September 2020 - Wine-devel

[PATCH] comctl32: Implement WM_GETTEXTLENGTH for datetime picker.
by Jactry Zeng 24 Sep '20

24 Sep '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/comctl32/datetime.c | 17 +++++++++++++++++ dlls/comctl32/tests/datetime.c | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 7b7ac8a86a..ace00c7550 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1565,6 +1565,20 @@ DATETIME_GetText (const DATETIME_INFO *infoPtr, INT count, LPWSTR dst) return lstrlenW(dst); } +static int DATETIME_GetTextLength(const DATETIME_INFO *info) +{ + int i, length = 0; + WCHAR buffer[80]; + + TRACE("%p.\n", info); + + for (i = 0; i < info->nrFields; i++) + { + DATETIME_ReturnTxt(info, i, buffer, ARRAY_SIZE(buffer)); + length += lstrlenW(buffer); + } + return length; +} static LRESULT WINAPI DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -1681,6 +1695,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_GETTEXT: return (LRESULT) DATETIME_GetText(infoPtr, wParam, (LPWSTR)lParam); + case WM_GETTEXTLENGTH: + return (LRESULT)DATETIME_GetTextLength(infoPtr); + case WM_SETTEXT: return CB_ERR; diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 88abce9ed6..111f0bee89 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -793,7 +793,12 @@ static void test_wm_set_get_text(void) if (ret == 0) skip("GetDateFormat failed, returned %ld, error %d\n", ret, GetLastError()); else + { ok(!strcmp(buff, time), "Expected %s, got %s\n", time, buff); + + ret = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(ret == strlen(time), "Got wrong length: %ld, expected %d.\n", ret, strlen(time)); + } } DestroyWindow(hWnd); -- 2.28.0

3 2

[PATCH] qedit: Drop redundant NULL check before free()
by Michael Stefaniuc 23 Sep '20

23 Sep '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qedit/mediadet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index e1defaa9a67..bacf5208a08 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -66,8 +66,7 @@ static void MD_cleanup(MediaDetImpl *This) This->splitter = NULL; if (This->graph) IGraphBuilder_Release(This->graph); This->graph = NULL; - if (This->filename) - free(This->filename); + free(This->filename); This->filename = NULL; This->num_streams = -1; This->cur_stream = 0; -- 2.26.2

3 2

[PATCH] windowscodecs/tests: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Sep '20

23 Sep '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/tests/tiffformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index b9d60de8a13..e0d70929585 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -1131,7 +1131,7 @@ static void test_color_formats(void) ok(bps[0] == 8 && bps[1] == 8 && bps[2] == 8 && bps[3] == 0, "expected bps 8,8,8,0 got %d,%d,%d,%d\n", bps[0], bps[1], bps[2], bps[3]); - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { if (td[i].data) { -- 2.26.2

2 1

[PATCH] gdiplus/tests: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Sep '20

23 Sep '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index b762f7c45ff..af90152aa26 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -335,7 +335,7 @@ static void test_logfont(void) memset(&lfa, 0, sizeof(lfa)); lstrcpyA(lfa.lfFaceName, "Times New Roman"); - for (i = 0; i < sizeof(test_sizes)/sizeof(test_sizes[0]); ++i) + for (i = 0; i < ARRAY_SIZE(test_sizes); ++i) { lfa.lfHeight = test_sizes[i].input; -- 2.26.2

2 1

[PATCH v2] wevtsvc: Add EventLog service stub.
by Dmitry Timoshkov 23 Sep '20

23 Sep '20

