October 2009 - Wine-commits

Alexandre Julliard : user32: Move 16-bit resource functions to user16.c.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 09d1c52fa09e65ae57589c1be7b74c4032e9e233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d1c52fa09e65ae57589c1be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 17:55:46 2009 +0200 user32: Move 16-bit resource functions to user16.c. --- dlls/user32/resource.c | 66 ---------------------------------------- dlls/user32/user16.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 66 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 1085dfa..82ec05b 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -26,9 +26,6 @@ #include "winerror.h" #include "winternl.h" #include "winnls.h" -#include "wine/winbase16.h" -#include "wine/winuser16.h" -#include "wownt32.h" #include "wine/debug.h" #include "user_private.h" @@ -53,24 +50,6 @@ struct accelerator }; /********************************************************************** - * LoadAccelerators [USER.177] - */ -HACCEL16 WINAPI LoadAccelerators16(HINSTANCE16 instance, LPCSTR lpTableName) -{ - HRSRC16 hRsrc; - - TRACE_(accel)("%04x %s\n", instance, debugstr_a(lpTableName) ); - - if (!(hRsrc = FindResource16( instance, lpTableName, (LPSTR)RT_ACCELERATOR ))) { - WARN_(accel)("couldn't find accelerator table resource\n"); - return 0; - } - - TRACE_(accel)("returning HACCEL 0x%x\n", hRsrc); - return LoadResource16(instance,hRsrc); -} - -/********************************************************************** * LoadAcceleratorsW (USER32.@) */ HACCEL WINAPI LoadAcceleratorsW(HINSTANCE instance, LPCWSTR name) @@ -254,51 +233,6 @@ BOOL WINAPI DestroyAcceleratorTable( HACCEL handle ) } /********************************************************************** - * LoadString (USER.176) - */ -INT16 WINAPI LoadString16( HINSTANCE16 instance, UINT16 resource_id, - LPSTR buffer, INT16 buflen ) -{ - HGLOBAL16 hmem; - HRSRC16 hrsrc; - unsigned char *p; - int string_num; - int i; - - TRACE("inst=%04x id=%04x buff=%p len=%d\n", - instance, resource_id, buffer, buflen); - - hrsrc = FindResource16( instance, MAKEINTRESOURCEA((resource_id>>4)+1), (LPSTR)RT_STRING ); - if (!hrsrc) return 0; - hmem = LoadResource16( instance, hrsrc ); - if (!hmem) return 0; - - p = LockResource16(hmem); - string_num = resource_id & 0x000f; - for (i = 0; i < string_num; i++) - p += *p + 1; - - TRACE("strlen = %d\n", (int)*p ); - - if (buffer == NULL) return *p; - i = min(buflen - 1, *p); - if (i > 0) { - memcpy(buffer, p + 1, i); - buffer[i] = '\0'; - } else { - if (buflen > 1) { - buffer[0] = '\0'; - return 0; - } - WARN("Don't know why caller gave buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1); - } - FreeResource16( hmem ); - - TRACE("'%s' loaded !\n", buffer); - return i; -} - -/********************************************************************** * LoadStringW (USER32.@) */ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index 5ca8837..f34ae57 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -612,6 +612,85 @@ HBITMAP16 WINAPI LoadBitmap16(HINSTANCE16 hInstance, LPCSTR name) return HBITMAP_16(LoadBitmapA(HINSTANCE_32(hInstance), name)); } +/********************************************************************** + * LoadString (USER.176) + */ +INT16 WINAPI LoadString16( HINSTANCE16 instance, UINT16 resource_id, LPSTR buffer, INT16 buflen ) +{ + HGLOBAL16 hmem; + HRSRC16 hrsrc; + unsigned char *p; + int string_num; + int ret; + + TRACE("inst=%04x id=%04x buff=%p len=%d\n", instance, resource_id, buffer, buflen); + + hrsrc = FindResource16( instance, MAKEINTRESOURCEA((resource_id>>4)+1), (LPSTR)RT_STRING ); + if (!hrsrc) return 0; + hmem = LoadResource16( instance, hrsrc ); + if (!hmem) return 0; + + p = LockResource16(hmem); + string_num = resource_id & 0x000f; + while (string_num--) p += *p + 1; + + if (buffer == NULL) ret = *p; + else + { + ret = min(buflen - 1, *p); + if (ret > 0) + { + memcpy(buffer, p + 1, ret); + buffer[ret] = '\0'; + } + else if (buflen > 1) + { + buffer[0] = '\0'; + ret = 0; + } + TRACE( "%s loaded\n", debugstr_a(buffer)); + } + FreeResource16( hmem ); + return ret; +} + +/********************************************************************** + * LoadAccelerators (USER.177) + */ +HACCEL16 WINAPI LoadAccelerators16(HINSTANCE16 instance, LPCSTR lpTableName) +{ + HRSRC16 hRsrc; + HGLOBAL16 hMem; + ACCEL16 *table16; + HACCEL ret = 0; + + TRACE("%04x %s\n", instance, debugstr_a(lpTableName) ); + + if (!(hRsrc = FindResource16( instance, lpTableName, (LPSTR)RT_ACCELERATOR )) || + !(hMem = LoadResource16(instance,hRsrc))) + { + WARN("couldn't find %04x %s\n", instance, debugstr_a(lpTableName)); + return 0; + } + if ((table16 = LockResource16( hMem ))) + { + DWORD i, count = SizeofResource16( instance, hRsrc ) / sizeof(*table16); + ACCEL *table = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*table) ); + if (table) + { + for (i = 0; i < count; i++) + { + table[i].fVirt = table16[i].fVirt & 0x7f; + table[i].key = table16[i].key; + table[i].cmd = table16[i].cmd; + } + ret = CreateAcceleratorTableA( table, count ); + HeapFree( GetProcessHeap(), 0, table ); + } + } + FreeResource16( hMem ); + return HACCEL_16(ret); +} /*********************************************************************** * GetSystemMetrics (USER.179)

