December 2009 - Wine-commits

Henri Verbeet : wined3d: Use surface_is_offscreen() in fb_copy_to_texture_hwstretch().
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 51438eec461346f350ce3f67161faaa40b2e4f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51438eec461346f350ce3f671… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 15 17:51:33 2009 +0100 wined3d: Use surface_is_offscreen() in fb_copy_to_texture_hwstretch(). --- dlls/wined3d/surface.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1c5f012..5a0da0e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3210,13 +3210,15 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine GLenum drawBuffer = GL_BACK; GLenum texture_target; BOOL noBackBufferBackup; + BOOL src_offscreen; TRACE("Using hwstretch blit\n"); /* Activate the Proper context for reading from the source surface, set it up for blitting */ context = context_acquire(myDevice, SrcSurface, CTXUSAGE_BLIT); surface_internal_preload((IWineD3DSurface *) This, SRGB_RGB); - noBackBufferBackup = !swapchain && wined3d_settings.offscreen_rendering_mode == ORM_FBO; + src_offscreen = surface_is_offscreen(SrcSurface); + noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !Src->texture_name) { /* Get it a description */ @@ -3232,7 +3234,7 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine /* Got more than one aux buffer? Use the 2nd aux buffer */ drawBuffer = GL_AUX1; } - else if ((swapchain || myDevice->offscreenBuffer == GL_BACK) && context->aux_buffers >= 1) + else if ((!src_offscreen || myDevice->offscreenBuffer == GL_BACK) && context->aux_buffers >= 1) { /* Only one aux buffer, but it isn't used (Onscreen rendering, or non-aux orm)? Use it! */ drawBuffer = GL_AUX0; @@ -3258,7 +3260,8 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine Src->Flags &= ~SFLAG_INTEXTURE; } - if(surface_is_offscreen(SrcSurface)) { + if (src_offscreen) + { TRACE("Reading from an offscreen target\n"); upsidedown = !upsidedown; glReadBuffer(myDevice->offscreenBuffer);

1 0

Henri Verbeet : wined3d: Use surface_is_offscreen() in read_from_framebuffer_texture().
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: bf113bd284a8b4d83d58d2f2d39f8d7640c8c83d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf113bd284a8b4d83d58d2f2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 15 17:51:34 2009 +0100 wined3d: Use surface_is_offscreen() in read_from_framebuffer_texture(). --- dlls/wined3d/surface.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5a0da0e..00051ed 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1172,7 +1172,6 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, const RECT *rect, v static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) { IWineD3DDeviceImpl *device = This->resource.device; - IWineD3DSwapChainImpl *swapchain; struct wined3d_context *context; int bpp; GLenum format, internal, type; @@ -1197,18 +1196,18 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) * There is no need to keep track of the current read buffer or reset it, every part of the code * that reads sets the read buffer as desired. */ - if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)This, &IID_IWineD3DSwapChain, (void **)&swapchain))) + if (!surface_is_offscreen((IWineD3DSurface *)This)) { - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *) This, (IWineD3DSwapChain *)swapchain); + GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This, (IWineD3DSwapChain *)This->container); TRACE("Locking %#x buffer\n", buffer); ENTER_GL(); glReadBuffer(buffer); checkGLcall("glReadBuffer"); LEAVE_GL(); - - IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); - } else { + } + else + { /* Locking the primary render target which is not on a swapchain(=offscreen render target). * Read from the back buffer */

1 0

André Hentschel : patches: Some HTML markup fixes.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: tools Branch: master Commit: fb4a2111a94ca767b26161086bd9b16c46f97fc0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=fb4a2111a94ca767b2616108… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 14 19:16:56 2009 +0100 patches: Some HTML markup fixes. --- patches/index.cgi | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/index.cgi b/patches/index.cgi index 93ce068..36826f8 100755 --- a/patches/index.cgi +++ b/patches/index.cgi @@ -54,7 +54,7 @@ my @legend = [ "applyfail", "<ul><li>The patch got mangled in transit.</li>" . "<li>It's not relative to the latest git.</li>" . "<li>Someone else sent a patch that changes the same area and causes conflicts.</li>" . - "<li>The patch is relative to a subdirectory (using 'git format-patch' is strongly recommended).</ul>" ], + "<li>The patch is relative to a subdirectory (using 'git format-patch' is strongly recommended).</li></ul>" ], [ "buildfail", "<ul><li>Syntax error or other compile problem.</li>" . "<li>You forgot to include some changes or new files required for compilation.</li>" . "<li>The patch causes compiler warnings (maintainer mode implies -Werror).</li></ul>" ], @@ -147,7 +147,7 @@ print "<div class=\"legend\"><h2><a name=\"legend\">Legend</a></h2>\n"; print "<table class=\"legend\"><tr><th class=\"status\">Status</th><th class=\"causes\">Possible causes</th></tr>\n"; foreach my $status (@legend) { - printf "<tr class=\"%s\"><td class=\"status %s\">%s</td><td class=\"causes\">%s</td>\n", + printf "<tr class=\"%s\"><td class=\"status %s\">%s</td><td class=\"causes\">%s</td></tr>\n", $row & 1 ? "odd" : "even", $status->[0], $status_descr{$status->[0]}, $status->[1]; $row++;

1 0

Huw Davies : oleaut32: Fix a leak in the tests.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 08760936e427f8e012012e4a73107ecc3407a0f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08760936e427f8e012012e4a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 15:17:22 2009 +0000 oleaut32: Fix a leak in the tests. Found by Valgrind. --- dlls/oleaut32/tests/vartype.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 3ea6ac2..8f19294 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5460,6 +5460,8 @@ static void test_BstrCopy(void) bstr = Get(V_BSTR(&vt2)); ok (bstr->dwLen == 3, "Expected 3, got %d\n", bstr->dwLen); ok (!lstrcmpA((LPCSTR)bstr->szString, szTestTruncA), "String different\n"); + VariantClear(&vt2); + VariantClear(&vt1); } }

