wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Łukasz Wojniłowicz : mshtml: Update the Polish translation.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 8b3d314a687c27c000cc6acb3eaa4b4d933ecc51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3d314a687c27c000cc6acb3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Sep 17 10:02:20 2010 +0200 mshtml: Update the Polish translation. --- dlls/mshtml/Pl.rc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Pl.rc b/dlls/mshtml/Pl.rc index 9e0a635..f071bd8 100644 --- a/dlls/mshtml/Pl.rc +++ b/dlls/mshtml/Pl.rc @@ -24,6 +24,12 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE { + IDS_STATUS_DONE "Sko�czone" + IDS_STATUS_DOWNLOADINGFROM "Pobieranie od %s..." +} + +STRINGTABLE +{ IDS_HTMLDISABLED "Wy�wietlanie HTML jest aktualnie wy��czone." IDS_HTMLDOCUMENT "Dokument HTML" IDS_DOWNLOADING "Pobieranie plik�w..."

1 0

Łukasz Wojniłowicz : shdocvw: Update the Polish translation.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 477e65402aab99c3e36dcf253c0c486649acbc39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=477e65402aab99c3e36dcf253… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Sep 17 10:02:21 2010 +0200 shdocvw: Update the Polish translation. --- dlls/shdocvw/Pl.rc | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Pl.rc b/dlls/shdocvw/Pl.rc index 7a6ce31..55c0742 100644 --- a/dlls/shdocvw/Pl.rc +++ b/dlls/shdocvw/Pl.rc @@ -49,9 +49,38 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "Podgl�&d wydruku...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "&W�a�ciwo�ci...", ID_BROWSE_PROPERTIES + MENUITEM "&Zamknij...", ID_BROWSE_QUIT + } + POPUP "&Widok" + { + POPUP "&Paski narz�dzi" + { + MENUITEM "Pasek &standardowy" ID_BROWSE_BAR_STD + MENUITEM "&Pasek adresu" ID_BROWSE_BAR_ADDR + } + } + POPUP "&Ulubione" + { + MENUITEM "&Dodaj do ulubionych..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR } POPUP "&Pomoc" { MENUITEM "&O Internet Explorer...", ID_BROWSE_ABOUT } } + +STRINGTABLE +{ + IDS_TB_BACK "Wstecz" + IDS_TB_FORWARD "Dalej" + IDS_TB_STOP "Zatrzymaj" + IDS_TB_REFRESH "Od�wierz" + IDS_TB_HOME "Strona g��wna" + IDS_TB_PRINT "Drukuj" +} + +STRINGTABLE +{ + IDS_ADDRESS "Adres" +}

1 0

Łukasz Wojniłowicz : jscript: Update the Polish translation.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: d1fd24441c6074f50f382dad3fc86dce96f00458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1fd24441c6074f50f382dad3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Sep 17 10:02:19 2010 +0200 jscript: Update the Polish translation. --- dlls/jscript/jscript_Pl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Pl.rc b/dlls/jscript/jscript_Pl.rc index ff924a3..d553c2c 100644 --- a/dlls/jscript/jscript_Pl.rc +++ b/dlls/jscript/jscript_Pl.rc @@ -26,6 +26,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "Niew�a�ciwe wywo�anie procedury lub argument" IDS_CREATE_OBJ_ERROR "Serwer automatyzacji nie mo�e stworzy� obiektu" IDS_NO_PROPERTY "Obiekt nie wspiera tej w�a�ciwo�ci lub metody" + IDS_UNSUPPORTED_ACTION "Obiekt nie wspiera tej akcji" IDS_ARG_NOT_OPT "Argument nieopcjonalny" IDS_SYNTAX_ERROR "B��d sk�adni" IDS_SEMICOLON "Oczekiwane ';'"

1 0

