wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Nikolay Sivov : d3d10/effect: Use effect variable pointers to store per-pass shader objects.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: a3942ae20e288edf6ee621a09acfaf6e70a81a8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3942ae20e288edf6ee621a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:32 2021 +0300 d3d10/effect: Use effect variable pointers to store per-pass shader objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 12 ++++++-- dlls/d3d10/effect.c | 74 ++++++++++++++++++++++++---------------------- dlls/d3d10/tests/effect.c | 28 ++++++++++++++++++ 3 files changed, 75 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3942ae20e288edf6ee6…

1 0

Zebediah Figura : winegstreamer: Get rid of the WMReader typedef.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 2652416be7b3914a98474faa562274c363f1dce8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2652416be7b3914a98474faa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 10:47:10 2021 -0500 winegstreamer: Get rid of the WMReader typedef. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 497 ++++++++++++++++++------------------ 1 file changed, 249 insertions(+), 248 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2652416be7b3914a9847…

1 0

Zebediah Figura : wmvcore: Move the async reader implementation to winegstreamer.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: bf7c05d87a65b7b9999d71fc0df602e3dfa2fafa URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf7c05d87a65b7b9999d71fc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 10:47:09 2021 -0500 wmvcore: Move the async reader implementation to winegstreamer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/winegstreamer.spec | 1 + .../reader.c => winegstreamer/wm_asyncreader.c} | 54 +++++++++------------- dlls/wmvcore/Makefile.in | 1 - dlls/wmvcore/wmvcore_main.c | 15 ++++++ 5 files changed, 40 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 671e3bcb7ba..17311cd663c 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ mfplat.c \ quartz_parser.c \ wg_parser.c \ + wm_asyncreader.c \ wm_syncreader.c IDL_SRCS = \ diff --git a/dlls/winegstreamer/winegstreamer.spec b/dlls/winegstreamer/winegstreamer.spec index bd9f53a7445..bc6a390f8b1 100644 --- a/dlls/winegstreamer/winegstreamer.spec +++ b/dlls/winegstreamer/winegstreamer.spec @@ -2,4 +2,5 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() +@ stdcall winegstreamer_create_wm_async_reader(ptr) @ stdcall winegstreamer_create_wm_sync_reader(ptr) diff --git a/dlls/wmvcore/reader.c b/dlls/winegstreamer/wm_asyncreader.c similarity index 98% rename from dlls/wmvcore/reader.c rename to dlls/winegstreamer/wm_asyncreader.c index 12ba8099ab1..d3fd1624f24 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -16,11 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wmvcore.h" - +#include "gst_private.h" #include "wmsdk.h" -#include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); @@ -153,7 +150,7 @@ static ULONG WINAPI WMReader_Release(IWMReader *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -2039,36 +2036,31 @@ static const IWMPacketSize2Vtbl WMPacketSize2Vtbl = packetsize_SetMinPacketSize }; -HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) +HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) { - WMReader *reader; + WMReader *object; - TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader); + TRACE("reader %p.\n", reader); - reader = heap_alloc(sizeof(*reader)); - if(!reader) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; - reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; - reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; - reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; - reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; - reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; - reader->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; - reader->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl; - reader->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl; - reader->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; - reader->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; - reader->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; - reader->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; - reader->ref = 1; - - *ret_reader = &reader->IWMReader_iface; + object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; + object->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl; + object->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; + object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; + object->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; + object->IWMReader_iface.lpVtbl = &WMReaderVtbl; + object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; + object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; + object->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; + object->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl; + object->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; + object->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; + object->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; + object->ref = 1; + + TRACE("Created async reader %p.\n", object); + *reader = (IWMReader *)&object->IWMReader_iface; return S_OK; } - -HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader) -{ - return WMCreateReader(NULL, 0, ret_reader); -} diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index d0b230dd7c0..6aed828abae 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -6,7 +6,6 @@ DELAYIMPORTS = winegstreamer EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ - reader.c \ wmvcore_main.c \ writer.c diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 8d4d4251369..ff837921286 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -25,8 +25,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); +HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader); HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader); +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader) +{ + TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader); + + return winegstreamer_create_wm_async_reader(reader); +} + +HRESULT WINAPI WMCreateReaderPriv(IWMReader **reader) +{ + TRACE("reader %p.\n", reader); + + return winegstreamer_create_wm_async_reader(reader); +} + HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) { TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader);

1 0

