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

Alexandre Julliard : tools: Add more spec files to synchronize automatically.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 6744fec6c7e444600bf7fc665df95500c34a56f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6744fec6c7e444600bf7fc665… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 11:13:08 2011 +0200 tools: Add more spec files to synchronize automatically. --- tools/make_specfiles | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 2ead737..73dd2bf 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -70,6 +70,38 @@ my @dll_groups = "d3dx9_25", "d3dx9_24", ], + [ + "d3dx10_43", + "d3dx10_42", + "d3dx10_41", + "d3dx10_40", + "d3dx10_39", + "d3dx10_38", + "d3dx10_37", + "d3dx10_36", + "d3dx10_35", + "d3dx10_34", + "d3dx10_33", + ], + [ + "d3dcompiler_43", + "d3dcompiler_42", + "d3dcompiler_41", + "d3dcompiler_40", + "d3dcompiler_39", + "d3dcompiler_38", + "d3dcompiler_37", + "d3dcompiler_36", + "d3dcompiler_35", + "d3dcompiler_34", + "d3dcompiler_33", + ], + [ + "xinput1_3", + "xinput1_2", + "xinput1_1", + "xinput9_1_0", + ], ); my $update_flags = 0;

1 0

Alexandre Julliard : d3dcompiler: Specify arguments for stub entry points that are used in forwards.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: cd2beae51b1db29e0d7659ac68f0c81cddd49c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd2beae51b1db29e0d7659ac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 14:23:45 2011 +0200 d3dcompiler: Specify arguments for stub entry points that are used in forwards. --- dlls/d3dcompiler_43/d3dcompiler_43.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index d7e0305..6cbee43 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -4,8 +4,8 @@ @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr) @ stub D3DDecompressShaders -@ stub D3DDisassemble10Effect -@ stub D3DDisassemble +@ stub D3DDisassemble10Effect(ptr long ptr) +@ stub D3DDisassemble(ptr long long ptr ptr) @ stdcall D3DGetBlobPart(ptr long long long ptr) @ stdcall D3DGetDebugInfo(ptr long ptr) @ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr)

1 0

Nicolas Le Cam : gdi32: Remove a set but unused variable.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 46988651d91fbea7f611287e5d8320239e72108d URL: http://source.winehq.org/git/wine.git/?a=commit;h=46988651d91fbea7f611287e5… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Fri Apr 29 23:57:09 2011 +0200 gdi32: Remove a set but unused variable. --- dlls/gdi32/metafile.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index dae991f..fbc88d1 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -394,7 +394,6 @@ static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) WORD i; HPEN hPen; HBRUSH hBrush; - HFONT hFont; HPALETTE hPal; HRGN hRgn; BOOL loaded = FALSE; @@ -409,7 +408,6 @@ static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) /* save DC */ hPen = GetCurrentObject(hdc, OBJ_PEN); hBrush = GetCurrentObject(hdc, OBJ_BRUSH); - hFont = GetCurrentObject(hdc, OBJ_FONT); hPal = GetCurrentObject(hdc, OBJ_PAL); hRgn = CreateRectRgn(0, 0, 0, 0);

1 0

