September 2015 - Wine-commits

Dmitry Timoshkov : oleaut32: Add support for handling VT_VARIANT|VT_ARRAY|VT_BYREF argument type.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 97ce5f4874ecd9b16a2dd8d0d64205aab6cba67a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ce5f4874ecd9b16a2dd8d0d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 10 15:17:04 2015 +0800 oleaut32: Add support for handling VT_VARIANT|VT_ARRAY|VT_BYREF argument type. --- dlls/oleaut32/tests/tmarshal.c | 1 - dlls/oleaut32/typelib.c | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 6b89774..d200785 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1602,7 +1602,6 @@ static void test_typelibmarshal(void) dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = vararg; hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_REF_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine ok_ole_success(hr, IDispatch_Invoke); SysFreeString(V_BSTR(&vararg[1])); SysFreeString(V_BSTR(&vararg[0])); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f4bba71..650fa21 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7078,7 +7078,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } V_VT(&rgvarg[i]) = rgvt[i]; } - else if (rgvt[i] == (VT_VARIANT | VT_ARRAY) && func_desc->cParamsOpt < 0) + else if ((rgvt[i] == (VT_VARIANT | VT_ARRAY) || rgvt[i] == (VT_VARIANT | VT_ARRAY | VT_BYREF)) && func_desc->cParamsOpt < 0) { SAFEARRAY *a; SAFEARRAYBOUND bound; @@ -7107,7 +7107,10 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( SafeArrayDestroy(a); break; } - V_ARRAY(&rgvarg[i]) = a; + if (rgvt[i] & VT_BYREF) + V_BYREF(&rgvarg[i]) = &a; + else + V_ARRAY(&rgvarg[i]) = a; V_VT(&rgvarg[i]) = rgvt[i]; } else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg))

1 0

Dmitry Timoshkov : oleaut32/tests: Add a test to show that support for coercion to arrays of variants is specific to vararg methods.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 462ef66105ef1b2d6a0e54cb96a85921fb84fb43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=462ef66105ef1b2d6a0e54cb9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 10 15:17:10 2015 +0800 oleaut32/tests: Add a test to show that support for coercion to arrays of variants is specific to vararg methods. --- dlls/oleaut32/tests/tmarshal.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index d200785..488c0d7 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1534,6 +1534,30 @@ static void test_typelibmarshal(void) ok_ole_success(hr, IDispatch_Invoke); VariantClear(&varresult); + /* call Array with BSTR argument - type mismatch */ + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(szSuperman); + dispparams.cNamedArgs = 0; + dispparams.cArgs = 1; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_ARRAY, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_TYPEMISMATCH || hr == DISP_E_BADVARTYPE, "expected DISP_E_TYPEMISMATCH, got %#x\n", hr); + SysFreeString(V_BSTR(&vararg[0])); + + /* call ArrayPtr with BSTR argument - type mismatch */ + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(szSuperman); + dispparams.cNamedArgs = 0; + dispparams.cArgs = 1; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARRAYPTR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_TYPEMISMATCH || hr == DISP_E_BADVARTYPE, "expected DISP_E_TYPEMISMATCH, got %#x\n", hr); + SysFreeString(V_BSTR(&vararg[0])); + /* call VariantCArray - test marshaling of variant arrays */ V_VT(&vararg[0]) = VT_I4; V_I4(&vararg[0]) = 1;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 099bd271b149539674e5c52b01214a2a9f4731e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099bd271b149539674e5c52b0… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Sep 9 22:12:22 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index c268efd..df2404f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-08-21 22:21+0300\n" +"PO-Revision-Date: 2015-09-09 22:11+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7456,16 +7456,12 @@ msgid "&Convert..." msgstr "&Konvertuoti..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Objektas" +msgstr "%1 %2 &objektą" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%s &Object" -msgstr "&Objektas" +msgstr "%s &objektas" #: oledlg.rc:33 oleview.rc:40 msgid "&Object"

1 0

