wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Piotr Caban : user32: Add helper for setting WS_EX_WINDOWEDGE flag.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 94c1a67f7846071910ca800f75ecbc80ace648c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c1a67f7846071910ca800f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:55 2021 +0200 user32: Add helper for setting WS_EX_WINDOWEDGE flag. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d261968d742..a1464f01345 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1461,6 +1461,20 @@ static void map_dpi_create_struct( CREATESTRUCTW *cs, UINT dpi_from, UINT dpi_to cs->cy = MulDiv( cs->cy, dpi_to, dpi_from ); } +/*********************************************************************** + * fix_exstyle + */ +static DWORD fix_exstyle( DWORD style, DWORD exstyle ) +{ + if ((exstyle & WS_EX_DLGMODALFRAME) || + (!(exstyle & WS_EX_STATICEDGE) && + (style & (WS_DLGFRAME | WS_THICKFRAME)))) + exstyle |= WS_EX_WINDOWEDGE; + else + exstyle &= ~WS_EX_WINDOWEDGE; + return exstyle; +} + /*********************************************************************** * WIN_CreateWindowEx * @@ -1596,13 +1610,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } WIN_FixCoordinates(cs, &sw); /* fix default coordinates */ - - if ((cs->dwExStyle & WS_EX_DLGMODALFRAME) || - ((!(cs->dwExStyle & WS_EX_STATICEDGE)) && - (cs->style & (WS_DLGFRAME | WS_THICKFRAME)))) - cs->dwExStyle |= WS_EX_WINDOWEDGE; - else - cs->dwExStyle &= ~WS_EX_WINDOWEDGE; + cs->dwExStyle = fix_exstyle(cs->style, cs->dwExStyle); /* Create the window structure */ @@ -2622,13 +2630,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return 0; /* WS_EX_TOPMOST can only be changed through SetWindowPos */ newval = (style.styleNew & ~WS_EX_TOPMOST) | (wndPtr->dwExStyle & WS_EX_TOPMOST); - /* WS_EX_WINDOWEDGE depends on some other styles */ - if (newval & WS_EX_DLGMODALFRAME) - newval |= WS_EX_WINDOWEDGE; - else if (!(newval & WS_EX_STATICEDGE) && (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME))) - newval |= WS_EX_WINDOWEDGE; - else - newval &= ~WS_EX_WINDOWEDGE; + newval = fix_exstyle(wndPtr->dwStyle, newval); break; case GWLP_HWNDPARENT: if (wndPtr->parent == GetDesktopWindow())

1 0

Piotr Caban : user32: Simplify CreateWindow condition for setting WS_EX_WINDOWEDGE style.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 3979f4a4e4e517e10c22f4350d9396832d70cdfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3979f4a4e4e517e10c22f435… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:52 2021 +0200 user32: Simplify CreateWindow condition for setting WS_EX_WINDOWEDGE style. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7c2471d2746..d261968d742 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1653,16 +1653,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } /* WS_EX_WINDOWEDGE depends on some other styles */ - if (wndPtr->dwExStyle & WS_EX_DLGMODALFRAME) + if ((wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME)) && + !(wndPtr->dwStyle & (WS_CHILD | WS_POPUP))) wndPtr->dwExStyle |= WS_EX_WINDOWEDGE; - else if (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME)) - { - if (!((wndPtr->dwExStyle & WS_EX_STATICEDGE) && - (wndPtr->dwStyle & (WS_CHILD | WS_POPUP)))) - wndPtr->dwExStyle |= WS_EX_WINDOWEDGE; - } - else - wndPtr->dwExStyle &= ~WS_EX_WINDOWEDGE; if (!(wndPtr->dwStyle & (WS_CHILD | WS_POPUP))) wndPtr->flags |= WIN_NEED_SIZE;

1 0

