September 2014 - Wine-commits

Aric Stewart : dwrite: Shift to using localized string for family name.
by Alexandre Julliard 05 Sep '14

05 Sep '14

Module: wine Branch: master Commit: 5d3eaf57ca2b18e3dcd44ced1711c898bbd19224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d3eaf57ca2b18e3dcd44ced1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 4 17:45:37 2014 -0500 dwrite: Shift to using localized string for family name. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 44 +++++++++++++++++++++++++++----------------- dlls/dwrite/main.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a23a9d5..77834cd 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -91,6 +91,7 @@ extern HRESULT create_trimmingsign(IDWriteInlineObject**) DECLSPEC_HIDDEN; extern HRESULT get_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c6fcf6a..8b59a37 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -77,7 +77,7 @@ struct dwrite_fontfamily { IDWriteFontCollection* collection; - WCHAR *familyname; + IDWriteLocalizedStrings *familyname; }; struct dwrite_font { @@ -123,7 +123,7 @@ struct dwrite_fontfile { IDWriteFontFileStream *stream; }; -static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family); +static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFontFamily **family); static HRESULT create_font_base(IDWriteFont **font); static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFont **font); @@ -744,7 +744,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) if (!ref) { int i; - heap_free(This->familyname); + IDWriteLocalizedStrings_Release(This->familyname); if (This->collection) IDWriteFontCollection_Release(This->collection); @@ -803,15 +803,7 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily *iface, UINT32 static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, IDWriteLocalizedStrings **names) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); - static const WCHAR enusW[] = {'e','n','-','u','s',0}; - HRESULT hr; - - TRACE("(%p)->(%p)\n", This, names); - - hr = create_localizedstrings(names); - if (FAILED(hr)) return hr; - - return add_localizedstring(*names, enusW, This->familyname); + return clone_localizedstring(This->familyname, names); } static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, @@ -828,7 +820,7 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i memset(&lf, 0, sizeof(lf)); lf.lfWeight = weight; lf.lfItalic = style == DWRITE_FONT_STYLE_ITALIC; - strcpyW(lf.lfFaceName, This->familyname); + IDWriteLocalizedStrings_GetString(This->familyname, 0, lf.lfFaceName, LF_FACESIZE); return create_font_from_logfont(&lf, font); } @@ -929,6 +921,9 @@ static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollecti static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection *iface, UINT32 index, IDWriteFontFamily **family) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + HRESULT hr; + IDWriteLocalizedStrings *familyname; + static const WCHAR enusW[] = {'e','n','-','u','s',0}; TRACE("(%p)->(%u %p)\n", This, index, family); @@ -938,7 +933,12 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection * return E_FAIL; } - return create_fontfamily(This->families[index], family); + hr = create_localizedstrings(&familyname); + if (FAILED(hr)) + return hr; + add_localizedstring(familyname, enusW, This->families[index]); + + return create_fontfamily(familyname, family); } static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection *iface, const WCHAR *name, UINT32 *index, BOOL *exists) @@ -1035,7 +1035,7 @@ HRESULT get_system_fontcollection(IDWriteFontCollection **collection) return S_OK; } -static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family) +static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFontFamily **family) { struct dwrite_fontfamily *This; @@ -1050,7 +1050,7 @@ static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **fa This->alloc = 2; This->fonts = heap_alloc(sizeof(*This->fonts) * 2); This->collection = NULL; - This->familyname = heap_strdupW(familyname); + This->familyname = familyname; *family = &This->IDWriteFontFamily_iface; @@ -1098,6 +1098,7 @@ static HRESULT create_font_base(IDWriteFont **font) HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) { const WCHAR* facename, *familyname; + IDWriteLocalizedStrings *name; struct dwrite_font *This; IDWriteFontFamily *family; OUTLINETEXTMETRICW *otm; @@ -1105,6 +1106,7 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) HFONT hfont; HDC hdc; int ret; + static const WCHAR enusW[] = {'e','n','-','u','s',0}; LPVOID tt_os2 = NULL; LPVOID tt_head = NULL; LPVOID tt_post = NULL; @@ -1174,7 +1176,15 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) familyname = (WCHAR*)((char*)otm + (ptrdiff_t)otm->otmpFamilyName); TRACE("facename=%s, familyname=%s\n", debugstr_w(facename), debugstr_w(familyname)); - hr = create_fontfamily(familyname, &family); + hr = create_localizedstrings(&name); + if (FAILED(hr)) + { + heap_free(This); + return hr; + } + add_localizedstring(name, enusW, familyname); + hr = create_fontfamily(name, &family); + heap_free(otm); if (hr != S_OK) { diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 01394dc..bcddbba 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -355,6 +355,37 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, return S_OK; } +HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + struct localizedstrings *New; + int i; + + *strings = NULL; + + New = heap_alloc(sizeof(struct localizedstrings)); + if (!This) return E_OUTOFMEMORY; + + New->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; + New->ref = 1; + New->count = This->count; + New->data = heap_alloc(sizeof(struct localizedpair) * New->count); + if (!New->data) { + heap_free(New); + return E_OUTOFMEMORY; + } + for (i = 0; i < New->count; i++) + { + New->data[i].locale = heap_strdupW(This->data[i].locale); + New->data[i].string = heap_strdupW(This->data[i].string); + } + New->alloc = New->count; + + *strings = &New->IDWriteLocalizedStrings_iface; + + return S_OK; +} + struct dwritefactory{ IDWriteFactory IDWriteFactory_iface; LONG ref;

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SetDpi().
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: a64a3c82383aad071637185d9b50f994d50ce97c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64a3c82383aad071637185d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 4 08:14:30 2014 +0200 d2d1: Implement d2d_d3d_render_target_SetDpi(). --- dlls/d2d1/render_target.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 39b0dad..864cd31 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -461,7 +461,18 @@ static D2D1_PIXEL_FORMAT STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelFormat( static void STDMETHODCALLTYPE d2d_d3d_render_target_SetDpi(ID2D1RenderTarget *iface, float dpi_x, float dpi_y) { - FIXME("iface %p, dpi_x %.8e, dpi_y %.8e stub!\n", iface, dpi_x, dpi_y); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, dpi_x %.8e, dpi_y %.8e.\n", iface, dpi_x, dpi_y); + + if (dpi_x == 0.0f && dpi_y == 0.0f) + { + dpi_x = 96.0f; + dpi_y = 96.0f; + } + + render_target->dpi_x = dpi_x; + render_target->dpi_y = dpi_y; } static void STDMETHODCALLTYPE d2d_d3d_render_target_GetDpi(ID2D1RenderTarget *iface, float *dpi_x, float *dpi_y)

1 0

Aric Stewart : dwrite: Implement a list of font data for IDWriteFontFamily.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: 383854defae38574d69a56b5e361ba11c387ee63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383854defae38574d69a56b5e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 3 13:11:35 2014 -0500 dwrite: Implement a list of font data for IDWriteFontFamily. --- dlls/dwrite/font.c | 119 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 99 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4088548..546dab8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -137,6 +137,8 @@ struct dwrite_fontface_data { }; struct dwrite_font_data { + LONG ref; + DWRITE_FONT_STYLE style; DWRITE_FONT_STRETCH stretch; DWRITE_FONT_WEIGHT weight; @@ -161,6 +163,10 @@ struct dwrite_fontfamily { IDWriteFontFamily IDWriteFontFamily_iface; LONG ref; + struct dwrite_font_data **fonts; + UINT32 font_count; + UINT32 alloc; + WCHAR *familyname; }; @@ -209,6 +215,7 @@ struct dwrite_fontfile { static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family); static HRESULT create_font_base(IDWriteFont **font); +static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFont **font); static inline struct dwrite_fontface *impl_from_IDWriteFontFace(IDWriteFontFace *iface) { @@ -268,6 +275,19 @@ static VOID _free_fontface_data(struct dwrite_fontface_data *data) heap_free(data); } +static VOID _free_font_data(struct dwrite_font_data *data) +{ + int i; + if (!data) + return; + i = InterlockedDecrement(&data->ref); + if (i > 0) + return; + _free_fontface_data(data->face_data); + heap_free(data->facename); + heap_free(data); +} + static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace *iface, REFIID riid, void **obj) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); @@ -643,9 +663,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont *iface) { if (This->face) IDWriteFontFace_Release(This->face); if (This->family) IDWriteFontFamily_Release(This->family); - heap_free(This->data->facename); - _free_fontface_data(This->data->face_data); - heap_free(This->data); + _free_font_data(This->data); heap_free(This); } @@ -815,7 +833,12 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) if (!ref) { + int i; heap_free(This->familyname); + + for (i = 0; i < This->font_count; i++) + _free_font_data(This->fonts[i]); + heap_free(This->fonts); heap_free(This); } @@ -832,15 +855,30 @@ static HRESULT WINAPI dwritefontfamily_GetFontCollection(IDWriteFontFamily *ifac static UINT32 WINAPI dwritefontfamily_GetFontCount(IDWriteFontFamily *iface) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->font_count; } static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily *iface, UINT32 index, IDWriteFont **font) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); - FIXME("(%p)->(%u %p): stub\n", This, index, font); - return E_NOTIMPL; + TRACE("(%p)->(%u %p)\n", This, index, font); + if (This->font_count > 0) + { + HRESULT hr; + if (index >= This->font_count) + return E_INVALIDARG; + hr = create_font_from_data(This->fonts[index], font); + if (SUCCEEDED(hr)) + { + struct dwrite_font *font_data = impl_from_IDWriteFont(*font); + font_data->family = iface; + IDWriteFontFamily_AddRef(iface); + } + return hr; + } + else + return E_NOTIMPL; } static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, IDWriteLocalizedStrings **names) @@ -865,12 +903,38 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i TRACE("(%p)->(%d %d %d %p)\n", This, weight, stretch, style, font); - memset(&lf, 0, sizeof(lf)); - lf.lfWeight = weight; - lf.lfItalic = style == DWRITE_FONT_STYLE_ITALIC; - strcpyW(lf.lfFaceName, This->familyname); + /* fallback for system font collections */ + if (This->font_count == 0) + { + memset(&lf, 0, sizeof(lf)); + lf.lfWeight = weight; + lf.lfItalic = style == DWRITE_FONT_STYLE_ITALIC; + strcpyW(lf.lfFaceName, This->familyname); - return create_font_from_logfont(&lf, font); + return create_font_from_logfont(&lf, font); + } + else + { + int i; + for (i = 0; i < This->font_count; i++) + { + if (style == This->fonts[i]->style && + weight == This->fonts[i]->weight && + stretch == This->fonts[i]->stretch) + { + HRESULT hr; + hr = create_font_from_data(This->fonts[i], font); + if (SUCCEEDED(hr)) + { + struct dwrite_font *font_data = impl_from_IDWriteFont(*font); + font_data->family = iface; + IDWriteFontFamily_AddRef(iface); + } + return hr; + } + } + return DWRITE_E_NOFONT; + } } static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, @@ -1063,6 +1127,9 @@ static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **fa This->IDWriteFontFamily_iface.lpVtbl = &fontfamilyvtbl; This->ref = 1; + This->font_count = 0; + This->alloc = 2; + This->fonts = heap_alloc(sizeof(*This->fonts) * 2); This->familyname = heap_strdupW(familyname); *family = &This->IDWriteFontFamily_iface; @@ -1121,32 +1188,44 @@ static void get_font_properties(struct dwrite_font *font, HDC hdc) } } -static HRESULT create_font_base(IDWriteFont **font) +static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFont **font) { struct dwrite_font *This; *font = NULL; This = heap_alloc(sizeof(struct dwrite_font)); if (!This) return E_OUTOFMEMORY; - This->data = heap_alloc(sizeof(struct dwrite_font_data)); - if (!This->data) - { - heap_free(This); - 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; + This->data = data; + InterlockedIncrement(&This->data->ref); *font = &This->IDWriteFont_iface; return S_OK; } +static HRESULT create_font_base(IDWriteFont **font) +{ + struct dwrite_font_data *data; + HRESULT ret; + + *font = NULL; + data = heap_alloc(sizeof(*data)); + if (!data) return E_OUTOFMEMORY; + + data->ref = 0; + data->face_data = NULL; + + ret = create_font_from_data( data, font ); + if (FAILED(ret)) heap_free( data ); + return ret; +} + HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) { const WCHAR* facename, *familyname;

1 0

Aric Stewart : dwrite: Implement GetFontCollection.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: ef173c4312524a04bc53240b19fe907cef3ec4c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef173c4312524a04bc53240b1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 3 07:27:17 2014 -0500 dwrite: Implement GetFontCollection. --- dlls/dwrite/font.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 546dab8..395fb64 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -167,6 +167,8 @@ struct dwrite_fontfamily { UINT32 font_count; UINT32 alloc; + IDWriteFontCollection* collection; + WCHAR *familyname; }; @@ -836,6 +838,8 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) int i; heap_free(This->familyname); + if (This->collection) + IDWriteFontCollection_Release(This->collection); for (i = 0; i < This->font_count; i++) _free_font_data(This->fonts[i]); heap_free(This->fonts); @@ -848,8 +852,15 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) static HRESULT WINAPI dwritefontfamily_GetFontCollection(IDWriteFontFamily *iface, IDWriteFontCollection **collection) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); - FIXME("(%p)->(%p): stub\n", This, collection); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, collection); + if (This->collection) + { + IDWriteFontCollection_AddRef(This->collection); + *collection = This->collection; + return S_OK; + } + else + return E_NOTIMPL; } static UINT32 WINAPI dwritefontfamily_GetFontCount(IDWriteFontFamily *iface) @@ -1130,6 +1141,7 @@ static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **fa This->font_count = 0; This->alloc = 2; This->fonts = heap_alloc(sizeof(*This->fonts) * 2); + This->collection = NULL; This->familyname = heap_strdupW(familyname); *family = &This->IDWriteFontFamily_iface;