There's an installer that fails if EventLog service is not running. v2: Fix test failures under newer Windows versions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/service.c | 46 ++++++++++++++++++ dlls/wevtsvc/Makefile.in | 7 +++ dlls/wevtsvc/wevtsvc.c | 87 +++++++++++++++++++++++++++++++++++ dlls/wevtsvc/wevtsvc.spec | 1 + loader/wine.inf.in | 17 +++++++ 5 files changed, 158 insertions(+) create mode 100644 dlls/wevtsvc/Makefile.in create mode 100644 dlls/wevtsvc/wevtsvc.c create mode 100644 dlls/wevtsvc/wevtsvc.spec diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 7048e5a09a..817d0cb9ab 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2678,6 +2678,51 @@ static void test_refcount(void) CloseServiceHandle(scm_handle); } +static void test_EventLog(void) +{ + SC_HANDLE scm_handle, svc_handle; + DWORD size; + BOOL ret; + QUERY_SERVICE_CONFIGA *config; + + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_READ); + ok(scm_handle != NULL, "OpenSCManager error %u\n", GetLastError()); + + svc_handle = OpenServiceA(scm_handle, "EventLog", GENERIC_READ); + ok(svc_handle != NULL, "OpenService error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = QueryServiceConfigA(svc_handle, NULL, 0, &size); + ok(!ret, "QueryServiceConfig should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + config = HeapAlloc(GetProcessHeap(), 0, size); + ret = QueryServiceConfigA(svc_handle, config, size, &size); + ok(ret, "QueryServiceConfig error %u\n", GetLastError()); + + ok(config->dwServiceType == SERVICE_WIN32_SHARE_PROCESS, "got %#x\n", config->dwServiceType); + ok(config->dwStartType == SERVICE_AUTO_START, "got %u\n", config->dwStartType); + ok(config->dwErrorControl == SERVICE_ERROR_NORMAL, "got %u\n", config->dwErrorControl); + ok(!strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\services.exe") /* XP */ || + !strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted") /* Vista+ */ || + !strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted -p") /* Win10 */, + "got %s\n", config->lpBinaryPathName); +todo_wine + ok(!strcmpi(config->lpLoadOrderGroup, "Event Log"), "got %s\n", config->lpLoadOrderGroup); + ok(config->dwTagId == 0, "Expected 0, got %d\n", config->dwTagId); + ok(!config->lpDependencies[0], "lpDependencies is not empty\n"); + ok(!strcmp(config->lpServiceStartName, "LocalSystem") /* XP */ || + !strcmp(config->lpServiceStartName, "NT AUTHORITY\\LocalService"), + "got %s\n", config->lpServiceStartName); + ok(!strcmp(config->lpDisplayName, "Event Log") /* XP */ || + !strcmp(config->lpDisplayName, "Windows Event Log") /* Vista+ */, "got %s\n", config->lpDisplayName); + + HeapFree(GetProcessHeap(), 0, config); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); +} + static DWORD WINAPI ctrl_handler(DWORD ctl, DWORD type, void *data, void *user) { HANDLE evt = user; @@ -2775,4 +2820,5 @@ START_TEST(service) * and what the rules are */ test_refcount(); + test_EventLog(); } diff --git a/dlls/wevtsvc/Makefile.in b/dlls/wevtsvc/Makefile.in new file mode 100644 index 0000000000..3dcbb804a3 --- /dev/null +++ b/dlls/wevtsvc/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wevtsvc.dll +IMPORTS = rpcrt4 advapi32 + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + wevtsvc.c diff --git a/dlls/wevtsvc/wevtsvc.c b/dlls/wevtsvc/wevtsvc.c new file mode 100644 index 0000000000..14c30791ff --- /dev/null +++ b/dlls/wevtsvc/wevtsvc.c @@ -0,0 +1,87 @@ +/* + * Event Log Service + * + * Copyright 2020 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(eventlog); + +static SERVICE_STATUS_HANDLE svc_handle; +static HANDLE done_event; + +static void eventlog_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.dwControlsAccepted = 0; + status.dwCurrentState = state; + + SetServiceStatus(svc_handle, &status); +} + +static void WINAPI eventlog_handler(DWORD control) +{ + TRACE("%#x\n", control); + + switch (control) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + eventlog_update_status(SERVICE_STOP_PENDING); + SetEvent(done_event); + break; + + default: + eventlog_update_status(SERVICE_RUNNING); + break; + } +} + +void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) +{ + TRACE("starting Event Log Service\n"); + + svc_handle = RegisterServiceCtrlHandlerW(L"EventLog", eventlog_handler); + if (!svc_handle) + { + ERR("RegisterServiceCtrlHandler error %u\n", GetLastError()); + return; + } + + eventlog_update_status(SERVICE_RUNNING); + + done_event = CreateEventW(NULL, TRUE, FALSE, NULL); + WaitForSingleObject(done_event, INFINITE); + CloseHandle(done_event); + + eventlog_update_status(SERVICE_STOPPED); + + TRACE("exiting Event Log Service\n"); +} diff --git a/dlls/wevtsvc/wevtsvc.spec b/dlls/wevtsvc/wevtsvc.spec new file mode 100644 index 0000000000..daa88578f7 --- /dev/null +++ b/dlls/wevtsvc/wevtsvc.spec @@ -0,0 +1 @@ +@ stdcall -private ServiceMain(long ptr) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index cd0e7bd16f..0b71b10544 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -149,6 +149,7 @@ WineFakeDlls=FakeDllsWin32 [DefaultInstall.Services] AddService=BITS,0,BITSService +AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService @@ -167,6 +168,7 @@ AddService=NDIS,0x800,NDISService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService +AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService @@ -185,6 +187,7 @@ AddService=NDIS,0x800,NDISService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService +AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService @@ -203,6 +206,7 @@ AddService=NDIS,0x800,NDISService [DefaultInstall.ntarm64.Services] AddService=BITS,0,BITSService +AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService @@ -3609,6 +3613,15 @@ ServiceType=16 StartType=3 ErrorControl=1 +[EventLogService] +AddReg=EventLogServiceKeys +Description="Event Log" +DisplayName="Event Log" +ServiceBinary="%11%\svchost.exe -k LocalServiceNetworkRestricted" +ServiceType=32 +StartType=2 +ErrorControl=1 + [HTTPService] Description="HTTP server" DisplayName="HTTP" @@ -3696,6 +3709,10 @@ ErrorControl=1 HKR,Parameters,"ServiceDll",,"%11%\qmgr.dll" HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010000,"BITS" +[EventLogServiceKeys] +HKR,Parameters,"ServiceDll",,"%11%\wevtsvc.dll" +HKLM,%CurrentVersionNT%\SvcHost,"LocalServiceNetworkRestricted",0x00010000,"Event Log" + [StiServiceKeys] HKR,Parameters,"ServiceDll",,"%11%\wiaservc.dll" HKLM,%CurrentVersionNT%\SvcHost,"imgsvc",0x00010000,"StiSvc" -- 2.26.2

