October 2015 - Wine-commits

Michael Müller : kernel32: Implement Set/ GetThreadGroupAffinity and add tests.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 9d58aac467c718ea45864a1634372b975c17542e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d58aac467c718ea45864a163… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Sep 23 22:51:23 2015 +0200 kernel32: Implement Set/GetThreadGroupAffinity and add tests. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/tests/thread.c | 142 ++++++++++++++++++++++++++++++++----------- dlls/kernel32/thread.c | 46 ++++++++++++++ 3 files changed, 156 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d58aac467c718ea45864…

1 0

André Hentschel : user32/tests: Allow tracing in menu tests.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 83bfda7cafae11d7b0de7fce253acc7f75c89ec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83bfda7cafae11d7b0de7fce2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 24 20:10:21 2015 +0200 user32/tests: Allow tracing in menu tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/user32/tests/menu.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 62c3229..65caaa4 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2508,9 +2508,10 @@ static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type, mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_SUBMENU; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -if (0) - trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n", - i, mii.fType, mii.fState, mii.wID, mii.hSubMenu); + + if (winetest_debug > 1) + trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n", + i, mii.fType, mii.fState, mii.wID, mii.hSubMenu); if (mii.hSubMenu) { @@ -2672,9 +2673,9 @@ static void test_menu_resource_layout(void) mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_STRING; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -if (0) - trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n", - i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData); + if (winetest_debug > 1) + trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n", + i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData); ok(mii.fType == menu_data[i].type, "%u: expected fType %04x, got %04x\n", i, menu_data[i].type, mii.fType); @@ -2778,9 +2779,10 @@ static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT ite mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_BITMAP; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -if (0) - trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n", - i, mii.fType, mii.fState, mii.wID, mii.hbmpItem); + + if (winetest_debug > 1) + trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n", + i, mii.fType, mii.fState, mii.wID, mii.hbmpItem); ok(mii.fType == item[i].type, "%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType);

1 0

Michael Müller : kernel32/tests: Add additional tests for GetFileAttributesExW.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: e0bbfc35037ea5d167983275929f6f254292cf33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0bbfc35037ea5d1679832759… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Sep 25 13:35:36 2015 +0200 kernel32/tests: Add additional tests for GetFileAttributesExW. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/kernel32/tests/file.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index dd64c91..61ef8af 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4650,6 +4650,30 @@ todo_wine CloseHandle(file); } +static void test_GetFileAttributesExW(void) +{ + static const WCHAR path1[] = {'\\','\\','?','\\',0}; + static const WCHAR path2[] = {'\\','?','?','\\',0}; + static const WCHAR path3[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; + WIN32_FILE_ATTRIBUTE_DATA info; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = GetFileAttributesExW(path1, GetFileExInfoStandard, &info); + ok(!ret, "GetFileAttributesExW succeeded\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_NAME, "Expected error ERROR_INVALID_NAME, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetFileAttributesExW(path2, GetFileExInfoStandard, &info); + ok(!ret, "GetFileAttributesExW succeeded\n"); + ok(GetLastError() == ERROR_INVALID_NAME, "Expected error ERROR_INVALID_NAME, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetFileAttributesExW(path3, GetFileExInfoStandard, &info); + ok(!ret, "GetFileAttributesExW succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); +} + START_TEST(file) { InitFunctionPointers(); @@ -4706,4 +4730,5 @@ START_TEST(file) test_GetFinalPathNameByHandleA(); test_GetFinalPathNameByHandleW(); test_SetFileInformationByHandle(); + test_GetFileAttributesExW(); }

1 0

Michael Müller : ntdll/tests: Add additional tests for NtQueryFullAttributesFile.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 24ea49b6ab189f25f2cb3512ed1ab10ec353164a URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ea49b6ab189f25f2cb3512e… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Sep 25 13:35:45 2015 +0200 ntdll/tests: Add additional tests for NtQueryFullAttributesFile. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ntdll/tests/file.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d68be15..6602581 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -78,6 +78,7 @@ static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOI static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK, PVOID,ULONG,FILE_INFORMATION_CLASS,BOOLEAN,PUNICODE_STRING,BOOLEAN); static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); +static NTSTATUS (WINAPI *pNtQueryFullAttributesFile)(const OBJECT_ATTRIBUTES*, FILE_NETWORK_OPEN_INFORMATION*); static inline BOOL is_signaled( HANDLE obj ) { @@ -173,6 +174,10 @@ static void create_file_test(void) '\\','f','a','i','l','i','n','g',0}; static const WCHAR questionmarkInvalidNameW[] = {'a','f','i','l','e','?',0}; static const WCHAR pipeInvalidNameW[] = {'a','|','b',0}; + static const WCHAR pathInvalidNtW[] = {'\\','\\','?','\\',0}; + static const WCHAR pathInvalidNt2W[] = {'\\','?','?','\\',0}; + static const WCHAR pathInvalidDosW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; + FILE_NETWORK_OPEN_INFORMATION info; NTSTATUS status; HANDLE dir, file; WCHAR path[MAX_PATH]; @@ -293,6 +298,39 @@ static void create_file_test(void) ok(status == STATUS_OBJECT_NAME_INVALID, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); pRtlFreeUnicodeString(&nameW); + + pRtlInitUnicodeString( &nameW, pathInvalidNtW ); + status = pNtCreateFile( &dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, + FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + ok( status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtQueryFullAttributesFile( &attr, &info ); + todo_wine ok( status == STATUS_OBJECT_NAME_INVALID, + "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + pRtlInitUnicodeString( &nameW, pathInvalidNt2W ); + status = pNtCreateFile( &dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, + FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + ok( status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtQueryFullAttributesFile( &attr, &info ); + todo_wine ok( status == STATUS_OBJECT_NAME_INVALID, + "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + pRtlInitUnicodeString( &nameW, pathInvalidDosW ); + status = pNtCreateFile( &dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, + FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + ok( status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtQueryFullAttributesFile( &attr, &info ); + todo_wine ok( status == STATUS_OBJECT_NAME_INVALID, + "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); } static void open_file_test(void) @@ -4158,6 +4196,7 @@ START_TEST(file) pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); + pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile"); test_read_write(); test_NtCreateFile();

1 0

Michael Müller : ntdll: Return STATUS_OBJECT_NAME_INVALID in wine_nt_to_unix_file_name for prefix-only paths.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 00d966cd3a8112dee499ff09ace8a3792d0a430a URL: http://source.winehq.org/git/wine.git/?a=commit;h=00d966cd3a8112dee499ff09a… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Sep 25 13:35:58 2015 +0200 ntdll: Return STATUS_OBJECT_NAME_INVALID in wine_nt_to_unix_file_name for prefix-only paths. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/kernel32/tests/file.c | 2 +- dlls/ntdll/directory.c | 6 ++++-- dlls/ntdll/tests/file.c | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 61ef8af..ca49863 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4661,7 +4661,7 @@ static void test_GetFileAttributesExW(void) SetLastError(0xdeadbeef); ret = GetFileAttributesExW(path1, GetFileExInfoStandard, &info); ok(!ret, "GetFileAttributesExW succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_NAME, "Expected error ERROR_INVALID_NAME, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_NAME, "Expected error ERROR_INVALID_NAME, got %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetFileAttributesExW(path2, GetFileExInfoStandard, &info); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 0e02f2e..f589621 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2762,11 +2762,11 @@ static inline int get_dos_prefix_len( const UNICODE_STRING *name ) static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; static const WCHAR dosdev_prefixW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\'}; - if (name->Length > sizeof(nt_prefixW) && + if (name->Length >= sizeof(nt_prefixW) && !memcmp( name->Buffer, nt_prefixW, sizeof(nt_prefixW) )) return sizeof(nt_prefixW) / sizeof(WCHAR); - if (name->Length > sizeof(dosdev_prefixW) && + if (name->Length >= sizeof(dosdev_prefixW) && !memicmpW( name->Buffer, dosdev_prefixW, sizeof(dosdev_prefixW)/sizeof(WCHAR) )) return sizeof(dosdev_prefixW) / sizeof(WCHAR); @@ -3132,6 +3132,8 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI name += pos; name_len -= pos; + if (!name_len) return STATUS_OBJECT_NAME_INVALID; + /* check for sub-directory */ for (pos = 0; pos < name_len; pos++) { diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 6602581..1afb9c8 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -318,8 +318,8 @@ static void create_file_test(void) "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtQueryFullAttributesFile( &attr, &info ); - todo_wine ok( status == STATUS_OBJECT_NAME_INVALID, - "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( status == STATUS_OBJECT_NAME_INVALID, + "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlInitUnicodeString( &nameW, pathInvalidDosW ); status = pNtCreateFile( &dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0, @@ -329,8 +329,8 @@ static void create_file_test(void) "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtQueryFullAttributesFile( &attr, &info ); - todo_wine ok( status == STATUS_OBJECT_NAME_INVALID, - "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + ok( status == STATUS_OBJECT_NAME_INVALID, + "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); } static void open_file_test(void)

1 0

Erich E. Hoover : server: Return STATUS_CANT_WAIT/ WSAEWOULDBLOCK for non-overlapped SIO_ADDRESS_LIST_CHANGE requests on non-blocking sockets.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: dfa73ca62678787400a27eb0d858a402aae37c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa73ca62678787400a27eb0d… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Fri Feb 20 14:03:34 2015 -0700 server: Return STATUS_CANT_WAIT/WSAEWOULDBLOCK for non-overlapped SIO_ADDRESS_LIST_CHANGE requests on non-blocking sockets. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> --- server/sock.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/sock.c b/server/sock.c index 67d6416..1767dea 100644 --- a/server/sock.c +++ b/server/sock.c @@ -546,6 +546,11 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *a switch(code) { case WS_SIO_ADDRESS_LIST_CHANGE: + if ((sock->state & FD_WINE_NONBLOCKING) && !blocking) + { + set_error( STATUS_CANT_WAIT ); + return 0; + } if (!(ifchange_q = sock_get_ifchange_q( sock ))) return 0; if (!(async = create_async( current, ifchange_q, async_data ))) return 0; if (blocking) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 );

1 0

Bruno Jesus : oleaut32: Cope with invalid icon data in OLEPictureImpl_LoadIcon.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 2f9987fd043d094c23430a1698f1a722be76b9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9987fd043d094c23430a169… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 29 22:15:45 2015 +0800 oleaut32: Cope with invalid icon data in OLEPictureImpl_LoadIcon. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> --- dlls/oleaut32/olepicture.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 5d0d801..5ce83e0 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1210,6 +1210,8 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x HDC hdcRef; int i; + TRACE("(this %p, xbuf %p, xread %u)\n", This, xbuf, xread); + /* FIXME("icon.idReserved=%d\n",cifd->idReserved); FIXME("icon.idType=%d\n",cifd->idType); @@ -1226,6 +1228,13 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x FIXME("[%d] dwDIBOffset %d\n",i,cifd->idEntries[i].dwDIBOffset); } */ + + /* Need at least one icon to do something. */ + if (!cifd->idCount) + { + ERR("Invalid icon count of zero.\n"); + return E_FAIL; + } i=0; /* If we have more than one icon, try to find the best. * this currently means '32 pixel wide'. @@ -1237,6 +1246,12 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x } if (i==cifd->idCount) i=0; } + if (xread < cifd->idEntries[i].dwDIBOffset + cifd->idEntries[i].dwDIBSize) + { + ERR("Icon data address %u is over %u bytes available.\n", + cifd->idEntries[i].dwDIBOffset + cifd->idEntries[i].dwDIBSize, xread); + return E_FAIL; + } if (cifd->idType == 2) { LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, cifd->idEntries[i].dwDIBSize + 4);

1 0

Martin Storsjo : ucrtbase: Make the strtod implementation C99 compatible.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 8578702e0615341118bb710b47da9c6d869153b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8578702e0615341118bb710b4… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Sep 29 14:40:12 2015 +0300 ucrtbase: Make the strtod implementation C99 compatible. Add a test for ucrtbase that verifies these aspects of the C99 behaviour of strtod. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/msvcrt/string.c | 68 ++++++++++++++++++---- dlls/ucrtbase/tests/Makefile.in | 5 ++ dlls/ucrtbase/tests/string.c | 121 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 186 insertions(+), 10 deletions(-) diff --git a/configure b/configure index c17423f..e3b6368 100755 --- a/configure +++ b/configure @@ -17786,6 +17786,7 @@ wine_fn_config_dll twain_32 enable_twain_32 wine_fn_config_test dlls/twain_32/tests twain_32_test wine_fn_config_dll typelib.dll16 enable_win16 wine_fn_config_dll ucrtbase enable_ucrtbase +wine_fn_config_test dlls/ucrtbase/tests ucrtbase_test wine_fn_config_dll unicows enable_unicows implib wine_fn_config_dll updspapi enable_updspapi wine_fn_config_dll url enable_url implib diff --git a/configure.ac b/configure.ac index 7ab221b..114a7fa 100644 --- a/configure.ac +++ b/configure.ac @@ -3336,6 +3336,7 @@ WINE_CONFIG_DLL(twain_32) WINE_CONFIG_TEST(dlls/twain_32/tests) WINE_CONFIG_DLL(typelib.dll16,enable_win16) WINE_CONFIG_DLL(ucrtbase) +WINE_CONFIG_TEST(dlls/ucrtbase/tests) WINE_CONFIG_DLL(unicows,,[implib]) WINE_CONFIG_DLL(updspapi) WINE_CONFIG_DLL(url,,[implib]) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 980d492..dde95ac 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -314,6 +314,7 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale double ret; long double lret=1, expcnt = 10; BOOL found_digit = FALSE, negexp; + int base = 10; if(err) *err = 0; @@ -339,16 +340,50 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale } else if(*p == '+') p++; - while(isdigit(*p)) { +#if _MSVCR_VER >= 140 + if(tolower(p[0]) == 'i' && tolower(p[1]) == 'n' && tolower(p[2]) == 'f') { + if(end) + *end = (char*) &p[3]; + if(tolower(p[3]) == 'i' && tolower(p[4]) == 'n' && tolower(p[5]) == 'i' && + tolower(p[6]) == 't' && tolower(p[7]) == 'y' && end) + *end = (char*) &p[8]; + return sign*INFINITY; + } + if(tolower(p[0]) == 'n' && + tolower(p[1]) == 'a' && + tolower(p[2]) == 'n') { + if(end) + *end = (char*) &p[3]; + return NAN; + } + + if(p[0] == '0' && tolower(p[1]) == 'x') { + base = 16; + expcnt = 2; + p += 2; + } +#endif + + while(isdigit(*p) || + (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { + char c = *p++; + int val; found_digit = TRUE; - hlp = d*10+*(p++)-'0'; - if(d>MSVCRT_UI64_MAX/10 || hlp<d) { + if (isdigit(c)) + val = c - '0'; + else if (c >= 'a' && c <= 'f') + val = 10 + c - 'a'; + else + val = 10 + c - 'A'; + hlp = d*base+val; + if(d>MSVCRT_UI64_MAX/base || hlp<d) { exp++; break; } else d = hlp; } - while(isdigit(*p)) { + while(isdigit(*p) || + (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { exp++; p++; } @@ -356,16 +391,25 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale if(*p == *locinfo->lconv->decimal_point) p++; - while(isdigit(*p)) { + while(isdigit(*p) || + (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { + char c = *p++; + int val; found_digit = TRUE; - hlp = d*10+*(p++)-'0'; - if(d>MSVCRT_UI64_MAX/10 || hlp<d) + if (isdigit(c)) + val = c - '0'; + else if (c >= 'a' && c <= 'f') + val = 10 + c - 'a'; + else + val = 10 + c - 'A'; + hlp = d*base+val; + if(d>MSVCRT_UI64_MAX/base || hlp<d) break; - d = hlp; exp--; } - while(isdigit(*p)) + while(isdigit(*p) || + (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) p++; if(!found_digit) { @@ -374,7 +418,11 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale return 0.0; } - if(*p=='e' || *p=='E' || *p=='d' || *p=='D') { + if(base == 16) + exp *= 4; + + if((base == 10 && (*p=='e' || *p=='E' || *p=='d' || *p=='D')) || + (base == 16 && (*p=='p' || *p=='P'))) { int e=0, s=1; p++; diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in new file mode 100644 index 0000000..2a57e5e --- /dev/null +++ b/dlls/ucrtbase/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = ucrtbase.dll +APPMODE = -mno-cygwin + +C_SRCS = \ + string.c diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c new file mode 100644 index 0000000..c251558 --- /dev/null +++ b/dlls/ucrtbase/tests/string.c @@ -0,0 +1,121 @@ +/* + * Copyright 2015 Martin Storsjo + * + * 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 <errno.h> +#include <stdarg.h> +#include <stdlib.h> +#include <wchar.h> +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include "wine/test.h" + +#include <math.h> + +#ifndef INFINITY +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() +#endif + +#ifndef NAN +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() +#endif + +static double (CDECL *p_strtod)(const char*, char** end); + +static BOOL init(void) +{ + HMODULE module; + + module = LoadLibraryA("ucrtbase.dll"); + if (!module) + { + win_skip("ucrtbase.dll not installed\n"); + return FALSE; + } + + p_strtod = (void*)GetProcAddress(module, "strtod"); + return TRUE; +} + +static BOOL local_isnan(double d) +{ + return d != d; +} + +#define test_strtod_str(string, value, length) _test_strtod_str(__LINE__, string, value, length) +static void _test_strtod_str(int line, const char* string, double value, int length) +{ + char *end; + double d; + d = p_strtod(string, &end); + if (local_isnan(value)) + ok_(__FILE__, line)(local_isnan(d), "d = %lf (\"%s\")\n", d, string); + else + ok_(__FILE__, line)(d == value, "d = %lf (\"%s\")\n", d, string); + ok_(__FILE__, line)(end == string + length, "incorrect end (%d, \"%s\")\n", (int)(end - string), string); +} + +static void test_strtod(void) +{ + test_strtod_str("infinity", INFINITY, 8); + test_strtod_str("INFINITY", INFINITY, 8); + test_strtod_str("InFiNiTy", INFINITY, 8); + test_strtod_str("INF", INFINITY, 3); + test_strtod_str("-inf", -INFINITY, 4); + test_strtod_str("inf42", INFINITY, 3); + test_strtod_str("inffoo", INFINITY, 3); + test_strtod_str("infini", INFINITY, 3); + + test_strtod_str("NAN", NAN, 3); + test_strtod_str("nan", NAN, 3); + test_strtod_str("NaN", NAN, 3); + + test_strtod_str("0x42", 66, 4); + test_strtod_str("0X42", 66, 4); + test_strtod_str("-0x42", -66, 5); + test_strtod_str("0x1p1", 2, 5); + test_strtod_str("0x1P1", 2, 5); + test_strtod_str("0x1p+1", 2, 6); + test_strtod_str("0x2p-1", 1, 6); + test_strtod_str("0xA", 10, 3); + test_strtod_str("0xa", 10, 3); + test_strtod_str("0xABCDEF", 11259375, 8); + test_strtod_str("0Xabcdef", 11259375, 8); + + test_strtod_str("0x1.1", 1.0625, 5); + test_strtod_str("0x1.1p1", 2.125, 7); + test_strtod_str("0x1.A", 1.625, 5); + test_strtod_str("0x1p1a", 2, 5); +} + +START_TEST(string) +{ + if (!init()) return; + test_strtod(); +}

1 0

Andrew Eikum : msdelta: Add stub DLL.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: ed36314dd9c9042bb1cc0d75c2e5c3c64685c8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed36314dd9c9042bb1cc0d75c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 10:27:43 2015 -0500 msdelta: Add stub DLL. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/msdelta/Makefile.in | 4 ++++ dlls/msdelta/msdelta.spec | 15 +++++++++++++++ dlls/msdelta/msdelta_main.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 64 insertions(+) diff --git a/configure b/configure index e3b6368..fab457f 100755 --- a/configure +++ b/configure @@ -1155,6 +1155,7 @@ enable_mscoree enable_msctf enable_msctfp enable_msdaps +enable_msdelta enable_msdmo enable_msftedit enable_msg711_acm @@ -17560,6 +17561,7 @@ wine_fn_config_dll msctf enable_msctf clean wine_fn_config_test dlls/msctf/tests msctf_test wine_fn_config_dll msctfp enable_msctfp clean wine_fn_config_dll msdaps enable_msdaps clean +wine_fn_config_dll msdelta enable_msdelta wine_fn_config_dll msdmo enable_msdmo implib wine_fn_config_test dlls/msdmo/tests msdmo_test wine_fn_config_dll msftedit enable_msftedit diff --git a/configure.ac b/configure.ac index 114a7fa..c37c491 100644 --- a/configure.ac +++ b/configure.ac @@ -3110,6 +3110,7 @@ WINE_CONFIG_DLL(msctf,,[clean]) WINE_CONFIG_TEST(dlls/msctf/tests) WINE_CONFIG_DLL(msctfp,,[clean]) WINE_CONFIG_DLL(msdaps,,[clean]) +WINE_CONFIG_DLL(msdelta) WINE_CONFIG_DLL(msdmo,,[implib]) WINE_CONFIG_TEST(dlls/msdmo/tests) WINE_CONFIG_DLL(msftedit) diff --git a/dlls/msdelta/Makefile.in b/dlls/msdelta/Makefile.in new file mode 100644 index 0000000..afdd037 --- /dev/null +++ b/dlls/msdelta/Makefile.in @@ -0,0 +1,4 @@ +MODULE = msdelta.dll + +C_SRCS = \ + msdelta_main.c diff --git a/dlls/msdelta/msdelta.spec b/dlls/msdelta/msdelta.spec new file mode 100644 index 0000000..ce2b5ed --- /dev/null +++ b/dlls/msdelta/msdelta.spec @@ -0,0 +1,15 @@ +@ stub ApplyDeltaA +@ stub ApplyDeltaB +@ stub ApplyDeltaProvidedB +@ stub ApplyDeltaW +@ stub CreateDeltaA +@ stub CreateDeltaB +@ stub CreateDeltaW +@ stub DeltaFree +@ stub DeltaNormalizeProvidedB +@ stub GetDeltaInfoA +@ stub GetDeltaInfoB +@ stub GetDeltaInfoW +@ stub GetDeltaSignatureA +@ stub GetDeltaSignatureB +@ stub GetDeltaSignatureW diff --git a/dlls/msdelta/msdelta_main.c b/dlls/msdelta/msdelta_main.c new file mode 100644 index 0000000..470b427 --- /dev/null +++ b/dlls/msdelta/msdelta_main.c @@ -0,0 +1,42 @@ +/* Copyright 2015 Andrew Eikum 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdelta); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Alexandre Julliard : Release 1.7.52.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 9bd963065b1fb7b445d010897d5f84967eadf75b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd963065b1fb7b445d010897… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 23:20:05 2015 +0900 Release 1.7.52. --- ANNOUNCE | 801 ++++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 477 insertions(+), 347 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bd963065b1fb7b445d01…

1 0