August 2007 - Wine-commits - list.winehq.org

Mikolaj Zalewski : msvcrt: Test and fix _mbsnextc.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 545f446bf3573b38e3fcc6b59ef89de9d189eec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=545f446bf3573b38e3fcc6b59… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Sun Aug 19 22:34:12 2007 -0700 msvcrt: Test and fix _mbsnextc. --- dlls/msvcrt/mbcs.c | 4 ++-- dlls/msvcrt/tests/string.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 1bbb32d..5882630 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -282,9 +282,9 @@ int CDECL _getmbcp(void) */ unsigned int CDECL _mbsnextc(const unsigned char* str) { - if(MSVCRT___mb_cur_max > 1 && MSVCRT_isleadbyte(*str)) + if(_ismbblead(*str)) return *str << 8 | str[1]; - return *str; /* ASCII CP or SB char */ + return *str; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6ac3fe2..8b55cf3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -25,6 +25,8 @@ #include <stdlib.h> #include <mbctype.h> +#define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } + static void* (*pmemcpy)(void *, const void *, size_t n); static int* (*pmemcmp)(void *, const void *, size_t n); @@ -163,6 +165,7 @@ static void test_mbcp(void) { int mb_orig_max = __mb_cur_max; int curr_mbcp = _getmbcp(); + unsigned char *mbstring = (unsigned char *)"\xb0\xb1\xb2 \xb3\xb4 \xb5"; /* incorrect string */ /* some two single-byte code pages*/ test_codepage(1252); @@ -182,6 +185,13 @@ static void test_mbcp(void) ok(_ismbblead(0x123420) == FALSE, "0x123420 should not be a lead byte\n"); ok(_ismbbtrail('\xb0'), "\xa0 should be a trail byte\n"); ok(_ismbbtrail(' ') == FALSE, "' ' should not be a trail byte\n"); + + + /* _mbsnextc */ + expect_eq(_mbsnextc(mbstring), 0xb0b1, int, "%x"); + expect_eq(_mbsnextc(&mbstring[2]), 0xb220, int, "%x"); /* lead + invalid tail */ + expect_eq(_mbsnextc(&mbstring[3]), 0x20, int, "%x"); /* single char */ + _setmbcp(curr_mbcp); }

1 0

Lei Zhang : wine.inf: Add twain_32.dll to the list of fake dlls.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 8942b7888be73847b77e1ad79f99afa49a88c5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8942b7888be73847b77e1ad79… Author: Lei Zhang <thestig(a)google.com> Date: Mon Aug 20 17:46:45 2007 -0700 wine.inf: Add twain_32.dll to the list of fake dlls. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 06702d2..a766b3d 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2171,6 +2171,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,explorer.exe 10,,notepad.exe 10,,regedit.exe +10,,twain_32.dll 10,,winebrowser.exe 10,,winhelp.exe 10,command,start.exe

1 0

Mikolaj Zalewski : setupapi: If needed create directories for fake dlls.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 0d00a74f4776fe5b45188b67eb54203ef77478d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d00a74f4776fe5b45188b67e… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Mon Aug 20 10:03:16 2007 -0700 setupapi: If needed create directories for fake dlls. --- dlls/setupapi/fakedll.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 5bf87c4..ca9e069 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -301,10 +301,32 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) } else { + if (GetLastError() == ERROR_PATH_NOT_FOUND) + { + WCHAR *path; + WCHAR *pathel; + + /* create the directory/directories */ + path = HeapAlloc(GetProcessHeap(), 0, (strlenW(name) + 1)*sizeof(WCHAR)); + strcpyW(path, name); + + pathel = strchrW(path, '\\'); + while (pathel != NULL) + { + *pathel = 0; + if (!CreateDirectoryW(path, NULL)) + TRACE("Couldn't create directory %s - error: %d\n", wine_dbgstr_w(path), GetLastError()); + *pathel = '\\'; + pathel = strchrW(pathel+1, '\\'); + } + + HeapFree(GetProcessHeap(), 0, path); + } + h = CreateFileW( name, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL ); if (h == INVALID_HANDLE_VALUE) { - WARN( "failed to create %s\n", debugstr_w(name) ); + ERR( "failed to create %s (error=%u)\n", debugstr_w(name), GetLastError() ); return FALSE; } }

1 0