Hans Leidekker : msi: Read supported platform and language ids from the summary information stream .
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: a0ebe951b626dab459b911dc17e384f368cd45bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ebe951b626dab459b911dc1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 17 15:20:26 2010 +0200 msi: Read supported platform and language ids from the summary information stream. --- dlls/msi/msipriv.h | 13 ++++++++ dlls/msi/package.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/tests/db.c | 8 ++-- 3 files changed, 95 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 94bac5d..99486ec 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -304,10 +304,20 @@ struct tagMSIVIEW struct msi_dialog_tag; typedef struct msi_dialog_tag msi_dialog; +enum platform +{ + PLATFORM_INTEL, + PLATFORM_INTEL64, + PLATFORM_X64 +}; + typedef struct tagMSIPACKAGE { MSIOBJECTHDR hdr; MSIDATABASE *db; + enum platform platform; + UINT num_langids; + LANGID *langids; struct list patches; struct list components; struct list features; @@ -1127,6 +1137,9 @@ static const WCHAR szLocalPackage[] = {'L','o','c','a','l','P','a','c','k','a',' 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}; static const WCHAR szAdminUser[] = {'A','d','m','i','n','U','s','e','r',0}; +static const WCHAR szIntel[] = {'I','n','t','e','l',0}; +static const WCHAR szIntel64[] = {'I','n','t','e','l','6','4',0}; +static const WCHAR szX64[] = {'x','6','4',0}; /* 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 4e7692f..9ca344a 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -280,6 +280,7 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free( package->ProductCode ); msi_free( package->ActionFormat ); msi_free( package->LastAction ); + msi_free( package->langids ); /* cleanup control event subscriptions */ ControlEvent_CleanupSubscriptions( package ); @@ -681,7 +682,6 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szScreenY[] = {'S','c','r','e','e','n','Y',0}; static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; static const WCHAR szIntFormat[] = {'%','d',0}; - static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; static const WCHAR szMsiAMD64[] = { 'M','s','i','A','M','D','6','4',0 }; static const WCHAR szMsix64[] = { 'M','s','i','x','6','4',0 }; static const WCHAR szSystem64Folder[] = { 'S','y','s','t','e','m','6','4','F','o','l','d','e','r',0 }; @@ -1271,6 +1271,64 @@ static UINT apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) return r; } +static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) +{ + WCHAR *template, *p, *q; + DWORD i, count; + + template = msi_suminfo_dup_string( si, PID_TEMPLATE ); + if (!template) + return ERROR_SUCCESS; /* native accepts missing template property */ + + TRACE("template: %s\n", debugstr_w(template)); + + p = strchrW( template, ';' ); + if (!p) + { + WARN("invalid template string %s\n", debugstr_w(template)); + msi_free( template ); + return ERROR_PATCH_PACKAGE_INVALID; + } + *p = 0; + if (!template[0] || !strcmpW( template, szIntel )) + package->platform = PLATFORM_INTEL; + else if (!strcmpW( template, szIntel64 )) + package->platform = PLATFORM_INTEL64; + else if (!strcmpW( template, szX64 )) + package->platform = PLATFORM_X64; + else + { + WARN("unknown platform %s\n", debugstr_w(template)); + msi_free( template ); + return ERROR_PATCH_PACKAGE_INVALID; + } + + count = 1; + for (q = ++p; (q = strchrW( q, ',' )); q++) count++; + + package->langids = msi_alloc( count * sizeof(LANGID) ); + if (!package->langids) + { + msi_free( template ); + return ERROR_OUTOFMEMORY; + } + + i = 0; + while (*p) + { + q = strchrW( p, ',' ); + if (q) *q = 0; + package->langids[i] = atoiW( p ); + if (!q) break; + p = q + 1; + i++; + } + package->num_langids = i + 1; + + msi_free( template ); + return ERROR_SUCCESS; +} + UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { static const WCHAR Database[] = {'D','A','T','A','B','A','S','E',0}; @@ -1283,6 +1341,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) WCHAR temppath[MAX_PATH], localfile[MAX_PATH], cachefile[MAX_PATH]; LPCWSTR file = szPackage; DWORD index = 0; + MSISUMMARYINFO *si; TRACE("%s %p\n", debugstr_w(szPackage), pPackage); @@ -1382,6 +1441,23 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) if( file != szPackage ) track_tempfile( package, file ); + si = MSI_GetSummaryInformationW( db->storage, 0 ); + if (!si) + { + WARN("failed to load summary info %u\n", r); + msiobj_release( &package->hdr ); + return ERROR_INSTALL_PACKAGE_INVALID; + } + + r = msi_parse_summary( si, package ); + msiobj_release( &si->hdr ); + if (r != ERROR_SUCCESS) + { + WARN("failed to parse summary info %u\n", r); + msiobj_release( &package->hdr ); + return r; + } + msi_set_property( package->db, Database, db->path ); if( UrlIsW( szPackage, URLIS_URL ) ) @@ -1412,7 +1488,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) if (r != ERROR_SUCCESS) { ERR("registered patch failed to apply %u\n", r); - MSI_FreePackage( (MSIOBJECTHDR *)package ); + msiobj_release( &package->hdr ); return r; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 5c87e3f..b3fe3b8 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1998,7 +1998,7 @@ static const CHAR suminfo[] = "PropertyId\tValue\n" "4\tWineHQ\n" "5\tInstaller\n" "6\tInstaller comments\n" - "7\tIntel;1033\n" + "7\tIntel;1033,2057\n" "9\t{12345678-1234-1234-1234-123456789012}\n" "12\t2009/04/12 15:46:11\n" "13\t2009/04/12 15:46:11\n" @@ -2107,8 +2107,8 @@ static void test_suminfo_import(void) r = MsiSummaryInfoGetPropertyA(hsi, PID_TEMPLATE, &type, NULL, NULL, str_value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); - ok(!strcmp(str_value, "Intel;1033"), - "Expected \"Intel;1033\", got %s\n", str_value); + ok(!strcmp(str_value, "Intel;1033,2057"), + "Expected \"Intel;1033,2057\", got %s\n", str_value); size = sizeof(str_value); r = MsiSummaryInfoGetPropertyA(hsi, PID_REVNUMBER, &type, NULL, NULL, str_value, &size); @@ -2877,7 +2877,7 @@ static UINT set_summary_info(MSIHANDLE hdb) ok( res == ERROR_SUCCESS , "Failed to set summary info\n" ); res = MsiSummaryInfoSetProperty(suminfo,7, VT_LPSTR, 0,NULL, - ";1033"); + ";1033,2057"); ok( res == ERROR_SUCCESS , "Failed to set summary info\n" ); res = MsiSummaryInfoSetProperty(suminfo,9, VT_LPSTR, 0,NULL,

1 0

Hans Leidekker : msi: Avoid a crash on database destruction.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 3ef3e81f9e9ce998bb1ef86afa8424cad9cd68ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef3e81f9e9ce998bb1ef86af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 17 15:20:07 2010 +0200 msi: Avoid a crash on database destruction. --- dlls/msi/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 748cbfd..3007d48 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -241,7 +241,7 @@ static VOID MSI_CloseDatabase( MSIOBJECTHDR *arg ) free_cached_tables( db ); free_streams( db ); free_transforms( db ); - msi_destroy_stringtable( db->strings ); + if (db->strings) msi_destroy_stringtable( db->strings ); IStorage_Release( db->storage ); if (db->deletefile) {

1 0

Hans Leidekker : msi: Adjust the AdminUser property too after applying a patch.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 931bf0573117771708c456523fb9aa8996860754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=931bf0573117771708c456523… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 17 15:19:56 2010 +0200 msi: Adjust the AdminUser property too after applying a patch. --- dlls/msi/action.c | 2 +- dlls/msi/msipriv.h | 3 ++- dlls/msi/package.c | 9 ++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5eb4ae8..5fd371e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7498,7 +7498,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_clone_properties( package ); msi_parse_command_line( package, szCommandLine, FALSE ); - msi_adjust_allusers_property( package ); + msi_adjust_privilege_properties( package ); msi_set_context( package ); if (needs_ui_sequence( package)) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index ebfcae7..94bac5d 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -768,7 +768,7 @@ extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR); extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR); extern UINT msi_clone_properties(MSIPACKAGE *); extern UINT msi_set_context(MSIPACKAGE *); -extern void msi_adjust_allusers_property(MSIPACKAGE *); +extern void msi_adjust_privilege_properties(MSIPACKAGE *); extern UINT MSI_GetFeatureCost(MSIPACKAGE *, MSIFEATURE *, MSICOSTTREE, INSTALLSTATE, LPINT); /* for deformating */ @@ -1126,6 +1126,7 @@ static const WCHAR szMIMEDatabase[] = {'M','I','M','E','\\','D','a','t','a','b', 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}; +static const WCHAR szAdminUser[] = {'A','d','m','i','n','U','s','e','r',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 c386f89..4e7692f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -660,8 +660,6 @@ static VOID set_installer_properties(MSIPACKAGE *package) {'W','i','n','d','o','w','s','V','o','l','u','m','e',0}; static const WCHAR TF[]= {'T','e','m','p','F','o','l','d','e','r',0}; - static const WCHAR szAdminUser[] = -{'A','d','m','i','n','U','s','e','r',0}; static const WCHAR szPriv[] = {'P','r','i','v','i','l','e','g','e','d',0}; static const WCHAR v9x[] = { 'V','e','r','s','i','o','n','9','X',0 }; @@ -1054,7 +1052,7 @@ static UINT msi_load_admin_properties(MSIPACKAGE *package) return r; } -void msi_adjust_allusers_property( MSIPACKAGE *package ) +void msi_adjust_privilege_properties( MSIPACKAGE *package ) { /* FIXME: this should depend on the user's privileges */ if (msi_get_property_int( package->db, szAllUsers, 0 ) == 2) @@ -1062,6 +1060,7 @@ void msi_adjust_allusers_property( MSIPACKAGE *package ) TRACE("resetting ALLUSERS property from 2 to 1\n"); msi_set_property( package->db, szAllUsers, szOne ); } + msi_set_property( package->db, szAdminUser, szOne ); } MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) @@ -1086,7 +1085,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) create_temp_property_table( package ); msi_clone_properties( package ); - msi_adjust_allusers_property( package ); + msi_adjust_privilege_properties( package ); package->ProductCode = msi_dup_property( package->db, szProductCode ); package->script = msi_alloc_zero( sizeof(MSISCRIPT) ); @@ -1423,7 +1422,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) if (index) { msi_clone_properties( package ); - msi_adjust_allusers_property( package ); + msi_adjust_privilege_properties( package ); } *pPackage = package;

