February 2015 - Wine-Commits

Matteo Bruni : wined3d: Set the surface pitch for user-memory surfaces.
by Alexandre Julliard Feb. 19, 2015

Feb. 19, 2015

Module: wine Branch: master Commit: d56c168da12d890b0ed3c2f22c4554d3d1140252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56c168da12d890b0ed3c2f22… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 14:20:47 2015 +0100 wined3d: Set the surface pitch for user-memory surfaces. --- dlls/wined3d/surface.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 096579f..429147e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2187,10 +2187,16 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, surface->resource.multisample_type = texture_resource->multisample_type; surface->resource.multisample_quality = texture_resource->multisample_quality; if (surface->pitch) + { surface->resource.size = height * surface->pitch; + } else + { + /* User memory surfaces don't have the regular surface alignment. */ surface->resource.size = wined3d_format_calculate_size(texture_resource->format, - texture_resource->device->surface_alignment, width, height, 1); + 1, width, height, 1); + surface->pitch = wined3d_format_calculate_pitch(texture_resource->format, width); + } /* The format might be changed to a format that needs conversion. * If the surface didn't use PBOs previously but could now, don't

1 0

Matteo Bruni : d3d9/tests: Allow more alternative results in the ATI1N test.
by Alexandre Julliard Feb. 19, 2015

Feb. 19, 2015

Module: wine Branch: master Commit: 2aed2c3a15ab6ccb14612661f462827338ce3926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aed2c3a15ab6ccb14612661f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 14:20:45 2015 +0100 d3d9/tests: Allow more alternative results in the ATI1N test. --- dlls/d3d9/tests/visual.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a8cf55f..5f64ec3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16728,15 +16728,17 @@ static void test_3dc_formats(void) static const struct { struct vec2 position; - D3DCOLOR amd; - D3DCOLOR nvidia; + D3DCOLOR amd_r500; + D3DCOLOR amd_r600; + D3DCOLOR nvidia_old; + D3DCOLOR nvidia_new; } expected_colors[] = { - {{ 80, 240}, 0x003f3f3f, 0x007f0000}, - {{240, 240}, 0x003f3f3f, 0x007f0000}, - {{400, 240}, 0x00007fff, 0x00007fff}, - {{560, 240}, 0x007f00ff, 0x007f00ff}, + {{ 80, 240}, 0x007fffff, 0x003f3f3f, 0x007f7f7f, 0x007f0000}, + {{240, 240}, 0x007fffff, 0x003f3f3f, 0x007f7f7f, 0x007f0000}, + {{400, 240}, 0x00007fff, 0x00007fff, 0x00007fff, 0x00007fff}, + {{560, 240}, 0x007f00ff, 0x007f00ff, 0x007f00ff, 0x007f00ff}, }; IDirect3D9 *d3d; IDirect3DDevice9 *device; @@ -16835,9 +16837,11 @@ static void test_3dc_formats(void) for (i = 0; i < 4; ++i) { color = getPixelColor(device, expected_colors[i].position.x, expected_colors[i].position.y); - ok (color_match(color, expected_colors[i].amd, 1) || color_match(color, expected_colors[i].nvidia, 1), - "Expected color 0x%08x or 0x%08x, got 0x%08x, case %u.\n", - expected_colors[i].amd, expected_colors[i].nvidia, color, i); + ok (color_match(color, expected_colors[i].amd_r500, 1) + || color_match(color, expected_colors[i].amd_r600, 1) + || color_match(color, expected_colors[i].nvidia_old, 1) + || color_match(color, expected_colors[i].nvidia_new, 1), + "Got unexpected color 0x%08x, case %u.\n", color, i); } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Nikolay Sivov : dwrite: Set facename field of a LOGFONT in ConvertFontFaceToLOGFONT().
by Alexandre Julliard Feb. 19, 2015

Feb. 19, 2015

Module: wine Branch: master Commit: 5a318c3e8badda11b2a00884e6de2c0367616525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a318c3e8badda11b2a00884e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 19 11:43:15 2015 +0300 dwrite: Set facename field of a LOGFONT in ConvertFontFaceToLOGFONT(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 59 ++++++++++-------------------------------- dlls/dwrite/gdiinterop.c | 61 +++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 1 - 4 files changed, 75 insertions(+), 47 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 674e9f0..9a27a5e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -121,6 +121,7 @@ extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; extern BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE) DECLSPEC_HIDDEN; +extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 527fa5d..2092576 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -773,45 +773,22 @@ static const IDWriteFontFace2Vtbl dwritefontfacevtbl = { dwritefontface2_GetRecommendedRenderingMode }; -HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) +HRESULT get_family_names_from_stream(IDWriteFontFileStream *stream, UINT32 index, DWRITE_FONT_FACE_TYPE facetype, + IDWriteLocalizedStrings **names) { - DWRITE_FONT_SIMULATIONS simulations; - DWRITE_FONT_FACE_TYPE face_type; - IDWriteFontFileStream *stream; - DWRITE_FONT_STRETCH stretch; - DWRITE_FONT_STYLE style; - DWRITE_FONT_WEIGHT weight; - IDWriteFontFile *file = NULL; - UINT32 index; - HRESULT hr; - - memset(logfont, 0, sizeof(*logfont)); - - index = 1; - hr = IDWriteFontFace_GetFiles(face, &index, &file); - if (FAILED(hr) || !file) - return hr; + const void *name_table = NULL; + void *name_context; + HRESULT hr = S_OK; - hr = get_filestream_from_file(file, &stream); - if (FAILED(hr)) { - IDWriteFontFile_Release(file); - return hr; + opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); + if (name_table) { + hr = opentype_get_font_strings_from_id(name_table, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, names); + IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); } + else + names = NULL; - index = IDWriteFontFace_GetIndex(face); - face_type = IDWriteFontFace_GetType(face); - opentype_get_font_properties(stream, face_type, index, &stretch, &weight, &style); - IDWriteFontFileStream_Release(stream); - - simulations = IDWriteFontFace_GetSimulations(face); - - logfont->lfCharSet = DEFAULT_CHARSET; - logfont->lfWeight = weight; - logfont->lfItalic = style == DWRITE_FONT_STYLE_ITALIC || (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE); - logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; - /* TODO: set facename */ - - return S_OK; + return hr; } static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 **fontface) @@ -1730,8 +1707,6 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat for (i = 0; i < face_count; i++) { IDWriteLocalizedStrings *family_name = NULL; struct dwrite_font_data *font_data; - const void *name_table; - void *name_context; IDWriteFontFileStream *stream; WCHAR buffer[255]; UINT32 index; @@ -1742,15 +1717,9 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat break; /* get family name from font file */ - name_table = NULL; - opentype_get_font_table(stream, face_type, i, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); - if (name_table) { - hr = opentype_get_font_strings_from_id(name_table, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &family_name); - IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); - } + hr = get_family_names_from_stream(stream, i, face_type, &family_name); IDWriteFontFileStream_Release(stream); - - if (FAILED(hr) || !family_name) { + if (FAILED(hr)) { WARN("unable to get family name from font\n"); release_font_data(font_data); continue; diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index bead01d..8f91ded 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -406,9 +406,68 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *iface, IDWriteFontFace *fontface, LOGFONTW *logfont) { + static const WCHAR enusW[] = {'e','n','-','u','s',0}; struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); + IDWriteLocalizedStrings *familynames; + DWRITE_FONT_SIMULATIONS simulations; + DWRITE_FONT_FACE_TYPE face_type; + IDWriteFontFileStream *stream; + DWRITE_FONT_STRETCH stretch; + DWRITE_FONT_STYLE style; + DWRITE_FONT_WEIGHT weight; + IDWriteFontFile *file = NULL; + UINT32 index; + BOOL exists; + HRESULT hr; + TRACE("(%p)->(%p %p)\n", This, fontface, logfont); - return convert_fontface_to_logfont(fontface, logfont); + + memset(logfont, 0, sizeof(*logfont)); + + index = 1; + hr = IDWriteFontFace_GetFiles(fontface, &index, &file); + if (FAILED(hr) || !file) + return hr; + + hr = get_filestream_from_file(file, &stream); + if (FAILED(hr)) { + IDWriteFontFile_Release(file); + return hr; + } + + index = IDWriteFontFace_GetIndex(fontface); + face_type = IDWriteFontFace_GetType(fontface); + opentype_get_font_properties(stream, face_type, index, &stretch, &weight, &style); + hr = get_family_names_from_stream(stream, index, face_type, &familynames); + IDWriteFontFile_Release(file); + IDWriteFontFileStream_Release(stream); + if (FAILED(hr)) + return hr; + + simulations = IDWriteFontFace_GetSimulations(fontface); + + logfont->lfCharSet = DEFAULT_CHARSET; + logfont->lfWeight = weight; + logfont->lfItalic = style == DWRITE_FONT_STYLE_ITALIC || (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE); + logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; + logfont->lfFaceName[0] = 0; + + exists = FALSE; + hr = IDWriteLocalizedStrings_FindLocaleName(familynames, enusW, &index, &exists); + if (FAILED(hr) || !exists) { + /* fallback to 0 index */ + if (IDWriteLocalizedStrings_GetCount(familynames) > 0) + index = 0; + else { + IDWriteLocalizedStrings_Release(familynames); + return E_FAIL; + } + } + + hr = IDWriteLocalizedStrings_GetString(familynames, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR)); + IDWriteLocalizedStrings_Release(familynames); + + return hr; } static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e00e788..d171411 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1467,7 +1467,6 @@ if (0) /* crashes on native */ ok(logfont.lfItalic == 1, "got %d\n", logfont.lfItalic); ok(logfont.lfUnderline == 0, "got %d\n", logfont.lfUnderline); ok(logfont.lfStrikeOut == 0, "got %d\n", logfont.lfStrikeOut); -todo_wine ok(!lstrcmpW(logfont.lfFaceName, tahomaW), "got %s\n", wine_dbgstr_w(logfont.lfFaceName)); IDWriteGdiInterop_Release(interop);

