November 2016 - Wine-commits

Andrey Gusev : api-ms-win-core-com-private-l1-1-0: Add dll.
by Alexandre Julliard 18 Nov '16

18 Nov '16

Module: wine Branch: master Commit: 02c04ff9c783f7d8e13449ad9effd73d0e1f9342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c04ff9c783f7d8e13449ad9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 18 15:38:07 2016 +0200 api-ms-win-core-com-private-l1-1-0: 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 + .../api-ms-win-core-com-private-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-com-private-l1-1-0.spec | 91 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 96 insertions(+) diff --git a/configure b/configure index 1794984..762db42 100755 --- a/configure +++ b/configure @@ -882,6 +882,7 @@ enable_api_ms_win_core_atoms_l1_1_0 enable_api_ms_win_core_bem_l1_1_0 enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_com_l1_1_1 +enable_api_ms_win_core_com_private_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_console_l2_1_0 enable_api_ms_win_core_datetime_l1_1_0 @@ -17591,6 +17592,7 @@ wine_fn_config_dll api-ms-win-core-atoms-l1-1-0 enable_api_ms_win_core_atoms_l1_ wine_fn_config_dll api-ms-win-core-bem-l1-1-0 enable_api_ms_win_core_bem_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 +wine_fn_config_dll api-ms-win-core-com-private-l1-1-0 enable_api_ms_win_core_com_private_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_datetime_l1_1_0 diff --git a/configure.ac b/configure.ac index 20ae9de..ee9afe2 100644 --- a/configure.ac +++ b/configure.ac @@ -2659,6 +2659,7 @@ WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-bem-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-com-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) diff --git a/dlls/api-ms-win-core-com-private-l1-1-0/Makefile.in b/dlls/api-ms-win-core-com-private-l1-1-0/Makefile.in new file mode 100644 index 0000000..3b4406f --- /dev/null +++ b/dlls/api-ms-win-core-com-private-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-com-private-l1-1-0.dll diff --git a/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec b/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec new file mode 100644 index 0000000..14d3b27 --- /dev/null +++ b/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec @@ -0,0 +1,91 @@ +@ stub CleanupOleStateInAllTls +@ stub CleanupTlsOleState +@ stub ClearCleanupFlag +@ stub CLSIDFromOle1Class +@ stub CoCreateErrorInfo +@ stub CoCreateObjectInContext +@ stub CoDeactivateObject +@ stdcall CoGetActivationState(int128 long ptr) ole32.CoGetActivationState +@ stub CoGetApartmentID +@ stdcall CoGetCallState(long ptr) ole32.CoGetCallState +@ stub CoGetClassVersion +@ stub CoGetErrorInfo +@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) ole32.CoGetInstanceFromFile +@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) ole32.CoGetInstanceFromIStorage +@ stub CoGetModuleType +@ stub CoGetProcessIdentifier +@ stub CoGetSystemSecurityPermissions +@ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW +@ stub CoPopServiceDomain +@ stub CoPushServiceDomain +@ stub CoReactivateObject +@ stdcall CoRegisterInitializeSpy(ptr ptr) ole32.CoRegisterInitializeSpy +@ stdcall CoRegisterMallocSpy(ptr) ole32.CoRegisterMallocSpy +@ stdcall CoRegisterMessageFilter(ptr ptr) ole32.CoRegisterMessageFilter +@ stub CoRegisterSurrogateEx +@ stub CoRetireServer +@ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy +@ stdcall CoRevokeMallocSpy() ole32.CoRevokeMallocSpy +@ stub CoSetErrorInfo +@ stub CoUnloadingWOW +@ stub CoVrfCheckThreadState +@ stub CoVrfGetThreadState +@ stub CoVrfReleaseThreadState +@ stdcall DllDebugObjectRPCHook(long ptr) ole32.DllDebugObjectRPCHook +@ stub EnableHookObject +@ stub FreePropVariantArrayWorker +@ stub GetCatalogHelper +@ stub GetFuncDescs +@ stub GetHookInterface +@ stub HkOleRegisterObject +@ stub InternalAppInvokeExceptionFilter +@ stub InternalCallAsProxyExceptionFilter +@ stub InternalCallerIsAppContainer +@ stub InternalCallFrameExceptionFilter +@ stub InternalCanMakeOutCall +@ stub InternalCCFreeUnused +@ stub InternalCCGetClassInformationForDde +@ stub InternalCCGetClassInformationFromKey +@ stub InternalCCSetDdeServerWindow +@ stub InternalCMLSendReceive +@ stub InternalCoIsSurrogateProcess +@ stub InternalCompleteObjRef +@ stub InternalCoRegisterDisconnectCallback +@ stub InternalCoRegisterSurrogatedObject +@ stub InternalCoStdMarshalObject +@ stub InternalCoUnregisterDisconnectCallback +@ stub InternalCreateCAggId +@ stub InternalCreateIdentityHandler +@ stub InternalDoATClassCreate +@ stub InternalFillLocalOXIDInfo +@ stub InternalFreeObjRef +@ stub InternalGetWindowPropInterface +@ stub InternalIrotEnumRunning +@ stub InternalIrotGetObject +@ stub InternalIrotGetTimeOfLastChange +@ stub InternalIrotIsRunning +@ stub InternalIrotNoteChangeTime +@ stub InternalIrotRegister +@ stub InternalIrotRevoke +@ stub InternalIsApartmentInitialized +@ stub InternalIsProcessInitialized +@ stub InternalMarshalObjRef +@ stub InternalNotifyDDStartOrStop +@ stub InternalOleModalLoopBlockFn +@ stub InternalRegisterWindowPropInterface +@ stub InternalReleaseMarshalObjRef +@ stub InternalServerExceptionFilter +@ stub InternalSetAptCallCtrlOnTlsIfRequired +@ stub InternalSetOleThunkWowPtr +@ stub InternalSTAInvoke +@ stub InternalStubInvoke +@ stub InternalTlsAllocData +@ stub InternalUnmarshalObjRef +@ stub NdrExtStubInitialize +@ stub NdrOleDllGetClassObject +@ stub NdrOleInitializeExtension +@ stub NdrpFindInterface +@ stub ReleaseFuncDescs +@ stub SetCleanupFlag +@ stub UpdateDCOMSettings +@ stub UpdateProcessTracing diff --git a/tools/make_specfiles b/tools/make_specfiles index 39288a6..f3809f3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -245,6 +245,7 @@ my @dll_groups = "api-ms-win-downlevel-ole32-l1-1-0", "api-ms-win-core-com-l1-1-0", "api-ms-win-core-com-l1-1-1", + "api-ms-win-core-com-private-l1-1-0", "combase", "iprop", ],

