September 2023 - Wine-commits

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for HTMLAttributeCollection.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 6be26997bff68264651ac25abdcbcbf9b30c6d3d URL: https://gitlab.winehq.org/wine/wine/-/commit/6be26997bff68264651ac25abdcbcb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 8 18:24:28 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLAttributeCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e9badecfa65..4726d22a98b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -8543,26 +8543,12 @@ static HRESULT WINAPI HTMLAttributeCollection_QueryInterface(IHTMLAttributeColle { HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLAttributeCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLAttributeCollection, riid)) { - *ppv = &This->IHTMLAttributeCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLAttributeCollection2, riid)) { - *ppv = &This->IHTMLAttributeCollection2_iface; - }else if(IsEqualGUID(&IID_IHTMLAttributeCollection3, riid)) { - *ppv = &This->IHTMLAttributeCollection3_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLAttributeCollection_AddRef(IHTMLAttributeCollection *iface) @@ -8929,6 +8915,20 @@ static inline HTMLAttributeCollection *HTMLAttributeCollection_from_DispatchEx(D return CONTAINING_RECORD(iface, HTMLAttributeCollection, dispex); } +static void *HTMLAttributeCollection_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLAttributeCollection, riid)) + return &This->IHTMLAttributeCollection_iface; + if(IsEqualGUID(&IID_IHTMLAttributeCollection2, riid)) + return &This->IHTMLAttributeCollection2_iface; + if(IsEqualGUID(&IID_IHTMLAttributeCollection3, riid)) + return &This->IHTMLAttributeCollection3_iface; + + return NULL; +} + static void HTMLAttributeCollection_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); @@ -9022,6 +9022,7 @@ static HRESULT HTMLAttributeCollection_invoke(DispatchEx *dispex, DISPID id, LCI } static const dispex_static_data_vtbl_t HTMLAttributeCollection_dispex_vtbl = { + .query_interface = HTMLAttributeCollection_query_interface, .destructor = HTMLAttributeCollection_destructor, .traverse = HTMLAttributeCollection_traverse, .unlink = HTMLAttributeCollection_unlink,

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for HTMLMimeTypesCollection.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 2e02337146b327c25f90ac0b51488136eed6666d URL: https://gitlab.winehq.org/wine/wine/-/commit/2e02337146b327c25f90ac0b514881… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 8 18:24:28 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLMimeTypesCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index e851debd128..84087f9a149 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -969,22 +969,12 @@ static HRESULT WINAPI HTMLMimeTypesCollection_QueryInterface(IHTMLMimeTypesColle { HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLMimeTypesCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLMimeTypesCollection, riid)) { - *ppv = &This->IHTMLMimeTypesCollection_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLMimeTypesCollection_AddRef(IHTMLMimeTypesCollection *iface) @@ -1064,6 +1054,16 @@ static inline HTMLMimeTypesCollection *HTMLMimeTypesCollection_from_DispatchEx(D return CONTAINING_RECORD(iface, HTMLMimeTypesCollection, dispex); } +static void *HTMLMimeTypesCollection_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLMimeTypesCollection *This = HTMLMimeTypesCollection_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLMimeTypesCollection, riid)) + return &This->IHTMLMimeTypesCollection_iface; + + return NULL; +} + static void HTMLMimeTypesCollection_unlink(DispatchEx *dispex) { HTMLMimeTypesCollection *This = HTMLMimeTypesCollection_from_DispatchEx(dispex); @@ -1080,6 +1080,7 @@ static void HTMLMimeTypesCollection_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLMimeTypesCollection_dispex_vtbl = { + .query_interface = HTMLMimeTypesCollection_query_interface, .destructor = HTMLMimeTypesCollection_destructor, .unlink = HTMLMimeTypesCollection_unlink };

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for HTMLNamespaceCollection.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 947e8b01354f85b48540ecda3f2ce19edad8a103 URL: https://gitlab.winehq.org/wine/wine/-/commit/947e8b01354f85b48540ecda3f2ce1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 8 18:24:28 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLNamespaceCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 84087f9a149..0a5d82e8f7a 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2424,22 +2424,12 @@ static HRESULT WINAPI HTMLNamespaceCollection_QueryInterface(IHTMLNamespaceColle { HTMLNamespaceCollection *This = impl_from_IHTMLNamespaceCollection(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLNamespaceCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLNamespaceCollection, riid)) { - *ppv = &This->IHTMLNamespaceCollection_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLNamespaceCollection_AddRef(IHTMLNamespaceCollection *iface) @@ -2538,6 +2528,16 @@ static inline HTMLNamespaceCollection *HTMLNamespaceCollection_from_DispatchEx(D return CONTAINING_RECORD(iface, HTMLNamespaceCollection, dispex); } +static void *HTMLNamespaceCollection_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLNamespaceCollection *This = HTMLNamespaceCollection_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLNamespaceCollection, riid)) + return &This->IHTMLNamespaceCollection_iface; + + return NULL; +} + static void HTMLNamespaceCollection_destructor(DispatchEx *dispex) { HTMLNamespaceCollection *This = HTMLNamespaceCollection_from_DispatchEx(dispex); @@ -2545,6 +2545,7 @@ static void HTMLNamespaceCollection_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLNamespaceCollection_dispex_vtbl = { + .query_interface = HTMLNamespaceCollection_query_interface, .destructor = HTMLNamespaceCollection_destructor, };

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for HTMLPluginsCollection.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 33dbc3c80a0d12935b2973b09ad3b01db95bc0f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/33dbc3c80a0d12935b2973b09ad3b0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 8 18:24:28 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLPluginsCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 0a5d82e8f7a..85a8cd0e41a 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -798,22 +798,12 @@ static HRESULT WINAPI HTMLPluginsCollection_QueryInterface(IHTMLPluginsCollectio { HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLPluginsCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLPluginsCollection, riid)) { - *ppv = &This->IHTMLPluginsCollection_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - *ppv = NULL; - WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLPluginsCollection_AddRef(IHTMLPluginsCollection *iface) @@ -904,6 +894,16 @@ static inline HTMLPluginsCollection *HTMLPluginsCollection_from_DispatchEx(Dispa return CONTAINING_RECORD(iface, HTMLPluginsCollection, dispex); } +static void *HTMLPluginsCollection_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLPluginsCollection *This = HTMLPluginsCollection_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLPluginsCollection, riid)) + return &This->IHTMLPluginsCollection_iface; + + return NULL; +} + static void HTMLPluginsCollection_unlink(DispatchEx *dispex) { HTMLPluginsCollection *This = HTMLPluginsCollection_from_DispatchEx(dispex); @@ -920,6 +920,7 @@ static void HTMLPluginsCollection_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLPluginsCollection_dispex_vtbl = { + .query_interface = HTMLPluginsCollection_query_interface, .destructor = HTMLPluginsCollection_destructor, .unlink = HTMLPluginsCollection_unlink };

1 0

Tim Clem : win32u/tests: Add a test for cross-process WM_GETDLGCODE with a NULL lparam.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 90f9b92762037c323284811e74fb3aedf57b5b65 URL: https://gitlab.winehq.org/wine/wine/-/commit/90f9b92762037c323284811e74fb3a… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Sep 8 09:09:56 2023 -0700 win32u/tests: Add a test for cross-process WM_GETDLGCODE with a NULL lparam. Co-authored-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/tests/win32u.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 25358c5d0d8..efc7249eca7 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -964,6 +964,9 @@ static LRESULT WINAPI test_ipc_message_proc( HWND hwnd, UINT msg, WPARAM wparam, ok( !wcscmp( mdi->szTitle, L"TestTitle" ), "szTitle = %s\n", wine_dbgstr_w( mdi->szTitle )); return 0xdeadbeef; } + + case WM_GETDLGCODE: + return !lparam; } return DefWindowProcW( hwnd, msg, wparam, lparam ); @@ -1059,6 +1062,10 @@ static void test_inter_process_child( HWND hwnd ) res = NtUserMessageCall( hwnd, WM_GETTEXTLENGTH, 0, 0, NULL, NtUserSendMessage, TRUE ); ok( res == 4, "res = %d\n", res ); + res = NtUserMessageCall( hwnd, WM_GETDLGCODE, 0, 0, NULL, NtUserSendMessage, TRUE ); + todo_wine + ok( res == 1, "res = %d\n", res ); + mdi.szClass = "TestClass"; mdi.szTitle = "TestTitle"; mdi.hOwner = 0;

1 0

Tim Clem : win32u: Correct the packed size of WM_GETDLGCODE when lparam is NULL.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: c8bc841405e89b88659c6954e81cb244650c40c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8bc841405e89b88659c6954e81cb2… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Sep 7 09:55:44 2023 -0700 win32u: Correct the packed size of WM_GETDLGCODE when lparam is NULL. --- dlls/win32u/message.c | 2 +- dlls/win32u/tests/win32u.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index d15f9af3f9f..d2909339983 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1691,7 +1691,7 @@ size_t user_message_size( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, size = sizeof(STYLESTRUCT); break; case WM_GETDLGCODE: - size = sizeof(MSG); + if (lparam) size = sizeof(MSG); break; case SBM_SETSCROLLINFO: case SBM_GETSCROLLINFO: diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index efc7249eca7..e118d081ead 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1063,7 +1063,6 @@ static void test_inter_process_child( HWND hwnd ) ok( res == 4, "res = %d\n", res ); res = NtUserMessageCall( hwnd, WM_GETDLGCODE, 0, 0, NULL, NtUserSendMessage, TRUE ); - todo_wine ok( res == 1, "res = %d\n", res ); mdi.szClass = "TestClass";

1 0

Huw Davies : ntdll: Store the codepage data addresses in both PEBs.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 152924c9e42dce9d82daccebc77ba357e6bb5726 URL: https://gitlab.winehq.org/wine/wine/-/commit/152924c9e42dce9d82daccebc77ba3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 8 12:33:22 2023 +0100 ntdll: Store the codepage data addresses in both PEBs. Spotted by Jactry Zeng. --- dlls/ntdll/locale.c | 11 +++++++++++ dlls/ntdll/tests/wow64.c | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index a5777117cfa..545cc628909 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -89,6 +89,13 @@ invalid: return STATUS_INVALID_PARAMETER; } +static PEB64 *get_peb64( void ) +{ + TEB64 *teb64 = NtCurrentTeb64(); + + if (!teb64) return NULL; + return (PEB64 *)(UINT_PTR)teb64->Peb; +} void locale_init(void) { @@ -101,6 +108,7 @@ void locale_init(void) void *ansi_ptr = utf8, *oem_ptr = utf8, *case_ptr; NTSTATUS status; const struct locale_nls_header *header; + PEB64 *peb64 = get_peb64(); status = RtlGetLocaleFileMappingAddress( (void **)&header, &system_lcid, &unused ); if (status) @@ -158,15 +166,18 @@ void locale_init(void) NtGetNlsSectionPtr( 10, 0, NULL, &case_ptr, &size ); NtCurrentTeb()->Peb->UnicodeCaseTableData = case_ptr; + if (peb64) peb64->UnicodeCaseTableData = PtrToUlong( case_ptr ); if (ansi_cp != CP_UTF8) { NtGetNlsSectionPtr( 11, ansi_cp, NULL, &ansi_ptr, &size ); NtCurrentTeb()->Peb->AnsiCodePageData = ansi_ptr; + if (peb64) peb64->AnsiCodePageData = PtrToUlong( ansi_ptr ); } if (oem_cp != CP_UTF8) { NtGetNlsSectionPtr( 11, oem_cp, NULL, &oem_ptr, &size ); NtCurrentTeb()->Peb->OemCodePageData = oem_ptr; + if (peb64) peb64->OemCodePageData = PtrToUlong( oem_ptr ); } RtlInitNlsTables( ansi_ptr, oem_ptr, case_ptr, &nls_info ); NlsAnsiCodePage = nls_info.AnsiTableInfo.CodePage; diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 4e9107ded9d..12ad7329816 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -875,6 +875,15 @@ static void test_peb_teb(void) peb64->OSBuildNumber, NtCurrentTeb()->Peb->OSBuildNumber ); ok( peb64->OSPlatformId == NtCurrentTeb()->Peb->OSPlatformId, "wrong OSPlatformId %lx / %lx\n", peb64->OSPlatformId, NtCurrentTeb()->Peb->OSPlatformId ); + ok( peb64->AnsiCodePageData == PtrToUlong( NtCurrentTeb()->Peb->AnsiCodePageData ), + "wrong AnsiCodePageData %I64x / %p\n", + peb64->AnsiCodePageData, NtCurrentTeb()->Peb->AnsiCodePageData ); + ok( peb64->OemCodePageData == PtrToUlong( NtCurrentTeb()->Peb->OemCodePageData ), + "wrong OemCodePageData %I64x / %p\n", + peb64->OemCodePageData, NtCurrentTeb()->Peb->OemCodePageData ); + ok( peb64->UnicodeCaseTableData == PtrToUlong( NtCurrentTeb()->Peb->UnicodeCaseTableData ), + "wrong UnicodeCaseTableData %I64x / %p\n", + peb64->UnicodeCaseTableData, NtCurrentTeb()->Peb->UnicodeCaseTableData ); return; } #endif

1 0

Dmitry Timoshkov : schedsvc: Remove duplicate dwControlsAccepted initialization.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 46a5454b797f8b76731fe865ba00e4272b9401bd URL: https://gitlab.winehq.org/wine/wine/-/commit/46a5454b797f8b76731fe865ba00e4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 8 14:42:48 2022 +0300 schedsvc: Remove duplicate dwControlsAccepted initialization. dwControlsAccepted is initialized a few lines earlier. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/svc_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 349dae756fc..1e525c06506 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -281,7 +281,6 @@ static void schedsvc_update_status(DWORD state) status.dwServiceSpecificExitCode = 0; status.dwCheckPoint = 0; status.dwWaitHint = 0; - status.dwControlsAccepted = 0; status.dwCurrentState = state; SetServiceStatus(schedsvc_handle, &status);

1 0

Dmitry Timoshkov : wevtsvc: Remove duplicate dwControlsAccepted initialization.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: d7c5797bee336b38b2688bba4db96c6ee6c9eaf4 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7c5797bee336b38b2688bba4db96c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 8 14:45:52 2022 +0300 wevtsvc: Remove duplicate dwControlsAccepted initialization. dwControlsAccepted is initialized a few lines earlier. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/service.c | 1 - dlls/wevtsvc/wevtsvc.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 8cc737207e0..4e6aebb445d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2930,7 +2930,6 @@ static void test_EventLog(void) else { ok(status.dwCurrentState == SERVICE_RUNNING, "got %#lx\n", status.dwCurrentState); - todo_wine ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ || status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ || status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN), diff --git a/dlls/wevtsvc/wevtsvc.c b/dlls/wevtsvc/wevtsvc.c index 2e303045740..78c68bac69b 100644 --- a/dlls/wevtsvc/wevtsvc.c +++ b/dlls/wevtsvc/wevtsvc.c @@ -40,7 +40,6 @@ static void eventlog_update_status(DWORD state) status.dwServiceSpecificExitCode = 0; status.dwCheckPoint = 0; status.dwWaitHint = 0; - status.dwControlsAccepted = 0; status.dwCurrentState = state; SetServiceStatus(svc_handle, &status);

1 0

Dmitry Timoshkov : srvsvc: Add LanmanServer stub service.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 3acdfe31804cf14873798388a540564e8aca7924 URL: https://gitlab.winehq.org/wine/wine/-/commit/3acdfe31804cf14873798388a54056… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 8 14:33:20 2022 +0300 srvsvc: Add LanmanServer stub service. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure | 2 ++ configure.ac | 1 + dlls/srvsvc/Makefile.in | 5 +++ dlls/srvsvc/srvsvc.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/srvsvc/srvsvc.spec | 1 + loader/wine.inf.in | 4 +-- 6 files changed, 98 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 80c27e92e3a..9ffe846def1 100755 --- a/configure +++ b/configure @@ -1403,6 +1403,7 @@ enable_spoolss enable_sppc enable_srclient enable_srvcli +enable_srvsvc enable_sspicli enable_stdole2_tlb enable_stdole32_tlb @@ -21664,6 +21665,7 @@ wine_fn_config_makefile dlls/spoolss/tests enable_tests wine_fn_config_makefile dlls/sppc enable_sppc wine_fn_config_makefile dlls/srclient enable_srclient wine_fn_config_makefile dlls/srvcli enable_srvcli +wine_fn_config_makefile dlls/srvsvc enable_srvsvc wine_fn_config_makefile dlls/sspicli enable_sspicli wine_fn_config_makefile dlls/stdole2.tlb enable_stdole2_tlb wine_fn_config_makefile dlls/stdole32.tlb enable_stdole32_tlb diff --git a/configure.ac b/configure.ac index 8b1a92c6396..1ea45c3a75d 100644 --- a/configure.ac +++ b/configure.ac @@ -3031,6 +3031,7 @@ WINE_CONFIG_MAKEFILE(dlls/spoolss/tests) WINE_CONFIG_MAKEFILE(dlls/sppc) WINE_CONFIG_MAKEFILE(dlls/srclient) WINE_CONFIG_MAKEFILE(dlls/srvcli) +WINE_CONFIG_MAKEFILE(dlls/srvsvc) WINE_CONFIG_MAKEFILE(dlls/sspicli) WINE_CONFIG_MAKEFILE(dlls/stdole2.tlb) WINE_CONFIG_MAKEFILE(dlls/stdole32.tlb) diff --git a/dlls/srvsvc/Makefile.in b/dlls/srvsvc/Makefile.in new file mode 100644 index 00000000000..f9c68fd12aa --- /dev/null +++ b/dlls/srvsvc/Makefile.in @@ -0,0 +1,5 @@ +MODULE = srvsvc.dll +IMPORTS = advapi32 + +C_SRCS = \ + srvsvc.c diff --git a/dlls/srvsvc/srvsvc.c b/dlls/srvsvc/srvsvc.c new file mode 100644 index 00000000000..3b2b563bc6c --- /dev/null +++ b/dlls/srvsvc/srvsvc.c @@ -0,0 +1,87 @@ +/* + * LanmanServer Service + * + * Copyright 2022 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winsvc.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lanman); + +static SERVICE_STATUS_HANDLE svc_handle; +static HANDLE done_event; + +static void svc_update_status(DWORD state) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + status.dwCurrentState = state; + + SetServiceStatus(svc_handle, &status); +} + +static void WINAPI svc_handler(DWORD control) +{ + TRACE("%#lx\n", control); + + switch (control) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + svc_update_status(SERVICE_STOP_PENDING); + SetEvent(done_event); + break; + + default: + svc_update_status(SERVICE_RUNNING); + break; + } +} + +void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) +{ + TRACE("Starting LanmanServer\n"); + + svc_handle = RegisterServiceCtrlHandlerW(L"LanmanServer", svc_handler); + if (!svc_handle) + { + ERR("RegisterServiceCtrlHandler error %ld\n", GetLastError()); + return; + } + + svc_update_status(SERVICE_START_PENDING); + done_event = CreateEventW(NULL, TRUE, FALSE, NULL); + + svc_update_status(SERVICE_RUNNING); + WaitForSingleObject(done_event, INFINITE); + CloseHandle(done_event); + + svc_update_status(SERVICE_STOPPED); + + TRACE("Exiting LanmanServer\n"); +} diff --git a/dlls/srvsvc/srvsvc.spec b/dlls/srvsvc/srvsvc.spec new file mode 100644 index 00000000000..daa88578f7f --- /dev/null +++ b/dlls/srvsvc/srvsvc.spec @@ -0,0 +1 @@ +@ stdcall -private ServiceMain(long ptr) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 347af35af6d..382808c4876 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2448,12 +2448,12 @@ Description="Lanman Server" DisplayName="Lanman Server" ServiceBinary="%11%\svchost.exe -k netsvcs" ServiceType=32 -StartType=4 +StartType=3 ErrorControl=1 [LanmanServerServiceKeys] HKR,Parameters,"ServiceDll",,"%11%\srvsvc.dll" -;; HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"lanmanserver" +HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"lanmanserver" [FontCacheService] AddReg=FontCacheServiceKeys

1 0