January 2017 - Wine-commits

Henri Verbeet : wined3d: Only store light type counts in struct wined3d_ffp_vs_settings.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 7757ecfc702c243028e5bfd1a95955ed08f16164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7757ecfc702c243028e5bfd1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 13:25:21 2017 +0100 wined3d: Only store light type counts in struct wined3d_ffp_vs_settings. The ordering doesn't matter, so this avoids creating some redundant shader variants. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 308 ++++++++++++++++++++++++----------------- dlls/wined3d/utils.c | 24 +++- dlls/wined3d/wined3d_private.h | 12 +- 3 files changed, 207 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7757ecfc702c243028e5b…

1 0

Marcus Meissner : maintainers: Add myself for gphoto2.ds.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 356a5261e1e20393ce1c7f535c5849abeb58ddb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=356a5261e1e20393ce1c7f535… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Jan 26 13:29:57 2017 +0100 maintainers: Add myself for gphoto2.ds. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 46e4273..f936afe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -118,6 +118,10 @@ GDIPlus M: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/gdiplus/ +GPhoto Driver +M: Marcus Meissner <marcus(a)jet.franken.de> +F: dlls/gphoto2.ds/ + HID support M: Aric Stewart <aric(a)codeweavers.com> F: dlls/hid/

1 0

André Hentschel : compstui: Fix SetCPSUIUserData spec file entry.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 1791b7d6ad7a9a08ef702c4b6676ab779f3b5b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1791b7d6ad7a9a08ef702c4b6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:49 2017 +0100 compstui: Fix SetCPSUIUserData spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compstui/compstui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/compstui/compstui.spec b/dlls/compstui/compstui.spec index 08fdb47..7ba72a5 100644 --- a/dlls/compstui/compstui.spec +++ b/dlls/compstui/compstui.spec @@ -1,4 +1,4 @@ @ stdcall CommonPropertySheetUIA(long ptr long ptr) @ stdcall CommonPropertySheetUIW(long ptr long ptr) @ stdcall GetCPSUIUserData(long) -@ stdcall SetCPSUIUserData(long ptr) +@ stdcall SetCPSUIUserData(long long)

1 0

André Hentschel : iphlpapi: Fix GetBestRoute spec file entry.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 5262696e21c4af4c77d692306671a2fa22571962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5262696e21c4af4c77d692306… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:50 2017 +0100 iphlpapi: Fix GetBestRoute spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 4be42fe..500267c 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -76,7 +76,7 @@ @ stdcall GetBestInterface( long ptr ) @ stdcall GetBestInterfaceEx( ptr ptr ) @ stub GetBestInterfaceFromStack -@ stdcall GetBestRoute( long long long ) +@ stdcall GetBestRoute( long long ptr ) #@ stub GetBestRoute2 @ stub GetBestRouteFromStack #@ stub GetCurrentThreadCompartmentId

1 0

Aric Stewart : hid: Implement HidD_GetNumInputBuffers.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: fbd3525e249b858b3f811499c4b38cdf1f2694f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd3525e249b858b3f811499c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 25 07:04:20 2017 -0600 hid: Implement HidD_GetNumInputBuffers. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index d5dd734..b1b6a35 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -8,7 +8,7 @@ @ stdcall HidD_GetInputReport(long ptr long) @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor -@ stub HidD_GetNumInputBuffers +@ stdcall HidD_GetNumInputBuffers(long ptr) @ stub HidD_GetPhysicalDescriptor @ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 99665dd..1161f0c 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -87,6 +87,12 @@ BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); } +BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers) +{ + TRACE("(%p %p)\n", HidDeviceObject, NumberBuffers); + return DeviceIoControl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL, NULL); +} + BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 8b3b5a2..71e50a9 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -38,6 +38,7 @@ BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); +BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength);

1 0

