November 2019 - wine-commits

Francois Gouget : testbot/WineTest: Fix the build-only missions.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: tools Branch: master Commit: 0ff36f0c396fac8d88f28c6bf544c97c1d30d5c2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0ff36f0c396fac8d88f28c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 19 16:28:31 2019 +0100 testbot/WineTest: Fix the build-only missions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 9948e09..88f5e36 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -453,7 +453,7 @@ if ($Action eq "testpatch") } foreach my $Mission (@{$TaskMissions->{Missions}}) { - return 1 if ($Mission->{test} eq "build"); + next if ($Mission->{test} eq "build"); if ($Action eq "testexe") {

1 0

Philip Rebohle : tests: Add a test for image UAV clears.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: vkd3d Branch: master Commit: 736dd8203da423d2719640183e68d9e57a063186 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=736dd8203da423d27196401… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Wed Nov 20 00:23:59 2019 +0330 tests: Add a test for image UAV clears. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 278 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=736dd8203da423d2719…

1 0

Philip Rebohle : tests: Test more view formats in the UAV clear test.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: vkd3d Branch: master Commit: f7f6073436db464e9eacfc859406b296db81ae48 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f7f6073436db464e9eacfc8… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Wed Nov 20 00:23:58 2019 +0330 tests: Test more view formats in the UAV clear test. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 101 ++++++++++++++++++++++++++++++++++++----------- tests/d3d12_test_utils.h | 27 ++++++++----- 2 files changed, 94 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=f7f6073436db464e9ea…

1 0

Zhiyi Zhang : setupapi: Set device SPDRP_CLASS registry property in create_device().
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 288a6625ad0177e258a0db1da166d292ff420b1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=288a6625ad0177e258a0db1d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 18 17:29:44 2019 +0800 setupapi: Set device SPDRP_CLASS registry property in create_device(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 10 +++++++++- dlls/setupapi/tests/devinst.c | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 61ddade405..25d4040da0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -751,7 +751,9 @@ static struct device *create_device(struct DeviceInfoSet *set, { const DWORD one = 1; struct device *device; - WCHAR guidstr[39]; + WCHAR guidstr[MAX_GUID_STRING_LEN]; + WCHAR class_name[MAX_CLASS_NAME_LEN]; + DWORD size; TRACE("%p, %s, %s, %d\n", set, debugstr_guid(class), debugstr_w(instanceid), phantom); @@ -796,6 +798,12 @@ static struct device *create_device(struct DeviceInfoSet *set, SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASSGUID, (const BYTE *)guidstr, sizeof(guidstr)); + if (SetupDiClassNameFromGuidW(class, class_name, ARRAY_SIZE(class_name), NULL)) + { + size = (lstrlenW(class_name) + 1) * sizeof(WCHAR); + SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASS, (const BYTE *)class_name, size); + } + TRACE("Created new device %p.\n", device); return device; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2f81a3abf5..68478b5d80 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1643,8 +1643,8 @@ todo_wine { /* Have SPDRP_CLASS property */ memset(buf, 0, sizeof(buf)); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL); - todo_wine ok(ret, "Failed to get property, error %#x.\n", GetLastError()); - todo_wine ok(!lstrcmpA(buf, "Display"), "Got unexpected value %s.\n", buf); + ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + ok(!lstrcmpA(buf, "Display"), "Got unexpected value %s.\n", buf); SetupDiDestroyDeviceInfoList(set); } @@ -1803,8 +1803,8 @@ todo_wine { /* Have SPDRP_CLASS property */ memset(buf, 0, sizeof(buf)); ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL); - todo_wine ok(ret, "Failed to get property, error %#x.\n", GetLastError()); - todo_wine ok(!lstrcmpW(buf, L"Display"), "Got unexpected value %s.\n", wine_dbgstr_w(buf)); + ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + ok(!lstrcmpW(buf, L"Display"), "Got unexpected value %s.\n", wine_dbgstr_w(buf)); SetupDiDestroyDeviceInfoList(set); }

1 0

Zhiyi Zhang : wine.inf: Add display and monitor classes.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 014f61539bd82cad2e35db5b6f844b714f9b9406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=014f61539bd82cad2e35db5b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 18 17:29:28 2019 +0800 wine.inf: Add display and monitor classes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c0f6e0a391..19c034d7fd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -510,6 +510,10 @@ HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"Locale",0x1 [ControlClass] HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},,,"Disk drives" HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},"Class",,"DiskDrive" +HKLM,System\CurrentControlSet\Control\Class\{4d36e968-e325-11ce-bfc1-08002be10318},,,"Display adapters" +HKLM,System\CurrentControlSet\Control\Class\{4d36e968-e325-11ce-bfc1-08002be10318},"Class",,"Display" +HKLM,System\CurrentControlSet\Control\Class\{4d36e96e-e325-11ce-bfc1-08002be10318},,,"Monitors" +HKLM,System\CurrentControlSet\Control\Class\{4d36e96e-e325-11ce-bfc1-08002be10318},"Class",,"Monitor" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},,,"System devices"

1 0

Zhiyi Zhang : setupapi/tests: Add default device registry property tests.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 4fe3d7e220225ddd57ef0acd9142ef8437cdb9ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fe3d7e220225ddd57ef0acd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 18 17:29:14 2019 +0800 setupapi/tests: Add default device registry property tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 117 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 452a570c4f..2f81a3abf5 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "winreg.h" #include "initguid.h" +#include "devguid.h" #include "devpkey.h" #include "setupapi.h" #include "cfgmgr32.h" @@ -1496,7 +1497,7 @@ static void test_registry_property_a(void) { static const CHAR bogus[] = "System\\CurrentControlSet\\Enum\\Root\\LEGACY_BOGUS"; SP_DEVINFO_DATA device = {sizeof(device)}; - CHAR buf[6] = ""; + CHAR buf[64] = ""; DWORD size, type; HDEVINFO set; BOOL ret; @@ -1590,13 +1591,69 @@ todo_wine { res = RegOpenKeyA(HKEY_LOCAL_MACHINE, bogus, &key); ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); + + /* Test existing registry properties right after device creation */ + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + + /* Create device from a not registered class without device name */ + ret = SetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* No SPDRP_DEVICEDESC property */ + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVICEDESC, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError()); + + /* No SPDRP_CLASS property */ + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError()); + + /* Have SPDRP_CLASSGUID property */ + memset(buf, 0, sizeof(buf)); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CLASSGUID, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + ok(!lstrcmpiA(buf, "{6a55b5a4-3f65-11db-b704-0011955c2bdb}"), "Got unexpected value %s.\n", buf); + + ret = SetupDiDeleteDeviceInfo(set, &device); + ok(ret, "Failed to delete device, error %#x.\n", GetLastError()); + + /* Create device from a not registered class with a device name */ + ret = SetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, "device_name", NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* Have SPDRP_DEVICEDESC property */ + memset(buf, 0, sizeof(buf)); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVICEDESC, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + ok(!lstrcmpA(buf, "device_name"), "Got unexpected value %s.\n", buf); + + SetupDiDestroyDeviceInfoList(set); + + /* Create device from a registered class */ + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "display", &GUID_DEVCLASS_DISPLAY, NULL, NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* Have SPDRP_CLASS property */ + memset(buf, 0, sizeof(buf)); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL); + todo_wine ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + todo_wine ok(!lstrcmpA(buf, "Display"), "Got unexpected value %s.\n", buf); + + SetupDiDestroyDeviceInfoList(set); } static void test_registry_property_w(void) { WCHAR friendly_name[] = {'B','o','g','u','s',0}; SP_DEVINFO_DATA device = {sizeof(device)}; - WCHAR buf[6] = {0}; + WCHAR buf[64] = {0}; DWORD size, type; HDEVINFO set; BOOL ret; @@ -1694,6 +1751,62 @@ todo_wine { res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); + + /* Test existing registry properties right after device creation */ + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + + /* Create device from a not registered class without device name */ + ret = SetupDiCreateDeviceInfoW(set, L"LEGACY_BOGUS", &guid, NULL, NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* No SPDRP_DEVICEDESC property */ + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_DEVICEDESC, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError()); + + /* No SPDRP_CLASS property */ + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError()); + + /* Have SPDRP_CLASSGUID property */ + memset(buf, 0, sizeof(buf)); + ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_CLASSGUID, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + ok(!lstrcmpiW(buf, L"{6a55b5a4-3f65-11db-b704-0011955c2bdb}"), "Got unexpected value %s.\n", wine_dbgstr_w(buf)); + + ret = SetupDiDeleteDeviceInfo(set, &device); + ok(ret, "Failed to delete device, error %#x.\n", GetLastError()); + + /* Create device from a not registered class with a device name */ + ret = SetupDiCreateDeviceInfoW(set, L"LEGACY_BOGUS", &guid, L"device_name", NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* Have SPDRP_DEVICEDESC property */ + memset(buf, 0, sizeof(buf)); + ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_DEVICEDESC, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + ok(!lstrcmpW(buf, L"device_name"), "Got unexpected value %s.\n", wine_dbgstr_w(buf)); + + SetupDiDestroyDeviceInfoList(set); + + /* Create device from a registered class */ + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoW(set, L"display", &GUID_DEVCLASS_DISPLAY, NULL, NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* Have SPDRP_CLASS property */ + memset(buf, 0, sizeof(buf)); + ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL); + todo_wine ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + todo_wine ok(!lstrcmpW(buf, L"Display"), "Got unexpected value %s.\n", wine_dbgstr_w(buf)); + + SetupDiDestroyDeviceInfoList(set); } static void test_get_inf_class(void)

1 0

Zhiyi Zhang : setupapi/tests: Fix timeout on win10 1809+.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 177d6d7f8981b9e036437d78023b76232dcadb3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=177d6d7f8981b9e036437d78… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 18 17:29:02 2019 +0800 setupapi/tests: Fix timeout on win10 1809+. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 50 +++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 57adeeb27b..452a570c4f 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2065,12 +2065,6 @@ static void test_get_actual_section(void) ok(!strcasecmp(section, "section1"), "Got unexpected section %s.\n", section); ok(size == 9, "Got size %u.\n", size); - extptr = section; - ret = SetupDiGetActualSectionToInstallA(hinf, "section1", section, ARRAY_SIZE(section), NULL, &extptr); - ok(ret, "Failed to get section, error %#x.\n", GetLastError()); - ok(!strcasecmp(section, "section1"), "Got unexpected section %s.\n", section); - ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); - extptr = section; ret = SetupDiGetActualSectionToInstallA(hinf, "section2", section, ARRAY_SIZE(section), NULL, &extptr); ok(ret, "Failed to get section, error %#x.\n", GetLastError()); @@ -2101,24 +2095,6 @@ static void test_get_actual_section(void) ok(!strcasecmp(section, "section6.NT" MYEXT), "Got unexpected section %s.\n", section); ok(extptr == section + 8, "Got extension %s.\n", extptr); - extptr = section; - ret = SetupDiGetActualSectionToInstallA(hinf, "section7", section, ARRAY_SIZE(section), NULL, &extptr); - ok(ret, "Failed to get section, error %#x.\n", GetLastError()); - ok(!strcasecmp(section, "section7"), "Got unexpected section %s.\n", section); - ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); - - extptr = section; - ret = SetupDiGetActualSectionToInstallA(hinf, "section8", section, ARRAY_SIZE(section), NULL, &extptr); - ok(ret, "Failed to get section, error %#x.\n", GetLastError()); - ok(!strcasecmp(section, "section8"), "Got unexpected section %s.\n", section); - ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); - - extptr = section; - ret = SetupDiGetActualSectionToInstallA(hinf, "nonexistent", section, ARRAY_SIZE(section), NULL, &extptr); - ok(ret, "Failed to get section, error %#x.\n", GetLastError()); - ok(!strcasecmp(section, "nonexistent"), "Got unexpected section %s.\n", section); - ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); - extptr = section; ret = SetupDiGetActualSectionToInstallA(hinf, "section9", section, ARRAY_SIZE(section), NULL, &extptr); ok(ret, "Failed to get section, error %#x.\n", GetLastError()); @@ -2127,7 +2103,31 @@ static void test_get_actual_section(void) if (0) { - /* For some reason, this call hangs on Windows 10 1809. */ + /* For some reason, these calls hang on Windows 10 1809+. */ + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section1", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section1"), "Got unexpected section %s.\n", section); + ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section7", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section7"), "Got unexpected section %s.\n", section); + ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section8", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section8"), "Got unexpected section %s.\n", section); + ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "nonexistent", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "nonexistent"), "Got unexpected section %s.\n", section); + ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); + extptr = section; ret = SetupDiGetActualSectionToInstallA(hinf, "section10", section, ARRAY_SIZE(section), NULL, &extptr); ok(ret, "Failed to get section, error %#x.\n", GetLastError());

1 0

Paul Gofman : d3dx9: Factor out free_parameter_object_data() function.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 07562f1e3927b2aa1521811f0c16a7f05c175cba URL: https://source.winehq.org/git/wine.git/?a=commit;h=07562f1e3927b2aa1521811f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 16:59:48 2019 +0100 d3dx9: Factor out free_parameter_object_data() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index af11738236..a573d88fcf 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -542,16 +542,21 @@ static void free_sampler(struct d3dx_sampler *sampler) static void d3dx_pool_release_shared_parameter(struct d3dx_top_level_parameter *param); -static void free_parameter_data(struct d3dx_parameter *param, BOOL child) +static void free_parameter_object_data(struct d3dx_parameter *param, const void *data, unsigned int bytes) { - if (!param->data) + unsigned int i, count; + + if (param->class != D3DXPC_OBJECT) return; - if (param->class == D3DXPC_OBJECT && !param->element_count) + + count = min(param->element_count ? param->element_count : 1, bytes / sizeof(void *)); + + for (i = 0; i < count; ++i) { switch (param->type) { case D3DXPT_STRING: - heap_free(*(char **)param->data); + heap_free(((char **)data)[i]); break; case D3DXPT_TEXTURE: @@ -561,7 +566,8 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child) case D3DXPT_TEXTURECUBE: case D3DXPT_PIXELSHADER: case D3DXPT_VERTEXSHADER: - if (*(IUnknown **)param->data) IUnknown_Release(*(IUnknown **)param->data); + if (*(IUnknown **)data) + IUnknown_Release(((IUnknown **)data)[i]); break; case D3DXPT_SAMPLER: @@ -569,7 +575,8 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child) case D3DXPT_SAMPLER2D: case D3DXPT_SAMPLER3D: case D3DXPT_SAMPLERCUBE: - free_sampler((struct d3dx_sampler *)param->data); + assert(count == 1); + free_sampler((struct d3dx_sampler *)data); return; default: @@ -577,6 +584,16 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child) break; } } +} + +static void free_parameter_data(struct d3dx_parameter *param, BOOL child) +{ + if (!param->data) + return; + + if (!param->element_count) + free_parameter_object_data(param, param->data, param->bytes); + if (!child || is_param_type_sampler(param->type)) heap_free(param->data); }

