October 2021 - Wine-Commits

Hans Leidekker : wpcap: Map Unix interfaces to Windows adapters.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 622b0e29a6efae8f45dd00a1d728512987252c9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=622b0e29a6efae8f45dd00a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 7 14:39:47 2021 +0200 wpcap: Map Unix interfaces to Windows adapters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37167 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/Makefile.in | 1 + dlls/wpcap/unixlib.c | 4 +- dlls/wpcap/unixlib.h | 25 +++- dlls/wpcap/wpcap.c | 307 ++++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 318 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=622b0e29a6efae8f45dd…

1 0

Jacek Caban : include: Use __builtin_offsetof on Clang.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: de9982f069e576b6aaebd96383af263584eedb03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de9982f069e576b6aaebd963… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 7 16:27:22 2021 +0200 include: Use __builtin_offsetof on Clang. Fixes a number of warning on MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stddef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h index 8d946e5aedf..b3fdaf0c052 100644 --- a/include/msvcrt/stddef.h +++ b/include/msvcrt/stddef.h @@ -20,7 +20,7 @@ #include <corecrt.h> -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) #define offsetof(s,m) __builtin_offsetof(s,m) #elif defined(_WIN64) #define offsetof(s,m) (size_t)((ptrdiff_t)&(((s*)NULL)->m))

1 0

