December 2009 - Wine-commits

Nikolay Sivov : kernel32: Fix a leak in ReplaceFileW.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 14058ccf2553f9deb6fe8c6b58624938d5dc5cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14058ccf2553f9deb6fe8c6b5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 22 03:13:53 2009 +0300 kernel32: Fix a leak in ReplaceFileW. --- dlls/kernel32/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 8932dea..5c7ba20 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1593,6 +1593,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa NULL, 0); if (status == STATUS_SUCCESS) status = wine_nt_to_unix_file_name(&nt_backup_name, &unix_backup_name, FILE_OPEN_IF, FALSE); + RtlFreeUnicodeString(&nt_backup_name); if (status != STATUS_SUCCESS) { error = RtlNtStatusToDosError(status);

1 0

Hans Leidekker : wininet: Free per-thread error info upon exit from an async procedure.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 406b6e36d8ed1d5989eec7c6767a57639464bf1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=406b6e36d8ed1d5989eec7c67… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 22 09:08:30 2009 +0100 wininet: Free per-thread error info upon exit from an async procedure. Found by Valgrind. --- dlls/wininet/internet.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index dfbe032..969c079 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3132,8 +3132,13 @@ static DWORD CALLBACK INTERNET_WorkerThreadFunc(LPVOID lpvParam) HeapFree(GetProcessHeap(), 0, lpRequest); workRequest.asyncproc(&workRequest); - WININET_Release( workRequest.hdr ); + + if (g_dwTlsErrIndex != TLS_OUT_OF_INDEXES) + { + HeapFree(GetProcessHeap(), 0, TlsGetValue(g_dwTlsErrIndex)); + TlsSetValue(g_dwTlsErrIndex, NULL); + } return TRUE; }

1 0

Alexandre Julliard : kernel32: Load the DestroyIcon32 function from 16-bit user.exe.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: ff04a5e8302858c9c79ad4543a8a99700dd1185a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff04a5e8302858c9c79ad4543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 13:48:03 2009 +0100 kernel32: Load the DestroyIcon32 function from 16-bit user.exe. --- dlls/kernel32/resource16.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/resource16.c b/dlls/kernel32/resource16.c index 5d745f8..3292990 100644 --- a/dlls/kernel32/resource16.c +++ b/dlls/kernel32/resource16.c @@ -1105,15 +1105,13 @@ DWORD WINAPI SizeofResource16( HMODULE16 hModule, HRSRC16 hRsrc ) } -typedef WORD (WINAPI *pDestroyIcon32Proc)( HGLOBAL16 handle, UINT16 flags ); - /********************************************************************** * FreeResource (KERNEL.63) */ BOOL16 WINAPI FreeResource16( HGLOBAL16 handle ) { - pDestroyIcon32Proc proc; - HMODULE user; + FARPROC16 proc; + HMODULE16 user; NE_MODULE *pModule = NE_GetPtr( FarGetOwner16( handle ) ); TRACE("(%04x)\n", handle ); @@ -1149,9 +1147,17 @@ BOOL16 WINAPI FreeResource16( HGLOBAL16 handle ) /* If this failed, call USER.DestroyIcon32; this will check whether it is a shared cursor/icon; if not it will call GlobalFree16() */ - user = GetModuleHandleA( "user32.dll" ); - if (user && (proc = (pDestroyIcon32Proc)GetProcAddress( user, "DestroyIcon32" ))) - return proc( handle, 1 /*CID_RESOURCE*/ ); + user = GetModuleHandle16( "user" ); + if (user && (proc = GetProcAddress16( user, "DestroyIcon32" ))) + { + WORD args[2]; + DWORD result; + + args[1] = handle; + args[0] = 1; /* CID_RESOURCE */ + WOWCallback16Ex( (SEGPTR)proc, WCB16_PASCAL, sizeof(args), args, &result ); + return LOWORD(result); + } else return GlobalFree16( handle ); }

1 0