1 0

Paul Gofman : d3dx9: Factor out set_value() function.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 4020a38259774c64035e5783d595ff88097cedf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4020a38259774c64035e5783… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 16:59:47 2019 +0100 d3dx9: Factor out set_value() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 130 ++++++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 61 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5657f61157..af11738236 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -827,6 +827,73 @@ static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX } } +static HRESULT set_string(char **param_data, const char *string) +{ + heap_free(*param_data); + *param_data = heap_alloc(strlen(string) + 1); + if (!*param_data) + { + ERR("Out of memory.\n"); + return E_OUTOFMEMORY; + } + strcpy(*param_data, string); + return D3D_OK; +} + +static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigned int bytes) +{ + unsigned int i, count; + + bytes = min(bytes, param->bytes); + count = min(param->element_count ? param->element_count : 1, bytes / sizeof(void *)); + + switch (param->type) + { + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + for (i = 0; i < count; ++i) + { + IUnknown *old_texture = ((IUnknown **)param->data)[i]; + IUnknown *new_texture = ((IUnknown **)data)[i]; + + if (new_texture == old_texture) + continue; + + if (new_texture) + IUnknown_AddRef(new_texture); + if (old_texture) + IUnknown_Release(old_texture); + } + /* fallthrough */ + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + TRACE("Copy %u bytes.\n", bytes); + memcpy(param->data, data, bytes); + break; + + case D3DXPT_STRING: + { + HRESULT hr; + + for (i = 0; i < count; ++i) + if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) + return hr; + break; + } + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); + break; + } + + return D3D_OK; +} + static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_effect *effect, struct d3dx_parameter *parameter, const char *name) { @@ -1176,19 +1243,6 @@ static void set_dirty(struct d3dx_parameter *param) top_param->update_version = new_update_version; } -static HRESULT set_string(char **param_data, const char *string) -{ - HeapFree(GetProcessHeap(), 0, *param_data); - *param_data = HeapAlloc(GetProcessHeap(), 0, strlen(string) + 1); - if (!*param_data) - { - ERR("Out of memory.\n"); - return E_OUTOFMEMORY; - } - strcpy(*param_data, string); - return D3D_OK; -} - static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) { static const struct @@ -2278,7 +2332,6 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_parameter *param = get_valid_parameter(effect, parameter); - unsigned int i; TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); @@ -2295,53 +2348,8 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame if (data && param->bytes <= bytes) { - switch (param->type) - { - case D3DXPT_TEXTURE: - case D3DXPT_TEXTURE1D: - case D3DXPT_TEXTURE2D: - case D3DXPT_TEXTURE3D: - case D3DXPT_TEXTURECUBE: - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - IUnknown *old_texture = ((IUnknown **)param->data)[i]; - IUnknown *new_texture = ((IUnknown **)data)[i]; - - if (new_texture == old_texture) - continue; - - if (new_texture) - IUnknown_AddRef(new_texture); - if (old_texture) - IUnknown_Release(old_texture); - } - /* fallthrough */ - case D3DXPT_VOID: - case D3DXPT_BOOL: - case D3DXPT_INT: - case D3DXPT_FLOAT: - TRACE("Copy %u bytes.\n", param->bytes); - memcpy(param->data, data, param->bytes); - set_dirty(param); - break; - - case D3DXPT_STRING: - { - HRESULT hr; - - set_dirty(param); - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) - return hr; - break; - } - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); - break; - } - - return D3D_OK; + set_dirty(param); + return set_value(param, data, bytes); } WARN("Invalid argument specified.\n");

1 0

Paul Gofman : d3dx9: Implement d3dx_effect_DeleteParameterBlock().
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: f65e4854e37355a946b6e017a2cd595a1ddceb38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65e4854e37355a946b6e017… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 16:59:46 2019 +0100 d3dx9: Implement d3dx_effect_DeleteParameterBlock(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 32 +++++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/effect.c | 12 ++++++------ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8317d7112c..5657f61157 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -509,6 +509,16 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx_effect *effect, D3 return effect->flags & D3DXFX_LARGEADDRESSAWARE ? NULL : get_parameter_by_name(effect, NULL, parameter); } +#if D3DX_SDK_VERSION >= 26 +static struct d3dx_parameter_block *get_valid_parameter_block(D3DXHANDLE handle) +{ + struct d3dx_parameter_block *block = (struct d3dx_parameter_block *)handle; + + return block && !strncmp(block->magic_string, parameter_block_magic_string, + sizeof(parameter_block_magic_string)) ? block : NULL; +} +#endif + static void free_state(struct d3dx_state *state) { free_parameter(&state->parameter, FALSE, FALSE); @@ -4119,11 +4129,27 @@ static HRESULT WINAPI d3dx_effect_ApplyParameterBlock(ID3DXEffect *iface, D3DXHA #if D3DX_SDK_VERSION >= 26 static HRESULT WINAPI d3dx_effect_DeleteParameterBlock(ID3DXEffect *iface, D3DXHANDLE parameter_block) { - struct d3dx_effect *This = impl_from_ID3DXEffect(iface); + struct d3dx_parameter_block *block = get_valid_parameter_block(parameter_block); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter_block *b; - FIXME("(%p)->(%p): stub\n", This, parameter_block); + TRACE("iface %p, parameter_block %p.\n", iface, parameter_block); - return E_NOTIMPL; + if (!block) + return D3DERR_INVALIDCALL; + + LIST_FOR_EACH_ENTRY(b, &effect->parameter_block_list, struct d3dx_parameter_block, entry) + { + if (b == block) + { + list_remove(&b->entry); + free_parameter_block(b); + return D3D_OK; + } + } + + WARN("Block is not found in issued block list, not freeing memory.\n"); + return D3DERR_INVALIDCALL; } #endif diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 7b6c1f00d6..f1cbe49287 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -8081,7 +8081,7 @@ static void test_effect_parameter_block(void) hr = effect->lpVtbl->ApplyParameterBlock(effect, block); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->DeleteParameterBlock(effect, block); - todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->BeginParameterBlock(effect); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -8095,9 +8095,9 @@ static void test_effect_parameter_block(void) todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->DeleteParameterBlock(effect2, block); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); hr = effect->lpVtbl->DeleteParameterBlock(effect, block); - todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ApplyParameterBlock(effect, NULL); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); @@ -8167,7 +8167,7 @@ static void test_effect_parameter_block(void) ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); hr = effect->lpVtbl->DeleteParameterBlock(effect2, block); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); IDirect3DTexture9_AddRef(texture); refcount = IDirect3DTexture9_Release(texture); @@ -8303,9 +8303,9 @@ static void test_effect_parameter_block(void) float_array[0], float_array[1], float_array[2], float_array[3]); hr = effect->lpVtbl->DeleteParameterBlock(effect, block); - todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->DeleteParameterBlock(effect, block2); - todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->SetTexture(effect, "tex1", NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Paul Gofman : d3dx9: Implement d3dx_effect_EndParameterBlock().
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: fd47b684487bab4664a31a3b670783b6d1a5aca3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd47b684487bab4664a31a3b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 16:59:45 2019 +0100 d3dx9: Implement d3dx_effect_EndParameterBlock(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 26 +++++++++++++++++++++++--- dlls/d3dx9_36/tests/effect.c | 14 +++++++------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4be7c7b6bc..8317d7112c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -24,6 +24,7 @@ #include "d3dx9_private.h" #include "d3dcompiler.h" #include "winternl.h" +#include "wine/list.h" /* Constants for special INT/FLOAT conversation */ #define INT_FLOAT_MULTI 255.0f @@ -151,6 +152,7 @@ struct d3dx_technique struct d3dx_parameter_block { char magic_string[ARRAY_SIZE(parameter_block_magic_string)]; + struct list entry; }; struct d3dx_effect @@ -184,6 +186,7 @@ struct d3dx_effect D3DMATERIAL9 current_material; BOOL material_updated; + struct list parameter_block_list; struct d3dx_parameter_block *current_parameter_block; }; @@ -686,12 +689,18 @@ static void free_parameter_block(struct d3dx_parameter_block *block) static void d3dx_effect_cleanup(struct d3dx_effect *effect) { + struct d3dx_parameter_block *block, *cursor; ID3DXEffectPool *pool; unsigned int i; TRACE("effect %p.\n", effect); free_parameter_block(effect->current_parameter_block); + LIST_FOR_EACH_ENTRY_SAFE(block, cursor, &effect->parameter_block_list, struct d3dx_parameter_block, entry) + { + list_remove(&block->entry); + free_parameter_block(block); + } heap_free(effect->full_name_tmp); @@ -4082,11 +4091,20 @@ static HRESULT WINAPI d3dx_effect_BeginParameterBlock(ID3DXEffect *iface) static D3DXHANDLE WINAPI d3dx_effect_EndParameterBlock(ID3DXEffect *iface) { - struct d3dx_effect *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter_block *ret; - FIXME("(%p)->(): stub\n", This); + TRACE("iface %p.\n", iface); - return NULL; + if (!effect->current_parameter_block) + { + WARN("No active parameter block.\n"); + return NULL; + } + ret = effect->current_parameter_block; + effect->current_parameter_block = NULL; + list_add_tail(&effect->parameter_block_list, &ret->entry); + return (D3DXHANDLE)ret; } static HRESULT WINAPI d3dx_effect_ApplyParameterBlock(ID3DXEffect *iface, D3DXHANDLE parameter_block) @@ -6232,6 +6250,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev effect->flags = eflags; + list_init(&effect->parameter_block_list); + read_dword(&ptr, &tag); TRACE("Tag: %x\n", tag); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index bb9604194d..7b6c1f00d6 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -8069,7 +8069,7 @@ static void test_effect_parameter_block(void) hr = effect->lpVtbl->BeginParameterBlock(effect); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); block = effect->lpVtbl->EndParameterBlock(effect); - todo_wine ok(!!block, "Got unexpected block %p.\n", block); + ok(!!block, "Got unexpected block %p.\n", block); handle = effect->lpVtbl->EndParameterBlock(effect); ok(!handle, "Got unexpected handle %p.\n", handle); @@ -8084,13 +8084,13 @@ static void test_effect_parameter_block(void) todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->BeginParameterBlock(effect); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->SetFloat(effect, "vec3[0]", 1001.0f); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->SetFloat(effect, "arr1[0]", 91.0f); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); block = effect->lpVtbl->EndParameterBlock(effect); - todo_wine ok(!!block, "Got unexpected block %p.\n", block); + ok(!!block, "Got unexpected block %p.\n", block); hr = effect->lpVtbl->ApplyParameterBlock(effect, block); todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -8108,7 +8108,7 @@ static void test_effect_parameter_block(void) ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); hr = effect->lpVtbl->BeginParameterBlock(effect); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Effect parameters are not updated during recording. */ hr = effect->lpVtbl->SetTexture(effect, "tex1", (IDirect3DBaseTexture9 *)texture); @@ -8160,7 +8160,7 @@ static void test_effect_parameter_block(void) ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); block = effect->lpVtbl->EndParameterBlock(effect); - todo_wine ok(!!block, "Got unexpected block %p.\n", block); + ok(!!block, "Got unexpected block %p.\n", block); IDirect3DTexture9_AddRef(texture); refcount = IDirect3DTexture9_Release(texture); @@ -8240,7 +8240,7 @@ static void test_effect_parameter_block(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->BeginParameterBlock(effect); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->ApplyParameterBlock(effect, block); todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -8271,7 +8271,7 @@ static void test_effect_parameter_block(void) float_array[0], float_array[1], float_array[2], float_array[3]); block2 = effect->lpVtbl->EndParameterBlock(effect); - todo_wine ok(!!block2, "Got unexpected block %p.\n", block2); + ok(!!block2, "Got unexpected block %p.\n", block2); hr = effect->lpVtbl->ApplyParameterBlock(effect, block2); todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Paul Gofman : d3dx9: Implement d3dx_effect_BeginParameterBlock().
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: e281ba4db6654850caf713ab09aa6a2057e1d064 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e281ba4db6654850caf713ab… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 16:59:44 2019 +0100 d3dx9: Implement d3dx_effect_BeginParameterBlock(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 34 +++++++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/effect.c | 4 ++-- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index eefd14aafa..4be7c7b6bc 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -30,6 +30,7 @@ #define INT_FLOAT_MULTI_INVERSE (1/INT_FLOAT_MULTI) static const char parameter_magic_string[4] = {'@', '!', '#', '\xFF'}; +static const char parameter_block_magic_string[4] = {'@', '!', '#', '\xFE'}; #define PARAMETER_FLAG_SHARED 1 @@ -147,6 +148,11 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; +struct d3dx_parameter_block +{ + char magic_string[ARRAY_SIZE(parameter_block_magic_string)]; +}; + struct d3dx_effect { ID3DXEffect ID3DXEffect_iface; @@ -177,6 +183,8 @@ struct d3dx_effect unsigned int light_updated; D3DMATERIAL9 current_material; BOOL material_updated; + + struct d3dx_parameter_block *current_parameter_block; }; #define INITIAL_SHARED_DATA_SIZE 4 @@ -668,6 +676,14 @@ static void free_technique(struct d3dx_technique *technique) technique->name = NULL; } +static void free_parameter_block(struct d3dx_parameter_block *block) +{ + if (!block) + return; + + heap_free(block); +} + static void d3dx_effect_cleanup(struct d3dx_effect *effect) { ID3DXEffectPool *pool; @@ -675,6 +691,8 @@ static void d3dx_effect_cleanup(struct d3dx_effect *effect) TRACE("effect %p.\n", effect); + free_parameter_block(effect->current_parameter_block); + heap_free(effect->full_name_tmp); if (effect->parameters) @@ -4045,11 +4063,21 @@ static HRESULT WINAPI d3dx_effect_GetStateManager(ID3DXEffect *iface, ID3DXEffec static HRESULT WINAPI d3dx_effect_BeginParameterBlock(ID3DXEffect *iface) { - struct d3dx_effect *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("iface %p.\n", iface); - return E_NOTIMPL; + if (effect->current_parameter_block) + { + WARN("Parameter block is already started.\n"); + return D3DERR_INVALIDCALL; + } + + effect->current_parameter_block = heap_alloc_zero(sizeof(*effect->current_parameter_block)); + memcpy(effect->current_parameter_block->magic_string, parameter_block_magic_string, + sizeof(parameter_block_magic_string)); + + return D3D_OK; } static D3DXHANDLE WINAPI d3dx_effect_EndParameterBlock(ID3DXEffect *iface) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 922d8247b1..bb9604194d 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -8065,9 +8065,9 @@ static void test_effect_parameter_block(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->BeginParameterBlock(effect); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->BeginParameterBlock(effect); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); block = effect->lpVtbl->EndParameterBlock(effect); todo_wine ok(!!block, "Got unexpected block %p.\n", block); handle = effect->lpVtbl->EndParameterBlock(effect);

1 0

Matteo Bruni : d3dx9/tests: Test ApplyParameterBlock() while recording.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 85d3ad879d5b13f7fce378009aaf80b419ad6185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d3ad879d5b13f7fce37800… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 18 16:59:43 2019 +0100 d3dx9/tests: Test ApplyParameterBlock() while recording. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 84 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 1a177d7a8b..922d8247b1 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -8018,8 +8018,8 @@ static void test_effect_parameter_block(void) D3DPRESENT_PARAMETERS present_parameters = {0}; static const float float_array_zero[4]; IDirect3DTexture9 *texture, *tex_test; + D3DXHANDLE block, block2, handle; ID3DXEffect *effect, *effect2; - D3DXHANDLE block, handle; IDirect3DDevice9 *device; ID3DXEffectPool *pool; float float_array[4]; @@ -8216,6 +8216,86 @@ static void test_effect_parameter_block(void) hr = effect->lpVtbl->GetFloat(effect, "ts1[0].fv", &float_value); todo_wine ok(hr == D3D_OK && float_value == 28.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v2", float_array, 4); + todo_wine ok(hr == D3D_OK && float_array[0] == -29.0f + && !memcmp(float_array + 1, float_array_zero, 3 * sizeof(*float_array)), + "Got unexpected hr %#x, ts1[0].v2 (%g, %g, %g, %g).\n", hr, + float_array[0], float_array[1], float_array[2], float_array[3]); + + /* Test applying a parameter block while recording a new one. */ + hr = effect->lpVtbl->SetFloat(effect, "arr2[0]", 0.0f); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "arr2[1]", 0.0f); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = effect->lpVtbl->SetFloatArray(effect, "ts1[0].v1", float_array_zero, 3); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "ts1[0].fv", 0.0f); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = effect->lpVtbl->SetFloatArray(effect, "ts1[0].v2", float_array_zero, 4); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memset(&mat, 0, sizeof(mat)); + hr = effect->lpVtbl->SetMatrix(effect, "m3x2row", &effect_orig_mat); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = effect->lpVtbl->SetMatrix(effect, "m3x2column", &effect_orig_mat); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = effect->lpVtbl->BeginParameterBlock(effect); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = effect->lpVtbl->ApplyParameterBlock(effect, block); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = effect->lpVtbl->GetFloat(effect, "arr2[0]", &float_value); + ok(hr == D3D_OK && float_value == 0.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + hr = effect->lpVtbl->GetFloat(effect, "arr2[1]", &float_value); + ok(hr == D3D_OK && float_value == 0.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + + hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v1", float_array, 3); + ok(hr == D3D_OK && !memcmp(float_array, float_array_zero, 3 * sizeof(*float_array)), + "Got unexpected hr %#x, ts1[0].v1 (%g, %g, %g).\n", hr, + float_array[0], float_array[1], float_array[2]); + + hr = effect->lpVtbl->GetMatrix(effect, "m3x2row", &mat); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n"); + hr = effect->lpVtbl->GetMatrix(effect, "m3x2column", &mat); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n"); + + hr = effect->lpVtbl->GetFloat(effect, "ts1[0].fv", &float_value); + ok(hr == D3D_OK && float_value == 0.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + + hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v2", float_array, 4); + ok(hr == D3D_OK && float_array[0] == 0.0f + && !memcmp(float_array + 1, float_array_zero, 3 * sizeof(*float_array)), + "Got unexpected hr %#x, ts1[0].v2 (%g, %g, %g, %g).\n", hr, + float_array[0], float_array[1], float_array[2], float_array[3]); + + block2 = effect->lpVtbl->EndParameterBlock(effect); + todo_wine ok(!!block2, "Got unexpected block %p.\n", block2); + + hr = effect->lpVtbl->ApplyParameterBlock(effect, block2); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = effect->lpVtbl->GetFloat(effect, "arr2[0]", &float_value); + todo_wine ok(hr == D3D_OK && float_value == 92.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + hr = effect->lpVtbl->GetFloat(effect, "arr2[1]", &float_value); + ok(hr == D3D_OK && float_value == 0.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + + hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v1", float_array, 3); + ok(hr == D3D_OK && !memcmp(float_array, float_array_zero, 3 * sizeof(*float_array)), + "Got unexpected hr %#x, ts1[0].v1 (%g, %g, %g).\n", hr, + float_array[0], float_array[1], float_array[2]); + + hr = effect->lpVtbl->GetMatrix(effect, "m3x2row", &mat); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!memcmp(&mat, &test_mat, sizeof(mat)), "Got unexpected matrix.\n"); + hr = effect->lpVtbl->GetMatrix(effect, "m3x2column", &mat); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!memcmp(&mat, &test_mat, sizeof(mat)), "Got unexpected matrix.\n"); + + hr = effect->lpVtbl->GetFloat(effect, "ts1[0].fv", &float_value); + todo_wine ok(hr == D3D_OK && float_value == 28.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v2", float_array, 4); todo_wine ok(hr == D3D_OK && float_array[0] == -29.0f && !memcmp(float_array + 1, float_array_zero, 3 * sizeof(*float_array)), @@ -8224,6 +8304,8 @@ static void test_effect_parameter_block(void) hr = effect->lpVtbl->DeleteParameterBlock(effect, block); todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->DeleteParameterBlock(effect, block2); + todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->SetTexture(effect, "tex1", NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Paul Gofman : d3dx9/tests: Add test for effect parameter block.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 61ee765aa0ec0d0e478a9f82d73e602ea71419c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ee765aa0ec0d0e478a9f82… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 16:59:42 2019 +0100 d3dx9/tests: Add test for effect parameter block. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 245 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61ee765aa0ec0d0e478a…

1 0

Paul Gofman : d3dx9: Avoid double freeing samplers.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 6aced396bad8bea61733fda24f0cecabaec5041e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aced396bad8bea61733fda2… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 16:59:41 2019 +0100 d3dx9: Avoid double freeing samplers. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ad81cb68cb..eefd14aafa 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -516,8 +516,7 @@ static void free_sampler(struct d3dx_sampler *sampler) { free_state(&sampler->states[i]); } - HeapFree(GetProcessHeap(), 0, sampler->states); - HeapFree(GetProcessHeap(), 0, sampler); + heap_free(sampler->states); } static void d3dx_pool_release_shared_parameter(struct d3dx_top_level_parameter *param); @@ -531,7 +530,7 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child) switch (param->type) { case D3DXPT_STRING: - HeapFree(GetProcessHeap(), 0, *(char **)param->data); + heap_free(*(char **)param->data); break; case D3DXPT_TEXTURE: @@ -557,8 +556,8 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child) break; } } - if (!child) - HeapFree(GetProcessHeap(), 0, param->data); + if (!child || is_param_type_sampler(param->type)) + heap_free(param->data); } static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child)

