October 2010 - Wine-Commits

Hans Leidekker : msi/tests: Don' t create a nested restore point on recent versions of MSI.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 9cc4b0caae8a1a37c43310eba010afcf8383fc2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc4b0caae8a1a37c43310eba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 14:24:18 2010 +0200 msi/tests: Don't create a nested restore point on recent versions of MSI. We now set the MSIFASTINSTALL property which disables restore points. --- dlls/msi/tests/install.c | 10 ++++++++-- dlls/msi/tests/package.c | 9 +++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3572a93..8b24367 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -42,6 +42,8 @@ static UINT (WINAPI *pMsiSourceListEnumSourcesA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPSTR, LPDWORD); static UINT (WINAPI *pMsiSourceListGetInfoA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, LPSTR, LPDWORD); +static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) + (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); static BOOL (WINAPI *pGetTokenInformation)( HANDLE, TOKEN_INFORMATION_CLASS, LPVOID, DWORD, PDWORD ); @@ -3266,6 +3268,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiSetExternalUIRecord); GET_PROC(hmsi, MsiSourceListEnumSourcesA); GET_PROC(hmsi, MsiSourceListGetInfoA); + GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hadvapi32, ConvertSidToStringSidA); GET_PROC(hadvapi32, GetTokenInformation); @@ -10955,8 +10958,11 @@ START_TEST(install) /* Create a restore point ourselves so we circumvent the multitude of restore points * that would have been created by all the installation and removal tests. + * + * This is not needed on version 5.0 where setting MSIFASTINSTALL prevents the + * creation of restore points. */ - if (pSRSetRestorePointA) + if (pSRSetRestorePointA && !pMsiGetComponentPathExA) { memset(&status, 0, sizeof(status)); ret = notify_system_change(BEGIN_NESTED_SYSTEM_CHANGE, &status); @@ -11046,7 +11052,7 @@ START_TEST(install) DeleteFileA(log_file); - if (pSRSetRestorePointA && ret) + if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) { ret = notify_system_change(END_NESTED_SYSTEM_CHANGE, &status); if (ret) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 6cb5533..07ab4eb 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -36,6 +36,7 @@ static const char msifile[] = "winetest-package.msi"; static char CURR_DIR[MAX_PATH]; static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); +static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA)(LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); @@ -62,6 +63,7 @@ static void init_functionpointers(void) p ## func = (void*)GetProcAddress(mod, #func); GET_PROC(hmsi, MsiApplyMultiplePatchesA); + GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hshell32, SHGetFolderPathA); GET_PROC(hadvapi32, ConvertSidToStringSidA); @@ -12829,8 +12831,11 @@ START_TEST(package) /* Create a restore point ourselves so we circumvent the multitude of restore points * that would have been created by all the installation and removal tests. + * + * This is not needed on version 5.0 where setting MSIFASTINSTALL prevents the + * creation of restore points. */ - if (pSRSetRestorePointA) + if (pSRSetRestorePointA && !pMsiGetComponentPathExA) { memset(&status, 0, sizeof(status)); ret = notify_system_change(BEGIN_NESTED_SYSTEM_CHANGE, &status); @@ -12868,7 +12873,7 @@ START_TEST(package) test_MsiApplyMultiplePatches(); test_MsiApplyPatch(); - if (pSRSetRestorePointA && ret) + if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) { ret = notify_system_change(END_NESTED_SYSTEM_CHANGE, &status); if (ret)

1 0

