August 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite/tests: Basic test for GetPaletteEntries().
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 4df29eb02f9c29df09539ab0613c58bd28089c19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df29eb02f9c29df09539ab06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:43:58 2015 +0300 dwrite/tests: Basic test for GetPaletteEntries(). --- dlls/dwrite/tests/font.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9a75abc..6c5cb82 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -39,6 +39,7 @@ #define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') #define MS_VDMX_TAG MS_MAKE_TAG('V','D','M','X') #define MS_GASP_TAG MS_MAKE_TAG('g','a','s','p') +#define MS_CPAL_TAG MS_MAKE_TAG('C','P','A','L') #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -4754,6 +4755,111 @@ static void test_IsSymbolFont(void) IDWriteFactory_Release(factory); } +struct CPAL_Header_0 +{ + USHORT version; + USHORT numPaletteEntries; + USHORT numPalette; + USHORT numColorRecords; + ULONG offsetFirstColorRecord; + USHORT colorRecordIndices[1]; +}; + +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; + IDWriteFont *font; + DWRITE_COLOR_F color; + UINT32 palettecount, entrycount, size, colorrecords; + void *ctxt; + const struct CPAL_Header_0 *cpal_header; + HRESULT hr; + BOOL exists; + + factory = create_factory(); + + /* Tahoma, no color support */ + fontface = create_fontface(factory); + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); + IDWriteFontFace_Release(fontface); + if (hr != S_OK) { + IDWriteFactory_Release(factory); + win_skip("GetPaletteEntries() is not supported.\n"); + return; + } + + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, 0, 1, &color); +todo_wine + ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); + IDWriteFontFace2_Release(fontface2); + + /* Segoe UI Emoji, with color support */ + font = get_font(factory, emojiW, DWRITE_FONT_STYLE_NORMAL); + if (!font) { + IDWriteFactory_Release(factory); + 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); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); + IDWriteFontFace_Release(fontface); + + palettecount = IDWriteFontFace2_GetColorPaletteCount(fontface2); + ok(palettecount >= 1, "got %u\n", palettecount); + + entrycount = IDWriteFontFace2_GetPaletteEntryCount(fontface2); + ok(entrycount >= 1, "got %u\n", entrycount); + + exists = FALSE; + hr = IDWriteFontFace2_TryGetFontTable(fontface2, MS_CPAL_TAG, (const void**)&cpal_header, &size, &ctxt, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists, "got %d\n", exists); + colorrecords = GET_BE_WORD(cpal_header->numColorRecords); + ok(colorrecords >= 1, "got %u\n", colorrecords); + + /* invalid palette index */ + color.r = color.g = color.b = color.a = 123.0; + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, palettecount, 0, 1, &color); +todo_wine + ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); + ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, + "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); + + /* invalid entry index */ + color.r = color.g = color.b = color.a = 123.0; + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, entrycount, 1, &color); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, + "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); + + color.r = color.g = color.b = color.a = 123.0; + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, entrycount - 1, 1, &color); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(color.r != 123.0 && color.g != 123.0 && color.b != 123.0 && color.a != 123.0, + "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); +} + + /* zero return length */ + color.r = color.g = color.b = color.a = 123.0; + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, 0, 0, &color); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, + "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); + + IDWriteFontFace2_Release(fontface2); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -4804,6 +4910,7 @@ START_TEST(font) test_GetAlphaBlendParams(); test_CreateAlphaTexture(); test_IsSymbolFont(); + test_GetPaletteEntries(); IDWriteFactory_Release(factory); }

1 0