1 0

Huw Davies : qedit: Fix a memory leak.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 33a193439d03a06555e8517d371e27b12e64c00d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a193439d03a06555e8517d3… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 15:20:29 2009 +0000 qedit: Fix a memory leak. Found by Valgrind. --- dlls/qedit/mediadet.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index d27a638..3a13f71 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -310,7 +310,11 @@ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar) hr = IPropertyBag_Read(pPropBagCat, wszClsidName, pvar, NULL); if (SUCCEEDED(hr)) + { hr = CLSIDFromString(V_UNION(pvar, bstrVal), pclsid); + VariantClear(pvar); + V_VT(pvar) = VT_BSTR; + } if (SUCCEEDED(hr)) hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL); @@ -387,10 +391,14 @@ static HRESULT GetSplitter(MediaDetImpl *This) hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **) &splitter); if (FAILED(hr)) + { + VariantClear(&var); return hr; + } hr = IGraphBuilder_AddFilter(This->graph, splitter, V_UNION(&var, bstrVal)); + VariantClear(&var); if (FAILED(hr)) { IBaseFilter_Release(splitter);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLImgElement get_Name.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 020c75b0fefaf4f24223653d459d689e4299e6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=020c75b0fefaf4f24223653d4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Dec 13 21:15:28 2009 +1100 mshtml: Implement IHTMLImgElement get_Name. --- dlls/mshtml/htmlimg.c | 20 ++++++++++++++++++-- dlls/mshtml/tests/dom.c | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 60333c6..87fe498 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -437,8 +437,24 @@ static HRESULT WINAPI HTMLImgElement_put_name(IHTMLImgElement *iface, BSTR v) static HRESULT WINAPI HTMLImgElement_get_name(IHTMLImgElement *iface, BSTR *p) { HTMLImgElement *This = HTMLIMG_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString strName; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&strName, NULL); + nsres = nsIDOMHTMLImageElement_GetName(This->nsimg, &strName); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *str; + + nsAString_GetData(&strName, &str); + *p = *str ? SysAllocString(str) : NULL; + }else { + ERR("GetName failed: %08x\n", nsres); + } + nsAString_Finish(&strName); + + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLImgElement_put_width(IHTMLImgElement *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6f1a064..10d802a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -49,7 +49,7 @@ static const char elem_test_str[] = "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td>td1 text</td><td>td2 text</td></tr></tbody></table>" "<script id=\"sc\" type=\"text/javascript\">\n</script>" "<test />" - "<img id=\"imgid\"/>" + "<img id=\"imgid\" name=\"WineImg\"/>" "<iframe src=\"about:blank\" id=\"ifr\"></iframe>" "<form id=\"frm\"></form>" "</body></html>"; @@ -1927,6 +1927,20 @@ static void _test_img_set_alt(unsigned line, IUnknown *unk, const char *alt) _test_img_alt(line, unk, alt); } +#define test_img_name(u, c) _test_img_name(__LINE__,u, c) +static void _test_img_name(unsigned line, IUnknown *unk, const char *pValue) +{ + IHTMLImgElement *img = _get_img_iface(line, unk); + BSTR sName; + HRESULT hres; + + hres = IHTMLImgElement_get_name(img, &sName); + ok_(__FILE__,line) (hres == S_OK, "get_Name failed: %08x\n", hres); + ok_(__FILE__,line) (!strcmp_wa (sName, pValue), "expected '%s' got '%s'\n", pValue, wine_dbgstr_w(sName)); + SysFreeString(sName); +} + + #define test_input_get_disabled(i,b) _test_input_get_disabled(__LINE__,i,b) static void _test_input_get_disabled(unsigned line, IHTMLInputElement *input, VARIANT_BOOL exb) { @@ -5526,6 +5540,7 @@ static void test_elems(IHTMLDocument2 *doc) test_img_set_src((IUnknown*)elem, "about:blank"); test_img_alt((IUnknown*)elem, NULL); test_img_set_alt((IUnknown*)elem, "alt test"); + test_img_name((IUnknown*)elem, "WineImg"); IHTMLElement_Release(elem); }