Piotr Caban : user32/tests: Print context in window style tests.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 0483e2b4afbb289c900367fd4b8296c9f6a8e762 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0483e2b4afbb289c900367fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:41 2021 +0200 user32/tests: Print context in window style tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 93 ++++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 39 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e23ab8137f8..744f7781439 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4546,48 +4546,63 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle /* tests what window styles the window manager automatically adds */ static void test_window_styles(void) { - register_style_check_class(); + static const struct + { + DWORD style_in; + DWORD exstyle_in; + DWORD style_out; + DWORD exstyle_out; + } tests[] = { + {0, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE}, + {WS_DLGFRAME, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE}, + {WS_THICKFRAME, 0, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE}, + {WS_DLGFRAME, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE}, + {WS_THICKFRAME, WS_EX_STATICEDGE, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE}, + {WS_OVERLAPPEDWINDOW, 0, WS_CLIPSIBLINGS|WS_OVERLAPPEDWINDOW, WS_EX_WINDOWEDGE}, + {WS_CHILD, 0, WS_CHILD, 0}, + {WS_CHILD|WS_DLGFRAME, 0, WS_CHILD|WS_DLGFRAME, WS_EX_WINDOWEDGE}, + {WS_CHILD|WS_THICKFRAME, 0, WS_CHILD|WS_THICKFRAME, WS_EX_WINDOWEDGE}, + {WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE}, + {WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE}, + {WS_CHILD|WS_CAPTION, 0, WS_CHILD|WS_CAPTION, WS_EX_WINDOWEDGE}, + {WS_CHILD|WS_CAPTION|WS_SYSMENU, 0, WS_CHILD|WS_CAPTION|WS_SYSMENU, WS_EX_WINDOWEDGE}, + {WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0}, + {WS_CHILD, WS_EX_DLGMODALFRAME, WS_CHILD, WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME}, + {WS_CHILD, WS_EX_DLGMODALFRAME|WS_EX_STATICEDGE, WS_CHILD, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME}, + {WS_CHILD|WS_POPUP, 0, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0}, + {WS_CHILD|WS_POPUP|WS_DLGFRAME, 0, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE}, + {WS_CHILD|WS_POPUP|WS_THICKFRAME, 0, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE}, + {WS_CHILD|WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE}, + {WS_CHILD|WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE}, + {WS_CHILD|WS_POPUP, WS_EX_APPWINDOW, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, WS_EX_APPWINDOW}, + {WS_CHILD|WS_POPUP, WS_EX_WINDOWEDGE, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0}, + {WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0}, + {0, WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW}, + {WS_POPUP, 0, WS_POPUP|WS_CLIPSIBLINGS, 0}, + {WS_POPUP, WS_EX_WINDOWEDGE, WS_POPUP|WS_CLIPSIBLINGS, 0}, + {WS_POPUP|WS_DLGFRAME, 0, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE}, + {WS_POPUP|WS_THICKFRAME, 0, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE}, + {WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE}, + {WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE}, + {WS_CAPTION, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE}, + {0, WS_EX_APPWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_APPWINDOW|WS_EX_WINDOWEDGE}, + {0, WS_EX_LAYERED, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_LAYERED|WS_EX_WINDOWEDGE}, + {0, WS_EX_LAYERED|WS_EX_TRANSPARENT, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_WINDOWEDGE}, + {0, WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, + WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW|WS_EX_WINDOWEDGE}, + }; + int i; - check_window_style(0, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); - check_window_style(WS_DLGFRAME, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); - check_window_style(WS_THICKFRAME, 0, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); - check_window_style(WS_DLGFRAME, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE); - check_window_style(WS_THICKFRAME, WS_EX_STATICEDGE, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE); - check_window_style(WS_OVERLAPPEDWINDOW, 0, WS_CLIPSIBLINGS|WS_OVERLAPPEDWINDOW, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD, 0, WS_CHILD, 0); - check_window_style(WS_CHILD|WS_DLGFRAME, 0, WS_CHILD|WS_DLGFRAME, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD|WS_THICKFRAME, 0, WS_CHILD|WS_THICKFRAME, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE); - check_window_style(WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE); - check_window_style(WS_CHILD|WS_CAPTION, 0, WS_CHILD|WS_CAPTION, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD|WS_CAPTION|WS_SYSMENU, 0, WS_CHILD|WS_CAPTION|WS_SYSMENU, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0); - check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME, WS_CHILD, WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); - check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME|WS_EX_STATICEDGE, WS_CHILD, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); - check_window_style(WS_CHILD|WS_POPUP, 0, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); - check_window_style(WS_CHILD|WS_POPUP|WS_DLGFRAME, 0, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD|WS_POPUP|WS_THICKFRAME, 0, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); - check_window_style(WS_CHILD|WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); - check_window_style(WS_CHILD|WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); - check_window_style(WS_CHILD|WS_POPUP, WS_EX_APPWINDOW, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, WS_EX_APPWINDOW); - check_window_style(WS_CHILD|WS_POPUP, WS_EX_WINDOWEDGE, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); - check_window_style(WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0); - check_window_style(0, WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW); - check_window_style(WS_POPUP, 0, WS_POPUP|WS_CLIPSIBLINGS, 0); - check_window_style(WS_POPUP, WS_EX_WINDOWEDGE, WS_POPUP|WS_CLIPSIBLINGS, 0); - check_window_style(WS_POPUP|WS_DLGFRAME, 0, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); - check_window_style(WS_POPUP|WS_THICKFRAME, 0, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); - check_window_style(WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); - check_window_style(WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); - check_window_style(WS_CAPTION, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE); - check_window_style(0, WS_EX_APPWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_APPWINDOW|WS_EX_WINDOWEDGE); + register_style_check_class(); - if (pGetLayeredWindowAttributes) + for (i = 0; i < ARRAY_SIZE(tests); i++) { - check_window_style(0, WS_EX_LAYERED, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_LAYERED|WS_EX_WINDOWEDGE); - check_window_style(0, WS_EX_LAYERED|WS_EX_TRANSPARENT, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_WINDOWEDGE); - check_window_style(0, WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, - WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW|WS_EX_WINDOWEDGE); + if ((tests[i].exstyle_in & WS_EX_LAYERED) && !pGetLayeredWindowAttributes) + continue; + + winetest_push_context("style %#x exstyle %#x", tests[i].style_in, tests[i].exstyle_in); + check_window_style(tests[i].style_in, tests[i].exstyle_in, tests[i].style_out, tests[i].exstyle_out); + winetest_pop_context(); } }

1 0