1 0

Andrey Gusev : api-ms-win-devices-config-l1-1-1: Add dll.
by Alexandre Julliard 18 Nov '16

18 Nov '16

Module: wine Branch: master Commit: 75af287cfda27252ce5730a21f4583781347386f URL: http://source.winehq.org/git/wine.git/?a=commit;h=75af287cfda27252ce5730a21… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 18 16:16:04 2016 +0200 api-ms-win-devices-config-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-devices-config-l1-1-1/Makefile.in | 1 + .../api-ms-win-devices-config-l1-1-1.spec | 39 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 44 insertions(+) diff --git a/configure b/configure index 762db42..e1ead7f 100755 --- a/configure +++ b/configure @@ -996,6 +996,7 @@ enable_api_ms_win_crt_stdio_l1_1_0 enable_api_ms_win_crt_string_l1_1_0 enable_api_ms_win_crt_time_l1_1_0 enable_api_ms_win_crt_utility_l1_1_0 +enable_api_ms_win_devices_config_l1_1_1 enable_api_ms_win_downlevel_advapi32_l1_1_0 enable_api_ms_win_downlevel_advapi32_l2_1_0 enable_api_ms_win_downlevel_normaliz_l1_1_0 @@ -17706,6 +17707,7 @@ wine_fn_config_dll api-ms-win-crt-stdio-l1-1-0 enable_api_ms_win_crt_stdio_l1_1_ wine_fn_config_dll api-ms-win-crt-string-l1-1-0 enable_api_ms_win_crt_string_l1_1_0 wine_fn_config_dll api-ms-win-crt-time-l1-1-0 enable_api_ms_win_crt_time_l1_1_0 wine_fn_config_dll api-ms-win-crt-utility-l1-1-0 enable_api_ms_win_crt_utility_l1_1_0 +wine_fn_config_dll api-ms-win-devices-config-l1-1-1 enable_api_ms_win_devices_config_l1_1_1 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 diff --git a/configure.ac b/configure.ac index ee9afe2..6dd80ac 100644 --- a/configure.ac +++ b/configure.ac @@ -2773,6 +2773,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-stdio-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-time-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-utility-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-devices-config-l1-1-1) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) diff --git a/dlls/api-ms-win-devices-config-l1-1-1/Makefile.in b/dlls/api-ms-win-devices-config-l1-1-1/Makefile.in new file mode 100644 index 0000000..d00e43f --- /dev/null +++ b/dlls/api-ms-win-devices-config-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-devices-config-l1-1-1.dll diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec new file mode 100644 index 0000000..4302bbf --- /dev/null +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -0,0 +1,39 @@ +@ stub CM_Delete_Class_Key +@ stub CM_Delete_Device_Interface_KeyW +@ stub CM_Delete_DevNode_Key +@ stub CM_Disable_DevNode +@ stub CM_Enable_DevNode +@ stub CM_Get_Child +@ stub CM_Get_Class_Property_Keys +@ stub CM_Get_Class_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW +@ stub CM_Get_Depth +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW +@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size +@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW +@ stub CM_Get_Device_Interface_ListW +@ stub CM_Get_Device_Interface_Property_KeysW +@ stub CM_Get_Device_Interface_PropertyW +@ stub CM_Get_DevNode_Property_Keys +@ stub CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) setupapi.CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent +@ stub CM_Get_Sibling +@ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW +@ stub CM_MapCrToWin32Err +@ stub CM_Open_Class_KeyW +@ stub CM_Open_Device_Interface_KeyW +@ stub CM_Open_DevNode_Key +@ stub CM_Query_And_Remove_SubTreeW +@ stub CM_Register_Notification +@ stub CM_Set_Class_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW +@ stub CM_Set_Device_Interface_PropertyW +@ stub CM_Set_DevNode_PropertyW +@ stub CM_Set_DevNode_Registry_PropertyW +@ stub CM_Setup_DevNode +@ stub CM_Uninstall_DevNode +@ stub CM_Unregister_Notification diff --git a/tools/make_specfiles b/tools/make_specfiles index f3809f3..db73689 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -97,6 +97,7 @@ my @dll_groups = [ "setupapi", "cfgmgr32", + "api-ms-win-devices-config-l1-1-1", ], [ "vcomp",