Alexandre Julliard : dsound: Fix a compiler warning.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 3d30204156b5fb48e92784f05b5ae0045364db50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d30204156b5fb48e92784f05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 21 12:43:15 2007 +0200 dsound: Fix a compiler warning. --- dlls/dsound/primary.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 4063266..ac1a17e 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -229,7 +229,8 @@ HRESULT DSOUND_PrimaryCreate(DirectSoundDevice *device) device->drvdesc.dwFlags = DSDDESC_DOMMSYSTEMOPEN | DSDDESC_DOMMSYSTEMSETFORMAT; waveOutClose(device->hwo); IDsDriver_Release(device->driver); - device->driver = device->buffer = NULL; + device->driver = NULL; + device->buffer = NULL; device->hwo = 0; err = mmErr(waveOutOpen(&(device->hwo), device->drvdesc.dnDevNode, device->pwfx, (DWORD_PTR)DSOUND_callback, (DWORD)device, CALLBACK_FUNCTION)); if (err != DS_OK)

1 0

Mikolaj Zalewski : msvcrt: Fill _mbctype table in _setmbcp.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: ea824f830fc201b0108dc7fd58bd7b64fd3c1ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea824f830fc201b0108dc7fd5… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Sun Aug 19 20:19:37 2007 -0700 msvcrt: Fill _mbctype table in _setmbcp. --- dlls/msvcrt/locale.c | 51 --------------- dlls/msvcrt/main.c | 2 + dlls/msvcrt/mbcs.c | 146 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 101 +++++++++++++++++++++++++++++- 4 files changed, 246 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea824f830fc201b0108dc…

1 0

Dmitry Timoshkov : ntdll: Detect current time zone settings.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: d666143f880f9e19849f8f2b520dc059a11750d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d666143f880f9e19849f8f2b5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Aug 7 20:01:16 2007 +0900 ntdll: Detect current time zone settings. --- dlls/kernel32/tests/time.c | 6 + dlls/ntdll/time.c | 795 ++++++++++++++++++-------------------------- include/winternl.h | 1 + 3 files changed, 335 insertions(+), 467 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d666143f880f9e19849f8…

1 0

