November 2008 - Wine-Commits

Vitaliy Margolen : dxdiagn: Replace remaining FIXMEs with TRACEs.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 1659bd622da822ddab555363ef9e730f7ae0979e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1659bd622da822ddab555363e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 2 21:26:01 2008 -0700 dxdiagn: Replace remaining FIXMEs with TRACEs. --- dlls/dxdiagn/provider.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 44b30d8..d22f756 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -203,8 +203,8 @@ static HRESULT DXDiag_AddFileDescContainer(IDxDiagContainer* pSubCont, const WCH UINT uiLength; VS_FIXEDFILEINFO* pFileInfo; - FIXME("(%p,%s)\n", pSubCont, debugstr_w(szFileName)); - + TRACE("(%p,%s)\n", pSubCont, debugstr_w(szFileName)); + lstrcpyW(szFile, szFilePath); lstrcatW(szFile, szSlashSep); lstrcatW(szFile, szFileName); @@ -598,13 +598,13 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu IEnumMoniker* pEnum = NULL; IMoniker* pMoniker = NULL; hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &clsidCat, &pEnum, 0); - FIXME("\tClassEnumerator for clsid(%s) pEnum(%p)\n", debugstr_guid(&clsidCat), pEnum); + TRACE("\tClassEnumerator for clsid(%s) pEnum(%p)\n", debugstr_guid(&clsidCat), pEnum); if (FAILED(hr) || pEnum == NULL) { goto class_enum_failed; } while (NULL != pEnum && S_OK == IEnumMoniker_Next(pEnum, 1, &pMoniker, NULL)) { IPropertyBag* pPropFilterBag = NULL; - FIXME("\tIEnumMoniker_Next(%p, 1, %p)\n", pEnum, pMoniker); + TRACE("\tIEnumMoniker_Next(%p, 1, %p)\n", pEnum, pMoniker); hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (void**) &pPropFilterBag); if (SUCCEEDED(hr)) { LPBYTE pData = NULL; @@ -619,11 +619,11 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu hr = IPropertyBag_Read(pPropFilterBag, wszFriendlyName, &v, 0); hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v); - FIXME("\tName:%s\n", debugstr_w(V_BSTR(&v))); + TRACE("\tName:%s\n", debugstr_w(V_BSTR(&v))); VariantClear(&v); hr = IPropertyBag_Read(pPropFilterBag, wszClsidName, &v, 0); - FIXME("\tClsid:%s\n", debugstr_w(V_BSTR(&v))); + TRACE("\tClsid:%s\n", debugstr_w(V_BSTR(&v))); hr = IDxDiagContainerImpl_AddProp(pSubCont, szClsidFilter, &v); VariantClear(&v);

1 0

