May 2019 - Wine-Commits - list.winehq.org

Zhiyi Zhang : gdi32/tests: Add D3DKMTCreateDevice tests.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: c7e4e45761cada651aae70aa7265d76f12011e1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7e4e45761cada651aae70aa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:29 2019 +0100 gdi32/tests: Add D3DKMTCreateDevice tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 204ecb0..97b7ed7 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -34,6 +34,8 @@ static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); +static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); +static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); @@ -179,15 +181,65 @@ static void test_D3DKMTCloseAdapter(void) todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTCreateDevice(void) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CREATEDEVICE create_device_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + D3DKMT_DESTROYDEVICE destroy_device_desc; + NTSTATUS status; + + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTCreateDevice(NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&create_device_desc, 0, sizeof(create_device_desc)); + status = pD3DKMTCreateDevice(&create_device_desc); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + lstrcpyW(open_adapter_gdi_desc.DeviceName, display1W); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Create device */ + create_device_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCreateDevice(&create_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + ok(create_device_desc.hDevice, "Expect not null.\n"); + ok(create_device_desc.pCommandBuffer == NULL, "Expect null.\n"); + ok(create_device_desc.CommandBufferSize == 0, "Got wrong value %#x.\n", create_device_desc.CommandBufferSize); + ok(create_device_desc.pAllocationList == NULL, "Expect null.\n"); + ok(create_device_desc.AllocationListSize == 0, "Got wrong value %#x.\n", create_device_desc.AllocationListSize); + ok(create_device_desc.pPatchLocationList == NULL, "Expect null.\n"); + ok(create_device_desc.PatchLocationListSize == 0, "Got wrong value %#x.\n", create_device_desc.PatchLocationListSize); + + destroy_device_desc.hDevice = create_device_desc.hDevice; + status = pD3DKMTDestroyDevice(&destroy_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); + pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); + pD3DKMTDestroyDevice = (void *)GetProcAddress(gdi32, "D3DKMTDestroyDevice"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); test_D3DKMTOpenAdapterFromGdiDisplayName(); test_D3DKMTOpenAdapterFromHdc(); test_D3DKMTCloseAdapter(); + test_D3DKMTCreateDevice(); }

1 0

Alexandre Julliard : setupapi/tests: Avoid size_t in traces.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: d5b77f5a161d1bf4176cf956e46ddf13139c897a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5b77f5a161d1bf4176cf956… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 11:24:29 2019 +0200 setupapi/tests: Avoid size_t in traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 7e59770..ce72a5d 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -265,14 +265,14 @@ static void test_SetupCopyOEMInf(void) ok(file_exists(path), "Expected source inf to exist\n"); ok(file_exists(orig_dest), "Expected dest inf to exist\n"); ok(!strcmp(dest, "aaa"), "Expected dest to be unchanged\n"); - ok(size == strlen(orig_dest) + 1, "Expected size %d, got %d.\n", strlen(orig_dest) + 1, size); + ok(size == strlen(orig_dest) + 1, "Got %d.\n", size); SetLastError(0xdeadbeef); res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), &size, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); - ok(size == strlen(dest) + 1, "Expected size %d, got %d.\n", strlen(dest) + 1, size); + ok(size == strlen(dest) + 1, "Got %d.\n", size); test_original_file_name(strrchr(path, '\\') + 1, dest);

1 0