Dmitry Timoshkov : kernel32: Fix test case failures for time zones with absolute transition dates.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 87f119cfe05cb4b13eaea0732655a8270fdf5086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f119cfe05cb4b13eaea0732… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Aug 9 13:44:50 2007 +0900 kernel32: Fix test case failures for time zones with absolute transition dates. --- dlls/kernel32/time.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 90af803..9aa9c69 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -101,7 +101,10 @@ static int TIME_DayLightCompareDate( const SYSTEMTIME *date, if (date->wMonth > compareDate->wMonth) return 1; /* We are in a month after the date limit. */ - if (compareDate->wDayOfWeek <= 6) + /* if year is 0 then date is in day-of-week format, otherwise + * it's absolute date. + */ + if (compareDate->wYear == 0) { WORD First; /* compareDate->wDay is interpreted as number of the week in the month @@ -160,11 +163,14 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, if (pTZinfo->DaylightDate.wMonth != 0) { - if (pTZinfo->StandardDate.wMonth == 0 || - pTZinfo->StandardDate.wDay<1 || + /* if year is 0 then date is in day-of-week format, otherwise + * it's absolute date. + */ + if (pTZinfo->StandardDate.wYear == 0 && + (pTZinfo->StandardDate.wDay<1 || pTZinfo->StandardDate.wDay>5 || pTZinfo->DaylightDate.wDay<1 || - pTZinfo->DaylightDate.wDay>5) + pTZinfo->DaylightDate.wDay>5)) { SetLastError(ERROR_INVALID_PARAMETER); return TIME_ZONE_ID_INVALID;

1 0

Dmitry Timoshkov : msvcrt: Route mktime and localtime to glibc.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 1e5b131d7a9bad5459aa290eecd3b579a8647bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5b131d7a9bad5459aa290ee… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Aug 21 14:25:28 2007 +0900 msvcrt: Route mktime and localtime to glibc. --- dlls/msvcrt/tests/time.c | 54 +++++++++++------- dlls/msvcrt/time.c | 139 ++++++++++----------------------------------- 2 files changed, 63 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e5b131d7a9bad5459aa2…

1 0

Paul Vriens : msvcrt/tests: Wait for spawned processes to finish.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 56f4262e9469d762ce52badbca2f271c6a62dd2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f4262e9469d762ce52badbc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 17 16:48:33 2007 +0200 msvcrt/tests: Wait for spawned processes to finish. --- dlls/msvcrt/tests/file.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 46ccad6..bdf0d0a 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -34,6 +34,8 @@ #include <process.h> #include <errno.h> +static HANDLE proc_handles[2]; + static void test_fdopen( void ) { static const char buffer[] = {0,1,2,3,4,5,6,7,8,9}; @@ -922,7 +924,7 @@ static void test_pipes(const char* selfname) arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); arg_v[4] = str_fdw; sprintf(str_fdw, "%d", pipes[1]); arg_v[5] = NULL; - _spawnvp(_P_NOWAIT, selfname, arg_v); + proc_handles[0] = (HANDLE)_spawnvp(_P_NOWAIT, selfname, arg_v); ok(close(pipes[1]) == 0, "unable to close %d: %d\n", pipes[1], errno); r=read(pipes[0], buf, sizeof(buf)-1); @@ -947,7 +949,7 @@ static void test_pipes(const char* selfname) arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); arg_v[4] = str_fdw; sprintf(str_fdw, "%d", pipes[1]); arg_v[5] = NULL; - _spawnvp(_P_NOWAIT, selfname, arg_v); + proc_handles[1] = (HANDLE)_spawnvp(_P_NOWAIT, selfname, arg_v); ok(close(pipes[1]) == 0, "unable to close %d: %d\n", pipes[1], errno); file=fdopen(pipes[0], "r"); @@ -1004,4 +1006,9 @@ START_TEST(file) test_get_osfhandle(); test_setmaxstdio(); test_pipes(arg_v[0]); + + /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report + * file contains lines in the correct order + */ + WaitForMultipleObjects(sizeof(proc_handles)/sizeof(proc_handles[0]), proc_handles, TRUE, 5000); }

1 0

Vitaliy Margolen : dinput: Don't try to create non existing device (/dev/ js*).
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: e2e3d193516d5ddc9013e862bbe7e3dc974428c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e3d193516d5ddc9013e862b… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Aug 20 22:06:54 2007 -0600 dinput: Don't try to create non existing device (/dev/js*). --- dlls/dinput/joystick_linux.c | 75 +++++++++++++++++++++++------------------- 1 files changed, 41 insertions(+), 34 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index f155f18..ef5b9f3 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -583,48 +583,55 @@ static unsigned short get_joystick_index(REFGUID guid) static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev) { - unsigned short index; - - if ((index = get_joystick_index(rguid)) < MAX_JOYSTICKS) { - if ((riid == NULL) || - IsEqualGUID(&IID_IDirectInputDeviceA,riid) || - IsEqualGUID(&IID_IDirectInputDevice2A,riid) || - IsEqualGUID(&IID_IDirectInputDevice7A,riid) || - IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { - return alloc_device(rguid, &JoystickAvt, dinput, pdev, index); - } else { - WARN("no interface\n"); - *pdev = 0; - return DIERR_NOINTERFACE; + unsigned short index; + + find_joystick_devices(); + *pdev = NULL; + + if ((index = get_joystick_index(rguid)) < MAX_JOYSTICKS && + joystick_devices_count && index < joystick_devices_count) + { + if ((riid == NULL) || + IsEqualGUID(&IID_IDirectInputDeviceA, riid) || + IsEqualGUID(&IID_IDirectInputDevice2A, riid) || + IsEqualGUID(&IID_IDirectInputDevice7A, riid) || + IsEqualGUID(&IID_IDirectInputDevice8A, riid)) + { + return alloc_device(rguid, &JoystickAvt, dinput, pdev, index); + } + + WARN("no interface\n"); + return DIERR_NOINTERFACE; } - } - WARN("invalid device GUID\n"); - *pdev = 0; - return DIERR_DEVICENOTREG; + WARN("invalid device GUID\n"); + return DIERR_DEVICENOTREG; } static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEW* pdev) { - unsigned short index; - - if ((index = get_joystick_index(rguid)) < MAX_JOYSTICKS) { - if ((riid == NULL) || - IsEqualGUID(&IID_IDirectInputDeviceW,riid) || - IsEqualGUID(&IID_IDirectInputDevice2W,riid) || - IsEqualGUID(&IID_IDirectInputDevice7W,riid) || - IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { - return alloc_device(rguid, &JoystickWvt, dinput, (LPDIRECTINPUTDEVICEA *)pdev, index); - } else { - WARN("no interface\n"); - *pdev = 0; - return DIERR_NOINTERFACE; + unsigned short index; + + find_joystick_devices(); + *pdev = NULL; + + if ((index = get_joystick_index(rguid)) < MAX_JOYSTICKS && + joystick_devices_count && index < joystick_devices_count) + { + if ((riid == NULL) || + IsEqualGUID(&IID_IDirectInputDeviceW, riid) || + IsEqualGUID(&IID_IDirectInputDevice2W, riid) || + IsEqualGUID(&IID_IDirectInputDevice7W, riid) || + IsEqualGUID(&IID_IDirectInputDevice8W, riid)) + { + return alloc_device(rguid, &JoystickWvt, dinput, (LPDIRECTINPUTDEVICEA *)pdev, index); + } + WARN("no interface\n"); + return DIERR_NOINTERFACE; } - } - WARN("invalid device GUID\n"); - *pdev = 0; - return DIERR_DEVICENOTREG; + WARN("invalid device GUID\n"); + return DIERR_DEVICENOTREG; } #undef MAX_JOYSTICKS

1 0