July 2010 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Remove a fixme that no longer applies.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 39293696114e53c5b3398d9c1f11422743129174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39293696114e53c5b3398d9c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 21 09:47:54 2010 +0200 msi: Remove a fixme that no longer applies. --- dlls/msi/source.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 0e752f5..8e4323a 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -588,9 +588,6 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, if (szUserSid) FIXME("Unhandled UserSid %s\n",debugstr_w(szUserSid)); - if (dwContext != MSIINSTALLCONTEXT_USERUNMANAGED) - FIXME("Unhandled context %d\n", dwContext); - rc = OpenSourceKey(szProduct, &sourcekey, dwOptions, dwContext, FALSE); if (rc != ERROR_SUCCESS) return rc;

1 0

Michael Stefaniuc : clock: Move from a per resource to a global LANGUAGE setting.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 5e7bdb8a7e8b46ab9628db10b45d2ff12897052e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7bdb8a7e8b46ab9628db10b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 10:32:07 2010 +0200 clock: Move from a per resource to a global LANGUAGE setting. --- programs/clock/Da.rc | 6 ++++-- programs/clock/De.rc | 6 ++++-- programs/clock/Fi.rc | 6 ++++-- programs/clock/Hu.rc | 6 ++++-- programs/clock/Sk.rc | 6 ++++-- programs/clock/Wa.rc | 6 ++++-- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/programs/clock/Da.rc b/programs/clock/Da.rc index 860f723..cc3a08b 100644 --- a/programs/clock/Da.rc +++ b/programs/clock/Da.rc @@ -22,7 +22,9 @@ #include "clock_res.h" -MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +MAIN_MENU MENU { POPUP "&Instillinger" { MENUITEM "&Analog", IDM_ANALOG @@ -42,7 +44,7 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT } } -STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { IDS_CLOCK, "Ur" } diff --git a/programs/clock/De.rc b/programs/clock/De.rc index 59a804d..8368d54 100644 --- a/programs/clock/De.rc +++ b/programs/clock/De.rc @@ -21,9 +21,11 @@ #include "clock_res.h" +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + #pragma code_page(65001) -MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Einstellungen" { MENUITEM "Ana&log", IDM_ANALOG @@ -43,7 +45,7 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL } } -STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { IDS_CLOCK, "Uhr" } diff --git a/programs/clock/Fi.rc b/programs/clock/Fi.rc index fd222f4..0322800 100644 --- a/programs/clock/Fi.rc +++ b/programs/clock/Fi.rc @@ -21,7 +21,9 @@ #include "clock_res.h" -MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT + +MAIN_MENU MENU { POPUP "&Ominaisuudet" { MENUITEM "&Analoginen", IDM_ANALOG @@ -41,7 +43,7 @@ MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT } } -STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { IDS_CLOCK, "Kello" } diff --git a/programs/clock/Hu.rc b/programs/clock/Hu.rc index b6cb24f..5b97146 100644 --- a/programs/clock/Hu.rc +++ b/programs/clock/Hu.rc @@ -22,7 +22,9 @@ #include "clock_res.h" -MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +MAIN_MENU MENU { POPUP "&Be�ll�t�sok" { MENUITEM "Ana&l�g", IDM_ANALOG @@ -42,7 +44,7 @@ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT } } -STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { IDS_CLOCK, "�ra" } diff --git a/programs/clock/Sk.rc b/programs/clock/Sk.rc index 6ddfc1b..9f43a77 100644 --- a/programs/clock/Sk.rc +++ b/programs/clock/Sk.rc @@ -22,7 +22,9 @@ #include "clock_res.h" -MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +MAIN_MENU MENU { POPUP "&Vlastnosti" { MENUITEM "Ana&l�gov�", IDM_ANALOG @@ -42,7 +44,7 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT } } -STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { IDS_CLOCK, "Hodiny" } diff --git a/programs/clock/Wa.rc b/programs/clock/Wa.rc index 06f0acc..9a413c2 100644 --- a/programs/clock/Wa.rc +++ b/programs/clock/Wa.rc @@ -27,7 +27,9 @@ #ifdef LANG_WALON -MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT +LANGUAGE LANG_WALON, SUBLANG_DEFAULT + +MAIN_MENU MENU { POPUP "&Propiet�s" { MENUITEM "&Analodjike", IDM_ANALOG @@ -47,7 +49,7 @@ MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT } } -STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { IDS_CLOCK, "�rlodje" }

