May 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : dwrite: Use the same BiDi direction table as usp10.
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 01ebf1ade42f8141caae5a593c4e41fa43296c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01ebf1ade42f8141caae5a59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 17:06:34 2019 +0200 dwrite: Use the same BiDi direction table as usp10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/bidi.c | 44 +--- dlls/dwrite/direction.c | 575 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_unicode | 1 + 4 files changed, 580 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01ebf1ade42f8141caae…

1 0

Alexandre Julliard : gdi32: Use the same BiDi direction table as usp10.
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: ef07087f47177e847c249d44f3f4918d1fd9a5ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef07087f47177e847c249d44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 17:11:39 2019 +0200 gdi32: Use the same BiDi direction table as usp10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/bidi.c | 56 ++--- dlls/gdi32/direction.c | 575 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_unicode | 1 + 4 files changed, 596 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef07087f47177e847c24…

1 0

Andrew Eikum : msvcrt: Implement fma and fmaf.
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: fa54e895a784038e56a62ef7515429f6610dc2b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa54e895a784038e56a62ef7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 21 16:50:42 2019 -0500 msvcrt: Implement fma and fmaf. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +- configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr120_app/msvcr120_app.spec | 4 +- dlls/msvcrt/math.c | 32 ++++++++++++ dlls/msvcrt/msvcrt.spec | 2 + dlls/ucrtbase/tests/misc.c | 60 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- include/config.h.in | 6 +++ 10 files changed, 112 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 69d085c..c206e8d 100755 --- a/configure +++ b/configure @@ -631,7 +631,6 @@ RT_LIBS POLL_LIBS DL_LIBS TOOLSEXT -UNWINDFLAGS MSVCRTFLAGS EXCESS_PRECISION_CFLAGS EXTRACFLAGS @@ -19147,6 +19146,8 @@ for ac_func in \ exp2f \ expm1 \ expm1f \ + fma \ + fmaf \ ilogb \ ilogbf \ j0 \ diff --git a/configure.ac b/configure.ac index 0490b53..83a8181 100644 --- a/configure.ac +++ b/configure.ac @@ -2634,6 +2634,8 @@ AC_CHECK_FUNCS(\ exp2f \ expm1 \ expm1f \ + fma \ + fmaf \ ilogb \ ilogbf \ j0 \ 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 75ecaf1..3a5991f 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 @@ -241,8 +241,8 @@ @ stub fdiml @ cdecl floor(double) ucrtbase.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) ucrtbase.floorf -@ stub fma -@ stub fmaf +@ cdecl fma(double double double) ucrtbase.fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) ucrtbase.fmaf @ stub fmal @ cdecl fmax(double double) ucrtbase.fmax @ cdecl fmaxf(float float) ucrtbase.fmaxf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 92ac324..63dc44d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2164,8 +2164,8 @@ @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf -@ stub fma -@ stub fmaf +@ cdecl fma(double double double) MSVCRT_fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf @ stub fmal @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index af6b0fe..9b7727e 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1830,8 +1830,8 @@ @ cdecl fgetws(ptr long ptr) msvcr120.fgetws @ cdecl floor(double) msvcr120.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) msvcr120.floorf -@ stub fma -@ stub fmaf +@ cdecl fma(double double double) msvcr120.fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) msvcr120.fmaf @ stub fmal @ cdecl fmax(double double) msvcr120.fmax @ cdecl fmaxf(float float) msvcr120.fmaxf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 049c340..63744e3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -388,6 +388,22 @@ float CDECL MSVCRT_floorf( float x ) } /********************************************************************* + * fmaf (MSVCRT.@) + */ +float CDECL MSVCRT_fmaf( float x, float y, float z ) +{ +#ifdef HAVE_FMAF + float w = fmaf(x, y, z); +#else + float w = x * y + z; +#endif + if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM; + return w; +} + +/********************************************************************* * frexpf (MSVCRT.@) */ float CDECL MSVCRT_frexpf( float x, int *exp ) @@ -864,6 +880,22 @@ double CDECL MSVCRT_floor( double x ) } /********************************************************************* + * fma (MSVCRT.@) + */ +double CDECL MSVCRT_fma( double x, double y, double z ) +{ +#ifdef HAVE_FMA + double w = fma(x, y, z); +#else + double w = x * y + z; +#endif + if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM; + return w; +} + +/********************************************************************* * fabs (MSVCRT.@) */ double CDECL MSVCRT_fabs( double x ) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 952de55..f464db2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1288,6 +1288,8 @@ @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf +@ cdecl fma(double double double) MSVCRT_fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf @ cdecl fmod(double double) MSVCRT_fmod @ cdecl -arch=arm,x86_64,arm64 fmodf(float float) MSVCRT_fmodf @ cdecl fopen(str str) MSVCRT_fopen diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index ddb7938..7559ede 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -64,6 +64,25 @@ static inline float __port_infinity(void) } #define INFINITY __port_infinity() +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + +static inline double __port_min_pos_double(void) +{ + static const UINT64 __min_pos_double = 0x10000000000000; + return *(const double *)&__min_pos_double; +} + +static inline double __port_max_double(void) +{ + static const UINT64 __max_double = 0x7FEFFFFFFFFFFFFF; + return *(const double *)&__max_double; +} + #define M_PI_2 1.57079632679489661923 #define FE_TONEAREST 0 @@ -750,6 +769,30 @@ static void test_math_errors(void) const struct { char func[16]; double a; + double b; + double c; + int error; + int exception; + } tests3d[] = { + /* 0 * inf --> EDOM */ + {"fma", INFINITY, 0, 0, EDOM, -1}, + {"fma", 0, INFINITY, 0, EDOM, -1}, + /* inf - inf -> EDOM */ + {"fma", INFINITY, 1, -INFINITY, EDOM, -1}, + {"fma", -INFINITY, 1, INFINITY, EDOM, -1}, + {"fma", 1, INFINITY, -INFINITY, EDOM, -1}, + {"fma", 1, -INFINITY, INFINITY, EDOM, -1}, + /* NaN */ + {"fma", NAN, 0, 0, -1, -1}, + {"fma", 0, NAN, 0, -1, -1}, + {"fma", 0, 0, NAN, -1, -1}, + /* over/underflow */ + {"fma", __port_max_double(), __port_max_double(), __port_max_double(), -1, -1}, + {"fma", __port_min_pos_double(), __port_min_pos_double(), 1, -1, -1}, + }; + const struct { + char func[16]; + double a; long b; int error; int exception; @@ -770,6 +813,7 @@ static void test_math_errors(void) }; double (CDECL *p_funcd)(double); double (CDECL *p_func2d)(double, double); + double (CDECL *p_func3d)(double, double, double); double (CDECL *p_funcdl)(double, long); int i; @@ -808,6 +852,22 @@ static void test_math_errors(void) "%s(%f, %f) got exception arg2 %f\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, exception.arg2); } + for(i = 0; i < ARRAY_SIZE(tests3d); i++) { + p_func3d = (void*)GetProcAddress(module, tests3d[i].func); + *p_errno() = -1; + exception.type = -1; + p_func3d(tests3d[i].a, tests3d[i].b, tests3d[i].c); + ok(*p_errno() == tests3d[i].error, + "%s(%f, %f, %f) got errno %d\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, *p_errno()); + ok(exception.type == tests3d[i].exception, + "%s(%f, %f, %f) got exception type %d\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, exception.type); + if(exception.type == -1) continue; + ok(exception.arg1 == tests3d[i].a, + "%s(%f, %f, %f) got exception arg1 %f\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, exception.arg1); + ok(exception.arg2 == tests3d[i].b, + "%s(%f, %f, %f) got exception arg2 %f\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, exception.arg2); + } + for(i = 0; i < ARRAY_SIZE(testsdl); i++) { p_funcdl = (void*)GetProcAddress(module, testsdl[i].func); *p_errno() = -1; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b7f814a..c64fee2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2305,8 +2305,8 @@ @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf -@ stub fma -@ stub fmaf +@ cdecl fma(double double double) MSVCRT_fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf @ stub fmal @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf diff --git a/include/config.h.in b/include/config.h.in index 7998764..774e9ee 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -161,6 +161,12 @@ /* Define to 1 if you have the <float.h> header file. */ #undef HAVE_FLOAT_H +/* Define to 1 if you have the `fma' function. */ +#undef HAVE_FMA + +/* Define to 1 if you have the `fmaf' function. */ +#undef HAVE_FMAF + /* Define to 1 if you have the `fnmatch' function. */ #undef HAVE_FNMATCH

1 0

Fabian Maurer : gdi32: CreatePolyPolygonRgn() returns an empty region when the area is empty.
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 9bc6f004ceccf3963584a4f7f4681b5c0578c214 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc6f004ceccf3963584a4f7… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed May 22 08:45:10 2019 +0100 gdi32: CreatePolyPolygonRgn() returns an empty region when the area is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46655 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 3 +-- dlls/gdi32/tests/clipping.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index cad6428..93238b5 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2627,8 +2627,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) return 0; - if (!(nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ))) - goto done; + nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); if (!(obj = alloc_region( nb_points / 2 ))) goto done; diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 60bd31e..d04ef77 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -533,6 +533,44 @@ static void test_window_dc_clipping(void) DestroyWindow(hwnd); } +static void test_CreatePolyPolygonRgn(void) +{ + HRGN region; + POINT points_zero[] = { {0, 0}, {0, 0}, {0, 0} }; + POINT points_mixed[] = { {0, 0}, {0, 0}, {0, 0}, {6, 6}, {6, 6}, {6, 6} }; + POINT points_six[] = { {6, 6}, {6, 6}, {6, 6} }; + POINT points_line[] = { {1, 0}, {11, 0}, {21, 0}}; + INT counts_single_poly[] = { 3 }; + INT counts_two_poly[] = { 3, 3 }; + int ret; + RECT rect; + + /* When all polygons are just one point or line, return must not be NULL */ + + region = CreatePolyPolygonRgn(points_zero, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_six, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_line, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_mixed, counts_two_poly, ARRAY_SIZE(counts_two_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); +} START_TEST(clipping) { @@ -541,4 +579,5 @@ START_TEST(clipping) test_GetClipRgn(); test_memory_dc_clipping(); test_window_dc_clipping(); + test_CreatePolyPolygonRgn(); }

1 0

Nikolay Sivov : kernelbase: Add some URL API functions from shlwapi.
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 7b2396979ecf6545c8dd827414130e993d9509da URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b2396979ecf6545c8dd8274… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 22 12:27:35 2019 +0300 kernelbase: Add some URL API functions from shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 26 +- dlls/kernelbase/path.c | 1144 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 1157 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b2396979ecf6545c8dd…

1 0

Nikolay Sivov : kernelbase: Remove helpers that are no longer necessary.
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 646c7803ec9b2ec1c7eda76eaa82757a4b7a00b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=646c7803ec9b2ec1c7eda76e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 22 12:27:36 2019 +0300 kernelbase: Remove helpers that are no longer necessary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 0ace59d..b81e0ba 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -52,24 +52,6 @@ static WCHAR *heap_strdupAtoW(const char *str) return ret; } -static char *char_next(const char *ptr) -{ - if (!*ptr) return (LPSTR)ptr; - if (IsDBCSLeadByte( ptr[0] ) && ptr[1]) return (LPSTR)(ptr + 2); - return (LPSTR)(ptr + 1); -} - -static char * char_prev(const char *start, const char *ptr) -{ - while (*start && (start < ptr)) - { - const char *next = char_next(start); - if (next >= ptr) break; - start = next; - } - return (char *)start; -} - static SIZE_T strnlenW(const WCHAR *string, SIZE_T maxlen) { SIZE_T i; @@ -958,7 +940,7 @@ BOOL WINAPI PathIsUNCServerShareA(const char *path) seen_slash = TRUE; } - path = char_next(path); + path = CharNextA(path); } } @@ -1015,7 +997,7 @@ BOOL WINAPI PathIsRootA(const char *path) seen_slash = TRUE; } - path = char_next(path); + path = CharNextA(path); } return TRUE; @@ -1090,7 +1072,7 @@ BOOL WINAPI PathRemoveFileSpecA(char *path) if (*path == '\\') filespec++; } - if (!(path = char_next(path))) + if (!(path = CharNextA(path))) break; } @@ -1184,7 +1166,7 @@ LPSTR WINAPI PathAddBackslashA(char *path) { do { - path = char_next(prev); + path = CharNextA(prev); if (*path) prev = path; } while (*path); @@ -1235,7 +1217,7 @@ LPSTR WINAPI PathFindExtensionA(const char *path) lastpoint = NULL; else if (*path == '.') lastpoint = path; - path = char_next(path); + path = CharNextA(path); } } @@ -1664,7 +1646,7 @@ char * WINAPI PathFindFileNameA(const char *path) if ((*path == '\\' || *path == '/' || *path == ':') && path[1] && path[1] != '\\' && path[1] != '/') last_slash = path + 1; - path = char_next(path); + path = CharNextA(path); } return (char *)last_slash; @@ -1703,7 +1685,7 @@ char * WINAPI PathGetArgsA(const char *path) if (*path == '"') seen_quote = !seen_quote; - path = char_next(path); + path = CharNextA(path); } return (char *)path; @@ -1808,7 +1790,7 @@ BOOL WINAPI PathIsFileSpecA(const char *path) { if (*path == '\\' || *path == ':') return FALSE; - path = char_next(path); + path = CharNextA(path); } return TRUE; @@ -1842,7 +1824,7 @@ BOOL WINAPI PathIsUNCServerA(const char *path) { if (*path == '\\') return FALSE; - path = char_next(path); + path = CharNextA(path); } return TRUE; @@ -1870,7 +1852,7 @@ void WINAPI PathRemoveBlanksA(char *path) start = path; while (*path == ' ') - path = char_next(path); + path = CharNextA(path); while (*path) *start++ = *path++; @@ -2003,7 +1985,7 @@ char * WINAPI PathRemoveBackslashA(char *path) if (!path) return NULL; - ptr = char_prev(path, path + strlen(path)); + ptr = CharPrevA(path, path + strlen(path)); if (!PathIsRootA(path) && *ptr == '\\') *ptr = '\0'; @@ -2058,7 +2040,7 @@ BOOL WINAPI PathIsLFNFileSpecA(const char *path) if (name_len > 8) return TRUE; /* DOS names are <= 8 chars */ } - path = char_next(path); + path = CharNextA(path); } return FALSE; /* Valid DOS path */

