wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

André Hentschel : user32: Don' t paint new button styles instead of crashing.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: a15c44910ecbff3a30f6038793acc1ddf730d0fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15c44910ecbff3a30f603879… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 3 21:15:42 2010 +0100 user32: Don't paint new button styles instead of crashing. (cherry picked from commit e054fc23100f347ae3ed026d24f183aa85b8c802) --- dlls/user32/button.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 54d54dc..463c37f 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -114,7 +114,7 @@ static void UB_Paint( HWND hwnd, HDC hDC, UINT action ); static void OB_Paint( HWND hwnd, HDC hDC, UINT action ); static void BUTTON_CheckAutoRadioButton( HWND hwnd ); -#define MAX_BTN_TYPE 12 +#define MAX_BTN_TYPE 16 static const WORD maxCheckState[MAX_BTN_TYPE] = { @@ -128,7 +128,7 @@ static const WORD maxCheckState[MAX_BTN_TYPE] = BUTTON_UNCHECKED, /* BS_GROUPBOX */ BUTTON_UNCHECKED, /* BS_USERBUTTON */ BUTTON_CHECKED, /* BS_AUTORADIOBUTTON */ - BUTTON_UNCHECKED, /* Not defined */ + BUTTON_UNCHECKED, /* BS_PUSHBOX */ BUTTON_UNCHECKED /* BS_OWNERDRAW */ }; @@ -146,7 +146,7 @@ static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = GB_Paint, /* BS_GROUPBOX */ UB_Paint, /* BS_USERBUTTON */ CB_Paint, /* BS_AUTORADIOBUTTON */ - NULL, /* Not defined */ + NULL, /* BS_PUSHBOX */ OB_Paint /* BS_OWNERDRAW */ };

1 0

André Hentschel : krnl386: Mention DOSBox.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 72e5e058d5c6cfbd48039b45288070f7e4267931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e5e058d5c6cfbd48039b452… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 10 20:02:21 2010 +0100 krnl386: Mention DOSBox. (cherry picked from commit ac816c2a82e44dff205e850743973bf97059bebd) --- dlls/krnl386.exe16/dosexe.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.c b/dlls/krnl386.exe16/dosexe.c index c16d0df..876a015 100644 --- a/dlls/krnl386.exe16/dosexe.c +++ b/dlls/krnl386.exe16/dosexe.c @@ -643,7 +643,8 @@ static DWORD WINAPI MZ_DOSVM( LPVOID lpExtra ) if (GetLastError() == ERROR_NOT_SUPPORTED) MESSAGE( "wine: Cannot start DOS application %s\n" - " because vm86 mode is not supported on this platform.\n", + " because vm86 mode is not supported on this platform.\n" + " Try running the application with DOSBox.\n", debugstr_a(env) ); else FIXME( "vm86 mode failed error %u\n", GetLastError() );

1 0

Alexandre Julliard : ntdll: Don' t call vectored exception handlers under the critical section.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: ac8680b2ad320f9904b6f72736165697f312fe09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8680b2ad320f9904b6f7273… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 10 20:55:07 2010 +0100 ntdll: Don't call vectored exception handlers under the critical section. (cherry picked from commit 11e71ede147491381bba4762163803f540c7eb5b) --- dlls/ntdll/exception.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 63fd281..33868c7 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -44,6 +44,7 @@ typedef struct { struct list entry; PVECTORED_EXCEPTION_HANDLER func; + ULONG count; } VECTORED_HANDLER; static struct list vectored_handlers = LIST_INIT(vectored_handlers); @@ -158,21 +159,37 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) struct list *ptr; LONG ret = EXCEPTION_CONTINUE_SEARCH; EXCEPTION_POINTERS except_ptrs; + VECTORED_HANDLER *handler, *to_free = NULL; except_ptrs.ExceptionRecord = rec; except_ptrs.ContextRecord = context; RtlEnterCriticalSection( &vectored_handlers_section ); - LIST_FOR_EACH( ptr, &vectored_handlers ) + ptr = list_head( &vectored_handlers ); + while (ptr) { - VECTORED_HANDLER *handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); + handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); + handler->count++; + RtlLeaveCriticalSection( &vectored_handlers_section ); + RtlFreeHeap( GetProcessHeap(), 0, to_free ); + to_free = NULL; + TRACE( "calling handler at %p code=%x flags=%x\n", handler->func, rec->ExceptionCode, rec->ExceptionFlags ); ret = handler->func( &except_ptrs ); TRACE( "handler at %p returned %x\n", handler->func, ret ); + + RtlEnterCriticalSection( &vectored_handlers_section ); + ptr = list_next( &vectored_handlers, ptr ); + if (!--handler->count) /* removed during execution */ + { + list_remove( &handler->entry ); + to_free = handler; + } if (ret == EXCEPTION_CONTINUE_EXECUTION) break; } RtlLeaveCriticalSection( &vectored_handlers_section ); + RtlFreeHeap( GetProcessHeap(), 0, to_free ); return ret; } @@ -214,6 +231,7 @@ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HA if (handler) { handler->func = func; + handler->count = 1; RtlEnterCriticalSection( &vectored_handlers_section ); if (first) list_add_head( &vectored_handlers, &handler->entry ); else list_add_tail( &vectored_handlers, &handler->entry ); @@ -237,7 +255,8 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) VECTORED_HANDLER *curr_handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); if (curr_handler == handler) { - list_remove( ptr ); + if (!--curr_handler->count) list_remove( ptr ); + else handler = NULL; /* don't free it yet */ ret = TRUE; break; }

