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

Frédéric Delanoy : dplayx: Remove dead code ( Clang).
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: 6ae1bfe20f2fb21241fd1cd20f6968a93fa61baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae1bfe20f2fb21241fd1cd20… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 3 20:28:29 2011 +0200 dplayx: Remove dead code (Clang). --- dlls/dplayx/dplay.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 0c33bb3..501b749 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3391,8 +3391,6 @@ static void DP_CopySessionDesc( LPDPSESSIONDESC2 lpSessionDest, lstrcpyA( (LPSTR)lpStartOfFreeSpace, lpSessionDest->u2.lpszPasswordA ); lpSessionDest->u2.lpszPasswordA = (LPSTR)lpStartOfFreeSpace; - lpStartOfFreeSpace += - lstrlenA( lpSessionDest->u2.lpszPasswordA ) + 1; } } else /* UNICODE */ @@ -3411,8 +3409,6 @@ static void DP_CopySessionDesc( LPDPSESSIONDESC2 lpSessionDest, lstrcpyW( (LPWSTR)lpStartOfFreeSpace, lpSessionDest->u2.lpszPassword ); lpSessionDest->u2.lpszPassword = (LPWSTR)lpStartOfFreeSpace; - lpStartOfFreeSpace += sizeof(WCHAR) * - ( lstrlenW( lpSessionDest->u2.lpszPassword ) + 1 ); } } } @@ -4593,8 +4589,6 @@ static HRESULT DP_SendEx ( DP_FindPlayer( This, idTo ) != NULL ) ) { - bValidDestination = TRUE; - /* Have the service provider send this message */ /* FIXME: Could optimize for local interface sends */ return DP_SP_SendEx( This, dwFlags, lpData, dwDataSize, dwPriority,

1 0

Dylan Smith : richedit: Fix incorrect GUID values for ITextHost and ITextHost2.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: 82da77c0a6903a414591f77621a41e1460f02310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82da77c0a6903a414591f7762… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 4 00:44:00 2011 -0400 richedit: Fix incorrect GUID values for ITextHost and ITextHost2. --- dlls/msftedit/msftedit.spec | 6 +++--- dlls/riched20/richole.c | 10 +++------- dlls/riched20/tests/txtsrv.c | 4 ++-- include/textserv.h | 5 ++--- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/msftedit/msftedit.spec b/dlls/msftedit/msftedit.spec index 0dd878d..5f71886 100644 --- a/dlls/msftedit/msftedit.spec +++ b/dlls/msftedit/msftedit.spec @@ -1,9 +1,9 @@ 2 extern IID_IRichEditOle 3 extern IID_IRichEditOleCallback 4 stdcall CreateTextServices(ptr ptr ptr) riched20.CreateTextServices -5 extern IID_ITextServices -6 extern IID_ITextHost -7 extern IID_ITextHost2 +5 extern IID_ITextServices riched20.IID_ITextServices +6 extern IID_ITextHost riched20.IID_ITextHost +7 extern IID_ITextHost2 riched20.IID_ITextHost2 8 stdcall REExtendedRegisterClass() riched20.REExtendedRegisterClass 9 stdcall RichEdit10ANSIWndProc(ptr long long long) riched20.RichEdit10ANSIWndProc 10 stdcall RichEditANSIWndProc(ptr long long long) riched20.RichEditANSIWndProc diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index ce6d308..840678d 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -39,14 +39,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); /* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/ -/* FIXME: the next 6 lines should be in textserv.h */ #include "initguid.h" -#define TEXTSERV_GUID(name, l, w1, w2, b1, b2) \ - DEFINE_GUID(name, l, w1, w2, b1, b2, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5) - -TEXTSERV_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d); -TEXTSERV_GUID(IID_ITextHost, 0xc5bdd8d0, 0xd26e, 0x11ce, 0xa8, 0x9e); -TEXTSERV_GUID(IID_ITextHost2, 0xc5bdd8d0, 0xd26e, 0x11ce, 0xa8, 0x9e); +DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); +DEFINE_GUID(IID_ITextHost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); +DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index efeffc1..a6c53ce 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -806,9 +806,9 @@ static void test_IIDs(void) { ok(IsEqualIID(pIID_ITextServices, &expected_iid_itextservices), "unexpected value for IID_ITextServices: %s\n", debugstr_guid(pIID_ITextServices)); - todo_wine ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost), + ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost), "unexpected value for IID_ITextHost: %s\n", debugstr_guid(pIID_ITextHost)); - todo_wine ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2), + ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2), "unexpected value for IID_ITextHost2: %s\n", debugstr_guid(pIID_ITextHost2)); } diff --git a/include/textserv.h b/include/textserv.h index 7a0cfbf..0d509a6 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -23,9 +23,8 @@ extern "C" { #endif -DEFINE_GUID(IID_ITextServices,0x8d33f740,0xcf58,0x11ce,0xa8,0x9d,0x00,0xaa,0x00,0x6c,0xad,0xc5); -DEFINE_GUID(IID_ITextHost, 0xc5bdd8d0,0xd26e,0x11ce,0xa8,0x9e,0x00,0xaa,0x00,0x6c,0xad,0xc5); -DEFINE_GUID(IID_ITextHost2, 0xc5bdd8d0,0xd26e,0x11ce,0xa8,0x9e,0x00,0xaa,0x00,0x6c,0xad,0xc5); +EXTERN_C const IID IID_ITextServices; +EXTERN_C const IID IID_ITextHost; /***************************************************************************** * ITextServices interface

1 0

Frédéric Delanoy : dbghelp: Remove dead code ( Clang).
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: e35cdaa138146e90cc43836d36efca945e8063a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35cdaa138146e90cc43836d3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 3 20:38:52 2011 +0200 dbghelp: Remove dead code (Clang). --- dlls/dbghelp/elf_module.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 8d06065..625127d 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -991,7 +991,6 @@ static BOOL elf_load_debug_info_from_map(struct module* module, WARN("Couldn't correctly read stabs\n"); ret = ret || lret; } - else lret = FALSE; image_unmap_section(&stab_sect); image_unmap_section(&stabstr_sect); }

