December 2016 - Wine-Commits

Matteo Bruni : wined3d: Recognize a couple of Haswell / Broadwell GPUs on macOS.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: e8caceda7059474499420ef940928ed2abf4e9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8caceda7059474499420ef94… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 14 00:03:34 2016 +0200 wined3d: Recognize a couple of Haswell / Broadwell GPUs on macOS. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bdc3df38ed1129d6b0dd6a55446322cf64acc138) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6fe1cdb..364082d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2009,8 +2009,10 @@ cards_intel[] = /* Broadwell */ {"Iris Pro 6200", CARD_INTEL_IP6200}, {"Iris 6100", CARD_INTEL_IG6100}, + {"Iris(TM) Graphics 6100", CARD_INTEL_IG6100}, /* MacOS */ /* Haswell */ {"Haswell Mobile", CARD_INTEL_HWM}, + {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ {"Ivybridge Server", CARD_INTEL_IVBS}, {"Ivybridge Mobile", CARD_INTEL_IVBM},

1 0

Jacek Caban : vbscript: Call GetItemInfo() with original item name.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: a1f860a4d80d34f65deb2376cb56ff47096df2d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f860a4d80d34f65deb2376c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 7 14:08:17 2016 +0100 vbscript: Call GetItemInfo() with original item name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c46dbfb131958849ac5fa5eab5703ad404cd0c6e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/interp.c | 2 +- dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index bc34860..02180d9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -183,7 +183,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ if(!item->disp) { IUnknown *unk; - hres = IActiveScriptSite_GetItemInfo(ctx->script->site, name, SCRIPTINFO_IUNKNOWN, &unk, NULL); + hres = IActiveScriptSite_GetItemInfo(ctx->script->site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL); if(FAILED(hres)) { WARN("GetItemInfo failed: %08x\n", hres); continue; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index d8c5467..0209106 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2126,6 +2126,12 @@ static void run_tests(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_af(0, "TEST.reportSuccess()"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + SET_EXPECT(global_vbvar_d); SET_EXPECT(global_vbvar_i); parse_script_a("Option Explicit\nvbvar = 3");

1 0

Austin English : ntoskrnl.exe: Add IoAttachDevice stub.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 921409f712c0b306fe6a4976ec55e94d75be0beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=921409f712c0b306fe6a4976e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 11 21:59:22 2016 -0500 ntoskrnl.exe: Add IoAttachDevice stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0e5fdf0e00c72bd9e6129823d6ee3c69a74378a8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6b0ea0c..871daa9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2426,3 +2426,12 @@ NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE waitmode, BOOLEAN alertab FIXME("(%u, %u, %p): stub\n", waitmode, alertable, interval); return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * IoAttachDevice (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoAttachDevice(DEVICE_OBJECT *source, UNICODE_STRING *target, DEVICE_OBJECT *attached) +{ + FIXME("(%p, %s, %p): stub\n", source, debugstr_us(target), attached); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b32c5e8..b684595 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -315,7 +315,7 @@ @ stdcall IoAllocateMdl(ptr long long long ptr) @ stdcall IoAllocateWorkItem(ptr) @ stub IoAssignResources -@ stub IoAttachDevice +@ stdcall IoAttachDevice(ptr ptr ptr) @ stub IoAttachDeviceByPointer @ stdcall IoAttachDeviceToDeviceStack(ptr ptr) @ stub IoAttachDeviceToDeviceStackSafe

1 0

Michael Müller : ntdll: Open current working directory with FILE_TRAVERSE access.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: fffa143180de3889cc670be59201be741f7c0775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffa143180de3889cc670be59… 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> (cherry picked from commit 6f2f307b1dcc8e4749eee05325961d77e3473fe1) Signed-off-by: Michael Stefaniuc <mstefani(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 9baae47..316c2e2 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. @@ -417,6 +439,7 @@ static void test_CreateDirectoryW(void) static void test_RemoveDirectoryA(void) { + char curdir[MAX_PATH]; char tmpdir[MAX_PATH]; BOOL ret; @@ -425,6 +448,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"); @@ -445,6 +480,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}; @@ -461,6 +497,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"); @@ -488,6 +536,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 ae0646a..de7366c 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

Aric Stewart : hid: Stub HidP_TranslateUsagesToI8042ScanCodes.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: a39c74dc1d12ca6ccf6e297e6b170858f32bf910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39c74dc1d12ca6ccf6e297e6… 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> (cherry picked from commit b82ce81957a44ac7b80778b5fbe57d3da2c00535) Signed-off-by: Michael Stefaniuc <mstefani(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 e416762..76df40d 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

Daniel Lehman : ucrtbase: Add __stdio_common_vfwprintf.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 0b548ab7a83cd4ce8b32e55bb4cff2dd95f4d7c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b548ab7a83cd4ce8b32e55bb… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Apr 6 15:56:43 2016 -0700 ucrtbase: Add __stdio_common_vfwprintf. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2f783c6828938d09a7ef86cdd9bc394f7c441136) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/file.c | 28 ++++ dlls/ucrtbase/tests/printf.c | 157 +++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 187 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b548ab7a83cd4ce8b32e…

1 0

Austin English : newdev: Add DiInstallDriverA/W stubs.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: d86a8b94a9ff237d381fe3928b2b4d131bd88602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d86a8b94a9ff237d381fe3928… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 21 13:35:29 2016 -0500 newdev: Add DiInstallDriverA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1513c706341a6c04ddfa8b1998a346d343fc4983) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/newdev/main.c | 21 +++++++++++++++++++++ dlls/newdev/newdev.spec | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index 6be8cd0..20725a4 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -70,3 +70,24 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND hwndParent, LPCWSTR Hardware FIXME("Stub! %s %s 0x%08x\n", debugstr_w(HardwareId), debugstr_w(FullInfPath), InstallFlags); return TRUE; } + + +/*********************************************************************** + * DiInstallDriverA (NEWDEV.@) + */ +BOOL WINAPI DiInstallDriverA(HWND parent, HDEVINFO deviceinfo, PSP_DEVINFO_DATA devicedata, + PSP_DRVINFO_DATA_A driverdata, DWORD flags, BOOL *reboot) +{ + FIXME("Stub! %p %p %p %p 0x%08x %p\n", parent, deviceinfo, devicedata, driverdata, flags, reboot); + return TRUE; +} + +/*********************************************************************** + * DiInstallDriverW (NEWDEV.@) + */ +BOOL WINAPI DiInstallDriverW(HWND parent, HDEVINFO deviceinfo, PSP_DEVINFO_DATA devicedata, + PSP_DRVINFO_DATA_W driverdata, DWORD flags, BOOL *reboot) +{ + FIXME("Stub! %p %p %p %p 0x%08x %p\n", parent, deviceinfo, devicedata, driverdata, flags, reboot); + return TRUE; +} diff --git a/dlls/newdev/newdev.spec b/dlls/newdev/newdev.spec index cef0abb..84303cc 100644 --- a/dlls/newdev/newdev.spec +++ b/dlls/newdev/newdev.spec @@ -1,7 +1,7 @@ @ stub DeviceInternetSettingUiW @ stub DiInstallDevice -@ stub DiInstallDriverA -@ stub DiInstallDriverW +@ stdcall DiInstallDriverA(long ptr ptr ptr long ptr) +@ stdcall DiInstallDriverW(long ptr ptr ptr long ptr) @ stub DiRollbackDriver @ stub DiShowUpdateDevice @ stub DiUninstallDevice

1 0

Austin English : ntoskrnl.exe: Add KeSetTimerEx stub.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 628629e831953562e58573e98d916cf9d93c7a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=628629e831953562e58573e98… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 4 20:59:20 2016 -0500 ntoskrnl.exe: Add KeSetTimerEx stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9e443e95f291a7e96c48fe0907e742507e21ca4b) Conflicts: dlls/ntoskrnl.exe/ntoskrnl.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 871daa9..904d66a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2435,3 +2435,12 @@ NTSTATUS WINAPI IoAttachDevice(DEVICE_OBJECT *source, UNICODE_STRING *target, DE FIXME("(%p, %s, %p): stub\n", source, debugstr_us(target), attached); return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * KeSetTimerEx (NTOSKRNL.EXE.@) + */ +BOOL WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, KDPC *dpc ) +{ + FIXME("stub: %p %s %u %p\n", timer, wine_dbgstr_longlong(duetime.QuadPart), period, dpc); + return TRUE; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b684595..a02c8d0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -618,7 +618,7 @@ @ stub KeSetTargetProcessorDpc @ stub KeSetTimeIncrement @ stub KeSetTimer -@ stub KeSetTimerEx +@ stdcall KeSetTimerEx(ptr int64 long ptr) @ stub KeStackAttachProcess @ stub KeSynchronizeExecution @ stub KeTerminateThread

1 0

Jacek Caban : msctf: Don't call ITextStoreACP:: UnadviseSink in context destructor.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 6a1ac3e31c43debc83d8689f9740a6565402e51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1ac3e31c43debc83d8689f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:24 2016 +0200 msctf: Don't call ITextStoreACP::UnadviseSink in context destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 79025d0e6af8189fd6c3360c5bd335954124c205) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/context.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 5a45466..0def547 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -140,10 +140,7 @@ static void Context_Destructor(Context *This) TRACE("destroying %p\n", This); if (This->pITextStoreACP) - { - ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)&This->ITextStoreACPSink_iface); ITextStoreACP_Release(This->pITextStoreACP); - } if (This->pITfContextOwnerCompositionSink) ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink);

1 0

Alexandre Julliard : server: Avoid some compiler warnings when EWOULDBLOCK == EAGAIN.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 0befffb5d9e884d9793d9cb671941aff14415d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0befffb5d9e884d9793d9cb67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 19:08:23 2016 +0900 server: Avoid some compiler warnings when EWOULDBLOCK == EAGAIN. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 438dae524d9410f571f7fe5cc335fb74fec8d2bb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/request.c | 6 +++--- server/sock.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/request.c b/server/request.c index f78026a..e7eb89f 100644 --- a/server/request.c +++ b/server/request.c @@ -184,7 +184,7 @@ void write_reply( struct thread *thread ) } if (errno == EPIPE) kill_thread( thread, 0 ); /* normal death */ - else if (errno != EWOULDBLOCK && errno != EAGAIN) + else if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) fatal_protocol_error( thread, "reply write: %s\n", strerror( errno )); } @@ -311,7 +311,7 @@ error: kill_thread( thread, 0 ); else if (ret > 0) fatal_protocol_error( thread, "partial read %d\n", ret ); - else if (errno != EWOULDBLOCK && errno != EAGAIN) + else if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) fatal_protocol_error( thread, "read: %s\n", strerror( errno )); } @@ -392,7 +392,7 @@ int receive_fd( struct process *process ) } else { - if (errno != EWOULDBLOCK && errno != EAGAIN) + if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) { fprintf( stderr, "Protocol error: process %04x: ", process->id ); perror( "recvmsg" ); diff --git a/server/sock.c b/server/sock.c index 1767dea..a35a115 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1071,8 +1071,8 @@ static void ifchange_poll_event( struct fd *fd, int event ) r = recv( get_unix_fd(fd), buffer, sizeof(buffer), MSG_DONTWAIT ); if (r < 0) { - if (errno == EWOULDBLOCK || errno == EAGAIN) - return; /* retry when poll() says the socket is ready */ + if (errno == EWOULDBLOCK || (EWOULDBLOCK != EAGAIN && errno == EAGAIN)) + return; /* retry when poll() says the socket is ready */ status = sock_get_ntstatus( errno ); } else if (r > 0)

1 0