wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Akihiro Sagawa : kernel32: Add traces to time zone functions.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 4ef37887d62e29e9ce16aa2067eef1eabc85cc29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ef37887d62e29e9ce16aa20… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 24 22:32:27 2019 +0900 kernel32: Add traces to time zone functions. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 3affb72..00fcc6b 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -610,6 +610,7 @@ DWORD WINAPI GetTimeZoneInformation( LPTIME_ZONE_INFORMATION ret ) DYNAMIC_TIME_ZONE_INFORMATION tzinfo; DWORD time_zone_id; + TRACE("(%p)\n", ret); time_zone_id = GetDynamicTimeZoneInformation( &tzinfo ); memcpy( ret, &tzinfo, sizeof(*ret) ); return time_zone_id; @@ -623,6 +624,7 @@ BOOL WINAPI GetTimeZoneInformationForYear( USHORT wYear, { DYNAMIC_TIME_ZONE_INFORMATION local_dtzi, result; + TRACE("(%u,%p)\n", wYear, ptzi); if (!pdtzi) { if (GetDynamicTimeZoneInformation(&local_dtzi) == TIME_ZONE_ID_INVALID) @@ -654,6 +656,8 @@ BOOL WINAPI GetTimeZoneInformationForYear( USHORT wYear, BOOL WINAPI SetTimeZoneInformation( const TIME_ZONE_INFORMATION *tzinfo ) { NTSTATUS status; + + TRACE("(%p)\n", tzinfo); status = RtlSetTimeZoneInformation( (const RTL_TIME_ZONE_INFORMATION *)tzinfo ); if ( status != STATUS_SUCCESS ) SetLastError( RtlNtStatusToDosError(status) ); @@ -1312,6 +1316,8 @@ VOID WINAPI GetSystemTime(LPSYSTEMTIME systime) BOOL WINAPI GetDaylightFlag(void) { TIME_ZONE_INFORMATION tzinfo; + + TRACE("()\n"); RtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); return (TIME_ZoneID(&tzinfo) == TIME_ZONE_ID_DAYLIGHT); } @@ -1462,6 +1468,7 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo NTSTATUS status; HANDLE time_zone_key; + TRACE("(%p)\n", tzinfo); status = RtlQueryDynamicTimeZoneInformation( (RTL_DYNAMIC_TIME_ZONE_INFORMATION*)tzinfo ); if ( status != STATUS_SUCCESS ) {

1 0

Alexandre Julliard : makefiles: Add install dependency for PE builtins.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 0fc2f6384eda4ff21fac6a5e9b41d76455a1de1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc2f6384eda4ff21fac6a5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 18:01:19 2019 +0200 makefiles: Add install dependency for PE builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 23b3389..2c5c503 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2406,6 +2406,7 @@ static void output_install_rules( struct makefile *make, enum install_rules rule const char *file = files.str[i]; switch (*files.str[i + 1]) { + case 'c': /* cross-compiled program */ case 'd': /* data file */ case 'p': /* program file */ case 's': /* script */

1 0

Nikolay Sivov : kernelbase: Add some registry helpers from shlwapi.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 110656072c127425f7e5e1733e4b006f7cb8beb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=110656072c127425f7e5e173… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 16:05:03 2019 +0300 kernelbase: Add some registry helpers from shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 38 ++-- dlls/kernelbase/registry.c | 477 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 497 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=110656072c127425f7e5…

1 0

Nikolay Sivov : kernelbase: Add SHLoadIndirectString().
by Alexandre Julliard 24 May '19

24 May '19

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

Nikolay Sivov : kernelbase: Add remaining URL functions.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 88ffcd5db4686bf9e285e384339ab48ac7c08604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88ffcd5db4686bf9e285e384… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 16:05:01 2019 +0300 kernelbase: Add remaining URL functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 12 +- dlls/kernelbase/path.c | 403 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 409 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=88ffcd5db4686bf9e285…

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTSetVidPnSourceOwner tests.
by Alexandre Julliard 24 May '19

24 May '19

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 D3DKMTCheckVidPnExclusiveOwnership tests.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: af7f3ecd3b03103a0a2f0002e2925af3a2ac93e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af7f3ecd3b03103a0a2f0002… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:31 2019 +0100 gdi32/tests: Add D3DKMTCheckVidPnExclusiveOwnership 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 | 345 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 345 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af7f3ecd3b03103a0a2f…

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTDestroyDevice tests.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 13f649fde5564ce9f40e6b31b6608165e04a1881 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13f649fde5564ce9f40e6b31… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:30 2019 +0100 gdi32/tests: Add D3DKMTDestroyDevice 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 97b7ed7..7d7fce3 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -228,6 +228,26 @@ static void test_D3DKMTCreateDevice(void) ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTDestroyDevice(void) +{ + D3DKMT_DESTROYDEVICE destroy_device_desc; + NTSTATUS status; + + if (!pD3DKMTDestroyDevice || pD3DKMTDestroyDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTDestroyDevice() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTDestroyDevice(NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&destroy_device_desc, 0, sizeof(destroy_device_desc)); + status = pD3DKMTDestroyDevice(&destroy_device_desc); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -242,4 +262,5 @@ START_TEST(driver) test_D3DKMTOpenAdapterFromHdc(); test_D3DKMTCloseAdapter(); test_D3DKMTCreateDevice(); + test_D3DKMTDestroyDevice(); }

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTCreateDevice tests.
by Alexandre Julliard 24 May '19

24 May '19

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

Zhiyi Zhang : gdi32/tests: Add D3DKMTCloseAdapter tests.
by Alexandre Julliard 24 May '19

24 May '19

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019