Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[reactos] 01/01: [WMIUTILS_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8856b0bde32fbc0c72534… commit 8856b0bde32fbc0c7253474510e55c859be46251 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 21 14:08:03 2017 +0100 [WMIUTILS_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/wmiutils/CMakeLists.txt | 3 ++- modules/rostests/winetests/wmiutils/path.c | 28 +++++++++++----------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/modules/rostests/winetests/wmiutils/CMakeLists.txt b/modules/rostests/winetests/wmiutils/CMakeLists.txt index 0aefcbade6..33d792d4b4 100644 --- a/modules/rostests/winetests/wmiutils/CMakeLists.txt +++ b/modules/rostests/winetests/wmiutils/CMakeLists.txt @@ -1,7 +1,8 @@ add_definitions( -DUSE_WINE_TODOS - -D__WINESRC__) + -D__WINESRC__ + -DWINETEST_USE_DBGSTR_LONGLONG) add_executable(wmiutils_winetest path.c testlist.c) set_module_type(wmiutils_winetest win32cui) diff --git a/modules/rostests/winetests/wmiutils/path.c b/modules/rostests/winetests/wmiutils/path.c index 99907a35d4..3709748174 100644 --- a/modules/rostests/winetests/wmiutils/path.c +++ b/modules/rostests/winetests/wmiutils/path.c @@ -443,7 +443,7 @@ static void test_IWbemPath_SetClassName(void) ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT), - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); IWbemPath_Release( path ); } @@ -514,7 +514,7 @@ static void test_IWbemPath_GetInfo(void) hr = IWbemPath_GetInfo( path, 0, &resp ); ok( hr == S_OK, "got %08x\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), - "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + "got %s\n", wine_dbgstr_longlong(resp) ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -531,7 +531,7 @@ static void test_IWbemPath_GetInfo(void) ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), - "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + "got %s\n", wine_dbgstr_longlong(resp) ); IWbemPath_Release( path ); if (!(path = create_path())) return; @@ -545,7 +545,7 @@ static void test_IWbemPath_GetInfo(void) ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT), - "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + "got %s\n", wine_dbgstr_longlong(resp) ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path1 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -554,7 +554,7 @@ static void test_IWbemPath_GetInfo(void) hr = IWbemPath_GetInfo( path, 0, &resp ); ok( hr == S_OK, "got %08x\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), - "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + "got %s\n", wine_dbgstr_longlong(resp) ); IWbemPath_Release( path ); } @@ -596,7 +596,7 @@ static void test_IWbemPath_SetServer(void) ok( flags == (WBEMPATH_INFO_HAS_MACHINE_NAME | WBEMPATH_INFO_V1_COMPLIANT | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY | WBEMPATH_INFO_PATH_HAD_SERVER), - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); hr = IWbemPath_SetServer( path, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -609,7 +609,7 @@ static void test_IWbemPath_SetServer(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); IWbemPath_Release( path ); } @@ -694,7 +694,7 @@ static void test_IWbemPath_RemoveAllNamespaces(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); hr = IWbemPath_RemoveAllNamespaces( path ); ok( hr == S_OK, "got %08x\n", hr ); @@ -703,7 +703,7 @@ static void test_IWbemPath_RemoveAllNamespaces(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); buf[0] = 0; len = sizeof(buf) / sizeof(buf[0]); @@ -738,7 +738,7 @@ static void test_IWbemPath_RemoveNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); @@ -752,7 +752,7 @@ static void test_IWbemPath_RemoveNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); @@ -773,7 +773,7 @@ static void test_IWbemPath_RemoveNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); @@ -822,7 +822,7 @@ static void test_IWbemPath_SetNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); buf[0] = 0; len = sizeof(buf) / sizeof(buf[0]); @@ -838,7 +838,7 @@ static void test_IWbemPath_SetNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count );

6 years, 11 months

