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

Mike McCormack : ole32: Fix and test reading and writing of VT_CF properties.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: refs/heads/master Commit: ac016925236cc731f0d9e7c5d0b0cc4e61e02801 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac016925236cc731f0d9e7c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 12 18:23:30 2006 +0900 ole32: Fix and test reading and writing of VT_CF properties. --- dlls/ole32/stg_prop.c | 27 +++++++++++++++++++++------ dlls/ole32/tests/stg_prop.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index e0567c8..64a825d 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1142,19 +1142,18 @@ static HRESULT PropertyStorage_ReadPrope break; case VT_CF: { - DWORD len = 0, type = 0, tag = 0; + DWORD len = 0, tag = 0; StorageUtl_ReadDWord(data, 0, &len); StorageUtl_ReadDWord(data, 4, &tag); - StorageUtl_ReadDWord(data, 8, &type); - if (tag == CFTAG_WINDOWS && len > 12) + if (len > 8) { + len -= 8; prop->u.pclipdata = CoTaskMemAlloc(sizeof (CLIPDATA)); prop->u.pclipdata->cbSize = len; - prop->u.pclipdata->ulClipFmt = type; + prop->u.pclipdata->ulClipFmt = tag; prop->u.pclipdata->pClipData = CoTaskMemAlloc(len); - memcpy(prop->u.pclipdata->pClipData, data+12, len - 12); - TRACE("returning %p, len %ld\n", prop->u.pclipdata->pClipData, len - 12); + memcpy(prop->u.pclipdata->pClipData, data+8, len); } else hr = STG_E_INVALIDPARAMETER; @@ -1727,6 +1726,22 @@ static HRESULT PropertyStorage_WriteProp bytesWritten = count; break; } + case VT_CF: + { + DWORD cf_hdr[2], len; + + len = var->u.pclipdata->cbSize; + StorageUtl_WriteDWord((LPBYTE)&cf_hdr[0], 0, len + 8); + StorageUtl_WriteDWord((LPBYTE)&cf_hdr[1], 0, var->u.pclipdata->ulClipFmt); + hr = IStream_Write(This->stm, &cf_hdr, sizeof(cf_hdr), &count); + if (FAILED(hr)) + goto end; + hr = IStream_Write(This->stm, &var->u.pclipdata->pClipData, len, &count); + if (FAILED(hr)) + goto end; + bytesWritten = count + sizeof cf_hdr; + break; + } default: FIXME("unsupported type: %d\n", var->vt); return STG_E_INVALIDPARAMETER; diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index 19fd593..169ee09 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -55,6 +55,8 @@ static void testProps(void) IPropertyStorage *propertyStorage = NULL; PROPSPEC spec; PROPVARIANT var; + CLIPDATA clipdata; + unsigned char clipcontent[] = "foobar"; if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) return; @@ -134,6 +136,18 @@ static void testProps(void) hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0); ok(SUCCEEDED(hr), "WriteMultiple failed: 0x%08lx\n", hr); + /* set a clipboard value */ + spec.ulKind = PRSPEC_PROPID; + U(spec).propid = PIDSI_THUMBNAIL; + var.vt = VT_CF; + clipdata.cbSize = sizeof clipcontent + sizeof (ULONG); + clipdata.ulClipFmt = CF_ENHMETAFILE; + clipdata.pClipData = clipcontent; + U(var).pclipdata = &clipdata; + hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0); + ok(SUCCEEDED(hr), "WriteMultiple failed: 0x%08lx\n", hr); + + /* check reading */ hr = IPropertyStorage_ReadMultiple(propertyStorage, 0, NULL, NULL); ok(SUCCEEDED(hr), "ReadMultiple with 0 args failed: 0x%08lx\n", hr); @@ -164,6 +178,20 @@ static void testProps(void) "Didn't get expected type or value for property (got type %d, value %s)\n", var.vt, U(var).pszVal); + /* read clipboard format */ + spec.ulKind = PRSPEC_PROPID; + U(spec).propid = PIDSI_THUMBNAIL; + hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var); + ok(hr == S_OK, "ReadMultiple failed: 0x%08lx\n", hr); + ok(var.vt == VT_CF, "variant type wrong\n"); + ok(U(var).pclipdata->ulClipFmt == CF_ENHMETAFILE, + "clipboard type wrong\n"); + ok(U(var).pclipdata->cbSize == sizeof clipcontent + sizeof (ULONG), + "clipboard size wrong\n"); + ok(!memcmp(U(var).pclipdata->pClipData, clipcontent, sizeof clipcontent), + "clipboard contents wrong\n"); + ok(S_OK == PropVariantClear(&var), "failed to clear variant\n"); + /* check deleting */ hr = IPropertyStorage_DeleteMultiple(propertyStorage, 0, NULL); ok(SUCCEEDED(hr), "DeleteMultiple with 0 args failed: 0x%08lx\n", hr);

