October 2010 - Wine-Commits

Andrew Nguyen : taskkill: Disallow process self-termination.
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: fbcf44aa23f748bb63eb26656e610cbfc3356375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcf44aa23f748bb63eb26656… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:13:43 2010 -0500 taskkill: Disallow process self-termination. --- programs/taskkill/En.rc | 1 + programs/taskkill/taskkill.c | 30 ++++++++++++++++++++++++++++++ programs/taskkill/taskkill.h | 1 + 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/En.rc b/programs/taskkill/En.rc index f7fcfd6..b4baabe 100644 --- a/programs/taskkill/En.rc +++ b/programs/taskkill/En.rc @@ -38,4 +38,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "Error: Could not find process \"%s\".\n" STRING_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" STRING_TERMINATE_FAILED, "Error: Unable to terminate process \"%s\".\n" + STRING_SELF_TERMINATION, "Error: Process self-termination is not permitted.\n" } diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 8dffdcd..1dc1fcc 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -204,6 +204,7 @@ static BOOL get_process_name_from_pid(DWORD pid, WCHAR *buf, DWORD chars) static int send_close_messages(void) { DWORD *pid_list, pid_list_size; + DWORD self_pid = GetCurrentProcessId(); unsigned int i; int status_code = 0; @@ -234,6 +235,13 @@ static int send_close_messages(void) DWORD pid = atoiW(task_list[i]); struct pid_close_info info = { pid }; + if (pid == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + EnumWindows(pid_enum_proc, (LPARAM)&info); if (info.found) taskkill_message_printfW(STRING_CLOSE_PID_SEARCH, pid); @@ -258,6 +266,13 @@ static int send_close_messages(void) struct pid_close_info info = { pid_list[index] }; found_process = TRUE; + if (pid_list[index] == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + EnumWindows(pid_enum_proc, (LPARAM)&info); taskkill_message_printfW(STRING_CLOSE_PROC_SRCH, process_name, pid_list[index]); } @@ -278,6 +293,7 @@ static int send_close_messages(void) static int terminate_processes(void) { DWORD *pid_list, pid_list_size; + DWORD self_pid = GetCurrentProcessId(); unsigned int i; int status_code = 0; @@ -308,6 +324,13 @@ static int terminate_processes(void) DWORD pid = atoiW(task_list[i]); HANDLE process; + if (pid == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + process = OpenProcess(PROCESS_TERMINATE, FALSE, pid); if (!process) { @@ -341,6 +364,13 @@ static int terminate_processes(void) { HANDLE process; + if (pid_list[index] == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + process = OpenProcess(PROCESS_TERMINATE, FALSE, pid_list[index]); if (!process) { diff --git a/programs/taskkill/taskkill.h b/programs/taskkill/taskkill.h index e535a01..7972a15 100644 --- a/programs/taskkill/taskkill.h +++ b/programs/taskkill/taskkill.h @@ -34,3 +34,4 @@ #define STRING_SEARCH_FAILED 111 #define STRING_ENUM_FAILED 112 #define STRING_TERMINATE_FAILED 113 +#define STRING_SELF_TERMINATION 114

1 0

Alexandre Julliard : user32: Store icon objects directly in the cache instead of using a separate structure .
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: 76e7fcc9d8bfae05fac2119eb653ee85c1fd24ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e7fcc9d8bfae05fac2119eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 14:55:46 2010 +0200 user32: Store icon objects directly in the cache instead of using a separate structure. --- dlls/user32/cursoricon.c | 149 +++++++++++++--------------------------------- 1 files changed, 42 insertions(+), 107 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 1af3aa4..d2219d2 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -25,6 +25,7 @@ #include "config.h" #include "wine/port.h" +#include <assert.h> #include <stdarg.h> #include <string.h> #include <stdlib.h> @@ -37,6 +38,7 @@ #include "wine/exception.h" #include "wine/server.h" #include "controls.h" +#include "win.h" #include "user_private.h" #include "wine/list.h" #include "wine/unicode.h" @@ -75,31 +77,8 @@ static HDC screen_dc; static const WCHAR DISPLAYW[] = {'D','I','S','P','L','A','Y',0}; - -/********************************************************************** - * ICONCACHE for cursors/icons loaded with LR_SHARED. - */ -typedef struct tagICONCACHE -{ - struct list entry; - HMODULE hModule; - HRSRC hRsrc; - HRSRC hGroupRsrc; - HICON hIcon; -} ICONCACHE; - static struct list icon_cache = LIST_INIT( icon_cache ); -static CRITICAL_SECTION IconCrst; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &IconCrst, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": IconCrst") } -}; -static CRITICAL_SECTION IconCrst = { &critsect_debug, -1, 0, 0, 0, 0 }; - - /********************************************************************** * User objects management */ @@ -114,9 +93,11 @@ struct cursoricon_frame struct cursoricon_object { struct user_object obj; /* object header */ + struct list entry; /* entry in shared icons list */ ULONG_PTR param; /* opaque param used by 16-bit code */ HMODULE module; /* module for icons loaded from resources */ LPWSTR resname; /* resource name for icons loaded from resources */ + HRSRC rsrc; /* resource for shared icons */ BOOL is_icon; /* whether icon or cursor */ UINT width; UINT height; @@ -162,6 +143,8 @@ static BOOL free_icon_handle( HICON handle ) ULONG_PTR param = obj->param; UINT i; + assert( !obj->rsrc ); /* shared icons can't be freed */ + for (i=0; i<obj->num_frames; i++) { if (obj->frames[i].alpha) DeleteObject( obj->frames[i].alpha ); @@ -401,77 +384,19 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, } /********************************************************************** - * CURSORICON_FindSharedIcon - */ -static HICON CURSORICON_FindSharedIcon( HMODULE hModule, HRSRC hRsrc ) -{ - HICON hIcon = 0; - ICONCACHE *ptr; - - EnterCriticalSection( &IconCrst ); - - LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) - if ( ptr->hModule == hModule && ptr->hRsrc == hRsrc ) - { - hIcon = ptr->hIcon; - break; - } - - LeaveCriticalSection( &IconCrst ); - - return hIcon; -} - -/************************************************************************* - * CURSORICON_FindCache - * - * Given a handle, find the corresponding cache element - * - * PARAMS - * Handle [I] handle to an Image - * - * RETURNS - * Success: The cache entry - * Failure: NULL - * + * is_icon_shared */ -static ICONCACHE* CURSORICON_FindCache(HICON hIcon) +static BOOL is_icon_shared( HICON handle ) { - ICONCACHE *ptr; - ICONCACHE *pRet=NULL; - - EnterCriticalSection( &IconCrst ); + struct cursoricon_object *info; + BOOL ret = FALSE; - LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) + if ((info = get_icon_ptr( handle ))) { - if ( hIcon == ptr->hIcon ) - { - pRet = ptr; - break; - } + ret = info->rsrc != NULL; + release_icon_ptr( handle, info ); } - - LeaveCriticalSection( &IconCrst ); - - return pRet; -} - -/********************************************************************** - * CURSORICON_AddSharedIcon - */ -static void CURSORICON_AddSharedIcon( HMODULE hModule, HRSRC hRsrc, HRSRC hGroupRsrc, HICON hIcon ) -{ - ICONCACHE *ptr = HeapAlloc( GetProcessHeap(), 0, sizeof(ICONCACHE) ); - if ( !ptr ) return; - - ptr->hModule = hModule; - ptr->hRsrc = hRsrc; - ptr->hIcon = hIcon; - ptr->hGroupRsrc = hGroupRsrc; - - EnterCriticalSection( &IconCrst ); - list_add_head( &icon_cache, &ptr->entry ); - LeaveCriticalSection( &IconCrst ); + return ret; } /********************************************************************** @@ -849,7 +774,7 @@ done: return ret; } -static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, HMODULE module, LPCWSTR resname, +static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, HMODULE module, LPCWSTR resname, HRSRC rsrc, POINT hotspot, BOOL bIcon, INT width, INT height, UINT cFlag ) { HICON hObj; @@ -908,6 +833,11 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, HMODULE module, LPCW } else info->resname = MAKEINTRESOURCEW( LOWORD(resname) ); + if (module && (cFlag & LR_SHARED)) + { + info->rsrc = rsrc; + list_add_head( &icon_cache, &info->entry ); + } release_icon_ptr( hObj, info ); USER_Driver->pCreateCursorIcon( hObj ); } @@ -1180,7 +1110,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, bmi = (BITMAPINFO *)(pt + 2); } - return CURSORICON_CreateIconFromBMI( bmi, NULL, NULL, hotspot, bIcon, width, height, cFlag ); + return CURSORICON_CreateIconFromBMI( bmi, NULL, NULL, NULL, hotspot, bIcon, width, height, cFlag ); } @@ -1242,7 +1172,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, hotspot.x = entry->xHotspot; hotspot.y = entry->yHotspot; - hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)&bits[entry->dwDIBOffset], NULL, NULL, + hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)&bits[entry->dwDIBOffset], NULL, NULL, NULL, hotspot, !fCursor, width, height, loadflags ); end: TRACE("loaded %s -> %p\n", debugstr_w( filename ), hIcon ); @@ -1261,7 +1191,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, { HANDLE handle = 0; HICON hIcon = 0; - HRSRC hRsrc, hGroupRsrc; + HRSRC hRsrc; CURSORICONDIR *dir; CURSORICONDIRENTRY *dirEntry; LPBYTE bits; @@ -1285,7 +1215,6 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, if (!(hRsrc = FindResourceW( hInstance, name, (LPWSTR)(fCursor ? RT_GROUP_CURSOR : RT_GROUP_ICON) ))) return 0; - hGroupRsrc = hRsrc; /* Find the best entry in the directory */ @@ -1306,9 +1235,21 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, (LPWSTR)(fCursor ? RT_CURSOR : RT_ICON) ))) return 0; /* If shared icon, check whether it was already loaded */ - if ( (loadflags & LR_SHARED) - && (hIcon = CURSORICON_FindSharedIcon( hInstance, hRsrc ) ) != 0 ) - return hIcon; + if (loadflags & LR_SHARED) + { + struct cursoricon_object *ptr; + + USER_Lock(); + LIST_FOR_EACH_ENTRY( ptr, &icon_cache, struct cursoricon_object, entry ) + { + if (ptr->module != hInstance) continue; + if (ptr->rsrc != hRsrc) continue; + hIcon = ptr->obj.handle; + break; + } + USER_Unlock(); + if (hIcon) return hIcon; + } if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; bits = LockResource( handle ); @@ -1325,15 +1266,9 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, hotspot.y = pt[1]; bits += 2 * sizeof(SHORT); } - hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)bits, hInstance, name, hotspot, - !fCursor, width, height, loadflags ); + hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)bits, hInstance, name, hRsrc, + hotspot, !fCursor, width, height, loadflags ); FreeResource( handle ); - - /* If shared icon, add to icon cache */ - - if ( hIcon && (loadflags & LR_SHARED) ) - CURSORICON_AddSharedIcon( hInstance, hRsrc, hGroupRsrc, hIcon ); - return hIcon; } @@ -1447,7 +1382,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) { TRACE_(icon)("%p\n", hIcon ); - if (!CURSORICON_FindCache( hIcon )) free_icon_handle( hIcon ); + if (!is_icon_shared( hIcon )) free_icon_handle( hIcon ); return TRUE; } @@ -2591,7 +2526,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, if (!(icon = get_icon_ptr( hnd ))) return 0; - if (icon->module && (flags & LR_COPYFROMRESOURCE)) + if (icon->rsrc && (flags & LR_COPYFROMRESOURCE)) res = CURSORICON_Load( icon->module, icon->resname, desiredx, desiredy, depth, type == IMAGE_CURSOR, flags ); else

1 0

Hans Leidekker : msi/tests: Reduce the UI level for a couple of tests.
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: 0df4712658fdf36b7e38c2dc55c101ad81e4af2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df4712658fdf36b7e38c2dc5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 11 12:10:23 2010 +0200 msi/tests: Reduce the UI level for a couple of tests. This makes the tests run faster because native only creates restore points for installers with a basic UI level and higher. --- dlls/msi/tests/format.c | 4 ++++ dlls/msi/tests/install.c | 45 ++++++++++++++++++++++++++++++--------------- dlls/msi/tests/package.c | 38 ++++++++++++++++++++++++++++++++------ 3 files changed, 66 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0df4712658fdf36b7e38c…

1 0

Alexandre Julliard : user32: Reimplement icon copying using CURSORICON_Load .
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: 76cd25c875586eb81264fb1d1ac11740ce48a074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76cd25c875586eb81264fb1d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 14:12:31 2010 +0200 user32: Reimplement icon copying using CURSORICON_Load. --- dlls/user32/cursoricon.c | 171 ++++++--------------------------------------- 1 files changed, 23 insertions(+), 148 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 1efe78e..1af3aa4 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1338,148 +1338,6 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, } -/************************************************************************* - * CURSORICON_ExtCopy - * - * Copies an Image from the Cache if LR_COPYFROMRESOURCE is specified - * - * PARAMS - * Handle [I] handle to an Image - * nType [I] Type of Handle (IMAGE_CURSOR | IMAGE_ICON) - * iDesiredCX [I] The Desired width of the Image - * iDesiredCY [I] The desired height of the Image - * nFlags [I] The flags from CopyImage - * - * RETURNS - * Success: The new handle of the Image - * - * NOTES - * LR_COPYDELETEORG and LR_MONOCHROME are currently not implemented. - * LR_MONOCHROME should be implemented by CreateIconFromResourceEx. - * LR_COPYFROMRESOURCE will only work if the Image is in the Cache. - * - * - */ - -static HICON CURSORICON_ExtCopy(HICON hIcon, UINT nType, - INT iDesiredCX, INT iDesiredCY, - UINT nFlags) -{ - HICON hNew=0; - - TRACE_(icon)("hIcon %p, nType %u, iDesiredCX %i, iDesiredCY %i, nFlags %u\n", - hIcon, nType, iDesiredCX, iDesiredCY, nFlags); - - if(hIcon == 0) - { - return 0; - } - - /* Best Fit or Monochrome */ - if( (nFlags & LR_COPYFROMRESOURCE - && (iDesiredCX > 0 || iDesiredCY > 0)) - || nFlags & LR_MONOCHROME) - { - ICONCACHE* pIconCache = CURSORICON_FindCache(hIcon); - - /* Not Found in Cache, then do a straight copy - */ - if(pIconCache == NULL) - { - hNew = CopyIcon( hIcon ); - if(nFlags & LR_COPYFROMRESOURCE) - { - TRACE_(icon)("LR_COPYFROMRESOURCE: Failed to load from cache\n"); - } - } - else - { - int iTargetCY = iDesiredCY, iTargetCX = iDesiredCX; - LPBYTE pBits; - HANDLE hMem; - HRSRC hRsrc; - DWORD dwBytesInRes; - WORD wResId; - CURSORICONDIR *pDir; - CURSORICONDIRENTRY *pDirEntry; - BOOL bIsIcon = (nType == IMAGE_ICON); - - /* Completing iDesiredCX CY for Monochrome Bitmaps if needed - */ - if(((nFlags & LR_MONOCHROME) && !(nFlags & LR_COPYFROMRESOURCE)) - || (iDesiredCX == 0 && iDesiredCY == 0)) - { - iDesiredCY = GetSystemMetrics(bIsIcon ? - SM_CYICON : SM_CYCURSOR); - iDesiredCX = GetSystemMetrics(bIsIcon ? - SM_CXICON : SM_CXCURSOR); - } - - /* Retrieve the CURSORICONDIRENTRY - */ - if (!(hMem = LoadResource( pIconCache->hModule , - pIconCache->hGroupRsrc))) - { - return 0; - } - if (!(pDir = LockResource( hMem ))) - { - return 0; - } - - /* Find Best Fit - */ - if(bIsIcon) - { - pDirEntry = CURSORICON_FindBestIconRes( - pDir, iDesiredCX, iDesiredCY, 256 ); - } - else - { - pDirEntry = CURSORICON_FindBestCursorRes( - pDir, iDesiredCX, iDesiredCY, 1); - } - - wResId = pDirEntry->wResId; - dwBytesInRes = pDirEntry->dwBytesInRes; - FreeResource(hMem); - - TRACE_(icon)("ResID %u, BytesInRes %u, Width %d, Height %d DX %d, DY %d\n", - wResId, dwBytesInRes, pDirEntry->ResInfo.icon.bWidth, - pDirEntry->ResInfo.icon.bHeight, iDesiredCX, iDesiredCY); - - /* Get the Best Fit - */ - if (!(hRsrc = FindResourceW(pIconCache->hModule , - MAKEINTRESOURCEW(wResId), (LPWSTR)(bIsIcon ? RT_ICON : RT_CURSOR)))) - { - return 0; - } - if (!(hMem = LoadResource( pIconCache->hModule , hRsrc ))) - { - return 0; - } - - pBits = LockResource( hMem ); - - if(nFlags & LR_DEFAULTSIZE) - { - iTargetCY = GetSystemMetrics(SM_CYICON); - iTargetCX = GetSystemMetrics(SM_CXICON); - } - - /* Create a New Icon with the proper dimension - */ - hNew = CreateIconFromResourceEx( pBits, dwBytesInRes, - bIsIcon, 0x00030000, iTargetCX, iTargetCY, nFlags); - FreeResource(hMem); - } - } - else hNew = CopyIcon( hIcon ); - return hNew; -} - - /*********************************************************************** * CreateCursor (USER32.@) */ @@ -2719,13 +2577,30 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, return res; } case IMAGE_ICON: - return CURSORICON_ExtCopy(hnd,type, desiredx, desiredy, flags); case IMAGE_CURSOR: - /* Should call CURSORICON_ExtCopy but more testing - * needs to be done before we change this - */ - if (flags) FIXME("Flags are ignored\n"); - return CopyCursor(hnd); + { + struct cursoricon_object *icon; + HICON res = 0; + int depth = (flags & LR_MONOCHROME) ? 1 : GetDeviceCaps( screen_dc, BITSPIXEL ); + + if (flags & LR_DEFAULTSIZE) + { + if (!desiredx) desiredx = GetSystemMetrics( type == IMAGE_ICON ? SM_CXICON : SM_CXCURSOR ); + if (!desiredy) desiredy = GetSystemMetrics( type == IMAGE_ICON ? SM_CYICON : SM_CYCURSOR ); + } + + if (!(icon = get_icon_ptr( hnd ))) return 0; + + if (icon->module && (flags & LR_COPYFROMRESOURCE)) + res = CURSORICON_Load( icon->module, icon->resname, desiredx, desiredy, depth, + type == IMAGE_CURSOR, flags ); + else + res = CopyIcon( hnd ); /* FIXME: change size if necessary */ + release_icon_ptr( hnd, icon ); + + if (res && (flags & LR_COPYDELETEORG)) DeleteObject( hnd ); + return res; + } } return 0; }

1 0

Alexandre Julliard : user32: Store the module and resource name information for icons.
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: 751a09e9839d7273895df24666a0bb2fb51a29c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=751a09e9839d7273895df2466… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 12:50:58 2010 +0200 user32: Store the module and resource name information for icons. --- dlls/user32/cursoricon.c | 62 +++++++++++++++++++++++++++++---------------- 1 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index e27365c..c88bc53 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -39,6 +39,7 @@ #include "controls.h" #include "user_private.h" #include "wine/list.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); @@ -114,6 +115,8 @@ struct cursoricon_object { struct user_object obj; /* object header */ ULONG_PTR param; /* opaque param used by 16-bit code */ + HMODULE module; /* module for icons loaded from resources */ + LPWSTR resname; /* resource name for icons loaded from resources */ BOOL is_icon; /* whether icon or cursor */ UINT width; UINT height; @@ -165,6 +168,7 @@ static BOOL free_icon_handle( HICON handle ) if (obj->frames[i].color) DeleteObject( obj->frames[i].color ); DeleteObject( obj->frames[i].mask ); } + if (!IS_INTRESOURCE( obj->resname )) HeapFree( GetProcessHeap(), 0, obj->resname ); HeapFree( GetProcessHeap(), 0, obj ); if (wow_handlers.free_icon_param && param) wow_handlers.free_icon_param( param ); USER_Driver->pDestroyCursorIcon( handle ); @@ -845,22 +849,13 @@ done: return ret; } -static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, - POINT hotspot, BOOL bIcon, - DWORD dwVersion, - INT width, INT height, - UINT cFlag ) +static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, HMODULE module, LPCWSTR resname, + POINT hotspot, BOOL bIcon, INT width, INT height, UINT cFlag ) { HICON hObj; HBITMAP color = 0, mask = 0, alpha = 0; BOOL do_stretch; - if (dwVersion == 0x00020000) - { - FIXME_(cursor)("\t2.xx resources are not supported\n"); - return 0; - } - /* Check bitmap header */ if ( (bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) && @@ -899,13 +894,22 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, struct cursoricon_object *info = get_icon_ptr( hObj ); info->is_icon = bIcon; + info->module = module; info->hotspot = hotspot; info->width = width; info->height = height; info->frames[0].color = color; info->frames[0].mask = mask; info->frames[0].alpha = alpha; + if (!IS_INTRESOURCE(resname)) + { + info->resname = HeapAlloc( GetProcessHeap(), 0, (strlenW(resname) + 1) * sizeof(WCHAR) ); + if (info->resname) strcpyW( info->resname, resname ); + } + else info->resname = MAKEINTRESOURCEW( LOWORD(resname) ); + release_icon_ptr( hObj, info ); + USER_Driver->pCreateCursorIcon( hObj ); } else { @@ -1149,7 +1153,6 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, { POINT hotspot; BITMAPINFO *bmi; - HICON icon; TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", bits, cbSize, dwVersion, width, height, @@ -1157,6 +1160,12 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, if (!bits) return 0; + if (dwVersion == 0x00020000) + { + FIXME_(cursor)("\t2.xx resources are not supported\n"); + return 0; + } + if (bIcon) { hotspot.x = width / 2; @@ -1171,10 +1180,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, bmi = (BITMAPINFO *)(pt + 2); } - icon = CURSORICON_CreateIconFromBMI( bmi, hotspot, bIcon, dwVersion, - width, height, cFlag ); - if (icon) USER_Driver->pCreateCursorIcon( icon ); - return icon; + return CURSORICON_CreateIconFromBMI( bmi, NULL, NULL, hotspot, bIcon, width, height, cFlag ); } @@ -1236,13 +1242,11 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, hotspot.x = entry->xHotspot; hotspot.y = entry->yHotspot; - hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)&bits[entry->dwDIBOffset], - hotspot, !fCursor, 0x00030000, - width, height, loadflags ); + hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)&bits[entry->dwDIBOffset], NULL, NULL, + hotspot, !fCursor, width, height, loadflags ); end: TRACE("loaded %s -> %p\n", debugstr_w( filename ), hIcon ); UnmapViewOfFile( bits ); - if (hIcon) USER_Driver->pCreateCursorIcon( hIcon ); return hIcon; } @@ -1263,6 +1267,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, LPBYTE bits; WORD wResId; DWORD dwBytesInRes; + POINT hotspot; TRACE("%p, %s, %dx%d, depth %d, fCursor %d, flags 0x%04x\n", hInstance, debugstr_w(name), width, height, depth, fCursor, loadflags); @@ -1307,8 +1312,21 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; bits = LockResource( handle ); - hIcon = CreateIconFromResourceEx( bits, dwBytesInRes, - !fCursor, 0x00030000, width, height, loadflags); + + if (!fCursor) + { + hotspot.x = width / 2; + hotspot.y = height / 2; + } + else /* get the hotspot */ + { + SHORT *pt = (SHORT *)bits; + hotspot.x = pt[0]; + hotspot.y = pt[1]; + bits += 2 * sizeof(SHORT); + } + hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)bits, hInstance, name, hotspot, + !fCursor, width, height, loadflags ); FreeResource( handle ); /* If shared icon, add to icon cache */

1 0

Hans Leidekker : msi/tests: Set the MSIFASTINSTALL property.
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: eafebe0f7d85af81529cfcec95ad2b9bcb717039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafebe0f7d85af81529cfcec9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 11 12:10:08 2010 +0200 msi/tests: Set the MSIFASTINSTALL property. On recent versions of msi this prevents the creation of a system restore point, which can take a very long time. --- dlls/msi/tests/automation.c | 9 +++++---- dlls/msi/tests/install.c | 24 ++++++++++++++++-------- dlls/msi/tests/package.c | 3 +++ dlls/msi/tests/patch.c | 3 ++- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 0ad51ea..49cdca3 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -79,7 +79,7 @@ static const CHAR directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" "MSITESTDIR\tProgramFilesFolder\tmsitest\n" "NEWDIR\tCABOUTDIR\tnew\n" "ProgramFilesFolder\tTARGETDIR\t.\n" - "TARGETDIR\t\tSourceDir"; + "TARGETDIR\t\tSourceDir\n"; static const CHAR feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" @@ -125,7 +125,7 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "InstallInitialize\t\t1500\n" "InstallValidate\t\t1400\n" "LaunchConditions\t\t100\n" - "WriteRegistryValues\tSourceDir And SOURCEDIR\t5000"; + "WriteRegistryValues\tSourceDir And SOURCEDIR\t5000\n"; static const CHAR media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" @@ -148,7 +148,8 @@ static const CHAR property_dat[] = "Property\tValue\n" "ProductVersion\t1.1.1\n" "PROMPTROLLBACKCOST\tP\n" "Setup\tSetup\n" - "UpgradeCode\t{CE067E8D-2E1A-4367-B734-4EB2BDAD6565}"; + "UpgradeCode\t{CE067E8D-2E1A-4367-B734-4EB2BDAD6565}\n" + "MSIFASTINSTALL\t1\n"; static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" "s72\ti2\tl255\tL255\tL0\ts72\n" @@ -156,7 +157,7 @@ static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_ "Apples\t1\tSOFTWARE\\Wine\\msitest\tName\timaname\tOne\n" "Oranges\t1\tSOFTWARE\\Wine\\msitest\tnumber\t#314\tTwo\n" "regdata\t1\tSOFTWARE\\Wine\\msitest\tblah\tbad\tdangler\n" - "OrderTest\t1\tSOFTWARE\\Wine\\msitest\tOrderTestName\tOrderTestValue\tcomponent"; + "OrderTest\t1\tSOFTWARE\\Wine\\msitest\tOrderTestName\tOrderTestValue\tcomponent\n"; typedef struct _msi_table { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 07a2dcf..b015015 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -171,7 +171,8 @@ static const CHAR property_dat[] = "Property\tValue\n" "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" "SERVNAME\tTestService\n" - "SERVDISP\tTestServiceDisp\n"; + "SERVDISP\tTestServiceDisp\n" + "MSIFASTINSTALL\t1\n"; static const CHAR aup_property_dat[] = "Property\tValue\n" "s72\tl0\n" @@ -194,7 +195,8 @@ static const CHAR aup_property_dat[] = "Property\tValue\n" "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" "SERVNAME\tTestService\n" - "SERVDISP\tTestServiceDisp\n"; + "SERVDISP\tTestServiceDisp\n" + "MSIFASTINSTALL\t1\n"; static const CHAR aup2_property_dat[] = "Property\tValue\n" "s72\tl0\n" @@ -217,7 +219,8 @@ static const CHAR aup2_property_dat[] = "Property\tValue\n" "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" "SERVNAME\tTestService\n" - "SERVDISP\tTestServiceDisp\n"; + "SERVDISP\tTestServiceDisp\n" + "MSIFASTINSTALL\t1\n"; static const CHAR icon_property_dat[] = "Property\tValue\n" "s72\tl0\n" @@ -239,7 +242,8 @@ static const CHAR icon_property_dat[] = "Property\tValue\n" "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" "SERVNAME\tTestService\n" - "SERVDISP\tTestServiceDisp\n"; + "SERVDISP\tTestServiceDisp\n" + "MSIFASTINSTALL\t1\n"; static const CHAR shortcut_dat[] = "Shortcut\tDirectory_\tName\tComponent_\tTarget\tArguments\tDescription\tHotkey\tIcon_\tIconIndex\tShowCmd\tWkDir\n" "s72\ts72\tl128\ts72\ts72\tS255\tL255\tI2\tS72\tI2\tI2\tS72\n" @@ -315,7 +319,8 @@ static const CHAR up_property_dat[] = "Property\tValue\n" "ROOTDRIVE\tC:\\\n" "SERVNAME\tTestService\n" "SERVDISP\tTestServiceDisp\n" - "RemovePreviousVersions\t1\n"; + "RemovePreviousVersions\t1\n" + "MSIFASTINSTALL\t1\n"; static const CHAR up2_property_dat[] = "Property\tValue\n" "s72\tl0\n" @@ -337,7 +342,8 @@ static const CHAR up2_property_dat[] = "Property\tValue\n" "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" "SERVNAME\tTestService\n" - "SERVDISP\tTestServiceDisp\n"; + "SERVDISP\tTestServiceDisp\n" + "MSIFASTINSTALL\t1\n"; static const CHAR up3_property_dat[] = "Property\tValue\n" "s72\tl0\n" @@ -360,7 +366,8 @@ static const CHAR up3_property_dat[] = "Property\tValue\n" "ROOTDRIVE\tC:\\\n" "SERVNAME\tTestService\n" "SERVDISP\tTestServiceDisp\n" - "RemovePreviousVersions\t1\n"; + "RemovePreviousVersions\t1\n" + "MSIFASTINSTALL\t1\n"; static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" "s72\ti2\tl255\tL255\tL0\ts72\n" @@ -1294,7 +1301,8 @@ static const CHAR vp_property_dat[] = "Property\tValue\n" "ProductLanguage\t1033\n" "ProductName\tMSITEST\n" "ProductVersion\t1.1.1\n" - "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n"; + "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n" + "MSIFASTINSTALL\t1\n"; static const CHAR vp_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" "s72\ti2\tS64\tS0\tS255\n" diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 7e688c8..47e0da3 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2510,6 +2510,9 @@ static void test_states(void) r = add_property_entry( hdb, "'ProductVersion', '1.1.1'" ); ok( r == ERROR_SUCCESS, "cannot add property entry: %d\n", r ); + r = add_property_entry( hdb, "'MSIFASTINSTALL', '1'" ); + ok( r == ERROR_SUCCESS, "cannot add property entry: %d\n", r ); + r = create_install_execute_sequence_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create InstallExecuteSequence table: %d\n", r ); diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 998dc4b..4cad4eb 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -57,7 +57,8 @@ static const char property_dat[] = "ProductLanguage\t1033\n" "ProductName\tmsitest\n" "ProductVersion\t1.1.1\n" - "PATCHNEWSUMMARYSUBJECT\tInstaller Database\n"; + "PATCHNEWSUMMARYSUBJECT\tInstaller Database\n" + "MSIFASTINSTALL\t1\n"; static const char media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n"

1 0

Alexandre Julliard : user32: Return the module and resource name in GetIconInfoEx.
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: 6e7846e33e3b9ab8a0995842863b4d75ae5f2663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7846e33e3b9ab8a09958428… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 12:53:36 2010 +0200 user32: Return the module and resource name in GetIconInfoEx. --- dlls/user32/cursoricon.c | 12 +++++++++--- dlls/user32/tests/cursoricon.c | 12 ++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index c88bc53..1efe78e 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1911,9 +1911,15 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) info->yHotspot = ptr->hotspot.y; info->hbmColor = copy_bitmap( ptr->frames[0].color ); info->hbmMask = copy_bitmap( ptr->frames[0].mask ); - info->wResID = 0; /* FIXME */ - info->szModName[0] = 0; /* FIXME */ - info->szResName[0] = 0; /* FIXME */ + info->wResID = 0; + info->szModName[0] = 0; + info->szResName[0] = 0; + if (ptr->module) + { + GetModuleFileNameW( ptr->module, info->szModName, MAX_PATH ); + if (IS_INTRESOURCE( ptr->resname )) info->wResID = LOWORD( ptr->resname ); + else lstrcpynW( info->szResName, ptr->resname, MAX_PATH ); + } release_icon_ptr( icon, ptr ); return TRUE; } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 446bdf9..10f0037 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -956,20 +956,20 @@ static void test_LoadImage(void) infoexA.cbSize = sizeof(infoexA); ret = pGetIconInfoExA( handle, &infoexA ); ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); - todo_wine ok( infoexA.wResID == (UINT_PTR)IDI_HAND, "GetIconInfoEx wrong resid %x\n", infoexA.wResID ); + ok( infoexA.wResID == (UINT_PTR)IDI_HAND, "GetIconInfoEx wrong resid %x\n", infoexA.wResID ); /* the A version is broken on 64-bit, it truncates the string after the first char */ if (is_win64 && infoexA.szModName[0] && infoexA.szModName[1] == 0) trace( "GetIconInfoExA broken on Win64\n" ); else - todo_wine ok( GetModuleHandleA(infoexA.szModName) == GetModuleHandleA("user32.dll"), - "GetIconInfoEx wrong module %s\n", infoexA.szModName ); + ok( GetModuleHandleA(infoexA.szModName) == GetModuleHandleA("user32.dll"), + "GetIconInfoEx wrong module %s\n", infoexA.szModName ); ok( infoexA.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoexA.szResName ); infoexW.cbSize = sizeof(infoexW); ret = pGetIconInfoExW( handle, &infoexW ); ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); - todo_wine ok( infoexW.wResID == (UINT_PTR)IDI_HAND, "GetIconInfoEx wrong resid %x\n", infoexW.wResID ); - todo_wine ok( GetModuleHandleW(infoexW.szModName) == GetModuleHandleA("user32.dll"), - "GetIconInfoEx wrong module %s\n", wine_dbgstr_w(infoexW.szModName) ); + ok( infoexW.wResID == (UINT_PTR)IDI_HAND, "GetIconInfoEx wrong resid %x\n", infoexW.wResID ); + ok( GetModuleHandleW(infoexW.szModName) == GetModuleHandleA("user32.dll"), + "GetIconInfoEx wrong module %s\n", wine_dbgstr_w(infoexW.szModName) ); ok( infoexW.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", wine_dbgstr_w(infoexW.szResName) ); } SetLastError(0xdeadbeef);

1 0

Jeff Cook : winealsa.drv: Only set micelem as master if there are no other elems on this card.
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: e96d3d538a33785b1ac4f505ab7643864a6d778c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96d3d538a33785b1ac4f505a… Author: Jeff Cook <jeff(a)deserettechnology.com> Date: Sun Oct 10 22:24:45 2010 -0600 winealsa.drv: Only set micelem as master if there are no other elems on this card. --- dlls/winealsa.drv/mixer.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index ffa0292..6a7d14b 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -431,7 +431,7 @@ static void ALSA_MixerInit(void) info = HeapAlloc( GetProcessHeap(), 0, snd_ctl_card_info_sizeof()); for (x = 0; x < MAX_MIXERS; ++x) { - int card, err, capcontrols = 0; + int card, err, capcontrols, total_elems = 0; char cardind[6], cardname[10]; snd_ctl_t *ctl; @@ -486,12 +486,15 @@ static void ALSA_MixerInit(void) /* First, lets see what's available.. * If there are multiple Master or Captures, all except 1 will be added as slaves */ + total_elems = snd_mixer_get_count(mixdev[mixnum].mix); + TRACE("Total elems: %d\n", total_elems); + for (elem = snd_mixer_first_elem(mixdev[mixnum].mix); elem; elem = snd_mixer_elem_next(elem)) if (!strcasecmp(snd_mixer_selem_get_name(elem), "Master") && !mastelem) mastelem = elem; else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Capture") && !captelem) captelem = elem; - else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Mic") && !micelem && !mastelem) + else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Mic") && !micelem && !mastelem && total_elems == 1) /* this is what snd-usb-audio mics look like; just a Mic control and that's it.*/ micelem = elem; else if (!blacklisted(elem))

1 0

Hans Leidekker : msi/tests: Fix some test failures on 64-bit.
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: 5709fab04ccbb4bb587c43cde0ee20da6cdcfbf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5709fab04ccbb4bb587c43cde… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 11 12:09:54 2010 +0200 msi/tests: Fix some test failures on 64-bit. --- dlls/msi/tests/install.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 8875bb8..07a2dcf 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -7537,7 +7537,6 @@ static void test_writeregistryvalues(void) HKEY hkey; DWORD type, size; CHAR path[MAX_PATH]; - REGSAM access = KEY_ALL_ACCESS; if (is_process_limited()) { @@ -7550,9 +7549,6 @@ static void test_writeregistryvalues(void) create_database(msifile, wrv_tables, sizeof(wrv_tables) / sizeof(msi_table)); - if (is_wow64) - access |= KEY_WOW64_64KEY; - MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); @@ -7565,7 +7561,10 @@ static void test_writeregistryvalues(void) ok(delete_pf("msitest\\augustus", TRUE), "File installed\n"); ok(delete_pf("msitest", FALSE), "File installed\n"); - res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); + if (is_64bit && !is_wow64) + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Wine\\msitest", 0, KEY_ALL_ACCESS, &hkey); + else + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, KEY_ALL_ACCESS, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); size = MAX_PATH; @@ -7577,6 +7576,8 @@ static void test_writeregistryvalues(void) ok(size == 15, "Expected 15, got %d\n", size); ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + RegDeleteValueA(hkey, "Value"); + RegCloseKey(hkey); RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest"); error: @@ -10485,7 +10486,10 @@ static void test_register_class_info(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - res = RegOpenKeyA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); + if (is_64bit && !is_wow64) + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Wow6432Node\\CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); + else + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); ok(res == ERROR_SUCCESS, "key not created\n"); RegCloseKey(hkey); @@ -10500,7 +10504,10 @@ static void test_register_class_info(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - res = RegOpenKeyA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); + if (is_64bit && !is_wow64) + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Wow6432Node\\CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); + else + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); res = RegOpenKeyA(HKEY_CLASSES_ROOT, "FileType\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey);

1 0

Jeff Cook : winealsa.drv: Rewrite channel counting for additional readability and circumvention of a couple of crashes .
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: 0b4c99cd7de02bf6c896f2e2bc87b49a03356b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4c99cd7de02bf6c896f2e2b… Author: Jeff Cook <jeff(a)deserettechnology.com> Date: Sun Oct 10 22:10:53 2010 -0600 winealsa.drv: Rewrite channel counting for additional readability and circumvention of a couple of crashes. --- dlls/winealsa.drv/mixer.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 6a7d14b..93c8927 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -491,7 +491,10 @@ static void ALSA_MixerInit(void) for (elem = snd_mixer_first_elem(mixdev[mixnum].mix); elem; elem = snd_mixer_elem_next(elem)) if (!strcasecmp(snd_mixer_selem_get_name(elem), "Master") && !mastelem) + { mastelem = elem; + ++(mixdev[mixnum].chans); + } else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Capture") && !captelem) captelem = elem; else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Mic") && !micelem && !mastelem && total_elems == 1) @@ -517,13 +520,12 @@ static void ALSA_MixerInit(void) headelem = elem; else if (!strcasecmp(snd_mixer_selem_get_name(elem), "PCM") && !pcmelem) pcmelem = elem; - else - ++(mixdev[mixnum].chans); + ++(mixdev[mixnum].chans); } } - /* Add master channel, uncounted channels and an extra for capture */ - mixdev[mixnum].chans += !!mastelem + !!headelem + !!pcmelem + 1; + /* Add dummy capture channel, wanted by Windows */ + mixdev[mixnum].chans += 1; /* If there is only 'Capture' and 'Master', this device is not worth it */ if (mixdev[mixnum].chans == 2)

1 0