1 0

Alistair Leslie-Hughes : dpvoice: Register interfaces.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: a4082fd6538315d12f1d27fdc2278f90fd8bb5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4082fd6538315d12f1d27fdc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 14 11:51:24 2014 +1000 dpvoice: Register interfaces. --- dlls/dpvoice/Makefile.in | 2 ++ dlls/dpvoice/dpvoice.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in index 4a9f902..e22b81f 100644 --- a/dlls/dpvoice/Makefile.in +++ b/dlls/dpvoice/Makefile.in @@ -4,3 +4,5 @@ C_SRCS = \ main.c RC_SRCS = version.rc + +IDL_SRCS = dpvoice.idl diff --git a/dlls/dpvoice/dpvoice.idl b/dlls/dpvoice/dpvoice.idl new file mode 100644 index 0000000..eee52e2 --- /dev/null +++ b/dlls/dpvoice/dpvoice.idl @@ -0,0 +1,48 @@ +/* + * COM Classes for dpvoice + * + * Copyright 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 + */ + +#pragma makedep register + +[ + helpstring("DirectPlayVoice Client Object"), + threading(both), + progid("DirectPlayVoice.Client.1"), + vi_progid("DirectPlayVoice.Client"), + uuid(b9f3eb85-b781-4ac1-8d90-93a05ee37d7d) +] +coclass DirectPlayVoiceClient { interface IDirectPlayVoiceClient; } + +[ + helpstring("DirectPlayVoice Server Object"), + threading(both), + progid("DirectPlayVoice.Server.1"), + vi_progid("DirectPlayVoice.Server"), + uuid(d3f5b8e6-9b78-4a4c-94ea-ca2397b663d3) +] +coclass DirectPlayVoiceServer { interface IDirectPlayVoiceServer; } + +[ + helpstring("DirectPlayVoice Test Object"), + threading(both), + progid("DirectPlayVoice.Test.1"), + vi_progid("DirectPlayVoice.Test"), + uuid(0f0f094b-b01c-4091-a14d-dd0cd807711a) +] +coclass DirectPlayVoiceTest { interface IDirectPlayVoiceTest; }

