wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Hans Leidekker : wbemprox: Implement Win32_DiskDrive.DeviceId.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 99c1b557275ef59c00e16f690789f60d4f6a7b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c1b557275ef59c00e16f690… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 21 16:29:00 2013 +0100 wbemprox: Implement Win32_DiskDrive.DeviceId. --- dlls/wbemprox/builtin.c | 6 +++++- dlls/wbemprox/tests/query.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4375d75..09da3f6 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -215,6 +215,7 @@ static const struct column col_compsys[] = }; static const struct column col_diskdrive[] = { + { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_serialnumberW, CIM_STRING } @@ -345,6 +346,8 @@ static const WCHAR compsys_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; +static const WCHAR diskdrive_deviceidW[] = + {'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; static const WCHAR diskdrive_modelW[] = {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; static const WCHAR diskdrive_manufacturerW[] = @@ -399,6 +402,7 @@ struct record_computersystem }; struct record_diskdrive { + const WCHAR *device_id; const WCHAR *manufacturer; const WCHAR *name; const WCHAR *serialnumber; @@ -518,7 +522,7 @@ static const struct record_cdromdrive data_cdromdrive[] = }; static const struct record_diskdrive data_diskdrive[] = { - { diskdrive_manufacturerW, diskdrive_modelW } + { diskdrive_deviceidW, diskdrive_manufacturerW, diskdrive_modelW } }; static const struct record_params data_params[] = { diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1096caa..04c87b7 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -91,7 +91,11 @@ static void test_select( IWbemServices *services ) {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'P','r','o','c','e','s','s',' ','W','H','E','R','E',' ','C','a','p','t','i','o','n',' ', 'L','I','K','E',' ','\'','%','%','R','E','G','E','D','I','T','%','\'',0}; - static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7 }; + static const WCHAR query8[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','i','s','k','D','r','i','v','e',' ','W','H','E','R','E',' ','D','e','v','i','c','e','I','D','=', + '\"','\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\"',0}; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW );

1 0

Hans Leidekker : msi: Remove const from integer parameters.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: b637d4ca948c18bded36a2df3c40f0a0bafa04cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b637d4ca948c18bded36a2df3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 21 16:25:34 2013 +0100 msi: Remove const from integer parameters. --- dlls/msi/custom.c | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 4366409..1a6b858 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -653,8 +653,8 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( return info; } -static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static UINT HANDLE_CustomType1( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) { msi_custom_action_info *info; MSIBINARY *binary; @@ -736,8 +736,8 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) return info.hProcess; } -static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static UINT HANDLE_CustomType2( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) { MSIBINARY *binary; HANDLE handle; @@ -754,8 +754,8 @@ static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, return wait_process_handle( package, type, handle, action ); } -static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static UINT HANDLE_CustomType17( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) { msi_custom_action_info *info; MSIFILE *file; @@ -773,8 +773,8 @@ static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, return wait_thread_handle( info ); } -static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static UINT HANDLE_CustomType18( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) { MSIFILE *file; HANDLE handle; @@ -791,8 +791,8 @@ static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, return wait_process_handle( package, type, handle, action ); } -static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static UINT HANDLE_CustomType19( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) { static const WCHAR query[] = { 'S','E','L','E','C','T',' ','`','M','e','s','s','a','g','e','`',' ', @@ -822,8 +822,8 @@ static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, return ERROR_INSTALL_FAILURE; } -static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static UINT HANDLE_CustomType23( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) { static const WCHAR msiexecW[] = {'m','s','i','e','x','e','c',0}; static const WCHAR paramsW[] = {'/','q','b',' ','/','i',' '}; @@ -866,8 +866,8 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, return wait_process_handle( package, type, handle, action ); } -static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static UINT HANDLE_CustomType50( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) { WCHAR *exe, *arg; HANDLE handle; @@ -883,8 +883,8 @@ static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, return wait_process_handle( package, type, handle, action ); } -static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static UINT HANDLE_CustomType34( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) { const WCHAR *workingdir = NULL; HANDLE handle; @@ -984,8 +984,8 @@ static msi_custom_action_info *do_msidbCustomActionTypeScript( return info; } -static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static UINT HANDLE_CustomType37_38( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) { msi_custom_action_info *info; @@ -995,8 +995,8 @@ static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source, return wait_thread_handle( info ); } -static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static UINT HANDLE_CustomType5_6( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) { static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', @@ -1042,8 +1042,8 @@ done: return r; } -static UINT HANDLE_CustomType21_22(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static UINT HANDLE_CustomType21_22( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) { msi_custom_action_info *info; MSIFILE *file; @@ -1101,8 +1101,8 @@ done: return r; } -static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static UINT HANDLE_CustomType53_54( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) { msi_custom_action_info *info; WCHAR *prop;

1 0

Hans Leidekker : msi: Execute concurrent installers in a separate process.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 5b642da8cbaae7093a4ce5c50e7c764e82c8e805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b642da8cbaae7093a4ce5c50… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 21 16:24:59 2013 +0100 msi: Execute concurrent installers in a separate process. --- dlls/msi/custom.c | 133 +++++++++++++++++----------------------------------- 1 files changed, 44 insertions(+), 89 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index a33f19d..4366409 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -619,43 +619,6 @@ static DWORD WINAPI DllThread( LPVOID arg ) return rc; } -static DWORD ACTION_CAInstallPackage(const GUID *guid) -{ - msi_custom_action_info *info; - UINT r = ERROR_FUNCTION_FAILED; - INSTALLUILEVEL old_level; - - info = find_action_by_guid(guid); - if (!info) - { - ERR("failed to find action %s\n", debugstr_guid(guid)); - return r; - } - - old_level = MsiSetInternalUI(INSTALLUILEVEL_BASIC, NULL); - r = MsiInstallProductW(info->source, info->target); - MsiSetInternalUI(old_level, NULL); - - release_custom_action_data(info); - - return r; -} - -static DWORD WINAPI ConcurrentInstallThread(LPVOID arg) -{ - LPGUID guid = arg; - DWORD rc; - - TRACE("concurrent installation (%x) started\n", GetCurrentThreadId()); - - rc = ACTION_CAInstallPackage(guid); - - TRACE("concurrent installation (%x) returned %i\n", GetCurrentThreadId(), rc); - - MsiCloseAllHandles(); - return rc; -} - static msi_custom_action_info *do_msidbCustomActionTypeDll( MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action ) { @@ -690,58 +653,6 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( return info; } -static msi_custom_action_info *do_msidbCAConcurrentInstall( - MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action) -{ - msi_custom_action_info *info; - - info = msi_alloc( sizeof *info ); - if (!info) - return NULL; - - msiobj_addref( &package->hdr ); - info->refs = 2; /* 1 for our caller and 1 for thread we created */ - info->package = package; - info->type = type; - info->target = strdupW( target ); - info->source = strdupW( source ); - info->action = strdupW( action ); - CoCreateGuid( &info->guid ); - - EnterCriticalSection( &msi_custom_action_cs ); - list_add_tail( &msi_pending_custom_actions, &info->entry ); - LeaveCriticalSection( &msi_custom_action_cs ); - - info->handle = CreateThread( NULL, 0, ConcurrentInstallThread, &info->guid, 0, NULL ); - if (!info->handle) - { - /* release both references */ - release_custom_action_data( info ); - release_custom_action_data( info ); - return NULL; - } - - return info; -} - -static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) -{ - msi_custom_action_info *info; - WCHAR package_path[MAX_PATH]; - DWORD size; - - size = MAX_PATH; - msi_get_property(package->db, szSourceDir, package_path, &size); - lstrcatW(package_path, szBackSlash); - lstrcatW(package_path, source); - - TRACE("Installing package %s concurrently\n", debugstr_w(package_path)); - - info = do_msidbCAConcurrentInstall(package, type, package_path, target, action); - return wait_thread_handle(info); -} - static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { @@ -911,6 +822,50 @@ static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, return ERROR_INSTALL_FAILURE; } +static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action) +{ + static const WCHAR msiexecW[] = {'m','s','i','e','x','e','c',0}; + static const WCHAR paramsW[] = {'/','q','b',' ','/','i',' '}; + WCHAR *dir, *arg, *p; + UINT len_src, len_dir, len_tgt, len = sizeof(paramsW)/sizeof(paramsW[0]); + HANDLE handle; + + if (!(dir = msi_dup_property( package->db, szOriginalDatabase ))) return ERROR_OUTOFMEMORY; + if (!(p = strrchrW( dir, '\\' )) && !(p = strrchrW( dir, '/' ))) + { + msi_free( dir ); + return ERROR_FUNCTION_FAILED; + } + *p = 0; + len_dir = p - dir; + len_src = strlenW( source ); + len_tgt = strlenW( target ); + if (!(arg = msi_alloc( (len + len_dir + len_src + len_tgt + 5) * sizeof(WCHAR) ))) + { + msi_free( dir ); + return ERROR_OUTOFMEMORY; + } + memcpy( arg, paramsW, sizeof(paramsW) ); + arg[len++] = '"'; + memcpy( arg + len, dir, len_dir * sizeof(WCHAR) ); + len += len_dir; + arg[len++] = '\\'; + memcpy( arg + len, source, len_src * sizeof(WCHAR) ); + len += len_src; + arg[len++] = '"'; + arg[len++] = ' '; + strcpyW( arg + len, target ); + + TRACE("installing %s concurrently\n", debugstr_w(source)); + + handle = execute_command( msiexecW, arg, dir ); + msi_free( dir ); + msi_free( arg ); + if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; + return wait_process_handle( package, type, handle, action ); +} + static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) {

1 0

Hans Leidekker : msi: Set the OriginalDatabase property after applying transforms, not before.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: a248f4f001bab6c0885343259ef6861f6d6dcd7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a248f4f001bab6c0885343259… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 21 16:24:11 2013 +0100 msi: Set the OriginalDatabase property after applying transforms, not before. --- dlls/msi/action.c | 1 + dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 39 ++++++++++++++++++++++++++++----------- dlls/msi/tests/package.c | 2 +- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 22fa388..5abe040 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7790,6 +7790,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, /* properties may have been added by a transform */ msi_clone_properties( package ); + msi_set_original_database_property( package->db, szPackagePath ); msi_parse_command_line( package, szCommandLine, FALSE ); msi_adjust_privilege_properties( package ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a3e1e0d..f709bac 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1041,6 +1041,7 @@ extern BOOL msi_init_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern WCHAR *msi_font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; +extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *) DECLSPEC_HIDDEN; /* media */ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 3055175..f8f818d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1510,6 +1510,28 @@ static UINT get_local_package( const WCHAR *filename, WCHAR *localfile ) return r; } +UINT msi_set_original_database_property( MSIDATABASE *db, const WCHAR *package ) +{ + UINT r; + + if (UrlIsW( package, URLIS_URL )) + r = msi_set_property( db, szOriginalDatabase, package, -1 ); + else if (package[0] == '#') + r = msi_set_property( db, szOriginalDatabase, db->path, -1 ); + else + { + DWORD len; + WCHAR *path; + + if (!(len = GetFullPathNameW( package, 0, NULL, NULL ))) return GetLastError(); + if (!(path = msi_alloc( len * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; + len = GetFullPathNameW( package, len, path, NULL ); + r = msi_set_property( db, szOriginalDatabase, path, len ); + msi_free( path ); + } + return r; +} + UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { static const WCHAR dotmsi[] = {'.','m','s','i',0}; @@ -1619,17 +1641,6 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return r; } msi_set_property( package->db, szDatabase, db->path, -1 ); - - if( UrlIsW( szPackage, URLIS_URL ) ) - msi_set_property( package->db, szOriginalDatabase, szPackage, -1 ); - else if( szPackage[0] == '#' ) - msi_set_property( package->db, szOriginalDatabase, db->path, -1 ); - else - { - WCHAR fullpath[MAX_PATH]; - DWORD len = GetFullPathNameW( szPackage, MAX_PATH, fullpath, NULL ); - msi_set_property( package->db, szOriginalDatabase, fullpath, len ); - } msi_set_context( package ); while (1) @@ -1656,6 +1667,12 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) msi_clone_properties( package ); msi_adjust_privilege_properties( package ); } + r = msi_set_original_database_property( package->db, szPackage ); + if (r != ERROR_SUCCESS) + { + msiobj_release( &package->hdr ); + return r; + } if (gszLogFile) package->log_file = CreateFileW( gszLogFile, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 4bac512..13a07e6 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2250,7 +2250,7 @@ static void test_property_table(void) sprintf(package, "#%i", hdb); r = MsiOpenPackage(package, &hpkg); - todo_wine ok(r != ERROR_SUCCESS, "MsiOpenPackage succeeded\n"); + ok(r != ERROR_SUCCESS, "MsiOpenPackage succeeded\n"); if (r == ERROR_SUCCESS) MsiCloseHandle(hpkg);

1 0

Aric Stewart : usp10: Only fall back to latin features if the base script tag is not found at all .
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: f6bdaf369c755a397bf4e0257b4b61ea3f8847cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bdaf369c755a397bf4e0257… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 21 09:23:14 2013 -0600 usp10: Only fall back to latin features if the base script tag is not found at all. --- dlls/usp10/shape.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index b504b3a..e40a404 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -614,7 +614,7 @@ static LoadedFeature* load_OT_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache int attempt = 2; OPENTYPE_TAG tags; OPENTYPE_TAG language; - OPENTYPE_TAG script; + OPENTYPE_TAG script = 0x00000000; int cTags; do @@ -631,7 +631,7 @@ static LoadedFeature* load_OT_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache } while(attempt && !feature); /* try in the default (latin) table */ - if (!feature) + if (!feature && !script) OpenType_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), tableType, 1, &tags, &cTags, &feature); }