Aric Stewart : hid: Implement HidP_GetUsagesEx.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: cc00075a65e0a3c1e93418daeb2a22dd6fede377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc00075a65e0a3c1e93418dae… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 25 07:07:04 2017 -0600 hid: Implement HidP_GetUsagesEx. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 6 ++++ 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index b1b6a35..205b626 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -29,7 +29,7 @@ @ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) @ stub HidP_GetUsageValueArray @ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) -@ stub HidP_GetUsagesEx +@ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) @ stdcall HidP_GetValueCaps(long ptr ptr ptr) @ stdcall HidP_InitializeReportForID(long long ptr ptr long) @ stub HidP_MaxDataListLength diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 9dcdeb6..d031b67 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -676,3 +676,90 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, return HIDP_STATUS_SUCCESS; } + +NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, + ULONG *UsageLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength) +{ + WINE_HIDP_PREPARSED_DATA *data = (WINE_HIDP_PREPARSED_DATA*)PreparsedData; + WINE_HID_REPORT *report = NULL; + USHORT b_count = 0, r_count = 0; + int i,uCount = 0; + NTSTATUS rc; + + TRACE("(%i, %i, %p, %p(%i), %p, %p, %i)\n", ReportType, LinkCollection, ButtonList, + UsageLength, *UsageLength, PreparsedData, Report, ReportLength); + + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + + switch(ReportType) + { + case HidP_Input: + b_count = data->caps.NumberInputButtonCaps; + r_count = data->dwInputReportCount; + report = HID_INPUT_REPORTS(data); + break; + case HidP_Output: + b_count = data->caps.NumberOutputButtonCaps; + r_count = data->dwOutputReportCount; + report = HID_OUTPUT_REPORTS(data); + break; + case HidP_Feature: + b_count = data->caps.NumberFeatureButtonCaps; + r_count = data->dwFeatureReportCount; + report = HID_FEATURE_REPORTS(data); + break; + default: + return HIDP_STATUS_INVALID_REPORT_TYPE; + } + + if (!r_count || !b_count || !report) + return HIDP_STATUS_USAGE_NOT_FOUND; + + for (i = 0; i < r_count; i++) + { + if (!report->reportID || report->reportID == Report[0]) + break; + report = HID_NEXT_REPORT(data, report); + } + + if (i == r_count) + return HIDP_STATUS_REPORT_DOES_NOT_EXIST; + + for (i = 0; i < report->elementCount; i++) + { + if (report->Elements[i].ElementType == ButtonElement) + { + int k; + WINE_HID_ELEMENT *element = &report->Elements[i]; + for (k=0; k < element->bitCount; k++) + { + UINT v = 0; + NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, + element->valueStartBit + k, 1, &v); + if (rc != HIDP_STATUS_SUCCESS) + return rc; + if (v) + { + if (uCount < *UsageLength) + { + ButtonList[uCount].Usage = element->caps.button.u.Range.UsageMin + k; + ButtonList[uCount].UsagePage = element->caps.button.UsagePage; + } + uCount++; + } + } + } + } + + TRACE("Returning %i usages\n", uCount); + + if (*UsageLength < uCount) + rc = HIDP_STATUS_BUFFER_TOO_SMALL; + else + rc = HIDP_STATUS_SUCCESS; + + *UsageLength = uCount; + + return rc; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 9f0fd8f..2b0eebd 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -161,6 +161,11 @@ typedef struct _HIDP_KEYBOARD_MODIFIER_STATE { } DUMMYUNIONNAME; } HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE; +typedef struct _USAGE_AND_PAGE { + USAGE Usage; + USAGE UsagePage; +} USAGE_AND_PAGE, *PUSAGE_AND_PAGE; + typedef BOOLEAN (NTAPI *PHIDP_INSERT_SCANCODES) (VOID *Context, CHAR *NewScanCodes, ULONG Length); @@ -175,6 +180,7 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext); NTSTATUS WINAPI HidP_GetSpecificButtonCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_BUTTON_CAPS *ButtonCaps, USHORT *ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_VALUE_CAPS *ValueCaps, USHORT *ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); +NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, ULONG *UsageLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0