Alexandre Julliard : make_unicode: Remove duplicate DECLSPEC_HIDDEN.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: c52b2f128472b704b9e799f2626370c09258e689 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c52b2f128472b704b9e799f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 10:13:29 2019 +0200 make_unicode: Remove duplicate DECLSPEC_HIDDEN. Spotted by Matteo Bruni. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/direction.c | 2 +- dlls/gdi32/direction.c | 2 +- dlls/kernel32/wctype.c | 2 +- dlls/usp10/direction.c | 2 +- tools/make_unicode | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/direction.c b/dlls/dwrite/direction.c index 6adbb73..aafd342 100644 --- a/dlls/dwrite/direction.c +++ b/dlls/dwrite/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN bidi_direction_table[4512] = +const unsigned short DECLSPEC_HIDDEN bidi_direction_table[4512] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, diff --git a/dlls/gdi32/direction.c b/dlls/gdi32/direction.c index 6adbb73..aafd342 100644 --- a/dlls/gdi32/direction.c +++ b/dlls/gdi32/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN bidi_direction_table[4512] = +const unsigned short DECLSPEC_HIDDEN bidi_direction_table[4512] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, diff --git a/dlls/kernel32/wctype.c b/dlls/kernel32/wctype.c index f335fac..cf25ccc 100644 --- a/dlls/kernel32/wctype.c +++ b/dlls/kernel32/wctype.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN wctype_table[7664] = +const unsigned short DECLSPEC_HIDDEN wctype_table[7664] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, diff --git a/dlls/usp10/direction.c b/dlls/usp10/direction.c index 6adbb73..aafd342 100644 --- a/dlls/usp10/direction.c +++ b/dlls/usp10/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN bidi_direction_table[4512] = +const unsigned short DECLSPEC_HIDDEN bidi_direction_table[4512] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, diff --git a/tools/make_unicode b/tools/make_unicode index adf8c0f..4b79668 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2251,7 +2251,7 @@ sub dump_string_type_table($) $table[$i] |= $c2_types{$direction_table[$i]} << 12 if defined $direction_table[$i]; } - dump_two_level_mapping( "DECLSPEC_HIDDEN wctype_table", 0, @table ); + dump_two_level_mapping( "wctype_table", 0, @table ); close OUTPUT; save_file($filename); @@ -2276,8 +2276,7 @@ sub dump_bidi_dir_table($) $table[$i] = $bidi_types{$direction_table[$i]} if defined $direction_table[$i]; } - dump_two_level_mapping( "DECLSPEC_HIDDEN bidi_direction_table", - $bidi_types{"L"}, @table ); + dump_two_level_mapping( "bidi_direction_table", $bidi_types{"L"}, @table ); close OUTPUT; save_file($filename);

1 0

