February 2009 - Wine-commits

Jacek Caban : jscript: Fixed handling block_cnt in jsheap_alloc.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 18ee50e5d2bd0f55061215e80559f1f50152bf16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ee50e5d2bd0f55061215e80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 25 01:28:49 2009 +0100 jscript: Fixed handling block_cnt in jsheap_alloc. --- dlls/jscript/jsutils.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index defddd4..5f24b7c 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -83,25 +83,25 @@ void *jsheap_alloc(jsheap_t *heap, DWORD size) heap->block_cnt = 1; } - if(heap->offset + size < block_size(heap->last_block)) { + if(heap->offset + size <= block_size(heap->last_block)) { tmp = ((BYTE*)heap->blocks[heap->last_block])+heap->offset; heap->offset += size; return tmp; } - if(size < block_size(heap->last_block+1)) { + if(size <= block_size(heap->last_block+1)) { if(heap->last_block+1 == heap->block_cnt) { tmp = heap_realloc(heap->blocks, (heap->block_cnt+1)*sizeof(void*)); if(!tmp) return NULL; - heap->blocks = tmp; - } - tmp = heap_alloc(block_size(heap->block_cnt+1)); - if(!tmp) - return NULL; + heap->blocks = tmp; + heap->blocks[heap->block_cnt] = heap_alloc(block_size(heap->block_cnt)); + if(!heap->blocks[heap->block_cnt]) + return NULL; - heap->blocks[heap->block_cnt++] = tmp; + heap->block_cnt++; + } heap->last_block++; heap->offset = size;

1 0

Jacek Caban : jscript: Reset mark in jsheap_clear.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: ed78892e46725e6cae8eb45320c69342d03acfb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed78892e46725e6cae8eb4532… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 25 01:29:02 2009 +0100 jscript: Reset mark in jsheap_clear. --- dlls/jscript/jsutils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 5f24b7c..5417daf 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -140,6 +140,7 @@ void jsheap_clear(jsheap_t *heap) } heap->last_block = heap->offset = 0; + heap->mark = FALSE; } void jsheap_free(jsheap_t *heap)

1 0

