February 2018 - Wine-commits

Dmitry Timoshkov : adsldp: Implement IADsADSystemInfo::get_ComputerName().
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: bc283fcf3d30c709cf064f71461e1b3577c26286 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc283fcf3d30c709cf064f71… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 28 11:44:49 2018 +0800 adsldp: Implement IADsADSystemInfo::get_ComputerName(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 1 + dlls/adsldp/adsldp.c | 25 +++++++++++++++++++++++-- dlls/adsldp/tests/sysinfo.c | 1 - 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index e033d91..c96e264 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,4 +1,5 @@ MODULE = adsldp.dll +IMPORTS = oleaut32 secur32 C_SRCS = \ adsldp.c diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 15f1d23..4fc0de4 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -28,6 +28,8 @@ #include "objbase.h" #include "rpcproxy.h" #include "iads.h" +#define SECURITY_WIN32 +#include "security.h" #include "wine/debug.h" @@ -120,8 +122,27 @@ static HRESULT WINAPI sysinfo_get_UserName(IADsADSystemInfo *iface, BSTR *retval static HRESULT WINAPI sysinfo_get_ComputerName(IADsADSystemInfo *iface, BSTR *retval) { - FIXME("%p,%p: stub\n", iface, retval); - return E_NOTIMPL; + UINT size; + WCHAR *name; + + TRACE("%p,%p\n", iface, retval); + + size = 0; + GetComputerObjectNameW(NameFullyQualifiedDN, NULL, &size); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return HRESULT_FROM_WIN32(GetLastError()); + + name = SysAllocStringLen(NULL, size); + if (!name) return E_OUTOFMEMORY; + + if (!GetComputerObjectNameW(NameFullyQualifiedDN, name, &size)) + { + SysFreeString(name); + return HRESULT_FROM_WIN32(GetLastError()); + } + + *retval = name; + return S_OK; } static HRESULT WINAPI sysinfo_get_SiteName(IADsADSystemInfo *iface, BSTR *retval) diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index 73435a6..1e3939f 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -79,7 +79,6 @@ static void test_ComputerName(void) ok(hr == S_OK, "got %#x\n", hr); hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr); -todo_wine ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_CANT_ACCESS_DOMAIN_INFO), "got %#x\n", hr); if (hr == S_OK) {

1 0

Jacek Caban : activscp.idl: Added SCRIPTLANGUAGEVERSION declaration.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: 0a72708126f5b8fc06698172d973bb529944c3bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a72708126f5b8fc06698172… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 18:40:45 2018 +0100 activscp.idl: Added SCRIPTLANGUAGEVERSION declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/activscp.idl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/activscp.idl b/include/activscp.idl index e539b04..57179cf 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -45,7 +45,14 @@ cpp_quote("#define SCRIPTPROP_INVOKEVERSIONING 0x00004000") cpp_quote("#define SCRIPTPROP_HACK_FIBERSUPPORT 0x70000000") cpp_quote("#define SCRIPTPROP_HACK_TRIDENTEVENTSINK 0x70000001") cpp_quote("#define SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION 0x70000002") - + +typedef enum tagSCRIPTLANGUAGEVERSION { + SCRIPTLANGUAGEVERSION_DEFAULT = 0, + SCRIPTLANGUAGEVERSION_5_7 = 1, + SCRIPTLANGUAGEVERSION_5_8 = 2, + SCRIPTLANGUAGEVERSION_MAX = 255 +} SCRIPTLANGUAGEVERSION; + typedef enum tagSCRIPTSTATE { SCRIPTSTATE_UNINITIALIZED = 0, SCRIPTSTATE_STARTED = 1,

1 0

Michael Müller : ntdll: Fix error code when querying too large memory address.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: 556ba38dd177198dba7cd8554302536d2e31ff10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=556ba38dd177198dba7cd855… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 27 17:31:23 2018 -0600 ntdll: Fix error code when querying too large memory address. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 4 ++++ dlls/ntdll/virtual.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index b62e035..1f1c675 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1868,6 +1868,10 @@ static void test_queryvirtualmemory(void) "mbi.Protect is 0x%x\n", mbi.Protect); } else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */ + + /* check error code when addr is higher than working set limit */ + status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); } static void test_affinity(void) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 106dab2..befb59c 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2845,7 +2845,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, base = ROUND_ADDR( addr, page_mask ); - if (is_beyond_limit( base, 1, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; + if (is_beyond_limit( base, 1, working_set_limit )) return STATUS_INVALID_PARAMETER; /* Find the view containing the address */

1 0

Michael Stefaniuc : scrrun: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: 0194896aa5bf13a1754e95a4eab1a1527b9bb463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0194896aa5bf13a1754e95a4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 28 01:11:31 2018 +0100 scrrun: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 0527531..aa16600 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1001,7 +1001,7 @@ static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) return E_POINTER; *name = NULL; - ret = GetVolumeInformationW(This->root, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, NULL, NULL, NULL, 0); + ret = GetVolumeInformationW(This->root, nameW, ARRAY_SIZE(nameW), NULL, NULL, NULL, NULL, 0); if (ret) *name = SysAllocString(nameW); return ret ? S_OK : E_FAIL; @@ -1026,7 +1026,7 @@ static HRESULT WINAPI drive_get_FileSystem(IDrive *iface, BSTR *fs) return E_POINTER; *fs = NULL; - ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, sizeof(nameW)/sizeof(WCHAR)); + ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, ARRAY_SIZE(nameW)); if (ret) *fs = SysAllocString(nameW); return ret ? S_OK : E_FAIL;