Piotr Caban : user32/tests: Test style returned by GetWindowLong in WM_CREATE.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: ce3efca24a3c10dc52deff970b4f29704f93fb82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce3efca24a3c10dc52deff97… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:45 2021 +0200 user32/tests: Test style returned by GetWindowLong in WM_CREATE. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 65 +++++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 744f7781439..d725f129d36 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4424,34 +4424,39 @@ static void test_SetParent(void) ok(!IsWindow(popup), "popup still exists\n"); } +typedef struct +{ + DWORD cs_style; + DWORD cs_exstyle; + DWORD style; + DWORD exstyle; +} test_style; + static LRESULT WINAPI StyleCheckProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - LPCREATESTRUCTA lpcs; - LPSTYLESTRUCT lpss; + CREATESTRUCTA *cs; + test_style *ts; + DWORD style; switch (msg) { case WM_NCCREATE: case WM_CREATE: - lpcs = (LPCREATESTRUCTA)lparam; - lpss = lpcs->lpCreateParams; - if (lpss) - { - if ((lpcs->dwExStyle & WS_EX_DLGMODALFRAME) || - ((!(lpcs->dwExStyle & WS_EX_STATICEDGE)) && - (lpcs->style & (WS_DLGFRAME | WS_THICKFRAME)))) - ok(lpcs->dwExStyle & WS_EX_WINDOWEDGE, "Window should have WS_EX_WINDOWEDGE style\n"); - else - ok(!(lpcs->dwExStyle & WS_EX_WINDOWEDGE), "Window shouldn't have WS_EX_WINDOWEDGE style\n"); - - ok((lpss->styleOld & ~WS_EX_WINDOWEDGE) == (lpcs->dwExStyle & ~WS_EX_WINDOWEDGE), - "Ex style (0x%08x) should match what the caller passed to CreateWindowEx (0x%08x)\n", - lpss->styleOld, lpcs->dwExStyle); - - ok(lpss->styleNew == lpcs->style, - "Style (0x%08x) should match what the caller passed to CreateWindowEx (0x%08x)\n", - lpss->styleNew, lpcs->style); - } + cs = (LPCREATESTRUCTA)lparam; + ts = cs->lpCreateParams; + + ok(ts != NULL, "lpCreateParams not set\n"); + ok(cs->style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", + cs->style, ts->cs_style); + ok(cs->dwExStyle == ts->cs_exstyle, "exstyle = 0x%08x, expected 0x%08x\n", + cs->dwExStyle, ts->cs_exstyle); + + style = GetWindowLongW(hwnd, GWL_STYLE); + ok(style == ts->style, "style = 0x%08x, expected 0x%08x\n", + style, ts->style); + style = GetWindowLongW(hwnd, GWL_EXSTYLE); + ok(style == ts->exstyle, "exstyle = 0x%08x, expected 0x%08x\n", + style, ts->exstyle); break; } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -4483,21 +4488,29 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle { DWORD dwActualStyle; DWORD dwActualExStyle; - STYLESTRUCT ss; + test_style ts; HWND hwnd; HWND hwndParent = NULL; - ss.styleNew = dwStyleIn; - ss.styleOld = dwExStyleIn; + ts.cs_style = dwStyleIn; + ts.cs_exstyle = dwExStyleIn; + if ((dwExStyleIn & WS_EX_DLGMODALFRAME) || + ((!(dwExStyleIn & WS_EX_STATICEDGE)) && + (dwStyleIn & (WS_DLGFRAME | WS_THICKFRAME)))) + ts.cs_exstyle |= WS_EX_WINDOWEDGE; + else + ts.cs_exstyle &= ~WS_EX_WINDOWEDGE; + ts.style = dwStyleOut; + ts.exstyle = dwExStyleOut; if (dwStyleIn & WS_CHILD) { - hwndParent = CreateWindowExA(0, (LPCSTR)MAKEINTATOM(atomStyleCheckClass), NULL, + hwndParent = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, 0, 0, 0, 0, NULL, NULL, NULL, NULL); } hwnd = CreateWindowExA(dwExStyleIn, (LPCSTR)MAKEINTATOM(atomStyleCheckClass), NULL, - dwStyleIn, 0, 0, 0, 0, hwndParent, NULL, NULL, &ss); + dwStyleIn, 0, 0, 0, 0, hwndParent, NULL, NULL, &ts); assert(hwnd); flush_events( TRUE );

1 0

Alexandre Julliard : configure: Use CROSSLDFLAGS as flags for cross-compiler tests.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: c7bd6865e7e9149aea3dfe56a407f6c5bcfcb0a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7bd6865e7e9149aea3dfe56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 17:08:51 2021 +0200 configure: Use CROSSLDFLAGS as flags for cross-compiler tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51849 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configure b/configure index 7fdd2085ad1..2ef854b50a9 100755 --- a/configure +++ b/configure @@ -9621,6 +9621,7 @@ test -n "$CROSSCC" || CROSSCC="false" then ac_save_CC="$CC" saved_CFLAGS=$CFLAGS + saved_LDFLAGS=$LDFLAGS CROSSCFLAGS=${CROSSCFLAGS:-"-g -O2"} EXTRACROSSCFLAGS="-DWINE_CROSS_PE -Wall" @@ -9629,6 +9630,7 @@ test -n "$CROSSCC" || CROSSCC="false" CC="$CROSSCC" CFLAGS=$CROSSCFLAGS + LDFLAGS=$CROSSLDFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CROSSCC works" >&5 $as_echo_n "checking whether $CROSSCC works... " >&6; } if ${wine_cv_crosscc+:} false; then : @@ -10676,6 +10678,7 @@ fi fi CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS CC="$ac_save_CC" fi fi diff --git a/configure.ac b/configure.ac index d9935f63c3a..b17d1ab4c3d 100644 --- a/configure.ac +++ b/configure.ac @@ -951,12 +951,14 @@ then then ac_save_CC="$CC" saved_CFLAGS=$CFLAGS + saved_LDFLAGS=$LDFLAGS AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-"-g -O2"}) AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSS_PE -Wall") AC_SUBST(CROSSLDFLAGS) CC="$CROSSCC" CFLAGS=$CROSSCFLAGS + LDFLAGS=$CROSSLDFLAGS AC_CACHE_CHECK([whether $CROSSCC works], wine_cv_crosscc, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],[wine_cv_crosscc=yes],[wine_cv_crosscc=no])]) if test $wine_cv_crosscc = yes @@ -1051,6 +1053,7 @@ then fi CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS CC="$ac_save_CC" fi fi