1 0

Jacek Caban : mshtml: Use constant instead of define for REDIRECT_* flags.
by Alexandre Julliard Feb. 19, 2015

Feb. 19, 2015

Module: wine Branch: master Commit: 1f310395eb699df247c006143da2f25700ed6eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f310395eb699df247c006143… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 18 18:00:26 2015 +0100 mshtml: Use constant instead of define for REDIRECT_* flags. --- dlls/mshtml/nsiface.idl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 9ba7c05..d7ced56 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -711,9 +711,9 @@ interface nsIAsyncVerifyRedirectCallback : nsISupports ] interface nsIChannelEventSink : nsISupports { - cpp_quote("#define REDIRECT_TEMPORARY 1") - cpp_quote("#define REDIRECT_PERMANENT 2") - cpp_quote("#define REDIRECT_INTERNAL 4") + const UINT REDIRECT_TEMPORARY = 1; + const UINT REDIRECT_PERMANENT = 2; + const UINT REDIRECT_INTERNAL = 4; nsresult AsyncOnChannelRedirect(nsIChannel *oldChannel, nsIChannel *newChannel, uint32_t flags, nsIAsyncVerifyRedirectCallback *callback);

1 0

Matteo Bruni : wined3d: Reject unsupported pitches in wined3d_surface_update_desc().
by Alexandre Julliard Feb. 19, 2015

Feb. 19, 2015

Module: wine Branch: master Commit: b47695bf3abd188a9e4185c43df3c80ea92bd74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47695bf3abd188a9e4185c43… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 19:21:00 2015 +0100 wined3d: Reject unsupported pitches in wined3d_surface_update_desc(). --- dlls/wined3d/texture.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 675ca9e..6b2e266 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -658,6 +658,19 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; } + /* We have no way of supporting a pitch that is not a multiple of the pixel + * byte width short of uploading the texture row-by-row. + * Fortunately that's not an issue since D3D9Ex doesn't allow a custom pitch + * for user-memory textures (it always expects packed data) while DirectDraw + * requires a 4-byte aligned pitch and doesn't support texture formats + * larger than 4 bytes per pixel nor any format using 3 bytes per pixel. + * This check is here to verify that the assumption holds. */ + if (pitch % texture->resource.format->byte_count) + { + WARN("Pitch unsupported, not a multiple of the texture format byte width.\n"); + return WINED3DERR_INVALIDCALL; + } + surface = surface_from_resource(texture->sub_resources[0]); if (surface->resource.map_count || (surface->flags & SFLAG_DCINUSE)) {

1 0

Alex Henrie : dpvoice: Turn GetCompressionTypes into a semi-stub.
by Alexandre Julliard Feb. 19, 2015

Feb. 19, 2015

Module: wine Branch: master Commit: 5cd04574084c3e39d41d50fd61a70b53eb04a0a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd04574084c3e39d41d50fd6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 19 00:00:35 2015 -0700 dpvoice: Turn GetCompressionTypes into a semi-stub. --- dlls/dpvoice/client.c | 5 +++-- dlls/dpvoice/dvoice_private.h | 1 + dlls/dpvoice/server.c | 43 +++++++++++++++++++++++++++++++++++++++++-- dlls/dpvoice/tests/voice.c | 10 ---------- 4 files changed, 45 insertions(+), 14 deletions(-) diff --git a/dlls/dpvoice/client.c b/dlls/dpvoice/client.c index 29b5336..bdae160 100644 --- a/dlls/dpvoice/client.c +++ b/dlls/dpvoice/client.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "dvoice.h" +#include "dvoice_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpvoice); @@ -149,8 +150,8 @@ static HRESULT WINAPI dpvclient_GetCompressionTypes(IDirectPlayVoiceClient *ifac DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %p %d\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); - return E_NOTIMPL; + FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } static HRESULT WINAPI dpvclient_SetTransmitTargets(IDirectPlayVoiceClient *iface, PDVID pdvIDTargets, diff --git a/dlls/dpvoice/dvoice_private.h b/dlls/dpvoice/dvoice_private.h index 5b0e57d..ededeab 100644 --- a/dlls/dpvoice/dvoice_private.h +++ b/dlls/dpvoice/dvoice_private.h @@ -23,5 +23,6 @@ extern HRESULT DPVOICE_CreateDirectPlayVoiceClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern HRESULT DPVOICE_CreateDirectPlayVoiceServer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern HRESULT DPVOICE_CreateDirectPlayVoiceTest(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DPVOICE_GetCompressionTypes(DVCOMPRESSIONINFO *pData, DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) DECLSPEC_HIDDEN; #endif diff --git a/dlls/dpvoice/server.c b/dlls/dpvoice/server.c index e9291e2..80ef199 100644 --- a/dlls/dpvoice/server.c +++ b/dlls/dpvoice/server.c @@ -41,6 +41,45 @@ typedef struct IDirectPlayVoiceServerImpl LONG ref; } IDirectPlayVoiceServerImpl; +HRESULT DPVOICE_GetCompressionTypes(DVCOMPRESSIONINFO *pData, DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) +{ + static const DVCOMPRESSIONINFO pcm_type = + {80, {0x8de12fd4,0x7cb3,0x48ce,{0xa7,0xe8,0x9c,0x47,0xa2,0x2e,0x8a,0xc5}}, NULL, NULL, 0, 64000}; + static const WCHAR pcm_name[] = + {'M','S','-','P','C','M',' ','6','4',' ','k','b','i','t','/','s',0}; + + HRESULT ret; + LPWSTR string_loc; + + if (!pdwDataSize || !pdwNumElements) + return DVERR_INVALIDPOINTER; + + if (dwFlags) + return DVERR_INVALIDFLAGS; + + *pdwNumElements = 1; + + if (*pdwDataSize < sizeof(pcm_type) + sizeof(pcm_name)) + { + ret = DVERR_BUFFERTOOSMALL; + } + else if (!pData) + { + ret = DVERR_INVALIDPOINTER; + } + else + { + string_loc = (LPWSTR)((char*)pData + sizeof(pcm_type)); + memcpy(pData, &pcm_type, sizeof(pcm_type)); + memcpy(string_loc, pcm_name, sizeof(pcm_name)); + pData->lpszName = string_loc; + ret = DV_OK; + } + + *pdwDataSize = sizeof(pcm_type) + sizeof(pcm_name); + return ret; +} + static inline IDirectPlayVoiceServerImpl *impl_from_IDirectPlayVoiceServer(IDirectPlayVoiceServer *iface) { return CONTAINING_RECORD(iface, IDirectPlayVoiceServerImpl, IDirectPlayVoiceServer_iface); @@ -130,8 +169,8 @@ static HRESULT WINAPI dpvserver_GetCompressionTypes(IDirectPlayVoiceServer *ifac DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %p %p %d\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); - return E_NOTIMPL; + FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } static HRESULT WINAPI dpvserver_SetTransmitTargets(IDirectPlayVoiceServer *iface, DVID dvSource, PDVID pdvIDTargets, diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index fe2db94..7f0faa3 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -420,16 +420,6 @@ static void test_GetCompressionTypes(IDirectPlayVoiceClient *client_iface, IDire /* either client_iface or server_iface must be given, but not both */ assert(!client_iface ^ !server_iface); - if(client_iface) - ret = IDirectPlayVoiceClient_GetCompressionTypes(client_iface, NULL, NULL, NULL, 0); - else - ret = IDirectPlayVoiceServer_GetCompressionTypes(server_iface, NULL, NULL, NULL, 0); - if(ret == E_NOTIMPL) - { - skip("%s: GetCompressionTypes not implemented\n", name); - return; - } - if (client_iface) ret = IDirectPlayVoiceClient_GetCompressionTypes(client_iface, NULL, &data_size, &num_elements, 0); else

1 0

Austin English : xapofx1_5: Add stub dll.
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 91cba2f1a8dc96056739168390342b8325704bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91cba2f1a8dc9605673916839… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 12 10:58:02 2015 -0800 xapofx1_5: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/xapofx1_5/Makefile.in | 4 ++++ dlls/xapofx1_5/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/xapofx1_5/xapofx1_5.spec | 1 + 5 files changed, 45 insertions(+) diff --git a/configure b/configure index abef0c3..0deacd1 100755 --- a/configure +++ b/configure @@ -1325,6 +1325,7 @@ enable_wuapi enable_wuaueng enable_x3daudio1_7 enable_xapofx1_1 +enable_xapofx1_5 enable_xaudio2_7 enable_xinput1_1 enable_xinput1_2 @@ -17675,6 +17676,7 @@ wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 +wine_fn_config_dll xapofx1_5 enable_xapofx1_5 wine_fn_config_dll xaudio2_7 enable_xaudio2_7 wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 diff --git a/configure.ac b/configure.ac index 2e6cb4c..11a3b78 100644 --- a/configure.ac +++ b/configure.ac @@ -3386,6 +3386,7 @@ WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) +WINE_CONFIG_DLL(xapofx1_5) WINE_CONFIG_DLL(xaudio2_7) WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in new file mode 100644 index 0000000..e0c6e9a --- /dev/null +++ b/dlls/xapofx1_5/Makefile.in @@ -0,0 +1,4 @@ +MODULE = xapofx1_5.dll + +C_SRCS = \ + main.c diff --git a/dlls/xapofx1_5/main.c b/dlls/xapofx1_5/main.c new file mode 100644 index 0000000..1b223ad --- /dev/null +++ b/dlls/xapofx1_5/main.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/xapofx1_5/xapofx1_5.spec b/dlls/xapofx1_5/xapofx1_5.spec new file mode 100644 index 0000000..33269e3 --- /dev/null +++ b/dlls/xapofx1_5/xapofx1_5.spec @@ -0,0 +1 @@ +@ stub CreateFX

