November 2014 - Wine-commits

Stefan Dösinger : d3d9/tests: Check if the current display settings match the registry settings.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 40c2fc215d272376d5eac0722048252c926ab997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c2fc215d272376d5eac0722… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 3 22:33:58 2014 +0100 d3d9/tests: Check if the current display settings match the registry settings. --- dlls/d3d9/tests/d3d9ex.c | 52 +++++++++++++--------- dlls/d3d9/tests/device.c | 113 ++++++++++++++++++++++++++++------------------- 2 files changed, 98 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40c2fc215d272376d5eac…

1 0

Stefan Dösinger : d3d8/tests: Check if the current display settings match the registry settings.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: dcf7d294ccc6ec073d97fc0f0b8776bc6902cbda URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf7d294ccc6ec073d97fc0f0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 3 22:34:00 2014 +0100 d3d8/tests: Check if the current display settings match the registry settings. --- dlls/d3d8/tests/device.c | 91 ++++++++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dcf7d294ccc6ec073d97f…

1 0

Hans Leidekker : msi: Pass a database pointer to msi_clone_properties instead of a package pointer.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 35ce56ac859793fcecb223b357f414e405281b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ce56ac859793fcecb223b35… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 4 10:57:13 2014 +0100 msi: Pass a database pointer to msi_clone_properties instead of a package pointer. --- dlls/msi/action.c | 2 +- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 66c2858..eb7ac62 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7814,7 +7814,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, } /* properties may have been added by a transform */ - msi_clone_properties( package ); + msi_clone_properties( package->db ); msi_set_original_database_property( package->db, szPackagePath ); msi_parse_command_line( package, szCommandLine, FALSE ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bf788ba..a66835e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -864,7 +864,7 @@ extern UINT MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ) DECLSPEC_H extern UINT msi_download_file( LPCWSTR szUrl, LPWSTR filename ) DECLSPEC_HIDDEN; extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR) DECLSPEC_HIDDEN; extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR) DECLSPEC_HIDDEN; -extern UINT msi_clone_properties(MSIPACKAGE *) DECLSPEC_HIDDEN; +extern UINT msi_clone_properties(MSIDATABASE *) DECLSPEC_HIDDEN; extern UINT msi_set_context(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_adjust_privilege_properties(MSIPACKAGE *) DECLSPEC_HIDDEN; extern UINT MSI_GetFeatureCost(MSIPACKAGE *, MSIFEATURE *, MSICOSTTREE, INSTALLSTATE, LPINT) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2805003..c910d82 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -386,7 +386,7 @@ static UINT create_temp_property_table(MSIPACKAGE *package) return rc; } -UINT msi_clone_properties(MSIPACKAGE *package) +UINT msi_clone_properties( MSIDATABASE *db ) { static const WCHAR query_select[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', @@ -403,7 +403,7 @@ UINT msi_clone_properties(MSIPACKAGE *package) MSIQUERY *view_select; UINT rc; - rc = MSI_DatabaseOpenViewW( package->db, query_select, &view_select ); + rc = MSI_DatabaseOpenViewW( db, query_select, &view_select ); if (rc != ERROR_SUCCESS) return rc; @@ -424,7 +424,7 @@ UINT msi_clone_properties(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) break; - rc = MSI_DatabaseOpenViewW( package->db, query_insert, &view_insert ); + rc = MSI_DatabaseOpenViewW( db, query_insert, &view_insert ); if (rc != ERROR_SUCCESS) { msiobj_release( &rec_select->hdr ); @@ -440,7 +440,7 @@ UINT msi_clone_properties(MSIPACKAGE *package) TRACE("insert failed, trying update\n"); - rc = MSI_DatabaseOpenViewW( package->db, query_update, &view_update ); + rc = MSI_DatabaseOpenViewW( db, query_update, &view_update ); if (rc != ERROR_SUCCESS) { WARN("open view failed %u\n", rc); @@ -1175,7 +1175,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) package->BaseURL = strdupW( base_url ); create_temp_property_table( package ); - msi_clone_properties( package ); + msi_clone_properties( package->db ); msi_adjust_privilege_properties( package ); package->ProductCode = msi_dup_property( package->db, szProductCode ); @@ -1679,7 +1679,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) } if (index) { - msi_clone_properties( package ); + msi_clone_properties( package->db ); msi_adjust_privilege_properties( package ); } r = msi_set_original_database_property( package->db, szPackage );

1 0

Hans Leidekker : msi: Update properties after each transform that affects the property table.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 98ae03ff4d1d8b1292301486b5ea30988de6fa51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98ae03ff4d1d8b1292301486b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 4 10:57:40 2014 +0100 msi: Update properties after each transform that affects the property table. --- dlls/msi/action.c | 3 --- dlls/msi/dialog.c | 1 - dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 7 ++----- dlls/msi/table.c | 6 ++++++ 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index eb7ac62..524c4f7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7813,10 +7813,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, package->full_reinstall = 1; } - /* properties may have been added by a transform */ - msi_clone_properties( package->db ); msi_set_original_database_property( package->db, szPackagePath ); - msi_parse_command_line( package, szCommandLine, FALSE ); msi_adjust_privilege_properties( package ); msi_set_context( package ); diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6708f13..4e1052e 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -155,7 +155,6 @@ static const WCHAR szVolumeCostList[] = { 'V','o','l','u','m','e','C','o','s','t static const WCHAR szVolumeSelectCombo[] = { 'V','o','l','u','m','e','S','e','l','e','c','t','C','o','m','b','o',0 }; static const WCHAR szSelectionDescription[] = {'S','e','l','e','c','t','i','o','n','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; -static const WCHAR szProperty[] = {'P','r','o','p','e','r','t','y',0}; static const WCHAR szHyperLink[] = {'H','y','p','e','r','L','i','n','k',0}; /* dialog sequencing */ diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a66835e..fd7b116 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1180,6 +1180,7 @@ static const WCHAR szName[] = {'N','a','m','e',0}; static const WCHAR szData[] = {'D','a','t','a',0}; static const WCHAR szLangResource[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n',0}; static const WCHAR szInstallLocation[] = {'I','n','s','t','a','l','l','L','o','c','a','t','i','o','n',0}; +static const WCHAR szProperty[] = {'P','r','o','p','e','r','t','y',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 c910d82..bf9c79c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1677,11 +1677,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) } index++; } - if (index) - { - msi_clone_properties( package->db ); - msi_adjust_privilege_properties( package ); - } + if (index) msi_adjust_privilege_properties( package ); + r = msi_set_original_database_property( package->db, szPackage ); if (r != ERROR_SUCCESS) { diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 9ed9421..900f9ae 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2716,6 +2716,7 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) string_table *strings; UINT ret = ERROR_FUNCTION_FAILED; UINT bytes_per_strref; + BOOL property_update = FALSE; TRACE("%p %p\n", db, stg ); @@ -2760,6 +2761,8 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) tables = transform; else if (!strcmpW( transform->name, szColumns ) ) columns = transform; + else if (!strcmpW( transform->name, szProperty )) + property_update = TRUE; TRACE("transform contains stream %s\n", debugstr_w(name)); @@ -2809,7 +2812,10 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) } if ( ret == ERROR_SUCCESS ) + { append_storage_to_db( db, stg ); + if (property_update) msi_clone_properties( db ); + } end: if ( stgenum )

1 0

Hans Leidekker : msi: Call execute_script directly in InstallFinalize.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 609de1a80a6ea99523737c4ada266ddc069fb2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=609de1a80a6ea99523737c4ad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 4 10:58:04 2014 +0100 msi: Call execute_script directly in InstallFinalize. --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 524c4f7..939e426 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5312,7 +5312,7 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) WCHAR *remove; /* first do the same as an InstallExecute */ - rc = ACTION_InstallExecute(package); + rc = execute_script(package, SCRIPT_INSTALL); if (rc != ERROR_SUCCESS) return rc;

1 0

Hans Leidekker : advapi32: Return success from LsaAddAccountRights.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 67e1cf839ac8724ec4158de9bdf2e1152c0ed0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e1cf839ac8724ec4158de9b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 4 10:58:32 2014 +0100 advapi32: Return success from LsaAddAccountRights. --- dlls/advapi32/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 483e902..2a8b791 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -118,7 +118,7 @@ NTSTATUS WINAPI LsaAddAccountRights( ULONG count) { FIXME("(%p,%p,%p,0x%08x) stub\n", policy, sid, rights, count); - return STATUS_OBJECT_NAME_NOT_FOUND; + return STATUS_SUCCESS; } /******************************************************************************

1 0

Nikolay Sivov : msvcr120: Added VS2013 CRT dll.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: c8c810c21020bd0079ff0adcfee95eb53520a747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c810c21020bd0079ff0adcf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 4 16:08:27 2014 +0300 msvcr120: Added VS2013 CRT dll. --- configure | 2 + configure.ac | 1 + dlls/msvcr120/Makefile.in | 34 + dlls/msvcr120/msvcr120.spec | 2489 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 2526 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8c810c21020bd0079ff0…

1 0

Nikolay Sivov : dwrite: Map Mac language id to locale name.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 3a2de7aef86f7eac9a38e98b2daf957686085915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2de7aef86f7eac9a38e98b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 4 16:36:16 2014 +0300 dwrite: Map Mac language id to locale name. --- dlls/dwrite/opentype.c | 284 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 278 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 6d48f90..8a14336 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -262,6 +262,250 @@ enum TT_NAME_MAC_ENCODING_ID TT_NAME_MAC_ENCODING_UNINTERPRETED }; +enum TT_NAME_MAC_LANGUAGE_ID +{ + TT_NAME_MAC_LANGID_ENGLISH = 0, + TT_NAME_MAC_LANGID_FRENCH, + TT_NAME_MAC_LANGID_GERMAN, + TT_NAME_MAC_LANGID_ITALIAN, + TT_NAME_MAC_LANGID_DUTCH, + TT_NAME_MAC_LANGID_SWEDISH, + TT_NAME_MAC_LANGID_SPANISH, + TT_NAME_MAC_LANGID_DANISH, + TT_NAME_MAC_LANGID_PORTUGUESE, + TT_NAME_MAC_LANGID_NORWEGIAN, + TT_NAME_MAC_LANGID_HEBREW, + TT_NAME_MAC_LANGID_JAPANESE, + TT_NAME_MAC_LANGID_ARABIC, + TT_NAME_MAC_LANGID_FINNISH, + TT_NAME_MAC_LANGID_GREEK, + TT_NAME_MAC_LANGID_ICELANDIC, + TT_NAME_MAC_LANGID_MALTESE, + TT_NAME_MAC_LANGID_TURKISH, + TT_NAME_MAC_LANGID_CROATIAN, + TT_NAME_MAC_LANGID_TRAD_CHINESE, + TT_NAME_MAC_LANGID_URDU, + TT_NAME_MAC_LANGID_HINDI, + TT_NAME_MAC_LANGID_THAI, + TT_NAME_MAC_LANGID_KOREAN, + TT_NAME_MAC_LANGID_LITHUANIAN, + TT_NAME_MAC_LANGID_POLISH, + TT_NAME_MAC_LANGID_HUNGARIAN, + TT_NAME_MAC_LANGID_ESTONIAN, + TT_NAME_MAC_LANGID_LATVIAN, + TT_NAME_MAC_LANGID_SAMI, + TT_NAME_MAC_LANGID_FAROESE, + TT_NAME_MAC_LANGID_FARSI, + TT_NAME_MAC_LANGID_RUSSIAN, + TT_NAME_MAC_LANGID_SIMPL_CHINESE, + TT_NAME_MAC_LANGID_FLEMISH, + TT_NAME_MAC_LANGID_GAELIC, + TT_NAME_MAC_LANGID_ALBANIAN, + TT_NAME_MAC_LANGID_ROMANIAN, + TT_NAME_MAC_LANGID_CZECH, + TT_NAME_MAC_LANGID_SLOVAK, + TT_NAME_MAC_LANGID_SLOVENIAN, + TT_NAME_MAC_LANGID_YIDDISH, + TT_NAME_MAC_LANGID_SERBIAN, + TT_NAME_MAC_LANGID_MACEDONIAN, + TT_NAME_MAC_LANGID_BULGARIAN, + TT_NAME_MAC_LANGID_UKRAINIAN, + TT_NAME_MAC_LANGID_BYELORUSSIAN, + TT_NAME_MAC_LANGID_UZBEK, + TT_NAME_MAC_LANGID_KAZAKH, + TT_NAME_MAC_LANGID_AZERB_CYR, + TT_NAME_MAC_LANGID_AZERB_ARABIC, + TT_NAME_MAC_LANGID_ARMENIAN, + TT_NAME_MAC_LANGID_GEORGIAN, + TT_NAME_MAC_LANGID_MOLDAVIAN, + TT_NAME_MAC_LANGID_KIRGHIZ, + TT_NAME_MAC_LANGID_TAJIKI, + TT_NAME_MAC_LANGID_TURKMEN, + TT_NAME_MAC_LANGID_MONGOLIAN, + TT_NAME_MAC_LANGID_MONGOLIAN_CYR, + TT_NAME_MAC_LANGID_PASHTO, + TT_NAME_MAC_LANGID_KURDISH, + TT_NAME_MAC_LANGID_KASHMIRI, + TT_NAME_MAC_LANGID_SINDHI, + TT_NAME_MAC_LANGID_TIBETAN, + TT_NAME_MAC_LANGID_NEPALI, + TT_NAME_MAC_LANGID_SANSKRIT, + TT_NAME_MAC_LANGID_MARATHI, + TT_NAME_MAC_LANGID_BENGALI, + TT_NAME_MAC_LANGID_ASSAMESE, + TT_NAME_MAC_LANGID_GUJARATI, + TT_NAME_MAC_LANGID_PUNJABI, + TT_NAME_MAC_LANGID_ORIYA, + TT_NAME_MAC_LANGID_MALAYALAM, + TT_NAME_MAC_LANGID_KANNADA, + TT_NAME_MAC_LANGID_TAMIL, + TT_NAME_MAC_LANGID_TELUGU, + TT_NAME_MAC_LANGID_SINHALESE, + TT_NAME_MAC_LANGID_BURMESE, + TT_NAME_MAC_LANGID_KHMER, + TT_NAME_MAC_LANGID_LAO, + TT_NAME_MAC_LANGID_VIETNAMESE, + TT_NAME_MAC_LANGID_INDONESIAN, + TT_NAME_MAC_LANGID_TAGALONG, + TT_NAME_MAC_LANGID_MALAY_ROMAN, + TT_NAME_MAC_LANGID_MALAY_ARABIC, + TT_NAME_MAC_LANGID_AMHARIC, + TT_NAME_MAC_LANGID_TIGRINYA, + TT_NAME_MAC_LANGID_GALLA, + TT_NAME_MAC_LANGID_SOMALI, + TT_NAME_MAC_LANGID_SWAHILI, + TT_NAME_MAC_LANGID_KINYARWANDA, + TT_NAME_MAC_LANGID_RUNDI, + TT_NAME_MAC_LANGID_NYANJA, + TT_NAME_MAC_LANGID_MALAGASY, + TT_NAME_MAC_LANGID_ESPERANTO, + TT_NAME_MAC_LANGID_WELSH, + TT_NAME_MAC_LANGID_BASQUE, + TT_NAME_MAC_LANGID_CATALAN, + TT_NAME_MAC_LANGID_LATIN, + TT_NAME_MAC_LANGID_QUENCHUA, + TT_NAME_MAC_LANGID_GUARANI, + TT_NAME_MAC_LANGID_AYMARA, + TT_NAME_MAC_LANGID_TATAR, + TT_NAME_MAC_LANGID_UIGHUR, + TT_NAME_MAC_LANGID_DZONGKHA, + TT_NAME_MAC_LANGID_JAVANESE, + TT_NAME_MAC_LANGID_SUNDANESE, + TT_NAME_MAC_LANGID_GALICIAN, + TT_NAME_MAC_LANGID_AFRIKAANS, + TT_NAME_MAC_LANGID_BRETON, + TT_NAME_MAC_LANGID_INUKTITUT, + TT_NAME_MAC_LANGID_SCOTTISH_GAELIC, + TT_NAME_MAC_LANGID_MANX_GAELIC, + TT_NAME_MAC_LANGID_IRISH_GAELIC, + TT_NAME_MAC_LANGID_TONGAN, + TT_NAME_MAC_LANGID_GREEK_POLYTONIC, + TT_NAME_MAC_LANGID_GREENLANDIC, + TT_NAME_MAC_LANGID_AZER_ROMAN +}; + +/* Names are indexed with TT_NAME_MAC_LANGUAGE_ID values */ +static const char name_mac_langid_to_locale[][10] = { + "en-US", + "fr-FR", + "de-DE", + "it-IT", + "nl-NL", + "sv-SE", + "es-ES", + "da-DA", + "pt-PT", + "no-NO", + "he-IL", + "ja-JP", + "ar-AR", + "fi-FI", + "el-GR", + "is-IS", + "mt-MT", + "tr-TR", + "hr-HR", + "zh-HK", + "ur-PK", + "hi-IN", + "th-TH", + "ko-KR", + "lt-LT", + "pl-PL", + "hu-HU", + "et-EE", + "lv-LV", + "se-NO", + "fo-FO", + "fa-IR", + "ru-RU", + "zh-CN", + "nl-BE", + "gd-GB", + "sq-AL", + "ro-RO", + "cs-CZ", + "sk-SK", + "sl-SI", + "", + "sr-Latn", + "mk-MK", + "bg-BG", + "uk-UA", + "be-BY", + "uz-Latn", + "kk-KZ", + "az-Cyrl-AZ", + "az-AZ", + "hy-AM", + "ka-GE", + "", + "", + "tg-TJ", + "tk-TM", + "mn-Mong", + "mn-MN", + "ps-AF", + "ku-Arab", + "", + "sd-Arab", + "bo-CN", + "ne-NP", + "sa-IN", + "mr-IN", + "bn-IN", + "as-IN", + "gu-IN", + "pa-Arab", + "or-IN", + "ml-IN", + "kn-IN", + "ta-LK", + "te-IN", + "si-LK", + "", + "km-KH", + "lo-LA", + "vi-VN", + "id-ID", + "", + "ms-MY", + "ms-Arab", + "am-ET", + "ti-ET", + "", + "", + "sw-KE", + "rw-RW", + "", + "", + "", + "", + "cy-GB", + "eu-ES", + "ca-ES", + "", + "", + "", + "", + "tt-RU", + "ug-CN", + "", + "", + "", + "gl-ES", + "af-ZA", + "br-FR", + "iu-Latn-CA", + "gd-GB", + "", + "ga-IE", + "", + "", + "kl-GL", + "az-Latn" +}; + enum OPENTYPE_STRING_ID { OPENTYPE_STRING_COPYRIGHT_NOTICE = 0, @@ -737,6 +981,39 @@ static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT return codepage; } +static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT lang_id, WCHAR *locale, USHORT locale_len) +{ + static const WCHAR enusW[] = {'e','n','-','U','S',0}; + + switch (platform) { + case OPENTYPE_PLATFORM_MAC: + { + const char *locale_name = NULL; + + if (lang_id > TT_NAME_MAC_LANGID_AZER_ROMAN) + ERR("invalid mac lang id %d\n", lang_id); + else if (!name_mac_langid_to_locale[lang_id][0]) + FIXME("failed to map mac lang id %d to locale name\n", lang_id); + else + locale_name = name_mac_langid_to_locale[lang_id]; + + if (locale_name) + MultiByteToWideChar(CP_ACP, 0, name_mac_langid_to_locale[lang_id], -1, locale, locale_len); + else + strcpyW(locale, enusW); + break; + } + case OPENTYPE_PLATFORM_WIN: + if (!LCIDToLocaleName(MAKELCID(lang_id, SORT_DEFAULT), locale, locale_len, 0)) { + FIXME("failed to get locale name for lcid=0x%08x\n", MAKELCID(lang_id, SORT_DEFAULT)); + strcpyW(locale, enusW); + } + break; + default: + FIXME("unknown platform %d\n", platform); + } +} + HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) { const TT_NAME_V0 *header; @@ -790,6 +1067,7 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA UINT codepage; codepage = get_name_record_codepage(platform, encoding); + get_name_record_locale(platform, lang_id, locale, sizeof(locale)/sizeof(WCHAR)); if (codepage) { DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0); @@ -806,12 +1084,6 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA name_string[i] = GET_BE_WORD(name_string[i]); } - if (!LCIDToLocaleName(MAKELCID(lang_id, SORT_DEFAULT), locale, sizeof(locale)/sizeof(WCHAR), 0)) { - static const WCHAR enusW[] = {'e','n','-','u','s',0}; - FIXME("failed to get locale name for lcid=0x%08x\n", MAKELCID(lang_id, SORT_DEFAULT)); - strcpyW(locale, enusW); - } - TRACE("string %s for locale %s found\n", debugstr_w(name_string), debugstr_w(locale)); add_localizedstring(*strings, locale, name_string); heap_free(name_string);