Hans Leidekker : msi: A commit or rollback custom action can be a deferred action at the same time .
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 7404e64373827b2aaa6b46f5180b03835814f907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7404e64373827b2aaa6b46f51… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 14:23:51 2010 +0200 msi: A commit or rollback custom action can be a deferred action at the same time. --- dlls/msi/custom.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 5a1787f..e3a2b44 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -258,20 +258,14 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL { LPWSTR actiondata = msi_dup_property( package->db, action ); - switch (script) - { - case INSTALL_SCRIPT: + if (type & msidbCustomActionTypeInScript) package->scheduled_action_running = TRUE; - break; - case COMMIT_SCRIPT: + + if (type & msidbCustomActionTypeCommit) package->commit_action_running = TRUE; - break; - case ROLLBACK_SCRIPT: + + if (type & msidbCustomActionTypeRollback) package->rollback_action_running = TRUE; - break; - default: - break; - } if (deferred_data) set_deferred_action_props(package, deferred_data);

1 0

Hans Leidekker : msi: Put keys from 32-bit packages starting with HLKM\Software under Wow6432Node on 64-bit .
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 59d6dcfdddda0339a71a3181e0018e79c0d3759a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59d6dcfdddda0339a71a3181e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 14:23:34 2010 +0200 msi: Put keys from 32-bit packages starting with HLKM\Software under Wow6432Node on 64-bit. --- dlls/msi/action.c | 50 ++++++++++++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 1 + 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4cebbea..34c0ce4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2371,17 +2371,43 @@ static const WCHAR *get_root_key( MSIPACKAGE *package, INT root, HKEY *root_key return ret; } +static WCHAR *get_keypath( MSIPACKAGE *package, HKEY root, const WCHAR *path ) +{ + static const WCHAR prefixW[] = {'S','O','F','T','W','A','R','E','\\'}; + static const UINT len = sizeof(prefixW) / sizeof(prefixW[0]); + + if (is_64bit && package->platform == PLATFORM_INTEL && + root == HKEY_LOCAL_MACHINE && !strncmpiW( path, prefixW, len )) + { + UINT size; + WCHAR *path_32node; + + size = (strlenW( path ) + strlenW( szWow6432Node ) + 1) * sizeof(WCHAR); + path_32node = msi_alloc( size ); + if (!path_32node) + return NULL; + + memcpy( path_32node, path, len * sizeof(WCHAR) ); + path_32node[len] = 0; + strcatW( path_32node, szWow6432Node ); + strcatW( path_32node, szBackSlash ); + strcatW( path_32node, path + len ); + return path_32node; + } + + return strdupW( path ); +} + static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; LPSTR value_data = NULL; HKEY root_key, hkey; DWORD type,size; - LPWSTR deformated; + LPWSTR deformated, uikey, keypath; LPCWSTR szRoot, component, name, key, value; MSICOMPONENT *comp; MSIRECORD * uirow; - LPWSTR uikey; INT root; BOOL check_first = FALSE; UINT rc; @@ -2432,14 +2458,14 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) strcpyW(uikey,szRoot); strcatW(uikey,deformated); - if (RegCreateKeyW( root_key, deformated, &hkey)) + keypath = get_keypath( package, root_key, deformated ); + msi_free( deformated ); + if (RegCreateKeyW( root_key, keypath, &hkey )) { - ERR("Could not create key %s\n",debugstr_w(deformated)); - msi_free(deformated); + ERR("Could not create key %s\n", debugstr_w(keypath)); msi_free(uikey); return ERROR_SUCCESS; } - msi_free(deformated); value = MSI_RecordGetString(row,5); if (value) @@ -2554,7 +2580,7 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para { MSIPACKAGE *package = param; LPCWSTR component, name, key_str, root_key_str; - LPWSTR deformated_key, deformated_name, ui_key_str; + LPWSTR deformated_key, deformated_name, ui_key_str, keypath; MSICOMPONENT *comp; MSIRECORD *uirow; BOOL delete_key = FALSE; @@ -2610,8 +2636,10 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para deformat_string( package, name, &deformated_name ); - delete_reg_key_or_value( hkey_root, deformated_key, deformated_name, delete_key ); + keypath = get_keypath( package, hkey_root, deformated_key ); msi_free( deformated_key ); + delete_reg_key_or_value( hkey_root, keypath, deformated_name, delete_key ); + msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, ui_key_str ); @@ -2629,7 +2657,7 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param { MSIPACKAGE *package = param; LPCWSTR component, name, key_str, root_key_str; - LPWSTR deformated_key, deformated_name, ui_key_str; + LPWSTR deformated_key, deformated_name, ui_key_str, keypath; MSICOMPONENT *comp; MSIRECORD *uirow; BOOL delete_key = FALSE; @@ -2682,8 +2710,10 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param deformat_string( package, name, &deformated_name ); - delete_reg_key_or_value( hkey_root, deformated_key, deformated_name, delete_key ); + keypath = get_keypath( package, hkey_root, deformated_key ); msi_free( deformated_key ); + delete_reg_key_or_value( hkey_root, keypath, deformated_name, delete_key ); + msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, ui_key_str ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a785876..0361ff4 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1150,6 +1150,7 @@ static const WCHAR szIntel[] = {'I','n','t','e','l',0}; static const WCHAR szIntel64[] = {'I','n','t','e','l','6','4',0}; static const WCHAR szX64[] = {'x','6','4',0}; static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; +static const WCHAR szWow6432Node[] = {'W','o','w','6','4','3','2','N','o','d','e',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0

Hans Leidekker : msi: Register class ids from 32-bit packages under Wow6432Node on 64-bit.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 43a680a1554de5d67123af645692d614b071ff06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a680a1554de5d67123af645… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 14:23:25 2010 +0200 msi: Register class ids from 32-bit packages under Wow6432Node on 64-bit. --- dlls/msi/classes.c | 18 ++++++++++++++++-- dlls/msi/msipriv.h | 3 +++ dlls/msi/package.c | 1 - dlls/msi/registry.c | 2 -- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 5943805..beaf1f0 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -804,12 +804,19 @@ static UINT register_appid(const MSIAPPID *appid, LPCWSTR app ) UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) { static const WCHAR szFileType_fmt[] = {'F','i','l','e','T','y','p','e','\\','%','s','\\','%','i',0}; + const WCHAR *keypath; MSIRECORD *uirow; HKEY hkey,hkey2,hkey3; MSICLASS *cls; load_classes_and_such(package); - if (RegCreateKeyW(HKEY_CLASSES_ROOT, szCLSID, &hkey) != ERROR_SUCCESS) + + if (is_64bit && package->platform == PLATFORM_INTEL) + keypath = szWow6432NodeCLSID; + else + keypath = szCLSID; + + if (RegCreateKeyW(HKEY_CLASSES_ROOT, keypath, &hkey) != ERROR_SUCCESS) return ERROR_FUNCTION_FAILED; LIST_FOR_EACH_ENTRY( cls, &package->classes, MSICLASS, entry ) @@ -963,12 +970,19 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) { static const WCHAR szFileType[] = {'F','i','l','e','T','y','p','e','\\',0}; + const WCHAR *keypath; MSIRECORD *uirow; MSICLASS *cls; HKEY hkey, hkey2; load_classes_and_such( package ); - if (RegOpenKeyW( HKEY_CLASSES_ROOT, szCLSID, &hkey ) != ERROR_SUCCESS) + + if (is_64bit && package->platform == PLATFORM_INTEL) + keypath = szWow6432NodeCLSID; + else + keypath = szCLSID; + + if (RegOpenKeyW( HKEY_CLASSES_ROOT, keypath, &hkey ) != ERROR_SUCCESS) return ERROR_SUCCESS; LIST_FOR_EACH_ENTRY( cls, &package->classes, MSICLASS, entry ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fb8bc50..a785876 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -37,6 +37,8 @@ #include "wine/list.h" #include "wine/debug.h" +static const BOOL is_64bit = sizeof(void *) > sizeof(int); + #define MSI_DATASIZEMASK 0x00ff #define MSITYPE_VALID 0x0100 #define MSITYPE_LOCALIZABLE 0x200 @@ -1147,6 +1149,7 @@ static const WCHAR szAdminUser[] = {'A','d','m','i','n','U','s','e','r',0}; static const WCHAR szIntel[] = {'I','n','t','e','l',0}; static const WCHAR szIntel64[] = {'I','n','t','e','l','6','4',0}; static const WCHAR szX64[] = {'x','6','4',0}; +static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index cd1cdf8..32576a0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1350,7 +1350,6 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) static UINT validate_package( MSIPACKAGE *package ) { - static const BOOL is_64bit = sizeof(void *) > sizeof(int); BOOL is_wow64; UINT i; diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index f3580d2..e83490f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); -static const BOOL is_64bit = sizeof(void *) > sizeof(int); - /* * This module will be all the helper functions for registry access by the * installer bits.

1 0

Alexandre Julliard : user32: Fix destruction of the active cursor.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: e8723a5dee0134f9a0470d3850eebbdf0bef9889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8723a5dee0134f9a0470d385… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 13 15:38:06 2010 +0200 user32: Fix destruction of the active cursor. --- dlls/user32/cursoricon.c | 44 ++++++++++++++++++--------------------- dlls/user32/tests/cursoricon.c | 10 ++++---- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 9732db6..eeaae7a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -387,22 +387,6 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, } /********************************************************************** - * is_icon_shared - */ -static BOOL is_icon_shared( HICON handle ) -{ - struct cursoricon_object *info; - BOOL ret = FALSE; - - if ((info = get_icon_ptr( handle ))) - { - ret = info->rsrc != NULL; - release_icon_ptr( handle, info ); - } - return ret; -} - -/********************************************************************** * get_icon_size */ BOOL get_icon_size( HICON handle, SIZE *size ) @@ -1357,7 +1341,11 @@ HICON WINAPI CopyIcon( HICON hIcon ) struct cursoricon_object *ptrOld, *ptrNew; HICON hNew; - if (!(ptrOld = get_icon_ptr( hIcon ))) return 0; + if (!(ptrOld = get_icon_ptr( hIcon ))) + { + SetLastError( ERROR_INVALID_CURSOR_HANDLE ); + return 0; + } if ((hNew = alloc_icon_handle(1))) { ptrNew = get_icon_ptr( hNew ); @@ -1381,10 +1369,19 @@ HICON WINAPI CopyIcon( HICON hIcon ) */ BOOL WINAPI DestroyIcon( HICON hIcon ) { + BOOL ret = FALSE; + struct cursoricon_object *obj = get_icon_ptr( hIcon ); + TRACE_(icon)("%p\n", hIcon ); - if (!is_icon_shared( hIcon )) free_icon_handle( hIcon ); - return TRUE; + if (obj) + { + BOOL shared = (obj->rsrc != NULL); + release_icon_ptr( hIcon, obj ); + ret = (GetCursor() != hIcon); + if (!shared) free_icon_handle( hIcon ); + } + return ret; } @@ -1393,11 +1390,6 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) */ BOOL WINAPI DestroyCursor( HCURSOR hCursor ) { - if (GetCursor() == hCursor) - { - WARN_(cursor)("Destroying active cursor!\n" ); - return FALSE; - } return DestroyIcon( hCursor ); } @@ -1419,6 +1411,7 @@ BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon ) */ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) { + struct cursoricon_object *obj; HCURSOR hOldCursor; int show_count; BOOL ret; @@ -1441,6 +1434,9 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu /* Change the cursor shape only if it is visible */ if (show_count >= 0 && hOldCursor != hCursor) USER_Driver->pSetCursor( hCursor ); + + if (!(obj = get_icon_ptr( hOldCursor ))) return 0; + release_icon_ptr( hOldCursor, obj ); return hOldCursor; } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 57419e5..8f7db52 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -82,7 +82,7 @@ static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARA SetLastError(0xdeadbeef); ret = DestroyCursor((HCURSOR) lParam); error = GetLastError(); - todo_wine ok(!ret || broken(ret) /* win9x */, "DestroyCursor on the active cursor succeeded.\n"); + ok(!ret || broken(ret) /* win9x */, "DestroyCursor on the active cursor succeeded.\n"); ok(error == ERROR_DESTROY_OBJECT_OF_OTHER_THREAD || error == 0xdeadbeef, /* vista */ "Last error: %u\n", error); @@ -1769,8 +1769,8 @@ static void test_DestroyCursor(void) SetLastError(0xdeadbeef); ret = GetIconInfo( cursor, &new_info ); - todo_wine ok( !ret || broken(ret), /* nt4 */ "GetIconInfo succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_CURSOR_HANDLE || + ok( !ret || broken(ret), /* nt4 */ "GetIconInfo succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_CURSOR_HANDLE || broken(GetLastError() == 0xdeadbeef), /* win9x */ "wrong error %u\n", GetLastError() ); @@ -1824,7 +1824,7 @@ static void test_DestroyCursor(void) if (new_cursor != cursor) /* win9x */ ok(cursor2 == new_cursor, "SetCursor returned %p/%p\n", cursor2, cursor); else - todo_wine ok(!cursor2, "SetCursor returned %p/%p\n", cursor2, cursor); + ok(!cursor2, "SetCursor returned %p/%p\n", cursor2, cursor); ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); cursor2 = GetCursor(); @@ -1835,7 +1835,7 @@ static void test_DestroyCursor(void) if (new_cursor != cursor) /* win9x */ ok( ret, "DestroyCursor succeeded\n" ); else - todo_wine ok( !ret, "DestroyCursor succeeded\n" ); + ok( !ret, "DestroyCursor succeeded\n" ); error = GetLastError(); ok( GetLastError() == ERROR_INVALID_CURSOR_HANDLE || GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() );