Henri Verbeet : dxgi: Introduce a helper function to convert wined3d multisample info to dxgi.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: d29f263c79b5cccc659304bc396bd860c4ccd534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29f263c79b5cccc659304bc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 00:21:56 2015 +0200 dxgi: Introduce a helper function to convert wined3d multisample info to dxgi. --- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/swapchain.c | 3 +-- dlls/dxgi/utils.c | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 02e37ba..0991433 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -76,6 +76,8 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, + enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) DECLSPEC_HIDDEN; void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; HRESULT dxgi_get_private_data(struct wined3d_private_store *store, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index d3f2289..ea0cfe1 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -205,8 +205,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain *iface, D desc->BufferDesc.Format = dxgi_format_from_wined3dformat(wined3d_desc.backbuffer_format); desc->BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; desc->BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; - desc->SampleDesc.Count = wined3d_desc.multisample_type; - desc->SampleDesc.Quality = wined3d_desc.multisample_quality; + dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality); desc->BufferCount = wined3d_desc.backbuffer_count; desc->OutputWindow = wined3d_desc.device_window; desc->Windowed = wined3d_desc.windowed; diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index ea88567..8334283 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -325,6 +325,13 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) } } +void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, + enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) +{ + desc->Count = wined3d_type == WINED3D_MULTISAMPLE_NONE ? 1 : wined3d_type; + desc->Quality = wined3d_quality; +} + void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) {

1 0

Hans Leidekker : shell32: Add a stub implementation of SHQueryUserNotificationState.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: 7ec5f555b05152dda53b149d5994152115e2c623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ec5f555b05152dda53b149d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 5 17:14:32 2015 +0200 shell32: Add a stub implementation of SHQueryUserNotificationState. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 10 ++++++++++ include/shellapi.h | 13 +++++++++++++ 3 files changed, 24 insertions(+) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index ce3a9f7..91a4138 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -409,6 +409,7 @@ @ stdcall SHPathPrepareForWriteW(long ptr wstr long) @ stdcall SHQueryRecycleBinA(str ptr) @ stdcall SHQueryRecycleBinW(wstr ptr) +@ stdcall SHQueryUserNotificationState(ptr) @ stdcall SHSetLocalizedName(wstr wstr long) @ stdcall SHSetUnreadMailCountW(wstr long wstr) @ stdcall SHUpdateRecycleBinIcon() diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index fd4b8c8..74deecd 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1404,3 +1404,13 @@ HRESULT WINAPI SHEnumerateUnreadMailAccountsW(HKEY user, DWORD idx, LPWSTR maila FIXME("%p %d %p %d: stub\n", user, idx, mailaddress, mailaddresslen); return E_NOTIMPL; } + +/*********************************************************************** + * SHQueryUserNotificationState (SHELL32.@) + */ +HRESULT WINAPI SHQueryUserNotificationState(QUERY_USER_NOTIFICATION_STATE *state) +{ + FIXME("%p: stub\n", state); + *state = QUNS_ACCEPTS_NOTIFICATIONS; + return S_OK; +} diff --git a/include/shellapi.h b/include/shellapi.h index 8492155..57454e3 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -490,6 +490,19 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR,LPSHQUERYRBINFO); * Misc */ +typedef enum +{ + QUNS_NOT_PRESENT = 1, + QUNS_BUSY = 2, + QUNS_RUNNING_D3D_FULL_SCREEN = 3, + QUNS_PRESENTATION_MODE = 4, + QUNS_ACCEPTS_NOTIFICATIONS = 5, + QUNS_QUIET_TIME = 6, + QUNS_APP = 7 +} QUERY_USER_NOTIFICATION_STATE; + +HRESULT WINAPI SHQueryUserNotificationState(QUERY_USER_NOTIFICATION_STATE*); + typedef enum SHSTOCKICONID { SIID_INVALID=-1,

1 0

Nikolay Sivov : dwrite: Implement IsSymbolFont().
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: ab7c65ae436fa5027846184c5b4fb6b56aee9ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7c65ae436fa5027846184c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 18:02:43 2015 +0300 dwrite: Implement IsSymbolFont(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 7 +++++-- dlls/dwrite/freetype.c | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 75098cf..cee49df 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -195,6 +195,7 @@ extern BOOL freetype_has_kerning_pairs(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace2*,UINT16,UINT16) DECLSPEC_HIDDEN; extern void freetype_get_glyph_bbox(IDWriteFontFace2*,FLOAT,UINT16,BOOL,RECT*) DECLSPEC_HIDDEN; extern void freetype_get_glyph_bitmap(IDWriteFontFace2*,FLOAT,UINT16,const RECT*,BYTE*) DECLSPEC_HIDDEN; +extern INT freetype_get_charmap_index(IDWriteFontFace2*,BOOL*) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index aaa0f42..a4ed575 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -148,6 +148,8 @@ struct dwrite_fontface { DWRITE_FONT_FACE_TYPE type; DWRITE_FONT_METRICS1 metrics; DWRITE_CARET_METRICS caret; + INT charmap; + BOOL is_symbol; struct dwrite_fonttable cmap; struct dwrite_fonttable vdmx; @@ -401,8 +403,8 @@ static DWRITE_FONT_SIMULATIONS WINAPI dwritefontface_GetSimulations(IDWriteFontF static BOOL WINAPI dwritefontface_IsSymbolFont(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return This->is_symbol; } static void WINAPI dwritefontface_GetMetrics(IDWriteFontFace2 *iface, DWRITE_FONT_METRICS *metrics) @@ -2500,6 +2502,7 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW fontface->caret.slopeRun = fontface->caret.slopeRise / 3; } } + fontface->charmap = freetype_get_charmap_index(&fontface->IDWriteFontFace2_iface, &fontface->is_symbol); *ret = &fontface->IDWriteFontFace2_iface; return S_OK; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 2c02b26..e693f9a 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -28,6 +28,7 @@ #include FT_CACHE_H #include FT_FREETYPE_H #include FT_OUTLINE_H +#include FT_TRUETYPE_TABLES_H #endif /* HAVE_FT2BUILD_H */ #include "windef.h" @@ -64,7 +65,9 @@ typedef struct #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(FT_Done_FreeType); +MAKE_FUNCPTR(FT_Get_First_Char); MAKE_FUNCPTR(FT_Get_Kerning); +MAKE_FUNCPTR(FT_Get_Sfnt_Table); MAKE_FUNCPTR(FT_Glyph_Get_CBox); MAKE_FUNCPTR(FT_Init_FreeType); MAKE_FUNCPTR(FT_Library_Version); @@ -145,7 +148,9 @@ BOOL init_freetype(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ft_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} LOAD_FUNCPTR(FT_Done_FreeType) + LOAD_FUNCPTR(FT_Get_First_Char) LOAD_FUNCPTR(FT_Get_Kerning) + LOAD_FUNCPTR(FT_Get_Sfnt_Table) LOAD_FUNCPTR(FT_Glyph_Get_CBox) LOAD_FUNCPTR(FT_Init_FreeType) LOAD_FUNCPTR(FT_Library_Version) @@ -554,6 +559,38 @@ void freetype_get_glyph_bitmap(IDWriteFontFace2 *fontface, FLOAT emSize, UINT16 LeaveCriticalSection(&freetype_cs); } +INT freetype_get_charmap_index(IDWriteFontFace2 *fontface, BOOL *is_symbol) +{ + INT charmap_index = -1; + FT_Face face; + + *is_symbol = FALSE; + + EnterCriticalSection(&freetype_cs); + if (pFTC_Manager_LookupFace(cache_manager, fontface, &face) == 0) { + TT_OS2 *os2 = pFT_Get_Sfnt_Table(face, ft_sfnt_os2); + FT_Int i; + + if (os2) { + FT_UInt dummy; + if (os2->version == 0) + *is_symbol = pFT_Get_First_Char(face, &dummy) >= 0x100; + else + *is_symbol = os2->ulCodePageRange1 & FS_SYMBOL; + } + + for (i = 0; i < face->num_charmaps; i++) + if (face->charmaps[i]->encoding == FT_ENCODING_MS_SYMBOL) { + *is_symbol = TRUE; + charmap_index = i; + break; + } + } + LeaveCriticalSection(&freetype_cs); + + return charmap_index; +} + #else /* HAVE_FREETYPE */ BOOL init_freetype(void) @@ -616,4 +653,10 @@ void freetype_get_glyph_bitmap(IDWriteFontFace2 *fontface, FLOAT emSize, UINT16 memset(buf, 0, size); } +INT freetype_get_charmap_index(IDWriteFontFace2 *fontface, BOOL *is_symbol) +{ + *is_symbol = FALSE; + return -1; +} + #endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 327a29f..9a75abc 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4710,6 +4710,50 @@ static void test_CreateAlphaTexture(void) IDWriteFactory_Release(factory); } +static void test_IsSymbolFont(void) +{ + static const WCHAR symbolW[] = {'S','y','m','b','o','l',0}; + IDWriteFontCollection *collection; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFont *font; + HRESULT hr; + BOOL ret; + + factory = create_factory(); + + /* Tahoma */ + fontface = create_fontface(factory); + ret = IDWriteFontFace_IsSymbolFont(fontface); + ok(!ret, "got %d\n", ret); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ret = IDWriteFont_IsSymbolFont(font); + ok(!ret, "got %d\n", ret); + + IDWriteFontCollection_Release(collection); + IDWriteFont_Release(font); + IDWriteFontFace_Release(fontface); + + /* Symbol */ + font = get_font(factory, symbolW, DWRITE_FONT_STYLE_NORMAL); + ret = IDWriteFont_IsSymbolFont(font); + ok(ret, "got %d\n", ret); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + ret = IDWriteFontFace_IsSymbolFont(fontface); + ok(ret, "got %d\n", ret); + IDWriteFont_Release(font); + + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -4759,6 +4803,7 @@ START_TEST(font) test_GetRecommendedRenderingMode(); test_GetAlphaBlendParams(); test_CreateAlphaTexture(); + test_IsSymbolFont(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Properly initialize LOGFONT returned from ConvertFontToLOGFONT().
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: 7540fa5a1a0a5f98f1443e31598221f6af42e7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7540fa5a1a0a5f98f1443e315… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 17:57:26 2015 +0300 dwrite: Properly initialize LOGFONT returned from ConvertFontToLOGFONT(). --- dlls/dwrite/gdiinterop.c | 2 ++ dlls/dwrite/tests/font.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 86778df..8248431 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -504,6 +504,8 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, *is_systemfont = FALSE; + memset(logfont, 0, sizeof(*logfont)); + if (!font) return E_INVALIDARG; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 0eca7f4..327a29f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2731,16 +2731,48 @@ if (0) { /* crashes on native */ IDWriteGdiInterop_ConvertFontToLOGFONT(interop, NULL, &logfont, NULL); IDWriteGdiInterop_ConvertFontToLOGFONT(interop, font, NULL, &system); } + + memset(&logfont, 0xcc, sizeof(logfont)); system = TRUE; hr = IDWriteGdiInterop_ConvertFontToLOGFONT(interop, NULL, &logfont, &system); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(!system, "got %d\n", system); + ok(logfont.lfFaceName[0] == 0, "got face name %s\n", wine_dbgstr_w(logfont.lfFaceName)); system = FALSE; - memset(&logfont, 0, sizeof(logfont)); + + logfont.lfHeight = 10; + logfont.lfWidth = 11; + logfont.lfEscapement = 10; + logfont.lfOrientation = 10; + logfont.lfWeight = 0; + logfont.lfItalic = 1; + logfont.lfUnderline = 1; + logfont.lfStrikeOut = 1; + logfont.lfCharSet = 0; + logfont.lfOutPrecision = 0; + logfont.lfClipPrecision = 0; + logfont.lfQuality = 0; + logfont.lfPitchAndFamily = 0; + logfont.lfFaceName[0] = 0; + hr = IDWriteGdiInterop_ConvertFontToLOGFONT(interop, font, &logfont, &system); ok(hr == S_OK, "got 0x%08x\n", hr); ok(system, "got %d\n", system); + + ok(logfont.lfHeight == 0, "got %d\n", logfont.lfHeight); + ok(logfont.lfWidth == 0, "got %d\n", logfont.lfWidth); + ok(logfont.lfEscapement == 0, "got %d\n", logfont.lfEscapement); + ok(logfont.lfOrientation == 0, "got %d\n", logfont.lfOrientation); + ok(logfont.lfWeight > 0, "got %d\n", logfont.lfWeight); + ok(logfont.lfItalic == 0, "got %d\n", logfont.lfItalic); + ok(logfont.lfUnderline == 0, "got %d\n", logfont.lfUnderline); + ok(logfont.lfStrikeOut == 0, "got %d\n", logfont.lfStrikeOut); + ok(logfont.lfCharSet == DEFAULT_CHARSET, "got %d\n", logfont.lfCharSet); + ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "got %d\n", logfont.lfOutPrecision); + ok(logfont.lfClipPrecision == 0, "got %d\n", logfont.lfClipPrecision); + ok(logfont.lfQuality == 0, "got %d\n", logfont.lfQuality); + ok(logfont.lfPitchAndFamily == 0, "got %d\n", logfont.lfPitchAndFamily); ok(logfont.lfFaceName[0] != 0, "got face name %s\n", wine_dbgstr_w(logfont.lfFaceName)); IDWriteFactory_Release(factory2);

1 0

Hans Leidekker : mscms: Let liblcms2 determine input and output format for transform profiles.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: d2c9e5560a2aa13319e2ea3e8ea8899e5aea1f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c9e5560a2aa13319e2ea3e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 6 14:46:34 2015 +0200 mscms: Let liblcms2 determine input and output format for transform profiles. --- dlls/mscms/tests/profile.c | 37 ++++++++++++++++ dlls/mscms/transform.c | 102 +++++++++++++++------------------------------ 2 files changed, 71 insertions(+), 68 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 012a7dc..f3ebe03 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -35,6 +35,8 @@ static HMODULE huser32; static BOOL (WINAPI *pAssociateColorProfileWithDeviceA)(PCSTR,PCSTR,PCSTR); static BOOL (WINAPI *pCloseColorProfile)(HPROFILE); +static HTRANSFORM (WINAPI *pCreateMultiProfileTransform)(PHPROFILE,DWORD,PDWORD,DWORD,DWORD,DWORD); +static BOOL (WINAPI *pDeleteColorTransform)(HTRANSFORM); static BOOL (WINAPI *pDisassociateColorProfileFromDeviceA)(PCSTR,PCSTR,PCSTR); static BOOL (WINAPI *pGetColorDirectoryA)(PCHAR,PCHAR,PDWORD); static BOOL (WINAPI *pGetColorDirectoryW)(PWCHAR,PWCHAR,PDWORD); @@ -68,6 +70,8 @@ static BOOL init_function_ptrs( void ) { GETFUNCPTR( AssociateColorProfileWithDeviceA ) GETFUNCPTR( CloseColorProfile ) + GETFUNCPTR( CreateMultiProfileTransform ) + GETFUNCPTR( DeleteColorTransform ) GETFUNCPTR( DisassociateColorProfileFromDeviceA ) GETFUNCPTR( GetColorDirectoryA ) GETFUNCPTR( GetColorDirectoryW ) @@ -1334,6 +1338,38 @@ static BOOL have_profile(void) return TRUE; } +static void test_CreateMultiProfileTransform( char *standardprofile, char *testprofile ) +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intents[2] = { INTENT_PERCEPTUAL, INTENT_PERCEPTUAL }; + + if (testprofile) + { + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standardprofile; + profile.cbDataSize = strlen(standardprofile); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %u\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = testprofile; + profile.cbDataSize = strlen(testprofile); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %u\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, intents, 2, 0, 0 ); + ok( transform != NULL, "got %u\n", GetLastError() ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); + } +} + START_TEST(profile) { UINT len; @@ -1443,6 +1479,7 @@ START_TEST(profile) test_UninstallColorProfileW( testprofileW ); test_AssociateColorProfileWithDeviceA( testprofile ); + test_CreateMultiProfileTransform( standardprofile, testprofile ); if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 058cffa..cada332 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -36,64 +36,51 @@ WINE_DEFAULT_DEBUG_CHANNEL(mscms); #ifdef HAVE_LCMS2 -static DWORD from_profile( HPROFILE profile ) -{ - PROFILEHEADER header; - - GetColorProfileHeader( profile, &header ); - TRACE( "color space: 0x%08x %s\n", header.phDataColorSpace, dbgstr_tag( header.phDataColorSpace ) ); - - switch (header.phDataColorSpace) - { - case 0x434d594b: return TYPE_CMYK_16; /* 'CMYK' */ - case 0x47524159: return TYPE_GRAY_16; /* 'GRAY' */ - case 0x4c616220: return TYPE_Lab_16; /* 'Lab ' */ - case 0x52474220: return TYPE_RGB_16; /* 'RGB ' */ - case 0x58595a20: return TYPE_XYZ_16; /* 'XYZ ' */ - default: - WARN("unhandled format\n"); - return TYPE_RGB_16; - } -} - static DWORD from_bmformat( BMFORMAT format ) { static BOOL quietfixme = FALSE; - TRACE( "bitmap format: 0x%08x\n", format ); + DWORD ret; switch (format) { - case BM_RGBTRIPLETS: return TYPE_RGB_8; - case BM_BGRTRIPLETS: return TYPE_BGR_8; - case BM_GRAY: return TYPE_GRAY_8; - case BM_xRGBQUADS: return TYPE_ARGB_8; - case BM_xBGRQUADS: return TYPE_ABGR_8; + case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; + case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_GRAY: ret = TYPE_GRAY_8; break; + case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; + case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; default: if (!quietfixme) { - FIXME("unhandled bitmap format 0x%x\n", format); + FIXME( "unhandled bitmap format %08x\n", format ); quietfixme = TRUE; } - return TYPE_RGB_8; + ret = TYPE_RGB_8; + break; } + TRACE( "color space: %08x -> %08x\n", format, ret ); + return ret; } static DWORD from_type( COLORTYPE type ) { - TRACE( "color type: 0x%08x\n", type ); + DWORD ret; switch (type) { - case COLOR_GRAY: return TYPE_GRAY_16; - case COLOR_RGB: return TYPE_RGB_16; - case COLOR_XYZ: return TYPE_XYZ_16; - case COLOR_Yxy: return TYPE_Yxy_16; - case COLOR_Lab: return TYPE_Lab_16; - case COLOR_CMYK: return TYPE_CMYK_16; + case COLOR_GRAY: ret = TYPE_GRAY_16; break; + case COLOR_RGB: ret = TYPE_RGB_16; break; + case COLOR_XYZ: ret = TYPE_XYZ_16; break; + case COLOR_Yxy: ret = TYPE_Yxy_16; break; + case COLOR_Lab: ret = TYPE_Lab_16; break; + case COLOR_CMYK: ret = TYPE_CMYK_16; break; default: - FIXME("unhandled color type\n"); - return TYPE_RGB_16; + FIXME( "unhandled color type %08x\n", type ); + ret = TYPE_RGB_16; + break; } + + TRACE( "color type: %08x -> %08x\n", type, ret ); + return ret; } #endif /* HAVE_LCMS2 */ @@ -145,7 +132,7 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, struct transform transform; struct profile *dst, *tgt = NULL; cmsHPROFILE cmsinput, cmsoutput, cmstarget = NULL; - DWORD in_format, out_format, proofing = 0; + DWORD proofing = 0; int intent; TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags ); @@ -163,9 +150,6 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, TRACE( "lcsCSType: %s\n", dbgstr_tag( space->lcsCSType ) ); TRACE( "lcsFilename: %s\n", debugstr_w( space->lcsFilename ) ); - in_format = TYPE_RGB_16; - out_format = from_profile( dest ); - cmsinput = cmsCreate_sRGBProfile(); /* FIXME: create from supplied color space */ if (target) { @@ -173,8 +157,9 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, cmstarget = tgt->cmsprofile; } cmsoutput = dst->cmsprofile; - transform.cmstransform = cmsCreateProofingTransform(cmsinput, in_format, cmsoutput, out_format, cmstarget, - intent, INTENT_ABSOLUTE_COLORIMETRIC, proofing); + transform.cmstransform = cmsCreateProofingTransform(cmsinput, 0, cmsoutput, 0, cmstarget, + intent, INTENT_ABSOLUTE_COLORIMETRIC, + proofing); if (!transform.cmstransform) { if (tgt) release_profile( tgt ); @@ -212,10 +197,9 @@ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofil { HTRANSFORM ret = NULL; #ifdef HAVE_LCMS2 - cmsHPROFILE *cmsprofiles, cmsconvert = NULL; + cmsHPROFILE *cmsprofiles; struct transform transform; struct profile *profile0, *profile1; - DWORD in_format, out_format; TRACE( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, 0x%08x )\n", profiles, nprofiles, intents, nintents, flags, cmm ); @@ -236,32 +220,14 @@ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofil release_profile( profile0 ); return NULL; } - in_format = from_profile( profiles[0] ); - out_format = from_profile( profiles[nprofiles - 1] ); - - if (in_format != out_format) - { - /* insert a conversion profile for pairings that lcms doesn't handle */ - if (out_format == TYPE_RGB_16) cmsconvert = cmsCreate_sRGBProfile(); - if (out_format == TYPE_Lab_16) cmsconvert = cmsCreateLab2Profile( NULL ); - } - cmsprofiles = HeapAlloc( GetProcessHeap(), 0, (nprofiles + 1) * sizeof(cmsHPROFILE) ); - if (cmsprofiles) + if ((cmsprofiles = HeapAlloc( GetProcessHeap(), 0, (nprofiles + 1) * sizeof(cmsHPROFILE) ))) { cmsprofiles[0] = profile0->cmsprofile; - if (cmsconvert) - { - cmsprofiles[1] = cmsconvert; - cmsprofiles[2] = profile1->cmsprofile; - nprofiles++; - } - else - { - cmsprofiles[1] = profile1->cmsprofile; - } - transform.cmstransform = cmsCreateMultiprofileTransform( cmsprofiles, nprofiles, in_format, - out_format, *intents, 0 ); + cmsprofiles[1] = profile1->cmsprofile; + + transform.cmstransform = cmsCreateMultiprofileTransform( cmsprofiles, nprofiles, 0, + 0, *intents, 0 ); HeapFree( GetProcessHeap(), 0, cmsprofiles ); if (!transform.cmstransform) {

1 0

Sebastian Lackner : vcomp/tests: Add tests for dynamic work scheduling.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: d3c8055b483323bb81c93125be68ac583038e7f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c8055b483323bb81c93125b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 6 09:31:05 2015 +0200 vcomp/tests: Add tests for dynamic work scheduling. --- dlls/vcomp/tests/vcomp.c | 248 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 242 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3c8055b483323bb81c93…

1 0

Sebastian Lackner : dbghelp: Implement UnDecorateSymbolNameW.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: fa4dfa4325f7c77331106ffdc4b1cedbb0803e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4dfa4325f7c77331106ffdc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 6 08:22:22 2015 +0200 dbghelp: Implement UnDecorateSymbolNameW. Also fixes a bug in UnDecorateSymbolName when undecorated_length == 0. --- dlls/dbghelp/dbghelp.spec | 4 +-- dlls/dbghelp/symbol.c | 63 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 4772358..6004f95 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -183,8 +183,8 @@ @ stdcall SymUnDName64(ptr str long) @ stdcall SymUnloadModule(long long) @ stdcall SymUnloadModule64(long int64) -@ stdcall UnDecorateSymbolName(str str long long) -@ stub UnDecorateSymbolNameW +@ stdcall UnDecorateSymbolName(str ptr long long) +@ stdcall UnDecorateSymbolNameW(wstr ptr long long) @ stdcall UnmapDebugInformation(ptr) @ stdcall WinDbgExtensionDllInit(ptr long long) #@ stub block diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index cbe232b..7569a58 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1752,32 +1752,69 @@ BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64 sym, PSTR UnDecName, DWORD UnDecName static void * CDECL und_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } static void CDECL und_free (void* ptr) { HeapFree(GetProcessHeap(), 0, ptr); } -/*********************************************************************** - * UnDecorateSymbolName (DBGHELP.@) - */ -DWORD WINAPI UnDecorateSymbolName(PCSTR DecoratedName, PSTR UnDecoratedName, - DWORD UndecoratedLength, DWORD Flags) +static char *und_name(char *buffer, const char *mangled, int buflen, unsigned short flags) { /* undocumented from msvcrt */ static HANDLE hMsvcrt; static char* (CDECL *p_undname)(char*, const char*, int, void* (CDECL*)(size_t), void (CDECL*)(void*), unsigned short); static const WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0}; - TRACE("(%s, %p, %d, 0x%08x)\n", - debugstr_a(DecoratedName), UnDecoratedName, UndecoratedLength, Flags); - if (!p_undname) { if (!hMsvcrt) hMsvcrt = LoadLibraryW(szMsvcrt); if (hMsvcrt) p_undname = (void*)GetProcAddress(hMsvcrt, "__unDName"); - if (!p_undname) return 0; + if (!p_undname) return NULL; } - if (!UnDecoratedName) return 0; - if (!p_undname(UnDecoratedName, DecoratedName, UndecoratedLength, - und_alloc, und_free, Flags)) + return p_undname(buffer, mangled, buflen, und_alloc, und_free, flags); +} + +/*********************************************************************** + * UnDecorateSymbolName (DBGHELP.@) + */ +DWORD WINAPI UnDecorateSymbolName(const char *decorated_name, char *undecorated_name, + DWORD undecorated_length, DWORD flags) +{ + TRACE("(%s, %p, %d, 0x%08x)\n", + debugstr_a(decorated_name), undecorated_name, undecorated_length, flags); + + if (!undecorated_name || !undecorated_length) + return 0; + if (!und_name(undecorated_name, decorated_name, undecorated_length, flags)) + return 0; + return strlen(undecorated_name); +} + +/*********************************************************************** + * UnDecorateSymbolNameW (DBGHELP.@) + */ +DWORD WINAPI UnDecorateSymbolNameW(const WCHAR *decorated_name, WCHAR *undecorated_name, + DWORD undecorated_length, DWORD flags) +{ + char *buf, *ptr; + int len, ret = 0; + + TRACE("(%s, %p, %d, 0x%08x)\n", + debugstr_w(decorated_name), undecorated_name, undecorated_length, flags); + + if (!undecorated_name || !undecorated_length) return 0; - return strlen(UnDecoratedName); + + len = WideCharToMultiByte(CP_ACP, 0, decorated_name, -1, NULL, 0, NULL, NULL); + if ((buf = HeapAlloc(GetProcessHeap(), 0, len))) + { + WideCharToMultiByte(CP_ACP, 0, decorated_name, -1, buf, len, NULL, NULL); + if ((ptr = und_name(NULL, buf, 0, flags))) + { + MultiByteToWideChar(CP_ACP, 0, ptr, -1, undecorated_name, undecorated_length); + undecorated_name[undecorated_length - 1] = 0; + ret = strlenW(undecorated_name); + und_free(ptr); + } + HeapFree(GetProcessHeap(), 0, buf); + } + + return ret; } #define WILDCHAR(x) (-(x))

1 0

Henri Verbeet : dxgi: Implement dxgi_surface_GetDesc() on top of wined3d.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: 4a843f282693cff00518dbe784ffc504306cf83b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a843f282693cff00518dbe78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 00:21:57 2015 +0200 dxgi: Implement dxgi_surface_GetDesc() on top of wined3d. --- dlls/d3d10core/texture.c | 55 +++++++++++++++++++++-------------------------- dlls/dxgi/device.c | 14 ++++++------ dlls/dxgi/dxgi_private.h | 5 ++--- dlls/dxgi/surface.c | 11 +++++++--- include/wine/winedxgi.idl | 2 +- 5 files changed, 42 insertions(+), 45 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 46a3af8..3ee87df 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -296,35 +296,6 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic wined3d_private_store_init(&texture->private_store); texture->desc = *desc; - if (desc->MipLevels == 1 && desc->ArraySize == 1) - { - DXGI_SURFACE_DESC surface_desc; - IWineDXGIDevice *wine_device; - - if (FAILED(hr = ID3D10Device1_QueryInterface(&device->ID3D10Device1_iface, &IID_IWineDXGIDevice, - (void **)&wine_device))) - { - ERR("Device should implement IWineDXGIDevice.\n"); - wined3d_private_store_cleanup(&texture->private_store); - return E_FAIL; - } - - surface_desc.Width = desc->Width; - surface_desc.Height = desc->Height; - surface_desc.Format = desc->Format; - surface_desc.SampleDesc = desc->SampleDesc; - - hr = IWineDXGIDevice_create_surface(wine_device, &surface_desc, 0, NULL, - (IUnknown *)&texture->ID3D10Texture2D_iface, (void **)&texture->dxgi_surface); - IWineDXGIDevice_Release(wine_device); - if (FAILED(hr)) - { - ERR("Failed to create DXGI surface, returning %#x\n", hr); - wined3d_private_store_cleanup(&texture->private_store); - return hr; - } - } - if (desc->ArraySize != 1) FIXME("Array textures not implemented.\n"); if (desc->SampleDesc.Count > 1) @@ -348,13 +319,35 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic &d3d10_texture2d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); - if (texture->dxgi_surface) - IUnknown_Release(texture->dxgi_surface); wined3d_private_store_cleanup(&texture->private_store); return hr; } texture->desc.MipLevels = levels; + if (desc->MipLevels == 1 && desc->ArraySize == 1) + { + IWineDXGIDevice *wine_device; + + if (FAILED(hr = ID3D10Device1_QueryInterface(&device->ID3D10Device1_iface, &IID_IWineDXGIDevice, + (void **)&wine_device))) + { + ERR("Device should implement IWineDXGIDevice.\n"); + wined3d_texture_decref(texture->wined3d_texture); + return E_FAIL; + } + + hr = IWineDXGIDevice_create_surface(wine_device, wined3d_texture_get_resource(texture->wined3d_texture), + 0, NULL, (IUnknown *)&texture->ID3D10Texture2D_iface, (void **)&texture->dxgi_surface); + IWineDXGIDevice_Release(wine_device); + if (FAILED(hr)) + { + ERR("Failed to create DXGI surface, returning %#x\n", hr); + texture->dxgi_surface = NULL; + wined3d_texture_decref(texture->wined3d_texture); + return hr; + } + } + texture->device = &device->ID3D10Device1_iface; ID3D10Device1_AddRef(texture->device); diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index e288774..580baf2 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -256,23 +256,23 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IWineDXGIDevic /* IWineDXGIDevice methods */ -static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, const DXGI_SURFACE_DESC *desc, - DXGI_USAGE usage, const DXGI_SHARED_RESOURCE *shared_resource, IUnknown *outer, void **surface) +static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, + struct wined3d_resource *wined3d_resource, DXGI_USAGE usage, + const DXGI_SHARED_RESOURCE *shared_resource, IUnknown *outer, void **surface) { struct dxgi_surface *object; HRESULT hr; - FIXME("iface %p, desc %p, usage %#x, shared_resource %p, outer %p, surface %p partial stub!\n", - iface, desc, usage, shared_resource, outer, surface); + TRACE("iface %p, wined3d_resource %p, usage %#x, shared_resource %p, outer %p, surface %p.\n", + iface, wined3d_resource, usage, shared_resource, outer, surface); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) { ERR("Failed to allocate DXGI surface object memory\n"); return E_OUTOFMEMORY; } - if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, desc))) + if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, wined3d_resource))) { WARN("Failed to initialize surface, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 0991433..e4966d2 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -164,11 +164,10 @@ struct dxgi_surface LONG refcount; struct wined3d_private_store private_store; IDXGIDevice *device; - - DXGI_SURFACE_DESC desc; + struct wined3d_resource *wined3d_resource; }; HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, - IUnknown *outer, const DXGI_SURFACE_DESC *desc) DECLSPEC_HIDDEN; + IUnknown *outer, struct wined3d_resource *wined3d_resource) DECLSPEC_HIDDEN; #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index f961de5..221a80d 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -164,10 +164,15 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REF static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_SURFACE_DESC *desc) { struct dxgi_surface *surface = impl_from_IDXGISurface(iface); + struct wined3d_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); - *desc = surface->desc; + wined3d_resource_get_desc(surface->wined3d_resource, &wined3d_desc); + desc->Width = wined3d_desc.width; + desc->Height = wined3d_desc.height; + desc->Format = dxgi_format_from_wined3dformat(wined3d_desc.format); + dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality); return S_OK; } @@ -214,7 +219,7 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = }; HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, - IUnknown *outer, const DXGI_SURFACE_DESC *desc) + IUnknown *outer, struct wined3d_resource *wined3d_resource) { surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; @@ -222,7 +227,7 @@ HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, wined3d_private_store_init(&surface->private_store); surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; - surface->desc = *desc; + surface->wined3d_resource = wined3d_resource; return S_OK; } diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 4980588..a6c6cce 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -26,7 +26,7 @@ import "dxgi.idl"; interface IWineDXGIDevice : IDXGIDevice { HRESULT create_surface( - [in] const DXGI_SURFACE_DESC *desc, + [in] struct wined3d_resource *wined3d_resource, [in] DXGI_USAGE usage, [in] const DXGI_SHARED_RESOURCE *shared_resource, [in] IUnknown *outer,

1 0

Charles Davis : ws2_32: Implement setting the keep-alive idle timeout and interval on Mac OS.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: 4829989c19de47b7c64fb8f5deb9877d96602442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4829989c19de47b7c64fb8f5d… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Sun Aug 2 17:54:42 2015 -0600 ws2_32: Implement setting the keep-alive idle timeout and interval on Mac OS. --- dlls/ws2_32/socket.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b06d7e7..79aaaf9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -172,6 +172,11 @@ #define INADDR_NONE ~0UL #endif +#if !defined(TCP_KEEPIDLE) && defined(TCP_KEEPALIVE) +/* TCP_KEEPALIVE is the Mac OS name for TCP_KEEPIDLE */ +#define TCP_KEEPIDLE TCP_KEEPALIVE +#endif + WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -4459,14 +4464,23 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID fd = get_sock_fd(s, 0, NULL); if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive, sizeof(int)) == -1) status = WSAEINVAL; -#if defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) +#if defined(TCP_KEEPIDLE) || defined(TCP_KEEPINTVL) /* these values need to be set only if SO_KEEPALIVE is enabled */ else if(keepalive) { +#ifndef TCP_KEEPIDLE + FIXME("ignoring keepalive timeout\n"); +#else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&keepidle, sizeof(int)) == -1) status = WSAEINVAL; - else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, sizeof(int)) == -1) + else +#endif +#ifdef TCP_KEEPINTVL + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, sizeof(int)) == -1) status = WSAEINVAL; +#else + FIXME("ignoring keepalive interval\n"); +#endif } #else else

1 0