wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Ken Thomases : winex11: Fix correspondence between main_key_LT_B and main_key_vkey_qwerty.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 51d5a48c370eee01ea17565aa3a885646d0045d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d5a48c370eee01ea17565aa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 11 17:49:36 2012 -0500 winex11: Fix correspondence between main_key_LT_B and main_key_vkey_qwerty. --- dlls/winex11.drv/keyboard.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index a2237e2..955ddfb 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -758,9 +758,9 @@ static const char main_key_LA[MAIN_LEN][4] = /*** Lithuanian keyboard layout (setxkbmap lt) */ static const char main_key_LT_B[MAIN_LEN][4] = { - "`~","��","��","��","��","��","��","��","��","�(","�)","-_","��","\\|", + "`~","��","��","��","��","��","��","��","��","�(","�)","-_","��", "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{","]}", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'\"", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'\"","\\|", "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?", "��" };

1 0

Hans Leidekker : msi: Keep assembly caches loaded until the package is destroyed.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: a17ca164952526815e98a345a6f7513842baa535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17ca164952526815e98a345a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 12 09:25:09 2012 +0200 msi: Keep assembly caches loaded until the package is destroyed. --- dlls/msi/action.c | 1 - dlls/msi/assembly.c | 8 +++++--- dlls/msi/files.c | 4 ---- dlls/msi/package.c | 7 ++----- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b256439..d452c92 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1017,7 +1017,6 @@ UINT msi_load_all_components( MSIPACKAGE *package ) r = MSI_IterateRecords(view, NULL, load_component, package); msiobj_release(&view->hdr); - msi_destroy_assembly_caches( package ); return r; } diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index e7660bd..2f321db 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -99,9 +99,11 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) { UINT i; - IAssemblyCache_Release( package->cache_sxs ); - package->cache_sxs = NULL; - + if (package->cache_sxs) + { + IAssemblyCache_Release( package->cache_sxs ); + package->cache_sxs = NULL; + } for (i = 0; i < CLR_VERSION_MAX; i++) { if (package->cache_net[i]) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index fe72c24..11913ef 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -399,7 +399,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) goto done; } } - msi_init_assembly_caches( package ); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { comp->Action = msi_get_component_action( package, comp ); @@ -414,7 +413,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) } } } - msi_destroy_assembly_caches( package ); done: msi_free_media_info(mi); @@ -1309,7 +1307,6 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) msiobj_release( &uirow->hdr ); } - msi_init_assembly_caches( package ); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { comp->Action = msi_get_component_action( package, comp ); @@ -1328,6 +1325,5 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) remove_folder( folder ); } } - msi_destroy_assembly_caches( package ); return ERROR_SUCCESS; } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7c8b1b4..4944065 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -344,9 +344,10 @@ static void free_package_structures( MSIPACKAGE *package ) static void MSI_FreePackage( MSIOBJECTHDR *arg) { - UINT i; MSIPACKAGE *package = (MSIPACKAGE *)arg; + msi_destroy_assembly_caches( package ); + if( package->dialog ) msi_dialog_destroy( package->dialog ); @@ -354,10 +355,6 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) free_package_structures(package); CloseHandle( package->log_file ); - for (i = 0; i < CLR_VERSION_MAX; i++) - if (package->cache_net[i]) IAssemblyCache_Release( package->cache_net[i] ); - if (package->cache_sxs) IAssemblyCache_Release( package->cache_sxs ); - if (package->delete_on_close) DeleteFileW( package->localfile ); msi_free( package->localfile ); }

1 0

