wine-commits September 2014

wine-commits@winehq.org

2 participants
301 discussions

Alistair Leslie-Hughes : dpvoice: New stub dll.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 7cd7c069ad7c978c5c3268221f2f6904356f3b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd7c069ad7c978c5c3268221… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 14 11:27:09 2014 +1000 dpvoice: New stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/dpvoice/Makefile.in | 6 ++++ dlls/dpvoice/dpvoice.spec | 6 ++++ dlls/dpvoice/main.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dpvoice/version.rc | 26 ++++++++++++++++ 6 files changed, 120 insertions(+) diff --git a/configure b/configure index 35bdf9d..17c1e30 100755 --- a/configure +++ b/configure @@ -1017,6 +1017,7 @@ enable_dpnaddr enable_dpnet enable_dpnhpast enable_dpnlobby +enable_dpvoice enable_dpwsockx enable_drmclien enable_dsound @@ -16949,6 +16950,7 @@ wine_fn_config_dll dpnet enable_dpnet clean,implib wine_fn_config_test dlls/dpnet/tests dpnet_test wine_fn_config_dll dpnhpast enable_dpnhpast wine_fn_config_dll dpnlobby enable_dpnlobby +wine_fn_config_dll dpvoice enable_dpvoice wine_fn_config_dll dpwsockx enable_dpwsockx wine_fn_config_dll drmclien enable_drmclien wine_fn_config_dll dsound enable_dsound clean,implib diff --git a/configure.ac b/configure.ac index 2f291e3..db8b76f 100644 --- a/configure.ac +++ b/configure.ac @@ -2859,6 +2859,7 @@ WINE_CONFIG_DLL(dpnet,,[clean,implib]) WINE_CONFIG_TEST(dlls/dpnet/tests) WINE_CONFIG_DLL(dpnhpast) WINE_CONFIG_DLL(dpnlobby) +WINE_CONFIG_DLL(dpvoice) WINE_CONFIG_DLL(dpwsockx) WINE_CONFIG_DLL(drmclien) WINE_CONFIG_DLL(dsound,,[clean,implib]) diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in new file mode 100644 index 0000000..4a9f902 --- /dev/null +++ b/dlls/dpvoice/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dpvoice.dll + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/dlls/dpvoice/dpvoice.spec b/dlls/dpvoice/dpvoice.spec new file mode 100644 index 0000000..5169b47 --- /dev/null +++ b/dlls/dpvoice/dpvoice.spec @@ -0,0 +1,6 @@ +1 stdcall DirectPlayVoiceCreate(ptr ptr) + +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dpvoice/main.c b/dlls/dpvoice/main.c new file mode 100644 index 0000000..00b70d9 --- /dev/null +++ b/dlls/dpvoice/main.c @@ -0,0 +1,79 @@ +/* + * DirectPlay Voice + * + * Copyright (C) 2014 Alistair Leslie-Hughes + * + * This program 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 program 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 program; 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" +#include "objbase.h" +#include "rpcproxy.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpvoice); + +static HINSTANCE DPVOICE_hInstance; + +HRESULT WINAPI DirectPlayVoiceCreate(LPCGUID pIID, PVOID *ppvInterface) +{ + FIXME("(%p, %p) stub\n", pIID, ppvInterface); + return E_NOTIMPL; +} + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + DPVOICE_hInstance = hinstDLL; + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + default: + break; + } + + return TRUE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME(":stub\n"); + return E_FAIL; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( DPVOICE_hInstance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( DPVOICE_hInstance ); +} diff --git a/dlls/dpvoice/version.rc b/dlls/dpvoice/version.rc new file mode 100644 index 0000000..993b59c --- /dev/null +++ b/dlls/dpvoice/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2014 Alistair Leslie-Hughes + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine DirectPlay Voice" +#define WINE_FILENAME_STR "dpvoice.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3" + +#include "wine/wine_common_ver.rc"

1 0

Aric Stewart : dwrite: Check if family is set before releasing.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 86af1acff4db17489ca6d7ca1c4c09547e0903e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86af1acff4db17489ca6d7ca1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 3 07:27:00 2014 -0500 dwrite: Check if family is set before releasing. --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 00353b7..4088548 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -642,7 +642,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont *iface) if (!ref) { if (This->face) IDWriteFontFace_Release(This->face); - IDWriteFontFamily_Release(This->family); + if (This->family) IDWriteFontFamily_Release(This->family); heap_free(This->data->facename); _free_fontface_data(This->data->face_data); heap_free(This->data);

1 0

Aric Stewart : dwrite: Break out basic IDWriteFont creation from requiring a logfont.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: b9cfb927ec1333b20dc8af620a656530efae7a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9cfb927ec1333b20dc8af620… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 3 07:26:52 2014 -0500 dwrite: Break out basic IDWriteFont creation from requiring a logfont. --- dlls/dwrite/font.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e782104..00353b7 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -208,6 +208,7 @@ struct dwrite_fontfile { }; static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family); +static HRESULT create_font_base(IDWriteFont **font); static inline struct dwrite_fontface *impl_from_IDWriteFontFace(IDWriteFontFace *iface) { @@ -1120,17 +1121,9 @@ static void get_font_properties(struct dwrite_font *font, HDC hdc) } } -HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) +static HRESULT create_font_base(IDWriteFont **font) { - const WCHAR* facename, *familyname; struct dwrite_font *This; - IDWriteFontFamily *family; - OUTLINETEXTMETRICW *otm; - HRESULT hr; - HFONT hfont; - HDC hdc; - int ret; - *font = NULL; This = heap_alloc(sizeof(struct dwrite_font)); @@ -1142,6 +1135,35 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) return E_OUTOFMEMORY; } + This->IDWriteFont_iface.lpVtbl = &dwritefontvtbl; + This->ref = 1; + This->data->face_data = NULL; + This->face = NULL; + This->family = NULL; + This->is_system = FALSE; + + *font = &This->IDWriteFont_iface; + + return S_OK; +} + +HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) +{ + const WCHAR* facename, *familyname; + struct dwrite_font *This; + IDWriteFontFamily *family; + OUTLINETEXTMETRICW *otm; + HRESULT hr; + HFONT hfont; + HDC hdc; + int ret; + + hr = create_font_base(font); + if (FAILED(hr)) + return hr; + + This = impl_from_IDWriteFont(*font); + hfont = CreateFontIndirectW(logfont); if (!hfont) { @@ -1184,17 +1206,11 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) return hr; } - This->IDWriteFont_iface.lpVtbl = &dwritefontvtbl; - This->ref = 1; - This->face = NULL; This->is_system = TRUE; This->family = family; This->data->simulations = DWRITE_FONT_SIMULATIONS_NONE; This->data->style = logfont->lfItalic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL; This->data->facename = heap_strdupW(logfont->lfFaceName); - This->data->face_data = NULL; - - *font = &This->IDWriteFont_iface; return S_OK; }

1 0

Aric Stewart : dwrite: Implement GetGlyphIndices from the CMAP table.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 2ec9fbb2058d2e59e0be5c05ba7efd9ff051146a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ec9fbb2058d2e59e0be5c05b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 3 07:26:43 2014 -0500 dwrite: Implement GetGlyphIndices from the CMAP table. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 36 ++++++++++- dlls/dwrite/opentype.c | 145 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 5 ++ 4 files changed, 184 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index e78f9bf..08bd40f 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -100,3 +100,4 @@ extern HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE /* Opentype font table functions */ extern HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) DECLSPEC_HIDDEN; extern HRESULT find_font_table(IDWriteFontFileStream *stream, UINT32 font_index, UINT32 tag, const void** table_data, void** table_context, UINT32 *table_size, BOOL* found) DECLSPEC_HIDDEN; +extern VOID OpenType_CMAP_GetGlyphIndex(LPVOID data, DWORD utf32c, LPWORD pgi, DWORD flags) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 07a8b86..e782104 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -124,6 +124,7 @@ typedef struct #define MS_HEAD_TAG MS_MAKE_TAG('h','e','a','d') #define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') #define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') +#define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') struct dwrite_fontface_data { LONG ref; @@ -188,6 +189,10 @@ struct dwrite_fontface { struct dwrite_fontface_data *data; + LPVOID CMAP_table; + LPVOID CMAP_context; + DWORD CMAP_size; + BOOL is_system; LOGFONTW logfont; }; @@ -296,6 +301,8 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace *iface) if (!ref) { + if (This->CMAP_context) + IDWriteFontFace_ReleaseFontTable(iface, This->CMAP_context); _free_fontface_data(This->data); heap_free(This); } @@ -379,12 +386,13 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace *iface, UIN UINT32 count, UINT16 *glyph_indices) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); + unsigned int i; + if (This->is_system) { HFONT hfont; WCHAR *str; HDC hdc; - unsigned int i; TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); @@ -408,8 +416,24 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace *iface, UIN } else { - FIXME("(%p)->(%p %u %p): Stub\n", This, codepoints, count, glyph_indices); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); + if (!This->CMAP_table) + { + BOOL exists = FALSE; + hr = IDWriteFontFace_TryGetFontTable(iface, MS_CMAP_TAG, (const void**)&This->CMAP_table, &This->CMAP_size, &This->CMAP_context, &exists); + if (FAILED(hr) || !exists) + { + ERR("Font does not have a CMAP table\n"); + return E_FAIL; + } + } + + for (i = 0; i < count; i++) + { + OpenType_CMAP_GetGlyphIndex(This->CMAP_table, codepoints[i], &glyph_indices[i], 0); + } + return S_OK; } } @@ -557,6 +581,9 @@ static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace This->data->files = NULL; This->data->index = 0; This->data->simulations = DWRITE_FONT_SIMULATIONS_NONE; + This->CMAP_table = NULL; + This->CMAP_context = NULL; + This->CMAP_size = 0; This->is_system = TRUE; memset(&This->logfont, 0, sizeof(This->logfont)); @@ -1318,6 +1345,9 @@ HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facety This->data->type = facetype; This->data->file_count = files_number; This->data->files = heap_alloc(sizeof(*This->data->files) * files_number); + This->CMAP_table = NULL; + This->CMAP_context = NULL; + This->CMAP_size = 0; /* Verify font file streams */ for (i = 0; i < This->data->file_count && SUCCEEDED(hr); i++) { diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 6c90a96..9e7a716 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -62,6 +62,44 @@ typedef struct { DWORD length; } TT_TableRecord; +typedef struct { + WORD platformID; + WORD encodingID; + DWORD offset; +} CMAP_EncodingRecord; + +typedef struct { + WORD version; + WORD numTables; + CMAP_EncodingRecord tables[1]; +} CMAP_Header; + +typedef struct { + DWORD startCharCode; + DWORD endCharCode; + DWORD startGlyphID; +} CMAP_SegmentedCoverage_group; + +typedef struct { + WORD format; + WORD reserved; + DWORD length; + DWORD language; + DWORD nGroups; + CMAP_SegmentedCoverage_group groups[1]; +} CMAP_SegmentedCoverage; + +typedef struct { + WORD format; + WORD length; + WORD language; + WORD segCountX2; + WORD searchRange; + WORD entrySelector; + WORD rangeShift; + WORD endCode[1]; +} CMAP_SegmentMapping_0; + HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) { /* TODO: Do font validation */ @@ -169,3 +207,110 @@ HRESULT find_font_table(IDWriteFontFileStream *stream, UINT32 font_index, UINT32 return hr; } + +/********** + * CMAP + **********/ + +static int compare_group(const void *a, const void* b) +{ + const DWORD *chr = a; + const CMAP_SegmentedCoverage_group *group = b; + + if (*chr < GET_BE_DWORD(group->startCharCode)) + return -1; + if (*chr > GET_BE_DWORD(group->endCharCode)) + return 1; + return 0; +} + +static void CMAP4_GetGlyphIndex(CMAP_SegmentMapping_0* format, DWORD utf32c, LPWORD pgi) +{ + WORD *startCode; + SHORT *idDelta; + WORD *idRangeOffset; + int segment; + + int segment_count = GET_BE_WORD(format->segCountX2)/2; + /* This is correct because of the padding before startCode */ + startCode = (WORD*)((BYTE*)format + sizeof(CMAP_SegmentMapping_0) + (sizeof(WORD) * segment_count)); + idDelta = (SHORT*)(((BYTE*)startCode) + (sizeof(WORD) * segment_count)); + idRangeOffset = (WORD*)(((BYTE*)idDelta) + (sizeof(WORD) * segment_count)); + + segment = 0; + while(GET_BE_WORD(format->endCode[segment]) < 0xffff) + { + if (utf32c <= GET_BE_WORD(format->endCode[segment])) + break; + segment++; + } + if (segment >= segment_count) + return; + TRACE("Segment %i of %i\n",segment, segment_count); + if (GET_BE_WORD(startCode[segment]) > utf32c) + return; + TRACE("In range %i -> %i\n", GET_BE_WORD(startCode[segment]), GET_BE_WORD(format->endCode[segment])); + if (GET_BE_WORD(idRangeOffset[segment]) == 0) + { + *pgi = (SHORT)(GET_BE_WORD(idDelta[segment])) + utf32c; + } + else + { + WORD ro = GET_BE_WORD(idRangeOffset[segment])/2; + WORD co = (utf32c - GET_BE_WORD(startCode[segment])); + WORD *index = (WORD*)((BYTE*)&idRangeOffset[segment] + (ro + co)); + *pgi = GET_BE_WORD(*index); + } +} + +static void CMAP12_GetGlyphIndex(CMAP_SegmentedCoverage* format, DWORD utf32c, LPWORD pgi) +{ + CMAP_SegmentedCoverage_group *group = NULL; + + group = bsearch(&utf32c, format->groups, GET_BE_DWORD(format->nGroups), + sizeof(CMAP_SegmentedCoverage_group), compare_group); + + if (group) + { + DWORD offset = utf32c - GET_BE_DWORD(group->startCharCode); + *pgi = GET_BE_DWORD(group->startGlyphID) + offset; + } +} + +VOID OpenType_CMAP_GetGlyphIndex(LPVOID data, DWORD utf32c, LPWORD pgi, DWORD flags) +{ + int i; + CMAP_Header *CMAP_Table = NULL; + + if (flags & GGI_MARK_NONEXISTING_GLYPHS) + *pgi = 0xffff; + else + *pgi = 0; + + CMAP_Table = data; + + for (i = 0; i < GET_BE_WORD(CMAP_Table->numTables); i++) + { + WORD type; + WORD *table; + + if (GET_BE_WORD(CMAP_Table->tables[i].platformID) != 3) + continue; + + table = (WORD*)(((BYTE*)CMAP_Table) + GET_BE_DWORD(CMAP_Table->tables[i].offset)); + type = GET_BE_WORD(*table); + TRACE("Type %i\n", type); + /* Break when we find a handled type */ + switch(type) + { + case 4: + CMAP4_GetGlyphIndex((CMAP_SegmentMapping_0*) table, utf32c, pgi); + break; + case 12: + CMAP12_GetGlyphIndex((CMAP_SegmentedCoverage*) table, utf32c, pgi); + break; + default: + TRACE("Type %i unhandled.\n", type); + } + } +} diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7a90c58..3a17064 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -919,6 +919,8 @@ static void test_FontLoader(void) IDWriteFontFace *fface = NULL; HRESULT hr; HRSRC font; + UINT32 codePoints[1] = {0xa8}; + UINT16 indices[1]; hr = IDWriteFactory_RegisterFontFileLoader(factory, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -975,6 +977,9 @@ static void test_FontLoader(void) hr = IDWriteFactory_CreateFontFace(factory, face, 1, &ffile, 0, 0, &fface); ok(hr == S_OK, "got 0x%08x\n",hr); + hr = IDWriteFontFace_GetGlyphIndices(fface, codePoints, 1, indices); + ok(hr == S_OK, "got0x%08x\n",hr); + ok(indices[0] == 6, "got index %i\n",indices[0]); IDWriteFontFace_Release(fface); IDWriteFontFile_Release(ffile); }

