Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[akhaldi] 70054: [ODBCCP32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:34:37 2015 New Revision: 70054 URL: http://svn.reactos.org/svn/reactos?rev=70054&view=rev Log: [ODBCCP32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/odbccp32/misc.c Modified: trunk/rostests/winetests/odbccp32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/misc.c… ============================================================================== --- trunk/rostests/winetests/odbccp32/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/odbccp32/misc.c [iso-8859-1] Mon Nov 23 09:34:37 2015 @@ -24,6 +24,10 @@ #include "winreg.h" #include "odbcinst.h" +static const WCHAR abcd_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I','\\','w','i','n','e','o','d','b','c',0}; +static const WCHAR abcdini_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I',0 }; + + static void test_SQLConfigMode(void) { BOOL bool_ret; @@ -133,8 +137,6 @@ static void test_SQLWritePrivateProfileString(void) { static const WCHAR odbc_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','.','I','N','I','\\','w','i','n','e','o','d','b','c',0}; - static const WCHAR abcd_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I','\\','w','i','n','e','o','d','b','c',0}; - static const WCHAR abcdini_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I',0 }; BOOL ret; LONG reg_ret; DWORD error_code; @@ -188,10 +190,229 @@ } } +static void test_SQLGetPrivateProfileString(void) +{ + int ret; + char buffer[256] = {0}; + LONG reg_ret; + + strcpy(buffer, "wine"); + ret = SQLGetPrivateProfileString(NULL, "testing" , "default", buffer, 256, "ODBC.INI"); + ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret); + ok(!strcmp(buffer, ""), "incorrect string '%s'\n", buffer); + + strcpy(buffer, "wine"); + ret = SQLGetPrivateProfileString("wineodbc", NULL , "default", buffer, 256, "ODBC.INI"); + ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret); + ok(!strcmp(buffer, ""), "incorrect string '%s'\n", buffer); + + strcpy(buffer, "value"); + ret = SQLGetPrivateProfileString("wineodbc", "testing" , NULL, buffer, 256, "ODBC.INI"); + ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret); + ok(!strcmp(buffer, ""), "incorrect string '%s'\n", buffer); + + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 256, "ODBC.INI"); + ok(ret == strlen("defaultX"), "SQLGetPrivateProfileString returned %d\n", ret); + ok(!strcmp(buffer, "defaultX"), "incorrect string '%s'\n", buffer); + + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 4, "ODBC.INI"); + ok(ret == strlen("def"), "SQLGetPrivateProfileString returned %d\n", ret); + ok(!strcmp(buffer, "def"), "incorrect string '%s'\n", buffer); + + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 8, "ODBC.INI"); + ok(ret == strlen("default"), "SQLGetPrivateProfileString returned %d\n", ret); + ok(!strcmp(buffer, "default"), "incorrect string '%s'\n", buffer); + + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", NULL, 256, "ODBC.INI"); + ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret); + + strcpy(buffer, "value"); + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 0, "ODBC.INI"); + ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret); + ok(!strcmp(buffer, "value"), "incorrect string '%s'\n", buffer); + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value0123456789", "abcd.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + if(ret) + { + HKEY hkey; + + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultY", buffer, 256, "abcd.ini"); + ok(ret == strlen("value0123456789"), "SQLGetPrivateProfileString returned %d\n", ret); + ok(!strcmp(buffer, "value0123456789"), "incorrect string '%s'\n", buffer); + + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultY", NULL, 0, "abcd.ini"); + ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret); + + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultY", buffer, 7, "abcd.ini"); + ok(ret == 6, "SQLGetPrivateProfileString returned %d\n", ret); + + strcpy(buffer, "wine"); + ret = SQLGetPrivateProfileString("wineodbc", NULL , "", buffer, 10, "abcd.ini"); + ok(ret == (strlen("testing")+1), "SQLGetPrivateProfileString returned %d\n", ret); + ok(!strcmp(buffer, "testing"), "incorrect string '%s'\n", buffer); + + ret = SQLWritePrivateProfileString("wineodbc", "value" , "0", "abcd.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + + strcpy(buffer, "wine"); + ret = SQLGetPrivateProfileString("wineodbc", NULL , "", buffer, 256, "abcd.ini"); + ok(ret == (strlen("testing") + strlen("value")+2), "SQLGetPrivateProfileString returned %d\n", ret); + if(ret >= (strlen("testing") + strlen("value")+2)) + { + ok(memcmp(buffer, "testing\0value\0", 14) == 0, "incorrect string '%s'\n", buffer); + } + + strcpy(buffer, "XXXXXXXXXXXXXXX"); + ret = SQLGetPrivateProfileString("wineodbc", NULL , "", buffer, 10, "abcd.ini"); + ok(ret == (strlen("testing")+1), "SQLGetPrivateProfileString returned %d\n", ret); + if(ret >= (strlen("testing")+1)) + { + ok(!strcmp(buffer, "testing"), "incorrect string '%s'\n", buffer); + /* Show that the buffer is cleared and partial enteries aren't added */ + ok(memcmp(buffer, "testing\0X", 9) != 0, "incorrect string '%s'\n", buffer); + } + + strcpy(buffer, "wine"); + ret = SQLGetPrivateProfileString("wineodbc", NULL , "", buffer, 2, "abcd.ini"); + ok(ret == 0, "SQLGetPrivateProfileString returned %d\n", ret); + + reg_ret = RegOpenKeyExW(HKEY_CURRENT_USER, abcd_key, 0, KEY_READ, &hkey); + ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if(reg_ret == ERROR_SUCCESS) + { + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, abcd_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + + RegCloseKey(hkey); + } + + /* Cleanup key */ + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, abcdini_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + } +} + +static void test_SQLGetPrivateProfileStringW(void) +{ + static WCHAR testing[] = {'t','e','s','t','i','n','g',0}; + static WCHAR wineodbc[] = {'w','i','n','e','o','d','b','c',0}; + static WCHAR defaultval[] = {'d','e','f','a','u','l','t',0}; + static WCHAR odbcini[] = {'O','D','B','C','.','I','N','I',0}; + static WCHAR abcdini[] = {'a','b','c','d','.','I','N','I',0}; + static WCHAR wine[] = {'w','i','n','e',0}; + static WCHAR value[] = {'v','a','l','u','e',0}; + static WCHAR empty[] = {0}; + static WCHAR defaultX[] = {'d','e','f','a','u','l','t',0}; + static WCHAR def[] = {'d','e','f',0}; + static WCHAR value0[] = {'v','a','l','u','e','0','1','2','3','4','5','6','7','8','9',0}; + static WCHAR testingvalue[] = {'t','e','s','t','i','n','g',0,'v','a','l','u','e',0}; + int ret; + WCHAR buffer[256] = {0}; + LONG reg_ret; + + lstrcpyW(buffer, wine); + ret = SQLGetPrivateProfileStringW(NULL, testing , defaultval, buffer, 256, odbcini); + ok(ret == 0, "SQLGetPrivateProfileStringW returned %d\n", ret); + ok(!lstrcmpW(buffer, wine), "incorrect string '%s'\n", wine_dbgstr_w(buffer)); + + lstrcpyW(buffer, wine); + ret = SQLGetPrivateProfileStringW(wineodbc, NULL , defaultval, buffer, 256, odbcini); + ok(ret == 0, "SQLGetPrivateProfileStringW returned %d\n", ret); + ok(!lstrcmpW(buffer, empty), "incorrect string '%s'\n", wine_dbgstr_w(buffer)); + + lstrcpyW(buffer, value); + ret = SQLGetPrivateProfileStringW(wineodbc, testing , NULL, buffer, 256, odbcini); + ok(ret == 0, "SQLGetPrivateProfileStringW returned %d\n", ret); + ok(!lstrcmpW(buffer, empty), "incorrect string '%s'\n", wine_dbgstr_w(buffer)); + + ret = SQLGetPrivateProfileStringW(wineodbc, testing , defaultX, buffer, 256, odbcini); + ok(ret == lstrlenW(defaultX), "SQLGetPrivateProfileStringW returned %d\n", ret); + ok(!lstrcmpW(buffer, defaultX), "incorrect string '%s'\n", wine_dbgstr_w(buffer)); + + ret = SQLGetPrivateProfileStringW(wineodbc, testing , defaultX, buffer, 4, odbcini); + ok(ret == lstrlenW(def), "SQLGetPrivateProfileStringW returned %d\n", ret); + ok(!lstrcmpW(buffer, def), "incorrect string '%s'\n", wine_dbgstr_w(buffer)); + + ret = SQLGetPrivateProfileStringW(wineodbc, testing , defaultX, buffer, 8, odbcini); + ok(ret == lstrlenW(defaultX), "SQLGetPrivateProfileStringW returned %d\n", ret); + ok(!lstrcmpW(buffer, defaultX), "incorrect string '%s'\n", wine_dbgstr_w(buffer)); + + ret = SQLGetPrivateProfileStringW(wineodbc, testing , defaultX, NULL, 256, odbcini); + ok(ret == 0, "SQLGetPrivateProfileStringW returned %d\n", ret); + + lstrcpyW(buffer, value); + ret = SQLGetPrivateProfileStringW(wineodbc, testing , defaultX, buffer, 0, odbcini); + ok(ret == 0, "SQLGetPrivateProfileStringW returned %d\n", ret); + ok(!lstrcmpW(buffer, value), "incorrect string '%s'\n", wine_dbgstr_w(buffer)); + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value0123456789", "abcd.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + if(ret) + { + HKEY hkey; + + ret = SQLGetPrivateProfileStringW(wineodbc, testing , defaultX, buffer, 256, abcdini); + ok(ret == lstrlenW(value0), "SQLGetPrivateProfileStringW returned %d\n", ret); + ok(!lstrcmpW(buffer, value0), "incorrect string '%s'\n", wine_dbgstr_w(buffer)); + + ret = SQLGetPrivateProfileStringW(wineodbc, testing , defaultX, NULL, 0, abcdini); + ok(ret == 0, "SQLGetPrivateProfileStringW returned %d\n", ret); + + ret = SQLGetPrivateProfileStringW(wineodbc, testing , defaultX, buffer, 7, abcdini); + ok(ret == 6, "SQLGetPrivateProfileStringW returned %d\n", ret); + + lstrcpyW(buffer, wine); + ret = SQLGetPrivateProfileStringW(wineodbc, NULL , empty, buffer, 10, abcdini); + ok(ret == lstrlenW(testing)+1, "SQLGetPrivateProfileStringW returned %d\n", ret); + ok(!lstrcmpW(buffer, testing), "incorrect string '%s'\n", wine_dbgstr_w(buffer)); + + ret = SQLWritePrivateProfileString("wineodbc", "value" , "0", "abcd.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + + lstrcpyW(buffer, wine); + ret = SQLGetPrivateProfileStringW(wineodbc, NULL , empty, buffer, 256, abcdini); + ok(ret == (lstrlenW(testing) + lstrlenW(value)+2), "SQLGetPrivateProfileStringW returned %d\n", ret); + if(ret == (lstrlenW(testing) + lstrlenW(value)+2)) + { + ok(!memcmp(buffer, testingvalue, sizeof(testingvalue)), + "incorrect string '%s'\n", wine_dbgstr_wn(buffer, ret)); + } + + lstrcpyW(buffer, value); + ret = SQLGetPrivateProfileStringW(wineodbc, NULL , empty, buffer, 10, abcdini); + ok(ret == lstrlenW(testing)+1, "SQLGetPrivateProfileStringW returned %d\n", ret); + if(ret >= lstrlenW(testing)+1) + { + ok(!lstrcmpW(buffer, testing), "incorrect string '%s'\n", wine_dbgstr_w(buffer)); + } + + lstrcpyW(buffer, value); + ret = SQLGetPrivateProfileStringW(wineodbc, NULL , empty, buffer, 2, abcdini); + ok(ret == 0, "SQLGetPrivateProfileStringW returned %d\n", ret); + + reg_ret = RegOpenKeyExW(HKEY_CURRENT_USER, abcd_key, 0, KEY_READ, &hkey); + ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if(reg_ret == ERROR_SUCCESS) + { + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, abcd_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + + RegCloseKey(hkey); + } + + /* Cleanup key */ + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, abcdini_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + } +} + START_TEST(misc) { test_SQLConfigMode(); test_SQLInstallerError(); test_SQLInstallDriverManager(); test_SQLWritePrivateProfileString(); -} + test_SQLGetPrivateProfileString(); + test_SQLGetPrivateProfileStringW(); +}

1 0

[akhaldi] 70053: [PSDK] Fix SQLGetPrivateProfileString(W).
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:25:53 2015 New Revision: 70053 URL: http://svn.reactos.org/svn/reactos?rev=70053&view=rev Log: [PSDK] Fix SQLGetPrivateProfileString(W). Modified: trunk/reactos/include/psdk/odbcinst.h Modified: trunk/reactos/include/psdk/odbcinst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/odbcinst.h?re… ============================================================================== --- trunk/reactos/include/psdk/odbcinst.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/odbcinst.h [iso-8859-1] Mon Nov 23 09:25:53 2015 @@ -64,8 +64,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,LPCSTR,int,LPCSTR); -int INSTAPI SQLGetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,int,LPCWSTR); +int INSTAPI SQLGetPrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPSTR,int,LPCSTR); +int INSTAPI SQLGetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,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*);

1 0

[akhaldi] 70052: [ODBCCP32] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:23:54 2015 New Revision: 70052 URL: http://svn.reactos.org/svn/reactos?rev=70052&view=rev Log: [ODBCCP32] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/odbccp32/CMakeLists.txt trunk/reactos/dll/win32/odbccp32/odbccp32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] Mon Nov 23 09:23:54 2015 @@ -1,3 +1,6 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.c [iso-8859-1] Mon Nov 23 09:23:54 2015 @@ -26,7 +26,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include <windef.h> #include <winbase.h> @@ -40,6 +39,7 @@ /* Registry key names */ static const WCHAR drivers_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','I','N','S','T','.','I','N','I','\\','O','D','B','C',' ','D','r','i','v','e','r','s',0}; +static const WCHAR odbcW[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C',0}; /* This config mode is known to be process-wide. * MSDN documentation suggests that the value is hidden somewhere in the registry but I haven't found it yet. @@ -402,28 +402,176 @@ return ret; } -int WINAPI SQLGetPrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry, - LPCWSTR lpszDefault, LPCWSTR RetBuffer, int cbRetBuffer, - LPCWSTR lpszFilename) -{ - clear_errors(); - FIXME("%s %s %s %p %d %s\n", debugstr_w(lpszSection), debugstr_w(lpszEntry), - debugstr_w(lpszDefault), RetBuffer, cbRetBuffer, - debugstr_w(lpszFilename)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -int WINAPI SQLGetPrivateProfileString(LPCSTR lpszSection, LPCSTR lpszEntry, - LPCSTR lpszDefault, LPCSTR RetBuffer, int cbRetBuffer, - LPCSTR lpszFilename) -{ - clear_errors(); - FIXME("%s %s %s %p %d %s\n", debugstr_a(lpszSection), debugstr_a(lpszEntry), - debugstr_a(lpszDefault), RetBuffer, cbRetBuffer, - debugstr_a(lpszFilename)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; +static HKEY get_privateprofile_sectionkey(LPCWSTR section, LPCWSTR filename) +{ + HKEY hkey, hkeyfilename, hkeysection; + LONG ret; + + if (RegOpenKeyW(HKEY_CURRENT_USER, odbcW, &hkey)) + return NULL; + + ret = RegOpenKeyW(hkey, filename, &hkeyfilename); + RegCloseKey(hkey); + if (ret) + return NULL; + + ret = RegOpenKeyW(hkeyfilename, section, &hkeysection); + RegCloseKey(hkeyfilename); + + return ret ? NULL : hkeysection; +} + +int WINAPI SQLGetPrivateProfileStringW(LPCWSTR section, LPCWSTR entry, + LPCWSTR defvalue, LPWSTR buff, int buff_len, LPCWSTR filename) +{ + BOOL usedefault = TRUE; + HKEY sectionkey; + LONG ret = 0; + + TRACE("%s %s %s %p %d %s\n", debugstr_w(section), debugstr_w(entry), + debugstr_w(defvalue), buff, buff_len, debugstr_w(filename)); + + clear_errors(); + + if (buff_len <= 0 || !section) + return 0; + + if(buff) + buff[0] = 0; + + if (!defvalue || !buff) + return 0; + + sectionkey = get_privateprofile_sectionkey(section, filename); + if (sectionkey) + { + DWORD type, size; + + if (entry) + { + size = buff_len * sizeof(*buff); + if (RegGetValueW(sectionkey, NULL, entry, RRF_RT_REG_SZ, &type, buff, &size) == ERROR_SUCCESS) + { + usedefault = FALSE; + ret = (size / sizeof(*buff)) - 1; + } + } + else + { + WCHAR name[MAX_PATH]; + DWORD index = 0; + DWORD namelen; + + usedefault = FALSE; + + memset(buff, 0, buff_len); + + namelen = sizeof(name); + while (RegEnumValueW(sectionkey, index, name, &namelen, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + if ((ret + namelen+1) > buff_len) + break; + + lstrcpyW(buff+ret, name); + ret += namelen+1; + namelen = sizeof(name); + index++; + } + } + + RegCloseKey(sectionkey); + } + else + usedefault = entry != NULL; + + if (usedefault) + { + lstrcpynW(buff, defvalue, buff_len); + ret = lstrlenW(buff); + } + + return ret; +} + +int WINAPI SQLGetPrivateProfileString(LPCSTR section, LPCSTR entry, + LPCSTR defvalue, LPSTR buff, int buff_len, LPCSTR filename) +{ + WCHAR *sectionW, *filenameW; + BOOL usedefault = TRUE; + HKEY sectionkey; + LONG ret = 0; + + TRACE("%s %s %s %p %d %s\n", debugstr_a(section), debugstr_a(entry), + debugstr_a(defvalue), buff, buff_len, debugstr_a(filename)); + + clear_errors(); + + if (buff_len <= 0) + return 0; + + if (buff) + buff[0] = 0; + + if (!section || !defvalue || !buff) + return 0; + + sectionW = heap_strdupAtoW(section); + filenameW = heap_strdupAtoW(filename); + + sectionkey = get_privateprofile_sectionkey(sectionW, filenameW); + + heap_free(sectionW); + heap_free(filenameW); + + if (sectionkey) + { + DWORD type, size; + + if (entry) + { + size = buff_len * sizeof(*buff); + if (RegGetValueA(sectionkey, NULL, entry, RRF_RT_REG_SZ, &type, buff, &size) == ERROR_SUCCESS) + { + usedefault = FALSE; + ret = (size / sizeof(*buff)) - 1; + } + } + else + { + char name[MAX_PATH] = {0}; + DWORD index = 0; + DWORD namelen; + + usedefault = FALSE; + + memset(buff, 0, buff_len); + + namelen = sizeof(name); + while (RegEnumValueA(sectionkey, index, name, &namelen, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + if ((ret + namelen+1) > buff_len) + break; + + lstrcpyA(buff+ret, name); + + ret += namelen+1; + namelen = sizeof(name); + index++; + } + } + + RegCloseKey(sectionkey); + } + else + usedefault = entry != NULL; + + if (usedefault) + { + lstrcpynA(buff, defvalue, buff_len); + ret = strlen(buff); + } + + return ret; } BOOL WINAPI SQLGetTranslatorW(HWND hwndParent, LPWSTR lpszName, WORD cbNameMax, @@ -1019,7 +1167,6 @@ { LONG ret; HKEY hkey; - WCHAR softwareodbc[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C',0}; clear_errors(); TRACE("%s %s %s %s\n", debugstr_w(lpszSection), debugstr_w(lpszEntry), @@ -1031,7 +1178,7 @@ return FALSE; } - if ((ret = RegCreateKeyW(HKEY_CURRENT_USER, softwareodbc, &hkey)) == ERROR_SUCCESS) + if ((ret = RegCreateKeyW(HKEY_CURRENT_USER, odbcW, &hkey)) == ERROR_SUCCESS) { HKEY hkeyfilename; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Nov 23 09:23:54 2015 @@ -142,7 +142,7 @@ reactos/dll/win32/ntprint # Synced to WineStaging-1.7.47 reactos/dll/win32/objsel # Synced to WineStaging-1.7.47 reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.55 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.55 reactos/dll/win32/oleacc # Synced to WineStaging-1.7.47 reactos/dll/win32/oleaut32 # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70051: [XDK] Add missing AT_ROUND_TO_PAGE.
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:15:43 2015 New Revision: 70051 URL: http://svn.reactos.org/svn/reactos?rev=70051&view=rev Log: [XDK] Add missing AT_ROUND_TO_PAGE. Modified: trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Mon Nov 23 09:15:43 2015 @@ -577,6 +577,8 @@ #define MESSAGE_RESOURCE_UNICODE 1 #define RTL_CRITSECT_TYPE 0 #define RTL_RESOURCE_TYPE 1 + +#define AT_ROUND_TO_PAGE 0x40000000 #define IMAGE_SIZEOF_FILE_HEADER 20 #define IMAGE_FILE_RELOCS_STRIPPED 1

1 0

[akhaldi] 70050: [MSXML3_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:12:39 2015 New Revision: 70050 URL: http://svn.reactos.org/svn/reactos?rev=70050&view=rev Log: [MSXML3_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/msxml3/domdoc.c trunk/rostests/winetests/msxml3/saxreader.c trunk/rostests/winetests/msxml3/xmlparser.idl Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Mon Nov 23 09:12:39 2015 @@ -7505,6 +7505,19 @@ IXMLDOMSchemaCollection *cache; VARIANT_BOOL b; VARIANT var; + IXMLDOMElement *element; + IXMLDOMNodeList *node_list; + IXMLDOMAttribute *attr; + LONG i, len; + HRESULT hr; + const CHAR nodeXML[] = + "<root id='0'>" + " " + " text node 0" + " <x attr='val'></x>" + " <?foo value='PI for x'?>" + " <![CDATA[ cdata ]]>" + "</root>"; if (!is_clsid_supported(&CLSID_DOMDocument2, &IID_IXMLDOMDocument2)) return; if (!is_clsid_supported(&CLSID_XMLSchemaCache, &IID_IXMLDOMSchemaCollection)) return; @@ -7556,6 +7569,47 @@ unset_props(doc_owner); check_default_props(doc_owner); check_default_props(doc); + + /* NULL check */ + hr = IXMLDOMDocument_loadXML(doc1, _bstr_(nodeXML), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + hr = IXMLDOMDocument_get_documentElement(doc1, &element); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_childNodes(element, &node_list); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNodeList_get_length(node_list, &len); + EXPECT_HR(hr, S_OK); + + for(i = 0; i < len; i++) { + hr = IXMLDOMNodeList_get_item(node_list, i, &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_get_ownerDocument(node, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + IXMLDOMNode_Release(node); + } + IXMLDOMElement_Release(element); + + /* Test Attribute Node */ + hr = IXMLDOMNodeList_get_item(node_list, 2, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&element); + EXPECT_HR(hr, S_OK); + IXMLDOMNode_Release(node); + + hr = IXMLDOMElement_getAttributeNode(element, _bstr_("attr"), &attr); + EXPECT_HR(hr, S_OK); + ok(attr != NULL, "attr == NULL\n"); + IXMLDOMElement_Release(element); + hr = IXMLDOMAttribute_get_ownerDocument(attr, NULL); + EXPECT_HR(hr, E_INVALIDARG); + IXMLDOMAttribute_Release(attr); + IXMLDOMNodeList_Release(node_list); IXMLDOMSchemaCollection_Release(cache); IXMLDOMDocument_Release(doc1); @@ -8961,6 +9015,7 @@ ok(doctype == NULL, "got %p\n", doctype); hr = IXMLDOMDocument_loadXML(doc, _bstr_(szEmailXML), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE, "failed to load XML string\n"); doctype = NULL; @@ -10866,6 +10921,56 @@ free_bstrs(); } +static void test_getAttribute(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + VARIANT_BOOL v; + VARIANT var; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &v); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute( elem, _bstr_("xmlns:foo"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("a"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("attr a")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("foo:b"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("attr b")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("b"), &var ); + EXPECT_HR(hr, S_FALSE); + ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("non-existent"), &var ); + EXPECT_HR(hr, S_FALSE); + ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); + VariantClear(&var); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + typedef struct { DOMNodeType type; const char *name; @@ -11917,6 +12022,71 @@ ok(s == NULL, "got %s\n", wine_dbgstr_w(s)); IXMLDOMDocument_Release(doc); +} + +static void test_merging_text(void) +{ + IXMLDOMText *nodetext; + IXMLDOMText *newtext; + IXMLDOMElement *root; + IXMLDOMDocument *doc; + IXMLDOMNode *first; + HRESULT hr; + VARIANT v; + BSTR str; + int i; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); + EXPECT_HR(hr, S_OK); + + /* test xmlAddChild */ + for (i = 0; i < 10; i++) + { + str = SysAllocString(szstr1); + hr = IXMLDOMDocument_createTextNode(doc, str, &nodetext); + SysFreeString(str); + EXPECT_HR(hr, S_OK); + + newtext = NULL; + hr = IXMLDOMElement_appendChild(root, (IXMLDOMNode*)nodetext, (IXMLDOMNode**)&newtext); + EXPECT_HR(hr, S_OK); + ok(nodetext == newtext, "expected %p, got %p\n", nodetext, newtext); + + IXMLDOMText_Release(newtext); + IXMLDOMText_Release(nodetext); + } + + /* test xmlAddPrevSibling */ + hr = IXMLDOMElement_get_firstChild(root, &first); + EXPECT_HR(hr, S_OK); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)first; + for (i = 0; i < 10; i++) + { + str = SysAllocString(szstr2); + hr = IXMLDOMDocument_createTextNode(doc, str, &nodetext); + SysFreeString(str); + EXPECT_HR(hr, S_OK); + + newtext = NULL; + hr = IXMLDOMElement_insertBefore(root, (IXMLDOMNode*)nodetext, v, (IXMLDOMNode**)&newtext); + EXPECT_HR(hr, S_OK); + ok(nodetext == newtext, "expected %p, got %p\n", nodetext, newtext); + + IXMLDOMText_Release(newtext); + IXMLDOMText_Release(nodetext); + } + + IXMLDOMNode_Release(first); + IXMLDOMElement_Release(root); + IXMLDOMDocument_Release(doc); + + free_bstrs(); } START_TEST(domdoc) @@ -11990,6 +12160,7 @@ test_dispex(); test_parseerror(); test_getAttributeNode(); + test_getAttribute(); test_supporterrorinfo(); test_nodeValue(); test_get_namespaces(); @@ -11998,6 +12169,7 @@ test_namedmap_newenum(); test_xmlns_attribute(); test_url(); + test_merging_text(); test_xsltemplate(); test_xsltext(); Modified: trunk/rostests/winetests/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/saxreade… ============================================================================== --- trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] Mon Nov 23 09:12:39 2015 @@ -2395,6 +2395,7 @@ hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", TRUE); + IStream_Release(stream); hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespaces"), VARIANT_TRUE); EXPECT_HR(hr, S_OK); @@ -2418,6 +2419,7 @@ hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", FALSE); + IStream_Release(stream); hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespace-prefixes"), VARIANT_TRUE); EXPECT_HR(hr, S_OK); Modified: trunk/rostests/winetests/msxml3/xmlparser.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/xmlparse… ============================================================================== --- trunk/rostests/winetests/msxml3/xmlparser.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/xmlparser.idl [iso-8859-1] Mon Nov 23 09:12:39 2015 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep header import "unknwn.idl"; import "objidl.idl"; @@ -254,7 +256,7 @@ ] library XMLPSR { -importlib("stdole32.tlb"); +/* importlib("stdole32.tlb"); */ importlib("stdole2.tlb"); [

1 0

[akhaldi] 70049: [MSXML3] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:11:20 2015 New Revision: 70049 URL: http://svn.reactos.org/svn/reactos?rev=70049&view=rev Log: [MSXML3] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/element.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/xmlparser.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Mon Nov 23 09:11:20 2015 @@ -1945,7 +1945,7 @@ } xml_name = xmlchar_from_wchar(name); - /* prevent empty href to be allocated */ + /* prevent empty href from being allocated */ href = namespaceURI ? xmlchar_from_wchar(namespaceURI) : NULL; switch(node_type) @@ -1958,7 +1958,7 @@ xmlnode = xmlNewDocNode(get_doc(This), NULL, local ? local : xml_name, NULL); - /* allow to create default namespace xmlns= */ + /* allow creating the default namespace xmlns= */ if (local || (href && *href)) { xmlNsPtr ns = xmlNewNs(xmlnode, href, prefix); Modified: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] Mon Nov 23 09:11:20 2015 @@ -1182,7 +1182,9 @@ domelem *This = impl_from_IXMLDOMElement( iface ); xmlNodePtr element; xmlChar *xml_name, *xml_value = NULL; + xmlChar *local, *prefix; HRESULT hr = S_FALSE; + xmlNsPtr ns; TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); @@ -1201,7 +1203,28 @@ if(!xmlValidateNameValue(xml_name)) hr = E_FAIL; else - xml_value = xmlGetNsProp(element, xml_name, NULL); + { + if ((local = xmlSplitQName2(xml_name, &prefix))) + { + if (xmlStrEqual(prefix, BAD_CAST "xmlns")) + { + ns = xmlSearchNs(element->doc, element, local); + if (ns) + xml_value = xmlStrdup(ns->href); + } + else + { + ns = xmlSearchNs(element->doc, element, prefix); + if (ns) + xml_value = xmlGetNsProp(element, local, ns->href); + } + + xmlFree(prefix); + xmlFree(local); + } + else + xml_value = xmlGetNsProp(element, xml_name, NULL); + } heap_free(xml_name); if(xml_value) Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Mon Nov 23 09:11:20 2015 @@ -477,7 +477,7 @@ refcount = xmlnode_get_inst_cnt(node_obj); if (refcount) xmldoc_add_refs(before_node_obj->node->doc, refcount); - xmlAddPrevSibling(before_node_obj->node, node_obj->node); + node_obj->node = xmlAddPrevSibling(before_node_obj->node, node_obj->node); if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->parent; } @@ -489,7 +489,7 @@ if (refcount) xmldoc_add_refs(This->node->doc, refcount); /* xmlAddChild doesn't unlink node from previous parent */ xmlUnlinkNode(node_obj->node); - xmlAddChild(This->node, node_obj->node); + node_obj->node = xmlAddChild(This->node, node_obj->node); if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->iface; } @@ -635,6 +635,8 @@ HRESULT node_get_owner_doc(const xmlnode *This, IXMLDOMDocument **doc) { + if(!doc) + return E_INVALIDARG; return get_domdoc_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)doc); } Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… ============================================================================== --- trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] Mon Nov 23 09:11:20 2015 @@ -668,12 +668,13 @@ static void update_position(saxlocator *This, BOOL fix_column) { const xmlChar *p = This->pParserCtxt->input->cur-1; + const xmlChar *baseP = This->pParserCtxt->input->base; This->line = xmlSAX2GetLineNumber(This->pParserCtxt); if(fix_column) { This->column = 1; - for(; *p!='\n' && *p!='\r' && p>=This->pParserCtxt->input->base; p--) + for(;p>=baseP && *p!='\n' && *p!='\r'; p--) This->column++; } else Modified: trunk/reactos/dll/win32/msxml3/xmlparser.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlparser… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmlparser.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmlparser.idl [iso-8859-1] Mon Nov 23 09:11:20 2015 @@ -256,7 +256,7 @@ ] library XMLPSR { -importlib("stdole32.tlb"); +/* importlib("stdole32.tlb"); */ importlib("stdole2.tlb"); [ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Nov 23 09:11:20 2015 @@ -132,7 +132,7 @@ reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.55 reactos/dll/win32/msxml # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.47 -reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.55 reactos/dll/win32/msxml4 # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.47 reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.47

1 0

[akhaldi] 70048: [MSCMS_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:03:09 2015 New Revision: 70048 URL: http://svn.reactos.org/svn/reactos?rev=70048&view=rev Log: [MSCMS_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/mscms/profile.c Modified: trunk/rostests/winetests/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/profile.c… ============================================================================== --- trunk/rostests/winetests/mscms/profile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mscms/profile.c [iso-8859-1] Mon Nov 23 09:03:09 2015 @@ -35,6 +35,8 @@ static BOOL (WINAPI *pAssociateColorProfileWithDeviceA)(PCSTR,PCSTR,PCSTR); static BOOL (WINAPI *pCloseColorProfile)(HPROFILE); +static HTRANSFORM (WINAPI *pCreateMultiProfileTransform)(PHPROFILE,DWORD,PDWORD,DWORD,DWORD,DWORD); +static BOOL (WINAPI *pDeleteColorTransform)(HTRANSFORM); static BOOL (WINAPI *pDisassociateColorProfileFromDeviceA)(PCSTR,PCSTR,PCSTR); static BOOL (WINAPI *pGetColorDirectoryA)(PCHAR,PCHAR,PDWORD); static BOOL (WINAPI *pGetColorDirectoryW)(PWCHAR,PWCHAR,PDWORD); @@ -68,6 +70,8 @@ { GETFUNCPTR( AssociateColorProfileWithDeviceA ) GETFUNCPTR( CloseColorProfile ) + GETFUNCPTR( CreateMultiProfileTransform ) + GETFUNCPTR( DeleteColorTransform ) GETFUNCPTR( DisassociateColorProfileFromDeviceA ) GETFUNCPTR( GetColorDirectoryA ) GETFUNCPTR( GetColorDirectoryW ) @@ -1334,6 +1338,38 @@ return TRUE; } +static void test_CreateMultiProfileTransform( char *standardprofile, char *testprofile ) +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intents[2] = { INTENT_PERCEPTUAL, INTENT_PERCEPTUAL }; + + if (testprofile) + { + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standardprofile; + profile.cbDataSize = strlen(standardprofile); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %u\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = testprofile; + profile.cbDataSize = strlen(testprofile); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %u\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, intents, 2, 0, 0 ); + ok( transform != NULL, "got %u\n", GetLastError() ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); + } +} + START_TEST(profile) { UINT len; @@ -1443,6 +1479,7 @@ test_UninstallColorProfileW( testprofileW ); test_AssociateColorProfileWithDeviceA( testprofile ); + test_CreateMultiProfileTransform( standardprofile, testprofile ); if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 );

1 0

[akhaldi] 70047: [PSDK] Update icm.h. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:02:47 2015 New Revision: 70047 URL: http://svn.reactos.org/svn/reactos?rev=70047&view=rev Log: [PSDK] Update icm.h. CORE-10536 Modified: trunk/reactos/include/psdk/icm.h Modified: trunk/reactos/include/psdk/icm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/icm.h?rev=700… ============================================================================== --- trunk/reactos/include/psdk/icm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/icm.h [iso-8859-1] Mon Nov 23 09:02:47 2015 @@ -179,6 +179,11 @@ typedef BOOL (CALLBACK *PBMCALLBACKFN)(ULONG,ULONG,LPARAM); typedef PBMCALLBACKFN LPPBMCALLBACKFN; +#define INTENT_PERCEPTUAL 0 +#define INTENT_RELATIVE_COLORIMETRIC 1 +#define INTENT_SATURATION 2 +#define INTENT_ABSOLUTE_COLORIMETRIC 3 + typedef struct tagPROFILEHEADER { DWORD phSize; @@ -359,7 +364,6 @@ BOOL WINAPI GetColorProfileElementTag(HPROFILE,DWORD,PTAGTYPE); BOOL WINAPI GetColorProfileFromHandle(HPROFILE,PBYTE,PDWORD); BOOL WINAPI GetColorProfileHeader(HPROFILE,PPROFILEHEADER); -HCOLORSPACE WINAPI GetColorSpace(HDC); BOOL WINAPI GetCountColorProfileElements(HPROFILE,PDWORD); BOOL WINAPI GetNamedProfileInfo(HPROFILE,PNAMED_PROFILE_INFO); BOOL WINAPI GetPS2ColorRenderingDictionary(HPROFILE,DWORD,PBYTE,PDWORD,PBOOL); @@ -384,7 +388,6 @@ BOOL WINAPI SetColorProfileElementReference(HPROFILE,TAGTYPE,TAGTYPE); BOOL WINAPI SetColorProfileElementSize(HPROFILE,TAGTYPE,DWORD); BOOL WINAPI SetColorProfileHeader(HPROFILE,PPROFILEHEADER); -HCOLORSPACE WINAPI SetColorSpace(HDC,HCOLORSPACE); BOOL WINAPI SetStandardColorSpaceProfileA(PCSTR,DWORD,PSTR); BOOL WINAPI SetStandardColorSpaceProfileW(PCWSTR,DWORD,PWSTR); #define SetStandardColorSpaceProfile WINELIB_NAME_AW(SetStandardColorSpaceProfile)

1 0

[akhaldi] 70046: [MSCMS] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:02:03 2015 New Revision: 70046 URL: http://svn.reactos.org/svn/reactos?rev=70046&view=rev Log: [MSCMS] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/mscms/profile.c trunk/reactos/dll/win32/mscms/transform.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/profile.c?… ============================================================================== --- trunk/reactos/dll/win32/mscms/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/profile.c [iso-8859-1] Mon Nov 23 09:02:03 2015 @@ -1154,7 +1154,7 @@ release_profile( profile ); return FALSE; } - *present = cmsIsTag( profile->cmsprofile, type ); + *present = (cmsIsTag( profile->cmsprofile, type ) != 0); release_profile( profile ); ret = TRUE; @@ -1408,7 +1408,11 @@ if (!(data = HeapAlloc( GetProcessHeap(), 0, profile->cbDataSize ))) return NULL; memcpy( data, profile->pProfileData, profile->cbDataSize ); - cmsprofile = cmsOpenProfileFromMem( data, profile->cbDataSize ); + if (!(cmsprofile = cmsOpenProfileFromMem( data, profile->cbDataSize ))) + { + HeapFree( GetProcessHeap(), 0, data ); + return FALSE; + } size = profile->cbDataSize; } else if (profile->dwType == PROFILE_FILENAME) @@ -1466,7 +1470,12 @@ HeapFree( GetProcessHeap(), 0, data ); return NULL; } - cmsprofile = cmsOpenProfileFromMem( data, size ); + if (!(cmsprofile = cmsOpenProfileFromMem( data, size ))) + { + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, data ); + return NULL; + } } else { Modified: trunk/reactos/dll/win32/mscms/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/transform.… ============================================================================== --- trunk/reactos/dll/win32/mscms/transform.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/transform.c [iso-8859-1] Mon Nov 23 09:02:03 2015 @@ -38,64 +38,51 @@ #ifdef HAVE_LCMS2 -static DWORD from_profile( HPROFILE profile ) -{ - PROFILEHEADER header; - - GetColorProfileHeader( profile, &header ); - TRACE( "color space: 0x%08x %s\n", header.phDataColorSpace, dbgstr_tag( header.phDataColorSpace ) ); - - switch (header.phDataColorSpace) - { - case 0x434d594b: return TYPE_CMYK_16; /* 'CMYK' */ - case 0x47524159: return TYPE_GRAY_16; /* 'GRAY' */ - case 0x4c616220: return TYPE_Lab_16; /* 'Lab ' */ - case 0x52474220: return TYPE_RGB_16; /* 'RGB ' */ - case 0x58595a20: return TYPE_XYZ_16; /* 'XYZ ' */ - default: - WARN("unhandled format\n"); - return TYPE_RGB_16; - } -} - static DWORD from_bmformat( BMFORMAT format ) { static BOOL quietfixme = FALSE; - TRACE( "bitmap format: 0x%08x\n", format ); + DWORD ret; switch (format) { - case BM_RGBTRIPLETS: return TYPE_RGB_8; - case BM_BGRTRIPLETS: return TYPE_BGR_8; - case BM_GRAY: return TYPE_GRAY_8; - case BM_xRGBQUADS: return TYPE_ARGB_8; - case BM_xBGRQUADS: return TYPE_ABGR_8; + case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; + case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_GRAY: ret = TYPE_GRAY_8; break; + case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; + case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; default: if (!quietfixme) { - FIXME("unhandled bitmap format 0x%x\n", format); + FIXME( "unhandled bitmap format %08x\n", format ); quietfixme = TRUE; } - return TYPE_RGB_8; - } + ret = TYPE_RGB_8; + break; + } + TRACE( "color space: %08x -> %08x\n", format, ret ); + return ret; } static DWORD from_type( COLORTYPE type ) { - TRACE( "color type: 0x%08x\n", type ); + DWORD ret; switch (type) { - case COLOR_GRAY: return TYPE_GRAY_16; - case COLOR_RGB: return TYPE_RGB_16; - case COLOR_XYZ: return TYPE_XYZ_16; - case COLOR_Yxy: return TYPE_Yxy_16; - case COLOR_Lab: return TYPE_Lab_16; - case COLOR_CMYK: return TYPE_CMYK_16; + case COLOR_GRAY: ret = TYPE_GRAY_16; break; + case COLOR_RGB: ret = TYPE_RGB_16; break; + case COLOR_XYZ: ret = TYPE_XYZ_16; break; + case COLOR_Yxy: ret = TYPE_Yxy_16; break; + case COLOR_Lab: ret = TYPE_Lab_16; break; + case COLOR_CMYK: ret = TYPE_CMYK_16; break; default: - FIXME("unhandled color type\n"); - return TYPE_RGB_16; - } + FIXME( "unhandled color type %08x\n", type ); + ret = TYPE_RGB_16; + break; + } + + TRACE( "color type: %08x -> %08x\n", type, ret ); + return ret; } #endif /* HAVE_LCMS2 */ @@ -147,7 +134,7 @@ struct transform transform; struct profile *dst, *tgt = NULL; cmsHPROFILE cmsinput, cmsoutput, cmstarget = NULL; - DWORD in_format, out_format, proofing = 0; + DWORD proofing = 0; int intent; TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags ); @@ -165,9 +152,6 @@ TRACE( "lcsCSType: %s\n", dbgstr_tag( space->lcsCSType ) ); TRACE( "lcsFilename: %s\n", debugstr_w( space->lcsFilename ) ); - in_format = TYPE_RGB_16; - out_format = from_profile( dest ); - cmsinput = cmsCreate_sRGBProfile(); /* FIXME: create from supplied color space */ if (target) { @@ -175,8 +159,15 @@ cmstarget = tgt->cmsprofile; } cmsoutput = dst->cmsprofile; - transform.cmstransform = cmsCreateProofingTransform(cmsinput, in_format, cmsoutput, out_format, cmstarget, - intent, INTENT_ABSOLUTE_COLORIMETRIC, proofing); + transform.cmstransform = cmsCreateProofingTransform(cmsinput, 0, cmsoutput, 0, cmstarget, + intent, INTENT_ABSOLUTE_COLORIMETRIC, + proofing); + if (!transform.cmstransform) + { + if (tgt) release_profile( tgt ); + release_profile( dst ); + return FALSE; + } ret = create_transform( &transform ); @@ -208,10 +199,9 @@ { HTRANSFORM ret = NULL; #ifdef HAVE_LCMS2 - cmsHPROFILE *cmsprofiles, cmsconvert = NULL; + cmsHPROFILE *cmsprofiles; struct transform transform; struct profile *profile0, *profile1; - DWORD in_format, out_format; TRACE( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, 0x%08x )\n", profiles, nprofiles, intents, nintents, flags, cmm ); @@ -232,33 +222,21 @@ release_profile( profile0 ); return NULL; } - in_format = from_profile( profiles[0] ); - out_format = from_profile( profiles[nprofiles - 1] ); - - if (in_format != out_format) - { - /* insert a conversion profile for pairings that lcms doesn't handle */ - if (out_format == TYPE_RGB_16) cmsconvert = cmsCreate_sRGBProfile(); - if (out_format == TYPE_Lab_16) cmsconvert = cmsCreateLab2Profile( NULL ); - } - - cmsprofiles = HeapAlloc( GetProcessHeap(), 0, (nprofiles + 1) * sizeof(cmsHPROFILE) ); - if (cmsprofiles) + + if ((cmsprofiles = HeapAlloc( GetProcessHeap(), 0, (nprofiles + 1) * sizeof(cmsHPROFILE) ))) { cmsprofiles[0] = profile0->cmsprofile; - if (cmsconvert) - { - cmsprofiles[1] = cmsconvert; - cmsprofiles[2] = profile1->cmsprofile; - nprofiles++; - } - else - { - cmsprofiles[1] = profile1->cmsprofile; - } - transform.cmstransform = cmsCreateMultiprofileTransform( cmsprofiles, nprofiles, in_format, out_format, *intents, 0 ); - + cmsprofiles[1] = profile1->cmsprofile; + + transform.cmstransform = cmsCreateMultiprofileTransform( cmsprofiles, nprofiles, 0, + 0, *intents, 0 ); HeapFree( GetProcessHeap(), 0, cmsprofiles ); + if (!transform.cmstransform) + { + release_profile( profile0 ); + release_profile( profile1 ); + return FALSE; + } ret = create_transform( &transform ); } @@ -329,7 +307,8 @@ outputstride, callback, data ); if (!transform) return FALSE; - cmsChangeBuffersFormat( transform->cmstransform, from_bmformat(input), from_bmformat(output) ); + if (!cmsChangeBuffersFormat( transform->cmstransform, from_bmformat(input), from_bmformat(output) )) + return FALSE; cmsDoTransform( transform->cmstransform, srcbits, destbits, width * height ); release_transform( transform ); @@ -370,7 +349,8 @@ if (!transform) return FALSE; xfrm = transform->cmstransform; - cmsChangeBuffersFormat( xfrm, from_type(input_type), from_type(output_type) ); + if (!cmsChangeBuffersFormat( xfrm, from_type(input_type), from_type(output_type) )) + return FALSE; switch (input_type) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Nov 23 09:02:03 2015 @@ -107,7 +107,7 @@ reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.55 reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/mscms # Synced to WineStaging-1.7.47 +reactos/dll/win32/mscms # Synced to WineStaging-1.7.55 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-1.7.47 reactos/dll/win32/msftedit # Synced to WineStaging-1.7.47

1 0

[akhaldi] 70045: [MSADP32.ACM] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 08:55:46 2015 New Revision: 70045 URL: http://svn.reactos.org/svn/reactos?rev=70045&view=rev Log: [MSADP32.ACM] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msad… ============================================================================== --- trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] Mon Nov 23 08:55:46 2015 @@ -251,9 +251,17 @@ { const unsigned char* in_src = src; - assert(*src <= 6); + /* Catch a problem from Tomb Raider III (bug 21000) where it passes + * invalid data after a valid sequence of blocks */ + if (*src > 6 || *(src + 1) > 6) + { + /* Recalculate the amount of used output buffer. We are not changing + * nsrc, let's assume the bad data was parsed */ + *ndst -= nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; + WARN("Invalid ADPCM data, stopping conversion\n"); + break; + } coeffL = MSADPCM_CoeffSet[*src++]; - assert(*src <= 6); coeffR = MSADPCM_CoeffSet[*src++]; ideltaL = R16(src); src += 2; @@ -544,6 +552,8 @@ if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; break; case WAVE_FORMAT_ADPCM: + if (adfs->cbwfxDst < sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET)) + return ACMERR_NOTPOSSIBLE; init_wfx_adpcm((ADPCMWAVEFORMAT*)adfs->pwfxDst); /* check if result is ok */ if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Nov 23 08:55:46 2015 @@ -105,7 +105,7 @@ reactos/dll/win32/mprapi # Synced to WineStaging-1.7.47 reactos/dll/win32/msacm32 # Synced to WineStaging-1.7.55 reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.55 -reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.47 +reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mscms # Synced to WineStaging-1.7.47 reactos/dll/win32/mscoree # Synced to Wine-1.5.4

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
46
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015