February 2015 - Wine-commits

André Hentschel : Add WWN 386
by Jeremy Newman 27 Feb '15

27 Feb '15

Module: website Branch: master Commit: 36db2d3272c4087ec293d6ac4c1522d9c0109c68 URL: http://source.winehq.org/git/website.git/?a=commit;h=36db2d3272c4087ec293d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 27 17:48:38 2015 +0100 Add WWN 386 --- news/de/2015022701.xml | 10 + news/en/2015022701.xml | 10 + wwn/en/wn20150227_386.xml | 556 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 576 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=36db2d3272c4087ec2…

1 0

Henri Verbeet : d3d10core: Implement d3d10_pixel_shader_GetPrivateData().
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 82049198286f23d2955a4d8d7978085c8d48ffd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82049198286f23d2955a4d8d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 12:29:45 2015 +0100 d3d10core: Implement d3d10_pixel_shader_GetPrivateData(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 9245445..0b052c6 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -551,10 +551,12 @@ static void STDMETHODCALLTYPE d3d10_pixel_shader_GetDevice(ID3D10PixelShader *if static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelShader *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateData(ID3D10PixelShader *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_blend_state_SetPrivateData().
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 2971a928405aaa979db45c39b3cc10ac2c1c648e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2971a928405aaa979db45c39b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 12:29:46 2015 +0100 d3d10core: Implement d3d10_blend_state_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/state.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 1756afc..791f302 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -247,6 +247,7 @@ struct d3d10_blend_state ID3D10BlendState ID3D10BlendState_iface; LONG refcount; + struct wined3d_private_store private_store; D3D10_BLEND_DESC desc; struct wine_rb_entry entry; ID3D10Device1 *device; diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 460bc8d..8d2dae1 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -79,6 +79,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface struct d3d10_device *device = impl_from_ID3D10Device(state->device); wine_rb_remove(&device->blend_states, &state->desc); ID3D10Device1_Release(state->device); + wined3d_private_store_cleanup(&state->private_store); HeapFree(GetProcessHeap(), 0, state); } @@ -109,10 +110,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendSta static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendState *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D10BlendState *iface, @@ -155,11 +158,13 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d10_dev { state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; + wined3d_private_store_init(&state->private_store); state->desc = *desc; if (wine_rb_put(&device->blend_states, desc, &state->entry) == -1) { ERR("Failed to insert blend state entry.\n"); + wined3d_private_store_cleanup(&state->private_store); return E_FAIL; }

1 0

Stefan Dösinger : d3d9/tests: Extend the FPU setup test.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 28a9d6324a9421d444dc9122673d2992642a5d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a9d6324a9421d444dc91226… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 27 10:48:41 2015 +0100 d3d9/tests: Extend the FPU setup test. Games created by GameMaker modify the FPU control word to enable division by zero exceptions. The game Risk of Rain, which is written with GameMaker, furthermore sets fogstart == fogend, which triggers an exception when the GL driver attempts to calculate 1 / (fogend - fogstart). This test adds some evidence that we are not supposed to temporarily restore the FPU CW if D3DCREATE_FPU_PRESERVE is used. --- dlls/d3d9/tests/device.c | 96 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b11d8d4..fde2bb6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4086,6 +4086,46 @@ static inline WORD get_fpu_cw(void) return cw; } +static WORD callback_cw, callback_set_cw; +static DWORD callback_tid; + +static HRESULT WINAPI dummy_object_QueryInterface(IUnknown *iface, REFIID riid, void **out) +{ + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dummy_object_AddRef(IUnknown *iface) +{ + callback_cw = get_fpu_cw(); + set_fpu_cw(callback_set_cw); + callback_tid = GetCurrentThreadId(); + return 2; +} + +static ULONG WINAPI dummy_object_Release(IUnknown *iface) +{ + callback_cw = get_fpu_cw(); + set_fpu_cw(callback_set_cw); + callback_tid = GetCurrentThreadId(); + return 1; +} + +static const IUnknownVtbl dummy_object_vtbl = +{ + dummy_object_QueryInterface, + dummy_object_AddRef, + dummy_object_Release, +}; + +static const GUID d3d9_private_data_test_guid = +{ + 0xfdb37466, + 0x428f, + 0x4edf, + {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} +}; + static void test_fpu_setup(void) { #if defined(D3D9_TEST_SET_FPU_CW) && defined(D3D9_TEST_GET_FPU_CW) @@ -4094,6 +4134,9 @@ static void test_fpu_setup(void) HWND window = NULL; IDirect3D9 *d3d9; WORD cw; + IDirect3DSurface9 *surface; + HRESULT hr; + IUnknown dummy_object = {&dummy_object_vtbl}; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_CAPTION, 0, 0, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight, 0, 0, 0, 0); @@ -4120,7 +4163,34 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); + + callback_set_cw = 0xf60; + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, + &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + ok(callback_cw == 0x7f, "Callback cw is %#x, expected 0x7f.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + + callback_cw = 0; + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, + &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + ok(callback_cw == 0xf60, "Callback cw is %#x, expected 0xf60.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); + + callback_set_cw = 0x7f; + set_fpu_cw(0x7f); + + IDirect3DSurface9_Release(surface); + + callback_cw = 0; IDirect3DDevice9_Release(device); + ok(callback_cw == 0x7f, "Callback cw is %#x, expected 0x7f.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); cw = get_fpu_cw(); ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); @@ -4134,9 +4204,26 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - set_fpu_cw(0x37f); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); + + callback_cw = 0; + callback_set_cw = 0x37f; + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, + &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + ok(callback_cw == 0xf60, "Callback cw is %#x, expected 0xf60.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); + cw = get_fpu_cw(); + ok(cw == 0x37f, "cw is %#x, expected 0x37f.\n", cw); + + IDirect3DSurface9_Release(surface); + + callback_cw = 0; IDirect3DDevice9_Release(device); + ok(callback_cw == 0x37f, "Callback cw is %#x, expected 0xf60.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); done: IDirect3D9_Release(d3d9); @@ -6976,13 +7063,6 @@ static void test_private_data(void) HRESULT hr; DWORD size; DWORD data[4] = {1, 2, 3, 4}; - static const GUID d3d9_private_data_test_guid = - { - 0xfdb37466, - 0x428f, - 0x4edf, - {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} - }; static const GUID d3d9_private_data_test_guid2 = { 0x2e5afac2,

1 0

Stefan Dösinger : d3d8/tests: Extend the FPU setup test.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 3b2cf06b913fbabc5ab7a8414335b29b4dadc03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2cf06b913fbabc5ab7a8414… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 27 10:48:42 2015 +0100 d3d8/tests: Extend the FPU setup test. --- dlls/d3d8/tests/device.c | 95 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 87 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e06b1a3..c8aa724 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3023,6 +3023,46 @@ static inline WORD get_fpu_cw(void) return cw; } +static WORD callback_cw, callback_set_cw; +static DWORD callback_tid; + +static HRESULT WINAPI dummy_object_QueryInterface(IUnknown *iface, REFIID riid, void **out) +{ + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dummy_object_AddRef(IUnknown *iface) +{ + callback_cw = get_fpu_cw(); + set_fpu_cw(callback_set_cw); + callback_tid = GetCurrentThreadId(); + return 2; +} + +static ULONG WINAPI dummy_object_Release(IUnknown *iface) +{ + callback_cw = get_fpu_cw(); + set_fpu_cw(callback_set_cw); + callback_tid = GetCurrentThreadId(); + return 1; +} + +static const IUnknownVtbl dummy_object_vtbl = +{ + dummy_object_QueryInterface, + dummy_object_AddRef, + dummy_object_Release, +}; + +static const GUID d3d8_private_data_test_guid = +{ + 0xfdb37466, + 0x428f, + 0x4edf, + {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} +}; + static void test_fpu_setup(void) { #if defined(D3D8_TEST_SET_FPU_CW) && defined(D3D8_TEST_GET_FPU_CW) @@ -3033,6 +3073,8 @@ static void test_fpu_setup(void) HWND window; HRESULT hr; WORD cw; + IDirect3DSurface8 *surface; + IUnknown dummy_object = {&dummy_object_vtbl}; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_CAPTION, 0, 0, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight, 0, 0, 0, 0); @@ -3062,7 +3104,34 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + hr = IDirect3DDevice8_GetRenderTarget(device, &surface); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); + + callback_set_cw = 0xf60; + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, + &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + ok(callback_cw == 0x7f, "Callback cw is %#x, expected 0x7f.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + + callback_cw = 0; + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, + &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + ok(callback_cw == 0xf60, "Callback cw is %#x, expected 0xf60.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); + + callback_set_cw = 0x7f; + set_fpu_cw(0x7f); + + IDirect3DSurface8_Release(surface); + + callback_cw = 0; IDirect3DDevice8_Release(device); + ok(callback_cw == 0x7f, "Callback cw is %#x, expected 0x7f.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); cw = get_fpu_cw(); ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); @@ -3076,9 +3145,26 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - set_fpu_cw(0x37f); + hr = IDirect3DDevice8_GetRenderTarget(device, &surface); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); + + callback_cw = 0; + callback_set_cw = 0x37f; + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, + &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + ok(callback_cw == 0xf60, "Callback cw is %#x, expected 0xf60.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); + cw = get_fpu_cw(); + ok(cw == 0x37f, "cw is %#x, expected 0x37f.\n", cw); + + IDirect3DSurface8_Release(surface); + + callback_cw = 0; IDirect3DDevice8_Release(device); + ok(callback_cw == 0x37f, "Callback cw is %#x, expected 0x37f.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); done: DestroyWindow(window); @@ -4541,13 +4627,6 @@ static void test_private_data(void) HRESULT hr; DWORD size; DWORD data[4] = {1, 2, 3, 4}; - static const GUID d3d8_private_data_test_guid = - { - 0xfdb37466, - 0x428f, - 0x4edf, - {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} - }; static const GUID d3d8_private_data_test_guid2 = { 0x2e5afac2,

1 0

Sebastian Lackner : winex11: Only enable XInput2 cursor warp workaround if necessary.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 7714efe2134f141a3e9f228f99c02185da5ef107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7714efe2134f141a3e9f228f9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jan 26 05:42:32 2015 +0100 winex11: Only enable XInput2 cursor warp workaround if necessary. Based on a patch by Patrick Rudolph. --- dlls/winex11.drv/mouse.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index f1e58fe..5f5bdeb 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -131,6 +131,7 @@ static Cursor create_cursor( HANDLE handle ); #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H static BOOL xinput2_available; +static BOOL broken_rawevents; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(XIFreeDeviceInfo); MAKE_FUNCPTR(XIQueryDevice); @@ -1579,7 +1580,15 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) if (!hwnd) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (thread_data->warp_serial && (long)(event->serial - thread_data->warp_serial) < 0) return; + if (thread_data->warp_serial) + { + if ((long)(event->serial - thread_data->warp_serial) < 0) + { + TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); + return; + } + thread_data->warp_serial = 0; /* we caught up now */ + } } send_mouse_input( hwnd, event->window, event->state, &input ); @@ -1669,7 +1678,7 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) break; } - if (thread_data->warp_serial) + if (broken_rawevents && thread_data->warp_serial) { if ((long)(xev->serial - thread_data->warp_serial) < 0) { @@ -1716,6 +1725,12 @@ void X11DRV_XInput2_Init(void) #undef LOAD_FUNCPTR xinput2_available = XQueryExtension( gdi_display, "XInputExtension", &xinput2_opcode, &event, &error ); + + /* Until version 1.10.4 rawinput was broken in XOrg, see + * https://bugs.freedesktop.org/show_bug.cgi?id=30068 */ + broken_rawevents = strstr(XServerVendor( gdi_display ), "X.Org") && + XVendorRelease( gdi_display ) < 11004000; + #else TRACE( "X Input 2 support not compiled in.\n" ); #endif

1 0

Austin English : include: Add more entries to msasn1.h.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: e9cab9b38144a720c291609fc0f3010614f4f75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9cab9b38144a720c291609fc… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 26 17:13:29 2015 -0600 include: Add more entries to msasn1.h. --- include/msasn1.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/msasn1.h b/include/msasn1.h index 8172849..32ace3e 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -30,6 +30,9 @@ typedef signed short ASN1int16_t; typedef ULONG ASN1uint32_t; typedef LONG ASN1int32_t; +typedef ASN1uint16_t ASN1char16_t; +typedef ASN1uint32_t ASN1char32_t; + typedef ASN1char_t *ASN1ztcharstring_t; typedef ASN1char16_t *ASN1ztchar16string_t; typedef ASN1char32_t *ASN1ztchar32string_t; @@ -40,6 +43,46 @@ typedef ASN1uint16_t ASN1choice_t; typedef ASN1uint32_t ASN1magic_t; typedef ASN1ztcharstring_t ASN1objectdescriptor_t; +typedef void (WINAPI *ASN1FreeFun_t)(void *data); +typedef void (WINAPI *ASN1GenericFun_t)(void); + +typedef struct ASN1encoding_s *ASN1encoding_t; +typedef struct ASN1decoding_s *ASN1decoding_t; +typedef ASN1int32_t (WINAPI *ASN1PerEncFun_t)(ASN1encoding_t enc,void *data); +typedef ASN1int32_t (WINAPI *ASN1PerDecFun_t)(ASN1decoding_t enc,void *data); + +typedef struct tagASN1PerFunArr_t { + const ASN1PerEncFun_t *apfnEncoder; + const ASN1PerDecFun_t *apfnDecoder; +} ASN1PerFunArr_t; + +typedef ASN1int32_t (WINAPI *ASN1BerEncFun_t)(ASN1encoding_t enc,ASN1uint32_t tag,void *data); +typedef ASN1int32_t (WINAPI *ASN1BerDecFun_t)(ASN1decoding_t enc,ASN1uint32_t tag,void *data); + +typedef struct tagASN1BerFunArr_t { + const ASN1BerEncFun_t *apfnEncoder; + const ASN1BerDecFun_t *apfnDecoder; +} ASN1BerFunArr_t; + +typedef enum { + ASN1_PER_RULE_ALIGNED = 0x0001,ASN1_PER_RULE_UNALIGNED = 0x0002,ASN1_PER_RULE = ASN1_PER_RULE_ALIGNED | ASN1_PER_RULE_UNALIGNED, + ASN1_BER_RULE_BER = 0x0100,ASN1_BER_RULE_CER = 0x0200,ASN1_BER_RULE_DER = 0x0400, + ASN1_BER_RULE = ASN1_BER_RULE_BER | ASN1_BER_RULE_CER | ASN1_BER_RULE_DER +} ASN1encodingrule_e; + +typedef struct tagASN1module_t { + ASN1magic_t nModuleName; + ASN1encodingrule_e eRule; + ASN1uint32_t dwFlags; + ASN1uint32_t cPDUs; + const ASN1FreeFun_t *apfnFreeMemory; + const ASN1uint32_t *acbStructSize; + union { + ASN1PerFunArr_t PER; + ASN1BerFunArr_t BER; + }; +} *ASN1module_t; + #ifdef __cplusplus } #endif

1 0

Mark Harmstone : include: Add IMediaObject interfaces.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: e82f73bf9e104a89e16ebe8e841a942a13ef3f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82f73bf9e104a89e16ebe8e8… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Feb 27 00:18:35 2015 +0000 include: Add IMediaObject interfaces. --- include/mediaobj.idl | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 176 insertions(+), 3 deletions(-) diff --git a/include/mediaobj.idl b/include/mediaobj.idl index cf7bb7a..04c82e8 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -19,12 +19,10 @@ import "unknwn.idl"; import "objidl.idl"; +import "strmif.idl"; interface IDMOQualityControl; interface IDMOVideoOutputOptimizations; -interface IMediaBuffer; -interface IMediaObject; -interface IMediaObjectInPlace; typedef struct _DMOMediaType { @@ -67,3 +65,178 @@ interface IEnumDMO : IUnknown [out] IEnumDMO **ppEnum ); } + +/***************************************************************************** + * IMediaBuffer interface + */ +[ + object, + uuid(59eff8b9-938c-4a26-82f2-95cb84cdc837), + local +] +interface IMediaBuffer : IUnknown +{ + HRESULT SetLength( + DWORD cbLength + ); + + HRESULT GetMaxLength( + [out] DWORD *pcbMaxLength + ); + + HRESULT GetBufferAndLength( + [out] BYTE **ppBuffer, + [out] DWORD *pcbLength + ); +} + +typedef struct _DMO_OUTPUT_DATA_BUFFER { + IMediaBuffer *pBuffer; + DWORD dwStatus; + REFERENCE_TIME rtTimestamp; + REFERENCE_TIME rtTimelength; +} DMO_OUTPUT_DATA_BUFFER, *PDMO_OUTPUT_DATA_BUFFER; + +enum _DMO_INPLACE_PROCESS_FLAGS { + DMO_INPLACE_NORMAL = 0x00000000, + DMO_INPLACE_ZERO = 0x00000001 +}; + +/***************************************************************************** + * IMediaObject interface + */ +[ + object, + uuid(d8ad0f58-5494-4102-97c5-ec798e59bcf4), + local +] +interface IMediaObject : IUnknown +{ + HRESULT GetStreamCount( + [out] DWORD *pcInputStreams, + [out] DWORD *pcOutputStreams + ); + + HRESULT GetInputStreamInfo( + DWORD dwInputStreamIndex, + [out] DWORD *pdwFlags + ); + + HRESULT GetOutputStreamInfo( + DWORD dwOutputStreamIndex, + [out] DWORD *pdwFlags + ); + + HRESULT GetInputType( + DWORD dwInputStreamIndex, + DWORD dwTypeIndex, + [out] DMO_MEDIA_TYPE *pmt + ); + + HRESULT GetOutputType( + DWORD dwOutputStreamIndex, + DWORD dwTypeIndex, + [out] DMO_MEDIA_TYPE *pmt + ); + + HRESULT SetInputType( + DWORD dwInputStreamIndex, + [in] const DMO_MEDIA_TYPE *pmt, + DWORD dwFlags + ); + + HRESULT SetOutputType( + DWORD dwOutputStreamIndex, + [in] const DMO_MEDIA_TYPE *pmt, + DWORD dwFlags + ); + + HRESULT GetInputCurrentType( + DWORD dwInputStreamIndex, + [out] DMO_MEDIA_TYPE *pmt + ); + + HRESULT GetOutputCurrentType( + DWORD dwOutputStreamIndex, + [out] DMO_MEDIA_TYPE *pmt + ); + + HRESULT GetInputSizeInfo( + DWORD dwInputStreamIndex, + [out] DWORD *pcbSize, + [out] DWORD *pcbMaxLookahead, + [out] DWORD *pcbAlignment + ); + + HRESULT GetOutputSizeInfo( + DWORD dwOutputStreamIndex, + [out] DWORD *pcbSize, + [out] DWORD *pcbAlignment + ); + + HRESULT GetInputMaxLatency( + DWORD dwInputStreamIndex, + [out] REFERENCE_TIME *prtMaxLatency + ); + + HRESULT SetInputMaxLatency( + DWORD dwInputStreamIndex, + REFERENCE_TIME rtMaxLatency + ); + + HRESULT Flush(); + + HRESULT Discontinuity(DWORD dwInputStreamIndex); + + HRESULT AllocateStreamingResources(); + + HRESULT FreeStreamingResources(); + + HRESULT GetInputStatus( + DWORD dwInputStreamIndex, + [out] DWORD *dwFlags + ); + + HRESULT ProcessInput( + DWORD dwInputStreamIndex, + IMediaBuffer *pBuffer, + DWORD dwFlags, + REFERENCE_TIME rtTimestamp, + REFERENCE_TIME rtTimelength + ); + + HRESULT ProcessOutput( + DWORD dwFlags, + DWORD cOutputBufferCount, + [in,out] DMO_OUTPUT_DATA_BUFFER *pOutputBuffers, + [out] DWORD *pdwStatus + ); + + HRESULT Lock(LONG bLock); +}; + +/***************************************************************************** + * IMediaObjectInPlace interface + */ + +[ + object, + uuid(651b9ad0-0fc7-4aa9-9538-d89931010741), + local +] +interface IMediaObjectInPlace : IUnknown { + HRESULT Process( + [in] ULONG ulSize, + [in,out] BYTE* pData, + [in] REFERENCE_TIME refTimeStart, + [in] DWORD dwFlags + ); + + HRESULT Clone( + [out] IMediaObjectInPlace **ppMediaObject + ); + + HRESULT GetLatency( + [out] REFERENCE_TIME *pLatencyTime + ); +}

1 0

Mark Harmstone : include: Add definition for KSDATAFORMAT_TYPE_AUDIO.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 67fda1b2c346213062f96128d633f5f48cc6afd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67fda1b2c346213062f96128d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Feb 27 00:18:50 2015 +0000 include: Add definition for KSDATAFORMAT_TYPE_AUDIO. --- include/ksmedia.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ksmedia.h b/include/ksmedia.h index 88c9fad..ae95249 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -23,6 +23,8 @@ #ifndef _KSMEDIA_ #define _KSMEDIA_ +DEFINE_GUID(KSDATAFORMAT_TYPE_AUDIO, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);

1 0

Henri Verbeet : d3d10core: Implement d3d10_geometry_shader_GetPrivateData( ).
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 6cd05c38a8018658083b6df3432c86b3a6d9d214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd05c38a8018658083b6df34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 12:29:42 2015 +0100 d3d10core: Implement d3d10_geometry_shader_GetPrivateData(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index ee47001..dbd6132 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -368,10 +368,12 @@ static void STDMETHODCALLTYPE d3d10_geometry_shader_GetDevice(ID3D10GeometryShad static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10GeometryShader *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10GeometryShader *iface,

1 0