Hans Leidekker : msi: Always load mscoree.dll from the system directory.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 3480ccbbb4d7ac9ec365595b57a9e938834d1efd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3480ccbbb4d7ac9ec365595b5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 12 09:24:58 2012 +0200 msi: Always load mscoree.dll from the system directory. --- dlls/msi/assembly.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index bfa5142..e7660bd 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -43,20 +43,25 @@ static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree, hsxs; static BOOL init_function_pointers( void ) { - static const WCHAR szFusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; + static const WCHAR szFusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; + static const WCHAR szMscoree[] = {'\\','m','s','c','o','r','e','e','.','d','l','l',0}; + static const WCHAR szSxs[] = {'s','x','s','.','d','l','l',0}; static const WCHAR szVersion10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; + WCHAR path[MAX_PATH]; + DWORD len = GetSystemDirectoryW( path, MAX_PATH ); - if (!hsxs && !(hsxs = LoadLibraryA( "sxs.dll" ))) return FALSE; + if (!hsxs && !(hsxs = LoadLibraryW( szSxs ))) return FALSE; if (!(pCreateAssemblyCacheSxs = (void *)GetProcAddress( hsxs, "CreateAssemblyCache" ))) { FreeLibrary( hsxs ); hsxs = NULL; return FALSE; } - if (hmscoree || !(hmscoree = LoadLibraryA( "mscoree.dll" ))) return TRUE; + strcpyW( path + len, szMscoree ); + if (hmscoree || !(hmscoree = LoadLibraryW( path ))) return TRUE; pGetFileVersion = (void *)GetProcAddress( hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ if (!(pLoadLibraryShim = (void *)GetProcAddress( hmscoree, "LoadLibraryShim" ))) {

1 0

Hans Leidekker : msi: Don't fail if no .NET runtime is available.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 458f6b7ccd0c25753ffbc071673d034dc02fe9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458f6b7ccd0c25753ffbc0716… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 12 09:24:45 2012 +0200 msi: Don't fail if no .NET runtime is available. --- dlls/msi/assembly.c | 98 ++++++++++++++++---------------------------------- 1 files changed, 32 insertions(+), 66 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index d384003..bfa5142 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -49,13 +49,21 @@ static BOOL init_function_pointers( void ) static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; - if (pCreateAssemblyCacheNet10 || pCreateAssemblyCacheNet11 || pCreateAssemblyCacheNet20 || - pCreateAssemblyCacheNet40 ) return TRUE; - - if (!(hmscoree = LoadLibraryA( "mscoree.dll" ))) return FALSE; + if (!hsxs && !(hsxs = LoadLibraryA( "sxs.dll" ))) return FALSE; + if (!(pCreateAssemblyCacheSxs = (void *)GetProcAddress( hsxs, "CreateAssemblyCache" ))) + { + FreeLibrary( hsxs ); + hsxs = NULL; + return FALSE; + } + if (hmscoree || !(hmscoree = LoadLibraryA( "mscoree.dll" ))) return TRUE; pGetFileVersion = (void *)GetProcAddress( hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ - if (!(pLoadLibraryShim = (void *)GetProcAddress( hmscoree, "LoadLibraryShim" ))) goto error; - + if (!(pLoadLibraryShim = (void *)GetProcAddress( hmscoree, "LoadLibraryShim" ))) + { + FreeLibrary( hmscoree ); + hmscoree = NULL; + return TRUE; + } if (!pLoadLibraryShim( szFusion, szVersion10, NULL, &hfusion10 )) pCreateAssemblyCacheNet10 = (void *)GetProcAddress( hfusion10, "CreateAssemblyCache" ); @@ -68,76 +76,27 @@ static BOOL init_function_pointers( void ) if (!pLoadLibraryShim( szFusion, szVersion40, NULL, &hfusion40 )) pCreateAssemblyCacheNet40 = (void *)GetProcAddress( hfusion40, "CreateAssemblyCache" ); - if (!pCreateAssemblyCacheNet10 && !pCreateAssemblyCacheNet11 && !pCreateAssemblyCacheNet20 - && !pCreateAssemblyCacheNet40) goto error; - - if (!(hsxs = LoadLibraryA( "sxs.dll" ))) goto error; - if (!(pCreateAssemblyCacheSxs = (void *)GetProcAddress( hsxs, "CreateAssemblyCache" ))) goto error; return TRUE; - -error: - pCreateAssemblyCacheNet10 = NULL; - pCreateAssemblyCacheNet11 = NULL; - pCreateAssemblyCacheNet20 = NULL; - pCreateAssemblyCacheNet40 = NULL; - FreeLibrary( hfusion10 ); - FreeLibrary( hfusion11 ); - FreeLibrary( hfusion20 ); - FreeLibrary( hfusion40 ); - FreeLibrary( hmscoree ); - return FALSE; } BOOL msi_init_assembly_caches( MSIPACKAGE *package ) { if (!init_function_pointers()) return FALSE; - if (package->cache_net[CLR_VERSION_V10] || - package->cache_net[CLR_VERSION_V11] || - package->cache_net[CLR_VERSION_V20] || - package->cache_net[CLR_VERSION_V40]) return TRUE; if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; - if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 ); - - if (package->cache_net[CLR_VERSION_V10] || - package->cache_net[CLR_VERSION_V11] || - package->cache_net[CLR_VERSION_V20] || - package->cache_net[CLR_VERSION_V40]) - { - return TRUE; - } - if (package->cache_net[CLR_VERSION_V10]) - { - IAssemblyCache_Release( package->cache_net[CLR_VERSION_V10] ); - package->cache_net[CLR_VERSION_V10] = NULL; - } - if (package->cache_net[CLR_VERSION_V11]) - { - IAssemblyCache_Release( package->cache_net[CLR_VERSION_V11] ); - package->cache_net[CLR_VERSION_V11] = NULL; - } - if (package->cache_net[CLR_VERSION_V20]) - { - IAssemblyCache_Release( package->cache_net[CLR_VERSION_V20] ); - package->cache_net[CLR_VERSION_V20] = NULL; - } - if (package->cache_net[CLR_VERSION_V40]) - { - IAssemblyCache_Release( package->cache_net[CLR_VERSION_V40] ); - package->cache_net[CLR_VERSION_V40] = NULL; - } - IAssemblyCache_Release( package->cache_sxs ); - package->cache_sxs = NULL; - return FALSE; + return TRUE; } void msi_destroy_assembly_caches( MSIPACKAGE *package ) { UINT i; + IAssemblyCache_Release( package->cache_sxs ); + package->cache_sxs = NULL; + for (i = 0; i < CLR_VERSION_MAX; i++) { if (package->cache_net[i]) @@ -146,11 +105,6 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) package->cache_net[i] = NULL; } } - if (package->cache_sxs) - { - IAssemblyCache_Release( package->cache_sxs ); - package->cache_sxs = NULL; - } pCreateAssemblyCacheNet10 = NULL; pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; @@ -161,6 +115,12 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) FreeLibrary( hfusion40 ); FreeLibrary( hmscoree ); FreeLibrary( hsxs ); + hfusion10 = NULL; + hfusion11 = NULL; + hfusion20 = NULL; + hfusion40 = NULL; + hmscoree = NULL; + hsxs = NULL; } static MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp ) @@ -279,6 +239,8 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n HRESULT hr; ASSEMBLY_INFO info; + if (!cache) return FALSE; + memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, display_name, &info ); @@ -433,6 +395,7 @@ UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) { manifest = msi_get_loaded_file( package, comp->KeyPath )->TargetPath; cache = package->cache_net[get_clr_version( manifest )]; + if (!cache) return ERROR_SUCCESS; } TRACE("installing assembly %s\n", debugstr_w(manifest)); @@ -477,8 +440,11 @@ UINT msi_uninstall_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) { if (!assembly->clr_version[i]) continue; cache = package->cache_net[i]; - hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL ); - if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr); + if (cache) + { + hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL ); + if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr); + } } } if (feature) feature->Action = INSTALLSTATE_ABSENT;