Aric Stewart : hid/tests: Add HID device enumeration test.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 178400b2bf4840dd1b370dfd8af652ed9f332f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=178400b2bf4840dd1b370dfd8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 25 07:19:23 2017 -0600 hid/tests: Add HID device enumeration test. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/hid/tests/Makefile.in | 5 +++ dlls/hid/tests/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+) diff --git a/configure b/configure index 1a96117..5bfad88 100755 --- a/configure +++ b/configure @@ -17995,6 +17995,7 @@ wine_fn_config_dll gpkcsp enable_gpkcsp wine_fn_config_dll hal enable_hal wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx clean,implib htmlhelp wine_fn_config_dll hid enable_hid implib +wine_fn_config_test dlls/hid/tests hid_test wine_fn_config_dll hidclass.sys enable_hidclass_sys implib hidclass wine_fn_config_dll hlink enable_hlink clean,implib wine_fn_config_test dlls/hlink/tests hlink_test diff --git a/configure.ac b/configure.ac index 353f271..d468bbe 100644 --- a/configure.ac +++ b/configure.ac @@ -3056,6 +3056,7 @@ WINE_CONFIG_DLL(gpkcsp) WINE_CONFIG_DLL(hal) WINE_CONFIG_DLL(hhctrl.ocx,,[clean,implib],[htmlhelp]) WINE_CONFIG_DLL(hid,,[implib]) +WINE_CONFIG_TEST(dlls/hid/tests) WINE_CONFIG_DLL(hidclass.sys,,[implib],[hidclass]) WINE_CONFIG_DLL(hlink,,[clean,implib]) WINE_CONFIG_TEST(dlls/hlink/tests) diff --git a/dlls/hid/tests/Makefile.in b/dlls/hid/tests/Makefile.in new file mode 100644 index 0000000..6bf3773 --- /dev/null +++ b/dlls/hid/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = hid.dll +IMPORTS = hid setupapi + +C_SRCS = \ + device.c diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c new file mode 100644 index 0000000..068360a --- /dev/null +++ b/dlls/hid/tests/device.c @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2017 Aric Stewart + * + * 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 "ntstatus.h" +#define WIN32_NO_STATUS +#include "windows.h" +#include "setupapi.h" +#include "ddk/hidsdi.h" + +#include "wine/test.h" + +typedef void (device_test)(HANDLE device); + +static void test_device_info(HANDLE device) +{ + PHIDP_PREPARSED_DATA ppd; + HIDP_CAPS Caps; + NTSTATUS status; + BOOL rc; + WCHAR device_name[128]; + + rc = HidD_GetPreparsedData(device, &ppd); + ok(rc, "Failed to get preparsed data(0x%x)\n", GetLastError()); + status = HidP_GetCaps(ppd, &Caps); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get Caps(0x%x)\n", status); + rc = HidD_GetProductString(device, device_name, sizeof(device_name)); + ok(rc, "Failed to get product string(0x%x)\n", GetLastError()); + trace("Found device %s (%02x, %02x)\n", wine_dbgstr_w(device_name), Caps.UsagePage, Caps.Usage); + rc = HidD_FreePreparsedData(ppd); + ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); +} + +static void run_for_each_device(device_test *test) +{ + GUID hid_guid; + HDEVINFO info_set; + DWORD index = 0; + SP_DEVICE_INTERFACE_DATA interface_data; + DWORD detail_size = MAX_PATH * sizeof(WCHAR); + SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; + + HidD_GetHidGuid(&hid_guid); + + ZeroMemory(&interface_data, sizeof(interface_data)); + interface_data.cbSize = sizeof(interface_data); + + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) + detail_size); + data->cbSize = sizeof(*data); + + info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE); + while (SetupDiEnumDeviceInterfaces(info_set, NULL, &hid_guid, index, &interface_data)) + { + index ++; + + if (SetupDiGetDeviceInterfaceDetailW(info_set, &interface_data, data, sizeof(*data) + detail_size, NULL, NULL)) + { + HANDLE file = CreateFileW(data->DevicePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + { + trace("Failed to access device %s, likely not plugged in or access is denied.\n", wine_dbgstr_w(data->DevicePath)); + continue; + } + + test(file); + + CloseHandle(file); + } + } + HeapFree(GetProcessHeap(), 0, data); + SetupDiDestroyDeviceInfoList(info_set); +} + +START_TEST(device) +{ + run_for_each_device(test_device_info); +}