Nikolay Sivov : dwrite/tests: Some tests for TranslateColorGlyphRun().
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 37d10af966221ff932d73a418163bd1fba29ff7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d10af966221ff932d73a418… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 9 17:48:12 2015 +0300 dwrite/tests: Some tests for TranslateColorGlyphRun(). --- dlls/dwrite/tests/font.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++- include/winerror.h | 1 + 2 files changed, 124 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index dfe782d..468a5c0 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -98,6 +98,7 @@ static const WCHAR arialW[] = {'A','r','i','a','l',0}; static const WCHAR tahomaUppercaseW[] = {'T','A','H','O','M','A',0}; static const WCHAR tahomaStrangecaseW[] = {'t','A','h','O','m','A',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; +static const WCHAR emojiW[] = {'S','e','g','o','e',' ','U','I',' ','E','m','o','j','i',0}; static IDWriteFactory *create_factory(void) { @@ -4793,7 +4794,6 @@ struct CPAL_Header_0 static void test_GetPaletteEntries(void) { - static const WCHAR emojiW[] = {'S','e','g','o','e',' ','U','I',' ','E','m','o','j','i',0}; IDWriteFontFace2 *fontface2; IDWriteFontFace *fontface; IDWriteFactory *factory; @@ -4880,6 +4880,127 @@ static void test_GetPaletteEntries(void) IDWriteFactory_Release(factory); } +static void test_TranslateColorGlyphRun(void) +{ + IDWriteColorGlyphRunEnumerator *layers; + const DWRITE_COLOR_GLYPH_RUN *colorrun; + IDWriteFontFace *fontface; + IDWriteFactory2 *factory2; + IDWriteFactory *factory; + DWRITE_GLYPH_RUN run; + UINT32 codepoints[2]; + IDWriteFont *font; + UINT16 glyphs[2]; + BOOL hasrun; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); + IDWriteFactory_Release(factory); + if (hr != S_OK) { + win_skip("TranslateColorGlyphRun() is not supported.\n"); + return; + } + + /* Tahoma, no color support */ + fontface = create_fontface((IDWriteFactory*)factory2); + + codepoints[0] = 'A'; + hr = IDWriteFontFace_GetGlyphIndices(fontface, codepoints, 1, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + + run.fontFace = fontface; + run.fontEmSize = 20.0f; + run.glyphCount = 1; + run.glyphIndices = glyphs; + run.glyphAdvances = NULL; + run.glyphOffsets = NULL; + run.isSideways = FALSE; + run.bidiLevel = 0; + + layers = (void*)0xdeadbeef; + hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, + DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); +todo_wine { + ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); + ok(layers == NULL, "got %p\n", layers); +} + IDWriteFontFace_Release(fontface); + + /* Segoe UI Emoji, with color support */ + font = get_font((IDWriteFactory*)factory2, emojiW, DWRITE_FONT_STYLE_NORMAL); + if (!font) { + IDWriteFactory2_Release(factory2); + skip("Segoe UI Emoji font not found.\n"); + return; + } + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + codepoints[0] = 0x26c4; + hr = IDWriteFontFace_GetGlyphIndices(fontface, codepoints, 1, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + + run.fontFace = fontface; + + layers = NULL; + hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, + DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(layers != NULL, "got %p\n", layers); + + while (1) { + hasrun = FALSE; + hr = IDWriteColorGlyphRunEnumerator_MoveNext(layers, &hasrun); + todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (!hasrun) + break; + } + + /* iterated all way through */ + hr = IDWriteColorGlyphRunEnumerator_GetCurrentRun(layers, &colorrun); +todo_wine + ok(hr == E_NOT_VALID_STATE, "got 0x%08x\n", hr); + + IDWriteColorGlyphRunEnumerator_Release(layers); + + /* color font, glyph without color info */ + codepoints[0] = 'A'; + hr = IDWriteFontFace_GetGlyphIndices(fontface, codepoints, 1, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + + layers = (void*)0xdeadbeef; + hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, + DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); +todo_wine { + ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); + ok(layers == NULL, "got %p\n", layers); +} + /* one glyph with, one without */ + codepoints[0] = 'A'; + codepoints[1] = 0x26c4; + + hr = IDWriteFontFace_GetGlyphIndices(fontface, codepoints, 2, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + + run.glyphCount = 2; + + layers = NULL; + hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, + DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(layers != NULL, "got %p\n", layers); + IDWriteColorGlyphRunEnumerator_Release(layers); + + IDWriteFontFace_Release(fontface); + IDWriteFactory2_Release(factory2); +} + START_TEST(font) { IDWriteFactory *factory; @@ -4931,6 +5052,7 @@ START_TEST(font) test_CreateAlphaTexture(); test_IsSymbolFont(); test_GetPaletteEntries(); + test_TranslateColorGlyphRun(); IDWriteFactory_Release(factory); } diff --git a/include/winerror.h b/include/winerror.h index 1c9df07..87419d1 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2077,6 +2077,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #undef NOERROR /* arpa/nameser_compat.h defines this */ #define E_NOT_SUFFICIENT_BUFFER HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) +#define E_NOT_VALID_STATE HRESULT_FROM_WIN32(ERROR_INVALID_STATE) #ifdef RC_INVOKED #define _HRESULT_TYPEDEF_(x) (x)

1 0

Alexandre Julliard : gdi32: Add an intermediate pointer to avoid a compiler warning.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 58fe3afff527fd09cd729beea22e6ebfce82379a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58fe3afff527fd09cd729beea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 10 19:47:24 2015 +0900 gdi32: Add an intermediate pointer to avoid a compiler warning. --- dlls/gdi32/bitblt.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 762ca0f..08ebfd9 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -224,20 +224,21 @@ static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits /* helper to retrieve either both colors or only the background color for monochrome blits */ static void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) { + RGBQUAD *colors = info->bmiColors; COLORREF color = GetBkColor( hdc ); - info->bmiColors[count - 1].rgbRed = GetRValue( color ); - info->bmiColors[count - 1].rgbGreen = GetGValue( color ); - info->bmiColors[count - 1].rgbBlue = GetBValue( color ); - info->bmiColors[count - 1].rgbReserved = 0; + colors[count - 1].rgbRed = GetRValue( color ); + colors[count - 1].rgbGreen = GetGValue( color ); + colors[count - 1].rgbBlue = GetBValue( color ); + colors[count - 1].rgbReserved = 0; if (count > 1) { color = GetTextColor( hdc ); - info->bmiColors[0].rgbRed = GetRValue( color ); - info->bmiColors[0].rgbGreen = GetGValue( color ); - info->bmiColors[0].rgbBlue = GetBValue( color ); - info->bmiColors[0].rgbReserved = 0; + colors[0].rgbRed = GetRValue( color ); + colors[0].rgbGreen = GetGValue( color ); + colors[0].rgbBlue = GetBValue( color ); + colors[0].rgbReserved = 0; } info->bmiHeader.biClrUsed = count; }

