December 2009 - Wine-Commits

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

Dec. 15, 2009

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

Dec. 15, 2009

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

Dec. 15, 2009

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

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

Dec. 15, 2009

Module: wine Branch: master Commit: 3dc6317fc6cbdec26c0dbab798bef5dffd178650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc6317fc6cbdec26c0dbab79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 13:19:30 2009 +0100 user32: Turn the scrollbar winproc into a Wow handler. --- dlls/user32/controls.h | 3 +++ dlls/user32/msg16.c | 33 +++++++++++++++++++++++++++++++++ dlls/user32/scroll.c | 40 ++++------------------------------------ dlls/user32/winproc.c | 10 ++++++---- 4 files changed, 46 insertions(+), 40 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 80f6bf5..82036bf 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -65,6 +65,7 @@ struct wow_handlers16 LRESULT (*combo_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*edit_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*listbox_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); + LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); }; struct wow_handlers32 @@ -73,6 +74,7 @@ struct wow_handlers32 LRESULT (*combo_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*edit_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*listbox_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); + LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); }; extern struct wow_handlers16 wow_handlers DECLSPEC_HIDDEN; @@ -81,6 +83,7 @@ extern LRESULT ButtonWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDE 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 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 2ebb133..239e8e5 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -1159,6 +1159,38 @@ static LRESULT listbox_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam } +/*********************************************************************** + * scrollbar_proc16 + */ +static LRESULT scrollbar_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + static const UINT msg16_offset = SBM_SETPOS16 - SBM_SETPOS; + + switch (msg) + { + case SBM_SETPOS16: + case SBM_GETPOS16: + case SBM_ENABLE_ARROWS16: + msg -= msg16_offset; + break; + case SBM_SETRANGE16: + msg = wParam ? SBM_SETRANGEREDRAW : SBM_SETRANGE; + wParam = LOWORD(lParam); + lParam = HIWORD(lParam); + break; + case SBM_GETRANGE16: + { + INT min, max; + wow_handlers32.scrollbar_proc( hwnd, SBM_GETRANGE, (WPARAM)&min, (LPARAM)&max, FALSE ); + return MAKELRESULT(min, max); + } + default: + return wow_handlers32.scrollbar_proc( hwnd, msg, wParam, lParam, unicode ); + } + return wow_handlers32.scrollbar_proc( hwnd, msg, wParam, lParam, FALSE ); +} + + void register_wow_handlers(void) { static const struct wow_handlers16 handlers16 = @@ -1167,6 +1199,7 @@ void register_wow_handlers(void) combo_proc16, edit_proc16, listbox_proc16, + scrollbar_proc16, }; UserRegisterWowHandlers( &handlers16, &wow_handlers32 ); diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 6ab1e56..b948c82 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -33,7 +33,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/winuser16.h" #include "controls.h" #include "win.h" #include "wine/debug.h" @@ -1401,9 +1400,9 @@ static BOOL SCROLL_SetScrollRange(HWND hwnd, INT nBar, INT minVal, INT maxVal) /*********************************************************************** - * ScrollBarWndProc + * ScrollBarWndProc_common */ -static LRESULT ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) +LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) { if (!IsWindow( hwnd )) return 0; @@ -1576,42 +1575,11 @@ static LRESULT ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM /*********************************************************************** - * ScrollBarWndProc_wrapper16 - */ -static LRESULT ScrollBarWndProc_wrapper16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) -{ - static const UINT msg16_offset = SBM_SETPOS16 - SBM_SETPOS; - - switch (msg) - { - case SBM_SETPOS16: - case SBM_GETPOS16: - case SBM_ENABLE_ARROWS16: - msg -= msg16_offset; - break; - case SBM_SETRANGE16: - msg = wParam ? SBM_SETRANGEREDRAW : SBM_SETRANGE; - wParam = LOWORD(lParam); - lParam = HIWORD(lParam); - break; - case SBM_GETRANGE16: - { - INT min, max; - ScrollBarWndProc( hwnd, SBM_GETRANGE, (WPARAM)&min, (LPARAM)&max, FALSE ); - return MAKELRESULT(min, max); - } - default: - return ScrollBarWndProc( hwnd, msg, wParam, lParam, unicode ); - } - return ScrollBarWndProc( hwnd, msg, wParam, lParam, FALSE ); -} - -/*********************************************************************** * ScrollBarWndProcA */ static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - return ScrollBarWndProc_wrapper16( hwnd, message, wParam, lParam, FALSE ); + return wow_handlers.scrollbar_proc( hwnd, message, wParam, lParam, FALSE ); } @@ -1620,7 +1588,7 @@ static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT message, WPARAM wParam, */ static LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - return ScrollBarWndProc_wrapper16( hwnd, message, wParam, lParam, TRUE ); + return wow_handlers.scrollbar_proc( hwnd, message, wParam, lParam, TRUE ); } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 0a91a58..d434961 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -2388,10 +2388,11 @@ 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; - orig->edit_proc = EditWndProc_common; - orig->listbox_proc = ListBoxWndProc_common; + orig->button_proc = ButtonWndProc_common; + orig->combo_proc = ComboWndProc_common; + orig->edit_proc = EditWndProc_common; + orig->listbox_proc = ListBoxWndProc_common; + orig->scrollbar_proc = ScrollBarWndProc_common; wow_handlers = *new; } @@ -2402,4 +2403,5 @@ struct wow_handlers16 wow_handlers = ComboWndProc_common, EditWndProc_common, ListBoxWndProc_common, + ScrollBarWndProc_common, };

