Author: hpoussin Date: Wed Mar 14 15:44:54 2007 New Revision: 26075
URL: http://svn.reactos.org/svn/reactos?rev=26075&view=rev Log: Prepare import of Wine library odbccp32 (sorry, this revision won't build)
Added: trunk/reactos/dll/win32/odbccp32/ Modified: trunk/reactos/dll/win32/win32.rbuild trunk/reactos/include/psdk/msidefs.h trunk/reactos/include/psdk/odbcinst.h trunk/reactos/include/reactos/wine/list.h trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev=... ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Wed Mar 14 15:44:54 2007 @@ -151,6 +151,9 @@ <directory name="objsel"> <xi:include href="objsel/objsel.rbuild" /> </directory> +<directory name="odbccp32"> + <xi:include href="odbccp32/odbccp32.rbuild" /> +</directory> <directory name="ole32"> <xi:include href="ole32/ole32.rbuild" /> </directory>
Modified: trunk/reactos/include/psdk/msidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msidefs.h?rev=... ============================================================================== --- trunk/reactos/include/psdk/msidefs.h (original) +++ trunk/reactos/include/psdk/msidefs.h Wed Mar 14 15:44:54 2007 @@ -182,6 +182,16 @@ msidbLocatorTypeFileName = 0x001, msidbLocatorTypeRawValue = 0x002, msidbLocatorType64bit = 0x010, +}; + +enum msidbServiceControlEvent +{ + msidbServiceControlEventStart = 0x00000001, + msidbServiceControlEventStop = 0x00000002, + msidbServiceControlEventDelete = 0x00000008, + msidbServiceControlEventUninstallStart = 0x00000010, + msidbServiceControlEventUninstallStop = 0x00000020, + msidbServiceControlEventUninstallDelete = 0x00000080, };
/*
Modified: trunk/reactos/include/psdk/odbcinst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/odbcinst.h?rev... ============================================================================== --- trunk/reactos/include/psdk/odbcinst.h (original) +++ trunk/reactos/include/psdk/odbcinst.h Wed Mar 14 15:44:54 2007 @@ -66,8 +66,8 @@ 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*);
Modified: trunk/reactos/include/reactos/wine/list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/list.h... ============================================================================== --- trunk/reactos/include/reactos/wine/list.h (original) +++ trunk/reactos/include/reactos/wine/list.h Wed Mar 14 15:44:54 2007 @@ -139,6 +139,15 @@ 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)
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=2... ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Wed Mar 14 15:44:54 2007 @@ -60,6 +60,7 @@ 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