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

Robert Reif : advapi32: Fix debugstr_sid to print unsigned SubAuthority.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: ed9cca6982733e867ad3fd39af46adaa5fe2cf99 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed9cca6982733e867ad3fd3… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Jul 28 20:23:17 2006 -0400 advapi32: Fix debugstr_sid to print unsigned SubAuthority. --- dlls/advapi32/security.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 3fe9739..658fa44 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -256,33 +256,33 @@ static const char * debugstr_sid(PSID si case 0: return wine_dbg_sprintf("S-%d-%d", psid->Revision, auth); case 1: - return wine_dbg_sprintf("S-%d-%d-%ld", psid->Revision, auth, + return wine_dbg_sprintf("S-%d-%d-%lu", psid->Revision, auth, psid->SubAuthority[0]); case 2: - return wine_dbg_sprintf("S-%d-%d-%ld-%ld", psid->Revision, auth, + return wine_dbg_sprintf("S-%d-%d-%lu-%lu", psid->Revision, auth, psid->SubAuthority[0], psid->SubAuthority[1]); case 3: - return wine_dbg_sprintf("S-%d-%d-%ld-%ld-%ld", psid->Revision, auth, + return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu", psid->Revision, auth, psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2]); case 4: - return wine_dbg_sprintf("S-%d-%d-%ld-%ld-%ld-%ld", psid->Revision, auth, + return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu", psid->Revision, auth, psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2], psid->SubAuthority[3]); case 5: - return wine_dbg_sprintf("S-%d-%d-%ld-%ld-%ld-%ld-%ld", psid->Revision, auth, + return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth, psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2], psid->SubAuthority[3], psid->SubAuthority[4]); case 6: - return wine_dbg_sprintf("S-%d-%d-%ld-%ld-%ld-%ld-%ld-%ld", psid->Revision, auth, + return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth, psid->SubAuthority[3], psid->SubAuthority[1], psid->SubAuthority[2], psid->SubAuthority[0], psid->SubAuthority[4], psid->SubAuthority[5]); case 7: - return wine_dbg_sprintf("S-%d-%d-%ld-%ld-%ld-%ld-%ld-%ld-%ld", psid->Revision, auth, + return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth, psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2], psid->SubAuthority[3], psid->SubAuthority[4], psid->SubAuthority[5], psid->SubAuthority[6]); case 8: - return wine_dbg_sprintf("S-%d-%d-%ld-%ld-%ld-%ld-%ld-%ld-%ld-%ld", psid->Revision, auth, + return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth, psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2], psid->SubAuthority[3], psid->SubAuthority[4], psid->SubAuthority[5], psid->SubAuthority[6], psid->SubAuthority[7]);

1 0

James Hawkins : wininet: Only copy the relative filename into the UrlEntry structure.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: 8c6040fccc2d8c8c9b3481f6ac0575e69ed3fbcd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c6040fccc2d8c8c9b3481f… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jul 28 13:46:06 2006 -0700 wininet: Only copy the relative filename into the UrlEntry structure. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 5d5f3b0..15fc4eb 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2204,7 +2204,7 @@ static BOOL WINAPI CommitUrlCacheEntryIn strcpy((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, achUrl); if (dwOffsetLocalFileName) - strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetLocalFileName), pchLocalFileName); + strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetLocalFileName), pchLocalFileName + DIR_LENGTH + 1); if (dwOffsetHeader) memcpy((LPBYTE)pUrlEntry + dwOffsetHeader, lpHeaderInfo, dwHeaderSize);

1 0

