July 2022 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Implement responseType prop for XMLHttpRequest.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: 6537c36df492cbca018ab7defd83980920044c79 URL: https://gitlab.winehq.org/wine/wine/-/commit/6537c36df492cbca018ab7defd8398… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 28 16:05:35 2022 +0300 mshtml: Implement responseType prop for XMLHttpRequest. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/xhr.js | 57 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/xmlhttprequest.c | 58 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 110 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index dd3750632c7..68f3a68caee 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -191,9 +191,64 @@ function test_timeout() { xhr.send("Timeout Test"); } +function test_responseType() { + var i, xhr = new XMLHttpRequest(); + if(!("responseType" in xhr)) { next_test(); return; } + + ok(xhr.responseType === "", "default responseType = " + xhr.responseType); + try { + xhr.responseType = ""; + ok(false, "setting responseType before open() did not throw exception"); + }catch(ex) { + todo_wine. + ok(ex.name === "InvalidStateError", "setting responseType before open() threw " + ex.name); + } + try { + xhr.responseType = "invalid response type"; + ok(false, "setting invalid responseType before open() did not throw exception"); + }catch(ex) { + todo_wine. + ok(ex.name === "InvalidStateError", "setting invalid responseType before open() threw " + ex.name); + } + + xhr.open("POST", "echo.php", true); + xhr.setRequestHeader("X-Test", "True"); + ok(xhr.responseType === "", "default responseType after open() = " + xhr.responseType); + + var types = [ "text", "", "document", "arraybuffer", "blob", "ms-stream" ]; + for(i = 0; i < types.length; i++) { + xhr.responseType = types[i]; + ok(xhr.responseType === types[i], "responseType = " + xhr.responseType + ", expected " + types[i]); + } + + types = [ "json", "teXt", "Document", "moz-chunked-text", "moz-blob", null ]; + for(i = 0; i < types.length; i++) { + xhr.responseType = types[i]; + ok(xhr.responseType === "ms-stream", "responseType (after set to " + types[i] + ") = " + xhr.responseType); + } + + xhr.responseType = ""; + xhr.onreadystatechange = function() { + if(xhr.readyState < 3) { + xhr.responseType = ""; + return; + } + try { + xhr.responseType = ""; + ok(false, "setting responseType with state " + xhr.readyState + " did not throw exception"); + }catch(ex) { + todo_wine. + ok(ex.name === "InvalidStateError", "setting responseType with state " + xhr.readyState + " threw " + ex.name); + } + } + xhr.onloadend = function() { next_test(); } + xhr.send("responseType test"); +} + var tests = [ test_xhr, test_content_types, test_abort, - test_timeout + test_timeout, + test_responseType ]; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index b17fa418c6c..6f639d3b821 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -103,6 +103,27 @@ static const eventid_t events[] = { EVENTID_TIMEOUT, }; +typedef enum { + response_type_empty, + response_type_text, + response_type_doc, + response_type_arraybuf, + response_type_blob, + response_type_stream +} response_type_t; + +static const struct { + const WCHAR *str; + const WCHAR *nsxhr_str; +} response_type_desc[] = { + [response_type_empty] = { L"", L"" }, + [response_type_text] = { L"text", L"" }, + [response_type_doc] = { L"document", L"" }, /* FIXME */ + [response_type_arraybuf] = { L"arraybuffer", L"arraybuffer" }, + [response_type_blob] = { L"blob", L"arraybuffer" }, + [response_type_stream] = { L"ms-stream", L"arraybuffer" } /* FIXME */ +}; + typedef struct { nsIDOMEventListener nsIDOMEventListener_iface; LONG ref; @@ -117,6 +138,7 @@ struct HTMLXMLHttpRequest { IWineXMLHttpRequestPrivate IWineXMLHttpRequestPrivate_iface; IProvideClassInfo2 IProvideClassInfo2_iface; LONG ref; + response_type_t response_type; nsIXMLHttpRequest *nsxhr; XMLHttpReqEventListener *event_listener; }; @@ -925,19 +947,47 @@ static HRESULT WINAPI HTMLXMLHttpRequest_private_get_response(IWineXMLHttpReques static HRESULT WINAPI HTMLXMLHttpRequest_private_put_responseType(IWineXMLHttpRequestPrivate *iface, BSTR v) { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + nsAString nsstr; + nsresult nsres; + HRESULT hres; + unsigned i; + LONG state; - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + hres = IHTMLXMLHttpRequest_get_readyState(&This->IHTMLXMLHttpRequest_iface, &state); + if(FAILED(hres)) + return hres; + + if(state < 1 || state > 2) { + /* FIXME: Return InvalidStateError */ + return E_FAIL; + } + + for(i = 0; i < ARRAY_SIZE(response_type_desc); i++) + if(!wcscmp(v, response_type_desc[i].str)) + break; + if(i >= ARRAY_SIZE(response_type_desc)) + return S_OK; + + nsAString_InitDepend(&nsstr, response_type_desc[i].nsxhr_str); + nsres = nsIXMLHttpRequest_SetResponseType(This->nsxhr, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + This->response_type = i; + return S_OK; } static HRESULT WINAPI HTMLXMLHttpRequest_private_get_responseType(IWineXMLHttpRequestPrivate *iface, BSTR *p) { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + *p = SysAllocString(response_type_desc[This->response_type].str); + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLXMLHttpRequest_private_get_upload(IWineXMLHttpRequestPrivate *iface, IDispatch **p)

