September 2012 - Wine-commits

Qian Hong : gdi32: Fixed localized font style name.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 80dbd4e9cf561c6d21723ca25782b3c8f5326460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80dbd4e9cf561c6d21723ca25… Author: Qian Hong <fracting(a)gmail.com> Date: Tue Sep 11 01:05:57 2012 +0800 gdi32: Fixed localized font style name. --- dlls/gdi32/freetype.c | 26 ++++++++++++++++++++------ dlls/gdi32/tests/font.c | 7 ++++++- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 28ca616..efb12a4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1714,7 +1714,14 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; - face->StyleName = towstr( CP_ACP, ft_face->style_name ); + face->StyleName = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, GetSystemDefaultLangID() ); + if (!face->StyleName) + face->StyleName = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + if (!face->StyleName) + { + face->StyleName = towstr( CP_ACP, ft_face->style_name ); + } + face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); if (!face->FullName) face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); @@ -6549,11 +6556,18 @@ static BOOL get_outline_text_metrics(GdiFont *font) lenfam = (strlenW(font->name) + 1) * sizeof(WCHAR); family_nameW = strdupW(font->name); - lensty = MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, NULL, 0) - * sizeof(WCHAR); - style_nameW = HeapAlloc(GetProcessHeap(), 0, lensty); - MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, - style_nameW, lensty/sizeof(WCHAR)); + style_nameW = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, GetSystemDefaultLangID() ); + if (!style_nameW) + style_nameW = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + if (!style_nameW) + { + FIXME("failed to read sytle_nameW for font %s!\n", wine_dbgstr_w(font->name)); + lensty = MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, NULL, 0) * sizeof(WCHAR); + style_nameW = HeapAlloc(GetProcessHeap(), 0, lensty); + MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, style_nameW, lensty/sizeof(WCHAR)); + } + else + lensty = (strlenW(style_nameW) + 1) * sizeof(WCHAR); face_nameW = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); if (!face_nameW) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bbfa02b..07f8dcb 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4132,7 +4132,12 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, GetSystemDefaultLangID()); + if (!ret) + { + trace("no localized FONT_SUBFAMILY font.\n"); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + } ok(ret, "SUBFAMILY (style name) could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); ok(!lstrcmpA(StyleName, bufA), "style names don't match: returned %s, expect %s\n", StyleName, bufA);

1 0

Qian Hong : gdi32/tests: Added tests for symbol fonts.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 84954c0dbe636edb7be6b4e4da7f0648af16a48e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84954c0dbe636edb7be6b4e4d… Author: Qian Hong <fracting(a)gmail.com> Date: Tue Sep 11 01:06:19 2012 +0800 gdi32/tests: Added tests for symbol fonts. --- dlls/gdi32/tests/font.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 07f8dcb..ef4e51d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2777,6 +2777,7 @@ end: } #define TT_PLATFORM_MICROSOFT 3 +#define TT_MS_ID_SYMBOL_CS 0 #define TT_MS_ID_UNICODE_CS 1 #define TT_MS_LANGID_ENGLISH_UNITED_STATES 0x0409 #define TT_NAME_ID_FONT_FAMILY 1 @@ -2840,7 +2841,7 @@ static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_ for (i = 0; i < header->number_of_record; i++) { if (GET_BE_WORD(entry[i].platform_id) != TT_PLATFORM_MICROSOFT || - GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS || + (GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS && GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_SYMBOL_CS) || GET_BE_WORD(entry[i].language_id) != language_id || GET_BE_WORD(entry[i].name_id) != name_id) { @@ -4150,7 +4151,9 @@ static void test_fullname2_helper(const char *Family) ok(ret, "UNIQUE_ID (full name) could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; - ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + if (efnd.elf[i].elfLogFont.lfCharSet == SYMBOL_CHARSET) + todo_wine ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + else ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); SelectObject(hdc, of); DeleteObject(hfont); @@ -4165,6 +4168,8 @@ static void test_fullname2_helper(const char *Family) static void test_fullname2(void) { test_fullname2_helper("Lucida Sans"); + test_fullname2_helper("Webdings"); + test_fullname2_helper("Wingdings"); } static BOOL write_ttf_file(const char *fontname, char *tmp_name)

1 0

