November 2008 - Wine-commits

Michael Stefaniuc : comdlg32: Remove superfluous casts of void pointers to other pointer types.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: 2d27d8290919501c08549a810277fb8760d25b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d27d8290919501c08549a810… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 5 23:01:03 2008 +0100 comdlg32: Remove superfluous casts of void pointers to other pointer types. --- dlls/comdlg32/finddlg32.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/finddlg32.c b/dlls/comdlg32/finddlg32.c index 027a8b4..80c8e8b 100644 --- a/dlls/comdlg32/finddlg32.c +++ b/dlls/comdlg32/finddlg32.c @@ -417,7 +417,7 @@ static HWND COMDLG32_FR_DoFindReplace( goto cleanup; } - if((rcs = (LPDLGTEMPLATEW)LockResource(loadrc)) == NULL) + if((rcs = LockResource(loadrc)) == NULL) { error = CDERR_LOCKRESFAILURE; goto cleanup; @@ -453,7 +453,7 @@ HWND WINAPI FindTextA( if(!COMDLG32_FR_CheckPartial(pfr, FALSE)) return 0; - if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data))) == NULL) + if((pdata = COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data))) == NULL) return 0; /* Error has been set */ pdata->user_fr.fra = pfr; @@ -476,7 +476,7 @@ HWND WINAPI ReplaceTextA( if(!COMDLG32_FR_CheckPartial(pfr, TRUE)) return 0; - if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data))) == NULL) + if((pdata = COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data))) == NULL) return 0; /* Error has been set */ pdata->user_fr.fra = pfr; @@ -507,8 +507,8 @@ HWND WINAPI FindTextW( len = WideCharToMultiByte( CP_ACP, 0, pfr->lpstrFindWhat, pfr->wFindWhatLen, NULL, 0, NULL, NULL ); - if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data) + len)) == NULL) - return 0; /* Error has been set */ + if((pdata = COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data) + len)) == NULL) + return 0; /* Error has been set */ pdata->user_fr.frw = pfr; pdata->fr = *(LPFINDREPLACEA)pfr; /* FINDREPLACEx have same size */ @@ -543,9 +543,8 @@ HWND WINAPI ReplaceTextW( NULL, 0, NULL, NULL ); len2 = WideCharToMultiByte( CP_ACP, 0, pfr->lpstrReplaceWith, pfr->wReplaceWithLen, NULL, 0, NULL, NULL ); - if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data) - + len1 + len2)) == NULL) - return 0; /* Error has been set */ + if((pdata = COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data) + len1 + len2)) == NULL) + return 0; /* Error has been set */ pdata->user_fr.frw = pfr; pdata->fr = *(LPFINDREPLACEA)pfr; /* FINDREPLACEx have same size */

1 0

