October 2012 - Wine-Commits

André Hentschel : cryptdlg: Fix copy-paste error ( coverity).
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: a8125d6efdb5117db5e74bfdab6bee2ba6ba144d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8125d6efdb5117db5e74bfda… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 19:27:00 2012 +0200 cryptdlg: Fix copy-paste error (coverity). --- dlls/cryptdlg/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index 04311fd..9124541 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -276,7 +276,7 @@ static HCERTCHAINENGINE CRYPTDLG_MakeEngine(CERT_VERIFY_CERTIFICATE_TRUST *cert) { trust = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - if (root) + if (trust) { for (i = 0; i < cert->cTrustStores; i++) CertAddStoreToCollection(trust, cert->rghstoreTrust[i], 0, 0);

1 0

André Hentschel : gdi32: Fix copy-paste error ( coverity).
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: cf95218f08e81fd093c16b00f87933fb8f986a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf95218f08e81fd093c16b00f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 19:27:08 2012 +0200 gdi32: Fix copy-paste error (coverity). --- dlls/gdi32/enhmfdrv/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 553801c..cf44e9c 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -172,7 +172,7 @@ EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, if(bounds.left > xCentre) bounds.left = xCentre; else if(bounds.right < xCentre) bounds.right = xCentre; if(bounds.top > yCentre) bounds.top = yCentre; - else if(bounds.bottom < yCentre) bounds.right = yCentre; + else if(bounds.bottom < yCentre) bounds.bottom = yCentre; } if(!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE;

1 0

Piotr Caban : ieframe: Handle rebar height changes.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: c7d7744860ac469be9ea5e4af39fef4a66d53a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d7744860ac469be9ea5e4af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 24 15:38:04 2012 +0200 ieframe: Handle rebar height changes. --- dlls/ieframe/iexplore.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 5b85205..a72ed34 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -551,6 +551,18 @@ static LRESULT iewnd_OnNotify(InternetExplorer *This, WPARAM wparam, LPARAM lpar } } + if(hdr->idFrom == IDC_BROWSE_REBAR && hdr->code == RBN_HEIGHTCHANGE) + { + RECT docarea; + + GetClientRect(This->frame_hwnd, &docarea); + adjust_ie_docobj_rect(This->frame_hwnd, &docarea); + + if(This->doc_host->doc_host.hwnd) + SetWindowPos(This->doc_host->doc_host.hwnd, NULL, docarea.left, docarea.top, docarea.right, docarea.bottom, + SWP_NOZORDER | SWP_NOACTIVATE); + } + return 0; }

1 0

André Hentschel : d3d9/tests: Fix copy-paste error ( coverity).
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 31ca59f0b59cdb0a4587c484d195b267de9991b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ca59f0b59cdb0a4587c484d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 19:27:02 2012 +0200 d3d9/tests: Fix copy-paste error (coverity). --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a67ce52..b6763099 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2751,7 +2751,7 @@ static void stretchrect_test(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt_dest64, 0, &surf_tex_rt_dest64); ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %08x\n", hr); } - if (tex_rt_dest64) { + if (tex_rt_dest640_480) { hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt_dest640_480, 0, &surf_tex_rt_dest640_480); ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %08x\n", hr); }

1 0

Akihiro Sagawa : ntdll: Add ReturnLength test for NtQuerySystemInformation with SystemProcessInformation .
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 3fc4e884739388d576909f54bc767f866f209953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc4e884739388d576909f54b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 23 23:52:33 2012 +0900 ntdll: Add ReturnLength test for NtQuerySystemInformation with SystemProcessInformation. --- dlls/ntdll/tests/info.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 333dc4a..5dba2da 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -285,8 +285,14 @@ static void test_query_process(void) ULONG SystemInformationLength = sizeof(SYSTEM_PROCESS_INFORMATION_PRIVATE); SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); - /* Only W2K3 returns the needed length, the rest returns 0, so we have to loop */ - + /* test ReturnLength */ + ReturnLength = 0; + status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_LENGTH_MISMATCH got %08x\n", status); + todo_wine ok( ReturnLength > 0 || broken(ReturnLength == 0) /* NT4, Win2K */, + "Expected a ReturnLength to show the needed length\n"); + + /* W2K3 and later returns the needed length, the rest returns 0, so we have to loop */ for (;;) { status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, SystemInformationLength, &ReturnLength);

1 0

Michael Stefaniuc : user32: Remove redundant sizeof check.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 7d4605db416c9a0748b2258982455f09c4db9c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d4605db416c9a0748b225898… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 24 10:24:00 2012 +0200 user32: Remove redundant sizeof check. --- dlls/user32/cursoricon.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 6002bbb..62afa3d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1330,9 +1330,6 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, } dir = (const CURSORICONFILEDIR*) bits; - if ( filesize < sizeof(*dir) ) - goto end; - if ( filesize < (sizeof(*dir) + sizeof(dir->idEntries[0])*(dir->idCount-1)) ) goto end;

1 0

