September 2016 - Wine-commits

Andrey Gusev : api-ms-win-security-audit-l1-1-1: Add dll.
by Alexandre Julliard 22 Sep '16

22 Sep '16

Module: wine Branch: master Commit: 63814adf39c3e4435887d9abaaca098ca4af1eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63814adf39c3e4435887d9aba… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Sep 22 16:34:16 2016 +0300 api-ms-win-security-audit-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-audit-l1-1-1/Makefile.in | 1 + .../api-ms-win-security-audit-l1-1-1.spec | 15 +++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 20 insertions(+) diff --git a/configure b/configure index dbc520d..b423e1a 100755 --- a/configure +++ b/configure @@ -1001,6 +1001,7 @@ enable_api_ms_win_eventing_controller_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 +enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 enable_api_ms_win_security_lsalookup_l1_1_0 @@ -17673,6 +17674,7 @@ wine_fn_config_dll api-ms-win-eventing-controller-l1-1-0 enable_api_ms_win_event wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 +wine_fn_config_dll api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 diff --git a/configure.ac b/configure.ac index 23702d6..c665bb3 100644 --- a/configure.ac +++ b/configure.ac @@ -2777,6 +2777,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) diff --git a/dlls/api-ms-win-security-audit-l1-1-1/Makefile.in b/dlls/api-ms-win-security-audit-l1-1-1/Makefile.in new file mode 100644 index 0000000..6f4a216 --- /dev/null +++ b/dlls/api-ms-win-security-audit-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-audit-l1-1-1.dll diff --git a/dlls/api-ms-win-security-audit-l1-1-1/api-ms-win-security-audit-l1-1-1.spec b/dlls/api-ms-win-security-audit-l1-1-1/api-ms-win-security-audit-l1-1-1.spec new file mode 100644 index 0000000..1e677ed --- /dev/null +++ b/dlls/api-ms-win-security-audit-l1-1-1/api-ms-win-security-audit-l1-1-1.spec @@ -0,0 +1,15 @@ +@ stub AuditComputeEffectivePolicyBySid +@ stub AuditEnumerateCategories +@ stub AuditEnumeratePerUserPolicy +@ stub AuditEnumerateSubCategories +@ stub AuditFree +@ stub AuditLookupCategoryNameW +@ stub AuditLookupSubCategoryNameW +@ stub AuditQueryGlobalSaclW +@ stub AuditQueryPerUserPolicy +@ stub AuditQuerySecurity +@ stub AuditQuerySystemPolicy +@ stub AuditSetGlobalSaclW +@ stub AuditSetPerUserPolicy +@ stub AuditSetSecurity +@ stub AuditSetSystemPolicy diff --git a/tools/make_specfiles b/tools/make_specfiles index c12a3ae..3fe7a28 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -118,6 +118,7 @@ my @dll_groups = "api-ms-win-eventing-controller-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-eventlog-legacy-l1-1-0", + "api-ms-win-security-audit-l1-1-1", "api-ms-win-security-base-l1-2-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-sddl-l1-1-0",

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

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

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

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

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

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

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