1 0

Sebastian Lackner : kernel32/tests: Add some even more basic pipe tests without call to PeekNamedPipe.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: 03f3ed89f366d52632b53fb3762a9789fc6425c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f3ed89f366d52632b53fb37… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 4 17:06:12 2014 +0200 kernel32/tests: Add some even more basic pipe tests without call to PeekNamedPipe. --- dlls/kernel32/tests/pipe.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index bdac564..157dc53 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -127,6 +127,21 @@ static void test_CreateNamedPipe(int pipemode) /* Make sure we can read and write a few bytes in both directions */ memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hnp, obuf, sizeof(obuf), &written, NULL), "WriteFile\n"); + ok(written == sizeof(obuf), "write file len\n"); + ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); + ok(readden == sizeof(obuf), "read got %d bytes\n", readden); + ok(memcmp(obuf, ibuf, written) == 0, "content check\n"); + + memset(ibuf, 0, sizeof(ibuf)); + ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), "WriteFile\n"); + ok(written == sizeof(obuf2), "write file len\n"); + ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); + ok(readden == sizeof(obuf2), "read got %d bytes\n", readden); + ok(memcmp(obuf2, ibuf, written) == 0, "content check\n"); + + /* Now the same again, but with an additional call to PeekNamedPipe */ + memset(ibuf, 0, sizeof(ibuf)); + ok(WriteFile(hnp, obuf, sizeof(obuf), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf), "write file len 1\n"); ok(PeekNamedPipe(hFile, NULL, 0, NULL, &readden, NULL), "Peek\n"); ok(readden == sizeof(obuf), "peek 1 got %d bytes\n", readden);