Qian Hong : gdi32: Fixed get_name_table_entry for symbol fonts.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: de5972081eb734366aa02d3685c27cfa13144b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5972081eb734366aa02d368… Author: Qian Hong <fracting(a)gmail.com> Date: Tue Sep 11 01:06:39 2012 +0800 gdi32: Fixed get_name_table_entry for symbol fonts. --- dlls/gdi32/freetype.c | 3 +-- dlls/gdi32/tests/font.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index efb12a4..9412df2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1146,7 +1146,7 @@ static BOOL get_name_table_entry(FT_Face ft_face, FT_SfntName *req) if(!pFT_Get_Sfnt_Name(ft_face, name_index, &name)) { if((name.platform_id == req->platform_id) && - (name.encoding_id == req->encoding_id) && + ((name.encoding_id == TT_MS_ID_UNICODE_CS) || (name.encoding_id == TT_MS_ID_SYMBOL_CS)) && (name.language_id == req->language_id) && (name.name_id == req->name_id)) { @@ -1168,7 +1168,6 @@ static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, FT_UShort langua FT_SfntName name; name.platform_id = TT_PLATFORM_MICROSOFT; - name.encoding_id = TT_MS_ID_UNICODE_CS; name.language_id = language_id; name.name_id = name_id; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ef4e51d..0c67fe7 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4151,9 +4151,7 @@ static void test_fullname2_helper(const char *Family) ok(ret, "UNIQUE_ID (full name) could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; - if (efnd.elf[i].elfLogFont.lfCharSet == SYMBOL_CHARSET) - todo_wine ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); - else ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); SelectObject(hdc, of); DeleteObject(hfont);

1 0

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_GetResource().
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: d2fdeaa4fef907dbc2d2134f90ab335363760fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fdeaa4fef907dbc2d2134f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 11 00:27:01 2012 +0200 d3d10core: Implement d3d10_depthstencil_view_GetResource(). --- dlls/d3d10core/d3d10core_private.h | 5 ++++- dlls/d3d10core/device.c | 3 +-- dlls/d3d10core/view.c | 14 ++++++++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 153c5cc..95d929a 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -128,9 +128,12 @@ struct d3d10_depthstencil_view { ID3D10DepthStencilView ID3D10DepthStencilView_iface; LONG refcount; + + ID3D10Resource *resource; }; -HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view) DECLSPEC_HIDDEN; +HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, + ID3D10Resource *resource) DECLSPEC_HIDDEN; /* ID3D10RenderTargetView */ struct d3d10_rendertarget_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 2d1db4e..6cd7737 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -804,8 +804,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic return E_OUTOFMEMORY; } - hr = d3d10_depthstencil_view_init(object); - if (FAILED(hr)) + if (FAILED(hr = d3d10_depthstencil_view_init(object, resource))) { WARN("Failed to initialize depthstencil view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index a542e63..792e79b 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -211,6 +211,7 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_Release(ID3D10DepthStenci if (!refcount) { + ID3D10Resource_Release(This->resource); HeapFree(GetProcessHeap(), 0, This); } @@ -255,7 +256,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateDataInterface static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetResource(ID3D10DepthStencilView *iface, ID3D10Resource **resource) { - FIXME("iface %p, resource %p stub!\n", iface, resource); + struct d3d10_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); + + TRACE("iface %p, resource %p.\n", iface, resource); + + *resource = view->resource; + ID3D10Resource_AddRef(*resource); } /* ID3D10DepthStencilView methods */ @@ -283,11 +289,15 @@ static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = d3d10_depthstencil_view_GetDesc, }; -HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view) +HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, + ID3D10Resource *resource) { view->ID3D10DepthStencilView_iface.lpVtbl = &d3d10_depthstencil_view_vtbl; view->refcount = 1; + view->resource = resource; + ID3D10Resource_AddRef(resource); + return S_OK; }

1 0

Henri Verbeet : wined3d: wined3d_device_set_render_state() never fails.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 75cec973d5ba6aa7d65b8dabb76617457af1d94b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cec973d5ba6aa7d65b8dabb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 11 00:27:02 2012 +0200 wined3d: wined3d_device_set_render_state() never fails. --- dlls/d3d8/device.c | 16 +++++----------- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 6 ++++-- dlls/wined3d/device.c | 6 ++---- include/wine/wined3d.h | 2 +- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5a029f2..2cf957e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -600,7 +600,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback))) { - hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); device->lost = FALSE; } else @@ -1453,7 +1453,6 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, D3DRENDERSTATETYPE state, DWORD value) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); @@ -1461,15 +1460,15 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, switch (state) { case D3DRS_ZBIAS: - hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); break; default: - hr = wined3d_device_set_render_state(device->wined3d_device, state, value); + wined3d_device_set_render_state(device->wined3d_device, state, value); } wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetRenderState(IDirect3DDevice8 *iface, @@ -3038,13 +3037,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } - hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_mutex_unlock(); - if (FAILED(hr)) - { - ERR("Failed to set minimum pointsize, hr %#x.\n", hr); - goto err; - } present_parameters_from_wined3d_swapchain_desc(parameters, &swapchain_desc); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2e33c9f..63a611d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1519,15 +1519,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi D3DRENDERSTATETYPE state, DWORD value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); wined3d_mutex_lock(); - hr = wined3d_device_set_render_state(device->wined3d_device, state, value); + wined3d_device_set_render_state(device->wined3d_device, state, value); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetRenderState(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7848b0d..a81fa31 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2627,7 +2627,8 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; case D3DRENDERSTATE_ZBIAS: - hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); + hr = D3D_OK; break; default: @@ -2639,7 +2640,8 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; } - hr = wined3d_device_set_render_state(device->wined3d_device, state, value); + wined3d_device_set_render_state(device->wined3d_device, state, value); + hr = D3D_OK; break; } wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e0849ce..3998408 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2317,7 +2317,7 @@ void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, stru *viewport = device->stateBlock->state.viewport; } -HRESULT CDECL wined3d_device_set_render_state(struct wined3d_device *device, +void CDECL wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value) { DWORD old_value = device->stateBlock->state.render_states[state]; @@ -2331,7 +2331,7 @@ HRESULT CDECL wined3d_device_set_render_state(struct wined3d_device *device, if (device->isRecordingState) { TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } /* Compared here and not before the assignment to allow proper stateblock recording. */ @@ -2339,8 +2339,6 @@ HRESULT CDECL wined3d_device_set_render_state(struct wined3d_device *device, TRACE("Application is setting the old value over, nothing to do.\n"); else device_invalidate_state(device, STATE_RENDER(state)); - - return WINED3D_OK; } HRESULT CDECL wined3d_device_get_render_state(const struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1fa1342..d2a2811 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2220,7 +2220,7 @@ HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device, UINT start_register, const float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device, UINT start_register, const int *constants, UINT vector4i_count); -HRESULT __cdecl wined3d_device_set_render_state(struct wined3d_device *device, +void __cdecl wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value); HRESULT __cdecl wined3d_device_set_render_target(struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface *render_target, BOOL set_viewport);

1 0

Henri Verbeet : wined3d: wined3d_device_get_render_state() never fails.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: d601a0dede8be827bc41d167ae8e360818da9ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d601a0dede8be827bc41d167a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 11 00:27:03 2012 +0200 wined3d: wined3d_device_get_render_state() never fails. --- dlls/d3d8/device.c | 7 +++---- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 6 ++++-- dlls/ddraw/vertexbuffer.c | 2 +- dlls/wined3d/device.c | 9 +++------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 +-- 7 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2cf957e..25f7534 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1475,7 +1475,6 @@ static HRESULT WINAPI d3d8_device_GetRenderState(IDirect3DDevice8 *iface, D3DRENDERSTATETYPE state, DWORD *value) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, state %#x, value %p.\n", iface, state, value); @@ -1483,15 +1482,15 @@ static HRESULT WINAPI d3d8_device_GetRenderState(IDirect3DDevice8 *iface, switch (state) { case D3DRS_ZBIAS: - hr = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); + *value = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS); break; default: - hr = wined3d_device_get_render_state(device->wined3d_device, state, value); + *value = wined3d_device_get_render_state(device->wined3d_device, state); } wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_BeginStateBlock(IDirect3DDevice8 *iface) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 63a611d..e10b698 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1533,15 +1533,14 @@ static HRESULT WINAPI d3d9_device_GetRenderState(IDirect3DDevice9Ex *iface, D3DRENDERSTATETYPE state, DWORD *value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, state %#x, value %p.\n", iface, state, value); wined3d_mutex_lock(); - hr = wined3d_device_get_render_state(device->wined3d_device, state, value); + *value = wined3d_device_get_render_state(device->wined3d_device, state); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a81fa31..f51222b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2331,7 +2331,8 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, break; case D3DRENDERSTATE_ZBIAS: - hr = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); + *value = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS); + hr = D3D_OK; break; default: @@ -2342,7 +2343,8 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, hr = E_NOTIMPL; break; } - hr = wined3d_device_get_render_state(device->wined3d_device, state, value); + *value = wined3d_device_get_render_state(device->wined3d_device, state); + hr = D3D_OK; } wined3d_mutex_unlock(); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 29feb87..39a977f 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -339,7 +339,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 * the vertex ops */ doClip = !!(vertex_op & D3DVOP_CLIP); - wined3d_device_get_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING, (DWORD *)&oldClip); + oldClip = wined3d_device_get_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING); if (doClip != oldClip) wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING, doClip); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3998408..2cf3028 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2341,14 +2341,11 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, device_invalidate_state(device, STATE_RENDER(state)); } -HRESULT CDECL wined3d_device_get_render_state(const struct wined3d_device *device, - enum wined3d_render_state state, DWORD *value) +DWORD CDECL wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state) { - TRACE("device %p, state %s (%#x), value %p.\n", device, debug_d3drenderstate(state), state, value); + TRACE("device %p, state %s (%#x).\n", device, debug_d3drenderstate(state), state); - *value = device->stateBlock->state.render_states[state]; - - return WINED3D_OK; + return device->stateBlock->state.render_states[state]; } HRESULT CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c211e4a..7aea714 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -75,7 +75,7 @@ @ cdecl wined3d_device_get_ps_consts_f(ptr long ptr long) @ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) -@ cdecl wined3d_device_get_render_state(ptr long ptr) +@ cdecl wined3d_device_get_render_state(ptr long) @ cdecl wined3d_device_get_render_target(ptr long ptr) @ cdecl wined3d_device_get_sampler_state(ptr long long ptr) @ cdecl wined3d_device_get_scissor_rect(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d2a2811..d581097 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2142,8 +2142,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *devi UINT start_register, int *constants, UINT vector4i_count); HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_raster_status *raster_status); -HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, - enum wined3d_render_state state, DWORD *value); +DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state); HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target); HRESULT __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device,

1 0

Vincent Povirk : windowscodecs: Only copy the palette to new bitmaps if they might be indexed.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 4038cb79b4aedad38816fcfbee83920cc2bd5259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4038cb79b4aedad38816fcfbe… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 10 15:23:43 2012 -0500 windowscodecs: Only copy the palette to new bitmaps if they might be indexed. --- dlls/windowscodecs/imgfactory.c | 23 +++++++++++++++- dlls/windowscodecs/tests/bitmap.c | 53 ++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 01ce034..8ba0a1d 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -474,6 +474,9 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto HRESULT hr; WICRect rc; double dpix, dpiy; + IWICComponentInfo *info; + IWICPixelFormatInfo2 *formatinfo; + WICPixelFormatNumericRepresentation format_type; TRACE("(%p,%p,%u,%p)\n", iface, piBitmapSource, option, ppIBitmap); @@ -486,6 +489,23 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto hr = IWICBitmapSource_GetPixelFormat(piBitmapSource, &pixelformat); if (SUCCEEDED(hr)) + hr = CreateComponentInfo(&pixelformat, &info); + + if (SUCCEEDED(hr)) + { + hr = IWICComponentInfo_QueryInterface(info, &IID_IWICPixelFormatInfo2, (void**)&formatinfo); + + if (SUCCEEDED(hr)) + { + hr = IWICPixelFormatInfo2_GetNumericRepresentation(formatinfo, &format_type); + + IWICPixelFormatInfo2_Release(formatinfo); + } + + IWICComponentInfo_Release(info); + } + + if (SUCCEEDED(hr)) hr = BitmapImpl_Create(width, height, &pixelformat, option, &result); if (SUCCEEDED(hr)) @@ -514,7 +534,8 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto if (SUCCEEDED(hr)) hr = PaletteImpl_Create(&palette); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr) && (format_type == WICPixelFormatNumericRepresentationUnspecified || + format_type == WICPixelFormatNumericRepresentationIndexed)) { hr = IWICBitmapSource_CopyPalette(piBitmapSource, palette); diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 91376ac..c2ce1aa 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -283,6 +283,8 @@ static void test_createbitmapfromsource(void) WICPixelFormatGUID pixelformat = {0}; UINT width=0, height=0; double dpix=10.0, dpiy=10.0; + UINT count; + WICBitmapPaletteType palette_type; hr = IWICImagingFactory_CreateBitmap(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, WICBitmapCacheOnLoad, &bitmap); @@ -340,7 +342,7 @@ static void test_createbitmapfromsource(void) /* palette isn't copied for non-indexed formats? */ hr = IWICBitmap_CopyPalette(bitmap2, palette); - todo_wine ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); IWICPalette_Release(palette); @@ -365,6 +367,55 @@ static void test_createbitmapfromsource(void) ok(height == 3, "got %d, expected 3\n", height); IWICBitmap_Release(bitmap2); + + /* Ensure palette is copied for indexed formats */ + hr = IWICImagingFactory_CreateBitmap(factory, 3, 3, &GUID_WICPixelFormat4bppIndexed, + WICBitmapCacheOnLoad, &bitmap); + ok(hr == S_OK, "IWICImagingFactory_CreateBitmap failed hr=%x\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "IWICImagingFactory_CreatePalette failed hr=%x\n", hr); + + hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray256, FALSE); + ok(hr == S_OK, "IWICPalette_InitializePredefined failed hr=%x\n", hr); + + hr = IWICBitmap_SetPalette(bitmap, palette); + ok(hr == S_OK, "IWICBitmap_SetPalette failed hr=%x\n", hr); + + IWICPalette_Release(palette); + + hr = IWICImagingFactory_CreateBitmapFromSource(factory, (IWICBitmapSource*)bitmap, + WICBitmapCacheOnLoad, &bitmap2); + ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromSource failed hr=%x\n", hr); + + IWICBitmap_Release(bitmap); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "IWICImagingFactory_CreatePalette failed hr=%x\n", hr); + + hr = IWICBitmap_CopyPalette(bitmap2, palette); + ok(hr == S_OK, "IWICBitmap_CopyPalette failed hr=%x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "IWICPalette_GetColorCount failed hr=%x\n", hr); + ok(count == 256, "unexpected count %d\n", count); + + hr = IWICPalette_GetType(palette, &palette_type); + ok(hr == S_OK, "IWICPalette_GetType failed hr=%x\n", hr); + ok(palette_type == WICBitmapPaletteTypeFixedGray256, "unexpected palette type %d\n", palette_type); + + IWICPalette_Release(palette); + + hr = IWICBitmap_GetPixelFormat(bitmap2, &pixelformat); + ok(hr == S_OK, "IWICBitmap_GetPixelFormat failed hr=%x\n", hr); + ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed), "unexpected pixel format\n"); + + hr = IWICBitmap_GetSize(bitmap2, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize failed hr=%x\n", hr); + ok(width == 3, "got %d, expected 3\n", width); + ok(height == 3, "got %d, expected 3\n", height); + + IWICBitmap_Release(bitmap2); } START_TEST(bitmap)