1 0

Michael Stefaniuc : comctl32: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: 58bb7b39fc59969b851e87db7e9fe22c073f5e64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58bb7b39fc59969b851e87db… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 28 01:11:32 2018 +0100 comctl32: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/commctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index afa6b84..9356624 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1430,7 +1430,7 @@ void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark {lCentre + 1, l2 - 3}, }; hOldPen = SelectObject(hDC, hPen); - PolyPolyline(hDC, aptInsertMark, adwPolyPoints, sizeof(adwPolyPoints)/sizeof(adwPolyPoints[0])); + PolyPolyline(hDC, aptInsertMark, adwPolyPoints, ARRAY_SIZE(adwPolyPoints)); SelectObject(hDC, hOldPen); DeleteObject(hPen); }

1 0

Michael Müller : hal: Implement KeQueryPerformanceCounter.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: 02a5071674ef2c39f76c7388a10d1cf63a332539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02a5071674ef2c39f76c7388… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 27 18:29:41 2018 -0600 hal: Implement KeQueryPerformanceCounter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 10 ++++++++++ dlls/hal/hal.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index ddd8710..51bf55d 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -177,3 +177,13 @@ void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { FIXME("(%p %d) stub!\n", port, value); } + +ULONGLONG WINAPI KeQueryPerformanceCounter(LARGE_INTEGER *frequency) +{ + LARGE_INTEGER counter; + + TRACE("(%p)\n", frequency); + + NtQueryPerformanceCounter(&counter, frequency); + return counter.QuadPart; +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index ae706e0..5dc3fa8 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -72,7 +72,7 @@ @ stub KeFlushWriteBuffer @ stdcall KeGetCurrentIrql() @ stub KeLowerIrql -@ stub KeQueryPerformanceCounter +@ stdcall -ret64 KeQueryPerformanceCounter(ptr) @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel

1 0

Sebastian Lackner : bcrypt: Correctly check the size in BCryptGetProperty.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: 1db5170f49781a23d20424d1617a9a09fb131831 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1db5170f49781a23d20424d1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 28 04:15:55 2018 +0000 bcrypt: Correctly check the size in BCryptGetProperty. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 72b5df2..28cf2d8 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -532,7 +532,7 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, } if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (size >= sizeof(BCRYPT_CHAIN_MODE_CBC)) + if (size >= sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR)) { memcpy(buf, BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC)); *ret_size = sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 6fa04b0..b716688 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -452,6 +452,12 @@ static void test_aes(void) ok(size == 64, "got %u\n", size); size = 0; + ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode) - 1, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 64, "got %u\n", size); + + size = 0; + memset(mode, 0, sizeof(mode)); ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", mode);

1 0

