August 2006 - Wine-Commits - list.winehq.org

Francois Gouget : shell32: Add CLSID_CUrlHistory and CLSID_CURLSearchHook.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: a3191f7f16409f0c779d71d04dd9a0ce27d53417 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3191f7f16409f0c779d71d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 7 21:37:03 2006 +0200 shell32: Add CLSID_CUrlHistory and CLSID_CURLSearchHook. --- include/shlguid.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index bc25a4b..e5a7aff 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -72,6 +72,11 @@ DEFINE_SHLGUID(IID_IQueryInfo, /* DEFINE_SHLGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); */ /* DEFINE_SHLGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); */ +DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xaa, 0x00, 0x69, 0x46, 0xee); +#define SID_SUrlHistory CLSID_CUrlHistory + +DEFINE_GUID(CLSID_CURLSearchHook, 0xcfbfae00, 0x17a6, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x44, 0x97); + DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40L, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); #define SID_SShellBrowser IID_IShellBrowser

1 0

Francois Gouget : mlang: Fix the 'Multi Language String' CLSID: there is no {44EC053A-B70D-11D0-B188-00AA0038C969} CLSID in the Windows registry .
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: 0c1586e8f0e484c34547f2704d9c7e1afa9d11e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c1586e8f0e484c34547f27… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 7 21:17:37 2006 +0200 mlang: Fix the 'Multi Language String' CLSID: there is no {44EC053A-B70D-11D0-B188-00AA0038C969} CLSID in the Windows registry. --- dlls/mlang/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/regsvr.c b/dlls/mlang/regsvr.c index d8edac5..ea83b1d 100644 --- a/dlls/mlang/regsvr.c +++ b/dlls/mlang/regsvr.c @@ -37,7 +37,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mlang); DEFINE_GUID( CLSID_MLANGSupport, 0x275c23e2,0x3747,0x11d0,0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46 ); -DEFINE_GUID( CLSID_MLANGString, 0x44ec053a,0xb70d,0x11d0,0xb1,0x88,0x00,0xaa,0x00,0x38,0xc9,0x69 ); +DEFINE_GUID( CLSID_MLANGString, 0xc04d65cf, 0xb70d, 0x11d0, 0xb1,0x88, 0x00,0xaa,0x00,0x38,0xc9,0x69); DEFINE_GUID( CLSID_MLANGCharSet, 0xd66d6f99,0xcdaa,0x11d0,0xb8,0x22,0x00,0xC0,0x4f,0xc9,0xb3,0x1f ); /*

1 0

Francois Gouget : inseng: Switch to the standard regsvr.c registration code .
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: feab43c7ba2296063de08498ec0d31f86116464d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=feab43c7ba2296063de0849… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 7 21:38:56 2006 +0200 inseng: Switch to the standard regsvr.c registration code. Now the CLSID_DLManager and CLSID_ActiveSetupEng keys get proper display names. This also gives us DllUnregisterServer() for free. --- dlls/inseng/Makefile.in | 3 dlls/inseng/inseng.spec | 2 dlls/inseng/inseng_main.c | 44 ---- dlls/inseng/regsvr.c | 563 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 566 insertions(+), 46 deletions(-) create mode 100644 dlls/inseng/regsvr.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=feab43c7ba2296063de…

1 0

Francois Gouget : itss: Register CLSID_ITSProtocol. Tweak the registration code (via copy/paste) so we can register its VersionIndependentProgID.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: b684e9d6521acf2f8f370ce0a9e7682cb3cadd83 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b684e9d6521acf2f8f370ce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 7 21:42:19 2006 +0200 itss: Register CLSID_ITSProtocol. Tweak the registration code (via copy/paste) so we can register its VersionIndependentProgID. --- dlls/itss/regsvr.c | 103 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 89 insertions(+), 14 deletions(-) diff --git a/dlls/itss/regsvr.c b/dlls/itss/regsvr.c index 5c848af..675af8a 100644 --- a/dlls/itss/regsvr.c +++ b/dlls/itss/regsvr.c @@ -61,8 +61,9 @@ struct regsvr_coclass LPCSTR ips; /* can be NULL to omit */ LPCSTR ips32; /* can be NULL to omit */ LPCSTR ips32_tmodel; /* can be NULL to omit */ - LPCSTR clsid_str; /* can be NULL to omit */ LPCSTR progid; /* can be NULL to omit */ + LPCSTR viprogid; /* can be NULL to omit */ + LPCSTR progid_extra; /* can be NULL to omit */ }; static HRESULT register_coclasses(struct regsvr_coclass const *list); @@ -86,6 +87,8 @@ static WCHAR const ps_clsid32_keyname[17 'i', 'd', '3', '2', 0 }; static WCHAR const clsid_keyname[6] = { 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const curver_keyname[7] = { + 'C', 'u', 'r', 'V', 'e', 'r', 0 }; static WCHAR const ips_keyname[13] = { 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', 0 }; @@ -94,7 +97,16 @@ static WCHAR const ips32_keyname[15] = { '3', '2', 0 }; static WCHAR const progid_keyname[7] = { 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const viprogid_keyname[25] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', + 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', + 0 }; static char const tmodel_valuename[] = "ThreadingModel"; +static WCHAR const lcs32_keyname[] = { + 'L','o','c','a','l','S','e','r','v','e','r','3','2',0 }; +static const WCHAR szIERelPath[] = { + 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\', + 'i','e','x','p','l','o','r','e','.','e','x','e',0 }; /*********************************************************************** * static helper functions @@ -104,6 +116,9 @@ static LONG register_key_defvalueW(HKEY WCHAR const *value); static LONG register_key_defvalueA(HKEY base, WCHAR const *name, char const *value); +static LONG register_progid(WCHAR const *clsid, + char const *progid, char const *curver_progid, + char const *name, char const *extra); static LONG recursive_delete_key(HKEY key); static LONG recursive_delete_keyA(HKEY base, char const *name); static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); @@ -255,26 +270,23 @@ static HRESULT register_coclasses(struct if (res != ERROR_SUCCESS) goto error_close_clsid_key; } - if (list->clsid_str) { - res = register_key_defvalueA(clsid_key, clsid_keyname, - list->clsid_str); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - if (list->progid) { - HKEY progid_key; - res = register_key_defvalueA(clsid_key, progid_keyname, list->progid); if (res != ERROR_SUCCESS) goto error_close_clsid_key; - res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &progid_key, NULL); + res = register_progid(buf, list->progid, NULL, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->viprogid) { + res = register_key_defvalueA(clsid_key, viprogid_keyname, + list->viprogid); if (res != ERROR_SUCCESS) goto error_close_clsid_key; - res = register_key_defvalueW(progid_key, clsid_keyname, buf); - RegCloseKey(progid_key); + res = register_progid(buf, list->viprogid, list->progid, + list->name, list->progid_extra); if (res != ERROR_SUCCESS) goto error_close_clsid_key; } @@ -312,6 +324,11 @@ static HRESULT unregister_coclasses(stru res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); if (res != ERROR_SUCCESS) goto error_close_coclass_key; } + + if (list->viprogid) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } } error_close_coclass_key: @@ -372,6 +389,56 @@ static LONG register_key_defvalueA( } /*********************************************************************** + * regsvr_progid + */ +static LONG register_progid( + WCHAR const *clsid, + char const *progid, + char const *curver_progid, + char const *name, + char const *extra) +{ + LONG res; + HKEY progid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) return res; + + if (name) { + res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, + (CONST BYTE*)name, strlen(name) + 1); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (clsid) { + res = register_key_defvalueW(progid_key, clsid_keyname, clsid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (curver_progid) { + res = register_key_defvalueA(progid_key, curver_keyname, + curver_progid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (extra) { + HKEY extra_key; + + res = RegCreateKeyExA(progid_key, extra, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &extra_key, NULL); + if (res == ERROR_SUCCESS) + RegCloseKey(extra_key); + } + +error_close_progid_key: + RegCloseKey(progid_key); + return res; +} + +/*********************************************************************** * recursive_delete_key */ static LONG recursive_delete_key(HKEY key) @@ -446,6 +513,14 @@ static struct regsvr_coclass const cocla "itss.dll", "Both" }, + { &CLSID_ITSProtocol, + "Microsoft InforTech Protocol for IE 3.0", + NULL, + "itss.dll", + "Both", + "MSITFS1.0", + "MSITFS" + }, { NULL } /* list terminator */ };

1 0

Francois Gouget : oleaut32: Set some missing ProxyStubClsid fields.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: aab7d2e78a125c124b11d9a3f30db93d47736434 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aab7d2e78a125c124b11d9a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 7 21:50:17 2006 +0200 oleaut32: Set some missing ProxyStubClsid fields. --- dlls/oleaut32/regsvr.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/regsvr.c b/dlls/oleaut32/regsvr.c index 636a4a5..b1dd714 100644 --- a/dlls/oleaut32/regsvr.c +++ b/dlls/oleaut32/regsvr.c @@ -542,28 +542,28 @@ static struct regsvr_interface const int "ITypeInfo", NULL, 22, - NULL, + &CLSID_PSTypeInfo, &CLSID_PSTypeInfo }, { &IID_ITypeLib, "ITypeLib", NULL, 13, - NULL, + &CLSID_PSTypeLib, &CLSID_PSTypeLib }, { &IID_ITypeComp, "ITypeComp", NULL, 5, - NULL, + &CLSID_PSTypeComp, &CLSID_PSTypeComp }, { &IID_IEnumVARIANT, "IEnumVARIANT", NULL, 15, - NULL, + &CLSID_PSEnumVariant, &CLSID_PSEnumVariant }, { &IID_ICreateTypeInfo,

1 0

Andrew Talbot : shell32: Write-strings warnings fix.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: 5d0e4ba0eb196418d7e3cbf93e32cb6d9fae2428 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d0e4ba0eb196418d7e3cbf… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Aug 7 19:03:40 2006 +0100 shell32: Write-strings warnings fix. --- dlls/shell32/dialogs.c | 2 +- dlls/shell32/shellord.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 4c40246..3a49933 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -247,7 +247,7 @@ void FillList (HWND hCb, char *pszLatest if (ERROR_SUCCESS != RegCreateKeyExA ( HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\RunMRU", - 0, "", REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL)) + 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL)) MessageBoxA (hCb, "Unable to open registry key !", "Nix", MB_OK) ; RegQueryValueExA (hkey, "MRUList", NULL, NULL, NULL, &icList) ; diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index a6216d3..c1f953b 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -522,7 +522,7 @@ SignalFileOpen (DWORD dwParam1) * RETURNS * result of the SHQueryValueEx call */ -static INT SHADD_get_policy(LPSTR policy, LPDWORD type, LPVOID buffer, LPDWORD len) +static INT SHADD_get_policy(LPCSTR policy, LPDWORD type, LPVOID buffer, LPDWORD len) { HKEY Policy_basekey; INT ret;

1 0

Francois Gouget : ole32: Add a BaseInterface where needed.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: 9ed9398ebea814812ee4a706bf6cb176d10ae7ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9ed9398ebea814812ee4a70… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 7 21:54:38 2006 +0200 ole32: Add a BaseInterface where needed. --- dlls/ole32/regsvr.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index 1b141ca..21474d6 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -499,6 +499,7 @@ static struct regsvr_coclass const cocla */ #define INTERFACE_ENTRY(interface, base, clsid32, clsid16) { &IID_##interface, #interface, base, sizeof(interface##Vtbl)/sizeof(void*), clsid16, clsid32 } +#define BAS_INTERFACE_ENTRY(interface, base) INTERFACE_ENTRY(interface, &IID_##base, &CLSID_PSFactoryBuffer, NULL) #define STD_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, &CLSID_PSFactoryBuffer, NULL) #define LCL_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, NULL, NULL) @@ -512,7 +513,7 @@ static const struct regsvr_interface int STD_INTERFACE_ENTRY(IStream), STD_INTERFACE_ENTRY(IEnumSTATSTG), STD_INTERFACE_ENTRY(IBindCtx), - STD_INTERFACE_ENTRY(IMoniker), + BAS_INTERFACE_ENTRY(IMoniker, IPersistStream), STD_INTERFACE_ENTRY(IRunningObjectTable), STD_INTERFACE_ENTRY(IRootStorage), LCL_INTERFACE_ENTRY(IMessageFilter), @@ -526,9 +527,9 @@ static const struct regsvr_interface int STD_INTERFACE_ENTRY(IEnumFORMATETC), STD_INTERFACE_ENTRY(IEnumOLEVERB), STD_INTERFACE_ENTRY(IEnumSTATDATA), - STD_INTERFACE_ENTRY(IPersistStream), - STD_INTERFACE_ENTRY(IPersistStorage), - STD_INTERFACE_ENTRY(IPersistFile), + BAS_INTERFACE_ENTRY(IPersistStream, IPersist), + BAS_INTERFACE_ENTRY(IPersistStorage, IPersist), + BAS_INTERFACE_ENTRY(IPersistFile, IPersist), STD_INTERFACE_ENTRY(IPersist), STD_INTERFACE_ENTRY(IViewObject), STD_INTERFACE_ENTRY(IDataObject), @@ -536,24 +537,24 @@ static const struct regsvr_interface int LCL_INTERFACE_ENTRY(IDataAdviseHolder), LCL_INTERFACE_ENTRY(IOleAdviseHolder), STD_INTERFACE_ENTRY(IOleObject), - STD_INTERFACE_ENTRY(IOleInPlaceObject), + BAS_INTERFACE_ENTRY(IOleInPlaceObject, IOleWindow), STD_INTERFACE_ENTRY(IOleWindow), - STD_INTERFACE_ENTRY(IOleInPlaceUIWindow), + BAS_INTERFACE_ENTRY(IOleInPlaceUIWindow, IOleWindow), STD_INTERFACE_ENTRY(IOleInPlaceFrame), - STD_INTERFACE_ENTRY(IOleInPlaceActiveObject), + BAS_INTERFACE_ENTRY(IOleInPlaceActiveObject, IOleWindow), STD_INTERFACE_ENTRY(IOleClientSite), - STD_INTERFACE_ENTRY(IOleInPlaceSite), + BAS_INTERFACE_ENTRY(IOleInPlaceSite, IOleWindow), STD_INTERFACE_ENTRY(IParseDisplayName), - STD_INTERFACE_ENTRY(IOleContainer), - STD_INTERFACE_ENTRY(IOleItemContainer), + BAS_INTERFACE_ENTRY(IOleContainer, IParseDisplayName), + BAS_INTERFACE_ENTRY(IOleItemContainer, IOleContainer), STD_INTERFACE_ENTRY(IOleLink), STD_INTERFACE_ENTRY(IOleCache), LCL_INTERFACE_ENTRY(IDropSource), STD_INTERFACE_ENTRY(IDropTarget), - STD_INTERFACE_ENTRY(IAdviseSink2), + BAS_INTERFACE_ENTRY(IAdviseSink2, IAdviseSink), STD_INTERFACE_ENTRY(IRunnableObject), - STD_INTERFACE_ENTRY(IViewObject2), - STD_INTERFACE_ENTRY(IOleCache2), + BAS_INTERFACE_ENTRY(IViewObject2, IViewObject), + BAS_INTERFACE_ENTRY(IOleCache2, IOleCache), STD_INTERFACE_ENTRY(IOleCacheControl), STD_INTERFACE_ENTRY(IRemUnknown), LCL_INTERFACE_ENTRY(IClientSecurity),

1 0

James Hawkins : wintrust: Always return ERROR_SUCCESS in WinVerifyTrust.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: f5e0195be642117e0380db1bbdf8d1a55cb4e383 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f5e0195be642117e0380db1… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 7 11:11:10 2006 -0700 wintrust: Always return ERROR_SUCCESS in WinVerifyTrust. --- dlls/wintrust/wintrust_main.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 6c56fcb..3ecbf90 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -100,26 +100,14 @@ BOOL WINAPI TrustIsCertificateSelfSigned */ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, WINTRUST_DATA* ActionData ) { - static const GUID gen_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; - FIXME("%p %s %p\n", hwnd, debugstr_guid(ActionID), ActionData); /* Trust providers can be found at: * HKLM\SOFTWARE\Microsoft\Cryptography\Providers\Trust\CertCheck\ * - * Process Explorer expects a correct implementation, so we - * return TRUST_E_PROVIDER_UNKNOWN. - * - * Girotel needs ERROR_SUCCESS. - * - * For now return TRUST_E_PROVIDER_UNKNOWN only when - * ActionID = WINTRUST_ACTION_GENERIC_VERIFY_V2. - * + * Process Explorer is now happy with ERROR_SUCCESS */ - if (IsEqualCLSID(ActionID, &gen_verify_v2)) - return TRUST_E_PROVIDER_UNKNOWN; - return ERROR_SUCCESS; }

1 0

Roderick Colenbrander : wined3d: Textureops caps fix.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: 91998b4d99d3cb370227307b0dc68f3606c5b67e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91998b4d99d3cb370227307… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Aug 7 20:09:24 2006 +0200 wined3d: Textureops caps fix. --- dlls/wined3d/directx.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7da6b9d..62f858a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1950,10 +1950,7 @@ #endif D3DTEXOPCAPS_SELECTARG1 | D3DTEXOPCAPS_SELECTARG2 | D3DTEXOPCAPS_DISABLE; -#if defined(GL_VERSION_1_3) - *pCaps->TextureOpCaps |= D3DTEXOPCAPS_DOTPRODUCT3 | - D3DTEXOPCAPS_SUBTRACT; -#endif + if (GL_SUPPORT(ARB_TEXTURE_ENV_COMBINE) || GL_SUPPORT(EXT_TEXTURE_ENV_COMBINE) || GL_SUPPORT(NV_TEXTURE_ENV_COMBINE4)) { @@ -1961,7 +1958,8 @@ #endif D3DTEXOPCAPS_BLENDTEXTUREALPHA | D3DTEXOPCAPS_BLENDFACTORALPHA | D3DTEXOPCAPS_BLENDCURRENTALPHA | - D3DTEXOPCAPS_LERP; + D3DTEXOPCAPS_LERP | + D3DTEXOPCAPS_SUBTRACT; } if (GL_SUPPORT(NV_TEXTURE_ENV_COMBINE4)) { *pCaps->TextureOpCaps |= D3DTEXOPCAPS_ADDSMOOTH | @@ -1970,7 +1968,15 @@ #endif D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA | D3DTEXOPCAPS_BLENDTEXTUREALPHAPM; } + if (GL_SUPPORT(ARB_TEXTURE_ENV_DOT3)) + *pCaps->TextureOpCaps |= D3DTEXOPCAPS_DOTPRODUCT3; + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { + *pCaps->TextureOpCaps |= D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR | + D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA; + } + + #if 0 *pCaps->TextureOpCaps |= D3DTEXOPCAPS_BUMPENVMAP; /* FIXME: Add

1 0

Andrew Talbot : user/tests: Write-strings and cast-qual warnings fix.
by Alexandre Julliard Aug. 8, 2006

Aug. 8, 2006

Module: wine Branch: refs/heads/master Commit: 47b90d6b1109ced2eb1e4eeb208644f353085483 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=47b90d6b1109ced2eb1e4ee… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Aug 7 20:52:33 2006 +0100 user/tests: Write-strings and cast-qual warnings fix. --- dlls/user/tests/sysparams.c | 2 +- dlls/user/tests/text.c | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/user/tests/sysparams.c b/dlls/user/tests/sysparams.c index d5f20ce..93f125d 100644 --- a/dlls/user/tests/sysparams.c +++ b/dlls/user/tests/sysparams.c @@ -336,7 +336,7 @@ #define test_reg_key_ex2( subKey1, subKe /* get a metric from the registry. If the value is negative * it is assumed to be in twips and converted to pixels */ -static UINT metricfromreg( char *keyname, char *valname, int dpi) +static UINT metricfromreg( const char *keyname, const char *valname, int dpi) { HKEY hkey; char buf[64]; diff --git a/dlls/user/tests/text.c b/dlls/user/tests/text.c index a25b3bf..f5e3703 100644 --- a/dlls/user/tests/text.c +++ b/dlls/user/tests/text.c @@ -33,12 +33,13 @@ static void test_DrawTextCalcRect(void) HDC hdc; HFONT hFont, hOldFont; LOGFONTA lf; - const char text[] = "Example text for testing DrawText in " + static CHAR text[] = "Example text for testing DrawText in " "MM_HIENGLISH mode"; - const WCHAR textW[] = {'W','i','d','e',' ','c','h','a','r',' ', + static WCHAR textW[] = {'W','i','d','e',' ','c','h','a','r',' ', 's','t','r','i','n','g','\0'}; - const WCHAR emptystringW[] = { 0 }; - INT textlen,textheight; + static CHAR emptystring[] = ""; + static WCHAR emptystringW[] = { 0 }; + INT textlen, textheight; RECT rect = { 0, 0, 100, 0 }; BOOL ret; @@ -106,12 +107,12 @@ static void test_DrawTextCalcRect(void) /* note: testing the function's return value is useless, it differs * ( 0 or 1) on every Windows version I tried */ SetRect( &rect, 10,10, 100, 100); - textheight = DrawTextExA(hdc, (char *) text, 0, &rect, DT_CALCRECT, NULL ); + textheight = DrawTextExA(hdc, text, 0, &rect, DT_CALCRECT, NULL ); ok( !(rect.left == rect.right && rect.bottom == rect.top), "rectangle should NOT be empty.\n"); SetRect( &rect, 10,10, 100, 100); SetLastError( 0); - textheight = DrawTextExA(hdc, "", -1, &rect, DT_CALCRECT, NULL ); + textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT, NULL ); ok( (rect.left == rect.right && rect.bottom == rect.top), "rectangle should be empty.\n"); SetRect( &rect, 10,10, 100, 100); @@ -127,12 +128,12 @@ static void test_DrawTextCalcRect(void) /* Wide char versions */ SetRect( &rect, 10,10, 100, 100); SetLastError( 0); - textheight = DrawTextExW(hdc, (WCHAR *) textW, 0, &rect, DT_CALCRECT, NULL ); + textheight = DrawTextExW(hdc, textW, 0, &rect, DT_CALCRECT, NULL ); if( GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) { ok( !(rect.left == rect.right && rect.bottom == rect.top), "rectangle should NOT be empty.\n"); SetRect( &rect, 10,10, 100, 100); - textheight = DrawTextExW(hdc, (WCHAR *) emptystringW, -1, &rect, DT_CALCRECT, NULL ); + textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT, NULL ); ok( (rect.left == rect.right && rect.bottom == rect.top), "rectangle should be empty.\n"); SetRect( &rect, 10,10, 100, 100); @@ -144,7 +145,7 @@ static void test_DrawTextCalcRect(void) ok( !(rect.left == rect.right && rect.bottom == rect.top), "rectangle should NOT be empty.\n"); } - + SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %lu\n", GetLastError()); @@ -157,7 +158,7 @@ static void test_DrawTextCalcRect(void) } /* replace tabs by \t */ -static void strfmt( char *str, char *strout) +static void strfmt( const char *str, char *strout) { unsigned int i,j ; for(i=0,j=0;i<=strlen(str);i++,j++) @@ -166,7 +167,7 @@ static void strfmt( char *str, char *str strout[j]='t'; } } - + #define TABTEST( tabval, tabcount, string, _exp) \ { int i,x_act, x_exp; char strdisp[64];\

1 0