November 2012 - Wine-commits

Jacek Caban : mshtml: Use ATTR_FIX_PX in IHTMLStyle2:: put_bottom implementation.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 6b0f51f9de1c9ddb314833ba6586f97ff8498341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0f51f9de1c9ddb314833ba6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:57:26 2012 +0100 mshtml: Use ATTR_FIX_PX in IHTMLStyle2::put_bottom implementation. --- dlls/mshtml/htmlstyle2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index 7eedc00..b2740d5 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -208,7 +208,7 @@ static HRESULT WINAPI HTMLStyle2_put_bottom(IHTMLStyle2 *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - return set_nsstyle_attr_var(This->nsstyle, STYLEID_BOTTOM, &v, 0); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BOTTOM, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle2_get_bottom(IHTMLStyle2 *iface, VARIANT *p)

1 0

Jacek Caban : mshtml: Fixed leak in fill_props.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 720c0c810d9ef4e3fac3c0a235cdaf5cc7b9172e URL: http://source.winehq.org/git/wine.git/?a=commit;h=720c0c810d9ef4e3fac3c0a23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 12:00:48 2012 +0100 mshtml: Fixed leak in fill_props. --- dlls/mshtml/propbag.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/propbag.c b/dlls/mshtml/propbag.c index f7bcf28..716f383 100644 --- a/dlls/mshtml/propbag.c +++ b/dlls/mshtml/propbag.c @@ -288,7 +288,7 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) nsres = nsIDOMNodeList_GetLength(params, &length); if(NS_FAILED(nsres)) - return S_OK; + length = 0; for(i=0; i < length; i++) { nsres = nsIDOMNodeList_Item(params, i, &nsnode); @@ -330,6 +330,7 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) } } + nsIDOMNodeList_Release(params); return hres; }

1 0

Aric Stewart : imm32: Use SendMessage not PostMessage for the default IME winproc.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: ad6272486ba56fd609af537213f30affb7c6463b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad6272486ba56fd609af53721… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 20 14:07:01 2012 -0600 imm32: Use SendMessage not PostMessage for the default IME winproc. --- dlls/imm32/imm.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 6bca604..1ade13a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2906,8 +2906,9 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, { ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); if (immHkl->UIWnd) - PostMessageW(immHkl->UIWnd,uMsg,wParam,lParam); - return TRUE; + return SendMessageW(immHkl->UIWnd,uMsg,wParam,lParam); + else + return FALSE; } default: if ((uMsg == WM_MSIME_RECONVERTOPTIONS) || @@ -2920,8 +2921,9 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, { ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); if (immHkl->UIWnd) - PostMessageW(immHkl->UIWnd,uMsg,wParam,lParam); - return TRUE; + return SendMessageW(immHkl->UIWnd,uMsg,wParam,lParam); + else + return FALSE; } return DefWindowProcW(hwnd, uMsg, wParam, lParam); }

1 0

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

21 Nov '12

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

Christian Costa : winegstreamer: Remove left over FIXME.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 1fcce23f34a70441311b0c34e79228c9c9c255e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcce23f34a70441311b0c34e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Nov 21 09:48:42 2012 +0100 winegstreamer: Remove left over FIXME. --- dlls/winegstreamer/gsttffilter.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 03b854b..4222008 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -398,7 +398,6 @@ static HRESULT WINAPI Gstreamer_transform_Cleanup(TransformFilter *tf, PIN_DIREC gst_object_unref(This->my_sink); } This->my_sink = This->my_src = This->their_sink = This->their_src = NULL; - FIXME("%p stub\n", This); } return S_OK; }

1 0

Andrew Talbot : hhctrl.ocx: Remove unused variable.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 9e01b1752ac4d94444c34a6486d9f3ed6fcbf8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e01b1752ac4d94444c34a648… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 20 20:58:28 2012 +0000 hhctrl.ocx: Remove unused variable. --- dlls/hhctrl.ocx/help.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 38446dc..f6155c7 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -266,7 +266,6 @@ static void DoSync(HHInfo *info) { WCHAR buf[INTERNET_MAX_URL_LENGTH]; HRESULT hres; - DWORD len; BSTR url; hres = IWebBrowser2_get_LocationURL(info->web_browser, &url); @@ -278,7 +277,7 @@ static void DoSync(HHInfo *info) } /* If we're not currently viewing a page in the active .chm file, abort */ - if ((!AppendFullPathURL(info->WinType.pszFile, buf, NULL)) || (len = lstrlenW(buf) > lstrlenW(url))) + if ((!AppendFullPathURL(info->WinType.pszFile, buf, NULL)) || (lstrlenW(buf) > lstrlenW(url))) { SysFreeString(url); return;

1 0

Andrew Talbot : ddraw: Remove unused variable.
by Alexandre Julliard 21 Nov '12

21 Nov '12

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 : d3d10core: Remove unused variables.
by Alexandre Julliard 21 Nov '12

21 Nov '12

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

Andrew Talbot : d3d8: Remove unused variable.
by Alexandre Julliard 21 Nov '12

21 Nov '12

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 21 Nov '12

21 Nov '12

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