1 0

Michael Stefaniuc : start: Remove the redundant per resource LANGUAGE settings.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: f6ff7225b343a188ffafd196b1dce104e83fa894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ff7225b343a188ffafd196b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 10:32:38 2010 +0200 start: Remove the redundant per resource LANGUAGE settings. The LANGUAGE is already set globally in the rc files. --- programs/start/Cs.rc | 2 +- programs/start/De.rc | 2 +- programs/start/Nl.rc | 2 +- programs/start/No.rc | 2 +- programs/start/Si.rc | 2 +- programs/start/Tr.rc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/start/Cs.rc b/programs/start/Cs.rc index fa00dd0..0c690fe 100644 --- a/programs/start/Cs.rc +++ b/programs/start/Cs.rc @@ -27,7 +27,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STRING_USAGE, "Spust� program nebo otev�e dokument v programu, kter� je norm�ln� pou�it pro soubory s danou p��ponou.\n\ Pou�it�:\n\ diff --git a/programs/start/De.rc b/programs/start/De.rc index 8b44b07..0c625b1 100644 --- a/programs/start/De.rc +++ b/programs/start/De.rc @@ -26,7 +26,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STRING_USAGE, "Startet ein Programm, oder öffnet ein Dokument in dem Programm, dass normalerweise für die Dateien mit dieser Dateiendung benutzt wird..\n\ Gebrauch:\n\ diff --git a/programs/start/Nl.rc b/programs/start/Nl.rc index 318965f..7981e22 100644 --- a/programs/start/Nl.rc +++ b/programs/start/Nl.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STRING_USAGE, "Start een programma, of open een document met het programma dat normaal voor bestanden met die extensie gebruikt wordt.\n\ Gebruik:\n\ diff --git a/programs/start/No.rc b/programs/start/No.rc index 5d2da44..bfe0ed9 100644 --- a/programs/start/No.rc +++ b/programs/start/No.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +STRINGTABLE DISCARDABLE { STRING_USAGE, "Starte et program, eller �pne et dokument i programmet som er tilknyttet filer med det etternavnet.\n\ Bruk:\n\ diff --git a/programs/start/Si.rc b/programs/start/Si.rc index 0ed1ff9..1effef2 100644 --- a/programs/start/Si.rc +++ b/programs/start/Si.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STRING_USAGE, "Zažene program oziroma odpre dokument v programu, ki je povezan z datotekami te vrste.\n\ Uporaba:\n\ diff --git a/programs/start/Tr.rc b/programs/start/Tr.rc index fefc94b..03c48ae 100644 --- a/programs/start/Tr.rc +++ b/programs/start/Tr.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STRING_USAGE, "Bir program� veya uzant�s� ile ili�kili olan program i�inde bir belgeyi a�ar.\n\ Kullan�m:\n\

1 0

Michael Stefaniuc : notepad: Move from a per resource to a global LANGUAGE setting.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: cd8e1f8e7597cc398c2367d5e82b698643796268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8e1f8e7597cc398c2367d5e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 10:32:50 2010 +0200 notepad: Move from a per resource to a global LANGUAGE setting. --- programs/notepad/Hu.rc | 6 ++++-- programs/notepad/Zh.rc | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/notepad/Hu.rc b/programs/notepad/Hu.rc index 3853d43..f60551a 100644 --- a/programs/notepad/Hu.rc +++ b/programs/notepad/Hu.rc @@ -23,7 +23,9 @@ #include "notepad_res.h" -MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +MAIN_MENU MENU { POPUP "&F�jl" { MENUITEM "�&j\tCtrl+N", CMD_NEW @@ -93,7 +95,7 @@ PUSHBUTTON "M PUSHBUTTON "&S�g�", IDHELP, 180, 39, 40, 15, WS_TABSTOP } -STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" STRING_PAGESETUP_FOOTERVALUE, "Oldalsz�m: &p." diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index dbc4430..0c06e59 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -24,7 +24,9 @@ /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) -MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +MAIN_MENU MENU { POPUP "文件(&F)" { MENUITEM "新建(&N)\tCtrl+N", CMD_NEW @@ -69,7 +71,6 @@ POPUP "帮助(&H)" { /* Dialog `Page setup' */ DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" CAPTION "页面设置" @@ -94,7 +95,7 @@ PUSHBUTTON "取消", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "帮助(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP } -STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" STRING_PAGESETUP_FOOTERVALUE, "&p 页"