1 0

Andrey Gusev : api-ms-win-devices-query-l1-1-1: Add dll.
by Alexandre Julliard 18 Nov '16

18 Nov '16

Module: wine Branch: master Commit: 25524801ac355fe354a4fac634078117c6d6c3ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=25524801ac355fe354a4fac63… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 18 17:19:44 2016 +0200 api-ms-win-devices-query-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-devices-query-l1-1-1/Makefile.in | 1 + .../api-ms-win-devices-query-l1-1-1.spec | 15 +++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 20 insertions(+) diff --git a/configure b/configure index e1ead7f..3cade53 100755 --- a/configure +++ b/configure @@ -997,6 +997,7 @@ enable_api_ms_win_crt_string_l1_1_0 enable_api_ms_win_crt_time_l1_1_0 enable_api_ms_win_crt_utility_l1_1_0 enable_api_ms_win_devices_config_l1_1_1 +enable_api_ms_win_devices_query_l1_1_1 enable_api_ms_win_downlevel_advapi32_l1_1_0 enable_api_ms_win_downlevel_advapi32_l2_1_0 enable_api_ms_win_downlevel_normaliz_l1_1_0 @@ -17708,6 +17709,7 @@ wine_fn_config_dll api-ms-win-crt-string-l1-1-0 enable_api_ms_win_crt_string_l1_ wine_fn_config_dll api-ms-win-crt-time-l1-1-0 enable_api_ms_win_crt_time_l1_1_0 wine_fn_config_dll api-ms-win-crt-utility-l1-1-0 enable_api_ms_win_crt_utility_l1_1_0 wine_fn_config_dll api-ms-win-devices-config-l1-1-1 enable_api_ms_win_devices_config_l1_1_1 +wine_fn_config_dll api-ms-win-devices-query-l1-1-1 enable_api_ms_win_devices_query_l1_1_1 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 diff --git a/configure.ac b/configure.ac index 6dd80ac..32a0987 100644 --- a/configure.ac +++ b/configure.ac @@ -2774,6 +2774,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-time-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-utility-l1-1-0) WINE_CONFIG_DLL(api-ms-win-devices-config-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-devices-query-l1-1-1) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) diff --git a/dlls/api-ms-win-devices-query-l1-1-1/Makefile.in b/dlls/api-ms-win-devices-query-l1-1-1/Makefile.in new file mode 100644 index 0000000..238f3f4 --- /dev/null +++ b/dlls/api-ms-win-devices-query-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-devices-query-l1-1-1.dll diff --git a/dlls/api-ms-win-devices-query-l1-1-1/api-ms-win-devices-query-l1-1-1.spec b/dlls/api-ms-win-devices-query-l1-1-1/api-ms-win-devices-query-l1-1-1.spec new file mode 100644 index 0000000..9aaaab9 --- /dev/null +++ b/dlls/api-ms-win-devices-query-l1-1-1/api-ms-win-devices-query-l1-1-1.spec @@ -0,0 +1,15 @@ +@ stub DevCloseObjectQuery +@ stub DevCreateObjectQuery +@ stub DevCreateObjectQueryEx +@ stub DevCreateObjectQueryFromId +@ stub DevCreateObjectQueryFromIdEx +@ stub DevCreateObjectQueryFromIds +@ stub DevCreateObjectQueryFromIdsEx +@ stub DevFindProperty +@ stub DevFreeObjectProperties +@ stub DevFreeObjects +@ stub DevGetObjectProperties +@ stub DevGetObjectPropertiesEx +@ stub DevGetObjects +@ stub DevGetObjectsEx +@ stub DevSetObjectProperties diff --git a/tools/make_specfiles b/tools/make_specfiles index db73689..60e5b16 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -98,6 +98,7 @@ my @dll_groups = "setupapi", "cfgmgr32", "api-ms-win-devices-config-l1-1-1", + "api-ms-win-devices-query-l1-1-1", ], [ "vcomp",

1 0

Aric Stewart : hid: Implement HidP_GetSpecificButtonCaps.
by Alexandre Julliard 18 Nov '16

18 Nov '16

Module: wine Branch: master Commit: a4ed76b9484869d3527bcf75348ef4a03e17ec1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ed76b9484869d3527bcf753… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 15 08:05:38 2016 -0600 hid: Implement HidP_GetSpecificButtonCaps. 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 | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 98f71db..d5dd734 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -24,7 +24,7 @@ @ stub HidP_GetExtendedAttributes @ stub HidP_GetLinkCollectionNodes @ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) -@ stub HidP_GetSpecificButtonCaps +@ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) @ stub HidP_GetUsageValueArray diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index c6b773b..cac9d4e 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -536,6 +536,78 @@ NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, return STATUS_NOT_IMPLEMENTED; } +NTSTATUS WINAPI HidP_GetSpecificButtonCaps(HIDP_REPORT_TYPE ReportType, + USAGE UsagePage, USHORT LinkCollection, USAGE Usage, + HIDP_BUTTON_CAPS *ButtonCaps, USHORT *ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) +{ + WINE_HIDP_PREPARSED_DATA *data = (WINE_HIDP_PREPARSED_DATA*)PreparsedData; + WINE_HID_REPORT *report = NULL; + USHORT b_count = 0, r_count = 0; + int i,j,u; + + TRACE("(%i, 0x%x, %i, 0x%x, %p %p %p)\n", ReportType, UsagePage, LinkCollection, + Usage, ButtonCaps, ButtonCapsLength, PreparsedData); + + 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) + { + *ButtonCapsLength = 0; + return HIDP_STATUS_SUCCESS; + } + + b_count = min(b_count, *ButtonCapsLength); + + u = 0; + for (j = 0; j < r_count && u < b_count; j++) + { + for (i = 0; i < report->elementCount && u < b_count; i++) + { + if (report->Elements[i].ElementType == ButtonElement && + (UsagePage == 0 || UsagePage == report->Elements[i].caps.button.UsagePage) && + (LinkCollection == 0 || LinkCollection == report->Elements[i].caps.button.LinkCollection) && + (Usage == 0 || ( + (!report->Elements[i].caps.button.IsRange && + Usage == report->Elements[i].caps.button.u.NotRange.Usage)) || + (report->Elements[i].caps.button.IsRange && + Usage >=report->Elements[i].caps.button.u.Range.UsageMin && + Usage <= report->Elements[i].caps.button.u.Range.UsageMax))) + { + ButtonCaps[u++] = report->Elements[i].caps.button; + } + } + report = HID_NEXT_REPORT(data, report); + } + TRACE("Matched %i usages\n", u); + + *ButtonCapsLength = u; + + return HIDP_STATUS_SUCCESS; +} + + NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_VALUE_CAPS *ValueCaps, USHORT *ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData) diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 82bbc70..9f0fd8f 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -173,6 +173,7 @@ NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR Re 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); +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); #ifndef FACILITY_HID_ERROR_CODE