1 0

Vincent Povirk : windowscodecs: Implement PNG tEXt metadata reader.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 1a032a94df301286a6c13ee3b2654e7ba1cbc893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a032a94df301286a6c13ee3b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 10 17:01:15 2012 -0500 windowscodecs: Implement PNG tEXt metadata reader. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/metadatahandler.c | 7 ++- dlls/windowscodecs/pngformat.c | 112 +++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 25 ++++++ dlls/windowscodecs/tests/metadata.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 4 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 ++ 7 files changed, 156 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 40d1547..91c75b7 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -61,6 +61,7 @@ static const classinfo wic_classes[] = { {&CLSID_WineTgaDecoder, TgaDecoder_CreateInstance}, {&CLSID_WICUnknownMetadataReader, UnknownMetadataReader_CreateInstance}, {&CLSID_WICIfdMetadataReader, IfdMetadataReader_CreateInstance}, + {&CLSID_WICPngTextMetadataReader, PngTextReader_CreateInstance}, {0}}; typedef struct { diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 084facf..5e50cb9 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -255,6 +255,11 @@ static int propvar_cmp(const PROPVARIANT *v1, const PROPVARIANT *v2) { LONGLONG value1, value2; + if (v1->vt == VT_LPSTR && v2->vt == VT_LPSTR) + { + return lstrcmpA(v1->u.pszVal, v2->u.pszVal); + } + if (!get_int_value(v1, &value1)) return -1; if (!get_int_value(v2, &value2)) return -1; @@ -446,7 +451,7 @@ static const IWICPersistStreamVtbl MetadataHandler_PersistStream_Vtbl = { MetadataHandler_SaveEx }; -static HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) +HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) { MetadataHandler *This; HRESULT hr; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 683da2d..3eae4b7 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -40,6 +40,118 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size) +{ + BYTE header[8]; + HRESULT hr; + ULONG bytesread; + + hr = IStream_Read(stream, header, 8, &bytesread); + if (FAILED(hr) || bytesread < 8) + { + if (SUCCEEDED(hr)) + hr = E_FAIL; + return hr; + } + + *data_size = header[0] << 24 | header[1] << 16 | header[2] << 8 | header[3]; + + memcpy(type, &header[4], 4); + + if (data) + { + *data = HeapAlloc(GetProcessHeap(), 0, *data_size); + if (!*data) + return E_OUTOFMEMORY; + + hr = IStream_Read(stream, *data, *data_size, &bytesread); + + if (FAILED(hr) || bytesread < *data_size) + { + if (SUCCEEDED(hr)) + hr = E_FAIL; + HeapFree(GetProcessHeap(), 0, *data); + *data = NULL; + return hr; + } + + /* FIXME: Verify the CRC? */ + } + + return S_OK; +} + +static HRESULT LoadTextMetadata(IStream *stream, const GUID *preferred_vendor, + DWORD persist_options, MetadataItem **items, DWORD *item_count) +{ + HRESULT hr; + BYTE type[4]; + BYTE *data; + ULONG data_size; + ULONG name_len, value_len; + BYTE *name_end_ptr; + LPSTR name, value; + MetadataItem *result; + + hr = read_png_chunk(stream, type, &data, &data_size); + if (FAILED(hr)) return hr; + + name_end_ptr = memchr(data, 0, data_size); + + name_len = name_end_ptr - data; + + if (!name_end_ptr || name_len > 79) + { + HeapFree(GetProcessHeap(), 0, data); + return E_FAIL; + } + + value_len = data_size - name_len - 1; + + result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem)); + name = HeapAlloc(GetProcessHeap(), 0, name_len + 1); + value = HeapAlloc(GetProcessHeap(), 0, value_len + 1); + if (!result || !name || !value) + { + HeapFree(GetProcessHeap(), 0, data); + HeapFree(GetProcessHeap(), 0, result); + HeapFree(GetProcessHeap(), 0, name); + HeapFree(GetProcessHeap(), 0, value); + return E_OUTOFMEMORY; + } + + PropVariantInit(&result[0].schema); + PropVariantInit(&result[0].id); + PropVariantInit(&result[0].value); + + memcpy(name, data, name_len + 1); + memcpy(value, name_end_ptr + 1, value_len); + value[value_len] = 0; + + result[0].id.vt = VT_LPSTR; + result[0].id.pszVal = name; + result[0].value.vt = VT_LPSTR; + result[0].value.pszVal = value; + + *items = result; + *item_count = 1; + + HeapFree(GetProcessHeap(), 0, data); + + return S_OK; +} + +static const MetadataHandlerVtbl TextReader_Vtbl = { + 0, + &CLSID_WICPngTextMetadataReader, + LoadTextMetadata +}; + +HRESULT PngTextReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + return MetadataReader_Create(&TextReader_Vtbl, pUnkOuter, iid, ppv); +} + #ifdef SONAME_LIBPNG static void *libpng_handle; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index a422747..cb11430 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1503,6 +1503,21 @@ static const struct reader_containers ifd_containers[] = { { NULL } /* list terminator */ }; +static const BYTE tEXt[] = "tEXt"; + +static const struct metadata_pattern pngtext_metadata_pattern[] = { + { 4, 4, tEXt, mask_all, 4 }, + { 0 } +}; + +static const struct reader_containers pngtext_containers[] = { + { + &GUID_ContainerFormatPng, + pngtext_metadata_pattern + }, + { NULL } /* list terminator */ +}; + static struct regsvr_metadatareader const metadatareader_list[] = { { &CLSID_WICUnknownMetadataReader, "The Wine Project", @@ -1525,6 +1540,16 @@ static struct regsvr_metadatareader const metadatareader_list[] = { 1, 1, 0, ifd_containers }, + { &CLSID_WICPngTextMetadataReader, + "The Wine Project", + "Unknown Metadata Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatChunktEXt, + 0, 0, 0, + pngtext_containers + }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 4bb33ae..229753c 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -303,7 +303,7 @@ static void test_metadata_tEXt(void) hr = CoCreateInstance(&CLSID_WICPngTextMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void**)&reader); - todo_wine ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); if (FAILED(hr)) return; hr = IWICMetadataReader_GetCount(reader, NULL); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 0bee818..37f9c90 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -90,7 +90,11 @@ typedef struct _MetadataHandlerVtbl ULARGE_INTEGER *size); } MetadataHandlerVtbl; +extern HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; + extern HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT IfdMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT PngTextReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; + #endif /* WINCODECS_PRIVATE_H */ diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index bc4c994..6d5bd2d 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -135,3 +135,10 @@ coclass WICUnknownMetadataReader { interface IWICMetadataReader; } uuid(8f914656-9d0a-4eb2-9019-0bf96d8a9ee6) ] coclass WICIfdMetadataReader { interface IWICIfdMetadataReader; } + +[ + helpstring("WIC Png tEXt Metadata Reader"), + threading(both), + uuid(4b59afcc-b8c3-408a-b670-89e5fab6fda7) +] +coclass WICPngTextMetadataReader { interface IWICMetadataReader; }