Francois Gouget : shlwapi/tests: AssocQueryStringA/W() are missing on Windows 98.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 88a883dfc36e0f494f61a3c125e3e3459cf9860c URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a883dfc36e0f494f61a3c12… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 2 23:58:06 2008 +0100 shlwapi/tests: AssocQueryStringA/W() are missing on Windows 98. --- dlls/shlwapi/tests/assoc.c | 56 ++++++++++++++++++++++++++++++++----------- 1 files changed, 41 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index 872575e..d1c15aa 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -25,6 +25,9 @@ #define expect(expected, got) ok ( expected == got, "Expected %d, got %d\n", expected, got) #define expect_hr(expected, got) ok ( expected == got, "Expected %08x, got %08x\n", expected, got) +static HRESULT (WINAPI *pAssocQueryStringA)(ASSOCF,ASSOCSTR,LPCSTR,LPCSTR,LPSTR,LPDWORD) = NULL; +static HRESULT (WINAPI *pAssocQueryStringW)(ASSOCF,ASSOCSTR,LPCWSTR,LPCWSTR,LPWSTR,LPDWORD) = NULL; + /* Every version of Windows with IE should have this association? */ static const WCHAR dotHtml[] = { '.','h','t','m','l',0 }; static const WCHAR badBad[] = { 'b','a','d','b','a','d',0 }; @@ -37,45 +40,51 @@ static void test_getstring_bad(void) HRESULT hr; DWORD len; - hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, NULL, open, NULL, &len); + if (!pAssocQueryStringW) + { + win_skip("AssocQueryStringW() is missing\n"); + return; + } + + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, NULL, open, NULL, &len); expect_hr(E_INVALIDARG, hr); - hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, badBad, open, NULL, &len); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, badBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); - hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotBad, open, NULL, &len); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); - hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); - hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, NULL); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, NULL); ok(hr == E_UNEXPECTED || hr == E_INVALIDARG, /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); - hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, NULL, open, NULL, &len); + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, NULL, open, NULL, &len); expect_hr(E_INVALIDARG, hr); - hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, badBad, open, NULL, + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, badBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); - hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); - hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) || /* W2K/Vista/W2K8 */ hr == E_FAIL, /* Win9x/WinMe/NT4 */ "Unexpected result : %08x\n", hr); - hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, NULL); ok(hr == E_UNEXPECTED || hr == E_INVALIDARG, /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ @@ -89,7 +98,13 @@ static void test_getstring_basic(void) WCHAR * executableName; DWORD len, len2, slen; - hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, &len); + if (!pAssocQueryStringW) + { + win_skip("AssocQueryStringW() is missing\n"); + return; + } + + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, &len); expect_hr(S_FALSE, hr); if (hr != S_FALSE) { @@ -106,14 +121,14 @@ static void test_getstring_basic(void) } len2 = len; - hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, executableName, &len2); expect_hr(S_OK, hr); slen = lstrlenW(executableName) + 1; expect(len, len2); expect(len, slen); - hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, &len); expect_hr(S_FALSE, hr); if (hr != S_FALSE) @@ -133,7 +148,7 @@ static void test_getstring_basic(void) } len2 = len; - hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, friendlyName, &len2); expect_hr(S_OK, hr); slen = lstrlenW(friendlyName) + 1; @@ -167,6 +182,12 @@ static void test_getstring_no_extra(void) CHAR buf[MAX_PATH]; DWORD len = MAX_PATH; + if (!pAssocQueryStringA) + { + win_skip("AssocQueryStringA() is missing\n"); + return; + } + buf[0] = '\0'; ret = RegCreateKeyA(HKEY_CLASSES_ROOT, dotWinetest, &hkey); if (ret != ERROR_SUCCESS) { @@ -197,7 +218,7 @@ static void test_getstring_no_extra(void) goto cleanup; } - hr = AssocQueryStringA(0, ASSOCSTR_EXECUTABLE, dotWinetest, NULL, buf, &len); + hr = pAssocQueryStringA(0, ASSOCSTR_EXECUTABLE, dotWinetest, NULL, buf, &len); expect_hr(S_OK, hr); ok(strstr(buf, action) != NULL, "got '%s' (Expected result to include 'notepad.exe')\n", buf); @@ -210,6 +231,11 @@ cleanup: START_TEST(assoc) { + HMODULE hshlwapi; + hshlwapi = GetModuleHandleA("shlwapi.dll"); + pAssocQueryStringA = (void*)GetProcAddress(hshlwapi, "AssocQueryStringA"); + pAssocQueryStringW = (void*)GetProcAddress(hshlwapi, "AssocQueryStringW"); + test_getstring_bad(); test_getstring_basic(); test_getstring_no_extra();

1 0