1 0

Henri Verbeet : wined3d: Apply modifiers after floatBitsToInt()/ floatBitsToUint() in shader_glsl_add_src_param().
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 3fa8f4ece38da2ee75b3b5f639a3cce64523b0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa8f4ece38da2ee75b3b5f63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 18 10:39:32 2015 +0100 wined3d: Apply modifiers after floatBitsToInt()/floatBitsToUint() in shader_glsl_add_src_param(). --- dlls/wined3d/glsl_shader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0017e45..0804997 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1758,28 +1758,28 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i } else { - char param_str[200]; - - shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, param_str); + char reg_name[200]; switch (wined3d_src->reg.data_type) { case WINED3D_DATA_FLOAT: - sprintf(glsl_src->param_str, "%s", param_str); + sprintf(reg_name, "%s", glsl_src->reg_name); break; case WINED3D_DATA_INT: - sprintf(glsl_src->param_str, "floatBitsToInt(%s)", param_str); + sprintf(reg_name, "floatBitsToInt(%s)", glsl_src->reg_name); break; case WINED3D_DATA_RESOURCE: case WINED3D_DATA_SAMPLER: case WINED3D_DATA_UINT: - sprintf(glsl_src->param_str, "floatBitsToUint(%s)", param_str); + sprintf(reg_name, "floatBitsToUint(%s)", glsl_src->reg_name); break; default: FIXME("Unhandled data type %#x.\n", wined3d_src->reg.data_type); - sprintf(glsl_src->param_str, "%s", param_str); + sprintf(reg_name, "%s", glsl_src->reg_name); break; } + + shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name, swizzle_str, glsl_src->param_str); } }

