February 2012 - Wine-commits

Nikolay Sivov : comctl32: Update ticks on TBM_SETRANGE.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: e508eae7d7e587add9ccee598acc65ed92fcc093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e508eae7d7e587add9ccee598… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 16:29:54 2012 +0300 comctl32: Update ticks on TBM_SETRANGE. --- dlls/comctl32/tests/trackbar.c | 9 +++++++++ dlls/comctl32/trackbar.c | 14 ++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index a444503..687ed07 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -1034,6 +1034,15 @@ static void test_TBS_AUTOTICKS(void) ret = SendMessage(hWnd, TBM_GETNUMTICS, 0, 0); expect(91, ret); + ret = SendMessage(hWnd, TBM_SETRANGEMIN, TRUE, 0); + expect(0, ret); + + /* TBM_SETRANGE rebuilds tics */ + ret = SendMessage(hWnd, TBM_SETRANGE, TRUE, MAKELONG(10, 200)); + expect(0, ret); + ret = SendMessage(hWnd, TBM_GETNUMTICS, 0, 0); + expect(191, ret); + DestroyWindow(hWnd); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 679d979..299c44c 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1151,10 +1151,13 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) static inline LRESULT -TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange) +TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) { - infoPtr->lRangeMin = (SHORT)LOWORD(lRange); - infoPtr->lRangeMax = (SHORT)HIWORD(lRange); + BOOL changed = infoPtr->lRangeMin != (SHORT)LOWORD(range) || + infoPtr->lRangeMax != (SHORT)HIWORD(range); + + infoPtr->lRangeMin = (SHORT)LOWORD(range); + infoPtr->lRangeMax = (SHORT)HIWORD(range); if (infoPtr->lPos < infoPtr->lRangeMin) { infoPtr->lPos = infoPtr->lRangeMin; @@ -1169,7 +1172,10 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange) infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; - if (fRedraw) TRACKBAR_InvalidateAll(infoPtr); + if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) + TRACKBAR_RecalculateTics (infoPtr); + + if (redraw) TRACKBAR_InvalidateAll(infoPtr); return 0; }

1 0

Nikolay Sivov : comctl32: Trace Header order array contents.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: a4e2f47c2d628cf3ee30f420cdaeaf070957d54f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e2f47c2d628cf3ee30f420c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 22:24:28 2012 +0300 comctl32: Trace Header order array contents. --- dlls/comctl32/header.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index ce95d58..0a40423 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1241,6 +1241,14 @@ HEADER_SetOrderArray(HEADER_INFO *infoPtr, INT size, const INT *order) if ((UINT)size != infoPtr->uNumItem) return FALSE; + if (TRACE_ON(header)) + { + TRACE("count=%d, order array={", size); + for (i = 0; i < size; i++) + TRACE("%d%c", order[i], i != size-1 ? ',' : '}'); + TRACE("\n"); + } + for (i=0; i<size; i++) { if (order[i] >= size || order[i] < 0)

1 0

Juan Lang : advapi32/tests: Fix a test failure on older NT4.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: c21033c5e93716ed37bd969b060407576bbccbac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21033c5e93716ed37bd969b0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 12 17:49:19 2012 -0800 advapi32/tests: Fix a test failure on older NT4. --- dlls/advapi32/tests/crypt.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 1180275..dae7263 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -448,7 +448,9 @@ static void test_verify_sig(void) "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptVerifySignatureW(hash, bogus, sizeof(bogus), key, NULL, 0); - ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, + ok(!ret && + (GetLastError() == NTE_BAD_SIGNATURE || + broken(GetLastError() == NTE_BAD_HASH_STATE /* older NT4 */)), "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); pCryptDestroyKey(key); pCryptDestroyHash(hash);

1 0

