September 2006 - Wine-Commits

Andrew Talbot : comdlg32: Cast-qual warnings fix.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 778d5d65e8c5da35691e397768a783b2e5a9967f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=778d5d65e8c5da35691e397… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Sep 2 16:33:45 2006 +0100 comdlg32: Cast-qual warnings fix. --- dlls/comdlg32/colordlg.c | 2 +- dlls/comdlg32/filedlg.c | 2 +- dlls/comdlg32/filedlg31.c | 6 +++--- dlls/comdlg32/filedlgbrowser.c | 4 ++-- dlls/comdlg32/fontdlg.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index ca758e3..92523b3 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -1344,7 +1344,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpcc->lpTemplateName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, (LPWSTR)lpcc->lpTemplateName, len ); } else { - lpcc->lpTemplateName = (LPWSTR)lpChCol->lpTemplateName; + lpcc->lpTemplateName = (LPCWSTR)lpChCol->lpTemplateName; } } diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index d2bb63c..a3e9aa5 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -293,7 +293,7 @@ static BOOL WINAPI GetFileName95(FileOpe (LPARAM) fodInfos); else lRes = DialogBoxIndirectParamA(COMDLG32_hInstance, - (LPDLGTEMPLATEA) template, + (LPCDLGTEMPLATEA) template, fodInfos->ofnInfos->hwndOwner, FileOpenDlgProc95, (LPARAM) fodInfos); diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 55c94b8..7e1de22 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -167,7 +167,7 @@ static BOOL FD31_ScanDir(HWND hWnd, LPWS * FD31_GetFileType [internal] */ -static LPWSTR FD31_GetFileType(LPWSTR cfptr, LPWSTR fptr, WORD index) +static LPCWSTR FD31_GetFileType(LPCWSTR cfptr, LPCWSTR fptr, const WORD index) { int n, i; i = 0; @@ -187,7 +187,7 @@ static LPWSTR FD31_GetFileType(LPWSTR cf return fptr; fptr += lstrlenW(fptr) + 1; } - return (LPWSTR) FILE_star; /* FIXME */ + return FILE_star; /* FIXME */ } /*********************************************************************** @@ -743,7 +743,7 @@ void FD31_MapOfnStructA(const LPOPENFILE ofnW->lpTemplateName = usBuffer.Buffer; } else /* numbered resource */ - ofnW->lpTemplateName = (LPWSTR) ofnA->lpTemplateName; + ofnW->lpTemplateName = (LPCWSTR) ofnA->lpTemplateName; } } diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 1ec37ca..8f04736 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -389,7 +389,7 @@ static HRESULT WINAPI IShellBrowserImpl_ } /* create an absolute pidl */ pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent, - (LPITEMIDLIST)pidl); + (LPCITEMIDLIST)pidl); } else if(wFlags & SBSP_PARENT) { @@ -401,7 +401,7 @@ static HRESULT WINAPI IShellBrowserImpl_ else /* SBSP_ABSOLUTE is 0x0000 */ { /* An absolute pidl (relative from the desktop) */ - pidlTmp = COMDLG32_PIDL_ILClone((LPITEMIDLIST)pidl); + pidlTmp = COMDLG32_PIDL_ILClone((LPCITEMIDLIST)pidl); psfTmp = GetShellFolderFromPidl(pidlTmp); } diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 5def9a3..4db8d22 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -341,7 +341,7 @@ static INT WINAPI FontFamilyEnumProc(con { LPCFn_ENUMSTRUCT e; e=(LPCFn_ENUMSTRUCT)lParam; - return AddFontFamily( lpElfex, (NEWTEXTMETRICEXW *) metrics, + return AddFontFamily( lpElfex, (const NEWTEXTMETRICEXW *) metrics, dwFontType, e->lpcf32w, e->hWnd1, e); }

1 0

Andrew Talbot : comdlg32: Cast-qual warnings fix.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: a1cb75e91b65422f6e364fc821d74e3460f753e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1cb75e91b65422f6e364fc… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Sep 1 20:22:35 2006 +0100 comdlg32: Cast-qual warnings fix. --- dlls/comdlg32/colordlg16.c | 4 ++-- dlls/comdlg32/filedlg16.c | 4 ++-- dlls/comdlg32/finddlg16.c | 2 +- dlls/comdlg32/fontdlg16.c | 4 ++-- dlls/comdlg32/printdlg16.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/colordlg16.c b/dlls/comdlg32/colordlg16.c index 3ab94cb..a3d651a 100644 --- a/dlls/comdlg32/colordlg16.c +++ b/dlls/comdlg32/colordlg16.c @@ -400,7 +400,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOL HANDLE16 hDlgTmpl16 = 0, hResource16 = 0; HGLOBAL16 hGlobal16 = 0; BOOL16 bRet = FALSE; - LPCVOID template; + LPVOID template; FARPROC16 ptr; TRACE("ChooseColor\n"); @@ -458,7 +458,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOL GlobalFree16(hGlobal16); return FALSE; } - ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template); + ConvertDialog32To16(template32, size, template); hDlgTmpl16 = hGlobal16; } diff --git a/dlls/comdlg32/filedlg16.c b/dlls/comdlg32/filedlg16.c index 294a5c5..55a3e0f 100644 --- a/dlls/comdlg32/filedlg16.c +++ b/dlls/comdlg32/filedlg16.c @@ -89,7 +89,7 @@ static BOOL FD16_GetTemplate(PFD31_DATA { PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632; LPOPENFILENAME16 ofn16 = priv->ofn16; - LPCVOID template; + LPVOID template; HGLOBAL16 hGlobal16 = 0; if (ofn16->Flags & OFN_ENABLETEMPLATEHANDLE) @@ -146,7 +146,7 @@ static BOOL FD16_GetTemplate(PFD31_DATA GlobalFree16(hGlobal16); return FALSE; } - ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template); + ConvertDialog32To16(template32, size, template); priv->hDlgTmpl16 = hGlobal16; priv->hGlobal16 = hGlobal16; } diff --git a/dlls/comdlg32/finddlg16.c b/dlls/comdlg32/finddlg16.c index c842376..a86e5eb 100644 --- a/dlls/comdlg32/finddlg16.c +++ b/dlls/comdlg32/finddlg16.c @@ -137,7 +137,7 @@ static BOOL FINDDLG_Get16BitsTemplate(LF GlobalFree16(hGlobal16); return FALSE; } - ConvertDialog32To16((LPVOID)template32, size, (LPVOID)lfr->template); + ConvertDialog32To16(template32, size, (LPVOID)lfr->template); lfr->hDlgTmpl16 = hGlobal16; lfr->hGlobal16 = hGlobal16; } diff --git a/dlls/comdlg32/fontdlg16.c b/dlls/comdlg32/fontdlg16.c index 4fd0d2f..a90dca2 100644 --- a/dlls/comdlg32/fontdlg16.c +++ b/dlls/comdlg32/fontdlg16.c @@ -167,7 +167,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT1 HANDLE16 hDlgTmpl16 = 0, hResource16 = 0; HGLOBAL16 hGlobal16 = 0; BOOL16 bRet = FALSE; - LPCVOID template; + LPVOID template; FARPROC16 ptr; CHOOSEFONTW cf32w; LOGFONTW lf32w; @@ -241,7 +241,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT1 GlobalFree16(hGlobal16); return FALSE; } - ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template); + ConvertDialog32To16(template32, size, template); hDlgTmpl16 = hGlobal16; } diff --git a/dlls/comdlg32/printdlg16.c b/dlls/comdlg32/printdlg16.c index 9d5f9dc..65384c1 100644 --- a/dlls/comdlg32/printdlg16.c +++ b/dlls/comdlg32/printdlg16.c @@ -260,7 +260,7 @@ static HGLOBAL16 PRINTDLG_Get16TemplateF GlobalFree16(hGlobal16); return 0; } - ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template); + ConvertDialog32To16(template32, size, template); GlobalUnlock16(hGlobal16); return hGlobal16; }