Francois Gouget : d3dx8/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 628b5aeb9e4515c0757886b161812bef0f33ad23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=628b5aeb9e4515c0757886b16… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 2 23:56:48 2008 +0100 d3dx8/tests: Fix compilation on systems that don't support nameless unions. --- dlls/d3dx8/tests/math.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index f38ff26..3dc0899 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -33,7 +33,7 @@ static inline BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2) { for (j = 0; j < 4; ++j) { - if (fabs(U(m1)->m[i][j] - U(m2)->m[i][j]) > admitted_error) + if (fabs(U(*m1).m[i][j] - U(*m2).m[i][j]) > admitted_error) return FALSE; } } @@ -47,14 +47,14 @@ do { \ const D3DXMATRIX *__m2 = (gotmat); \ ok(compare_matrix(__m1, __m2), "Expected matrix=\n(%f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n)\n\n" \ "Got matrix=\n(%f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f)\n", \ - U(__m1)->m[0][0], U(__m1)->m[0][1], U(__m1)->m[0][2], U(__m1)->m[0][3], \ - U(__m1)->m[1][0], U(__m1)->m[1][1], U(__m1)->m[1][2], U(__m1)->m[1][3], \ - U(__m1)->m[2][0], U(__m1)->m[2][1], U(__m1)->m[2][2], U(__m1)->m[2][3], \ - U(__m1)->m[3][0], U(__m1)->m[3][1], U(__m1)->m[3][2], U(__m1)->m[3][3], \ - U(__m2)->m[0][0], U(__m2)->m[0][1], U(__m2)->m[0][2], U(__m2)->m[0][3], \ - U(__m2)->m[1][0], U(__m2)->m[1][1], U(__m2)->m[1][2], U(__m2)->m[1][3], \ - U(__m2)->m[2][0], U(__m2)->m[2][1], U(__m2)->m[2][2], U(__m2)->m[2][3], \ - U(__m2)->m[3][0], U(__m2)->m[3][1], U(__m2)->m[3][2], U(__m2)->m[3][3]); \ + U(*__m1).m[0][0], U(*__m1).m[0][1], U(*__m1).m[0][2], U(*__m1).m[0][3], \ + U(*__m1).m[1][0], U(*__m1).m[1][1], U(*__m1).m[1][2], U(*__m1).m[1][3], \ + U(*__m1).m[2][0], U(*__m1).m[2][1], U(*__m1).m[2][2], U(*__m1).m[2][3], \ + U(*__m1).m[3][0], U(*__m1).m[3][1], U(*__m1).m[3][2], U(*__m1).m[3][3], \ + U(*__m2).m[0][0], U(*__m2).m[0][1], U(*__m2).m[0][2], U(*__m2).m[0][3], \ + U(*__m2).m[1][0], U(*__m2).m[1][1], U(*__m2).m[1][2], U(*__m2).m[1][3], \ + U(*__m2).m[2][0], U(*__m2).m[2][1], U(*__m2).m[2][2], U(*__m2).m[2][3], \ + U(*__m2).m[3][0], U(*__m2).m[3][1], U(*__m2).m[3][2], U(*__m2).m[3][3]); \ } while(0) #define expect_plane(expectedplane,gotplane) ok((fabs(expectedplane.a-gotplane.a)<admitted_error)&&(fabs(expectedplane.b-gotplane.b)<admitted_error)&&(fabs(expectedplane.c-gotplane.c)<admitted_error)&&(fabs(expectedplane.d-gotplane.d)<admitted_error),"Expected Plane= (%f, %f, %f, %f)\n , Got Plane= (%f, %f, %f, %f)\n", expectedplane.a, expectedplane.b, expectedplane.c, expectedplane.d, gotplane.a, gotplane.b, gotplane.c, gotplane.d);

1 0

Francois Gouget : cryptui: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: a6d5f7df7f4d6ad14647a2462e831c59b4cd406f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d5f7df7f4d6ad14647a2462… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 2 23:56:29 2008 +0100 cryptui: Fix compilation on systems that don't support nameless unions. --- dlls/cryptui/main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index afb8491..692196c 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -220,7 +222,7 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT switch (pImportSrc->dwSubjectChoice) { case CRYPTUI_WIZ_IMPORT_SUBJECT_FILE: - if (!(cert = make_cert_from_file(pImportSrc->pwszFileName))) + if (!(cert = make_cert_from_file(pImportSrc->u.pwszFileName))) { WARN("unable to create certificate context\n"); return FALSE; @@ -229,7 +231,7 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT freeCert = TRUE; break; case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT: - cert = pImportSrc->pCertContext; + cert = pImportSrc->u.pCertContext; if (!cert) { SetLastError(E_INVALIDARG);

1 0