Juan Lang : crypt32/tests: Fix test failures on older NT4.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: ad46dbd4cc866592aab8ab84f34ccf98762ac995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad46dbd4cc866592aab8ab84f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 12 17:51:23 2012 -0800 crypt32/tests: Fix test failures on older NT4. --- dlls/crypt32/tests/cert.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 759b0da..9678053 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3321,6 +3321,11 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)certs, 0, NULL, &status); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("CERT_CONTEXT_REVOCATION_TYPE unsupported, skipping\n"); + return; + } ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK,

1 0

Juan Lang : cryptnet/tests: Fix test failures on older NT4.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: 0439500f2cfbe0eaad9bd6c9c0b848526b36cbf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0439500f2cfbe0eaad9bd6c9c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Feb 12 17:58:45 2012 -0800 cryptnet/tests: Fix test failures on older NT4. --- dlls/cryptnet/tests/cryptnet.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 683c6b6..4ab88ec 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -365,9 +365,12 @@ static void test_retrieveObjectByUrl(void) SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl, NULL, NULL, NULL, NULL); - /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG */ + /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG + * or OSS_DATA_ERROR. + */ ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH || - broken(GetLastError() == CRYPT_E_ASN1_BADTAG)), + broken(GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_DATA_ERROR)), "got 0x%x/%u (expected CRYPT_E_NO_MATCH)\n", GetLastError(), GetLastError()); /* only newer versions of cryptnet do the cleanup */ @@ -698,6 +701,11 @@ static void test_verifyRevocation(void) * bad authority key ID extension and can't be matched with the issuer * cert, hence the revocation status should be unknown. */ + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("CERT_CONTEXT_REVOCATION_TYPE unsupported, skipping\n"); + return; + } ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || broken(GetLastError() == CRYPT_E_REVOKED /* Win2k */)), "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError());

1 0

Frédéric Delanoy : setupx.dll16: Simplify some dead code (Coverity).
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: a8fe74b4d1c13151326393f8889c2f591c61420a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8fe74b4d1c13151326393f88… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 22:20:09 2012 +0100 setupx.dll16: Simplify some dead code (Coverity). --- dlls/setupx.dll16/virtcopy.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index f2ce4e8..a718ac9 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -562,14 +562,6 @@ VCP_UI_FileCopyWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (uMsg != WM_CREATE) return DefWindowProcA (hwnd, uMsg, wParam, lParam); - switch (uMsg) - { - case WM_CREATE: - return 0; - default: - FIXME("%04x: unhandled.\n", uMsg); - } - return 0; }

1 0