[reactos] 01/01: [UXTHEME_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddb53a4bab405ad85cbb9… commit ddb53a4bab405ad85cbb91ec4378d924d2663949 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 21 14:01:30 2017 +0100 [UXTHEME_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/uxtheme/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/winetests/uxtheme/system.c b/modules/rostests/winetests/uxtheme/system.c index 44730a32d2..d52927935d 100644 --- a/modules/rostests/winetests/uxtheme/system.c +++ b/modules/rostests/winetests/uxtheme/system.c @@ -691,7 +691,7 @@ todo_wine hr = pGetBufferedPaintBits(NULL, &bits, &row); ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); ok(row == 10, "Unexpected row count %d\n", row); - ok(bits == (void *)0xdeadbeef, "Unepexpected data pointer %p\n", bits); + ok(bits == (void *)0xdeadbeef, "Unexpected data pointer %p\n", bits); hr = pGetBufferedPaintBits(NULL, NULL, NULL); ok(hr == E_POINTER, "Unexpected return code %#x\n", hr);

6 years, 11 months

[reactos] 01/01: [SHLWAPI_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a90aee56c1610894150e… commit 7a90aee56c1610894150ecd6d7cc31318e562ce9 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 21 14:00:13 2017 +0100 [SHLWAPI_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/shlwapi/CMakeLists.txt | 4 +++- modules/rostests/winetests/shlwapi/string.c | 28 +++++++++++------------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/modules/rostests/winetests/shlwapi/CMakeLists.txt b/modules/rostests/winetests/shlwapi/CMakeLists.txt index 4d32cb308c..dfd73e607c 100644 --- a/modules/rostests/winetests/shlwapi/CMakeLists.txt +++ b/modules/rostests/winetests/shlwapi/CMakeLists.txt @@ -1,5 +1,7 @@ -add_definitions(-DUSE_WINE_TODOS) +add_definitions( + -DUSE_WINE_TODOS + -DWINETEST_USE_DBGSTR_LONGLONG) list(APPEND SOURCE assoc.c diff --git a/modules/rostests/winetests/shlwapi/string.c b/modules/rostests/winetests/shlwapi/string.c index 7bd30fc790..1d8a6af1be 100755 --- a/modules/rostests/winetests/shlwapi/string.c +++ b/modules/rostests/winetests/shlwapi/string.c @@ -575,8 +575,8 @@ static void test_StrToInt64ExA(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n", - result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%s)\n", + result->string, wine_dbgstr_longlong(return_val)); result++; } @@ -588,8 +588,8 @@ static void test_StrToInt64ExA(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n", - result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%s)\n", + result->string, wine_dbgstr_longlong(return_val)); result++; } } @@ -615,8 +615,8 @@ static void test_StrToInt64ExW(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n", - result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%s)\n", + result->string, wine_dbgstr_longlong(return_val)); result++; } @@ -629,8 +629,8 @@ static void test_StrToInt64ExW(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n", - result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%s)\n", + result->string, wine_dbgstr_longlong(return_val)); result++; } } @@ -677,8 +677,8 @@ static void test_StrFormatByteSize64A(void) pStrFormatByteSize64A(result->value, szBuff, 256); ok(!strcmp(result->byte_size_64, szBuff), - "Formatted %x%08x wrong: got %s, expected %s\n", - (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->byte_size_64); + "Formatted %s wrong: got %s, expected %s\n", + wine_dbgstr_longlong(result->value), szBuff, result->byte_size_64); result++; } @@ -701,8 +701,8 @@ static void test_StrFormatKBSizeW(void) pStrFormatKBSizeW(result->value, szBuffW, 256); WideCharToMultiByte(CP_ACP,0,szBuffW,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR),NULL,NULL); - ok(!strcmp(result->kb_size, szBuff), "Formatted %x%08x wrong: got %s, expected %s\n", - (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size); + ok(!strcmp(result->kb_size, szBuff), "Formatted %s wrong: got %s, expected %s\n", + wine_dbgstr_longlong(result->value), szBuff, result->kb_size); result++; } } @@ -726,8 +726,8 @@ static void test_StrFormatKBSizeA(void) * and does not correctly handle extremely large values. */ ok(!strcmp(result->kb_size, szBuff) || (result->kb_size_broken && !strcmp(result->kb_size2, szBuff)), - "Formatted %x%08x wrong: got %s, expected %s\n", - (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size); + "Formatted %s wrong: got %s, expected %s\n", + wine_dbgstr_longlong(result->value), szBuff, result->kb_size); result++; } }