Alexandre Julliard : credui: Fix old-style dependency line in the makefile.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: e4815a9b51d28823ab39a74dd62ee85435347e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4815a9b51d28823ab39a74dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 17:31:00 2009 +0100 credui: Fix old-style dependency line in the makefile. --- dlls/credui/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index e91474f..c9d574f 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -13,4 +13,4 @@ RC_SRCS = credui.rc @MAKE_DLL_RULES@ -### Dependencies: +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Alexandre Julliard : user32: Move a few 16-bit user functions to user16. c where they belong.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 6c8e3a8539a6aecba43e82ffd8c348fb8006b56d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8e3a8539a6aecba43e82ffd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 17:36:50 2009 +0100 user32: Move a few 16-bit user functions to user16.c where they belong. --- dlls/user32/kbd16.c | 31 ------------------------ dlls/user32/mouse16.c | 26 -------------------- dlls/user32/user16.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 57 deletions(-) diff --git a/dlls/user32/kbd16.c b/dlls/user32/kbd16.c index fbf0788..ffc53ef 100644 --- a/dlls/user32/kbd16.c +++ b/dlls/user32/kbd16.c @@ -209,34 +209,3 @@ INT16 WINAPI ToAscii16(UINT16 virtKey,UINT16 scanCode, LPBYTE lpKeyState, { return ToAscii( virtKey, scanCode, lpKeyState, lpChar, flags ); } - -/*********************************************************************** - * MessageBeep (USER.104) - */ -void WINAPI MessageBeep16( UINT16 i ) -{ - MessageBeep( i ); -} - -/*********************************************************************** - * keybd_event (USER.289) - */ -void WINAPI keybd_event16( CONTEXT86 *context ) -{ - DWORD dwFlags = 0; - - if (HIBYTE(context->Eax) & 0x80) dwFlags |= KEYEVENTF_KEYUP; - if (HIBYTE(context->Ebx) & 0x01) dwFlags |= KEYEVENTF_EXTENDEDKEY; - - keybd_event( LOBYTE(context->Eax), LOBYTE(context->Ebx), - dwFlags, MAKELONG(LOWORD(context->Esi), LOWORD(context->Edi)) ); -} - - -/**************************************************************************** - * GetKeyboardLayoutName (USER.477) - */ -INT16 WINAPI GetKeyboardLayoutName16( LPSTR name ) -{ - return GetKeyboardLayoutNameA( name ); -} diff --git a/dlls/user32/mouse16.c b/dlls/user32/mouse16.c index f754e3b..7cb653d 100644 --- a/dlls/user32/mouse16.c +++ b/dlls/user32/mouse16.c @@ -77,29 +77,3 @@ VOID WINAPI MOUSE_Disable(VOID) { DefMouseEventProc = 0; } - -/*********************************************************************** - * SwapMouseButton (USER.186) - */ -BOOL16 WINAPI SwapMouseButton16( BOOL16 fSwap ) -{ - return SwapMouseButton( fSwap ); -} - -/*********************************************************************** - * mouse_event (USER.299) - */ -void WINAPI mouse_event16( CONTEXT86 *context ) -{ - mouse_event( LOWORD(context->Eax), LOWORD(context->Ebx), LOWORD(context->Ecx), - LOWORD(context->Edx), MAKELONG(context->Esi, context->Edi) ); -} - -/*********************************************************************** - * GetMouseEventProc (USER.337) - */ -FARPROC16 WINAPI GetMouseEventProc16(void) -{ - HMODULE16 hmodule = GetModuleHandle16("USER"); - return GetProcAddress16( hmodule, "mouse_event" ); -} diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index 64a160f..85b7212 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -428,6 +428,15 @@ BOOL16 WINAPI AdjustWindowRect16( LPRECT16 rect, DWORD style, BOOL16 menu ) } +/*********************************************************************** + * MessageBeep (USER.104) + */ +void WINAPI MessageBeep16( UINT16 i ) +{ + MessageBeep( i ); +} + + /************************************************************************** * CloseClipboard (USER.138) */ @@ -677,6 +686,15 @@ BOOL16 WINAPI GrayString16( HDC16 hdc, HBRUSH16 hbr, GRAYSTRINGPROC16 gsprc, } +/*********************************************************************** + * SwapMouseButton (USER.186) + */ +BOOL16 WINAPI SwapMouseButton16( BOOL16 fSwap ) +{ + return SwapMouseButton( fSwap ); +} + + /************************************************************************** * IsClipboardFormatAvailable (USER.193) */ @@ -999,6 +1017,31 @@ BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename ) /*********************************************************************** + * keybd_event (USER.289) + */ +void WINAPI keybd_event16( CONTEXT86 *context ) +{ + DWORD dwFlags = 0; + + if (HIBYTE(context->Eax) & 0x80) dwFlags |= KEYEVENTF_KEYUP; + if (HIBYTE(context->Ebx) & 0x01) dwFlags |= KEYEVENTF_EXTENDEDKEY; + + keybd_event( LOBYTE(context->Eax), LOBYTE(context->Ebx), + dwFlags, MAKELONG(LOWORD(context->Esi), LOWORD(context->Edi)) ); +} + + +/*********************************************************************** + * mouse_event (USER.299) + */ +void WINAPI mouse_event16( CONTEXT86 *context ) +{ + mouse_event( LOWORD(context->Eax), LOWORD(context->Ebx), LOWORD(context->Ecx), + LOWORD(context->Edx), MAKELONG(context->Esi, context->Edi) ); +} + + +/*********************************************************************** * GetClipCursor (USER.309) */ void WINAPI GetClipCursor16( RECT16 *rect ) @@ -1053,6 +1096,16 @@ BOOL16 WINAPI EnableHardwareInput16(BOOL16 bEnable) /*********************************************************************** + * GetMouseEventProc (USER.337) + */ +FARPROC16 WINAPI GetMouseEventProc16(void) +{ + HMODULE16 hmodule = GetModuleHandle16("USER"); + return GetProcAddress16( hmodule, "mouse_event" ); +} + + +/*********************************************************************** * IsUserIdle (USER.333) */ BOOL16 WINAPI IsUserIdle16(void) @@ -1678,6 +1731,15 @@ SEGPTR WINAPI AnsiPrev16( LPCSTR start, SEGPTR current ) } +/**************************************************************************** + * GetKeyboardLayoutName (USER.477) + */ +INT16 WINAPI GetKeyboardLayoutName16( LPSTR name ) +{ + return GetKeyboardLayoutNameA( name ); +} + + /*********************************************************************** * FormatMessage (USER.606) */

