April 2019 - Wine-Devel - list.winehq.org

[PATCH 1/2] winex11.drv: Recreate gl_drawable for top-level windows as non-top level when clipping for child windows is required
by Micah N Gorrell April 10, 2019

April 10, 2019

Prevent creating a gl_drawable for a window as type DC_GL_WINDOW if the window has children since DC_GL_WINDOW does not support clipping. If a parent window is encountered of type DC_GL_WINDOW then recreate the gl_drawable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=15232 Signed-off-by: Micah N Gorrell <mgorrell(a)crossover.com> --- dlls/winex11.drv/opengl.c | 23 +++++++++++++++-------- dlls/winex11.drv/window.c | 13 ++++++++++++- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 13a1da32ea..0d4fb521c4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1328,7 +1328,7 @@ static GLXContext create_glxcontext(Display *display, struct wgl_context *contex /*********************************************************************** * create_gl_drawable */ -static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel_format *format ) +static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel_format *format, BOOL have_child ) { struct gl_drawable *gl, *prev; XVisualInfo *visual = format->visual; @@ -1349,7 +1349,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel gl->format = format; gl->ref = 1; - if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ + if (!have_child && !GetWindow( hwnd, GW_CHILD ) && GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* childless top-level window */ { gl->type = DC_GL_WINDOW; gl->window = create_client_window( hwnd, visual ); @@ -1412,7 +1412,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) if (!format->visual) return FALSE; - if (!(gl = create_gl_drawable( hwnd, format ))) return FALSE; + if (!(gl = create_gl_drawable( hwnd, format, FALSE ))) return FALSE; TRACE( "created GL drawable %lx for win %p %s\n", gl->drawable, hwnd, debugstr_fbconfig( format->fbconfig )); @@ -1471,7 +1471,7 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) /*********************************************************************** * sync_gl_drawable */ -void sync_gl_drawable( HWND hwnd ) +void sync_gl_drawable( HWND hwnd, BOOL have_child ) { struct gl_drawable *old, *new; @@ -1479,8 +1479,11 @@ void sync_gl_drawable( HWND hwnd ) switch (old->type) { + case DC_GL_WINDOW: + if (!have_child) break; /* Still a childless top-level window */ + /* fall through */ case DC_GL_PIXMAP_WIN: - if (!(new = create_gl_drawable( hwnd, old->format ))) break; + if (!(new = create_gl_drawable( hwnd, old->format, have_child ))) break; mark_drawable_dirty( old, new ); XFlush( gdi_display ); TRACE( "Recreated GL drawable %lx to replace %lx\n", new->drawable, old->drawable ); @@ -1517,7 +1520,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) return; } - if ((new = create_gl_drawable( hwnd, old->format ))) + if ((new = create_gl_drawable( hwnd, old->format, FALSE ))) { mark_drawable_dirty( old, new ); release_gl_drawable( new ); @@ -3304,9 +3307,13 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) } pglXSwapBuffers(gdi_display, gl->drawable); break; + case DC_GL_WINDOW: case DC_GL_CHILD_WIN: if (ctx) sync_context( ctx ); - escape.gl_drawable = gl->window; + if (gl->type == DC_GL_CHILD_WIN) + { + escape.gl_drawable = gl->window; + } /* fall through */ default: if (escape.gl_drawable && pglXSwapBuffersMscOML) @@ -3362,7 +3369,7 @@ struct opengl_funcs *get_glx_driver( UINT version ) return NULL; } -void sync_gl_drawable( HWND hwnd ) +void sync_gl_drawable( HWND hwnd, HWND child ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7a3b340e19..97dee523c9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1874,6 +1874,11 @@ static struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd, const RECT *wi if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) return NULL; + /* Recreate the parent gl_drawable now that we know there are child windows + * that will need clipping support. + */ + sync_gl_drawable( parent, TRUE ); + display = thread_init_display(); init_clip_window(); /* make sure the clip window is initialized in this thread */ @@ -2206,6 +2211,12 @@ void CDECL X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) done: release_win_data( data ); set_gl_drawable_parent( hwnd, parent ); + + /* Recreate the parent gl_drawable now that we know there are child windows + * that will need clipping support. + */ + sync_gl_drawable( parent, TRUE ); + fetch_icon_data( hwnd, 0, 0 ); } @@ -2369,7 +2380,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags data->client_rect.bottom - data->client_rect.top != old_client_rect.bottom - old_client_rect.top)); release_win_data( data ); - if (needs_resize) sync_gl_drawable( hwnd ); + if (needs_resize) sync_gl_drawable( hwnd, FALSE ); return; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a0308b0675..71c1f3877d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -583,7 +583,7 @@ extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; -extern void sync_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; +extern void sync_gl_drawable( HWND hwnd, BOOL have_child ) DECLSPEC_HIDDEN; extern void set_gl_drawable_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void wine_vk_surface_destroy( HWND hwnd ) DECLSPEC_HIDDEN; -- 2.21.0

3 4

[PATCH] msvcrt: Implement the remquo family of functions
by Martin Storsjo April 10, 2019