1 0

Gabriel Ivăncescu : mshtml: Implement "text" type response for XMLHttpRequest.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: c82900e207cd92fdfa3e75eca193ff3070e154dd URL: https://gitlab.winehq.org/wine/wine/-/commit/c82900e207cd92fdfa3e75eca193ff… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 28 16:05:35 2022 +0300 mshtml: Implement "text" type response for XMLHttpRequest. Also basic implementation of arraybuffer/blob with invalid state, mostly to show how the tests will look. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/xhr.js | 47 +++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/xmlhttprequest.c | 41 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index 68f3a68caee..d60a449678b 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -245,10 +245,55 @@ function test_responseType() { xhr.send("responseType test"); } +function test_response() { + var xhr = new XMLHttpRequest(), i = 0; + if(!("response" in xhr)) { next_test(); return; } + + var types = [ + [ "text", "application/octet-stream", function() { + if(xhr.readyState < 3) + ok(xhr.response === "", "response for text with state " + state + " = " + xhr.response); + else if(xhr.readyState === 4) + ok(xhr.response === xml, "response for text = " + xhr.response); + }], + [ "arraybuffer", "image/png", function() { + if(xhr.readyState < 4) + ok(xhr.response === undefined, "response for arraybuffer with state " + state + " = " + xhr.response); + }], + [ "blob", "wine/test", function() { + if(xhr.readyState < 4) + ok(xhr.response === undefined, "response for blob with state " + state + " = " + xhr.response); + }] + ]; + + function onreadystatechange() { + types[i][2](); + if(xhr.readyState < 4) + return; + if(++i >= types.length) { + next_test(); + return; + } + xhr = new XMLHttpRequest(); + xhr.open("POST", "echo.php?content-type=" + types[i][1], true); + xhr.onreadystatechange = onreadystatechange; + xhr.setRequestHeader("X-Test", "True"); + xhr.responseType = types[i][0]; + xhr.send(xml); + } + + xhr.open("POST", "echo.php?content-type=" + types[i][1], true); + xhr.onreadystatechange = onreadystatechange; + xhr.setRequestHeader("X-Test", "True"); + xhr.responseType = types[i][0]; + xhr.send(xml); +} + var tests = [ test_xhr, test_content_types, test_abort, test_timeout, - test_responseType + test_responseType, + test_response ]; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 6f639d3b821..e01c9791f6f 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -938,10 +938,47 @@ static HRESULT WINAPI HTMLXMLHttpRequest_private_Invoke(IWineXMLHttpRequestPriva static HRESULT WINAPI HTMLXMLHttpRequest_private_get_response(IWineXMLHttpRequestPrivate *iface, VARIANT *p) { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); + HRESULT hres = S_OK; + nsresult nsres; + UINT16 state; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + switch(This->response_type) { + case response_type_empty: + case response_type_text: + hres = IHTMLXMLHttpRequest_get_responseText(&This->IHTMLXMLHttpRequest_iface, &V_BSTR(p)); + if(SUCCEEDED(hres)) + V_VT(p) = VT_BSTR; + break; + + case response_type_doc: + FIXME("response_type_doc\n"); + return E_NOTIMPL; + + case response_type_arraybuf: + case response_type_blob: + nsres = nsIXMLHttpRequest_GetReadyState(This->nsxhr, &state); + if(NS_FAILED(nsres) || state < 4) { + V_VT(p) = VT_EMPTY; + break; + } + if(This->response_type == response_type_arraybuf) { + FIXME("response_type_arraybuf\n"); + return E_NOTIMPL; + } + FIXME("response_type_blob\n"); + return E_NOTIMPL; + + case response_type_stream: + FIXME("response_type_stream\n"); + return E_NOTIMPL; + + default: + assert(0); + } + + return hres; } static HRESULT WINAPI HTMLXMLHttpRequest_private_put_responseType(IWineXMLHttpRequestPrivate *iface, BSTR v)

1 0

Alexandre Julliard : makefiles: List all headers in the makefile.
by Alexandre Julliard 28 Jul '22

28 Jul '22

1 0