1 0

Sebastian Lackner : kernel32/tests: Ensure that pipe tests read the full pipe content.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: 36debbe80f5388b5dd08955bbeabc3da0e8caf1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=36debbe80f5388b5dd08955bb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 4 17:10:45 2014 +0200 kernel32/tests: Ensure that pipe tests read the full pipe content. --- dlls/kernel32/tests/pipe.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 157dc53..832b980 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -251,7 +251,9 @@ static void test_CreateNamedPipe(int pipemode) } pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n"); - + if (readden <= sizeof(obuf)) + ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); + /* Multiple writes in the reverse direction */ /* the write of obuf2 from write4 should still be in the buffer */ ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek6a\n"); @@ -281,6 +283,8 @@ static void test_CreateNamedPipe(int pipemode) } pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 6a check\n"); + if (readden <= sizeof(obuf)) + ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); } /* Picky conformance tests */

1 0

Sebastian Lackner : kernel32/tests: Add basic tests for partially received pipe messages (ERROR_MORE_DATA).
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: e4551eee469480908592f73e24df449b34047ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4551eee469480908592f73e2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 4 17:14:19 2014 +0200 kernel32/tests: Add basic tests for partially received pipe messages (ERROR_MORE_DATA). --- dlls/kernel32/tests/pipe.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 832b980..5e96930 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -160,6 +160,65 @@ static void test_CreateNamedPipe(int pipemode) ok(readden == sizeof(obuf2), "read 2 got %d bytes\n", readden); ok(memcmp(obuf2, ibuf, written) == 0, "content 2 check\n"); + /* Test how ReadFile behaves when the buffer is not big enough for the whole message */ + memset(ibuf, 0, sizeof(ibuf)); + ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), "WriteFile\n"); + ok(written == sizeof(obuf2), "write file len\n"); + ok(ReadFile(hFile, ibuf, 4, &readden, NULL), "ReadFile\n"); + ok(readden == 4, "read got %d bytes\n", readden); + ok(ReadFile(hFile, ibuf + 4, sizeof(ibuf) - 4, &readden, NULL), "ReadFile\n"); + ok(readden == sizeof(obuf2) - 4, "read got %d bytes\n", readden); + ok(memcmp(obuf2, ibuf, written) == 0, "content check\n"); + + memset(ibuf, 0, sizeof(ibuf)); + ok(WriteFile(hFile, obuf, sizeof(obuf), &written, NULL), "WriteFile\n"); + ok(written == sizeof(obuf), "write file len\n"); + if (pipemode == PIPE_TYPE_BYTE) + { + ok(ReadFile(hnp, ibuf, 4, &readden, NULL), "ReadFile\n"); + } + else + { + SetLastError(0xdeadbeef); + todo_wine + ok(!ReadFile(hnp, ibuf, 4, &readden, NULL), "ReadFile\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error\n"); + } + ok(readden == 4, "read got %d bytes\n", readden); + ok(ReadFile(hnp, ibuf + 4, sizeof(ibuf) - 4, &readden, NULL), "ReadFile\n"); + ok(readden == sizeof(obuf) - 4, "read got %d bytes\n", readden); + ok(memcmp(obuf, ibuf, written) == 0, "content check\n"); + + /* Similar to above, but use a read buffer size small enough to read in three parts */ + memset(ibuf, 0, sizeof(ibuf)); + ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), "WriteFile\n"); + ok(written == sizeof(obuf2), "write file len\n"); + if (pipemode == PIPE_TYPE_BYTE) + { + ok(ReadFile(hnp, ibuf, 4, &readden, NULL), "ReadFile\n"); + ok(readden == 4, "read got %d bytes\n", readden); + ok(ReadFile(hnp, ibuf + 4, 4, &readden, NULL), "ReadFile\n"); + } + else + { + SetLastError(0xdeadbeef); + todo_wine + ok(!ReadFile(hnp, ibuf, 4, &readden, NULL), "ReadFile\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error\n"); + ok(readden == 4, "read got %d bytes\n", readden); + SetLastError(0xdeadbeef); + todo_wine + ok(!ReadFile(hnp, ibuf + 4, 4, &readden, NULL), "ReadFile\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error\n"); + } + ok(readden == 4, "read got %d bytes\n", readden); + ok(ReadFile(hnp, ibuf + 8, sizeof(ibuf) - 8, &readden, NULL), "ReadFile\n"); + ok(readden == sizeof(obuf2) - 8, "read got %d bytes\n", readden); + ok(memcmp(obuf2, ibuf, written) == 0, "content check\n"); + /* Test reading of multiple writes */ memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hnp, obuf, sizeof(obuf), &written, NULL), "WriteFile3a\n");

