wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Henri Verbeet : d3drm: Avoid LPDIRECTXFILEDATA.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 19b8ba0cb94c6f2ceb917822e9e4701372eb0ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b8ba0cb94c6f2ceb917822e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:12 2013 +0200 d3drm: Avoid LPDIRECTXFILEDATA. --- dlls/d3drm/d3drm.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 097d141..1e3547a 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1355,7 +1355,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v DXFILELOADOPTIONS load_options; IDirectXFile *file = NULL; IDirectXFileEnumObject *enum_object = NULL; - LPDIRECTXFILEDATA pData = NULL; + IDirectXFileData *data = NULL; HRESULT hr; const GUID* pGuid; DWORD size; @@ -1399,11 +1399,11 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v if (hr != DXFILE_OK) goto end; - hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &pData); + hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &data); if (hr != DXFILE_OK) goto end; - hr = IDirectXFileData_GetType(pData, &pGuid); + hr = IDirectXFileData_GetType(data, &pGuid); if (hr != DXFILE_OK) goto end; @@ -1415,7 +1415,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v goto end; } - hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&pHeader); + hr = IDirectXFileData_GetData(data, NULL, &size, (void **)&pHeader); if ((hr != DXFILE_OK) || (size != sizeof(Header))) goto end; @@ -1428,12 +1428,12 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v goto end; } - IDirectXFileData_Release(pData); - pData = NULL; + IDirectXFileData_Release(data); + data = NULL; while (1) { - hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &pData); + hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &data); if (hr == DXFILEERR_NOMOREOBJECTS) { TRACE("No more object\n"); @@ -1445,19 +1445,19 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v goto end; } - ret = load_data(iface, pData, iids, iid_count, load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame); + ret = load_data(iface, data, iids, iid_count, load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame); if (ret != D3DRM_OK) goto end; - IDirectXFileData_Release(pData); - pData = NULL; + IDirectXFileData_Release(data); + data = NULL; } ret = D3DRM_OK; end: - if (pData) - IDirectXFileData_Release(pData); + if (data) + IDirectXFileData_Release(data); if (enum_object) IDirectXFileEnumObject_Release(enum_object); if (file)

1 0

Henri Verbeet : d3d8: Always create textures for surfaces.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 133bfe29e4b5d70e5e962dbce2f5e56f8264a83c URL: http://source.winehq.org/git/wine.git/?a=commit;h=133bfe29e4b5d70e5e962dbce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:11 2013 +0200 d3d8: Always create textures for surfaces. --- dlls/d3d8/device.c | 72 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 49 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2f09a4f..e2a6af9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -36,6 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static void STDMETHODCALLTYPE d3d8_null_wined3d_object_destroyed(void *parent) {} + +static const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops = +{ + d3d8_null_wined3d_object_destroyed, +}; + D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) { BYTE *c = (BYTE *)&format; @@ -871,7 +878,10 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width D3DFORMAT format, DWORD flags, IDirect3DSurface8 **surface, UINT usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) { - struct d3d8_surface *object; + struct wined3d_resource *sub_resource; + struct wined3d_resource_desc desc; + struct d3d8_surface *surface_impl; + struct wined3d_texture *texture; HRESULT hr; TRACE("device %p, width %u, height %u, format %#x, flags %#x, surface %p,\n" @@ -879,22 +889,36 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width device, width, height, format, flags, surface, usage, pool, multisample_type, multisample_quality); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - FIXME("Failed to allocate surface memory.\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = wined3dformat_from_d3dformat(format); + desc.multisample_type = multisample_type; + desc.multisample_quality = multisample_quality; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.pool = pool; + desc.width = width; + desc.height = height; + desc.depth = 1; + desc.size = 0; - if (FAILED(hr = surface_init(object, device, width, height, format, - flags, usage, pool, multisample_type, multisample_quality))) + wined3d_mutex_lock(); + + if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &desc, + 1, flags, NULL, &d3d8_null_wined3d_parent_ops, &texture))) { - WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); + WARN("Failed to create texture, hr %#x.\n", hr); return hr; } - TRACE("Created surface %p.\n", object); - *surface = &object->IDirect3DSurface8_iface; + sub_resource = wined3d_texture_get_sub_resource(texture, 0); + surface_impl = wined3d_resource_get_parent(sub_resource); + surface_impl->forwardReference = NULL; + surface_impl->parent_device = &device->IDirect3DDevice8_iface; + *surface = &surface_impl->IDirect3DSurface8_iface; + IDirect3DSurface8_AddRef(*surface); + wined3d_texture_decref(texture); + + wined3d_mutex_unlock(); return D3D_OK; } @@ -1910,13 +1934,6 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, return hr; } -static void STDMETHODCALLTYPE d3d8_null_wined3d_object_destroyed(void *parent) {} - -static const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops = -{ - d3d8_null_wined3d_object_destroyed, -}; - /* The caller is responsible for wined3d locking */ static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UINT min_size) { @@ -2907,14 +2924,23 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ TRACE("device_parent %p, container_parent %p, desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", device_parent, container_parent, desc, sub_resource_idx, flags, surface); - if (FAILED(hr = d3d8_device_create_surface(device, desc->width, desc->height, - d3dformat_from_wined3dformat(desc->format), flags, (IDirect3DSurface8 **)&d3d_surface, - desc->usage, desc->pool, desc->multisample_type, desc->multisample_quality))) + if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) { - WARN("Failed to create surface, hr %#x.\n", hr); + FIXME("Failed to allocate surface memory.\n"); + return D3DERR_OUTOFVIDEOMEMORY; + } + + if (FAILED(hr = surface_init(d3d_surface, device, desc->width, desc->height, + d3dformat_from_wined3dformat(desc->format), flags, desc->usage, desc->pool, + desc->multisample_type, desc->multisample_quality))) + { + WARN("Failed to initialize surface, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, d3d_surface); return hr; } + TRACE("Created surface %p.\n", d3d_surface); + *surface = d3d_surface->wined3d_surface; wined3d_surface_incref(*surface);