April 10, 2019

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +-- dlls/msvcr120/msvcr120.spec | 6 +-- dlls/msvcr120_app/msvcr120_app.spec | 6 +-- dlls/msvcrt/math.c | 38 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +-- 6 files changed, 52 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 67b360d9a9..a38a9873df 100644 --- a/configure.ac +++ b/configure.ac @@ -2728,6 +2728,8 @@ AC_CHECK_FUNCS(\ powl \ remainder \ remainderf \ + remquo \ + remquof \ rint \ rintf \ round \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index dea5094a91..b9fb2dcda5 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -308,9 +308,9 @@ @ cdecl remainder(double double) ucrtbase.remainder @ cdecl remainderf(float float) ucrtbase.remainderf @ cdecl remainderl(double double) ucrtbase.remainderl -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) ucrtbase.remquo +@ cdecl remquof(float float ptr) ucrtbase.remquof +@ cdecl remquol(double double) ucrtbase.remquol @ cdecl rint(double) ucrtbase.rint @ cdecl rintf(float) ucrtbase.rintf @ cdecl rintl(double) ucrtbase.rintl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8cd39ea19e..dc146fdd7c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2328,9 +2328,9 @@ @ cdecl remainderf(float float) MSVCR120_remainderf @ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) MSVCR120_remquo +@ cdecl remquof(float float ptr) MSVCR120_remquof +@ cdecl remquol(double double) MSVCR120_remquol @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind @ cdecl rint(double) MSVCR120_rint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index dc3f3bd807..d290ff8213 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1991,9 +1991,9 @@ @ cdecl remainderf(float float) msvcr120.remainderf @ cdecl remainderl(double double) msvcr120.remainderl @ cdecl remove(str) msvcr120.remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) msvcr120.remquo +@ cdecl remquof(float float ptr) msvcr120.remquof +@ cdecl remquol(double double) msvcr120.remquol @ cdecl rename(str str) msvcr120.rename @ cdecl rewind(ptr) msvcr120.rewind @ cdecl rint(double) msvcr120.rint diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 754e46ce66..c893c83a69 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3272,6 +3272,44 @@ LDOUBLE CDECL MSVCR120_remainderl(LDOUBLE x, LDOUBLE y) return MSVCR120_remainder(x, y); } +/********************************************************************* + * remquo (MSVCR120.@) + */ +double CDECL MSVCR120_remquo(double x, double y, int *quo) +{ +#ifdef HAVE_REMQUO + if(!finite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnan(y) || y==0.0) *MSVCRT__errno() = MSVCRT_EDOM; + return remquo(x, y, quo); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * remquof (MSVCR120.@) + */ +float CDECL MSVCR120_remquof(float x, float y, int *quo) +{ +#ifdef HAVE_REMQUOF + if(!finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnan(y) || y==0.0f) *MSVCRT__errno() = MSVCRT_EDOM; + return remquof(x, y, quo); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * remquol (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_remquol(LDOUBLE x, LDOUBLE y, int *quo) +{ + return MSVCR120_remquo(x, y, quo); +} + /********************************************************************* * lgamma (MSVCR120.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d218aa3a7b..30718dcc9c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2463,9 +2463,9 @@ @ cdecl remainderf(float float) MSVCR120_remainderf @ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) MSVCR120_remquo +@ cdecl remquof(float float ptr) MSVCR120_remquof +@ cdecl remquol(double double) MSVCR120_remquol @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind @ cdecl rint(double) MSVCR120_rint -- 2.17.1

2 2

[PATCH vkd3d 3/4] include: Add definitions for versioned root signatures.
by Józef Kucia April 10, 2019

April 10, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index e3f9df0f7127..6cb63f113860 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -590,7 +590,11 @@ typedef struct D3D12_DESCRIPTOR_RANGE typedef enum D3D12_DESCRIPTOR_RANGE_FLAGS { - D3D12_DESCRIPTOR_RANGE_FLAG_NONE = 0, + D3D12_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, + D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, + D3D12_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, + D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, } D3D12_DESCRIPTOR_RANGE_FLAGS; typedef struct D3D12_DESCRIPTOR_RANGE1 @@ -630,7 +634,10 @@ typedef struct D3D12_ROOT_DESCRIPTOR typedef enum D3D12_ROOT_DESCRIPTOR_FLAGS { - D3D12_ROOT_DESCRIPTOR_FLAG_NONE = 0, + D3D12_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, + D3D12_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, + D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, } D3D12_ROOT_DESCRIPTOR_FLAGS; typedef struct D3D12_ROOT_DESCRIPTOR1 @@ -2298,13 +2305,39 @@ interface ID3D12RootSignatureDeserializer : IUnknown const D3D12_ROOT_SIGNATURE_DESC *GetRootSignatureDesc(); } +[ + uuid(7f91ce67-090c-4bb7-b78e-ed8ff2e31da0), + object, + local, + pointer_default(unique) +] +interface ID3D12VersionedRootSignatureDeserializer : IUnknown +{ + HRESULT GetRootSignatureDescAtVersion(D3D_ROOT_SIGNATURE_VERSION version, + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC **desc); + + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *GetUnconvertedRootSignatureDesc(); +}; + [local] HRESULT __stdcall D3D12CreateRootSignatureDeserializer( const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +typedef HRESULT (__stdcall *PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER)( + const void *data, SIZE_T data_size, REFIID iid, void **deserializer); + +[local] HRESULT __stdcall D3D12CreateVersionedRootSignatureDeserializer( + const void *data, SIZE_T data_size, REFIID iid, void **deserializer); + [local] HRESULT __stdcall D3D12SerializeRootSignature( const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); +typedef HRESULT (__stdcall *PFN_D3D12_SERIALIZE_VERSIONED_ROOT_SIGNATURE)( + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, ID3DBlob **blob, ID3DBlob **error_blob); + +[local] HRESULT __stdcall D3D12SerializeVersionedRootSignature( + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, ID3DBlob **blob, ID3DBlob **error_blob); + [local] HRESULT __stdcall D3D12SerializeVersionedRootSignature( const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *root_signature_desc, ID3DBlob **blob, ID3DBlob **error_blob); -- 2.21.0

3 3

[PATCH vkd3d 4/4] vkd3d: Add stubs for versioned root signatures.
by Józef Kucia April 10, 2019

April 10, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d.h | 13 +++++++++++++ libs/vkd3d-utils/vkd3d_utils.map | 2 ++ libs/vkd3d-utils/vkd3d_utils_main.c | 24 ++++++++++++++++++++---- libs/vkd3d/vkd3d.map | 2 ++ libs/vkd3d/vkd3d_main.c | 24 ++++++++++++++++++++---- 5 files changed, 57 insertions(+), 8 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 39c4c6bdd1bc..24cb34eb3c34 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -154,9 +154,15 @@ ULONG vkd3d_resource_incref(ID3D12Resource *resource); HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); +HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); + HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer); + DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format); VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); @@ -190,9 +196,16 @@ typedef ULONG (*PFN_vkd3d_resource_incref)(ID3D12Resource *resource); typedef HRESULT (*PFN_vkd3d_serialize_root_signature)(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); +typedef HRESULT (*PFN_vkd3d_serialize_versioned_root_signature)(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); + typedef HRESULT (*PFN_vkd3d_create_root_signature_deserializer)(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +typedef HRESULT (*PFN_vkd3d_create_versioned_root_signature_deserializer)(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer); + +typedef DXGI_FORMAT (*PFN_vkd3d_get_dxgi_format)(VkFormat format); typedef VkFormat (*PFN_vkd3d_get_vk_format)(DXGI_FORMAT format); #ifdef __cplusplus diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index 79858e502eec..9d95a8410406 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -3,8 +3,10 @@ VKD3D_1_0 global: D3D12CreateDevice; D3D12CreateRootSignatureDeserializer; + D3D12CreateVersionedRootSignatureDeserializer; D3D12GetDebugInterface; D3D12SerializeRootSignature; + D3D12SerializeVersionedRootSignature; vkd3d_create_event; vkd3d_destroy_event; vkd3d_signal_event; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 03f9f52261ad..d06a7503b8da 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -87,13 +87,29 @@ HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T dat return vkd3d_create_root_signature_deserializer(data, data_size, iid, deserializer); } -HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, +HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size, + REFIID iid,void **deserializer) +{ + TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", + data, data_size, debugstr_guid(iid), deserializer); + + return vkd3d_create_versioned_root_signature_deserializer(data, data_size, iid, deserializer); +} + +HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) { - TRACE("root_signature_desc %p, version %#x, blob %p, error_blob %p.\n", - root_signature_desc, version, blob, error_blob); + TRACE("desc %p, version %#x, blob %p, error_blob %p.\n", desc, version, blob, error_blob); + + return vkd3d_serialize_root_signature(desc, version, blob, error_blob); +} + +HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob) +{ + TRACE("desc %p, blob %p, error_blob %p.\n", desc, blob, error_blob); - return vkd3d_serialize_root_signature(root_signature_desc, version, blob, error_blob); + return vkd3d_serialize_versioned_root_signature(desc, blob, error_blob); } /* Events */ diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index f43c85c1f9d4..6f1f376113e0 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -6,6 +6,7 @@ global: vkd3d_create_image_resource; vkd3d_create_instance; vkd3d_create_root_signature_deserializer; + vkd3d_create_versioned_root_signature_deserializer; vkd3d_get_device_parent; vkd3d_get_dxgi_format; vkd3d_get_vk_device; @@ -20,6 +21,7 @@ global: vkd3d_resource_decref; vkd3d_resource_incref; vkd3d_serialize_root_signature; + vkd3d_serialize_versioned_root_signature; local: *; }; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 5e93a2a77407..8f9351bbacac 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -205,6 +205,15 @@ HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_s &IID_ID3D12RootSignatureDeserializer, iid, deserializer); } +HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer) +{ + FIXME("data %p, data_size %lu, iid %s, deserializer %p stub!\n", + data, data_size, debugstr_guid(iid), deserializer); + + return E_NOTIMPL; +} + /* ID3DBlob */ struct d3d_blob { @@ -319,7 +328,7 @@ static HRESULT d3d_blob_create(void *buffer, SIZE_T size, struct d3d_blob **blob return S_OK; } -HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, +HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) { struct vkd3d_shader_code dxbc; @@ -327,8 +336,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_sig HRESULT hr; int ret; - TRACE("root_signature_desc %p, version %#x, blob %p, error_blob %p.\n", - root_signature_desc, version, blob, error_blob); + TRACE("desc %p, version %#x, blob %p, error_blob %p.\n", desc, version, blob, error_blob); if (!blob) { @@ -340,7 +348,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_sig *error_blob = NULL; if ((ret = vkd3d_shader_serialize_root_signature( - (const struct vkd3d_root_signature_desc *)root_signature_desc, + (const struct vkd3d_root_signature_desc *)desc, (enum vkd3d_root_signature_version)version, &dxbc)) < 0) { WARN("Failed to serialize root signature, vkd3d result %d.\n", ret); @@ -360,3 +368,11 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_sig return S_OK; } + +HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob) +{ + FIXME("desc %p, blob %p, error_blob %p stub!\n", desc, blob, error_blob); + + return E_NOTIMPL; +} -- 2.21.0

2 1

[PATCH vkd3d 2/4] vkd3d: Fix device features structure chain.
by Józef Kucia April 10, 2019

April 10, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 43c683061f3b..5c0c880d9d25 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1583,7 +1583,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, depth_clip_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT; memset(&descriptor_indexing_features, 0, sizeof(descriptor_indexing_features)); descriptor_indexing_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; - descriptor_indexing_features.pNext = &depth_clip_features.pNext; + descriptor_indexing_features.pNext = &depth_clip_features; memset(&xfb_features, 0, sizeof(xfb_features)); xfb_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; xfb_features.pNext = &descriptor_indexing_features; -- 2.21.0

2 1

[PATCH] include: Add more dbgeng interface definitions.
by Nikolay Sivov April 10, 2019

April 10, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dbgeng.h | 207 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 207 insertions(+) diff --git a/include/dbgeng.h b/include/dbgeng.h index 268fcba2a2..8c5c78c07f 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -27,11 +27,16 @@ DEFINE_GUID(IID_IDebugOutputCallbacks, 0x4bf58045, 0xd654, 0x4c40, 0xb0, 0xaf DEFINE_GUID(IID_IDebugEventCallbacks, 0x337be28b, 0x5036, 0x4d72, 0xb6, 0xbf, 0xc4, 0x5f, 0xbb, 0x9f, 0x2e, 0xaa); DEFINE_GUID(IID_IDebugClient, 0x27fe5639, 0x8407, 0x4f47, 0x83, 0x64, 0xee, 0x11, 0x8f, 0xb0, 0x8a, 0xc8); DEFINE_GUID(IID_IDebugDataSpaces, 0x88f7dfab, 0x3ea7, 0x4c3a, 0xae, 0xfb, 0xc4, 0xe8, 0x10, 0x61, 0x73, 0xaa); +DEFINE_GUID(IID_IDebugDataSpaces2, 0x7a5e852f, 0x96e9, 0x468f, 0xac, 0x1b, 0x0b, 0x3a, 0xdd, 0xc4, 0xa0, 0x49); DEFINE_GUID(IID_IDebugSymbols, 0x8c31e98c, 0x983a, 0x48a5, 0x90, 0x16, 0x6f, 0xe5, 0xd6, 0x67, 0xa9, 0x50); DEFINE_GUID(IID_IDebugSymbols2, 0x3a707211, 0xafdd, 0x4495, 0xad, 0x4f, 0x56, 0xfe, 0xcd, 0xf8, 0x16, 0x3f); DEFINE_GUID(IID_IDebugSymbols3, 0xf02fbecc, 0x50ac, 0x4f36, 0x9a, 0xd9, 0xc9, 0x75, 0xe8, 0xf3, 0x2f, 0xf8); DEFINE_GUID(IID_IDebugControl, 0x5182e668, 0x105e, 0x416e, 0xad, 0x92, 0x24, 0xef, 0x80, 0x04, 0x24, 0xba); DEFINE_GUID(IID_IDebugControl2, 0xd4366723, 0x44df, 0x4bed, 0x8c, 0x7e, 0x4c, 0x05, 0x42, 0x4f, 0x45, 0x88); +DEFINE_GUID(IID_IDebugAdvanced, 0xf2df5f53, 0x071f, 0x47bd, 0x9d, 0xe6, 0x57, 0x34, 0xc3, 0xfe, 0xd6, 0x89); +DEFINE_GUID(IID_IDebugSystemObjects, 0x6b86fe2c, 0x2c4f, 0x4f0c, 0x9d, 0xa2, 0x17, 0x43, 0x11, 0xac, 0xc3, 0x27); +DEFINE_GUID(IID_IDebugSystemObjects2, 0x0ae9f5ff, 0x1852, 0x4679, 0xb0, 0x55, 0x49, 0x4b, 0xee, 0x64, 0x07, 0xee); +DEFINE_GUID(IID_IDebugSystemObjects3, 0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9, 0xdf, 0xe5, 0xd9, 0xfc, 0x33, 0x0e); /* Engine options */ #define DEBUG_ENGOPT_IGNORE_DBGHELP_VERSION 0x00000001 @@ -154,6 +159,7 @@ typedef struct _DEBUG_BREAKPOINT_PARAMETERS typedef struct _WINDBG_EXTENSION_APIS32 *PWINDBG_EXTENSION_APIS32; typedef struct _WINDBG_EXTENSION_APIS64 *PWINDBG_EXTENSION_APIS64; +typedef struct _MEMORY_BASIC_INFORMATION64 *PMEMORY_BASIC_INFORMATION64; typedef struct _DEBUG_SPECIFIC_FILTER_PARAMETERS { @@ -414,6 +420,54 @@ DECLARE_INTERFACE_(IDebugDataSpaces, IUnknown) }; #undef INTERFACE +#define INTERFACE IDebugDataSpaces2 +DECLARE_INTERFACE_(IDebugDataSpaces2, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugDataSpaces */ + STDMETHOD(ReadVirtual)(THIS_ ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *read_len) PURE; + STDMETHOD(WriteVirtual)(THIS_ ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *written) PURE; + STDMETHOD(SearchVirtual)(THIS_ ULONG64 offset, ULONG64 length, void *pattern, ULONG pattern_size, + ULONG pattern_granularity, ULONG64 *ret_offset) PURE; + STDMETHOD(ReadVirtualUncached)(THIS_ ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *read_len) PURE; + STDMETHOD(WriteVirtualUncached)(THIS_ ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *written) PURE; + STDMETHOD(ReadPointersVirtual)(THIS_ ULONG count, ULONG64 offset, ULONG64 *pointers) PURE; + STDMETHOD(WritePointersVirtual)(THIS_ ULONG count, ULONG64 offset, ULONG64 *pointers) PURE; + STDMETHOD(ReadPhysical)(THIS_ ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *read_len) PURE; + STDMETHOD(WritePhysical)(THIS_ ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *written) PURE; + STDMETHOD(ReadControl)(THIS_ ULONG processor, ULONG64 offset, void *buffer, ULONG buffer_size, + ULONG *read_len) PURE; + STDMETHOD(WriteControl)(THIS_ ULONG processor, ULONG64 offset, void *buffer, ULONG buffer_size, + ULONG *written) PURE; + STDMETHOD(ReadIo)(THIS_ ULONG type, ULONG bus_number, ULONG address_space, ULONG64 offset, void *buffer, + ULONG buffer_size, ULONG *read_len) PURE; + STDMETHOD(WriteIo)(THIS_ ULONG type, ULONG bus_number, ULONG address_space, ULONG64 offset, void *buffer, + ULONG buffer_size, ULONG *written) PURE; + STDMETHOD(ReadMsr)(THIS_ ULONG msr, ULONG64 *value) PURE; + STDMETHOD(WriteMsr)(THIS_ ULONG msr, ULONG64 value) PURE; + STDMETHOD(ReadBusData)(THIS_ ULONG data_type, ULONG bus_number, ULONG slot_number, ULONG offset, void *buffer, + ULONG buffer_size, ULONG *read_len) PURE; + STDMETHOD(WriteBusData)(THIS_ ULONG data_type, ULONG bus_number, ULONG slot_number, ULONG offset, void *buffer, + ULONG buffer_size, ULONG *written) PURE; + STDMETHOD(CheckLowMemory)(THIS) PURE; + STDMETHOD(ReadDebuggerData)(THIS_ ULONG index, void *buffer, ULONG buffer_size, ULONG *data_size) PURE; + STDMETHOD(ReadProcessorSystemData)(THIS_ ULONG processor, ULONG index, void *buffer, ULONG buffer_size, + ULONG *data_size) PURE; + /* IDebugDataSpaces2 */ + STDMETHOD(VirtualToPhysical)(THIS_ ULONG64 virt, ULONG64 *physical) PURE; + STDMETHOD(GetVirtualTranslationPhysicalOffsets)(THIS_ ULONG64 virt, ULONG64 *offsets, ULONG offsets_size, + ULONG *levels) PURE; + STDMETHOD(ReadHandleData)(THIS_ ULONG64 handle, ULONG datatype, void *buffer, ULONG buffer_size, + ULONG *data_size) PURE; + STDMETHOD(FillVirtual)(THIS_ ULONG64 start, ULONG size, void *pattern, ULONG pattern_size, ULONG *filled) PURE; + STDMETHOD(FillPhysical)(THIS_ ULONG64 start, ULONG size, void *pattern, ULONG pattern_size, ULONG *filled) PURE; + STDMETHOD(QueryVirtual)(THIS_ ULONG64 offset, PMEMORY_BASIC_INFORMATION64 info) PURE; +}; +#undef INTERFACE + #define INTERFACE IDebugSymbols DECLARE_INTERFACE_(IDebugSymbols, IUnknown) { @@ -1024,6 +1078,159 @@ DECLARE_INTERFACE_(IDebugControl2, IUnknown) }; #undef INTERFACE +#define INTERFACE IDebugAdvanced +DECLARE_INTERFACE_(IDebugAdvanced, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugAdvanced */ + STDMETHOD(GetThreadContext)(THIS_ void *context, ULONG context_size) PURE; + STDMETHOD(SetThreadContext)(THIS_ void *context, ULONG context_size) PURE; +}; +#undef INTERFACE + +#define INTERFACE IDebugSystemObjects +DECLARE_INTERFACE_(IDebugSystemObjects, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugSystemObjects */ + STDMETHOD(GetEventThread)(THIS_ ULONG *id) PURE; + STDMETHOD(GetEventProcess)(THIS_ ULONG *id) PURE; + STDMETHOD(GetCurrentThreadId)(THIS_ ULONG *id) PURE; + STDMETHOD(SetCurrentThreadId)(THIS_ ULONG id) PURE; + STDMETHOD(SetCurrentProcessId)(THIS_ ULONG id) PURE; + STDMETHOD(GetNumberThreads)(THIS_ ULONG *number) PURE; + STDMETHOD(GetTotalNumberThreads)(THIS_ ULONG *total, ULONG *largest_process) PURE; + STDMETHOD(GetThreadIdsByIndex)(THIS_ ULONG start, ULONG count, ULONG *ids, ULONG *sysids) PURE; + STDMETHOD(GetThreadIdByProcessor)(THIS_ ULONG processor, ULONG *id) PURE; + STDMETHOD(GetCurrentThreadDataOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(GetThreadIdByDataOffset)(THIS_ ULONG64 offset, ULONG *id) PURE; + STDMETHOD(GetCurrentThreadTeb)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(GetThreadIdByTeb)(THIS_ ULONG64 offset, ULONG *id) PURE; + STDMETHOD(GetCurrentThreadSystemId)(THIS_ ULONG *sysid) PURE; + STDMETHOD(GetThreadIdBySystemId)(THIS_ ULONG sysid, ULONG *id) PURE; + STDMETHOD(GetCurrentThreadHandle)(THIS_ ULONG64 *handle) PURE; + STDMETHOD(GetThreadIdByHandle)(THIS_ ULONG64 handle, ULONG *id) PURE; + STDMETHOD(GetNumberProcesses)(THIS_ ULONG *number) PURE; + STDMETHOD(GetProcessIdsByIndex)(THIS_ ULONG start, ULONG count, ULONG *ids, ULONG *sysids) PURE; + STDMETHOD(GetCurrentProcessDataOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(GetProcessIdByDataOffset)(THIS_ ULONG64 offset, ULONG *id) PURE; + STDMETHOD(GetCurrentProcessPeb)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(GetProcessIdByPeb)(THIS_ ULONG64 offset, ULONG *id) PURE; + STDMETHOD(GetCurrentProcessSystemId)(THIS_ ULONG *sysid) PURE; + STDMETHOD(GetProcessIdBySystemId)(THIS_ ULONG sysid, ULONG *id) PURE; + STDMETHOD(GetCurrentProcessHandle)(THIS_ ULONG64 *handle) PURE; + STDMETHOD(GetProcessIdByHandle)(THIS_ ULONG64 handle, ULONG *id) PURE; + STDMETHOD(GetCurrentProcessExecutableName)(THIS_ char *buffer, ULONG buffer_size, ULONG *exe_size) PURE; +}; +#undef INTERFACE + +#define INTERFACE IDebugSystemObjects2 +DECLARE_INTERFACE_(IDebugSystemObjects2, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugSystemObjects */ + STDMETHOD(GetEventThread)(THIS_ ULONG *id) PURE; + STDMETHOD(GetEventProcess)(THIS_ ULONG *id) PURE; + STDMETHOD(GetCurrentThreadId)(THIS_ ULONG *id) PURE; + STDMETHOD(SetCurrentThreadId)(THIS_ ULONG id) PURE; + STDMETHOD(SetCurrentProcessId)(THIS_ ULONG id) PURE; + STDMETHOD(GetNumberThreads)(THIS_ ULONG *number) PURE; + STDMETHOD(GetTotalNumberThreads)(THIS_ ULONG *total, ULONG *largest_process) PURE; + STDMETHOD(GetThreadIdsByIndex)(THIS_ ULONG start, ULONG count, ULONG *ids, ULONG *sysids) PURE; + STDMETHOD(GetThreadIdByProcessor)(THIS_ ULONG processor, ULONG *id) PURE; + STDMETHOD(GetCurrentThreadDataOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(GetThreadIdByDataOffset)(THIS_ ULONG64 offset, ULONG *id) PURE; + STDMETHOD(GetCurrentThreadTeb)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(GetThreadIdByTeb)(THIS_ ULONG64 offset, ULONG *id) PURE; + STDMETHOD(GetCurrentThreadSystemId)(THIS_ ULONG *sysid) PURE; + STDMETHOD(GetThreadIdBySystemId)(THIS_ ULONG sysid, ULONG *id) PURE; + STDMETHOD(GetCurrentThreadHandle)(THIS_ ULONG64 *handle) PURE; + STDMETHOD(GetThreadIdByHandle)(THIS_ ULONG64 handle, ULONG *id) PURE; + STDMETHOD(GetNumberProcesses)(THIS_ ULONG *number) PURE; + STDMETHOD(GetProcessIdsByIndex)(THIS_ ULONG start, ULONG count, ULONG *ids, ULONG *sysids) PURE; + STDMETHOD(GetCurrentProcessDataOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(GetProcessIdByDataOffset)(THIS_ ULONG64 offset, ULONG *id) PURE; + STDMETHOD(GetCurrentProcessPeb)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(GetProcessIdByPeb)(THIS_ ULONG64 offset, ULONG *id) PURE; + STDMETHOD(GetCurrentProcessSystemId)(THIS_ ULONG *sysid) PURE; + STDMETHOD(GetProcessIdBySystemId)(THIS_ ULONG sysid, ULONG *id) PURE; + STDMETHOD(GetCurrentProcessHandle)(THIS_ ULONG64 *handle) PURE; + STDMETHOD(GetProcessIdByHandle)(THIS_ ULONG64 handle, ULONG *id) PURE; + STDMETHOD(GetCurrentProcessExecutableName)(THIS_ char *buffer, ULONG buffer_size, ULONG *exe_size) PURE; + /* IDebugSystemObjects2 */ + STDMETHOD(GetCurrentProcessUpTime)(THIS_ ULONG *uptime) PURE; + STDMETHOD(GetImplicitThreadDataOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(SetImplicitThreadDataOffset)(THIS_ ULONG64 offset) PURE; + STDMETHOD(GetImplicitProcessDataOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(SetImplicitProcessDataOffset)(THIS_ ULONG64 offset) PURE; +}; +#undef INTERFACE + +#define INTERFACE IDebugSystemObjects3 +DECLARE_INTERFACE_(IDebugSystemObjects3, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugSystemObjects */ + STDMETHOD(GetEventThread)(THIS_ ULONG *id) PURE; + STDMETHOD(GetEventProcess)(THIS_ ULONG *id) PURE; + STDMETHOD(GetCurrentThreadId)(THIS_ ULONG *id) PURE; + STDMETHOD(SetCurrentThreadId)(THIS_ ULONG id) PURE; + STDMETHOD(SetCurrentProcessId)(THIS_ ULONG id) PURE; + STDMETHOD(GetNumberThreads)(THIS_ ULONG *number) PURE; + STDMETHOD(GetTotalNumberThreads)(THIS_ ULONG *total, ULONG *largest_process) PURE; + STDMETHOD(GetThreadIdsByIndex)(THIS_ ULONG start, ULONG count, ULONG *ids, ULONG *sysids) PURE; + STDMETHOD(GetThreadIdByProcessor)(THIS_ ULONG processor, ULONG *id) PURE; + STDMETHOD(GetCurrentThreadDataOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(GetThreadIdByDataOffset)(THIS_ ULONG64 offset, ULONG *id) PURE; + STDMETHOD(GetCurrentThreadTeb)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(GetThreadIdByTeb)(THIS_ ULONG64 offset, ULONG *id) PURE; + STDMETHOD(GetCurrentThreadSystemId)(THIS_ ULONG *sysid) PURE; + STDMETHOD(GetThreadIdBySystemId)(THIS_ ULONG sysid, ULONG *id) PURE; + STDMETHOD(GetCurrentThreadHandle)(THIS_ ULONG64 *handle) PURE; + STDMETHOD(GetThreadIdByHandle)(THIS_ ULONG64 handle, ULONG *id) PURE; + STDMETHOD(GetNumberProcesses)(THIS_ ULONG *number) PURE; + STDMETHOD(GetProcessIdsByIndex)(THIS_ ULONG start, ULONG count, ULONG *ids, ULONG *sysids) PURE; + STDMETHOD(GetCurrentProcessDataOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(GetProcessIdByDataOffset)(THIS_ ULONG64 offset, ULONG *id) PURE; + STDMETHOD(GetCurrentProcessPeb)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(GetProcessIdByPeb)(THIS_ ULONG64 offset, ULONG *id) PURE; + STDMETHOD(GetCurrentProcessSystemId)(THIS_ ULONG *sysid) PURE; + STDMETHOD(GetProcessIdBySystemId)(THIS_ ULONG sysid, ULONG *id) PURE; + STDMETHOD(GetCurrentProcessHandle)(THIS_ ULONG64 *handle) PURE; + STDMETHOD(GetProcessIdByHandle)(THIS_ ULONG64 handle, ULONG *id) PURE; + STDMETHOD(GetCurrentProcessExecutableName)(THIS_ char *buffer, ULONG buffer_size, ULONG *exe_size) PURE; + /* IDebugSystemObjects2 */ + STDMETHOD(GetCurrentProcessUpTime)(THIS_ ULONG *uptime) PURE; + STDMETHOD(GetImplicitThreadDataOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(SetImplicitThreadDataOffset)(THIS_ ULONG64 offset) PURE; + STDMETHOD(GetImplicitProcessDataOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(SetImplicitProcessDataOffset)(THIS_ ULONG64 offset) PURE; + /* IDebugSystemObjects3 */ + STDMETHOD(GetEventSystem)(THIS_ ULONG *id) PURE; + STDMETHOD(GetCurrentSystemId)(THIS_ ULONG *id) PURE; + STDMETHOD(SetCurrentSystemId)(THIS_ ULONG id) PURE; + STDMETHOD(GetNumberSystems)(THIS_ ULONG *number) PURE; + STDMETHOD(GetSystemIdsByIndex)(THIS_ ULONG start, ULONG count, ULONG *ids) PURE; + STDMETHOD(GetTotalNumberThreadsAndProcesses)(THIS_ ULONG *total_threads, ULONG *total_processes, + ULONG *largest_process_threads, ULONG *largest_system_threads, ULONG *largest_system_processes) PURE; + STDMETHOD(GetCurrentSystemServer)(THIS_ ULONG64 *server) PURE; + STDMETHOD(GetSystemByServer)(THIS_ ULONG64 server, ULONG *id) PURE; + STDMETHOD(GetCurrentSystemServerName)(THIS_ char *buffer, ULONG buffer_size, ULONG *name_size) PURE; +}; +#undef INTERFACE + HRESULT WINAPI DebugCreate(REFIID riid, void **out); #ifdef __cplusplus -- 2.20.1

2 2

[PATCH v7 2/2] user32: Implement EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa April 10, 2019

April 10, 2019

In v7, fix the following compiler warning: ../../../wine/dlls/user32/edit.c:2897:43: warning: implicit declaration of function ‘GetCharWidthInfo’ [-Wimplicit-function-declaration] if (is_cjk_charset(dc) && GetCharWidthInfo(dc, &width_info)) ^~~~~~~~~~~~~~~~ Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 41 ++++++++++++++++++++++++++++++++++++++--- dlls/user32/tests/edit.c | 4 ++-- 2 files changed, 40 insertions(+), 5 deletions(-)

1 0

[PATCH v7 1/2] user32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa April 10, 2019

April 10, 2019

In v7, rename structure name for consistency. In v6, use Gdi32.GetCharWidthInfo. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-)

1 0

[PATCH v2 1/5] configure: Check for libv4l2.
by Zebediah Figura April 10, 2019

April 10, 2019

v4l1 has been deprecated and removed from the kernel for almost a decade. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This patch, notably, does not port the support for mmap(). Devices that do not support read(), and only support mmap(), can be emulated with libv4l2. Accordingly this patch requires libv4l2 to read from those devices. configure.ac | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index ef0a2612ff..31dd472533 100644 --- a/configure.ac +++ b/configure.ac @@ -82,6 +82,7 @@ AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) +AC_ARG_WITH(v4l2, AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)])) AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), @@ -1425,6 +1426,14 @@ fi WINE_NOTICE_WITH(v4l,[test "x$ac_cv_lib_soname_v4l1" = "x"], [libv4l ${notice_platform}development files not found.]) +dnl **** Check for libv4l2 **** +if test "x$with_v4l2" != "xno" +then + WINE_CHECK_SONAME(v4l2,v4l2_open,,,) +fi +WINE_NOTICE_WITH(v4l2,[test "x$ac_cv_lib_soname_v4l2" = "x"], + [libv4l2 ${notice_platform}development files not found.]) + dnl **** Check for libgphoto2 **** if test "x$with_gphoto" != "xno" then -- 2.21.0

