November 2012 - Wine-Commits

Aric Stewart : imm32/tests: Test showing that communication to the IME window is done via SendMessage.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 203b4fbff09a95c7ac1c51b65144f5f7b6110848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203b4fbff09a95c7ac1c51b65… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 20 14:07:07 2012 -0600 imm32/tests: Test showing that communication to the IME window is done via SendMessage. --- dlls/imm32/tests/imm32.c | 73 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 6eb8a41..5aff7f7 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -33,11 +33,16 @@ static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); /* * msgspy - record and analyse message traces sent to a certain window */ +typedef struct _msgs { + CWPSTRUCT msg; + BOOL post; +} imm_msgs; + static struct _msg_spy { HWND hwnd; HHOOK get_msg_hook; HHOOK call_wnd_proc_hook; - CWPSTRUCT msgs[32]; + imm_msgs msgs[32]; unsigned int i_msg; } msg_spy; @@ -46,13 +51,14 @@ static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam) if (HC_ACTION == nCode) { MSG *msg = (MSG*)lParam; - if ((msg->hwnd == msg_spy.hwnd) && + if ((msg->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL) && (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) { - msg_spy.msgs[msg_spy.i_msg].hwnd = msg->hwnd; - msg_spy.msgs[msg_spy.i_msg].message = msg->message; - msg_spy.msgs[msg_spy.i_msg].wParam = msg->wParam; - msg_spy.msgs[msg_spy.i_msg].lParam = msg->lParam; + msg_spy.msgs[msg_spy.i_msg].msg.hwnd = msg->hwnd; + msg_spy.msgs[msg_spy.i_msg].msg.message = msg->message; + msg_spy.msgs[msg_spy.i_msg].msg.wParam = msg->wParam; + msg_spy.msgs[msg_spy.i_msg].msg.lParam = msg->lParam; + msg_spy.msgs[msg_spy.i_msg].post = TRUE; msg_spy.i_msg++; } } @@ -66,10 +72,11 @@ static LRESULT CALLBACK call_wnd_proc_filter(int nCode, WPARAM wParam, if (HC_ACTION == nCode) { CWPSTRUCT *cwp = (CWPSTRUCT*)lParam; - if ((cwp->hwnd == msg_spy.hwnd) && + if (((cwp->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL)) && (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) { - memcpy(&msg_spy.msgs[msg_spy.i_msg], cwp, sizeof(msg_spy.msgs[0])); + memcpy(&msg_spy.msgs[msg_spy.i_msg].msg, cwp, sizeof(msg_spy.msgs[0].msg)); + msg_spy.msgs[msg_spy.i_msg].post = FALSE; msg_spy.i_msg++; } } @@ -93,7 +100,7 @@ static void msg_spy_flush_msgs(void) { msg_spy.i_msg = 0; } -static CWPSTRUCT* msg_spy_find_msg(UINT message) { +static imm_msgs* msg_spy_find_next_msg(UINT message, UINT *start) { UINT i; msg_spy_pump_msg_queue(); @@ -102,13 +109,22 @@ static CWPSTRUCT* msg_spy_find_msg(UINT message) { fprintf(stdout, "%s:%d: msg_spy: message buffer overflow!\n", __FILE__, __LINE__); - for (i = 0; i < msg_spy.i_msg; i++) - if (msg_spy.msgs[i].message == message) + for (i = *start; i < msg_spy.i_msg; i++) + if (msg_spy.msgs[i].msg.message == message) + { + *start = i+1; return &msg_spy.msgs[i]; + } return NULL; } +static imm_msgs* msg_spy_find_msg(UINT message) { + UINT i = 0; + + return msg_spy_find_next_msg(message, &i); +} + static void msg_spy_init(HWND hwnd) { msg_spy.hwnd = hwnd; msg_spy.get_msg_hook = @@ -655,6 +671,36 @@ static void test_ImmDefaultHwnd(void) DestroyWindow(hwnd); } +static void test_ImmMessages(void) +{ + CANDIDATEFORM cf; + imm_msgs *msg; + HWND defwnd; + HIMC imc; + UINT idx = 0; + + HWND hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + + ShowWindow(hwnd, SW_SHOWNORMAL); + defwnd = ImmGetDefaultIMEWnd(hwnd); + imc = ImmGetContext(hwnd); + + ImmSetOpenStatus(imc, TRUE); + msg_spy_flush_msgs(); + SendMessage(defwnd, WM_IME_CONTROL, IMC_GETCANDIDATEPOS, (LPARAM)&cf ); + do + { + msg = msg_spy_find_next_msg(WM_IME_CONTROL,&idx); + if (msg) ok(!msg->post, "Message should not be posted\n"); + } while (msg); + msg_spy_flush_msgs(); + ImmSetOpenStatus(imc, FALSE); + ImmReleaseContext(hwnd, imc); + DestroyWindow(hwnd); +} + START_TEST(imm32) { if (init()) { @@ -668,6 +714,11 @@ START_TEST(imm32) { test_ImmGetContext(); test_ImmGetDescription(); test_ImmDefaultHwnd(); + msg_spy_cleanup(); + /* Reinitialize the hooks to capture all windows */ + msg_spy_init(NULL); + test_ImmMessages(); + msg_spy_cleanup(); } cleanup(); }

1 0

Jacek Caban : winecrt0: Use atl100. dll directly to create a registrar instance.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: eb51602304e6e3a6937feab8ca3ad9ed9cd9fa77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb51602304e6e3a6937feab8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:12:37 2012 +0100 winecrt0: Use atl100.dll directly to create a registrar instance. --- dlls/winecrt0/register.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index 407dfbd..70a4a35 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -30,7 +30,7 @@ #include "rpcproxy.h" #include "atliface.h" -static const WCHAR ole32W[] = {'o','l','e','3','2','.','d','l','l',0}; +static const WCHAR atl100W[] = {'a','t','l','1','0','0','.','d','l','l',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; @@ -38,32 +38,25 @@ struct reg_info { IRegistrar *registrar; BOOL do_register; - BOOL uninit; HRESULT result; }; -static HMODULE ole32; -static HRESULT (WINAPI *pCoInitialize)(LPVOID); -static void (WINAPI *pCoUninitialize)(void); -static HRESULT (WINAPI *pCoCreateInstance)(REFCLSID,LPUNKNOWN,DWORD,REFIID,LPVOID*); +static HMODULE atl100; +static HRESULT (WINAPI *pAtlCreateRegistrar)(IRegistrar**); static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info ) { - if (!pCoCreateInstance) + if (!pAtlCreateRegistrar) { - if (!(ole32 = LoadLibraryW( ole32W )) || - !(pCoInitialize = (void *)GetProcAddress( ole32, "CoInitialize" )) || - !(pCoUninitialize = (void *)GetProcAddress( ole32, "CoUninitialize" )) || - !(pCoCreateInstance = (void *)GetProcAddress( ole32, "CoCreateInstance" ))) + if (!(atl100 = LoadLibraryW( atl100W )) || + !(pAtlCreateRegistrar = (void *)GetProcAddress( atl100, "AtlCreateRegistrar" ))) { info->result = E_NOINTERFACE; return NULL; } } - info->uninit = SUCCEEDED( pCoInitialize( NULL )); - info->result = pCoCreateInstance( &CLSID_Registrar, NULL, CLSCTX_INPROC_SERVER, - &IID_IRegistrar, (void **)&info->registrar ); + info->result = pAtlCreateRegistrar( &info->registrar ); if (SUCCEEDED( info->result )) { WCHAR str[MAX_PATH]; @@ -108,11 +101,9 @@ HRESULT __wine_register_resources( HMODULE module ) info.registrar = NULL; info.do_register = TRUE; - info.uninit = FALSE; info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); - if (info.uninit) pCoUninitialize(); return info.result; } @@ -122,10 +113,8 @@ HRESULT __wine_unregister_resources( HMODULE module ) info.registrar = NULL; info.do_register = FALSE; - info.uninit = FALSE; info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); - if (info.uninit) pCoUninitialize(); return info.result; }

1 0

Jacek Caban : atl: Moved atlbase.h to public includes.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 7f98899bbae00c397ac678c912ac314b4437e58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f98899bbae00c397ac678c91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:10:28 2012 +0100 atl: Moved atlbase.h to public includes. --- include/Makefile.in | 1 + {dlls/atl => include}/atlbase.h | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 314b37f..dc6ee88 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -141,6 +141,7 @@ SRCDIR_INCLUDES = \ appmgmt.h \ asynot.idl \ asysta.idl \ + atlbase.h \ audevcod.h \ audiosessiontypes.h \ aviriff.h \ diff --git a/dlls/atl/atlbase.h b/include/atlbase.h similarity index 99% rename from dlls/atl/atlbase.h rename to include/atlbase.h index 59cdddf..8fa9987 100644 --- a/dlls/atl/atlbase.h +++ b/include/atlbase.h @@ -21,9 +21,7 @@ #ifndef __WINE_ATLBASE_H__ #define __WINE_ATLBASE_H__ -#define COBJMACROS - -#include "atliface.h" +#include <atliface.h> typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void* pv, REFIID riid, LPVOID* ppv); typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD dw);

1 0

Jacek Caban : atl: Added AtlGetVersion implementation.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 8cfe856b17ba2c7be43d2648d4b8da0e4cb19c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cfe856b17ba2c7be43d2648d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:11:56 2012 +0100 atl: Added AtlGetVersion implementation. --- dlls/atl/atl.spec | 2 +- dlls/atl/atl_main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index d33d986..c043d3e 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -25,7 +25,7 @@ 30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface -34 stub AtlGetVersion +34 stdcall AtlGetVersion(ptr) 35 stub AtlAxDialogBoxW 36 stub AtlAxDialogBoxA 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 9e7467a..f215151 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -472,3 +472,11 @@ void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM) } return NULL; } + +/*********************************************************************** + * AtlGetVersion [ATL.@] + */ +DWORD WINAPI AtlGetVersion(void *pReserved) +{ + return 0x0300; +}

1 0

Jacek Caban : atl100: Moved IRegistrar implementation to atl100.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 9d956864b7ae21134b6b8c0c733eff22653b57fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d956864b7ae21134b6b8c0c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:10:54 2012 +0100 atl100: Moved IRegistrar implementation to atl100. --- configure | 2 +- configure.ac | 2 +- dlls/atl/Makefile.in | 2 +- dlls/atl/registrar.c | 676 --------------------------------------------- dlls/atl100/Makefile.in | 6 +- dlls/atl100/atl100.spec | 2 +- dlls/atl100/registrar.c | 704 +++++++++++++++++++++++++++++++++++++++++++++++ include/atlbase.h | 1 + 8 files changed, 714 insertions(+), 681 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d956864b7ae21134b6b8…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DVIEWPORT.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 0ac2b823b5f52dfd2dac4e8b362629ddb7c0e7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac2b823b5f52dfd2dac4e8b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:18 2012 +0100 d3drm: Avoid LPDIRECT3DVIEWPORT. --- dlls/d3drm/viewport.c | 8 ++++---- include/d3drmobj.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index fb93dc6..75eb225 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -448,8 +448,8 @@ static D3DRMPROJECTIONTYPE WINAPI IDirect3DRMViewportImpl_GetProjection(IDirect3 return IDirect3DRMViewport2_GetProjection(&This->IDirect3DRMViewport2_iface); } -static HRESULT WINAPI IDirect3DRMViewportImpl_GetDirect3DViewport(IDirect3DRMViewport* iface, - LPDIRECT3DVIEWPORT * viewport) +static HRESULT WINAPI IDirect3DRMViewportImpl_GetDirect3DViewport(IDirect3DRMViewport *iface, + IDirect3DViewport **viewport) { IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); @@ -883,8 +883,8 @@ static D3DRMPROJECTIONTYPE WINAPI IDirect3DRMViewport2Impl_GetProjection(IDirect return This->projection; } -static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDirect3DViewport(IDirect3DRMViewport2* iface, - LPDIRECT3DVIEWPORT * viewport) +static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDirect3DViewport(IDirect3DRMViewport2 *iface, + IDirect3DViewport **viewport) { IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 3bafd9d..2265b56 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -835,7 +835,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject) STDMETHOD_(D3DVALUE, GetBack)(THIS) PURE; STDMETHOD_(D3DVALUE, GetFront)(THIS) PURE; STDMETHOD_(D3DRMPROJECTIONTYPE, GetProjection)(THIS) PURE; - STDMETHOD(GetDirect3DViewport)(THIS_ LPDIRECT3DVIEWPORT *) PURE; + STDMETHOD(GetDirect3DViewport)(THIS_ IDirect3DViewport **viewport) PURE; }; #undef INTERFACE @@ -975,7 +975,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD_(D3DVALUE, GetBack)(THIS) PURE; STDMETHOD_(D3DVALUE, GetFront)(THIS) PURE; STDMETHOD_(D3DRMPROJECTIONTYPE, GetProjection)(THIS) PURE; - STDMETHOD(GetDirect3DViewport)(THIS_ LPDIRECT3DVIEWPORT *) PURE; + STDMETHOD(GetDirect3DViewport)(THIS_ IDirect3DViewport **viewport) PURE; STDMETHOD(TransformVectors)(THIS_ DWORD NumVectors, LPD3DRMVECTOR4D pDstVectors, LPD3DVECTOR pSrcVectors) PURE; STDMETHOD(InverseTransformVectors)(THIS_ DWORD NumVectors, LPD3DVECTOR pDstVectors,

1 0

Andrew Talbot : ddraw: Remove unused variable.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 9c3722ec4050f3034baafb8f97ba8a44888273f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c3722ec4050f3034baafb8f9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 20 20:58:23 2012 +0000 ddraw: Remove unused variable. --- dlls/ddraw/ddraw.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 14fc73d..e4e50df 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5168,7 +5168,6 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic struct ddraw *ddraw = ddraw_from_device_parent(device_parent); MONITORINFO monitor_info; HMONITOR monitor; - BOOL ret; RECT *r; TRACE("device_parent %p.\n", device_parent); @@ -5181,7 +5180,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic monitor = MonitorFromWindow(ddraw->swapchain_window, MONITOR_DEFAULTTOPRIMARY); monitor_info.cbSize = sizeof(monitor_info); - if (!(ret = GetMonitorInfoW(monitor, &monitor_info))) + if (!GetMonitorInfoW(monitor, &monitor_info)) { ERR("Failed to get monitor info.\n"); return; @@ -5190,8 +5189,8 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic r = &monitor_info.rcMonitor; TRACE("Resizing window %p to %s.\n", ddraw->swapchain_window, wine_dbgstr_rect(r)); - if (!(ret = SetWindowPos(ddraw->swapchain_window, HWND_TOP, r->left, r->top, - r->right - r->left, r->bottom - r->top, SWP_SHOWWINDOW | SWP_NOACTIVATE))) + if (!SetWindowPos(ddraw->swapchain_window, HWND_TOP, r->left, r->top, + r->right - r->left, r->bottom - r->top, SWP_SHOWWINDOW | SWP_NOACTIVATE)) ERR("Failed to resize window.\n"); }

1 0

Andrew Talbot : d3d8: Remove unused variable.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 1cd505cb8168bf74a3eeb354478948edefa57983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd505cb8168bf74a3eeb3544… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 20 20:58:10 2012 +0000 d3d8: Remove unused variable. --- dlls/d3d8/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b4bd3f9..d1dcd02 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -545,13 +545,12 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_swapchain_desc desc; struct d3d8_swapchain *object; - HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); - if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, &object))) + if (SUCCEEDED(d3d8_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain8_iface; present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc);

1 0

Andrew Talbot : cryptui: Remove unused variable.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: e21b7bbaf1dc4f6bfcc98e5cd85926f5d667d985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21b7bbaf1dc4f6bfcc98e5cd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 20 20:58:04 2012 +0000 cryptui: Remove unused variable. --- dlls/cryptui/main.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 387b6c6..3835573 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1804,7 +1804,6 @@ static void add_icon_to_control(HWND hwnd, int id) DWORD conn; LPDATAOBJECT dataObject = NULL; HBITMAP bitmap = NULL; - RECT rect; STGMEDIUM stgm; LPOLECLIENTSITE clientSite = NULL; REOBJECT reObject; @@ -1843,9 +1842,6 @@ static void add_icon_to_control(HWND hwnd, int id) LR_DEFAULTSIZE | LR_LOADTRANSPARENT); if (!bitmap) goto end; - rect.left = rect.top = 0; - rect.right = GetSystemMetrics(SM_CXICON); - rect.bottom = GetSystemMetrics(SM_CYICON); stgm.tymed = TYMED_GDI; stgm.u.hBitmap = bitmap; stgm.pUnkForRelease = NULL;

