December 2009 - Wine-Commits

Alexandre Julliard : user32: Move 16-bit winproc functions to msg16.c.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 552fc29b2613f0169f0680339bdf619442323ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=552fc29b2613f0169f0680339… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 20:01:38 2009 +0100 user32: Move 16-bit winproc functions to msg16.c. --- dlls/user32/controls.h | 3 + dlls/user32/msg16.c | 275 +++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/winproc.c | 292 ++---------------------------------------------- 3 files changed, 287 insertions(+), 283 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=552fc29b2613f0169f068…

1 0

Alexandre Julliard : user32: Store the 16-bit winproc in a different array from the 32-bit A/W ones.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: fc0244cb32b5db1b075fd008a23e3c35324b9a96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0244cb32b5db1b075fd008a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 20:11:16 2009 +0100 user32: Store the 16-bit winproc in a different array from the 32-bit A/W ones. --- dlls/user32/winproc.c | 245 ++++++++++++++++++++++-------------------------- 1 files changed, 112 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc0244cb32b5db1b075fd…

1 0

André Hentschel : patches: Some HTML markup fixes.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

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 Dec. 15, 2009

Dec. 15, 2009

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 Dec. 15, 2009

Dec. 15, 2009

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

Alexandre Julliard : user32: Turn the static winproc into a Wow handler.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: 8649f73056d79a06159b5b5787f0e86b4e2ab69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8649f73056d79a06159b5b578… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 13:19:53 2009 +0100 user32: Turn the static winproc into a Wow handler. --- dlls/user32/controls.h | 3 +++ dlls/user32/msg16.c | 19 +++++++++++++++++++ dlls/user32/static.c | 25 +++---------------------- dlls/user32/winproc.c | 2 ++ 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 82036bf..036282b 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -66,6 +66,7 @@ struct wow_handlers16 LRESULT (*edit_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*listbox_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); + LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); }; struct wow_handlers32 @@ -75,6 +76,7 @@ struct wow_handlers32 LRESULT (*edit_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*listbox_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); + LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); }; extern struct wow_handlers16 wow_handlers DECLSPEC_HIDDEN; @@ -84,6 +86,7 @@ extern LRESULT ComboWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN extern LRESULT EditWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; extern LRESULT ListBoxWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; extern LRESULT ScrollBarWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; +extern LRESULT StaticWndProc_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 239e8e5..7ccf049 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -1191,6 +1191,24 @@ static LRESULT scrollbar_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar } +/*********************************************************************** + * static_proc16 + */ +static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + switch (msg) + { + case STM_SETICON16: + wParam = (WPARAM)HICON_32( (HICON16)wParam ); + return wow_handlers32.static_proc( hwnd, STM_SETICON, wParam, lParam, FALSE ); + case STM_GETICON16: + return HICON_16( wow_handlers32.static_proc( hwnd, STM_GETICON, wParam, lParam, FALSE )); + default: + return wow_handlers32.static_proc( hwnd, msg, wParam, lParam, unicode ); + } +} + + void register_wow_handlers(void) { static const struct wow_handlers16 handlers16 = @@ -1200,6 +1218,7 @@ void register_wow_handlers(void) edit_proc16, listbox_proc16, scrollbar_proc16, + static_proc16, }; UserRegisterWowHandlers( &handlers16, &wow_handlers32 ); diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 80c502d..b33033a 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -47,7 +47,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/winuser16.h" #include "controls.h" #include "user_private.h" #include "wine/debug.h" @@ -400,8 +399,7 @@ static BOOL hasTextStyle( DWORD style ) /*********************************************************************** * StaticWndProc_common */ -static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, - LPARAM lParam, BOOL unicode ) +LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL unicode ) { LRESULT lResult = 0; LONG full_style = GetWindowLongW( hwnd, GWL_STYLE ); @@ -607,29 +605,12 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, } /*********************************************************************** - * StaticWndProc_wrapper16 - */ -static LRESULT StaticWndProc_wrapper16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) -{ - switch (msg) - { - case STM_SETICON16: - wParam = (WPARAM)HICON_32( (HICON16)wParam ); - return StaticWndProc_common( hwnd, STM_SETICON, wParam, lParam, FALSE ); - case STM_GETICON16: - return HICON_16( StaticWndProc_common( hwnd, STM_GETICON, wParam, lParam, FALSE )); - default: - return StaticWndProc_common( hwnd, msg, wParam, lParam, unicode ); - } -} - -/*********************************************************************** * StaticWndProcA */ static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; - return StaticWndProc_wrapper16(hWnd, uMsg, wParam, lParam, FALSE); + return wow_handlers.static_proc(hWnd, uMsg, wParam, lParam, FALSE); } /*********************************************************************** @@ -638,7 +619,7 @@ static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARA static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; - return StaticWndProc_wrapper16(hWnd, uMsg, wParam, lParam, TRUE); + return wow_handlers.static_proc(hWnd, uMsg, wParam, lParam, TRUE); } static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index d434961..67671c9 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -2393,6 +2393,7 @@ void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wo orig->edit_proc = EditWndProc_common; orig->listbox_proc = ListBoxWndProc_common; orig->scrollbar_proc = ScrollBarWndProc_common; + orig->static_proc = StaticWndProc_common; wow_handlers = *new; } @@ -2404,4 +2405,5 @@ struct wow_handlers16 wow_handlers = EditWndProc_common, ListBoxWndProc_common, ScrollBarWndProc_common, + StaticWndProc_common, };