1 0

Hans Leidekker : shell32: Support FOLDERID_LocalAppDataLow.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 9f4d6c6edc11f88b3cc994934c9532d270722356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f4d6c6edc11f88b3cc994934… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 17 15:19:35 2010 +0200 shell32: Support FOLDERID_LocalAppDataLow. --- dlls/shell32/shell32_En.rc | 1 + dlls/shell32/shellpath.c | 4 ++-- dlls/shell32/shresdef.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index 6fb4c6c..d752f77 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -302,6 +302,7 @@ STRINGTABLE IDS_COMMON_OEM_LINKS "OEM Links" IDS_DOCUMENTS "Documents" IDS_DOWNLOADS "Downloads" + IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow" IDS_NEWFOLDER "New Folder" diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index ec66699..e0228ee 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1304,9 +1304,9 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x4e */ &FOLDERID_LocalAppDataLow, - CSIDL_Type_Disallowed, /* FIXME */ + CSIDL_Type_User, NULL, - NULL + MAKEINTRESOURCEW(IDS_LOCAL_APPDATA_LOW) }, { /* 0x4f */ &FOLDERID_MusicLibrary, diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 136201a..8ad2b91 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -111,6 +111,7 @@ #define IDS_COMMON_OEM_LINKS 94 #define IDS_DOCUMENTS 95 #define IDS_DOWNLOADS 96 +#define IDS_LOCAL_APPDATA_LOW 97 #define IDS_CREATEFOLDER_DENIED 128 #define IDS_CREATEFOLDER_CAPTION 129