1 0

Hans Leidekker : msi: Check transform validation flags.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: a5d8ab57f6b84f318efee10c97558df5514c342d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d8ab57f6b84f318efee10c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 3 15:41:09 2014 +0200 msi: Check transform validation flags. --- dlls/msi/patch.c | 57 ++++++++++++++++++++++++++++-------------------------- include/msiquery.h | 15 ++++++++++++++ 2 files changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index d7eef7c..a3a8d32 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -46,54 +46,57 @@ static BOOL match_language( MSIPACKAGE *package, LANGID langid ) static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *transform ) { - WCHAR *package_product, *transform_product, *template = NULL; - UINT ret = ERROR_FUNCTION_FAILED; + MSISUMMARYINFO *si = MSI_GetSummaryInformationW( transform, 0 ); + UINT valid_flags = 0, wanted_flags = 0; + + if (si) wanted_flags = msi_suminfo_get_int32( si, PID_CHARCOUNT ); + TRACE("validation flags %x\n", wanted_flags); - package_product = msi_dup_property( package->db, szProductCode ); - transform_product = msi_get_suminfo_product( transform ); + if (wanted_flags & ~(MSITRANSFORM_VALIDATE_PRODUCT|MSITRANSFORM_VALIDATE_LANGUAGE)) + FIXME("unsupported validation flags %x\n", wanted_flags); + + if (wanted_flags & MSITRANSFORM_VALIDATE_PRODUCT) + { + WCHAR *package_product = msi_dup_property( package->db, szProductCode ); + WCHAR *transform_product = msi_get_suminfo_product( transform ); - TRACE("package = %s transform = %s\n", debugstr_w(package_product), debugstr_w(transform_product)); + TRACE("package = %s transform = %s\n", debugstr_w(package_product), debugstr_w(transform_product)); - if (!transform_product || strstrW( transform_product, package_product )) + if (!transform_product || strstrW( transform_product, package_product )) + { + valid_flags |= MSITRANSFORM_VALIDATE_PRODUCT; + } + msi_free( transform_product ); + msi_free( package_product ); + } + if (wanted_flags & MSITRANSFORM_VALIDATE_LANGUAGE) { - MSISUMMARYINFO *si; + WCHAR *template; const WCHAR *p; - si = MSI_GetSummaryInformationW( transform, 0 ); if (!si) { ERR("no summary information!\n"); goto end; } - template = msi_suminfo_dup_string( si, PID_TEMPLATE ); - if (!template) + if (!(template = msi_suminfo_dup_string( si, PID_TEMPLATE ))) { ERR("no template property!\n"); - msiobj_release( &si->hdr ); - goto end; - } - if (!template[0]) - { - ret = ERROR_SUCCESS; - msiobj_release( &si->hdr ); goto end; } TRACE("template: %s\n", debugstr_w(template)); - p = strchrW( template, ';' ); - if (p && match_language( package, atoiW( p + 1 ) )) + if (!template[0] || ((p = strchrW( template, ';' )) && match_language( package, atoiW( p + 1 ) ))) { - TRACE("applicable transform\n"); - ret = ERROR_SUCCESS; + valid_flags |= MSITRANSFORM_VALIDATE_LANGUAGE; } - /* FIXME: check platform */ - msiobj_release( &si->hdr ); + msi_free( template ); } end: - msi_free( transform_product ); - msi_free( package_product ); - msi_free( template ); - return ret; + msiobj_release( &si->hdr ); + if (valid_flags & ~wanted_flags) return ERROR_FUNCTION_FAILED; + TRACE("applicable transform\n"); + return ERROR_SUCCESS; } static UINT apply_substorage_transform( MSIPACKAGE *package, MSIDATABASE *patch_db, LPCWSTR name ) diff --git a/include/msiquery.h b/include/msiquery.h index fbd4651..a1f3c6c 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -145,6 +145,21 @@ typedef enum tagMSIDBSTATE MSIDBSTATE_WRITE = 1 } MSIDBSTATE; +typedef enum tagMSITRANSFORM_VALIDATE +{ + MSITRANSFORM_VALIDATE_LANGUAGE = 0x00000001, + MSITRANSFORM_VALIDATE_PRODUCT = 0x00000002, + MSITRANSFORM_VALIDATE_PLATFORM = 0x00000004, + MSITRANSFORM_VALIDATE_MAJORVERSION = 0x00000008, + MSITRANSFORM_VALIDATE_MINORVERSION = 0x00000010, + MSITRANSFORM_VALIDATE_UPDATEVERSION = 0x00000020, + MSITRANSFORM_VALIDATE_NEWLESSBASEVERSION = 0x00000040, + MSITRANSFORM_VALIDATE_NEWLESSEQUALBASEVERSION = 0x00000080, + MSITRANSFORM_VALIDATE_NEWEQUALBASEVERSION = 0x00000100, + MSITRANSFORM_VALIDATE_NEWGREATEREQUALBASEVERSION = 0x00000200, + MSITRANSFORM_VALIDATE_NEWGREATERBASEVERSION = 0x00000400, + MSITRANSFORM_VALIDATE_UPGRADECODE = 0x00000800 +} MSITRANSFORM_VALIDATE; #ifdef __cplusplus extern "C" {