1 0

Hans Leidekker : msi/tests: Use only uppercase characters for the PID_REVNUMBER property.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: f6f1bfd6fbe218a1afbd55debc9999a38dbe0871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f1bfd6fbe218a1afbd55deb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 12 09:24:35 2012 +0200 msi/tests: Use only uppercase characters for the PID_REVNUMBER property. --- dlls/msi/tests/action.c | 6 +++--- dlls/msi/tests/automation.c | 2 +- dlls/msi/tests/install.c | 2 +- dlls/msi/tests/package.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 82afd18..811bd99 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2318,7 +2318,7 @@ static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, con ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_REVNUMBER, VT_LPSTR, 0, NULL, - "{004757CA-5092-49c2-AD20-28E1CE0DF5F2}"); + "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, version, NULL, NULL); @@ -2947,7 +2947,7 @@ currentuser: ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); - CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); + CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052C94DA02821EECD05F2F"); CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); if (!old_installer) @@ -3028,7 +3028,7 @@ machprod: ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); - CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); + CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052C94DA02821EECD05F2F"); CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); if (!old_installer) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 630ff76..bc0a632 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -199,7 +199,7 @@ typedef struct _msi_summary_info static const msi_summary_info summary_info[] = { ADD_INFO_LPSTR(PID_TEMPLATE, ";1033"), - ADD_INFO_LPSTR(PID_REVNUMBER, "{004757CA-5092-49c2-AD20-28E1CE0DF5F2}"), + ADD_INFO_LPSTR(PID_REVNUMBER, "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"), ADD_INFO_I4(PID_PAGECOUNT, 100), ADD_INFO_I4(PID_WORDCOUNT, 0), ADD_INFO_FILETIME(PID_CREATE_DTM, &systemtime), diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ad3ea66..e41bef4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2462,7 +2462,7 @@ static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, con ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_REVNUMBER, VT_LPSTR, 0, NULL, - "{004757CA-5092-49c2-AD20-28E1CE0DF5F2}"); + "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, version, NULL, NULL); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 8cf8f27..f2d940f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2445,7 +2445,7 @@ static void test_msipackage(void) ok(r == ERROR_INSTALL_PACKAGE_INVALID, "Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r); - set_summary_str(hdb, PID_REVNUMBER, "{004757CD-5092-49c2-AD20-28E1CE0DF5F2}"); + set_summary_str(hdb, PID_REVNUMBER, "{004757CD-5092-49C2-AD20-28E1CE0DF5F2}"); r = MsiOpenPackage(name, &hpack); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Dmitry Timoshkov : ole32: Add VT_I1 to the list of supported variant types.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 574a52e522f47b8ab450cea18199975413c3be2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=574a52e522f47b8ab450cea18… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 12 15:22:35 2012 +0900 ole32: Add VT_I1 to the list of supported variant types. --- dlls/ole32/ole2.c | 9 ++++++--- dlls/ole32/tests/propvariant.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 9e9ca65..4680f40 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2907,8 +2907,10 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) { case VT_EMPTY: case VT_NULL: + case VT_I1: case VT_I2: case VT_I4: + case VT_I8: case VT_R4: case VT_R8: case VT_CY: @@ -2920,7 +2922,6 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_UI1: case VT_UI2: case VT_UI4: - case VT_I8: case VT_UI8: case VT_LPSTR: case VT_LPWSTR: @@ -2933,8 +2934,10 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_BLOB_OBJECT: case VT_CF: case VT_CLSID: + case VT_I1|VT_VECTOR: case VT_I2|VT_VECTOR: case VT_I4|VT_VECTOR: + case VT_I8|VT_VECTOR: case VT_R4|VT_VECTOR: case VT_R8|VT_VECTOR: case VT_CY|VT_VECTOR: @@ -2946,7 +2949,6 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_UI1|VT_VECTOR: case VT_UI2|VT_VECTOR: case VT_UI4|VT_VECTOR: - case VT_I8|VT_VECTOR: case VT_UI8|VT_VECTOR: case VT_LPSTR|VT_VECTOR: case VT_LPWSTR|VT_VECTOR: @@ -2979,8 +2981,10 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ { case VT_EMPTY: case VT_NULL: + case VT_I1: case VT_I2: case VT_I4: + case VT_I8: case VT_R4: case VT_R8: case VT_CY: @@ -2991,7 +2995,6 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ case VT_UI1: case VT_UI2: case VT_UI4: - case VT_I8: case VT_UI8: case VT_FILETIME: break; diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 4d34117..50adfe7 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -56,7 +56,7 @@ static const struct valid_mapping { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* 15 */ - { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO }, /* VT_I1 */ + { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_I1 */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI1 */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI2 */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */

1 0

Matteo Bruni : d3dcompiler: Parse constructors.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: eeb550c0c39f4c5c3021aff814551b4deb27677b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb550c0c39f4c5c3021aff81… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:35 2012 +0200 d3dcompiler: Parse constructors. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 13 +++++++ dlls/d3dcompiler_43/hlsl.y | 48 +++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 54 ++++++++++++++++++++++++++++- 3 files changed, 114 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 695ee7d..d7fcfea 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -694,6 +694,7 @@ enum hlsl_ir_node_type { HLSL_IR_VAR = 0, HLSL_IR_CONSTANT, + HLSL_IR_CONSTRUCTOR, HLSL_IR_DEREF, HLSL_IR_FUNCTION_DECL, }; @@ -788,6 +789,12 @@ struct hlsl_ir_constant } v; }; +struct hlsl_ir_constructor +{ + struct hlsl_ir_node node; + struct list *arguments; +}; + struct hlsl_scope { struct list entry; @@ -847,6 +854,12 @@ static inline struct hlsl_ir_constant *constant_from_node(const struct hlsl_ir_n return CONTAINING_RECORD(node, struct hlsl_ir_constant, node); } +static inline struct hlsl_ir_constructor *constructor_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_CONSTRUCTOR); + return CONTAINING_RECORD(node, struct hlsl_ir_constructor, node); +} + BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5151002..a3e5f6e 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -112,6 +112,18 @@ static DWORD add_modifier(DWORD modifiers, DWORD mod) return modifiers | mod; } +static unsigned int components_count_expr_list(struct list *list) +{ + struct hlsl_ir_node *node; + unsigned int count = 0; + + LIST_FOR_EACH_ENTRY(node, list, struct hlsl_ir_node, entry) + { + count += components_count_type(node->data_type); + } + return count; +} + %} %error-verbose @@ -793,6 +805,42 @@ postfix_expr: primary_expr { $$ = $1; } + /* "var_modifiers" doesn't make sense in this case, but it's needed + in the grammar to avoid shift/reduce conflicts. */ + | var_modifiers type '(' initializer_expr_list ')' + { + struct hlsl_ir_constructor *constructor; + + TRACE("%s constructor.\n", debug_hlsl_type($2)); + if ($1) + { + hlsl_message("Line %u: unexpected modifier in a constructor.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return -1; + } + if ($2->type > HLSL_CLASS_LAST_NUMERIC) + { + hlsl_message("Line %u: constructors are allowed only for numeric data types.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return -1; + } + if ($2->dimx * $2->dimy != components_count_expr_list($4)) + { + hlsl_message("Line %u: wrong number of components in constructor.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return -1; + } + + constructor = d3dcompiler_alloc(sizeof(*constructor)); + constructor->node.type = HLSL_IR_CONSTRUCTOR; + constructor->node.data_type = $2; + constructor->arguments = $4; + + $$ = &constructor->node; + } unary_expr: postfix_expr { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index d92243d..9c222cd 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -876,6 +876,32 @@ BOOL find_function(const char *name) return FALSE; } +unsigned int components_count_type(struct hlsl_type *type) +{ + unsigned int count = 0; + struct hlsl_struct_field *field; + + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + { + return type->dimx * type->dimy; + } + if (type->type == HLSL_CLASS_ARRAY) + { + return components_count_type(type->e.array.type) * type->e.array.elements_count; + } + if (type->type != HLSL_CLASS_STRUCT) + { + ERR("Unexpected data type %s.\n", debug_hlsl_type(type)); + return 0; + } + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + count += components_count_type(field->type); + } + return count; +} + struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) { struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); @@ -1027,6 +1053,7 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) { "HLSL_IR_VAR", "HLSL_IR_CONSTANT", + "HLSL_IR_CONSTRUCTOR", "HLSL_IR_DEREF", "HLSL_IR_FUNCTION_DECL", }; @@ -1112,7 +1139,20 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) TRACE("}"); } -static void debug_dump_instr(const struct hlsl_ir_node *instr) +void debug_dump_ir_constructor(const struct hlsl_ir_constructor *constructor) +{ + struct hlsl_ir_node *arg; + + TRACE("%s (", debug_hlsl_type(constructor->node.data_type)); + LIST_FOR_EACH_ENTRY(arg, constructor->arguments, struct hlsl_ir_node, entry) + { + debug_dump_instr(arg); + TRACE(" "); + } + TRACE(")"); +} + +void debug_dump_instr(const struct hlsl_ir_node *instr) { switch (instr->type) { @@ -1122,6 +1162,9 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) case HLSL_IR_CONSTANT: debug_dump_ir_constant(constant_from_node(instr)); break; + case HLSL_IR_CONSTRUCTOR: + debug_dump_ir_constructor(constructor_from_node(instr)); + break; default: TRACE("No dump function for %s\n", debug_node_type(instr->type)); } @@ -1226,6 +1269,12 @@ static void free_ir_deref(struct hlsl_ir_deref *deref) d3dcompiler_free(deref); } +static void free_ir_constructor(struct hlsl_ir_constructor *constructor) +{ + free_instr_list(constructor->arguments); + d3dcompiler_free(constructor); +} + void free_instr(struct hlsl_ir_node *node) { switch (node->type) @@ -1239,6 +1288,9 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_DEREF: free_ir_deref(deref_from_node(node)); break; + case HLSL_IR_CONSTRUCTOR: + free_ir_constructor(constructor_from_node(node)); + break; default: FIXME("Unsupported node type %s\n", debug_node_type(node->type)); }

1 0

Matteo Bruni : d3dcompiler: Parse function definitions.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: d2673848eae67a42ea5f7d253b756edc64554f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2673848eae67a42ea5f7d253… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:34 2012 +0200 d3dcompiler: Parse function definitions. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/hlsl.y | 74 +++++++++++++++++- dlls/d3dcompiler_43/utils.c | 124 ++++++++++++++++++++++++++++- 3 files changed, 197 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2673848eae67a42ea5f7…

1 0

Matteo Bruni : d3dcompiler: Parse function declarations.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 552f10d0e803ad1a5f4b3f6e01604723b520a849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=552f10d0e803ad1a5f4b3f6e0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:33 2012 +0200 d3dcompiler: Parse function declarations. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 22 ++++++ dlls/d3dcompiler_43/hlsl.y | 104 ++++++++++++++++++++++++++++- dlls/d3dcompiler_43/utils.c | 63 +++++++++++++++++- 3 files changed, 187 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=552f10d0e803ad1a5f4b3…

1 0

Matteo Bruni : d3dcompiler: Parse sampler declarations.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 5e343752383c23b8696439993c384a3fb1a15265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e343752383c23b8696439993… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:32 2012 +0200 d3dcompiler: Parse sampler declarations. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 10 ++++++++++ dlls/d3dcompiler_43/hlsl.y | 25 +++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 10 ++++++++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5e5f1d3..1c4b776 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -644,6 +644,15 @@ enum hlsl_base_type HLSL_TYPE_VOID, }; +enum hlsl_sampler_dim +{ + HLSL_SAMPLER_DIM_GENERIC, + HLSL_SAMPLER_DIM_1D, + HLSL_SAMPLER_DIM_2D, + HLSL_SAMPLER_DIM_3D, + HLSL_SAMPLER_DIM_CUBE, +}; + enum hlsl_matrix_majority { HLSL_COLUMN_MAJOR, @@ -656,6 +665,7 @@ struct hlsl_type struct list scope_entry; enum hlsl_type_class type; enum hlsl_base_type base_type; + enum hlsl_sampler_dim sampler_dim; const char *name; unsigned int modifiers; unsigned int dimx; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index cc13e25..7384e88 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -343,6 +343,31 @@ base_type: KW_VOID { $$ = new_hlsl_type("void", HLSL_CLASS_SCALAR, HLSL_TYPE_VOID, 1, 1); } + | KW_SAMPLER + { + $$ = new_hlsl_type("sampler", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_GENERIC; + } + | KW_SAMPLER1D + { + $$ = new_hlsl_type("sampler1D", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_1D; + } + | KW_SAMPLER2D + { + $$ = new_hlsl_type("sampler2D", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_2D; + } + | KW_SAMPLER3D + { + $$ = new_hlsl_type("sampler3D", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_3D; + } + | KW_SAMPLERCUBE + { + $$ = new_hlsl_type("samplerCUBE", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_CUBE; + } | TYPE_IDENTIFIER { struct hlsl_type *type; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 304f70c..6f8b013 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -897,6 +897,16 @@ static const char *debug_base_type(const struct hlsl_type *type) case HLSL_TYPE_INT: name = "int"; break; case HLSL_TYPE_UINT: name = "uint"; break; case HLSL_TYPE_BOOL: name = "bool"; break; + case HLSL_TYPE_SAMPLER: + switch (type->sampler_dim) + { + case HLSL_SAMPLER_DIM_GENERIC: name = "sampler"; break; + case HLSL_SAMPLER_DIM_1D: name = "sampler1D"; break; + case HLSL_SAMPLER_DIM_2D: name = "sampler2D"; break; + case HLSL_SAMPLER_DIM_3D: name = "sampler3D"; break; + case HLSL_SAMPLER_DIM_CUBE: name = "samplerCUBE"; break; + } + break; default: FIXME("Unhandled case %u\n", type->base_type); }

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012