Alexandre Julliard : fusion/tests: Remove a broken macro.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 7e50d67d7ea496371fab06d1b882b3c27c3bc23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e50d67d7ea496371fab06d1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 11:38:34 2012 +0200 fusion/tests: Remove a broken macro. --- dlls/fusion/tests/fusion.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/fusion/tests/fusion.c b/dlls/fusion/tests/fusion.c index 6ebd455..3fc67ef 100644 --- a/dlls/fusion/tests/fusion.c +++ b/dlls/fusion/tests/fusion.c @@ -30,14 +30,6 @@ static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR szDllName, LPCWSTR szVersion, static HRESULT (WINAPI *pGetCORVersion)(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength); -static CHAR string1[MAX_PATH], string2[MAX_PATH]; - -#define ok_w2(format, szString1, szString2) \ -\ - WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ - WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ - ok(!lstrcmpA(string1, string2), format, string1, string2) - static BOOL init_functionpointers(void) { HRESULT hr; @@ -127,14 +119,14 @@ static void test_GetCachePath(void) lstrcpyW(path, nochange); hr = pGetCachePath(ASM_CACHE_GAC, path, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); /* get the cache path */ lstrcpyW(path, nochange); size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, path, &size); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + ok( !lstrcmpW( cachepath, path ), "Expected %s, got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path)); /* pcchPath has no room for NULL terminator */ lstrcpyW(path, nochange); @@ -142,7 +134,7 @@ static void test_GetCachePath(void) hr = pGetCachePath(ASM_CACHE_GAC, path, &size); ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); lstrcpyW(cachepath, windir); lstrcatW(cachepath, backslash); @@ -156,7 +148,7 @@ static void test_GetCachePath(void) broken(hr == E_INVALIDARG), /* .NET 1.1 */ "Expected S_OK, got %08x\n", hr); if (hr == S_OK) - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + ok( !lstrcmpW( cachepath, path ), "Expected %s, got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path)); if (pGetCORVersion) { @@ -191,7 +183,7 @@ static void test_GetCachePath(void) size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_ZAP, path, &size); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + ok( !lstrcmpW( cachepath, path ), "Expected %s, got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path)); } /* two flags at once */ @@ -199,7 +191,7 @@ static void test_GetCachePath(void) size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC | ASM_CACHE_ROOT, path, &size); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); } START_TEST(fusion)

1 0

André Hentschel : d3dx9_36/tests: Fix sizeof to be more portable (coverity).
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 472010911dc111b48a68512c6d02d4cee0720ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=472010911dc111b48a68512c6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 03:31:55 2012 +0200 d3dx9_36/tests: Fix sizeof to be more portable (coverity). --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 563c759..97d7e2d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -10167,7 +10167,7 @@ static void test_optimize_faces(void) DWORD j; DWORD *face_remap; face_remap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - tc[i].num_faces*sizeof(face_remap)); + tc[i].num_faces*sizeof(*face_remap)); hr = D3DXOptimizeFaces(tc[i].indices, tc[i].num_faces, tc[i].num_vertices, tc[i].indices_are_32bit,

1 0

André Hentschel : usp10: Add missing break in switch ( coverity).
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: c41bdf98bb7e0f19ec3d1923c33897a23ea47fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41bdf98bb7e0f19ec3d1923c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 02:05:47 2012 +0200 usp10: Add missing break in switch (coverity). --- dlls/usp10/opentype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index fe4bde4..138890f 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1498,6 +1498,7 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I if (advance.y) FIXME("Unhandled adjustment to Y advancement\n"); } + break; } case 2: {

1 0

André Hentschel : ntdll/tests: Remove duplicate function prototypes (coverity).
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 48ce2cc2829dda00f29a34f7e288c161d3ea8421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ce2cc2829dda00f29a34f7e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 01:24:55 2012 +0200 ntdll/tests: Remove duplicate function prototypes (coverity). --- dlls/ntdll/tests/reg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index ef903c6..076948e 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -124,7 +124,6 @@ static NTSTATUS (WINAPI * pRtlCheckRegistryKey)(IN ULONG,IN PWSTR); static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(IN ACCESS_MASK, PHANDLE); static NTSTATUS (WINAPI * pNtOpenKey)(PHANDLE, IN ACCESS_MASK, IN POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI * pNtClose)(IN HANDLE); -static NTSTATUS (WINAPI * pNtDeleteValueKey)(IN HANDLE, IN PUNICODE_STRING); static NTSTATUS (WINAPI * pNtFlushKey)(HANDLE); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); static NTSTATUS (WINAPI * pNtCreateKey)( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, @@ -143,7 +142,6 @@ static NTSTATUS (WINAPI * pRtlFreeHeap)(PVOID, ULONG, PVOID); static LPVOID (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); static NTSTATUS (WINAPI * pRtlZeroMemory)(PVOID, ULONG); static NTSTATUS (WINAPI * pRtlpNtQueryValueKey)(HANDLE,ULONG*,PBYTE,DWORD*,void *); -static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(ACCESS_MASK,HANDLE*); static HMODULE hntdll = 0; static int CurrentTest = 0;

1 0