1 0

Juan Lang : msi: Split up ACTION_AppSearchReg.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: refs/heads/master Commit: ab24569b85271ea0b0d14b7f15c5821cdaa9b40c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab24569b85271ea0b0d14b7… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jul 12 09:55:13 2006 -0700 msi: Split up ACTION_AppSearchReg. --- dlls/msi/appsearch.c | 94 +++++++++++++++++++++++++++----------------------- 1 files changed, 51 insertions(+), 43 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 6f173dc..9a5bec2 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -236,6 +236,54 @@ end: return rc; } +static void ACTION_ConvertRegValue(DWORD regType, const BYTE *value, DWORD sz, + LPWSTR *appValue) +{ + static const WCHAR dwordFmt[] = { '#','%','d','\0' }; + static const WCHAR expandSzFmt[] = { '#','%','%','%','s','\0' }; + static const WCHAR binFmt[] = { '#','x','%','x','\0' }; + DWORD i; + + switch (regType) + { + case REG_SZ: + if (*(LPWSTR)value == '#') + { + /* escape leading pound with another */ + *appValue = msi_alloc(sz + sizeof(WCHAR)); + (*appValue)[0] = '#'; + strcpyW(*appValue + 1, (LPCWSTR)value); + } + else + { + *appValue = msi_alloc(sz); + strcpyW(*appValue, (LPCWSTR)value); + } + break; + case REG_DWORD: + /* 7 chars for digits, 1 for NULL, 1 for #, and 1 for sign + * char if needed + */ + *appValue = msi_alloc(10 * sizeof(WCHAR)); + sprintfW(*appValue, dwordFmt, *(const DWORD *)value); + break; + case REG_EXPAND_SZ: + /* space for extra #% characters in front */ + *appValue = msi_alloc(sz + 2 * sizeof(WCHAR)); + sprintfW(*appValue, expandSzFmt, (LPCWSTR)value); + break; + case REG_BINARY: + /* 3 == length of "#x<nibble>" */ + *appValue = msi_alloc((sz * 3 + 1) * sizeof(WCHAR)); + for (i = 0; i < sz; i++) + sprintfW(*appValue + i * 3, binFmt, value[i]); + break; + default: + WARN("unimplemented for values of type %ld\n", regType); + *appValue = NULL; + } +} + static UINT ACTION_AppSearchReg(MSIPACKAGE *package, BOOL *appFound, MSISIGNATURE *sig) { @@ -247,9 +295,6 @@ static UINT ACTION_AppSearchReg(MSIPACKA 'R','e','g','L','o','c','a','t','o','r',' ', 'w','h','e','r','e',' ','S','i','g','n','a','t','u','r','e','_',' ','=',' ', '\'','%','s','\'',0}; - static const WCHAR dwordFmt[] = { '#','%','d','\0' }; - static const WCHAR expandSzFmt[] = { '#','%','%','%','s','\0' }; - static const WCHAR binFmt[] = { '#','x','%','x','\0' }; TRACE("(package %p, appFound %p, sig %p)\n", package, appFound, sig); *appFound = FALSE; @@ -260,7 +305,7 @@ static UINT ACTION_AppSearchReg(MSIPACKA LPWSTR keyPath = NULL, valueName = NULL, propertyValue = NULL; int root, type; HKEY rootKey, key = NULL; - DWORD sz = 0, regType, i; + DWORD sz = 0, regType; LPBYTE value = NULL; rc = MSI_ViewExecute(view, 0); @@ -342,45 +387,8 @@ static UINT ACTION_AppSearchReg(MSIPACKA rc = ERROR_SUCCESS; goto end; } - - switch (regType) - { - case REG_SZ: - if (*(LPWSTR)value == '#') - { - /* escape leading pound with another */ - propertyValue = msi_alloc( sz + sizeof(WCHAR)); - propertyValue[0] = '#'; - strcpyW(propertyValue + 1, (LPWSTR)value); - } - else - { - propertyValue = msi_alloc( sz); - strcpyW(propertyValue, (LPWSTR)value); - } - break; - case REG_DWORD: - /* 7 chars for digits, 1 for NULL, 1 for #, and 1 for sign - * char if needed - */ - propertyValue = msi_alloc( 10 * sizeof(WCHAR)); - sprintfW(propertyValue, dwordFmt, *(DWORD *)value); - break; - case REG_EXPAND_SZ: - /* space for extra #% characters in front */ - propertyValue = msi_alloc( sz + 2 * sizeof(WCHAR)); - sprintfW(propertyValue, expandSzFmt, (LPWSTR)value); - break; - case REG_BINARY: - /* 3 == length of "#x<nibble>" */ - propertyValue = msi_alloc( (sz * 3 + 1) * sizeof(WCHAR)); - for (i = 0; i < sz; i++) - sprintfW(propertyValue + i * 3, binFmt, value[i]); - break; - default: - WARN("unimplemented for values of type %ld\n", regType); - goto end; - } + + ACTION_ConvertRegValue(regType, value, sz, &propertyValue); TRACE("found registry value, setting %s to %s\n", debugstr_w(sig->Property), debugstr_w(propertyValue));

1 0

Juan Lang : crypt32: Add stubs for some stores.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: refs/heads/master Commit: 39859971bb4259279ea42d51c91de4c7cb38a927 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39859971bb4259279ea42d5… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jul 12 07:20:56 2006 -0700 crypt32: Add stubs for some stores. --- dlls/crypt32/store.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 95b91da..f1cca0e 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1723,6 +1723,54 @@ static PWINECRYPT_CERTSTORE CRYPT_SysOpe return ret; } +static PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + FIXME("(%ld, %08lx, %s): stub\n", hCryptProv, dwFlags, + debugstr_w((LPCWSTR)pvPara)); + return NULL; +} + +static PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreA(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + int len; + PWINECRYPT_CERTSTORE ret = NULL; + + TRACE("(%ld, %08lx, %s)\n", hCryptProv, dwFlags, + debugstr_a((LPCSTR)pvPara)); + + if (!pvPara) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return NULL; + } + len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, NULL, 0); + if (len) + { + LPWSTR storeName = CryptMemAlloc(len * sizeof(WCHAR)); + + if (storeName) + { + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, storeName, len); + ret = CRYPT_FileNameOpenStoreW(hCryptProv, dwFlags, storeName); + CryptMemFree(storeName); + } + } + return ret; +} + +static PWINECRYPT_CERTSTORE CRYPT_PhysOpenStoreW(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG) + FIXME("(%ld, %08lx, %p): stub\n", hCryptProv, dwFlags, pvPara); + else + FIXME("(%ld, %08lx, %s): stub\n", hCryptProv, dwFlags, + debugstr_w((LPCWSTR)pvPara)); + return NULL; +} + HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, DWORD dwMsgAndCertEncodingType, HCRYPTPROV hCryptProv, DWORD dwFlags, const void* pvPara) @@ -1743,6 +1791,12 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR l case (int)CERT_STORE_PROV_REG: openFunc = CRYPT_RegOpenStore; break; + case (int)CERT_STORE_PROV_FILENAME_A: + openFunc = CRYPT_FileNameOpenStoreA; + break; + case (int)CERT_STORE_PROV_FILENAME_W: + openFunc = CRYPT_FileNameOpenStoreW; + break; case (int)CERT_STORE_PROV_COLLECTION: openFunc = CRYPT_CollectionOpenStore; break; @@ -1758,6 +1812,9 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR l case (int)CERT_STORE_PROV_SYSTEM_REGISTRY_W: openFunc = CRYPT_SysRegOpenStoreW; break; + case (int)CERT_STORE_PROV_PHYSICAL_W: + openFunc = CRYPT_PhysOpenStoreW; + break; default: if (LOWORD(lpszStoreProvider)) FIXME("unimplemented type %d\n", LOWORD(lpszStoreProvider));