1 0

Alexandre Julliard : user32: Implement UserRegisterWowHandlers function and add a handler for the button winproc .
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 02e74fa8a65177a9200e5f8acee6b0e5e214a675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e74fa8a65177a9200e5f8ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 13:16:50 2009 +0100 user32: Implement UserRegisterWowHandlers function and add a handler for the button winproc. --- dlls/user32/button.c | 28 +++------------------------- dlls/user32/controls.h | 20 ++++++++++++++++++++ dlls/user32/msg16.c | 34 ++++++++++++++++++++++++++++++++++ dlls/user32/user16.c | 1 + dlls/user32/user32.spec | 2 +- dlls/user32/winproc.c | 18 ++++++++++++++++++ 6 files changed, 77 insertions(+), 26 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 9eb731c..42163eb 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -73,7 +73,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/winuser16.h" #include "controls.h" #include "win.h" #include "user_private.h" @@ -230,8 +229,7 @@ static void setup_clipping( HWND hwnd, HDC hdc ) /*********************************************************************** * ButtonWndProc_common */ -static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL unicode ) { RECT rect; POINT pt; @@ -548,32 +546,12 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, } /*********************************************************************** - * ButtonWndProc_wrapper16 - */ -static LRESULT ButtonWndProc_wrapper16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) -{ - static const UINT msg16_offset = BM_GETCHECK16 - BM_GETCHECK; - - switch (msg) - { - case BM_GETCHECK16: - case BM_SETCHECK16: - case BM_GETSTATE16: - case BM_SETSTATE16: - case BM_SETSTYLE16: - return ButtonWndProc_common( hwnd, msg - msg16_offset, wParam, lParam, FALSE ); - default: - return ButtonWndProc_common( hwnd, msg, wParam, lParam, unicode ); - } -} - -/*********************************************************************** * ButtonWndProcW */ static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; - return ButtonWndProc_wrapper16( hWnd, uMsg, wParam, lParam, TRUE ); + return wow_handlers.button_proc( hWnd, uMsg, wParam, lParam, TRUE ); } @@ -583,7 +561,7 @@ static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARA static LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; - return ButtonWndProc_wrapper16( hWnd, uMsg, wParam, lParam, FALSE ); + return wow_handlers.button_proc( hWnd, uMsg, wParam, lParam, FALSE ); } diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index f51a3d9..a407c93 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -57,6 +57,26 @@ extern const struct builtin_class_descr MESSAGE_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr SCROLL_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr STATIC_builtin_class DECLSPEC_HIDDEN; +/* Wow handlers */ + +struct wow_handlers16 +{ + LRESULT (*button_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); +}; + +struct wow_handlers32 +{ + LRESULT (*button_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); +}; + +extern struct wow_handlers16 wow_handlers DECLSPEC_HIDDEN; + +extern LRESULT ButtonWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; + +extern void register_wow_handlers(void) DECLSPEC_HIDDEN; +extern void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, + struct wow_handlers32 *orig ); + extern WNDPROC EDIT_winproc_handle DECLSPEC_HIDDEN; /* Class functions */ diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index d5d4825..b677e51 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -23,12 +23,15 @@ #include "winerror.h" #include "win.h" #include "user_private.h" +#include "controls.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); DWORD USER16_AlertableWait = 0; +static struct wow_handlers32 wow_handlers32; + static LRESULT cwp_hook_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ) { @@ -584,3 +587,34 @@ BOOL16 WINAPI TranslateMDISysAccel16( HWND16 hwndClient, LPMSG16 msg ) } return 0; } + + +/*********************************************************************** + * button_proc16 + */ +static LRESULT button_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + static const UINT msg16_offset = BM_GETCHECK16 - BM_GETCHECK; + + switch (msg) + { + case BM_GETCHECK16: + case BM_SETCHECK16: + case BM_GETSTATE16: + case BM_SETSTATE16: + case BM_SETSTYLE16: + return wow_handlers32.button_proc( hwnd, msg - msg16_offset, wParam, lParam, FALSE ); + default: + return wow_handlers32.button_proc( hwnd, msg, wParam, lParam, unicode ); + } +} + +void register_wow_handlers(void) +{ + static const struct wow_handlers16 handlers16 = + { + button_proc16, + }; + + UserRegisterWowHandlers( &handlers16, &wow_handlers32 ); +} diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index 77b3759..34133e5 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -1387,6 +1387,7 @@ BOOL WINAPI DllEntryPoint( DWORD reason, HINSTANCE16 inst, WORD ds, if (USER_HeapSel) return TRUE; /* already called */ USER_HeapSel = ds; + register_wow_handlers(); return TRUE; } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8cdc24c..4492e58 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -738,7 +738,7 @@ # @ stub UserLpkPSMTextOut # @ stub UserLpkTabbedTextOut @ stdcall UserRealizePalette(long) -@ stub UserRegisterWowHandlers +@ stdcall UserRegisterWowHandlers(ptr ptr) # @ stub UserSetDeviceHoldState @ stdcall UserSignalProc(long long long long) # @ stub VRipOutput diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index d08a59f..040fd72 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -2378,3 +2378,21 @@ INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, } return ret; } + + +/********************************************************************** + * UserRegisterWowHandlers (USER32.@) + * + * NOTE: no attempt has been made to be compatible here, + * the Windows function is most likely completely different. + */ +void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wow_handlers32 *orig ) +{ + orig->button_proc = ButtonWndProc_common; + wow_handlers = *new; +} + +struct wow_handlers16 wow_handlers = +{ + ButtonWndProc_common, +};