Zebediah Figura : winegstreamer: Get rid of the WMSyncReader typedef.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: ba3fa4254b3c336b171c9d47de677c2d9b277cdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba3fa4254b3c336b171c9d47… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 10:47:08 2021 -0500 winegstreamer: Get rid of the WMSyncReader typedef. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_syncreader.c | 143 +++++++++++++++++++------------------ 1 file changed, 72 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba3fa4254b3c336b171c…

1 0

Zebediah Figura : wmvcore: Move the sync reader implementation to winegstreamer.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: e4767ea6126fce8b419ef10a3cfce8bf43206d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4767ea6126fce8b419ef10a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 10:47:07 2021 -0500 wmvcore: Move the sync reader implementation to winegstreamer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 4 ++- dlls/winegstreamer/winegstreamer.spec | 1 + .../syncreader.c => winegstreamer/wm_syncreader.c} | 33 ++++++++-------------- dlls/wmvcore/Makefile.in | 2 +- dlls/wmvcore/wmvcore_main.c | 16 +++++++++++ 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index e35df3cf3f9..671e3bcb7ba 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,5 +1,6 @@ MODULE = winegstreamer.dll UNIXLIB = winegstreamer.so +IMPORTLIB = winegstreamer IMPORTS = strmbase strmiids uuid ole32 mfuuid DELAYIMPORTS = mfplat EXTRAINCL = $(GSTREAMER_CFLAGS) @@ -11,7 +12,8 @@ C_SRCS = \ media_source.c \ mfplat.c \ quartz_parser.c \ - wg_parser.c + wg_parser.c \ + wm_syncreader.c IDL_SRCS = \ winegstreamer_classes.idl diff --git a/dlls/winegstreamer/winegstreamer.spec b/dlls/winegstreamer/winegstreamer.spec index b16365d0c9f..bd9f53a7445 100644 --- a/dlls/winegstreamer/winegstreamer.spec +++ b/dlls/winegstreamer/winegstreamer.spec @@ -2,3 +2,4 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() +@ stdcall winegstreamer_create_wm_sync_reader(ptr) diff --git a/dlls/wmvcore/syncreader.c b/dlls/winegstreamer/wm_syncreader.c similarity index 96% rename from dlls/wmvcore/syncreader.c rename to dlls/winegstreamer/wm_syncreader.c index b245ff20d31..75b8e021148 100644 --- a/dlls/wmvcore/syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -16,11 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wmvcore.h" - +#include "gst_private.h" +#include "initguid.h" #include "wmsdk.h" -#include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); @@ -85,7 +83,7 @@ static ULONG WINAPI WMSyncReader_Release(IWMSyncReader2 *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -605,27 +603,20 @@ static const IWMProfile3Vtbl WMProfile3Vtbl = WMProfile3_GetExpectedPacketCount }; -HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) +HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader) { - WMSyncReader *sync; - - TRACE("(%p, %x, %p)\n", pcert, rights, syncreader); + WMSyncReader *object; - sync = heap_alloc(sizeof(*sync)); + TRACE("reader %p.\n", reader); - if (!sync) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - sync->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; - sync->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl; - sync->ref = 1; - - *syncreader = (IWMSyncReader *)&sync->IWMSyncReader2_iface; + object->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; + object->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl; + object->ref = 1; + TRACE("Created sync reader %p.\n", object); + *reader = (IWMSyncReader *)&object->IWMSyncReader2_iface; return S_OK; } - -HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **syncreader) -{ - return WMCreateSyncReader(NULL, 0, syncreader); -} diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index 15c017f86d9..d0b230dd7c0 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -1,12 +1,12 @@ MODULE = wmvcore.dll IMPORTLIB = wmvcore IMPORTS = kernel32 +DELAYIMPORTS = winegstreamer EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ reader.c \ - syncreader.c \ wmvcore_main.c \ writer.c diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 5f93fc68e3b..8d4d4251369 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -25,6 +25,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); +HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader); + +HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) +{ + TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader); + + return winegstreamer_create_wm_sync_reader(reader); +} + +HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **reader) +{ + TRACE("reader %p.\n", reader); + + return winegstreamer_create_wm_sync_reader(reader); +} + HRESULT WINAPI WMCheckURLExtension(const WCHAR *url) { FIXME("(%s): stub\n", wine_dbgstr_w(url));

1 0

