December 2009 - Wine-Commits

Vincent Povirk : gdiplus: Add a trace for values of new string format objects.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: d46eda2b29bdc997a40f588fbb4f61cf0571c14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46eda2b29bdc997a40f588fb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:26:03 2009 -0600 gdiplus: Add a trace for values of new string format objects. --- dlls/gdiplus/stringformat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 6e85008..392f11f 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -55,6 +55,8 @@ GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, (*format)->firsttab = 0.0; (*format)->tabs = NULL; + TRACE("<-- %p\n", *format); + return Ok; }

1 0

Alexandre Julliard : configure: Re-generate with autoconf 2.65.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: fa8c4f7633ab64e2c5ee0c305d7ffc7105bb8325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8c4f7633ab64e2c5ee0c305… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 11:43:02 2009 +0100 configure: Re-generate with autoconf 2.65. --- configure | 179 ++++++++++++++++++++++++++++++--------------------- include/config.h.in | 52 ++++++++-------- 2 files changed, 131 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa8c4f7633ab64e2c5ee0…

1 0

Alexandre Julliard : user32: Move handling of listbox sizes for Win 3. 1 apps to the 16-bit code.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 537877adaee0199e2f28d89c1f69c5a4fc1aeb70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537877adaee0199e2f28d89c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 21:09:17 2009 +0100 user32: Move handling of listbox sizes for Win 3.1 apps to the 16-bit code. --- dlls/user.exe16/message.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/user32/listbox.c | 26 -------------------------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index ee7fa46..b8a5190 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -584,6 +584,12 @@ static HANDLE16 convert_handle_32_to_16(UINT_PTR src, unsigned int flags) return dst; } +static BOOL is_old_app( HWND hwnd ) +{ + HINSTANCE inst = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); + return inst && !((ULONG_PTR)inst >> 16) && (GetExpWinVer16(LOWORD(inst)) & 0xFF00) == 0x0300; +} + static int find_sub_menu( HMENU *hmenu, HMENU16 target ) { int i, pos, count = GetMenuItemCount( *hmenu ); @@ -2382,6 +2388,39 @@ static LRESULT listbox_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam switch (msg) { + case WM_SIZE: + if (is_old_app( hwnd )) + { + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + int width, height, remaining, item_height; + RECT rect; + + /* give a margin for error to old 16 bits programs - if we need + less than the height of the nonclient area, round to the + *next* number of items */ + + if (!(style & LBS_NOINTEGRALHEIGHT) && !(style & LBS_OWNERDRAWVARIABLE)) + { + GetClientRect( hwnd, &rect ); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + item_height = wow_handlers32.listbox_proc( hwnd, LB_GETITEMHEIGHT, 0, 0, FALSE ); + remaining = item_height ? (height % item_height) : 0; + if ((height > item_height) && remaining) + { + GetWindowRect( hwnd, &rect ); + if ((item_height - remaining) <= rect.bottom - rect.top - height) + remaining = remaining - item_height; + TRACE( "[%p]: changing height %d -> %d\n", hwnd, height, height - remaining ); + SetWindowPos( hwnd, 0, 0, 0, rect.right - rect.left, + rect.bottom - rect.top - remaining, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE ); + return 0; + } + } + } + return wow_handlers32.listbox_proc( hwnd, msg, wParam, lParam, unicode ); + case LB_RESETCONTENT16: case LB_DELETESTRING16: case LB_GETITEMDATA16: diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 983eee6..059be04 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -39,7 +39,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/winbase16.h" #include "wine/unicode.h" #include "user_private.h" #include "controls.h" @@ -161,13 +160,6 @@ const struct builtin_class_descr COMBOLBOX_builtin_class = }; -/* check whether app is a Win 3.1 app */ -static inline BOOL is_old_app( LB_DESCR *descr ) -{ - return (GetExpWinVer16( GetWindowLongPtrW(descr->self, GWLP_HINSTANCE) ) & 0xFF00 ) == 0x0300; -} - - /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -394,14 +386,6 @@ static void LISTBOX_UpdateSize( LB_DESCR *descr ) remaining = 0; if ((descr->height > descr->item_height) && remaining) { - if (is_old_app(descr)) - { /* give a margin for error to 16 bits programs - if we need - less than the height of the nonclient area, round to the - *next* number of items */ - int ncheight = rect.bottom - rect.top - descr->height; - if ((descr->item_height - remaining) <= ncheight) - remaining = remaining - descr->item_height; - } TRACE("[%p]: changing height %d -> %d\n", descr->self, descr->height, descr->height - remaining ); SetWindowPos( descr->self, 0, 0, 0, rect.right - rect.left, @@ -2517,16 +2501,6 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->locale = GetUserDefaultLCID(); descr->lphc = lphc; - if (is_old_app(descr) && ( descr->style & ( WS_VSCROLL | WS_HSCROLL ) ) ) - { - /* Win95 document "List Box Differences" from MSDN: - If a list box in a version 3.x application has either the - WS_HSCROLL or WS_VSCROLL style, the list box receives both - horizontal and vertical scroll bars. - */ - descr->style |= WS_VSCROLL | WS_HSCROLL; - } - if( lphc ) { TRACE("[%p]: resetting owner %p -> %p\n", descr->self, descr->owner, lphc->self );

1 0

Alexandre Julliard : include: Move undocumented Win9x function definitions to winbase16.h.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 21ddb9f48e219ddb073c9874bc64222635a11902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ddb9f48e219ddb073c9874b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 20:28:12 2009 +0100 include: Move undocumented Win9x function definitions to winbase16.h. --- dlls/ddeml.dll16/ddeml.c | 1 + dlls/msvideo.dll16/msvideo16.c | 1 + dlls/ole2disp.dll16/ole2disp.c | 3 +- dlls/olecli.dll16/olecli.c | 1 + dlls/setupx.dll16/devinst16.c | 1 + dlls/winaspi.dll16/winaspi.c | 1 + include/winbase.h | 42 ---------------------------------------- include/wine/winbase16.h | 39 +++++++++++++++++++++++++++++++++++++ 8 files changed, 46 insertions(+), 43 deletions(-) diff --git a/dlls/ddeml.dll16/ddeml.c b/dlls/ddeml.dll16/ddeml.c index 874c456..e0a9dda 100644 --- a/dlls/ddeml.dll16/ddeml.c +++ b/dlls/ddeml.dll16/ddeml.c @@ -30,6 +30,7 @@ #include "windef.h" #include "winbase.h" #include "wine/windef16.h" +#include "wine/winbase16.h" #include "wownt32.h" #include "dde.h" #include "ddeml.h" diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 6970278..e157808 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -29,6 +29,7 @@ #include "winnls.h" #include "winreg.h" #include "winuser.h" +#include "wine/winbase16.h" #include "vfw16.h" #include "wine/debug.h" diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index a09ef7c..081683e 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -23,7 +23,6 @@ #include <stdarg.h> #include <string.h> -#include "wine/windef16.h" #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -31,6 +30,8 @@ #include "ole2.h" #include "oleauto.h" #include "winerror.h" +#include "wine/windef16.h" +#include "wine/winbase16.h" #include "ole2disp.h" diff --git a/dlls/olecli.dll16/olecli.c b/dlls/olecli.dll16/olecli.c index a37254b..ad59fa3 100644 --- a/dlls/olecli.dll16/olecli.c +++ b/dlls/olecli.dll16/olecli.c @@ -27,6 +27,7 @@ #include "windef.h" #include "wine/windef16.h" +#include "wine/winbase16.h" #include "winbase.h" #include "wingdi.h" #include "wownt32.h" diff --git a/dlls/setupx.dll16/devinst16.c b/dlls/setupx.dll16/devinst16.c index 6c78aec..fb98f42 100644 --- a/dlls/setupx.dll16/devinst16.c +++ b/dlls/setupx.dll16/devinst16.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "wine/winbase16.h" #include "setupx16.h" #include "wine/debug.h" diff --git a/dlls/winaspi.dll16/winaspi.c b/dlls/winaspi.dll16/winaspi.c index 9ef9974..aceef36 100644 --- a/dlls/winaspi.dll16/winaspi.c +++ b/dlls/winaspi.dll16/winaspi.c @@ -34,6 +34,7 @@ #include "windef.h" #include "winbase.h" #include "wine/windef16.h" +#include "wine/winbase16.h" #include "winreg.h" #include "wownt32.h" #include "aspi.h" diff --git a/include/winbase.h b/include/winbase.h index 8298cbd..1cd26f5 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2304,48 +2304,6 @@ WINBASEAPI UINT WINAPI _lwrite(HFILE,LPCSTR,UINT); #define ZeroMemory RtlZeroMemory #define CopyMemory RtlCopyMemory -/* undocumented functions */ - -typedef struct tagSYSLEVEL -{ - CRITICAL_SECTION crst; - INT level; -} SYSLEVEL; - -/* [GS]etProcessDword offsets */ -#define GPD_APP_COMPAT_FLAGS (-56) -#define GPD_LOAD_DONE_EVENT (-52) -#define GPD_HINSTANCE16 (-48) -#define GPD_WINDOWS_VERSION (-44) -#define GPD_THDB (-40) -#define GPD_PDB (-36) -#define GPD_STARTF_SHELLDATA (-32) -#define GPD_STARTF_HOTKEY (-28) -#define GPD_STARTF_SHOWWINDOW (-24) -#define GPD_STARTF_SIZE (-20) -#define GPD_STARTF_POSITION (-16) -#define GPD_STARTF_FLAGS (-12) -#define GPD_PARENT (- 8) -#define GPD_FLAGS (- 4) -#define GPD_USERDATA ( 0) - -WINBASEAPI void WINAPI DisposeLZ32Handle(HANDLE); -WINBASEAPI HANDLE WINAPI DosFileHandleToWin32Handle(HFILE); -WINBASEAPI DWORD WINAPI GetProcessDword(DWORD,INT); -WINBASEAPI VOID WINAPI GetpWin16Lock(SYSLEVEL**); -WINBASEAPI DWORD WINAPI MapLS(LPCVOID); -WINBASEAPI LPVOID WINAPI MapSL(DWORD); -WINBASEAPI VOID WINAPI ReleaseThunkLock(DWORD*); -WINBASEAPI VOID WINAPI RestoreThunkLock(DWORD); -WINBASEAPI VOID WINAPI UnMapLS(DWORD); -WINBASEAPI HFILE WINAPI Win32HandleToDosFileHandle(HANDLE); -WINBASEAPI VOID WINAPI _CheckNotSysLevel(SYSLEVEL *lock); -WINBASEAPI DWORD WINAPI _ConfirmWin16Lock(void); -WINBASEAPI DWORD WINAPI _ConfirmSysLevel(SYSLEVEL*); -WINBASEAPI VOID WINAPI _EnterSysLevel(SYSLEVEL*); -WINBASEAPI VOID WINAPI _LeaveSysLevel(SYSLEVEL*); - - /* Wine internal functions */ extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ); diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 0e41cba..aaa3336 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -320,6 +320,30 @@ typedef struct #define __AHINCR (1 << __AHSHIFT) /* undocumented functions */ + +typedef struct tagSYSLEVEL +{ + CRITICAL_SECTION crst; + INT level; +} SYSLEVEL; + +/* [GS]etProcessDword offsets */ +#define GPD_APP_COMPAT_FLAGS (-56) +#define GPD_LOAD_DONE_EVENT (-52) +#define GPD_HINSTANCE16 (-48) +#define GPD_WINDOWS_VERSION (-44) +#define GPD_THDB (-40) +#define GPD_PDB (-36) +#define GPD_STARTF_SHELLDATA (-32) +#define GPD_STARTF_HOTKEY (-28) +#define GPD_STARTF_SHOWWINDOW (-24) +#define GPD_STARTF_SIZE (-20) +#define GPD_STARTF_POSITION (-16) +#define GPD_STARTF_FLAGS (-12) +#define GPD_PARENT (- 8) +#define GPD_FLAGS (- 4) +#define GPD_USERDATA ( 0) + WORD WINAPI AllocCStoDSAlias16(WORD); WORD WINAPI AllocDStoCSAlias16(WORD); HGLOBAL16 WINAPI AllocResource16(HINSTANCE16,HRSRC16,DWORD); @@ -327,6 +351,8 @@ WORD WINAPI AllocSelector16(WORD); WORD WINAPI AllocSelectorArray16(WORD); VOID WINAPI DirectedYield16(HTASK16); HGLOBAL16 WINAPI DirectResAlloc16(HINSTANCE16,WORD,UINT16); +void WINAPI DisposeLZ32Handle(HANDLE); +HANDLE WINAPI DosFileHandleToWin32Handle(HFILE); HANDLE16 WINAPI FarGetOwner16(HGLOBAL16); VOID WINAPI FarSetOwner16(HGLOBAL16,HANDLE16); FARPROC16 WINAPI FileCDR16(FARPROC16); @@ -346,7 +372,9 @@ INT16 WINAPI GetInstanceData16(HINSTANCE16,WORD,INT16); BOOL16 WINAPI GetModuleName16(HINSTANCE16,LPSTR,INT16); INT16 WINAPI GetModuleUsage16(HINSTANCE16); UINT16 WINAPI GetNumTasks16(void); +VOID WINAPI GetpWin16Lock(SYSLEVEL**); SEGPTR WINAPI GetpWin16Lock16(void); +DWORD WINAPI GetProcessDword(DWORD,INT); DWORD WINAPI GetSelectorLimit16(WORD); FARPROC16 WINAPI GetSetKernelDOSProc16(FARPROC16 DosProc); HINSTANCE16 WINAPI GetTaskDS16(void); @@ -375,10 +403,14 @@ WORD WINAPI LocalHeapSize16(void); BOOL16 WINAPI LocalInit16(HANDLE16,WORD,WORD); FARPROC16 WINAPI LocalNotify16(FARPROC16); HTASK16 WINAPI LockCurrentTask16(BOOL16); +DWORD WINAPI MapLS(LPCVOID); +LPVOID WINAPI MapSL(DWORD); VOID WINAPI OldYield16(void); VOID WINAPI WIN32_OldYield16(void); VOID WINAPI PostEvent16(HTASK16); WORD WINAPI PrestoChangoSelector16(WORD,WORD); +VOID WINAPI ReleaseThunkLock(DWORD*); +VOID WINAPI RestoreThunkLock(DWORD); WORD WINAPI SelectorAccessRights16(WORD,WORD,WORD); void WINAPI SetFastQueue16(DWORD,HQUEUE16); VOID WINAPI SetPriority16(HTASK16,INT16); @@ -387,11 +419,18 @@ WORD WINAPI SetSelectorLimit16(WORD,DWORD); HQUEUE16 WINAPI SetTaskQueue16(HTASK16,HQUEUE16); HQUEUE16 WINAPI SetThreadQueue16(DWORD,HQUEUE16); VOID WINAPI SwitchStackTo16(WORD,WORD,WORD); +VOID WINAPI UnMapLS(DWORD); BOOL16 WINAPI WaitEvent16(HTASK16); +HFILE WINAPI Win32HandleToDosFileHandle(HANDLE); VOID WINAPI WriteOutProfiles16(void); VOID WINAPI hmemcpy16(LPVOID,LPCVOID,LONG); +VOID WINAPI _CheckNotSysLevel(SYSLEVEL *lock); +DWORD WINAPI _ConfirmSysLevel(SYSLEVEL*); +DWORD WINAPI _ConfirmWin16Lock(void); VOID WINAPI _CreateSysLevel(SYSLEVEL*,INT); +VOID WINAPI _EnterSysLevel(SYSLEVEL*); VOID WINAPI _EnterWin16Lock(void); +VOID WINAPI _LeaveSysLevel(SYSLEVEL*); VOID WINAPI _LeaveWin16Lock(void);

1 0

Alexandre Julliard : user32: Use a standard critical section instead of a syslevel for the USER lock.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 5d92931933e16fbe42ad37a32214b73146abbf10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d92931933e16fbe42ad37a32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 17:42:19 2009 +0100 user32: Use a standard critical section instead of a syslevel for the USER lock. --- dlls/user32/user_main.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 7868e19..a61a67d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -39,14 +39,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(graphics); HMODULE user32_module = 0; -static SYSLEVEL USER_SysLevel; +static CRITICAL_SECTION user_section; static CRITICAL_SECTION_DEBUG critsect_debug = { - 0, 0, &USER_SysLevel.crst, + 0, 0, &user_section, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": USER_SysLevel") } + 0, 0, { (DWORD_PTR)(__FILE__ ": user_section") } }; -static SYSLEVEL USER_SysLevel = { { &critsect_debug, -1, 0, 0, 0, 0 }, 2 }; +static CRITICAL_SECTION user_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static HPALETTE (WINAPI *pfnGDISelectPalette)( HDC hdc, HPALETTE hpal, WORD bkgnd ); static UINT (WINAPI *pfnGDIRealizePalette)( HDC hdc ); @@ -62,7 +62,7 @@ extern void WDML_NotifyThreadDetach(void); */ void USER_Lock(void) { - _EnterSysLevel( &USER_SysLevel ); + EnterCriticalSection( &user_section ); } @@ -71,7 +71,7 @@ void USER_Lock(void) */ void USER_Unlock(void) { - _LeaveSysLevel( &USER_SysLevel ); + LeaveCriticalSection( &user_section ); } @@ -82,7 +82,11 @@ void USER_Unlock(void) */ void USER_CheckNotLock(void) { - _CheckNotSysLevel( &USER_SysLevel ); + if (user_section.OwningThread == ULongToHandle(GetCurrentThreadId()) && user_section.RecursionCount) + { + ERR( "BUG: holding USER lock\n" ); + DebugBreak(); + } }