1 0

Vincent Povirk : user32: Notify the user driver of hotkey changes.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: 8c0d568c32c4ce5938e825a35e92356af5829060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0d568c32c4ce5938e825a35… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 23 12:34:26 2011 -0500 user32: Notify the user driver of hotkey changes. --- dlls/user32/driver.c | 25 +++++++++++++++++++++++++ dlls/user32/input.c | 25 ++++++++++++++++++++----- dlls/user32/user_private.h | 2 ++ 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index d152f86..6e21ca2 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -80,8 +80,10 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(GetKeyboardLayoutName); GET_USER_FUNC(LoadKeyboardLayout); GET_USER_FUNC(MapVirtualKeyEx); + GET_USER_FUNC(RegisterHotKey); GET_USER_FUNC(ToUnicodeEx); GET_USER_FUNC(UnloadKeyboardLayout); + GET_USER_FUNC(UnregisterHotKey); GET_USER_FUNC(VkKeyScanEx); GET_USER_FUNC(CreateCursorIcon); GET_USER_FUNC(DestroyCursorIcon); @@ -193,6 +195,11 @@ static UINT CDECL nulldrv_MapVirtualKeyEx( UINT code, UINT type, HKL layout ) return 0; } +static BOOL CDECL nulldrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) +{ + return TRUE; +} + static INT CDECL nulldrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, int size, UINT flags, HKL layout ) { @@ -204,6 +211,10 @@ static BOOL CDECL nulldrv_UnloadKeyboardLayout( HKL layout ) return 0; } +static void CDECL nulldrv_UnregisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) +{ +} + static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) { return -1; @@ -430,8 +441,10 @@ static USER_DRIVER null_driver = nulldrv_GetKeyboardLayoutName, nulldrv_LoadKeyboardLayout, nulldrv_MapVirtualKeyEx, + nulldrv_RegisterHotKey, nulldrv_ToUnicodeEx, nulldrv_UnloadKeyboardLayout, + nulldrv_UnregisterHotKey, nulldrv_VkKeyScanEx, /* cursor/icon functions */ nulldrv_CreateCursorIcon, @@ -528,6 +541,11 @@ static UINT CDECL loaderdrv_MapVirtualKeyEx( UINT code, UINT type, HKL layout ) return load_driver()->pMapVirtualKeyEx( code, type, layout ); } +static BOOL CDECL loaderdrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) +{ + return load_driver()->pRegisterHotKey( hwnd, modifiers, vk ); +} + static INT CDECL loaderdrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, int size, UINT flags, HKL layout ) { @@ -539,6 +557,11 @@ static BOOL CDECL loaderdrv_UnloadKeyboardLayout( HKL layout ) return load_driver()->pUnloadKeyboardLayout( layout ); } +static void CDECL loaderdrv_UnregisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) +{ + load_driver()->pUnregisterHotKey( hwnd, modifiers, vk ); +} + static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) { return load_driver()->pVkKeyScanEx( ch, layout ); @@ -765,8 +788,10 @@ static USER_DRIVER lazy_load_driver = loaderdrv_GetKeyboardLayoutName, loaderdrv_LoadKeyboardLayout, loaderdrv_MapVirtualKeyEx, + loaderdrv_RegisterHotKey, loaderdrv_ToUnicodeEx, loaderdrv_UnloadKeyboardLayout, + loaderdrv_UnregisterHotKey, loaderdrv_VkKeyScanEx, /* cursor/icon functions */ loaderdrv_CreateCursorIcon, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 335be1f..1ffce8d 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -984,10 +984,13 @@ UINT WINAPI GetKeyboardLayoutList(INT nBuff, HKL *layouts) BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) { BOOL ret; + int replaced=0; TRACE_(keyboard)("(%p,%d,0x%08x,%X)\n",hwnd,id,modifiers,vk); - /* FIXME: Register hotkey with user driver. */ + if ((hwnd == NULL || WIN_IsCurrentThread(hwnd)) && + !USER_Driver->pRegisterHotKey(hwnd, modifiers, vk)) + return FALSE; SERVER_START_REQ( register_hotkey ) { @@ -995,11 +998,17 @@ BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) req->id = id; req->flags = modifiers; req->vkey = vk; - ret = !wine_server_call_err( req ); + if ((ret = !wine_server_call_err( req ))) + { + replaced = reply->replaced; + modifiers = reply->flags; + vk = reply->vkey; + } } SERVER_END_REQ; - /* FIXME: Unregister new or replaced hotkey with user driver if necessary. */ + if (ret && replaced) + USER_Driver->pUnregisterHotKey(hwnd, modifiers, vk); return ret; } @@ -1010,6 +1019,7 @@ BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) { BOOL ret; + UINT modifiers, vk; TRACE_(keyboard)("(%p,%d)\n",hwnd,id); @@ -1017,11 +1027,16 @@ BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) { req->window = wine_server_user_handle( hwnd ); req->id = id; - ret = !wine_server_call_err( req ); + if ((ret = !wine_server_call_err( req ))) + { + modifiers = reply->flags; + vk = reply->vkey; + } } SERVER_END_REQ; - /* FIXME: Unregister hotkey with user driver if necessary. */ + if (ret) + USER_Driver->pUnregisterHotKey(hwnd, modifiers, vk); return ret; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 92b52a3..399974e 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -62,8 +62,10 @@ typedef struct tagUSER_DRIVER { BOOL (CDECL *pGetKeyboardLayoutName)(LPWSTR); HKL (CDECL *pLoadKeyboardLayout)(LPCWSTR, UINT); UINT (CDECL *pMapVirtualKeyEx)(UINT, UINT, HKL); + BOOL (CDECL *pRegisterHotKey)(HWND, UINT, UINT); INT (CDECL *pToUnicodeEx)(UINT, UINT, const BYTE *, LPWSTR, int, UINT, HKL); BOOL (CDECL *pUnloadKeyboardLayout)(HKL); + void (CDECL *pUnregisterHotKey)(HWND, UINT, UINT); SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL); /* cursor/icon functions */ void (CDECL *pCreateCursorIcon)(HCURSOR);