Zebediah Figura : winegstreamer: Translate GST_AUDIO_CHANNEL_POSITION_MONO to SPEAKER_FRONT_CENTER.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 009c1d66fa202666f778d7df2bbcc522993935cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=009c1d66fa202666f778d7df… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 10:47:06 2021 -0500 winegstreamer: Translate GST_AUDIO_CHANNEL_POSITION_MONO to SPEAKER_FRONT_CENTER. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0c23ae6d351..c3c9051a174 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -159,7 +159,10 @@ static uint32_t wg_channel_position_from_gst(GstAudioChannelPosition position) SPEAKER_TOP_BACK_CENTER, }; - if (position < ARRAY_SIZE(position_map)) + if (position == GST_AUDIO_CHANNEL_POSITION_MONO) + return SPEAKER_FRONT_CENTER; + + if (position >= 0 && position < ARRAY_SIZE(position_map)) return position_map[position]; return 0; }

1 0

Piotr Caban : user32: Fix window style while CBT_CREATEWND hook is called.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: fd60414fce64fb97c4ac66267f84b9c577d7473b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd60414fce64fb97c4ac6626… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:34:11 2021 +0200 user32: Fix window style while CBT_CREATEWND hook is called. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 17 +++++++---------- dlls/user32/win.c | 40 +++++++++++++++++++++++++++------------- include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/request.h | 4 +++- server/trace.c | 2 ++ server/window.c | 2 ++ 7 files changed, 46 insertions(+), 25 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6715a26b631..6b13d93be14 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1222,10 +1222,9 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) /* WS_VISIBLE should be turned off yet */ style = createwnd->lpcs->style & ~WS_VISIBLE; - todo_wine_if(!(style & WS_CLIPSIBLINGS) && (!(style & WS_CHILD) || (style & WS_POPUP))) - ok(style == GetWindowLongA(hwnd, GWL_STYLE), - "style of hwnd and style in the CREATESTRUCT do not match: %08x != %08x\n", - GetWindowLongA(hwnd, GWL_STYLE), style); + ok(style == GetWindowLongA(hwnd, GWL_STYLE), + "style of hwnd and style in the CREATESTRUCT do not match: %08x != %08x\n", + GetWindowLongA(hwnd, GWL_STYLE), style); if (0) { @@ -4451,13 +4450,11 @@ static LRESULT WINAPI cbt_proc(int ncode, WPARAM wparam, LPARAM lparam) c->lpcs->dwExStyle, ts->cs_exstyle); style = GetWindowLongW(hwnd, GWL_STYLE); - todo_wine_if(!(ts->cs_style & WS_CHILD) || (ts->cs_style & WS_POPUP)) - ok(style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", - style, ts->cs_style); + ok(style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", + style, ts->cs_style); style = GetWindowLongW(hwnd, GWL_EXSTYLE); - todo_wine_if(ts->exstyle != ts->cs_exstyle) - ok(style == (ts->cs_exstyle & ~WS_EX_LAYERED), - "exstyle = 0x%08x, expected 0x%08x\n", style, ts->cs_exstyle); + ok(style == (ts->cs_exstyle & ~WS_EX_LAYERED), + "exstyle = 0x%08x, expected 0x%08x\n", style, ts->cs_exstyle); return CallNextHookEx(NULL, ncode, wparam, lparam); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 081d21a95d0..5e89f4c2c97 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -192,7 +192,8 @@ void *free_user_handle( HANDLE handle, enum user_obj_type type ) * Create a window handle with the server. */ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, - HINSTANCE instance, BOOL unicode ) + HINSTANCE instance, BOOL unicode, + DWORD style, DWORD ex_style ) { WORD index; WND *win; @@ -209,6 +210,8 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, req->instance = wine_server_client_ptr( instance ); req->dpi = GetDpiForSystem(); req->awareness = awareness; + req->style = style; + req->ex_style = ex_style; if (!(req->atom = get_int_atom_value( name )) && name) wine_server_add_data( req, name, lstrlenW(name)*sizeof(WCHAR) ); if (!wine_server_call_err( req )) @@ -1482,7 +1485,7 @@ static DWORD fix_exstyle( DWORD style, DWORD exstyle ) */ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) { - INT cx, cy, style, sw = SW_SHOW; + INT cx, cy, style, ex_style, sw = SW_SHOW; LRESULT result; RECT rect; WND *wndPtr; @@ -1614,13 +1617,17 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* Create the window structure */ - if (!(wndPtr = create_window_handle( parent, owner, className, module, unicode ))) + style = cs->style & ~WS_VISIBLE; + ex_style = cs->dwExStyle & ~WS_EX_LAYERED; + if (!(wndPtr = create_window_handle( parent, owner, className, module, + unicode, style, ex_style ))) { WNDCLASSW wc; /* if it's a comctl32 class, GetClassInfo will load it, then we can retry */ if (GetLastError() != ERROR_INVALID_HANDLE || !GetClassInfoW( 0, className, &wc ) || - !(wndPtr = create_window_handle( parent, owner, className, module, unicode ))) + !(wndPtr = create_window_handle( parent, owner, className, module, + unicode, style, ex_style ))) return 0; } hwnd = wndPtr->obj.handle; @@ -1630,8 +1637,8 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, wndPtr->tid = GetCurrentThreadId(); wndPtr->hInstance = cs->hInstance; wndPtr->text = NULL; - wndPtr->dwStyle = cs->style & ~WS_VISIBLE; - wndPtr->dwExStyle = cs->dwExStyle; + wndPtr->dwStyle = style; + wndPtr->dwExStyle = ex_style; wndPtr->wIDmenu = 0; wndPtr->helpContext = 0; wndPtr->pScroll = NULL; @@ -1647,6 +1654,19 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if (wndPtr->dwStyle & WS_SYSMENU) SetSystemMenu( hwnd, 0 ); + /* call the WH_CBT hook */ + + WIN_ReleasePtr( wndPtr ); + cbcs = *cs; + cbtc.lpcs = &cbcs; + cbtc.hwndInsertAfter = HWND_TOP; + if (HOOK_CallHooks( WH_CBT, HCBT_CREATEWND, (WPARAM)hwnd, (LPARAM)&cbtc, unicode ) || + !(wndPtr = WIN_GetPtr( hwnd ))) + { + free_window_handle( hwnd ); + return 0; + } + /* * Correct the window styles. * @@ -1660,6 +1680,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, wndPtr->dwStyle |= WS_CAPTION; } + wndPtr->dwExStyle = cs->dwExStyle; /* WS_EX_WINDOWEDGE depends on some other styles */ if ((wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME)) && !(wndPtr->dwStyle & (WS_CHILD | WS_POPUP))) @@ -1713,13 +1734,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); - /* call the WH_CBT hook */ - - cbcs = *cs; - cbtc.lpcs = &cbcs; - cbtc.hwndInsertAfter = HWND_TOP; - if (HOOK_CallHooks( WH_CBT, HCBT_CREATEWND, (WPARAM)hwnd, (LPARAM)&cbtc, unicode )) goto failed; - /* send the WM_GETMINMAXINFO message and fix the size if needed */ cx = cs->cx; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 02c90ea9011..8a85e0bc4ff 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3021,6 +3021,8 @@ struct create_window_request mod_handle_t instance; int dpi; int awareness; + unsigned int style; + unsigned int ex_style; /* VARARG(class,unicode_str); */ }; struct create_window_reply @@ -6257,7 +6259,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 732 +#define SERVER_PROTOCOL_VERSION 733 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index a7a4b7cc957..0f58dc7c85a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2241,6 +2241,8 @@ enum message_type mod_handle_t instance; /* module instance */ int dpi; /* system DPI */ int awareness; /* thread DPI awareness */ + unsigned int style; /* window style */ + unsigned int ex_style; /* window extended style */ VARARG(class,unicode_str); /* class name */ @REPLY user_handle_t handle; /* created window */ diff --git a/server/request.h b/server/request.h index ff1744c1a80..778e7272bf5 100644 --- a/server/request.h +++ b/server/request.h @@ -1441,7 +1441,9 @@ C_ASSERT( FIELD_OFFSET(struct create_window_request, atom) == 20 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, instance) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, dpi) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, awareness) == 36 ); -C_ASSERT( sizeof(struct create_window_request) == 40 ); +C_ASSERT( FIELD_OFFSET(struct create_window_request, style) == 40 ); +C_ASSERT( FIELD_OFFSET(struct create_window_request, ex_style) == 44 ); +C_ASSERT( sizeof(struct create_window_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct create_window_reply, handle) == 8 ); C_ASSERT( FIELD_OFFSET(struct create_window_reply, parent) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_window_reply, owner) == 16 ); diff --git a/server/trace.c b/server/trace.c index a007cb280f0..5a2afac504a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2929,6 +2929,8 @@ static void dump_create_window_request( const struct create_window_request *req dump_uint64( ", instance=", &req->instance ); fprintf( stderr, ", dpi=%d", req->dpi ); fprintf( stderr, ", awareness=%d", req->awareness ); + fprintf( stderr, ", style=%08x", req->style ); + fprintf( stderr, ", ex_style=%08x", req->ex_style ); dump_varargs_unicode_str( ", class=", cur_size ); } diff --git a/server/window.c b/server/window.c index c94c745bd3c..7ea91d2a7dc 100644 --- a/server/window.c +++ b/server/window.c @@ -1964,6 +1964,8 @@ DECL_HANDLER(create_window) win->dpi_awareness = req->awareness; win->dpi = req->dpi; } + win->style = req->style; + win->ex_style = req->ex_style; reply->handle = win->handle; reply->parent = win->parent ? win->parent->handle : 0;

