December 2007 - Wine-commits

Alexander Dorofeyev : ddraw: Release palette interfaces.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 9dbdacbd824189fafe6d88075761c5309a3f551b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbdacbd824189fafe6d88075… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Dec 30 18:03:42 2007 -0800 ddraw: Release palette interfaces. --- dlls/ddraw/texture.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index 0880154..3f0ccc9 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -394,6 +394,9 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, } } + if (pal) IDirectDrawPalette_Release(pal); + if (pal_src) IDirectDrawPalette_Release(pal_src); + /* Copy one surface on the other */ dst_d = (DDSURFACEDESC *)&(This->surface_desc); src_d = (DDSURFACEDESC *)&(src_ptr->surface_desc);

1 0

Andrew Talbot : cryptnet: Remove unneeded cast.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 46b6f43fa0da00264b2d050d07d03fc3f58ff7ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b6f43fa0da00264b2d050d0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Dec 30 15:29:43 2007 +0000 cryptnet: Remove unneeded cast. --- dlls/cryptnet/cryptnet_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index eba8648..30f9350 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1139,7 +1139,7 @@ static BOOL WINAPI CRYPT_CreatePKCS7(LPCSTR pszObjectOid, ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &pObject->rgBlob[0], CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED | CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED, CERT_QUERY_FORMAT_FLAG_BINARY, - 0, NULL, NULL, NULL, (HCERTSTORE *)ppvContext, NULL, NULL); + 0, NULL, NULL, NULL, ppvContext, NULL, NULL); else { FIXME("multiple messages unimplemented\n");

1 0

Andrew Talbot : crypt32: Remove unneeded casts.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 5d886557df4d1095bb84a26ccf0ed2bb5722e1aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d886557df4d1095bb84a26cc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Dec 30 15:29:38 2007 +0000 crypt32: Remove unneeded casts. --- dlls/crypt32/cert.c | 3 +-- dlls/crypt32/protectdata.c | 15 +++++++-------- dlls/crypt32/store.c | 2 +- dlls/crypt32/str.c | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 97f9360..d747574 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -831,8 +831,7 @@ DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType, if (ret) { - RSAPUBKEY *rsaPubKey = (RSAPUBKEY *)((LPBYTE)buf + - sizeof(BLOBHEADER)); + RSAPUBKEY *rsaPubKey = (RSAPUBKEY *)(buf + sizeof(BLOBHEADER)); len = rsaPubKey->bitlen; LocalFree(buf); diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index d5ec287..d3e0034 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -331,7 +331,7 @@ BOOL serialize(const struct protect_data_t *pInfo, DATA_BLOB *pSerial) if (ptr - pSerial->pbData != dwStruct) { ERR("struct size changed!? %u != expected %u\n", - ptr - pSerial->pbData, (unsigned int)dwStruct); + ptr - pSerial->pbData, dwStruct); LocalFree(pSerial->pbData); pSerial->pbData=NULL; pSerial->cbData=0; @@ -476,8 +476,7 @@ BOOL unserialize(const DATA_BLOB *pSerial, struct protect_data_t *pInfo) { /* this is an impossible-to-reach test, but if the padding * issue is ever understood, this may become more useful */ - ERR("loaded corrupt structure! (used %u expected %u)\n", - (unsigned int)index, (unsigned int)size); + ERR("loaded corrupt structure! (used %u expected %u)\n", index, size); status=FALSE; } @@ -776,15 +775,15 @@ report(const DATA_BLOB* pDataIn, const DATA_BLOB* pOptionalEntropy, TRACE("pPromptStruct: %p\n", pPromptStruct); if (pPromptStruct) { - TRACE(" cbSize: 0x%x\n",(unsigned int)pPromptStruct->cbSize); - TRACE(" dwPromptFlags: 0x%x\n",(unsigned int)pPromptStruct->dwPromptFlags); + TRACE(" cbSize: 0x%x\n", pPromptStruct->cbSize); + TRACE(" dwPromptFlags: 0x%x\n", pPromptStruct->dwPromptFlags); TRACE(" hwndApp: %p\n", pPromptStruct->hwndApp); TRACE(" szPrompt: %p %s\n", pPromptStruct->szPrompt, pPromptStruct->szPrompt ? debugstr_w(pPromptStruct->szPrompt) : ""); } - TRACE("dwFlags: 0x%04x\n",(unsigned int)dwFlags); + TRACE("dwFlags: 0x%04x\n", dwFlags); TRACE_DATA_BLOB(pDataIn); if (pOptionalEntropy) { @@ -893,7 +892,7 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn, ERR("CryptEncrypt\n"); goto free_hash; } - TRACE("required encrypted storage: %u\n",(unsigned int)dwLength); + TRACE("required encrypted storage: %u\n", dwLength); /* copy plain text into cipher area for CryptEncrypt call */ protect_data.cipher.cbData=dwLength; @@ -910,7 +909,7 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn, if (!CryptEncrypt(hKey, hHash, TRUE, 0, protect_data.cipher.pbData, &dwLength, protect_data.cipher.cbData)) { - ERR("CryptEncrypt %u\n",(unsigned int)GetLastError()); + ERR("CryptEncrypt %u\n", GetLastError()); goto free_hash; } protect_data.cipher.cbData=dwLength; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 1158feb..37247a5 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -521,7 +521,7 @@ static PWINECRYPT_CERTSTORE CRYPT_SysOpenStoreA(HCRYPTPROV hCryptProv, static void WINAPI CRYPT_MsgCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { - HCRYPTMSG msg = (HCRYPTMSG)hCertStore; + HCRYPTMSG msg = hCertStore; TRACE("(%p, %08x)\n", msg, dwFlags); CryptMsgClose(msg); diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 8e19dc8..699779f 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -622,7 +622,7 @@ static BOOL CRYPT_GetNextValueW(LPCWSTR str, DWORD dwFlags, LPCWSTR separators, while (*separators) map[*separators++] = 1; - while (*str && (*str >= 0xff || !map[*(const unsigned short *)str])) + while (*str && (*str >= 0xff || !map[*str])) str++; token->end = str; }

1 0

Jeremy White : wintab32: Add modest trace information for tablets.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: ca89d7e80998a817b4ed82e30901854b3f70cf8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca89d7e80998a817b4ed82e30… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Sun Dec 30 11:41:54 2007 -0600 wintab32: Add modest trace information for tablets. --- dlls/winex11.drv/wintab.c | 1 + dlls/wintab32/context.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index c3ad140..e3c7b57 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -436,6 +436,7 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) wine_tsx11_unlock(); return; } + TRACE("XListInputDevices reports %d devices\n", num_devices); for (loop=0; loop < num_devices; loop++) { int class_loop; diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 7974972..bd79701 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -367,6 +367,8 @@ static VOID TABLET_BlankPacketData(LPOPENCONTEXT context, LPVOID lpPkt, INT n) UINT WINAPI WTInfoT(UINT wCategory, UINT nIndex, LPVOID lpOutput, BOOL bUnicode) { UINT result; + + TRACE("(%d, %d, %p, %d)\n", wCategory, nIndex, lpOutput, bUnicode); if (gLoaded == FALSE) LoadTablet(); @@ -409,7 +411,7 @@ UINT WINAPI WTInfoT(UINT wCategory, UINT nIndex, LPVOID lpOutput, BOOL bUnicode) LOGCONTEXTWtoA(&buf, lpOutput); } - return bUnicode ? sizeof(LOGCONTEXTW) : sizeof(LOGCONTEXTA); + result = bUnicode ? sizeof(LOGCONTEXTW) : sizeof(LOGCONTEXTA); } else if (is_string_field(wCategory, nIndex) && !bUnicode) { @@ -422,6 +424,7 @@ UINT WINAPI WTInfoT(UINT wCategory, UINT nIndex, LPVOID lpOutput, BOOL bUnicode) else result = pWTInfoW(wCategory, nIndex, lpOutput); + TRACE("returns %d\n", result); return result; }

1 0

Jeremy White : wintab32: Remove the unused and clearly broken FindOpenContext function.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 6c1d38649ae547d57dbb91bc07281390d0b3befa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1d38649ae547d57dbb91bc0… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Sun Dec 30 17:16:37 2007 -0600 wintab32: Remove the unused and clearly broken FindOpenContext function. It's clear that someone left it in by accident; the TABLET_FindOpenContext is its clear successor. --- dlls/wintab32/context.c | 15 --------------- dlls/wintab32/wintab_internal.h | 1 - 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index bd79701..4b382ec 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -166,21 +166,6 @@ static inline DWORD ScaleForContext(DWORD In, DWORD InOrg, DWORD InExt, DWORD return ((abs(InExt) - (In - InOrg))*abs(OutExt) / abs(InExt)) + OutOrg; } -LPOPENCONTEXT FindOpenContext(HWND hwnd) -{ - LPOPENCONTEXT ptr; - - EnterCriticalSection(&csTablet); - ptr = gOpenContexts; - while (ptr) - { - TRACE("Trying Context %p (%p %p)\n",ptr->handle,hwnd,ptr->hwndOwner); - if (ptr->hwndOwner == hwnd) break; - } - LeaveCriticalSection(&csTablet); - return ptr; -} - LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) { LPOPENCONTEXT ptr=NULL; diff --git a/dlls/wintab32/wintab_internal.h b/dlls/wintab32/wintab_internal.h index 1c8636d..4fa4bfd 100644 --- a/dlls/wintab32/wintab_internal.h +++ b/dlls/wintab32/wintab_internal.h @@ -149,7 +149,6 @@ typedef struct tagOPENCONTEXT int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, LPARAM lParam, BOOL send_always); LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd); -LPOPENCONTEXT FindOpenContext(HWND hwnd); /* X11drv functions */ extern int (*pLoadTabletInfo)(HWND hwnddefault);

1 0

Andrew Talbot : cabinet: Remove unneeded cast.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 69599675a7d6ee7ea0a10bf4ccb994ccd7c6c2a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69599675a7d6ee7ea0a10bf4c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 29 15:37:27 2007 +0000 cabinet: Remove unneeded cast. --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 91e2daf..a0bb64a 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -461,7 +461,7 @@ static char *FDI_read_string(HFDI hfdi, INT_PTR hf, long cabsize) } /* otherwise, set the stream to just after the string and return */ - PFDI_SEEK(hfdi, hf, base + ((cab_off_t) strlen((char *) buf)) + 1, SEEK_SET); + PFDI_SEEK(hfdi, hf, base + strlen((char *)buf) + 1, SEEK_SET); return (char *) buf; }

1 0

Andrew Talbot : avifil32: Remove unneeded casts.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: ff92404decece1c3eb1499162c87f03a03b4a0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff92404decece1c3eb1499162… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 29 15:37:24 2007 +0000 avifil32: Remove unneeded casts. --- dlls/avifil32/api.c | 2 +- dlls/avifil32/avifile.c | 4 ++-- dlls/avifil32/factory.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 910c816..465164a 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1509,7 +1509,7 @@ BOOL WINAPI AVISaveOptions(HWND hWnd, UINT uFlags, INT nStreams, HeapFree(GetProcessHeap(), 0, pSavedOptions); } - return (BOOL)ret; + return ret; } /*********************************************************************** diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index a23e326..b97fd78 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1795,7 +1795,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) if (str == NULL) return AVIERR_MEMORY; - if (mmioRead(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize) + if (mmioRead(This->hmmio, str, ck.cksize) != ck.cksize) { HeapFree(GetProcessHeap(), 0, str); return AVIERR_FILEREAD; @@ -2249,7 +2249,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) WideCharToMultiByte(CP_ACP, 0, pStream->sInfo.szName, -1, str, ck.cksize, NULL, NULL); - if (mmioWrite(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize) { + if (mmioWrite(This->hmmio, str, ck.cksize) != ck.cksize) { HeapFree(GetProcessHeap(), 0, str); return AVIERR_FILEWRITE; } diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index ae717c8..40e4c68 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -209,7 +209,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDll); - AVIFILE_hModule = (HMODULE)hInstDll; + AVIFILE_hModule = hInstDll; break; case DLL_PROCESS_DETACH: break;

1 0

Andrew Talbot : user32: Fix a spelling typo.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 8752c6d1a51387f087ffa6cf8fa511b10c8bf00d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8752c6d1a51387f087ffa6cf8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 29 21:17:43 2007 +0000 user32: Fix a spelling typo. --- dlls/user32/dde_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index 8f43c36..cd32e4a 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -1005,7 +1005,7 @@ static LRESULT CALLBACK WDML_ServerConvProc(HWND hwndServer, UINT iMsg, WPARAM w } if (pConv->hwndClient != WIN_GetFullHandle( (HWND)wParam ) || pConv->hwndServer != hwndServer) { - ERR("mismatch between C/S windows and converstation\n"); + ERR("mismatch between C/S windows and conversation\n"); return 0; } if (pConv->instance != pInstance || pConv->instance == NULL)

1 0

Peter Dons Tychsen : oleaut32: Add missing types to serialize/deserialize.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 1e1b29f842191b0a3ffe98e76188192b4e0538be URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1b29f842191b0a3ffe98e76… Author: Peter Dons Tychsen <donpedro(a)dhcppc4> Date: Sat Dec 29 05:55:48 2007 +0100 oleaut32: Add missing types to serialize/deserialize. --- dlls/oleaut32/tmarshal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 6e5f494..9649705 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -573,6 +573,7 @@ serialize_param( return S_OK; case VT_I8: case VT_UI8: + case VT_R8: case VT_CY: hres = S_OK; if (debugout) TRACE_(olerelay)("%x%x\n",arg[0],arg[1]); @@ -900,6 +901,7 @@ deserialize_param( } case VT_I8: case VT_UI8: + case VT_R8: case VT_CY: if (readit) { hres = xbuf_get(buf,(LPBYTE)arg,8);

1 0

Andrew Talbot : advapi32: Remove unneeded casts.
by Alexandre Julliard 31 Dec '07

31 Dec '07

Module: wine Branch: master Commit: 05f38321c4b5672238c635c27079cac079074dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f38321c4b5672238c635c27… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 29 15:37:21 2007 +0000 advapi32: Remove unneeded casts. --- dlls/advapi32/crypt_md4.c | 4 ++-- dlls/advapi32/crypt_md5.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt_md4.c b/dlls/advapi32/crypt_md4.c index 5f4e709..3341f08 100644 --- a/dlls/advapi32/crypt_md4.c +++ b/dlls/advapi32/crypt_md4.c @@ -58,7 +58,7 @@ static void byteReverse( unsigned char *buf, unsigned longs ) unsigned int t; do { - t = (unsigned int)((unsigned)buf[3] << 8 | buf[2]) << 16 | + t = ((unsigned)buf[3] << 8 | buf[2]) << 16 | ((unsigned)buf[1] << 8 | buf[0]); *(unsigned int *)buf = t; buf += 4; @@ -90,7 +90,7 @@ VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len /* Update bitcount */ t = ctx->i[0]; - if ((ctx->i[0] = t + ((unsigned int)len << 3)) < t) + if ((ctx->i[0] = t + (len << 3)) < t) ctx->i[1]++; /* Carry from low to high */ ctx->i[1] += len >> 29; diff --git a/dlls/advapi32/crypt_md5.c b/dlls/advapi32/crypt_md5.c index d326715..3cb039a 100644 --- a/dlls/advapi32/crypt_md5.c +++ b/dlls/advapi32/crypt_md5.c @@ -55,7 +55,7 @@ static void byteReverse( unsigned char *buf, unsigned longs ) unsigned int t; do { - t = (unsigned int)((unsigned)buf[3] << 8 | buf[2]) << 16 | + t = ((unsigned)buf[3] << 8 | buf[2]) << 16 | ((unsigned)buf[1] << 8 | buf[0]); *(unsigned int *)buf = t; buf += 4; @@ -87,7 +87,7 @@ VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len /* Update bitcount */ t = ctx->i[0]; - if ((ctx->i[0] = t + ((unsigned int)len << 3)) < t) + if ((ctx->i[0] = t + (len << 3)) < t) ctx->i[1]++; /* Carry from low to high */ ctx->i[1] += len >> 29;

1 0