wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

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 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: 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

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

Stefan Dösinger : wined3d: Properly release client storage memory.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: cde321726820e0430089b5d4db32eadd66c1d1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde321726820e0430089b5d4d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 15 11:25:14 2009 +0100 wined3d: Properly release client storage memory. --- dlls/wined3d/surface.c | 50 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 59dda6e..1c5f012 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1624,6 +1624,37 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { return WINED3D_OK; } +static void surface_release_client_storage(IWineD3DSurface *iface) +{ + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + struct wined3d_context *context; + + context = context_acquire(This->resource.device, NULL, CTXUSAGE_RESOURCELOAD); + + ENTER_GL(); + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); + if(This->texture_name) + { + surface_bind_and_dirtify(This, FALSE); + glTexImage2D(This->texture_target, This->texture_level, + GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + } + if(This->texture_name_srgb) + { + surface_bind_and_dirtify(This, TRUE); + glTexImage2D(This->texture_target, This->texture_level, + GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + } + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + + LEAVE_GL(); + context_release(context); + + IWineD3DSurface_ModifyLocation(iface, SFLAG_INSRGBTEX, FALSE); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); + surface_force_reload(iface); +} + static HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -1650,11 +1681,12 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHD /* Create a DIB section if there isn't a hdc yet */ if(!This->hDC) { - hr = IWineD3DBaseSurfaceImpl_CreateDIBSection(iface); - if(FAILED(hr)) return WINED3DERR_INVALIDCALL; if(This->Flags & SFLAG_CLIENT) { - surface_internal_preload(iface, SRGB_RGB); + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + surface_release_client_storage(iface); } + hr = IWineD3DBaseSurfaceImpl_CreateDIBSection(iface); + if(FAILED(hr)) return WINED3DERR_INVALIDCALL; /* Use the dib section from now on if we are not using a PBO */ if(!(This->Flags & SFLAG_PBO)) @@ -2911,11 +2943,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *M /* For client textures opengl has to be notified */ if(This->Flags & SFLAG_CLIENT) { - DWORD oldFlags = This->Flags; - This->Flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); - if(oldFlags & SFLAG_ALLOCATED) surface_internal_preload(iface, SRGB_RGB); - if(oldFlags & SFLAG_SRGBALLOCATED) surface_internal_preload(iface, SRGB_SRGB); - /* And hope that the app behaves correctly and did not free the old surface memory before setting a new pointer */ + surface_release_client_storage(iface); } /* Now free the old memory if any */ @@ -2928,11 +2956,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *M This->Flags &= ~SFLAG_USERPTR; if(This->Flags & SFLAG_CLIENT) { - DWORD oldFlags = This->Flags; - This->Flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); - /* This respecifies an empty texture and opengl knows that the old memory is gone */ - if(oldFlags & SFLAG_ALLOCATED) surface_internal_preload(iface, SRGB_RGB); - if(oldFlags & SFLAG_SRGBALLOCATED) surface_internal_preload(iface, SRGB_SRGB); + surface_release_client_storage(iface); } } return WINED3D_OK;

1 0