1 0

Piotr Caban : user32: Fix style passed to HCBT_CREATEWND hook.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 1b6f8a1adb087d7bc2f42345b8b0861bd570addf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b6f8a1adb087d7bc2f42345… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:34:07 2021 +0200 user32: Fix style passed to HCBT_CREATEWND hook. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 12 ++++++------ dlls/user32/win.c | 6 ------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b9824422409..6715a26b631 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1222,9 +1222,10 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) /* WS_VISIBLE should be turned off yet */ style = createwnd->lpcs->style & ~WS_VISIBLE; - ok(style == GetWindowLongA(hwnd, GWL_STYLE), - "style of hwnd and style in the CREATESTRUCT do not match: %08x != %08x\n", - GetWindowLongA(hwnd, GWL_STYLE), style); + todo_wine_if(!(style & WS_CLIPSIBLINGS) && (!(style & WS_CHILD) || (style & WS_POPUP))) + ok(style == GetWindowLongA(hwnd, GWL_STYLE), + "style of hwnd and style in the CREATESTRUCT do not match: %08x != %08x\n", + GetWindowLongA(hwnd, GWL_STYLE), style); if (0) { @@ -4444,9 +4445,8 @@ static LRESULT WINAPI cbt_proc(int ncode, WPARAM wparam, LPARAM lparam) ts = c->lpcs->lpCreateParams; ok(ts != NULL, "lpCreateParams not set\n"); - todo_wine_if(!(ts->cs_style & WS_CHILD) || (ts->cs_style & WS_POPUP)) - ok(c->lpcs->style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", - c->lpcs->style, ts->cs_style); + ok(c->lpcs->style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", + c->lpcs->style, ts->cs_style); ok(c->lpcs->dwExStyle == ts->cs_exstyle, "exstyle = 0x%08x, expected 0x%08x\n", c->lpcs->dwExStyle, ts->cs_exstyle); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 21214432b6d..081d21a95d0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1706,7 +1706,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } else SetWindowLongPtrW( hwnd, GWLP_ID, (ULONG_PTR)cs->hMenu ); - style = wndPtr->dwStyle; win_dpi = wndPtr->dpi; WIN_ReleasePtr( wndPtr ); @@ -1716,12 +1715,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* call the WH_CBT hook */ - /* the window style passed to the hook must be the real window style, - * rather than just the window style that the caller to CreateWindowEx - * passed in, so we have to copy the original CREATESTRUCT and get the - * the real style. */ cbcs = *cs; - cbcs.style = style; cbtc.lpcs = &cbcs; cbtc.hwndInsertAfter = HWND_TOP; if (HOOK_CallHooks( WH_CBT, HCBT_CREATEWND, (WPARAM)hwnd, (LPARAM)&cbtc, unicode )) goto failed;