1 0

Alexandre Julliard : comctl32/tests: Avoid size_t in traces.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: c799c1ea36f577ffde216e2543761ddbc6c09086 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c799c1ea36f577ffde216e25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 22:27:55 2019 +0100 comctl32/tests: Avoid size_t in traces. --- dlls/comctl32/tests/treeview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index eb63439f0b..fac8e8b6b8 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1695,7 +1695,7 @@ static void test_itemedit(void) r = SetWindowTextA(edit, buffA); expect(TRUE, r); r = GetWindowTextA(edit, buffA, ARRAY_SIZE(buffA)); - expect(ARRAY_SIZE(buffA) - 1, r); + ok( r == ARRAY_SIZE(buffA) - 1, "got %d\n", r ); /* ...but it's trimmed to MAX_PATH chars when editing ends */ r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); @@ -1705,7 +1705,7 @@ static void test_itemedit(void) item.cchTextMax = ARRAY_SIZE(buffA); r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - expect(MAX_PATH - 1, strlen(item.pszText)); + expect(MAX_PATH - 1, lstrlenA(item.pszText)); /* We can't get around that MAX_PATH limit by increasing EM_SETLIMITTEXT */ edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); @@ -1723,7 +1723,7 @@ static void test_itemedit(void) item.cchTextMax = ARRAY_SIZE(buffA); r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - expect(MAX_PATH - 1, strlen(item.pszText)); + expect(MAX_PATH - 1, lstrlenA(item.pszText)); /* Overwriting of pszText contents in TVN_ENDLABELEDIT */ edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot);

1 0

João Diogo Ferreira : kernel32/nls: Add LOCALE_IGEOID to all locales.
by Alexandre Julliard 18 Nov '19

18 Nov '19

1 0

Damjan Jovanovic : winedbg: Allow changing the current thread.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 8c52c17a08799a71436cd72ecf2c107548d5df82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c52c17a08799a71436cd72e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Nov 16 13:39:30 2019 +0200 winedbg: Allow changing the current thread. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 1 + programs/winedbg/debug.l | 1 + programs/winedbg/debugger.h | 1 + programs/winedbg/info.c | 2 +- programs/winedbg/tgt_active.c | 23 +++++++++++++++++++++++ programs/winedbg/winedbg.man.in | 3 +++ 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 126eef2239..ac76b5baf8 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -139,6 +139,7 @@ command: | tWHATIS expr_lvalue { dbg_printf("type = "); types_print_type(&$2.type, FALSE); dbg_printf("\n"); } | tATTACH tNUM { dbg_attach_debuggee($2); dbg_active_wait_for_first_exception(); } | tDETACH { dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); } + | tTHREAD tNUM { dbg_set_curr_thread($2); } | tKILL { dbg_curr_process->process_io->close_process(dbg_curr_process, TRUE); } | tMINIDUMP pathname { minidump_write($2, (dbg_curr_thread && dbg_curr_thread->in_exception) ? &dbg_curr_thread->excpt_record : NULL);} | tECHO tSTRING { dbg_printf("%s\n", $2); } diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index ef7a2eb42b..79cb8ccd3a 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -187,6 +187,7 @@ STRING \"[^\n"]+\" <INFO_CMD,BD_CMD>display|displa|displ|disp|dis|di|d { BEGIN(NOCMD); return tDISPLAY; } <INITIAL>undisplay|undispla|undispl|undisp|undis|undi|und { BEGIN(NOCMD); return tUNDISPLAY; } <INITIAL>delete|delet|dele|del { BEGIN(BD_CMD); return tDELETE; } +<INITIAL>thread|threa|thre|thr|th { BEGIN(NOCMD); return tTHREAD; } <INITIAL,NOPROCESS>quit|qui|qu|q { BEGIN(NOCMD); return tQUIT; } <INITIAL>set|se { BEGIN(NOCMD); return tSET; } <INITIAL>x { BEGIN(FORMAT_EXPECTED); return tEXAM; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index d8d7a699fb..40d93d669c 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -427,6 +427,7 @@ extern enum sym_get_lval symbol_picker_scoped(const char* name, const struct sgv extern void dbg_run_debuggee(const char* args); extern void dbg_wait_next_exception(DWORD cont, int count, int mode); extern enum dbg_start dbg_active_attach(int argc, char* argv[]); +extern BOOL dbg_set_curr_thread(DWORD tid); extern enum dbg_start dbg_active_launch(int argc, char* argv[]); extern enum dbg_start dbg_active_auto(int argc, char* argv[]); extern enum dbg_start dbg_active_minidump(int argc, char* argv[]); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index bf5ba4f6e3..123cbc934e 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -66,7 +66,7 @@ void print_help(void) " show dir dir <path>", " set <reg> = <expr> set *<addr> = <expr>", " pass whatis", - " info (see 'help info' for options)", + " info (see 'help info' for options) thread <tid>", "The 'x' command accepts repeat counts and formats (including 'i') in the", "same way that gdb does.\n", diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 71e0bc1944..2b38ce95de 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -98,6 +98,29 @@ static unsigned dbg_fetch_context(void) return TRUE; } +BOOL dbg_set_curr_thread(DWORD tid) +{ + struct dbg_thread* thread; + + if (!dbg_curr_process) + { + dbg_printf("No process loaded\n"); + return FALSE; + } + + thread = dbg_get_thread(dbg_curr_process, tid); + if (thread) + { + dbg_curr_thread = thread; + dbg_fetch_context(); + stack_fetch_frames(&dbg_context); + dbg_curr_tid = tid; + return TRUE; + } + dbg_printf("No such thread\n"); + return thread != NULL; +} + /*********************************************************************** * dbg_exception_prolog * diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 6f38bc07b9..6ed8d4474c 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -116,6 +116,9 @@ IDs can be obtained using the \fBinfo\ process\fR command. Note the .IP .IP \fBdetach\fR Detach from a Wine-process. +.IP \fBthread\ \fIN\fR +Change the current thread to \fIN\fR (its Windows TID, numeric or hexadecimal). +.IP .PP \fIHelp commands\fR .IP \fBhelp\fR

1 0