Alexandre Julliard : user32: Move DestroyIcon32 implementation to user16.c.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 1d1f8e2a2c861567cf9785c8a6a1a61037ea23d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1f8e2a2c861567cf9785c8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 13:48:19 2009 +0100 user32: Move DestroyIcon32 implementation to user16.c. --- dlls/user32/cursoricon.c | 57 +++++++++------------------------------------- dlls/user32/user16.c | 40 +++++++++++++++++++++++++++++++- dlls/user32/user32.spec | 5 ---- 3 files changed, 50 insertions(+), 52 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 118b8b6..1320523 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -84,10 +84,6 @@ typedef struct #include "poppack.h" -#define CID_RESOURCE 0x0001 -#define CID_WIN32 0x0004 -#define CID_NONSHARED 0x0008 - static RECT CURSOR_ClipRect; /* Cursor clipping rect */ static HDC screen_dc; @@ -1470,52 +1466,16 @@ HICON WINAPI CopyIcon( HICON hIcon ) } -/********************************************************************** - * DestroyIcon32 (USER.610) - * - * This routine is actually exported from Win95 USER under the name - * DestroyIcon32 ... The behaviour implemented here should mimic - * the Win95 one exactly, especially the return values, which - * depend on the setting of various flags. - */ -WORD WINAPI DestroyIcon32( HGLOBAL16 handle, UINT16 flags ) -{ - WORD retv; - - TRACE_(icon)("(%04x, %04x)\n", handle, flags ); - - /* Check whether destroying active cursor */ - - if ( get_user_thread_info()->cursor == HICON_32(handle) ) - { - WARN_(cursor)("Destroying active cursor!\n" ); - return FALSE; - } - - /* Try shared cursor/icon first */ - - if ( !(flags & CID_NONSHARED) ) - { - INT count = CURSORICON_DelSharedIcon(HICON_32(handle)); - - if ( count != -1 ) - return (flags & CID_WIN32)? TRUE : (count == 0); - - /* FIXME: OEM cursors/icons should be recognized */ - } - - /* Now assume non-shared cursor/icon */ - - retv = GlobalFree16( handle ); - return (flags & CID_RESOURCE)? retv : TRUE; -} - /*********************************************************************** * DestroyIcon (USER32.@) */ BOOL WINAPI DestroyIcon( HICON hIcon ) { - return DestroyIcon32(HICON_16(hIcon), CID_WIN32); + TRACE_(icon)("%p\n", hIcon ); + + if (CURSORICON_DelSharedIcon( hIcon ) == -1) + GlobalFree16( HICON_16(hIcon) ); + return TRUE; } @@ -1524,7 +1484,12 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) */ BOOL WINAPI DestroyCursor( HCURSOR hCursor ) { - return DestroyIcon32(HCURSOR_16(hCursor), CID_WIN32); + if (get_user_thread_info()->cursor == hCursor) + { + WARN_(cursor)("Destroying active cursor!\n" ); + return FALSE; + } + return DestroyIcon( hCursor ); } /*********************************************************************** diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index 4daaafd..6305945 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -55,7 +55,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(user); #define USUD_LOCALHEAP 0x0004 #define USUD_FIRSTCLASS 0x0005 -WORD WINAPI DestroyIcon32(HGLOBAL16, UINT16); +#define CID_RESOURCE 0x0001 +#define CID_WIN32 0x0004 +#define CID_NONSHARED 0x0008 WORD USER_HeapSel = 0; /* USER heap selector */ @@ -2854,6 +2856,42 @@ DWORD WINAPI FormatMessage16( #undef ADD_TO_T +/********************************************************************** + * DestroyIcon32 (USER.610) + * + * This routine is actually exported from Win95 USER under the name + * DestroyIcon32 ... The behaviour implemented here should mimic + * the Win95 one exactly, especially the return values, which + * depend on the setting of various flags. + */ +WORD WINAPI DestroyIcon32( HGLOBAL16 handle, UINT16 flags ) +{ + WORD retv; + + /* Check whether destroying active cursor */ + + if (GetCursor16() == handle) + { + WARN("Destroying active cursor!\n" ); + return FALSE; + } + + /* Try shared cursor/icon first */ + + if (!(flags & CID_NONSHARED)) + { + INT count = release_shared_icon( handle ); + if (count != -1) + return (flags & CID_WIN32) ? TRUE : (count == 0); + } + + /* Now assume non-shared cursor/icon */ + + retv = GlobalFree16( handle ); + return (flags & CID_RESOURCE)? retv : TRUE; +} + + /*********************************************************************** * ChangeDisplaySettings (USER.620) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4492e58..7f87a20 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -772,11 +772,6 @@ @ stdcall wvsprintfW(ptr wstr ptr) ################################################################ -# Wine extensions: Win16 functions that are needed by other dlls -# -@ stdcall DestroyIcon32(long long) - -################################################################ # Wine dll separation hacks, these will go away, don't use them # @ cdecl HOOK_CallHooks(long long long long long)