1 0

Jacek Caban : include: Added more d3d9 error codes.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 5b15c0dfac250d13db6218aff605fe78a21716dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b15c0dfac250d13db6218aff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 17 13:29:57 2010 +0200 include: Added more d3d9 error codes. --- include/d3d9.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/d3d9.h b/include/d3d9.h index 3f9ebf2..0310240 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -96,6 +96,18 @@ #define D3DERR_WASSTILLDRAWING MAKE_D3DHRESULT(540) #define D3DOK_NOAUTOGEN MAKE_D3DSTATUS(2159) +#define D3DERR_DEVICEREMOVED MAKE_D3DHRESULT(2160) +#define D3DERR_DEVICEHUNG MAKE_D3DHRESULT(2164) +#define S_NOT_RESIDENT MAKE_D3DSTATUS(2165) +#define S_RESIDENT_IN_SHARED_MEMORY MAKE_D3DSTATUS(2166) +#define S_PRESENT_MODE_CHANGED MAKE_D3DSTATUS(2167) +#define S_PRESENT_OCCLUDED MAKE_D3DSTATUS(2168) +#define D3DERR_UNSUPPORTEDOVERLAY MAKE_D3DHRESULT(2171) +#define D3DERR_UNSUPPORTEDOVERLAYFORMAT MAKE_D3DHRESULT(2172) +#define D3DERR_CANNOTPROTECTCONTENT MAKE_D3DHRESULT(2173) +#define D3DERR_UNSUPPORTEDCRYPTO MAKE_D3DHRESULT(2174) +#define D3DERR_PRESENT_STATISTICS_DISJOINT MAKE_D3DHRESULT(2180) + /***************************************************************************** * Predeclare the interfaces