Vitaliy Margolen : dxdiagn: Add windows path.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 45a2807f87d20289d09551a91c6a96d4b2b40a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a2807f87d20289d09551a91… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 2 21:26:33 2008 -0700 dxdiagn: Add windows path. --- dlls/dxdiagn/provider.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index b15ee96..2bf44e6 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -270,14 +270,14 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) static const WCHAR ullUsedPageFile[] = {'u','l','l','U','s','e','d','P','a','g','e','F','i','l','e',0}; static const WCHAR ullAvailPageFile[] = {'u','l','l','A','v','a','i','l','P','a','g','e','F','i','l','e',0}; /*static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};*/ - /*szWindowsDir*/ - /*szWindowsDir*/ + static const WCHAR szWindowsDir[] = {'s','z','W','i','n','d','o','w','s','D','i','r',0}; static const WCHAR dwOSMajorVersion[] = {'d','w','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; static const WCHAR dwOSMinorVersion[] = {'d','w','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR dwOSBuildNumber[] = {'d','w','O','S','B','u','i','l','d','N','u','m','b','e','r',0}; static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0}; MEMORYSTATUSEX msex; OSVERSIONINFOW info; + WCHAR buffer[MAX_PATH]; add_prop_ui4(pSubCont, dwDirectXVersionMajor, 9); add_prop_ui4(pSubCont, dwDirectXVersionMinor, 0); @@ -299,6 +299,9 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) add_prop_ui4(pSubCont, dwOSBuildNumber, info.dwBuildNumber); add_prop_ui4(pSubCont, dwOSPlatformID, info.dwPlatformId); + GetWindowsDirectoryW(buffer, MAX_PATH); + add_prop_str(pSubCont, szWindowsDir, buffer); + return S_OK; }

1 0

Dmitry Timoshkov : gdi32: Try to avoid not necessary glyph transformations.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 376adf9438907f4e6147d8b2c33ea941aca6835d URL: http://source.winehq.org/git/wine.git/?a=commit;h=376adf9438907f4e6147d8b2c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Nov 1 17:44:05 2008 +0800 gdi32: Try to avoid not necessary glyph transformations. --- dlls/gdi32/freetype.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2e64038..9e3ec02 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3321,6 +3321,14 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) dcmat.eM21 = dcmat.eM12 = 0; } + /* Try to avoid not necessary glyph transformations */ + if (dcmat.eM21 == 0.0 && dcmat.eM12 == 0.0 && dcmat.eM11 == dcmat.eM22) + { + lf.lfHeight *= fabs(dcmat.eM11); + lf.lfWidth *= fabs(dcmat.eM11); + dcmat.eM11 = dcmat.eM22 = 1.0; + } + TRACE("DC transform %f %f %f %f\n", dcmat.eM11, dcmat.eM12, dcmat.eM21, dcmat.eM22); @@ -4606,9 +4614,8 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.pixel_mode = ft_pixel_mode_mono; ft_bitmap.buffer = buf; - if(needsTransform) { - pFT_Outline_Transform(&ft_face->glyph->outline, &transMat); - } + if(needsTransform) + pFT_Outline_Transform(&ft_face->glyph->outline, &transMat); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom );

1 0

Marcus Meissner : wininet: Removed redundant NULL check (Coverity).
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 2d5ca30994a6a77ef4443f850c045e29587d3193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5ca30994a6a77ef4443f850… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Nov 1 09:40:59 2008 +0100 wininet: Removed redundant NULL check (Coverity). --- dlls/wininet/http.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a3d04d9..e088fa4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2354,8 +2354,6 @@ static BOOL HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLevel, tmpTM = *gmtime(&tmpTime); STHook = (SYSTEMTIME *)lpBuffer; - if (!STHook) return bSuccess; - STHook->wDay = tmpTM.tm_mday; STHook->wHour = tmpTM.tm_hour; STHook->wMilliseconds = 0;

1 0

