wine-commits September 2016

wine-commits@winehq.org

2 participants
430 discussions

Michael Müller : ntdll: Open current working directory with FILE_TRAVERSE access.
by Alexandre Julliard 22 Sep '16

22 Sep '16

Module: wine Branch: master Commit: 6f2f307b1dcc8e4749eee05325961d77e3473fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2f307b1dcc8e4749eee0532… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Sep 21 15:00:41 2016 +0200 ntdll: Open current working directory with FILE_TRAVERSE access. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/directory.c | 50 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/path.c | 3 ++- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index a3af052..512dc6d 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -24,6 +24,28 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winternl.h" + +static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG); + +static void init(void) +{ + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + pNtQueryObject = (void *)GetProcAddress(hntdll, "NtQueryObject"); +} + +#define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,__LINE__) +static void test_granted_access(HANDLE handle, ACCESS_MASK access, int line) +{ + OBJECT_BASIC_INFORMATION obj_info; + NTSTATUS status; + + status = pNtQueryObject(handle, ObjectBasicInformation, &obj_info, + sizeof(obj_info), NULL); + ok_(__FILE__, line)(!status, "NtQueryObject with err: %08x\n", status); + ok_(__FILE__, line)(obj_info.GrantedAccess == access, "Granted access should " + "be 0x%08x, instead of 0x%08x\n", access, obj_info.GrantedAccess); +} /* If you change something in these tests, please do the same * for GetSystemDirectory tests. @@ -424,6 +446,7 @@ static void test_CreateDirectoryW(void) static void test_RemoveDirectoryA(void) { + char curdir[MAX_PATH]; char tmpdir[MAX_PATH]; BOOL ret; @@ -432,6 +455,18 @@ static void test_RemoveDirectoryA(void) ret = CreateDirectoryA(tmpdir, NULL); ok(ret == TRUE, "CreateDirectoryA should always succeed\n"); + GetCurrentDirectoryA(MAX_PATH, curdir); + ok(SetCurrentDirectoryA(tmpdir), "SetCurrentDirectoryA failed\n"); + + SetLastError(0xdeadbeef); + ok(!RemoveDirectoryA(tmpdir), "RemoveDirectoryA succeeded\n"); + ok(GetLastError() == ERROR_SHARING_VIOLATION, + "Expected ERROR_SHARING_VIOLATION, got %u\n", GetLastError()); + + TEST_GRANTED_ACCESS(NtCurrentTeb()->Peb->ProcessParameters->CurrentDirectory.Handle, + FILE_TRAVERSE | SYNCHRONIZE); + + SetCurrentDirectoryA(curdir); ret = RemoveDirectoryA(tmpdir); ok(ret == TRUE, "RemoveDirectoryA should always succeed\n"); @@ -452,6 +487,7 @@ static void test_RemoveDirectoryA(void) static void test_RemoveDirectoryW(void) { + WCHAR curdir[MAX_PATH]; WCHAR tmpdir[MAX_PATH]; BOOL ret; static const WCHAR tmp_dir_name[] = {'P','l','e','a','s','e',' ','R','e','m','o','v','e',' ','M','e',0}; @@ -468,6 +504,18 @@ static void test_RemoveDirectoryW(void) ok(ret == TRUE, "CreateDirectoryW should always succeed\n"); + GetCurrentDirectoryW(MAX_PATH, curdir); + ok(SetCurrentDirectoryW(tmpdir), "SetCurrentDirectoryW failed\n"); + + SetLastError(0xdeadbeef); + ok(!RemoveDirectoryW(tmpdir), "RemoveDirectoryW succeeded\n"); + ok(GetLastError() == ERROR_SHARING_VIOLATION, + "Expected ERROR_SHARING_VIOLATION, got %u\n", GetLastError()); + + TEST_GRANTED_ACCESS(NtCurrentTeb()->Peb->ProcessParameters->CurrentDirectory.Handle, + FILE_TRAVERSE | SYNCHRONIZE); + + SetCurrentDirectoryW(curdir); ret = RemoveDirectoryW(tmpdir); ok(ret == TRUE, "RemoveDirectoryW should always succeed\n"); @@ -495,6 +543,8 @@ static void test_SetCurrentDirectoryA(void) START_TEST(directory) { + init(); + test_GetWindowsDirectoryA(); test_GetWindowsDirectoryW(); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ac4807f..e76ce3f 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -984,7 +984,8 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - nts = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + nts = NtOpenFile( &handle, FILE_TRAVERSE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); if (nts != STATUS_SUCCESS) goto out; /* don't keep the directory handle open on removable media */