1 0

Alex Henrie : winegstreamer: Remove redundant null check before g_error_free.
by Alexandre Julliard 18 Nov '16

18 Nov '16

Module: wine Branch: master Commit: 976ccb92ea745d8a79a2d0a25d37268bb4dc62a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=976ccb92ea745d8a79a2d0a25… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 08:46:37 2016 -0700 winegstreamer: Remove redundant null check before g_error_free. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 65366ce..6b005ed 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1083,8 +1083,7 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) WARN("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); WARN("%s\n", dbg_info); } - if (err) - g_error_free(err); + g_error_free(err); g_free(dbg_info); return GST_BUS_DROP; }

1 0

Andrey Gusev : api-ms-win-security-lsalookup-l2-1-1: Add dll.
by Alexandre Julliard 18 Nov '16

18 Nov '16

Module: wine Branch: master Commit: 035b04d60569025f12f2b0628e996e6a5a266e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035b04d60569025f12f2b0628… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 18 01:56:55 2016 +0200 api-ms-win-security-lsalookup-l2-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-lsalookup-l2-1-1/Makefile.in | 1 + .../api-ms-win-security-lsalookup-l2-1-1.spec | 7 +++++++ tools/make_specfiles | 1 + 5 files changed, 12 insertions(+) diff --git a/configure b/configure index f91d64d..9860128 100755 --- a/configure +++ b/configure @@ -1018,6 +1018,7 @@ enable_api_ms_win_security_base_l1_2_0 enable_api_ms_win_security_base_private_l1_1_1 enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 +enable_api_ms_win_security_lsalookup_l2_1_1 enable_api_ms_win_security_sddl_l1_1_0 enable_api_ms_win_service_core_l1_1_0 enable_api_ms_win_service_core_l1_1_1 @@ -17725,6 +17726,7 @@ wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_ba wine_fn_config_dll api-ms-win-security-base-private-l1-1-1 enable_api_ms_win_security_base_private_l1_1_1 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 +wine_fn_config_dll api-ms-win-security-lsalookup-l2-1-1 enable_api_ms_win_security_lsalookup_l2_1_1 wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-0 enable_api_ms_win_service_core_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 diff --git a/configure.ac b/configure.ac index 2489ac0..4147ba6 100644 --- a/configure.ac +++ b/configure.ac @@ -2795,6 +2795,7 @@ WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) WINE_CONFIG_DLL(api-ms-win-security-base-private-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l2-1-1) WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-1/Makefile.in b/dlls/api-ms-win-security-lsalookup-l2-1-1/Makefile.in new file mode 100644 index 0000000..7f97a8e --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l2-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-l2-1-1.dll diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec new file mode 100644 index 0000000..2e5185c --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec @@ -0,0 +1,7 @@ +@ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW +@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW +@ stdcall LookupPrivilegeNameW(wstr ptr ptr long) advapi32.LookupPrivilegeNameW +@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains +@ stub LsaManageSidNameMapping diff --git a/tools/make_specfiles b/tools/make_specfiles index fc3bb5e..d5740c2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -122,6 +122,7 @@ my @dll_groups = "api-ms-win-security-base-l1-2-0", "api-ms-win-security-base-private-l1-1-1", "api-ms-win-security-lsalookup-l1-1-0", + "api-ms-win-security-lsalookup-l2-1-1", "api-ms-win-security-sddl-l1-1-0", "api-ms-win-service-core-l1-1-0", "api-ms-win-service-core-l1-1-1",