Nikolay Sivov : wshom: Use global memory allocation helpers.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: f6bf26906547200a6cc23e6e139e357f440dc605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6bf26906547200a6cc23e6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 28 08:56:04 2018 +0300 wshom: Use global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index d7b36cf..1aa353a 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -24,6 +24,7 @@ #include "dispex.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); @@ -130,7 +131,7 @@ static ULONG WINAPI WshExec_Release(IWshExec *iface) if (!ref) { CloseHandle(This->info.hThread); CloseHandle(This->info.hProcess); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -325,7 +326,7 @@ static HRESULT WshExec_create(BSTR command, IWshExec **ret) *ret = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -333,7 +334,7 @@ static HRESULT WshExec_create(BSTR command, IWshExec **ret) This->ref = 1; if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &This->info)) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return HRESULT_FROM_WIN32(GetLastError()); } @@ -383,7 +384,7 @@ static ULONG WINAPI WshEnvironment_Release(IWshEnvironment *iface) TRACE("(%p) ref = %d\n", This, ref); if (!ref) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -519,7 +520,7 @@ static HRESULT WshEnvironment_Create(IWshEnvironment **env) { WshEnvironment *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IWshEnvironment_iface.lpVtbl = &WshEnvironmentVtbl; @@ -572,7 +573,7 @@ static ULONG WINAPI WshCollection_Release(IWshCollection *iface) TRACE("(%p) ref = %d\n", This, ref); if (!ref) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -721,7 +722,7 @@ static HRESULT WshCollection_Create(IWshCollection **collection) { WshCollection *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IWshCollection_iface.lpVtbl = &WshCollectionVtbl; @@ -778,7 +779,7 @@ static ULONG WINAPI WshShortcut_Release(IWshShortcut *iface) { SysFreeString(This->path_link); IShellLinkW_Release(This->link); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -1077,7 +1078,7 @@ static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) *shortcut = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IWshShortcut_iface.lpVtbl = &WshShortcutVtbl; @@ -1087,7 +1088,7 @@ static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) &IID_IShellLinkW, (void**)&This->link); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return hr; } @@ -1095,7 +1096,7 @@ static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) if (!This->path_link) { IShellLinkW_Release(This->link); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return E_OUTOFMEMORY; } @@ -1426,7 +1427,7 @@ static HRESULT split_reg_path(const WCHAR *path, WCHAR **subkey, WCHAR **value) unsigned int len = *value - *subkey - 1; WCHAR *ret; - ret = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); + ret = heap_alloc((len + 1)*sizeof(WCHAR)); if (!ret) return E_OUTOFMEMORY; @@ -1466,7 +1467,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v if (ret == ERROR_SUCCESS) { void *data; - data = HeapAlloc(GetProcessHeap(), 0, datalen); + data = heap_alloc(datalen); if (!data) { hr = E_OUTOFMEMORY; goto fail; @@ -1474,7 +1475,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v ret = RegGetValueW(root, subkey, val, RRF_RT_ANY, &type, data, &datalen); if (ret) { - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); hr = HRESULT_FROM_WIN32(ret); goto fail; } @@ -1564,7 +1565,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v hr = E_FAIL; }; - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); if (FAILED(hr)) VariantInit(value); } @@ -1573,7 +1574,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v fail: if (val) - HeapFree(GetProcessHeap(), 0, subkey); + heap_free(subkey); return hr; } @@ -1661,7 +1662,7 @@ static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT * fail: VariantClear(&v); if (val) - HeapFree(GetProcessHeap(), 0, subkey); + heap_free(subkey); return hr; }

1 0