1 0

Michael Müller : dsound: Pretend that the driver is certified.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: 6fd36314d051ceff8dbb0f2d442f57983e0bcd65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd36314d051ceff8dbb0f2d4… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Sep 21 13:54:58 2016 +0200 dsound: Pretend that the driver is certified. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index fb9fd66..43b252d 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -367,6 +367,9 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU device->drvcaps.dwFlags |= DSCAPS_SECONDARYMONO | DSCAPS_SECONDARYSTEREO; device->drvcaps.dwFlags |= DSCAPS_CONTINUOUSRATE; + /* pretend that the driver is certified */ + device->drvcaps.dwFlags |= DSCAPS_CERTIFIED; + device->drvcaps.dwPrimaryBuffers = 1; device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX;

1 0

Andrew Kanaber : wined3d: Add id for Broadwell Xeon E3 GPU.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: 6816313387e89c915729783f612a8170becece61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6816313387e89c915729783f6… Author: Andrew Kanaber <akanaber(a)chiark.greenend.org.uk> Date: Tue Sep 20 22:23:34 2016 +0100 wined3d: Add id for Broadwell Xeon E3 GPU. Signed-off-by: Andrew Kanaber <akanaber(a)chiark.greenend.org.uk> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b97cd78..6b019b6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1402,6 +1402,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_IG6100, "Intel(R) Iris(TM) Graphics 6100", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IP6200, "Intel(R) Iris(TM) Pro Graphics 6200", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_IPP6300, "Intel(R) Iris(TM) Pro Graphics P6300", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD520, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD530_1, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD530_2, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, @@ -2021,6 +2022,7 @@ cards_intel[] = {"Iris Pro Graphics P580", CARD_INTEL_IPP580}, {"Skylake", CARD_INTEL_HD520}, /* Broadwell */ + {"Iris Pro P6300", CARD_INTEL_IPP6300}, {"Iris Pro 6200", CARD_INTEL_IP6200}, {"Iris 6100", CARD_INTEL_IG6100}, /* Haswell */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4479837..3b47384 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1993,6 +1993,7 @@ enum wined3d_pci_device CARD_INTEL_HWM = 0x0416, CARD_INTEL_IG6100 = 0x162b, CARD_INTEL_IP6200 = 0x1622, + CARD_INTEL_IPP6300 = 0x162a, CARD_INTEL_HD520 = 0x1916, CARD_INTEL_HD530_1 = 0x1912, CARD_INTEL_HD530_2 = 0x191b,

1 0