Piotr Caban : user32/tests: Don't use the same condition in ok and todo_wine_if.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 08303d9bbf7da6fbe7f68685d6ec9c4b79de7545 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08303d9bbf7da6fbe7f68685… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:48 2021 +0200 user32/tests: Don't use the same condition in ok and todo_wine_if. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d725f129d36..93d1e8ec232 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4548,8 +4548,7 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle else dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE; ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); - /* FIXME: Remove the condition below once Wine is fixed */ - todo_wine_if (dwActualExStyle != dwExStyleOut) + todo_wine_if (!dwStyleIn) ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); DestroyWindow(hwnd); @@ -4702,7 +4701,7 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou WORD class_atom; WCHAR caption[1]; } dlg_data; - DWORD style, ex_style; + DWORD style, ex_style, ex_style_out2; HWND hwnd, grand_parent = 0, parent = 0; struct dialog_param param; @@ -4764,14 +4763,13 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou ok(style == style_out, "expected style %#x, got %#x\n", style_out, style); /* WS_EX_WINDOWEDGE can't always be changed */ if (ex_style_in & WS_EX_DLGMODALFRAME) - ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; + ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE; else if ((style & (WS_DLGFRAME | WS_THICKFRAME)) && !(ex_style_in & WS_EX_STATICEDGE)) - ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; + ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE; else - ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE; - /* FIXME: Remove the condition below once Wine is fixed */ - todo_wine_if (ex_style != ex_style_out) - ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); + ex_style_out2 = ex_style_in & ~WS_EX_WINDOWEDGE; + todo_wine_if (ex_style_out != ex_style_out2) + ok(ex_style == ex_style_out2, "expected ex_style %#x, got %#x\n", ex_style_out2, ex_style); DestroyWindow(hwnd);

1 0

Piotr Caban : user32/tests: Test style returned by GetWindowLong in WM_CREATE.
by Alexandre Julliard 07 Oct '21

07 Oct '21

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

Piotr Caban : user32/tests: Print context in window style tests.
by Alexandre Julliard 07 Oct '21

07 Oct '21

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

Jacek Caban : include: Use __builtin_offsetof on Clang.
by Alexandre Julliard 07 Oct '21

07 Oct '21

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

Hans Leidekker : wpcap: Map Unix interfaces to Windows adapters.
by Alexandre Julliard 07 Oct '21

07 Oct '21

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

Alistair Leslie-Hughes : wininet: Allow up to 4K for response headers.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 42920ad653db4514532ee713467856e5abc5b126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42920ad653db4514532ee713… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 7 13:58:05 2021 +0200 wininet: Allow up to 4K for response headers. LevelHead includes a Header value that is > 3K in length which causes a crash after linking your account. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47505 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.h | 2 +- dlls/wininet/tests/http.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..b361c0d1b4d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -462,7 +462,7 @@ void free_authorization_cache(void) DECLSPEC_HIDDEN; void init_winsock(void) DECLSPEC_HIDDEN; -#define MAX_REPLY_LEN 0x5B4 +#define MAX_REPLY_LEN 0x1000 /* Used for debugging - maybe need to be shared in the Wine debugging code ? */ typedef struct diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ae95b4399e0..d1d7e678853 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2410,6 +2410,17 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n0123456789"; send(c, headmsg, sizeof(headmsg)-1, 0); } + if (strstr(buffer, "GET /test_large_header")) + { + static const char allokmsg[] = "HTTP/1.1 200 OK\r\nServer: winetest\r\n"; + char header[4000 + sizeof("wine-header: ") - 1]; + + memset(header, 'A', sizeof(header)); + memcpy(header, "wine-header: ", sizeof("wine-header: ") - 1); + send(c, allokmsg, sizeof(allokmsg) - 1, 0); + send(c, header, sizeof(header), 0); + send(c, "\r\n\r\n", 4, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3616,6 +3627,41 @@ static void test_not_modified(int port) InternetCloseHandle(ses); } +static void test_large_header(int port) +{ + HINTERNET ses, con, req; + BOOL ret; + DWORD size, index, error; + char buffer[13]; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_large_header", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + index = 0; + size = sizeof(buffer); + strcpy(buffer, "wine-header"); + ret = HttpQueryInfoA(req, HTTP_QUERY_CUSTOM, buffer, &size, &index); + error = GetLastError(); + ok(!ret, "HttpQueryInfoA succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size == 4001, "got %u\n", size); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6190,6 +6236,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_not_modified(si.port); + test_large_header(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port);

1 0