1 0

Andrey Gusev : api-ms-win-security-lsapolicy-l1-1-0: Add dll.
by Alexandre Julliard 18 Nov '16

18 Nov '16

Module: wine Branch: master Commit: 10a469a18a00fa356c6325f10543de45a87c4aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a469a18a00fa356c6325f10… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 18 01:56:56 2016 +0200 api-ms-win-security-lsapolicy-l1-1-0: 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 + .../Makefile.in | 1 + .../api-ms-win-security-lsapolicy-l1-1-0.spec | 22 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 27 insertions(+) diff --git a/configure b/configure index 9860128..1794984 100755 --- a/configure +++ b/configure @@ -1019,6 +1019,7 @@ enable_api_ms_win_security_base_private_l1_1_1 enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 enable_api_ms_win_security_lsalookup_l2_1_1 +enable_api_ms_win_security_lsapolicy_l1_1_0 enable_api_ms_win_security_sddl_l1_1_0 enable_api_ms_win_service_core_l1_1_0 enable_api_ms_win_service_core_l1_1_1 @@ -17727,6 +17728,7 @@ wine_fn_config_dll api-ms-win-security-base-private-l1-1-1 enable_api_ms_win_sec wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 wine_fn_config_dll api-ms-win-security-lsalookup-l2-1-1 enable_api_ms_win_security_lsalookup_l2_1_1 +wine_fn_config_dll api-ms-win-security-lsapolicy-l1-1-0 enable_api_ms_win_security_lsapolicy_l1_1_0 wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-0 enable_api_ms_win_service_core_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 diff --git a/configure.ac b/configure.ac index 4147ba6..20ae9de 100644 --- a/configure.ac +++ b/configure.ac @@ -2796,6 +2796,7 @@ WINE_CONFIG_DLL(api-ms-win-security-base-private-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l2-1-1) +WINE_CONFIG_DLL(api-ms-win-security-lsapolicy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) diff --git a/dlls/api-ms-win-security-lsapolicy-l1-1-0/Makefile.in b/dlls/api-ms-win-security-lsapolicy-l1-1-0/Makefile.in new file mode 100644 index 0000000..01b7a03 --- /dev/null +++ b/dlls/api-ms-win-security-lsapolicy-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsapolicy-l1-1-0.dll diff --git a/dlls/api-ms-win-security-lsapolicy-l1-1-0/api-ms-win-security-lsapolicy-l1-1-0.spec b/dlls/api-ms-win-security-lsapolicy-l1-1-0/api-ms-win-security-lsapolicy-l1-1-0.spec new file mode 100644 index 0000000..311ae94 --- /dev/null +++ b/dlls/api-ms-win-security-lsapolicy-l1-1-0/api-ms-win-security-lsapolicy-l1-1-0.spec @@ -0,0 +1,22 @@ +@ stdcall LsaAddAccountRights(ptr ptr ptr long) advapi32.LsaAddAccountRights +@ stdcall LsaClose(ptr) advapi32.LsaClose +@ stub LsaCreateSecret +@ stdcall LsaEnumerateAccountRights(ptr ptr ptr ptr) advapi32.LsaEnumerateAccountRights +@ stdcall LsaEnumerateAccountsWithUserRight(ptr ptr ptr ptr) advapi32.LsaEnumerateAccountsWithUserRight +@ stdcall LsaFreeMemory(ptr) advapi32.LsaFreeMemory +@ stub LsaICLookupNames +@ stub LsaICLookupNamesWithCreds +@ stub LsaICLookupSids +@ stub LsaICLookupSidsWithCreds +@ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) advapi32.LsaLookupNames2 +@ stdcall LsaLookupSids(ptr long ptr ptr ptr) advapi32.LsaLookupSids +@ stub LsaLookupSids2 +@ stdcall LsaOpenPolicy(long long long long) advapi32.LsaOpenPolicy +@ stub LsaOpenSecret +@ stdcall LsaQueryInformationPolicy(ptr long ptr) advapi32.LsaQueryInformationPolicy +@ stub LsaQuerySecret +@ stdcall LsaRemoveAccountRights(ptr ptr long ptr long) advapi32.LsaRemoveAccountRights +@ stdcall LsaRetrievePrivateData(ptr ptr ptr) advapi32.LsaRetrievePrivateData +@ stdcall LsaSetInformationPolicy(long long ptr) advapi32.LsaSetInformationPolicy +@ stdcall LsaSetSecret(ptr ptr ptr) advapi32.LsaSetSecret +@ stdcall LsaStorePrivateData(ptr ptr ptr) advapi32.LsaStorePrivateData diff --git a/tools/make_specfiles b/tools/make_specfiles index d5740c2..043e2fd 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -123,6 +123,7 @@ my @dll_groups = "api-ms-win-security-base-private-l1-1-1", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-lsalookup-l2-1-1", + "api-ms-win-security-lsapolicy-l1-1-0", "api-ms-win-security-sddl-l1-1-0", "api-ms-win-service-core-l1-1-0", "api-ms-win-service-core-l1-1-1",