1 0

Piotr Caban : user32/tests: Test window style in HCBT_CREATEWND hook.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 08f60ee991916f3b4400574cb1096a6cc87d53e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08f60ee991916f3b4400574c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:34:04 2021 +0200 user32/tests: Test window style in HCBT_CREATEWND hook. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f9428fd3494..b9824422409 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4432,6 +4432,35 @@ typedef struct DWORD exstyle; } test_style; +static LRESULT WINAPI cbt_proc(int ncode, WPARAM wparam, LPARAM lparam) +{ + CBT_CREATEWNDW* c = (CBT_CREATEWNDW*)lparam; + HWND hwnd = (HWND)wparam; + test_style *ts; + DWORD style; + + if (ncode != HCBT_CREATEWND) + return CallNextHookEx(NULL, ncode, wparam, lparam); + + ts = c->lpcs->lpCreateParams; + ok(ts != NULL, "lpCreateParams not set\n"); + todo_wine_if(!(ts->cs_style & WS_CHILD) || (ts->cs_style & WS_POPUP)) + ok(c->lpcs->style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", + c->lpcs->style, ts->cs_style); + ok(c->lpcs->dwExStyle == ts->cs_exstyle, "exstyle = 0x%08x, expected 0x%08x\n", + c->lpcs->dwExStyle, ts->cs_exstyle); + + style = GetWindowLongW(hwnd, GWL_STYLE); + todo_wine_if(!(ts->cs_style & WS_CHILD) || (ts->cs_style & WS_POPUP)) + ok(style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", + style, ts->cs_style); + style = GetWindowLongW(hwnd, GWL_EXSTYLE); + todo_wine_if(ts->exstyle != ts->cs_exstyle) + ok(style == (ts->cs_exstyle & ~WS_EX_LAYERED), + "exstyle = 0x%08x, expected 0x%08x\n", style, ts->cs_exstyle); + return CallNextHookEx(NULL, ncode, wparam, lparam); +} + static LRESULT WINAPI StyleCheckProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { CREATESTRUCTA *cs; @@ -4491,6 +4520,7 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle test_style ts; HWND hwnd; HWND hwndParent = NULL; + HHOOK hook; ts.cs_style = dwStyleIn; ts.cs_exstyle = dwExStyleIn; @@ -4507,11 +4537,14 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle { hwndParent = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwndParent != NULL, "CreateWindowExA failed\n"); } + hook = SetWindowsHookExW(WH_CBT, cbt_proc, 0, GetCurrentThreadId()); hwnd = CreateWindowExA(dwExStyleIn, (LPCSTR)MAKEINTATOM(atomStyleCheckClass), NULL, dwStyleIn, 0, 0, 0, 0, hwndParent, NULL, NULL, &ts); - assert(hwnd); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + UnhookWindowsHookEx(hook); flush_events( TRUE );

