diff --git a/reactos/dll/win32/odbccp32/.gitignore b/reactos/dll/win32/odbccp32/.gitignore new file mode 100644 index 00000000000..e69de29bb2d diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild index 3a81bc325c8..22a862c4eee 100644 --- a/reactos/dll/win32/win32.rbuild +++ b/reactos/dll/win32/win32.rbuild @@ -151,6 +151,9 @@ + + + diff --git a/reactos/include/psdk/msidefs.h b/reactos/include/psdk/msidefs.h index 9d06d6da508..30649072d2c 100644 --- a/reactos/include/psdk/msidefs.h +++ b/reactos/include/psdk/msidefs.h @@ -184,6 +184,16 @@ enum msidbLocatorType msidbLocatorType64bit = 0x010, }; +enum msidbServiceControlEvent +{ + msidbServiceControlEventStart = 0x00000001, + msidbServiceControlEventStop = 0x00000002, + msidbServiceControlEventDelete = 0x00000008, + msidbServiceControlEventUninstallStart = 0x00000010, + msidbServiceControlEventUninstallStop = 0x00000020, + msidbServiceControlEventUninstallDelete = 0x00000080, +}; + /* * Windows SDK braindamage alert * diff --git a/reactos/include/psdk/odbcinst.h b/reactos/include/psdk/odbcinst.h index b995ec1578c..9e8c6eceb8d 100644 --- a/reactos/include/psdk/odbcinst.h +++ b/reactos/include/psdk/odbcinst.h @@ -66,8 +66,8 @@ BOOL INSTAPI SQLGetAvailableDrivers(LPCSTR,LPSTR,WORD,WORD*); BOOL INSTAPI SQLGetAvailableDriversW(LPCWSTR,LPWSTR,WORD,WORD*); BOOL INSTAPI SQLGetInstalledDrivers(LPSTR,WORD,WORD*); BOOL INSTAPI SQLGetInstalledDriversW(LPWSTR,WORD,WORD*); -int INSTAPI SQLGetPrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPSTR,int,LPCSTR); -int INSTAPI SQLGetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,int,LPCWSTR); +int INSTAPI SQLGetPrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPCSTR,int,LPCSTR); +int INSTAPI SQLGetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,int,LPCWSTR); BOOL INSTAPI SQLGetTranslator(HWND,LPSTR,WORD,WORD*,LPSTR,WORD,WORD*,DWORD*); BOOL INSTAPI SQLGetTranslatorW(HWND,LPWSTR,WORD,WORD*,LPWSTR,WORD,WORD*,DWORD*); BOOL INSTAPI SQLInstallDriver(LPCSTR,LPCSTR,LPSTR,WORD,WORD*); diff --git a/reactos/include/reactos/wine/list.h b/reactos/include/reactos/wine/list.h index 392edd94a39..66a2bca7e8c 100644 --- a/reactos/include/reactos/wine/list.h +++ b/reactos/include/reactos/wine/list.h @@ -139,6 +139,15 @@ __inline static void list_init( struct list *list ) list->next = list->prev = list; } +/* count the elements of a list */ +inline static unsigned int list_count( const struct list *list ) +{ + unsigned count = 0; + const struct list *ptr; + for (ptr = list->next; ptr != list; ptr = ptr->next) count++; + return count; +} + /* iterate through the list */ #define LIST_FOR_EACH(cursor,list) \ for ((cursor) = (list)->next; (cursor) != (list); (cursor) = (cursor)->next) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index e53ab86563f..aa3e06a430e 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -60,6 +60,7 @@ reactos/dll/win32/msvideo # Out of sync reactos/dll/win32/netapi32 # Synced to Wine-0_9_5 reactos/dll/win32/objsel # Autosync reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. +reactos/dll/win32/odbccp32 # Autosync reactos/dll/win32/ole32 # Synced to Wine-0_9_5 reactos/dll/win32/oleacc # Autosync reactos/dll/win32/oleaut32 # Synced to Wine-0_9_10