1 0

Andrey Gusev : make_specfiles: Add api-ms-win-security-lsalookup-l1-1-1 to advapi32 group.
by Alexandre Julliard 18 Nov '16

18 Nov '16

Module: wine Branch: master Commit: 9ff9bd46cd2eba7c67ca83f61eccdef5bda0cb30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff9bd46cd2eba7c67ca83f61… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 18 01:56:57 2016 +0200 make_specfiles: Add api-ms-win-security-lsalookup-l1-1-1 to advapi32 group. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_specfiles | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/make_specfiles b/tools/make_specfiles index 043e2fd..39288a6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -122,6 +122,7 @@ my @dll_groups = "api-ms-win-security-base-l1-2-0", "api-ms-win-security-base-private-l1-1-1", "api-ms-win-security-lsalookup-l1-1-0", + "api-ms-win-security-lsalookup-l1-1-1", "api-ms-win-security-lsalookup-l2-1-1", "api-ms-win-security-lsapolicy-l1-1-0", "api-ms-win-security-sddl-l1-1-0",

1 0

Alistair Leslie-Hughes : dpnet: Header files cleanup.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: 5cd33bf892f3a7599f37dba64b1046f22b95af6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd33bf892f3a7599f37dba64… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 15 06:59:13 2016 +0000 dpnet: Header files cleanup. Stops error of SOCKADDR being redefined on older compilers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/address.c | 1 - dlls/dpnet/client.c | 1 - dlls/dpnet/lobbiedapp.c | 2 -- dlls/dpnet/peer.c | 1 - dlls/dpnet/server.c | 1 - dlls/dpnet/threadpool.c | 1 - include/dpaddr.h | 2 ++ 7 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index c5457eb..4d55caa 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -33,7 +33,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 9692e38..1fa825f 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -31,7 +31,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index 8ec9ad1..d041e63 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -31,8 +31,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" -#include "dplobby8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index fe62d59..d7144df 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -33,7 +33,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index d91822e..46d5fe2 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -32,7 +32,6 @@ #include "ocidl.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" typedef struct IDirectPlay8ServerImpl diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c index 274789d..9e13ffb 100644 --- a/dlls/dpnet/threadpool.c +++ b/dlls/dpnet/threadpool.c @@ -32,7 +32,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/include/dpaddr.h b/include/dpaddr.h index 576caaf..d47dd26 100644 --- a/include/dpaddr.h +++ b/include/dpaddr.h @@ -27,7 +27,9 @@ extern "C" { #endif /* defined(__cplusplus) */ typedef REFIID DPNAREFIID; +#ifndef _WINSOCK2API_ typedef struct sockaddr SOCKADDR; +#endif /***************************************************************************** * DirectPlay8Addr defines