1 0

Austin English : ntoskrnl.exe: Add a stub for IoRegisterPlugPlayNotification.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 825673210ffebc7193dede0c5e7247ded221561a URL: http://source.winehq.org/git/wine.git/?a=commit;h=825673210ffebc7193dede0c5… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 3 13:08:24 2014 -0600 ntoskrnl.exe: Add a stub for IoRegisterPlugPlayNotification. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 23379b8..a31b186 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1936,3 +1936,14 @@ NTSTATUS WINAPI ObQueryNameString(PVOID object, POBJECT_NAME_INFORMATION name, U FIXME("(%p %p %u %p) stub\n", object, name, maxlength, returnlength); return STATUS_NOT_IMPLEMENTED; } + +/***************************************************** + * IoRegisterPlugPlayNotification (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoRegisterPlugPlayNotification(IO_NOTIFICATION_EVENT_CATEGORY category, ULONG flags, PVOID data, + PDRIVER_OBJECT driver, PDRIVER_NOTIFICATION_CALLBACK_ROUTINE callback, + PVOID context, PVOID *notification) +{ + FIXME("(%u %u %p %p %p %p %p) stub\n", category, flags, data, driver, callback, context, notification); + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 1512cf8..4ead907 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -430,7 +430,7 @@ @ stdcall IoRegisterFileSystem(ptr) @ stub IoRegisterFsRegistrationChange @ stub IoRegisterLastChanceShutdownNotification -@ stub IoRegisterPlugPlayNotification +@ stdcall IoRegisterPlugPlayNotification(long long ptr ptr ptr ptr ptr) @ stdcall IoRegisterShutdownNotification(ptr) @ stdcall IoReleaseCancelSpinLock(ptr) @ stub IoReleaseRemoveLockAndWaitEx diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index f6aef8f..56f2f35 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -127,11 +127,20 @@ typedef struct _IMAGE_INFO ULONG ImageSectionNumber; } IMAGE_INFO, *PIMAGE_INFO; +typedef enum _IO_NOTIFICATION_EVENT_CATEGORY +{ + EventCategoryReserved, + EventCategoryHardwareProfileChange, + EventCategoryDeviceInterfaceChange, + EventCategoryTargetDeviceChange +} IO_NOTIFICATION_EVENT_CATEGORY; + typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION { LARGE_INTEGER ValidDataLength; } FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION; +typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERFACE_TYPE,ULONG,