1 0

Aric Stewart : usp10: Add locl and ccmp to Latin features.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: ddf6b6e585b8fd0d91efc4b7e3bdb89e5eb897f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf6b6e585b8fd0d91efc4b7e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 21 09:23:04 2013 -0600 usp10: Add locl and ccmp to Latin features. --- dlls/usp10/shape.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index ac18b13..b504b3a 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -142,6 +142,8 @@ static OPENTYPE_FEATURE_RECORD standard_features[] = static OPENTYPE_FEATURE_RECORD latin_features[] = { + { MS_MAKE_TAG('l','o','c','l'), 1}, + { MS_MAKE_TAG('c','c','m','p'), 1}, { MS_MAKE_TAG('l','i','g','a'), 1}, { MS_MAKE_TAG('c','l','i','g'), 1}, }; @@ -451,11 +453,11 @@ typedef struct ScriptShapeDataTag { static const ScriptShapeData ShapingData[] = { {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ hebrew_features, 2}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, ShapeCharGlyphProp_Hebrew}, @@ -495,7 +497,7 @@ static const ScriptShapeData ShapingData[] = {{ devanagari_features, 6}, {devanagari_gpos_features, 4}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, {{ devanagari_features, 6}, {devanagari_gpos_features, 4}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, NULL}, {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ myanmar_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ myanmar_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, @@ -530,7 +532,7 @@ static const ScriptShapeData ShapingData[] = {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ hebrew_features, 2}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, {{ thai_features, 1}, {thai_gpos_features, 3}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, };

1 0

Jacek Caban : secur32: Added SECPKG_ATTR_REMOTE_CERT_CONTEXT tests.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 63c7f8d8ee2141614fa2e6788edcfa5199d3e90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c7f8d8ee2141614fa2e6788… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 21 15:04:05 2013 +0100 secur32: Added SECPKG_ATTR_REMOTE_CERT_CONTEXT tests. --- dlls/secur32/tests/schannel.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 99394c3..ddcc87d 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -45,6 +45,7 @@ static ENCRYPT_MESSAGE_FN pEncryptMessage; static PCCERT_CONTEXT (WINAPI *pCertCreateCertificateContext)(DWORD,const BYTE*,DWORD); static BOOL (WINAPI *pCertFreeCertificateContext)(PCCERT_CONTEXT); static BOOL (WINAPI *pCertSetCertificateContextProperty)(PCCERT_CONTEXT,DWORD,DWORD,const void*); +static PCCERT_CONTEXT (WINAPI *pCertEnumCertificatesInStore)(HCERTSTORE,PCCERT_CONTEXT); static BOOL (WINAPI *pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD); static BOOL (WINAPI *pCryptDestroyKey)(HCRYPTKEY); @@ -148,6 +149,7 @@ static void InitFunctionPtrs(void) GET_PROC(crypt32dll, CertFreeCertificateContext); GET_PROC(crypt32dll, CertSetCertificateContextProperty); GET_PROC(crypt32dll, CertCreateCertificateContext); + GET_PROC(crypt32dll, CertEnumCertificatesInStore); #undef GET_PROC } @@ -467,6 +469,24 @@ static void testAcquireSecurityContext(void) } } +static void test_remote_cert(PCCERT_CONTEXT remote_cert) +{ + PCCERT_CONTEXT iter = NULL; + BOOL incl_remote = FALSE; + unsigned cert_cnt = 0; + + ok(remote_cert->hCertStore != NULL, "hCertStore == NULL\n"); + + while((iter = pCertEnumCertificatesInStore(remote_cert->hCertStore, iter))) { + if(iter == remote_cert) + incl_remote = TRUE; + cert_cnt++; + } + + ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); + ok(incl_remote, "context does not contain cert itself\n"); +} + static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.codeweavers.com\r\nConnection: close\r\n\r\n"; static void init_cred(SCHANNEL_CRED *cred) @@ -572,6 +592,7 @@ static void test_communication(void) CredHandle cred_handle; CtxtHandle context; SecPkgContext_StreamSizes sizes; + CERT_CONTEXT *cert; SecBufferDesc buffers[2]; SecBuffer *buf; @@ -726,6 +747,13 @@ static void test_communication(void) return; } + status = pQueryContextAttributesA(&context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); + ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_REMOTE_CERT_CONTEXT) failed: %08x\n", status); + if(status == SEC_E_OK) { + test_remote_cert(cert); + pCertFreeCertificateContext(cert); + } + pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); reset_buffers(&buffers[0]);

1 0

Jacek Caban : secur32: Return a cert context with context store in SECPKG_ATTR_REMOTE_CERT_CONTEXT MacOSX implementation .
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 303ec3ef91536baaab94501a2cd3db2bc666213e URL: http://source.winehq.org/git/wine.git/?a=commit;h=303ec3ef91536baaab94501a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 21 15:03:50 2013 +0100 secur32: Return a cert context with context store in SECPKG_ATTR_REMOTE_CERT_CONTEXT MacOSX implementation. --- dlls/secur32/schannel_macosx.c | 76 +++++++++++++++++++++++---------------- 1 files changed, 45 insertions(+), 31 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 2d03d2a..aaf2532 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -706,53 +706,67 @@ static void schan_imp_cf_release(const void *arg, void *ctx) } #endif -SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE cert_store, - PCCERT_CONTEXT *cert) +SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE store, + PCCERT_CONTEXT *ret_cert) { struct mac_session* s = (struct mac_session*)session; - SECURITY_STATUS ret = SEC_E_INTERNAL_ERROR; - CFArrayRef certs; + SECURITY_STATUS ret = SEC_E_OK; + PCCERT_CONTEXT cert = NULL; + SecCertificateRef mac_cert; + CFArrayRef cert_array; OSStatus status; + CFIndex cnt, i; + CFDataRef data; + BOOL res; TRACE("(%p/%p, %p)\n", s, s->context, cert); #ifdef HAVE_SSLCOPYPEERCERTIFICATES - status = SSLCopyPeerCertificates(s->context, &certs); + status = SSLCopyPeerCertificates(s->context, &cert_array); #else - status = SSLGetPeerCertificates(s->context, &certs); + status = SSLGetPeerCertificates(s->context, &cert_array); #endif - if (status == noErr && certs) + if (status != noErr || !cert_array) { - SecCertificateRef mac_cert; - CFDataRef data; - if (CFArrayGetCount(certs) && - (mac_cert = (SecCertificateRef)CFArrayGetValueAtIndex(certs, 0)) && - (SecKeychainItemExport(mac_cert, kSecFormatX509Cert, 0, NULL, &data) == noErr)) + WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status); + return SEC_E_INTERNAL_ERROR; + } + + cnt = CFArrayGetCount(cert_array); + for (i=0; i < cnt; i++) { + if (!(mac_cert = (SecCertificateRef)CFArrayGetValueAtIndex(cert_array, i)) || + (SecKeychainItemExport(mac_cert, kSecFormatX509Cert, 0, NULL, &data) != noErr)) { - *cert = CertCreateCertificateContext(X509_ASN_ENCODING, - CFDataGetBytePtr(data), CFDataGetLength(data)); - if (*cert) - ret = SEC_E_OK; - else - { - ret = GetLastError(); - WARN("CertCreateCertificateContext failed: %x\n", ret); - } - CFRelease(data); - } - else WARN("Couldn't extract certificate data\n"); + ret = SEC_E_INTERNAL_ERROR; + break; + } + + res = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, CFDataGetBytePtr(data), CFDataGetLength(data), + CERT_STORE_ADD_REPLACE_EXISTING, i ? NULL : &cert); + CFRelease(data); + if (!res) + { + ret = GetLastError(); + WARN("CertAddEncodedCertificateToStore failed: %x\n", ret); + break; + } + } + #ifndef HAVE_SSLCOPYPEERCERTIFICATES - /* This is why SSLGetPeerCertificates was deprecated */ - CFArrayApplyFunction(certs, CFRangeMake(0, CFArrayGetCount(certs)), - schan_imp_cf_release, NULL); + /* This is why SSLGetPeerCertificates was deprecated */ + CFArrayApplyFunction(cert_array, CFRangeMake(0, CFArrayGetCount(cert_array)), + schan_imp_cf_release, NULL); #endif - CFRelease(certs); + CFRelease(cert_array); + if (ret != SEC_E_OK) { + if(cert) + CertFreeCertificateContext(cert); + return ret; } - else - WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status); - return ret; + *ret_cert = cert; + return SEC_E_OK; } SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer,

1 0

Jacek Caban : secur32: Return a cert context with context store in SECPKG_ATTR_REMOTE_CERT_CONTEXT GnuTLS implementation .
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 5c5d12c8bc400c8a57771defa4bc5c0523b0a4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5d12c8bc400c8a57771defa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 21 15:03:36 2013 +0100 secur32: Return a cert context with context store in SECPKG_ATTR_REMOTE_CERT_CONTEXT GnuTLS implementation. --- dlls/secur32/schannel.c | 13 ++++++++++++- dlls/secur32/schannel_gnutls.c | 30 ++++++++++++++++++------------ dlls/secur32/schannel_macosx.c | 2 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index cc287dc..37af15e 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -60,6 +60,7 @@ struct schan_context { schan_imp_session session; ULONG req_ctx_attr; + HCERTSTORE cert_store; }; static struct schan_handle *schan_handle_table; @@ -696,6 +697,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ctx = HeapAlloc(GetProcessHeap(), 0, sizeof(*ctx)); if (!ctx) return SEC_E_INSUFFICIENT_MEMORY; + ctx->cert_store = NULL; handle = schan_alloc_handle(ctx, SCHAN_HANDLE_CTX); if (handle == SCHAN_INVALID_HANDLE) { @@ -859,7 +861,14 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( case SECPKG_ATTR_REMOTE_CERT_CONTEXT: { PCCERT_CONTEXT *cert = buffer; - return schan_imp_get_session_peer_certificate(ctx->session, cert); + + if (!ctx->cert_store) { + ctx->cert_store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + if(!ctx->cert_store) + return GetLastError(); + } + + return schan_imp_get_session_peer_certificate(ctx->session, ctx->cert_store, cert); } case SECPKG_ATTR_CONNECTION_INFO: { @@ -1167,6 +1176,8 @@ static SECURITY_STATUS SEC_ENTRY schan_DeleteSecurityContext(PCtxtHandle context ctx = schan_free_handle(context_handle->dwLower, SCHAN_HANDLE_CTX); if (!ctx) return SEC_E_INVALID_HANDLE; + if (ctx->cert_store) + CertCloseStore(ctx->cert_store, 0); schan_imp_dispose_session(ctx->session); HeapFree(GetProcessHeap(), 0, ctx); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bb481b7..fa68591 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -318,25 +318,31 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, return SEC_E_OK; } -SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, - PCCERT_CONTEXT *cert) +SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE store, + PCCERT_CONTEXT *ret) { gnutls_session_t s = (gnutls_session_t)session; - unsigned int list_size; + PCCERT_CONTEXT cert = NULL; const gnutls_datum_t *datum; + unsigned list_size, i; + BOOL res; datum = pgnutls_certificate_get_peers(s, &list_size); - if (datum) - { - *cert = CertCreateCertificateContext(X509_ASN_ENCODING, datum->data, - datum->size); - if (!*cert) + if(!datum) + return SEC_E_INTERNAL_ERROR; + + for(i = 0; i < list_size; i++) { + res = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, datum[i].data, datum[i].size, + CERT_STORE_ADD_REPLACE_EXISTING, i ? NULL : &cert); + if(!res) { + if(i) + CertFreeCertificateContext(cert); return GetLastError(); - else - return SEC_E_OK; + } } - else - return SEC_E_INTERNAL_ERROR; + + *ret = cert; + return SEC_E_OK; } SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 75fe9a0..2d03d2a 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -706,7 +706,7 @@ static void schan_imp_cf_release(const void *arg, void *ctx) } #endif -SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, +SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE cert_store, PCCERT_CONTEXT *cert) { struct mac_session* s = (struct mac_session*)session; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 3254e0b..164a2eb 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -247,7 +247,7 @@ extern unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session se extern unsigned int schan_imp_get_max_message_size(schan_imp_session session) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) DECLSPEC_HIDDEN; -extern SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, +extern SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE, PCCERT_CONTEXT *cert) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, SIZE_T *length) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : libwine: Hardcode Linux syscall numbers.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: ef4981bd5b2d33c7f9be28ce00c0002b37980a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4981bd5b2d33c7f9be28ce0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 21 16:00:16 2013 +0100 libwine: Hardcode Linux syscall numbers. --- libs/wine/ldt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 85a835b..5175e9c 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -70,7 +70,7 @@ static inline void fill_modify_ldt_struct( struct modify_ldt_s *ptr, const LDT_E static inline int modify_ldt( int func, struct modify_ldt_s *ptr, unsigned long count ) { - return syscall( SYS_modify_ldt, func, ptr, count ); + return syscall( 123 /* SYS_modify_ldt */, func, ptr, count ); } static inline int set_thread_area( struct modify_ldt_s *ptr )

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
74
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 January 2013