1 0

Henri Verbeet : d3d9: Always create textures for surfaces.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: d0c9dbe7633c0618660dcf85bb8e6bc7f367a8e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0c9dbe7633c0618660dcf85b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:10 2013 +0200 d3d9: Always create textures for surfaces. --- dlls/d3d9/device.c | 72 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 49 insertions(+), 23 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 738a274..261591b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -25,6 +25,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +static void STDMETHODCALLTYPE d3d9_null_wined3d_object_destroyed(void *parent) {} + +static const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops = +{ + d3d9_null_wined3d_object_destroyed, +}; + D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) { BYTE *c = (BYTE *)&format; @@ -909,7 +916,10 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width D3DFORMAT format, DWORD flags, IDirect3DSurface9 **surface, UINT usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) { - struct d3d9_surface *object; + struct wined3d_resource *sub_resource; + struct wined3d_resource_desc desc; + struct d3d9_surface *surface_impl; + struct wined3d_texture *texture; HRESULT hr; TRACE("device %p, width %u, height %u, format %#x, flags %#x, surface %p.\n" @@ -917,22 +927,36 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width device, width, height, format, flags, surface, usage, pool, multisample_type, multisample_quality); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - FIXME("Failed to allocate surface memory.\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = wined3dformat_from_d3dformat(format); + desc.multisample_type = multisample_type; + desc.multisample_quality = multisample_quality; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.pool = pool; + desc.width = width; + desc.height = height; + desc.depth = 1; + desc.size = 0; - if (FAILED(hr = surface_init(object, device, width, height, format, - flags, usage, pool, multisample_type, multisample_quality))) + wined3d_mutex_lock(); + + if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &desc, + 1, flags, NULL, &d3d9_null_wined3d_parent_ops, &texture))) { - WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); + WARN("Failed to create texture, hr %#x.\n", hr); return hr; } - TRACE("Created surface %p.\n", object); - *surface = &object->IDirect3DSurface9_iface; + sub_resource = wined3d_texture_get_sub_resource(texture, 0); + surface_impl = wined3d_resource_get_parent(sub_resource); + surface_impl->forwardReference = NULL; + surface_impl->parent_device = &device->IDirect3DDevice9Ex_iface; + *surface = &surface_impl->IDirect3DSurface9_iface; + IDirect3DSurface9_AddRef(*surface); + wined3d_texture_decref(texture); + + wined3d_mutex_unlock(); return D3D_OK; } @@ -1989,13 +2013,6 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface return hr; } -static void STDMETHODCALLTYPE d3d9_null_wined3d_object_destroyed(void *parent) {} - -static const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops = -{ - d3d9_null_wined3d_object_destroyed, -}; - /* The caller is responsible for wined3d locking */ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UINT min_size) { @@ -3292,14 +3309,23 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ TRACE("device_parent %p, container_parent %p, desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", device_parent, container_parent, desc, sub_resource_idx, flags, surface); - if (FAILED(hr = d3d9_device_create_surface(device, desc->width, desc->height, - d3dformat_from_wined3dformat(desc->format), flags, (IDirect3DSurface9 **)&d3d_surface, - desc->usage, desc->pool, desc->multisample_type, desc->multisample_quality))) + if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) { - WARN("Failed to create surface, hr %#x.\n", hr); + FIXME("Failed to allocate surface memory.\n"); + return D3DERR_OUTOFVIDEOMEMORY; + } + + if (FAILED(hr = surface_init(d3d_surface, device, desc->width, desc->height, + d3dformat_from_wined3dformat(desc->format), flags, desc->usage, desc->pool, + desc->multisample_type, desc->multisample_quality))) + { + WARN("Failed to initialize surface, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, d3d_surface); return hr; } + TRACE("Created surface %p.\n", d3d_surface); + *surface = d3d_surface->wined3d_surface; wined3d_surface_incref(*surface);

1 0

Henri Verbeet : wined3d: Store the original display mode in the swapchain.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 7e7bd87b2cf2786f858a5d14a4611c34102bbbfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7bd87b2cf2786f858a5d14a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:09 2013 +0200 wined3d: Store the original display mode in the swapchain. --- dlls/wined3d/device.c | 6 +----- dlls/wined3d/swapchain.c | 39 ++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 14 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1db04b4..1ab93a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5012,11 +5012,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } else if (swapchain_desc->windowed) { - m.width = swapchain->orig_width; - m.height = swapchain->orig_height; - m.refresh_rate = 0; - m.format_id = swapchain->desc.backbuffer_format; - m.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + m = swapchain->original_mode; } else { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f6cfc2e..47ee901 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -30,7 +30,6 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); /* Do not call while under the GL lock. */ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) { - struct wined3d_display_mode mode; HRESULT hr; UINT i; @@ -76,13 +75,8 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) * orig_height will be equal to the modes in the presentation params. */ if (!swapchain->desc.windowed && swapchain->desc.auto_restore_display_mode) { - mode.width = swapchain->orig_width; - mode.height = swapchain->orig_height; - mode.refresh_rate = 0; - mode.format_id = swapchain->orig_fmt; - mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; if (FAILED(hr = wined3d_set_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, &mode))) + swapchain->device->adapter->ordinal, &swapchain->original_mode))) ERR("Failed to restore display mode, hr %#x.\n", hr); } @@ -818,8 +812,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 { const struct wined3d_adapter *adapter = device->adapter; struct wined3d_resource_desc surface_desc; - const struct wined3d_format *format; - struct wined3d_display_mode mode; BOOL displaymode_set = FALSE; RECT client_rect; HWND window; @@ -853,11 +845,12 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 swapchain->win_handle = window; swapchain->device_window = window; - wined3d_get_adapter_display_mode(device->wined3d, adapter->ordinal, &mode, NULL); - swapchain->orig_width = mode.width; - swapchain->orig_height = mode.height; - swapchain->orig_fmt = mode.format_id; - format = wined3d_get_format(&adapter->gl_info, mode.format_id); + if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, + adapter->ordinal, &swapchain->original_mode, NULL))) + { + ERR("Failed to get current display mode, hr %#x.\n", hr); + goto err; + } GetClientRect(window, &client_rect); if (desc->windowed @@ -879,8 +872,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) { - desc->backbuffer_format = swapchain->orig_fmt; - TRACE("Updating format to %s.\n", debug_d3dformat(swapchain->orig_fmt)); + desc->backbuffer_format = swapchain->original_mode.format_id; + TRACE("Updating format to %s.\n", debug_d3dformat(swapchain->original_mode.format_id)); } } swapchain->desc = *desc; @@ -1040,18 +1033,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 err: if (displaymode_set) { - DEVMODEW devmode; - + if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, + adapter->ordinal, &swapchain->original_mode))) + ERR("Failed to restore display mode.\n"); ClipCursor(NULL); - - /* Change the display settings */ - memset(&devmode, 0, sizeof(devmode)); - devmode.dmSize = sizeof(devmode); - devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - devmode.dmBitsPerPel = format->byte_count * CHAR_BIT; - devmode.dmPelsWidth = swapchain->orig_width; - devmode.dmPelsHeight = swapchain->orig_height; - ChangeDisplaySettingsExW(adapter->DeviceName, &devmode, NULL, CDS_FULLSCREEN, NULL); } if (swapchain->back_buffers) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cee9651..49aacc1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2543,8 +2543,7 @@ struct wined3d_swapchain struct wined3d_surface **back_buffers; struct wined3d_surface *front_buffer; struct wined3d_swapchain_desc desc; - DWORD orig_width, orig_height; - enum wined3d_format_id orig_fmt; + struct wined3d_display_mode original_mode; struct wined3d_gamma_ramp orig_gamma; BOOL render_to_fbo; const struct wined3d_format *ds_format;