Jacek Caban : rbtree.h: Added ordered iteration functions and macros.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: c16fb053d1d8e8e2df1eaec3b144f66bc4e126a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c16fb053d1d8e8e2df1eaec3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 21:15:51 2016 +0200 rbtree.h: Added ordered iteration functions and macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rbtree.h | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index 634893d..598a15f 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -94,6 +94,20 @@ static inline void wine_rb_flip_color(struct wine_rb_entry *entry) entry->right->flags ^= WINE_RB_FLAG_RED; } +static inline struct wine_rb_entry *wine_rb_head(struct wine_rb_entry *iter) +{ + if (!iter) return NULL; + while (iter->left) iter = iter->left; + return iter; +} + +static inline struct wine_rb_entry *wine_rb_next(struct wine_rb_entry *iter) +{ + if (iter->right) return wine_rb_head(iter->right); + while (iter->parent && iter->parent->right == iter) iter = iter->parent; + return iter->parent; +} + static inline struct wine_rb_entry *wine_rb_postorder_head(struct wine_rb_entry *iter) { if (!iter) return NULL; @@ -112,6 +126,17 @@ static inline struct wine_rb_entry *wine_rb_postorder_next(struct wine_rb_entry return wine_rb_postorder_head(iter->parent->right); } +/* iterate through the tree */ +#define WINE_RB_FOR_EACH(cursor, tree) \ + for ((cursor) = wine_rb_head((tree)->root); (cursor); (cursor) = wine_rb_next(cursor)) + +/* iterate through the tree using a tree entry */ +#define WINE_RB_FOR_EACH_ENTRY(elem, tree, type, field) \ + for ((elem) = WINE_RB_ENTRY_VALUE(wine_rb_head((tree)->root), type, field); \ + &(elem)->field; \ + (elem) = WINE_RB_ENTRY_VALUE(wine_rb_next(&elem->field), type, field)) + + static inline void wine_rb_postorder(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) { struct wine_rb_entry *iter, *next; @@ -131,7 +156,8 @@ static inline void wine_rb_init(struct wine_rb_tree *tree, wine_rb_compare_func_ static inline void wine_rb_for_each_entry(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) { - wine_rb_postorder(tree, callback, context); + struct wine_rb_entry *iter; + WINE_RB_FOR_EACH(iter, tree) callback(iter, context); } static inline void wine_rb_clear(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context)

1 0

Jacek Caban : jscript: Use wine_rb_tree to store local variables in compiler_ctx_t.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: 0f21353ac073d143e9158665115db1d9e17eca09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f21353ac073d143e91586651… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 21:16:02 2016 +0200 jscript: Use wine_rb_tree to store local variables in compiler_ctx_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 77 +++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index a1b2207..fe3e043 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -23,6 +23,7 @@ #include "engine.h" #include "parser.h" +#include "wine/rbtree.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(jscript); @@ -42,6 +43,12 @@ typedef struct _statement_ctx_t { } statement_ctx_t; typedef struct { + struct wine_rb_entry entry; + BSTR name; + int ref; +} function_local_t; + +typedef struct { parser_ctx_t *parser; bytecode_t *code; @@ -54,8 +61,7 @@ typedef struct { unsigned labels_size; unsigned labels_cnt; - local_ref_t *locals_buf; - unsigned locals_buf_size; + struct wine_rb_tree locals; unsigned locals_cnt; statement_ctx_t *stat_ctx; @@ -63,6 +69,8 @@ typedef struct { function_expression_t *func_head; function_expression_t *func_tail; + + heap_pool_t heap; } compiler_ctx_t; static const struct { @@ -1812,42 +1820,29 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, return hres; } -static int local_cmp(const void *key, const void *ref) +static int function_local_cmp(const void *key, const struct wine_rb_entry *entry) { - return strcmpW((const WCHAR*)key, ((const local_ref_t*)ref)->name); + function_local_t *local = WINE_RB_ENTRY_VALUE(entry, function_local_t, entry); + return strcmpW(key, local->name); } -static inline local_ref_t *find_local(compiler_ctx_t *ctx, const WCHAR *name) +static inline function_local_t *find_local(compiler_ctx_t *ctx, const WCHAR *name) { - return bsearch(name, ctx->locals_buf, ctx->locals_cnt, sizeof(*ctx->locals_buf), local_cmp); + struct wine_rb_entry *entry = wine_rb_get(&ctx->locals, name); + return entry ? WINE_RB_ENTRY_VALUE(entry, function_local_t, entry) : NULL; } static BOOL alloc_local(compiler_ctx_t *ctx, BSTR name, int ref) { - unsigned i; - - if(!ctx->locals_buf_size) { - ctx->locals_buf = heap_alloc(4 * sizeof(*ctx->locals_buf)); - if(!ctx->locals_buf) - return FALSE; - ctx->locals_buf_size = 4; - }else if(ctx->locals_buf_size == ctx->locals_cnt) { - local_ref_t *new_buf = heap_realloc(ctx->locals_buf, ctx->locals_buf_size * 2 * sizeof(*ctx->locals_buf)); - if(!new_buf) - return FALSE; - ctx->locals_buf = new_buf; - ctx->locals_buf_size *= 2; - } + function_local_t *local; - for(i = 0; i < ctx->locals_cnt; i++) { - if(strcmpW(ctx->locals_buf[i].name, name) > 0) { - memmove(ctx->locals_buf + i+1, ctx->locals_buf + i, (ctx->locals_cnt - i) * sizeof(*ctx->locals_buf)); - break; - } - } + local = heap_pool_alloc(&ctx->heap, sizeof(*local)); + if(!local) + return FALSE; - ctx->locals_buf[i].name = name; - ctx->locals_buf[i].ref = ref; + local->name = name; + local->ref = ref; + wine_rb_put(&ctx->locals, name, &local->entry); ctx->locals_cnt++; return TRUE; } @@ -2264,7 +2259,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, BOOL from_eval, function_code_t *func) { function_expression_t *iter; - unsigned off, i, j; + function_local_t *local; + unsigned off, i; HRESULT hres; TRACE("\n"); @@ -2273,6 +2269,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, ctx->from_eval = from_eval; ctx->func = func; ctx->locals_cnt = 0; + wine_rb_init(&ctx->locals, function_local_cmp); if(func_expr) { parameter_t *param_iter; @@ -2319,21 +2316,22 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, if(!func->locals) return E_OUTOFMEMORY; func->locals_cnt = ctx->locals_cnt; - memcpy(func->locals, ctx->locals_buf, func->locals_cnt * sizeof(*func->locals)); func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); if(!func->variables) return E_OUTOFMEMORY; - for(i = 0, j = 0; i < func->locals_cnt; i++) { - if(func->locals[i].ref < 0) - continue; /* skip arguments */ - func->variables[func->locals[i].ref].name = func->locals[i].name; - func->variables[func->locals[i].ref].func_id = -1; - j++; + i = 0; + WINE_RB_FOR_EACH_ENTRY(local, &ctx->locals, function_local_t, entry) { + func->locals[i].name = local->name; + func->locals[i].ref = local->ref; + if(local->ref >= 0) { + func->variables[local->ref].name = local->name; + func->variables[local->ref].func_id = -1; + } + i++; } - - assert(j == func->var_cnt); + assert(i == ctx->locals_cnt); func->funcs = compiler_alloc(ctx->code, func->func_cnt * sizeof(*func->funcs)); if(!func->funcs) @@ -2476,9 +2474,10 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, const WCHAR *args, return hres; } + heap_pool_init(&compiler.heap); hres = compile_function(&compiler, compiler.parser->source, NULL, from_eval, &compiler.code->global_code); + heap_pool_free(&compiler.heap); parser_release(compiler.parser); - heap_free(compiler.locals_buf); if(FAILED(hres)) { release_bytecode(compiler.code); return hres;

1 0