February 2009 - Wine-Commits

Aric Stewart : wininet: use debugstr_a in NETCON_getNextLine TRACE to avoid overflow on long lines .
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 32c3cf1db7747af1582235dc7c9ce12b9a3fb900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c3cf1db7747af1582235dc7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 13 14:32:28 2009 -0600 wininet: use debugstr_a in NETCON_getNextLine TRACE to avoid overflow on long lines. --- dlls/wininet/netconnection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c573407..ccf2928 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -659,7 +659,7 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD { lpszBuffer[nRecv++] = '\0'; *dwBuffer = nRecv; - TRACE(":%u %s\n", nRecv, lpszBuffer); + TRACE(":%u %s\n", nRecv, debugstr_a(lpszBuffer)); return TRUE; } if (lpszBuffer[nRecv] != '\r')

1 0

Jeremy White : sane.ds: Implement NATIVEXFER/MSG_GET for RGB scans.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: aaf83dc1b20d037195075580545127ba4dfd1606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf83dc1b20d0371950755805… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Feb 13 13:14:58 2009 -0600 sane.ds: Implement NATIVEXFER/MSG_GET for RGB scans. --- dlls/sane.ds/ds_image.c | 132 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 90 insertions(+), 42 deletions(-) diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index 5bb6cbb..38689da 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -327,6 +327,30 @@ TW_UINT16 SANE_ImageMemXferGet (pTW_IDENTITY pOrigin, #endif } +#ifdef SONAME_LIBSANE +static SANE_Status read_one_line(SANE_Handle h, BYTE *line, int len) +{ + int read_len; + SANE_Status status; + + for (;;) + { + read_len = 0; + status = psane_read (activeDS.deviceHandle, line, len, &read_len); + if (status != SANE_STATUS_GOOD) + break; + + if (read_len == len) + break; + + line += read_len; + len -= read_len; + } + + return status; +} +#endif + /* DG_IMAGE/DAT_IMAGENATIVEXFER/MSG_GET */ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, TW_MEMREF pData) @@ -337,12 +361,12 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, TW_UINT16 twRC = TWRC_SUCCESS; pTW_UINT32 pHandle = (pTW_UINT32) pData; SANE_Status status; - SANE_Byte buffer[32*1024]; - int buff_len; - HBITMAP hDIB; - BITMAPINFO bmpInfo; - VOID *pBits; - HDC dc; + HANDLE hDIB; + BITMAPINFOHEADER *header = NULL; + int dib_bytes; + int dib_bytes_per_line; + BYTE *line; + int i; TRACE("DG_IMAGE/DAT_IMAGENATIVEXFER/MSG_GET\n"); @@ -373,55 +397,79 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, return TWRC_FAILURE; } - TRACE("Acquiring image %dx%dx%d bits (format=%d last=%d) from sane...\n" + if (activeDS.sane_param.format != SANE_FRAME_RGB) + { + FIXME("For NATIVE, we support only RGB, not %d\n", activeDS.sane_param.format); + psane_cancel (activeDS.deviceHandle); + activeDS.twCC = TWCC_OPERATIONERROR; + return TWRC_FAILURE; + } + + TRACE("Acquiring image %dx%dx%d bits (format=%d last=%d bpl=%d) from sane...\n" , activeDS.sane_param.pixels_per_line, activeDS.sane_param.lines, activeDS.sane_param.depth, activeDS.sane_param.format, - activeDS.sane_param.last_frame); + activeDS.sane_param.last_frame, activeDS.sane_param.bytes_per_line); - ZeroMemory (&bmpInfo, sizeof (BITMAPINFO)); - bmpInfo.bmiHeader.biSize = sizeof (BITMAPINFOHEADER); - bmpInfo.bmiHeader.biWidth = activeDS.sane_param.pixels_per_line; - bmpInfo.bmiHeader.biHeight = activeDS.sane_param.lines; - bmpInfo.bmiHeader.biPlanes = 1; - bmpInfo.bmiHeader.biBitCount = activeDS.sane_param.depth; - bmpInfo.bmiHeader.biCompression = BI_RGB; - bmpInfo.bmiHeader.biSizeImage = 0; - bmpInfo.bmiHeader.biXPelsPerMeter = 0; - bmpInfo.bmiHeader.biYPelsPerMeter = 0; - bmpInfo.bmiHeader.biClrUsed = 1; - bmpInfo.bmiHeader.biClrImportant = 0; - bmpInfo.bmiColors[0].rgbBlue = 128; - bmpInfo.bmiColors[0].rgbGreen = 128; - bmpInfo.bmiColors[0].rgbRed = 128; - hDIB = CreateDIBSection ((dc = GetDC(activeDS.hwndOwner)), &bmpInfo, - DIB_RGB_COLORS, &pBits, 0, 0); - if (!hDIB) + dib_bytes_per_line = ((activeDS.sane_param.bytes_per_line + 3) / 4) * 4; + dib_bytes = activeDS.sane_param.lines * dib_bytes_per_line; + + hDIB = GlobalAlloc(GMEM_ZEROINIT, dib_bytes + sizeof(*header)); + if (hDIB) + header = GlobalLock(hDIB); + + if (!header) { psane_cancel (activeDS.deviceHandle); activeDS.twCC = TWCC_LOWMEMORY; + if (hDIB) + GlobalFree(hDIB); return TWRC_FAILURE; } - do + header->biSize = sizeof (*header); + header->biWidth = activeDS.sane_param.pixels_per_line; + header->biHeight = activeDS.sane_param.lines; + header->biPlanes = 1; + header->biBitCount = activeDS.sane_param.depth * 3; + header->biCompression = BI_RGB; + header->biSizeImage = dib_bytes; + header->biXPelsPerMeter = 0; + header->biYPelsPerMeter = 0; + header->biClrUsed = 0; + header->biClrImportant = 0; + + /* Sane returns data in top down order. Acrobat does best with + a bottom up DIB being returned. */ + line = (BYTE *)(header + 1) + + (activeDS.sane_param.lines - 1) * dib_bytes_per_line; + for (i = activeDS.sane_param.lines - 1; i >= 0; i--) { - status = psane_read (activeDS.deviceHandle, buffer, - sizeof (buffer), &buff_len); - if (status == SANE_STATUS_GOOD) - { - /* FIXME: put code for converting the image data into DIB here */ + activeDS.progressWnd = ScanningDialogBox(activeDS.progressWnd, + ((activeDS.sane_param.lines - 1 - i) * 100) + / + (activeDS.sane_param.lines - 1)); - } - else if (status != SANE_STATUS_EOF) - { - WARN("psane_read: %s\n", psane_strstatus (status)); - psane_cancel (activeDS.deviceHandle); - activeDS.twCC = TWCC_OPERATIONERROR; - return TWRC_FAILURE; - } - } while (status == SANE_STATUS_GOOD); + status = read_one_line(activeDS.deviceHandle, line, + activeDS.sane_param.bytes_per_line); + if (status != SANE_STATUS_GOOD) + break; + + line -= dib_bytes_per_line; + } + activeDS.progressWnd = ScanningDialogBox(activeDS.progressWnd, -1); + + GlobalUnlock(hDIB); + + if (status != SANE_STATUS_GOOD && status != SANE_STATUS_EOF) + { + WARN("psane_read: %s, reading line %d\n", psane_strstatus(status), i); + psane_cancel (activeDS.deviceHandle); + activeDS.twCC = TWCC_OPERATIONERROR; + GlobalFree(hDIB); + return TWRC_FAILURE; + } psane_cancel (activeDS.deviceHandle); - ReleaseDC (activeDS.hwndOwner, dc); *pHandle = (TW_UINT32)hDIB; twRC = TWRC_XFERDONE; activeDS.twCC = TWCC_SUCCESS;

1 0

Jeremy White : sane.ds: Implement stub support for ICAP_PIXELFLAVOR.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 9bb24b8f7e746357bb0e7cf6858b413842cd70b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb24b8f7e746357bb0e7cf68… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Feb 13 13:14:45 2009 -0600 sane.ds: Implement stub support for ICAP_PIXELFLAVOR. --- dlls/sane.ds/capability.c | 50 ++++++++++++++++++++++++++++++++++++++++++++- dlls/twain_32/tests/dsm.c | 4 ++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index b66624c..ad2d7ba 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -126,7 +126,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) { TW_ARRAY *a; static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, CAP_UICONTROLLABLE, - ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_COMPRESSION }; + ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_COMPRESSION, ICAP_PIXELFLAVOR }; pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[sizeof(supported_caps)] )); pCapability->ConType = TWON_ARRAY; @@ -345,6 +345,50 @@ static TW_UINT16 SANE_ICAPCompression (pTW_CAPABILITY pCapability, TW_UINT16 act return twCC; } +/* ICAP_PIXELFLAVOR */ +static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 action) +{ + static const TW_UINT32 possible_values[] = { TWPF_CHOCOLATE, TWPF_VANILLA }; + TW_UINT32 val; + TW_UINT16 twCC = TWCC_BADCAP; + + TRACE("ICAP_PIXELFLAVOR\n"); + + switch (action) + { + case MSG_QUERYSUPPORT: + twCC = set_onevalue(pCapability, TWTY_INT32, + TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET ); + break; + + case MSG_GET: + twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + TWTY_UINT16, TWPF_CHOCOLATE, TWPF_CHOCOLATE); + break; + + case MSG_SET: + twCC = msg_set(pCapability, &val); + if (twCC == TWCC_SUCCESS) + { + FIXME("Stub: PIXELFLAVOR set to %d, but ignored\n", val); + } + break; + + case MSG_GETDEFAULT: + twCC = set_onevalue(pCapability, TWTY_UINT16, TWPF_CHOCOLATE); + break; + + case MSG_RESET: + /* .. fall through intentional .. */ + + case MSG_GETCURRENT: + twCC = set_onevalue(pCapability, TWTY_UINT16, TWPF_CHOCOLATE); + break; + } + return twCC; +} + + TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) { TW_UINT16 twCC = TWCC_CAPUNSUPPORTED; @@ -376,6 +420,10 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) twCC = SANE_ICAPXferMech (pCapability, action); break; + case ICAP_PIXELFLAVOR: + twCC = SANE_ICAPPixelFlavor (pCapability, action); + break; + case ICAP_COMPRESSION: twCC = SANE_ICAPCompression(pCapability, action); break; diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 4e3d7ce..1c38824 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -333,8 +333,10 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) ok(capabilities[ICAP_PHYSICALHEIGHT], "ICAP_PHYSICALHEIGHT not supported\n"); todo_wine ok(capabilities[ICAP_PHYSICALWIDTH], "ICAP_PHYSICALWIDTH not supported\n"); - todo_wine ok(capabilities[ICAP_PIXELFLAVOR], "ICAP_PIXELFLAVOR not supported\n"); + if (capabilities[ICAP_PIXELFLAVOR]) + test_onevalue_cap(appid, source, ICAP_PIXELFLAVOR, TWTY_UINT16, + TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); /* For Twain 1.6: Sources that supply image information must support DG_CONTROL / DAT_CAPABILITY /

1 0

Jeremy White : sane.ds: Get resolution from sane, instead of hard coding -1 .
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 4b794bee9a3bad1a3744e5563d61a4861cff83b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b794bee9a3bad1a3744e5563… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Feb 13 13:14:30 2009 -0600 sane.ds: Get resolution from sane, instead of hard coding -1. --- dlls/sane.ds/Makefile.in | 1 + dlls/sane.ds/ds_image.c | 7 ++++- dlls/sane.ds/options.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/sane.ds/sane_i.h | 6 +++++ 4 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index d8646fe..d136594 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ capability.c \ ds_ctrl.c \ ds_image.c \ + options.c \ sane_main.c \ ui.c diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index 9a88bb5..5bb6cbb 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -86,6 +86,7 @@ TW_UINT16 SANE_ImageInfoGet (pTW_IDENTITY pOrigin, TW_UINT16 twRC = TWRC_SUCCESS; pTW_IMAGEINFO pImageInfo = (pTW_IMAGEINFO) pData; SANE_Status status; + SANE_Int resolution; TRACE("DG_IMAGE/DAT_IMAGEINFO/MSG_GET\n"); @@ -111,9 +112,11 @@ TW_UINT16 SANE_ImageInfoGet (pTW_IDENTITY pOrigin, activeDS.sane_param_valid = TRUE; } - pImageInfo->XResolution.Whole = -1; + if (sane_option_get_int(activeDS.deviceHandle, "resolution", &resolution) == SANE_STATUS_GOOD) + pImageInfo->XResolution.Whole = pImageInfo->YResolution.Whole = resolution; + else + pImageInfo->XResolution.Whole = pImageInfo->YResolution.Whole = -1; pImageInfo->XResolution.Frac = 0; - pImageInfo->YResolution.Whole = -1; pImageInfo->YResolution.Frac = 0; pImageInfo->ImageWidth = activeDS.sane_param.pixels_per_line; pImageInfo->ImageLength = activeDS.sane_param.lines; diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c new file mode 100644 index 0000000..0ac5c45 --- /dev/null +++ b/dlls/sane.ds/options.c @@ -0,0 +1,49 @@ +/* + * Copyright 2009 Jeremy White <jwhite(a)codeweavers.com> for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdlib.h> +#include "twain.h" +#include "sane_i.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(twain); + +#ifdef SONAME_LIBSANE +SANE_Status sane_option_get_int(SANE_Handle h, const char *option_name, SANE_Int *val) +{ + SANE_Status rc; + SANE_Int optcount; + const SANE_Option_Descriptor *opt; + int i; + + rc = psane_control_option(h, 0, SANE_ACTION_GET_VALUE, &optcount, NULL); + if (rc != SANE_STATUS_GOOD) + return rc; + + for (i = 1; i < optcount; i++) + { + opt = psane_get_option_descriptor(h, i); + if (opt && (opt->name && strcmp(opt->name, option_name) == 0) && + opt->type == SANE_TYPE_INT ) + return psane_control_option(h, i, SANE_ACTION_GET_VALUE, val, NULL); + } + return SANE_STATUS_EOF; +} +#endif diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 5a3a6d0..7e2f117 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -211,4 +211,10 @@ TW_UINT16 SANE_RGBResponseSet BOOL DoScannerUI(void); HWND ScanningDialogBox(HWND dialog, LONG progress); +/* Option functions */ +#ifdef SONAME_LIBSANE +SANE_Status sane_option_get_int(SANE_Handle h, const char *option_name, SANE_Int *val); +#endif + + #endif

