January 2016 - Wine-Commits

Stefan Dösinger : d3d9/tests: Block validation checks the surface size too.
by Alexandre Julliard Jan. 18, 2016

Jan. 18, 2016

Module: wine Branch: master Commit: 460ae01d981353c5268b0dfe26e47458ddab90a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=460ae01d981353c5268b0dfe2… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jan 17 14:40:06 2016 +0000 d3d9/tests: Block validation checks the surface size too. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0c7afd8..ee8556f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7646,7 +7646,7 @@ static void test_surface_blocks(void) IDirect3DSurface9 *surface; D3DLOCKED_RECT locked_rect; IDirect3DDevice9 *device; - unsigned int i, j, w, h; + unsigned int i, j, k, w, h; BOOL surface_only; IDirect3D9 *d3d; ULONG refcount; @@ -7655,6 +7655,21 @@ static void test_surface_blocks(void) RECT rect; BOOL tex_pow2, cube_pow2; D3DCAPS9 caps; + static const RECT invalid[] = + { + {60, 60, 60, 68}, /* 0 height */ + {60, 60, 68, 60}, /* 0 width */ + {68, 60, 60, 68}, /* left > right */ + {60, 68, 68, 60}, /* top > bottom */ + {-8, 60, 0, 68}, /* left < surface */ + {60, -8, 68, 0}, /* top < surface */ + {-16, 60, -8, 68}, /* right < surface */ + {60, -16, 68, -8}, /* bottom < surface */ + {60, 60, 136, 68}, /* right > surface */ + {60, 60, 68, 136}, /* bottom > surface */ + {136, 60, 144, 68}, /* left > surface */ + {60, 136, 68, 144}, /* top > surface */ + }; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -7903,6 +7918,19 @@ static void test_surface_blocks(void) } } + for (k = 0; k < sizeof(invalid) / sizeof(*invalid); ++k) + { + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &invalid[k], 0); + ok(FAILED(hr) == !pools[j].success, "Invalid lock %s(%#x), expected %s, format %s, pool %s, case %u.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", hr, pools[j].success ? "success" : "failure", + formats[i].name, pools[j].name, k); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + } + } + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height); hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); ok(SUCCEEDED(hr), "Got unexpected hr %#x for format %s, pool %s.\n", hr, formats[i].name, pools[j].name);

1 0

Alistair Leslie-Hughes : d3dx9: Implement GetMaxNum* functions.
by Alexandre Julliard Jan. 18, 2016

Jan. 18, 2016