André Hentschel : d3d9/tests: Allow D3D_OK for lost device present (Win10).
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: ddc6e027a444bd2b85fad7ef108f103dcb8c182a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc6e027a444bd2b85fad7ef1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 20 23:01:36 2016 +0200 d3d9/tests: Allow D3D_OK for lost device present (Win10). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 05f1580..54699ca 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2042,13 +2042,13 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_MODE_CHANGED || hr == D3D_OK /* Win10 */, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_PresentEx(device, NULL, NULL, NULL, NULL, 0); - todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_MODE_CHANGED || hr == D3D_OK /* Win10 */, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); - todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_MODE_CHANGED || hr == D3D_OK /* Win10 */, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_MODE_CHANGED || hr == D3D_OK /* Win10 */, "Got unexpected hr %#x.\n", hr); hr = reset_device(device, &desc); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Austin English : api-ms-win-core-delayload-l1-1-0: Add dll.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: e9fe20bcde747676b4677f4ac22df58be59139e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9fe20bcde747676b4677f4ac… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Sep 15 21:17:56 2016 -0500 api-ms-win-core-delayload-l1-1-0: Add dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-delayload-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-delayload-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 58fb32f..809116f 100755 --- a/configure +++ b/configure @@ -884,6 +884,7 @@ enable_api_ms_win_core_datetime_l1_1_0 enable_api_ms_win_core_datetime_l1_1_1 enable_api_ms_win_core_debug_l1_1_0 enable_api_ms_win_core_debug_l1_1_1 +enable_api_ms_win_core_delayload_l1_1_0 enable_api_ms_win_core_delayload_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_0 enable_api_ms_win_core_errorhandling_l1_1_1 @@ -17553,6 +17554,7 @@ wine_fn_config_dll api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_dateti wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 wine_fn_config_dll api-ms-win-core-debug-l1-1-0 enable_api_ms_win_core_debug_l1_1_0 wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 +wine_fn_config_dll api-ms-win-core-delayload-l1-1-0 enable_api_ms_win_core_delayload_l1_1_0 wine_fn_config_dll api-ms-win-core-delayload-l1-1-1 enable_api_ms_win_core_delayload_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-0 enable_api_ms_win_core_errorhandling_l1_1_0 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 diff --git a/configure.ac b/configure.ac index a6c9c6d..3433186 100644 --- a/configure.ac +++ b/configure.ac @@ -2660,6 +2660,7 @@ WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-delayload-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-delayload-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) diff --git a/dlls/api-ms-win-core-delayload-l1-1-0/Makefile.in b/dlls/api-ms-win-core-delayload-l1-1-0/Makefile.in new file mode 100644 index 0000000..3a55309 --- /dev/null +++ b/dlls/api-ms-win-core-delayload-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-delayload-l1-1-0.dll diff --git a/dlls/api-ms-win-core-delayload-l1-1-0/api-ms-win-core-delayload-l1-1-0.spec b/dlls/api-ms-win-core-delayload-l1-1-0/api-ms-win-core-delayload-l1-1-0.spec new file mode 100644 index 0000000..ecc42aa --- /dev/null +++ b/dlls/api-ms-win-core-delayload-l1-1-0/api-ms-win-core-delayload-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook diff --git a/tools/make_specfiles b/tools/make_specfiles index 07266d4..37af57f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -130,6 +130,7 @@ my @dll_groups = "api-ms-win-core-atoms-l1-1-0", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1", + "api-ms-win-core-delayload-l1-1-0", "api-ms-win-core-delayload-l1-1-1", "api-ms-win-core-errorhandling-l1-1-0", "api-ms-win-core-errorhandling-l1-1-1",

1 0

Aric Stewart : hid: Stub HidP_TranslateUsagesToI8042ScanCodes.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: b82ce81957a44ac7b80778b5fbe57d3da2c00535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82ce81957a44ac7b80778b5f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 19 08:45:34 2016 -0500 hid: Stub HidP_TranslateUsagesToI8042ScanCodes. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 12 ++++++++++++ include/ddk/hidpi.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 4c5e505..2131af2 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -39,6 +39,6 @@ @ stub HidP_SetUsageValue @ stub HidP_SetUsageValueArray @ stub HidP_SetUsages -@ stub HidP_TranslateUsagesToI8042ScanCodes +@ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) @ stub HidP_UnsetUsages @ stub HidP_UsageListDifference diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 3d7a12e..4a0fa64 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -23,6 +23,7 @@ #include <stdarg.h> #define NONAMELESSUNION +#include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" @@ -519,3 +520,14 @@ ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePag } return count; } + +NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, + ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, + HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, + PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext) +{ + FIXME("stub: %p, %i, %i, %p, %p, %p\n", ChangedUsageList, UsageListLength, + KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 4cfac61..eadc44d 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -136,6 +136,34 @@ typedef struct _HIDP_CAPS USHORT NumberFeatureDataIndices; } HIDP_CAPS, *PHIDP_CAPS; +typedef enum _HIDP_KEYBOARD_DIRECTION { + HidP_Keyboard_Break, + HidP_Keyboard_Make +} HIDP_KEYBOARD_DIRECTION; + +typedef struct _HIDP_KEYBOARD_MODIFIER_STATE { + union { + struct { + ULONG LeftControl: 1; + ULONG LeftShift: 1; + ULONG LeftAlt: 1; + ULONG LeftGUI: 1; + ULONG RightControl: 1; + ULONG RightShift: 1; + ULONG RightAlt: 1; + ULONG RigthGUI: 1; + ULONG CapsLock: 1; + ULONG ScollLock: 1; + ULONG NumLock: 1; + ULONG Reserved: 21; + } DUMMYSTRUCTNAME; + ULONG ul; + } DUMMYUNIONNAME; +} HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE; + +typedef BOOLEAN (NTAPI *PHIDP_INSERT_SCANCODES) (VOID *Context, CHAR *NewScanCodes, ULONG Length); + + NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); @@ -144,6 +172,7 @@ NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0