1 0

Juan Lang : crypt32: Forward CreateFileU to CreateFileW.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: refs/heads/master Commit: db4d361fd7d2e9edb17441a47b80a4922671cd1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db4d361fd7d2e9edb17441a… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jul 12 23:20:01 2006 +0900 crypt32: Forward CreateFileU to CreateFileW. --- dlls/crypt32/crypt32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 41ec54f..04b028c 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -89,7 +89,7 @@ @ stdcall CertVerifySubjectCertificateContext(ptr ptr ptr) @ stdcall CertVerifyTimeValidity(ptr ptr) @ stub CertVerifyValidityNesting -@ stub CreateFileU +@ stdcall CreateFileU(wstr long long ptr long long ptr) kernel32.CreateFileW @ stdcall CryptBinaryToStringA(ptr long long ptr ptr) @ stub CryptBinaryToStringW # (ptr long long ptr ptr) @ stdcall CryptStringToBinaryA(str long long ptr ptr ptr ptr)

1 0

Dan Hipschman : gdi32: Implement GetTextExtentPoint in terms of GetTextExtentExPoint
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: f9047238134e1dbfd7eaedf81a6ee94788a4681d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9047238134e1dbfd7eaedf… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 11 17:58:35 2006 -0700 gdi32: Implement GetTextExtentPoint in terms of GetTextExtentExPoint (not vice versa) for efficiency (required adding the Ex functionality to drivers). --- dlls/gdi/driver.c | 2 - dlls/gdi/enhmfdrv/init.c | 2 - dlls/gdi/font.c | 106 +++++++++++++++++++++---------------- dlls/gdi/freetype.c | 27 +++++++-- dlls/gdi/gdi_private.h | 4 + dlls/gdi/mfdrv/init.c | 2 - dlls/wineps.drv/builtin.c | 19 ++++++- dlls/wineps.drv/psdrv.h | 4 + dlls/wineps.drv/wineps.drv.spec | 2 - dlls/winex11.drv/codepage.c | 32 ++++++++++- dlls/winex11.drv/text.c | 18 +++++- dlls/winex11.drv/winex11.drv.spec | 2 - dlls/winex11.drv/x11font.h | 3 + 13 files changed, 149 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f9047238134e1dbfd7e…