1 0

Vincent Povirk : riched20: Use \ulnone instead of \ul0 for no underline.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: d04d1c17369887c365174c062d2975d957509980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04d1c17369887c365174c062… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 19 17:31:38 2013 -0500 riched20: Use \ulnone instead of \ul0 for no underline. --- dlls/riched20/writer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 6a4538c..ea797fd 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -680,7 +680,7 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) break; case CFU_UNDERLINENONE: default: - strcat(props, "\\ul0"); + strcat(props, "\\ulnone"); break; } else if (fmt->dwEffects & CFE_UNDERLINE)

1 0

Michael Stefaniuc : winedbg: Fix the return type of read_input(); it is never negative.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 4cf489f9ceb9f99ed33be527479944dae935570b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf489f9ceb9f99ed33be5274… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 20 00:13:42 2013 +0200 winedbg: Fix the return type of read_input(); it is never negative. --- programs/winedbg/debug.l | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index a6ab10c..ef7a2eb 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -61,7 +61,7 @@ void lexeme_flush(void) next_lexeme = 0; } -static int read_input(const char* pfx, char* buf, int size) +static size_t read_input(const char* pfx, char* buf, int size) { int len; static char* last_line = NULL; @@ -107,8 +107,7 @@ static int read_input(const char* pfx, char* buf, int size) } #define YY_INPUT(buf,result,max_size) \ - if ((result = read_input("Wine-dbg>", buf, max_size)) < 0) \ - YY_FATAL_ERROR("read_input in flex scanner failed"); + (result = read_input("Wine-dbg>", buf, max_size)) static int syntax_error; %}

