wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Nikolay Sivov : ucrtbase: Add ilogb* functions.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 3838bc9698c20a74284e0137fe5a1f6b96d0e7f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3838bc9698c20a74284e0137… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 28 21:08:13 2019 +0100 ucrtbase: Add ilogb* functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8c8d8e80f558e8b0de410196ce4bcc9c77b91edf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++--- dlls/msvcr120/msvcr120.spec | 6 ++--- dlls/msvcr120_app/msvcr120_app.spec | 6 ++--- dlls/msvcrt/math.c | 31 ++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 4 +++ dlls/ucrtbase/ucrtbase.spec | 6 ++--- include/config.h.in | 6 +++++ 9 files changed, 57 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 2220d16..a4c835c 100755 --- a/configure +++ b/configure @@ -18605,6 +18605,8 @@ for ac_func in \ exp2f \ expm1 \ expm1f \ + ilogb \ + ilogbf \ j0 \ j1 \ jn \ diff --git a/configure.ac b/configure.ac index fe7ad4e..8493778 100644 --- a/configure.ac +++ b/configure.ac @@ -2743,6 +2743,8 @@ AC_CHECK_FUNCS(\ exp2f \ expm1 \ expm1f \ + ilogb \ + ilogbf \ j0 \ j1 \ jn \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index f5e4fb1..dea5094 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -254,9 +254,9 @@ @ cdecl -arch=arm,x86_64,arm64 fmodf(float float) ucrtbase.fmodf @ cdecl frexp(double ptr) ucrtbase.frexp @ cdecl hypot(double double) ucrtbase.hypot -@ stub ilogb -@ stub ilogbf -@ stub ilogbl +@ cdecl ilogb(double) ucrtbase.ilogb +@ cdecl ilogbf(float) ucrtbase.ilogbf +@ cdecl ilogbl(double) ucrtbase.ilogbl @ cdecl ldexp(double long) ucrtbase.ldexp @ cdecl lgamma(double) ucrtbase.lgamma @ cdecl lgammaf(float) ucrtbase.lgammaf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 478248d..4ddead9 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2207,9 +2207,9 @@ @ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar -@ stub ilogb -@ stub ilogbf -@ stub ilogbl +@ cdecl ilogb(double) MSVCR120_ilogb +@ cdecl ilogbf(float) MSVCR120_ilogbf +@ cdecl ilogbl(double) MSVCR120_ilogbl @ stub imaxabs @ stub imaxdiv @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 706799c..54de44b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1871,9 +1871,9 @@ @ cdecl gets_s(ptr long) msvcr120.gets_s @ cdecl getwc(ptr) msvcr120.getwc @ cdecl getwchar() msvcr120.getwchar -@ stub ilogb -@ stub ilogbf -@ stub ilogbl +@ cdecl ilogb(double) msvcr120.ilogb +@ cdecl ilogbf(float) msvcr120.ilogbf +@ cdecl ilogbl(double) msvcr120.ilogbl @ stub imaxabs @ stub imaxdiv @ cdecl isalnum(long) msvcr120.isalnum diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index dc12cb1..ca181d9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3433,4 +3433,35 @@ double CDECL MSVCR120_creal(_Dcomplex z) return z.x; } +int CDECL MSVCR120_ilogb(double x) +{ + if (!x) return MSVCRT_FP_ILOGB0; + if (isnan(x)) return MSVCRT_FP_ILOGBNAN; + if (isinf(x)) return MSVCRT_INT_MAX; + +#ifdef HAVE_ILOGB + return ilogb(x); +#else + return logb(x); +#endif +} + +int CDECL MSVCR120_ilogbf(float x) +{ + if (!x) return MSVCRT_FP_ILOGB0; + if (isnan(x)) return MSVCRT_FP_ILOGBNAN; + if (isinf(x)) return MSVCRT_INT_MAX; + +#ifdef HAVE_ILOGBF + return ilogbf(x); +#else + return logbf(x); +#endif +} + +int CDECL MSVCR120_ilogbl(LDOUBLE x) +{ + return MSVCR120_ilogb(x); +} + #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 02b8628..8654218 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -41,6 +41,7 @@ #include "windef.h" #include "winbase.h" +#define MSVCRT_INT_MAX 0x7fffffff #define MSVCRT_LONG_MAX 0x7fffffff #define MSVCRT_LONG_MIN (-MSVCRT_LONG_MAX-1) #define MSVCRT_ULONG_MAX 0xffffffff @@ -1185,6 +1186,9 @@ printf_arg arg_clbk_positional(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN; #define MSVCRT__OVERFLOW 3 #define MSVCRT__UNDERFLOW 4 +#define MSVCRT_FP_ILOGB0 (-MSVCRT_INT_MAX - 1) +#define MSVCRT_FP_ILOGBNAN MSVCRT_INT_MAX + typedef struct { float f; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6b87bd1..2e5e102 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2341,9 +2341,9 @@ @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl hypot(double double) _hypot -@ stub ilogb -@ stub ilogbf -@ stub ilogbl +@ cdecl ilogb(double) MSVCR120_ilogb +@ cdecl ilogbf(float) MSVCR120_ilogbf +@ cdecl ilogbl(double) MSVCR120_ilogbl @ stub imaxabs @ stub imaxdiv @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/include/config.h.in b/include/config.h.in index af8783a..05a7147 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -300,6 +300,12 @@ /* Define to 1 if you have the `if_nameindex' function. */ #undef HAVE_IF_NAMEINDEX +/* Define to 1 if you have the `ilogb' function. */ +#undef HAVE_ILOGB + +/* Define to 1 if you have the `ilogbf' function. */ +#undef HAVE_ILOGBF + /* Define to 1 if you have the `inet_addr' function. */ #undef HAVE_INET_ADDR

1 0

Alistair Leslie-Hughes : oleaut32: Support VT_DECIMAL in VarRound.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: a532a9f7f7dd95ec8d08f6dcb4979e5073997147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a532a9f7f7dd95ec8d08f6dc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 14 03:39:57 2019 +0000 oleaut32: Support VT_DECIMAL in VarRound. Based on a patch by Carlos Chiriboga Calderon. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26653 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0c738d900a8daccf2c5460972033766d34d59aed) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 4 ++-- dlls/oleaut32/variant.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c00968e..92e044b 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3632,7 +3632,8 @@ static const struct decimal_round_t decimal_round_data[] = { {{ 2, 0, 0, 0, 199 }, { 2, 0, 0, 0, 199 }, 2}, {{ 2, DECIMAL_NEG, 0, 0, 199 }, { 2, DECIMAL_NEG, 0, 0, 199 }, 2}, {{ 2, DECIMAL_NEG, 0, 0, 55 }, { 2, DECIMAL_NEG, 0, 0, 6 }, 1}, - {{ 2, 0, 0, 0, 55 }, { 2, 0, 0, 0, 6 }, 1} + {{ 2, 0, 0, 0, 55 }, { 2, 0, 0, 0, 6 }, 1}, + {{ 2, 0, 0, 0, 1999 }, { 1, 0, 0, 0, 200 }, 1}, }; static void test_VarRound(void) @@ -3735,7 +3736,6 @@ static void test_VarRound(void) S1(U1(*pdec)).Lo32 = ptr->source.Lo32; VariantInit(&vDst); hres = pVarRound(&v, ptr->dec, &vDst); - todo_wine ok(hres == S_OK, "%d: got 0x%08x\n", i, hres); if (hres == S_OK) { diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 8781f3e..fcbef53 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5134,7 +5134,21 @@ HRESULT WINAPI VarRound(LPVARIANT pVarIn, int deci, LPVARIANT pVarOut) } V_VT(pVarOut) = V_VT(pVarIn); break; + case VT_DECIMAL: + { + double dbl; + VarR8FromDec(&V_DECIMAL(pVarIn), &dbl); + + if (dbl>0.0f) + dbl = floor(dbl*pow(10,deci)+0.5); + else + dbl = ceil(dbl*pow(10,deci)-0.5); + + V_VT(pVarOut)=VT_DECIMAL; + VarDecFromR8(dbl, &V_DECIMAL(pVarOut)); + break; + } /* cases we don't know yet */ default: FIXME("unimplemented part, V_VT(pVarIn) == 0x%X, deci == %d\n",

1 0

Vijay Kiran Kamuju : user32: Add DlgDirList wildcard checks.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 380d97406f86fa3aa601aced3e53c60eae66193d URL: https://source.winehq.org/git/wine.git/?a=commit;h=380d97406f86fa3aa601aced… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 22 14:25:59 2019 +0100 user32: Add DlgDirList wildcard checks. Based on a patch from Christian Lupien. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8226 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7a6b00dc25880bd7e8515551b7c3fa7917776eaf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 6 +++--- dlls/user32/dialog.c | 9 ++++++++- dlls/user32/tests/listbox.c | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index e789483..76948fd 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -1812,7 +1812,7 @@ static void test_listbox_dlgdir(void) strcpy(pathBuffer, "C:\\"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); ok(res, "DlgDirList failed to list C:\\ folders\n"); - todo_wine ok(!strcmp(pathBuffer, "*"), "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + ok(!strcmp(pathBuffer, "*"), "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); strcpy(pathBuffer, "C:\\*"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); @@ -1823,8 +1823,8 @@ static void test_listbox_dlgdir(void) SetLastError(0xdeadbeef); strcpy(pathBuffer, "C:\\INVALID$$DIR"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); - todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, "GetLastError should return 0x589, got 0x%X\n",GetLastError()); DestroyWindow(hWnd); diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index deaeb84..88c2930 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1821,6 +1821,7 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, HWND hwnd; LPWSTR orig_spec = spec; WCHAR any[] = {'*','.','*',0}; + WCHAR star[] = {'*',0}; #define SENDMSG(msg,wparam,lparam) \ ((attrib & DDL_POSTMSGS) ? PostMessageW( hwnd, msg, wparam, lparam ) \ @@ -1829,10 +1830,16 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, TRACE("%p %s %d %d %04x\n", hDlg, debugstr_w(spec), idLBox, idStatic, attrib ); /* If the path exists and is a directory, chdir to it */ - if (!spec || !spec[0] || SetCurrentDirectoryW( spec )) spec = any; + if (!spec || !spec[0] || SetCurrentDirectoryW( spec )) spec = star; else { WCHAR *p, *p2; + + if (!strchrW(spec, '*') && !strchrW(spec, '?')) + { + SetLastError(ERROR_NO_WILDCARD_CHARACTERS); + return FALSE; + } p = spec; if ((p2 = strchrW( p, ':' ))) p = p2 + 1; if ((p2 = strrchrW( p, '\\' ))) p = p2; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index b87acd7..a3d3ae6 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1707,7 +1707,7 @@ static void test_listbox_dlgdir(void) strcpy(pathBuffer, "C:\\"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); - todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); strcpy(pathBuffer, "C:\\*"); @@ -1720,8 +1720,8 @@ static void test_listbox_dlgdir(void) SetLastError(0xdeadbeef); strcpy(pathBuffer, "C:\\INVALID$$DIR"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); - todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, "GetLastError should return 0x589, got 0x%X\n",GetLastError()); DestroyWindow(hWnd);

1 0

Alexandre Julliard : server: Report a 64-bit CPU for IL-only binaries.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 144db807a5cd970d3a31333a14451810936cc204 URL: https://source.winehq.org/git/wine.git/?a=commit;h=144db807a5cd970d3a31333a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 15:52:50 2019 +0100 server: Report a 64-bit CPU for IL-only binaries. Based on a patch by Brendan McGrath. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46319 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9381da9f1c8a685f806b922383c7f9356f87d94d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/mapping.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/mapping.c b/server/mapping.c index bc59b21..ea49e1a 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -712,7 +712,11 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.image_flags |= IMAGE_FLAGS_ComPlusILOnly; if (nt.opt.hdr32.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC && !(clr.Flags & COMIMAGE_FLAGS_32BITREQUIRED)) + { mapping->image.image_flags |= IMAGE_FLAGS_ComPlusNativeReady; + if (cpu_mask & CPU_FLAG(CPU_x86_64)) mapping->image.cpu = CPU_x86_64; + else if (cpu_mask & CPU_FLAG(CPU_ARM64)) mapping->image.cpu = CPU_ARM64; + } } if (!build_shared_mapping( mapping, unix_fd, sec, nt.FileHeader.NumberOfSections ))

1 0

Piotr Caban : msvcrt: Fix buffer overflow in _get_tzname.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: b26f35d9ef891da33ab0486d33b151dba106f1ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=b26f35d9ef891da33ab0486d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 27 18:37:10 2019 +0100 msvcrt: Fix buffer overflow in _get_tzname. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46481 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 79188582f067b16e3aaebfad4a853d84f3a310cc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/time.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 14f4ba0..e6493b0 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -939,6 +939,11 @@ int CDECL MSVCRT__get_tzname(MSVCRT_size_t *ret, char *buf, MSVCRT_size_t bufsiz *ret = strlen(timezone)+1; if(!buf && !bufsize) return 0; + if(*ret > bufsize) + { + buf[0] = 0; + return MSVCRT_ERANGE; + } strcpy(buf, timezone); return 0;

1 0

Paul Gofman : ntdll: Return STATUS_PENDING from NtReadFile() for async read in case of no buffering.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 9d66116b9c18c68ed292f7bd6709a76907549412 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d66116b9c18c68ed292f7bd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 15 20:41:39 2019 +0300 ntdll: Return STATUS_PENDING from NtReadFile() for async read in case of no buffering. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31954 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7ce2a8e0ae3d107f7dbeeeebb4b1189d34d27827) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/file.c | 4 ++-- dlls/ntdll/file.c | 3 ++- dlls/ntdll/tests/file.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index f93409c..8d7af9c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5162,9 +5162,9 @@ static void test_overlapped_read(void) bytes_count = 0xffffffff; ret = ReadFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, &ov); - todo_wine ok(!ret && GetLastError() == ERROR_IO_PENDING, + ok(!ret && GetLastError() == ERROR_IO_PENDING, "Unexpected ReadFile result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); - todo_wine ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); + ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); ret = GetOverlappedResult(hfile, &ov, &bytes_count, TRUE); ok(ret, "Unexpected error %u.\n", GetLastError()); ok(bytes_count == TEST_OVERLAPPED_READ_SIZE, "Unexpected read size %u.\n", bytes_count); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a43fe71..1cf3ae2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1014,7 +1014,8 @@ err: } if (send_completion) NTDLL_AddCompletion( hFile, cvalue, status, total ); - + if (async_read && (options & FILE_NO_INTERMEDIATE_BUFFERING) && status == STATUS_SUCCESS) + return STATUS_PENDING; return status; } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7b35569..e210a6e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -742,7 +742,7 @@ static void read_file_test(void) ResetEvent(event); status = pNtReadFile(handle, event, apc, &apc_count, &iosb, aligned_buffer, sizeof(aligned_buffer), &offset, NULL); - todo_wine ok(status == STATUS_PENDING, "Wrong status %x.\n", status); + ok(status == STATUS_PENDING, "Wrong status %x.\n", status); WaitForSingleObject(event, 1000); ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information);

1 0

Paul Gofman : ntdll/tests: Add more tests for overlapped file read.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: a2b99898e97e5047bfdc06f4e5e061fd64eb351c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2b99898e97e5047bfdc06f4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 15 20:41:38 2019 +0300 ntdll/tests: Add more tests for overlapped file read. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9dc63ca9813b9aec1384160afb19a8be9061d9ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/file.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 8391570..7b35569 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -598,8 +598,11 @@ static void delete_file_test(void) pRtlFreeUnicodeString( &nameW ); } +#define TEST_OVERLAPPED_READ_SIZE 4096 + static void read_file_test(void) { + DECLSPEC_ALIGN(TEST_OVERLAPPED_READ_SIZE) static unsigned char aligned_buffer[TEST_OVERLAPPED_READ_SIZE]; const char text[] = "foobar"; HANDLE handle; IO_STATUS_BLOCK iosb; @@ -711,7 +714,45 @@ static void read_file_test(void) CloseHandle( handle ); - CloseHandle( event ); + if (!(handle = create_temp_file(FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING))) + return; + + apc_count = 0; + offset.QuadPart = 0; + U(iosb).Status = 0xdeadbabe; + iosb.Information = 0xdeadbeef; + offset.QuadPart = 0; + ResetEvent(event); + status = pNtWriteFile(handle, event, apc, &apc_count, &iosb, + aligned_buffer, sizeof(aligned_buffer), &offset, NULL); + ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING || status == STATUS_SUCCESS, + "Wrong status %x.\n", status); + ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); + ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information); + ok(is_signaled(event), "event is not signaled.\n"); + ok(!apc_count, "apc was called.\n"); + SleepEx(1, TRUE); /* alertable sleep */ + ok(apc_count == 1, "apc was not called.\n"); + + apc_count = 0; + offset.QuadPart = 0; + U(iosb).Status = 0xdeadbabe; + iosb.Information = 0xdeadbeef; + offset.QuadPart = 0; + ResetEvent(event); + status = pNtReadFile(handle, event, apc, &apc_count, &iosb, + aligned_buffer, sizeof(aligned_buffer), &offset, NULL); + todo_wine ok(status == STATUS_PENDING, "Wrong status %x.\n", status); + WaitForSingleObject(event, 1000); + ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); + ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information); + ok(is_signaled(event), "event is not signaled.\n"); + ok(!apc_count, "apc was called.\n"); + SleepEx(1, TRUE); /* alertable sleep */ + ok(apc_count == 1, "apc was not called.\n"); + + CloseHandle(handle); + CloseHandle(event); } static void append_file_test(void)

1 0

Paul Gofman : kernel32/tests: Add test for overlapped file read.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 984f2a75b294740939931e359ac382b250fe431a URL: https://source.winehq.org/git/wine.git/?a=commit;h=984f2a75b294740939931e35… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 15 20:41:37 2019 +0300 kernel32/tests: Add test for overlapped file read. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3117370acceeb2606d0f6dde420a735fa6854a73) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/file.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index d1b76bb..f93409c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5125,6 +5125,70 @@ static void test_post_completion(void) CloseHandle( port ); } +#define TEST_OVERLAPPED_READ_SIZE 4096 + +static void test_overlapped_read(void) +{ + DECLSPEC_ALIGN(TEST_OVERLAPPED_READ_SIZE) static unsigned char buffer[TEST_OVERLAPPED_READ_SIZE]; + static const char prefix[] = "pfx"; + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; + DWORD bytes_count; + OVERLAPPED ov; + HANDLE hfile; + DWORD err; + DWORD ret; + + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret, "Unexpect error %u.\n", GetLastError()); + ret = GetTempFileNameA(temp_path, prefix, 0, file_name); + ok(ret, "Unexpected error %u.\n", GetLastError()); + + hfile = CreateFileA(file_name, GENERIC_WRITE, 0, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Failed to create file, GetLastError() %u.\n", GetLastError()); + memset(buffer, 0x55, sizeof(buffer)); + ret = WriteFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, NULL); + ok(ret && bytes_count == TEST_OVERLAPPED_READ_SIZE, + "Unexpected WriteFile result, ret %#x, bytes_count %u, GetLastError() %u.\n", + ret, bytes_count, GetLastError()); + CloseHandle(hfile); + + hfile = CreateFileA(file_name, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Failed to create file, GetLastError() %u.\n", GetLastError()); + + memset(&ov, 0, sizeof(ov)); + + bytes_count = 0xffffffff; + ret = ReadFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, &ov); + todo_wine ok(!ret && GetLastError() == ERROR_IO_PENDING, + "Unexpected ReadFile result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); + todo_wine ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); + ret = GetOverlappedResult(hfile, &ov, &bytes_count, TRUE); + ok(ret, "Unexpected error %u.\n", GetLastError()); + ok(bytes_count == TEST_OVERLAPPED_READ_SIZE, "Unexpected read size %u.\n", bytes_count); + + S(U(ov)).Offset = bytes_count; + ret = ReadFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, &ov); + err = GetLastError(); + /* Win8+ return ERROR_IO_PENDING like stated in MSDN, while older ones + * return ERROR_HANDLE_EOF right away. */ + ok(!ret && (err == ERROR_HANDLE_EOF || err == ERROR_IO_PENDING), + "Unexpected ReadFile result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); + if (err == ERROR_IO_PENDING) + { + ret = GetOverlappedResult(hfile, &ov, &bytes_count, TRUE); + ok(!ret && GetLastError() == ERROR_HANDLE_EOF, "Unexpected result %#x, GetLasttError() %u.\n", + ret, GetLastError()); + } + ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); + + CloseHandle(hfile); + ret = DeleteFileA(file_name); + ok(ret, "Unexpected error %u.\n", GetLastError()); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5194,4 +5258,5 @@ START_TEST(file) test_SetFileInformationByHandle(); test_GetFileAttributesExW(); test_post_completion(); + test_overlapped_read(); }

1 0

Paul Gofman : wined3d: Only use the LSB of the _SAMP_SRGB_TEXTURE state value.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 8b7fad064822df2cce132ad85962c75aac94cead URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b7fad064822df2cce132ad8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Feb 20 13:55:11 2019 +0330 wined3d: Only use the LSB of the _SAMP_SRGB_TEXTURE state value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37705 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 225fdc35586719406943286dd0e0d1aa8c25e3a1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/visual.c | 173 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/context.c | 2 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 12 +++ 4 files changed, 168 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b7fad064822df2cce13…

1 0

Nikolay Sivov : usp10: Use single path for all fonts in ScriptGetCMap().
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: d185fc2f1e818b4d6c5adf29415c6c9e3be33c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d185fc2f1e818b4d6c5adf29… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 22 15:52:48 2019 +0300 usp10: Use single path for all fonts in ScriptGetCMap(). Testing tmPitchAndFamily bitmask does not tell if font has mappings defined. Besides that, GetGlyphIndices() handles bitmap system fonts exactly the same way alternate path did. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46678 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit df4aaff7a3832c040611e6152b6431ac853371a5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/usp10/usp10.c | 45 +++++++++++++++------------------------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index abc2605..0a26996 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3544,42 +3544,27 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars hr = S_OK; - if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) + for (i = 0; i < cChars; i++) { - for (i = 0; i < cChars; i++) + WCHAR inChar; + if (dwFlags == SGCM_RTL) + inChar = mirror_char(pwcInChars[i]); + else + inChar = pwcInChars[i]; + if (!(pwOutGlyphs[i] = get_cache_glyph(psc, inChar))) { - WCHAR inChar; - if (dwFlags == SGCM_RTL) - inChar = mirror_char(pwcInChars[i]); - else - inChar = pwcInChars[i]; - if (!(pwOutGlyphs[i] = get_cache_glyph(psc, inChar))) + WORD glyph; + if (!hdc) return E_PENDING; + if (GetGlyphIndicesW(hdc, &inChar, 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; + if (glyph == 0xffff) { - WORD glyph; - if (!hdc) return E_PENDING; - if (GetGlyphIndicesW(hdc, &inChar, 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; - if (glyph == 0xffff) - { - hr = S_FALSE; - glyph = 0x0; - } - pwOutGlyphs[i] = set_cache_glyph(psc, inChar, glyph); + hr = S_FALSE; + glyph = 0x0; } + pwOutGlyphs[i] = set_cache_glyph(psc, inChar, glyph); } } - else - { - TRACE("no glyph translation\n"); - for (i = 0; i < cChars; i++) - { - WCHAR inChar; - if (dwFlags == SGCM_RTL) - inChar = mirror_char(pwcInChars[i]); - else - inChar = pwcInChars[i]; - pwOutGlyphs[i] = inChar; - } - } + return hr; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019