Sven Baars : msvcp140/tests: Test _Stat() against the actual permissions of the system directory.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: da42f2e0752e6bf02bd40c3a3ecb4a02157a11b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da42f2e0752e6bf02bd40c3a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Nov 15 20:30:46 2019 +0100 msvcp140/tests: Test _Stat() against the actual permissions of the system directory. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 8ad172495d..751b1beed8 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -786,8 +786,9 @@ static void test_Current_set(void) static void test_Stat(void) { - int i, perms, ret; + int i, perms, expected_perms, ret; HANDLE file; + DWORD attr; enum file_type val; WCHAR test_dirW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; WCHAR test_f1W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; @@ -889,10 +890,12 @@ static void test_Stat(void) } GetSystemDirectoryW(sys_path, MAX_PATH); + attr = GetFileAttributesW(sys_path); + expected_perms = (attr & FILE_ATTRIBUTE_READONLY) ? 0555 : 0777; perms = 0xdeadbeef; val = p_Stat(sys_path, &perms); ok(directory_file == val, "_Stat(): expect: regular, got %d\n", val); - ok(0777 == perms, "_Stat(): perms expect: 0777, got 0%o\n", perms); + ok(perms == expected_perms, "_Stat(): perms expect: 0%o, got 0%o\n", expected_perms, perms); if(ret) { todo_wine ok(DeleteFileW(test_f1_linkW), "expect wine_test_dir/f1_link to exist\n");

1 0

Paul Gofman : wined3d: Create a backup context if setting the pixel format failed in wined3d_context_gl_create_wgl_ctx().
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 645eb62f709275ac46c2a7ea59bf8bcba34c7edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=645eb62f709275ac46c2a7ea… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 18:06:12 2019 +0330 wined3d: Create a backup context if setting the pixel format failed in wined3d_context_gl_create_wgl_ctx(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5b8402bfe4..c5d2eeaa47 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2033,9 +2033,27 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context if (!wined3d_context_gl_set_pixel_format(context_gl)) { - ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc); context_release(context); - return FALSE; + + if (context_gl->dc_is_private) + { + ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc); + + return FALSE; + } + + WARN("Failed to set pixel format %d on device context %p, trying backup DC.\n", + context_gl->pixel_format, context_gl->dc); + + wined3d_release_dc(context_gl->window, context_gl->dc); + if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) + { + ERR("Failed to retrieve the backup device context.\n"); + return E_FAIL; + } + context_gl->dc_is_private = TRUE; + + return wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl); } share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL;

1 0

Paul Gofman : wined3d: Factor out wined3d_context_gl_create_wgl() function.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: ecad635124866602b8577339bca9a8f886ec7f23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecad635124866602b8577339… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 18:06:11 2019 +0330 wined3d: Factor out wined3d_context_gl_create_wgl() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 232 +++++++++++++++++++++++++++---------------------- 1 file changed, 128 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ecad635124866602b857…

1 0