1 0

Riccardo Bortolato : wined3d: Remove wined3d_volume_preload.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 02ce14b3ef1c8087cf7d7443f674469a192bce03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ce14b3ef1c8087cf7d7443f… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Sep 9 19:02:19 2015 +0200 wined3d: Remove wined3d_volume_preload. --- dlls/wined3d/volume.c | 5 ----- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 3 files changed, 7 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 424938a..1bce5c0 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -481,11 +481,6 @@ void * CDECL wined3d_volume_get_parent(const struct wined3d_volume *volume) return volume->resource.parent; } -void CDECL wined3d_volume_preload(struct wined3d_volume *volume) -{ - FIXME("volume %p stub!\n", volume); -} - struct wined3d_resource * CDECL wined3d_volume_get_resource(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9f714ef..ec3cc45 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -289,5 +289,4 @@ @ cdecl wined3d_volume_get_resource(ptr) @ cdecl wined3d_volume_incref(ptr) @ cdecl wined3d_volume_map(ptr ptr ptr long) -@ cdecl wined3d_volume_preload(ptr) @ cdecl wined3d_volume_unmap(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7d4e5a0..8f686fb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2573,7 +2573,6 @@ struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_vol ULONG __cdecl wined3d_volume_incref(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); -void __cdecl wined3d_volume_preload(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume); /* Return the integer base-2 logarithm of x. Undefined for x == 0. */

1 0

Riccardo Bortolato : wined3d: Remove wined3d_volume_get_parent.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 5cba355a8392c41b9b7b418eb910fb5c454b5528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cba355a8392c41b9b7b418eb… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Sep 9 19:02:20 2015 +0200 wined3d: Remove wined3d_volume_get_parent. --- dlls/wined3d/volume.c | 7 ------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 3 files changed, 9 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 1bce5c0..6d62c5e 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -474,13 +474,6 @@ ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) return wined3d_texture_decref(volume->container); } -void * CDECL wined3d_volume_get_parent(const struct wined3d_volume *volume) -{ - TRACE("volume %p.\n", volume); - - return volume->resource.parent; -} - struct wined3d_resource * CDECL wined3d_volume_get_resource(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ec3cc45..f2447da 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -285,7 +285,6 @@ @ cdecl wined3d_volume_decref(ptr) @ cdecl wined3d_volume_from_resource(ptr) -@ cdecl wined3d_volume_get_parent(ptr) @ cdecl wined3d_volume_get_resource(ptr) @ cdecl wined3d_volume_incref(ptr) @ cdecl wined3d_volume_map(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8f686fb..e2b9e1f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2568,7 +2568,6 @@ ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaratio ULONG __cdecl wined3d_volume_decref(struct wined3d_volume *volume); struct wined3d_volume * __cdecl wined3d_volume_from_resource(struct wined3d_resource *resource); -void * __cdecl wined3d_volume_get_parent(const struct wined3d_volume *volume); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); ULONG __cdecl wined3d_volume_incref(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume,

1 0

Riccardo Bortolato : wined3d: Remove volume reference counting from public interface.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 9eb47678de27d2c6bdbedde3515f89c228ba86ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb47678de27d2c6bdbedde35… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Sep 9 19:02:21 2015 +0200 wined3d: Remove volume reference counting from public interface. --- dlls/wined3d/volume.c | 4 ++-- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 6d62c5e..2daa55e 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -460,14 +460,14 @@ static void volume_unload(struct wined3d_resource *resource) resource_unload(resource); } -ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume) +static ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume) { TRACE("Forwarding to container %p.\n", volume->container); return wined3d_texture_incref(volume->container); } -ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) +static ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) { TRACE("Forwarding to container %p.\n", volume->container); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f2447da..6f770a9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -283,9 +283,7 @@ @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) -@ cdecl wined3d_volume_decref(ptr) @ cdecl wined3d_volume_from_resource(ptr) @ cdecl wined3d_volume_get_resource(ptr) -@ cdecl wined3d_volume_incref(ptr) @ cdecl wined3d_volume_map(ptr ptr ptr long) @ cdecl wined3d_volume_unmap(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e2b9e1f..d3dde35 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2566,10 +2566,8 @@ ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaratio void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration); ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); -ULONG __cdecl wined3d_volume_decref(struct wined3d_volume *volume); struct wined3d_volume * __cdecl wined3d_volume_from_resource(struct wined3d_resource *resource); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); -ULONG __cdecl wined3d_volume_incref(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume);