1 0

Marcus Meissner : ntdll: Check for NULL attr in NtOpenKey (Coverity).
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: afd4aed5fca819d954f174d5d62eb5a38ed02625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd4aed5fca819d954f174d5d… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Dec 15 11:39:23 2009 +0100 ntdll: Check for NULL attr in NtOpenKey (Coverity). --- dlls/ntdll/reg.c | 4 +++- dlls/ntdll/tests/reg.c | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 7d24a9b..286dbdb 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -114,8 +114,10 @@ NTSTATUS WINAPI RtlpNtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJEC NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; - DWORD len = attr->ObjectName->Length; + DWORD len; + if (!attr) return STATUS_ACCESS_VIOLATION; + len = attr->ObjectName->Length; TRACE( "(%p,%s,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), access, retkey ); diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 89f7c68..a061293 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -336,9 +336,6 @@ static void test_NtOpenKey(void) OBJECT_ATTRIBUTES attr; ACCESS_MASK am = KEY_READ; - if (0) - { - /* Crashes Wine */ /* All NULL */ status = pNtOpenKey(NULL, 0, NULL); ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status); @@ -347,7 +344,6 @@ static void test_NtOpenKey(void) status = pNtOpenKey(&key, 0, NULL); ok(status == STATUS_ACCESS_VIOLATION /* W2K3/XP/W2K */ || status == STATUS_INVALID_PARAMETER /* NT4 */, "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08x\n", status); - } InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);

1 0

Marcus Meissner : rpcrt4: Exit on unknown confirmance type (Coverity).
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: 122ca034db085b4d76525e4b08c1d705c8109234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=122ca034db085b4d76525e4b0… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Dec 15 11:44:37 2009 +0100 rpcrt4: Exit on unknown confirmance type (Coverity). --- dlls/rpcrt4/ndr_marshall.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 4c9f625..3b10af4 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -551,7 +551,8 @@ PFORMAT_STRING ComputeConformanceOrVariance( } break; default: - FIXME("unknown conformance type %x\n", pFormat[0] & 0xf0); + FIXME("unknown conformance type %x, expect crash.\n", pFormat[0] & 0xf0); + goto finish_conf; } switch (pFormat[1]) {

1 0

Alexander Nicolaysen Sørnes : winedbg: Add Norwegian Bokmål translation.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: bdda678803a04a6cf91a7f25163f6e07aafdd291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdda678803a04a6cf91a7f251… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 14 23:47:38 2009 +0100 winedbg: Add Norwegian Bokmål translation. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/rsrc_No.rc | 55 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index cf73058..1d92849 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -39,6 +39,7 @@ RC_SRCS = \ rsrc_Ko.rc \ rsrc_Lt.rc \ rsrc_Nl.rc \ + rsrc_No.rc \ rsrc_Pt.rc \ rsrc_Ru.rc \ rsrc_Sv.rc diff --git a/programs/winedbg/rsrc_No.rc b/programs/winedbg/rsrc_No.rc new file mode 100644 index 0000000..795aec3 --- /dev/null +++ b/programs/winedbg/rsrc_No.rc @@ -0,0 +1,55 @@ +/* + * Norwegian Bokmål Language Support + * + * Copyright 2009 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Debug", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Programfeil" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Programmet %s har fått et alvorlig problem og må \ + avsluttes. Vi beklager det inntrufne.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Dette kan skyldes et problem i programmet eller en feil i Wine. \ + Du kan besøke http://appdb.winehq.org for råd om hvordan du kan kjøre \ + dette programmet.\n\n\ + Du kan rapportere feilen på http://bugs.winehq.org hvis problemet \ + ikke oppstår i Windows.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Lukk", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Wine programfeil" + IDS_INVALID_PARAMS "Interne feil - mottok ugyldig parameter" + IDS_UNIDENTIFIED "(uidentifisert)" +END

1 0

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

Dec. 15, 2009

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 : gdiplus: Fix a memory leak in the tests.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

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

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

Dec. 15, 2009

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