1 0

Henri Verbeet : wined3d: Recognize the SM4 ieq opcode.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 7c6658f970d70afc418bc56c01ea2b90e6afcac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6658f970d70afc418bc56c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 13 12:26:31 2010 +0200 wined3d: Recognize the SM4 ieq opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a36a1e4..3fe8653 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4965,6 +4965,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_FRC */ shader_hw_map2gl, /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_IADD */ NULL, + /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 305f251..237150f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5023,6 +5023,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_IADD */ NULL, + /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c671920..5f6bc0b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -69,6 +69,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_FRC */ "frc", /* WINED3DSIH_FTOI */ "ftoi", /* WINED3DSIH_IADD */ "iadd", + /* WINED3DSIH_IEQ */ "ieq", /* WINED3DSIH_IF */ "if", /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index d3fb74f..e64f38b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -68,6 +68,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_FTOI = 0x1b, WINED3D_SM4_OP_IADD = 0x1e, WINED3D_SM4_OP_IF = 0x1f, + WINED3D_SM4_OP_IEQ = 0x20, WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_IMUL = 0x26, WINED3D_SM4_OP_ITOF = 0x2b, @@ -145,6 +146,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_FTOI, WINED3DSIH_FTOI, 1, 1}, {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, 1, 2}, {WINED3D_SM4_OP_IF, WINED3DSIH_IF, 0, 1}, + {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, 1, 2}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, 1, 2}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, 2, 2}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, 1, 1}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a3841b..5dba59d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -438,6 +438,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_FRC, WINED3DSIH_FTOI, WINED3DSIH_IADD, + WINED3DSIH_IEQ, WINED3DSIH_IF, WINED3DSIH_IFC, WINED3DSIH_IGE,