1 0

Andrey Gusev : ntdll: Move UnregisterTraceGuids from advapi32 to ntdll.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 03d22addd12dfc752448cbae6ee738ad1576bbef URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d22addd12dfc752448cbae6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 25 17:18:43 2017 +0200 ntdll: Move UnregisterTraceGuids from advapi32 to ntdll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 14 -------------- dlls/ntdll/misc.c | 12 ++++++++++++ dlls/ntdll/ntdll.spec | 1 + 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 8e2911c..3bd6382 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -783,7 +783,7 @@ # @ stub UninstallApplication @ stdcall UnlockServiceDatabase (ptr) # @ stub UnregisterIdleTask -@ stdcall UnregisterTraceGuids(int64) +@ stdcall UnregisterTraceGuids(int64) ntdll.EtwUnregisterTraceGuids @ stub UpdateTraceA @ stub UpdateTraceW # @ stub UsePinForEncryptedFilesA diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index c1dbb99..93d814c 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -815,20 +815,6 @@ ULONG WINAPI TraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER EventTra } /****************************************************************************** - * UnregisterTraceGuids [ADVAPI32.@] - * - * See RegisterTraceGuids - * - * FIXME - * Stub. - */ -ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) -{ - FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -/****************************************************************************** * EventEnabled [ADVAPI32.@] * */ diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index ceb82f6..40a8785 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -445,3 +445,15 @@ ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, debugstr_a(MofResourceName), RegistrationHandle); return ERROR_SUCCESS; } + +/****************************************************************************** + * EtwUnregisterTraceGuids (NTDLL.@) + */ +ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) +{ + if (!RegistrationHandle) + return ERROR_INVALID_PARAMETER; + + FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); + return ERROR_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index fc6074c..28dc60c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -46,6 +46,7 @@ @ stdcall EtwEventUnregister(int64) @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) +@ stdcall EtwUnregisterTraceGuids(int64) # @ stub KiFastSystemCall # @ stub KiFastSystemCallRet # @ stub KiIntSystemCall

1 0