Juan Lang : crypt32: Implement CryptHashPublicKeyInfo.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: da3eeb4bd5a7f61b8e4a155b9114a39d354dd7b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=da3eeb4bd5a7f61b8e4a155… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Jul 28 17:26:24 2006 -0700 crypt32: Implement CryptHashPublicKeyInfo. --- dlls/crypt32/cert.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/tests/cert.c | 33 +++++++++++++++++++++++++++++++++ include/wincrypt.h | 4 ++++ 4 files changed, 76 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 6297e72..b131f11 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1115,6 +1115,44 @@ BOOL WINAPI CryptHashCertificate(HCRYPTP return ret; } +BOOL WINAPI CryptHashPublicKeyInfo(HCRYPTPROV hCryptProv, ALG_ID Algid, + DWORD dwFlags, DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, + BYTE *pbComputedHash, DWORD *pcbComputedHash) +{ + BOOL ret = TRUE; + HCRYPTHASH hHash = 0; + + TRACE("(%ld, %d, %08lx, %ld, %p, %p, %p)\n", hCryptProv, Algid, dwFlags, + dwCertEncodingType, pInfo, pbComputedHash, pcbComputedHash); + + if (!hCryptProv) + hCryptProv = CRYPT_GetDefaultProvider(); + if (!Algid) + Algid = CALG_MD5; + if (ret) + { + BYTE *buf; + DWORD size = 0; + + ret = CryptEncodeObjectEx(dwCertEncodingType, X509_PUBLIC_KEY_INFO, + pInfo, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + if (ret) + { + ret = CryptCreateHash(hCryptProv, Algid, 0, 0, &hHash); + if (ret) + { + ret = CryptHashData(hHash, buf, size, 0); + if (ret) + ret = CryptGetHashParam(hHash, HP_HASHVAL, pbComputedHash, + pcbComputedHash, 0); + CryptDestroyHash(hHash); + } + LocalFree(buf); + } + } + return ret; +} + BOOL WINAPI CryptSignCertificate(HCRYPTPROV hCryptProv, DWORD dwKeySpec, DWORD dwCertEncodingType, const BYTE *pbEncodedToBeSigned, DWORD cbEncodedToBeSigned, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 1293816..56db08c 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -124,7 +124,7 @@ @ stdcall CryptGetOIDFunctionValue(long str str wstr ptr ptr ptr) @ stdcall CryptHashCertificate(long long long ptr long ptr ptr) @ stub CryptHashMessage -@ stub CryptHashPublicKeyInfo +@ stdcall CryptHashPublicKeyInfo(long long long long ptr ptr ptr) @ stub CryptHashToBeSigned @ stub CryptImportPKCS8 @ stdcall CryptImportPublicKeyInfo(long long ptr ptr) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 49692e2..5c23607 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1544,6 +1544,38 @@ static void testComparePublicKeyInfo(voi ok(!ret, "Expected keys not to compare\n"); } +static void testHashPublicKeyInfo(void) +{ + BOOL ret; + CERT_PUBLIC_KEY_INFO info = { { 0 } }; + DWORD len; + + /* Crash + ret = CryptHashPublicKeyInfo(0, 0, 0, 0, NULL, NULL, NULL); + ret = CryptHashPublicKeyInfo(0, 0, 0, 0, &info, NULL, NULL); + */ + ret = CryptHashPublicKeyInfo(0, 0, 0, 0, NULL, NULL, &len); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); + ret = CryptHashPublicKeyInfo(0, 0, 0, X509_ASN_ENCODING, NULL, NULL, &len); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + ret = CryptHashPublicKeyInfo(0, 0, 0, X509_ASN_ENCODING, &info, NULL, &len); + ok(ret, "CryptHashPublicKeyInfo failed: %08lx\n", GetLastError()); + ok(len == 16, "Expected hash size 16, got %ld\n", len); + if (len == 16) + { + static const BYTE emptyHash[] = { 0xb8,0x51,0x3a,0x31,0x0e,0x9f,0x40, + 0x36,0x9c,0x92,0x45,0x1b,0x9d,0xc8,0xf9,0xf6 }; + BYTE buf[16]; + + ret = CryptHashPublicKeyInfo(0, 0, 0, X509_ASN_ENCODING, &info, buf, + &len); + ok(ret, "CryptHashPublicKeyInfo failed: %08lx\n", GetLastError()); + ok(!memcmp(buf, emptyHash, len), "Unexpected hash\n"); + } +} + void testCompareCert(void) { CERT_INFO info1 = { 0 }, info2 = { 0 }; @@ -1827,6 +1859,7 @@ START_TEST(cert) testCompareCertName(); testCompareIntegerBlob(); testComparePublicKeyInfo(); + testHashPublicKeyInfo(); testCompareCert(); testVerifySubjectCert(); testAcquireCertPrivateKey(); diff --git a/include/wincrypt.h b/include/wincrypt.h index 6e88249..f538aee 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2936,6 +2936,10 @@ BOOL WINAPI CryptHashCertificate(HCRYPTP DWORD dwFlags, const BYTE *pbEncoded, DWORD cbEncoded, BYTE *pbComputedHash, DWORD *pcbComputedHash); +BOOL WINAPI CryptHashPublicKeyInfo(HCRYPTPROV hCryptProv, ALG_ID Algid, + DWORD dwFlags, DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, + BYTE *pbComputedHash, DWORD *pcbComputedHash); + BOOL WINAPI CryptHashToBeSigned(HCRYPTPROV hCryptProv, DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, BYTE *pbComputedHash, DWORD *pcbComputedHash);

1 0

Andrew Talbot : msi/tests: Write-strings warnings fix.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: 81592e497b6a1e161df0212329e73c255310996e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=81592e497b6a1e161df0212… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jul 28 18:45:50 2006 +0100 msi/tests: Write-strings warnings fix. --- dlls/msi/tests/db.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 4bf8871..063c645 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1076,7 +1076,7 @@ static UINT add_table_to_db(MSIHANDLE hd static void test_msiimport(void) { MSIHANDLE hdb, view, rec; - LPSTR query; + LPCSTR query; UINT r, count; signed int i;

1 0

Andrew Talbot : advpack/tests: Write-strings warnings fix.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: 719aa10a4b7b017664eaad4e7cbe58f73bde4e69 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=719aa10a4b7b017664eaad4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jul 28 21:32:25 2006 +0100 advpack/tests: Write-strings warnings fix. --- dlls/advpack/tests/advpack.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 48211f2..c178268 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -36,10 +36,10 @@ #define OPEN_GUID_KEY() !RegOpenKey(HKEY static HRESULT (WINAPI *pCloseINFEngine)(HINF); static HRESULT (WINAPI *pDelNode)(LPCSTR,DWORD); -static HRESULT (WINAPI *pGetVersionFromFile)(LPSTR,LPDWORD,LPDWORD,BOOL); +static HRESULT (WINAPI *pGetVersionFromFile)(LPCSTR,LPDWORD,LPDWORD,BOOL); static HRESULT (WINAPI *pOpenINFEngine)(PCSTR,PCSTR,DWORD,HINF*,PVOID); static HRESULT (WINAPI *pSetPerUserSecValues)(PPERUSERSECTION pPerUser); -static HRESULT (WINAPI *pTranslateInfString)(LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,DWORD,LPDWORD,LPVOID); +static HRESULT (WINAPI *pTranslateInfString)(LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,DWORD,LPDWORD,LPVOID); static HRESULT (WINAPI *pTranslateInfStringEx)(HINF,PCSTR,PCSTR,PCSTR,PSTR,DWORD,PDWORD,PVOID); static CHAR PROG_FILES[MAX_PATH]; @@ -397,7 +397,7 @@ static void translateinfstringex_test(vo DeleteFileA("c:\\test.inf"); } -static BOOL check_reg_str(HKEY hkey, LPSTR name, LPSTR value) +static BOOL check_reg_str(HKEY hkey, LPCSTR name, LPCSTR value) { DWORD size = MAX_PATH; char check[MAX_PATH]; @@ -408,7 +408,7 @@ static BOOL check_reg_str(HKEY hkey, LPS return !lstrcmp(check, value); } -static BOOL check_reg_dword(HKEY hkey, LPSTR name, DWORD value) +static BOOL check_reg_dword(HKEY hkey, LPCSTR name, DWORD value) { DWORD size = sizeof(DWORD); DWORD check;

1 0

Vitaliy Margolen : dinput: Add DISCL_NOWINKEY define.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: eb3028acc080922996b04f4e0cb36440680fe876 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb3028acc080922996b04f4… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Jul 28 08:13:21 2006 -0600 dinput: Add DISCL_NOWINKEY define. --- dlls/dinput/device.c | 3 ++- include/dinput.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 7e2e9d4..5c0234f 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -54,7 +54,8 @@ #define FE(x) { x, #x} FE(DISCL_BACKGROUND), FE(DISCL_EXCLUSIVE), FE(DISCL_FOREGROUND), - FE(DISCL_NONEXCLUSIVE) + FE(DISCL_NONEXCLUSIVE), + FE(DISCL_NOWINKEY) #undef FE }; for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) diff --git a/include/dinput.h b/include/dinput.h index 47409de..f6e766b 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -785,6 +785,7 @@ #define DISCL_EXCLUSIVE 0x00000001 #define DISCL_NONEXCLUSIVE 0x00000002 #define DISCL_FOREGROUND 0x00000004 #define DISCL_BACKGROUND 0x00000008 +#define DISCL_NOWINKEY 0x00000010 /* Device FF flags */ #define DISFFC_RESET 0x00000001

1 0

Juan Lang : rsaenh: Use Interlocked functions for reference counting.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: 669b0a52268ee116fee74bc2ae73e89e65632546 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=669b0a52268ee116fee74bc… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Jul 28 07:46:11 2006 -0700 rsaenh: Use Interlocked functions for reference counting. --- dlls/rsaenh/handle.c | 8 +++++--- dlls/rsaenh/handle.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/handle.c b/dlls/rsaenh/handle.c index 01746a6..d924c2d 100644 --- a/dlls/rsaenh/handle.c +++ b/dlls/rsaenh/handle.c @@ -253,7 +253,7 @@ int alloc_handle(HANDLETABLE *lpTable, O lpTable->paEntries[lpTable->iFirstFree].pObject = lpObject; lpTable->iFirstFree = lpTable->paEntries[lpTable->iFirstFree].iNextFree; - lpObject->refcount++; + InterlockedIncrement(&lpObject->refcount); ret = 1; exit: @@ -296,10 +296,12 @@ int release_handle(HANDLETABLE *lpTable, goto exit; pObject = lpTable->paEntries[index].pObject; - pObject->refcount--; - if (pObject->refcount == 0) + if (InterlockedDecrement(&pObject->refcount) == 0) + { + TRACE("destroying handle %d\n", handle); if (pObject->destructor) pObject->destructor(pObject); + } lpTable->paEntries[index].pObject = NULL; lpTable->paEntries[index].iNextFree = lpTable->iFirstFree; diff --git a/dlls/rsaenh/handle.h b/dlls/rsaenh/handle.h index 14febf9..6fa9639 100644 --- a/dlls/rsaenh/handle.h +++ b/dlls/rsaenh/handle.h @@ -36,7 +36,7 @@ typedef void (*DESTRUCTOR)(OBJECTHDR *ob struct tagOBJECTHDR { DWORD dwType; - UINT refcount; + LONG refcount; DESTRUCTOR destructor; };

1 0

Jason Green : wined3d: Start checking for D3DUSAGE_QUERY_* items, improve traces.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: d353ab7879d547871fa4732f0895dfed9c0f7ce0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d353ab7879d547871fa4732… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jul 28 15:33:20 2006 -0400 wined3d: Start checking for D3DUSAGE_QUERY_* items, improve traces. --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/directx.c | 22 +++++++++++++++------- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/utils.c | 22 +++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + include/d3d9types.h | 2 +- include/wine/wined3d_types.h | 10 ++++++++++ 7 files changed, 56 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d353ab7879d547871fa…

1 0

Jason Green : wined3d: Declare a 1D sampler for TEXDP3TEX (GLSL).
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: 2e52b36bb351d5b4863155cdafd20f1a32434579 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2e52b36bb351d5b4863155c… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jul 28 15:34:39 2006 -0400 wined3d: Declare a 1D sampler for TEXDP3TEX (GLSL). --- dlls/wined3d/baseshader.c | 18 ++++++++++----- dlls/wined3d/glsl_shader.c | 49 ++++++++++++++++++++++-------------------- include/d3d9types.h | 1 + include/wine/wined3d_types.h | 13 +++++++++++ 4 files changed, 52 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2e52b36bb351d5b4863…

1 0

Jason Green : wined3d: Skip processing of D3DSIO_PHASE instruction.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: e5fc18a5052c27ebd4e5f3ebb0a6d60f7f71af3e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e5fc18a5052c27ebd4e5f3e… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jul 28 15:35:39 2006 -0400 wined3d: Skip processing of D3DSIO_PHASE instruction. --- dlls/wined3d/baseshader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ce1f1a3..f5e3de5 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -701,6 +701,7 @@ void shader_generate_main( D3DSIO_DEF == curOpcode->opcode || D3DSIO_DEFI == curOpcode->opcode || D3DSIO_DEFB == curOpcode->opcode || + D3DSIO_PHASE == curOpcode->opcode || D3DSIO_RET == curOpcode->opcode) { pToken += shader_skip_opcode(This, curOpcode, hw_arg.opcode_token);

1 0