June 2016 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : include: Add ID3D10InfoQueue interface.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 5e27e038093f6d21ef5020d6234a999ae909d4a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e27e038093f6d21ef5020d62… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 3 15:26:39 2016 +0200 include: Add ID3D10InfoQueue interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3d10.idl | 2 +- include/d3d10sdklayers.idl | 676 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 678 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e27e038093f6d21ef502…

1 0

Alistair Leslie-Hughes : d3d10_1/tests: Test for ID3D10InfoQueue interface.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: d94a2c9bb82684997af6a85af645acb8c50874ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94a2c9bb82684997af6a85af… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 3 15:26:40 2016 +0200 d3d10_1/tests: Test for ID3D10InfoQueue interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index f5b1454..f70b4ff 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -297,6 +297,9 @@ static void test_device_interfaces(void) "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(iface); + hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10InfoQueue, (void **)&iface); + ok(hr == E_NOINTERFACE, "Found ID3D10InfoQueue interface in non-debug mode, hr %#x.\n", hr); + hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); ok(SUCCEEDED(hr), "Device should implement ID3D10Device interface, hr %#x.\n", hr); IUnknown_Release(iface); @@ -309,6 +312,26 @@ static void test_device_interfaces(void) refcount = ID3D10Device1_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } + + for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + { + struct device_desc device_desc; + + device_desc.feature_level = d3d10_feature_levels[i]; + device_desc.flags = D3D10_CREATE_DEVICE_DEBUG; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device for feature level %#x.\n", d3d10_feature_levels[i]); + continue; + } + + hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10InfoQueue, (void **)&iface); + todo_wine ok(hr == S_OK, "Device should implement ID3D10InfoQueue interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D10Device1_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } } static void test_create_shader_resource_view(void)

1 0

Andrey Gusev : d3dx9_36: Fix typos in comments.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: d8641197c041763c2c9784f4b4a8b3dba2bbf0cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8641197c041763c2c9784f4b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 23:45:42 2016 +0300 d3dx9_36: Fix typos in comments. Signed-off-by: Andrey Gusev <andrey.goosev(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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7772406..fd8d59e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -198,7 +198,7 @@ static const struct } state_table[] = { - /* Render sates */ + /* Render states */ {SC_RENDERSTATE, D3DRS_ZENABLE, "D3DRS_ZENABLE"}, /* 0x0 */ {SC_RENDERSTATE, D3DRS_FILLMODE, "D3DRS_FILLMODE"}, {SC_RENDERSTATE, D3DRS_SHADEMODE, "D3DRS_SHADEMODE"}, @@ -350,7 +350,7 @@ state_table[] = {SC_LIGHT, LT_ATTENUATION2, "LightAttenuation2"}, {SC_LIGHT, LT_THETA, "LightTheta"}, {SC_LIGHT, LT_PHI, "LightPhi"}, /* 0x90 */ - /* Ligthenable */ + /* Lightenable */ {SC_LIGHTENABLE, 0, "LightEnable"}, /* Vertexshader */ {SC_VERTEXSHADER, 0, "Vertexshader"},

1 0

Andrey Gusev : hlink/tests: Fix a typo in ok() messages.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: b9bbce9c74859076db4533e0c4f1a8ff847ff487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9bbce9c74859076db4533e0c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 23:48:25 2016 +0300 hlink/tests: Fix a typo in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index fc84b54..a913fb1 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -637,7 +637,7 @@ static void test_HlinkParseDisplayName(void) ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); - ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); ok(!lstrcmpW(name, winehq_urlW), "wrong display name %s\n", wine_dbgstr_w(name)); CoTaskMemFree(name); @@ -664,7 +664,7 @@ static void test_HlinkParseDisplayName(void) ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); - ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); ok(!lstrcmpW(name, invalid_urlW), "wrong display name %s\n", wine_dbgstr_w(name)); CoTaskMemFree(name); @@ -680,7 +680,7 @@ static void test_HlinkParseDisplayName(void) ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); - ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); ok(!lstrcmpW(name, file_urlW+8), "wrong display name %s\n", wine_dbgstr_w(name)); CoTaskMemFree(name);

1 0

Andrey Gusev : kernel32/tests: Fix a typo in ok() messages.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 2f5d04aaeb2197af2cda519fcf692a47ba3f5804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5d04aaeb2197af2cda519fc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 23:50:20 2016 +0300 kernel32/tests: Fix a typo in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index e0de3f9..034bdaa 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1644,7 +1644,7 @@ static void test_thread_actctx(void) handle = (void*)0xdeadbeef; b = pGetCurrentActCtx(&handle); - ok(b, "GetCurentActCtx failed: %u\n", GetLastError()); + ok(b, "GetCurrentActCtx failed: %u\n", GetLastError()); ok(handle == 0, "active context %p\n", handle); /* without active context */ @@ -1663,7 +1663,7 @@ static void test_thread_actctx(void) handle = 0; b = pGetCurrentActCtx(&handle); - ok(b, "GetCurentActCtx failed: %u\n", GetLastError()); + ok(b, "GetCurrentActCtx failed: %u\n", GetLastError()); ok(handle != 0, "no active context\n"); pReleaseActCtx(handle);