1 4

[PATCH 6/6] ddraw: Avoid passing invalid device type to wined3d.
by Józef Kucia April 10, 2019

April 10, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/main.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 0faa98234d55..ac4d3f786c79 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -256,62 +256,52 @@ HRESULT WINAPI GetSurfaceFromDC(HDC dc, IDirectDrawSurface4 **surface, HDC *devi * E_OUTOFMEMORY if some allocation failed * ***********************************************************************/ -static HRESULT -DDRAW_Create(const GUID *guid, - void **DD, - IUnknown *UnkOuter, - REFIID iid) +static HRESULT DDRAW_Create(const GUID *guid, void **out, IUnknown *outer_unknown, REFIID iid) { enum wined3d_device_type device_type; struct ddraw *ddraw; - HRESULT hr; DWORD flags = 0; + HRESULT hr; TRACE("driver_guid %s, ddraw %p, outer_unknown %p, interface_iid %s.\n", - debugstr_guid(guid), DD, UnkOuter, debugstr_guid(iid)); + debugstr_guid(guid), out, outer_unknown, debugstr_guid(iid)); - *DD = NULL; + *out = NULL; if (guid == (GUID *) DDCREATE_EMULATIONONLY) { - /* Use the reference device id. This doesn't actually change anything, - * WineD3D always uses OpenGL for D3D rendering. One could make it request - * indirect rendering - */ device_type = WINED3D_DEVICE_TYPE_REF; } - else if(guid == (GUID *) DDCREATE_HARDWAREONLY) + else if (guid == (GUID *) DDCREATE_HARDWAREONLY) { device_type = WINED3D_DEVICE_TYPE_HAL; } else { - device_type = 0; + device_type = WINED3D_DEVICE_TYPE_HAL; } /* DDraw doesn't support aggregation, according to msdn */ - if (UnkOuter != NULL) + if (outer_unknown != NULL) return CLASS_E_NOAGGREGATION; if (!IsEqualGUID(iid, &IID_IDirectDraw7)) flags = WINED3D_LEGACY_FFP_LIGHTING; - /* DirectDraw creation comes here */ if (!(ddraw = heap_alloc_zero(sizeof(*ddraw)))) { - ERR("Out of memory when creating DirectDraw\n"); + ERR("Out of memory when creating DirectDraw.\n"); return E_OUTOFMEMORY; } - hr = ddraw_init(ddraw, flags, device_type); - if (FAILED(hr)) + if (FAILED(hr = ddraw_init(ddraw, flags, device_type))) { WARN("Failed to initialize ddraw object, hr %#x.\n", hr); heap_free(ddraw); return hr; } - hr = IDirectDraw7_QueryInterface(&ddraw->IDirectDraw7_iface, iid, DD); + hr = IDirectDraw7_QueryInterface(&ddraw->IDirectDraw7_iface, iid, out); IDirectDraw7_Release(&ddraw->IDirectDraw7_iface); if (SUCCEEDED(hr)) list_add_head(&global_ddraw_list, &ddraw->ddraw_list_entry); -- 2.19.2

5 4