1 0

Alexandre Julliard : user32: Turn the combobox winproc into a Wow handler.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 57d439f4f181c52c60aae6ad4473143c52a1b87c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d439f4f181c52c60aae6ad4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 13:17:15 2009 +0100 user32: Turn the combobox winproc into a Wow handler. --- dlls/user32/combo.c | 82 ++---------------------------------------------- dlls/user32/controls.h | 3 ++ dlls/user32/msg16.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/winproc.c | 2 + 4 files changed, 84 insertions(+), 79 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index a0f0eb5..c405c1a 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -41,7 +41,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/winuser16.h" #include "wine/unicode.h" #include "user_private.h" #include "win.h" @@ -1833,8 +1832,7 @@ static char *strdupA(LPCSTR str) /*********************************************************************** * ComboWndProc_common */ -static LRESULT ComboWndProc_common( HWND hwnd, UINT message, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) { LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwnd, 0 ); @@ -2222,80 +2220,6 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message, } /*********************************************************************** - * ComboWndProc_wrapper16 - */ -static LRESULT ComboWndProc_wrapper16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) -{ - static const UINT msg16_offset = CB_GETEDITSEL16 - CB_GETEDITSEL; - - switch (msg) - { - case CB_INSERTSTRING16: - case CB_SELECTSTRING16: - case CB_FINDSTRING16: - case CB_FINDSTRINGEXACT16: - wParam = (INT)(INT16)wParam; - /* fall through */ - case CB_ADDSTRING16: - if (GetWindowLongW( hwnd, GWL_STYLE ) & CBS_HASSTRINGS) lParam = (LPARAM)MapSL(lParam); - msg -= msg16_offset; - break; - case CB_SETITEMHEIGHT16: - case CB_GETITEMHEIGHT16: - case CB_SETCURSEL16: - case CB_GETLBTEXTLEN16: - case CB_GETITEMDATA16: - case CB_SETITEMDATA16: - wParam = (INT)(INT16)wParam; /* signed integer */ - msg -= msg16_offset; - break; - case CB_GETDROPPEDCONTROLRECT16: - lParam = (LPARAM)MapSL(lParam); - if (lParam) - { - RECT r; - RECT16 *r16 = (RECT16 *)lParam; - ComboWndProc_common( hwnd, CB_GETDROPPEDCONTROLRECT, wParam, (LPARAM)&r, FALSE ); - r16->left = r.left; - r16->top = r.top; - r16->right = r.right; - r16->bottom = r.bottom; - } - return CB_OKAY; - case CB_DIR16: - if (wParam & DDL_DRIVES) wParam |= DDL_EXCLUSIVE; - lParam = (LPARAM)MapSL(lParam); - msg -= msg16_offset; - break; - case CB_GETLBTEXT16: - wParam = (INT)(INT16)wParam; - lParam = (LPARAM)MapSL(lParam); - msg -= msg16_offset; - break; - case CB_GETEDITSEL16: - wParam = lParam = 0; /* just in case */ - msg -= msg16_offset; - break; - case CB_LIMITTEXT16: - case CB_SETEDITSEL16: - case CB_DELETESTRING16: - case CB_RESETCONTENT16: - case CB_GETDROPPEDSTATE16: - case CB_SHOWDROPDOWN16: - case CB_GETCOUNT16: - case CB_GETCURSEL16: - case CB_SETEXTENDEDUI16: - case CB_GETEXTENDEDUI16: - msg -= msg16_offset; - break; - default: - return ComboWndProc_common( hwnd, msg, wParam, lParam, unicode ); - } - return ComboWndProc_common( hwnd, msg, wParam, lParam, FALSE ); -} - - -/*********************************************************************** * ComboWndProcA * * This is just a wrapper for the real ComboWndProc which locks/unlocks @@ -2304,7 +2228,7 @@ static LRESULT ComboWndProc_wrapper16( HWND hwnd, UINT msg, WPARAM wParam, LPARA static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { if (!IsWindow(hwnd)) return 0; - return ComboWndProc_wrapper16( hwnd, message, wParam, lParam, FALSE ); + return wow_handlers.combo_proc( hwnd, message, wParam, lParam, FALSE ); } /*********************************************************************** @@ -2313,7 +2237,7 @@ static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPA static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { if (!IsWindow(hwnd)) return 0; - return ComboWndProc_wrapper16( hwnd, message, wParam, lParam, TRUE ); + return wow_handlers.combo_proc( hwnd, message, wParam, lParam, TRUE ); } /************************************************************************* diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index a407c93..64731b5 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -62,16 +62,19 @@ extern const struct builtin_class_descr STATIC_builtin_class DECLSPEC_HIDDEN; struct wow_handlers16 { LRESULT (*button_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); + LRESULT (*combo_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); }; struct wow_handlers32 { LRESULT (*button_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); + LRESULT (*combo_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); }; extern struct wow_handlers16 wow_handlers DECLSPEC_HIDDEN; extern LRESULT ButtonWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; +extern LRESULT ComboWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; extern void register_wow_handlers(void) DECLSPEC_HIDDEN; extern void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index b677e51..42710aa 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -609,11 +609,87 @@ static LRESULT button_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, } } + +/*********************************************************************** + * combo_proc16 + */ +static LRESULT combo_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + static const UINT msg16_offset = CB_GETEDITSEL16 - CB_GETEDITSEL; + + switch (msg) + { + case CB_INSERTSTRING16: + case CB_SELECTSTRING16: + case CB_FINDSTRING16: + case CB_FINDSTRINGEXACT16: + wParam = (INT)(INT16)wParam; + /* fall through */ + case CB_ADDSTRING16: + if (GetWindowLongW( hwnd, GWL_STYLE ) & CBS_HASSTRINGS) lParam = (LPARAM)MapSL(lParam); + msg -= msg16_offset; + break; + case CB_SETITEMHEIGHT16: + case CB_GETITEMHEIGHT16: + case CB_SETCURSEL16: + case CB_GETLBTEXTLEN16: + case CB_GETITEMDATA16: + case CB_SETITEMDATA16: + wParam = (INT)(INT16)wParam; /* signed integer */ + msg -= msg16_offset; + break; + case CB_GETDROPPEDCONTROLRECT16: + lParam = (LPARAM)MapSL(lParam); + if (lParam) + { + RECT r; + RECT16 *r16 = (RECT16 *)lParam; + wow_handlers32.combo_proc( hwnd, CB_GETDROPPEDCONTROLRECT, wParam, (LPARAM)&r, FALSE ); + r16->left = r.left; + r16->top = r.top; + r16->right = r.right; + r16->bottom = r.bottom; + } + return CB_OKAY; + case CB_DIR16: + if (wParam & DDL_DRIVES) wParam |= DDL_EXCLUSIVE; + lParam = (LPARAM)MapSL(lParam); + msg -= msg16_offset; + break; + case CB_GETLBTEXT16: + wParam = (INT)(INT16)wParam; + lParam = (LPARAM)MapSL(lParam); + msg -= msg16_offset; + break; + case CB_GETEDITSEL16: + wParam = lParam = 0; /* just in case */ + msg -= msg16_offset; + break; + case CB_LIMITTEXT16: + case CB_SETEDITSEL16: + case CB_DELETESTRING16: + case CB_RESETCONTENT16: + case CB_GETDROPPEDSTATE16: + case CB_SHOWDROPDOWN16: + case CB_GETCOUNT16: + case CB_GETCURSEL16: + case CB_SETEXTENDEDUI16: + case CB_GETEXTENDEDUI16: + msg -= msg16_offset; + break; + default: + return wow_handlers32.combo_proc( hwnd, msg, wParam, lParam, unicode ); + } + return wow_handlers32.combo_proc( hwnd, msg, wParam, lParam, FALSE ); +} + + void register_wow_handlers(void) { static const struct wow_handlers16 handlers16 = { button_proc16, + combo_proc16, }; UserRegisterWowHandlers( &handlers16, &wow_handlers32 ); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 040fd72..3e85b77 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -2389,10 +2389,12 @@ INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wow_handlers32 *orig ) { orig->button_proc = ButtonWndProc_common; + orig->combo_proc = ComboWndProc_common; wow_handlers = *new; } struct wow_handlers16 wow_handlers = { ButtonWndProc_common, + ComboWndProc_common, };

1 0

Alexandre Julliard : user32: Turn the listbox winproc into a Wow handler.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 9f12c730e16ffe8abe9e2cb2c77e09d8deabcafc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f12c730e16ffe8abe9e2cb2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 13:18:28 2009 +0100 user32: Turn the listbox winproc into a Wow handler. --- dlls/user32/controls.h | 3 + dlls/user32/listbox.c | 119 +---------------------------------------------- dlls/user32/msg16.c | 113 +++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/winproc.c | 7 ++- 4 files changed, 124 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f12c730e16ffe8abe9e2…

1 0

Alexandre Julliard : user32: Turn the edit winproc into a Wow handler.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 57e5c8f67ab1a78959b43bd814b9d49632e3f9aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e5c8f67ab1a78959b43bd81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 13:19:03 2009 +0100 user32: Turn the edit winproc into a Wow handler. --- dlls/user32/controls.h | 3 + dlls/user32/edit.c | 400 +----------------------------------------------- dlls/user32/msg16.c | 364 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/winproc.c | 2 + 4 files changed, 372 insertions(+), 397 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57e5c8f67ab1a78959b43…

1 0