1 0

Hans Leidekker : msi: Publish patches regardless of any features being installed locally.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: c9fb24927db773905e144db63d9e34741e97f703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fb24927db773905e144db63… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 21 09:46:30 2010 +0200 msi: Publish patches regardless of any features being installed locally. --- dlls/msi/action.c | 36 +++++++++++++++++++----------------- dlls/msi/msipriv.h | 1 + 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b101533..1e2af4b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3770,9 +3770,6 @@ static UINT msi_publish_upgrade_code(MSIPACKAGE *package) LPWSTR upgrade; WCHAR squashed_pc[SQUISH_GUID_SIZE]; - static const WCHAR szUpgradeCode[] = - {'U','p','g','r','a','d','e','C','o','d','e',0}; - upgrade = msi_dup_property(package->db, szUpgradeCode); if (!upgrade) return ERROR_SUCCESS; @@ -3826,21 +3823,28 @@ static BOOL msi_check_unpublish(MSIPACKAGE *package) return TRUE; } -static UINT msi_publish_patches( MSIPACKAGE *package, HKEY prodkey ) +static UINT msi_publish_patches( MSIPACKAGE *package ) { static const WCHAR szAllPatches[] = {'A','l','l','P','a','t','c','h','e','s',0}; WCHAR patch_squashed[GUID_SIZE]; - HKEY patches_key = NULL, product_patches_key; + HKEY patches_key = NULL, product_patches_key = NULL, product_key; LONG res; MSIPATCHINFO *patch; UINT r; WCHAR *p, *all_patches = NULL; DWORD len = 0; - res = RegCreateKeyExW( prodkey, szPatches, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &patches_key, NULL ); - if (res != ERROR_SUCCESS) + r = MSIREG_OpenProductKey( package->ProductCode, NULL, package->Context, &product_key, FALSE ); + if (r != ERROR_SUCCESS) return ERROR_FUNCTION_FAILED; + res = RegCreateKeyExW( product_key, szPatches, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &patches_key, NULL ); + if (res != ERROR_SUCCESS) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } + r = MSIREG_OpenUserDataProductPatchesKey( package->ProductCode, package->Context, &product_patches_key, TRUE ); if (r != ERROR_SUCCESS) goto done; @@ -3903,6 +3907,7 @@ static UINT msi_publish_patches( MSIPACKAGE *package, HKEY prodkey ) done: RegCloseKey( product_patches_key ); RegCloseKey( patches_key ); + RegCloseKey( product_key ); msi_free( all_patches ); return r; } @@ -3919,6 +3924,13 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) HKEY hukey = NULL, hudkey = NULL; MSIRECORD *uirow; + if (!list_empty(&package->patches)) + { + rc = msi_publish_patches(package); + if (rc != ERROR_SUCCESS) + goto end; + } + /* FIXME: also need to publish if the product is in advertise mode */ if (!msi_check_publish(package)) return ERROR_SUCCESS; @@ -3937,13 +3949,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto end; - if (!list_empty(&package->patches)) - { - rc = msi_publish_patches(package, hukey); - if (rc != ERROR_SUCCESS) - goto end; - } - rc = msi_publish_product_properties(package, hukey); if (rc != ERROR_SUCCESS) goto end; @@ -4699,9 +4704,6 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) HKEY upgrade; UINT rc; - static const WCHAR szUpgradeCode[] = { - 'U','p','g','r','a','d','e','C','o','d','e',0}; - /* FIXME: also need to publish if the product is in advertise mode */ if (!msi_check_publish(package)) return ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 8e978cc..df9f045 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1119,6 +1119,7 @@ static const WCHAR szInprocHandler32[] = {'I','n','p','r','o','c','H','a','n','d static const WCHAR szMIMEDatabase[] = {'M','I','M','E','\\','D','a','t','a','b','a','s','e','\\','C','o','n','t','e','n','t',' ','T','y','p','e','\\',0}; static const WCHAR szLocalPackage[] = {'L','o','c','a','l','P','a','c','k','a','g','e',0}; static const WCHAR szOriginalDatabase[] = {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; +static const WCHAR szUpgradeCode[] = {'U','p','g','r','a','d','e','C','o','d','e',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0

Michael Stefaniuc : winhlp32: Move from a per resource to a global LANGUAGE setting.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 6e8c900d1960e804227e83826a529f075e09443e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8c900d1960e804227e83826… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 10:31:28 2010 +0200 winhlp32: Move from a per resource to a global LANGUAGE setting. --- programs/winhlp32/Bg.rc | 6 ++++-- programs/winhlp32/Cs.rc | 6 ++++-- programs/winhlp32/De.rc | 12 +++++++----- programs/winhlp32/En.rc | 22 +++++++++++++++------- programs/winhlp32/Eo.rc | 6 ++++-- programs/winhlp32/Es.rc | 10 ++++++---- programs/winhlp32/Fi.rc | 6 ++++-- programs/winhlp32/Fr.rc | 8 +++++--- programs/winhlp32/Hu.rc | 6 ++++-- programs/winhlp32/It.rc | 12 +++++++----- programs/winhlp32/Ja.rc | 12 +++++++----- programs/winhlp32/Ko.rc | 12 +++++++----- programs/winhlp32/No.rc | 12 +++++++----- programs/winhlp32/Pt.rc | 13 +++++++++---- programs/winhlp32/Rm.rc | 6 ++++-- programs/winhlp32/Si.rc | 12 +++++++----- programs/winhlp32/Sk.rc | 6 ++++-- programs/winhlp32/Sv.rc | 12 +++++++----- programs/winhlp32/Tr.rc | 6 ++++-- programs/winhlp32/Wa.rc | 6 ++++-- 20 files changed, 120 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e8c900d1960e804227e8…

1 0

Michael Stefaniuc : winmm: Move from a per resource to a global LANGUAGE setting.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 6301f6553427e478672a799a905be3fd367f31cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6301f6553427e478672a799a9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 10:31:50 2010 +0200 winmm: Move from a per resource to a global LANGUAGE setting. --- dlls/winmm/winmm_Cs.rc | 4 +++- dlls/winmm/winmm_Da.rc | 4 +++- dlls/winmm/winmm_De.rc | 4 +++- dlls/winmm/winmm_En.rc | 4 +++- dlls/winmm/winmm_Es.rc | 4 +++- dlls/winmm/winmm_It.rc | 4 +++- dlls/winmm/winmm_Ja.rc | 4 +++- dlls/winmm/winmm_Ko.rc | 4 +++- dlls/winmm/winmm_Nl.rc | 4 +++- dlls/winmm/winmm_No.rc | 4 +++- dlls/winmm/winmm_Pl.rc | 4 +++- dlls/winmm/winmm_Pt.rc | 8 ++++++-- dlls/winmm/winmm_Ru.rc | 4 +++- dlls/winmm/winmm_Si.rc | 4 +++- dlls/winmm/winmm_Sk.rc | 4 +++- dlls/winmm/winmm_Tr.rc | 4 +++- dlls/winmm/winmm_Uk.rc | 4 +++- 17 files changed, 54 insertions(+), 18 deletions(-) diff --git a/dlls/winmm/winmm_Cs.rc b/dlls/winmm/winmm_Cs.rc index 36604d4..260e629 100644 --- a/dlls/winmm/winmm_Cs.rc +++ b/dlls/winmm/winmm_Cs.rc @@ -22,9 +22,11 @@ #include "windef.h" #include "mmddk.h" +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL + /* Czech strings in CP1250 */ -STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_Da.rc b/dlls/winmm/winmm_Da.rc index 7f55353..b222710 100644 --- a/dlls/winmm/winmm_Da.rc +++ b/dlls/winmm/winmm_Da.rc @@ -19,7 +19,9 @@ #include "windef.h" #include "mmddk.h" -STRINGTABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_De.rc b/dlls/winmm/winmm_De.rc index c259204..1b86a9a 100644 --- a/dlls/winmm/winmm_De.rc +++ b/dlls/winmm/winmm_De.rc @@ -19,9 +19,11 @@ #include "windef.h" #include "mmddk.h" +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + #pragma code_page(65001) -STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_En.rc b/dlls/winmm/winmm_En.rc index 1a945d8..cc20333 100644 --- a/dlls/winmm/winmm_En.rc +++ b/dlls/winmm/winmm_En.rc @@ -19,7 +19,9 @@ #include "windef.h" #include "mmddk.h" -STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_Es.rc b/dlls/winmm/winmm_Es.rc index 8713075..03bad73 100644 --- a/dlls/winmm/winmm_Es.rc +++ b/dlls/winmm/winmm_Es.rc @@ -20,7 +20,9 @@ #include "windef.h" #include "mmddk.h" -STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_It.rc b/dlls/winmm/winmm_It.rc index f4c2fa0..2c0396c 100644 --- a/dlls/winmm/winmm_It.rc +++ b/dlls/winmm/winmm_It.rc @@ -20,7 +20,9 @@ #include "windef.h" #include "mmddk.h" -STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_Ja.rc b/dlls/winmm/winmm_Ja.rc index b8f1c53..32abcbe 100644 --- a/dlls/winmm/winmm_Ja.rc +++ b/dlls/winmm/winmm_Ja.rc @@ -19,10 +19,12 @@ #include "windef.h" #include "mmddk.h" +LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL + /* UTF-8 */ #pragma code_page(65001) -STRINGTABLE LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_Ko.rc b/dlls/winmm/winmm_Ko.rc index bf7c8a5..3e8403f 100644 --- a/dlls/winmm/winmm_Ko.rc +++ b/dlls/winmm/winmm_Ko.rc @@ -20,7 +20,9 @@ #include "windef.h" #include "mmddk.h" -STRINGTABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_Nl.rc b/dlls/winmm/winmm_Nl.rc index 7073c0c..857bf15 100644 --- a/dlls/winmm/winmm_Nl.rc +++ b/dlls/winmm/winmm_Nl.rc @@ -19,9 +19,11 @@ #include "windef.h" #include "mmddk.h" +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + #pragma code_page(65001) -STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_No.rc b/dlls/winmm/winmm_No.rc index 511e4b3..f5f6e05 100644 --- a/dlls/winmm/winmm_No.rc +++ b/dlls/winmm/winmm_No.rc @@ -19,7 +19,9 @@ #include "windef.h" #include "mmddk.h" -STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_Pl.rc b/dlls/winmm/winmm_Pl.rc index 5abf3f5..d37bc01 100644 --- a/dlls/winmm/winmm_Pl.rc +++ b/dlls/winmm/winmm_Pl.rc @@ -19,7 +19,9 @@ #include "windef.h" #include "mmddk.h" -STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL + +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_Pt.rc b/dlls/winmm/winmm_Pt.rc index 52adb07..d3302fd 100644 --- a/dlls/winmm/winmm_Pt.rc +++ b/dlls/winmm/winmm_Pt.rc @@ -21,7 +21,9 @@ #include "windef.h" #include "mmddk.h" -STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE BEGIN @@ -131,7 +133,9 @@ MCIERR_SEQ_TIMER, "Todos os temporizadores de multim END -STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE BEGIN diff --git a/dlls/winmm/winmm_Ru.rc b/dlls/winmm/winmm_Ru.rc index 18d81d2..f5daf38 100644 --- a/dlls/winmm/winmm_Ru.rc +++ b/dlls/winmm/winmm_Ru.rc @@ -19,10 +19,12 @@ #include "windef.h" #include "mmddk.h" +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL + /* UTF-8 */ #pragma code_page(65001) -STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL +STRINGTABLE BEGIN /* Russian strings in UTF-8 */ diff --git a/dlls/winmm/winmm_Si.rc b/dlls/winmm/winmm_Si.rc index 918e7f1..4b0ac17 100644 --- a/dlls/winmm/winmm_Si.rc +++ b/dlls/winmm/winmm_Si.rc @@ -19,9 +19,11 @@ #include "windef.h" #include "mmddk.h" +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + #pragma code_page(65001) -STRINGTABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_Sk.rc b/dlls/winmm/winmm_Sk.rc index d9345ec..3706f44 100644 --- a/dlls/winmm/winmm_Sk.rc +++ b/dlls/winmm/winmm_Sk.rc @@ -19,7 +19,9 @@ #include "windef.h" #include "mmddk.h" -STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_NEUTRAL +LANGUAGE LANG_SLOVAK, SUBLANG_NEUTRAL + +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_Tr.rc b/dlls/winmm/winmm_Tr.rc index 6c8a73e..b45ad71 100644 --- a/dlls/winmm/winmm_Tr.rc +++ b/dlls/winmm/winmm_Tr.rc @@ -21,7 +21,9 @@ #include "windef.h" #include "mmddk.h" -STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE BEGIN /* MMSYS errors */ diff --git a/dlls/winmm/winmm_Uk.rc b/dlls/winmm/winmm_Uk.rc index e5af095..59c5b13 100644 --- a/dlls/winmm/winmm_Uk.rc +++ b/dlls/winmm/winmm_Uk.rc @@ -21,10 +21,12 @@ #include "windef.h" #include "mmddk.h" +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + /* UTF-8 */ #pragma code_page(65001) -STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STRINGTABLE BEGIN /* MMSYS errors */

1 0

Stefan Dösinger : d3d9: Use a vertex shader in the vpos test.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 8284f70de8ed86935cc4a75d0a4601d88183f54d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8284f70de8ed86935cc4a75d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 3 19:14:54 2010 +0200 d3d9: Use a vertex shader in the vpos test. --- dlls/d3d9/tests/visual.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ebb11c6..6ecd624 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8580,6 +8580,14 @@ static void vpos_register_test(IDirect3DDevice9 *device) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff /* end */ }; + const DWORD vshader_code[] = { + 0xfffe0300, /* vs_3_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x0000ffff /* end */ + }; + IDirect3DVertexShader9 *vshader; IDirect3DPixelShader9 *shader, *shader_frac; IDirect3DSurface9 *surface = NULL, *backbuffer; const float quad[] = { @@ -8594,12 +8602,16 @@ static void vpos_register_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vshader); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader failed hr=%08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed hr=%08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, shader_frac_code, &shader_frac); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed hr=%08x\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, shader); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vshader); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed hr=%08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed hr=%08x\n", hr); hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); @@ -8692,8 +8704,11 @@ static void vpos_register_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetPixelShader(device, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed hr=%08x\n", hr); IDirect3DPixelShader9_Release(shader); IDirect3DPixelShader9_Release(shader_frac); + IDirect3DVertexShader9_Release(vshader); if(surface) IDirect3DSurface9_Release(surface); IDirect3DSurface9_Release(backbuffer); }