1 0

Jonathan Vollebregt : reg/tests: Delete keys manually to prevent timeout on winxp/win2k.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 375f9c990562cc352e1dbe014cc7faed271bb06b URL: http://source.winehq.org/git/wine.git/?a=commit;h=375f9c990562cc352e1dbe014… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Mon Nov 3 22:10:44 2014 +0100 reg/tests: Delete keys manually to prevent timeout on winxp/win2k. --- programs/reg/tests/reg.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3de6f70..cb209a3 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -104,26 +104,39 @@ static void test_add(void) run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest0"); + ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r); + run_reg_exe("reg add \\\\HKCU\\" KEY_BASE "\\keytest1 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest1"); + ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest2"); + todo_wine ok(err == ERROR_FILE_NOT_FOUND || broken(err == ERROR_SUCCESS /* WinXP */), + "got exit code %d\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3", 0, KEY_READ, &hkey); ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); RegCloseKey(hkey); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3"); + ok(err == ERROR_SUCCESS, "got exit code %d\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4", 0, KEY_READ, &hkey); ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); RegCloseKey(hkey); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4"); + ok(err == ERROR_SUCCESS, "got exit code %d\n", r); - err = RegDeleteTreeA(HKEY_CURRENT_USER, KEY_BASE); - ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS, "got exit code %d\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0