6 years, 11 months

[reactos] 01/01: [QMGR_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=684625e49fdc5edb8a881… commit 684625e49fdc5edb8a8818205d903d3109813660 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 21 13:33:33 2017 +0100 [QMGR_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/qmgr/CMakeLists.txt | 2 ++ modules/rostests/winetests/qmgr/file.c | 8 ++++---- modules/rostests/winetests/qmgr/job.c | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/rostests/winetests/qmgr/CMakeLists.txt b/modules/rostests/winetests/qmgr/CMakeLists.txt index f2d2aa7ef4..a3681e9fac 100644 --- a/modules/rostests/winetests/qmgr/CMakeLists.txt +++ b/modules/rostests/winetests/qmgr/CMakeLists.txt @@ -1,4 +1,6 @@ +add_definitions(-DWINETEST_USE_DBGSTR_LONGLONG) + list(APPEND SOURCE enum_files.c enum_jobs.c diff --git a/modules/rostests/winetests/qmgr/file.c b/modules/rostests/winetests/qmgr/file.c index 61d77225d1..3cee4bdc8c 100644 --- a/modules/rostests/winetests/qmgr/file.c +++ b/modules/rostests/winetests/qmgr/file.c @@ -185,10 +185,10 @@ static void test_GetProgress_PreTransfer(void) hres = IBackgroundCopyFile_GetProgress(test_file, &progress); ok(hres == S_OK, "GetProgress failed: %08x\n", hres); - ok(progress.BytesTotal == BG_SIZE_UNKNOWN, "Got incorrect total size: %x%08x\n", - (DWORD)(progress.BytesTotal >> 32), (DWORD)progress.BytesTotal); - ok(progress.BytesTransferred == 0, "Got incorrect number of transferred bytes: %x%08x\n", - (DWORD)(progress.BytesTransferred >> 32), (DWORD)progress.BytesTransferred); + ok(progress.BytesTotal == BG_SIZE_UNKNOWN, "Got incorrect total size: %s\n", + wine_dbgstr_longlong(progress.BytesTotal)); + ok(progress.BytesTransferred == 0, "Got incorrect number of transferred bytes: %s\n", + wine_dbgstr_longlong(progress.BytesTransferred)); ok(progress.Completed == FALSE, "Got incorrect completion status\n"); } diff --git a/modules/rostests/winetests/qmgr/job.c b/modules/rostests/winetests/qmgr/job.c index 012ae1cf4b..3ed3425a5d 100644 --- a/modules/rostests/winetests/qmgr/job.c +++ b/modules/rostests/winetests/qmgr/job.c @@ -266,10 +266,10 @@ static void test_GetProgress_preTransfer(void) hres = IBackgroundCopyJob_GetProgress(test_job, &progress); ok(hres == S_OK, "GetProgress failed: 0x%08x\n", hres); - ok(progress.BytesTotal == 0, "Incorrect BytesTotal: %x%08x\n", - (DWORD)(progress.BytesTotal >> 32), (DWORD)progress.BytesTotal); - ok(progress.BytesTransferred == 0, "Incorrect BytesTransferred: %x%08x\n", - (DWORD)(progress.BytesTransferred >> 32), (DWORD)progress.BytesTransferred); + ok(progress.BytesTotal == 0, "Incorrect BytesTotal: %s\n", + wine_dbgstr_longlong(progress.BytesTotal)); + ok(progress.BytesTransferred == 0, "Incorrect BytesTransferred: %s\n", + wine_dbgstr_longlong(progress.BytesTransferred)); ok(progress.FilesTotal == 0, "Incorrect FilesTotal: %u\n", progress.FilesTotal); ok(progress.FilesTransferred == 0, "Incorrect FilesTransferred %u\n", progress.FilesTransferred); }

6 years, 11 months

[reactos] 01/01: [PDH_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f9927dddcba9deb08083… commit 2f9927dddcba9deb08083be8340a800a5ab385c5 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 21 13:22:17 2017 +0100 [PDH_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/pdh/CMakeLists.txt | 1 + modules/rostests/winetests/pdh/pdh.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/rostests/winetests/pdh/CMakeLists.txt b/modules/rostests/winetests/pdh/CMakeLists.txt index 5fe1bbd003..6e29a26a6b 100644 --- a/modules/rostests/winetests/pdh/CMakeLists.txt +++ b/modules/rostests/winetests/pdh/CMakeLists.txt @@ -1,4 +1,5 @@ +add_definitions(-DWINETEST_USE_DBGSTR_LONGLONG) add_executable(pdh_winetest pdh.c testlist.c) set_module_type(pdh_winetest win32cui) add_importlibs(pdh_winetest pdh msvcrt kernel32) diff --git a/modules/rostests/winetests/pdh/pdh.c b/modules/rostests/winetests/pdh/pdh.c index f492d5a599..573bcc3a10 100644 --- a/modules/rostests/winetests/pdh/pdh.c +++ b/modules/rostests/winetests/pdh/pdh.c @@ -854,7 +854,7 @@ static void test_PdhCollectQueryDataEx(void) status = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE, NULL, &value ); ok(status == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08x\n", status); - trace( "uptime %x%08x\n", (DWORD)(U(value).largeValue >> 32), (DWORD)U(value).largeValue ); + trace( "uptime %s\n", wine_dbgstr_longlong(U(value).largeValue) ); } }

6 years, 11 months

[reactos] 01/01: [ODBCCP32_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c2597df715a119f54e29… commit 6c2597df715a119f54e29cc92c6892b6ba510c28 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 21 13:15:39 2017 +0100 [ODBCCP32_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/odbccp32/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/winetests/odbccp32/misc.c b/modules/rostests/winetests/odbccp32/misc.c index 8e119e02cb..4a72ad038b 100644 --- a/modules/rostests/winetests/odbccp32/misc.c +++ b/modules/rostests/winetests/odbccp32/misc.c @@ -530,7 +530,7 @@ if (0) /* Crashes on XP. */ ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); } -void test_SQLInstallTranslatorEx(void) +static void test_SQLInstallTranslatorEx(void) { char path[MAX_PATH]; char syspath[MAX_PATH];

6 years, 11 months

[reactos] 01/01: [MOUNTMGR] Don't attempt to free random address on failure CID 515354

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7601011f4ed578ae4a15a… commit 7601011f4ed578ae4a15a55298ebbe96fe3a1129 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 21 14:13:44 2017 +0200 [MOUNTMGR] Don't attempt to free random address on failure CID 515354 --- drivers/filters/mountmgr/point.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/point.c b/drivers/filters/mountmgr/point.c index b65c22cab7..d9a468f32c 100644 --- a/drivers/filters/mountmgr/point.c +++ b/drivers/filters/mountmgr/point.c @@ -322,7 +322,7 @@ QueryPointsFromMemory(IN PDEVICE_EXTENSION DeviceExtension, { if (DeviceEntry == &(DeviceExtension->DeviceListHead)) { - if (DeviceName.Buffer) + if (SymbolicName) { FreePool(DeviceName.Buffer); }

6 years, 11 months

[reactos] 01/01: [MSXML3_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a06e69a1184bae342c34… commit 3a06e69a1184bae342c343c04cb4b6fc28ce7b2a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 21 13:14:13 2017 +0100 [MSXML3_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/msxml3/CMakeLists.txt | 4 +++- modules/rostests/winetests/msxml3/schema.c | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/rostests/winetests/msxml3/CMakeLists.txt b/modules/rostests/winetests/msxml3/CMakeLists.txt index 20b23b9666..7fee075ca8 100644 --- a/modules/rostests/winetests/msxml3/CMakeLists.txt +++ b/modules/rostests/winetests/msxml3/CMakeLists.txt @@ -1,5 +1,7 @@ -add_definitions(-DUSE_WINE_TODOS) +add_definitions( + -DUSE_WINE_TODOS + -DWINETEST_USE_DBGSTR_LONGLONG) list(APPEND SOURCE domdoc.c diff --git a/modules/rostests/winetests/msxml3/schema.c b/modules/rostests/winetests/msxml3/schema.c index d108d6257b..9c785fd05d 100644 --- a/modules/rostests/winetests/msxml3/schema.c +++ b/modules/rostests/winetests/msxml3/schema.c @@ -440,9 +440,8 @@ static const CHAR szOpenSeqXML4[] = "<test><x/><x/><y/><z/><z/><v/></test>"; #define _expect64(expr, str, base, TYPE, CONV) { \ TYPE v1 = expr; \ TYPE v2 = CONV(str, NULL, base); \ - ok(v1 == v2, #expr "returned 0x%08x%08x, expected 0x%08x%08x\n", \ - (ULONG)((ULONG64)v1 >> 32), (ULONG)((ULONG64)v2 & (ULONG64)0xffffffff), \ - (ULONG)((ULONG64)v1 >> 32), (ULONG)((ULONG64)v2 & (ULONG64)0xffffffff)); \ + ok(v1 == v2, #expr "returned %s, expected %s\n", \ + wine_dbgstr_longlong(v1), wine_dbgstr_longlong(v2)); \ } #define expect_int64(expr, x, base) _expect64(expr, #x, base, LONG64, _strtoi64)

6 years, 11 months

[reactos] 01/01: [MPR_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=959d60f54a1dc9259d8c0… commit 959d60f54a1dc9259d8c0d4fef396795c351e2af Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 21 13:11:27 2017 +0100 [MPR_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/mpr/mpr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/rostests/winetests/mpr/mpr.c b/modules/rostests/winetests/mpr/mpr.c index c8ca2445cb..19097b8a28 100644 --- a/modules/rostests/winetests/mpr/mpr.c +++ b/modules/rostests/winetests/mpr/mpr.c @@ -125,8 +125,7 @@ static void test_WNetGetRemoteName(void) ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, NULL, &info_size); - if(((GetVersion() & 0x8000ffff) == 0x00000004) || /* NT40 */ - (drive_type == DRIVE_REMOTE)) + if(drive_type == DRIVE_REMOTE) todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); else

6 years, 11 months

[reactos] 01/01: [MSI] Apply Wine commit fdac39f by Hans Leidekker: Pass correct length to GetDateFormatW. CORE-13902

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fec16ab0c05c765bf6ca6… commit fec16ab0c05c765bf6ca600af96c07895719bd91 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Oct 20 18:40:15 2017 +0100 [MSI] Apply Wine commit fdac39f by Hans Leidekker: Pass correct length to GetDateFormatW. CORE-13902 --- dll/win32/msi/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index e2c383499c..3e0ae717f0 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -2289,7 +2289,7 @@ static MSIRECORD *msi_get_property_row( MSIDATABASE *db, LPCWSTR name ) if (!length) return NULL; buffer = msi_alloc(length * sizeof(WCHAR)); - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, buffer, sizeof(WCHAR)); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, buffer, length); row = MSI_CreateRecord(1); if (!row) @@ -2304,7 +2304,7 @@ static MSIRECORD *msi_get_property_row( MSIDATABASE *db, LPCWSTR name ) if (!length) return NULL; buffer = msi_alloc(length * sizeof(WCHAR)); - GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOTIMEMARKER, NULL, NULL, buffer, sizeof(WCHAR)); + GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOTIMEMARKER, NULL, NULL, buffer, length); row = MSI_CreateRecord(1); if (!row)

6 years, 11 months

← Newer
1
...
8
9
10
11
12
13
14
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2017