1 0

Luke Bratch : wined3d: Add Nvidia 8800GTX detection.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: c63c568731ba4440df5cffc2a98d6e5a97a47451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c63c568731ba4440df5cffc2a… Author: Luke Bratch <l_bratch(a)yahoo.co.uk> Date: Tue Jul 20 17:02:17 2010 +0000 wined3d: Add Nvidia 8800GTX detection. --- dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5705def..3e6e38d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1014,6 +1014,7 @@ static const struct driver_version_information driver_version_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTX, "NVIDIA GeForce 8800 GTX", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 15, 11, 9745 }, @@ -1385,6 +1386,13 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_9200; } + /* Geforce8 - highend high*/ + if (strstr(gl_renderer, "8800 GTX")) + { + *vidmem = 768; + return CARD_NVIDIA_GEFORCE_8800GTX; + } + /* Geforce8 - highend */ if (strstr(gl_renderer, "8800")) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f5fb280..8773248 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1304,6 +1304,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_8600GT = 0x0402, CARD_NVIDIA_GEFORCE_8600MGT = 0x0407, CARD_NVIDIA_GEFORCE_8800GTS = 0x0193, + CARD_NVIDIA_GEFORCE_8800GTX = 0x0191, CARD_NVIDIA_GEFORCE_9200 = 0x086d, CARD_NVIDIA_GEFORCE_9400GT = 0x042c, CARD_NVIDIA_GEFORCE_9500GT = 0x0640,