1 0

Henri Verbeet : wined3d: Recognize the SM4 ld opcode.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 50f6fbadb0b0327edec815113ed0d25bb04a9823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50f6fbadb0b0327edec815113… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 13 12:26:32 2010 +0200 wined3d: Recognize the SM4 ld opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3fe8653..a34b506 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4972,6 +4972,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, + /* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LOG */ shader_hw_log_pow, /* WINED3DSIH_LOGP */ shader_hw_log_pow, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 237150f..facb686 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5030,6 +5030,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_glsl_label, + /* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOG */ shader_glsl_log, /* WINED3DSIH_LOGP */ shader_glsl_log, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5f6bc0b..2e57e9f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -76,6 +76,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", + /* WINED3DSIH_LD */ "ld", /* WINED3DSIH_LIT */ "lit", /* WINED3DSIH_LOG */ "log", /* WINED3DSIH_LOGP */ "logp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index e64f38b..080f53b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -72,6 +72,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_IMUL = 0x26, WINED3D_SM4_OP_ITOF = 0x2b, + WINED3D_SM4_OP_LD = 0x2d, WINED3D_SM4_OP_LOG = 0x2f, WINED3D_SM4_OP_LOOP = 0x30, WINED3D_SM4_OP_LT = 0x31, @@ -150,6 +151,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, 1, 2}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, 2, 2}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, 1, 1}, + {WINED3D_SM4_OP_LD, WINED3DSIH_LD, 1, 2}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, {WINED3D_SM4_OP_LOOP, WINED3DSIH_LOOP, 0, 0}, {WINED3D_SM4_OP_LT, WINED3DSIH_LT, 1, 2}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5dba59d..c648bd9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -445,6 +445,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMUL, WINED3DSIH_ITOF, WINED3DSIH_LABEL, + WINED3DSIH_LD, WINED3DSIH_LIT, WINED3DSIH_LOG, WINED3DSIH_LOGP,