1 0

Sebastian Lackner : kernel32/tests: Add tests for partially received pipe messages after calling SetNamedPipeHandleState.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: e65a61853840b29da6f7ae39b76076ce8f55a195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65a61853840b29da6f7ae39b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 4 17:16:33 2014 +0200 kernel32/tests: Add tests for partially received pipe messages after calling SetNamedPipeHandleState. --- dlls/kernel32/tests/pipe.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 5e96930..eeeaa32 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -344,6 +344,34 @@ static void test_CreateNamedPipe(int pipemode) ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 6a check\n"); if (readden <= sizeof(obuf)) ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); + + /* Test how ReadFile behaves when the buffer is not big enough for the whole message */ + memset(ibuf, 0, sizeof(ibuf)); + ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), "WriteFile 7\n"); + ok(written == sizeof(obuf2), "write file len 7\n"); + SetLastError(0xdeadbeef); + todo_wine + ok(!ReadFile(hFile, ibuf, 4, &readden, NULL), "ReadFile 7\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error 7\n"); + ok(readden == 4, "read got %d bytes 7\n", readden); + ok(ReadFile(hFile, ibuf + 4, sizeof(ibuf) - 4, &readden, NULL), "ReadFile 7\n"); + ok(readden == sizeof(obuf2) - 4, "read got %d bytes 7\n", readden); + ok(memcmp(obuf2, ibuf, written) == 0, "content check 7\n"); + + memset(ibuf, 0, sizeof(ibuf)); + ok(WriteFile(hFile, obuf, sizeof(obuf), &written, NULL), "WriteFile 8\n"); + ok(written == sizeof(obuf), "write file len 8\n"); + SetLastError(0xdeadbeef); + todo_wine + ok(!ReadFile(hnp, ibuf, 4, &readden, NULL), "ReadFile 8\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error 8\n"); + ok(readden == 4, "read got %d bytes 8\n", readden); + ok(ReadFile(hnp, ibuf + 4, sizeof(ibuf) - 4, &readden, NULL), "ReadFile 8\n"); + ok(readden == sizeof(obuf) - 4, "read got %d bytes 8\n", readden); + ok(memcmp(obuf, ibuf, written) == 0, "content check 8\n"); + } /* Picky conformance tests */

