wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Martin Payne : user.exe16: Support Windows 2 menus.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 5ec4d1be97b19d57508d87df34fd7a7d32569d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec4d1be97b19d57508d87df3… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Sun Sep 24 09:04:51 2017 +0100 user.exe16: Support Windows 2 menus. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/krnl386.exe16.spec | 1 + dlls/user.exe16/user.c | 44 +++++++++++++++++++++++++---------- dlls/user.exe16/user_private.h | 1 + 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index 62d37e5..0fd7e7a 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -706,6 +706,7 @@ @ stdcall -arch=win32 GetCurrentTask() @ stdcall -arch=win32 GetDOSEnvironment16() @ stdcall -arch=win32 GetExePtr(long) +@ stdcall -arch=win32 GetExeVersion16() @ stdcall -arch=win32 GetExpWinVer16(long) @ stdcall -arch=win32 GetModuleHandle16(str) @ stdcall -arch=win32 GlobalReAlloc16(long long long) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 35f2585..eac4a19 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1428,7 +1428,7 @@ HMENU16 WINAPI LookupMenuHandle16( HMENU16 hmenu, INT16 id ) } -static LPCSTR parse_menu_resource( LPCSTR res, HMENU hMenu ) +static LPCSTR parse_menu_resource( LPCSTR res, HMENU hMenu, BOOL oldFormat ) { WORD flags, id = 0; LPCSTR str; @@ -1436,11 +1436,21 @@ static LPCSTR parse_menu_resource( LPCSTR res, HMENU hMenu ) do { - flags = GET_WORD(res); + /* Windows 3.00 and later use a WORD for the flags, whereas 1.x and 2.x use a BYTE. */ + if (oldFormat) + { + flags = GET_BYTE(res); + res += sizeof(BYTE); + } + else + { + flags = GET_WORD(res); + res += sizeof(WORD); + } + end_flag = flags & MF_END; /* Remove MF_END because it has the same value as MF_HILITE */ flags &= ~MF_END; - res += sizeof(WORD); if (!(flags & MF_POPUP)) { id = GET_WORD(res); @@ -1452,7 +1462,7 @@ static LPCSTR parse_menu_resource( LPCSTR res, HMENU hMenu ) { HMENU hSubMenu = CreatePopupMenu(); if (!hSubMenu) return NULL; - if (!(res = parse_menu_resource( res, hSubMenu ))) return NULL; + if (!(res = parse_menu_resource( res, hSubMenu, oldFormat ))) return NULL; AppendMenuA( hMenu, flags, (UINT_PTR)hSubMenu, str ); } else /* Not a popup */ @@ -1468,22 +1478,32 @@ static LPCSTR parse_menu_resource( LPCSTR res, HMENU hMenu ) */ HMENU16 WINAPI LoadMenuIndirect16( LPCVOID template ) { + BOOL oldFormat; HMENU hMenu; WORD version, offset; LPCSTR p = template; TRACE("(%p)\n", template ); - version = GET_WORD(p); - p += sizeof(WORD); - if (version) + + /* Windows 1.x and 2.x menus have a slightly different menu format from 3.x menus */ + oldFormat = (GetExeVersion16() < 0x0300); + + /* Windows 3.00 and later menu items are preceded by a MENUITEMTEMPLATEHEADER structure */ + if (!oldFormat) { - WARN("version must be 0 for Win16\n" ); - return 0; + version = GET_WORD(p); + p += sizeof(WORD); + if (version) + { + WARN("version must be 0 for Win16 >= 3.00 applications\n" ); + return 0; + } + offset = GET_WORD(p); + p += sizeof(WORD) + offset; } - offset = GET_WORD(p); - p += sizeof(WORD) + offset; + if (!(hMenu = CreateMenu())) return 0; - if (!parse_menu_resource( p, hMenu )) + if (!parse_menu_resource( p, hMenu, oldFormat )) { DestroyMenu( hMenu ); return 0; diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 7c91afb..336b891 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -95,6 +95,7 @@ extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp ) DECLSPEC_HIDDEN; +#define GET_BYTE(ptr) (*(const BYTE *)(ptr)) #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr))

1 0

Jeremy Newman : take live
by Jeremy Newman 27 Sep '17

27 Sep '17

Module: appdb Branch: master Commit: a02cb79079216adeeeec9a655cd8d4e7e14b1cd5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a02cb79079216adeeeec9a65… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Sep 27 15:29:02 2017 -0500 take live --- tables/alter.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/tables/alter.sql b/tables/alter.sql index 6f536fb..457f8d9 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,3 +1,2 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ -ALTER TABLE testResults ADD COLUMN hasProblems ENUM("Yes", "No") DEFAULT NULL;

1 0

Rosanne DiMesio : Add hasProblems yes/no question to the test report form
by Jeremy Newman 27 Sep '17

27 Sep '17

Module: appdb Branch: master Commit: 688664c3a41da8618a653b2c08446edfcc06f0d0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=688664c3a41da8618a653b2c… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Sep 27 13:45:22 2017 -0500 Add hasProblems yes/no question to the test report form Adds question to form and checks user responses against the responses to the Installs?, Runs?, and usedWorkarounds questions and the rating given. The user is shown an error message if the response/rating combination does not conform to the rating definitions, e.g., rating cannot be Platinum if the answer to this question is yes. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 94 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 62 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=688664c3a41da8618a65…

1 0

Rosanne DiMesio : Add hasProblems field to testResults table
by Jeremy Newman 27 Sep '17

27 Sep '17

Module: appdb Branch: master Commit: e283e25ac4efc2f1a50bd8e7bdf3d3bf52f4bd1b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e283e25ac4efc2f1a50bd8e7… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Sep 27 13:44:19 2017 -0500 Add hasProblems field to testResults table The field will be used to check whether the rating given conforms to the rating definitions. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- tables/alter.sql | 1 + tables/testResults.sql | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tables/alter.sql b/tables/alter.sql index 457f8d9..6f536fb 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,2 +1,3 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ +ALTER TABLE testResults ADD COLUMN hasProblems ENUM("Yes", "No") DEFAULT NULL; diff --git a/tables/testResults.sql b/tables/testResults.sql index 511c115..92c46e6 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -25,6 +25,7 @@ create table testResults ( submitterId int(11) NOT NULL default '0', state enum('accepted','queued','rejected','pending','deleted') NOT NULL default 'accepted', gpuMfr enum('AMD', 'Intel', 'Nvidia', 'Other', 'Unknown') default NULL, - graphicsDriver enum('open source', 'proprietary', 'unknown') default NULL, + graphicsDriver enum('open source', 'proprietary', 'unknown') default NULL, + hasProblems enum('Yes', 'No') default NULL, key(testingId) );

1 0

Alexandre Julliard : dwmapi: Update the spec file.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: c91a531957acaf4cf7cdb985b5ba47a273f5f9b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c91a531957acaf4cf7cdb985b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 19:57:06 2017 +0200 dwmapi: Update the spec file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 58 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 8e92cf2..d81df3d 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -1,6 +1,6 @@ -100 stub @ -101 stub @ -102 stdcall DwmEnableComposition (long) +100 stub DwmpDxGetWindowSharedSurface +101 stub DwmpDxUpdateWindowSharedSurface +102 stdcall DwmEnableComposition(long) 103 stub @ 104 stub @ 105 stub @ @@ -9,17 +9,57 @@ 108 stub @ 109 stub @ 110 stub @ -111 stub @ 112 stub @ 113 stub @ - +114 stub @ 115 stub @ -116 stub @ -117 stub @ 118 stub @ 119 stub @ 120 stub @ +121 stub @ +124 stub @ +125 stub DwmpDxBindSwapChain +126 stub DwmpDxUnbindSwapChain +127 stub @ +128 stub DwmpDxgiIsThreadDesktopComposited +129 stub @ +130 stub @ +131 stub @ +132 stub @ +133 stub DwmpDxUpdateWindowRedirectionBltSurface +134 stub @ +135 stub DwmpRenderFlick +136 stub DwmpAllocateSecurityDescriptor +137 stub DwmpFreeSecurityDescriptor +138 stub @ +139 stub @ +140 stub @ +141 stub @ +142 stub @ +143 stub DwmpEnableDDASupport +144 stub @ +145 stub @ +146 stub @ +147 stub @ +148 stub @ +150 stub @ +151 stub @ +152 stub @ +153 stub @ +154 stub @ +155 stub @ +156 stub DwmTetherTextContact +157 stub @ +158 stub @ +159 stub @ +160 stub @ +161 stub @ +162 stub @ +163 stub @ +164 stub @ +# @ stdcall -private DllCanUnloadNow() +# @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall DwmAttachMilContent(long) @ stdcall DwmDefWindowProc(long long long long ptr) @ stdcall DwmDetachMilContent(long) @@ -38,10 +78,14 @@ @ stub DwmModifyPreviousDxFrameDuration @ stub DwmQueryThumbnailSourceSize @ stdcall DwmRegisterThumbnail(long long ptr) +# @ stub DwmRenderGesture @ stub DwmSetDxFrameDuration @ stub DwmSetIconicLivePreviewBitmap @ stub DwmSetIconicThumbnail @ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) +# @ stub DwmShowContact +# @ stub DwmTetherContact +# @ stub DwmTransitionOwnedWindow @ stdcall DwmUnregisterThumbnail(long) @ stdcall DwmUpdateThumbnailProperties(ptr ptr)

1 0

Andrey Gusev : dwmapi: Add DwmSetIconicLivePreviewBitmap and DwmSetIconicThumbnail stubs.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 98f807c2ec2b6652a9b2efa32df0dba89f374088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98f807c2ec2b6652a9b2efa32… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Sep 26 20:48:51 2017 +0300 dwmapi: Add DwmSetIconicLivePreviewBitmap and DwmSetIconicThumbnail stubs. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 6adbcb9..8e92cf2 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -39,6 +39,8 @@ @ stub DwmQueryThumbnailSourceSize @ stdcall DwmRegisterThumbnail(long long ptr) @ stub DwmSetDxFrameDuration +@ stub DwmSetIconicLivePreviewBitmap +@ stub DwmSetIconicThumbnail @ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) @ stdcall DwmUnregisterThumbnail(long)

1 0

Ihsan Akmal : include: Add d3d11_4.idl.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: e7ebe0981d6c7a2f297efb5ba23a2094d8b843c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ebe0981d6c7a2f297efb5ba… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Tue Sep 26 17:21:25 2017 +0200 include: Add d3d11_4.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3d11_4.idl | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 71e25ca..1982386 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -43,6 +43,7 @@ IDL_SRCS = \ d3d11_1.idl \ d3d11_2.idl \ d3d11_3.idl \ + d3d11_4.idl \ d3d11sdklayers.idl \ d3dcommon.idl \ d3dx10core.idl \ diff --git a/include/d3d11_4.idl b/include/d3d11_4.idl new file mode 100644 index 0000000..d00ee49 --- /dev/null +++ b/include/d3d11_4.idl @@ -0,0 +1,120 @@ +/* + * Copyright 2017 Ihsan Akmal + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +import "oaidl.idl"; +import "ocidl.idl"; +import "dxgi1_5.idl"; +import "d3dcommon.idl"; +import "d3d11_3.idl"; + +typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS4 +{ + BOOL ExtendedNV12SharedTextureSupported; +} D3D11_FEATURE_DATA_D3D11_OPTIONS4; + +[ + uuid(8992ab71-02e6-4b8d-ba48-b056dcda42c4), + object, + local, + pointer_default(unique) +] +interface ID3D11Device4 : ID3D11Device3 +{ + HRESULT RegisterDeviceRemovedEvent( + [in] HANDLE event, + [out] DWORD *cookie + ); + void UnregisterDeviceRemoved( + [in] DWORD cookie + ); +} + +[ + uuid(8ffde202-a0e7-45df-9e01-e837801b5ea0), + object, + local, + pointer_default(unique) +] +interface ID3D11Device5 : ID3D11Device4 +{ + HRESULT OpenSharedFence( + [in] HANDLE fence, + [in] REFIID iid, + [out] void **fence + ); + HRESULT CreateFence( + [in] UINT64 initial_value, + [in] D3D11_FENCE_FLAG flags, + [in] REFIID iid, + [out] void **fence + ); +} + +[ + uuid(9b7e4e00-342c-4106-a19f-4f2704f689f0), + object, + local, + pointer_default(unique) +] +interface ID3D11Multithread : IUnknown +{ + void Enter(); + void Leave(); + BOOL SetMultithreadProtected( + [in] BOOL enable + ); + BOOL GetMultithreadProtected(); +} + +[ + uuid(c4e7374c-6243-4d1b-ae87-52b4f740e261), + object, + local, + pointer_default(unique) +] +interface ID3D11VideoContext2 : ID3D11VideoContext1 +{ + void VideoProcessorSetOutputHDRMetaData( + [in] ID3D11VideoProcessor *processor, + [in] DXGI_HDR_METADATA_TYPE type, + [in] UINT size, + [in] const void *meta_data + ); + void VideoProcessorGetOutputHDRMetaData( + [in] ID3D11VideoProcessor *processor, + [out] DXGI_HDR_METADATA_TYPE *type, + [in] UINT size, + [out] void *meta_data + ); + + void VideoProcessorSetStreamHDRMetaData( + [in] ID3D11VideoProcessor *processor, + [in] UINT stream_index, + [in] DXGI_HDR_METADATA_TYPE type, + [in] UINT size, + [in] const void *meta_data + ); + + void VideoProcessorGetStreamHDRMetaData( + [in] ID3D11VideoProcessor *processor, + [in] UINT stream_index, + [out] DXGI_HDR_METADATA_TYPE *type, + [in] UINT size, + [out] void *meta_data + ); +}

1 0

Ihsan Akmal : include: Add missing d3d11_1.idl enums and interfaces.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 0db640eb8fc3a299fb4dd067ddddd71d670a3fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db640eb8fc3a299fb4dd067d… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Tue Sep 26 17:21:24 2017 +0200 include: Add missing d3d11_1.idl enums and interfaces. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11_1.idl | 258 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 254 insertions(+), 4 deletions(-) diff --git a/include/d3d11_1.idl b/include/d3d11_1.idl index 1a46abf..4fd82f0 100644 --- a/include/d3d11_1.idl +++ b/include/d3d11_1.idl @@ -22,7 +22,8 @@ import "dxgi1_2.idl"; import "d3dcommon.idl"; import "d3d11.idl"; -typedef enum D3D11_LOGIC_OP { +typedef enum D3D11_LOGIC_OP +{ D3D11_LOGIC_OP_CLEAR = 0, D3D11_LOGIC_OP_SET, D3D11_LOGIC_OP_COPY, @@ -41,7 +42,43 @@ typedef enum D3D11_LOGIC_OP { D3D11_LOGIC_OP_OR_INVERTED } D3D11_LOGIC_OP; -typedef struct _D3D11_RENDER_TARGET_BLEND_DESC1 { +typedef enum D3D11_COPY_FLAGS +{ + D3D11_COPY_NO_OVERWRITE = 0x00000001, + D3D11_COPY_DISCARD = 0x00000002, +} D3D11_COPY_FLAGS; + +typedef enum D3D11_1_CREATE_DEVICE_CONTEXT_STATE_FLAG +{ + D3D11_1_CREATE_DEVICE_CONTEXT_STATE_SINGLETHREADED = 0x1, +} D3D11_1_CREATE_DEVICE_CONTEXT_STATE_FLAG; + +typedef enum D3D11_VIDEO_DECODER_CAPS +{ + D3D11_VIDEO_DECODER_CAPS_DOWNSAMPLE = 0x01, + D3D11_VIDEO_DECODER_CAPS_NON_REAL_TIME = 0x02, + D3D11_VIDEO_DECODER_CAPS_DOWNSAMPLE_DYNAMIC = 0x04, + D3D11_VIDEO_DECODER_CAPS_DOWNSAMPLE_REQUIRED = 0x08, + D3D11_VIDEO_DECODER_CAPS_UNSUPPORTED = 0x10, +} D3D11_VIDEO_DECODER_CAPS; + +typedef enum D3D11_VIDEO_PROCESSOR_BEHAVIOR_HINTS +{ + D3D11_VIDEO_PROCESSOR_BEHAVIOR_HINT_MULTIPLANE_OVERLAY_ROTATION = 0x01, + D3D11_VIDEO_PROCESSOR_BEHAVIOR_HINT_MULTIPLANE_OVERLAY_RESIZE = 0x02, + D3D11_VIDEO_PROCESSOR_BEHAVIOR_HINT_MULTIPLANE_OVERLAY_COLOR_SPACE_CONVERSION = 0x04, + D3D11_VIDEO_PROCESSOR_BEHAVIOR_HINT_TRIPLE_BUFFER_OUTPUT = 0x08, +} D3D11_VIDEO_PROCESSOR_BEHAVIOR_HINTS; + +typedef enum D3D11_CRYPTO_SESSION_STATUS +{ + D3D11_CRYPTO_SESSION_STATUS_OK = 0x0, + D3D11_CRYPTO_SESSION_STATUS_KEY_LOST = 0x1, + D3D11_CRYPTO_SESSION_STATUS_KEY_AND_CONTENT_LOST = 0x2, +} D3D11_CRYPTO_SESSION_STATUS; + +typedef struct D3D11_RENDER_TARGET_BLEND_DESC1 +{ BOOL BlendEnable; BOOL LogicOpEnable; D3D11_BLEND SrcBlend; @@ -54,13 +91,15 @@ typedef struct _D3D11_RENDER_TARGET_BLEND_DESC1 { UINT8 RenderTargetWriteMask; } D3D11_RENDER_TARGET_BLEND_DESC1; -typedef struct _D3D11_BLEND_DESC1 { +typedef struct D3D11_BLEND_DESC1 +{ BOOL AlphaToCoverageEnable; BOOL IndependentBlendEnable; D3D11_RENDER_TARGET_BLEND_DESC1 RenderTarget[D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT]; } D3D11_BLEND_DESC1; -typedef struct _D3D11_RASTERIZER_DESC1 { +typedef struct D3D11_RASTERIZER_DESC1 +{ D3D11_FILL_MODE FillMode; D3D11_CULL_MODE CullMode; BOOL FrontCounterClockwise; @@ -74,6 +113,74 @@ typedef struct _D3D11_RASTERIZER_DESC1 { UINT ForcedSampleCount; } D3D11_RASTERIZER_DESC1; +typedef struct D3D11_VIDEO_DECODER_SUB_SAMPLE_MAPPING_BLOCK +{ + UINT ClearSize; + UINT EncryptedSize; +} D3D11_VIDEO_DECODER_SUB_SAMPLE_MAPPING_BLOCK; + +typedef struct D3D11_VIDEO_DECODER_BUFFER_DESC1 +{ + D3D11_VIDEO_DECODER_BUFFER_TYPE BufferType; + UINT DataOffset; + UINT DataSize; + void *pIV; + UINT IVSize; + D3D11_VIDEO_DECODER_SUB_SAMPLE_MAPPING_BLOCK *pSubSampleMappingBlock; + UINT SubSampleMappingCount; +} D3D11_VIDEO_DECODER_BUFFER_DESC1; + +typedef struct D3D11_VIDEO_DECODER_BEGIN_FRAME_CRYPTO_SESSION +{ + ID3D11CryptoSession *pCryptoSession; + UINT BlobSize; + void *pBlob; + GUID *pKeyInfoId; + UINT PrivateDataSize; + void *pPrivateData; +} D3D11_VIDEO_DECODER_BEGIN_FRAME_CRYPTO_SESSION; + +typedef struct D3D11_VIDEO_PROCESSOR_STREAM_BEHAVIOR_HINT +{ + BOOL Enable; + UINT Width; + UINT Height; + DXGI_FORMAT Format; +} D3D11_VIDEO_PROCESSOR_STREAM_BEHAVIOR_HINT; + +typedef struct D3D11_KEY_EXCHANGE_HW_PROTECTION_INPUT_DATA +{ + UINT PrivateDataSize; + UINT HWProtectionDataSize; + BYTE pbInput[4]; +} D3D11_KEY_EXCHANGE_HW_PROTECTION_INPUT_DATA; + +typedef struct D3D11_KEY_EXCHANGE_HW_PROTECTION_OUTPUT_DATA +{ + UINT PrivateDataSize; + UINT MaxHWProtectionDataSize; + UINT HWProtectionDataSize; + UINT64 TransportTime; + UINT64 ExecutionTime; + BYTE pbOutput[4]; +} D3D11_KEY_EXCHANGE_HW_PROTECTION_OUTPUT_DATA; + +typedef struct D3D11_KEY_EXCHANGE_HW_PROTECTION_DATA +{ + UINT HWProtectionFunctionID; + D3D11_KEY_EXCHANGE_HW_PROTECTION_INPUT_DATA *pInputData; + D3D11_KEY_EXCHANGE_HW_PROTECTION_OUTPUT_DATA *pOutputData; + HRESULT Status; +} D3D11_KEY_EXCHANGE_HW_PROTECTION_DATA; + +typedef struct D3D11_VIDEO_SAMPLE_DESC +{ + UINT Width; + UINT Height; + DXGI_FORMAT Format; + DXGI_COLOR_SPACE_TYPE ColorSpace; +} D3D11_VIDEO_SAMPLE_DESC; + [ uuid(cc86fabe-da55-401d-85e7-e3c9de2877e9), object, @@ -228,6 +335,149 @@ interface ID3D11DeviceContext1 : ID3D11DeviceContext } [ + uuid(a7f026da-a5f8-4487-a564-15e34357651e), + object, + local, + pointer_default(unique) +] +interface ID3D11VideoContext1 : ID3D11VideoContext +{ + HRESULT SubmitDecoderBuffers1( + ID3D11VideoDecoder *decoder, + UINT buffer_count, + const D3D11_VIDEO_DECODER_BUFFER_DESC1 *buffer_desc + ); + HRESULT GetDataForNewHardwareKey( + ID3D11CryptoSession *session, + UINT input_size, + const void *input_data, + UINT64 *output_data + ); + HRESULT CheckCryptoSessionStatus( + ID3D11CryptoSession *session, + D3D11_CRYPTO_SESSION_STATUS *status + ); + HRESULT DecoderEnableDownsampling( + ID3D11VideoDecoder *decoder, + DXGI_COLOR_SPACE_TYPE colour_space, + const D3D11_VIDEO_SAMPLE_DESC *output_desc, + UINT reference_frame_count + ); + HRESULT DecoderUpdateDownsampling( + ID3D11VideoDecoder *decoder, + const D3D11_VIDEO_SAMPLE_DESC *output_desc + ); + void VideoProcessorSetOutputColorSpace1( + ID3D11VideoProcessor *processor, + DXGI_COLOR_SPACE_TYPE colour_space + ); + void VideoProcessorSetOutputShaderUsage( + ID3D11VideoProcessor *processor, + BOOL shader_usage + ); + void VideoProcessorGetOutputColorSpace1( + ID3D11VideoProcessor *processor, + DXGI_COLOR_SPACE_TYPE *colour_space + ); + void VideoProcessorGetOutputShaderUsage( + ID3D11VideoProcessor *processor, + BOOL *shader_usage + ); + void VideoProcessorSetStreamColorSpace1( + ID3D11VideoProcessor *processor, + UINT stream_index, + DXGI_COLOR_SPACE_TYPE colour_space + ); + void VideoProcessorSetStreamMirror( + ID3D11VideoProcessor *processor, + UINT stream_index, + BOOL enable, + BOOL flip_horizontal, + BOOL flip_vertical + ); + void VideoProcessorGetStreamColorSpace1( + ID3D11VideoProcessor *processor, + UINT stream_index, + DXGI_COLOR_SPACE_TYPE *colour_space + ); + void VideoProcessorGetStreamMirror( + ID3D11VideoProcessor *processor, + UINT stream_index, + BOOL *enable, + BOOL *flip_horizontal, + BOOL *flip_vertical + ); + HRESULT VideoProcessorGetBehaviorHints( + ID3D11VideoProcessor *processor, + UINT output_width, + UINT output_height, + DXGI_FORMAT output_format, + UINT stream_count, + const D3D11_VIDEO_PROCESSOR_STREAM_BEHAVIOR_HINT *streams, + UINT *behaviour_hints + ); +} + +[ + uuid(29da1d51-1321-4454-804b-f5fc9f861f0f), + object, + local, + pointer_default(unique) +] +interface ID3D11VideoDevice1 : ID3D11VideoDevice +{ + HRESULT GetCryptoSessionPrivateDataSize( + const GUID *crypto_type, + const GUID *decoder_profile, + const GUID *key_exchange_type, + UINT *input_size, + UINT *output_size + ); + HRESULT GetVideoDecoderCaps( + const GUID *decoder_profile, + UINT sample_width, + UINT sample_height, + const DXGI_RATIONAL *framerate, + UINT bitrate, + const GUID *crypto_type, + UINT *decoder_caps + ); + HRESULT CheckVideoDecoderDownsampling( + const D3D11_VIDEO_DECODER_DESC *input_desc, + DXGI_COLOR_SPACE_TYPE input_colour_space, + const D3D11_VIDEO_DECODER_CONFIG *input_config, + const DXGI_RATIONAL *framerate, + const D3D11_VIDEO_SAMPLE_DESC *output_desc, + BOOL *supported, + BOOL *real_time_hint + ); + HRESULT RecommendVideoDecoderDownsampleParameters( + const D3D11_VIDEO_DECODER_DESC *input_desc, + DXGI_COLOR_SPACE_TYPE input_colour_space, + const D3D11_VIDEO_DECODER_CONFIG *input_config, + const DXGI_RATIONAL *framerate, + D3D11_VIDEO_SAMPLE_DESC *recommended_output_desc + ); +} + +[ + uuid(465217f2-5568-43cf-b5b9-f61d54531ca1), + object, + local, + pointer_default(unique) +] +interface ID3D11VideoProcessorEnumerator1 : ID3D11VideoProcessorEnumerator +{ + HRESULT CheckVideoProcessorFormatConversion( + DXGI_FORMAT input_format, + DXGI_COLOR_SPACE_TYPE input_colour_space, + DXGI_FORMAT output_format, + DXGI_COLOR_SPACE_TYPE output_colour_space, + BOOL *supported + ); +} + +[ uuid(b2daad8b-03d4-4dbf-95eb-32ab4b63d0ab), object, local,

1 0

Ihsan Akmal : include: Add missing d3d11.idl structs and enums.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 2a75fa9010fce75b813c2edf4c729602711ab00c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a75fa9010fce75b813c2edf4… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Tue Sep 26 17:21:23 2017 +0200 include: Add missing d3d11.idl structs and enums. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 265 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a75fa9010fce75b813c2…

1 0

Ihsan Akmal : include: Add missing dxgi1_2.idl constants and interfaces.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 9274ec5f71759e2cd224a94c562d195e716a86e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9274ec5f71759e2cd224a94c5… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Tue Sep 26 17:21:22 2017 +0200 include: Add missing dxgi1_2.idl constants and interfaces. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi1_2.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/include/dxgi1_2.idl b/include/dxgi1_2.idl index 64163dd..eeabd03 100644 --- a/include/dxgi1_2.idl +++ b/include/dxgi1_2.idl @@ -18,6 +18,12 @@ import "dxgi.idl"; +const UINT DXGI_ENUM_MODES_STEREO = 0x4; +const UINT DXGI_ENUM_MODES_DISABLED_STEREO = 0x8; + +const DWORD DXGI_SHARED_RESOURCE_READ = 0x80000000; +const DWORD DXGI_SHARED_RESOURCE_WRITE = 0x00000001; + typedef enum _DXGI_OFFER_RESOURCE_PRIORITY { DXGI_OFFER_RESOURCE_PRIORITY_LOW = 1, DXGI_OFFER_RESOURCE_PRIORITY_NORMAL, @@ -138,6 +144,41 @@ interface IDXGIOutputDuplication : IDXGIObject [ object, + uuid(aba496dd-b617-4cb8-a866-bc44d7eb1fa2), + local, + pointer_default(unique) +] +interface IDXGISurface2 : IDXGISurface1 +{ + HRESULT GetResource( + [in] REFIID iid, + [out] void **parent_resource, + [out] UINT *subresource_idx + ); +} + +[ + object, + uuid(30961379-4609-4a41-998e-54fe567ee0c1), + local, + pointer_default(unique) +] +interface IDXGIResource1 : IDXGIResource +{ + HRESULT CreateSubresourceSurface( + UINT index, + [out] IDXGISurface2 **surface + ); + HRESULT CreateSharedHandle( + [in] const SECURITY_ATTRIBUTES *attributes, + [in] DWORD access, + [in] const WCHAR *name, + [out] HANDLE *handle + ); +} + +[ + object, uuid(ea9dbf1a-c88e-4486-854a-98aa0138f30c), local, pointer_default(unique)

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
45
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 2017