1 0

Jacek Caban : wmsdkidl.idl: Added some missing GUIDs.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 73aef4031335b0b6640014f79c4cc4bc335dd910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73aef4031335b0b6640014f79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 19 16:47:47 2013 +0200 wmsdkidl.idl: Added some missing GUIDs. --- include/wmsdkidl.idl | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 4cb1db7..91dc000 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -345,3 +345,42 @@ interface IWMSyncReader : IUnknown HRESULT OpenStream( [in] IStream *pStream); }; + +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB1, 0xe436eb78,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB4, 0xe436eb79,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB8, 0xe436eb7a,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB565, 0xe436eb7b,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB555, 0xe436eb7c,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB24, 0xe436eb7d,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB32, 0xe436eb7e,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_I420, 0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_IYUV, 0x56555949,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_YV12, 0x32315659,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_YUY2, 0x32595559,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_P422, 0x32323450,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_UYVY, 0x59565955,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_YVYU, 0x55595659,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_YVU9, 0x39555659,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_VIDEOIMAGE, 0x1d4a45f2,0xe5f6,0x4b44,0x83,0x88,0xf0,0xae,0x5c,0x0e,0x0c,0x37);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MP43, 0x3334504d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MP4S, 0x5334504d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_M4S2, 0x3253344d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMV1, 0x31564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMV2, 0x32564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MSS1, 0x3153534d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MPEG2_VIDEO, 0xe06d8026,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea);") +cpp_quote("EXTERN_GUID(WMMEDIATYPE_Audio, 0x73647561,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_PCM, 0x00000001,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_DRM, 0x00000009,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMAudioV9, 0x00000162,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMAudio_Lossless, 0x00000163,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MSS2, 0x3253534d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMSP1, 0x0000000a,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMSP2, 0x0000000b,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMV3, 0x33564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMVP, 0x50564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WVP2, 0x32505657,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMVA, 0x41564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WVC1, 0x31435657,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")

1 0

Jacek Caban : rpcndr.h: Added EXTERN_GUID define.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 6261ab2686434426874a6b804f920abb24df9fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6261ab2686434426874a6b804… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 19 16:47:36 2013 +0200 rpcndr.h: Added EXTERN_GUID define. --- include/rpcndr.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 514f1ce..bc895a5 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -37,6 +37,18 @@ extern "C" { # define CONST_VTBL #endif +#ifdef __cplusplus +#define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \ + EXTERN_C const GUID DECLSPEC_SELECTANY name = \ + { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } +#else +#define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \ + const GUID DECLSPEC_SELECTANY name = \ + { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } +#endif + /* stupid #if can't handle casts... this __stupidity is just a workaround for that limitation */

1 0

Jacek Caban : evcode.h: Added some missing defines.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: c52282fe7b36a2c168bdc36097b27ef1d756c5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52282fe7b36a2c168bdc3609… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 19 13:14:50 2013 +0200 evcode.h: Added some missing defines. --- include/evcode.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/include/evcode.h b/include/evcode.h index 3cbdd9d..b62ff6a 100644 --- a/include/evcode.h +++ b/include/evcode.h @@ -35,6 +35,7 @@ #define EC_QUALITY_CHANGE 0x0B #define EC_SHUTTING_DOWN 0x0C #define EC_CLOCK_CHANGED 0x0D +#define EC_PAUSED 0x0E #define EC_OPENING_FILE 0x10 #define EC_BUFFERING_DATA 0x11 #define EC_FULLSCREEN_LOST 0x12 @@ -50,5 +51,44 @@ #define EC_END_OF_SEGMENT 0x1C #define EC_SEGMENT_STARTED 0x1D #define EC_LENGTH_CHANGED 0x1E +#define EC_DEVICE_LOST 0x1F +#define EC_SAMPLE_NEEDED 0x20 +#define EC_PROCESSING_LATENCY 0x21 +#define EC_SAMPLE_LATENCY 0x22 +#define EC_SCRUB_TIME 0x23 +#define EC_STEP_COMPLETE 0x24 + +#define EC_NEW_PIN 0x20 +#define EC_RENDER_FINISHED 0x21 + +#define EC_TIMECODE_AVAILABLE 0x30 +#define EC_EXTDEVICE_MODE_CHANGE 0x31 +#define EC_STATE_CHANGE 0x32 + +#define EC_PLEASE_REOPEN 0x40 +#define EC_STATUS 0x41 +#define EC_MARKER_HIT 0x42 +#define EC_LOADSTATUS 0x43 +#define EC_FILE_CLOSED 0x44 +#define EC_ERRORABORTEX 0x45 +#define EC_EOS_SOON 0x46 +#define EC_CONTENTPROPERTY_CHANGED 0x47 +#define EC_BANDWIDTHCHANGE 0x48 +#define EC_VIDEOFRAMEREADY 0x49 +#define EC_GRAPH_CHANGED 0x50 +#define EC_CLOCK_UNSET 0x51 + +#define EC_VMR_RENDERDEVICE_SET 0x53 +#define EC_VMR_SURFACE_FLIPPED 0x54 +#define EC_VMR_RECONNECTION_FAILED 0x55 +#define EC_PREPROCESS_COMPLETE 0x56 +#define EC_CODECAPI_EVENT 0x57 + +#define EC_BUILT 0x300 +#define EC_UNBUILT 0x301 + +#define EC_WMT_EVENT_BASE 0x0251 +#define EC_WMT_INDEX_EVENT EC_WMT_EVENT_BASE +#define EC_WMT_EVENT EC_WMT_EVENT_BASE+1 #endif /* __WINE_EVCODE_H */

1 0

Hans Leidekker : winhttp: Fix invalid parameter handling in WinHttpQueryAuthSchemes.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: fe678927dd12ba597d4886418cd72f194954f7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe678927dd12ba597d4886418… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 19 15:52:44 2013 +0200 winhttp: Fix invalid parameter handling in WinHttpQueryAuthSchemes. --- dlls/winhttp/request.c | 11 ++++++- dlls/winhttp/tests/winhttp.c | 72 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 72 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 00c2238..35a0deb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1270,12 +1270,14 @@ static BOOL query_auth_schemes( request_t *request, DWORD level, LPDWORD support return FALSE; } scheme = auth_scheme_from_header( buffer ); + heap_free( buffer ); + if (!scheme) break; + if (first && index == 1) *first = *supported = scheme; else *supported |= scheme; - heap_free( buffer ); ret = TRUE; } return ret; @@ -1302,6 +1304,13 @@ BOOL WINAPI WinHttpQueryAuthSchemes( HINTERNET hrequest, LPDWORD supported, LPDW set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } + if (!supported || !first || !target) + { + release_object( &request->hdr ); + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + + } if (query_auth_schemes( request, WINHTTP_QUERY_WWW_AUTHENTICATE, supported, first )) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 87ddcb0..3157a44 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1881,7 +1881,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) { HINTERNET ses, con, req; char buffer[0x100]; - DWORD count, status, size, supported, first, target; + DWORD count, status, size, error, supported, first, target; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -1904,12 +1904,15 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) ok(ret, "failed to query status code %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); - supported = first = target = 0xffff; + supported = first = target = 0xdeadbeef; + SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); + error = GetLastError(); ok(!ret, "unexpected success\n"); - ok(supported == 0xffff, "got %x\n", supported); - ok(first == 0xffff, "got %x\n", first); - ok(target == 0xffff, "got %x\n", target); + todo_wine ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(first == 0xdeadbeef, "got %x\n", first); + ok(target == 0xdeadbeef, "got %x\n", target); count = 0; memset(buffer, 0, sizeof(buffer)); @@ -1941,12 +1944,54 @@ static void test_basic_authentication(int port) req = WinHttpOpenRequest(con, NULL, authW, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); - supported = first = target = 0xffff; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(NULL, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(req, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); + + supported = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(req, &supported, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + + supported = first = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(req, &supported, &first, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(first == 0xdeadbeef, "got %x\n", first); + + supported = first = target = 0xdeadbeef; + SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); - ok(!ret, "unexpected success\n"); - ok(supported == 0xffff, "got %x\n", supported); - ok(first == 0xffff, "got %x\n", first); - ok(target == 0xffff, "got %x\n", target); + error = GetLastError(); + ok(!ret, "expected failure\n"); + todo_wine ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(first == 0xdeadbeef, "got %x\n", first); + ok(target == 0xdeadbeef, "got %x\n", target); + + supported = first = target = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(NULL, &supported, &first, &target); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(first == 0xdeadbeef, "got %x\n", first); + ok(target == 0xdeadbeef, "got %x\n", target); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError()); @@ -1959,6 +2004,13 @@ static void test_basic_authentication(int port) ok(ret, "failed to query status code %u\n", GetLastError()); ok(status == 401, "request failed unexpectedly %u\n", status); + supported = first = target = 0xdeadbeef; + ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); + ok(ret, "failed to query authentication schemes %u\n", GetLastError()); + ok(supported == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", supported); + ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", first); + ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %x\n", target); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, NULL, NULL, NULL); ok(ret, "failed to set credentials %u\n", GetLastError());

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2013