Erich Hoover : ws2_32: Fix allocating a hostent with no h_aliases list.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 896af79093f3d6f8a81b4ed5c6fd41e0e91b7186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896af79093f3d6f8a81b4ed5c… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Dec 14 08:30:14 2009 -0700 ws2_32: Fix allocating a hostent with no h_aliases list. --- dlls/ws2_32/socket.c | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e6668b9..9a65cb0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3639,7 +3639,11 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) /* Allocate a hostent and enough memory for all the IPs, * including the NULL at the end of the list. */ - hostlist = WS_create_he(hostname, 0, numroutes, TRUE); + hostlist = WS_create_he(hostname, 1, numroutes+1, TRUE); + if (hostlist == NULL) + goto cleanup; /* Failed to allocate a hostent for the list of IPs */ + hostlist->h_addr_list[numroutes] = NULL; /* NULL-terminate the address list */ + hostlist->h_aliases[0] = NULL; /* NULL-terminate the alias list */ hostlist->h_addrtype = AF_INET; hostlist->h_length = sizeof(struct in_addr); /* = 4 */ /* Reorder the entries when placing them in the host list, Windows expects @@ -4602,9 +4606,14 @@ static int list_dup(char** l_src, char** l_to, int item_size) * * Creates the entry with enough memory for the name, aliases * addresses, and the address pointers. Also copies the name - * and sets up all the pointers. If "fill_address" is set then + * and sets up all the pointers. If "fill_addresses" is set then * sufficient memory for the addresses is also allocated and the * address pointers are set to this memory. + * + * NOTE: The alias and address lists must be allocated with room + * for the NULL item terminating the list. This is true even if + * the list has no items ("aliases" and "addresses" must be + * at least "1", a truly empty list is invalid). */ static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses, int fill_addresses) { @@ -4616,11 +4625,9 @@ static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses, i sizeof(char *)*aliases + sizeof(char *)*addresses); - /* Place addresses in the allocated memory, making sure to have enough - * room for the NULL at the end of the list. - */ + /* Allocate enough memory for the addresses */ if (fill_addresses) - size += sizeof(struct in_addr)*(addresses+1); + size += sizeof(struct in_addr)*addresses; if (!(p_to = check_buffer_he(size))) return NULL; memset(p_to, 0, size); @@ -4630,24 +4637,21 @@ static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses, i strcpy(p, name); p += strlen(p) + 1; - if (aliases != 0) - { - p_to->h_aliases = (char **)p; - p += sizeof(char *)*aliases; - } - if (addresses != 0) - { - p_to->h_addr_list = (char **)p; - p += sizeof(char *)*addresses; - } + p_to->h_aliases = (char **)p; + p += sizeof(char *)*aliases; + p_to->h_addr_list = (char **)p; + p += sizeof(char *)*addresses; if (fill_addresses) { int i; - /* Fill in the list of address pointers and NULL-terminate the list*/ + /* NOTE: h_aliases must be filled in manually, leave these + * pointers NULL (already set to NULL by memset earlier). + */ + + /* Fill in the list of address pointers */ for (i = 0; i < addresses; i++) p_to->h_addr_list[i] = (p += sizeof(struct in_addr)); - p_to->h_addr_list[i] = NULL; p += sizeof(struct in_addr); } return p_to;

1 0

Huw Davies : riched20: Initialise the style flags.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: d4383b4498af9617c632abe6cb39af0e31e4f139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4383b4498af9617c632abe6c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 11:52:02 2009 +0000 riched20: Initialise the style flags. Found by Valgrind. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6790a6a..3dc1133 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2648,6 +2648,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->hwndParent = NULL; ed->texthost = texthost; ed->bEmulateVersion10 = bEmulateVersion10; + ed->styleFlags = 0; ITextHost_TxGetPropertyBits(texthost, (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| TXTBIT_READONLY|TXTBIT_USEPASSWORD|

1 0

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

15 Dec '09

Module: wine Branch: master Commit: 39dd4d25a47850bc13fe9ab5e579b8f503e9e947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39dd4d25a47850bc13fe9ab5e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 11:35:19 2009 +0000 gdiplus: Fix a memory leak in the tests. Found by Valgrind. --- dlls/gdiplus/tests/customlinecap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 7aa8dc4..218e46d 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -63,6 +63,7 @@ static void test_constructor_destructor(void) stat = GdipCreateCustomLineCap(path, NULL, LineCapFlat, 10.0, &custom); todo_wine expect(NotImplemented, stat); todo_wine ok(custom == NULL, "Expected a failure on creation\n"); + if(stat == Ok) GdipDeleteCustomLineCap(custom); GdipDeletePath(path2); GdipDeletePath(path);

1 0

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

15 Dec '09

Module: wine Branch: master Commit: 70742d5e5a252e7d14fd4e1d6c8369ea0ddc1393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70742d5e5a252e7d14fd4e1d6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 11:32:58 2009 +0000 gdiplus: Fix a memory leak in the tests. Found by Valgrind. --- dlls/gdiplus/tests/font.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 3134ffc..7b95d4c 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -193,6 +193,7 @@ todo_wine { stat = GdipCreateFontFamilyFromName (MSSansSerif, NULL, &family); expect (FontFamilyNotFound, stat); + if(stat == Ok) GdipDeleteFontFamily(family); } stat = GdipCreateFontFamilyFromName (arial, NULL, &family);

1 0

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

15 Dec '09

Module: wine Branch: master Commit: b18cc9f680e522c9e7f7321d07688a77c3ab127f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18cc9f680e522c9e7f7321d0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 11:28:12 2009 +0000 gdiplus: Fix a memory leak in the tests. Found by Valgrind. --- dlls/gdiplus/tests/graphics.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 2a03aad..45bd9f7 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1338,6 +1338,7 @@ static void test_Get_Release_DC(void) GdipDeletePen(pen); GdipDeleteGraphics(graphics); + GdipDeleteRegion(clip); GdipDeletePath(path); GdipDeleteBrush((GpBrush*)brush); GdipDeleteRegion(region);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009