1 0

Piotr Caban : user32: Update exstyle when setting style in SetWindowLong.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: a9eee150ad03e28829ffafd1b3fff57fffc816a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9eee150ad03e28829ffafd1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:34:01 2021 +0200 user32: Update exstyle when setting style in SetWindowLong. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 14 ++++++-------- dlls/user32/win.c | 6 +++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 93d1e8ec232..f9428fd3494 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); - todo_wine_if (!dwStyleIn) - ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); + ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); DestroyWindow(hwnd); if (hwndParent) DestroyWindow(hwndParent); @@ -4701,7 +4700,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, ex_style_out2; + DWORD style, ex_style; HWND hwnd, grand_parent = 0, parent = 0; struct dialog_param param; @@ -4763,13 +4762,12 @@ 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_out2 = ex_style_in | WS_EX_WINDOWEDGE; + ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; else if ((style & (WS_DLGFRAME | WS_THICKFRAME)) && !(ex_style_in & WS_EX_STATICEDGE)) - ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE; + ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; else - 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); + ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE; + ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); DestroyWindow(hwnd); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a1464f01345..21214432b6d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2619,8 +2619,6 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if (wndPtr->parent == GetDesktopWindow()) newval |= WS_CLIPSIBLINGS; /* WS_MINIMIZE can't be reset */ if (wndPtr->dwStyle & WS_MINIMIZE) newval |= WS_MINIMIZE; - /* FIXME: changing WS_DLGFRAME | WS_THICKFRAME is supposed to change - WS_EX_WINDOWEDGE too */ break; case GWL_EXSTYLE: style.styleOld = wndPtr->dwExStyle; @@ -2699,8 +2697,9 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B switch(offset) { case GWL_STYLE: - req->flags = SET_WIN_STYLE; + req->flags = SET_WIN_STYLE | SET_WIN_EXSTYLE; req->style = newval; + req->ex_style = fix_exstyle(newval, wndPtr->dwExStyle); break; case GWL_EXSTYLE: req->flags = SET_WIN_EXSTYLE; @@ -2734,6 +2733,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B { case GWL_STYLE: wndPtr->dwStyle = newval; + wndPtr->dwExStyle = fix_exstyle(wndPtr->dwStyle, wndPtr->dwExStyle); retval = reply->old_style; break; case GWL_EXSTYLE:

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