1 0

Alexandre Julliard : winmm/tests: Assume volume is not supported if waveGetOutVolume fails.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 9f32c0d9d60662ac8e00ce5cbd4aebd4fdf8dc89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f32c0d9d60662ac8e00ce5cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 12:26:18 2009 +0100 winmm/tests: Assume volume is not supported if waveGetOutVolume fails. --- dlls/winmm/tests/wave.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 37685ed..c6b0282 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -62,7 +62,8 @@ static void test_multiple_waveopens(void) /* In windows this is most likely allowed, in wine an application can use the waveout * interface, but so can directsound.. this causes problems if directsound goes active */ - todo_wine ok(ret == MMSYSERR_NOERROR, "waveOutOpen returns: %x\n", ret); + todo_wine ok(ret == MMSYSERR_NOERROR || broken(ret == MMSYSERR_ALLOCATED), /* winME */ + "waveOutOpen returns: %x\n", ret); if (ret == MMSYSERR_NOERROR) waveOutClose(handle2); @@ -700,6 +701,7 @@ static void wave_out_test_deviceOut(int device, double duration, ok(rc==MMSYSERR_INVALPARAM,"waveOutGetVolume(%s,0) expected " "MMSYSERR_INVALPARAM, got %s\n", dev_name(device),wave_out_error(rc)); rc=waveOutGetVolume(wout,&volume); + if (rc == MMSYSERR_NOTSUPPORTED) has_volume = FALSE; ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED, "waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc));

1 0

Alexandre Julliard : kernel32/tests: Add a few more error codes for GetDiskFreeSpace.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 5720375fec11aeccdffecd5ea8acfed14e6beaa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5720375fec11aeccdffecd5ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 12:02:46 2009 +0100 kernel32/tests: Add a few more error codes for GetDiskFreeSpace. --- dlls/kernel32/tests/drive.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index 81e04bf..98bc126 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -119,8 +119,10 @@ static void test_GetDiskFreeSpaceA(void) { ok(ret || GetLastError() == ERROR_NOT_READY || + GetLastError() == ERROR_INVALID_FUNCTION || GetLastError() == ERROR_INVALID_DRIVE || GetLastError() == ERROR_PATH_NOT_FOUND || + GetLastError() == ERROR_REQUEST_ABORTED || GetLastError() == ERROR_UNRECOGNIZED_VOLUME, "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n", drive, ret, GetLastError()); @@ -137,7 +139,9 @@ static void test_GetDiskFreeSpaceA(void) ret = pGetDiskFreeSpaceExA( drive, &d, &totEx, NULL); ok( ret || GetLastError() == ERROR_NOT_READY || + GetLastError() == ERROR_INVALID_FUNCTION || GetLastError() == ERROR_PATH_NOT_FOUND || + GetLastError() == ERROR_REQUEST_ABORTED || GetLastError() == ERROR_UNRECOGNIZED_VOLUME, "GetDiskFreeSpaceExA( %s ) failed. GetLastError=%d\n", drive, GetLastError()); ok( bytes_per_sector == 0 || /* empty cd rom drive */ @@ -196,7 +200,9 @@ static void test_GetDiskFreeSpaceW(void) else ok( ret || GetLastError() == ERROR_NOT_READY || + GetLastError() == ERROR_INVALID_FUNCTION || GetLastError() == ERROR_PATH_NOT_FOUND || + GetLastError() == ERROR_REQUEST_ABORTED || GetLastError() == ERROR_UNRECOGNIZED_VOLUME, "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", drive[0], ret, GetLastError());

1 0

Alexandre Julliard : user32/tests: Fix some checks of the key value in accelerators.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: cc46d242e0cc7f27b3db46ee81bb253e1064d1c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc46d242e0cc7f27b3db46ee8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 11:53:06 2009 +0100 user32/tests: Fix some checks of the key value in accelerators. --- dlls/user32/tests/resource.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index f553b10..c64aff0 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -199,12 +199,12 @@ static void test_accel1(void) if (++n == r) goto done; ok( ac[n].cmd == 0xfff0, "cmd 2 not preserved got %x\n", ac[n].cmd); - ok( ac[n].key == 0x00ff, "key 2 not preserved got %x\n", ac[n].key); + ok( (ac[n].key & 0xff) == 0xff, "key 2 not preserved got %x\n", ac[n].key); ok( ac[n].fVirt == 0x0070, "fVirt 2 wrong got %x\n", ac[n].fVirt); if (++n == r) goto done; ok( ac[n].cmd == 0xfff0, "cmd 3 not preserved got %x\n", ac[n].cmd); - ok( ac[n].key == 0x00ff, "key 3 not preserved got %x\n", ac[n].key); + ok( (ac[n].key & 0xff) == 0xff, "key 3 not preserved got %x\n", ac[n].key); ok( ac[n].fVirt == 0x0000, "fVirt 3 wrong got %x\n", ac[n].fVirt); if (++n == r) goto done;

1 0

Alexandre Julliard : user32/tests: Skip some tests if SetForegroundWindow doesn't behave correctly.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: d00ad7f197d49f0b7b45645a1b41c70c5db74d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00ad7f197d49f0b7b45645a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 11:52:38 2009 +0100 user32/tests: Skip some tests if SetForegroundWindow doesn't behave correctly. --- dlls/user32/tests/win.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c72c114..a79bd34 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2398,7 +2398,11 @@ static void test_SetForegroundWindow(HWND hwnd) check_wnd_state(0, 0, 0, 0); ret = SetForegroundWindow(hwnd); - ok(ret, "SetForegroundWindow returned FALSE instead of TRUE\n"); + if (!ret) + { + skip( "SetForegroundWindow not working\n" ); + return; + } check_wnd_state(hwnd, hwnd, hwnd, 0); SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : user32/tests: Add a couple of optional message, mark as todo a test that now fails consistently on Wine.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: fa212d512777f030895a762ee7fedc59f805b335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa212d512777f030895a762ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 11:52:17 2009 +0100 user32/tests: Add a couple of optional message, mark as todo a test that now fails consistently on Wine. --- dlls/user32/tests/msg.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a865d74..4824f79 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1582,8 +1582,8 @@ static const struct message WmSetScrollRangeHV_NC_Seq[] = { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, { WM_CTLCOLORDLG, sent|defwinproc|optional }, /* sent to a parent of the dialog */ - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE|SWP_NOCLIENTMOVE }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE|SWP_NOCLIENTMOVE, 0, SWP_NOCLIENTSIZE }, + { WM_SIZE, sent|defwinproc|wparam|optional, SIZE_RESTORED }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_OBJECT_VALUECHANGE, winevent_hook|lparam|optional, 0/*OBJID_HSCROLL or OBJID_VSCROLL*/, 0 }, { WM_GETTEXT, sent|optional }, @@ -4445,7 +4445,7 @@ static void test_messages(void) { ShowWindow(hwnd, SW_RESTORE); flush_events(); - ok_sequence(WmShowRestoreMaxOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", FALSE); + ok_sequence(WmShowRestoreMaxOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", TRUE); flush_sequence(); } @@ -10382,20 +10382,19 @@ static const struct message SetActiveWindowSeq0[] = { WM_ACTIVATE, sent|wparam, 0 }, { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, - { WM_KILLFOCUS, sent|wparam|optional, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent|wparam|optional, 1 }, { WM_GETTEXT, sent|defwinproc|optional }, - { WM_ACTIVATE, sent|wparam, 1 }, - { HCBT_SETFOCUS, hook }, + { WM_ACTIVATE, sent|wparam|optional, 1 }, + { HCBT_SETFOCUS, hook|optional }, { WM_KILLFOCUS, sent|defwinproc }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 0 }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { WM_SETFOCUS, sent|defwinproc }, + { WM_SETFOCUS, sent|defwinproc|optional }, { WM_GETTEXT, sent|optional }, { 0 } };

1 0

Alexandre Julliard : kernel32/tests: Fix the last remaining failure on NT4.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 9849c99d1bce89676636365fc973625868e56330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9849c99d1bce89676636365fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 12:02:25 2009 +0100 kernel32/tests: Fix the last remaining failure on NT4. --- dlls/kernel32/tests/environ.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index aa163b4..6a13aec 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -278,7 +278,7 @@ static void test_ExpandEnvironmentStringsA(void) /* v5.1.2600.2945 (XP SP2) needs and returns len + 2 here! */ ret_size = ExpandEnvironmentStringsA(buf, buf1, ret_size); ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2 || - ret_size == strlen(value)*2 /* NT4 */, + ret_size == (strlen(value)+1)*2 /* NT4 */, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, lstrlenA(value)+1); ok(!strcmp(buf1, value), "ExpandEnvironmentStrings returned [%s]\n", buf1);

1 0