André Hentschel : ntdll/tests: Fix some typos.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: 0fb4cba77f4703268080694bc0e7e7c50eaaed10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb4cba77f4703268080694bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 12 19:35:04 2012 +0100 ntdll/tests: Fix some typos. --- dlls/ntdll/tests/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index a4d0b8a..9349f5d 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1255,9 +1255,9 @@ static void test_qsort(void) static void test_bsearch(void) { int arr[7] = { 1, 3, 4, 8, 16, 23, 42 }; - int *x, l, i,j ; + int *x, l, i, j; - /* just try all all sizes */ + /* just try all array sizes */ for (j=1;j<sizeof(arr)/sizeof(arr[0]);j++) { for (i=0;i<j;i++) { l = arr[i];

1 0

Alexandre Julliard : wineps16.drv: Call winspool functions instead of removed wineps.drv entry points.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: ca69cc6078de3e3f79462b774baf05273925c26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca69cc6078de3e3f79462b774… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 13 16:01:27 2012 +0100 wineps16.drv: Call winspool functions instead of removed wineps.drv entry points. --- dlls/wineps16.drv16/Makefile.in | 1 + dlls/wineps16.drv16/driver.c | 43 +++++++++++++++++++++----------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/wineps16.drv16/Makefile.in b/dlls/wineps16.drv16/Makefile.in index 759410b..879e7da 100644 --- a/dlls/wineps16.drv16/Makefile.in +++ b/dlls/wineps16.drv16/Makefile.in @@ -1,4 +1,5 @@ MODULE = wineps16.drv16 +IMPORTS = winspool EXTRADLLFLAGS = -m16 C_SRCS = driver.c diff --git a/dlls/wineps16.drv16/driver.c b/dlls/wineps16.drv16/driver.c index 64dcbfb..b4d54dd 100644 --- a/dlls/wineps16.drv16/driver.c +++ b/dlls/wineps16.drv16/driver.c @@ -25,24 +25,11 @@ #include "windef.h" #include "wine/winuser16.h" #include "wownt32.h" +#include "winspool.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -static HMODULE wineps; -static INT (CDECL *pExtDeviceMode)(LPSTR,HWND,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD); -static DWORD (CDECL *pDeviceCapabilities)(LPSTR,LPCSTR,LPCSTR,WORD,LPSTR,LPDEVMODEA); - -static HMODULE load_wineps(void) -{ - if (!wineps) - { - wineps = LoadLibraryA( "wineps.drv" ); - pExtDeviceMode = (void *)GetProcAddress( wineps, "ExtDeviceMode" ); - pDeviceCapabilities = (void *)GetProcAddress( wineps, "DeviceCapabilities" ); - } - return wineps; -} /************************************************************** * AdvancedSetupDialog [WINEPS16.93] @@ -63,9 +50,7 @@ INT16 WINAPI PSDRV_ExtDeviceMode16(HWND16 hwnd, HANDLE16 hDriver, LPSTR lpszProfile, WORD fwMode) { - if (!load_wineps() || !pExtDeviceMode) return -1; - return pExtDeviceMode( NULL, HWND_32(hwnd), lpdmOutput, lpszDevice, - lpszPort, lpdmInput, lpszProfile, fwMode ); + return DocumentPropertiesA( HWND_32(hwnd), 0, lpszDevice, lpdmOutput, lpdmInput, fwMode ); } /************************************************************** @@ -75,8 +60,28 @@ DWORD WINAPI PSDRV_DeviceCapabilities16(LPCSTR lpszDevice, LPCSTR lpszPort, WORD fwCapability, LPSTR lpszOutput, LPDEVMODEA lpdm) { - if (!load_wineps() || !pDeviceCapabilities) return 0; - return pDeviceCapabilities( NULL, lpszDevice, lpszPort, fwCapability, lpszOutput, lpdm ); + int i, ret; + POINT *pt; + POINT16 *pt16; + + if (fwCapability != DC_PAPERSIZE || !lpszOutput) + return DeviceCapabilitiesA( lpszDevice, lpszPort, fwCapability, lpszOutput, lpdm ); + + /* for DC_PAPERSIZE, map POINT to POINT16 */ + + ret = DeviceCapabilitiesA( lpszDevice, lpszPort, DC_PAPERSIZE, NULL, lpdm ); + if (ret <= 0) return ret; + + pt16 = (POINT16 *)lpszOutput; + pt = HeapAlloc( GetProcessHeap(), 0, ret * sizeof(POINT) ); + ret = DeviceCapabilitiesA( lpszDevice, lpszPort, DC_PAPERSIZE, (LPSTR)pt, lpdm ); + for (i = 0; i < ret; i++) + { + pt16[i].x = pt[i].x; + pt16[i].y = pt[i].y; + } + HeapFree( GetProcessHeap(), 0, pt ); + return ret; } /***************************************************************

1 0

Detlef Riekenberg : comdlg32: Exclude the driver path from the result.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: bea70326875077c488cb42f2d487d777e5721b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea70326875077c488cb42f2d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 13 00:26:53 2012 +0100 comdlg32: Exclude the driver path from the result. --- dlls/comdlg32/printdlg.c | 4 ++++ dlls/comdlg32/tests/printdlg.c | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index aea5224..d074563 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -322,6 +322,8 @@ static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, const char* DeviceDriverName, char buf[260]; DWORD dwBufLen = sizeof(buf); + DeviceDriverName = strrchr(DeviceDriverName, '\\') + 1; + size = strlen(DeviceDriverName) + 1 + strlen(DeviceName) + 1 + strlen(OutputPort) + 1 @@ -365,6 +367,8 @@ static BOOL PRINTDLG_CreateDevNamesW(HGLOBAL *hmem, LPCWSTR DeviceDriverName, WCHAR bufW[260]; DWORD dwBufLen = sizeof(bufW) / sizeof(WCHAR); + DeviceDriverName = strrchrW(DeviceDriverName, '\\') + 1; + size = sizeof(WCHAR)*lstrlenW(DeviceDriverName) + 2 + sizeof(WCHAR)*lstrlenW(DeviceName) + 2 + sizeof(WCHAR)*lstrlenW(OutputPort) + 2 diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index cad080d..c295df0 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -200,9 +200,7 @@ static void test_PrintDlgA(void) /* The Driver Entry does not include a Path */ ptr = strrchr(driver, '\\'); - todo_wine { ok( ptr == NULL, "got %p for '%s' (expected NULL for a simple name)\n", ptr, driver); - } /* The Driver Entry does not have an extension (fixed to ".drv") */ ptr = strrchr(driver, '.'); @@ -220,11 +218,8 @@ static void test_PrintDlgA(void) res, GetLastError(), ptr, buffer); if (ptr) ptr[0] = '\0'; - todo_wine { ok( lstrcmpiA(driver, buffer) == 0, "got driver '%s' (expected '%s')\n", driver, buffer); - } - } GlobalUnlock(pDlg->hDevNames);

1 0

Henri Verbeet : wined3d: Use a format flag instead of a floating point comparison to determine if we need to apply heightscale .
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: a4e5bcff4c66aa1041ea32f971b92b40d73e7d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e5bcff4c66aa1041ea32f97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 13 18:40:13 2012 +0100 wined3d: Use a format flag instead of a floating point comparison to determine if we need to apply heightscale. --- dlls/wined3d/surface.c | 5 +++-- dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 30dc63e..ac44194 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2281,7 +2281,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi surface->flags |= SFLAG_PIN_SYSMEM; } - if (format->heightscale != 1.0f && format->heightscale != 0.0f) + if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) update_h *= format->heightscale; ENTER_GL(); @@ -2516,7 +2516,8 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru internal = format->glInternal; } - if (format->heightscale != 1.0f && format->heightscale != 0.0f) height *= format->heightscale; + if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) + height *= format->heightscale; TRACE("(%p) : Creating surface (target %#x) level %d, d3d format %s, internal format %#x, width %d, height %d, gl format %#x, gl type=%#x\n", surface, surface->texture_target, surface->texture_level, debug_d3dformat(format->id), diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2ade261..e570a13 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1580,6 +1580,7 @@ static void apply_format_fixups(struct wined3d_gl_info *gl_info) } idx = getFmtIdx(WINED3DFMT_YV12); + gl_info->formats[idx].flags |= WINED3DFMT_FLAG_HEIGHT_SCALE; gl_info->formats[idx].heightscale = 1.5f; gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); @@ -1705,7 +1706,7 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT ali size = height * (((width * format->byte_count) + alignment - 1) & ~(alignment - 1)); } - if (format->heightscale != 0.0f) + if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { /* The D3D format requirements make sure that the resulting format is an integer again */ size = (UINT) (size * format->heightscale); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 416d970..3cabe76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2800,6 +2800,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_COMPRESSED 0x00008000 #define WINED3DFMT_FLAG_BROKEN_PITCH 0x00010000 #define WINED3DFMT_FLAG_BLOCKS 0x00020000 +#define WINED3DFMT_FLAG_HEIGHT_SCALE 0x00040000 struct wined3d_format {

1 0