1 0

Henri Verbeet : wined3d: Move the vertex declaration to wined3d_state.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: e31ea51bab250f2ea65f8d608da637f65ee29042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31ea51bab250f2ea65f8d608… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 17 11:59:41 2010 +0200 wined3d: Move the vertex declaration to wined3d_state. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 22 +++++++++++++--------- dlls/wined3d/stateblock.c | 23 ++++++++++++++--------- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 7 +++---- 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4660333..31ef339 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -467,7 +467,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) * analyse the strided streams in depth, just set them up for no conversion. Return decl changed * if we used conversion before */ - if (!((IWineD3DVertexDeclarationImpl *) device->stateBlock->vertexDecl)->half_float_conv_needed) + if (!device->stateBlock->state.vertex_declaration->half_float_conv_needed) { if (This->conversion_map) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7bf601b..3a54f42 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -177,7 +177,7 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) { /* We need to deal with frequency data! */ - IWineD3DVertexDeclarationImpl *declaration = (IWineD3DVertexDeclarationImpl *)This->stateBlock->vertexDecl; + IWineD3DVertexDeclarationImpl *declaration = This->stateBlock->state.vertex_declaration; unsigned int i; stream_info->use_map = 0; @@ -426,7 +426,7 @@ void device_update_stream_info(IWineD3DDeviceImpl *device, const struct wined3d_ if (vs && !stream_info->position_transformed) { - if (((IWineD3DVertexDeclarationImpl *)stateblock->vertexDecl)->half_float_conv_needed && !fixup) + if (stateblock->state.vertex_declaration->half_float_conv_needed && !fixup) { TRACE("Using drawStridedSlow with vertex shaders for FLOAT16 conversion.\n"); device->useDrawStridedSlow = TRUE; @@ -3164,14 +3164,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetScissorRect(IWineD3DDevice *iface, R static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexDeclaration(IWineD3DDevice* iface, IWineD3DVertexDeclaration* pDecl) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - IWineD3DVertexDeclaration *oldDecl = This->updateStateBlock->vertexDecl; + IWineD3DVertexDeclaration *oldDecl = (IWineD3DVertexDeclaration *)This->updateStateBlock->state.vertex_declaration; TRACE("(%p) : pDecl=%p\n", This, pDecl); if (pDecl) IWineD3DVertexDeclaration_AddRef(pDecl); if (oldDecl) IWineD3DVertexDeclaration_Release(oldDecl); - This->updateStateBlock->vertexDecl = pDecl; + This->updateStateBlock->state.vertex_declaration = (IWineD3DVertexDeclarationImpl *)pDecl; This->updateStateBlock->changed.vertexDecl = TRUE; if (This->isRecordingState) { @@ -3192,7 +3192,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetVertexDeclaration(IWineD3DDevice* if TRACE("(%p) : ppDecl=%p\n", This, ppDecl); - *ppDecl = This->stateBlock->vertexDecl; + *ppDecl = (IWineD3DVertexDeclaration *)This->stateBlock->state.vertex_declaration; if (*ppDecl) IWineD3DVertexDeclaration_AddRef(*ppDecl); return WINED3D_OK; } @@ -4671,7 +4671,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitive(IWineD3DDevice *iface, UI TRACE("(%p) : start %u, count %u\n", This, StartVertex, vertex_count); - if(!This->stateBlock->vertexDecl) { + if (!This->stateBlock->state.vertex_declaration) + { WARN("(%p) : Called without a valid vertex declaration set\n", This); return WINED3DERR_INVALIDCALL; } @@ -4709,7 +4710,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice *if return WINED3DERR_INVALIDCALL; } - if(!This->stateBlock->vertexDecl) { + if (!This->stateBlock->state.vertex_declaration) + { WARN("(%p) : Called without a valid vertex declaration set\n", This); return WINED3DERR_INVALIDCALL; } @@ -4749,7 +4751,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveUP(IWineD3DDevice *iface, TRACE("(%p) : vertex count %u, pVtxData %p, stride %u\n", This, vertex_count, pVertexStreamZeroData, VertexStreamZeroStride); - if(!This->stateBlock->vertexDecl) { + if (!This->stateBlock->state.vertex_declaration) + { WARN("(%p) : Called without a valid vertex declaration set\n", This); return WINED3DERR_INVALIDCALL; } @@ -4792,7 +4795,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveUP(IWineD3DDevice * TRACE("(%p) : index count %u, pidxdata %p, IdxFmt %u, pVtxdata %p, stride=%u.\n", This, index_count, pIndexData, IndexDataFormat, pVertexStreamZeroData, VertexStreamZeroStride); - if(!This->stateBlock->vertexDecl) { + if (!This->stateBlock->state.vertex_declaration) + { WARN("(%p) : Called without a valid vertex declaration set\n", This); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c06e14b..ac5accb 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -492,7 +492,8 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { if (!refCount) { int counter; - if (This->vertexDecl) IWineD3DVertexDeclaration_Release(This->vertexDecl); + if (This->state.vertex_declaration) + IWineD3DVertexDeclaration_Release((IWineD3DVertexDeclaration *)This->state.vertex_declaration); for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) { @@ -731,13 +732,17 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->IndexFmt = targetStateBlock->IndexFmt; } - if (This->changed.vertexDecl && This->vertexDecl != targetStateBlock->vertexDecl) + if (This->changed.vertexDecl && This->state.vertex_declaration != targetStateBlock->state.vertex_declaration) { - TRACE("Updating vertex declaration from %p to %p.\n", This->vertexDecl, targetStateBlock->vertexDecl); + TRACE("Updating vertex declaration from %p to %p.\n", + This->state.vertex_declaration, targetStateBlock->state.vertex_declaration); - if (targetStateBlock->vertexDecl) IWineD3DVertexDeclaration_AddRef(targetStateBlock->vertexDecl); - if (This->vertexDecl) IWineD3DVertexDeclaration_Release(This->vertexDecl); - This->vertexDecl = targetStateBlock->vertexDecl; + if (targetStateBlock->state.vertex_declaration) + IWineD3DVertexDeclaration_AddRef( + (IWineD3DVertexDeclaration *)targetStateBlock->state.vertex_declaration); + if (This->state.vertex_declaration) + IWineD3DVertexDeclaration_Release((IWineD3DVertexDeclaration *)This->state.vertex_declaration); + This->state.vertex_declaration = targetStateBlock->state.vertex_declaration; } if (This->changed.material && memcmp(&targetStateBlock->state.material, @@ -989,9 +994,9 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface) IWineD3DDevice_SetBaseVertexIndex(device, This->baseVertexIndex); } - if (This->changed.vertexDecl && This->vertexDecl) + if (This->changed.vertexDecl && This->state.vertex_declaration) { - IWineD3DDevice_SetVertexDeclaration(device, This->vertexDecl); + IWineD3DDevice_SetVertexDeclaration(device, (IWineD3DVertexDeclaration *)This->state.vertex_declaration); } if (This->changed.material) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 994c1e2..9457bf4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2897,7 +2897,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting } else if (stateblock->state.render_states[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { - if (use_vs(stateblock) || ((IWineD3DVertexDeclarationImpl *)stateblock->vertexDecl)->position_transformed) + if (use_vs(stateblock) || stateblock->state.vertex_declaration->position_transformed) { settings->fog = FOG_LINEAR; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c54be90..10ddc4a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2349,6 +2349,8 @@ struct wined3d_stream_state struct wined3d_state { + IWineD3DVertexDeclarationImpl *vertex_declaration; + IWineD3DBaseTextureImpl *textures[MAX_COMBINED_SAMPLERS]; DWORD sampler_states[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; DWORD texture_states[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; @@ -2376,9 +2378,6 @@ struct IWineD3DStateBlockImpl SAVEDSTATES changed; struct wined3d_state state; - /* Vertex Shader Declaration */ - IWineD3DVertexDeclaration *vertexDecl; - IWineD3DVertexShader *vertexShader; /* Vertex Shader Constants */ @@ -3036,7 +3035,7 @@ static inline BOOL use_vs(IWineD3DStateBlockImpl *stateblock) * stateblock->vertexShader implies a vertex declaration instead of ddraw * style strided data. */ return (stateblock->vertexShader - && !((IWineD3DVertexDeclarationImpl *)stateblock->vertexDecl)->position_transformed + && !stateblock->state.vertex_declaration->position_transformed && stateblock->device->vs_selected_mode != SHADER_NONE); }

1 0

Henri Verbeet : wined3d: Move texture bindings to wined3d_state.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: d728d5f0ec8159cbb8af2f11645b84269df4c966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d728d5f0ec8159cbb8af2f116… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 17 11:59:40 2010 +0200 wined3d: Move texture bindings to wined3d_state. --- dlls/wined3d/arb_program_shader.c | 14 ++++++------ dlls/wined3d/device.c | 27 ++++++++++++----------- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 39 +++++++++++++++------------------ dlls/wined3d/nvidia_texture_shader.c | 4 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 31 ++++++++++++++------------- dlls/wined3d/stateblock.c | 18 +++++++++------ dlls/wined3d/utils.c | 13 +++++------ dlls/wined3d/wined3d_private.h | 5 +--- 10 files changed, 77 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d728d5f0ec8159cbb8af2…

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
86
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 September 2010