Francois Gouget : wined3d: Make wined3d_event_query_test() and resource_get_type() static.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 6c8c68f7b6cef598a677edb76ddb5d45f0d00cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8c68f7b6cef598a677edb76… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 3 00:37:55 2011 +0200 wined3d: Make wined3d_event_query_test() and resource_get_type() static. --- dlls/wined3d/query.c | 2 +- dlls/wined3d/resource.c | 6 ------ dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1751609..4e1eed27 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -37,7 +37,7 @@ void wined3d_event_query_destroy(struct wined3d_event_query *query) HeapFree(GetProcessHeap(), 0, query); } -enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) +static enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) { struct wined3d_context *context; const struct wined3d_gl_info *gl_info; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index cdc483d..3807e89 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -272,12 +272,6 @@ DWORD resource_get_priority(const struct wined3d_resource *resource) return resource->priority; } -WINED3DRESOURCETYPE resource_get_type(const struct wined3d_resource *resource) -{ - TRACE("resource %p, returning %#x.\n", resource, resource->resourceType); - return resource->resourceType; -} - void * CDECL wined3d_resource_get_parent(const struct wined3d_resource *resource) { return resource->parent; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17bcc7a..955595c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1027,7 +1027,6 @@ enum wined3d_event_query_result }; void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HIDDEN; -enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; enum wined3d_event_query_result wined3d_event_query_finish(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; @@ -1838,7 +1837,6 @@ HRESULT resource_init(struct wined3d_resource *resource, IWineD3DDeviceImpl *dev DWORD usage, WINED3DPOOL pool, UINT width, UINT height, UINT depth, UINT size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; -WINED3DRESOURCETYPE resource_get_type(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) DECLSPEC_HIDDEN; HRESULT resource_set_private_data(struct wined3d_resource *resource, REFGUID guid, const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN;

1 0

Francois Gouget : winefile: Fix the View and Options menu handles.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 7d460a4ea87b58cc449836a60231f89f64de4293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d460a4ea87b58cc449836a60… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 3 00:38:44 2011 +0200 winefile: Fix the View and Options menu handles. --- programs/winefile/winefile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 51a889d..1b56308 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -4558,8 +4558,8 @@ static BOOL show_frame(HWND hwndParent, int cmdshow, LPCWSTR path) hMenuWindow = GetSubMenu(hMenuFrame, GetMenuItemCount(hMenuFrame)-2); Globals.hMenuFrame = hMenuFrame; - Globals.hMenuView = GetSubMenu(hMenuFrame, 3); - Globals.hMenuOptions = GetSubMenu(hMenuFrame, 4); + Globals.hMenuView = GetSubMenu(hMenuFrame, 2); + Globals.hMenuOptions = GetSubMenu(hMenuFrame, 3); ccs.hWindowMenu = hMenuWindow; ccs.idFirstChild = IDW_FIRST_CHILD;

1 0

Huw Davies : gdi32/tests: Allow broken behaviour for nt4 sp1 and sp2.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 3a91df11e10d1b6b7fe8167ccbeece56430d3d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a91df11e10d1b6b7fe8167cc… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 3 12:14:32 2011 +0100 gdi32/tests: Allow broken behaviour for nt4 sp1 and sp2. --- dlls/gdi32/tests/dib.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 7bc48f3..57a2969 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -388,7 +388,9 @@ static void test_simple_graphics(void) ok(ds.dsBitfields[0] == 0, "got %08x\n", ds.dsBitfields[0]); ok(ds.dsBitfields[1] == 0, "got %08x\n", ds.dsBitfields[1]); ok(ds.dsBitfields[2] == 0, "got %08x\n", ds.dsBitfields[2]); - ok(ds.dsBmih.biCompression == BI_RGB, "got %x\n", ds.dsBmih.biCompression); + ok(ds.dsBmih.biCompression == BI_RGB || + broken(ds.dsBmih.biCompression == BI_BITFIELDS), /* nt4 sp1 and 2 */ + "got %x\n", ds.dsBmih.biCompression); orig_bm = SelectObject(mem_dc, dib);

1 0

Alexandre Julliard : d3dx9_36: Specify arguments for stub entry points.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: f9c75812e49d4d9401950627496b864c733f26c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c75812e49d4d94019506274… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 14:21:21 2011 +0200 d3dx9_36: Specify arguments for stub entry points. --- dlls/d3dx9_36/d3dx9_36.spec | 304 +++++++++++++++++++++--------------------- 1 files changed, 152 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c75812e49d4d9401950…

1 0

Henri Verbeet : d3d8/tests: Add a test for window styles on device creation .
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 7b44caa7520d18a226cbd36d3bd63bdfeb09e246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b44caa7520d18a226cbd36d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 2 22:16:39 2011 +0200 d3d8/tests: Add a test for window styles on device creation. --- dlls/d3d8/tests/device.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 557eec1..16fc22b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2182,6 +2182,80 @@ cleanup: DestroyWindow(hwnd); } +static void test_window_style(void) +{ + RECT focus_rect, fullscreen_rect, r; + LONG device_style, device_exstyle; + LONG focus_style, focus_exstyle; + LONG style, expected_style; + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + ULONG ref; + + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + return; + } + + focus_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + device_exstyle = GetWindowLongA(device_window, GWL_EXSTYLE); + focus_style = GetWindowLongA(focus_window, GWL_STYLE); + focus_exstyle = GetWindowLongA(focus_window, GWL_EXSTYLE); + + SetRect(&fullscreen_rect, 0, 0, screen_width, screen_height); + GetWindowRect(focus_window, &focus_rect); + + device = create_device(d3d8, device_window, focus_window, FALSE); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | WS_VISIBLE; + todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x.\n", + expected_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x.\n", + expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetClientRect(device_window, &r); + todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + GetWindowRect(focus_window, &r); + ok(EqualRect(&r, &focus_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, + r.left, r.top, r.right, r.bottom); + + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + IDirect3D8_Release(d3d8); + + DestroyWindow(device_window); + DestroyWindow(focus_window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -2230,6 +2304,7 @@ START_TEST(device) test_wndproc(); test_wndproc_windowed(); test_depth_stencil_size(); + test_window_style(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : d3d9/tests: Destroy the window after we' re done with it in test_reset().
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 02f0d82d24646c209a74befc5f3a7c92276d9fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f0d82d24646c209a74befc5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 2 22:16:36 2011 +0200 d3d9/tests: Destroy the window after we're done with it in test_reset(). --- dlls/d3d9/tests/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b377bee..55b6982 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1229,6 +1229,7 @@ cleanup: ok(!refcount, "Device has %u references left.\n", refcount); } if (pD3d) IDirect3D9_Release(pD3d); + if (hwnd) DestroyWindow(hwnd); } /* Test adapter display modes */

1 0

Francois Gouget : msxml3: Make a bunch of XSLPattern_*() functions static.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 8a8c8bbd868762d3b065d00cecdf52bffb7c3fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8c8bbd868762d3b065d00ce… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 3 00:35:31 2011 +0200 msxml3: Make a bunch of XSLPattern_*() functions static. --- dlls/msxml3/selection.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index abd9347..e0f30c3 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -500,7 +500,7 @@ static dispex_static_data_t domselection_dispex = { } -void XSLPattern_index(xmlXPathParserContextPtr pctx, int nargs) +static void XSLPattern_index(xmlXPathParserContextPtr pctx, int nargs) { XSLPATTERN_CHECK_ARGS(0); @@ -508,7 +508,7 @@ void XSLPattern_index(xmlXPathParserContextPtr pctx, int nargs) xmlXPathReturnNumber(pctx, xmlXPathPopNumber(pctx) - 1.0); } -void XSLPattern_end(xmlXPathParserContextPtr pctx, int nargs) +static void XSLPattern_end(xmlXPathParserContextPtr pctx, int nargs) { double pos, last; XSLPATTERN_CHECK_ARGS(0); @@ -520,13 +520,13 @@ void XSLPattern_end(xmlXPathParserContextPtr pctx, int nargs) xmlXPathReturnBoolean(pctx, pos == last); } -void XSLPattern_nodeType(xmlXPathParserContextPtr pctx, int nargs) +static void XSLPattern_nodeType(xmlXPathParserContextPtr pctx, int nargs) { XSLPATTERN_CHECK_ARGS(0); xmlXPathReturnNumber(pctx, pctx->context->node->type); } -void XSLPattern_OP_IEq(xmlXPathParserContextPtr pctx, int nargs) +static void XSLPattern_OP_IEq(xmlXPathParserContextPtr pctx, int nargs) { xmlChar *arg1, *arg2; XSLPATTERN_CHECK_ARGS(2); @@ -538,7 +538,7 @@ void XSLPattern_OP_IEq(xmlXPathParserContextPtr pctx, int nargs) xmlFree(arg2); } -void XSLPattern_OP_INEq(xmlXPathParserContextPtr pctx, int nargs) +static void XSLPattern_OP_INEq(xmlXPathParserContextPtr pctx, int nargs) { xmlChar *arg1, *arg2; XSLPATTERN_CHECK_ARGS(2); @@ -550,7 +550,7 @@ void XSLPattern_OP_INEq(xmlXPathParserContextPtr pctx, int nargs) xmlFree(arg2); } -void XSLPattern_OP_ILt(xmlXPathParserContextPtr pctx, int nargs) +static void XSLPattern_OP_ILt(xmlXPathParserContextPtr pctx, int nargs) { xmlChar *arg1, *arg2; XSLPATTERN_CHECK_ARGS(2); @@ -562,7 +562,7 @@ void XSLPattern_OP_ILt(xmlXPathParserContextPtr pctx, int nargs) xmlFree(arg2); } -void XSLPattern_OP_ILEq(xmlXPathParserContextPtr pctx, int nargs) +static void XSLPattern_OP_ILEq(xmlXPathParserContextPtr pctx, int nargs) { xmlChar *arg1, *arg2; XSLPATTERN_CHECK_ARGS(2); @@ -574,7 +574,7 @@ void XSLPattern_OP_ILEq(xmlXPathParserContextPtr pctx, int nargs) xmlFree(arg2); } -void XSLPattern_OP_IGt(xmlXPathParserContextPtr pctx, int nargs) +static void XSLPattern_OP_IGt(xmlXPathParserContextPtr pctx, int nargs) { xmlChar *arg1, *arg2; XSLPATTERN_CHECK_ARGS(2); @@ -586,7 +586,7 @@ void XSLPattern_OP_IGt(xmlXPathParserContextPtr pctx, int nargs) xmlFree(arg2); } -void XSLPattern_OP_IGEq(xmlXPathParserContextPtr pctx, int nargs) +static void XSLPattern_OP_IGEq(xmlXPathParserContextPtr pctx, int nargs) { xmlChar *arg1, *arg2; XSLPATTERN_CHECK_ARGS(2);

1 0