1 0

Alexandre Julliard : winmm: Avoid using ReleaseThunkLock from 32-bit code.
by Alexandre Julliard Dec. 24, 2009

Dec. 24, 2009

Module: wine Branch: master Commit: 18a7655234728efbf0ba32d7aae2fdf790c9b475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a7655234728efbf0ba32d7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 12:29:24 2009 +0100 winmm: Avoid using ReleaseThunkLock from 32-bit code. --- dlls/winmm/winmm.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 4f3ace1..f5e2af1 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1713,11 +1713,7 @@ the_end: static BOOL MMSYSTEM_MidiStream_PostMessage(WINE_MIDIStream* lpMidiStrm, WORD msg, DWORD pmt1, DWORD pmt2) { if (PostThreadMessageA(lpMidiStrm->dwThreadID, msg, pmt1, pmt2)) { - DWORD count; - - ReleaseThunkLock(&count); - WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); - RestoreThunkLock(count); + MsgWaitForMultipleObjects( 1, &lpMidiStrm->hEvent, FALSE, INFINITE, 0 ); } else { WARN("bad PostThreadMessageA\n"); return FALSE; @@ -1796,17 +1792,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, SetThreadPriority(lpMidiStrm->hThread, THREAD_PRIORITY_TIME_CRITICAL); /* wait for thread to have started, and for its queue to be created */ - { - DWORD count; - - /* (Release|Restore)ThunkLock() is needed when this method is called from 16 bit code, - * (meaning the Win16Lock is set), so that it's released and the 32 bit thread running - * MMSYSTEM_MidiStreamPlayer can acquire Win16Lock to create its queue. - */ - ReleaseThunkLock(&count); - WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); - RestoreThunkLock(count); - } + WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); TRACE("=> (%u/%d) hMidi=%p ret=%d lpMidiStrm=%p\n", *lpuDeviceID, lpwm->mld.uDeviceID, *lphMidiStrm, ret, lpMidiStrm);