1 0

Alexandre Julliard : libwine: Try to load all modules in the programs directory, not just those with . exe extension.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: cee15b24496e9c15bf7c7f2d3cf1b781212ce435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee15b24496e9c15bf7c7f2d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 18:11:53 2009 +0100 libwine: Try to load all modules in the programs directory, not just those with .exe extension. --- libs/wine/loader.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index dde5a70..b7dd8b3 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -169,22 +169,23 @@ static char *next_dll_path( struct dll_path_context *context ) switch(index) { - case 0: /* try programs dir for .exe files */ - if (!context->win16 && namelen > 4 && !memcmp( context->name + namelen - 4, ".exe", 4 )) + case 0: /* try dlls dir with subdir prefix */ + if (namelen > 4 && !memcmp( context->name + namelen - 4, ".dll", 4 )) namelen -= 4; + if (!context->win16) path = prepend( path, context->name, namelen ); + path = prepend( path, "/dlls", sizeof("/dlls") - 1 ); + path = prepend( path, build_dir, strlen(build_dir) ); + return path; + case 1: /* try programs dir with subdir prefix */ + if (!context->win16) { - path = prepend( path, context->name, namelen - 4 ); + if (namelen > 4 && !memcmp( context->name + namelen - 4, ".exe", 4 )) namelen -= 4; + path = prepend( path, context->name, namelen ); path = prepend( path, "/programs", sizeof("/programs") - 1 ); path = prepend( path, build_dir, strlen(build_dir) ); return path; } context->index++; /* fall through */ - case 1: /* try dlls dir with subdir prefix */ - if (namelen > 4 && !memcmp( context->name + namelen - 4, ".dll", 4 )) namelen -= 4; - if (!context->win16) path = prepend( path, context->name, namelen ); - path = prepend( path, "/dlls", sizeof("/dlls") - 1 ); - path = prepend( path, build_dir, strlen(build_dir) ); - return path; default: index -= 2; if (index < nb_dll_paths)

1 0

Rob Shearman : widl: Ignore pointer attributes applied to interface pointers.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: a93f531c210a77f6ca66b66cf0fed674adb74e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a93f531c210a77f6ca66b66cf… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Feb 24 15:15:21 2009 +0000 widl: Ignore pointer attributes applied to interface pointers. Print a warning if a pointer attribute is specified since the generated code won't do what the developer expects. --- tools/widl/parser.y | 7 ++++++- tools/widl/proxy.c | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9ac093d..0988efd 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1446,7 +1446,12 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, } if (ptr && is_ptr(ptr) && (ptr_attr || top)) { - if (!ptr_attr) + if (ptr_attr && ptr_attr != RPC_FC_UP && + type_get_type(type_pointer_get_ref(ptr)) == TYPE_INTERFACE) + warning_loc_info(&v->loc_info, + "%s: pointer attribute applied to interface " + "pointer type has no effect\n", v->name); + if (top) ptr_attr = RPC_FC_RP; if (ptr_attr != (*pt)->type) { diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 0355eda..2999b3f 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -158,7 +158,6 @@ int cant_be_null(const var_t *v) case TGT_ARRAY: /* FIXME: work out pointer type */ return 0; - case TGT_IFACE_POINTER: /* FIXME */ case TGT_POINTER: return (get_pointer_fc(v->type) == RPC_FC_RP); case TGT_CTXT_HANDLE_POINTER:

1 0

Rob Shearman : widl: Only classify top-level pointers as ref pointers if they don' t have any other pointer attributes.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: f27261e525d5025e12f85ea3107dd938054abf4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27261e525d5025e12f85ea31… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Feb 24 15:15:42 2009 +0000 widl: Only classify top-level pointers as ref pointers if they don't have any other pointer attributes. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 0988efd..fb7dcaa 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1451,7 +1451,7 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, warning_loc_info(&v->loc_info, "%s: pointer attribute applied to interface " "pointer type has no effect\n", v->name); - if (top) + if (top && !ptr_attr) ptr_attr = RPC_FC_RP; if (ptr_attr != (*pt)->type) {

1 0

Rein Klazes : user32: Refine the size calculations for menu items with HBMMENU_POPUP magic bitmaps with some conformance tests .
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: bdb770e10e03485737cca5d6a82b5e3c26dd2703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb770e10e03485737cca5d6a… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Feb 24 19:10:29 2009 +0100 user32: Refine the size calculations for menu items with HBMMENU_POPUP magic bitmaps with some conformance tests. --- dlls/user32/menu.c | 11 +++++++---- dlls/user32/tests/menu.c | 44 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 1df3675..d285ef2 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -423,6 +423,7 @@ static HMENU MENU_CopySysPopup(void) MENUITEMINFOW miteminfo; POPUPMENU* menu = MENU_GetMenu(hMenu); menu->wFlags |= MF_SYSMENU | MF_POPUP; + /* decorate the menu with bitmaps */ minfo.cbSize = sizeof( MENUINFO); minfo.dwStyle = MNS_CHECKORBMP; minfo.fMask = MIM_STYLE; @@ -835,8 +836,8 @@ static void MENU_GetBitmapItemSize( MENUITEM *lpitem, SIZE *size, case (INT_PTR)HBMMENU_POPUP_RESTORE: case (INT_PTR)HBMMENU_POPUP_MAXIMIZE: case (INT_PTR)HBMMENU_POPUP_MINIMIZE: - size->cx = GetSystemMetrics( SM_CYMENU ) - 4; /* FIXME: test */ - size->cy = size->cx; + size->cx = GetSystemMetrics( SM_CXMENUSIZE); + size->cy = GetSystemMetrics( SM_CYMENUSIZE); return; } if (GetObjectW(bmp, sizeof(bm), &bm )) @@ -945,15 +946,17 @@ static void MENU_DrawBitmapItem( HDC hdc, MENUITEM *lpitem, const RECT *rect, } if (bmchr) { + /* draw the magic bitmaps using marlett font characters */ + /* FIXME: fontsize and the position (x,y) could probably be better */ HFONT hfont, hfontsav; LOGFONTW logfont = { 0, 0, 0, 0, FW_NORMAL, 0, 0, 0, SYMBOL_CHARSET, 0, 0, 0, 0, { 'M','a','r','l','e','t','t',0 } }; - logfont.lfHeight = min( h, w) - 2 ; + logfont.lfHeight = min( h, w) - 5 ; TRACE(" height %d rect %s\n", logfont.lfHeight, wine_dbgstr_rect( rect)); hfont = CreateFontIndirectW( &logfont); hfontsav = SelectObject(hdc, hfont); - TextOutW( hdc, rect->left, rect->top, &bmchr, 1); + TextOutW( hdc, rect->left, rect->top + 2, &bmchr, 1); SelectObject(hdc, hfontsav); DeleteObject( hfont); } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 4d0e7d4..f5d2bdc 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -433,7 +433,7 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, sprintf( buf,"%d text \"%s\" mnuopt %d", count, text ? text: "(nil)", mnuopt); FillRect( hdc, &rc, (HBRUSH) COLOR_WINDOW); - TextOut( hdc, 100, 50, buf, strlen( buf)); + TextOut( hdc, 10, 50, buf, strlen( buf)); ReleaseDC( hwnd, hdc); } if(ispop) @@ -445,13 +445,17 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, } ret = GetMenuItemRect( hwnd, hmenu, 0, &rc); if (0) /* comment out menu size checks, behavior is different in almost every Windows version */ + /* the tests should however succeed on win2000, XP and Wine (at least upto 1.1.15) */ + /* with a variety of dpi's and desktop font sizes */ { /* check menu width */ if( ispop) expect = ( text || hbmp ? 4 + (mnuopt != 1 ? GetSystemMetrics(SM_CXMENUCHECK) : 0) : 0) + - arrowwidth + MOD_avec + (hbmp ? bmpsize.cx + 2 : 0) + + arrowwidth + MOD_avec + (hbmp ? + ((int)hbmp<0||(int)hbmp>12 ? bmpsize.cx + 2 : GetSystemMetrics( SM_CXMENUSIZE) + 2) + : 0) + (text && hastab ? /* TAB space */ MOD_avec + ( hastab==2 ? sc_size.cx : 0) : 0) + (text ? 2 + (text[0] ? size.cx :0): 0) ; @@ -466,7 +470,11 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, if( ispop) expect = max( ( !(text || hbmp) ? GetSystemMetrics( SM_CYMENUSIZE)/2 : 0), max( (text ? max( 2 + size.cy, MOD_hic + 4) : 0), - (hbmp ? bmpsize.cy + 2 : 0))); + (hbmp ? + ((int)hbmp<0||(int)hbmp>12 ? + bmpsize.cy + 2 + : GetSystemMetrics( SM_CYMENUSIZE) + 2) + : 0))); else expect = ( !(text || hbmp) ? GetSystemMetrics( SM_CYMENUSIZE)/2 : max( GetSystemMetrics( SM_CYMENU) - 1, (hbmp ? bmpsize.cy : 0))); @@ -497,8 +505,8 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, } /* if there was a failure, report details */ if( failed) { - trace("*** count %d text \"%s\" bitmap %p bmsize %d,%d textsize %d+%d,%d mnuopt %d hastab %d\n", - count, text ? text: "(nil)", hbmp, bmpsize.cx, bmpsize.cy, + trace("*** count %d %s text \"%s\" bitmap %p bmsize %d,%d textsize %d+%d,%d mnuopt %d hastab %d\n", + count, (ispop? "POPUP": "MENUBAR"),text ? text: "(nil)", hbmp, bmpsize.cx, bmpsize.cy, size.cx, size.cy, sc_size.cx, mnuopt, hastab); trace(" check %d,%d arrow %d avechar %d\n", GetSystemMetrics(SM_CXMENUCHECK ), @@ -523,6 +531,9 @@ static void test_menu_bmp_and_string(void) BITMAP bm; INT arrowwidth; HWND hwnd; + HMENU hsysmenu; + MENUINFO mi= {sizeof(MENUINFO)}; + MENUITEMINFOA mii= {sizeof(MENUITEMINFOA)}; int count, szidx, txtidx, bmpidx, hassub, mnuopt, ispop; if( !pGetMenuInfo) @@ -532,15 +543,28 @@ static void test_menu_bmp_and_string(void) } memset( bmfill, 0xcc, sizeof( bmfill)); - hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, + hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, WS_SYSMENU | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, NULL, NULL, NULL, NULL); hbm_arrow=LoadBitmap( 0, (CHAR*)OBM_MNARROW); GetObject( hbm_arrow, sizeof(bm), &bm); arrowwidth = bm.bmWidth; - ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); if( !hwnd) return; + /* test system menu */ + hsysmenu = GetSystemMenu( hwnd, FALSE); + ok( hsysmenu != NULL, "GetSystemMenu failed with error %d\n", GetLastError()); + mi.fMask = MIM_STYLE; + mi.dwStyle = 0; + ok( pGetMenuInfo( hsysmenu, &mi), "GetMenuInfo failed gle=%d\n", GetLastError()); + ok( MNS_CHECKORBMP == mi.dwStyle, "System Menu Style is %08x, without the bit %08x\n", + mi.dwStyle, MNS_CHECKORBMP); + mii.fMask = MIIM_BITMAP; + mii.hbmpItem = NULL; + ok( GetMenuItemInfoA( hsysmenu, SC_CLOSE, FALSE, &mii), "GetMenuItemInfoA failed gle=%d\n", GetLastError()); + ok( HBMMENU_POPUP_CLOSE == mii.hbmpItem, "Item info did not get the right hbitmap: got %p expected %p\n", + mii.hbmpItem, HBMMENU_POPUP_CLOSE); + SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG_PTR)menu_ownerdraw_wnd_proc); if( winetest_debug) @@ -554,7 +578,7 @@ static void test_menu_bmp_and_string(void) {10,10},{38,38},{1,30},{55,5}}; for( szidx=0; szidx < sizeof( bmsizes) / sizeof( SIZE); szidx++) { HBITMAP hbm = CreateBitmap( bmsizes[szidx].cx, bmsizes[szidx].cy,1,1,bmfill); - HBITMAP bitmaps[] = { HBMMENU_CALLBACK, hbm, NULL }; + HBITMAP bitmaps[] = { HBMMENU_CALLBACK, hbm, HBMMENU_POPUP_CLOSE, NULL }; ok( hbm != 0, "CreateBitmap failed err %d\n", GetLastError()); for( txtidx = 0; txtidx < sizeof(MOD_txtsizes)/sizeof(MOD_txtsizes[0]); txtidx++) { for( hassub = 0; hassub < 2 ; hassub++) { /* add submenu item */ @@ -562,6 +586,10 @@ static void test_menu_bmp_and_string(void) for( bmpidx = 0; bmpidx <sizeof(bitmaps)/sizeof(HBITMAP); bmpidx++) { /* no need to test NULL bitmaps of several sizes */ if( !bitmaps[bmpidx] && szidx > 0) continue; + /* the HBMMENU_POPUP not to test for menu bars */ + if( !ispop && + bitmaps[bmpidx] >= HBMMENU_POPUP_CLOSE && + bitmaps[bmpidx] <= HBMMENU_POPUP_MINIMIZE) continue; if( !ispop && hassub) continue; test_mbs_help( ispop, hassub, mnuopt, hwnd, arrowwidth, ++count,

1 0

Vincent Povirk : mapi32: Add version resource.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: c0dbcbab5276ac06287cc71893f153c77773efd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0dbcbab5276ac06287cc7189… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 24 16:36:41 2009 -0600 mapi32: Add version resource. --- dlls/mapi32/Makefile.in | 2 ++ dlls/mapi32/version.rc | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 26ebf06..3e311de 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -13,6 +13,8 @@ C_SRCS = \ sendmail.c \ util.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/mapi32/version.rc b/dlls/mapi32/version.rc new file mode 100644 index 0000000..0f95516 --- /dev/null +++ b/dlls/mapi32/version.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Messaging API" +#define WINE_FILENAME_STR "mapi32.dll" + +#include "wine/wine_common_ver.rc"

1 0

Rob Shearman : rpcrt4: Fix use of uninitialised variable in NdrDllRegisterProxy.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 86f79e3a558ca1fb5d596e9f62403ca89178d3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f79e3a558ca1fb5d596e9f6… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Feb 24 14:53:17 2009 +0000 rpcrt4: Fix use of uninitialised variable in NdrDllRegisterProxy. It should be key, not subkey being passed into RegSetValueExW. --- dlls/rpcrt4/cpsf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index bece899..a0d541d 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -266,7 +266,7 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll, if (len && len < sizeof(module)) { TRACE("registering CLSID %s => %s\n", debugstr_w(clsid), debugstr_w(module)); if (RegCreateKeyW(HKEY_CLASSES_ROOT, keyname, &key) == ERROR_SUCCESS) { - RegSetValueExW(subkey, NULL, 0, REG_SZ, (const BYTE *)psfactoryW, sizeof(psfactoryW)); + RegSetValueExW(key, NULL, 0, REG_SZ, (const BYTE *)psfactoryW, sizeof(psfactoryW)); if (RegCreateKeyW(key, inprocserverW, &subkey) == ERROR_SUCCESS) { RegSetValueExW(subkey, NULL, 0, REG_SZ, (LPBYTE)module, (strlenW(module)+1)*sizeof(WCHAR)); RegSetValueExW(subkey, threadingmodelW, 0, REG_SZ, (const BYTE *)bothW, sizeof(bothW));

1 0