Zebediah Figura : setupapi: Fix error handling in SetupInstallServicesFromInfSection().
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 6b2b6cde8bbd18ab1645cbf31435eb7a8ceec91e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2b6cde8bbd18ab1645cbf3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 18:00:48 2019 -0500 setupapi: Fix error handling in SetupInstallServicesFromInfSection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 40 +++++++++++++++++++++------------------- dlls/setupapi/tests/install.c | 14 ++++++++++++++ 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 6a3213c..dae0bc1 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1458,36 +1458,38 @@ BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR section, DWOR SC_HANDLE scm; INFCONTEXT context; INT section_flags; - BOOL ok, ret = TRUE; + BOOL ret = TRUE; - if (!(ok = SetupFindFirstLineW( hinf, section, NULL, &context ))) + if (!SetupFindFirstLineW( hinf, section, NULL, &context )) { SetLastError( ERROR_SECTION_NOT_FOUND ); return FALSE; } if (!(scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ))) return FALSE; - ok = SetupFindFirstLineW( hinf, section, AddService, &context ); - while (ok) + if (SetupFindFirstLineW( hinf, section, AddService, &context )) { - if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) - continue; - if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0; - if (!SetupGetStringFieldW( &context, 3, service_section, MAX_INF_STRING_LENGTH, NULL )) - continue; - if (!(ret = add_service( scm, hinf, service_name, service_section, section_flags | flags ))) - goto done; - ok = SetupFindNextMatchLineW( &context, AddService, &context ); + do + { + if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) + continue; + if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0; + if (!SetupGetStringFieldW( &context, 3, service_section, MAX_INF_STRING_LENGTH, NULL )) + continue; + if (!(ret = add_service( scm, hinf, service_name, service_section, section_flags | flags ))) + goto done; + } while (SetupFindNextMatchLineW( &context, AddService, &context )); } - ok = SetupFindFirstLineW( hinf, section, DelService, &context ); - while (ok) + if (SetupFindFirstLineW( hinf, section, DelService, &context )) { - if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) - continue; - if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0; - if (!(ret = del_service( scm, hinf, service_name, section_flags | flags ))) goto done; - ok = SetupFindNextMatchLineW( &context, AddService, &context ); + do + { + if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) + continue; + if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0; + if (!(ret = del_service( scm, hinf, service_name, section_flags | flags ))) goto done; + } while (SetupFindNextMatchLineW( &context, AddService, &context )); } if (ret) SetLastError( ERROR_SUCCESS ); done: diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index a0a4596..f9e5592 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -574,6 +574,20 @@ static void test_install_svc_from(void) SetupCloseInfFile(infhandle); DeleteFileA(inffile); + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + strcat(inf, "[Winetest.Services]\n"); + strcat(inf, "AddService=,2\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + /* TODO: Test the Flags */ }

1 0

Nikolay Sivov : kernelbase: Add SHLoadIndirectString().
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: d361fa79a1888d252b7b2840a66e040205454d22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d361fa79a1888d252b7b2840… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 16:05:02 2019 +0300 kernelbase: Add SHLoadIndirectString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/string.c | 48 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7f48169..b721d8f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1354,7 +1354,7 @@ # @ stub SHCoCreateInstance @ stdcall SHExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA @ stdcall SHExpandEnvironmentStringsW(wstr ptr long) kernel32.ExpandEnvironmentStringsW -@ stdcall SHLoadIndirectString(wstr ptr long ptr) shlwapi.SHLoadIndirectString +@ stdcall SHLoadIndirectString(wstr ptr long ptr) # @ stub SHLoadIndirectStringInternal @ stdcall SHRegCloseUSKey(ptr) shlwapi.SHRegCloseUSKey @ stdcall SHRegCreateUSKeyA(str long long ptr long) shlwapi.SHRegCreateUSKeyA diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 4c18acf..bd495bd 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -1426,3 +1426,51 @@ DWORD WINAPI SHTruncateString(char *str, DWORD size) return size; } + +HRESULT WINAPI SHLoadIndirectString(const WCHAR *src, WCHAR *dst, UINT dst_len, void **reserved) +{ + WCHAR *dllname = NULL; + HMODULE hmod = NULL; + HRESULT hr = E_FAIL; + + TRACE("%s, %p, %#x, %p\n", debugstr_w(src), dst, dst_len, reserved); + + if (src[0] == '@') + { + WCHAR *index_str; + int index; + + dst[0] = 0; + dllname = StrDupW(src + 1); + index_str = strchrW(dllname, ','); + + if(!index_str) goto end; + + *index_str = 0; + index_str++; + index = atoiW(index_str); + + hmod = LoadLibraryW(dllname); + if (!hmod) goto end; + + if (index < 0) + { + if (LoadStringW(hmod, -index, dst, dst_len)) + hr = S_OK; + } + else + FIXME("can't handle non-negative indices (%d)\n", index); + } + else + { + if (dst != src) + lstrcpynW(dst, src, dst_len); + hr = S_OK; + } + + TRACE("returning %s\n", debugstr_w(dst)); +end: + if (hmod) FreeLibrary(hmod); + LocalFree(dllname); + return hr; +}

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTSetVidPnSourceOwner tests.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: bf3e32b5b0a604041a5b9d31267a5b7de96db6f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf3e32b5b0a604041a5b9d31… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:32 2019 +0100 gdi32/tests: Add D3DKMTSetVidPnSourceOwner tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index ef9a7ae..d8ae0f8 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -590,6 +590,22 @@ static void test_D3DKMTCheckVidPnExclusiveOwnership(void) ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTSetVidPnSourceOwner(void) +{ + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc = {0}; + NTSTATUS status; + + if (!pD3DKMTSetVidPnSourceOwner || pD3DKMTSetVidPnSourceOwner(&set_owner_desc) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -608,4 +624,5 @@ START_TEST(driver) test_D3DKMTCreateDevice(); test_D3DKMTDestroyDevice(); test_D3DKMTCheckVidPnExclusiveOwnership(); + test_D3DKMTSetVidPnSourceOwner(); }

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTCloseAdapter tests.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 5fdf401fc1593fa296d3386ff23e02793007bc2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fdf401fc1593fa296d3386f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:28 2019 +0100 gdi32/tests: Add D3DKMTCloseAdapter tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 30b0207..204ecb0 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -159,6 +159,26 @@ static void test_D3DKMTOpenAdapterFromHdc(void) } } +static void test_D3DKMTCloseAdapter(void) +{ + D3DKMT_CLOSEADAPTER close_adapter_desc; + NTSTATUS status; + + if (!pD3DKMTCloseAdapter || pD3DKMTCloseAdapter(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + win_skip("D3DKMTCloseAdapter() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTCloseAdapter(NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&close_adapter_desc, 0, sizeof(close_adapter_desc)); + status = pD3DKMTCloseAdapter(&close_adapter_desc); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -169,4 +189,5 @@ START_TEST(driver) test_D3DKMTOpenAdapterFromGdiDisplayName(); test_D3DKMTOpenAdapterFromHdc(); + test_D3DKMTCloseAdapter(); }

1 0

Zebediah Figura : setupapi: Always fill output parameters in SetupCopyOEMInfA().
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 56aab6aaf83098115014512e0a6a5ab7e78bbef3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56aab6aaf83098115014512e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 18:00:47 2019 -0500 setupapi: Always fill output parameters in SetupCopyOEMInfA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/misc.c | 12 +++--------- dlls/setupapi/tests/misc.c | 1 - 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 7298ac6..67e2eaf 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -851,12 +851,9 @@ BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location, if (source && !(sourceW = strdupAtoW( source ))) goto done; if (location && !(locationW = strdupAtoW( location ))) goto done; - if (!(ret = SetupCopyOEMInfW( sourceW, locationW, media_type, style, destW, - buffer_size, &size, NULL ))) - { - if (required_size) *required_size = size; - goto done; - } + ret = SetupCopyOEMInfW( sourceW, locationW, media_type, style, destW, buffer_size, &size, NULL ); + + if (required_size) *required_size = size; if (dest) { @@ -866,10 +863,7 @@ BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location, if (component) *component = strrchr( dest, '\\' ) + 1; } else - { SetLastError( ERROR_INSUFFICIENT_BUFFER ); - goto done; - } } done: diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index e2dd12f..7e59770 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -246,7 +246,6 @@ static void test_SetupCopyOEMInf(void) ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %d\n", GetLastError()); -todo_wine ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : ucrtbase: Move the vsnprintf() wrapper function to the ucrtbase import library.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 030a460934054808d66dab74547d4b150ce01169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=030a460934054808d66dab74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 12:20:42 2019 +0200 ucrtbase: Move the vsnprintf() wrapper function to the ucrtbase import library. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47250 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp90.h | 6 ------ dlls/msvcp90/msvcp_main.c | 10 ++-------- dlls/msvcrt/wcs.c | 4 ++-- dlls/ucrtbase/Makefile.in | 1 + dlls/ucrtbase/printf.c | 34 ++++++++++++++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 40 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 77c96e3..2e3d071 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -662,9 +662,3 @@ static inline int mbstowcs_wrapper( size_t *ret, wchar_t *wcs, size_t size, cons #endif void free_misc(void); - -#if _MSVCP_VER >= 140 -#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) -int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, const char *format, - _locale_t locale, __ms_va_list valist); -#endif diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 6d78ce3..52f25a9 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -120,7 +120,7 @@ int WINAPIV _scprintf(const char* fmt, ...) int ret; __ms_va_list valist; __ms_va_start(valist, fmt); - ret = __stdio_common_vsprintf(UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, fmt, NULL, valist); + ret = _vsnprintf(NULL, 0, fmt, valist); __ms_va_end(valist); return ret; } @@ -130,16 +130,10 @@ int WINAPIV sprintf(char *buf, const char *fmt, ...) int ret; __ms_va_list valist; __ms_va_start(valist, fmt); - ret = __stdio_common_vsprintf(UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buf, -1, fmt, NULL, valist); + ret = _vsnprintf(buf, -1, fmt, valist); __ms_va_end(valist); return ret; } - -int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args ) -{ - return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, - buf, size, fmt, NULL, args ); -} #endif static void init_cxx_funcs(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 2a75030..e62ac25 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -796,8 +796,8 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) /********************************************************************* * __stdio_common_vsprintf (UCRTBASE.@) */ -int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, - MSVCRT__locale_t locale, __ms_va_list valist ) +int CDECL __stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) { static const char nullbyte = '\0'; struct _str_ctx_a ctx = {len, str}; diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index 23d8292..63fcc9b 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -26,6 +26,7 @@ C_SRCS = \ math.c \ mbcs.c \ misc.c \ + printf.c \ process.c \ scanf.c \ string.c \ diff --git a/dlls/ucrtbase/printf.c b/dlls/ucrtbase/printf.c new file mode 100644 index 0000000..8f58e6c --- /dev/null +++ b/dlls/ucrtbase/printf.c @@ -0,0 +1,34 @@ +/* + * Copyright 2019 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* this function is part of the import lib */ +#if 0 +#pragma makedep implib +#endif + +#include <stdarg.h> +#include "msvcrt.h" + +int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, MSVCRT_size_t len, + const char *format, MSVCRT__locale_t locale, __ms_va_list valist); + +int __cdecl _vsnprintf( char *buf, MSVCRT_size_t size, const char *fmt, __ms_va_list args ) +{ + return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, + buf, size, fmt, NULL, args ); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c64fee2..441ef70 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -156,7 +156,7 @@ @ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s -@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf +@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) @ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf

1 0

Akihiro Sagawa : advapi32: Factor out load_mui_string().
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: ed165737957df146d8dabc274d6c4c58fe0fc275 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed165737957df146d8dabc27… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 24 22:32:31 2019 +0900 advapi32: Factor out load_mui_string(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 81 ++++++++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 30 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 7cf9ed1..b779def 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3112,7 +3112,7 @@ LSTATUS WINAPI RegOpenUserClassesRoot( * avoid importing user32, which is higher level than advapi32. Helper for * RegLoadMUIString. */ -static LONG load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars, UINT *reqChars) +static INT load_string(HINSTANCE hModule, UINT resId, LPWSTR *pResString) { HGLOBAL hMemory; HRSRC hResource; @@ -3125,27 +3125,61 @@ static LONG load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cM /* Load the resource into memory and get a pointer to it. */ hResource = FindResourceW(hModule, MAKEINTRESOURCEW(LOWORD(resId >> 4) + 1), (LPWSTR)RT_STRING); - if (!hResource) return ERROR_FILE_NOT_FOUND; + if (!hResource) return 0; hMemory = LoadResource(hModule, hResource); - if (!hMemory) return ERROR_FILE_NOT_FOUND; + if (!hMemory) return 0; pString = LockResource(hMemory); /* Strings are length-prefixed. Lowest nibble of resId is an index. */ idxString = resId & 0xf; while (idxString--) pString += *pString + 1; - *reqChars = *pString + 1; - /* If no buffer is given, return here. */ - if (!pwszBuffer) return ERROR_MORE_DATA; + *pResString = pString + 1; + return *pString; +} + +static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, INT max_chars, INT *req_chars) +{ + HMODULE hModule = NULL; + WCHAR *string; + int size; + LONG result; + + /* Verify the file existence. i.e. We don't rely on PATH variable */ + if (GetFileAttributesW(file_name) == INVALID_FILE_ATTRIBUTES) + return ERROR_FILE_NOT_FOUND; + + /* Load the file */ + hModule = LoadLibraryExW(file_name, NULL, + LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); + if (!hModule) + return ERROR_BADKEY; + + size = load_string(hModule, res_id, &string); + if (!size) { + result = ERROR_FILE_NOT_FOUND; + goto cleanup; + } + *req_chars = size + 1; + + /* If no buffer is given, skip copying. */ + if (!buffer) { + result = ERROR_MORE_DATA; + goto cleanup; + } /* Else copy over the string, respecting the buffer size. */ - cMaxChars = (*pString < cMaxChars) ? *pString : (cMaxChars - 1); - if (cMaxChars >= 0) { - memcpy(pwszBuffer, pString+1, cMaxChars * sizeof(WCHAR)); - pwszBuffer[cMaxChars] = '\0'; + max_chars = (size < max_chars) ? size : (max_chars - 1); + if (max_chars >= 0) { + memcpy(buffer, string, max_chars * sizeof(WCHAR)); + buffer[max_chars] = '\0'; } - return ERROR_SUCCESS; + result = ERROR_SUCCESS; + +cleanup: + if (hModule) FreeLibrary(hModule); + return result; } /****************************************************************************** @@ -3229,7 +3263,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer const WCHAR backslashW[] = {'\\',0}; UINT uiStringId; DWORD baseDirLen; - HMODULE hModule; + int reqChars; /* Format of the expanded value is 'path_to_dll,-resId' */ if (!pComma || pComma[1] != '-') { @@ -3257,24 +3291,11 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer } strcatW(pwszTempBuffer, pwszExpandedBuffer + 1); - /* Verify the file existence. i.e. We don't rely on PATH variable */ - if (GetFileAttributesW(pwszTempBuffer) == INVALID_FILE_ATTRIBUTES) { - result = ERROR_FILE_NOT_FOUND; - goto cleanup; - } - - /* Load the file */ - hModule = LoadLibraryExW(pwszTempBuffer, NULL, - LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); - if (hModule) { - DWORD reqChars; - result = load_string(hModule, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR), &reqChars); - if (pcbData && (result == ERROR_SUCCESS || result == ERROR_MORE_DATA)) - *pcbData = reqChars * sizeof(WCHAR); - FreeLibrary(hModule); - } - else - result = ERROR_BADKEY; + /* Load specified string from the file */ + reqChars = 0; + result = load_mui_string(pwszTempBuffer, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR), &reqChars); + if (pcbData && (result == ERROR_SUCCESS || result == ERROR_MORE_DATA)) + *pcbData = reqChars * sizeof(WCHAR); } cleanup:

1 0