1 0

Alexandre Julliard : user32: Reimplement MapWindowPoints16 and move it to wnd16.c.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: df3e5a87627d74daf0a3bef7060d1e6e44016f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3e5a87627d74daf0a3bef70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 12:45:54 2009 +0100 user32: Reimplement MapWindowPoints16 and move it to wnd16.c. --- dlls/user32/winpos.c | 18 ------------------ dlls/user32/wnd16.c | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 915cb59..65e9389 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -507,24 +507,6 @@ static void WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, POINT *offset ) /******************************************************************* - * MapWindowPoints (USER.258) - */ -void WINAPI MapWindowPoints16( HWND16 hwndFrom, HWND16 hwndTo, - LPPOINT16 lppt, UINT16 count ) -{ - POINT offset; - - WINPOS_GetWinOffset( WIN_Handle32(hwndFrom), WIN_Handle32(hwndTo), &offset ); - while (count--) - { - lppt->x += offset.x; - lppt->y += offset.y; - lppt++; - } -} - - -/******************************************************************* * MapWindowPoints (USER32.@) */ INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count ) diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index 6968683..dfcd71f 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -1260,6 +1260,30 @@ HWND16 WINAPI GetOpenClipboardWindow16(void) } +/******************************************************************* + * MapWindowPoints (USER.258) + */ +void WINAPI MapWindowPoints16( HWND16 hwndFrom, HWND16 hwndTo, LPPOINT16 lppt, UINT16 count ) +{ + POINT buffer[8], *ppt = buffer; + UINT i; + + if (count > 8) ppt = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*ppt) ); + for (i = 0; i < count; i++) + { + ppt[i].x = lppt[i].x; + ppt[i].y = lppt[i].y; + } + MapWindowPoints( WIN_Handle32(hwndFrom), WIN_Handle32(hwndTo), ppt, count ); + for (i = 0; i < count; i++) + { + lppt[i].x = ppt[i].x; + lppt[i].y = ppt[i].y; + } + if (ppt != buffer) HeapFree( GetProcessHeap(), 0, ppt ); +} + + /************************************************************************** * BeginDeferWindowPos (USER.259) */

1 0

Alexandre Julliard : user32: Avoid including winuser16.h in 32-bit files.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: ce05f498437a591faa94958f32ea95ee7276e784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce05f498437a591faa94958f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 12:50:07 2009 +0100 user32: Avoid including winuser16.h in 32-bit files. --- dlls/user32/defwnd.c | 3 ++- dlls/user32/desktop.c | 1 - dlls/user32/dialog.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 39e27b3..ae104e2 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -33,7 +33,6 @@ #include "user_private.h" #include "controls.h" #include "wine/unicode.h" -#include "wine/winuser16.h" #include "wine/server.h" #include "wine/exception.h" #include "wine/debug.h" @@ -44,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); #define KEYDATA_ALT 0x2000 #define KEYDATA_PREVSTATE 0x4000 +#define DRAG_FILE 0x454C4946 + static short iF10Key = 0; static short iMenuSysKey = 0; static const WCHAR imm32W[] = { 'i','m','m','3','2','\0' }; diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index df4ac70..ea9bded 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -31,7 +31,6 @@ #include "winbase.h" #include "wingdi.h" #include "controls.h" -#include "wine/winuser16.h" static HBRUSH hbrushPattern; static HBITMAP hbitmapWallPaper; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index a7040ea..021955b 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -34,7 +34,6 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "wine/winuser16.h" #include "wine/unicode.h" #include "controls.h" #include "win.h" @@ -566,7 +565,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, size.cx = rect.right - rect.left; size.cy = rect.bottom - rect.top; - if (template.x == CW_USEDEFAULT16) + if (template.x == (SHORT)0x8000 /*CW_USEDEFAULT16*/) { pos.x = pos.y = CW_USEDEFAULT; }