Nikolay Sivov : comctl32/tests: Run some Progress control tests on version 6.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: 037d315a2893d642a7b20b19b0dbcc4c9f0f81fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=037d315a2893d642a7b20b19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 28 08:57:53 2018 +0300 comctl32/tests: Run some Progress control tests on version 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/progress.c | 49 +++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index d3b219c..b911021 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -27,8 +27,9 @@ #include "wine/test.h" +#include "v6util.h" -static HWND hProgressParentWnd, hProgressWnd; +static HWND hProgressParentWnd; static const char progressTestClass[] = "ProgressBarTestClass"; static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -119,16 +120,6 @@ static void init(void) CW_USEDEFAULT, CW_USEDEFAULT, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, GetModuleHandleA(NULL), 0); ok(hProgressParentWnd != NULL, "failed to create parent wnd\n"); - GetClientRect(hProgressParentWnd, &rect); - hProgressWnd = CreateWindowExA(0, PROGRESS_CLASSA, "", WS_CHILD | WS_VISIBLE, - 0, 0, rect.right, rect.bottom, hProgressParentWnd, NULL, GetModuleHandleA(NULL), 0); - ok(hProgressWnd != NULL, "Failed to create progress bar.\n"); - progress_wndproc = (WNDPROC)SetWindowLongPtrA(hProgressWnd, GWLP_WNDPROC, (LPARAM)progress_subclass_proc); - - ShowWindow(hProgressParentWnd, SW_SHOWNORMAL); - ok(GetUpdateRect(hProgressParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n"); - flush_events(); - update_window(hProgressParentWnd); } static void cleanup(void) @@ -151,9 +142,21 @@ static void cleanup(void) */ static void test_redraw(void) { - RECT client_rect; + RECT client_rect, rect; + HWND hProgressWnd; LRESULT ret; + GetClientRect(hProgressParentWnd, &rect); + hProgressWnd = CreateWindowExA(0, PROGRESS_CLASSA, "", WS_CHILD | WS_VISIBLE, + 0, 0, rect.right, rect.bottom, hProgressParentWnd, NULL, GetModuleHandleA(NULL), 0); + ok(hProgressWnd != NULL, "Failed to create progress bar.\n"); + progress_wndproc = (WNDPROC)SetWindowLongPtrA(hProgressWnd, GWLP_WNDPROC, (LPARAM)progress_subclass_proc); + + ShowWindow(hProgressParentWnd, SW_SHOWNORMAL); + ok(GetUpdateRect(hProgressParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n"); + flush_events(); + update_window(hProgressParentWnd); + SendMessageA(hProgressWnd, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); SendMessageA(hProgressWnd, PBM_SETPOS, 10, 0); SendMessageA(hProgressWnd, PBM_SETSTEP, 20, 0); @@ -162,15 +165,15 @@ static void test_redraw(void) /* PBM_SETPOS */ ok(SendMessageA(hProgressWnd, PBM_SETPOS, 50, 0) == 10, "PBM_SETPOS must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_SETPOS: The progress bar should be redrawn immediately\n"); - + /* PBM_DELTAPOS */ ok(SendMessageA(hProgressWnd, PBM_DELTAPOS, 15, 0) == 50, "PBM_DELTAPOS must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_DELTAPOS: The progress bar should be redrawn immediately\n"); - + /* PBM_SETPOS */ ok(SendMessageA(hProgressWnd, PBM_SETPOS, 80, 0) == 65, "PBM_SETPOS must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_SETPOS: The progress bar should be redrawn immediately\n"); - + /* PBM_STEPIT */ ok(SendMessageA(hProgressWnd, PBM_STEPIT, 0, 0) == 80, "PBM_STEPIT must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_STEPIT: The progress bar should be redrawn immediately\n"); @@ -179,7 +182,7 @@ static void test_redraw(void) win_skip("PBM_GETPOS needs comctl32 > 4.70\n"); else ok(ret == 100, "PBM_GETPOS returned a wrong position : %d\n", (UINT)ret); - + /* PBM_SETRANGE and PBM_SETRANGE32: Usually the progress bar doesn't repaint itself immediately. If the position is not in the new range, it does. @@ -207,6 +210,8 @@ static void test_redraw(void) wine_dbgstr_rect(&last_paint_rect), wine_dbgstr_rect(&client_rect)); update_window(hProgressWnd); ok(erased, "Progress bar should have erased the background\n"); + + DestroyWindow(hProgressWnd); } static void test_setcolors(void) @@ -299,6 +304,8 @@ static void init_functions(void) START_TEST(progress) { INITCOMMONCONTROLSEX iccex; + ULONG_PTR ctx_cookie; + HANDLE hCtx; init_functions(); @@ -307,10 +314,18 @@ START_TEST(progress) pInitCommonControlsEx(&iccex); init(); - + test_redraw(); test_setcolors(); test_PBM_STEPIT(); + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + test_setcolors(); + test_PBM_STEPIT(); + + unload_v6_module(ctx_cookie, hCtx); + cleanup(); }

1 0

Roman Pišl : comctl32/tooltips: Set window size before TTN_SHOW and preserve it after.
by Alexandre Julliard 28 Feb '18

28 Feb '18

Module: wine Branch: master Commit: 4803b7abc9633125d38e2fa4cc099d44fe497edc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4803b7abc9633125d38e2fa4… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Wed Feb 28 09:00:05 2018 +0300 comctl32/tooltips: Set window size before TTN_SHOW and preserve it after. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 1 - dlls/comctl32/tooltips.c | 27 +++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 7f37d5f..af95a56 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -304,7 +304,6 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP break; case TTN_SHOW: GetWindowRect(hdr->hwndFrom, &rect); - todo_wine ok(!EqualRect(&g_ttip_rect, &rect), "Unexpected window rectangle.\n"); break; } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index e5b966a..5460101 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -624,18 +624,10 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) } toolPtr = &infoPtr->tools[nTool]; - - TRACE("Show tooltip %d\n", nTool); - - hdr.hwndFrom = infoPtr->hwndSelf; - hdr.idFrom = toolPtr->uId; - hdr.code = TTN_SHOW; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); - - TRACE("%s\n", debugstr_w(infoPtr->szTipText)); - TOOLTIPS_CalcTipSize (infoPtr, &size); - TRACE("size %d x %d\n", size.cx, size.cy); + + TRACE("Show tooltip %d, %s, size %d x %d\n", nTool, debugstr_w(infoPtr->szTipText), + size.cx, size.cy); if (track_activate && (toolPtr->uFlags & TTF_TRACK)) { @@ -824,9 +816,16 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) * it is no longer needed */ } - SetWindowPos (infoPtr->hwndSelf, HWND_TOPMOST, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, - SWP_SHOWWINDOW | SWP_NOACTIVATE); + SetWindowPos (infoPtr->hwndSelf, NULL, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + + hdr.hwndFrom = infoPtr->hwndSelf; + hdr.idFrom = toolPtr->uId; + hdr.code = TTN_SHOW; + SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); + + SetWindowPos (infoPtr->hwndSelf, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW | SWP_NOACTIVATE); /* repaint the tooltip */ InvalidateRect(infoPtr->hwndSelf, NULL, TRUE);

1 0