Alexandre Julliard : makefiles: Avoid adding the same source multiple times.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: 6f4d1766a7781dd8dd68b8784b01aedbf497138e URL: https://gitlab.winehq.org/wine/wine/-/commit/6f4d1766a7781dd8dd68b8784b01ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 15:30:31 2022 +0200 makefiles: Avoid adding the same source multiple times. --- dlls/setupapi/tests/Makefile.in | 2 -- tools/make_makefiles | 6 ++++++ tools/makedep.c | 21 ++++++++++----------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index df7c6687875..85be56de556 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -18,5 +18,3 @@ SOURCES = \ setupapi.rc \ setupcab.c \ stringtable.c - -RC_SRCS = setupapi.rc diff --git a/tools/make_makefiles b/tools/make_makefiles index d61e3865e13..c7afd4080ac 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -128,6 +128,7 @@ sub replace_makefile_variables($) my $make = $makefiles{$file}; my $source_vars_regexp = join "|", @source_vars; my %replaced; + my %files; my $old; my $new; @@ -177,6 +178,11 @@ sub replace_makefile_variables($) $new .= $new_str; } $replaced{$var} = 1; + foreach my $val (@values) + { + die "$file.in: duplicate file $val" if defined $files{$val}; + $files{$val} = 1; + } next; } $new .= $_; diff --git a/tools/makedep.c b/tools/makedep.c index 17227120a0e..0e8daf3a960 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -817,10 +817,8 @@ found: static struct incl_file *add_generated_source( struct makefile *make, const char *name, const char *filename ) { - struct incl_file *file; + struct incl_file *file = xmalloc( sizeof(*file) ); - if ((file = find_src_file( make, name ))) return file; /* we already have it */ - file = xmalloc( sizeof(*file) ); memset( file, 0, sizeof(*file) ); file->file = add_file( name ); file->name = xstrdup( name ); @@ -1564,10 +1562,8 @@ static void parse_file( struct makefile *make, struct incl_file *source, int src */ static struct incl_file *add_src_file( struct makefile *make, const char *name ) { - struct incl_file *file; + struct incl_file *file = xmalloc( sizeof(*file) ); - if ((file = find_src_file( make, name ))) return file; /* we already have it */ - file = xmalloc( sizeof(*file) ); memset( file, 0, sizeof(*file) ); file->name = xstrdup(name); file->use_msvcrt = make->use_msvcrt; @@ -1744,7 +1740,7 @@ static struct makefile *parse_makefile( const char *path ) static void add_generated_sources( struct makefile *make ) { unsigned int i; - struct incl_file *source, *next, *file; + struct incl_file *source, *next, *file, *dlldata = NULL; struct strarray objs = get_expanded_make_var_array( make, "EXTRA_OBJS" ); LIST_FOR_EACH_ENTRY_SAFE( source, next, &make->sources, struct incl_file, entry ) @@ -1772,10 +1768,13 @@ static void add_generated_sources( struct makefile *make ) } if (source->file->flags & FLAG_IDL_PROXY) { - file = add_generated_source( make, "dlldata.o", "dlldata.c" ); - add_dependency( file->file, "objbase.h", INCL_NORMAL ); - add_dependency( file->file, "rpcproxy.h", INCL_NORMAL ); - add_all_includes( make, file, file->file ); + if (!dlldata) + { + dlldata = add_generated_source( make, "dlldata.o", "dlldata.c" ); + add_dependency( dlldata->file, "objbase.h", INCL_NORMAL ); + add_dependency( dlldata->file, "rpcproxy.h", INCL_NORMAL ); + add_all_includes( make, dlldata, dlldata->file ); + } file = add_generated_source( make, replace_extension( source->name, ".idl", "_p.c" ), NULL ); add_dependency( file->file, "objbase.h", INCL_NORMAL ); add_dependency( file->file, "rpcproxy.h", INCL_NORMAL );

1 0