1 0

Roderick Colenbrander : winex11: Fix a null pointer crash when XRender isn' t around.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 48db6abae1108c81144180ebc8902921bada015b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48db6abae1108c81144180ebc… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Dec 21 16:45:13 2009 +0100 winex11: Fix a null pointer crash when XRender isn't around. --- dlls/winex11.drv/xrender.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 1f5e512..214be7b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2093,7 +2093,8 @@ void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, physDev->brush.pixmap = XCreatePixmap(gdi_display, root_window, width, height, depth); /* Use XCopyArea when the physBitmap and brush.pixmap have the same format. */ - if(physBitmap->pixmap_depth == 1 || src_format->format == dst_format->format) + if( (physBitmap->pixmap_depth == 1) || (!X11DRV_XRender_Installed && physDev->depth == physBitmap->pixmap_depth) || + (src_format->format == dst_format->format) ) { XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, width, height, 0, 0 );

1 0

Vladimir Pankratov : mapi32: Add Russian translation.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 9e394d86b409aa71685fafe1874aea89e8a02f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e394d86b409aa71685fafe18… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Dec 21 22:52:30 2009 +0500 mapi32: Add Russian translation. --- dlls/mapi32/Makefile.in | 1 + dlls/mapi32/Ru.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index eecd69c..2ce3313 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -18,6 +18,7 @@ RC_SRCS = \ En.rc \ Fr.rc \ Lt.rc \ + Ru.rc \ version.rc @MAKE_DLL_RULES@ diff --git a/dlls/mapi32/Ru.rc b/dlls/mapi32/Ru.rc new file mode 100644 index 0000000..66626da --- /dev/null +++ b/dlls/mapi32/Ru.rc @@ -0,0 +1,33 @@ +/* +* MAPI32 Russian resources +* +* Copyright 2009 Vladimir Pankratov +* +* 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 "res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Невозможно отправить почту: не установлен почтовый клиент MAPI." + IDS_SEND_MAIL, "Отправка почты" +}

1 0

Paul Vriens : ole32/tests: Fix a test failure on several platforms.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 25d15c68dc91ebf91478513d226567dc2ce92211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d15c68dc91ebf91478513d2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Dec 21 18:51:18 2009 +0100 ole32/tests: Fix a test failure on several platforms. --- dlls/ole32/tests/storage32.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 07ac810..2011375 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -999,7 +999,9 @@ static void test_streamenum(void) /* the storage is left open until the enumerator is freed */ r = StgOpenStorage( filename, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE |STGM_TRANSACTED, NULL, 0, &stg); - ok(r==STG_E_SHAREVIOLATION, "StgCreateDocfile failed, res=%x\n", r); + ok(r==STG_E_SHAREVIOLATION || + r==STG_E_LOCKVIOLATION, /* XP-SP2/W2K3-SP1 and below */ + "StgCreateDocfile failed, res=%x\n", r); r = IEnumSTATSTG_Release(ee); ok (r == 0, "enum not released\n");

1 0

Jason Edmeades : comctl32/toolbar: Improve fixme message conditions.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 64bd51b1d3480c186db7d253cae8a39b68118105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64bd51b1d3480c186db7d253c… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Mon Dec 21 09:42:38 2009 +0000 comctl32/toolbar: Improve fixme message conditions. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d5ca524..836b864 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3980,7 +3980,7 @@ TOOLBAR_ReplaceBitmap (TOOLBAR_INFO *infoPtr, const TBREPLACEBITMAP *lpReplace) FIXME("changing standard bitmaps not implemented\n"); return FALSE; } - else if (lpReplace->hInstOld != 0) + else if (lpReplace->hInstOld != 0 && lpReplace->hInstOld != lpReplace->hInstNew) FIXME("resources not in the current module not implemented\n"); TRACE("To be replaced hInstOld %p nIDOld %lx\n", lpReplace->hInstOld, lpReplace->nIDOld);

1 0