1 0

Stefan Dösinger : d3d9: Remove the fog vs sRGB test.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 24adf40ee1531e76ec0df397228c28732cf7ea52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24adf40ee1531e76ec0df3972… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 20 12:47:28 2010 +0200 d3d9: Remove the fog vs sRGB test. --- dlls/d3d9/tests/visual.c | 109 ---------------------------------------------- 1 files changed, 0 insertions(+), 109 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0168222..4aaa56c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7032,114 +7032,6 @@ bail: IDirect3DVertexBuffer9_Release(vb_list); } - -static void fog_srgbwrite_test(IDirect3DDevice9 *device) -{ - /* Draw a black quad, half fogged with white fog -> grey color. Enable sRGB writing. - * if sRGB writing is applied before fogging, the 0.0 will be multiplied with ~ 12.92, so still - * stay 0.0. After that the fog gives 0.5. If sRGB writing is applied after fogging, the - * 0.5 will run through the alternative path(0^5 ^ 0.41666 * 1.055 - 0.055), resulting in approx. - * 0.73 - * - * At the time of this writing, wined3d could not apply sRGB correction to fixed function rendering, - * so use shaders for this task - */ - IDirect3DPixelShader9 *pshader; - IDirect3DVertexShader9 *vshader; - IDirect3D9 *d3d; - DWORD vshader_code[] = { - 0xfffe0101, /* vs_1_1 */ - 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ - 0x00000051, 0xa00f0000, 0x3f000000, 0x00000000, 0x00000000, 0x00000000, /* def c0, 0.5, 0.0, 0.0, 0.0 */ - 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ - 0x00000001, 0xc00f0001, 0xa0000000, /* mov oFog, c0.x */ - 0x0000ffff /* end */ - }; - DWORD pshader_code[] = { - 0xffff0101, /* ps_1_1 */ - 0x00000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, /* def c0, 0.0, 0.0, 0.0, 0.0 */ - 0x00000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ - 0x0000ffff /* end */ - }; - const float quad[] = { - -1.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - -1.0, 1.0, 0.1, - 1.0, 1.0, 0.1 - }; - HRESULT hr; - D3DCOLOR color; - - IDirect3DDevice9_GetDirect3D(device, &d3d); - /* Ask for srgb writing on D3DRTYPE_TEXTURE. Some Windows drivers do not report it on surfaces. - * For some not entirely understood reasons D3DUSAGE_RENDERTARGET | D3DUSAGE_QUERY_SRGBWRITE - * passes on surfaces, while asking for SRGBWRITE alone fails. Textures advertize srgb writing - * alone as well, so use that since it is not the point of this test to show how CheckDeviceFormat - * works - */ - if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_RENDERTARGET | D3DUSAGE_QUERY_SRGBWRITE, - D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8) != D3D_OK) { - skip("No SRGBWRITEENABLE support on D3DFMT_X8R8G8B8\n"); - IDirect3D9_Release(d3d); - return; - } - IDirect3D9_Release(d3d); - - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); - - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0xffffffff); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, TRUE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - - hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vshader); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code, &pshader); - ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); - ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, vshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, pshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); - if(SUCCEEDED(hr)) { - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(float) * 3); - ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); - } - - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); - IDirect3DPixelShader9_Release(pshader); - IDirect3DVertexShader9_Release(vshader); - - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - - color = getPixelColor(device, 160, 360); - ok(color_match(color, 0x00808080, 1), - "Fog with D3DRS_SRGBWRITEENABLE returned color 0x%08x, expected 0x00808080\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); -} - static void alpha_test(IDirect3DDevice9 *device) { HRESULT hr; @@ -11408,7 +11300,6 @@ START_TEST(visual) if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1) && caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) { fog_with_shader_test(device_ptr); - fog_srgbwrite_test(device_ptr); } else skip("No vs_1_1 and ps_1_1 support\n");

1 0