Module: wine Branch: master Commit: 94cc44883fcdbb535aee4f5d110102a3c48085e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94cc44883fcdbb535aee4f5d1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 14 22:36:06 2016 +0100 d3dx9: Implement GetMaxNum* functions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/animation.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c index abee89f..9a8f8b5 100644 --- a/dlls/d3dx9_36/animation.c +++ b/dlls/d3dx9_36/animation.c @@ -27,6 +27,11 @@ struct d3dx9_animation_controller { ID3DXAnimationController ID3DXAnimationController_iface; LONG ref; + + UINT max_outputs; + UINT max_sets; + UINT max_tracks; + UINT max_events; }; static inline struct d3dx9_animation_controller *impl_from_ID3DXAnimationController(ID3DXAnimationController *iface) @@ -78,30 +83,38 @@ static ULONG WINAPI d3dx9_animation_controller_Release(ID3DXAnimationController static UINT WINAPI d3dx9_animation_controller_GetMaxNumAnimationOutputs(ID3DXAnimationController *iface) { - FIXME("iface %p stub.\n", iface); + struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface); - return 0; + TRACE("iface %p.\n", iface); + + return animation->max_outputs; } static UINT WINAPI d3dx9_animation_controller_GetMaxNumAnimationSets(ID3DXAnimationController *iface) { - FIXME("iface %p stub.\n", iface); + struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface); - return 0; + TRACE("iface %p.\n", iface); + + return animation->max_sets; } static UINT WINAPI d3dx9_animation_controller_GetMaxNumTracks(ID3DXAnimationController *iface) { - FIXME("iface %p stub.\n", iface); + struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface); - return 0; + TRACE("iface %p.\n", iface); + + return animation->max_tracks; } static UINT WINAPI d3dx9_animation_controller_GetMaxNumEvents(ID3DXAnimationController *iface) { - FIXME("iface %p stub.\n", iface); + struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface); - return 0; + TRACE("iface %p.\n", iface); + + return animation->max_events; } static HRESULT WINAPI d3dx9_animation_controller_RegisterAnimationOutput(ID3DXAnimationController *iface, @@ -445,6 +458,10 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets, object->ID3DXAnimationController_iface.lpVtbl = &d3dx9_animation_controller_vtbl; object->ref = 1; + object->max_outputs = max_outputs; + object->max_sets = max_sets; + object->max_tracks = max_tracks; + object->max_events = max_events; *controller = &object->ID3DXAnimationController_iface;

1 0

Alistair Leslie-Hughes : d3dx9/tests: Add D3DXCreateAnimationController tests.
by Alexandre Julliard Jan. 18, 2016

Jan. 18, 2016

Module: wine Branch: master Commit: 6097695d4bec31a2558ff9405cc244cb25e682b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6097695d4bec31a2558ff9405… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 14 22:36:07 2016 +0100 d3dx9/tests: Add D3DXCreateAnimationController tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 588654d..7c86190 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -11100,6 +11100,66 @@ static void test_compute_normals(void) free_test_context(test_context); } +static void D3DXCreateAnimationControllerTest(void) +{ + HRESULT hr; + ID3DXAnimationController *animation; + UINT value; + + hr = D3DXCreateAnimationController(0, 0, 0, 0, NULL); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + + hr = D3DXCreateAnimationController(0, 1, 1, 1, &animation); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + ok(!animation, "Got unexpected animation %p.\n", animation); + + hr = D3DXCreateAnimationController(1, 0, 1, 1, &animation); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + ok(!animation, "Got unexpected animation %p.\n", animation); + + hr = D3DXCreateAnimationController(1, 1, 0, 1, &animation); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + ok(!animation, "Got unexpected animation %p.\n", animation); + + hr = D3DXCreateAnimationController(1, 1, 1, 0, &animation); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + ok(!animation, "Got unexpected animation %p.\n", animation); + + hr = D3DXCreateAnimationController(1, 1, 1, 1, &animation); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + + value = animation->lpVtbl->GetMaxNumAnimationOutputs(animation); + ok(value == 1, "Got unexpected value %u.\n", value); + + value = animation->lpVtbl->GetMaxNumAnimationSets(animation); + ok(value == 1, "Got unexpected value %u.\n", value); + + value = animation->lpVtbl->GetMaxNumTracks(animation); + ok(value == 1, "Got unexpected value %u.\n", value); + + value = animation->lpVtbl->GetMaxNumEvents(animation); + ok(value == 1, "Got unexpected value %u.\n", value); + + animation->lpVtbl->Release(animation); + + hr = D3DXCreateAnimationController(100, 101, 102, 103, &animation); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + + value = animation->lpVtbl->GetMaxNumAnimationOutputs(animation); + ok(value == 100, "Got unexpected value %u.\n", value); + + value = animation->lpVtbl->GetMaxNumAnimationSets(animation); + ok(value == 101, "Got unexpected value %u.\n", value); + + value = animation->lpVtbl->GetMaxNumTracks(animation); + ok(value == 102, "Got unexpected value %u.\n", value); + + value = animation->lpVtbl->GetMaxNumEvents(animation); + ok(value == 103, "Got unexpected value %u.\n", value); + + animation->lpVtbl->Release(animation); +} + START_TEST(mesh) { D3DXBoundProbeTest(); @@ -11116,6 +11176,7 @@ START_TEST(mesh) D3DXCreateCylinderTest(); D3DXCreateTextTest(); D3DXCreateTorusTest(); + D3DXCreateAnimationControllerTest(); test_get_decl_length(); test_get_decl_vertex_size(); test_fvf_decl_conversion();

1 0

Andrew Eikum : xaudio2: Remove run-time version checks for XAudio2 object.
by Alexandre Julliard Jan. 18, 2016

Jan. 18, 2016

Module: wine Branch: master Commit: fb9f616b2ba1b4bccda39f7e933612aba4cd562b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9f616b2ba1b4bccda39f7e9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 15 13:48:34 2016 -0600 xaudio2: Remove run-time version checks for XAudio2 object. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 186 ++++++++++++++++++++-------------------- dlls/xaudio2_7/xaudio_private.h | 2 - 2 files changed, 91 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb9f616b2ba1b4bccda39…

1 0

André Hentschel : include: Add manifest related defines.
by Alexandre Julliard Jan. 18, 2016

Jan. 18, 2016

Module: wine Branch: master Commit: d05587afb8c0dc149a8ce874608318dafc0c785a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05587afb8c0dc149a8ce8746… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 14 23:40:56 2016 +0100 include: Add manifest related defines. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index 50821f4..74d3cd5 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -766,6 +766,21 @@ typedef struct tagWINDOWPLACEMENT #define RT_ANIICON MAKEINTRESOURCE(22) #define RT_HTML MAKEINTRESOURCE(23) +#ifdef RC_INVOKED +#define RT_MANIFEST 24 +#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 +#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2 +#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3 +#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID 1 +#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID 16 +#else +#define RT_MANIFEST MAKEINTRESOURCE(24) +#define CREATEPROCESS_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(1) +#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(2) +#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(3) +#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(1) +#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(16) +#endif /* cbWndExtra bytes for dialog class */ #define DLGWINDOWEXTRA 30

1 0

Andrew Eikum : mciqtz32: Support MCI_DGV_PUT_DESTINATION.
by Alexandre Julliard Jan. 18, 2016

Jan. 18, 2016

Module: wine Branch: master Commit: 708a6b06cbcb78afa39fb42116b504c9289c2fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708a6b06cbcb78afa39fb4211… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 15 13:43:52 2016 -0600 mciqtz32: Support MCI_DGV_PUT_DESTINATION. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index d018a54..24d48f3 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -936,6 +936,53 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS return 0; } +/*************************************************************************** + * MCIQTZ_mciPut [internal] + */ +static DWORD MCIQTZ_mciPut(UINT wDevID, DWORD dwFlags, MCI_GENERIC_PARMS *lpParms) +{ + WINE_MCIQTZ *wma = MCIQTZ_mciGetOpenDev(wDevID); + MCI_DGV_RECT_PARMS *rectparms; + HRESULT hr; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (!(dwFlags & MCI_DGV_RECT)) { + FIXME("No support for non-RECT MCI_PUT\n"); + return 1; + } + + if (dwFlags & MCI_TEST) + return 0; + + dwFlags &= ~MCI_DGV_RECT; + rectparms = (MCI_DGV_RECT_PARMS*)lpParms; + + if (dwFlags & MCI_DGV_PUT_DESTINATION) { + hr = IVideoWindow_SetWindowPosition(wma->vidwin, + rectparms->rc.left, rectparms->rc.top, + rectparms->rc.right - rectparms->rc.left, + rectparms->rc.bottom - rectparms->rc.top); + if(FAILED(hr)) + WARN("IVideoWindow_SetWindowPosition failed: 0x%x\n", hr); + + dwFlags &= ~MCI_DGV_PUT_DESTINATION; + } + + if (dwFlags & MCI_NOTIFY) { + MCIQTZ_mciNotify(lpParms->dwCallback, wma, MCI_NOTIFY_SUCCESSFUL); + dwFlags &= ~MCI_NOTIFY; + } + + if (dwFlags) + FIXME("No support for some flags: 0x%x\n", dwFlags); + + return 0; +} + /****************************************************************************** * MCIAVI_mciUpdate [internal] */ @@ -1099,6 +1146,9 @@ static DWORD CALLBACK MCIQTZ_taskThread(LPVOID arg) case MCI_WINDOW: task->res = MCIQTZ_mciWindow(task->devid, task->flags, (LPMCI_DGV_WINDOW_PARMSW)task->parms); break; + case MCI_PUT: + task->res = MCIQTZ_mciPut(task->devid, task->flags, (MCI_GENERIC_PARMS*)task->parms); + break; case MCI_CLOSE: /* Special internal message */ SetEvent(task->done); @@ -1163,9 +1213,9 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SETAUDIO: case MCI_UPDATE: case MCI_WINDOW: + case MCI_PUT: if (!dwParam2) return MCIERR_NULL_PARAMETER_BLOCK; return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); - case MCI_PUT: case MCI_RECORD: case MCI_RESUME: case MCI_INFO:

1 0

Alexandre Julliard : server: Pass full object attributes in the create_mailslot request.
by Alexandre Julliard Jan. 18, 2016

Jan. 18, 2016

Module: wine Branch: master Commit: 14825a7a558bb74a97071ce0547ce320fcf76642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14825a7a558bb74a97071ce05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 18:57:02 2016 +0900 server: Pass full object attributes in the create_mailslot request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 12 +++++++----- include/wine/server_protocol.h | 8 +++----- server/mailslot.c | 19 +++++++++++-------- server/protocol.def | 4 +--- server/request.h | 8 +++----- server/trace.c | 4 +--- 6 files changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 4cac2ca..d547591 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3627,6 +3627,8 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess, { LARGE_INTEGER timeout; NTSTATUS ret; + data_size_t len; + struct object_attributes *objattr; TRACE("%p %08x %p %p %08x %08x %08x %p\n", pHandle, DesiredAccess, attr, IoStatusBlock, @@ -3636,6 +3638,8 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess, if (!attr) return STATUS_INVALID_PARAMETER; if (!attr->ObjectName) return STATUS_OBJECT_PATH_SYNTAX_BAD; + if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; + /* * For a NULL TimeOut pointer set the default timeout value */ @@ -3647,17 +3651,15 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess, SERVER_START_REQ( create_mailslot ) { req->access = DesiredAccess; - req->attributes = attr->Attributes; - req->rootdir = wine_server_obj_handle( attr->RootDirectory ); req->max_msgsize = MaxMessageSize; req->read_timeout = timeout.QuadPart; - wine_server_add_data( req, attr->ObjectName->Buffer, - attr->ObjectName->Length ); + wine_server_add_data( req, objattr, len ); ret = wine_server_call( req ); if( ret == STATUS_SUCCESS ) *pHandle = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; - + + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index aba649e..e5b7506 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4673,12 +4673,10 @@ struct create_mailslot_request { struct request_header __header; unsigned int access; - unsigned int attributes; - obj_handle_t rootdir; timeout_t read_timeout; unsigned int max_msgsize; - /* VARARG(name,unicode_str); */ - char __pad_36[4]; + /* VARARG(objattr,object_attributes); */ + char __pad_28[4]; }; struct create_mailslot_reply { @@ -6169,6 +6167,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 495 +#define SERVER_PROTOCOL_VERSION 496 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mailslot.c b/server/mailslot.c index 97ea3f6..cb9510c 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -395,7 +395,8 @@ void create_mailslot_device( struct directory *root, const struct unicode_str *n static struct mailslot *create_mailslot( struct directory *root, const struct unicode_str *name, unsigned int attr, - int max_msgsize, timeout_t read_timeout ) + int max_msgsize, timeout_t read_timeout, + const struct security_descriptor *sd ) { struct object *obj; struct unicode_str new_name; @@ -442,6 +443,8 @@ static struct mailslot *create_mailslot( struct directory *root, mailslot->max_msgsize = max_msgsize; mailslot->read_timeout = read_timeout; list_init( &mailslot->writers ); + if (sd) default_set_sd( &mailslot->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); if (!socketpair( PF_UNIX, SOCK_DGRAM, 0, fds )) { @@ -508,16 +511,16 @@ DECL_HANDLER(create_mailslot) struct mailslot *mailslot; struct unicode_str name; struct directory *root = NULL; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name ); - reply->handle = 0; - get_req_unicode_str( &name ); - if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) - return; + if (!objattr) return; + if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; - if ((mailslot = create_mailslot( root, &name, req->attributes, req->max_msgsize, - req->read_timeout ))) + if ((mailslot = create_mailslot( root, &name, objattr->attributes, req->max_msgsize, + req->read_timeout, sd ))) { - reply->handle = alloc_handle( current->process, mailslot, req->access, req->attributes ); + reply->handle = alloc_handle( current->process, mailslot, req->access, objattr->attributes ); release_object( mailslot ); } diff --git a/server/protocol.def b/server/protocol.def index 8250bed..72a63e4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3277,11 +3277,9 @@ struct handle_info /* Create a mailslot */ @REQ(create_mailslot) unsigned int access; /* wanted access rights */ - unsigned int attributes; /* object attributes */ - obj_handle_t rootdir; /* root directory */ timeout_t read_timeout; unsigned int max_msgsize; - VARARG(name,unicode_str); /* mailslot name */ + VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t handle; /* handle to the mailslot */ @END diff --git a/server/request.h b/server/request.h index d9163a0..310bcf4 100644 --- a/server/request.h +++ b/server/request.h @@ -2082,11 +2082,9 @@ C_ASSERT( sizeof(struct get_system_handles_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_system_handles_reply, count) == 8 ); C_ASSERT( sizeof(struct get_system_handles_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, access) == 12 ); -C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, attributes) == 16 ); -C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, rootdir) == 20 ); -C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, read_timeout) == 24 ); -C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, max_msgsize) == 32 ); -C_ASSERT( sizeof(struct create_mailslot_request) == 40 ); +C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, read_timeout) == 16 ); +C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, max_msgsize) == 24 ); +C_ASSERT( sizeof(struct create_mailslot_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_mailslot_reply, handle) == 8 ); C_ASSERT( sizeof(struct create_mailslot_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_mailslot_info_request, handle) == 12 ); diff --git a/server/trace.c b/server/trace.c index 552e8c2..82f8342 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3866,11 +3866,9 @@ static void dump_get_system_handles_reply( const struct get_system_handles_reply static void dump_create_mailslot_request( const struct create_mailslot_request *req ) { fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); dump_timeout( ", read_timeout=", &req->read_timeout ); fprintf( stderr, ", max_msgsize=%08x", req->max_msgsize ); - dump_varargs_unicode_str( ", name=", cur_size ); + dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_mailslot_reply( const struct create_mailslot_reply *req )

1 0

Alexandre Julliard : server: Pass full object attributes in the create_timer request.
by Alexandre Julliard Jan. 18, 2016

Jan. 18, 2016

Module: wine Branch: master Commit: b5245a15a82770da5dcc1c50e5960786e0e4b6d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5245a15a82770da5dcc1c50e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 18:47:06 2016 +0900 server: Pass full object attributes in the create_timer request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 15 ++++++++------- include/wine/server_protocol.h | 8 +++----- server/protocol.def | 4 +--- server/request.h | 6 ++---- server/timer.c | 17 ++++++++++------- server/trace.c | 4 +--- 6 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 36a9c86..1206627 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -745,25 +745,26 @@ NTSTATUS WINAPI NtCreateTimer(OUT HANDLE *handle, IN const OBJECT_ATTRIBUTES *attr OPTIONAL, IN TIMER_TYPE timer_type) { - DWORD len = (attr && attr->ObjectName) ? attr->ObjectName->Length : 0; - NTSTATUS status; - - if (len >= MAX_PATH * sizeof(WCHAR)) return STATUS_NAME_TOO_LONG; + NTSTATUS status; + data_size_t len; + struct object_attributes *objattr; if (timer_type != NotificationTimer && timer_type != SynchronizationTimer) return STATUS_INVALID_PARAMETER; + if ((status = alloc_object_attributes( attr, &objattr, &len ))) return status; + SERVER_START_REQ( create_timer ) { req->access = access; - req->attributes = (attr) ? attr->Attributes : 0; - req->rootdir = wine_server_obj_handle( attr ? attr->RootDirectory : 0 ); req->manual = (timer_type == NotificationTimer); - if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); + wine_server_add_data( req, objattr, len ); status = wine_server_call( req ); *handle = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; + + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return status; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8dd4994..aba649e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2601,11 +2601,9 @@ struct create_timer_request { struct request_header __header; unsigned int access; - unsigned int attributes; - obj_handle_t rootdir; int manual; - /* VARARG(name,unicode_str); */ - char __pad_28[4]; + /* VARARG(objattr,object_attributes); */ + char __pad_20[4]; }; struct create_timer_reply { @@ -6171,6 +6169,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 494 +#define SERVER_PROTOCOL_VERSION 495 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 4becb8f..8250bed 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1950,10 +1950,8 @@ enum char_info_mode /* Create a waitable timer */ @REQ(create_timer) unsigned int access; /* wanted access rights */ - unsigned int attributes; /* object attributes */ - obj_handle_t rootdir; /* root directory */ int manual; /* manual reset */ - VARARG(name,unicode_str); /* object name */ + VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t handle; /* handle to the timer */ @END diff --git a/server/request.h b/server/request.h index b2e5719..d9163a0 100644 --- a/server/request.h +++ b/server/request.h @@ -1352,10 +1352,8 @@ C_ASSERT( FIELD_OFFSET(struct set_registry_notification_request, subtree) == 20 C_ASSERT( FIELD_OFFSET(struct set_registry_notification_request, filter) == 24 ); C_ASSERT( sizeof(struct set_registry_notification_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_timer_request, access) == 12 ); -C_ASSERT( FIELD_OFFSET(struct create_timer_request, attributes) == 16 ); -C_ASSERT( FIELD_OFFSET(struct create_timer_request, rootdir) == 20 ); -C_ASSERT( FIELD_OFFSET(struct create_timer_request, manual) == 24 ); -C_ASSERT( sizeof(struct create_timer_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct create_timer_request, manual) == 16 ); +C_ASSERT( sizeof(struct create_timer_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_timer_reply, handle) == 8 ); C_ASSERT( sizeof(struct create_timer_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_timer_request, access) == 12 ); diff --git a/server/timer.c b/server/timer.c index 9c293f2..2c0522c 100644 --- a/server/timer.c +++ b/server/timer.c @@ -80,7 +80,7 @@ static const struct object_ops timer_ops = /* create a timer object */ static struct timer *create_timer( struct directory *root, const struct unicode_str *name, - unsigned int attr, int manual ) + unsigned int attr, int manual, const struct security_descriptor *sd ) { struct timer *timer; @@ -95,6 +95,9 @@ static struct timer *create_timer( struct directory *root, const struct unicode_ timer->period = 0; timer->timeout = NULL; timer->thread = NULL; + if (sd) default_set_sd( &timer->obj, sd, + OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); } } return timer; @@ -232,15 +235,15 @@ DECL_HANDLER(create_timer) struct timer *timer; struct unicode_str name; struct directory *root = NULL; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name ); - reply->handle = 0; - get_req_unicode_str( &name ); - if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) - return; + if (!objattr) return; + if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; - if ((timer = create_timer( root, &name, req->attributes, req->manual ))) + if ((timer = create_timer( root, &name, objattr->attributes, req->manual, sd ))) { - reply->handle = alloc_handle( current->process, timer, req->access, req->attributes ); + reply->handle = alloc_handle( current->process, timer, req->access, objattr->attributes ); release_object( timer ); } diff --git a/server/trace.c b/server/trace.c index edfcaf5..552e8c2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2441,10 +2441,8 @@ static void dump_set_registry_notification_request( const struct set_registry_no static void dump_create_timer_request( const struct create_timer_request *req ) { fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); fprintf( stderr, ", manual=%d", req->manual ); - dump_varargs_unicode_str( ", name=", cur_size ); + dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_timer_reply( const struct create_timer_reply *req )

1 0

Andrew Eikum : xaudio2: Remove run-time versioning of xapo objects.
by Alexandre Julliard Jan. 18, 2016

Jan. 18, 2016

Module: wine Branch: master Commit: 0a8e8d190fcc979b25c6f1d675458cf51c60d0a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8e8d190fcc979b25c6f1d67… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 15 13:48:37 2016 -0600 xaudio2: Remove run-time versioning of xapo objects. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xapofx.c | 29 +++++++------------- dlls/xaudio2_7/xaudio_dll.c | 59 +++++++++++++---------------------------- dlls/xaudio2_7/xaudio_private.h | 2 +- 3 files changed, 30 insertions(+), 60 deletions(-) diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index 9b9a077..44dfb47 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -53,8 +53,6 @@ typedef struct _VUMeterImpl { IXAPOParameters IXAPOParameters_iface; LONG ref; - - DWORD version; } VUMeterImpl; static VUMeterImpl *VUMeterImpl_from_IXAPO(IXAPO *iface) @@ -258,8 +256,6 @@ typedef struct _ReverbImpl { IXAPOParameters IXAPOParameters_iface; LONG ref; - - DWORD version; } ReverbImpl; static ReverbImpl *ReverbImpl_from_IXAPO(IXAPO *iface) @@ -461,8 +457,6 @@ typedef struct _EQImpl { IXAPOParameters IXAPOParameters_iface; LONG ref; - - DWORD version; } EQImpl; static EQImpl *EQImpl_from_IXAPO(IXAPO *iface) @@ -662,7 +656,6 @@ static const IXAPOParametersVtbl EQXAPOParameters_Vtbl = { struct xapo_cf { IClassFactory IClassFactory_iface; LONG ref; - DWORD version; const CLSID *class; }; @@ -726,14 +719,13 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut object->IXAPO_iface.lpVtbl = &VUMXAPO_Vtbl; object->IXAPOParameters_iface.lpVtbl = &VUMXAPOParameters_Vtbl; - object->version = This->version; hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); if(FAILED(hr)){ HeapFree(GetProcessHeap(), 0, object); return hr; } - }else if(IsEqualGUID(This->class, &CLSID_AudioReverb27)){ + }else if(IsEqualGUID(This->class, &CLSID_FXReverb)){ ReverbImpl *object; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); @@ -742,7 +734,6 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut object->IXAPO_iface.lpVtbl = &RVBXAPO_Vtbl; object->IXAPOParameters_iface.lpVtbl = &RVBXAPOParameters_Vtbl; - object->version = This->version; hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); if(FAILED(hr)){ @@ -758,7 +749,6 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut object->IXAPO_iface.lpVtbl = &EQXAPO_Vtbl; object->IXAPOParameters_iface.lpVtbl = &EQXAPOParameters_Vtbl; - object->version = This->version; hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); if(FAILED(hr)){ @@ -766,6 +756,7 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut return hr; } }else + /* TODO FXECHO, FXMasteringLimiter, */ return E_INVALIDARG; return S_OK; @@ -786,11 +777,10 @@ static const IClassFactoryVtbl xapo_Vtbl = xapocf_LockServer }; -IClassFactory *make_xapo_factory(REFCLSID clsid, DWORD version) +IClassFactory *make_xapo_factory(REFCLSID clsid) { struct xapo_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xapo_cf)); ret->IClassFactory_iface.lpVtbl = &xapo_Vtbl; - ret->version = version; ret->class = clsid; ret->ref = 0; return &ret->IClassFactory_iface; @@ -802,7 +792,7 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) IClassFactory *cf; HRESULT hr; - cf = make_xapo_factory(&CLSID_AudioVolumeMeter27, 28); + cf = make_xapo_factory(&CLSID_AudioVolumeMeter27); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); @@ -816,7 +806,7 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out) IClassFactory *cf; HRESULT hr; - cf = make_xapo_factory(&CLSID_AudioReverb27, 28); + cf = make_xapo_factory(&CLSID_FXReverb); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); @@ -836,13 +826,13 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 in if(IsEqualGUID(clsid, &CLSID_FXReverb27) || IsEqualGUID(clsid, &CLSID_FXReverb)) - class = &CLSID_AudioReverb27; + class = &CLSID_FXReverb; else if(IsEqualGUID(clsid, &CLSID_FXEQ27) || IsEqualGUID(clsid, &CLSID_FXEQ)) class = &CLSID_FXEQ; if(class){ - cf = make_xapo_factory(class, 20 + XAUDIO2_VER); + cf = make_xapo_factory(class); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); IClassFactory_Release(cf); @@ -893,13 +883,14 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) if(IsEqualGUID(clsid, &CLSID_FXReverb27) || IsEqualGUID(clsid, &CLSID_FXReverb)) - class = &CLSID_AudioReverb27; + class = &CLSID_FXReverb; else if(IsEqualGUID(clsid, &CLSID_FXEQ27) || IsEqualGUID(clsid, &CLSID_FXEQ)) class = &CLSID_FXEQ; + /* TODO FXECHO, FXMasteringLimiter, */ if(class){ - cf = make_xapo_factory(class, 20 + XAUDIO2_VER); + cf = make_xapo_factory(class); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); IClassFactory_Release(cf); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 6517b40..efa6279 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2020,46 +2020,25 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) IsEqualGUID(rclsid, &CLSID_XAudio27)){ factory = make_xaudio2_factory(); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter20)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 20); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter21)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 21); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter22)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 22); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter23)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 23); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter24)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 24); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter25)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 25); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter26)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 26); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter27)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 27); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb20)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 20); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb21)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 21); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb22)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 22); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb23)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 23); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb24)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 24); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb25)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 25); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb26)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 26); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb27)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 27); + }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter20) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter21) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter22) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter23) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter24) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter25) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter26) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter27)){ + factory = make_xapo_factory(&CLSID_AudioVolumeMeter27); + + }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb20) || + IsEqualGUID(rclsid, &CLSID_AudioReverb21) || + IsEqualGUID(rclsid, &CLSID_AudioReverb22) || + IsEqualGUID(rclsid, &CLSID_AudioReverb23) || + IsEqualGUID(rclsid, &CLSID_AudioReverb24) || + IsEqualGUID(rclsid, &CLSID_AudioReverb25) || + IsEqualGUID(rclsid, &CLSID_AudioReverb26) || + IsEqualGUID(rclsid, &CLSID_AudioReverb27)){ + factory = make_xapo_factory(&CLSID_FXReverb); } if(!factory) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 81db339..a75f721 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -149,4 +149,4 @@ extern const IXAudio20SourceVoiceVtbl XAudio20SourceVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio20SubmixVoiceVtbl XAudio20SubmixVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio20MasteringVoiceVtbl XAudio20MasteringVoice_Vtbl DECLSPEC_HIDDEN; -extern IClassFactory *make_xapo_factory(REFCLSID clsid, DWORD version); +extern IClassFactory *make_xapo_factory(REFCLSID clsid) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : maintainers: Add DirectShow section.
by Alexandre Julliard Jan. 18, 2016

Jan. 18, 2016

Module: wine Branch: master Commit: 7cad73c6cb4ccdd0bc443dcda79388873a0eebb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cad73c6cb4ccdd0bc443dcda… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 15 13:42:33 2016 -0600 maintainers: Add DirectShow section. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 3e7d48d..ac3f515 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -90,6 +90,17 @@ DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput/ +DirectShow +P: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/amstream/ +F: dlls/mciqtz32/ +F: dlls/qcap/ +F: dlls/qedit/ +F: dlls/quartz/ +F: dlls/strmbase/ +F: dlls/winegstreamer/ +F: dlls/wineqtdecoder/ + DirectWrite M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/dwrite/

1 0