September 2010 - Wine-Commits

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}Fragment.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 6aa90a2dceb388d1b46bfc7700d219afd7bd42f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa90a2dceb388d1b46bfc770… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Aug 29 17:10:10 2010 -0400 urlmon: Implemented IUriBuilder_{Get/Set}Fragment. --- dlls/urlmon/tests/uri.c | 22 ++++++++- dlls/urlmon/uri.c | 122 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 121 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9206ce0..1ce6dfa 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4266,7 +4266,7 @@ typedef struct _uri_builder_test { static const uri_builder_test uri_builder_tests[] = { { "http://google.com/",0,S_OK,FALSE, { - {TRUE,"#fragment",NULL,Uri_PROPERTY_FRAGMENT,S_OK,TRUE}, + {TRUE,"#fragment",NULL,Uri_PROPERTY_FRAGMENT,S_OK,FALSE}, {TRUE,"password",NULL,Uri_PROPERTY_PASSWORD,S_OK,TRUE}, {TRUE,"?query=x",NULL,Uri_PROPERTY_QUERY,S_OK,TRUE}, {TRUE,"username",NULL,Uri_PROPERTY_USER_NAME,S_OK,TRUE} @@ -4295,6 +4295,24 @@ static const uri_builder_test uri_builder_tests[] = { "http://[::192.2.3.4]/",0,S_OK,TRUE, "http://[::192.2.3.4]/",0,S_OK,TRUE, "http://[::192.2.3.4]/",0,0,0,S_OK,TRUE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"Frag","#Frag",Uri_PROPERTY_FRAGMENT,S_OK,FALSE} + }, + {FALSE}, + "http://google.com/#Frag",0,S_OK,TRUE, + "http://google.com/#Frag",0,S_OK,TRUE, + "http://google.com/#Frag",0,0,0,S_OK,TRUE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"","#",Uri_PROPERTY_FRAGMENT,S_OK,FALSE}, + }, + {FALSE}, + "http://google.com/#",0,S_OK,TRUE, + "http://google.com/#",0,S_OK,TRUE, + "http://google.com/#",0,0,0,S_OK,TRUE } }; @@ -5819,7 +5837,7 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { if(uri) IUri_Release(uri); hr = IUriBuilder_SetFragment(builder, NULL); - todo_wine { ok(hr == S_OK, "Error: IUriBuilder_SetFragment returned 0x%08x, expected 0x%08x.\n", hr, S_OK); } + ok(hr == S_OK, "Error: IUriBuilder_SetFragment returned 0x%08x, expected 0x%08x.\n", hr, S_OK); /* The IUriBuilder is changed, so it returns E_NOTIMPL again. */ uri = (void*) 0xdeadbeef; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 4377548..c6b496b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -77,7 +77,11 @@ typedef struct { const IUriBuilderVtbl *lpIUriBuilderVtbl; LONG ref; - IUri *uri; + Uri *uri; + DWORD modified_props; + + WCHAR *fragment; + DWORD fragment_len; } UriBuilder; typedef struct { @@ -3243,6 +3247,76 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { return S_OK; } +static HRESULT get_builder_component(LPWSTR *component, DWORD *component_len, + LPCWSTR source, DWORD source_len, + LPCWSTR *output, DWORD *output_len) +{ + if(!output_len) { + if(output) + *output = NULL; + return E_POINTER; + } + + if(!output) { + *output_len = 0; + return E_POINTER; + } + + if(!(*component) && source) { + /* Allocate 'component', and copy the contents from 'source' + * into the new allocation. + */ + *component = heap_alloc((source_len+1)*sizeof(WCHAR)); + if(!(*component)) + return E_OUTOFMEMORY; + + memcpy(*component, source, source_len*sizeof(WCHAR)); + (*component)[source_len] = '\0'; + *component_len = source_len; + } + + *output = *component; + *output_len = *component_len; + return *output ? S_OK : S_FALSE; +} + +/* Allocates 'component' and copies the string from 'new_value' into 'component'. + * If 'prefix' is set and 'new_value' isn't NULL, then it checks if 'new_value' + * starts with 'prefix'. If it doesn't then 'prefix' is prepended to 'component'. + */ +static HRESULT set_builder_component(LPWSTR *component, DWORD *component_len, LPCWSTR new_value, + WCHAR prefix) +{ + if(*component) + heap_free(*component); + + if(!new_value) { + *component = NULL; + *component_len = 0; + } else { + BOOL add_prefix = FALSE; + DWORD len = lstrlenW(new_value); + DWORD pos = 0; + + if(prefix && *new_value != prefix) { + add_prefix = TRUE; + *component = heap_alloc((len+2)*sizeof(WCHAR)); + } else + *component = heap_alloc((len+1)*sizeof(WCHAR)); + + if(!(*component)) + return E_OUTOFMEMORY; + + if(add_prefix) + (*component)[pos++] = prefix; + + memcpy(*component+pos, new_value, (len+1)*sizeof(WCHAR)); + *component_len = len+pos; + } + + return S_OK; +} + #define URI(x) ((IUri*) &(x)->lpIUriVtbl) #define URIBUILDER(x) ((IUriBuilder*) &(x)->lpIUriBuilderVtbl) @@ -4234,7 +4308,8 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if(This->uri) IUri_Release(This->uri); + if(This->uri) IUri_Release(URI(This->uri)); + heap_free(This->fragment); heap_free(This); } @@ -4353,19 +4428,11 @@ static HRESULT WINAPI UriBuilder_GetFragment(IUriBuilder *iface, DWORD *pcchFrag UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%p %p)\n", This, pcchFragment, ppwzFragment); - if(!pcchFragment) { - if(ppwzFragment) - *ppwzFragment = NULL; - return E_POINTER; - } - - if(!ppwzFragment) { - *pcchFragment = 0; - return E_POINTER; - } - - FIXME("(%p)->(%p %p)\n", This, pcchFragment, ppwzFragment); - return E_NOTIMPL; + if(!This->uri || This->uri->fragment_start == -1 || This->modified_props & Uri_HAS_FRAGMENT) + return get_builder_component(&This->fragment, &This->fragment_len, NULL, 0, ppwzFragment, pcchFragment); + else + return get_builder_component(&This->fragment, &This->fragment_len, This->uri->canon_uri+This->uri->fragment_start, + This->uri->fragment_len, ppwzFragment, pcchFragment); } static HRESULT WINAPI UriBuilder_GetHost(IUriBuilder *iface, DWORD *pcchHost, LPCWSTR *ppwzHost) @@ -4511,8 +4578,10 @@ static HRESULT WINAPI UriBuilder_GetUserName(IUriBuilder *iface, DWORD *pcchUser static HRESULT WINAPI UriBuilder_SetFragment(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); + + This->modified_props |= Uri_HAS_FRAGMENT; + return set_builder_component(&This->fragment, &This->fragment_len, pwzNewValue, '#'); } static HRESULT WINAPI UriBuilder_SetHost(IUriBuilder *iface, LPCWSTR pwzNewValue) @@ -4626,16 +4695,27 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve if(!ppIUriBuilder) return E_POINTER; - ret = heap_alloc(sizeof(UriBuilder)); + ret = heap_alloc_zero(sizeof(UriBuilder)); if(!ret) return E_OUTOFMEMORY; ret->lpIUriBuilderVtbl = &UriBuilderVtbl; ret->ref = 1; - ret->uri = pIUri; - if(pIUri) - IUri_AddRef(pIUri); + if(pIUri) { + Uri *uri; + + if((uri = get_uri_obj(pIUri))) { + IUri_AddRef(pIUri); + ret->uri = uri; + } else { + heap_free(ret); + *ppIUriBuilder = NULL; + FIXME("(%p %x %x %p): Unknown IUri types not supported yet.\n", pIUri, dwFlags, + (DWORD)dwReserved, ppIUriBuilder); + return E_NOTIMPL; + } + } *ppIUriBuilder = URIBUILDER(ret); return S_OK;

1 0

Henri Verbeet : wined3d: Don't overwrite the offscreen depth/ stencil surface with undefined data in surface_load_ds_location().
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 8fbf23f0ccd1f210204fd3695513f469bad8ada8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fbf23f0ccd1f210204fd3695… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 5 23:38:50 2010 +0200 wined3d: Don't overwrite the offscreen depth/stencil surface with undefined data in surface_load_ds_location(). --- dlls/wined3d/surface.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8f39a97..e60fb44 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4166,6 +4166,14 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte { GLint old_binding = 0; GLenum bind_target; + GLsizei w, h; + + /* The render target is allowed to be smaller than the depth/stencil + * buffer, so the onscreen depth/stencil buffer is potentially smaller + * than the offscreen surface. Don't overwrite the offscreen surface + * with undefined data. */ + w = min(surface->currentDesc.Width, context->swapchain->presentParms.BackBufferWidth); + h = min(surface->currentDesc.Height, context->swapchain->presentParms.BackBufferHeight); TRACE("Copying onscreen depth buffer to depth texture.\n"); @@ -4190,8 +4198,7 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte bind_target = GL_TEXTURE_2D; } glBindTexture(bind_target, device->depth_blt_texture); - glCopyTexImage2D(bind_target, surface->texture_level, surface->resource.format->glInternal, - 0, 0, surface->currentDesc.Width, surface->currentDesc.Height, 0); + glCopyTexImage2D(bind_target, surface->texture_level, surface->resource.format->glInternal, 0, 0, w, h, 0); glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); @@ -4206,16 +4213,14 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte gl_info->fbo_ops.glGenRenderbuffers(1, &device->depth_blt_rb); checkGLcall("glGenRenderbuffersEXT"); } - if (device->depth_blt_rb_w != surface->currentDesc.Width - || device->depth_blt_rb_h != surface->currentDesc.Height) + if (device->depth_blt_rb_w != w || device->depth_blt_rb_h != h) { gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, device->depth_blt_rb); checkGLcall("glBindRenderbufferEXT"); - gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, - surface->currentDesc.Width, surface->currentDesc.Height); + gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, w, h); checkGLcall("glRenderbufferStorageEXT"); - device->depth_blt_rb_w = surface->currentDesc.Width; - device->depth_blt_rb_h = surface->currentDesc.Height; + device->depth_blt_rb_w = w; + device->depth_blt_rb_h = h; } context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); @@ -4225,8 +4230,7 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, surface, FALSE); /* Do the actual blit */ - surface_depth_blt(surface, gl_info, device->depth_blt_texture, - surface->currentDesc.Width, surface->currentDesc.Height, bind_target); + surface_depth_blt(surface, gl_info, device->depth_blt_texture, w, h, bind_target); checkGLcall("depth_blt"); if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id);