Aric Stewart : crypt32: Static functions CertContext_GetProperty and CertContext_SetProperty do not need to be WINAPI .
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: c009f9c9ee7208369ef2629223aac1ec13c50f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c009f9c9ee7208369ef262922… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 31 15:16:52 2008 -0500 crypt32: Static functions CertContext_GetProperty and CertContext_SetProperty do not need to be WINAPI. --- dlls/crypt32/cert.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index e294997..75d26a4 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); * CertGetCertificateContextProperty, and are particular to the store in which * the property exists (which is separate from the context.) */ -static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, +static BOOL CertContext_GetProperty(void *context, DWORD dwPropId, void *pvData, DWORD *pcbData); /* Internal version of CertSetCertificateContextProperty that sets properties @@ -45,7 +45,7 @@ static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, * type.) Doesn't handle special cases, since they're handled by * CertSetCertificateContextProperty anyway. */ -static BOOL WINAPI CertContext_SetProperty(void *context, DWORD dwPropId, +static BOOL CertContext_SetProperty(void *context, DWORD dwPropId, DWORD dwFlags, const void *pvData); BOOL WINAPI CertAddEncodedCertificateToStore(HCERTSTORE hCertStore, @@ -188,7 +188,7 @@ static BOOL CertContext_CopyParam(void *pvData, DWORD *pcbData, const void *pb, return ret; } -static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, +static BOOL CertContext_GetProperty(void *context, DWORD dwPropId, void *pvData, DWORD *pcbData) { PCCERT_CONTEXT pCertContext = (PCCERT_CONTEXT)context; @@ -440,7 +440,7 @@ static BOOL CertContext_SetKeyProvInfoProperty(PCONTEXT_PROPERTY_LIST properties return ret; } -static BOOL WINAPI CertContext_SetProperty(void *context, DWORD dwPropId, +static BOOL CertContext_SetProperty(void *context, DWORD dwPropId, DWORD dwFlags, const void *pvData) { PCONTEXT_PROPERTY_LIST properties =

1 0

Juan Lang : crypt32: Fix test failures on older versions of Windows.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: c83ff71293d9bfa9b0c3d81bbee8603c508e2a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83ff71293d9bfa9b0c3d81bb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 31 11:03:12 2008 -0700 crypt32: Fix test failures on older versions of Windows. --- dlls/crypt32/tests/chain.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 3d89512..34dfb6a 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1824,15 +1824,23 @@ static void checkChainPolicyStatus(LPCSTR policy, const ChainPolicyCheck *check, if (ret) { if (check->todo & TODO_ERROR) - todo_wine ok(policyStatus.dwError == check->status.dwError, + todo_wine ok(policyStatus.dwError == check->status.dwError || + broken(policyStatus.dwError == CERT_TRUST_NO_ERROR), "%s[%d]: expected %08x, got %08x\n", HIWORD(policy) ? policy : num_to_str(LOWORD(policy)), testIndex, check->status.dwError, policyStatus.dwError); else - ok(policyStatus.dwError == check->status.dwError, + ok(policyStatus.dwError == check->status.dwError || + broken(policyStatus.dwError == CERT_TRUST_NO_ERROR), "%s[%d]: expected %08x, got %08x\n", HIWORD(policy) ? policy : num_to_str(LOWORD(policy)), testIndex, check->status.dwError, policyStatus.dwError); + if (policyStatus.dwError != check->status.dwError) + { + skip("error doesn't match, not checking indexes\n"); + pCertFreeCertificateChain(chain); + return; + } if (check->todo & TODO_CHAINS) todo_wine ok(policyStatus.lChainIndex == check->status.lChainIndex, "%s[%d]: expected %d, got %d\n",

1 0

Henri Verbeet : wined3d: Remove another redundant NULL check (LLVM/Clang).
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: b11dd542584c292d3d99f173a44552c63139b04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11dd542584c292d3d99f173a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 31 16:21:22 2008 +0100 wined3d: Remove another redundant NULL check (LLVM/Clang). --- dlls/wined3d/surface_base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 1c8de42..b7ee525 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1539,7 +1539,7 @@ IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, } if ((This->Flags & SFLAG_LOCKED) || - ((Src != NULL) && (Src->Flags & SFLAG_LOCKED))) + (Src->Flags & SFLAG_LOCKED)) { WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n"); return WINEDDERR_SURFACEBUSY;

1 0