Jeff Smith : msvcrt: Add additional strftime tests.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 959fe2fd10eaebb34a2ffe6b430b38a73b427a2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=959fe2fd10eaebb34a2ffe6b… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 18 01:07:27 2019 -0600 msvcrt: Add additional strftime tests. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 6 ++++++ dlls/ucrtbase/tests/misc.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index c8acd848bf..4a3d81d2dd 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -612,8 +612,14 @@ static void test_strftime(void) {"e%#%e", "e%e", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%c", "01/01/70 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%c", "02/30/70 00:00:00", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE}, + {"%#c", "Thursday, January 01, 1970 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#c", "Thursday, February 30, 1970 00:00:00", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE}, {"%x", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%x", "02/30/70", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE}, + {"%#x", "Thursday, January 01, 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#x", "Thursday, February 30, 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE}, {"%X", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%X", "14:00:00", { 0, 0, 14, 1, 0, 70, 4, 0, 0 }}, {"%a", "Thu", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%A", "Thursday", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%b", "Jan", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index fb138a0fa4..fa5f29372c 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -936,6 +936,17 @@ static void test_strftime(void) {"%g", "72", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, {"%G", "1971", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, {"%G", "1972", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, + {"%c", "Thu Jan 1 00:00:00 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, + {"%c", "Thu Feb 30 00:00:00 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE}, + {"%#c", "Thursday, January 01, 1970 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#c", "Thursday, February 30, 1970 00:00:00", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE}, + {"%x", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%x", "02/30/70", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE}, + {"%#x", "Thursday, January 01, 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#x", "Thursday, February 30, 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE}, + {"%X", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%X", "14:00:00", { 0, 0, 14, 1, 0, 70, 4, 0, 0 }}, + {"%X", "23:59:60", { 60, 59, 23, 1, 0, 70, 4, 0, 0 }, TRUE}, }; const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 };

1 0

Jeff Smith : msvcrt: Clean up strftime tests.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 550a992dd9b5d798c1a7ff1cde5373b527509e75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=550a992dd9b5d798c1a7ff1c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 18 01:07:26 2019 -0600 msvcrt: Clean up strftime tests. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 209 ++++++++++++++--------------------------------- 1 file changed, 63 insertions(+), 146 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index cf79e5971e..c8acd848bf 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -588,13 +588,59 @@ static void test_daylight(void) static void test_strftime(void) { + const struct { + const char *format; + } tests_einval[] = { + {"%C"}, + {"%D"}, + {"%e"}, + {"%F"}, + {"%h"}, + {"%n"}, + {"%R"}, + {"%t"}, + {"%T"}, + {"%u"}, + }; + + const struct { + const char *format; + const char *ret; + struct tm tm; + BOOL todo; + } tests[] = { + {"e%#%e", "e%e", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%c", "01/01/70 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%c", "02/30/70 00:00:00", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE}, + {"%x", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%X", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%a", "Thu", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%A", "Thursday", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%b", "Jan", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%B", "January", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#d", "1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%H", "00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%I", "12", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%j", "001", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%m", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#M", "0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%p", "AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%U", "00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%W", "00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%U", "01", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + {"%W", "00", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + {"%U", "53", { 0, 0, 0, 1, 0, 70, 0, 365, 0 }}, + {"%W", "52", { 0, 0, 0, 1, 0, 70, 0, 365, 0 }}, + }; + static const wchar_t cW[] = { '%','c',0 }; - static const char expected[] = "01/01/70 00:00:00"; time_t gmt; struct tm* gmt_tm; char buf[256], bufA[256]; WCHAR bufW[256]; long retA, retW; + int i; if (!p_strftime || !p_wcsftime || !p_gmtime) { @@ -608,55 +654,13 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); - errno = 0xdeadbeef; - retA = p_strftime(bufA, 256, "%C", gmt_tm); - ok(retA == 0, "expected 0, got %ld\n", retA); - ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - - errno = 0xdeadbeef; - retA = p_strftime(bufA, 256, "%D", gmt_tm); - ok(retA == 0, "expected 0, got %ld\n", retA); - ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - - errno = 0xdeadbeef; - retA = p_strftime(bufA, 256, "%e", gmt_tm); - ok(retA == 0, "expected 0, got %ld\n", retA); - ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - - errno = 0xdeadbeef; - retA = p_strftime(bufA, 256, "%F", gmt_tm); - ok(retA == 0, "expected 0, got %ld\n", retA); - ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - - errno = 0xdeadbeef; - retA = p_strftime(bufA, 256, "%h", gmt_tm); - ok(retA == 0, "expected 0, got %ld\n", retA); - ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - - errno = 0xdeadbeef; - retA = p_strftime(bufA, 256, "%n", gmt_tm); - ok(retA == 0, "expected 0, got %ld\n", retA); - ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - - errno = 0xdeadbeef; - retA = p_strftime(bufA, 256, "%R", gmt_tm); - ok(retA == 0, "expected 0, got %ld\n", retA); - ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - - errno = 0xdeadbeef; - retA = p_strftime(bufA, 256, "%t", gmt_tm); - ok(retA == 0, "expected 0, got %ld\n", retA); - ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - - errno = 0xdeadbeef; - retA = p_strftime(bufA, 256, "%T", gmt_tm); - ok(retA == 0, "expected 0, got %ld\n", retA); - ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - - errno = 0xdeadbeef; - retA = p_strftime(bufA, 256, "%u", gmt_tm); - ok(retA == 0, "expected 0, got %ld\n", retA); - ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + for (i=0; i<ARRAY_SIZE(tests_einval); i++) + { + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, tests_einval[i].format, gmt_tm); + ok(retA == 0, "%d) ret = %ld\n", i, retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "%d) errno = %d\n", i, errno); + } errno = 0xdeadbeef; retA = p_strftime(NULL, 0, "copy", gmt_tm); @@ -691,14 +695,17 @@ static void test_strftime(void) ok(errno == EINVAL, "errno = %d\n", errno); } - retA = p_strftime(bufA, 256, "e%#%e", gmt_tm); - ok(retA == 3, "expected 3, got %ld\n", retA); - ok(!strcmp(bufA, "e%e"), "got %s\n", bufA); + for (i=0; i<ARRAY_SIZE(tests); i++) + { + retA = p_strftime(bufA, 256, tests[i].format, &tests[i].tm); + todo_wine_if(tests[i].todo) { + ok(retA == strlen(tests[i].ret), "%d) ret = %ld\n", i, retA); + ok(!strcmp(bufA, tests[i].ret), "%d) buf = \"%s\", expected \"%s\"\n", + i, bufA, tests[i].ret); + } + } retA = p_strftime(bufA, 256, "%c", gmt_tm); - ok(retA == 17, "expected 17, got %ld\n", retA); - ok(strcmp(bufA, expected) == 0, "expected %s, got %s\n", expected, bufA); - retW = p_wcsftime(bufW, 256, cW, gmt_tm); ok(retW == 17, "expected 17, got %ld\n", retW); ok(retA == retW, "expected %ld, got %ld\n", retA, retW); @@ -707,96 +714,6 @@ static void test_strftime(void) buf[retA] = 0; ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf); - retA = p_strftime(bufA, 256, "%x", gmt_tm); - ok(retA == 8, "expected 8, got %ld\n", retA); - ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%X", gmt_tm); - ok(retA == 8, "expected 8, got %ld\n", retA); - ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%a", gmt_tm); - ok(retA == 3, "expected 3, got %ld\n", retA); - ok(!strcmp(bufA, "Thu"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%A", gmt_tm); - ok(retA == 8, "expected 8, got %ld\n", retA); - ok(!strcmp(bufA, "Thursday"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%b", gmt_tm); - ok(retA == 3, "expected 3, got %ld\n", retA); - ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%B", gmt_tm); - ok(retA == 7, "expected 7, got %ld\n", retA); - ok(!strcmp(bufA, "January"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%d", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "01"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%#d", gmt_tm); - ok(retA == 1, "expected 1, got %ld\n", retA); - ok(!strcmp(bufA, "1"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%H", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "00"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%I", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "12"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%j", gmt_tm); - ok(retA == 3, "expected 3, got %ld\n", retA); - ok(!strcmp(bufA, "001"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%m", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "01"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%#M", gmt_tm); - ok(retA == 1, "expected 1, got %ld\n", retA); - ok(!strcmp(bufA, "0"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%p", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "AM"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%U", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "00"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%W", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "00"), "got %s\n", bufA); - - gmt_tm->tm_wday = 0; - retA = p_strftime(bufA, 256, "%U", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "01"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%W", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "00"), "got %s\n", bufA); - - gmt_tm->tm_yday = 365; - retA = p_strftime(bufA, 256, "%U", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "53"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%W", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "52"), "got %s\n", bufA); - - gmt_tm->tm_mon = 1; - gmt_tm->tm_mday = 30; - retA = p_strftime(bufA, 256, "%c", gmt_tm); - todo_wine { - ok(retA == 17, "expected 17, got %ld\n", retA); - ok(!strcmp(bufA, "02/30/70 00:00:00"), "got %s\n", bufA); - } - if(!setlocale(LC_ALL, "Japanese_Japan.932")) { win_skip("Japanese_Japan.932 locale not available\n"); return;

1 0

Stefan Dösinger : libs/port: Use MSVC intrinsics for interlocked functions.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 934c02c794d2bf8084c01dd9646b9b4884cdc716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=934c02c794d2bf8084c01dd9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 17 13:43:15 2019 +0100 libs/port: Use MSVC intrinsics for interlocked functions. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/interlocked.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index 59b852f7e9..040ab756eb 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -138,6 +138,47 @@ __ASM_GLOBAL_FUNC(interlocked_xchg_add, #elif defined(__x86_64__) +#if defined(_MSC_VER) + +#include <intrin.h> + +int interlocked_cmpxchg(int *dest, int xchg, int compare) +{ + return _InterlockedCompareExchange(dest, xchg, compare); +} + +void *interlocked_cmpxchg_ptr(void **dest, void *xchg, void *compare) +{ + return _InterlockedCompareExchangePointer(dest, xchg, compare); +} + +__int64 interlocked_cmpxchg64(__int64 *dest, __int64 xchg, __int64 compare) +{ + return _InterlockedCompareExchange64(dest, xchg, compare); +} + +int interlocked_xchg(int *dest, int val) +{ + return _InterlockedExchange(dest, val); +} + +void *interlocked_xchg_ptr(void **dest, void *val) +{ + return _InterlockedExchangePointer(dest, val); +} + +int interlocked_xchg_add(int *dest, int incr) +{ + return _InterlockedExchangeAdd(dest, incr); +} + +int interlocked_cmpxchg128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) +{ + return _InterlockedCompareExchange128(dest, xchg_high, xchg_low, compare); +} + +#else + __ASM_GLOBAL_FUNC(interlocked_cmpxchg, "mov %edx, %eax\n\t" "lock cmpxchgl %esi,(%rdi)\n\t" @@ -179,6 +220,7 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg128, __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") __ASM_CFI(".cfi_same_value %rbx\n\t") "ret") +#endif #elif defined(__powerpc__)

1 0

Stefan Dösinger : include: Windows SDK C headers have snprintf.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 8101d25118db9c35fc84980c1b342a1f515316f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8101d25118db9c35fc84980c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 17 13:43:14 2019 +0100 include: Windows SDK C headers have snprintf. And it is a function prototype, so we can't use #ifndef. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/wine/port.h b/include/wine/port.h index b3ef4b905a..264f282837 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -69,7 +69,13 @@ #endif #define popen _popen #define pclose _pclose -#define snprintf _snprintf +/* The UCRT headers in the Windows SDK #error out if we #define snprintf. + * The C headers that came with previous Visual Studio versions do not have + * snprintf. Check for VS 2015, which appears to be the first version to + * use the UCRT headers by default. */ +#if _MSC_VER < 1900 +# define snprintf _snprintf +#endif #define strtoll _strtoi64 #define strtoull _strtoui64 #define strncasecmp _strnicmp

1 0

Stefan Dösinger : includes: Newer Visual Studio versions have isfinite and friends.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: af7ace7990602976dc2bd7f59e3d24ea465ff6cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=af7ace7990602976dc2bd7f5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 17 13:43:13 2019 +0100 includes: Newer Visual Studio versions have isfinite and friends. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index d23e2b033f..b3ef4b905a 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -58,9 +58,15 @@ #ifdef _MSC_VER #define ftruncate chsize -#define isfinite(x) _finite(x) -#define isinf(x) (!(_finite(x) || _isnan(x))) -#define isnan(x) _isnan(x) +#ifndef isfinite +# define isfinite(x) _finite(x) +#endif +#ifndef isinf +# define isinf(x) (!(_finite(x) || _isnan(x))) +#endif +#ifndef isnan +# define isnan(x) _isnan(x) +#endif #define popen _popen #define pclose _pclose #define snprintf _snprintf

1 0

Stefan Dösinger : d3d11/tests: Don't use empty initializer list.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: fbfd697f89f5a843cbf8c1338387dd60ef1903e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbfd697f89f5a843cbf8c133… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 17 13:43:12 2019 +0100 d3d11/tests: Don't use empty initializer list. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1dbd405001..f378ae52ec 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -19422,9 +19422,9 @@ static void test_uav_load(void) #define R32_FLOAT DXGI_FORMAT_R32_FLOAT #define R32_UINT DXGI_FORMAT_R32_UINT #define R32_SINT DXGI_FORMAT_R32_SINT - {&ps_ld_2d_float, &float_2d, {R32_FLOAT, TEX_2D, 0}, {}, (const DWORD *)float_data}, - {&ps_ld_2d_uint, &uint_2d, {R32_UINT, TEX_2D, 0}, {}, (const DWORD *)uint_data}, - {&ps_ld_2d_int, &int_2d, {R32_SINT, TEX_2D, 0}, {}, (const DWORD *)int_data}, + {&ps_ld_2d_float, &float_2d, {R32_FLOAT, TEX_2D, 0}, {0}, (const DWORD *)float_data}, + {&ps_ld_2d_uint, &uint_2d, {R32_UINT, TEX_2D, 0}, {0}, (const DWORD *)uint_data}, + {&ps_ld_2d_int, &int_2d, {R32_SINT, TEX_2D, 0}, {0}, (const DWORD *)int_data}, {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 0, ~0u}, {0}, (const DWORD *)uint_data}, {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 0, ~0u}, {1}, (const DWORD *)uint_data2}, {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 0, ~0u}, {2}, (const DWORD *)uint_data3},

1 0

João Diogo Ferreira : kernel32: Add Kosovo, UN codes and change two parents in geoinfodata.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: d353c96e83a1b0d8fc50882327581397f35763a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d353c96e83a1b0d8fc508823… Author: João Diogo Ferreira <devilj(a)outlook.pt> Date: Sun Nov 17 18:24:49 2019 +0000 kernel32: Add Kosovo, UN codes and change two parents in geoinfodata. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 65 +++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 18edc8f7ba..0cb5b81acd 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3945,12 +3945,12 @@ static const struct geoinfo_t geoinfodata[] = { { 300, {'A','I',0}, {'A','I','A',0}, 10039880, 660 }, /* Anguilla */ { 301, {'A','Q',0}, {'A','T','A',0}, 39070, 10 }, /* Antarctica */ { 302, {'A','W',0}, {'A','B','W',0}, 10039880, 533 }, /* Aruba */ - { 303, {'X','X',0}, {'X','X',0}, 39070 }, /* Ascension Island */ + { 303, {'X','X',0}, {'X','X',0}, 343 }, /* Ascension Island */ { 304, {'X','X',0}, {'X','X',0}, 10210825 }, /* Ashmore and Cartier Islands */ { 305, {'X','X',0}, {'X','X',0}, 161832256 }, /* Baker Island */ { 306, {'B','V',0}, {'B','V','T',0}, 39070, 74 }, /* Bouvet Island */ { 307, {'K','Y',0}, {'C','Y','M',0}, 10039880, 136 }, /* Cayman Islands */ - { 308, {'X','X',0}, {'X','X',0}, 10210824, 0, LOCATION_BOTH }, /* Channel Islands */ + { 308, {'X','X',0}, {'X','X',0}, 10210824, 830, LOCATION_BOTH }, /* Channel Islands */ { 309, {'C','X',0}, {'C','X','R',0}, 12, 162 }, /* Christmas Island */ { 310, {'X','X',0}, {'X','X',0}, 27114 }, /* Clipperton Island */ { 311, {'C','C',0}, {'C','C','K',0}, 10210825, 166 }, /* Cocos (Keeling) Islands */ @@ -3986,48 +3986,49 @@ static const struct geoinfo_t geoinfodata[] = { { 343, {'S','H',0}, {'S','H','N',0}, 42483, 654 }, /* St. Helena */ { 346, {'X','X',0}, {'X','X',0}, 337 }, /* Tinian Island */ { 347, {'T','K',0}, {'T','K','L',0}, 26286, 772 }, /* Tokelau */ - { 348, {'X','X',0}, {'X','X',0}, 39070 }, /* Tristan da Cunha */ + { 348, {'X','X',0}, {'X','X',0}, 343 }, /* Tristan da Cunha */ { 349, {'T','C',0}, {'T','C','A',0}, 10039880, 796 }, /* Turks and Caicos Islands */ { 351, {'V','G',0}, {'V','G','B',0}, 10039880, 92 }, /* Virgin Islands, British */ { 352, {'W','F',0}, {'W','L','F',0}, 26286, 876 }, /* Wallis and Futuna */ - { 742, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Africa */ - { 2129, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Asia */ - { 10541, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Europe */ + { 742, {'X','X',0}, {'X','X',0}, 39070, 2, LOCATION_REGION }, /* Africa */ + { 2129, {'X','X',0}, {'X','X',0}, 39070, 142, LOCATION_REGION }, /* Asia */ + { 10541, {'X','X',0}, {'X','X',0}, 39070, 150, LOCATION_REGION }, /* Europe */ { 15126, {'I','M',0}, {'I','M','N',0}, 10039882, 833 }, /* Man, Isle of */ { 19618, {'M','K',0}, {'M','K','D',0}, 47610, 807 }, /* Macedonia, Former Yugoslav Republic of */ - { 20900, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Melanesia */ - { 21206, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Micronesia */ + { 20900, {'X','X',0}, {'X','X',0}, 27114, 54, LOCATION_REGION }, /* Melanesia */ + { 21206, {'X','X',0}, {'X','X',0}, 27114, 57, LOCATION_REGION }, /* Micronesia */ { 21242, {'X','X',0}, {'X','X',0}, 161832256 }, /* Midway Islands */ - { 23581, {'X','X',0}, {'X','X',0}, 10026358, 0, LOCATION_REGION }, /* Northern America */ - { 26286, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Polynesia */ - { 27082, {'X','X',0}, {'X','X',0}, 161832257, 0, LOCATION_REGION }, /* Central America */ - { 27114, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Oceania */ + { 23581, {'X','X',0}, {'X','X',0}, 10026358, 21, LOCATION_REGION }, /* Northern America */ + { 26286, {'X','X',0}, {'X','X',0}, 27114, 61, LOCATION_REGION }, /* Polynesia */ + { 27082, {'X','X',0}, {'X','X',0}, 161832257, 13, LOCATION_REGION }, /* Central America */ + { 27114, {'X','X',0}, {'X','X',0}, 39070, 9, LOCATION_REGION }, /* Oceania */ { 30967, {'S','X',0}, {'S','X','M',0}, 10039880, 534 }, /* Sint Maarten (Dutch part) */ - { 31396, {'X','X',0}, {'X','X',0}, 161832257, 0, LOCATION_REGION }, /* South America */ + { 31396, {'X','X',0}, {'X','X',0}, 161832257, 5, LOCATION_REGION }, /* South America */ { 31706, {'M','F',0}, {'M','A','F',0}, 10039880, 663 }, /* Saint Martin (French part) */ - { 39070, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* World */ - { 42483, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Western Africa */ - { 42484, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Middle Africa */ - { 42487, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Northern Africa */ - { 47590, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Central Asia */ - { 47599, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* South-Eastern Asia */ - { 47600, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Eastern Asia */ - { 47603, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Eastern Africa */ - { 47609, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Eastern Europe */ - { 47610, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Southern Europe */ - { 47611, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Middle East */ - { 47614, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Southern Asia */ + { 39070, {'X','X',0}, {'X','X',0}, 39070, 1, LOCATION_REGION }, /* World */ + { 42483, {'X','X',0}, {'X','X',0}, 742, 11, LOCATION_REGION }, /* Western Africa */ + { 42484, {'X','X',0}, {'X','X',0}, 742, 17, LOCATION_REGION }, /* Middle Africa */ + { 42487, {'X','X',0}, {'X','X',0}, 742, 15, LOCATION_REGION }, /* Northern Africa */ + { 47590, {'X','X',0}, {'X','X',0}, 2129, 143, LOCATION_REGION }, /* Central Asia */ + { 47599, {'X','X',0}, {'X','X',0}, 2129, 35, LOCATION_REGION }, /* South-Eastern Asia */ + { 47600, {'X','X',0}, {'X','X',0}, 2129, 30, LOCATION_REGION }, /* Eastern Asia */ + { 47603, {'X','X',0}, {'X','X',0}, 742, 14, LOCATION_REGION }, /* Eastern Africa */ + { 47609, {'X','X',0}, {'X','X',0}, 10541, 151, LOCATION_REGION }, /* Eastern Europe */ + { 47610, {'X','X',0}, {'X','X',0}, 10541, 39, LOCATION_REGION }, /* Southern Europe */ + { 47611, {'X','X',0}, {'X','X',0}, 2129, 145, LOCATION_REGION }, /* Middle East */ + { 47614, {'X','X',0}, {'X','X',0}, 2129, 34, LOCATION_REGION }, /* Southern Asia */ { 7299303, {'T','L',0}, {'T','L','S',0}, 47599, 626 }, /* Democratic Republic of Timor-Leste */ - { 10026358, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Americas */ + { 9914689, {'X','K',0}, {'X','K','S',0}, 47610, 906 }, /* Kosovo */ + { 10026358, {'X','X',0}, {'X','X',0}, 39070, 19, LOCATION_REGION }, /* Americas */ { 10028789, {'A','X',0}, {'A','L','A',0}, 10039882, 248 }, /* Åland Islands */ - { 10039880, {'X','X',0}, {'X','X',0}, 161832257, 0, LOCATION_REGION }, /* Caribbean */ - { 10039882, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Northern Europe */ - { 10039883, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Southern Africa */ - { 10210824, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Western Europe */ - { 10210825, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Australia and New Zealand */ + { 10039880, {'X','X',0}, {'X','X',0}, 161832257, 29, LOCATION_REGION }, /* Caribbean */ + { 10039882, {'X','X',0}, {'X','X',0}, 10541, 154, LOCATION_REGION }, /* Northern Europe */ + { 10039883, {'X','X',0}, {'X','X',0}, 742, 18, LOCATION_REGION }, /* Southern Africa */ + { 10210824, {'X','X',0}, {'X','X',0}, 10541, 155, LOCATION_REGION }, /* Western Europe */ + { 10210825, {'X','X',0}, {'X','X',0}, 27114, 53, LOCATION_REGION }, /* Australia and New Zealand */ { 161832015, {'B','L',0}, {'B','L','M',0}, 10039880, 652 }, /* Saint Barthélemy */ { 161832256, {'U','M',0}, {'U','M','I',0}, 27114, 581 }, /* U.S. Minor Outlying Islands */ - { 161832257, {'X','X',0}, {'X','X',0}, 10026358, 0, LOCATION_REGION }, /* Latin America and the Caribbean */ + { 161832257, {'X','X',0}, {'X','X',0}, 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ }; static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid)

1 0

João Diogo Ferreira : kernel32: Fix null pointer access in GetGeoInfoW().
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: c790422daa4520e9f23111e8a2052cebff584abd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c790422daa4520e9f23111e8… Author: João Diogo Ferreira <devilj(a)outlook.pt> Date: Sun Nov 17 18:22:35 2019 +0000 kernel32: Fix null pointer access in GetGeoInfoW(). We were failing the conditional that would point «str» to «buffW» when retrieving the GEO_ISO_UN_NUMBER of a location with UN code 0. Some locations will keep having no UN code, such as Guantanamo Bay or Johnston Atoll, since that's how those are defined in Windows. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 323110daa6..18edc8f7ba 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4171,10 +4171,10 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, LANGID lang) { const struct geoinfo_t *ptr; - const WCHAR *str = NULL; WCHAR buffW[12]; - LONG val = 0; - INT len; + const WCHAR *str = buffW; + int len; + static const WCHAR fmtW[] = {'%','d',0}; TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); @@ -4185,20 +4185,20 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, switch (geotype) { case GEO_NATION: - val = geoid; + sprintfW(buffW, fmtW, ptr->id); break; case GEO_ISO_UN_NUMBER: - val = ptr->uncode; + sprintfW(buffW, fmtW, ptr->uncode); break; case GEO_PARENT: - val = ptr->parent; + sprintfW(buffW, fmtW, ptr->parent); break; case GEO_ISO2: + str = ptr->iso2W; + break; case GEO_ISO3: - { - str = geotype == GEO_ISO2 ? ptr->iso2W : ptr->iso3W; + str = ptr->iso3W; break; - } case GEO_RFC1766: case GEO_LCID: case GEO_FRIENDLYNAME: @@ -4216,12 +4216,6 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, return 0; } - if (val) { - static const WCHAR fmtW[] = {'%','d',0}; - sprintfW(buffW, fmtW, val); - str = buffW; - } - len = strlenW(str) + 1; if (!data || !data_len) return len;

1 0

John Chadwick : wintab32: Use 64-bit math in ScaleForContext.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 27afc0d3ab728be671ce387263db3f50aeeb0821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27afc0d3ab728be671ce3872… Author: John Chadwick <john(a)jchw.io> Date: Sun Nov 17 14:26:40 2019 -0800 wintab32: Use 64-bit math in ScaleForContext. With some tablet configurations, the InExt value passed to ScaleForContext can be very large, leading to an integer overflow. Signed-off-by: John Chadwick <john(a)jchw.io> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 0514dd78b4..ff9a4ca677 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -178,9 +178,9 @@ int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, static inline DWORD ScaleForContext(DWORD In, LONG InOrg, LONG InExt, LONG OutOrg, LONG OutExt) { if (((InExt > 0 )&&(OutExt > 0)) || ((InExt<0) && (OutExt < 0))) - return ((In - InOrg) * abs(OutExt) / abs(InExt)) + OutOrg; + return MulDiv(In - InOrg, abs(OutExt), abs(InExt)) + OutOrg; else - return ((abs(InExt) - (In - InOrg))*abs(OutExt) / abs(InExt)) + OutOrg; + return MulDiv(abs(InExt) - (In - InOrg), abs(OutExt), abs(InExt)) + OutOrg; } LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd)

1 0

Serge Gautherie : wbemprox: Always free 'new_path'.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: a45dfea99a2eeaf3ede829b04e58c13d14b33970 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a45dfea99a2eeaf3ede829b0… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon Nov 18 11:16:48 2019 +0100 wbemprox: Always free 'new_path'. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 96d1e0b850..53d4b169cd 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2341,7 +2341,13 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c goto done; } if (!wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW )) continue; - new_path = append_path( path, data.cFileName, &len ); + + if (!(new_path = append_path( path, data.cFileName, &len ))) + { + status = FILL_STATUS_FAILED; + FindClose( handle ); + goto done; + } if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -2354,6 +2360,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c rec = (struct record_datafile *)(table->data + offset); rec->name = build_name( root[0], new_path ); rec->version = get_file_version( rec->name ); + heap_free( new_path ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row ); @@ -2465,7 +2472,13 @@ static enum fill_status fill_directory( struct table *table, const struct expr * !wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW )) continue; - new_path = append_path( path, data.cFileName, &len ); + if (!(new_path = append_path( path, data.cFileName, &len ))) + { + FindClose( handle ); + status = FILL_STATUS_FAILED; + goto done; + } + if (!(push_dir( dirstack, new_path, len ))) { heap_free( new_path ); @@ -2476,6 +2489,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * rec = (struct record_directory *)(table->data + offset); rec->accessmask = FILE_ALL_ACCESS; rec->name = build_name( root[0], new_path ); + heap_free( new_path ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

1 0

Zebediah Figura : ddraw: Track WINED3D_RS_ZENABLE in the primary stateblock.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 769ba7d1e91c9a178786b9139a301cdffef2300b URL: https://source.winehq.org/git/wine.git/?a=commit;h=769ba7d1e91c9a178786b913… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 17:26:32 2019 -0600 ddraw: Track WINED3D_RS_ZENABLE in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 2 ++ dlls/ddraw/surface.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cdb2e9c2ba..4ad1fdb7f5 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -7025,6 +7025,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, ddraw->d3ddevice = device; + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_ZENABLE, + d3d_device_update_depth_stencil(device)); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, d3d_device_update_depth_stencil(device)); if (version == 1) /* Color keying is initially enabled for version 1 devices. */ diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 89e5024c0e..fda42f2982 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6085,6 +6085,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return hr_ddraw_from_wined3d(hr); } + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); }

1 0

Zebediah Figura : d3d8: Track WINED3D_RS_POINTSIZE_MIN and WINED3D_RS_ZENABLE in the primary stateblock.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 9fb7c84b15250e6420f5e365914f8a9720c64e86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fb7c84b15250e6420f5e365… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 17:26:31 2019 -0600 d3d8: Track WINED3D_RS_POINTSIZE_MIN and WINED3D_RS_ZENABLE in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 92b67b9274..17d8a726c7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -922,6 +922,9 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, implicit_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchain); implicit_swapchain->swap_interval = wined3dswapinterval_from_d3d(present_parameters->FullScreen_PresentationInterval); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); @@ -3710,6 +3713,9 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_swapchain_incref(wined3d_swapchain); IDirect3DSwapChain8_Release(&d3d_swapchain->IDirect3DSwapChain8_iface); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0);

1 0

Zebediah Figura : d3d9: Track WINED3D_RS_ZENABLE in the primary stateblock.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: c7073bec0c84239072d80ca809b944dfc56ab4cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7073bec0c84239072d80ca8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 17:26:30 2019 -0600 d3d9: Track WINED3D_RS_ZENABLE in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ec1800a649..5ef0c9cdf6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1007,6 +1007,8 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (!extended) { device->auto_mipmaps = 0; + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); } @@ -4630,6 +4632,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_swapchain_incref(d3d_swapchain->wined3d_swapchain); IDirect3DSwapChain9Ex_Release(&d3d_swapchain->IDirect3DSwapChain9Ex_iface); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc->enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil);

1 0

Michael Stefaniuc : dmband/tests: Check all IDirectMusicTrack_IsParamSupported() types.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 7d534d829902c021e4972ac22e83efb3ecaa2093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d534d829902c021e4972ac2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:20 2019 +0100 dmband/tests: Check all IDirectMusicTrack_IsParamSupported() types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/tests/dmband.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 29d0668219..459d00ed1d 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -181,6 +181,44 @@ static void test_bandtrack(void) CLSID class; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + BOOL supported; + } param_types[] = { + { X(GUID_BandParam), TRUE }, + { X(GUID_ChordParam), FALSE }, + { X(GUID_Clear_All_Bands), TRUE }, + { X(GUID_CommandParam), FALSE }, + { X(GUID_CommandParam2), FALSE }, + { X(GUID_CommandParamNext), FALSE }, + { X(GUID_ConnectToDLSCollection), TRUE }, + { X(GUID_Disable_Auto_Download), TRUE }, + { X(GUID_DisableTempo), FALSE }, + { X(GUID_DisableTimeSig), FALSE }, + { X(GUID_Download), TRUE }, + { X(GUID_DownloadToAudioPath), TRUE }, + { X(GUID_Enable_Auto_Download), TRUE }, + { X(GUID_EnableTempo), FALSE }, + { X(GUID_EnableTimeSig), FALSE }, + { X(GUID_IDirectMusicBand), TRUE }, + { X(GUID_IDirectMusicChordMap), FALSE }, + { X(GUID_IDirectMusicStyle), FALSE }, + { X(GUID_MuteParam), FALSE }, + { X(GUID_Play_Marker), FALSE }, + { X(GUID_RhythmParam), FALSE }, + { X(GUID_SeedVariations), FALSE }, + { X(GUID_StandardMIDIFile), TRUE }, + { X(GUID_TempoParam), FALSE }, + { X(GUID_TimeSignature), FALSE }, + { X(GUID_Unload), TRUE }, + { X(GUID_UnloadFromAudioPath), TRUE }, + { X(GUID_Valid_Start_Time), FALSE }, + { X(GUID_Variations), FALSE }, + }; +#undef X + unsigned int i; hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); @@ -203,8 +241,20 @@ static void test_bandtrack(void) hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + for (i = 0; i < ARRAY_SIZE(param_types); i++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[i].type); + if (param_types[i].supported) + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[i].name, hr); + else + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[i].name, hr); + } + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL);

1 0

Michael Stefaniuc : dmime/tests: Check all IDirectMusicTrack_IsParamSupported() types.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 1f5e2b7815595dc4538e4cb60518aa90e1ab087d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f5e2b7815595dc4538e4cb6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:19 2019 +0100 dmime/tests: Check all IDirectMusicTrack_IsParamSupported() types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 82 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 944a278dbb..3fb0e8afd8 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -532,24 +532,62 @@ static void test_track(void) CLSID classid; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } param_types[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicChordMap) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) }, + { X(GUID_NULL) } + }; +#undef X #define X(class) &CLSID_ ## class, #class const struct { REFCLSID clsid; const char *name; - BOOL has_param; + /* bitfield with supported param types */ + unsigned int has_params; } class[] = { - { X(DirectMusicLyricsTrack), TRUE }, - { X(DirectMusicMarkerTrack), TRUE }, - { X(DirectMusicParamControlTrack), TRUE }, - { X(DirectMusicSegmentTriggerTrack), TRUE }, - { X(DirectMusicSeqTrack), FALSE }, - { X(DirectMusicSysExTrack), FALSE }, - { X(DirectMusicTempoTrack), TRUE }, - { X(DirectMusicTimeSigTrack), TRUE }, - { X(DirectMusicWaveTrack), TRUE } + { X(DirectMusicLyricsTrack), 0 }, + { X(DirectMusicMarkerTrack), 0x8080000 }, + { X(DirectMusicParamControlTrack), 0 }, + { X(DirectMusicSegmentTriggerTrack), 0x3fffffff }, + { X(DirectMusicSeqTrack), ~0 }, /* param methods not implemented */ + { X(DirectMusicSysExTrack), ~0 }, /* param methods not implemented */ + { X(DirectMusicTempoTrack), 0x802100 }, + { X(DirectMusicTimeSigTrack), 0x1004200 }, + { X(DirectMusicWaveTrack), 0x6001c80 } }; #undef X - unsigned int i; + unsigned int i, j; for (i = 0; i < ARRAY_SIZE(class); i++) { trace("Testing %s\n", class[i].name); @@ -558,7 +596,18 @@ static void test_track(void) ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); /* IDirectMusicTrack */ - if (!class[i].has_param) { + if (class[i].has_params != ~0) { + for (j = 0; j < ARRAY_SIZE(param_types); j++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt, param_types[j].type); + if (class[i].has_params & (1 << j)) + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[j].name, hr); + else + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[j].name, hr); + } + } else { hr = IDirectMusicTrack_GetParam(dmt, NULL, 0, NULL, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack_SetParam(dmt, NULL, 0, NULL); @@ -569,13 +618,6 @@ static void test_track(void) hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); ok(hr == E_NOTIMPL, "got: %08x\n", hr); } - else { - hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); - if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack) - ok(hr == S_OK, "got: %08x\n", hr); - else - ok(hr == DMUS_E_TYPE_UNSUPPORTED, "got: %08x\n", hr); - } if (class[i].clsid != &CLSID_DirectMusicMarkerTrack && class[i].clsid != &CLSID_DirectMusicTimeSigTrack) { hr = IDirectMusicTrack_AddNotificationType(dmt, NULL); @@ -591,7 +633,7 @@ static void test_track(void) if (hr == S_OK) { hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); - if (!class[i].has_param) { + if (class[i].has_params == ~0) { hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0);

1 0

Michael Stefaniuc : dmime: The Wave track supports two additional param types.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: d65f1e55a20c35b0a6cf35b308052e4fc2e76d90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65f1e55a20c35b0a6cf35b3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:18 2019 +0100 dmime: The Wave track supports two additional param types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/wavetrack.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index a679ed60ab..5869c9e72d 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -136,20 +136,27 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rgu return S_OK; } -static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - if (IsEqualGUID (rguidType, &GUID_Disable_Auto_Download) - || IsEqualGUID (rguidType, &GUID_Download) - || IsEqualGUID (rguidType, &GUID_DownloadToAudioPath) - || IsEqualGUID (rguidType, &GUID_Enable_Auto_Download)) { - TRACE("param supported\n"); - return S_OK; - } - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); + static const REFGUID valid[] = { + &GUID_Disable_Auto_Download, + &GUID_Download, + &GUID_DownloadToAudioPath, + &GUID_Enable_Auto_Download, + &GUID_Unload, + &GUID_UnloadFromAudioPath + }; + unsigned int i; + + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); + + for (i = 0; i < ARRAY_SIZE(valid); i++) + if (IsEqualGUID(type, valid[i])) + return S_OK; + + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI wave_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype)

1 0

Michael Stefaniuc : dmime: SegTrigger track supports all param types, even invalid ones.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 9b0512de26635b7943b564a3a0e7fe77ab1d198d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b0512de26635b7943b564a3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:17 2019 +0100 dmime: SegTrigger track supports all param types, even invalid ones. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segtriggertrack.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 3050a5031b..7e1d75aa05 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -156,11 +156,7 @@ static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); - if (IsEqualGUID(type, &GUID_IDirectMusicStyle)) - return S_OK; - - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + return S_OK; } static HRESULT WINAPI segment_track_AddNotificationType(IDirectMusicTrack8 *iface,

1 0

Michael Stefaniuc : dmstyle/tests: Check all IDirectMusicTrack8_IsParamSupported() types.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 5d11ee2fe02a37a3bc5beb8bfcc320e7492698c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d11ee2fe02a37a3bc5beb8b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:16 2019 +0100 dmstyle/tests: Check all IDirectMusicTrack8_IsParamSupported() types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 66 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 6b2275866c..0c17ef3b41 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -244,22 +244,61 @@ static void test_track(void) CLSID classid; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } param_types[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicChordMap) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) } + }; +#undef X #define X(class) &CLSID_ ## class, #class const struct { REFCLSID clsid; const char *name; BOOL has_save; BOOL has_join; + /* bitfields with supported param types */ + unsigned int has_params; + unsigned int todo_params; } class[] = { - { X(DirectMusicAuditionTrack), TRUE, FALSE }, - { X(DirectMusicChordTrack), TRUE, TRUE }, - { X(DirectMusicCommandTrack), TRUE, TRUE }, - { X(DirectMusicMotifTrack), FALSE, FALSE }, - { X(DirectMusicMuteTrack), TRUE, FALSE }, - { X(DirectMusicStyleTrack), FALSE, TRUE }, + { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 }, + { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 1 }, + { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 }, + { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 }, + { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 }, + { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200, 0 }, }; #undef X - unsigned int i; + unsigned int i, j; for (i = 0; i < ARRAY_SIZE(class); i++) { trace("Testing %s\n", class[i].name); @@ -287,6 +326,19 @@ static void test_track(void) hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + for (j = 0; j < ARRAY_SIZE(param_types); j++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[j].type); + if (class[i].has_params & (1 << j)) + todo_wine_if(class[i].todo_params & (1 << j)) + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[j].name, hr); + else + todo_wine_if(class[i].todo_params & (1 << j)) + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[j].name, hr); + } + if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr);

1 0

Nikolay Sivov : ole32/tests: Check more return values in moniker tests (Coverity).
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: b9462e66a4d75e4477285bf220af4e92ca8bcbed URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9462e66a4d75e4477285bf2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 16 21:06:38 2019 +0300 ole32/tests: Check more return values in moniker tests (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 9e2c23b421..cbffad4dfa 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1049,36 +1049,33 @@ todo_wine ok_ole_success(hr, CreateBindCtx); hr = CreateFileMoniker(wszFileName1, &pmk1); - ok(hr==0, "CreateFileMoniker for file hr=%08x\n", hr); + ok(hr == S_OK, "Failed to create file moniker, hr %#x.\n", hr); hr = CreateFileMoniker(wszFileName2, &pmk2); - ok(hr==0, "CreateFileMoniker for file hr=%08x\n", hr); + ok(hr == S_OK, "Failed to create file moniker, hr %#x.\n", hr); hr = IBindCtx_GetRunningObjectTable(pbc, &pprot); - ok(hr==0, "IBindCtx_GetRunningObjectTable hr=%08x\n", hr); + ok(hr == S_OK, "Failed to get ROT, hr %#x.\n", hr); /* Check EnumMoniker before registering */ hr = IRunningObjectTable_EnumRunning(pprot, &spEM1); - ok(hr==0, "IRunningObjectTable_EnumRunning hr=%08x\n", hr); - hr = IEnumMoniker_QueryInterface(spEM1, &IID_IUnknown, (void*) &lpEM1); + ok(hr == S_OK, "Failed to get enum object, hr %#x.\n", hr); + hr = IEnumMoniker_QueryInterface(spEM1, &IID_IUnknown, (void *)&lpEM1); /* Register a couple of Monikers and check is ok */ - ok(hr==0, "IEnumMoniker_QueryInterface hr %08x %p\n", hr, lpEM1); - + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + matchCnt = count_moniker_matches(pbc, spEM1); trace("Number of matches is %i\n", matchCnt); grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk1, &pdwReg1); - ok(hr==0, "IRunningObjectTable_Register hr=%08x %p %08x %p %p %d\n", - hr, pprot, grflags, lpEM1, pmk1, pdwReg1); + ok(hr == S_OK, "Failed to register object, hr %#x.\n", hr); - trace("IROT::Register\n"); grflags=0; grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk2, &pdwReg2); - ok(hr==0, "IRunningObjectTable_Register hr=%08x %p %08x %p %p %d\n", hr, - pprot, grflags, lpEM1, pmk2, pdwReg2); + ok(hr == S_OK, "Failed to register object, hr %#x.\n", hr); hr = IRunningObjectTable_EnumRunning(pprot, &spEM2); - ok(hr==0, "IRunningObjectTable_EnumRunning hr=%08x\n", hr); + ok(hr == S_OK, "Failed to get enum object, hr %#x.\n", hr); matchCnt = count_moniker_matches(pbc, spEM2); ok(matchCnt==2, "Number of matches should be equal to 2 not %i\n", matchCnt); @@ -1094,8 +1091,10 @@ todo_wine matchCnt = count_moniker_matches(pbc, spEM3); ok(matchCnt==2, "Number of matches should be equal to 2 not %i\n", matchCnt); - IRunningObjectTable_Revoke(pprot,pdwReg1); - IRunningObjectTable_Revoke(pprot,pdwReg2); + hr = IRunningObjectTable_Revoke(pprot,pdwReg1); + ok(hr == S_OK, "Failed to revoke, hr %#x.\n", hr); + hr = IRunningObjectTable_Revoke(pprot,pdwReg2); + ok(hr == S_OK, "Failed to revoke, hr %#x.\n", hr); IUnknown_Release(lpEM1); IEnumMoniker_Release(spEM1); IEnumMoniker_Release(spEM2);

1 0

Zebediah Figura : strmbase: Get rid of the unused segment fields from struct strmbase_pin.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 21ac839711f766098e5b9d5164fe11e9e1a1f0b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ac839711f766098e5b9d51… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 11:20:14 2019 -0600 strmbase: Get rid of the unused segment fields from struct strmbase_pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 23 +++++++---------------- include/wine/strmbase.h | 2 -- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 2d98168418..9a88246a7f 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -333,16 +333,10 @@ HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, return E_NOTIMPL; /* to tell caller that all input pins connected to all output pins */ } -HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - struct strmbase_pin *This = impl_from_IPin(iface); - TRACE("iface %p, start %s, stop %s, rate %.16e.\n", - iface, debugstr_time(tStart), debugstr_time(tStop), dRate); - - This->tStart = tStart; - This->tStop = tStop; - This->dRate = dRate; + iface, debugstr_time(start), debugstr_time(stop), rate); return S_OK; } @@ -696,7 +690,6 @@ void strmbase_source_init(struct strmbase_source *pin, const IPinVtbl *vtbl, str { memset(pin, 0, sizeof(*pin)); pin->pin.IPin_iface.lpVtbl = vtbl; - pin->pin.dRate = 1.0; pin->pin.filter = filter; pin->pin.dir = PINDIR_OUTPUT; lstrcpyW(pin->pin.name, name); @@ -843,17 +836,16 @@ static HRESULT deliver_newsegment(IPin *pin, LPVOID data) return IPin_NewSegment(pin, args->tStart, args->tStop, args->rate); } -HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args; TRACE("iface %p, start %s, stop %s, rate %.16e.\n", - iface, debugstr_time(tStart), debugstr_time(tStop), dRate); + iface, debugstr_time(start), debugstr_time(stop), rate); - args.tStart = This->pin.tStart = tStart; - args.tStop = This->pin.tStop = tStop; - args.rate = This->pin.dRate = dRate; + args.tStart = start; + args.tStop = stop; + args.rate = rate; return SendFurther( iface, deliver_newsegment, &args, NULL ); } @@ -994,7 +986,6 @@ void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, struct strmbase { memset(pin, 0, sizeof(*pin)); pin->pin.IPin_iface.lpVtbl = vtbl; - pin->pin.dRate = 1.0; pin->pin.filter = filter; pin->pin.dir = PINDIR_INPUT; lstrcpyW(pin->pin.name, name); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 7f9d2cb64d..f87b726d0a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -38,8 +38,6 @@ struct strmbase_pin WCHAR name[128]; IPin *peer; AM_MEDIA_TYPE mtCurrent; - REFERENCE_TIME tStart, tStop; - double dRate; const struct BasePinFuncTable* pFuncsTable; };

1 0

Zebediah Figura : strmbase: Get rid of the unused "cs" parameter to strmbase_video_init().
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 70d2ba7482c61270f84a2e69992d1682771d698e URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d2ba7482c61270f84a2e69… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 11:20:13 2019 -0600 strmbase: Get rid of the unused "cs" parameter to strmbase_video_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 3 +-- dlls/quartz/vmr9.c | 3 +-- dlls/strmbase/video.c | 3 +-- include/wine/strmbase.h | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b21cc281b9..449bd31f68 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -771,8 +771,7 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr)) goto fail; - hr = strmbase_video_init(&pVideoRenderer->baseControlVideo, - &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.filter.csFilter, + hr = strmbase_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 1a4f85c87c..a2ed46d05d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2239,8 +2239,7 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid) goto fail; hr = strmbase_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter, - &pVMR->renderer.filter.csFilter, &pVMR->renderer.sink.pin, - &renderer_BaseControlVideoFuncTable); + &pVMR->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index d1ebbdf235..081794e9b3 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -648,11 +648,10 @@ static const IBasicVideoVtbl basic_video_vtbl = }; HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter, - CRITICAL_SECTION *cs, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) + struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) { video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl; video->pFilter = filter; - video->pInterfaceLock = cs; video->pPin = pin; video->pFuncsTable = func_table; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index f92a375a56..7f9d2cb64d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -477,7 +477,6 @@ typedef struct tagBaseControlVideo IBasicVideo IBasicVideo_iface; struct strmbase_filter *pFilter; - CRITICAL_SECTION* pInterfaceLock; struct strmbase_pin *pPin; const struct BaseControlVideoFuncTable* pFuncsTable; @@ -509,7 +508,7 @@ typedef struct BaseControlVideoFuncTable { } BaseControlVideoFuncTable; HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter, - CRITICAL_SECTION *cs, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table); + struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table); HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo); #endif #endif