1 0

Henri Verbeet : gdi32: Add support for D3DDDIFMT_A4R4G4B4 and D3DDDIFMT_X4R4G4B4 to D3DKMTCreateDCFromMemory ().
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: d837b71557f92d3dfbcbe6ad231cda18ab653fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d837b71557f92d3dfbcbe6ad2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 17 12:11:35 2016 +0100 gdi32: Add support for D3DDDIFMT_A4R4G4B4 and D3DDDIFMT_X4R4G4B4 to D3DKMTCreateDCFromMemory(). These are needed by wined3d to support DCs on WINED3DFMT_B4G4R4A4_UNORM and WINED3DFMT_B4G4R4X4_UNORM textures, as required by the Microsoft Motocross Madness demo. Note that these formats are not available on versions of Windows newer than Vista, and as far as I'm aware the application doesn't work on those versions. I don't expect exposing more formats to be an issue in practice, but these could be hidden behind a version check if needed. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 585d2ac..36a7b0f 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1606,6 +1606,8 @@ NTSTATUS WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) { D3DDDIFMT_R5G6B5, 16, BI_BITFIELDS, 0, 0x0000f800, 0x000007e0, 0x0000001f }, { D3DDDIFMT_X1R5G5B5, 16, BI_BITFIELDS, 0, 0x00007c00, 0x000003e0, 0x0000001f }, { D3DDDIFMT_A1R5G5B5, 16, BI_BITFIELDS, 0, 0x00007c00, 0x000003e0, 0x0000001f }, + { D3DDDIFMT_A4R4G4B4, 16, BI_BITFIELDS, 0, 0x00000f00, 0x000000f0, 0x0000000f }, + { D3DDDIFMT_X4R4G4B4, 16, BI_BITFIELDS, 0, 0x00000f00, 0x000000f0, 0x0000000f }, { D3DDDIFMT_P8, 8, BI_RGB, 256, 0x00000000, 0x00000000, 0x00000000 }, };

1 0