Michael Stefaniuc : shlwapi: Remove superfluous casts of/to void pointers.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: 5f55f154bf5609507757f174bd3bf5ce22495067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f55f154bf5609507757f174b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 5 23:04:51 2008 +0100 shlwapi: Remove superfluous casts of/to void pointers. --- dlls/shlwapi/clist.c | 24 ++++++++++-------------- dlls/shlwapi/istream.c | 2 +- dlls/shlwapi/ordinal.c | 2 +- dlls/shlwapi/reg.c | 22 +++++++++++----------- dlls/shlwapi/string.c | 4 ++-- dlls/shlwapi/tests/string.c | 4 ++-- dlls/shlwapi/thread.c | 2 +- 7 files changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c index 2fa53cd..52bee37 100644 --- a/dlls/shlwapi/clist.c +++ b/dlls/shlwapi/clist.c @@ -91,8 +91,7 @@ HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewIt if(!*lppList) { /* An empty list. Allocate space for terminal ulSize also */ - *lppList = (LPDATABLOCK_HEADER)LocalAlloc(LMEM_ZEROINIT, - ulSize + sizeof(ULONG)); + *lppList = LocalAlloc(LMEM_ZEROINIT, ulSize + sizeof(ULONG)); lpInsertAt = *lppList; } else @@ -109,8 +108,7 @@ HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewIt } /* Increase the size of the list */ - lpIter = (LPDATABLOCK_HEADER)LocalReAlloc((HLOCAL)*lppList, - ulTotalSize + ulSize+sizeof(ULONG), + lpIter = LocalReAlloc(*lppList, ulTotalSize + ulSize+sizeof(ULONG), LMEM_ZEROINIT | LMEM_MOVEABLE); if(lpIter) { @@ -247,7 +245,7 @@ HRESULT WINAPI SHReadDataBlockList(IStream* lpStream, LPDBLIST* lppList) if(*lppList) { /* Free any existing list */ - LocalFree((HLOCAL)*lppList); + LocalFree(*lppList); *lppList = NULL; } @@ -283,10 +281,9 @@ HRESULT WINAPI SHReadDataBlockList(IStream* lpStream, LPDBLIST* lppList) LPDATABLOCK_HEADER lpTemp; if (pItem == bBuff) - lpTemp = (LPDATABLOCK_HEADER)LocalAlloc(LMEM_ZEROINIT, ulSize); + lpTemp = LocalAlloc(LMEM_ZEROINIT, ulSize); else - lpTemp = (LPDATABLOCK_HEADER)LocalReAlloc((HLOCAL)pItem, ulSize, - LMEM_ZEROINIT|LMEM_MOVEABLE); + lpTemp = LocalReAlloc(pItem, ulSize, LMEM_ZEROINIT|LMEM_MOVEABLE); if(!lpTemp) { @@ -312,7 +309,7 @@ HRESULT WINAPI SHReadDataBlockList(IStream* lpStream, LPDBLIST* lppList) /* If we allocated space, free it */ if(pItem != bBuff) - LocalFree((HLOCAL)pItem); + LocalFree(pItem); return hRet; } @@ -336,7 +333,7 @@ VOID WINAPI SHFreeDataBlockList(LPDBLIST lpList) TRACE("(%p)\n", lpList); if (lpList) - LocalFree((HLOCAL)lpList); + LocalFree(lpList); } /************************************************************************* @@ -389,20 +386,19 @@ BOOL WINAPI SHRemoveDataBlock(LPDBLIST* lppList, DWORD dwSignature) lpList = NextItem(lpList); /* Resize the list */ - ulNewSize = LocalSize((HLOCAL)*lppList) - lpItem->cbSize; + ulNewSize = LocalSize(*lppList) - lpItem->cbSize; /* Copy following elements over lpItem */ memmove(lpItem, lpNext, (char *)lpList - (char *)lpNext + sizeof(ULONG)); if(ulNewSize <= sizeof(ULONG)) { - LocalFree((HLOCAL)*lppList); + LocalFree(*lppList); *lppList = NULL; /* Removed the last element */ } else { - lpList = (LPDATABLOCK_HEADER)LocalReAlloc((HLOCAL)*lppList, ulNewSize, - LMEM_ZEROINIT|LMEM_MOVEABLE); + lpList = LocalReAlloc(*lppList, ulNewSize, LMEM_ZEROINIT|LMEM_MOVEABLE); if(lpList) *lppList = lpList; } diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index c5c8c06..1d11c37 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -101,7 +101,7 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) if (!refCount) { IStream_fnCommit(iface, 0); /* If ever buffered, this will be needed */ - LocalFree((HLOCAL)This->lpszPath); + LocalFree(This->lpszPath); CloseHandle(This->hFile); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index be6b0da..1d3d641 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4335,7 +4335,7 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, va_end(args); ret = MessageBoxW(hWnd, pszTemp, pszTitle, uType); - LocalFree((HLOCAL)pszTemp); + LocalFree(pszTemp); return ret; } diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 9239824..07384ea 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -68,8 +68,8 @@ HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID,LPCWSTR,BOOL,BOOL,PHKEY); */ static HKEY WINAPI REG_GetHKEYFromHUSKEY(HUSKEY hUSKey, BOOL which) { - HKEY test = (HKEY) hUSKey; - LPSHUSKEY mihk = (LPSHUSKEY) hUSKey; + HKEY test = hUSKey; + LPSHUSKEY mihk = hUSKey; if ((test == HKEY_CLASSES_ROOT) || (test == HKEY_CURRENT_CONFIG) || @@ -174,7 +174,7 @@ LONG WINAPI SHRegOpenUSKeyW(LPCWSTR Path, REGSAM AccessType, HUSKEY hRelativeUSK TRACE("HUSKEY=%p\n", hKey); if (phNewUSKey) - *phNewUSKey = (HUSKEY)hKey; + *phNewUSKey = hKey; return ERROR_SUCCESS; } @@ -1398,21 +1398,21 @@ DWORD WINAPI SHQueryValueExA( HKEY hKey, LPCSTR lpszValue, char cNull = '\0'; nBytesToAlloc = dwUnExpDataLen; - szData = (LPSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); + szData = LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); RegQueryValueExA (hKey, lpszValue, lpReserved, NULL, (LPBYTE)szData, &nBytesToAlloc); dwExpDataLen = ExpandEnvironmentStringsA(szData, &cNull, 1); dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen); - LocalFree((HLOCAL) szData); + LocalFree(szData); } else { nBytesToAlloc = (lstrlenA(pvData)+1) * sizeof (CHAR); - szData = (LPSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc ); + szData = LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); lstrcpyA(szData, pvData); dwExpDataLen = ExpandEnvironmentStringsA(szData, pvData, *pcbData / sizeof(CHAR)); if (dwExpDataLen > *pcbData) dwRet = ERROR_MORE_DATA; dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen); - LocalFree((HLOCAL) szData); + LocalFree(szData); } } @@ -1459,21 +1459,21 @@ DWORD WINAPI SHQueryValueExW(HKEY hKey, LPCWSTR lpszValue, WCHAR cNull = '\0'; nBytesToAlloc = dwUnExpDataLen; - szData = (LPWSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); + szData = LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); RegQueryValueExW (hKey, lpszValue, lpReserved, NULL, (LPBYTE)szData, &nBytesToAlloc); dwExpDataLen = ExpandEnvironmentStringsW(szData, &cNull, 1); dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen); - LocalFree((HLOCAL) szData); + LocalFree(szData); } else { nBytesToAlloc = (lstrlenW(pvData) + 1) * sizeof(WCHAR); - szData = (LPWSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc ); + szData = LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); lstrcpyW(szData, pvData); dwExpDataLen = ExpandEnvironmentStringsW(szData, pvData, *pcbData/sizeof(WCHAR) ); if (dwExpDataLen > *pcbData) dwRet = ERROR_MORE_DATA; dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen); - LocalFree((HLOCAL) szData); + LocalFree(szData); } } diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 89cf5ef..bc961da 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -911,7 +911,7 @@ LPSTR WINAPI StrDupA(LPCSTR lpszStr) TRACE("(%s)\n",debugstr_a(lpszStr)); iLen = lpszStr ? strlen(lpszStr) + 1 : 1; - lpszRet = (LPSTR)LocalAlloc(LMEM_FIXED, iLen); + lpszRet = LocalAlloc(LMEM_FIXED, iLen); if (lpszRet) { @@ -936,7 +936,7 @@ LPWSTR WINAPI StrDupW(LPCWSTR lpszStr) TRACE("(%s)\n",debugstr_w(lpszStr)); iLen = (lpszStr ? strlenW(lpszStr) + 1 : 1) * sizeof(WCHAR); - lpszRet = (LPWSTR)LocalAlloc(LMEM_FIXED, iLen); + lpszRet = LocalAlloc(LMEM_FIXED, iLen); if (lpszRet) { diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 4d9c17c..34ab7ba 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -486,7 +486,7 @@ static void test_StrDupA(void) if (lpszStr) { ok(!strcmp(result->byte_size_64, lpszStr), "Copied string wrong\n"); - LocalFree((HLOCAL)lpszStr); + LocalFree(lpszStr); } result++; } @@ -496,7 +496,7 @@ static void test_StrDupA(void) */ lpszStr = StrDupA(NULL); ok(lpszStr == NULL || *lpszStr == '\0', "NULL string returned %p\n", lpszStr); - LocalFree((HLOCAL)lpszStr); + LocalFree(lpszStr); } static void test_StrFormatByteSize64A(void) diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index 9aa56b5..cfe6615 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -140,7 +140,7 @@ HRESULT WINAPI SHGetThreadRef(IUnknown **lppUnknown) if (!lppUnknown || SHLWAPI_ThreadRef_index == TLS_OUT_OF_INDEXES) return E_NOINTERFACE; - *lppUnknown = (IUnknown*)TlsGetValue(SHLWAPI_ThreadRef_index); + *lppUnknown = TlsGetValue(SHLWAPI_ThreadRef_index); if (!*lppUnknown) return E_NOINTERFACE;