1 0

Jacek Caban : ntdll: Provide some Unicode helpers for Unix libs.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 1be12eaa942e38302c2b79806a184f58d664c617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be12eaa942e38302c2b7980… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:19:58 2021 +0200 ntdll: Provide some Unicode helpers for Unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 101 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 71 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 92ae04d90a5..13bf85d2eb6 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -644,37 +644,11 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) } else /* utf-8 */ { - unsigned int res; - const char *srcend = src + srclen; - WCHAR *dstend = dst + dstlen; - - while ((dst < dstend) && (src < srcend)) - { - unsigned char ch = *src++; - if (ch < 0x80) /* special fast case for 7-bit ASCII */ - { - *dst++ = ch; - continue; - } - if ((res = decode_utf8_char( ch, &src, srcend )) <= 0xffff) - { - *dst++ = res; - } - else if (res <= 0x10ffff) /* we need surrogates */ - { - res -= 0x10000; - *dst++ = 0xd800 | (res >> 10); - if (dst == dstend) break; - *dst++ = 0xdc00 | (res & 0x3ff); - } - else - { - *dst++ = 0xfffd; - } - } - reslen = dstlen - (dstend - dst); + reslen = 0; + RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); + reslen /= sizeof(WCHAR); #ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces NFD */ - if (reslen && nfc_table) reslen = compose_string( nfc_table, dst - reslen, reslen ); + if (reslen && nfc_table) reslen = compose_string( nfc_table, dst, reslen ); #endif } return reslen; @@ -2486,3 +2460,70 @@ NTSTATUS WINAPI NtQueryInstallUILanguage( LANGID *lang ) *lang = system_ui_language; return STATUS_SUCCESS; } + +WCHAR WINAPI RtlUpcaseUnicodeChar( WCHAR wch ) +{ + return ntdll_towupper( wch ); +} + +WCHAR WINAPI RtlDowncaseUnicodeChar( WCHAR wch ) +{ + return ntdll_towlower( wch ); +} + +NTSTATUS WINAPI RtlUTF8ToUnicodeN( WCHAR *dst, DWORD dstlen, DWORD *reslen, const char *src, DWORD srclen ) +{ + unsigned int res, len; + NTSTATUS status = STATUS_SUCCESS; + const char *srcend = src + srclen; + WCHAR *dstend; + + if (!src) return STATUS_INVALID_PARAMETER_4; + if (!reslen) return STATUS_INVALID_PARAMETER; + + dstlen /= sizeof(WCHAR); + dstend = dst + dstlen; + if (!dst) + { + for (len = 0; src < srcend; len++) + { + unsigned char ch = *src++; + if (ch < 0x80) continue; + if ((res = decode_utf8_char( ch, &src, srcend )) > 0x10ffff) + status = STATUS_SOME_NOT_MAPPED; + else + if (res > 0xffff) len++; + } + *reslen = len * sizeof(WCHAR); + return status; + } + + while ((dst < dstend) && (src < srcend)) + { + unsigned char ch = *src++; + if (ch < 0x80) /* special fast case for 7-bit ASCII */ + { + *dst++ = ch; + continue; + } + if ((res = decode_utf8_char( ch, &src, srcend )) <= 0xffff) + { + *dst++ = res; + } + else if (res <= 0x10ffff) /* we need surrogates */ + { + res -= 0x10000; + *dst++ = 0xd800 | (res >> 10); + if (dst == dstend) break; + *dst++ = 0xdc00 | (res & 0x3ff); + } + else + { + *dst++ = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + } + if (src < srcend) status = STATUS_BUFFER_TOO_SMALL; /* overflow */ + *reslen = (dstlen - (dstend - dst)) * sizeof(WCHAR); + return status; +}