1 0

Dmitry Timoshkov : windowscodecs: Correct name of the PNG text metadata reader.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: d96e32c8a3f52f3c12ec367f3ffd42ca76876a87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d96e32c8a3f52f3c12ec367f3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 11 16:47:52 2012 +0900 windowscodecs: Correct name of the PNG text metadata reader. --- dlls/windowscodecs/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index cb11430..3fa2df3 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1542,7 +1542,7 @@ static struct regsvr_metadatareader const metadatareader_list[] = { }, { &CLSID_WICPngTextMetadataReader, "The Wine Project", - "Unknown Metadata Reader", + "Chunk tEXt Reader", "1.0.0.0", "1.0.0.0", &GUID_VendorMicrosoft,

1 0

Dmitry Timoshkov : windowscodecs: Implement Logical Screen Descriptor metadata reader.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 500ab2b5c7d17d8ba42cc90ecb9fc2455e603af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500ab2b5c7d17d8ba42cc90ec… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 11 16:48:37 2012 +0900 windowscodecs: Implement Logical Screen Descriptor metadata reader. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/gifformat.c | 111 +++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 27 ++++++- dlls/windowscodecs/tests/metadata.c | 1 - dlls/windowscodecs/wincodecs_private.h | 2 +- dlls/windowscodecs/windowscodecs_wincodec.idl | 7 ++ 6 files changed, 145 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 91c75b7..3f1328c 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -62,6 +62,7 @@ static const classinfo wic_classes[] = { {&CLSID_WICUnknownMetadataReader, UnknownMetadataReader_CreateInstance}, {&CLSID_WICIfdMetadataReader, IfdMetadataReader_CreateInstance}, {&CLSID_WICPngTextMetadataReader, PngTextReader_CreateInstance}, + {&CLSID_WICLSDMetadataReader, LSDReader_CreateInstance}, {0}}; typedef struct { diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 17de9aa..c4ee566 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -21,11 +21,13 @@ #include <stdarg.h> #define COBJMACROS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "objbase.h" #include "wincodec.h" +#include "wincodecsdk.h" #include "ungif.h" @@ -35,6 +37,115 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +static LPWSTR strdupAtoW(const char *src) +{ + int len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); + LPWSTR dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (dst) MultiByteToWideChar(CP_ACP, 0, src, -1, dst, len); + return dst; +} + +static HRESULT load_LSD_metadata(IStream *stream, const GUID *vendor, DWORD options, + MetadataItem **items, DWORD *count) +{ + struct logical_screen_descriptor + { + char signature[6]; + USHORT width; + USHORT height; + BYTE packed; + /* global_color_table_flag : 1; + * color_resolution : 3; + * sort_flag : 1; + * global_color_table_size : 3; + */ + BYTE background_color_index; + BYTE pixel_aspect_ratio; + } lsd_data; + HRESULT hr; + ULONG bytesread, i; + MetadataItem *result; + + *items = NULL; + *count = 0; + + hr = IStream_Read(stream, &lsd_data, sizeof(lsd_data), &bytesread); + if (FAILED(hr) || bytesread != sizeof(lsd_data)) return S_OK; + + result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem) * 9); + if (!result) return E_OUTOFMEMORY; + + for (i = 0; i < 9; i++) + { + PropVariantInit(&result[i].schema); + PropVariantInit(&result[i].id); + PropVariantInit(&result[i].value); + } + + result[0].id.vt = VT_LPWSTR; + result[0].id.u.pwszVal = strdupAtoW("Signature"); + result[0].value.vt = VT_UI1|VT_VECTOR; + result[0].value.u.caub.cElems = 6; + result[0].value.u.caub.pElems = HeapAlloc(GetProcessHeap(), 0, sizeof(lsd_data.signature)); + memcpy(result[0].value.u.caub.pElems, lsd_data.signature, sizeof(lsd_data.signature)); + + result[1].id.vt = VT_LPWSTR; + result[1].id.u.pwszVal = strdupAtoW("Width"); + result[1].value.vt = VT_UI2; + result[1].value.u.uiVal = lsd_data.width; + + result[2].id.vt = VT_LPWSTR; + result[2].id.u.pwszVal = strdupAtoW("Height"); + result[2].value.vt = VT_UI2; + result[2].value.u.uiVal = lsd_data.height; + + result[3].id.vt = VT_LPWSTR; + result[3].id.u.pwszVal = strdupAtoW("GlobalColorTableFlag"); + result[3].value.vt = VT_BOOL; + result[3].value.u.boolVal = (lsd_data.packed >> 7) & 1; + + result[4].id.vt = VT_LPWSTR; + result[4].id.u.pwszVal = strdupAtoW("ColorResolution"); + result[4].value.vt = VT_UI1; + result[4].value.u.bVal = (lsd_data.packed >> 6) & 7; + + result[5].id.vt = VT_LPWSTR; + result[5].id.u.pwszVal = strdupAtoW("SortFlag"); + result[5].value.vt = VT_BOOL; + result[5].value.u.boolVal = (lsd_data.packed >> 3) & 1; + + result[6].id.vt = VT_LPWSTR; + result[6].id.u.pwszVal = strdupAtoW("GlobalColorTableSize"); + result[6].value.vt = VT_UI1; + result[6].value.u.bVal = lsd_data.packed & 7; + + result[7].id.vt = VT_LPWSTR; + result[7].id.u.pwszVal = strdupAtoW("BackgroundColorIndex"); + result[7].value.vt = VT_UI1; + result[7].value.u.bVal = lsd_data.background_color_index; + + result[8].id.vt = VT_LPWSTR; + result[8].id.u.pwszVal = strdupAtoW("PixelAspectRatio"); + result[8].value.vt = VT_UI1; + result[8].value.u.bVal = lsd_data.pixel_aspect_ratio; + + *items = result; + *count = 9; + + return S_OK; +} + +static const MetadataHandlerVtbl LSDReader_Vtbl = { + 0, + &CLSID_WICLSDMetadataReader, + load_LSD_metadata +}; + +HRESULT LSDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) +{ + return MetadataReader_Create(&LSDReader_Vtbl, pUnkOuter, iid, ppv); +} + typedef struct { IWICBitmapDecoder IWICBitmapDecoder_iface; LONG ref; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 3fa2df3..cb48d63 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1518,6 +1518,20 @@ static const struct reader_containers pngtext_containers[] = { { NULL } /* list terminator */ }; +static const struct metadata_pattern lsd_metadata_patterns[] = { + { 0, 6, gif87a_magic, mask_all, 0 }, + { 0, 6, gif89a_magic, mask_all, 0 }, + { 0 } +}; + +static const struct reader_containers lsd_containers[] = { + { + &GUID_ContainerFormatGif, + lsd_metadata_patterns + }, + { NULL } /* list terminator */ +}; + static struct regsvr_metadatareader const metadatareader_list[] = { { &CLSID_WICUnknownMetadataReader, "The Wine Project", @@ -1529,8 +1543,7 @@ static struct regsvr_metadatareader const metadatareader_list[] = { 0, 0, 0, NULL }, - { - &CLSID_WICIfdMetadataReader, + { &CLSID_WICIfdMetadataReader, "The Wine Project", "Ifd Reader", "1.0.0.0", @@ -1550,6 +1563,16 @@ static struct regsvr_metadatareader const metadatareader_list[] = { 0, 0, 0, pngtext_containers }, + { &CLSID_WICLSDMetadataReader, + "The Wine Project", + "Logical Screen Descriptor Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatLSD, + 0, 0, 0, + lsd_containers + }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 229753c..fd81e6f 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1287,7 +1287,6 @@ static void test_metadata_LSD(void) hr = CoCreateInstance(&CLSID_WICLSDMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void **)&reader); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE || hr == REGDB_E_CLASSNOTREG) /* before Win7 */, "CoCreateInstance error %#x\n", hr); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 37f9c90..908b2e6 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -94,7 +94,7 @@ extern HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown extern HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT IfdMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; - extern HRESULT PngTextReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT LSDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; #endif /* WINCODECS_PRIVATE_H */ diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 6d5bd2d..d360ae5 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -142,3 +142,10 @@ coclass WICIfdMetadataReader { interface IWICIfdMetadataReader; } uuid(4b59afcc-b8c3-408a-b670-89e5fab6fda7) ] coclass WICPngTextMetadataReader { interface IWICMetadataReader; } + +[ + helpstring("WIC LSD Metadata Reader"), + threading(both), + uuid(41070793-59e4-479a-a1f7-954adc2ef5fc) +] +coclass WICLSDMetadataReader { interface IWICMetadataReader; }

1 0