1 0

Huw Davies : oleaut32: Fix a memory leak in the tests.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: 0535a2d39c928b7e04def6fe9a1d9c11cf04ce4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0535a2d39c928b7e04def6fe9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 12:26:37 2009 +0000 oleaut32: Fix a memory leak in the tests. Found by Valgrind. --- dlls/oleaut32/tests/varformat.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 6833a27..9d15fd9 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -387,7 +387,9 @@ static void test_VarFormat(void) /* 'out' is not cleared */ out = (BSTR)0x1; - pVarFormat(&in,NULL,fd,fw,flags,&out); /* Would crash if out is cleared */ + hres = pVarFormat(&in,NULL,fd,fw,flags,&out); /* Would crash if out is cleared */ + ok(hres == S_OK, "got %08x\n", hres); + SysFreeString(out); out = NULL; /* VT_NULL */

1 0

Alexandre Julliard : user32: Add 16-bit translation for parameters of the WM_H/VSCROLL edit messages.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: 6af1df86ce21bb895f896dd0d9ab514bd49a8cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af1df86ce21bb895f896dd0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 13:22:45 2009 +0100 user32: Add 16-bit translation for parameters of the WM_H/VSCROLL edit messages. --- dlls/user32/edit.c | 15 +++++---------- dlls/user32/msg16.c | 5 +++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 4b73ec7..a2ce5f1 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -51,11 +51,8 @@ #include "windef.h" #include "winbase.h" #include "winnt.h" -#include "wownt32.h" #include "win.h" #include "imm.h" -#include "wine/winbase16.h" -#include "wine/winuser16.h" #include "wine/unicode.h" #include "controls.h" #include "user_private.h" @@ -3918,7 +3915,6 @@ static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos) * although it's also a regular control message. */ case EM_GETTHUMB: /* this one is used by NT notepad */ - case EM_GETTHUMB16: { LRESULT ret; if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL) @@ -3932,7 +3928,7 @@ static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos) TRACE("EM_GETTHUMB: returning %ld\n", ret); return ret; } - case EM_LINESCROLL16: + case EM_LINESCROLL: TRACE("EM_LINESCROLL16\n"); dx = pos; break; @@ -4042,7 +4038,6 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos) * although it's also a regular control message. */ case EM_GETTHUMB: /* this one is used by NT notepad */ - case EM_GETTHUMB16: { LRESULT ret; if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_VSCROLL) @@ -4056,8 +4051,8 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos) TRACE("EM_GETTHUMB: returning %ld\n", ret); return ret; } - case EM_LINESCROLL16: - TRACE("EM_LINESCROLL16 %d\n", pos); + case EM_LINESCROLL: + TRACE("EM_LINESCROLL %d\n", pos); dy = pos; break; @@ -4083,8 +4078,8 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos) */ static LRESULT EDIT_EM_GetThumb(EDITSTATE *es) { - return MAKELONG(EDIT_WM_VScroll(es, EM_GETTHUMB16, 0), - EDIT_WM_HScroll(es, EM_GETTHUMB16, 0)); + return MAKELONG(EDIT_WM_VScroll(es, EM_GETTHUMB, 0), + EDIT_WM_HScroll(es, EM_GETTHUMB, 0)); } diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index 7ccf049..674b18c 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -1038,6 +1038,11 @@ static LRESULT edit_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case WM_NCDESTROY: edit_destroy_handle( hwnd ); return wow_handlers32.edit_proc( hwnd, msg, wParam, lParam, unicode ); /* no unlock on destroy */ + case WM_HSCROLL: + case WM_VSCROLL: + if (LOWORD(wParam) == EM_GETTHUMB16 || LOWORD(wParam) == EM_LINESCROLL16) wParam -= msg16_offset; + result = wow_handlers32.edit_proc( hwnd, msg, wParam, lParam, unicode ); + break; default: result = wow_handlers32.edit_proc( hwnd, msg, wParam, lParam, unicode ); break;

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLImgElement get_Name.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

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 Dec. 15, 2009

Dec. 15, 2009

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