1 0

Alexandre Julliard : ntdll: Move some exception definitions to winternl.h.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 97479d3d32cd1adf1a77f74b19ecfd0560b78128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97479d3d32cd1adf1a77f74b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 12:06:54 2021 +0200 ntdll: Move some exception definitions to winternl.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/store.c | 1 - dlls/dbghelp/coff.c | 1 - dlls/ddraw/tests/dsurface.c | 1 - dlls/kernel32/console.c | 2 -- dlls/kernel32/file.c | 1 - dlls/kernel32/module.c | 1 - dlls/kernel32/process.c | 1 - dlls/krnl386.exe16/instr.c | 1 - dlls/krnl386.exe16/int21.c | 1 - dlls/krnl386.exe16/int31.c | 1 - dlls/msvcp140_1/tests/msvcp140_1.c | 2 -- dlls/msvcp90/misc.c | 2 +- dlls/msvcrt/except.c | 1 - dlls/ntdll/unix/process.c | 1 - dlls/ntdll/unix/sync.c | 1 - dlls/ntdll/unix/thread.c | 1 - dlls/ntoskrnl.exe/instr.c | 1 - dlls/user32/lstr.c | 2 -- dlls/user32/png.c | 1 - dlls/win32u/main.c | 1 - dlls/wininet/internet.c | 2 -- dlls/wow64cpu/cpu.c | 1 - dlls/ws2_32/ws2_32_private.h | 1 - include/wine/exception.h | 32 +------------------------------- include/winternl.h | 31 +++++++++++++++++++++++++++++++ programs/winedbg/gdbproxy.c | 1 - programs/winedbg/info.c | 1 - programs/winedbg/tgt_active.c | 1 - programs/winedbg/winedbg.c | 2 -- 29 files changed, 33 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97479d3d32cd1adf1a77…

1 0

Alexandre Julliard : bcrypt: Convert the Unix library to the __wine_unix_call() interface.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: dc3a240a2dc89e5280f37c3b50df86e09705dc70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc3a240a2dc89e5280f37c3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 11:19:27 2021 +0200 bcrypt: Convert the Unix library to the __wine_unix_call() interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_internal.h | 128 ++++++++++++++++++++++---- dlls/bcrypt/bcrypt_main.c | 179 +++++++++++++++++++++++++++---------- dlls/bcrypt/gnutls.c | 203 +++++++++++++++++++++++------------------- 4 files changed, 357 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc3a240a2dc89e5280f3…

1 0