1 0

Andrew Nguyen : ntdll: Use the HKCU\Volatile Environment key when generating the initial process environment .
by Alexandre Julliard Dec. 24, 2009

Dec. 24, 2009

Module: wine Branch: master Commit: 542feda6b883cd289996862a868c0c610a5cf808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542feda6b883cd289996862a8… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Dec 23 11:31:46 2009 -0600 ntdll: Use the HKCU\Volatile Environment key when generating the initial process environment. --- dlls/kernel32/process.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 08ac255..45488aa 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -417,6 +417,7 @@ static BOOL set_registry_environment(void) 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', 'E','n','v','i','r','o','n','m','e','n','t',0}; static const WCHAR envW[] = {'E','n','v','i','r','o','n','m','e','n','t',0}; + static const WCHAR volatile_envW[] = {'V','o','l','a','t','i','l','e',' ','E','n','v','i','r','o','n','m','e','n','t',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; @@ -449,6 +450,15 @@ static BOOL set_registry_environment(void) set_registry_variables( hkey, REG_EXPAND_SZ ); NtClose( hkey ); } + + RtlInitUnicodeString( &nameW, volatile_envW ); + if (NtOpenKey( &hkey, KEY_READ, &attr ) == STATUS_SUCCESS) + { + set_registry_variables( hkey, REG_SZ ); + set_registry_variables( hkey, REG_EXPAND_SZ ); + NtClose( hkey ); + } + NtClose( attr.RootDirectory ); return ret; }