1 0

Alexandre Julliard : server: Free client-side user handles at process exit.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 538b24747cdadf7e8e3082911868502b2fc433b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=538b24747cdadf7e8e3082911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 17:56:04 2009 +0200 server: Free client-side user handles at process exit. --- server/process.c | 1 + server/user.c | 12 +++++++++++- server/user.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/server/process.c b/server/process.c index 31d3527..630abe6 100644 --- a/server/process.c +++ b/server/process.c @@ -645,6 +645,7 @@ static void process_killed( struct process *process ) free( dll ); } destroy_process_classes( process ); + free_process_user_handles( process ); remove_process_locks( process ); set_process_startup_state( process, STARTUP_ABORTED ); finish_process_tracing( process ); diff --git a/server/user.c b/server/user.c index 2515799..c529fc7 100644 --- a/server/user.c +++ b/server/user.c @@ -166,10 +166,20 @@ void *next_user_handle( user_handle_t *handle, enum user_object type ) return NULL; } +/* free client-side user handles managed by the process */ +void free_process_user_handles( struct process *process ) +{ + unsigned int i; + + for (i = 0; i < nb_handles; i++) + if (handles[i].type == USER_CLIENT && handles[i].ptr == process) + free_user_entry( &handles[i] ); +} + /* allocate an arbitrary user handle */ DECL_HANDLER(alloc_user_handle) { - reply->handle = alloc_user_handle( NULL, USER_CLIENT ); + reply->handle = alloc_user_handle( current->process, USER_CLIENT ); } diff --git a/server/user.h b/server/user.h index bf1e23c..e9ad116 100644 --- a/server/user.h +++ b/server/user.h @@ -72,6 +72,7 @@ extern void *get_user_object_handle( user_handle_t *handle, enum user_object typ extern user_handle_t get_user_full_handle( user_handle_t handle ); extern void *free_user_handle( user_handle_t handle ); extern void *next_user_handle( user_handle_t *handle, enum user_object type ); +extern void free_process_user_handles( struct process *process ); /* clipboard functions */

1 0

Alexandre Julliard : user32: Add a helper to retrieve the dimensions of an icon.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 62ac036bc6148dffc53543a0184f6248bfbcc390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ac036bc6148dffc53543a01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 19:44:45 2009 +0200 user32: Add a helper to retrieve the dimensions of an icon. --- dlls/user32/cursoricon.c | 14 ++++++++++++++ dlls/user32/static.c | 32 ++++++++++++++++---------------- dlls/user32/uitools.c | 9 ++------- dlls/user32/user_private.h | 1 + 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 1ae33aa..3872c8a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -473,6 +473,20 @@ void CURSORICON_FreeModuleIcons( HMODULE16 hMod16 ) LeaveCriticalSection( &IconCrst ); } +/********************************************************************** + * get_icon_size + */ +BOOL get_icon_size( HICON handle, SIZE *size ) +{ + CURSORICONINFO *info; + + if (!(info = GlobalLock16( HICON_16(handle) ))) return FALSE; + size->cx = info->nWidth; + size->cy = info->nHeight; + GlobalUnlock16( HICON_16(handle) ); + return TRUE; +} + /* * The following macro functions account for the irregularities of * accessing cursor and icon resources in files and resource entries. diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 69acbc5..6c61db2 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -148,12 +148,12 @@ static void restore_clipping(HDC hdc, HRGN hrgn) static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) { HICON prevIcon; - CURSORICONINFO * info; + SIZE size; if ((style & SS_TYPEMASK) != SS_ICON) return 0; - info = hicon ? GlobalLock16(HICON_16(hicon)) : NULL; - if (hicon && !info) { - WARN("hicon != 0, but info == 0\n"); + if (hicon && !get_icon_size( hicon, &size )) + { + WARN("hicon != 0, but invalid\n"); return 0; } prevIcon = (HICON)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hicon ); @@ -170,11 +170,9 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) } else */ { - SetWindowPos( hwnd, 0, 0, 0, info->nWidth, info->nHeight, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + SetWindowPos( hwnd, 0, 0, 0, size.cx, size.cy, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } } - if (info) GlobalUnlock16(HICON_16(hicon)); return prevIcon; } @@ -573,8 +571,10 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, case STM_GETIMAGE: return (LRESULT)STATIC_GetImage( hwnd, wParam, full_style ); - + case STM_GETICON16: + return HICON_16(STATIC_GetImage( hwnd, IMAGE_ICON, full_style )); + case STM_GETICON: return (LRESULT)STATIC_GetImage( hwnd, IMAGE_ICON, full_style ); @@ -598,6 +598,8 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, break; case STM_SETICON16: + wParam = (WPARAM)HICON_32( (HICON16)wParam ); + /* fall through */ case STM_SETICON: lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); STATIC_TryPaintFcn( hwnd, full_style ); @@ -800,13 +802,12 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) RECT rc, iconRect; HBRUSH hbrush; HICON hIcon; - CURSORICONINFO * info; + SIZE size; GetClientRect( hwnd, &rc ); hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); - info = hIcon ? GlobalLock16(HICON_16(hIcon)) : NULL; - if (!hIcon || !info) + if (!hIcon || !get_icon_size( hIcon, &size )) { FillRect(hdc, &rc, hbrush); } @@ -814,10 +815,10 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) { if (style & SS_CENTERIMAGE) { - iconRect.left = (rc.right - rc.left) / 2 - info->nWidth / 2; - iconRect.top = (rc.bottom - rc.top) / 2 - info->nHeight / 2; - iconRect.right = iconRect.left + info->nWidth; - iconRect.bottom = iconRect.top + info->nHeight; + iconRect.left = (rc.right - rc.left) / 2 - size.cx / 2; + iconRect.top = (rc.bottom - rc.top) / 2 - size.cy / 2; + iconRect.right = iconRect.left + size.cx; + iconRect.bottom = iconRect.top + size.cy; } else iconRect = rc; @@ -825,7 +826,6 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) DrawIconEx( hdc, iconRect.left, iconRect.top, hIcon, iconRect.right - iconRect.left, iconRect.bottom - iconRect.top, 0, NULL, DI_NORMAL ); } - if (info) GlobalUnlock16(HICON_16(hIcon)); } static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index a401fc3..c8e9580 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -22,8 +22,8 @@ #include <stdarg.h> #include "windef.h" +#include "winbase.h" #include "wingdi.h" -#include "wine/winuser16.h" #include "winuser.h" #include "user_private.h" #include "wine/unicode.h" @@ -1597,7 +1597,6 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp if(!cx || !cy) { SIZE s; - CURSORICONINFO *ici; BITMAP bm; switch(opcode) @@ -1612,11 +1611,7 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp break; case DST_ICON: - ici = GlobalLock16((HGLOBAL16)lp); - if(!ici) return FALSE; - s.cx = ici->nWidth; - s.cy = ici->nHeight; - GlobalUnlock16((HGLOBAL16)lp); + if (!get_icon_size( (HICON)lp, &s )) return FALSE; break; case DST_BITMAP: diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 8c49ad3..67fdbb6 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -328,6 +328,7 @@ typedef struct #include "poppack.h" extern void CURSORICON_FreeModuleIcons( HMODULE16 hModule ) DECLSPEC_HIDDEN; +extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; /* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ #ifdef __MINGW32__