1 0

Henri Verbeet : dxgi: Implement dxgi_swapchain_GetPrivateData().
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 3beaf224ea2c8a331e717857796375f325e0c053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3beaf224ea2c8a331e7178577… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 18 10:39:28 2015 +0100 dxgi: Implement dxgi_swapchain_GetPrivateData(). --- dlls/dxgi/swapchain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a348ecc..d3f2289 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -102,9 +102,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetPrivateDataInterface(IDXGISwa static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetPrivateData(IDXGISwapChain *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_get_private_data(&swapchain->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetParent(IDXGISwapChain *iface, REFIID riid, void **parent)

1 0

Nikolay Sivov : dwrite: Use vertical variants in GetGlyphs() when appropriate.
by Alexandre Julliard Feb. 18, 2015

Feb. 18, 2015

Module: wine Branch: master Commit: 980c65f1266d4f87166d2199d302d178cc6e651c URL: http://source.winehq.org/git/wine.git/?a=commit;h=980c65f1266d4f87166d2199d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 18 15:50:41 2015 +0300 dwrite: Use vertical variants in GetGlyphs() when appropriate. --- dlls/dwrite/analyzer.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index b9caefd..62a6b15 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -864,8 +864,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, const struct dwritescript_properties *scriptprops; struct scriptshaping_context context; struct scriptshaping_cache *cache = NULL; + BOOL update_cluster, need_vertical; + IDWriteFontFace1 *fontface1; WCHAR *string; - BOOL update_cluster; UINT32 i, g; HRESULT hr = S_OK; UINT16 script; @@ -909,6 +910,12 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, if (!string) return E_OUTOFMEMORY; + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + if (FAILED(hr)) + WARN("failed to get IDWriteFontFace1\n"); + + need_vertical = is_sideways && fontface1 && IDWriteFontFace1_HasVerticalGlyphVariants(fontface1); + for (i = 0, g = 0, update_cluster = FALSE; i < length; i++) { UINT32 codepoint; @@ -928,6 +935,14 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, if (FAILED(hr)) goto done; + if (need_vertical) { + UINT16 vertical; + + hr = IDWriteFontFace1_GetVerticalGlyphVariants(fontface1, 1, &glyph_indices[g], &vertical); + if (hr == S_OK) + glyph_indices[g] = vertical; + } + g++; } else { @@ -969,6 +984,8 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); done: + if (fontface1) + IDWriteFontFace1_Release(fontface1); release_scriptshaping_cache(cache); heap_free(string);

1 0