1 0

Dan Hipschman : gdi32: Add conformance test for GetTextExtentExPointW.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: fe3c9428c3975259e50eb2d87f60307fda154144 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fe3c9428c3975259e50eb2d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 11 17:57:06 2006 -0700 gdi32: Add conformance test for GetTextExtentExPointW. --- dlls/gdi/tests/font.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index 393bc27..971dcf3 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -336,11 +336,15 @@ static void test_GetCharABCWidthsW(void) static void test_text_extents(void) { + const static WCHAR wt[] = {'O','n','e','\n','t','w','o',' ','3',0}; + LPINT extents; + INT i, len, fit1, fit2; LOGFONTA lf; TEXTMETRICA tm; HDC hdc; HFONT hfont; SIZE sz; + SIZE sz1, sz2; memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Arial"); @@ -353,6 +357,35 @@ static void test_text_extents(void) GetTextExtentPointA(hdc, "o", 1, &sz); ok(sz.cy == tm.tmHeight, "cy %ld tmHeight %ld\n", sz.cy, tm.tmHeight); + len = lstrlenW(wt); + extents = HeapAlloc(GetProcessHeap(), 0, len * sizeof extents[0]); + memset(extents, 0, len * sizeof extents[0]); + extents[0] = 1; /* So that the increasing sequence test will fail + if the extents array is untouched. */ + GetTextExtentExPointW(hdc, wt, len, 32767, &fit1, extents, &sz1); + GetTextExtentPointW(hdc, wt, len, &sz2); + ok(sz1.cx == sz2.cx && sz1.cy == sz2.cy, + "results from GetTextExtentExPointW and GetTextExtentPointW differ\n"); + for (i = 1; i < len; ++i) + ok(extents[i-1] <= extents[i], + "GetTextExtentExPointW generated a non-increasing sequence of partial extents (at position %d)\n", + i); + ok(extents[len-1] == sz1.cx, "GetTextExtentExPointW extents and size don't match\n"); + ok(0 <= fit1 && fit1 <= len, "GetTextExtentExPointW generated illegal value %d for fit\n", fit1); + ok(0 < fit1, "GetTextExtentExPointW says we can't even fit one letter in 32767 logical units\n"); + GetTextExtentExPointW(hdc, wt, len, extents[2], &fit2, NULL, &sz2); + ok(sz1.cx == sz2.cx && sz1.cy == sz2.cy, "GetTextExtentExPointW returned different sizes for the same string\n"); + ok(fit2 == 3, "GetTextExtentExPointW extents isn't consistent with fit\n"); + GetTextExtentExPointW(hdc, wt, len, extents[2]-1, &fit2, NULL, &sz2); + ok(fit2 == 2, "GetTextExtentExPointW extents isn't consistent with fit\n"); + GetTextExtentExPointW(hdc, wt, 2, 0, NULL, extents + 2, &sz2); + ok(extents[0] == extents[2] && extents[1] == extents[3], + "GetTextExtentExPointW with lpnFit == NULL returns incorrect results\n"); + GetTextExtentExPointW(hdc, wt, 2, 0, NULL, NULL, &sz1); + ok(sz1.cx == sz2.cx && sz1.cy == sz2.cy, + "GetTextExtentExPointW with lpnFit and alpDx both NULL returns incorrect results\n"); + HeapFree(GetProcessHeap(), 0, extents); + SelectObject(hdc, hfont); DeleteObject(hfont); ReleaseDC(NULL, hdc);

1 0

Mike McCormack : query: Return a more appropriate error code from CIState.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: d58e7e16b994354ccfaa612d0dde2f1d6e7b2492 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d58e7e16b994354ccfaa612… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 12 14:56:17 2006 +0900 query: Return a more appropriate error code from CIState. --- dlls/query/query_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index 5a91095..6b08352 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -30,6 +30,7 @@ #include "winuser.h" #include "winreg.h" #include "ole2.h" #include "ntquery.h" +#include "cierror.h" #include "initguid.h" #include "wine/debug.h" @@ -73,5 +74,5 @@ HRESULT WINAPI DllRegisterServer(void) HRESULT WINAPI CIState( WCHAR const *pwcsCat, WCHAR const *pwcsMachine, CI_STATE *pCiState) { FIXME("%s %s %p\n", debugstr_w(pwcsCat), debugstr_w(pwcsMachine), pCiState); - return E_FAIL; + return CI_E_NOT_RUNNING; }

1 0

Andrew Talbot : urlmon: Write-strings warnings fix.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: 24e4acf728dd0d856914d89205fd28e002272e72 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24e4acf728dd0d856914d89… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jul 11 22:43:45 2006 +0100 urlmon: Write-strings warnings fix. --- dlls/urlmon/regsvr.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index d15b72a..2b8cfd3 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -572,9 +572,14 @@ static struct regsvr_interface const int * register_inf */ -#define INF_SET_CLSID(clsid) \ - pse[i].pszName = "CLSID_" #clsid; \ - clsids[i++] = &CLSID_ ## clsid; +#define INF_SET_CLSID(clsid) \ + do \ + { \ + static CHAR name[] = "CLSID_" #clsid; \ + \ + pse[i].pszName = name; \ + clsids[i++] = &CLSID_ ## clsid; \ + } while (0) static HRESULT register_inf(BOOL doregister) { @@ -587,7 +592,7 @@ static HRESULT register_inf(BOOL doregis int i = 0; static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - + INF_SET_CLSID(CdlProtocol); INF_SET_CLSID(FileProtocol); INF_SET_CLSID(FtpProtocol);

1 0

H. Verbeet : wined3d: Texture stages that reference NULL textures should just pass
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: 0924f969d11a95df55e673496131a802d3f446be URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0924f969d11a95df55e6734… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jul 12 00:44:03 2006 +0200 wined3d: Texture stages that reference NULL textures should just pass through the result of the previous stage. --- dlls/wined3d/utils.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a729344..8275953 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -653,6 +653,17 @@ typedef struct { GLenum component_usage[3]; } tex_op_args; +static BOOL is_invalid_op(IWineD3DDeviceImpl *This, int stage, D3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) { + if (op == D3DTOP_DISABLE) return FALSE; + if (This->stateBlock->textures[stage]) return FALSE; + + if (arg1 == D3DTA_TEXTURE && op != D3DTOP_SELECTARG2) return TRUE; + if (arg2 == D3DTA_TEXTURE && op != D3DTOP_SELECTARG1) return TRUE; + if (arg3 == D3DTA_TEXTURE && (op == D3DTOP_MULTIPLYADD || op == D3DTOP_LERP)) return TRUE; + + return FALSE; +} + void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, D3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl*)iface; tex_op_args tex_op_args = {{0}, {0}, {0}}; @@ -662,6 +673,13 @@ void set_tex_op_nvrc(IWineD3DDevice *ifa TRACE("stage %d, is_alpha %d, op %s, arg1 %#lx, arg2 %#lx, arg3 %#lx, texture_idx %d\n", stage, is_alpha, debug_d3dtop(op), arg1, arg2, arg3, texture_idx); + /* If a texture stage references an invalid texture unit the stage just + * passes through the result from the previous stage */ + if (is_invalid_op(This, stage, op, arg1, arg2, arg3)) { + arg1 = D3DTA_CURRENT; + op = D3DTOP_SELECTARG1; + } + get_src_and_opr_nvrc(stage, arg1, is_alpha, &tex_op_args.input[0], &tex_op_args.mapping[0], &tex_op_args.component_usage[0], texture_idx); get_src_and_opr_nvrc(stage, arg2, is_alpha, &tex_op_args.input[1], @@ -1053,6 +1071,13 @@ #define GLINFO_LOCATION ((IWineD3DImpl * scal_target = useext(GL_RGB_SCALE); } + /* If a texture stage references an invalid texture unit the stage just + * passes through the result from the previous stage */ + if (is_invalid_op(This, Stage, op, arg1, arg2, arg3)) { + arg1 = D3DTA_CURRENT; + op = D3DTOP_SELECTARG1; + } + /* From MSDN (WINED3DTSS_ALPHAARG1) : The default argument is D3DTA_TEXTURE. If no texture is set for this stage, then the default argument is D3DTA_DIFFUSE.

1 0

H. Verbeet : wined3d: Fix specular color handling for register combiners.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: 709025954504b5b3a74cd659ab868832b1a62820 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=709025954504b5b3a74cd65… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jul 12 00:44:15 2006 +0200 wined3d: Fix specular color handling for register combiners. By default the FinalCombiner is setup to add the specular color to the final result of the combiner operations. However, it should only do this when the WINED3DRS_SPECULARENABLE renderstate is enabled. --- dlls/wined3d/device.c | 30 ++++++++++++++++++++++++++++++ include/wine/wined3d_gl.h | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 45dd144..082f92b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3842,6 +3842,26 @@ static HRESULT WINAPI IWineD3DDeviceImpl NOTE: If not supported don't give FIXMEs the impact is really minimal and very few people are running 1.4 yet! */ + /* + * If register combiners are enabled, enabling / disabling GL_COLOR_SUM has no effect. + * Instead, we need to setup the FinalCombiner properly. + * + * The default setup for the FinalCombiner is: + * + * <variable> <input> <mapping> <usage> + * GL_VARIABLE_A_NV GL_FOG, GL_UNSIGNED_IDENTITY_NV GL_ALPHA + * GL_VARIABLE_B_NV GL_SPARE0_PLUS_SECONDARY_COLOR_NV GL_UNSIGNED_IDENTITY_NV GL_RGB + * GL_VARIABLE_C_NV GL_FOG GL_UNSIGNED_IDENTITY_NV GL_RGB + * GL_VARIABLE_D_NV GL_ZERO GL_UNSIGNED_IDENTITY_NV GL_RGB + * GL_VARIABLE_E_NV GL_ZERO GL_UNSIGNED_IDENTITY_NV GL_RGB + * GL_VARIABLE_F_NV GL_ZERO GL_UNSIGNED_IDENTITY_NV GL_RGB + * GL_VARIABLE_G_NV GL_SPARE0_NV GL_UNSIGNED_IDENTITY_NV GL_ALPHA + * + * That's pretty much fine as it is, except for variable B, which needs to take + * either GL_SPARE0_PLUS_SECONDARY_COLOR_NV or GL_SPARE0_NV, depending on + * whether WINED3DRS_SPECULARENABLE is enabled or not. + */ + if (Value) { glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*) &This->updateStateBlock->material.Specular); checkGLcall("glMaterialfv"); @@ -3851,6 +3871,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl TRACE("Specular colors cannot be enabled in this version of opengl\n"); } checkGLcall("glEnable(GL_COLOR_SUM)"); + + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { + GL_EXTCALL(glFinalCombinerInputNV(GL_VARIABLE_B_NV, GL_SPARE0_PLUS_SECONDARY_COLOR_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB)); + checkGLcall("glFinalCombinerInputNV()"); + } } else { float black[4] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -3865,6 +3890,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl TRACE("Specular colors cannot be disabled in this version of opengl\n"); } checkGLcall("glDisable(GL_COLOR_SUM)"); + + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { + GL_EXTCALL(glFinalCombinerInputNV(GL_VARIABLE_B_NV, GL_SPARE0_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB)); + checkGLcall("glFinalCombinerInputNV()"); + } } } break; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 038cbaf..c8d9402 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1537,6 +1537,7 @@ #define GL_EXT_FUNCS_GEN \ USE_GL_FUNC(PGLFNCOMBINERPARAMETERFVNVPROC, glCombinerParameterfvNV); \ USE_GL_FUNC(PGLFNCOMBINERPARAMETERINVPROC, glCombinerParameteriNV); \ USE_GL_FUNC(PGLFNCOMBINERPARAMETERIVNVPROC, glCombinerParameterivNV); \ + USE_GL_FUNC(PGLFNFINALCOMBINERINPUTNVPROC, glFinalCombinerInputNV); \ /* OpenGL 2.0 functions */ #define GL2_FUNCS_GEN \

1 0