1 0

Andrey Gusev : user32/tests: Fix a typo in ok() messages.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 647ecec46d323bd1912ce17f09a0364b03de5c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=647ecec46d323bd1912ce17f0… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 23:55:32 2016 +0300 user32/tests: Fix a typo in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e39f8a1..52cf901 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7457,7 +7457,7 @@ static void test_interthread_messages(void) handle = (void*)0xdeadbeef; ret = pGetCurrentActCtx(&handle); - ok(ret, "GetCurentActCtx failed: %u\n", GetLastError()); + ok(ret, "GetCurrentActCtx failed: %u\n", GetLastError()); ok(handle == 0, "active context %p\n", handle); wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); @@ -7472,7 +7472,7 @@ static void test_interthread_messages(void) handle = 0; ret = pGetCurrentActCtx(&handle); - ok(ret, "GetCurentActCtx failed: %u\n", GetLastError()); + ok(ret, "GetCurrentActCtx failed: %u\n", GetLastError()); ok(handle != 0, "active context %p\n", handle); pReleaseActCtx(handle);

1 0

Andrey Gusev : urlmon/tests: Fix a typo in ok() message.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 805092f8f6a69677e8ca996cf447aac641b19039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805092f8f6a69677e8ca996cf… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 23:53:58 2016 +0300 urlmon/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index dcf0970..40c0ca9 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1636,7 +1636,7 @@ static void test_MkParseDisplayNameEx(void) ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, NULL, 0, &name); - ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); ok(!lstrcmpW(name, url9), "wrong display name %s\n", wine_dbgstr_w(name)); CoTaskMemFree(name);

1 0

Andrey Gusev : server: Fix a typo in comment.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 9035e58e6758ebde3fbd010f868acbc4b251b635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9035e58e6758ebde3fbd010f8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 3 00:00:13 2016 +0300 server: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 4d275f0..93f785a 100644 --- a/server/console.c +++ b/server/console.c @@ -486,7 +486,7 @@ int free_console( struct process *process ) /* let process inherit the console from parent... this handle two cases : * 1/ generic console inheritance * 2/ parent is a renderer which launches process, and process should attach to the console - * renderered by parent + * rendered by parent */ void inherit_console(struct thread *parent_thread, struct process *process, obj_handle_t hconin) {

1 0

Ken Thomases : winemac: Use a more idiomatic pattern for an autorelease pool around a loop.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: bdbb3514bb08e1deed99e39b1fe29fec5a366b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbb3514bb08e1deed99e39b1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 3 00:06:48 2016 -0500 winemac: Use a more idiomatic pattern for an autorelease pool around a loop. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index f64de31..dced704 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2318,11 +2318,11 @@ static NSString* WineLocalizedString(unsigned int stringID) */ static void PerformRequest(void *info) { + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; WineApplicationController* controller = [WineApplicationController sharedController]; for (;;) { - NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; __block dispatch_block_t block; dispatch_sync(controller->requestsManipQueue, ^{ @@ -2336,15 +2336,16 @@ static void PerformRequest(void *info) }); if (!block) - { - [pool release]; break; - } block(); [block release]; + [pool release]; + pool = [[NSAutoreleasePool alloc] init]; } + + [pool release]; } /***********************************************************************

1 0

Ken Thomases : winemac: Fix the logic for checking if a view is already in the intended z-order.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 102cd6dcaea6d419dd72e397141df2c01f3fe3cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=102cd6dcaea6d419dd72e3971… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 3 00:06:49 2016 -0500 winemac: Fix the logic for checking if a view is already in the intended z-order. -[NSView subviews] returns the views in back-to-front order, not front-to-back as I had thought. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1b0f9cc..0b975f2 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3343,11 +3343,11 @@ void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, ma { NSArray* subviews = [superview subviews]; NSUInteger index = [subviews indexOfObjectIdenticalTo:view]; - if (!prev && !next && index == 0) + if (!prev && !next && index == [subviews count] - 1) return; - if (prev && index > 0 && [subviews objectAtIndex:index - 1] == prev) + if (prev && index + 1 < [subviews count] && [subviews objectAtIndex:index + 1] == prev) return; - if (!prev && next && index + 1 < [subviews count] && [subviews objectAtIndex:index + 1] == next) + if (!prev && next && index > 0 && [subviews objectAtIndex:index - 1] == next) return; }

1 0