1 0

Detlef Riekenberg : user32/tests: Fix crash on win9x in the dde test.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: 609a3998f70a5f448a5b4bac6d8f1c6071a14a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=609a3998f70a5f448a5b4bac6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Nov 5 21:30:41 2008 +0100 user32/tests: Fix crash on win9x in the dde test. --- dlls/user32/tests/dde.c | 141 ++++++++++++++++++++++++++-------------------- 1 files changed, 80 insertions(+), 61 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 14a52b5..a3b73a5 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1055,9 +1055,14 @@ static void test_msg_client() /* WM_DDE_POKE, no ddepoke */ lparam = PackDDElParam(WM_DDE_POKE, 0, item); - PostMessageA(server_hwnd, WM_DDE_POKE, (WPARAM)client_hwnd, lparam); + /* win9x returns 0 here and crashes in PostMessageA */ + if (lparam) { + PostMessageA(server_hwnd, WM_DDE_POKE, (WPARAM)client_hwnd, lparam); + flush_events(); + } + else + win_skip("no lparam for WM_DDE_POKE\n"); - flush_events(); /* WM_DDE_POKE, no item */ lparam = PackDDElParam(WM_DDE_POKE, (UINT_PTR)hglobal, 0); @@ -1522,15 +1527,9 @@ static void test_DdeCreateDataHandle(void) item = DdeCreateStringHandleA(dde_inst, "item", CP_WINANSI); ok(item != NULL, "Expected non-NULL hsz\n"); - /* invalid instance id */ - DdeGetLastError(dde_inst); - hdata = DdeCreateDataHandle(0xdeadbeef, (LPBYTE)"data", MAX_PATH, 0, item, CF_TEXT, 0); - err = DdeGetLastError(dde_inst); - todo_wine - { - ok(hdata == NULL, "Expected NULL, got %p\n", hdata); - ok(err == DMLERR_INVALIDPARAMETER, - "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); + if (0) { + /* do not test with an invalid instance id: that crashes on win9x */ + hdata = DdeCreateDataHandle(0xdeadbeef, (LPBYTE)"data", MAX_PATH, 0, item, CF_TEXT, 0); } /* 0 instance id */ @@ -1826,19 +1825,24 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); lparam = PackDDElParam(WM_DDE_ADVISE, 0xcafe, 0xbeef); - ptr = GlobalLock((HGLOBAL)lparam); - ok(ptr != NULL, "Expected non-NULL ptr\n"); - ok(ptr[0] == 0xcafe, "Expected 0xcafe, got %08lx\n", ptr[0]); - ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]); + /* win9x returns 0 here */ + if (lparam) { + ptr = GlobalLock((HGLOBAL)lparam); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(ptr[0] == 0xcafe, "Expected 0xcafe, got %08lx\n", ptr[0]); + ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]); - ret = GlobalUnlock((HGLOBAL)lparam); - ok(ret == 1, "Expected 1, got %d\n", ret); + ret = GlobalUnlock((HGLOBAL)lparam); + ok(ret == 1, "Expected 1, got %d\n", ret); - lo = hi = 0; - ret = UnpackDDElParam(WM_DDE_ADVISE, lparam, &lo, &hi); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - ok(lo == 0xcafe, "Expected 0xcafe, got %08lx\n", lo); - ok(hi == 0xbeef, "Expected 0xbeef, got %08lx\n", hi); + lo = hi = 0; + ret = UnpackDDElParam(WM_DDE_ADVISE, lparam, &lo, &hi); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(lo == 0xcafe, "Expected 0xcafe, got %08lx\n", lo); + ok(hi == 0xbeef, "Expected 0xbeef, got %08lx\n", hi); + } + else + win_skip("no lparam for WM_DDE_ADVISE\n"); ret = FreeDDElParam(WM_DDE_ADVISE, lparam); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -1865,42 +1869,52 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); lparam = PackDDElParam(WM_DDE_ACK, 0xcafe, 0xbeef); - ptr = GlobalLock((HGLOBAL)lparam); - ok(ptr != NULL, "Expected non-NULL ptr\n"); - ok(ptr[0] == 0xcafe, "Expected 0xcafe, got %08lx\n", ptr[0]); - ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]); + /* win9x returns the input (0xbeef<<16 | 0xcafe) here */ + if (lparam != 0xbeefcafe) { + ptr = GlobalLock((HGLOBAL)lparam); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(ptr[0] == 0xcafe, "Expected 0xcafe, got %08lx\n", ptr[0]); + ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]); - ret = GlobalUnlock((HGLOBAL)lparam); - ok(ret == 1, "Expected 1, got %d\n", ret); + ret = GlobalUnlock((HGLOBAL)lparam); + ok(ret == 1, "Expected 1, got %d\n", ret); - lo = hi = 0; - ret = UnpackDDElParam(WM_DDE_ACK, lparam, &lo, &hi); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - ok(lo == 0xcafe, "Expected 0xcafe, got %08lx\n", lo); - ok(hi == 0xbeef, "Expected 0xbeef, got %08lx\n", hi); + lo = hi = 0; + ret = UnpackDDElParam(WM_DDE_ACK, lparam, &lo, &hi); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(lo == 0xcafe, "Expected 0xcafe, got %08lx\n", lo); + ok(hi == 0xbeef, "Expected 0xbeef, got %08lx\n", hi); - ret = FreeDDElParam(WM_DDE_ACK, lparam); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ret = FreeDDElParam(WM_DDE_ACK, lparam); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - hglobal = GlobalFree((HGLOBAL)lparam); - ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + hglobal = GlobalFree((HGLOBAL)lparam); + ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + } + else + win_skip("got lparam 0x%lx for WM_DDE_ACK\n", lparam); lparam = PackDDElParam(WM_DDE_DATA, 0xcafe, 0xbeef); - ptr = GlobalLock((HGLOBAL)lparam); - ok(ptr != NULL, "Expected non-NULL ptr\n"); - ok(ptr[0] == 0xcafe, "Expected 0xcafe, got %08lx\n", ptr[0]); - ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]); + /* win9x returns 0 here */ + if (lparam) { + ptr = GlobalLock((HGLOBAL)lparam); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(ptr[0] == 0xcafe, "Expected 0xcafe, got %08lx\n", ptr[0]); + ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]); - ret = GlobalUnlock((HGLOBAL)lparam); - ok(ret == 1, "Expected 1, got %d\n", ret); + ret = GlobalUnlock((HGLOBAL)lparam); + ok(ret == 1, "Expected 1, got %d\n", ret); - lo = hi = 0; - ret = UnpackDDElParam(WM_DDE_DATA, lparam, &lo, &hi); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - ok(lo == 0xcafe, "Expected 0xcafe, got %08lx\n", lo); - ok(hi == 0xbeef, "Expected 0xbeef, got %08lx\n", hi); + lo = hi = 0; + ret = UnpackDDElParam(WM_DDE_DATA, lparam, &lo, &hi); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(lo == 0xcafe, "Expected 0xcafe, got %08lx\n", lo); + ok(hi == 0xbeef, "Expected 0xbeef, got %08lx\n", hi); + } + else + win_skip("no lparam for WM_DDE_DATA\n"); ret = FreeDDElParam(WM_DDE_DATA, lparam); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -1927,19 +1941,24 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); lparam = PackDDElParam(WM_DDE_POKE, 0xcafe, 0xbeef); - ptr = GlobalLock((HGLOBAL)lparam); - ok(ptr != NULL, "Expected non-NULL ptr\n"); - ok(ptr[0] == 0xcafe, "Expected 0xcafe, got %08lx\n", ptr[0]); - ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]); + /* win9x returns 0 here */ + if (lparam) { + ptr = GlobalLock((HGLOBAL)lparam); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(ptr[0] == 0xcafe, "Expected 0xcafe, got %08lx\n", ptr[0]); + ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]); - ret = GlobalUnlock((HGLOBAL)lparam); - ok(ret == 1, "Expected 1, got %d\n", ret); + ret = GlobalUnlock((HGLOBAL)lparam); + ok(ret == 1, "Expected 1, got %d\n", ret); - lo = hi = 0; - ret = UnpackDDElParam(WM_DDE_POKE, lparam, &lo, &hi); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - ok(lo == 0xcafe, "Expected 0xcafe, got %08lx\n", lo); - ok(hi == 0xbeef, "Expected 0xbeef, got %08lx\n", hi); + lo = hi = 0; + ret = UnpackDDElParam(WM_DDE_POKE, lparam, &lo, &hi); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(lo == 0xcafe, "Expected 0xcafe, got %08lx\n", lo); + ok(hi == 0xbeef, "Expected 0xbeef, got %08lx\n", hi); + } + else + win_skip("no lparam for WM_DDE_POKE\n"); ret = FreeDDElParam(WM_DDE_POKE, lparam); ok(ret == TRUE, "Expected TRUE, got %d\n", ret);

1 0

Andrew Talbot : riched20: Sign-compare warnings fix.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: affc6e029c793bd1f204793b6476dc77c17c1c5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=affc6e029c793bd1f204793b6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 5 20:48:37 2008 +0000 riched20: Sign-compare warnings fix. --- dlls/riched20/editor.c | 8 ++++---- dlls/riched20/reader.c | 2 +- dlls/riched20/writer.c | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 29aa577..2e44663 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3203,7 +3203,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if (unicode) { memcpy((LPWSTR)lParam, bufferW, wParam * sizeof(WCHAR)); - if (lstrlenW(bufferW) >= wParam) rc = 0; + if (strlenW(bufferW) >= wParam) rc = 0; } else { @@ -3338,7 +3338,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, { if (run && (run->member.run.nFlags & MERF_ENDPARA)) { - unsigned int i; + int i; /* Write as many \r as encoded in end-of-paragraph, space allowing */ for (i = 0; i < run->member.run.nCR && nCharsLeft > 0; i++, nCharsLeft--) { @@ -4650,7 +4650,7 @@ BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, int sel_min, int sel_max) }; LPWSTR bufferW = NULL; WCHAR bufW[32]; - int i; + unsigned int i; if (sel_max == -1) sel_max = ME_GetTextLength(editor); assert(sel_min <= sel_max); @@ -4660,7 +4660,7 @@ BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, int sel_min, int sel_max) if (bufferW == NULL) { bufferW = heap_alloc((sel_max - sel_min + 1) * sizeof(WCHAR)); } - ME_GetTextW(editor, bufferW, sel_min, min(sel_max - sel_min, strlen(prefixes[i].text)), 0); + ME_GetTextW(editor, bufferW, sel_min, min(sel_max - sel_min, lstrlenA(prefixes[i].text)), 0); MultiByteToWideChar(CP_ACP, 0, prefixes[i].text, -1, bufW, 32); if (!lstrcmpW(bufW, bufferW)) { diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 7ad9d81..0e0d9a0 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2326,7 +2326,7 @@ void LookupInit(void) void LookupCleanup(void) { - int i; + unsigned int i; for (i=0; i<RTF_KEY_COUNT*2; i++) { diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 109ada1..98bb9d3 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -201,7 +201,7 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, { ME_DisplayItem *item = pFirstRun; ME_FontTableItem *table = pStream->fonttbl; - int i; + unsigned int i; ME_DisplayItem *pLastPara = ME_GetParagraph(pLastRun); ME_DisplayItem *pCell = NULL; @@ -264,7 +264,7 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, { if (borders[i]->width > 0) { - int j; + unsigned int j; COLORREF crColor = borders[i]->colorRef; for (j = 1; j < pStream->nColorTblLen; j++) if (pStream->colortbl[j] == crColor) @@ -348,7 +348,7 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, { if (borders[i]->width) { - int j; + unsigned int j; COLORREF crColor = borders[i]->colorRef; sprintf(props + strlen(props), "\\clbrdr%c", sideChar[i]); sprintf(props + strlen(props), "\\brdrs"); @@ -380,7 +380,7 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, { if (borders[i]->width) { - int j; + unsigned int j; COLORREF crColor = borders[i]->colorRef; sprintf(props + strlen(props), "\\trbrdr%c", sideChar[i]); sprintf(props + strlen(props), "\\brdrs"); @@ -555,7 +555,7 @@ static BOOL ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) { char props[STREAMOUT_BUFFER_SIZE] = ""; - int i; + unsigned int i; if (fmt->dwMask & CFM_ALLCAPS && fmt->dwEffects & CFE_ALLCAPS) strcat(props, "\\caps");

1 0

Austin English : wininet: Change a couple fixme's to warn's.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: d7c0cbdce51081fe9ade524b3e29e1591761b255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c0cbdce51081fe9ade524b3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 5 15:21:04 2008 -0600 wininet: Change a couple fixme's to warn's. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 353b156..492ce89 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -863,7 +863,7 @@ BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved) TRACE("(%p, 0x%08x)\n", lpdwStatus, dwReserved); if (lpdwStatus) { - FIXME("always returning LAN connection.\n"); + WARN("always returning LAN connection.\n"); *lpdwStatus = INTERNET_CONNECTION_LAN; } return TRUE; @@ -907,7 +907,7 @@ BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnecti return FALSE; if (lpdwStatus) { - FIXME("always returning LAN connection.\n"); + WARN("always returning LAN connection.\n"); *lpdwStatus = INTERNET_CONNECTION_LAN; } return LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen);

1 0

Michael Stefaniuc : shell32: Remove superfluous casts; mostly of void pointers.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: b7de266082614ef3b721a4f8eeaffb222626654d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7de266082614ef3b721a4f8e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 5 23:00:50 2008 +0100 shell32: Remove superfluous casts; mostly of void pointers. --- dlls/shell32/autocomplete.c | 2 +- dlls/shell32/brsfolder.c | 2 +- dlls/shell32/clipboard.c | 8 ++++---- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/dragdrophelper.c | 2 +- dlls/shell32/enumidlist.c | 2 +- dlls/shell32/iconcache.c | 6 +++--- dlls/shell32/pidl.c | 8 ++++---- dlls/shell32/shell.c | 2 +- dlls/shell32/shellole.c | 6 +++--- dlls/shell32/shellord.c | 2 +- dlls/shell32/shellstring.c | 2 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_netplaces.c | 2 +- dlls/shell32/shfldr_unixfs.c | 6 +++--- dlls/shell32/shlmenu.c | 2 +- dlls/shell32/shlview.c | 2 +- dlls/shell32/shv_bg_cmenu.c | 2 +- dlls/shell32/tests/string.c | 2 +- 19 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7de266082614ef3b721a…

1 0

Michael Stefaniuc : ole32: Remove some superfluous casts of void pointers and zero.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: 095568dfe95a8b797a8b90dfca2fffca4066bb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=095568dfe95a8b797a8b90dfc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 5 23:04:10 2008 +0100 ole32: Remove some superfluous casts of void pointers and zero. --- dlls/ole32/clipboard.c | 4 ++-- dlls/ole32/comcat.c | 4 ++-- dlls/ole32/memlockbytes16.c | 2 +- dlls/ole32/ole16.c | 2 +- dlls/ole32/ole2.c | 8 ++++---- dlls/ole32/ole2_16.c | 2 +- dlls/ole32/tests/marshal.c | 2 +- dlls/ole32/tests/moniker.c | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 0e9d55c..5320988 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -414,7 +414,7 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) if (hDataObject==0) HANDLE_ERROR( E_OUTOFMEMORY ); - ppDataObject = (OLEClipbrd**)GlobalLock(hDataObject); + ppDataObject = GlobalLock(hDataObject); *ppDataObject = theOleClipboard; GlobalUnlock(hDataObject); @@ -958,7 +958,7 @@ static HRESULT OLEClipbrd_RenderFormat(IDataObject *pIDataObject, LPFORMATETC pF if (SUCCEEDED(hr = IDataObject_GetData(theOleClipboard->pIDataObjectSrc, &fmt2, &std2))) { - mfp = (METAFILEPICT *)GlobalLock(std2.u.hGlobal); + mfp = GlobalLock(std2.u.hGlobal); } if (mfp) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index 9120df0..f757cf9 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -181,7 +181,7 @@ static HRESULT COMCAT_GetCategoryDesc(HKEY key, LCID lcid, PWCHAR pszDesc, FIXME("Simplified lcid comparison\n"); return CAT_E_NODESCRIPTION; } - pszDesc[size / sizeof(WCHAR)] = (WCHAR)0; + pszDesc[size / sizeof(WCHAR)] = 0; return S_OK; } @@ -531,7 +531,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_GetCategoryDesc( if (res != ERROR_SUCCESS) return CAT_E_CATIDNOEXIST; /* Allocate a sensible amount of memory for the description. */ - *ppszDesc = (PWCHAR) CoTaskMemAlloc(128 * sizeof(WCHAR)); + *ppszDesc = CoTaskMemAlloc(128 * sizeof(WCHAR)); if (*ppszDesc == NULL) { RegCloseKey(key); return E_OUTOFMEMORY; diff --git a/dlls/ole32/memlockbytes16.c b/dlls/ole32/memlockbytes16.c index bccb953..bca7aa1 100644 --- a/dlls/ole32/memlockbytes16.c +++ b/dlls/ole32/memlockbytes16.c @@ -193,7 +193,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_QueryInterface( REFIID riid, /* [in] */ void** ppvObject) /* [out][iid_is] (ptr to SEGPTR!) */ { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)MapSL((SEGPTR)iface); + HGLOBALLockBytesImpl16* const This = MapSL((SEGPTR)iface); TRACE("(%p,%s,%p)\n",iface,debugstr_guid(riid),ppvObject); /* diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index d19a817..a8fa59b 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -572,7 +572,7 @@ SEGPTR WINAPI CoMemAlloc(DWORD size, DWORD dwMemContext, DWORD x) { TRACE("(%d, 0x%08x, 0x%08x)\n", size, dwMemContext, x); hres = _xmalloc16(size, &segptr); if (hres != S_OK) - return (SEGPTR)0; + return 0; return segptr; } diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index bdbf6da..441244c 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1405,7 +1405,7 @@ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lPar goto NEXTHOOK; /* Get the menu descriptor */ - pOleMenuDescriptor = (OleMenuDescriptor *) GlobalLock( hOleMenu ); + pOleMenuDescriptor = GlobalLock( hOleMenu ); if ( !pOleMenuDescriptor ) /* Bad descriptor! */ goto NEXTHOOK; @@ -1524,7 +1524,7 @@ static LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lPara } /* Get the menu descriptor */ - pOleMenuDescriptor = (OleMenuDescriptor *) GlobalLock( hOleMenu ); + pOleMenuDescriptor = GlobalLock( hOleMenu ); if ( !pOleMenuDescriptor ) /* Bad descriptor! */ goto NEXTHOOK; @@ -1579,7 +1579,7 @@ HOLEMENU WINAPI OleCreateMenuDescriptor( sizeof(OleMenuDescriptor) ) ) ) return 0; - pOleMenuDescriptor = (OleMenuDescriptor *) GlobalLock( hOleMenu ); + pOleMenuDescriptor = GlobalLock( hOleMenu ); if ( !pOleMenuDescriptor ) return 0; @@ -1664,7 +1664,7 @@ HRESULT WINAPI OleSetMenuDescriptor( return E_FAIL; /* Get the menu descriptor */ - pOleMenuDescriptor = (OleMenuDescriptor *) GlobalLock( hOleMenu ); + pOleMenuDescriptor = GlobalLock( hOleMenu ); if ( !pOleMenuDescriptor ) return E_UNEXPECTED; diff --git a/dlls/ole32/ole2_16.c b/dlls/ole32/ole2_16.c index 90a1ed2..fc88d8a 100644 --- a/dlls/ole32/ole2_16.c +++ b/dlls/ole32/ole2_16.c @@ -113,7 +113,7 @@ HGLOBAL16 WINAPI OleMetaFilePictFromIconAndLabel16( hmf = CloseMetaFile(hdc); hmf16 = GlobalAlloc16(0, sizeof(METAFILEPICT16)); - mf16 = (METAFILEPICT16 *)GlobalLock16(hmf16); + mf16 = GlobalLock16(hmf16); mf16->mm = MM_ANISOTROPIC; mf16->xExt = 20; /* FIXME: bogus */ mf16->yExt = 20; /* ditto */ diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 0443b63..9dc7632 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2052,7 +2052,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * size = GlobalSize(hglobal); - marshal_data = (char *)GlobalLock(hglobal); + marshal_data = GlobalLock(hglobal); if (mshctx == MSHCTX_INPROC) { diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 468eb62..1b7bcc3 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -364,7 +364,7 @@ Moniker_GetDisplayName(IMoniker* iface, IBindCtx* pbc, { static const WCHAR wszDisplayName[] = {'*','*','G','e','m','m','a',0}; CHECK_EXPECTED_METHOD("Moniker_GetDisplayName"); - *ppszDisplayName = (LPOLESTR)CoTaskMemAlloc(sizeof(wszDisplayName)); + *ppszDisplayName = CoTaskMemAlloc(sizeof(wszDisplayName)); memcpy(*ppszDisplayName, wszDisplayName, sizeof(wszDisplayName)); return S_OK; }

1 0

Sergey Khodych : winex11: BitBlt returns TRUE when drawing outside of the clipping or visible region .
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: 11d17fafc440f7cd9acd9a694708e57990822ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d17fafc440f7cd9acd9a694… Author: Sergey Khodych <khodych(a)gmail.com> Date: Tue Nov 4 19:59:34 2008 +0200 winex11: BitBlt returns TRUE when drawing outside of the clipping or visible region. --- dlls/gdi32/tests/bitmap.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/bitblt.c | 3 ++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 7607667..0b41f19 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2189,6 +2189,51 @@ void test_GdiAlphaBlend() } +static void test_clipping(void) +{ + HBITMAP bmpDst; + HBITMAP oldDst; + HBITMAP bmpSrc; + HBITMAP oldSrc; + HRGN hRgn; + LPVOID bits; + BOOL result; + + HDC hdcDst = CreateCompatibleDC( NULL ); + HDC hdcSrc = CreateCompatibleDC( NULL ); + + BITMAPINFO bmpinfo={{0}}; + bmpinfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmpinfo.bmiHeader.biWidth = 100; + bmpinfo.bmiHeader.biHeight = 100; + bmpinfo.bmiHeader.biPlanes = 1; + bmpinfo.bmiHeader.biBitCount = GetDeviceCaps( hdcDst, BITSPIXEL ); + bmpinfo.bmiHeader.biCompression = BI_RGB; + + bmpDst = CreateDIBSection( hdcDst, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); + ok(bmpDst != NULL, "Couldn't create destination bitmap\n"); + oldDst = (HBITMAP)SelectObject( hdcDst, bmpDst ); + + bmpSrc = CreateDIBSection( hdcSrc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); + ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); + oldSrc = (HBITMAP)SelectObject( hdcSrc, bmpSrc ); + + result = BitBlt( hdcDst, 0, 0, 100, 100, hdcSrc, 100, 100, SRCCOPY ); + ok(result, "BitBlt failed\n"); + + hRgn = CreateRectRgn( 0,0,0,0 ); + SelectClipRgn( hdcDst, hRgn ); + + result = BitBlt( hdcDst, 0, 0, 100, 100, hdcSrc, 0, 0, SRCCOPY ); + ok(result, "BitBlt failed\n"); + + DeleteObject( bmpDst ); + DeleteObject( bmpSrc ); + DeleteObject( hRgn ); + DeleteDC( hdcDst ); + DeleteDC( hdcSrc ); +} + START_TEST(bitmap) { HMODULE hdll; @@ -2214,4 +2259,5 @@ START_TEST(bitmap) test_GdiAlphaBlend(); test_bitmapinfoheadersize(); test_get16dibits(); + test_clipping(); } diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c740b10..5b5742c 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1686,7 +1686,10 @@ BOOL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, if (!BITBLT_GetVisRectangles( physDevDst, xDst, yDst, width, height, physDevSrc, xSrc, ySrc, width, height, &visRectSrc, &visRectDst )) + { + result = TRUE; goto END; + } xSrc = visRectSrc.left; ySrc = visRectSrc.top;

1 0

Juan Lang : crypt32: Add missing ok calls.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: ed2ba3a467986380b695ae9c15943a8c33b3e341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2ba3a467986380b695ae9c1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 5 11:38:11 2008 -0800 crypt32: Add missing ok calls. --- dlls/crypt32/tests/encode.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 1dacc10..c269b9b 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -3193,6 +3193,7 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) info.rgDistPoint = &point; ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { ok(size == sizeof(emptyDistPoint), "Wrong size %d\n", size); @@ -3217,6 +3218,7 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) U(entry).pwszURL = (LPWSTR)url; ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { ok(size == sizeof(distPointWithUrl), "Wrong size %d\n", size); @@ -3229,6 +3231,7 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) point.ReasonFlags.pbData = (LPBYTE)&crlReason; ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { ok(size == sizeof(distPointWithReason), "Wrong size %d\n", size); @@ -3241,6 +3244,7 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) point.CRLIssuer.rgAltEntry = &entry; ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { ok(size == sizeof(distPointWithIssuer), "Wrong size %d\n", size); @@ -3251,6 +3255,7 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) point.DistPointName.dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME; ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { ok(size == sizeof(distPointWithUrlAndIssuer), @@ -3272,6 +3277,7 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, emptyDistPoint, emptyDistPoint[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { info = (PCRL_DIST_POINTS_INFO)buf; @@ -3290,6 +3296,7 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, distPointWithUrl, distPointWithUrl[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { info = (PCRL_DIST_POINTS_INFO)buf; @@ -3316,6 +3323,8 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, distPointWithReason, distPointWithReason[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { info = (PCRL_DIST_POINTS_INFO)buf; @@ -3338,6 +3347,7 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, distPointWithUrlAndIssuer, distPointWithUrlAndIssuer[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { info = (PCRL_DIST_POINTS_INFO)buf;

1 0

Juan Lang : crypt32: Separate checking the tag of encoded bits from decoding the bits.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: aa1effe3b264c0bf18008a31d89cbf50dd68d4ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1effe3b264c0bf18008a31d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 5 11:47:38 2008 -0800 crypt32: Separate checking the tag of encoded bits from decoding the bits. --- dlls/crypt32/decode.c | 85 ++++++++++++++++++++++--------------------- dlls/crypt32/tests/encode.c | 1 - 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 3a487ea..4654008 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -96,6 +96,7 @@ static BOOL CRYPT_AsnDecodeBool(const BYTE *pbEncoded, DWORD cbEncoded, static BOOL CRYPT_AsnDecodeOctetsInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded); +/* Doesn't check the tag, assumes the caller does so */ static BOOL CRYPT_AsnDecodeBitsInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded); static BOOL CRYPT_AsnDecodeIntInternal(const BYTE *pbEncoded, DWORD cbEncoded, @@ -3298,64 +3299,54 @@ static BOOL CRYPT_AsnDecodeBitsInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { BOOL ret; + DWORD bytesNeeded, dataLen; + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); TRACE("(%p, %d, 0x%08x, %p, %d, %p)\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo, pcbDecoded); - if (pbEncoded[0] == ASN_BITSTRING) + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { - DWORD bytesNeeded, dataLen; - BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); - - if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) + bytesNeeded = sizeof(CRYPT_BIT_BLOB); + else + bytesNeeded = dataLen - 1 + sizeof(CRYPT_BIT_BLOB); + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else { + CRYPT_BIT_BLOB *blob; + + *pcbStructInfo = bytesNeeded; + blob = (CRYPT_BIT_BLOB *)pvStructInfo; + blob->cbData = dataLen - 1; + blob->cUnusedBits = *(pbEncoded + 1 + lenBytes); if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) - bytesNeeded = sizeof(CRYPT_BIT_BLOB); - else - bytesNeeded = dataLen - 1 + sizeof(CRYPT_BIT_BLOB); - if (pcbDecoded) - *pcbDecoded = 1 + lenBytes + dataLen; - if (!pvStructInfo) - *pcbStructInfo = bytesNeeded; - else if (*pcbStructInfo < bytesNeeded) { - *pcbStructInfo = bytesNeeded; - SetLastError(ERROR_MORE_DATA); - ret = FALSE; + blob->pbData = (BYTE *)pbEncoded + 2 + lenBytes; } else { - CRYPT_BIT_BLOB *blob; - - *pcbStructInfo = bytesNeeded; - blob = (CRYPT_BIT_BLOB *)pvStructInfo; - blob->cbData = dataLen - 1; - blob->cUnusedBits = *(pbEncoded + 1 + lenBytes); - if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) - { - blob->pbData = (BYTE *)pbEncoded + 2 + lenBytes; - } - else + assert(blob->pbData); + if (blob->cbData) { - assert(blob->pbData); - if (blob->cbData) - { - BYTE mask = 0xff << blob->cUnusedBits; + BYTE mask = 0xff << blob->cUnusedBits; - memcpy(blob->pbData, pbEncoded + 2 + lenBytes, - blob->cbData); - blob->pbData[blob->cbData - 1] &= mask; - } + memcpy(blob->pbData, pbEncoded + 2 + lenBytes, + blob->cbData); + blob->pbData[blob->cbData - 1] &= mask; } } } } - else - { - SetLastError(CRYPT_E_ASN1_BADTAG); - ret = FALSE; - } - TRACE("returning %d (%08x)\n", ret, GetLastError()); return ret; } @@ -3372,7 +3363,17 @@ static BOOL WINAPI CRYPT_AsnDecodeBits(DWORD dwCertEncodingType, { DWORD bytesNeeded; - if ((ret = CRYPT_AsnDecodeBitsInternal(pbEncoded, cbEncoded, + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } + else if (pbEncoded[0] != ASN_BITSTRING) + { + SetLastError(CRYPT_E_ASN1_BADTAG); + ret = FALSE; + } + else if ((ret = CRYPT_AsnDecodeBitsInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL))) { if (!pvStructInfo) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index c269b9b..9a0eff5 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -3323,7 +3323,6 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, distPointWithReason, distPointWithReason[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0