1 0

André Hentschel : shdocvw: Add ITaskbarList[34] Interface.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: 8b733dd31348e26a0fdf47775eca0cec68aa25f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b733dd31348e26a0fdf47775… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 3 13:35:51 2011 +0200 shdocvw: Add ITaskbarList[34] Interface. --- dlls/shdocvw/taskbarlist.c | 178 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 160 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b733dd31348e26a0fdf4…

1 0

Frédéric Delanoy : secur32: Remove dead code ( Clang).
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: 982e7f96b182363826e18e45a3148b79521c64f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=982e7f96b182363826e18e45a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 3 20:28:28 2011 +0200 secur32: Remove dead code (Clang). --- dlls/secur32/ntlm.c | 1 - dlls/secur32/wrapper.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 7317e91..c842a12 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1255,7 +1255,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( } } pOutput->pBuffers[0].cbBuffer = 0; - ret = SEC_E_OK; TRACE("Getting negotiated flags\n"); lstrcpynA(buffer, "GF", max_len - 1); diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 590a7da..dabd90f 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -793,7 +793,6 @@ SECURITY_STATUS WINAPI QuerySecurityPackageInfoW(SEC_WCHAR *pszPackageName, { (*ppPackageInfo)->Comment = nextString; lstrcpynW(nextString, package->infoW.Comment, commentLen); - nextString += commentLen; } else (*ppPackageInfo)->Comment = NULL;

1 0

Andrew Eikum : winmm/tests: Don' t test MCI output if no output devices are available.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: f78af0e04689e2faf2cc66e29899598d89b4a174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78af0e04689e2faf2cc66e29… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jun 30 15:05:08 2011 -0500 winmm/tests: Don't test MCI output if no output devices are available. --- dlls/winmm/tests/mci.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 91a3e47..1cbcc68 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1271,9 +1271,12 @@ START_TEST(mci) test_mciParser(hwnd); test_openCloseWAVE(hwnd); test_recordWAVE(hwnd); - test_playWAVE(hwnd); - test_asyncWAVE(hwnd); - test_AutoOpenWAVE(hwnd); + if(waveOutGetNumDevs()){ + test_playWAVE(hwnd); + test_asyncWAVE(hwnd); + test_AutoOpenWAVE(hwnd); + }else + skip("No output devices available, skipping all output tests\n"); /* Win9X hangs when exiting with something still open. */ err = mciSendString("close all", NULL, 0, hwnd); ok(!err,"final close all returned %s\n", dbg_mcierr(err));

1 0

Alistair Leslie-Hughes : msxml3: clang corrections.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: 5f1262825c2dc72d7f6cf407a89d5aba0bb5449f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f1262825c2dc72d7f6cf407a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 3 18:14:12 2011 +1000 msxml3: clang corrections. --- dlls/msxml3/saxreader.c | 1 - dlls/msxml3/tests/domdoc.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index f1c2b4b..4f0a5f1 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1998,7 +1998,6 @@ static HRESULT internal_parse( TRACE("(%p)->(%s)\n", This, debugstr_variant(&varInput)); - hr = S_OK; switch(V_VT(&varInput)) { case VT_BSTR: diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index fd62062..bced22c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5553,6 +5553,7 @@ static void test_cloneNode(void ) hr = IXMLDOMNode_get_attributes(node_clone, &mapAttr); ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMNamedNodeMap_get_length(mapAttr, &attr_cnt1); + ok(hr == S_OK, "ret %08x\n", hr ); ok(attr_cnt1 == 3, "Attribute count should be 3 (%d)\n", attr_cnt1); IXMLDOMNamedNodeMap_Release(mapAttr); @@ -9746,6 +9747,7 @@ static void test_get_attributes(void) str = SysAllocString( szComplete4 ); hr = IXMLDOMDocument_loadXML(doc, str, &b); + ok(hr == S_OK, "got %08x\n", hr); SysFreeString(str); hr = IXMLDOMDocument_get_attributes(doc, NULL);

1 0

Michael Stefaniuc : d3d9: Use unsafe_impl_from_IDirect3DIndexBuffer9 for an app provided iface.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: 875d6900c6faf88d6ba53d1fa8598936ed33bc78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875d6900c6faf88d6ba53d1fa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 12:01:01 2011 +0200 d3d9: Use unsafe_impl_from_IDirect3DIndexBuffer9 for an app provided iface. --- dlls/d3d9/buffer.c | 10 ++++++++++ dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 2 +- 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 8a86e6e..7d35927 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include <assert.h> #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); @@ -573,3 +574,12 @@ HRESULT indexbuffer_init(IDirect3DIndexBuffer9Impl *buffer, IDirect3DDevice9Impl return D3D_OK; } + +IDirect3DIndexBuffer9Impl *unsafe_impl_from_IDirect3DIndexBuffer9(IDirect3DIndexBuffer9 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d9_indexbuffer_vtbl); + + return impl_from_IDirect3DIndexBuffer9(iface); +} diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 87ff3fd..9171181 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -283,6 +283,7 @@ typedef struct IDirect3DIndexBuffer9Impl HRESULT indexbuffer_init(IDirect3DIndexBuffer9Impl *buffer, IDirect3DDevice9Impl *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; +IDirect3DIndexBuffer9Impl *unsafe_impl_from_IDirect3DIndexBuffer9(IDirect3DIndexBuffer9 *iface) DECLSPEC_HIDDEN; /* --------------------- */ /* IDirect3DBaseTexture9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5aa324e..0c726d9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2528,8 +2528,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetIndices(IDirect3DDevice9Ex *iface, IDirect3DIndexBuffer9 *pIndexData) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DIndexBuffer9Impl *ib = unsafe_impl_from_IDirect3DIndexBuffer9(pIndexData); HRESULT hr; - IDirect3DIndexBuffer9Impl *ib = (IDirect3DIndexBuffer9Impl *) pIndexData; TRACE("iface %p, buffer %p.\n", iface, pIndexData);

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DPixelShader9 iface.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: b09078b0169be4f4cb8ac8eb2f7cde34d2e1844f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09078b0169be4f4cb8ac8eb2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 12:05:01 2011 +0200 d3d9: COM cleanup for the IDirect3DPixelShader9 iface. --- dlls/d3d9/d3d9_private.h | 5 ++--- dlls/d3d9/device.c | 2 +- dlls/d3d9/shader.c | 21 +++++++++++++-------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index db783d8..db059bf 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -428,9 +428,8 @@ HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, * IDirect3DPixelShader implementation structure */ typedef struct IDirect3DPixelShader9Impl { - /* IUnknown fields */ - const IDirect3DPixelShader9Vtbl *lpVtbl; - LONG ref; + IDirect3DPixelShader9 IDirect3DPixelShader9_iface; + LONG ref; struct wined3d_shader *wined3d_shader; IDirect3DDevice9Ex *parentDevice; } IDirect3DPixelShader9Impl; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2f7a38f..ed5abd4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2598,7 +2598,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreatePixelShader(IDirect3DDevice9Ex } TRACE("Created pixel shader %p.\n", object); - *shader = (IDirect3DPixelShader9 *)object; + *shader = &object->IDirect3DPixelShader9_iface; return D3D_OK; } diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 66f1c07..31ccfaa 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -153,7 +153,7 @@ HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, IDirect3DDevice9Im static inline IDirect3DPixelShader9Impl *impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DPixelShader9Impl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DPixelShader9Impl, IDirect3DPixelShader9_iface); } static HRESULT WINAPI d3d9_pixelshader_QueryInterface(IDirect3DPixelShader9 *iface, REFIID riid, void **object) @@ -176,7 +176,7 @@ static HRESULT WINAPI d3d9_pixelshader_QueryInterface(IDirect3DPixelShader9 *ifa static ULONG WINAPI d3d9_pixelshader_AddRef(IDirect3DPixelShader9 *iface) { - IDirect3DPixelShader9Impl *shader = (IDirect3DPixelShader9Impl *)iface; + IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); ULONG refcount = InterlockedIncrement(&shader->ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -194,7 +194,7 @@ static ULONG WINAPI d3d9_pixelshader_AddRef(IDirect3DPixelShader9 *iface) static ULONG WINAPI d3d9_pixelshader_Release(IDirect3DPixelShader9 *iface) { - IDirect3DPixelShader9Impl *shader = (IDirect3DPixelShader9Impl *)iface; + IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); ULONG refcount = InterlockedDecrement(&shader->ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -214,11 +214,14 @@ static ULONG WINAPI d3d9_pixelshader_Release(IDirect3DPixelShader9 *iface) return refcount; } -static HRESULT WINAPI d3d9_pixelshader_GetDevice(IDirect3DPixelShader9 *iface, IDirect3DDevice9 **device) +static HRESULT WINAPI d3d9_pixelshader_GetDevice(IDirect3DPixelShader9 *iface, + IDirect3DDevice9 **device) { + IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); + TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)((IDirect3DPixelShader9Impl *)iface)->parentDevice; + *device = (IDirect3DDevice9 *)shader->parentDevice; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -226,14 +229,16 @@ static HRESULT WINAPI d3d9_pixelshader_GetDevice(IDirect3DPixelShader9 *iface, I return D3D_OK; } -static HRESULT WINAPI d3d9_pixelshader_GetFunction(IDirect3DPixelShader9 *iface, void *data, UINT *data_size) +static HRESULT WINAPI d3d9_pixelshader_GetFunction(IDirect3DPixelShader9 *iface, void *data, + UINT *data_size) { + IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); HRESULT hr; TRACE("iface %p, data %p, data_size %p.\n", iface, data, data_size); wined3d_mutex_lock(); - hr = wined3d_shader_get_byte_code(((IDirect3DPixelShader9Impl *)iface)->wined3d_shader, data, data_size); + hr = wined3d_shader_get_byte_code(shader->wined3d_shader, data, data_size); wined3d_mutex_unlock(); return hr; @@ -265,7 +270,7 @@ HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, IDirect3DDevice9Impl HRESULT hr; shader->ref = 1; - shader->lpVtbl = &d3d9_pixelshader_vtbl; + shader->IDirect3DPixelShader9_iface.lpVtbl = &d3d9_pixelshader_vtbl; wined3d_mutex_lock(); hr = wined3d_shader_create_ps(device->wined3d_device, byte_code, NULL, shader,

1 0