1 0

Paul Vriens : mmdevapi/tests: Fix a test failure on Vista+ with no soundcard present.
by Alexandre Julliard Dec. 24, 2009

Dec. 24, 2009

Module: wine Branch: master Commit: 20a50f30c4ab57330436438ee42bbc5b491623fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a50f30c4ab57330436438ee… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 24 13:12:36 2009 +0100 mmdevapi/tests: Fix a test failure on Vista+ with no soundcard present. --- dlls/mmdevapi/tests/dependency.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c index 1568bed..0d60cb2 100644 --- a/dlls/mmdevapi/tests/dependency.c +++ b/dlls/mmdevapi/tests/dependency.c @@ -55,15 +55,18 @@ START_TEST(dependency) if (FAILED(hr)) { skip("mmdevapi not available: 0x%08x\n", hr); - return; + goto cleanup; } hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); - ok(hr == S_OK, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); if (hr != S_OK) { - skip("GetDefaultAudioEndpoint returns 0x%08x, skipping tests\n", hr); - return; + if (hr == E_NOTFOUND) + skip("No sound card available\n"); + else + skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + goto cleanup; } ok(!GetModuleHandle("dsound.dll"), "dsound.dll was already loaded!\n"); @@ -94,8 +97,14 @@ START_TEST(dependency) ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s", dump_guid(&clsid)); } } + +cleanup: if (bf) IUnknown_Release(bf); + if (dev) + IUnknown_Release(dev); + if (mme) + IUnknown_Release(mme); - IUnknown_Release(mme); + CoUninitialize(); }