Rémi Bernon : dinput: Partially implement HID joystick IDirectInputEffect_SetParameters.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 83bc89f41f1d2a24b4503a8f659d27cd16da89b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83bc89f41f1d2a24b4503a8f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 7 10:40:06 2021 +0200 dinput: Partially implement HID joystick IDirectInputEffect_SetParameters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 176 +++++++++++++++++++++++++++++++++++++++++++-- dlls/dinput8/tests/hid.c | 85 ++-------------------- 2 files changed, 177 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83bc89f41f1d2a24b450…

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputEffect_(Start|Stop).
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 33dc3db01e5a972cbc58f795869b44d9c61ed89e URL: https://source.winehq.org/git/wine.git/?a=commit;h=33dc3db01e5a972cbc58f795… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 7 10:40:04 2021 +0200 dinput: Implement HID joystick IDirectInputEffect_(Start|Stop). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 92 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/dinput8/tests/hid.c | 5 --- 2 files changed, 88 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 624cea4d77a..002b16fe84b 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -145,6 +145,7 @@ struct hid_joystick_effect IDirectInputEffect IDirectInputEffect_iface; LONG ref; USAGE type; + ULONG index; struct list entry; struct hid_joystick *joystick; @@ -2134,14 +2135,97 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa static HRESULT WINAPI hid_joystick_effect_Start( IDirectInputEffect *iface, DWORD iterations, DWORD flags ) { - FIXME( "iface %p, iterations %u, flags %#x stub!\n", iface, iterations, flags ); - return DIERR_UNSUPPORTED; + struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface ); + struct pid_control_report *effect_control = &impl->joystick->pid_effect_control; + ULONG count, report_len = impl->joystick->caps.OutputReportByteLength; + PHIDP_PREPARSED_DATA preparsed = impl->joystick->preparsed; + HANDLE device = impl->joystick->device; + NTSTATUS status; + USAGE control; + HRESULT hr; + + TRACE( "iface %p, iterations %u, flags %#x.\n", iface, iterations, flags ); + + if ((flags & ~(DIES_NODOWNLOAD|DIES_SOLO))) return DIERR_INVALIDPARAM; + if (flags & DIES_SOLO) control = PID_USAGE_OP_EFFECT_START_SOLO; + else control = PID_USAGE_OP_EFFECT_START; + + EnterCriticalSection( &impl->joystick->base.crit ); + if (!impl->joystick->base.acquired || !(impl->joystick->base.dwCoopLevel & DISCL_EXCLUSIVE)) + hr = DIERR_NOTEXCLUSIVEACQUIRED; + else if ((flags & DIES_NODOWNLOAD) && !impl->index) + hr = DIERR_NOTDOWNLOADED; + else if ((flags & DIES_NODOWNLOAD) || !FAILED(hr = IDirectInputEffect_Download( iface ))) + { + count = 1; + status = HidP_InitializeReportForID( HidP_Output, effect_control->id, preparsed, + impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, + impl->index, preparsed, impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsages( HidP_Output, HID_USAGE_PAGE_PID, effect_control->control_coll, + &control, &count, preparsed, impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_LOOP_COUNT, + iterations, preparsed, impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else if (WriteFile( device, impl->effect_control_buf, report_len, NULL, NULL )) hr = DI_OK; + else hr = DIERR_INPUTLOST; + } + LeaveCriticalSection( &impl->joystick->base.crit ); + + return hr; } static HRESULT WINAPI hid_joystick_effect_Stop( IDirectInputEffect *iface ) { - FIXME( "iface %p stub!\n", iface ); - return DIERR_UNSUPPORTED; + struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface ); + struct pid_control_report *effect_control = &impl->joystick->pid_effect_control; + ULONG count, report_len = impl->joystick->caps.OutputReportByteLength; + PHIDP_PREPARSED_DATA preparsed = impl->joystick->preparsed; + HANDLE device = impl->joystick->device; + NTSTATUS status; + USAGE control; + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + EnterCriticalSection( &impl->joystick->base.crit ); + if (!impl->joystick->base.acquired || !(impl->joystick->base.dwCoopLevel & DISCL_EXCLUSIVE)) + hr = DIERR_NOTEXCLUSIVEACQUIRED; + else if (!impl->index) + hr = DIERR_NOTDOWNLOADED; + else + { + count = 1; + control = PID_USAGE_OP_EFFECT_STOP; + status = HidP_InitializeReportForID( HidP_Output, effect_control->id, preparsed, + impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, + impl->index, preparsed, impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsages( HidP_Output, HID_USAGE_PAGE_PID, effect_control->control_coll, + &control, &count, preparsed, impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_LOOP_COUNT, + 0, preparsed, impl->effect_control_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else if (WriteFile( device, impl->effect_control_buf, report_len, NULL, NULL )) hr = DI_OK; + else hr = DIERR_INPUTLOST; + } + LeaveCriticalSection( &impl->joystick->base.crit ); + + return hr; } static HRESULT WINAPI hid_joystick_effect_GetEffectStatus( IDirectInputEffect *iface, DWORD *status ) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index eb774dd5fe3..a53502ca8d4 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5765,10 +5765,8 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) check_member( periodic, expect_periodic, "%u", dwPeriod ); hr = IDirectInputEffect_Start( effect, 1, DIES_NODOWNLOAD ); - todo_wine ok( hr == DIERR_NOTDOWNLOADED, "Start returned %#x\n", hr ); hr = IDirectInputEffect_Stop( effect ); - todo_wine ok( hr == DIERR_NOTDOWNLOADED, "Stop returned %#x\n", hr ); set_hid_expect( file, expect_download, 3 * sizeof(struct hid_expect) ); @@ -5782,7 +5780,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) ok( hr == DI_NOEFFECT, "Download returned %#x\n", hr ); hr = IDirectInputEffect_Start( effect, 1, 0xdeadbeef ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "Start returned %#x\n", hr ); set_hid_expect( file, &expect_start_solo, sizeof(expect_start_solo) ); @@ -5845,10 +5842,8 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) set_hid_expect( file, NULL, 0 ); hr = IDirectInputEffect_Start( effect, 1, DIES_NODOWNLOAD ); - todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "Start returned %#x\n", hr ); hr = IDirectInputEffect_Stop( effect ); - todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "Stop returned %#x\n", hr ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) );

1 0