1 0

Dmitry Timoshkov : urlmon/tests: Add a test for ProtocolCF_CreateInstance not supporting aggregation.
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 97529298a1d73eb4268dfca40595a020f17ea7ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=97529298a1d73eb4268dfca4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 22 15:31:56 2019 +0200 urlmon/tests: Add a test for ProtocolCF_CreateInstance not supporting aggregation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 156 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 128 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97529298a1d73eb4268d…

1 0

Dmitry Timoshkov : urlmon: If ProtocolCF_CreateInstance doesn' t support aggregation retry without it.
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 43c1992821b5e1bc9ff51e6b327f29cb7613cf49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43c1992821b5e1bc9ff51e6b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 22 15:32:12 2019 +0200 urlmon: If ProtocolCF_CreateInstance doesn't support aggregation retry without it. This patch fixes a regression caused by 097811f2513e457ebf4afb1d2d21ab90b8684325. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47190 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindprot.c | 23 +++++++++++++++-------- dlls/urlmon/tests/protocol.c | 3 --- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 42d3d21..e9c97e8 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -509,15 +509,19 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr hres = IClassFactory_CreateInstance(cf, (IUnknown*)&This->IInternetBindInfo_iface, &IID_IUnknown, (void**)&protocol_unk); + if(SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); + if(SUCCEEDED(hres)) + This->protocol_unk = protocol_unk; + else + IUnknown_Release(protocol_unk); + } + else if(hres == CLASS_E_NOAGGREGATION) + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocol, (void**)&protocol); + IClassFactory_Release(cf); if(FAILED(hres)) return hres; - - hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); - if(FAILED(hres)) { - IUnknown_Release(protocol_unk); - return hres; - } } StringFromCLSID(&clsid, &clsid_str); @@ -703,8 +707,11 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD if(This->protocol) { IInternetProtocol_Terminate(This->protocol, 0); - IInternetProtocol_Release(This->protocol); - This->protocol = NULL; + + if (This->protocol_unk) { + IInternetProtocol_Release(This->protocol); + This->protocol = NULL; + } } set_binding_sink(This, NULL, NULL); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index f161251..85ef7d0 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -3875,9 +3875,7 @@ static void test_CreateBinding(void) trace("Start >\n"); expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, test_url, &protocol_sink, &bind_info, 0, 0); -todo_wine_if (no_aggregation) ok(hres == S_OK, "Start failed: %08x\n", hres); - if (hres != S_OK) goto fail; trace("Start <\n"); CHECK_CALLED(QueryService_InternetProtocol); @@ -4025,7 +4023,6 @@ todo_wine_if (no_aggregation) ok(hres == MK_E_SYNTAX, "Start failed: %08x, expected MK_E_SYNTAX\n", hres); CHECK_CALLED(QueryService_InternetProtocol); -fail: IInternetProtocol_Release(protocol); IInternetSession_Release(session);