1 0

Paul Vriens : hlink/tests: Fix a test failure on Win9x/WinMe.
by Alexandre Julliard Dec. 24, 2009

Dec. 24, 2009

Module: wine Branch: master Commit: 62bb1eb2a4154f4045e8388c9798d490c8301c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62bb1eb2a4154f4045e8388c9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 24 12:31:59 2009 +0100 hlink/tests: Fix a test failure on Win9x/WinMe. --- dlls/hlink/tests/browse_ctx.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 637f3c8..e9806b8 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -24,6 +24,16 @@ #include "wine/test.h" +/* Win9x and WinMe don't have lstrcmpW */ +static int strcmp_ww(const WCHAR *str1, const WCHAR *str2) +{ + DWORD len1 = lstrlenW(str1); + DWORD len2 = lstrlenW(str2); + + if (len1 != len2) return 1; + return memcmp(str1, str2, len1 * sizeof(WCHAR)); +} + static void test_SetInitialHlink(void) { IHlinkBrowseContext *bc; @@ -55,7 +65,7 @@ static void test_SetInitialHlink(void) hres = IMoniker_GetDisplayName(found_moniker, bindctx, NULL, &found_name); ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); - ok(lstrcmpW(found_name, friend), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(friend), wine_dbgstr_w(found_name)); + ok(strcmp_ww(found_name, friend), "Found display name should not have been %s\n", wine_dbgstr_w(friend)); IBindCtx_Release(bindctx); IMoniker_Release(found_moniker);