1 0

Riccardo Bortolato : wined3d: Remove wined3d_surface_get_blt_status stub.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: e869ef5c0f5a11ab5981ecb1f4590fd592c711fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e869ef5c0f5a11ab5981ecb1f… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Sep 9 19:02:25 2015 +0200 wined3d: Remove wined3d_surface_get_blt_status stub. --- dlls/ddraw/surface.c | 16 +++++++--------- dlls/wined3d/surface.c | 15 --------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4e815aa..fcdf04b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2945,18 +2945,16 @@ static HRESULT WINAPI ddraw_surface1_EnumOverlayZOrders(IDirectDrawSurface *ifac *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetBltStatus(IDirectDrawSurface7 *iface, DWORD Flags) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - HRESULT hr; - TRACE("iface %p, flags %#x.\n", iface, Flags); - wined3d_mutex_lock(); - hr = wined3d_surface_get_blt_status(surface->wined3d_surface, Flags); - wined3d_mutex_unlock(); - switch(hr) + switch (Flags) { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return hr; + case WINEDDGBS_CANBLT: + case WINEDDGBS_ISBLTDONE: + return DD_OK; + + default: + return DDERR_INVALIDPARAMS; } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f01260c..f823e05 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1883,21 +1883,6 @@ struct wined3d_resource * CDECL wined3d_surface_get_resource(struct wined3d_surf return &surface->resource; } -HRESULT CDECL wined3d_surface_get_blt_status(const struct wined3d_surface *surface, DWORD flags) -{ - TRACE("surface %p, flags %#x.\n", surface, flags); - - switch (flags) - { - case WINEDDGBS_CANBLT: - case WINEDDGBS_ISBLTDONE: - return WINED3D_OK; - - default: - return WINED3DERR_INVALIDCALL; - } -} - HRESULT CDECL wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags) { TRACE("surface %p, flags %#x.\n", surface, flags); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6f770a9..26bd6dd 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -224,7 +224,6 @@ @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) @ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_from_resource(ptr) -@ cdecl wined3d_surface_get_blt_status(ptr long) @ cdecl wined3d_surface_get_flip_status(ptr long) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d3dde35..5739899 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2478,7 +2478,6 @@ HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const R const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); -HRESULT __cdecl wined3d_surface_get_blt_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface);