2 2

[PATCH] widl: Add null source pointer check for typelib writer.
by Nikolay Sivov 23 Sep '20

23 Sep '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38964 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- All other locations already test for it. tools/widl/write_msft.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index aa05dcfe567..440bb23f79b 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2560,7 +2560,8 @@ static void set_lib_flags(msft_typelib_t *typelib) static void ctl2_write_segment(msft_typelib_t *typelib, int segment) { - put_data(typelib->typelib_segment_data[segment], typelib->typelib_segdir[segment].length); + if (typelib->typelib_segment_data[segment]) + put_data(typelib->typelib_segment_data[segment], typelib->typelib_segdir[segment].length); } static void ctl2_finalize_typeinfos(msft_typelib_t *typelib, int filesize) -- 2.28.0

1 0

[PATCH v2] mshtml: Implement IOleObject::[Get|Set]Extent.
by Gijs Vermeulen 23 Sep '20

23 Sep '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45797 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/mshtml/htmldoc.c | 3 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/oleobj.c | 22 ++++++-- dlls/mshtml/tests/htmldoc.c | 99 ++++++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index bc3427c30f..0fd039bfa6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -6014,10 +6014,11 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii doc->IUnknown_inner.lpVtbl = &HTMLDocumentObjVtbl; doc->ICustomDoc_iface.lpVtbl = &CustomDocVtbl; + doc->basedoc.doc_obj = doc; + init_dispex(&doc->dispex, (IUnknown*)&doc->ICustomDoc_iface, &HTMLDocumentObj_dispex); init_doc(&doc->basedoc, outer ? outer : &doc->IUnknown_inner, &doc->dispex.IDispatchEx_iface); TargetContainer_Init(doc); - doc->basedoc.doc_obj = doc; doc->is_mhtml = is_mhtml; doc->task_magic = get_task_target_magic(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2c14ec0bec..066169b749 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -711,6 +711,7 @@ struct HTMLDocumentObj { DWORD update; LONG task_magic; + SIZEL extent; }; typedef struct nsWeakReference nsWeakReference; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 1d8d62669e..00e937223a 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -606,15 +606,27 @@ static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfTyp static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { HTMLDocument *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); + + if (dwDrawAspect != DVASPECT_CONTENT) + return E_INVALIDARG; + + This->doc_obj->extent = *psizel; + return S_OK; } static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { HTMLDocument *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); + + if (dwDrawAspect != DVASPECT_CONTENT) + return E_INVALIDARG; + + *psizel = This->doc_obj->extent; + return S_OK; } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, DWORD *pdwConnection) @@ -1473,4 +1485,6 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) This->IObjectWithSite_iface.lpVtbl = &ObjectWithSiteVtbl; This->IOleContainer_iface.lpVtbl = &OleContainerVtbl; This->IObjectSafety_iface.lpVtbl = &ObjectSafetyVtbl; + This->doc_obj->extent.cx = 1; + This->doc_obj->extent.cy = 1; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index dee448144e..89311c5d8c 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6922,6 +6922,104 @@ static void test_OnAmbientPropertyChange(IHTMLDocument2 *doc) +static void test_GetSetExtent(IHTMLDocument2 *doc) +{ + IOleObject *oleobj = NULL; + HRESULT hres; + SIZE extent; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, 0, &extent); + ok(hres == E_INVALIDARG, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 0xdeadbeef && extent.cy == 0xdeadbeef, "size = {%d %d}\n", extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, 7, &extent); + ok(hres == E_INVALIDARG, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 0xdeadbeef && extent.cy == 0xdeadbeef, "size = {%d %d}\n", extent.cx, extent.cy); + + extent.cx = 800; + extent.cy = 700; + hres = IOleObject_SetExtent(oleobj, 0, &extent); + ok(hres == E_INVALIDARG, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = 800; + extent.cy = 700; + hres = IOleObject_SetExtent(oleobj, 7, &extent); + ok(hres == E_INVALIDARG, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_SetExtent(oleobj, 0, &extent); + todo_wine ok(hres == E_FAIL, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_SetExtent(oleobj, 7, &extent); + todo_wine ok(hres == E_FAIL, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); + todo_wine ok(hres == E_FAIL, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + todo_wine ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + extent.cx, extent.cy); + + extent.cx = 800; + extent.cy = 700; + hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 800 && extent.cy == 700, "size = {%d %d} (expected {800 700})\n", + extent.cx, extent.cy ); + + extent.cx = 1; + extent.cy = 1; + hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "SetExtent failed: %08x\n", hres); + + IOleObject_Release(oleobj); +} + static void test_OnAmbientPropertyChange2(IHTMLDocument2 *doc) { IOleControl *control = NULL; @@ -7605,6 +7703,7 @@ static void test_HTMLDocument(BOOL do_load, BOOL mime) doc_unk = (IUnknown*)doc; test_QueryInterface(doc); + test_GetSetExtent(doc); test_Advise(doc); test_IsDirty(doc, S_FALSE); test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); -- 2.28.0