1 0

Jörg Höhle : runtest: -i sets WINETEST_INTERACTIVE=1 and enables even more tests.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: baac2a6c59577e2a385d5a86c399c872a389e16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=baac2a6c59577e2a385d5a86c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 10 05:54:16 2009 +0200 runtest: -i sets WINETEST_INTERACTIVE=1 and enables even more tests. --- tools/runtest | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/runtest b/tools/runtest index ad8ef72..86f8680 100755 --- a/tools/runtest +++ b/tools/runtest @@ -33,6 +33,7 @@ input_file: the source code for the test program Options: -q quiet mode -v verbose mode (can be specified multiple times) + -i interactive mode (runs even more tests) -s announce successful tests -p prog name of the program to run for C tests -P name set the current platform name @@ -62,6 +63,10 @@ while [ "$#" -gt 0 ]; do -v) WINETEST_DEBUG=`expr $WINETEST_DEBUG + 1` ;; + -i) + WINETEST_INTERACTIVE=1 + export WINETEST_INTERACTIVE + ;; -s) WINETEST_REPORT_SUCCESS=1 export WINETEST_REPORT_SUCCESS

1 0

Nikolay Sivov : comctl32/monthcal: Get/set unicode format flag using MCM_[ GET|SET]UNICODEFORMAT.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: cbdc99cdbaec40b7639c0948c3e21d6e07d846e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbdc99cdbaec40b7639c0948c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 15 20:16:27 2009 +0400 comctl32/monthcal: Get/set unicode format flag using MCM_[GET|SET]UNICODEFORMAT. --- dlls/comctl32/monthcal.c | 23 +++++++++++++++++++++++ dlls/comctl32/tests/monthcal.c | 2 -- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ee7dc4e..1c06d23 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -100,6 +100,8 @@ typedef struct stored in SYSTEMTIME format */ BOOL firstDaySet; /* first week day differs from locale defined */ + BOOL isUnicode; /* value set with MCM_SETUNICODE format */ + int monthRange; MONTHDAYSTATE *monthdayState; SYSTEMTIME todaysDate; @@ -2412,6 +2414,7 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->minSel = infoPtr->todaysDate; infoPtr->maxSel = infoPtr->todaysDate; infoPtr->curSel = infoPtr->todaysDate; + infoPtr->isUnicode = TRUE; /* call MONTHCAL_UpdateSize to set all of the dimensions */ /* of the control */ @@ -2465,6 +2468,20 @@ MONTHCAL_Notify(MONTHCAL_INFO *infoPtr, NMHDR *hdr) return 0; } +static inline BOOL +MONTHCAL_SetUnicodeFormat(MONTHCAL_INFO *infoPtr, BOOL isUnicode) +{ + BOOL prev = infoPtr->isUnicode; + infoPtr->isUnicode = isUnicode; + return prev; +} + +static inline BOOL +MONTHCAL_GetUnicodeFormat(const MONTHCAL_INFO *infoPtr) +{ + return infoPtr->isUnicode; +} + static LRESULT WINAPI MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -2540,6 +2557,12 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case MCM_GETMAXTODAYWIDTH: return MONTHCAL_GetMaxTodayWidth(infoPtr); + case MCM_SETUNICODEFORMAT: + return MONTHCAL_SetUnicodeFormat(infoPtr, (BOOL)wParam); + + case MCM_GETUNICODEFORMAT: + return MONTHCAL_GetUnicodeFormat(infoPtr); + case WM_GETDLGCODE: return DLGC_WANTARROWS | DLGC_WANTCHARS; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 2e84af5..f59614c 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -901,14 +901,12 @@ static void test_monthcal_unicode(void) /* current setting is 1, so, should return 1 */ res = SendMessage(hwnd, MCM_GETUNICODEFORMAT, 0, 0); - todo_wine ok(1 == res || broken(0 == res), /* comctl32 <= 4.70 */ "Expected 1, got %d\n", res); /* setting to 0, should return previous settings */ res = SendMessage(hwnd, MCM_SETUNICODEFORMAT, 0, 0); - todo_wine ok(1 == res || broken(0 == res), /* comctl32 <= 4.70 */ "Expected 1, got %d\n", res);