1 0

Sebastian Lackner : kernel32/tests: Add additional tests for multithreaded partial reads from named pipes.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: 652f5d9b8715fb71b15cfb93fa741474ac3b757d URL: http://source.winehq.org/git/wine.git/?a=commit;h=652f5d9b8715fb71b15cfb93f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 4 17:24:12 2014 +0200 kernel32/tests: Add additional tests for multithreaded partial reads from named pipes. --- dlls/kernel32/tests/pipe.c | 159 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index eeeaa32..3f89086 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -43,6 +43,72 @@ static void CALLBACK user_apc(ULONG_PTR param) user_apc_ran = TRUE; } + +enum rpcThreadOp +{ + RPC_READFILE +}; + +struct rpcThreadArgs +{ + ULONG_PTR returnValue; + DWORD lastError; + enum rpcThreadOp op; + ULONG_PTR args[5]; +}; + +static DWORD CALLBACK rpcThreadMain(LPVOID arg) +{ + struct rpcThreadArgs *rpcargs = (struct rpcThreadArgs *)arg; + trace("rpcThreadMain starting\n"); + SetLastError( rpcargs->lastError ); + + switch (rpcargs->op) + { + case RPC_READFILE: + rpcargs->returnValue = (ULONG_PTR)ReadFile( (HANDLE)rpcargs->args[0], /* hFile */ + (LPVOID)rpcargs->args[1], /* buffer */ + (DWORD)rpcargs->args[2], /* bytesToRead */ + (LPDWORD)rpcargs->args[3], /* bytesRead */ + (LPOVERLAPPED)rpcargs->args[4] ); /* overlapped */ + break; + + default: + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + rpcargs->returnValue = 0; + break; + } + + rpcargs->lastError = GetLastError(); + trace("rpcThreadMain returning\n"); + return 0; +} + +/* Runs ReadFile(...) from a different thread */ +static BOOL RpcReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD bytesRead, LPOVERLAPPED overlapped) +{ + struct rpcThreadArgs rpcargs; + HANDLE thread; + DWORD threadId; + + rpcargs.returnValue = 0; + rpcargs.lastError = GetLastError(); + rpcargs.op = RPC_READFILE; + rpcargs.args[0] = (ULONG_PTR)hFile; + rpcargs.args[1] = (ULONG_PTR)buffer; + rpcargs.args[2] = (ULONG_PTR)bytesToRead; + rpcargs.args[3] = (ULONG_PTR)bytesRead; + rpcargs.args[4] = (ULONG_PTR)overlapped; + + thread = CreateThread(NULL, 0, rpcThreadMain, (void *)&rpcargs, 0, &threadId); + ok(thread != NULL, "CreateThread failed. %d\n", GetLastError()); + ok(WaitForSingleObject(thread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed with %d.\n", GetLastError()); + CloseHandle(thread); + + SetLastError(rpcargs.lastError); + return (BOOL)rpcargs.returnValue; +} + static void test_CreateNamedPipe(int pipemode) { HANDLE hnp; @@ -372,6 +438,99 @@ static void test_CreateNamedPipe(int pipemode) ok(readden == sizeof(obuf) - 4, "read got %d bytes 8\n", readden); ok(memcmp(obuf, ibuf, written) == 0, "content check 8\n"); + /* The following test shows that when doing a partial read of a message, the rest + * is still in the pipe, and can be received from a second thread. This shows + * especially that the content is _not_ stored in thread-local-storage until it is + * completely transmitted. The same method works even across multiple processes. */ + memset(ibuf, 0, sizeof(ibuf)); + ok(WriteFile(hnp, obuf, sizeof(obuf), &written, NULL), "WriteFile 9\n"); + ok(written == sizeof(obuf), "write file len 9\n"); + ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), "WriteFile 9\n"); + ok(written == sizeof(obuf2), "write file len 9\n"); + SetLastError(0xdeadbeef); + todo_wine + ok(!ReadFile(hFile, ibuf, 4, &readden, NULL), "ReadFile 9\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error 9\n"); + ok(readden == 4, "read got %d bytes 9\n", readden); + SetLastError(0xdeadbeef); + ret = RpcReadFile(hFile, ibuf + 4, 4, &readden, NULL); + todo_wine + ok(!ret, "RpcReadFile 9\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error 9\n"); + ok(readden == 4, "read got %d bytes 9\n", readden); + ret = RpcReadFile(hFile, ibuf + 8, sizeof(ibuf), &readden, NULL); + ok(ret, "RpcReadFile 9\n"); + todo_wine + ok(readden == sizeof(obuf) - 8, "read got %d bytes 9\n", readden); + ok(memcmp(obuf, ibuf, sizeof(obuf)) == 0, "content check 9\n"); + if (readden <= sizeof(obuf) - 8) /* blocks forever if second part was already received */ + { + memset(ibuf, 0, sizeof(ibuf)); + SetLastError(0xdeadbeef); + ret = RpcReadFile(hFile, ibuf, 4, &readden, NULL); + ok(!ret, "RpcReadFile 9\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error 9\n"); + ok(readden == 4, "read got %d bytes 9\n", readden); + SetLastError(0xdeadbeef); + todo_wine + ok(!ReadFile(hFile, ibuf + 4, 4, &readden, NULL), "ReadFile 9\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error 9\n"); + ok(readden == 4, "read got %d bytes 9\n", readden); + ret = RpcReadFile(hFile, ibuf + 8, sizeof(ibuf), &readden, NULL); + ok(ret, "RpcReadFile 9\n"); + ok(readden == sizeof(obuf2) - 8, "read got %d bytes 9\n", readden); + ok(memcmp(obuf2, ibuf, sizeof(obuf2)) == 0, "content check 9\n"); + } + + /* Now the reverse direction */ + memset(ibuf, 0, sizeof(ibuf)); + ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), "WriteFile 10\n"); + ok(written == sizeof(obuf2), "write file len 10\n"); + ok(WriteFile(hFile, obuf, sizeof(obuf), &written, NULL), "WriteFile 10\n"); + ok(written == sizeof(obuf), "write file len 10\n"); + SetLastError(0xdeadbeef); + todo_wine + ok(!ReadFile(hnp, ibuf, 4, &readden, NULL), "ReadFile 10\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error 10\n"); + ok(readden == 4, "read got %d bytes 10\n", readden); + SetLastError(0xdeadbeef); + ret = RpcReadFile(hnp, ibuf + 4, 4, &readden, NULL); + todo_wine + ok(!ret, "RpcReadFile 10\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error 10\n"); + ok(readden == 4, "read got %d bytes 10\n", readden); + ret = RpcReadFile(hnp, ibuf + 8, sizeof(ibuf), &readden, NULL); + ok(ret, "RpcReadFile 10\n"); + todo_wine + ok(readden == sizeof(obuf2) - 8, "read got %d bytes 10\n", readden); + ok(memcmp(obuf2, ibuf, sizeof(obuf2)) == 0, "content check 10\n"); + if (readden <= sizeof(obuf2) - 8) /* blocks forever if second part was already received */ + { + memset(ibuf, 0, sizeof(ibuf)); + SetLastError(0xdeadbeef); + ret = RpcReadFile(hnp, ibuf, 4, &readden, NULL); + ok(!ret, "RpcReadFile 10\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error 10\n"); + ok(readden == 4, "read got %d bytes 10\n", readden); + SetLastError(0xdeadbeef); + todo_wine + ok(!ReadFile(hnp, ibuf + 4, 4, &readden, NULL), "ReadFile 10\n"); + todo_wine + ok(GetLastError() == ERROR_MORE_DATA, "wrong error 10\n"); + ok(readden == 4, "read got %d bytes 10\n", readden); + ret = RpcReadFile(hnp, ibuf + 8, sizeof(ibuf), &readden, NULL); + ok(ret, "RpcReadFile 10\n"); + ok(readden == sizeof(obuf) - 8, "read got %d bytes 10\n", readden); + ok(memcmp(obuf, ibuf, sizeof(obuf)) == 0, "content check 10\n"); + } + } /* Picky conformance tests */

1 0