1 0

Piotr Caban : msvcrt: Fix _stricmp behavior on characters that doesn' t fit into signed char.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 7cf23a7957aa63069c2ab52e2482840539cd0892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf23a7957aa63069c2ab52e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 3 14:43:02 2014 +0200 msvcrt: Fix _stricmp behavior on characters that doesn't fit into signed char. --- dlls/msvcrt/string.c | 2 +- dlls/msvcrt/tests/string.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index bacab00..be65675 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1766,7 +1766,7 @@ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, MSVCRT_size_t count, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; - char c1, c2; + int c1, c2; if(s1==NULL || s2==NULL) return MSVCRT__NLSCMPERROR; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 5b9d951..1788035 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2548,6 +2548,8 @@ static void test__stricmp(void) ok(ret > 0, "_stricmp returned %d\n", ret); ret = _stricmp("\xa5", "\xb9"); ok(ret == 0, "_stricmp returned %d\n", ret); + ret = _stricmp("a", "\xb9"); + ok(ret < 0, "_stricmp returned %d\n", ret); setlocale(LC_ALL, "C"); }

1 0

Jacek Caban : wininet/tests: Always use test.winehq.org instead of www.codeweavers.com in tests.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 7c3364621fb61b42321389fb261cec354281bc69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3364621fb61b42321389fb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 3 14:39:51 2014 +0200 wininet/tests: Always use test.winehq.org instead of www.codeweavers.com in tests. --- dlls/wininet/tests/http.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ab09cca..3d09917 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -139,10 +139,10 @@ static const test_data_t test_data[] = { TESTF_REDIRECT }, { - "http://www.codeweavers.com/", - "http://www.codeweavers.com/", - "www.codeweavers.com", - "", + "http://test.winehq.org/tests/gzip.php", + "http://test.winehq.org/tests/gzip.php", + "test.winehq.org", + "/tests/gzip.php", "Accept-Encoding: gzip, deflate", TESTF_COMPRESSED }, @@ -1210,11 +1210,11 @@ static void HttpSendRequestEx_test(void) hSession = InternetOpenA("Wine Regression Test", INTERNET_OPEN_TYPE_PRECONFIG,NULL,NULL,0); ok( hSession != NULL ,"Unable to open Internet session\n"); - hConnect = InternetConnectA(hSession, "crossover.codeweavers.com", + hConnect = InternetConnectA(hSession, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok( hConnect != NULL, "Unable to connect to http://crossover.codeweavers.com\n"); - hRequest = HttpOpenRequestA(hConnect, "POST", "/posttest.php", + ok( hConnect != NULL, "Unable to connect to http://test.winehq.org\n"); + hRequest = HttpOpenRequestA(hConnect, "POST", "/tests/post.php", NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); if (!hRequest && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -1626,11 +1626,11 @@ static void HttpHeaders_test(void) hSession = InternetOpenA("Wine Regression Test", INTERNET_OPEN_TYPE_PRECONFIG,NULL,NULL,0); ok( hSession != NULL ,"Unable to open Internet session\n"); - hConnect = InternetConnectA(hSession, "crossover.codeweavers.com", + hConnect = InternetConnectA(hSession, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok( hConnect != NULL, "Unable to connect to http://crossover.codeweavers.com\n"); - hRequest = HttpOpenRequestA(hConnect, "POST", "/posttest.php", + ok( hConnect != NULL, "Unable to connect to http://test.winehq.org\n"); + hRequest = HttpOpenRequestA(hConnect, "POST", "/tests/post.php", NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); if (!hRequest && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -1713,7 +1713,7 @@ static void HttpHeaders_test(void) ok((len < sizeof(buffer)-sizeof(CHAR)) && (buffer[len/sizeof(CHAR)] == 0),"No NUL at end\n"); ok(len == strlen(buffer) * sizeof(CHAR), "Length wrong\n"); /* what's in the middle differs between Wine and Windows so currently we check only the beginning and the end */ - ok(strncmp(buffer, "POST /posttest.php HTTP/1", 25)==0, "Invalid beginning of headers string\n"); + ok(strncmp(buffer, "POST /tests/post.php HTTP/1", 25)==0, "Invalid beginning of headers string\n"); ok(strcmp(buffer + strlen(buffer) - 4, "\r\n\r\n")==0, "Invalid end of headers string\n"); ok(index == 0, "Index was incremented\n"); @@ -5177,7 +5177,7 @@ static const struct notification_data notification_data[] = { sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]), "POST", "test.winehq.org", - "tests/posttest.php", + "tests/post.php", "Public ID=codeweavers" }, { @@ -5185,7 +5185,7 @@ static const struct notification_data notification_data[] = { sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]), "POST", "test.winehq.org", - "tests/posttest.php" + "tests/post.php" }, { async_send_request_ex_resolve_failure_test, @@ -5485,7 +5485,6 @@ START_TEST(http) InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[0]); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[1]); InternetReadFile_test(0, &test_data[1]); - first_connection_to_test_url = TRUE; InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[2]); test_security_flags(); InternetReadFile_test(0, &test_data[2]);

1 0

Jacek Caban : wininet/tests: Fixed most tests on IE11.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 8e8eef940a2980dc4577ec4d075f1d7e2a57f8b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8eef940a2980dc4577ec4d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 2 12:37:37 2014 +0200 wininet/tests: Fixed most tests on IE11. --- dlls/wininet/tests/http.c | 62 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a8b55fd..ab09cca 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -73,7 +73,7 @@ static BOOL first_connection_to_test_url = TRUE; status < MAX_INTERNET_STATUS && status_string[status] ? \ status_string[status] : "unknown"); \ if (expect[status]) expect[status]--; \ - else optional[status]--; \ + else if(optional[status]) optional[status]--; \ } \ notified[status]++; \ }while(0) @@ -728,8 +728,16 @@ static void InternetReadFile_test(int flags, const test_data_t *test) { if (flags & INTERNET_FLAG_ASYNC) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + /* IE11 calls those in InternetQueryDataAvailable call. */ + SET_OPTIONAL(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_OPTIONAL(INTERNET_STATUS_RESPONSE_RECEIVED); + length = 0; res = InternetQueryDataAvailable(hor,&length,0x0,0x0); + + CLEAR_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + if (flags & INTERNET_FLAG_ASYNC) { if (res) @@ -750,6 +758,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) exlen = length; ok(exlen, "length = 0\n"); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + CLEAR_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); ok(req_error, "req_error = 0\n"); continue; }else { @@ -758,6 +767,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) }else { ok(res, "InternetQueryDataAvailable failed: %u\n", GetLastError()); } + CLEAR_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + trace("LENGTH %d\n", length); if(test->flags & TESTF_CHUNKED) ok(length <= 8192, "length = %d, expected <= 8192\n", length); @@ -3232,17 +3243,24 @@ static void test_conn_close(int port) res = InternetReadFile(req, buf, avail, &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); + /* IE11 calls those in InternetQueryDataAvailable call. */ + SET_OPTIONAL(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_OPTIONAL(INTERNET_STATUS_RESPONSE_RECEIVED); + res = InternetQueryDataAvailable(req, &avail, 0, 0); ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); ok(!avail, "avail = %u, expected 0\n", avail); + CLEAR_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); SetEvent(conn_close_event); WaitForSingleObject(hCompleteEvent, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + CLEAR_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); @@ -4323,6 +4341,10 @@ static void test_security_flags(void) SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_OPTIONAL(INTERNET_STATUS_CLOSING_CONNECTION); /* IE11 calls it, it probably reconnects. */ + SET_OPTIONAL(INTERNET_STATUS_CONNECTION_CLOSED); /* IE11 */ + SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); /* IE11 */ + SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); /* IE11 */ SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); @@ -4339,8 +4361,10 @@ static void test_security_flags(void) CHECK_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTING_TO_SERVER, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTED_TO_SERVER, 2); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); @@ -4374,6 +4398,10 @@ static void test_security_flags(void) SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_OPTIONAL(INTERNET_STATUS_CLOSING_CONNECTION); /* IE11 calls it, it probably reconnects. */ + SET_OPTIONAL(INTERNET_STATUS_CONNECTION_CLOSED); /* IE11 */ + SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); /* IE11 */ + SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); /* IE11 */ SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); @@ -4411,10 +4439,10 @@ static void test_security_flags(void) } HeapFree(GetProcessHeap(), 0, cert); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); - CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTING_TO_SERVER, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTED_TO_SERVER, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); @@ -4470,6 +4498,10 @@ static void test_security_flags(void) SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_OPTIONAL(INTERNET_STATUS_CLOSING_CONNECTION); /* IE11 calls it, it probably reconnects. */ + SET_OPTIONAL(INTERNET_STATUS_CONNECTION_CLOSED); /* IE11 */ + SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); /* IE11 */ + SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); /* IE11 */ SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); @@ -4484,8 +4516,10 @@ static void test_security_flags(void) WaitForSingleObject(hCompleteEvent, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %d\n", req_error); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTING_TO_SERVER, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTED_TO_SERVER, 2); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); @@ -4537,6 +4571,10 @@ static void test_security_flags(void) SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_OPTIONAL(INTERNET_STATUS_CLOSING_CONNECTION); /* IE11 calls it, it probably reconnects. */ + SET_OPTIONAL(INTERNET_STATUS_CONNECTION_CLOSED); /* IE11 */ + SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); /* IE11 */ + SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); /* IE11 */ SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); @@ -4550,8 +4588,10 @@ static void test_security_flags(void) WaitForSingleObject(hCompleteEvent, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %d\n", req_error); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTING_TO_SERVER, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTED_TO_SERVER, 2); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE);

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetPixelSize().
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 5295edbd3a139d4280019c35f7bb8dc8c8744a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5295edbd3a139d4280019c35f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 07:48:23 2014 +0200 d2d1: Implement d2d_d3d_render_target_GetPixelSize(). --- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/factory.c | 8 +++++++- dlls/d2d1/render_target.c | 21 +++++++++++++++++---- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 001c986..925fafb 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -29,10 +29,11 @@ struct d2d_d3d_render_target ID2D1RenderTarget ID2D1RenderTarget_iface; LONG refcount; + D2D1_SIZE_U pixel_size; D2D1_MATRIX_3X2_F transform; }; -void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, +HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; struct d2d_gradient diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 0bc465e..f8cd912 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -191,13 +191,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1 IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { struct d2d_d3d_render_target *object; + HRESULT hr; TRACE("iface %p, surface %p, desc %p, render_target %p.\n", iface, surface, desc, render_target); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_d3d_render_target_init(object, iface, surface, desc); + if (FAILED(hr = d2d_d3d_render_target_init(object, iface, surface, desc))) + { + WARN("Failed to initialize render target, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } TRACE("Created render target %p.\n", object); *render_target = &object->ID2D1RenderTarget_iface; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 3897a1c..2c079a3 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -483,11 +483,11 @@ static D2D1_SIZE_F STDMETHODCALLTYPE d2d_d3d_render_target_GetSize(ID2D1RenderTa static D2D1_SIZE_U STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelSize(ID2D1RenderTarget *iface) { - static const D2D1_SIZE_U size = {0, 0}; + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); - return size; + return render_target->pixel_size; } static UINT32 STDMETHODCALLTYPE d2d_d3d_render_target_GetMaximumBitmapSize(ID2D1RenderTarget *iface) @@ -566,9 +566,12 @@ static const struct ID2D1RenderTargetVtbl d2d_d3d_render_target_vtbl = d2d_d3d_render_target_IsSupported, }; -void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, +HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { + DXGI_SURFACE_DESC surface_desc; + HRESULT hr; + static const D2D1_MATRIX_3X2_F identity = { 1.0f, 0.0f, @@ -581,5 +584,15 @@ void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2 render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; render_target->refcount = 1; + if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) + { + WARN("Failed to get surface desc, hr %#x.\n", hr); + return hr; + } + + render_target->pixel_size.width = surface_desc.Width; + render_target->pixel_size.height = surface_desc.Height; render_target->transform = identity; + + return S_OK; }

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_EndDraw().
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 53d0c20526014a61b56aa0f9b8c159d9477d7b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d0c20526014a61b56aa0f9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 07:48:22 2014 +0200 d2d1: Implement d2d_d3d_render_target_EndDraw(). Tag1/tag2 are "error tags". You set them with SetTags(), and if a subsequent drawing operation generates an error, EndDraw() will return the error code and tags that were set when the error occurred. --- dlls/d2d1/render_target.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index d6db977..3897a1c 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -440,9 +440,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_BeginDraw(ID2D1RenderTarget static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { - FIXME("iface %p, tag1 %p, tag2 %p stub!\n", iface, tag1, tag2); + TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - return E_NOTIMPL; + if (tag1) + *tag1 = 0; + if (tag2) + *tag2 = 0; + + return S_OK; } static D2D1_PIXEL_FORMAT STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelFormat(ID2D1RenderTarget *iface)

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2014