1 0

Louis Lenders : kernel32: Change SetHandleCount to match behaviour on versions >WINNT.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: e793f9b0721d84de5f32518e1006efbcb1486b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e793f9b0721d84de5f32518e1… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 3 20:47:30 2010 +0200 kernel32: Change SetHandleCount to match behaviour on versions >WINNT. --- dlls/kernel32/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index dadaea6..e32d75d 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1192,7 +1192,7 @@ BOOL WINAPI UnlockFileEx( HANDLE hFile, DWORD reserved, DWORD count_low, DWORD c */ UINT WINAPI SetHandleCount( UINT count ) { - return min( 256, count ); + return count; }

1 0

Henri Verbeet : wined3d: Do not call device_switch_onscreen_ds() while under the GL lock.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 8e0cb60b092ab3ec5c276d5159e5ff3d8f6f2b23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0cb60b092ab3ec5c276d515… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 5 23:38:48 2010 +0200 wined3d: Do not call device_switch_onscreen_ds() while under the GL lock. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/device.c | 9 +++++++++ dlls/wined3d/surface.c | 4 ++++ dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7901f0f..3ca5004 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7170,6 +7170,7 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ return WINED3D_OK; } +/* Do not call while under the GL lock. */ static HRESULT arbfp_blit_color_fill(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect, const WINED3DCOLORVALUE *color) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5116961..6cd07bb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -576,6 +576,7 @@ void device_get_draw_rect(IWineD3DDeviceImpl *device, RECT *rect) } } +/* Do not call while under the GL lock. */ void device_switch_onscreen_ds(IWineD3DDeviceImpl *device, struct wined3d_context *context, IWineD3DSurfaceImpl *depth_stencil) { @@ -653,6 +654,7 @@ static void prepare_ds_clear(IWineD3DSurfaceImpl *ds, struct wined3d_context *co surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); } +/* Do not call while under the GL lock. */ HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, IWineD3DSurfaceImpl **rts, UINT rect_count, const RECT *rects, const RECT *draw_rect, DWORD flags, const WINED3DCOLORVALUE *color, float depth, DWORD stencil) @@ -715,7 +717,11 @@ HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, I DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; if (location == SFLAG_DS_ONSCREEN && depth_stencil != device->onscreen_depth_stencil) + { + LEAVE_GL(); device_switch_onscreen_ds(device, context, depth_stencil); + ENTER_GL(); + } prepare_ds_clear(depth_stencil, context, location, draw_rect, rect_count, clear_rect); surface_modify_location(depth_stencil, SFLAG_INDRAWABLE, TRUE); @@ -4574,6 +4580,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, return WINED3D_OK; } +/* Do not call while under the GL lock. */ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD rect_count, const RECT *rects, DWORD flags, WINED3DCOLOR color, float depth, DWORD stencil) { @@ -5493,6 +5500,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DeletePatch(IWineD3DDevice *iface, UINT return WINED3DERR_INVALIDCALL; } +/* Do not call while under the GL lock. */ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *surface, const RECT *rect, const WINED3DCOLORVALUE *color) { @@ -5511,6 +5519,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, return surface_color_fill(s, rect, color); } +/* Do not call while under the GL lock. */ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *iface, IWineD3DRendertargetView *rendertarget_view, const WINED3DCOLORVALUE *color) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fe26fd5..8f39a97 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3356,6 +3356,7 @@ static void surface_blt_fbo(IWineD3DDeviceImpl *device, const WINED3DTEXTUREFILT context_release(context); } +/* Do not call while under the GL lock. */ HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) { IWineD3DDeviceImpl *device = s->resource.device; @@ -3373,6 +3374,7 @@ HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED } /* Not called from the VTable */ +/* Do not call while under the GL lock. */ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, const RECT *DestRect, IWineD3DSurfaceImpl *src_surface, const RECT *SrcRect, DWORD Flags, const WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter) @@ -4873,6 +4875,7 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_ return FALSE; } +/* Do not call while under the GL lock. */ static HRESULT ffp_blit_color_fill(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect, const WINED3DCOLORVALUE *color) { @@ -4924,6 +4927,7 @@ static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_ return FALSE; } +/* Do not call while under the GL lock. */ static HRESULT cpu_blit_color_fill(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect, const WINED3DCOLORVALUE *color) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 691b8cc..2963933 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1133,7 +1133,8 @@ enum blit_operation BLIT_OP_COLOR_FILL }; -/* Shaders for color conversions in blits */ +/* Shaders for color conversions in blits. Do not do blit operations while + * already under the GL lock. */ struct blit_shader { HRESULT (*alloc_private)(IWineD3DDevice *iface);

1 0

Henri Verbeet : wined3d: Translate before scaling for rhw as well in transform_projection().
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 952dfe30be68848fb3799ddb4e732f0e9c7fdbe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952dfe30be68848fb3799ddb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 5 23:38:49 2010 +0200 wined3d: Translate before scaling for rhw as well in transform_projection(). --- dlls/wined3d/state.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2224247..c04b317 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3905,10 +3905,6 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock glOrtho(x, x + w, y + h, y, 0.0, -1.0); checkGLcall("glOrtho"); - /* Window Coord 0 is the middle of the first pixel, so translate by 1/2 pixels */ - glTranslatef(63.0f / 128.0f, 63.0f / 128.0f, 0.0f); - checkGLcall("glTranslatef(63.0f / 128.0f, 63.0f / 128.0f, 0.0f)"); - /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ if (context->render_offscreen) @@ -3916,7 +3912,13 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock glScalef(1.0f, -1.0f, 1.0f); checkGLcall("glScalef"); } - } else { + + /* Window Coord 0 is the middle of the first pixel, so translate by 1/2 pixels */ + glTranslatef(63.0f / 128.0f, 63.0f / 128.0f, 0.0f); + checkGLcall("glTranslatef(63.0f / 128.0f, -63.0f / 128.0f, 0.0f)"); + } + else + { /* The rule is that the window coordinate 0 does not correspond to the beginning of the first pixel, but the center of the first pixel. As a consequence if you want to correctly draw one line exactly from

1 0

Vincent Povirk : windowscodecs: Enumerate encoders.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: d701e8fab38643fe4344971adaab033e5ffcfe2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d701e8fab38643fe4344971ad… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Sep 5 21:13:20 2010 -0500 windowscodecs: Enumerate encoders. --- dlls/windowscodecs/info.c | 255 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 255 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index f790dbc..373699d 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -467,6 +467,260 @@ static HRESULT BitmapDecoderInfo_Constructor(HKEY classkey, REFCLSID clsid, IWIC } typedef struct { + const IWICBitmapEncoderInfoVtbl *lpIWICBitmapEncoderInfoVtbl; + LONG ref; + HKEY classkey; + CLSID clsid; +} BitmapEncoderInfo; + +static HRESULT WINAPI BitmapEncoderInfo_QueryInterface(IWICBitmapEncoderInfo *iface, REFIID iid, + void **ppv) +{ + BitmapEncoderInfo *This = (BitmapEncoderInfo*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICComponentInfo, iid) || + IsEqualIID(&IID_IWICBitmapCodecInfo, iid) || + IsEqualIID(&IID_IWICBitmapEncoderInfo ,iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI BitmapEncoderInfo_AddRef(IWICBitmapEncoderInfo *iface) +{ + BitmapEncoderInfo *This = (BitmapEncoderInfo*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI BitmapEncoderInfo_Release(IWICBitmapEncoderInfo *iface) +{ + BitmapEncoderInfo *This = (BitmapEncoderInfo*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + RegCloseKey(This->classkey); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetComponentType(IWICBitmapEncoderInfo *iface, + WICComponentType *pType) +{ + TRACE("(%p,%p)\n", iface, pType); + *pType = WICEncoder; + return S_OK; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetCLSID(IWICBitmapEncoderInfo *iface, CLSID *pclsid) +{ + FIXME("(%p,%p): stub\n", iface, pclsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetSigningStatus(IWICBitmapEncoderInfo *iface, DWORD *pStatus) +{ + FIXME("(%p,%p): stub\n", iface, pStatus); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetAuthor(IWICBitmapEncoderInfo *iface, UINT cchAuthor, + WCHAR *wzAuthor, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchAuthor, wzAuthor, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetVendorGUID(IWICBitmapEncoderInfo *iface, GUID *pguidVendor) +{ + FIXME("(%p,%p): stub\n", iface, pguidVendor); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetVersion(IWICBitmapEncoderInfo *iface, UINT cchVersion, + WCHAR *wzVersion, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchVersion, wzVersion, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetSpecVersion(IWICBitmapEncoderInfo *iface, UINT cchSpecVersion, + WCHAR *wzSpecVersion, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetFriendlyName(IWICBitmapEncoderInfo *iface, UINT cchFriendlyName, + WCHAR *wzFriendlyName, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchFriendlyName, wzFriendlyName, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetContainerFormat(IWICBitmapEncoderInfo *iface, + GUID *pguidContainerFormat) +{ + FIXME("(%p,%p): stub\n", iface, pguidContainerFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetPixelFormats(IWICBitmapEncoderInfo *iface, + UINT cFormats, GUID *pguidPixelFormats, UINT *pcActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cFormats, pguidPixelFormats, pcActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetColorManagementVersion(IWICBitmapEncoderInfo *iface, + UINT cchColorManagementVersion, WCHAR *wzColorManagementVersion, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchColorManagementVersion, wzColorManagementVersion, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetDeviceManufacturer(IWICBitmapEncoderInfo *iface, + UINT cchDeviceManufacturer, WCHAR *wzDeviceManufacturer, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetDeviceModels(IWICBitmapEncoderInfo *iface, + UINT cchDeviceModels, WCHAR *wzDeviceModels, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchDeviceModels, wzDeviceModels, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetMimeTypes(IWICBitmapEncoderInfo *iface, + UINT cchMimeTypes, WCHAR *wzMimeTypes, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchMimeTypes, wzMimeTypes, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_GetFileExtensions(IWICBitmapEncoderInfo *iface, + UINT cchFileExtensions, WCHAR *wzFileExtensions, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchFileExtensions, wzFileExtensions, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_DoesSupportAnimation(IWICBitmapEncoderInfo *iface, + BOOL *pfSupportAnimation) +{ + FIXME("(%p,%p): stub\n", iface, pfSupportAnimation); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_DoesSupportChromaKey(IWICBitmapEncoderInfo *iface, + BOOL *pfSupportChromaKey) +{ + FIXME("(%p,%p): stub\n", iface, pfSupportChromaKey); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_DoesSupportLossless(IWICBitmapEncoderInfo *iface, + BOOL *pfSupportLossless) +{ + FIXME("(%p,%p): stub\n", iface, pfSupportLossless); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_DoesSupportMultiframe(IWICBitmapEncoderInfo *iface, + BOOL *pfSupportMultiframe) +{ + FIXME("(%p,%p): stub\n", iface, pfSupportMultiframe); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_MatchesMimeType(IWICBitmapEncoderInfo *iface, + LPCWSTR wzMimeType, BOOL *pfMatches) +{ + FIXME("(%p,%s,%p): stub\n", iface, debugstr_w(wzMimeType), pfMatches); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapEncoderInfo_CreateInstance(IWICBitmapEncoderInfo *iface, + IWICBitmapEncoder **ppIBitmapEncoder) +{ + BitmapEncoderInfo *This = (BitmapEncoderInfo*)iface; + + TRACE("(%p,%p)\n", iface, ppIBitmapEncoder); + + return CoCreateInstance(&This->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapEncoder, (void**)ppIBitmapEncoder); +} + +static const IWICBitmapEncoderInfoVtbl BitmapEncoderInfo_Vtbl = { + BitmapEncoderInfo_QueryInterface, + BitmapEncoderInfo_AddRef, + BitmapEncoderInfo_Release, + BitmapEncoderInfo_GetComponentType, + BitmapEncoderInfo_GetCLSID, + BitmapEncoderInfo_GetSigningStatus, + BitmapEncoderInfo_GetAuthor, + BitmapEncoderInfo_GetVendorGUID, + BitmapEncoderInfo_GetVersion, + BitmapEncoderInfo_GetSpecVersion, + BitmapEncoderInfo_GetFriendlyName, + BitmapEncoderInfo_GetContainerFormat, + BitmapEncoderInfo_GetPixelFormats, + BitmapEncoderInfo_GetColorManagementVersion, + BitmapEncoderInfo_GetDeviceManufacturer, + BitmapEncoderInfo_GetDeviceModels, + BitmapEncoderInfo_GetMimeTypes, + BitmapEncoderInfo_GetFileExtensions, + BitmapEncoderInfo_DoesSupportAnimation, + BitmapEncoderInfo_DoesSupportChromaKey, + BitmapEncoderInfo_DoesSupportLossless, + BitmapEncoderInfo_DoesSupportMultiframe, + BitmapEncoderInfo_MatchesMimeType, + BitmapEncoderInfo_CreateInstance +}; + +static HRESULT BitmapEncoderInfo_Constructor(HKEY classkey, REFCLSID clsid, IWICComponentInfo **ppIInfo) +{ + BitmapEncoderInfo *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapEncoderInfo)); + if (!This) + { + RegCloseKey(classkey); + return E_OUTOFMEMORY; + } + + This->lpIWICBitmapEncoderInfoVtbl = &BitmapEncoderInfo_Vtbl; + This->ref = 1; + This->classkey = classkey; + memcpy(&This->clsid, clsid, sizeof(CLSID)); + + *ppIInfo = (IWICComponentInfo*)This; + return S_OK; +} + +typedef struct { const IWICFormatConverterInfoVtbl *lpIWICFormatConverterInfoVtbl; LONG ref; HKEY classkey; @@ -662,6 +916,7 @@ struct category { static const struct category categories[] = { {WICDecoder, &CATID_WICBitmapDecoders, BitmapDecoderInfo_Constructor}, + {WICEncoder, &CATID_WICBitmapEncoders, BitmapEncoderInfo_Constructor}, {WICPixelFormatConverter, &CATID_WICFormatConverters, FormatConverterInfo_Constructor}, {0} };

1 0

Vincent Povirk : windowscodecs: Register builtin encoders.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: ad2895d10b62cf756a13ab4336d32c301c90c796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2895d10b62cf756a13ab433… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Sep 5 21:24:53 2010 -0500 windowscodecs: Register builtin encoders. --- dlls/windowscodecs/regsvr.c | 248 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 2 + 2 files changed, 250 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad2895d10b62cf756a13a…

1 0

Octavian Voicu : include: Fix typo in propkeydef.h.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: a161d5950421d869ec404e61c4c4855079661cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a161d5950421d869ec404e61c… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Fri Sep 3 20:44:28 2010 +0300 include: Fix typo in propkeydef.h. --- include/propkeydef.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/propkeydef.h b/include/propkeydef.h index b3a2559..2a796ea 100644 --- a/include/propkeydef.h +++ b/include/propkeydef.h @@ -60,7 +60,7 @@ #ifdef __cplusplus inline bool operator==(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) { - return IsEqualPropertyKey(guidOne, guidTwo); + return IsEqualPropertyKey(guidOne, guidOther); } inline bool operator!=(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) {

1 0

Henri Verbeet : wined3d: Fix a silly typo.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 6471004a8c10db36c7e33e8372e5cab0f22a1f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6471004a8c10db36c7e33e837… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 5 23:38:47 2010 +0200 wined3d: Fix a silly typo. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 158bdc2..dcd0b85 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2362,7 +2362,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) TRACE_(d3d_caps)(" IMPLIED: ARB_vertex_array_bgra support (by EXT_vertex_array_bgra).\n"); gl_info->supported[ARB_VERTEX_ARRAY_BGRA] = TRUE; } - if (!gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC && gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]]) + if (!gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] && gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { TRACE_(d3d_caps)(" IMPLIED: ARB_texture_compression_rgtc support (by EXT_texture_compression_rgtc).\n"); gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] = TRUE;

1 0

Henri Verbeet : d3d8: An invalid shader version isn't an internal error.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 95098f1b2a08ea7af895b77cea3cdcaf75869f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95098f1b2a08ea7af895b77ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 5 23:38:51 2010 +0200 d3d8: An invalid shader version isn't an internal error. --- dlls/d3d8/d3d8_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index c471049..6cefe57 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -98,7 +98,7 @@ HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD ret=S_OK; break; default: - ERR("vertexshader version mismatch\n"); + WARN("Invalid shader version token %#x.\n", *vertexshader); ret=E_FAIL; } @@ -136,7 +136,7 @@ HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bo ret=S_OK; break; default: - ERR("pixelshader version mismatch\n"); + WARN("Invalid shader version token %#x.\n", *pixelshader); ret=E_FAIL; } return ret;

1 0