1 0

Eric Pouech : dbghelp: Add support for loading dwarf debug information out of PE images.
by Alexandre Julliard Dec. 24, 2009

Dec. 24, 2009

Module: wine Branch: master Commit: bc38d3eaac21b717effec9b6aabfee64bad5a01f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc38d3eaac21b717effec9b6a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Dec 23 22:05:25 2009 +0100 dbghelp: Add support for loading dwarf debug information out of PE images. --- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/pe_module.c | 102 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 81 insertions(+), 23 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 702bca2..3399aeb 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -369,7 +369,7 @@ int elf_is_in_thunk_area(unsigned long addr, { unsigned i; - for (i = 0; thunks[i].symname; i++) + if (thunks) for (i = 0; thunks[i].symname; i++) { if (addr >= thunks[i].rva_start && addr < thunks[i].rva_end) return i; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 03e9c86..5cce6a3 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -98,6 +98,17 @@ static BOOL pe_load_symbol_table(struct module* module, IMAGE_NT_HEADERS* nth, v return TRUE; } +static inline void* pe_get_sect(IMAGE_NT_HEADERS* nth, void* mapping, + IMAGE_SECTION_HEADER* sect) +{ + return (sect) ? RtlImageRvaToVa(nth, mapping, sect->VirtualAddress, NULL) : NULL; +} + +static inline DWORD pe_get_sect_size(IMAGE_SECTION_HEADER* sect) +{ + return (sect) ? sect->SizeOfRawData : 0; +} + /****************************************************************** * pe_load_stabs * @@ -108,39 +119,85 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module, void* mapping, IMAGE_NT_HEADERS* nth) { IMAGE_SECTION_HEADER* section; - int i, stabsize = 0, stabstrsize = 0; - unsigned int stabs = 0, stabstr = 0; - BOOL ret = FALSE; + IMAGE_SECTION_HEADER* sect_stabs = NULL; + IMAGE_SECTION_HEADER* sect_stabstr = NULL; + int i; + BOOL ret; section = (IMAGE_SECTION_HEADER*) ((char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++) { - if (!strcasecmp((const char*)section->Name, ".stab")) - { - stabs = section->VirtualAddress; - stabsize = section->SizeOfRawData; - } - else if (!strncasecmp((const char*)section->Name, ".stabstr", 8)) - { - stabstr = section->VirtualAddress; - stabstrsize = section->SizeOfRawData; - } + if (!strcasecmp((const char*)section->Name, ".stab")) sect_stabs = section; + else if (!strncasecmp((const char*)section->Name, ".stabstr", 8)) sect_stabstr = section; } - - if (stabstrsize && stabsize) + if (sect_stabs && sect_stabstr) { - ret = stabs_parse(module, - module->module.BaseOfImage - nth->OptionalHeader.ImageBase, - RtlImageRvaToVa(nth, mapping, stabs, NULL), - stabsize, - RtlImageRvaToVa(nth, mapping, stabstr, NULL), - stabstrsize, + ret = stabs_parse(module, + module->module.BaseOfImage - nth->OptionalHeader.ImageBase, + pe_get_sect(nth, mapping, sect_stabs), pe_get_sect_size(sect_stabs), + pe_get_sect(nth, mapping, sect_stabstr), pe_get_sect_size(sect_stabstr), NULL, NULL); if (ret) pe_load_symbol_table(module, nth, mapping); } - TRACE("%s the STABS debug info\n", ret ? "successfully loaded" : "failed to load"); + + return ret; +} + +/****************************************************************** + * pe_load_dwarf + * + * look for dwarf information in PE header (it's also a way for the mingw compiler + * to provide its debugging information) + */ +static BOOL pe_load_dwarf(const struct process* pcs, struct module* module, + void* mapping, IMAGE_NT_HEADERS* nth) +{ + IMAGE_SECTION_HEADER* section; + IMAGE_SECTION_HEADER* sect_debuginfo = NULL; + IMAGE_SECTION_HEADER* sect_debugstr = NULL; + IMAGE_SECTION_HEADER* sect_debugabbrev = NULL; + IMAGE_SECTION_HEADER* sect_debugline = NULL; + IMAGE_SECTION_HEADER* sect_debugloc = NULL; + int i; + const char* strtable; + const char* sectname; + BOOL ret; + + if (nth->FileHeader.PointerToSymbolTable && nth->FileHeader.NumberOfSymbols) + /* FIXME: no way to get strtable size */ + strtable = (const char*)mapping + nth->FileHeader.PointerToSymbolTable + + nth->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); + else strtable = NULL; + + section = (IMAGE_SECTION_HEADER*) + ((char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++) + { + sectname = (const char*)section->Name; + /* long section names start with a '/' (at least on MinGW32) */ + if (*sectname == '/' && strtable) + sectname = strtable + atoi(sectname + 1); + if (!strcasecmp(sectname, ".debug_info")) sect_debuginfo = section; + else if (!strcasecmp(sectname, ".debug_str")) sect_debugstr = section; + else if (!strcasecmp(sectname, ".debug_abbrev")) sect_debugabbrev = section; + else if (!strcasecmp(sectname, ".debug_line")) sect_debugline = section; + else if (!strcasecmp(sectname, ".debug_loc")) sect_debugloc = section; + } + if (sect_debuginfo) + { + ret = dwarf2_parse(module, + module->module.BaseOfImage - nth->OptionalHeader.ImageBase, + NULL, /* FIXME: some thunks to deal with ? */ + pe_get_sect(nth, mapping, sect_debuginfo), pe_get_sect_size(sect_debuginfo), + pe_get_sect(nth, mapping, sect_debugabbrev), pe_get_sect_size(sect_debugabbrev), + pe_get_sect(nth, mapping, sect_debugstr), pe_get_sect_size(sect_debugstr), + pe_get_sect(nth, mapping, sect_debugline), pe_get_sect_size(sect_debugline), + pe_get_sect(nth, mapping, sect_debugloc), pe_get_sect_size(sect_debugloc)); + } + TRACE("%s the DWARF debug info\n", ret ? "successfully loaded" : "failed to load"); + return ret; } @@ -349,6 +406,7 @@ BOOL pe_load_debug_info(const struct process* pcs, struct module* module) if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) { ret = pe_load_stabs(pcs, module, mapping, nth) || + pe_load_dwarf(pcs, module, mapping, nth) || pe_load_msc_debug_info(pcs, module, mapping, nth); /* if we still have no debug info (we could only get SymExport at this * point), then do the SymExport except if we have an ELF container,

1 0