1 0

Henri Verbeet : wined3d: Recognize the SM4 ABS and NEG source modifiers.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: e54d9afbc32edc9dba3faac7002eb3dae4ed160e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54d9afbc32edc9dba3faac70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 13 12:26:33 2010 +0200 wined3d: Recognize the SM4 ABS and NEG source modifiers. --- dlls/wined3d/shader_sm4.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 080f53b..47cece3 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -366,7 +366,29 @@ static void shader_sm4_read_src_param(void *data, const DWORD **ptr, struct wine if (token & WINED3D_SM4_REGISTER_MODIFIER) { DWORD modifier = *(*ptr)++; - FIXME("Skipping modifier 0x%08x.\n", modifier); + + /* FIXME: This will probably break down at some point. The SM4 + * modifiers look like flags, while wined3d currently has an enum + * with possible combinations, e.g. WINED3DSPSM_ABSNEG. */ + switch (modifier) + { + case 0x41: + src_param->modifiers = WINED3DSPSM_NEG; + break; + + case 0x81: + src_param->modifiers = WINED3DSPSM_ABS; + break; + + default: + FIXME("Skipping modifier 0x%08x.\n", modifier); + src_param->modifiers = WINED3DSPSM_NONE; + break; + } + } + else + { + src_param->modifiers = WINED3DSPSM_NONE; } order = (token & WINED3D_SM4_REGISTER_ORDER_MASK) >> WINED3D_SM4_REGISTER_ORDER_SHIFT; @@ -409,7 +431,6 @@ static void shader_sm4_read_src_param(void *data, const DWORD **ptr, struct wine src_param->swizzle = (token & WINED3D_SM4_SWIZZLE_MASK) >> WINED3D_SM4_SWIZZLE_SHIFT; } - src_param->modifiers = 0; src_param->reg.rel_addr = NULL; map_register(priv, &src_param->reg);

1 0

Alexandre Julliard : user32/tests: Add more tests for DestroyCursor on the active cursor.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 1aab7ea8372cf2f36610c635cc7a232ee94cf1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aab7ea8372cf2f36610c635c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 13 13:58:19 2010 +0200 user32/tests: Add more tests for DestroyCursor on the active cursor. --- dlls/user32/tests/cursoricon.c | 94 +++++++++++++++++++++++++++++++++------- 1 files changed, 78 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 10f0037..57419e5 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1731,8 +1731,8 @@ static void test_ShowCursor(void) static void test_DestroyCursor(void) { static const BYTE bmp_bits[4096]; - ICONINFO cursorInfo; - HCURSOR cursor, cursor2; + ICONINFO cursorInfo, new_info; + HCURSOR cursor, cursor2, new_cursor; BOOL ret; DWORD error; UINT display_bpp; @@ -1760,23 +1760,85 @@ static void test_DestroyCursor(void) ok(!ret || broken(ret) /* succeeds on win9x */, "DestroyCursor on the active cursor succeeded\n"); error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error); - if (!ret) + + new_cursor = GetCursor(); + if (ret) /* win9x replaces cursor by another one on destroy */ + ok(new_cursor != cursor, "GetCursor returned %p/%p\n", new_cursor, cursor); + else + ok(new_cursor == cursor, "GetCursor returned %p/%p\n", new_cursor, cursor); + + SetLastError(0xdeadbeef); + ret = GetIconInfo( cursor, &new_info ); + todo_wine ok( !ret || broken(ret), /* nt4 */ "GetIconInfo succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_INVALID_CURSOR_HANDLE || + broken(GetLastError() == 0xdeadbeef), /* win9x */ + "wrong error %u\n", GetLastError() ); + + if (ret) /* nt4 delays destruction until cursor changes */ { - cursor2 = GetCursor(); - ok(cursor2 == cursor, "Active was set to %p when trying to destroy it\n", cursor2); - SetCursor(NULL); - - /* Trying to destroy the cursor properly fails now with - * ERROR_INVALID_CURSOR_HANDLE. This happens because we called - * DestroyCursor() 2+ times after calling SetCursor(). The calls to - * GetCursor() and SetCursor(NULL) in between make no difference. */ + DeleteObject( new_info.hbmColor ); + DeleteObject( new_info.hbmMask ); + SetLastError(0xdeadbeef); - ret = DestroyCursor(cursor); - todo_wine ok(!ret, "DestroyCursor succeeded.\n"); - error = GetLastError(); - ok(error == ERROR_INVALID_CURSOR_HANDLE || error == 0xdeadbeef, /* vista */ - "Last error: 0x%08x\n", error); + ret = DestroyCursor( cursor ); + ok( !ret, "DestroyCursor succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_CURSOR_HANDLE || GetLastError() == 0xdeadbeef, + "wrong error %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + cursor2 = SetCursor( cursor ); + ok( cursor2 == cursor, "SetCursor returned %p/%p\n", cursor2, cursor); + ok( GetLastError() == ERROR_INVALID_CURSOR_HANDLE || GetLastError() == 0xdeadbeef, + "wrong error %u\n", GetLastError() ); } + else + { + SetLastError(0xdeadbeef); + cursor2 = CopyCursor( cursor ); + ok(!cursor2, "CopyCursor succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_CURSOR_HANDLE || + broken(GetLastError() == 0xdeadbeef), /* win9x */ + "wrong error %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = DestroyCursor( cursor ); + if (new_cursor != cursor) /* win9x */ + ok( ret, "DestroyCursor succeeded\n" ); + else + ok( !ret, "DestroyCursor succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_CURSOR_HANDLE || GetLastError() == 0xdeadbeef, + "wrong error %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + cursor2 = SetCursor( cursor ); + ok(!cursor2, "SetCursor returned %p/%p\n", cursor2, cursor); + ok( GetLastError() == ERROR_INVALID_CURSOR_HANDLE || GetLastError() == 0xdeadbeef, + "wrong error %u\n", GetLastError() ); + } + + cursor2 = GetCursor(); + ok(cursor2 == new_cursor, "GetCursor returned %p/%p\n", cursor2, new_cursor); + + SetLastError(0xdeadbeef); + cursor2 = SetCursor( 0 ); + if (new_cursor != cursor) /* win9x */ + ok(cursor2 == new_cursor, "SetCursor returned %p/%p\n", cursor2, cursor); + else + todo_wine ok(!cursor2, "SetCursor returned %p/%p\n", cursor2, cursor); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + + cursor2 = GetCursor(); + ok(!cursor2, "GetCursor returned %p/%p\n", cursor2, cursor); + + SetLastError(0xdeadbeef); + ret = DestroyCursor(cursor); + if (new_cursor != cursor) /* win9x */ + ok( ret, "DestroyCursor succeeded\n" ); + else + todo_wine ok( !ret, "DestroyCursor succeeded\n" ); + error = GetLastError(); + ok( GetLastError() == ERROR_INVALID_CURSOR_HANDLE || GetLastError() == 0xdeadbeef, + "wrong error %u\n", GetLastError() ); DeleteObject(cursorInfo.hbmMask); DeleteObject(cursorInfo.hbmColor);

1 0

Henri Verbeet : wined3d: Recognize the SM4 ftoi opcode.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: a9e3058426696fb4372f1f6314b9fbf1299610d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e3058426696fb4372f1f631… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 13 12:26:30 2010 +0200 wined3d: Recognize the SM4 ftoi opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e1f4be5..a36a1e4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4963,6 +4963,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_EXP */ shader_hw_scalar_op, /* WINED3DSIH_EXPP */ shader_hw_scalar_op, /* WINED3DSIH_FRC */ shader_hw_map2gl, + /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_IADD */ NULL, /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IFC */ shader_hw_ifc, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 62a4f7b..305f251 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5021,6 +5021,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_EXP */ shader_glsl_map2gl, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl, + /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_IADD */ NULL, /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 096fc13..c671920 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -67,6 +67,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_EXP */ "exp", /* WINED3DSIH_EXPP */ "expp", /* WINED3DSIH_FRC */ "frc", + /* WINED3DSIH_FTOI */ "ftoi", /* WINED3DSIH_IADD */ "iadd", /* WINED3DSIH_IF */ "if", /* WINED3DSIH_IFC */ "ifc", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c0a8292..d3fb74f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -65,6 +65,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_ENDLOOP = 0x16, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_FRC = 0x1a, + WINED3D_SM4_OP_FTOI = 0x1b, WINED3D_SM4_OP_IADD = 0x1e, WINED3D_SM4_OP_IF = 0x1f, WINED3D_SM4_OP_IGE = 0x21, @@ -141,6 +142,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_ENDLOOP, WINED3DSIH_ENDLOOP, 0, 0}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, {WINED3D_SM4_OP_FRC, WINED3DSIH_FRC, 1, 1}, + {WINED3D_SM4_OP_FTOI, WINED3DSIH_FTOI, 1, 1}, {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, 1, 2}, {WINED3D_SM4_OP_IF, WINED3DSIH_IF, 0, 1}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, 1, 2}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 13526f8..1a3841b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -436,6 +436,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_EXP, WINED3DSIH_EXPP, WINED3DSIH_FRC, + WINED3DSIH_FTOI, WINED3DSIH_IADD, WINED3DSIH_IF, WINED3DSIH_IFC,

1 0