December 2009 - Wine-commits

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

15 Dec '09

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

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

15 Dec '09

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

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

15 Dec '09

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 15 Dec '09

15 Dec '09

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

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

15 Dec '09

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 15 Dec '09

15 Dec '09

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 15 Dec '09

15 Dec '09

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

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

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