September 2010 - Wine-Commits

Igor Paliychuk : ipconfig: Ukrainian translation update.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: 7d138aca122d1d531df7e60e1ae2564860100547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d138aca122d1d531df7e60e1… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Fri Sep 17 13:07:38 2010 +0300 ipconfig: Ukrainian translation update. --- programs/ipconfig/Uk.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Uk.rc b/programs/ipconfig/Uk.rc index 7b400cb..9f6d1b7 100644 --- a/programs/ipconfig/Uk.rc +++ b/programs/ipconfig/Uk.rc @@ -46,4 +46,6 @@ STRINGTABLE STRING_DESCRIPTION, "Опис" STRING_PHYS_ADDR, "Фізична адреса" STRING_DHCP_ENABLED, "DHCP ввімкнено" + STRING_YES, "Так" + STRING_NO, "Ні" }

1 0

Igor Paliychuk : shdocvw: Ukrainian translation update.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: f0afced6bd002933ac2cebbb6fe21ee75b2b93c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0afced6bd002933ac2cebbb6… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Fri Sep 17 13:07:00 2010 +0300 shdocvw: Ukrainian translation update. --- dlls/shdocvw/Uk.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Uk.rc b/dlls/shdocvw/Uk.rc index f7c51e6..95e1484 100644 --- a/dlls/shdocvw/Uk.rc +++ b/dlls/shdocvw/Uk.rc @@ -53,6 +53,7 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "Попередній пе&регляд...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "В&ластивості...", ID_BROWSE_PROPERTIES + MENUITEM "За&крити", ID_BROWSE_QUIT } POPUP "&Вигляд" {

1 0

Łukasz Wojniłowicz : jscript: Update the Polish translation.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

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: Adjust the AdminUser property too after applying a patch.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

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 : msi: Avoid a crash on database destruction.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

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 : shell32: Support FOLDERID_LocalAppDataLow.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

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

Hans Leidekker : msi: Read supported platform and language ids from the summary information stream .
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

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

Jacek Caban : include: Added more d3d9 error codes.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

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 texture' s target field to the base texture struct.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: 2e119ecd2828bce51225144053c7fbc0e809bef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e119ecd2828bce5122514405… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 17 11:59:38 2010 +0200 wined3d: Move the texture's target field to the base texture struct. --- dlls/wined3d/cubetexture.c | 5 ++++- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/volumetexture.c | 5 ++++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 13ec3a8..b64eab7 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -308,9 +308,11 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *i static UINT WINAPI IWineD3DCubeTextureImpl_GetTextureDimensions(IWineD3DCubeTexture *iface) { + IWineD3DCubeTextureImpl *texture = (IWineD3DCubeTextureImpl *)iface; + TRACE("iface %p.\n", iface); - return GL_TEXTURE_CUBE_MAP_ARB; + return texture->baseTexture.target; } static BOOL WINAPI IWineD3DCubeTextureImpl_IsCondNP2(IWineD3DCubeTexture *iface) @@ -538,6 +540,7 @@ HRESULT cubetexture_init(IWineD3DCubeTextureImpl *texture, UINT edge_length, UIN texture->baseTexture.pow2Matrix[15] = 1.0f; texture->baseTexture.pow2Matrix_identity = FALSE; } + texture->baseTexture.target = GL_TEXTURE_CUBE_MAP_ARB; /* Generate all the surfaces. */ tmp_w = edge_length; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a52d7c4..ff57104 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -327,7 +327,7 @@ static UINT WINAPI IWineD3DTextureImpl_GetTextureDimensions(IWineD3DTexture *ifa IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; TRACE("(%p)\n", This); - return This->target; + return This->baseTexture.target; } static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DTexture *iface) { @@ -556,7 +556,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT texture->baseTexture.pow2Matrix[5] = 1.0f; texture->baseTexture.pow2Matrix[10] = 1.0f; texture->baseTexture.pow2Matrix[15] = 1.0f; - texture->target = GL_TEXTURE_2D; + texture->baseTexture.target = GL_TEXTURE_2D; texture->cond_np2 = TRUE; texture->baseTexture.minMipLookup = minMipLookup_noFilter; } @@ -570,7 +570,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT texture->baseTexture.pow2Matrix[5] = (float)height; texture->baseTexture.pow2Matrix[10] = 1.0f; texture->baseTexture.pow2Matrix[15] = 1.0f; - texture->target = GL_TEXTURE_RECTANGLE_ARB; + texture->baseTexture.target = GL_TEXTURE_RECTANGLE_ARB; texture->cond_np2 = TRUE; if(texture->resource.format->Flags & WINED3DFMT_FLAG_FILTERING) @@ -598,7 +598,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT texture->baseTexture.pow2Matrix[10] = 1.0f; texture->baseTexture.pow2Matrix[15] = 1.0f; - texture->target = GL_TEXTURE_2D; + texture->baseTexture.target = GL_TEXTURE_2D; texture->cond_np2 = FALSE; } TRACE("xf(%f) yf(%f)\n", texture->baseTexture.pow2Matrix[0], texture->baseTexture.pow2Matrix[5]); @@ -621,7 +621,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT } surface_set_container((IWineD3DSurfaceImpl *)surface, WINED3D_CONTAINER_TEXTURE, (IWineD3DBase *)texture); - surface_set_texture_target((IWineD3DSurfaceImpl *)surface, texture->target); + surface_set_texture_target((IWineD3DSurfaceImpl *)surface, texture->baseTexture.target); texture->baseTexture.sub_resources[i] = (IWineD3DResourceImpl *)surface; TRACE("Created surface level %u @ %p.\n", i, surface); /* Calculate the next mipmap level. */ diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index a69ff68..742ac2f 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -244,9 +244,11 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTextur static UINT WINAPI IWineD3DVolumeTextureImpl_GetTextureDimensions(IWineD3DVolumeTexture *iface) { + IWineD3DVolumeTextureImpl *texture = (IWineD3DVolumeTextureImpl *)iface; + TRACE("iface %p.\n", iface); - return GL_TEXTURE_3D; + return texture->baseTexture.target; } static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DVolumeTexture *iface) @@ -453,6 +455,7 @@ HRESULT volumetexture_init(IWineD3DVolumeTextureImpl *texture, UINT width, UINT texture->baseTexture.pow2Matrix[5] = 1.0f; texture->baseTexture.pow2Matrix[10] = 1.0f; texture->baseTexture.pow2Matrix[15] = 1.0f; + texture->baseTexture.target = GL_TEXTURE_3D; /* Generate all the surfaces. */ tmp_w = width; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 90082ba..d542de0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1871,6 +1871,7 @@ typedef struct IWineD3DBaseTextureClass BOOL pow2Matrix_identity; const struct min_lookup *minMipLookup; const GLenum *magLookup; + GLenum target; void (*internal_preload)(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb); } IWineD3DBaseTextureClass; @@ -1917,7 +1918,6 @@ typedef struct IWineD3DTextureImpl IWineD3DBaseTextureClass baseTexture; /* IWineD3DTexture */ - UINT target; BOOL cond_np2; } IWineD3DTextureImpl;

1 0

Henri Verbeet : wined3d: Move texture bindings to wined3d_state.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

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