1 0

Vladimir Panteleev : user32: Update last active popup for all parents.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 3f9aed869d04d9773bea54155ef6560e04dc7552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9aed869d04d9773bea54155… Author: Vladimir Panteleev <vladimir(a)thecybershadow.net> Date: Sat Oct 16 20:22:58 2010 +0300 user32: Update last active popup for all parents. (cherry picked from commit 824c5089d2f0e7257111a65d65e8db94b113c5fa) --- server/window.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/window.c b/server/window.c index 5fdfd13..4975bfe 100644 --- a/server/window.c +++ b/server/window.c @@ -569,9 +569,13 @@ int make_window_active( user_handle_t window ) if (!win) return 0; - /* set last active for window and its owner */ - win->last_active = win->handle; - if ((owner = get_user_object( win->owner, USER_WINDOW ))) owner->last_active = win->handle; + /* set last active for window and its owners */ + owner = win; + while (owner) + { + owner->last_active = win->handle; + owner = get_user_object( owner->owner, USER_WINDOW ); + } return 1; }

1 0

Marcus Meissner : winspool.drv: Check return value of EnumPrintersA.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 61a19597ff3c506014d36a16295b41841275dc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a19597ff3c506014d36a162… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 24 11:09:42 2010 +0100 winspool.drv: Check return value of EnumPrintersA. (cherry picked from commit c7f158824f41f37168222cb09a12c385d98315c3) --- dlls/winspool.drv/info.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8c6486b..407bb2e 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1010,8 +1010,7 @@ void WINSPOOL_LoadSystemPrinters(void) printers AddPrinter takes a while. So we'll tag all printers that were automatically added last time around, if they still exist we'll leave them be otherwise we'll delete them. */ - EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num); - if(needed) { + if (EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num) && needed) { PRINTER_INFO_5A* pi = HeapAlloc(GetProcessHeap(), 0, needed); if(EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num)) { for(i = 0; i < num; i++) {

1 0