1 0

Andrew Talbot : crypt32/tests: Cast-qual warning fix.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 572c2c273fb70c6e1e7d11aec760775f09283baa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=572c2c273fb70c6e1e7d11a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Sep 5 17:04:17 2006 +0100 crypt32/tests: Cast-qual warning fix. --- dlls/crypt32/tests/oid.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index c5d2689..0eb68c4 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -430,7 +430,7 @@ static void test_enumOIDInfo(void) static void test_findOIDInfo(void) { - static const WCHAR sha1[] = { 's','h','a','1',0 }; + static WCHAR sha1[] = { 's','h','a','1',0 }; static CHAR oid_rsa_md5[] = szOID_RSA_MD5; ALG_ID alg = CALG_SHA1; ALG_ID algs[2] = { CALG_MD5, CALG_RSA_SIGN }; @@ -447,7 +447,7 @@ static void test_findOIDInfo(void) ok(U(*info).Algid == CALG_MD5, "Expected CALG_MD5, got %d\n", U(*info).Algid); } - info = CryptFindOIDInfo(CRYPT_OID_INFO_NAME_KEY, (void *)sha1, 0); + info = CryptFindOIDInfo(CRYPT_OID_INFO_NAME_KEY, sha1, 0); ok(info != NULL, "Expected to find sha1\n"); if (info) {

1 0

Andrew Talbot : crypt32: Cast-qual warnings fix.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 950b838e2865e4a442d54fbd103f17ff36a3d0ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=950b838e2865e4a442d54fb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Sep 5 14:50:22 2006 +0100 crypt32: Cast-qual warnings fix. --- dlls/crypt32/encode.c | 6 +++--- dlls/crypt32/protectdata.c | 8 ++++---- dlls/crypt32/str.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 9d9aca4..cd70eca 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1019,7 +1019,7 @@ static BOOL WINAPI CRYPT_AsnEncodeNameVa __TRY { - const CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo; + const CERT_NAME_VALUE *value = (const CERT_NAME_VALUE *)pvStructInfo; switch (value->dwValueType) { @@ -1159,7 +1159,7 @@ static BOOL WINAPI CRYPT_AsnEncodeRdnAtt static int BLOBComp(const void *l, const void *r) { - CRYPT_DER_BLOB *a = (CRYPT_DER_BLOB *)l, *b = (CRYPT_DER_BLOB *)r; + const CRYPT_DER_BLOB *a = (const CRYPT_DER_BLOB *)l, *b = (const CRYPT_DER_BLOB *)r; int ret; if (!(ret = memcmp(a->pbData, b->pbData, min(a->cbData, b->cbData)))) @@ -1564,7 +1564,7 @@ static BOOL WINAPI CRYPT_AsnEncodeUnicod __TRY { - const CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo; + const CERT_NAME_VALUE *value = (const CERT_NAME_VALUE *)pvStructInfo; switch (value->dwValueType) { diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 4b7cfc9..75846e7 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -555,7 +555,7 @@ void free_protect_data(struct protect_da /* copies a string into a data blob */ static -BYTE * convert_str_to_blob(char* str, DATA_BLOB* blob) +BYTE *convert_str_to_blob(LPCSTR str, DATA_BLOB *blob) { if (!str || !blob) return NULL; @@ -590,11 +590,11 @@ BOOL fill_protect_data(struct protect_da pInfo->count0=0x0001; - convert_str_to_blob((char*)crypt_magic_str,&pInfo->info0); + convert_str_to_blob(crypt_magic_str, &pInfo->info0); pInfo->count1=0x0001; - convert_str_to_blob((char*)crypt_magic_str,&pInfo->info1); + convert_str_to_blob(crypt_magic_str, &pInfo->info1); pInfo->null0=0x0000; @@ -606,7 +606,7 @@ BOOL fill_protect_data(struct protect_da pInfo->unknown0=0x0000; pInfo->unknown1=0x0000; - convert_str_to_blob((char*)crypt_magic_str,&pInfo->data0); + convert_str_to_blob(crypt_magic_str, &pInfo->data0); pInfo->null1=0x0000; pInfo->unknown2=0x0000; diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 415cc43..e118748 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -572,7 +572,7 @@ static DWORD CRYPT_GetNextValueW(LPCWSTR while (*separators) map[*separators++] = 1; - while (*str && (*str >= 0xff || !map[*(unsigned short *)str])) + while (*str && (*str >= 0xff || !map[*(const unsigned short *)str])) str++; token->end = str; }

1 0

Louis. Lenders : shfolder: Add version resource.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: c0d2923cc13dbef1684725bb5d45adb678bcfcc2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0d2923cc13dbef1684725b… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Sep 3 21:14:12 2006 +0100 shfolder: Add version resource. --- dlls/shfolder/Makefile.in | 2 ++ dlls/shfolder/version.rc | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) create mode 100644 dlls/shfolder/version.rc diff --git a/dlls/shfolder/Makefile.in b/dlls/shfolder/Makefile.in index b497a22..479d5b7 100644 --- a/dlls/shfolder/Makefile.in +++ b/dlls/shfolder/Makefile.in @@ -8,6 +8,8 @@ IMPORTS = shell32 kernel32 C_SRCS = shfolder_main.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/shfolder/version.rc b/dlls/shfolder/version.rc new file mode 100644 index 0000000..726bd7f --- /dev/null +++ b/dlls/shfolder/version.rc @@ -0,0 +1,25 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine Shell Folder Service" +#define WINE_FILENAME_STR "shfolder.dll" +#define WINE_FILEVERSION 6,00,2800,1106 +#define WINE_FILEVERSION_STR "6,00,2800,1106" +#define WINE_PRODUCTVERSION 6,00,2800,1106 +#define WINE_PRODUCTVERSION_STR "6,00,2800,1106" + +#include "wine/wine_common_ver.rc"

1 0

Louis. Lenders : shlwapi: Simple test for UrlCanonicalizeA.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 531ee64e79609febf6f689a6a086e7ccc06d3562 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=531ee64e79609febf6f689a… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Sep 3 19:17:23 2006 +0100 shlwapi: Simple test for UrlCanonicalizeA. --- dlls/shlwapi/tests/path.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 3d90ada..f700038 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -488,6 +488,7 @@ static void test_UrlCanonicalize(void) unsigned int i; CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; DWORD dwSize; + HRESULT hr; for(i=0; i<sizeof(TEST_CANONICALIZE)/sizeof(TEST_CANONICALIZE[0]); i++) { test_url_canonicalize(TEST_CANONICALIZE[i].url, TEST_CANONICALIZE[i].flags, @@ -500,6 +501,14 @@ static void test_UrlCanonicalize(void) todo_wine { ok(strcmp(szReturnUrl,"file:///c:/tests/foo%20bar")==0, "UrlCanonicalizeA got %s\n", szReturnUrl); } + + dwSize = sizeof szReturnUrl; + /*LimeWire online installer calls this*/ + hr = UrlCanonicalizeA("/uri-res/N2R?urn:sha1:B3K", szReturnUrl, &dwSize,URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/); + ok(hr==S_OK,"UrlCanonicalizeA returned 0x%08lx instead of S_OK\n", hr); + todo_wine { + ok(strcmp(szReturnUrl,"/uri-res/N2R?urn:sha1:B3K")==0, "UrlCanonicalizeA got \"%s\" instead of \"/uri-res/N2R?urn:sha1:B3K\"\n", szReturnUrl); + } } static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFlags, HRESULT dwExpectReturn, const char *szExpectUrl)

1 0

András Kovács : wined3d: Implement BlendFactor renderstate.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: d1d5f4b6465d71d3ef1845fd5693a8fd64b8cb46 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d1d5f4b6465d71d3ef1845f… Author: András Kovács <andras(a)csevego.net> Date: Fri Sep 1 23:05:55 2006 +0200 wined3d: Implement BlendFactor renderstate. --- dlls/wined3d/device.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a20f2e0..be90664 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3608,6 +3608,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl This->srcBlend = newVal; This->dstBlend = newVal; break; + case D3DBLEND_BLENDFACTOR : newVal = GL_CONSTANT_COLOR; break; + case D3DBLEND_INVBLENDFACTOR : newVal = GL_ONE_MINUS_CONSTANT_COLOR; break; default: FIXME("Unrecognized src/dest blend value %ld (%d)\n", Value, State); } @@ -4534,8 +4536,24 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_BLENDFACTOR : { - if(0xFFFFFFFF != Value) - ERR("(%p)->(%s,%ld) not yet implemented. Missing of cap D3DPBLENDCAPS_BLENDFACTOR wasn't honored?\n", This, debug_d3drenderstate(State), Value); + float col[4]; + if (GL_SUPPORT(ARB_IMAGING)) { + + TRACE("Setting BlendFactor to %ld", Value); + + D3DCOLORTOGLFLOAT4(Value, col); + if (0xFFFFFFFF != Value) { + glEnable(GL_BLEND); + checkGLcall("glEnable(GL_BLEND)"); + } + else { + glDisable(GL_BLEND); + checkGLcall("glDisable(GL_BLEND)"); + } + glBlendColor (col[0],col[1],col[2],col[3]); + } else { + WARN("Unsupported in local OpenGL implementation: glBlendColor\n"); + } break; }

1 0

András Kovács : wined3d: Remove unnecessary glBlendColor in TextureFactor renderstate.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: c33e6245b53a6a5b6e768b7c01b2e2d7fefcf3c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c33e6245b53a6a5b6e768b7… Author: András Kovács <andras(a)csevego.net> Date: Fri Sep 1 23:03:56 2006 +0200 wined3d: Remove unnecessary glBlendColor in TextureFactor renderstate. --- dlls/wined3d/device.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c6a2af5..a20f2e0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -494,18 +494,6 @@ #undef APPLY_STATE checkGLcall("glTexEnvi GL_TEXTURE_LOD_BIAS_EXT ..."); } - /* Note the D3DRS value applies to all textures, but GL has one - * per texture, so apply it now ready to be used! - */ - D3DCOLORTOGLFLOAT4(This->stateBlock->renderState[WINED3DRS_TEXTUREFACTOR], col); - /* Set the default alpha blend color */ - if (GL_SUPPORT(ARB_IMAGING)) { - GL_EXTCALL(glBlendColor(col[0], col[1], col[2], col[3])); - checkGLcall("glBlendColor"); - } else { - WARN("Unsupported in local OpenGL implementation: glBlendColor\n"); - } - D3DCOLORTOGLFLOAT4(This->stateBlock->renderState[WINED3DRS_TEXTUREFACTOR], col); glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]); checkGLcall("glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);"); @@ -3756,13 +3744,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl GL_TEXTURE_ENV_COLOR applies to active only */ float col[4]; D3DCOLORTOGLFLOAT4(Value, col); - /* Set the default alpha blend color */ - if (GL_SUPPORT(ARB_IMAGING)) { - GL_EXTCALL(glBlendColor(col[0], col[1], col[2], col[3])); - checkGLcall("glBlendColor"); - } else { - WARN("Unsupported in local OpenGL implementation: glBlendColor\n"); - } if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { /* And now the default texture color as well */

1 0

Paul Vriens : crypt32: Set last error on registry errors.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 063f3e9c2fb8c5f258c0ed956711523046917a6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=063f3e9c2fb8c5f258c0ed9… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Sep 6 15:48:00 2006 +0200 crypt32: Set last error on registry errors. --- dlls/crypt32/oid.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index c1d3bc6..a993478 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -449,15 +449,24 @@ BOOL WINAPI CryptRegisterOIDFunction(DWO r = RegCreateKeyA(HKEY_LOCAL_MACHINE, szKey, &hKey); CryptMemFree(szKey); + + /* Testing on native shows that registry errors are reported */ if(r != ERROR_SUCCESS) + { + SetLastError(r); return FALSE; + } /* write the values */ if (pszOverrideFuncName) - RegSetValueExA(hKey, "FuncName", 0, REG_SZ, - (const BYTE*)pszOverrideFuncName, lstrlenA(pszOverrideFuncName) + 1); - RegSetValueExW(hKey, DllW, 0, REG_SZ, (const BYTE*) pwszDll, - (lstrlenW(pwszDll) + 1) * sizeof (WCHAR)); + { + r = RegSetValueExA(hKey, "FuncName", 0, REG_SZ, + (const BYTE*)pszOverrideFuncName, lstrlenA(pszOverrideFuncName) + 1); + if (r != ERROR_SUCCESS) SetLastError(r); + } + r = RegSetValueExW(hKey, DllW, 0, REG_SZ, (const BYTE*) pwszDll, + (lstrlenW(pwszDll) + 1) * sizeof (WCHAR)); + if (r != ERROR_SUCCESS) SetLastError(r); RegCloseKey(hKey); return TRUE;

1 0

Paul Vriens : wintrust: Add a bunch of CryptRegisterOIDFunction calls.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 6e38461019ffc2ac7bc330d3b7ce510a0dbe48e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e38461019ffc2ac7bc330d… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Sep 6 13:16:01 2006 +0200 wintrust: Add a bunch of CryptRegisterOIDFunction calls. --- dlls/wintrust/register.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index bc40020..c9baea5 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -703,6 +703,28 @@ static void WINTRUST_RegisterGenChainVer */ HRESULT WINAPI DllRegisterServer(void) { + static const CHAR WVTAsn1SpcPeImageDataEncode[] = "WVTAsn1SpcPeImageDataEncode"; + static const CHAR WVTAsn1SpcPeImageDataDecode[] = "WVTAsn1SpcPeImageDataDecode"; + static const CHAR WVTAsn1SpcLinkEncode[] = "WVTAsn1SpcLinkEncode"; + static const CHAR WVTAsn1SpcLinkDecode[] = "WVTAsn1SpcLinkDecode"; + static const CHAR WVTAsn1SpcSigInfoEncode[] = "WVTAsn1SpcSigInfoEncode"; + static const CHAR WVTAsn1SpcSigInfoDecode[] = "WVTAsn1SpcSigInfoDecode"; + static const CHAR WVTAsn1SpcIndirectDataContentEncode[] = "WVTAsn1SpcIndirectDataContentEncode"; + static const CHAR WVTAsn1SpcIndirectDataContentDecode[] = "WVTAsn1SpcIndirectDataContentDecode"; + static const CHAR WVTAsn1SpcSpAgencyInfoEncode[] = "WVTAsn1SpcSpAgencyInfoEncode"; + static const CHAR WVTAsn1SpcSpAgencyInfoDecode[] = "WVTAsn1SpcSpAgencyInfoDecode"; + static const CHAR WVTAsn1SpcMinimalCriteriaInfoEncode[] = "WVTAsn1SpcMinimalCriteriaInfoEncode"; + static const CHAR WVTAsn1SpcMinimalCriteriaInfoDecode[] = "WVTAsn1SpcMinimalCriteriaInfoDecode"; + static const CHAR WVTAsn1SpcFinancialCriteriaInfoEncode[] = "WVTAsn1SpcFinancialCriteriaInfoEncode"; + static const CHAR WVTAsn1SpcFinancialCriteriaInfoDecode[] = "WVTAsn1SpcFinancialCriteriaInfoDecode"; + static const CHAR WVTAsn1SpcStatementTypeEncode[] = "WVTAsn1SpcStatementTypeEncode"; + static const CHAR WVTAsn1SpcStatementTypeDecode[] = "WVTAsn1SpcStatementTypeDecode"; + static const CHAR WVTAsn1CatNameValueEncode[] = "WVTAsn1CatNameValueEncode"; + static const CHAR WVTAsn1CatNameValueDecode[] = "WVTAsn1CatNameValueDecode"; + static const CHAR WVTAsn1CatMemberInfoEncode[] = "WVTAsn1CatMemberInfoEncode"; + static const CHAR WVTAsn1CatMemberInfoDecode[] = "WVTAsn1CatMemberInfoDecode"; + static const CHAR WVTAsn1SpcSpOpusInfoEncode[] = "WVTAsn1SpcSpOpusInfoEncode"; + static const CHAR WVTAsn1SpcSpOpusInfoDecode[] = "WVTAsn1SpcSpOpusInfoDecode"; HRESULT Res = S_OK; HKEY Key; @@ -718,6 +740,39 @@ HRESULT WINAPI DllRegisterServer(void) * - One call to CryptSIPRemoveProvider (do we need that?) */ +#define WINTRUST_REGISTEROID( oid, encode_funcname, decode_funcname ) \ + CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_ENCODE_OBJECT_FUNC, oid, SP_POLICY_PROVIDER_DLL_NAME, encode_funcname); \ + CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_DECODE_OBJECT_FUNC, oid, SP_POLICY_PROVIDER_DLL_NAME, decode_funcname) + + WINTRUST_REGISTEROID(SPC_PE_IMAGE_DATA_OBJID, WVTAsn1SpcPeImageDataEncode, WVTAsn1SpcPeImageDataDecode); + WINTRUST_REGISTEROID(SPC_PE_IMAGE_DATA_STRUCT, WVTAsn1SpcPeImageDataEncode, WVTAsn1SpcPeImageDataDecode); + WINTRUST_REGISTEROID(SPC_CAB_DATA_OBJID, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_CAB_DATA_STRUCT, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_JAVA_CLASS_DATA_OBJID, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_JAVA_CLASS_DATA_STRUCT, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_LINK_OBJID, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_LINK_STRUCT, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_SIGINFO_OBJID, WVTAsn1SpcSigInfoEncode, WVTAsn1SpcSigInfoDecode); + WINTRUST_REGISTEROID(SPC_SIGINFO_STRUCT, WVTAsn1SpcSigInfoEncode, WVTAsn1SpcSigInfoDecode); + WINTRUST_REGISTEROID(SPC_INDIRECT_DATA_OBJID, WVTAsn1SpcIndirectDataContentEncode, WVTAsn1SpcIndirectDataContentDecode); + WINTRUST_REGISTEROID(SPC_INDIRECT_DATA_CONTENT_STRUCT, WVTAsn1SpcIndirectDataContentEncode, WVTAsn1SpcIndirectDataContentDecode); + WINTRUST_REGISTEROID(SPC_SP_AGENCY_INFO_OBJID, WVTAsn1SpcSpAgencyInfoEncode, WVTAsn1SpcSpAgencyInfoDecode); + WINTRUST_REGISTEROID(SPC_SP_AGENCY_INFO_STRUCT, WVTAsn1SpcSpAgencyInfoEncode, WVTAsn1SpcSpAgencyInfoDecode); + WINTRUST_REGISTEROID(SPC_MINIMAL_CRITERIA_OBJID, WVTAsn1SpcMinimalCriteriaInfoEncode, WVTAsn1SpcMinimalCriteriaInfoDecode); + WINTRUST_REGISTEROID(SPC_MINIMAL_CRITERIA_STRUCT, WVTAsn1SpcMinimalCriteriaInfoEncode, WVTAsn1SpcMinimalCriteriaInfoDecode); + WINTRUST_REGISTEROID(SPC_FINANCIAL_CRITERIA_OBJID, WVTAsn1SpcFinancialCriteriaInfoEncode, WVTAsn1SpcFinancialCriteriaInfoDecode); + WINTRUST_REGISTEROID(SPC_FINANCIAL_CRITERIA_STRUCT, WVTAsn1SpcFinancialCriteriaInfoEncode, WVTAsn1SpcFinancialCriteriaInfoDecode); + WINTRUST_REGISTEROID(SPC_STATEMENT_TYPE_OBJID, WVTAsn1SpcStatementTypeEncode, WVTAsn1SpcStatementTypeDecode); + WINTRUST_REGISTEROID(SPC_STATEMENT_TYPE_STRUCT, WVTAsn1SpcStatementTypeEncode, WVTAsn1SpcStatementTypeDecode); + WINTRUST_REGISTEROID(CAT_NAMEVALUE_OBJID, WVTAsn1CatNameValueEncode, WVTAsn1CatNameValueDecode); + WINTRUST_REGISTEROID(CAT_NAMEVALUE_STRUCT, WVTAsn1CatNameValueEncode, WVTAsn1CatNameValueDecode); + WINTRUST_REGISTEROID(CAT_MEMBERINFO_OBJID, WVTAsn1CatMemberInfoEncode, WVTAsn1CatMemberInfoDecode); + WINTRUST_REGISTEROID(CAT_MEMBERINFO_STRUCT, WVTAsn1CatMemberInfoEncode, WVTAsn1CatMemberInfoDecode); + WINTRUST_REGISTEROID(SPC_SP_OPUS_INFO_OBJID, WVTAsn1SpcSpOpusInfoEncode, WVTAsn1SpcSpOpusInfoDecode); + WINTRUST_REGISTEROID(SPC_SP_OPUS_INFO_STRUCT, WVTAsn1SpcSpOpusInfoEncode, WVTAsn1SpcSpOpusInfoDecode); + +#undef WINTRUST_REGISTEROID + /* Testing on W2K3 shows: * If we cannot open HKLM\Software\Microsoft\Cryptography\Providers\Trust * for writing, DllRegisterServer returns S_FALSE. If the key can be opened

1 0