1 0

Riccardo Bortolato : wined3d: Remove wined3d_surface_get_flip_status stub.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 825b141e5ae293fc7f0ba51de41ca6161cf09b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=825b141e5ae293fc7f0ba51de… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Sep 9 19:02:26 2015 +0200 wined3d: Remove wined3d_surface_get_flip_status stub. --- dlls/ddraw/surface.c | 17 ++++++++--------- dlls/wined3d/surface.c | 17 ----------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fcdf04b..6b6ddb9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3117,19 +3117,18 @@ static HRESULT WINAPI ddraw_surface1_GetColorKey(IDirectDrawSurface *iface, DWOR *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetFlipStatus(IDirectDrawSurface7 *iface, DWORD Flags) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - HRESULT hr; - TRACE("iface %p, flags %#x.\n", iface, Flags); - wined3d_mutex_lock(); - hr = wined3d_surface_get_flip_status(surface->wined3d_surface, Flags); - wined3d_mutex_unlock(); + /* XXX: DDERR_INVALIDSURFACETYPE */ - switch(hr) + switch (Flags) { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return hr; + case WINEDDGFS_CANFLIP: + case WINEDDGFS_ISFLIPDONE: + return DD_OK; + + default: + return DDERR_INVALIDPARAMS; } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f823e05..999423d8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1883,23 +1883,6 @@ struct wined3d_resource * CDECL wined3d_surface_get_resource(struct wined3d_surf return &surface->resource; } -HRESULT CDECL wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags) -{ - TRACE("surface %p, flags %#x.\n", surface, flags); - - /* XXX: DDERR_INVALIDSURFACETYPE */ - - switch (flags) - { - case WINEDDGFS_CANFLIP: - case WINEDDGFS_ISFLIPDONE: - return WINED3D_OK; - - default: - return WINED3DERR_INVALIDCALL; - } -} - HRESULT CDECL wined3d_surface_is_lost(const struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 26bd6dd..9531dd3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -224,7 +224,6 @@ @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) @ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_from_resource(ptr) -@ cdecl wined3d_surface_get_flip_status(ptr long) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5739899..ac1e59e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2478,7 +2478,6 @@ HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const R const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); -HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface);

1 0