1 0

Ken Thomases : winecoreaudio: Quiet a noisy FIXME.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: f639c4df54079272951cd916dc8e880dd28e8f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f639c4df54079272951cd916d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 15 19:19:20 2009 -0500 winecoreaudio: Quiet a noisy FIXME. --- dlls/winecoreaudio.drv/audiounit.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index f69b03d..bef882b 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -133,7 +133,9 @@ int AudioUnit_InitializeWithStreamDescription(AudioUnit au, AudioStreamBasicDesc int AudioUnit_SetVolume(AudioUnit au, float left, float right) { OSStatus err = noErr; - FIXME("independent left/right volume not implemented (%f, %f)\n", left, right); + static int once; + + if (!once++) FIXME("independent left/right volume not implemented (%f, %f)\n", left, right); err = AudioUnitSetParameter(au, kHALOutputParam_Volume, kAudioUnitParameterFlag_Output, 0, left, 0); @@ -148,7 +150,9 @@ int AudioUnit_SetVolume(AudioUnit au, float left, float right) int AudioUnit_GetVolume(AudioUnit au, float *left, float *right) { OSStatus err = noErr; - FIXME("independent left/right volume not implemented\n"); + static int once; + + if (!once++) FIXME("independent left/right volume not implemented\n"); err = AudioUnitGetParameter(au, kHALOutputParam_Volume, kAudioUnitParameterFlag_Output, 0, left); if (err != noErr)

1 0

Hans Leidekker : msi: Eliminate the last parameter from ACTION_PerformActionSequence.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: a187b43ddd79c01040ad6d2e5cff6d3dd7c53c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a187b43ddd79c01040ad6d2e5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 15 12:49:10 2009 +0200 msi: Eliminate the last parameter from ACTION_PerformActionSequence. --- dlls/msi/action.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1a06600..e08f25a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6323,10 +6323,10 @@ UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT scrip return rc; } -static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI) +static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq) { UINT rc = ERROR_SUCCESS; - MSIRECORD *row = 0; + MSIRECORD *row; static const WCHAR ExecSeqQuery[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', @@ -6339,7 +6339,7 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI) '`', ' ', 'W','H','E','R','E',' ','`','S','e','q','u','e','n','c','e','`', ' ', '=',' ','%','i',0}; - if (UI) + if (needs_ui_sequence(package)) row = MSI_QueryGetRecord(package->db, UISeqQuery, seq); else row = MSI_QueryGetRecord(package->db, ExecSeqQuery, seq); @@ -6355,25 +6355,26 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI) /* this is a hack to skip errors in the condition code */ if (MSI_EvaluateConditionW(package, cond) == MSICONDITION_FALSE) - goto end; + { + msiobj_release(&row->hdr); + return ERROR_SUCCESS; + } action = MSI_RecordGetString(row, 1); if (!action) { ERR("failed to fetch action\n"); - rc = ERROR_FUNCTION_FAILED; - goto end; + msiobj_release(&row->hdr); + return ERROR_FUNCTION_FAILED; } - if (UI) + if (needs_ui_sequence(package)) rc = ACTION_PerformUIAction(package, action, -1); else rc = ACTION_PerformAction(package, action, -1, FALSE); -end: + msiobj_release(&row->hdr); } - else - rc = ERROR_SUCCESS; return rc; } @@ -6386,7 +6387,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, LPCWSTR szCommandLine ) { UINT rc; - BOOL ui = FALSE, ui_exists; + BOOL ui_exists; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; @@ -6451,7 +6452,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, { package->script->InWhatSequence |= SEQUENCE_UI; rc = ACTION_ProcessUISequence(package); - ui = TRUE; ui_exists = ui_sequence_exists(package); if (rc == ERROR_SUCCESS || !ui_exists) { @@ -6466,13 +6466,13 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, /* process the ending type action */ if (rc == ERROR_SUCCESS) - ACTION_PerformActionSequence(package, -1, ui); + ACTION_PerformActionSequence(package, -1); else if (rc == ERROR_INSTALL_USEREXIT) - ACTION_PerformActionSequence(package, -2, ui); + ACTION_PerformActionSequence(package, -2); else if (rc == ERROR_INSTALL_SUSPEND) - ACTION_PerformActionSequence(package, -4, ui); + ACTION_PerformActionSequence(package, -4); else /* failed */ - ACTION_PerformActionSequence(package, -3, ui); + ACTION_PerformActionSequence(package, -3); /* finish up running custom actions */ ACTION_FinishCustomActions(package);

1 0

Alexandre Julliard : setupapi: Add support for specifying a fake dll source as '-' to delete it.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 777a30b997abf5ffa4d61893487056ce56b88451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=777a30b997abf5ffa4d618934… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 14:05:46 2009 +0200 setupapi: Add support for specifying a fake dll source as '-' to delete it. --- dlls/setupapi/fakedll.c | 8 +++++++- tools/wine.inf.in | 1 + 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 6397950..3b5a47c 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -597,7 +597,13 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) if (!(h = create_dest_file( name ))) return TRUE; /* not a fake dll */ if (h == INVALID_HANDLE_VALUE) return FALSE; - if ((buffer = load_fake_dll( source, &size ))) + if (source[0] == '-' && !source[1]) + { + /* '-' source means delete the file */ + TRACE( "deleting %s\n", debugstr_w(name) ); + ret = FALSE; + } + else if ((buffer = load_fake_dll( source, &size ))) { DWORD written; diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 9f0a2de..6e2df39 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2455,6 +2455,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dosx.exe 11,,dsound.vxd 11,,notepad.exe +11,,winetest.exe,- 11,,winhlp32.exe 12,,mountmgr.sys 16422,Internet Explorer,iexplore.exe

1 0

Stefan Dösinger : opengl32: Give wglSwapBuffers a real function, make it hookable.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 49012919905d2ace7dd6f2546b78780f54a58735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49012919905d2ace7dd6f2546… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 14 23:20:20 2009 +0200 opengl32: Give wglSwapBuffers a real function, make it hookable. --- dlls/opengl32/make_opengl | 2 +- dlls/opengl32/opengl32.spec | 2 +- dlls/opengl32/wgl.c | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index a1bd02b..c98cd45 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -665,7 +665,7 @@ print SPEC "@ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat @ stdcall wglSetLayerPaletteEntries(long long long long ptr) @ stdcall wglSetPixelFormat(long long ptr) gdi32.SetPixelFormat @ stdcall wglShareLists(long long) gdi32.wglShareLists -@ stdcall wglSwapBuffers(long) gdi32.SwapBuffers +@ stdcall wglSwapBuffers(long) @ stdcall wglSwapLayerBuffers(long long) @ stdcall wglUseFontBitmapsA(long long long long) gdi32.wglUseFontBitmapsA @ stdcall wglUseFontBitmapsW(long long long long) gdi32.wglUseFontBitmapsW diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index a965771..238b12a 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -352,7 +352,7 @@ @ stdcall wglSetLayerPaletteEntries(long long long long ptr) @ stdcall wglSetPixelFormat(long long ptr) gdi32.SetPixelFormat @ stdcall wglShareLists(long long) gdi32.wglShareLists -@ stdcall wglSwapBuffers(long) gdi32.SwapBuffers +@ stdcall wglSwapBuffers(long) @ stdcall wglSwapLayerBuffers(long long) @ stdcall wglUseFontBitmapsA(long long long long) gdi32.wglUseFontBitmapsA @ stdcall wglUseFontBitmapsW(long long long long) gdi32.wglUseFontBitmapsW diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 34f7f07..f6cf469 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -690,6 +690,13 @@ void WINAPI wine_glGetIntegerv( GLenum pname, GLint* params ) wine_wgl.p_wglGetIntegerv(pname, params); } +/*********************************************************************** + * wglSwapBuffers (OPENGL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH wglSwapBuffers( HDC hdc ) +{ + return SwapBuffers(hdc); +} /* This is for brain-dead applications that use OpenGL functions before even creating a rendering context.... */

1 0

Nikolay Sivov : comctl32/tooltips: Fix an obviously wrong structure size check.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 98a7d8cf9d3c9984af7fec043a07ec73e1383ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a7d8cf9d3c9984af7fec043… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 15 14:49:30 2009 +0400 comctl32/tooltips: Fix an obviously wrong structure size check. --- dlls/comctl32/tests/tooltips.c | 51 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 30 ++++++++++++----------- include/commctrl.h | 4 +++ 3 files changed, 71 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index b8c46cb..ddc162a 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -416,6 +416,56 @@ static void test_gettext(void) DestroyWindow(hwnd); } +static void test_ttm_gettoolinfo(void) +{ + TTTOOLINFOA ti; + TTTOOLINFOW tiW; + HWND hwnd; + DWORD r; + + hwnd = CreateWindowExA(0, TOOLTIPS_CLASSA, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + + ti.cbSize = TTTOOLINFOA_V2_SIZE; + ti.hwnd = NULL; + ti.hinst = GetModuleHandleA(NULL); + ti.uFlags = 0; + ti.uId = 0x1234ABCD; + ti.lpszText = NULL; + ti.lParam = 0xdeadbeef; + GetClientRect(hwnd, &ti.rect); + r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&ti); + ok(r, "Adding the tool to the tooltip failed\n"); + + ti.cbSize = TTTOOLINFOA_V2_SIZE; + ti.lParam = 0xaaaaaaaa; + r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); + ok(r, "Getting tooltip info failed\n"); + ok(0xdeadbeef == ti.lParam, "Expected 0xdeadbeef, got %lx\n", ti.lParam); + + tiW.cbSize = TTTOOLINFOW_V2_SIZE; + tiW.hwnd = NULL; + tiW.uId = 0x1234ABCD; + tiW.lParam = 0xaaaaaaaa; + r = SendMessageA(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&tiW); + ok(r, "Getting tooltip info failed\n"); + ok(0xdeadbeef == tiW.lParam, "Expected 0xdeadbeef, got %lx\n", tiW.lParam); + + ti.cbSize = TTTOOLINFOA_V2_SIZE; + ti.uId = 0x1234ABCD; + ti.lParam = 0xaaaaaaaa; + r = SendMessageA(hwnd, TTM_SETTOOLINFOA, 0, (LPARAM)&ti); + + ti.cbSize = TTTOOLINFOA_V2_SIZE; + ti.lParam = 0xdeadbeef; + r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); + ok(r, "Getting tooltip info failed\n"); + ok(0xaaaaaaaa == ti.lParam, "Expected 0xaaaaaaaa, got %lx\n", ti.lParam); + + DestroyWindow(hwnd); +} + START_TEST(tooltips) { InitCommonControls(); @@ -423,4 +473,5 @@ START_TEST(tooltips) test_create_tooltip(); test_customdraw(); test_gettext(); + test_ttm_gettoolinfo(); } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 54600e8..05cd0dc 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1076,7 +1076,7 @@ TOOLTIPS_AddToolA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) } } - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA)) + if (lpToolInfo->cbSize >= TTTOOLINFOA_V2_SIZE) toolPtr->lParam = lpToolInfo->lParam; /* install subclassing hook */ @@ -1164,7 +1164,7 @@ TOOLTIPS_AddToolW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) } } - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW)) + if (lpToolInfo->cbSize >= TTTOOLINFOW_V2_SIZE) toolPtr->lParam = lpToolInfo->lParam; /* install subclassing hook */ @@ -1337,7 +1337,7 @@ TOOLTIPS_EnumToolsA (const TOOLTIPS_INFO *infoPtr, UINT uIndex, LPTTTOOLINFOA lp /* lpToolInfo->lpszText = toolPtr->lpszText; */ lpToolInfo->lpszText = NULL; /* FIXME */ - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA)) + if (lpToolInfo->cbSize >= TTTOOLINFOA_V2_SIZE) lpToolInfo->lParam = toolPtr->lParam; return TRUE; @@ -1369,7 +1369,7 @@ TOOLTIPS_EnumToolsW (const TOOLTIPS_INFO *infoPtr, UINT uIndex, LPTTTOOLINFOW lp /* lpToolInfo->lpszText = toolPtr->lpszText; */ lpToolInfo->lpszText = NULL; /* FIXME */ - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW)) + if (lpToolInfo->cbSize >= TTTOOLINFOW_V2_SIZE) lpToolInfo->lParam = toolPtr->lParam; return TRUE; @@ -1416,7 +1416,7 @@ TOOLTIPS_GetCurrentToolA (const TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo /* lpToolInfo->lpszText = toolPtr->lpszText; */ lpToolInfo->lpszText = NULL; /* FIXME */ - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA)) + if (lpToolInfo->cbSize >= TTTOOLINFOA_V2_SIZE) lpToolInfo->lParam = toolPtr->lParam; return TRUE; @@ -1448,7 +1448,7 @@ TOOLTIPS_GetCurrentToolW (const TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo /* lpToolInfo->lpszText = toolPtr->lpszText; */ lpToolInfo->lpszText = NULL; /* FIXME */ - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW)) + if (lpToolInfo->cbSize >= TTTOOLINFOW_V2_SIZE) lpToolInfo->lParam = toolPtr->lParam; return TRUE; @@ -1602,7 +1602,7 @@ TOOLTIPS_GetToolInfoA (const TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) /* lpToolInfo->lpszText = toolPtr->lpszText; */ lpToolInfo->lpszText = NULL; /* FIXME */ - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA)) + if (lpToolInfo->cbSize >= TTTOOLINFOA_V2_SIZE) lpToolInfo->lParam = toolPtr->lParam; return TRUE; @@ -1637,7 +1637,7 @@ TOOLTIPS_GetToolInfoW (const TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) /* lpToolInfo->lpszText = toolPtr->lpszText; */ lpToolInfo->lpszText = NULL; /* FIXME */ - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW)) + if (lpToolInfo->cbSize >= TTTOOLINFOW_V2_SIZE) lpToolInfo->lParam = toolPtr->lParam; return TRUE; @@ -1660,7 +1660,7 @@ TOOLTIPS_HitTestA (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOA lptthit) TRACE("tool %d!\n", nTool); /* copy tool data */ - if (lptthit->ti.cbSize >= sizeof(TTTOOLINFOA)) { + if (lptthit->ti.cbSize >= TTTOOLINFOA_V1_SIZE) { toolPtr = &infoPtr->tools[nTool]; lptthit->ti.uFlags = toolPtr->uFlags; @@ -1670,7 +1670,8 @@ TOOLTIPS_HitTestA (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOA lptthit) lptthit->ti.hinst = toolPtr->hinst; /* lptthit->ti.lpszText = toolPtr->lpszText; */ lptthit->ti.lpszText = NULL; /* FIXME */ - lptthit->ti.lParam = toolPtr->lParam; + if (lptthit->ti.cbSize >= TTTOOLINFOA_V2_SIZE) + lptthit->ti.lParam = toolPtr->lParam; } return TRUE; @@ -1693,7 +1694,7 @@ TOOLTIPS_HitTestW (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOW lptthit) TRACE("tool %d!\n", nTool); /* copy tool data */ - if (lptthit->ti.cbSize >= sizeof(TTTOOLINFOW)) { + if (lptthit->ti.cbSize >= TTTOOLINFOW_V1_SIZE) { toolPtr = &infoPtr->tools[nTool]; lptthit->ti.uFlags = toolPtr->uFlags; @@ -1703,7 +1704,8 @@ TOOLTIPS_HitTestW (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOW lptthit) lptthit->ti.hinst = toolPtr->hinst; /* lptthit->ti.lpszText = toolPtr->lpszText; */ lptthit->ti.lpszText = NULL; /* FIXME */ - lptthit->ti.lParam = toolPtr->lParam; + if (lptthit->ti.cbSize >= TTTOOLINFOW_V2_SIZE) + lptthit->ti.lParam = toolPtr->lParam; } return TRUE; @@ -2018,7 +2020,7 @@ TOOLTIPS_SetToolInfoA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) } } - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA)) + if (lpToolInfo->cbSize >= TTTOOLINFOA_V2_SIZE) toolPtr->lParam = lpToolInfo->lParam; return 0; @@ -2072,7 +2074,7 @@ TOOLTIPS_SetToolInfoW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) } } - if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOW)) + if (lpToolInfo->cbSize >= TTTOOLINFOW_V2_SIZE) toolPtr->lParam = lpToolInfo->lParam; if (infoPtr->nCurrentTool == nTool) diff --git a/include/commctrl.h b/include/commctrl.h index 2add8b8..f2ea3ae 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1774,6 +1774,10 @@ typedef struct tagTOOLINFOW { #define TTTOOLINFOA_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpszText) #define TTTOOLINFOW_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpszText) #define TTTOOLINFO_V1_SIZE CCSIZEOF_STRUCT(WINELIB_NAME_AW(TTTOOLINFO), lpszText) +#define TTTOOLINFOA_V2_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lParam) +#define TTTOOLINFOW_V2_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lParam) +#define TTTOOLINFOA_V3_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpReserved) +#define TTTOOLINFOW_V3_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpReserved) typedef struct _TT_HITTESTINFOA {

1 0