Nikolay Sivov : comctl32/toolbar: Fix TB_SETDRAWTEXTFLAGS handler.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 970029bb9ba33928bb20c5e397d47f023e4a6501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=970029bb9ba33928bb20c5e39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 22:50:54 2017 +0300 comctl32/toolbar: Fix TB_SETDRAWTEXTFLAGS handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 13 ++++++------- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f2f7924..a8bcd40 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2367,6 +2367,47 @@ static void test_save(void) RegCloseKey( key ); } +static void test_drawtext_flags(void) +{ + HWND hwnd = NULL; + UINT flags; + + rebuild_toolbar(&hwnd); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + + /* zero mask, flags are retained */ + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, DT_BOTTOM); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + /* set/remove */ + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, DT_BOTTOM); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, 0); +todo_wine + ok(flags == DT_BOTTOM, "Unexpected draw text flags %#x\n", flags); + ok(flags & DT_BOTTOM, "Expected DT_BOTTOM style, %#x\n", flags); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + DestroyWindow(hwnd); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2411,6 +2452,7 @@ START_TEST(toolbar) test_TB_GET_SET_EXTENDEDSTYLE(); test_noresize(); test_save(); + test_drawtext_flags(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 0c545a2..784745c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4546,17 +4546,16 @@ TOOLBAR_SetDisabledImageList (TOOLBAR_INFO *infoPtr, WPARAM wParam, HIMAGELIST h static LRESULT -TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, DWORD mask, DWORD flags) { - DWORD dwTemp; + DWORD old_flags; - TRACE("hwnd = %p, dwMask = 0x%08x, dwDTFlags = 0x%08x\n", infoPtr->hwndSelf, (DWORD)wParam, (DWORD)lParam); + TRACE("hwnd = %p, mask = 0x%08x, flags = 0x%08x\n", infoPtr->hwndSelf, mask, flags); - dwTemp = infoPtr->dwDTFlags; - infoPtr->dwDTFlags = - (infoPtr->dwDTFlags & (DWORD)wParam) | (DWORD)lParam; + old_flags = infoPtr->dwDTFlags; + infoPtr->dwDTFlags = (old_flags & ~mask) | (flags & mask); - return (LRESULT)dwTemp; + return (LRESULT)old_flags; } /* This function differs a bit from what MSDN says it does:

1 0

Nikolay Sivov : shell32/shellview: Get rid of intermediate pointer array when filling ListView.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: a26d6e375e394f7672555c2ae51fd5aaa03d0525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26d6e375e394f7672555c2ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 22:51:30 2017 +0300 shell32/shellview: Get rid of intermediate pointer array when filling ListView. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 83 ++++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 53 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 4560162..c15a32d 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -110,6 +110,7 @@ typedef struct LONG iDragOverItem; /* Dragged over item's index, iff pCurDropTarget != NULL */ UINT cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ POINT ptLastMousePos; /* Mouse position at last DragOver call */ + UINT columns; /* Number of shell folder columns */ } IShellViewImpl; static inline IShellViewImpl *impl_from_IShellView3(IShellView3 *iface) @@ -383,7 +384,6 @@ static void ShellView_InitList(IShellViewImpl *This) SHELLDETAILS sd; WCHAR nameW[50]; HRESULT hr; - INT i; TRACE("(%p)\n", This); @@ -405,39 +405,36 @@ static void ShellView_InitList(IShellViewImpl *This) } } - for (i = 0; 1; i++) + for (This->columns = 0;; This->columns++) { if (This->pSF2Parent) - hr = IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, i, &sd); + hr = IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, This->columns, &sd); else - hr = IShellDetails_GetDetailsOf(details, NULL, i, &sd); + hr = IShellDetails_GetDetailsOf(details, NULL, This->columns, &sd); if (FAILED(hr)) break; lvColumn.fmt = sd.fmt; lvColumn.cx = sd.cxChar*8; /* chars->pixel */ StrRetToStrNW(nameW, sizeof(nameW)/sizeof(WCHAR), &sd.str, NULL); - SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, i, (LPARAM) &lvColumn); + SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, This->columns, (LPARAM)&lvColumn); } if (details) IShellDetails_Release(details); } -/********************************************************** -* ShellView_CompareItems() -* -* NOTES -* internal, CALLBACK for DSA_Sort -*/ -static INT CALLBACK ShellView_CompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData) +/* LVM_SORTITEMS callback used when initially inserting items */ +static INT CALLBACK ShellView_CompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData) { - int ret; - TRACE("pidl1=%p pidl2=%p lpsf=%p\n", lParam1, lParam2, (LPVOID) lpData); + LPITEMIDLIST pidl1 = (LPITEMIDLIST)lParam1; + LPITEMIDLIST pidl2 = (LPITEMIDLIST)lParam2; + IShellFolder *folder = (IShellFolder *)lpData; + int ret; - if(!lpData) return 0; + TRACE("pidl1=%p, pidl2=%p, shellfolder=%p\n", pidl1, pidl2, folder); - ret = (SHORT) SCODE_CODE(IShellFolder_CompareIDs((LPSHELLFOLDER)lpData, 0, (LPITEMIDLIST)lParam1, (LPITEMIDLIST)lParam2)); - TRACE("ret=%i\n",ret); - return ret; + ret = (SHORT)HRESULT_CODE(IShellFolder_CompareIDs(folder, 0, pidl1, pidl2)); + TRACE("ret=%i\n", ret); + return ret; } /************************************************************************* @@ -568,19 +565,19 @@ static int LV_FindItemByPidl( /********************************************************** * LV_AddItem() */ -static BOOLEAN LV_AddItem(IShellViewImpl * This, LPCITEMIDLIST pidl) +static void shellview_add_item(IShellViewImpl * This, LPCITEMIDLIST pidl) { LVITEMW lvItem; TRACE("(%p)(pidl=%p)\n", This, pidl); lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; /*set the mask*/ - lvItem.iItem = SendMessageW(This->hWndList, LVM_GETITEMCOUNT, 0, 0); /*add the item to the end of the list*/ + lvItem.iItem = 0; lvItem.iSubItem = 0; - lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidl)); /*set the item's data*/ + lvItem.lParam = (LPARAM)pidl; lvItem.pszText = LPSTR_TEXTCALLBACKW; /*get text on a callback basis*/ lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/ - return ListView_InsertItemW(This->hWndList, &lvItem) != -1; + ListView_InsertItemW(This->hWndList, &lvItem); } /********************************************************** @@ -618,16 +615,6 @@ static BOOLEAN LV_RenameItem(IShellViewImpl * This, LPCITEMIDLIST pidlOld, LPCIT * - fills the list into the view */ -static INT CALLBACK fill_list( LPVOID ptr, LPVOID arg ) -{ - LPITEMIDLIST pidl = ptr; - IShellViewImpl *This = arg; - /* in a commdlg This works as a filemask*/ - if ( IncludeObject(This, pidl)==S_OK ) LV_AddItem(This, pidl); - SHFree(pidl); - return TRUE; -} - static HRESULT ShellView_FillList(IShellViewImpl *This) { IFolderView2 *folderview = &This->IFolderView2_iface; @@ -635,40 +622,28 @@ static HRESULT ShellView_FillList(IShellViewImpl *This) LPITEMIDLIST pidl; DWORD fetched; HRESULT hr; - HDPA hdpa; TRACE("(%p)\n", This); /* get the itemlist from the shfolder*/ hr = IShellFolder_EnumObjects(This->pSFParent, This->hWnd, SHCONTF_NONFOLDERS | SHCONTF_FOLDERS, &pEnumIDList); - if (hr != S_OK) return hr; + if (hr != S_OK) + return hr; - /* create a pointer array */ - hdpa = DPA_Create(16); - if (!hdpa) - { - IEnumIDList_Release(pEnumIDList); - return E_OUTOFMEMORY; - } + IFolderView2_SetRedraw(folderview, FALSE); - /* copy the items into the array*/ - while((S_OK == IEnumIDList_Next(pEnumIDList, 1, &pidl, &fetched)) && fetched) + /* copy the items into the array */ + while ((S_OK == IEnumIDList_Next(pEnumIDList, 1, &pidl, &fetched)) && fetched) { - if (DPA_InsertPtr(hdpa, DPA_GetPtrCount(hdpa), pidl) == -1) - { - SHFree(pidl); - } + if (IncludeObject(This, pidl) == S_OK) + shellview_add_item(This, pidl); } - /* sort the array */ - DPA_Sort(hdpa, ShellView_CompareItems, (LPARAM)This->pSFParent); + SendMessageW(This->hWndList, LVM_SORTITEMS, (WPARAM)This->pSFParent, (LPARAM)ShellView_CompareItems); - IFolderView2_SetRedraw(folderview, FALSE); - DPA_DestroyCallback(hdpa, fill_list, This); IFolderView2_SetRedraw(folderview, TRUE); IEnumIDList_Release(pEnumIDList); - return S_OK; } @@ -1626,6 +1601,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn static LRESULT ShellView_OnChange(IShellViewImpl * This, const LPCITEMIDLIST *pidls, LONG event) { + LPCITEMIDLIST pidl; BOOL ret = TRUE; TRACE("(%p)->(%p, %p, 0x%08x)\n", This, pidls[0], pidls[1], event); @@ -1634,7 +1610,8 @@ static LRESULT ShellView_OnChange(IShellViewImpl * This, const LPCITEMIDLIST *pi { case SHCNE_MKDIR: case SHCNE_CREATE: - LV_AddItem(This, pidls[0]); + pidl = ILClone(ILFindLastID(pidls[0])); + shellview_add_item(This, pidl); break; case SHCNE_RMDIR: case SHCNE_DELETE:

1 0