1 0

Zebediah Figura : setupapi: Implement SetupDiRegisterCoDeviceInstallers().
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: a35a2ec2afc3e6800f38795965c45ecbd5e9cefe URL: https://source.winehq.org/git/wine.git/?a=commit;h=a35a2ec2afc3e6800f387959… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 11:15:37 2019 -0500 setupapi: Implement SetupDiRegisterCoDeviceInstallers(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 51 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9b83c35..5c6ec55 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -108,6 +108,7 @@ struct driver { WCHAR inf_path[MAX_PATH]; WCHAR manufacturer[LINE_LEN]; + WCHAR mfg_key[LINE_LEN]; WCHAR description[LINE_LEN]; }; @@ -4076,12 +4077,53 @@ BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO dev, PSP_DEVINFO_DATA info_d /*********************************************************************** * SetupDiRegisterCoDeviceInstallers (SETUPAPI.@) */ -BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO dev, PSP_DEVINFO_DATA info_data) +BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { - FIXME("%p, %p stub\n", dev, info_data); + static const WCHAR coinstallersW[] = {'.','C','o','I','n','s','t','a','l','l','e','r','s',0}; + WCHAR coinst_key[LINE_LEN], coinst_key_ext[LINE_LEN]; + struct device *device; + struct driver *driver; + void *callback_ctx; + HKEY driver_key; + INFCONTEXT ctx; + HINF hinf; + LONG l; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!(driver = device->selected_driver)) + { + ERR("No driver selected for device %p.\n", devinfo); + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); + SetupGetStringFieldW(&ctx, 1, coinst_key, ARRAY_SIZE(coinst_key), NULL); + SetupDiGetActualSectionToInstallW(hinf, coinst_key, coinst_key_ext, ARRAY_SIZE(coinst_key_ext), NULL, NULL); + strcatW(coinst_key_ext, coinstallersW); + + if ((l = create_driver_key(device, &driver_key))) + { + SetLastError(l); + SetupCloseInfFile(hinf); + return FALSE; + } + + callback_ctx = SetupInitDefaultQueueCallback(NULL); + SetupInstallFromInfSectionW(NULL, hinf, coinst_key_ext, SPINST_ALL, driver_key, NULL, + SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + SetupTermDefaultQueueCallback(callback_ctx); + + RegCloseKey(driver_key); + SetupCloseInfFile(hinf); + return TRUE; } /* Check whether the given hardware or compatible ID matches any of the device's @@ -4190,6 +4232,7 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa device->drivers = heap_realloc(device->drivers, count * sizeof(*device->drivers)); strcpyW(device->drivers[count - 1].inf_path, path); strcpyW(device->drivers[count - 1].manufacturer, mfg_name); + strcpyW(device->drivers[count - 1].mfg_key, mfg_key_ext); SetupGetStringFieldW(&ctx, 0, device->drivers[count - 1].description, ARRAY_SIZE(device->drivers[count - 1].description), NULL);