Brendan Shanks : api-ms-win-core-realtime-l1-1-1: Add stub DLL.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 54d51df66828d159fb6eb7cb9030581559dd9321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d51df66828d159fb6eb7cb… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 6 15:39:01 2021 -0700 api-ms-win-core-realtime-l1-1-1: Add stub DLL. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-realtime-l1-1-1.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index 877c62d9647..ec425d91f63 100755 --- a/configure +++ b/configure @@ -1021,6 +1021,7 @@ enable_api_ms_win_core_psapi_obsolete_l1_1_0 enable_api_ms_win_core_psm_appnotify_l1_1_0 enable_api_ms_win_core_quirks_l1_1_0 enable_api_ms_win_core_realtime_l1_1_0 +enable_api_ms_win_core_realtime_l1_1_1 enable_api_ms_win_core_registry_l1_1_0 enable_api_ms_win_core_registry_l2_1_0 enable_api_ms_win_core_registry_l2_2_0 @@ -19850,6 +19851,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-psapi-obsolete-l1-1-0 enable_api_ms wine_fn_config_makefile dlls/api-ms-win-core-psm-appnotify-l1-1-0 enable_api_ms_win_core_psm_appnotify_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-quirks-l1-1-0 enable_api_ms_win_core_quirks_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-realtime-l1-1-0 enable_api_ms_win_core_realtime_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-realtime-l1-1-1 enable_api_ms_win_core_realtime_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-registry-l2-1-0 enable_api_ms_win_core_registry_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-registry-l2-2-0 enable_api_ms_win_core_registry_l2_2_0 diff --git a/configure.ac b/configure.ac index 1928a6503ea..530785c0033 100644 --- a/configure.ac +++ b/configure.ac @@ -2739,6 +2739,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psm-appnotify-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-2-0) diff --git a/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in b/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in new file mode 100644 index 00000000000..88ebedfb236 --- /dev/null +++ b/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-realtime-l1-1-1.dll diff --git a/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec b/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec new file mode 100644 index 00000000000..6cffa1f0b08 --- /dev/null +++ b/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec @@ -0,0 +1,3 @@ +@ stub QueryInterruptTime +@ stub QueryInterruptTimePrecise +@ stub QueryUnbiasedInterruptTimePrecise diff --git a/tools/make_specfiles b/tools/make_specfiles index a7ee7e7f4db..ecfc6d0e8f2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -219,6 +219,7 @@ my @dll_groups = "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-realtime-l1-1-0", + "api-ms-win-core-realtime-l1-1-1", "api-ms-win-core-sidebyside-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-string-obsolete-l1-1-0",

1 0

Matteo Bruni : ntdll: Implement NtYieldExecution() as usleep().
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: b1a79c6b9c3ada0c34b1411b60879962f1815e4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1a79c6b9c3ada0c34b1411b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 6 15:53:57 2021 +0200 ntdll: Implement NtYieldExecution() as usleep(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/ntdll/unix/sync.c | 6 +----- include/config.h.in | 3 --- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configure b/configure index 2ef854b50a9..877c62d9647 100755 --- a/configure +++ b/configure @@ -17913,7 +17913,6 @@ for ac_func in \ posix_fallocate \ prctl \ proc_pidinfo \ - sched_yield \ setproctitle \ setprogname \ sigprocmask \ diff --git a/configure.ac b/configure.ac index b17d1ab4c3d..1928a6503ea 100644 --- a/configure.ac +++ b/configure.ac @@ -2145,7 +2145,6 @@ AC_CHECK_FUNCS(\ posix_fallocate \ prctl \ proc_pidinfo \ - sched_yield \ setproctitle \ setprogname \ sigprocmask \ diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index bbe7d53cba3..86a836a908f 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1505,12 +1505,8 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait, */ NTSTATUS WINAPI NtYieldExecution(void) { -#ifdef HAVE_SCHED_YIELD - sched_yield(); + usleep(0); return STATUS_SUCCESS; -#else - return STATUS_NO_YIELD_PERFORMED; -#endif } diff --git a/include/config.h.in b/include/config.h.in index f262f8a0a12..e975ca8a55d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -519,9 +519,6 @@ /* Define to 1 if you have the `sched_setaffinity' function. */ #undef HAVE_SCHED_SETAFFINITY -/* Define to 1 if you have the `sched_yield' function. */ -#undef HAVE_SCHED_YIELD - /* Define to 1 if `cmd' is a member of `scsireq_t'. */ #undef HAVE_SCSIREQ_T_CMD

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 October 2021