1 0

Gijs Vermeulen : odbccp32: Handle NULL sizeout in SQLGetInstalledDrivers.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 3915b8d22921daeb30015b2204ff90f25ca19cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3915b8d22921daeb30015b22… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Nov 16 17:08:44 2019 +0100 odbccp32: Handle NULL sizeout in SQLGetInstalledDrivers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48111 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 3 ++- dlls/odbccp32/tests/misc.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 1198b487f3..a09d6571f3 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -583,7 +583,8 @@ BOOL WINAPI SQLGetInstalledDrivers(char *buf, WORD size, WORD *sizeout) return FALSE; } - *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL); + if (sizeout) + *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, wbuf, written, buf, size, NULL, NULL); heap_free(wbuf); diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index dc2ca7ed3f..e2f48ee732 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -643,6 +643,11 @@ static void test_SQLGetInstalledDrivers(void) ok(!ret, "got %d\n", ret); check_error(ODBC_ERROR_INVALID_BUFF_LEN); + ret = SQLGetInstalledDrivers(buffer, 10, NULL); + ok(ret, "got %d\n", ret); + ok(strlen(buffer) == 8, "got len %u\n", lstrlenA(buffer)); + ok(!buffer[9], "buffer not doubly null-terminated\n"); + ret = SQLGetInstalledDrivers(buffer, 10, &written); ok(ret, "got %d\n", ret); ok(strlen(buffer) == 8, "got len %u\n", lstrlenA(buffer));