Aric Stewart : ntoskrnl.exe: Implement removing plug and play devices.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: b8ac3d7684b9990974a60f4f2fcf06d88f9f94f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ac3d7684b9990974a60f4f2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 21 13:38:21 2016 +0200 ntoskrnl.exe: Implement removing plug and play devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 93029a4..522facf 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3064,6 +3064,16 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) } +static void handle_removal_relations( DEVICE_OBJECT *device ) +{ + TRACE_(plugplay)( "(%p)\n", device ); + + send_power_irp( device, PowerDeviceD3 ); + send_pnp_irp( device, IRP_MN_SURPRISE_REMOVAL ); + send_pnp_irp( device, IRP_MN_REMOVE_DEVICE ); +} + + /*********************************************************************** * IoInvalidateDeviceRelations (NTOSKRNL.EXE.@) */ @@ -3076,6 +3086,9 @@ void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RE case BusRelations: handle_bus_relations( device_object ); break; + case RemovalRelations: + handle_removal_relations( device_object ); + break; default: FIXME( "unhandled relation %i\n", type ); break;

1 0

Alexandre Julliard : winex11: Use standard clipboard APIs to retrieve the data to export.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: 96930bdc04fd2f61ba58e7a9ef15170fd8ad1232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96930bdc04fd2f61ba58e7a9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 21 13:34:32 2016 +0900 winex11: Use standard clipboard APIs to retrieve the data to export. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f4c8866..dcb1403 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1744,20 +1744,26 @@ static BOOL export_selection( Display *display, Window win, Atom prop, Atom targ { struct clipboard_format *format = X11DRV_CLIPBOARD_LookupProperty( NULL, target ); HANDLE handle = 0; + BOOL ret = FALSE; if (!format || !format->export) return FALSE; TRACE( "win %lx prop %s target %s exporting %s\n", win, debugstr_xatom( prop ), debugstr_xatom( target ), debugstr_format( format->id ) ); - if (format->id) + if (!format->id) return format->export( display, win, prop, target, 0 ); + + if (!OpenClipboard( 0 )) { - LPWINE_CLIPDATA data = X11DRV_CLIPBOARD_LookupData( format->id ); - if (!data) return FALSE; - if (!X11DRV_CLIPBOARD_RenderFormat( display, data )) return FALSE; - handle = data->hData; + ERR( "failed to open clipboard for %s\n", debugstr_format( format->id )); + return FALSE; } - return format->export( display, win, prop, target, handle ); + + if ((handle = GetClipboardData( format->id ))) + ret = format->export( display, win, prop, target, handle ); + + CloseClipboard(); + return ret; }

1 0

Alexandre Julliard : winex11: Reimplement targets enumeration using standard clipboard APIs.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: 8e5ee4474f3a733c592b182a9778d1b5bc80af4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5ee4474f3a733c592b182a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 21 12:10:32 2016 +0900 winex11: Reimplement targets enumeration using standard clipboard APIs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 147 ++++++++++++++++++++++++------------------- 1 file changed, 82 insertions(+), 65 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 62171d2..f4c8866 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2,10 +2,11 @@ * X11 clipboard windows driver * * Copyright 1994 Martin Ayotte - * 1996 Alex Korobka - * 1999 Noel Borthwick - * 2003 Ulrich Czekalla for CodeWeavers - * 2014 Damjan Jovanovic + * Copyright 1996 Alex Korobka + * Copyright 1999 Noel Borthwick + * Copyright 2003 Ulrich Czekalla for CodeWeavers + * Copyright 2014 Damjan Jovanovic + * Copyright 2016 Alexandre Julliard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -211,6 +212,7 @@ static const struct static struct list format_list = LIST_INIT( format_list ); +#define NB_BUILTIN_FORMATS (sizeof(builtin_formats) / sizeof(builtin_formats[0])) #define GET_ATOM(prop) (((prop) < FIRST_XATOM) ? (Atom)(prop) : X11DRV_Atoms[(prop) - FIRST_XATOM]) @@ -306,13 +308,12 @@ static const char *debugstr_xatom( Atom atom ) */ void X11DRV_InitClipboard(void) { - static const unsigned int count = sizeof(builtin_formats) / sizeof(builtin_formats[0]); struct clipboard_format *formats; UINT i; - if (!(formats = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*formats)))) return; + if (!(formats = HeapAlloc( GetProcessHeap(), 0, NB_BUILTIN_FORMATS * sizeof(*formats)))) return; - for (i = 0; i < count; i++) + for (i = 0; i < NB_BUILTIN_FORMATS; i++) { if (builtin_formats[i].name) formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); @@ -1660,6 +1661,80 @@ failed: } +/*********************************************************************** + * get_clipboard_formats + * + * Return a list of all formats currently available on the Win32 clipboard. + * Helper for export_targets. + */ +static UINT *get_clipboard_formats( UINT *size ) +{ + UINT *ids; + + *size = 256; + for (;;) + { + if (!(ids = HeapAlloc( GetProcessHeap(), 0, *size * sizeof(*ids) ))) return NULL; + if (GetUpdatedClipboardFormats( ids, *size, size )) break; + HeapFree( GetProcessHeap(), 0, ids ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; + } + return ids; +} + + +/*********************************************************************** + * is_format_available + * + * Check if a clipboard format is included in the list. + * Helper for export_targets. + */ +static BOOL is_format_available( UINT format, const UINT *ids, unsigned int count ) +{ + while (count--) if (*ids++ == format) return TRUE; + return FALSE; +} + + +/*********************************************************************** + * export_targets + * + * Service a TARGETS selection request event + */ +static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +{ + struct clipboard_format *format; + UINT pos, count, *formats; + Atom *targets; + + intern_atoms(); + + if (!(formats = get_clipboard_formats( &count ))) return FALSE; + + /* the builtin formats contain duplicates, so allocate some extra space */ + if (!(targets = HeapAlloc( GetProcessHeap(), 0, (count + NB_BUILTIN_FORMATS) * sizeof(*targets) ))) + { + HeapFree( GetProcessHeap(), 0, formats ); + return FALSE; + } + + pos = 0; + LIST_FOR_EACH_ENTRY( format, &format_list, struct clipboard_format, entry ) + { + if (!format->export) continue; + /* formats with id==0 are always exported */ + if (format->id && !is_format_available( format->id, formats, count )) continue; + TRACE( "%d: %s -> %s\n", pos, debugstr_format( format->id ), debugstr_xatom( format->atom )); + targets[pos++] = format->atom; + } + + put_property( display, win, prop, XA_ATOM, 32, targets, pos ); + HeapFree( GetProcessHeap(), 0, targets ); + HeapFree( GetProcessHeap(), 0, formats ); + return TRUE; +} + + /************************************************************************** * export_selection * @@ -2485,64 +2560,6 @@ void X11DRV_ResetSelectionOwner(void) /*********************************************************************** - * export_targets - * - * Service a TARGETS selection request event - */ -static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) -{ - UINT i; - Atom* targets; - ULONG cTargets; - LPWINE_CLIPFORMAT format; - LPWINE_CLIPDATA lpData; - - /* Create X atoms for any clipboard types which don't have atoms yet. - * This avoids sending bogus zero atoms. - * Without this, copying might not have access to all clipboard types. - * FIXME: is it safe to call this here? - */ - intern_atoms(); - - /* - * Count the number of items we wish to expose as selection targets. - */ - cTargets = 1; /* Include TARGETS */ - - if (!list_head( &data_list )) return FALSE; - - LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry ) - LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if (format->id == lpData->wFormatID && format->export && format->atom) - cTargets++; - - TRACE(" found %d formats\n", cTargets); - - /* Allocate temp buffer */ - targets = HeapAlloc( GetProcessHeap(), 0, cTargets * sizeof(Atom)); - if(targets == NULL) - return FALSE; - - i = 0; - targets[i++] = x11drv_atom(TARGETS); - - LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry ) - LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if (format->id == lpData->wFormatID && format->export && format->atom) - { - TRACE( "%d: %s -> %s\n", i, debugstr_format( format->id ), - debugstr_xatom( format->atom )); - targets[i++] = format->atom; - } - - put_property( display, win, prop, XA_ATOM, 32, targets, cTargets ); - - HeapFree(GetProcessHeap(), 0, targets); - return TRUE; -} - - -/*********************************************************************** * X11DRV_HandleSelectionRequest */ BOOL X11DRV_SelectionRequest( HWND hwnd, XEvent *xev )

1 0

Alexandre Julliard : winex11: Use a standard export function to handle TARGETS requests.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: d1f539ac0045bfd87e475f7a8d99cd293e432f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f539ac0045bfd87e475f7a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 21 12:04:07 2016 +0900 winex11: Use a standard export function to handle TARGETS requests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index e0fde76..62171d2 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -145,6 +145,7 @@ static BOOL export_metafile( Display *display, Window win, Atom prop, Atom targe static BOOL export_enhmetafile( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); +static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData); @@ -204,6 +205,7 @@ static const struct { PNGW, 0, XATOM_image_png, import_data, export_data }, { HTMLFormatW, 0, XATOM_HTML_Format, import_data, export_data }, { HTMLFormatW, 0, XATOM_text_html, import_data, export_text_html }, + { 0, 0, XATOM_TARGETS, NULL, export_targets }, { 0, 0, XATOM_MULTIPLE, NULL, export_multiple }, }; @@ -2483,11 +2485,11 @@ void X11DRV_ResetSelectionOwner(void) /*********************************************************************** - * X11DRV_SelectionRequest_TARGETS + * export_targets + * * Service a TARGETS selection request event */ -static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, - Atom target, Atom rprop ) +static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) { UINT i; Atom* targets; @@ -2507,7 +2509,7 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, */ cTargets = 1; /* Include TARGETS */ - if (!list_head( &data_list )) return None; + if (!list_head( &data_list )) return FALSE; LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry ) LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) @@ -2519,7 +2521,7 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, /* Allocate temp buffer */ targets = HeapAlloc( GetProcessHeap(), 0, cTargets * sizeof(Atom)); if(targets == NULL) - return None; + return FALSE; i = 0; targets[i++] = x11drv_atom(TARGETS); @@ -2533,11 +2535,10 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, targets[i++] = format->atom; } - put_property( display, requestor, rprop, XA_ATOM, 32, targets, cTargets ); + put_property( display, win, prop, XA_ATOM, 32, targets, cTargets ); HeapFree(GetProcessHeap(), 0, targets); - - return rprop; + return TRUE; } @@ -2550,7 +2551,6 @@ BOOL X11DRV_SelectionRequest( HWND hwnd, XEvent *xev ) Display *display = event->display; XEvent result; Atom rprop = None; - Window request = event->requestor; X11DRV_expect_error( display, is_window_error, NULL ); @@ -2568,12 +2568,7 @@ BOOL X11DRV_SelectionRequest( HWND hwnd, XEvent *xev ) if( rprop == None ) rprop = event->target; - if(event->target == x11drv_atom(TARGETS)) /* Return a list of all supported targets */ - { - /* TARGETS selection request */ - rprop = X11DRV_SelectionRequest_TARGETS( display, request, event->target, rprop ); - } - else if (!export_selection( display, event->requestor, rprop, event->target )) + if (!export_selection( display, event->requestor, rprop, event->target )) rprop = None; /* report failure to client */ done:

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2016