1 0

Zebediah Figura : strmbase: Rename BaseFilter_Destroy() to strmbase_filter_cleanup().
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 43444f4096af2004670b37aa6745dc13dda7980c URL: https://source.winehq.org/git/wine.git/?a=commit;h=43444f4096af2004670b37aa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 00:02:12 2019 -0500 strmbase: Rename BaseFilter_Destroy() to strmbase_filter_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/parser.c | 2 +- dlls/strmbase/filter.c | 4 ++-- dlls/strmbase/renderer.c | 2 +- dlls/strmbase/transform.c | 2 +- dlls/winegstreamer/gstdemux.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- include/wine/strmbase.h | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 0139dbc..feb9c08 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -177,7 +177,7 @@ static ULONG WINAPI unknown_inner_Release(IUnknown *iface) IPin_Release(conn); } IPin_Release(This->pOutputPin); - BaseFilter_Destroy(&This->filter); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); ObjectRefCount(FALSE); } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index b4afae9..a331d33 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -493,7 +493,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) CoTaskMemFree(This->pszFileName); if (This->pmt) DeleteMediaType(This->pmt); - BaseFilter_Destroy(&This->filter); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); return 0; } diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index a8917d9..9798ea7 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -193,7 +193,7 @@ void Parser_Destroy(ParserImpl *This) } CoTaskMemFree(This->ppPins); - BaseFilter_Destroy(&This->filter); + strmbase_filter_cleanup(&This->filter); TRACE("Destroying parser\n"); CoTaskMemFree(This); diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 3a39ec4..325620e 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -62,7 +62,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) - BaseFilter_Destroy(This); + strmbase_filter_cleanup(This); return refCount; } @@ -227,7 +227,7 @@ void BaseFilter_Init(BaseFilter *This, const IBaseFilterVtbl *Vtbl, const CLSID This->pFuncsTable = pBaseFuncsTable; } -HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This) +HRESULT WINAPI strmbase_filter_cleanup(BaseFilter * This) { if (This->pClock) IReferenceClock_Release(This->pClock); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index d263b20..c6c7978 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -298,7 +298,7 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) CloseHandle(filter->ThreadSignal); CloseHandle(filter->RenderEvent); QualityControlImpl_Destroy(filter->qcimpl); - BaseFilter_Destroy(&filter->filter); + strmbase_filter_cleanup(&filter->filter); } HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 9cb18b2..8b63d2d 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -194,7 +194,7 @@ static ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) FreeMediaType(&This->pmt); QualityControlImpl_Destroy(This->qcimpl); IUnknown_Release(This->seekthru_unk); - BaseFilter_Destroy(&This->filter); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); } return refCount; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e494b1a..6d6cf31 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1302,7 +1302,7 @@ static void GST_Destroy(GSTImpl *This) gst_bus_set_sync_handler(This->bus, NULL, NULL, NULL); gst_object_unref(This->bus); } - BaseFilter_Destroy(&This->filter); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); } diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 19042ed..651a4a8 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -337,7 +337,7 @@ static void QT_Destroy(QTSplitter *This) This->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csReceive); - BaseFilter_Destroy(&This->filter); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 18336c0..d51fdb4 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -192,7 +192,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This); void BaseFilter_Init(BaseFilter *filter, const IBaseFilterVtbl *vtbl, const CLSID *clsid, DWORD_PTR debug_info, const BaseFilterFuncTable *func_table); -HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This); +HRESULT WINAPI strmbase_filter_cleanup(BaseFilter *filter); /* Enums */ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum);

1 0