1 0

Andrew Talbot : d3d10core: Remove unused variables.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 608be1715b0313002c04c9d0fe78e1dc4bdb67f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=608be1715b0313002c04c9d0f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 20 20:58:16 2012 +0000 d3d10core: Remove unused variables. --- dlls/d3d10core/view.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index b36f9d7..98ba776 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -48,7 +48,6 @@ static struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *r static HRESULT set_dsdesc_from_resource(D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension; - HRESULT hr; ID3D10Resource_GetType(resource, &dimension); @@ -59,7 +58,7 @@ static HRESULT set_dsdesc_from_resource(D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3 D3D10_TEXTURE1D_DESC texture_desc; ID3D10Texture1D *texture; - if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) + if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) { ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D.\n"); return E_INVALIDARG; @@ -90,7 +89,7 @@ static HRESULT set_dsdesc_from_resource(D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3 D3D10_TEXTURE2D_DESC texture_desc; ID3D10Texture2D *texture; - if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) + if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) { ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D.\n"); return E_INVALIDARG; @@ -262,7 +261,6 @@ static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3 static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension; - HRESULT hr; ID3D10Resource_GetType(resource, &dimension); @@ -273,7 +271,7 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I D3D10_TEXTURE1D_DESC texture_desc; ID3D10Texture1D *texture; - if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) + if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) { ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D.\n"); return E_INVALIDARG; @@ -306,7 +304,7 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I D3D10_TEXTURE2D_DESC texture_desc; ID3D10Texture2D *texture; - if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) + if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) { ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D.\n"); return E_INVALIDARG; @@ -355,7 +353,7 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I D3D10_TEXTURE3D_DESC texture_desc; ID3D10Texture3D *texture; - if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture))) + if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture))) { ERR("Resource of type TEXTURE3D doesn't implement ID3D10Texture3D.\n"); return E_INVALIDARG;

1 0