3 2

[PATCH 1/2] widl: Enable [hidden] attribute for enums.
by Nikolay Sivov 23 Sep '20

23 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7d5aaebf339..b6cd33dd6b1 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2153,7 +2153,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_HELPSTRING */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstring" }, /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstringcontext" }, /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpstringdll" }, - /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, "hidden" }, + /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, "hidden" }, /* ATTR_ID */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, "id" }, /* ATTR_IDEMPOTENT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "ignore" }, -- 2.28.0

1 1

[PATCH resend] user32: Fix messages sent on a window without WS_CHILD, but with an invisible parent, when it is shown.
by Gabriel Ivăncescu 23 Sep '20

23 Sep '20

Some applications depend on the fact that WM_WINDOWPOSCHANGING is sent after WM_SHOWWINDOW when SetParent is called, even if the window ends up not visible because its parent is not visible, and occurs when the window itself does not have the WS_CHILD style set. This also fixes a TODO message sequence, so that Wine matches Windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40262 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/msg.c | 3 ++- dlls/user32/winpos.c | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bf20c5c..fb341cc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16397,6 +16397,7 @@ static const struct message WmSetParentSeq_2[] = { { HCBT_ACTIVATE, hook|optional }, { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_QUERYNEWPALETTE, sent|optional }, { WM_NCACTIVATE, sent|wparam|optional, 1 }, { WM_ACTIVATE, sent|wparam|optional, 1 }, { HCBT_SETFOCUS, hook|optional }, @@ -16467,7 +16468,7 @@ static void test_SetParent(void) SetParent(popup, child); flush_events(); - ok_sequence(WmSetParentSeq_2, "SetParent() visible WS_POPUP", TRUE); + ok_sequence(WmSetParentSeq_2, "SetParent() visible WS_POPUP", FALSE); ok(GetWindowLongA(popup, GWL_STYLE) & WS_VISIBLE, "WS_VISIBLE should be set\n"); ok(!IsWindowVisible(popup), "IsWindowVisible() should return FALSE\n"); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index e3c3f5c..7b5c657 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1122,8 +1122,8 @@ static BOOL show_window( HWND hwnd, INT cmd ) swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp ); - parent = GetAncestor( hwnd, GA_PARENT ); - if (parent && !IsWindowVisible( parent ) && !(swp & SWP_STATECHANGED)) + if ((style & WS_CHILD) && (parent = GetAncestor( hwnd, GA_PARENT )) && + !IsWindowVisible( parent ) && !(swp & SWP_STATECHANGED)) { /* if parent is not visible simply toggle WS_VISIBLE and return */ if (showFlag) WIN_SetStyle( hwnd, WS_VISIBLE, 0 ); @@ -1958,8 +1958,11 @@ static BOOL fixup_flags( WINDOWPOS *winpos, const RECT *old_window_rect, int par if (winpos->cy < 0) winpos->cy = 0; else if (winpos->cy > 32767) winpos->cy = 32767; - parent = GetAncestor( winpos->hwnd, GA_PARENT ); - if (!IsWindowVisible( parent )) winpos->flags |= SWP_NOREDRAW; + if (wndPtr->dwStyle & WS_CHILD) + { + parent = GetAncestor( winpos->hwnd, GA_PARENT ); + if (!IsWindowVisible( parent )) winpos->flags |= SWP_NOREDRAW; + } if (wndPtr->dwStyle & WS_VISIBLE) winpos->flags &= ~SWP_SHOWWINDOW; else -- 2.21.0

2 2

[PATCH 01/12] include/icmpapi: Add missing function declarations.
by Gabriel Ivăncescu 23 Sep '20

23 Sep '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/icmpapi.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/include/icmpapi.h b/include/icmpapi.h index 102851a..fd86e84 100644 --- a/include/icmpapi.h +++ b/include/icmpapi.h @@ -21,6 +21,8 @@ #ifndef __WINE_ICMPAPI_H #define __WINE_ICMPAPI_H +#include "winternl.h" + #ifdef __cplusplus extern "C" { #endif @@ -30,10 +32,24 @@ HANDLE WINAPI IcmpCreateFile( VOID ); +HANDLE WINAPI Icmp6CreateFile( + VOID + ); + BOOL WINAPI IcmpCloseHandle( HANDLE IcmpHandle ); +DWORD WINAPI IcmpParseReplies( + LPVOID ReplyBuffer, + DWORD ReplySize + ); + +DWORD WINAPI Icmp6ParseReplies( + LPVOID ReplyBuffer, + DWORD ReplySize + ); + DWORD WINAPI IcmpSendEcho( HANDLE IcmpHandle, IPAddr DestinationAddress, @@ -45,6 +61,50 @@ DWORD WINAPI IcmpSendEcho( DWORD Timeout ); +DWORD WINAPI IcmpSendEcho2( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ); + +DWORD WINAPI IcmpSendEcho2Ex( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + IPAddr SourceAddress, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ); + +DWORD WINAPI Icmp6SendEcho2( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + struct sockaddr_in6* SourceAddress, + struct sockaddr_in6* DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ); + #ifdef __cplusplus } -- 2.21.0

1 11