1 0

Alexandre Julliard : mscoree: Store the Mono base directory in Unicode.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: df3c911c635c3c0d236af30ddfff1c618367dd8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=df3c911c635c3c0d236af30d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 17 16:09:37 2019 +0100 mscoree: Store the Mono base directory in Unicode. --- dlls/mscoree/metahost.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 18232a4568..4c1e4e97c1 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -711,7 +711,7 @@ static BOOL get_mono_path_registry(LPWSTR path) static BOOL get_mono_path_dos(const WCHAR *dir, LPWSTR path) { static const WCHAR unix_prefix[] = {'\\','\\','?','\\','u','n','i','x','\\'}; - static const char basedir[] = "\\wine-mono-" WINE_MONO_VERSION; + static const WCHAR basedir[] = L"\\wine-mono-" WINE_MONO_VERSION; LPWSTR dos_dir; WCHAR mono_dll_path[MAX_PATH]; DWORD len; @@ -720,10 +720,10 @@ static BOOL get_mono_path_dos(const WCHAR *dir, LPWSTR path) if (memcmp(dir, unix_prefix, sizeof(unix_prefix)) == 0) return FALSE; /* No drive letter for this directory */ - len = lstrlenW( dir ) + MultiByteToWideChar( CP_UNIXCP, 0, basedir, -1, NULL, 0 ); + len = lstrlenW( dir ) + lstrlenW( basedir ) + 1; if (!(dos_dir = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; lstrcpyW( dos_dir, dir ); - MultiByteToWideChar( CP_UNIXCP, 0, basedir, -1, dos_dir + lstrlenW(dos_dir), len - lstrlenW(dos_dir)); + lstrcatW( dos_dir, basedir ); ret = find_mono_dll(dos_dir, mono_dll_path); if (ret)

1 0

Alexandre Julliard : appwiz.cpl: Use Unicode strings for addons file names.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 0a443c1f36c9f7fd8242f129dbbfcc4604cf8e2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a443c1f36c9f7fd8242f129… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 17 15:58:59 2019 +0100 appwiz.cpl: Use Unicode strings for addons file names. --- dlls/appwiz.cpl/addons.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 350c25ef90..8d4be64930 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -63,8 +63,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); typedef struct { const char *version; - const char *file_name; - const char *subdir_name; + const WCHAR *file_name; + const WCHAR *subdir_name; const char *sha; const char *url_default; const char *config_key; @@ -79,8 +79,8 @@ typedef struct { static const addon_info_t addons_info[] = { { GECKO_VERSION, - "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", - "gecko", + L"wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", + L"gecko", GECKO_SHA, "http://source.winehq.org/winegecko.php", "MSHTML", "GeckoUrl", "GeckoCabDir", @@ -88,8 +88,8 @@ static const addon_info_t addons_info[] = { }, { MONO_VERSION, - "wine-mono-" MONO_VERSION ".msi", - "mono", + L"wine-mono-" MONO_VERSION ".msi", + L"mono", MONO_SHA, "http://source.winehq.org/winemono.php", "Dotnet", "MonoUrl", "MonoCabDir", @@ -198,28 +198,23 @@ static enum install_res install_file(const WCHAR *file_name) return INSTALL_OK; } -static enum install_res install_from_dos_file(const WCHAR *dir, const char *subdir, const char *file_name) +static enum install_res install_from_dos_file(const WCHAR *dir, const WCHAR *subdir, const WCHAR *file_name) { - static const WCHAR ntprefixW[] = {'\\','?','?','\\',0}; WCHAR *path; enum install_res ret; int len = lstrlenW( dir ); int size = len + 1; - size += MultiByteToWideChar( CP_UNIXCP, 0, subdir, -1, NULL, 0 ); - size += MultiByteToWideChar( CP_UNIXCP, 0, file_name, -1, NULL, 0 ); + size += lstrlenW( subdir ) + lstrlenW( file_name ) + 2; if (!(path = heap_alloc( size * sizeof(WCHAR) ))) return INSTALL_FAILED; lstrcpyW( path, dir ); - if (!wcsncmp( path, ntprefixW, wcslen(ntprefixW) )) path[1] = '\\'; /* change \??\ into \\?\ */ + if (!wcsncmp( path, L"\\??\\", 4 )) path[1] = '\\'; /* change \??\ into \\?\ */ if (len && path[len-1] != '/' && path[len-1] != '\\') path[len++] = '\\'; - if (*subdir) - { - len += MultiByteToWideChar( CP_UNIXCP, 0, subdir, -1, path + len, size - len ); - path[len - 1] = '\\'; - } - MultiByteToWideChar( CP_UNIXCP, 0, file_name, -1, path + len, size - len ); + lstrcpyW( path + len, subdir ); + lstrcatW( path, L"\\" ); + lstrcatW( path, file_name ); if (GetFileAttributesW( path ) == INVALID_FILE_ATTRIBUTES) { @@ -234,7 +229,7 @@ static enum install_res install_from_dos_file(const WCHAR *dir, const char *subd return ret; } -static enum install_res install_from_unix_file(const char *dir, const char *subdir, const char *file_name) +static enum install_res install_from_unix_file(const char *dir, const WCHAR *subdir, const WCHAR *file_name) { WCHAR *dos_dir; enum install_res ret = INSTALL_NEXT; @@ -290,7 +285,7 @@ static enum install_res install_from_registered_dir(void) return INSTALL_FAILED; } - ret = install_from_unix_file(package_dir, "", addon->file_name); + ret = install_from_unix_file(package_dir, L"", addon->file_name); heap_free(package_dir); return ret; @@ -357,8 +352,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) return NULL; } - size = lstrlenW( cache_dir ) + ARRAY_SIZE(wineW); - size += MultiByteToWideChar( CP_UNIXCP, 0, addon->file_name, -1, NULL, 0 ); + size = lstrlenW( cache_dir ) + ARRAY_SIZE(wineW) + lstrlenW( addon->file_name ) + 1; if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) { heap_free( cache_dir ); @@ -376,7 +370,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) } len = lstrlenW( ret ); ret[len++] = '\\'; - MultiByteToWideChar( CP_UNIXCP, 0, addon->file_name, -1, ret + len, size - len ); + lstrcpyW( ret + len, addon->file_name ); TRACE( "got %s\n", debugstr_w(ret) ); return ret;

1 0

Alexandre Julliard : kernel32: Move Get/SetCalendarInfo to kernelbase.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: ab6970d9b09d763ccd27660e706dff157b6195e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6970d9b09d763ccd27660e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 21:27:00 2019 +0100 kernel32: Move Get/SetCalendarInfo to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/time.c | 227 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/locale.c | 204 ++++++++++++++++++++++++++++++++++++ 4 files changed, 210 insertions(+), 233 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab6970d9b09d763ccd27…

1 0

Alexandre Julliard : kernel32: Move EnumCalendarInfo functions to kernelbase.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 42ed9797b1929fc5917bd967f7062cab953fab55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42ed9797b1929fc5917bd967… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 21:00:08 2019 +0100 kernel32: Move EnumCalendarInfo functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/lcformat.c | 261 ---------------------------------------- dlls/kernel32/locale.c | 19 +++ dlls/kernelbase/kernelbase.spec | 8 +- dlls/kernelbase/locale.c | 86 +++++++++++++ 5 files changed, 112 insertions(+), 268 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42ed9797b1929fc5917b…

1 0

Alexandre Julliard : kernel32: Move EnumTimeFormats functions to kernelbase.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 50d15730dfa3f44bee722e777989d03b86bc35ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=50d15730dfa3f44bee722e77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 20:11:21 2019 +0100 kernel32: Move EnumTimeFormats functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/lcformat.c | 122 ---------------------------------------- dlls/kernel32/locale.c | 19 +++++++ dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/locale.c | 64 +++++++++++++++++++++ 5 files changed, 88 insertions(+), 127 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a7043c223d..3f6943a29d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -426,8 +426,8 @@ @ stdcall -import EnumSystemLocalesEx(ptr long long ptr) @ stdcall -import EnumSystemLocalesW(ptr long) @ stdcall EnumTimeFormatsA(ptr long long) -@ stdcall EnumTimeFormatsEx(ptr wstr long long) -@ stdcall EnumTimeFormatsW(ptr long long) +@ stdcall -import EnumTimeFormatsEx(ptr wstr long long) +@ stdcall -import EnumTimeFormatsW(ptr long long) @ stdcall EnumUILanguagesA(ptr long long) @ stdcall -import EnumUILanguagesW(ptr long long) # @ stub EnumerateLocalComputerNamesA diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 6a6a5174c0..28e305a8ee 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1780,128 +1780,6 @@ enum enum_callback_type { CALLBACK_ENUMPROCEXEX }; -struct enumtimeformats_context { - enum enum_callback_type type; /* callback kind */ - union { - TIMEFMT_ENUMPROCW callback; /* user callback pointer */ - TIMEFMT_ENUMPROCEX callbackex; - } u; - LCID lcid; /* locale of interest */ - DWORD flags; - LPARAM lParam; - BOOL unicode; /* A vs W callback type, only for regular and Ex callbacks */ -}; - -static BOOL NLS_EnumTimeFormats(struct enumtimeformats_context *ctxt) -{ - WCHAR bufW[256]; - char bufA[256]; - LCTYPE lctype; - INT ret; - - if (!ctxt->u.callback) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - switch (ctxt->flags & ~LOCALE_USE_CP_ACP) - { - case 0: - lctype = LOCALE_STIMEFORMAT; - break; - case TIME_NOSECONDS: - lctype = LOCALE_SSHORTTIME; - break; - default: - FIXME("Unknown time format (%d)\n", ctxt->flags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - lctype |= ctxt->flags & LOCALE_USE_CP_ACP; - if (ctxt->unicode) - ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, ARRAY_SIZE(bufW)); - else - ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, ARRAY_SIZE(bufA)); - - if (ret) - { - switch (ctxt->type) - { - case CALLBACK_ENUMPROC: - ctxt->u.callback(ctxt->unicode ? bufW : (WCHAR*)bufA); - break; - case CALLBACK_ENUMPROCEX: - ctxt->u.callbackex(bufW, ctxt->lParam); - break; - default: - ; - } - } - - return TRUE; -} - -/************************************************************************** - * EnumTimeFormatsA (KERNEL32.@) - * - * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle - * LOCALE_NOUSEROVERRIDE here as well? - */ -BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) -{ - struct enumtimeformats_context ctxt; - - /* EnumTimeFormatsA doesn't support flags, EnumTimeFormatsW does. */ - if (flags & ~LOCALE_USE_CP_ACP) - { - SetLastError(ERROR_INVALID_FLAGS); - return FALSE; - } - - ctxt.type = CALLBACK_ENUMPROC; - ctxt.u.callback = (TIMEFMT_ENUMPROCW)proc; - ctxt.lcid = lcid; - ctxt.flags = flags; - ctxt.unicode = FALSE; - - return NLS_EnumTimeFormats(&ctxt); -} - -/************************************************************************** - * EnumTimeFormatsW (KERNEL32.@) - */ -BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) -{ - struct enumtimeformats_context ctxt; - - ctxt.type = CALLBACK_ENUMPROC; - ctxt.u.callback = proc; - ctxt.lcid = lcid; - ctxt.flags = flags; - ctxt.unicode = TRUE; - - return NLS_EnumTimeFormats(&ctxt); -} - -/************************************************************************** - * EnumTimeFormatsEx (KERNEL32.@) - */ -BOOL WINAPI EnumTimeFormatsEx(TIMEFMT_ENUMPROCEX proc, const WCHAR *locale, DWORD flags, LPARAM lParam) -{ - struct enumtimeformats_context ctxt; - - ctxt.type = CALLBACK_ENUMPROCEX; - ctxt.u.callbackex = proc; - ctxt.lcid = LocaleNameToLCID(locale, 0); - ctxt.flags = flags; - ctxt.lParam = lParam; - ctxt.unicode = TRUE; - - return NLS_EnumTimeFormats(&ctxt); -} - struct enumcalendar_context { enum enum_callback_type type; /* callback kind */ union { diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index f3468949f7..d7f32cbfda 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -66,6 +66,8 @@ extern BOOL WINAPI Internal_EnumLanguageGroupLocales( LANGGROUPLOCALE_ENUMPROCW extern BOOL WINAPI Internal_EnumSystemCodePages( CODEPAGE_ENUMPROCW proc, DWORD flags, BOOL unicode ); extern BOOL WINAPI Internal_EnumSystemLanguageGroups( LANGUAGEGROUP_ENUMPROCW proc, DWORD flags, LONG_PTR param, BOOL unicode ); +extern BOOL WINAPI Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags, + BOOL unicode, BOOL ex, LPARAM lparam ); extern BOOL WINAPI Internal_EnumUILanguages( UILANGUAGE_ENUMPROCW proc, DWORD flags, LONG_PTR param, BOOL unicode ); @@ -3648,6 +3650,23 @@ BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) return Internal_EnumDateFormats( (DATEFMT_ENUMPROCW)proc, lcid, flags, FALSE, FALSE, FALSE, 0 ); } +/************************************************************************** + * EnumTimeFormatsA (KERNEL32.@) + * + * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle + * LOCALE_NOUSEROVERRIDE here as well? + */ +BOOL WINAPI EnumTimeFormatsA( TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags ) +{ + /* EnumTimeFormatsA doesn't support flags, EnumTimeFormatsW does. */ + if (flags & ~LOCALE_USE_CP_ACP) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, lcid, flags, FALSE, FALSE, 0 ); +} + /****************************************************************************** * InvalidateNLSCache (KERNEL32.@) * diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 1cea884e9b..546a52c7ef 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -318,8 +318,8 @@ @ stdcall EnumSystemLocalesA(ptr long) @ stdcall EnumSystemLocalesEx(ptr long long ptr) @ stdcall EnumSystemLocalesW(ptr long) -@ stdcall EnumTimeFormatsEx(ptr wstr long long) kernel32.EnumTimeFormatsEx -@ stdcall EnumTimeFormatsW(ptr long long) kernel32.EnumTimeFormatsW +@ stdcall EnumTimeFormatsEx(ptr wstr long long) +@ stdcall EnumTimeFormatsW(ptr long long) @ stdcall EnumUILanguagesW(ptr long long) # @ stub EnumerateStateAtomValues # @ stub EnumerateStateContainerItems @@ -830,7 +830,7 @@ @ stdcall Internal_EnumSystemCodePages(ptr long long) @ stdcall Internal_EnumSystemLanguageGroups(ptr long ptr long) @ stub Internal_EnumSystemLocales -@ stub Internal_EnumTimeFormats +@ stdcall Internal_EnumTimeFormats(ptr long long long long long) @ stdcall Internal_EnumUILanguages(ptr long long long) # @ stub InternetTimeFromSystemTimeA # @ stub InternetTimeFromSystemTimeW diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2e1e76c4d7..473e6e2391 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -244,6 +244,50 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumSystemLanguageGroups( LANGUAGEGROUP_E } +/************************************************************************** + * Internal_EnumTimeFormats (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags, + BOOL unicode, BOOL ex, LPARAM lparam ) +{ + WCHAR buffer[256]; + LCTYPE lctype; + INT ret; + + if (!proc) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + switch (flags & ~LOCALE_USE_CP_ACP) + { + case 0: + lctype = LOCALE_STIMEFORMAT; + break; + case TIME_NOSECONDS: + lctype = LOCALE_SSHORTTIME; + break; + default: + FIXME( "Unknown time format %x\n", flags ); + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + lctype |= flags & LOCALE_USE_CP_ACP; + if (unicode) + ret = GetLocaleInfoW( lcid, lctype, buffer, ARRAY_SIZE(buffer) ); + else + ret = GetLocaleInfoA( lcid, lctype, (char *)buffer, sizeof(buffer) ); + + if (ret) + { + if (ex) ((TIMEFMT_ENUMPROCEX)proc)( buffer, lparam ); + else proc( buffer ); + } + return TRUE; +} + + /****************************************************************************** * Internal_EnumUILanguages (kernelbase.@) */ @@ -475,6 +519,26 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemLocalesEx( LOCALE_ENUMPROCEX proc, DWORD } +/************************************************************************** + * EnumTimeFormatsW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsW( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags ) +{ + return Internal_EnumTimeFormats( proc, lcid, flags, TRUE, FALSE, 0 ); +} + + +/************************************************************************** + * EnumTimeFormatsEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsEx( TIMEFMT_ENUMPROCEX proc, const WCHAR *locale, + DWORD flags, LPARAM lparam ) +{ + LCID lcid = LocaleNameToLCID( locale, 0 ); + return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, lcid, flags, TRUE, TRUE, lparam ); +} + + /****************************************************************************** * FindStringOrdinal (kernelbase.@) */

1 0

Alexandre Julliard : kernel32: Move EnumDateFormats functions to kernelbase.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 02d9ccb3c3903550c3206ca0ee6c59de30470e35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d9ccb3c3903550c3206ca0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 19:57:12 2019 +0100 kernel32: Move EnumDateFormats functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/lcformat.c | 173 ---------------------------------------- dlls/kernel32/locale.c | 24 ++++++ dlls/kernelbase/kernelbase.spec | 8 +- dlls/kernelbase/locale.c | 83 +++++++++++++++++++ 5 files changed, 114 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02d9ccb3c3903550c320…

1 0

Alexandre Julliard : Wine release 4.20
by Alexandre Julliard 15 Nov '19

15 Nov '19

Module: website Branch: master Commit: 19e82fb9d5402e41d5409ee698b03630013fe80a URL: https://source.winehq.org/git/website.git/?a=commit;h=19e82fb9d5402e41d5409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 15 23:55:37 2019 +0100 Wine release 4.20 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019111501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2019111501.xml b/news/en/2019111501.xml new file mode 100644 index 00000000..4f78e8ef --- /dev/null +++ b/news/en/2019111501.xml @@ -0,0 +1,16 @@ +<news> +<date>November 15, 2019</date> +<title>Wine 4.20 Released</title> +<body> + The Wine development release 4.20 is now available. + <a href="{$root}/announce/4.20">What's new</a> in this release: +<ul> + <li>New version of the Mono engine with an FNA update.</li> + <li>Code persistence in VBScript and JScript.</li> + <li>Vulkan spec updates.</li> + <li>Improved support for LLVM MinGW.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.20.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

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 November 2019