Jacek Caban : user32: Avoid using WIN_GetPtr for window handle validation.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: 11657aab278e73a892843b33e196b8f4375d54f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/11657aab278e73a892843b33e196b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 16:08:55 2022 +0200 user32: Avoid using WIN_GetPtr for window handle validation. We will eventually want to make GetWindowThreadProcessId fast (probably based on shared handle table) instead of calling win32u. --- dlls/user32/win.c | 47 +++-------------------------------------------- dlls/win32u/window.c | 10 ++++++++++ include/ntuser.h | 4 ++++ 3 files changed, 17 insertions(+), 44 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8b5033ad821..b149a202433 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -153,13 +153,7 @@ void WIN_ReleasePtr( WND *ptr ) */ HWND WIN_IsCurrentProcess( HWND hwnd ) { - WND *ptr; - HWND ret; - - if (!(ptr = WIN_GetPtr( hwnd )) || ptr == WND_OTHER_PROCESS || ptr == WND_DESKTOP) return 0; - ret = ptr->obj.handle; - WIN_ReleasePtr( ptr ); - return ret; + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserIsCurrehtProcessWindow )); } @@ -170,13 +164,7 @@ HWND WIN_IsCurrentProcess( HWND hwnd ) */ HWND WIN_IsCurrentThread( HWND hwnd ) { - WND *ptr; - HWND ret = 0; - - if (!(ptr = WIN_GetPtr( hwnd )) || ptr == WND_OTHER_PROCESS || ptr == WND_DESKTOP) return 0; - if (ptr->tid == GetCurrentThreadId()) ret = ptr->obj.handle; - WIN_ReleasePtr( ptr ); - return ret; + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserIsCurrehtThreadWindow )); } @@ -205,36 +193,7 @@ UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) */ HWND WIN_GetFullHandle( HWND hwnd ) { - WND *ptr; - - if (!hwnd || (ULONG_PTR)hwnd >> 16) return hwnd; - if (LOWORD(hwnd) <= 1 || LOWORD(hwnd) == 0xffff) return hwnd; - /* do sign extension for -2 and -3 */ - if (LOWORD(hwnd) >= (WORD)-3) return (HWND)(LONG_PTR)(INT16)LOWORD(hwnd); - - if (!(ptr = WIN_GetPtr( hwnd ))) return hwnd; - - if (ptr == WND_DESKTOP) - { - if (LOWORD(hwnd) == LOWORD(GetDesktopWindow())) return GetDesktopWindow(); - else return get_hwnd_message_parent(); - } - - if (ptr != WND_OTHER_PROCESS) - { - hwnd = ptr->obj.handle; - WIN_ReleasePtr( ptr ); - } - else /* may belong to another process */ - { - SERVER_START_REQ( get_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) hwnd = wine_server_ptr_handle( reply->full_handle ); - } - SERVER_END_REQ; - } - return hwnd; + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserGetFullWindowHandle )); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index a2ef9e72a06..1b72635e99c 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5408,6 +5408,16 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) case NtUserCallHwnd_SetForegroundWindow: return set_foreground_window( hwnd, FALSE ); + /* temporary exports */ + case NtUserGetFullWindowHandle: + return HandleToUlong( get_full_window_handle( hwnd )); + + case NtUserIsCurrehtProcessWindow: + return HandleToUlong( is_current_process_window( hwnd )); + + case NtUserIsCurrehtThreadWindow: + return HandleToUlong( is_current_thread_window( hwnd )); + default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 59916d25d6d..dc5f5ee501a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1112,6 +1112,10 @@ enum NtUserCallHwnd_IsWindowUnicode, NtUserCallHwnd_IsWindowVisible, NtUserCallHwnd_SetForegroundWindow, + /* temporary exports */ + NtUserGetFullWindowHandle, + NtUserIsCurrehtProcessWindow, + NtUserIsCurrehtThreadWindow, }; static inline UINT NtUserArrangeIconicWindows( HWND parent )

1 0

Jacek Caban : user32: Use GetWindowLongPtr for GetWindowModuleFileName implementation.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: fcf4d07161478ec8ea0707a50af02acc7fe6df6a URL: https://gitlab.winehq.org/wine/wine/-/commit/fcf4d07161478ec8ea0707a50af02a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 18:23:30 2022 +0200 user32: Use GetWindowLongPtr for GetWindowModuleFileName implementation. --- dlls/user32/win.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b149a202433..23263166eeb 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1413,20 +1413,17 @@ BOOL WINAPI DragDetect( HWND hwnd, POINT pt ) */ UINT WINAPI GetWindowModuleFileNameA( HWND hwnd, LPSTR module, UINT size ) { - WND *win; HINSTANCE hinst; TRACE( "%p, %p, %u\n", hwnd, module, size ); - win = WIN_GetPtr( hwnd ); - if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) + if (!WIN_IsCurrentProcess( hwnd )) { SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } - hinst = win->hInstance; - WIN_ReleasePtr( win ); + hinst = (HINSTANCE)GetWindowLongPtrA( hwnd, GWLP_HINSTANCE ); return GetModuleFileNameA( hinst, module, size ); } @@ -1435,20 +1432,17 @@ UINT WINAPI GetWindowModuleFileNameA( HWND hwnd, LPSTR module, UINT size ) */ UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR module, UINT size ) { - WND *win; HINSTANCE hinst; TRACE( "%p, %p, %u\n", hwnd, module, size ); - win = WIN_GetPtr( hwnd ); - if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) + if (!WIN_IsCurrentProcess( hwnd )) { SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } - hinst = win->hInstance; - WIN_ReleasePtr( win ); + hinst = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); return GetModuleFileNameW( hinst, module, size ); }

1 0