Louis Lenders : rpcrt4: Add stub for NdrMesTypeEncode2.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 1cbc5852bea3176cda18976ba7510cf92864f4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cbc5852bea3176cda18976ba… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Oct 26 22:56:11 2010 +0200 rpcrt4: Add stub for NdrMesTypeEncode2. (cherry picked from commit 92f41c56f7397f1763d90bee41e6ec1c04804595) --- dlls/rpcrt4/ndr_es.c | 6 ++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index 52200dc..c3456ca 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -446,6 +446,12 @@ void RPC_ENTRY NdrMesTypeDecode2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO FIXME("(%p, %p, %p, %p, %p)\n", Handle, pPicklingInfo, pStubDesc, pFormatString, pObject); } +void RPC_ENTRY NdrMesTypeEncode2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO *pPicklingInfo, + const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormatString, const void *pObject) +{ + FIXME("(%p, %p, %p, %p, %p)\n", Handle, pPicklingInfo, pStubDesc, pFormatString, pObject); +} + void RPC_ENTRY NdrMesTypeFree2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO *pPicklingInfo, const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormatString, void *pObject) { diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 477b3f0..e0c6c11 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -227,7 +227,7 @@ @ stub NdrMesTypeAlignSize @ stdcall NdrMesTypeDecode2(ptr ptr ptr ptr ptr) @ stub NdrMesTypeDecode -@ stub NdrMesTypeEncode2 +@ stdcall NdrMesTypeEncode2(ptr ptr ptr ptr ptr) @ stub NdrMesTypeEncode @ stdcall NdrMesTypeFree2(ptr ptr ptr ptr ptr) @ stdcall NdrNonConformantStringBufferSize(ptr ptr ptr)

1 0

Louis Lenders : ws2_32: Return SOCKET_ERROR in stubbed WSALookupServiceNext , to prevent apps from looping forever.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 7c595bc74e0394fd8d6649f16531097d7bf9ac05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c595bc74e0394fd8d6649f16… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Oct 27 23:02:46 2010 +0200 ws2_32: Return SOCKET_ERROR in stubbed WSALookupServiceNext, to prevent apps from looping forever. (cherry picked from commit cb65dbf3d84f64d8275d853bb75e17fbf64b23c7) --- dlls/ws2_32/socket.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8dffeeb..713dab4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5802,7 +5802,8 @@ INT WINAPI WSALookupServiceEnd( HANDLE lookup ) INT WINAPI WSALookupServiceNextA( HANDLE lookup, DWORD flags, LPDWORD len, LPWSAQUERYSETA results ) { FIXME( "(%p 0x%08x %p %p) Stub!\n", lookup, flags, len, results ); - return 0; + WSASetLastError(WSA_E_NO_MORE); + return SOCKET_ERROR; } /*********************************************************************** @@ -5811,7 +5812,8 @@ INT WINAPI WSALookupServiceNextA( HANDLE lookup, DWORD flags, LPDWORD len, LPWSA INT WINAPI WSALookupServiceNextW( HANDLE lookup, DWORD flags, LPDWORD len, LPWSAQUERYSETW results ) { FIXME( "(%p 0x%08x %p %p) Stub!\n", lookup, flags, len, results ); - return 0; + WSASetLastError(WSA_E_NO_MORE); + return SOCKET_ERROR; } /***********************************************************************

1 0

Louis Lenders : kernel32: Fix GetTempFileName with invalid path.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: d7c7c2f43d54c9475e0838e77c1af3b910f0320d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c7c2f43d54c9475e0838e77… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Oct 20 20:27:38 2010 +0200 kernel32: Fix GetTempFileName with invalid path. Found by Oskar Eisemuth. (cherry picked from commit 8819ae1e66fb0d4181594510431eee7c8d158af0) --- dlls/kernel32/path.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 0e69f91..6f97b3a 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -660,6 +660,7 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR int i; LPWSTR p; + DWORD attr; if ( !path || !buffer ) { @@ -667,6 +668,15 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR return 0; } + /* ensure that the provided directory exists */ + attr = GetFileAttributesW(path); + if (attr == INVALID_FILE_ATTRIBUTES || !(attr & FILE_ATTRIBUTE_DIRECTORY)) + { + TRACE("path not found %s\n", debugstr_w(path)); + SetLastError( ERROR_DIRECTORY ); + return 0; + } + strcpyW( buffer, path ); p = buffer + strlenW(buffer);

1 0

Dmitry Timoshkov : user32: FindWindow() should treat an empty title same way as NULL.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 9d0eda9f67506fef6e481a61c3f00d29eb3e2fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0eda9f67506fef6e481a61c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 19 14:22:53 2010 +0900 user32: FindWindow() should treat an empty title same way as NULL. (cherry picked from commit 2f0b9dd3bfa3820abd89846d45eb78578b627b3b) --- dlls/user32/win.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index cbc949c..aee81cd 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1694,7 +1694,14 @@ HWND WINAPI FindWindowExW( HWND parent, HWND child, LPCWSTR className, LPCWSTR t { while (list[i]) { - if (GetWindowTextW( list[i], buffer, len + 1 ) && !strcmpiW( buffer, title )) break; + if (GetWindowTextW( list[i], buffer, len + 1 )) + { + if (!strcmpiW( buffer, title )) break; + } + else + { + if (!title[0]) break; + } i++; } }

1 0

Detlef Riekenberg : shell32: We have a Unicode parameter when launching a CPL.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: e8d8e3ac635cc05d11cb36dbbfc1c313aa50b30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d8e3ac635cc05d11cb36dbb… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 17 23:50:44 2010 +0200 shell32: We have a Unicode parameter when launching a CPL. (cherry picked from commit 463dafc3aca5a606b85025b3ca908389e3688710) --- dlls/shell32/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 3346ddc..3be0494 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -817,7 +817,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) } if (applet->info[sp].dwSize) { - if (!applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts)) + if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts)) applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010