Jacek Caban : win32u: Introduce NtUserGetDialogInfo and NtUserSetDialogInfo.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: 1cd5702d9f4787f56a342b52ae9b4dcf5356b8e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cd5702d9f4787f56a342b52ae9b4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 19:12:12 2022 +0200 win32u: Introduce NtUserGetDialogInfo and NtUserSetDialogInfo. And use it instead of accessing window object from user32. --- dlls/user32/defdlg.c | 22 ++++------------------ dlls/win32u/window.c | 32 ++++++++++++++++++++++++++++++++ include/ntuser.h | 12 ++++++++++++ 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index e330cf6603d..1e1ff71b87b 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -237,15 +237,11 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, case WM_NCDESTROY: if (dlgInfo) { - WND *wndPtr; - if (dlgInfo->hUserFont) DeleteObject( dlgInfo->hUserFont ); if (dlgInfo->hMenu) NtUserDestroyMenu( dlgInfo->hMenu ); HeapFree( GetProcessHeap(), 0, dlgInfo ); - wndPtr = WIN_GetPtr( hwnd ); - wndPtr->dlgInfo = NULL; - WIN_ReleasePtr( wndPtr ); + NtUserSetDialogInfo( hwnd, NULL ); } /* Window clean-up */ return DefWindowProcA( hwnd, msg, wParam, lParam ); @@ -323,22 +319,14 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, */ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) { - WND* wndPtr; DIALOGINFO* dlgInfo; - wndPtr = WIN_GetPtr( hwnd ); - if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return NULL; - } - - dlgInfo = wndPtr->dlgInfo; + dlgInfo = NtUserGetDialogInfo( hwnd ); if (!dlgInfo && create) { if (!(dlgInfo = HeapAlloc( GetProcessHeap(), 0, sizeof(*dlgInfo) ))) - goto out; + return NULL; dlgInfo->hwndFocus = 0; dlgInfo->hUserFont = 0; dlgInfo->hMenu = 0; @@ -346,11 +334,9 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) dlgInfo->yBaseUnit = 0; dlgInfo->idResult = IDOK; dlgInfo->flags = 0; - wndPtr->dlgInfo = dlgInfo; + NtUserSetDialogInfo( hwnd, dlgInfo ); } -out: - WIN_ReleasePtr( wndPtr ); return dlgInfo; } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 1b72635e99c..71e500abb0f 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5359,6 +5359,32 @@ failed: return 0; } +static void *get_dialog_info( HWND hwnd ) +{ + WND *win; + void *ret; + + if (!(win = get_win_ptr( hwnd )) || win == WND_OTHER_PROCESS || win == WND_DESKTOP) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return NULL; + } + + ret = win->dlgInfo; + release_win_ptr( win ); + return ret; +} + +static BOOL set_dialog_info( HWND hwnd, void *info ) +{ + WND *win; + + if (!(win = get_win_ptr( hwnd )) || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return FALSE; + win->dlgInfo = info; + release_win_ptr( win ); + return TRUE; +} + /***************************************************************************** * NtUserCallHwnd (win32u.@) */ @@ -5381,6 +5407,9 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) case NtUserCallHwnd_GetParent: return HandleToUlong( get_parent( hwnd )); + case NtUserCallHwnd_GetDialogInfo: + return (ULONG_PTR)get_dialog_info( hwnd ); + case NtUserCallHwnd_GetWindowContextHelpId: return get_window_context_help_id( hwnd ); @@ -5510,6 +5539,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_ScreenToClient: return screen_to_client( hwnd, (POINT *)param ); + case NtUserCallHwndParam_SetDialogInfo: + return set_dialog_info( hwnd, (void *)param ); + case NtUserCallHwndParam_SetWindowContextHelpId: return set_window_context_help_id( hwnd, param ); diff --git a/include/ntuser.h b/include/ntuser.h index dc5f5ee501a..9ba128bdbda 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1101,6 +1101,7 @@ enum NtUserCallHwnd_ArrangeIconicWindows, NtUserCallHwnd_DrawMenuBar, NtUserCallHwnd_GetDefaultImeWindow, + NtUserCallHwnd_GetDialogInfo, NtUserCallHwnd_GetDpiForWindow, NtUserCallHwnd_GetParent, NtUserCallHwnd_GetWindowContextHelpId, @@ -1138,6 +1139,11 @@ static inline HWND NtUserGetDefaultImeWindow( HWND hwnd ) return UlongToHandle( NtUserCallHwnd( hwnd, NtUserCallHwnd_GetDefaultImeWindow )); } +static inline void *NtUserGetDialogInfo( HWND hwnd ) +{ + return (void *)NtUserCallHwnd( hwnd, NtUserCallHwnd_GetDialogInfo ); +} + static inline UINT NtUserGetDpiForWindow( HWND hwnd ) { return NtUserCallHwnd( hwnd, NtUserCallHwnd_GetDpiForWindow ); @@ -1216,6 +1222,7 @@ enum NtUserCallHwndParam_MirrorRgn, NtUserCallHwndParam_MonitorFromWindow, NtUserCallHwndParam_ScreenToClient, + NtUserCallHwndParam_SetDialogInfo, NtUserCallHwndParam_SetWindowContextHelpId, NtUserCallHwndParam_SetWindowPixelFormat, NtUserCallHwndParam_ShowOwnedPopups, @@ -1365,6 +1372,11 @@ static inline BOOL NtUserScreenToClient( HWND hwnd, POINT *pt ) return NtUserCallHwndParam( hwnd, (UINT_PTR)pt, NtUserCallHwndParam_ScreenToClient ); } +static inline void NtUserSetDialogInfo( HWND hwnd, void *info ) +{ + NtUserCallHwndParam( hwnd, (UINT_PTR)info, NtUserCallHwndParam_SetDialogInfo ); +} + static inline BOOL NtUserSetWindowContextHelpId( HWND hwnd, DWORD id ) { return NtUserCallHwndParam( hwnd, id, NtUserCallHwndParam_SetWindowContextHelpId );

1 0

Jacek Caban : win32u: Introduce NtUserGetDialogProc.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: 3dc3709f4cf49456b02720ff1a12412bc07e0dee URL: https://gitlab.winehq.org/wine/wine/-/commit/3dc3709f4cf49456b02720ff1a1241… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 20:33:40 2022 +0200 win32u: Introduce NtUserGetDialogProc. And use it in user32 instead of DEFDLG_GetDlgProc. --- dlls/user32/defdlg.c | 34 ++++------------------------------ dlls/user32/dialog.c | 23 ++++------------------- dlls/user32/user_private.h | 4 ++-- dlls/user32/winproc.c | 36 ++++++++++++++++-------------------- dlls/win32u/class.c | 25 +++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/window.c | 3 +++ include/ntuser.h | 13 +++++++++++++ 8 files changed, 68 insertions(+), 71 deletions(-)

1 0

Jacek Caban : win32u: Remove no longer needed exports.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: fa7aaca9f1e057cc8a411edb77f5728510bb9c88 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa7aaca9f1e057cc8a411edb77f572… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 20:39:19 2022 +0200 win32u: Remove no longer needed exports. --- dlls/user32/user_main.c | 19 ------------------- dlls/user32/user_private.h | 3 --- dlls/user32/winproc.c | 26 -------------------------- dlls/win32u/class.c | 6 ++++++ dlls/win32u/ntuser_private.h | 12 ++---------- dlls/win32u/sysparams.c | 6 ------ include/ntuser.h | 2 -- 7 files changed, 8 insertions(+), 66 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index d3940d4a95c..91f2891f198 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -39,8 +39,6 @@ WINE_DECLARE_DEBUG_CHANNEL(message); HMODULE user32_module = 0; -static DWORD exiting_thread_id; - extern void WDML_NotifyThreadDetach(void); /*********************************************************************** @@ -241,15 +239,6 @@ static BOOL process_attach(void) } -/********************************************************************** - * USER_IsExitingThread - */ -BOOL USER_IsExitingThread( DWORD tid ) -{ - return (tid == exiting_thread_id); -} - - /********************************************************************** * thread_detach */ @@ -257,15 +246,12 @@ static void thread_detach(void) { struct user_thread_info *thread_info = get_user_thread_info(); - exiting_thread_id = GetCurrentThreadId(); NtUserCallNoParam( NtUserExitingThread ); WDML_NotifyThreadDetach(); NtUserCallNoParam( NtUserThreadDetach ); HeapFree( GetProcessHeap(), 0, thread_info->wmchar_data ); - - exiting_thread_id = 0; } @@ -380,11 +366,6 @@ const char *SPY_GetMsgName( UINT msg, HWND hwnd ) return (const char *)NtUserCallHwndParam( hwnd, msg, NtUserSpyGetMsgName ); } -const char *SPY_GetVKeyName( WPARAM wparam ) -{ - return (const char *)NtUserCallOneParam( wparam, NtUserSpyGetVKeyName ); -} - void SPY_EnterMessage( INT flag, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { if (TRACE_ON(message)) NtUserMessageCall( hwnd, msg, wparam, lparam, 0, NtUserSpyEnter, flag ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 3e2cebd99ae..d4a296f4bb7 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -77,7 +77,6 @@ extern HPEN SYSCOLOR_GetPen( INT index ) DECLSPEC_HIDDEN; extern HBRUSH SYSCOLOR_Get55AABrush(void) DECLSPEC_HIDDEN; extern void SYSPARAMS_Init(void) DECLSPEC_HIDDEN; extern void USER_CheckNotLock(void) DECLSPEC_HIDDEN; -extern BOOL USER_IsExitingThread( DWORD tid ) DECLSPEC_HIDDEN; typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ); @@ -90,7 +89,6 @@ extern INT_PTR WINPROC_CallDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM extern INT_PTR WINPROC_CallDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern void winproc_init(void) DECLSPEC_HIDDEN; extern void dispatch_win_proc_params( struct win_proc_params *params ) DECLSPEC_HIDDEN; -extern void get_winproc_params( struct win_proc_params *params ) DECLSPEC_HIDDEN; extern ATOM get_class_info( HINSTANCE instance, const WCHAR *name, WNDCLASSEXW *info, UNICODE_STRING *name_str, BOOL ansi ) DECLSPEC_HIDDEN; @@ -107,7 +105,6 @@ BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, /* message spy definitions */ extern const char *SPY_GetMsgName( UINT msg, HWND hWnd ) DECLSPEC_HIDDEN; -extern const char *SPY_GetVKeyName(WPARAM wParam) DECLSPEC_HIDDEN; extern void SPY_EnterMessage( INT iFlag, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern void SPY_ExitMessage( INT iFlag, HWND hwnd, UINT msg, LRESULT lReturn, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index e71b222ce79..3b7927891b5 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -66,13 +66,6 @@ static inline void free_buffer( void *static_buffer, void *buffer ) if (buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer ); } -/* return the window proc for a given handle, or NULL for an invalid handle, - * or WINPROC_PROC16 for a handle to a 16-bit proc. */ -static inline WINDOWPROC *handle_to_proc( WNDPROC handle ) -{ - return (WINDOWPROC *)NtUserCallOneParam( HandleToUlong(handle), NtUserGetWinProcPtr ); -} - #ifdef __i386__ /* Some window procedures modify registers they shouldn't, or are not * properly declared stdcall; so we need a small assembly wrapper to @@ -1276,25 +1269,6 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) return TRUE; } -void get_winproc_params( struct win_proc_params *params ) -{ - WINDOWPROC *proc = handle_to_proc( params->func ); - - if (!proc) - { - params->procW = params->procA = NULL; - } - else if (proc == WINPROC_PROC16) - { - params->procW = params->procA = WINPROC_PROC16; - } - else - { - params->procA = proc->procA; - params->procW = proc->procW; - } -} - BOOL WINAPI User32CallSendAsyncCallback( const struct send_async_params *params, ULONG size ) { params->callback( params->hwnd, params->msg, params->data, params->result ); diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 5fa5436436b..eab65b72ef6 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -60,6 +60,12 @@ typedef struct tagCLASS struct client_menu_name menu_name; /* Default menu name */ } CLASS; +typedef struct tagWINDOWPROC +{ + WNDPROC procA; /* ANSI window proc */ + WNDPROC procW; /* Unicode window proc */ +} WINDOWPROC; + static WINDOWPROC winproc_array[MAX_WINPROCS]; static UINT winproc_used = NB_BUILTIN_WINPROCS; static pthread_mutex_t winproc_lock = PTHREAD_MUTEX_INITIALIZER; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index ecb5ab82164..3ecd7424f77 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -106,8 +106,8 @@ typedef struct tagWND #define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */ #define WIN_HAS_IME_WIN 0x0080 /* the window has been registered with imm32 */ -#define WND_OTHER_PROCESS ((WND *)1) /* returned by WIN_GetPtr on unknown window handles */ -#define WND_DESKTOP ((WND *)2) /* returned by WIN_GetPtr on the desktop window */ +#define WND_OTHER_PROCESS ((WND *)1) /* returned by get_win_ptr on unknown window handles */ +#define WND_DESKTOP ((WND *)2) /* returned by get_win_ptr on the desktop window */ /* check if hwnd is a broadcast magic handle */ static inline BOOL is_broadcast( HWND hwnd ) @@ -197,13 +197,6 @@ struct scroll_bar_win_data struct scroll_info info; }; -/* FIXME: make it private to class.c */ -typedef struct tagWINDOWPROC -{ - WNDPROC procA; /* ANSI window proc */ - WNDPROC procW; /* Unicode window proc */ -} WINDOWPROC; - #define WINPROC_HANDLE (~0u >> 16) #define BUILTIN_WINPROC(index) ((WNDPROC)(ULONG_PTR)((index) | (WINPROC_HANDLE << 16))) @@ -243,7 +236,6 @@ extern void spy_exit_message( INT flag, HWND hwnd, UINT msg, /* class.c */ extern HINSTANCE user32_module DECLSPEC_HIDDEN; WNDPROC alloc_winproc( WNDPROC func, BOOL ansi ) DECLSPEC_HIDDEN; -WINDOWPROC *get_winproc_ptr( WNDPROC handle ) DECLSPEC_HIDDEN; BOOL is_winproc_unicode( WNDPROC proc, BOOL def_val ) DECLSPEC_HIDDEN; DWORD get_class_long( HWND hwnd, INT offset, BOOL ansi ) DECLSPEC_HIDDEN; WNDPROC get_class_winproc( struct tagCLASS *class ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3c1051b2d80..0a453f937c3 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -5031,9 +5031,6 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserGetDeskPattern: return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); - case NtUserGetWinProcPtr: - return (UINT_PTR)get_winproc_ptr( UlongToHandle(arg) ); - case NtUserLock: switch( arg ) { @@ -5042,9 +5039,6 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) default: user_check_not_lock(); return 0; } - case NtUserSpyGetVKeyName: - return (UINT_PTR)debugstr_vkey_name( arg ); - default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index c223d1f2704..86e2d329eb9 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -922,9 +922,7 @@ enum NtUserCallOneParam_SetProcessDefaultLayout, /* temporary exports */ NtUserGetDeskPattern, - NtUserGetWinProcPtr, NtUserLock, - NtUserSpyGetVKeyName, }; static inline HDWP NtUserBeginDeferWindowPos( INT count )

1 0

Jacek Caban : user32: Inline DEFWND_ControlColor implementation.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: cf9e6b3b2281eba68a76e8677d9a36f866178e63 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf9e6b3b2281eba68a76e8677d9a36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 13:18:16 2022 +0200 user32: Inline DEFWND_ControlColor implementation. --- dlls/user32/controls.h | 3 --- dlls/user32/defwnd.c | 36 ------------------------------------ dlls/user32/scroll.c | 30 +++++++++++++++++++++--------- 3 files changed, 21 insertions(+), 48 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 955c9092a54..036d872c43c 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -106,9 +106,6 @@ struct tagWND; extern ATOM get_int_atom_value( UNICODE_STRING *name ) DECLSPEC_HIDDEN; extern void register_desktop_class(void) DECLSPEC_HIDDEN; -/* defwnd proc */ -extern HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType ) DECLSPEC_HIDDEN; - /* desktop */ extern BOOL update_wallpaper( const WCHAR *wallpaper, const WCHAR *pattern ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 9e258e5d3c0..34a4f294429 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -34,42 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -/*********************************************************************** - * DEFWND_ControlColor - * - * Default colors for control painting. - */ -HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType ) -{ - if( ctlType == CTLCOLOR_SCROLLBAR) - { - HBRUSH hb = GetSysColorBrush(COLOR_SCROLLBAR); - COLORREF bk = GetSysColor(COLOR_3DHILIGHT); - SetTextColor( hDC, GetSysColor(COLOR_3DFACE)); - SetBkColor( hDC, bk); - - /* if COLOR_WINDOW happens to be the same as COLOR_3DHILIGHT - * we better use 0x55aa bitmap brush to make scrollbar's background - * look different from the window background. - */ - if (bk == GetSysColor(COLOR_WINDOW)) - return SYSCOLOR_Get55AABrush(); - - UnrealizeObject( hb ); - return hb; - } - - SetTextColor( hDC, GetSysColor(COLOR_WINDOWTEXT)); - - if ((ctlType == CTLCOLOR_EDIT) || (ctlType == CTLCOLOR_LISTBOX)) - SetBkColor( hDC, GetSysColor(COLOR_WINDOW) ); - else { - SetBkColor( hDC, GetSysColor(COLOR_3DFACE) ); - return GetSysColorBrush(COLOR_3DFACE); - } - return GetSysColorBrush(COLOR_WINDOW); -} - /*********************************************************************** * DefWindowProcA (USER32.@) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 9453df9dedd..9e17424a8de 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -97,18 +97,30 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, HPEN hSavePen; HBRUSH hSaveBrush,hBrush; - /* Select the correct brush and pen */ - - /* Only scrollbar controls send WM_CTLCOLORSCROLLBAR. - * The window-owned scrollbars need to call DEFWND_ControlColor - * to correctly setup default scrollbar colors - */ - if (nBar == SB_CTL) { + if (nBar == SB_CTL) + { hBrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSCROLLBAR, (WPARAM)hdc,(LPARAM)hwnd); - } else { - hBrush = DEFWND_ControlColor( hdc, CTLCOLOR_SCROLLBAR ); } + else + { + COLORREF bk = GetSysColor( COLOR_3DHILIGHT ); + SetTextColor( hdc, GetSysColor( COLOR_3DFACE )); + SetBkColor( hdc, bk ); + + /* if COLOR_WINDOW happens to be the same as COLOR_3DHILIGHT + * we better use 0x55aa bitmap brush to make scrollbar's background + * look different from the window background. + */ + if (bk == GetSysColor( COLOR_WINDOW )) + hBrush = SYSCOLOR_Get55AABrush(); + else + { + hBrush = GetSysColorBrush( COLOR_SCROLLBAR ); + UnrealizeObject( hBrush ); + } + } + hSavePen = SelectObject( hdc, SYSCOLOR_GetPen(COLOR_WINDOWFRAME) ); hSaveBrush = SelectObject( hdc, hBrush );

1 0