wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Nikolay Sivov : dwrite: Implement GetDesignGlyphAdvances().
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 415e0b3f54968017014060a0cddab6f639f63def URL: http://source.winehq.org/git/wine.git/?a=commit;h=415e0b3f54968017014060a0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 9 10:00:45 2014 +0300 dwrite: Implement GetDesignGlyphAdvances(). --- dlls/dwrite/font.c | 20 +++++++++++++++--- dlls/dwrite/tests/font.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ef4c32c..ebea17d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -500,11 +500,25 @@ static BOOL WINAPI dwritefontface1_IsMonospacedFont(IDWriteFontFace2 *iface) } static HRESULT WINAPI dwritefontface1_GetDesignGlyphAdvances(IDWriteFontFace2 *iface, - UINT32 glyph_count, UINT16 const *indices, INT32 *advances, BOOL is_sideways) + UINT32 glyph_count, UINT16 const *glyphs, INT32 *advances, BOOL is_sideways) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%u %p %p %d): stub\n", This, glyph_count, indices, advances, is_sideways); - return E_NOTIMPL; + UINT32 i; + + TRACE("(%p)->(%u %p %p %d)\n", This, glyph_count, glyphs, advances, is_sideways); + + for (i = 0; i < glyph_count; i++) { + DWRITE_GLYPH_METRICS metrics = { 0 }; + HRESULT hr; + + hr = IDWriteFontFace2_GetDesignGlyphMetrics(iface, glyphs + i, 1, &metrics, is_sideways); + if (FAILED(hr)) + return hr; + + advances[i] = is_sideways ? metrics.advanceHeight : metrics.advanceWidth; + } + + return S_OK; } static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontFace2 *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index db554eb..b8bf75c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2636,6 +2636,58 @@ static void test_IsMonospacedFont(void) IDWriteFontCollection_Release(collection); } +static void test_GetDesignGlyphAdvances(void) +{ + IDWriteFontFace1 *fontface1; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFontFile *file; + HRESULT hr; + + factory = create_factory(); + + create_testfontfile(test_fontfile); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, + 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + if (hr == S_OK) { + UINT32 codepoint; + UINT16 index; + INT32 advance; + + codepoint = 'A'; + index = 0; + hr = IDWriteFontFace1_GetGlyphIndices(fontface1, &codepoint, 1, &index); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(index > 0, "got %u\n", index); + + advance = 0; + hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, &index, &advance, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advance == 1000, "got %i\n", advance); + + advance = 0; + hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, &index, &advance, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advance == 2048, "got %i\n", advance); + + IDWriteFontFace1_Release(fontface1); + } + else + win_skip("GetDesignGlyphAdvances() is not supported.\n"); + + IDWriteFontFace_Release(fontface); + IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2670,6 +2722,7 @@ START_TEST(font) test_CreateStreamFromKey(); test_ReadFileFragment(); test_GetDesignGlyphMetrics(); + test_GetDesignGlyphAdvances(); test_IsMonospacedFont(); IDWriteFactory_Release(factory);

1 0

Nikolay Sivov : dwrite: Implement IsMonospacedFont().
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 730b2f4c6671f489b0638a0ca766f527da15850e URL: http://source.winehq.org/git/wine.git/?a=commit;h=730b2f4c6671f489b0638a0ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 9 09:58:14 2014 +0300 dwrite: Implement IsMonospacedFont(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 4 +-- dlls/dwrite/freetype.c | 20 +++++++++++++++ dlls/dwrite/tests/font.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 181a0a0..ed02501 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -129,6 +129,7 @@ extern BOOL init_freetype(void) DECLSPEC_HIDDEN; extern void release_freetype(void) DECLSPEC_HIDDEN; extern HRESULT freetype_get_design_glyph_metrics(IDWriteFontFace2*,UINT16,UINT16,DWRITE_GLYPH_METRICS*) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace2*) DECLSPEC_HIDDEN; +extern BOOL freetype_is_monospaced(IDWriteFontFace2*) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e7712d7..ef4c32c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -495,8 +495,8 @@ static HRESULT WINAPI dwritefontface1_GetUnicodeRanges(IDWriteFontFace2 *iface, static BOOL WINAPI dwritefontface1_IsMonospacedFont(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return freetype_is_monospaced(iface); } static HRESULT WINAPI dwritefontface1_GetDesignGlyphAdvances(IDWriteFontFace2 *iface, diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 66dd1c9..7e8fd3c 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -67,6 +67,7 @@ MAKE_FUNCPTR(FT_Load_Glyph); MAKE_FUNCPTR(FT_New_Memory_Face); MAKE_FUNCPTR(FTC_Manager_New); MAKE_FUNCPTR(FTC_Manager_Done); +MAKE_FUNCPTR(FTC_Manager_LookupFace); MAKE_FUNCPTR(FTC_Manager_LookupSize); MAKE_FUNCPTR(FTC_Manager_RemoveFaceID); #undef MAKE_FUNCPTR @@ -135,6 +136,7 @@ BOOL init_freetype(void) LOAD_FUNCPTR(FT_New_Memory_Face) LOAD_FUNCPTR(FTC_Manager_New) LOAD_FUNCPTR(FTC_Manager_Done) + LOAD_FUNCPTR(FTC_Manager_LookupFace) LOAD_FUNCPTR(FTC_Manager_LookupSize) LOAD_FUNCPTR(FTC_Manager_RemoveFaceID) #undef LOAD_FUNCPTR @@ -210,6 +212,19 @@ HRESULT freetype_get_design_glyph_metrics(IDWriteFontFace2 *fontface, UINT16 uni return S_OK; } +BOOL freetype_is_monospaced(IDWriteFontFace2 *fontface) +{ + BOOL is_monospaced = FALSE; + FT_Face face; + + EnterCriticalSection(&freetype_cs); + if (pFTC_Manager_LookupFace(cache_manager, fontface, &face) == 0) + is_monospaced = FT_IS_FIXED_WIDTH(face); + LeaveCriticalSection(&freetype_cs); + + return is_monospaced; +} + #else /* HAVE_FREETYPE */ BOOL init_freetype(void) @@ -230,4 +245,9 @@ HRESULT freetype_get_design_glyph_metrics(IDWriteFontFace2 *fontface, UINT16 uni return E_NOTIMPL; } +BOOL freetype_is_monospaced(IDWriteFontFace2 *fontface) +{ + return FALSE; +} + #endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 58b536e..db554eb 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2578,6 +2578,64 @@ static void test_GetDesignGlyphMetrics(void) DeleteFileW(test_fontfile); } +static void test_IsMonospacedFont(void) +{ + static const WCHAR courierW[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; + IDWriteFontCollection *collection; + IDWriteFactory *factory; + UINT32 index; + BOOL exists; + HRESULT hr; + + factory = create_factory(); + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + exists = FALSE; + hr = IDWriteFontCollection_FindFamilyName(collection, courierW, &index, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (exists) { + IDWriteFontFamily *family; + IDWriteFont1 *font1; + IDWriteFont *font; + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFamily_Release(family); + + hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void**)&font1); + if (hr == S_OK) { + IDWriteFontFace1 *fontface1; + IDWriteFontFace *fontface; + BOOL is_monospaced; + + is_monospaced = IDWriteFont1_IsMonospacedFont(font1); + ok(is_monospaced, "got %d\n", is_monospaced); + + hr = IDWriteFont1_CreateFontFace(font1, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + ok(hr == S_OK, "got 0x%08x\n", hr); + is_monospaced = IDWriteFontFace1_IsMonospacedFont(fontface1); + ok(is_monospaced, "got %d\n", is_monospaced); + IDWriteFontFace1_Release(fontface1); + + IDWriteFontFace_Release(fontface); + IDWriteFont1_Release(font1); + } + else + win_skip("IsMonospacedFont() is not supported.\n"); + } + else + skip("Courier New font not found.\n"); + + IDWriteFontCollection_Release(collection); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2612,6 +2670,7 @@ START_TEST(font) test_CreateStreamFromKey(); test_ReadFileFragment(); test_GetDesignGlyphMetrics(); + test_IsMonospacedFont(); IDWriteFactory_Release(factory); }

1 0

Martin Storsjo : api-ms-win-core-winrt-l1-1-0: Move implementations into combase.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 13a101707a1793d777f5a30063ff9d19178cfbca URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a101707a1793d777f5a3006… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 9 10:36:46 2014 +0200 api-ms-win-core-winrt-l1-1-0: Move implementations into combase. --- dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in | 4 ---- .../api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec | 4 ++-- dlls/combase/Makefile.in | 4 ++++ dlls/combase/combase.spec | 4 ++-- dlls/{api-ms-win-core-winrt-l1-1-0/main.c => combase/roapi.c} | 7 ++++--- tools/make_specfiles | 4 ++++ 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in index 7ce8241..1660441 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in +++ b/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in @@ -1,5 +1 @@ MODULE = api-ms-win-core-winrt-l1-1-0.dll -IMPORTS = ole32 - -C_SRCS = \ - main.c diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index 344265a..0749ac0 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -1,9 +1,9 @@ @ stub RoActivateInstance @ stub RoGetActivationFactory @ stub RoGetApartmentIdentifier -@ stdcall RoInitialize(long) +@ stdcall RoInitialize(long) combase.RoInitialize @ stub RoRegisterActivationFactories @ stub RoRegisterForApartmentShutdown @ stub RoRevokeActivationFactories -@ stdcall RoUninitialize() +@ stdcall RoUninitialize() combase.RoUninitialize @ stub RoUnregisterForApartmentShutdown diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index 8b1099d..79d22a1 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1 +1,5 @@ MODULE = combase.dll +IMPORTS = ole32 + +C_SRCS = \ + roapi.c diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index daa0bbb..652eff6 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -255,7 +255,7 @@ @ stub RoGetMatchingRestrictedErrorInfo @ stub RoGetParameterizedTypeInstanceIID @ stub RoGetServerActivatableClasses -@ stub RoInitialize +@ stdcall RoInitialize(long) @ stub RoInspectCapturedStackBackTrace @ stub RoInspectThreadErrorInfo @ stub RoOriginateError @@ -272,7 +272,7 @@ @ stub RoSetErrorReportingFlags @ stub RoTransformError @ stub RoTransformErrorW -@ stub RoUninitialize +@ stdcall RoUninitialize() @ stub RoUnregisterForApartmentShutdown @ stub SetCleanupFlag @ stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/main.c b/dlls/combase/roapi.c similarity index 90% rename from dlls/api-ms-win-core-winrt-l1-1-0/main.c rename to dlls/combase/roapi.c index 674d21d..a2c17db 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/main.c +++ b/dlls/combase/roapi.c @@ -15,15 +15,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "objbase.h" #include "roapi.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(winrt); +WINE_DEFAULT_DEBUG_CHANNEL(combase); /*********************************************************************** - * RoInitialize (api-ms-win-core-winrt-l1-1-0.@) + * RoInitialize (combase.@) */ HRESULT WINAPI RoInitialize(RO_INIT_TYPE type) { @@ -38,7 +39,7 @@ HRESULT WINAPI RoInitialize(RO_INIT_TYPE type) } /*********************************************************************** - * RoUninitialize (api-ms-win-core-winrt-l1-1-0.@) + * RoUninitialize (combase.@) */ void WINAPI RoUninitialize(void) { diff --git a/tools/make_specfiles b/tools/make_specfiles index 0bbd826..6e2f3d7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -204,6 +204,10 @@ my @dll_groups = "gdi32", "ext-ms-win-gdi-devcaps-l1-1-0", ], + [ + "combase", + "api-ms-win-core-winrt-l1-1-0", + ], ); my $update_flags = 0;

1 0

Martin Storsjo : include: Add a roapi.h header.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: f185af6e8294db3a12a443a1de6d2b151249e612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f185af6e8294db3a12a443a1d… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 9 10:36:44 2014 +0200 include: Add a roapi.h header. --- dlls/api-ms-win-core-winrt-l1-1-0/main.c | 7 +----- include/Makefile.in | 1 + include/roapi.h | 41 ++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/main.c b/dlls/api-ms-win-core-winrt-l1-1-0/main.c index 4cf1105..674d21d 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/main.c +++ b/dlls/api-ms-win-core-winrt-l1-1-0/main.c @@ -16,17 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "objbase.h" +#include "roapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winrt); -typedef enum -{ - RO_INIT_SINGLETHREADED = 0, - RO_INIT_MULTITHREADED = 1, -} RO_INIT_TYPE; - /*********************************************************************** * RoInitialize (api-ms-win-core-winrt-l1-1-0.@) */ diff --git a/include/Makefile.in b/include/Makefile.in index a952964..5b1f3ab 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -506,6 +506,7 @@ SRCDIR_INCLUDES = \ restartmanager.h \ richedit.h \ rmxfguid.h \ + roapi.h \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roapi.h b/include/roapi.h new file mode 100644 index 0000000..0421fe9 --- /dev/null +++ b/include/roapi.h @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2014 Martin Storsjo + * + * 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 + */ + +#ifndef __WINE_ROAPI_H +#define __WINE_ROAPI_H + +#include <windef.h> + +typedef enum +{ + RO_INIT_SINGLETHREADED = 0, + RO_INIT_MULTITHREADED = 1, +} RO_INIT_TYPE; + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI RoInitialize(RO_INIT_TYPE type); +void WINAPI RoUninitialize(void); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_ROAPI_H */

1 0

Martin Storsjo : combase: Add stub dll.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 3923c550b73a1abc952c2cee9c3697a37844fef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3923c550b73a1abc952c2cee9… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 9 10:36:45 2014 +0200 combase: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/combase/Makefile.in | 1 + dlls/combase/combase.spec | 308 ++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 313 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3923c550b73a1abc952c2…

1 0

Martin Storsjo : msvcr120: Implement the _dclass/_fdclass/ _ldclass functions.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 5f395ee8e63dd6e91da47f048a569079a18d1c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f395ee8e63dd6e91da47f048… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 9 08:43:07 2014 +0200 msvcr120: Implement the _dclass/_fdclass/_ldclass functions. --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcrt/math.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 7 +++++++ 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index e0e4661..9c765b3 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1104,7 +1104,7 @@ @ varargs _cwscanf_s(wstr) @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight -@ stub _dclass +@ cdecl _dclass(double) MSVCR120__dclass @ cdecl _difftime32(long long) MSVCRT__difftime32 @ cdecl _difftime64(long long) MSVCRT__difftime64 @ stub _dosmaperr @@ -1140,7 +1140,7 @@ @ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s -@ stub _fdclass +@ cdecl _fdclass(float) MSVCR120__fdclass @ cdecl _fdopen(long str) MSVCRT__fdopen @ stub _fdpcomp @ stub _fdsign @@ -1389,7 +1389,7 @@ @ cdecl _j1(double) MSVCRT__j1 @ cdecl _jn(long double) MSVCRT__jn @ cdecl _kbhit() -@ stub _ldclass +@ cdecl _ldclass(double) MSVCR120__ldclass @ stub _ldpcomp @ stub _ldsign @ stub _ldtest diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 16a9c4e..9b75d36 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2526,3 +2526,44 @@ LDOUBLE CDECL MSVCR120_truncl(LDOUBLE x) { return MSVCR120_trunc(x); } + +/********************************************************************* + * _dclass (MSVCR120.@) + */ +short CDECL MSVCR120__dclass(double x) +{ + switch (MSVCRT__fpclass(x)) { + case MSVCRT__FPCLASS_QNAN: + case MSVCRT__FPCLASS_SNAN: + return MSVCRT_FP_NAN; + case MSVCRT__FPCLASS_NINF: + case MSVCRT__FPCLASS_PINF: + return MSVCRT_FP_INFINITE; + case MSVCRT__FPCLASS_ND: + case MSVCRT__FPCLASS_PD: + return MSVCRT_FP_SUBNORMAL; + case MSVCRT__FPCLASS_NN: + case MSVCRT__FPCLASS_PN: + default: + return MSVCRT_FP_NORMAL; + case MSVCRT__FPCLASS_NZ: + case MSVCRT__FPCLASS_PZ: + return MSVCRT_FP_ZERO; + } +} + +/********************************************************************* + * _fdclass (MSVCR120.@) + */ +short CDECL MSVCR120__fdclass(float x) +{ + return MSVCR120__dclass(x); +} + +/********************************************************************* + * _ldclass (MSVCR120.@) + */ +short CDECL MSVCR120__ldclass(LDOUBLE x) +{ + return MSVCR120__dclass(x); +} diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index f397087..41f31b9 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -824,6 +824,13 @@ struct MSVCRT__stat64 { #define MSVCRT__FPCLASS_PN 0x0100 /* Positive Normal */ #define MSVCRT__FPCLASS_PINF 0x0200 /* Positive Infinity */ +/* fpclassify constants */ +#define MSVCRT_FP_INFINITE 1 +#define MSVCRT_FP_NAN 2 +#define MSVCRT_FP_NORMAL -1 +#define MSVCRT_FP_SUBNORMAL -2 +#define MSVCRT_FP_ZERO 0 + #define MSVCRT__MCW_EM 0x0008001f #define MSVCRT__MCW_IC 0x00040000 #define MSVCRT__MCW_RC 0x00000300

1 0

Hans Leidekker : winhttp/tests: Close the connection immediately after authentication.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: bb89483397985e142304a177090d6ceb928a8fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb89483397985e142304a1770… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:50:41 2014 +0100 winhttp/tests: Close the connection immediately after authentication. --- dlls/winhttp/tests/winhttp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 7d0167b..446cba4 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1812,6 +1812,12 @@ static const char noauthmsg[] = "WWW-Authenticate: Basic realm=\"placebo\"\r\n" "\r\n"; +static const char okauthmsg[] = +"HTTP/1.1 200 OK\r\n" +"Server: winetest\r\n" +"Connection: close\r\n" +"\r\n"; + struct server_info { HANDLE event; @@ -1873,7 +1879,7 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "/auth")) { if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) - send(c, okmsg, sizeof okmsg - 1, 0); + send(c, okauthmsg, sizeof okauthmsg - 1, 0); else send(c, noauthmsg, sizeof noauthmsg - 1, 0); }

1 0

Hans Leidekker : winhttp: Don' t try to read data when the server response is HTTP_STATUS_NO_CONTENT or HTTP_STATUS_NOT_MODIFIED.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 2087a9fbe9ab5282fca8a55575fbc0126c3ac7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2087a9fbe9ab5282fca8a5557… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:50:07 2014 +0100 winhttp: Don't try to read data when the server response is HTTP_STATUS_NO_CONTENT or HTTP_STATUS_NOT_MODIFIED. Tests based on a patch by Bruno Jesus. --- dlls/winhttp/request.c | 15 ++++++----- dlls/winhttp/tests/winhttp.c | 62 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 62ecfee..61f5439 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1802,14 +1802,15 @@ static BOOL handle_authorization( request_t *request, DWORD status ) } /* set the request content length based on the headers */ -static DWORD set_content_length( request_t *request ) +static DWORD set_content_length( request_t *request, DWORD status ) { WCHAR encoding[20]; - DWORD buflen; + DWORD buflen = sizeof(request->content_length); - buflen = sizeof(request->content_length); - if (!query_headers( request, WINHTTP_QUERY_CONTENT_LENGTH|WINHTTP_QUERY_FLAG_NUMBER, - NULL, &request->content_length, &buflen, NULL )) + if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED) + request->content_length = 0; + else if (!query_headers( request, WINHTTP_QUERY_CONTENT_LENGTH|WINHTTP_QUERY_FLAG_NUMBER, + NULL, &request->content_length, &buflen, NULL )) request->content_length = ~0u; buflen = sizeof(encoding); @@ -2302,7 +2303,7 @@ static BOOL receive_response( request_t *request, BOOL async ) query = WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER; if (!(ret = query_headers( request, query, NULL, &status, &size, NULL ))) break; - set_content_length( request ); + set_content_length( request, status ); if (!(request->hdr.disable_flags & WINHTTP_DISABLE_COOKIES)) record_cookies( request ); @@ -2329,7 +2330,7 @@ static BOOL receive_response( request_t *request, BOOL async ) break; } - if (ret) refill_buffer( request, FALSE ); + if (request->content_length) refill_buffer( request, FALSE ); if (async) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 8a863cb..7d0167b 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1801,6 +1801,10 @@ static const char nocontentmsg[] = "Server: winetest\r\n" "\r\n"; +static const char notmodified[] = +"HTTP/1.1 304 Not Modified\r\n" +"\r\n"; + static const char noauthmsg[] = "HTTP/1.1 401 Unauthorized\r\n" "Server: winetest\r\n" @@ -1888,6 +1892,11 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, nocontentmsg, sizeof nocontentmsg - 1, 0); } + if (strstr(buffer, "GET /not_modified")) + { + send(c, notmodified, sizeof notmodified - 1, 0); + Sleep(6000); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -2129,7 +2138,7 @@ static void test_no_content(int port) { static const WCHAR no_contentW[] = {'/','n','o','_','c','o','n','t','e','n','t',0}; HINTERNET ses, con, req; - WCHAR buf[128]; + char buf[128]; DWORD size, len = sizeof(buf), bytes_read, status; BOOL ret; @@ -2181,6 +2190,7 @@ static void test_no_content(int port) ok(size == 0, "expected 0, got %d\n", size); ret = WinHttpReadData(req, buf, len, &bytes_read); + ok(ret, "expected success\n"); ok( bytes_read == 0, "expected 0, got %u available\n", bytes_read ); size = 12345; @@ -2202,6 +2212,55 @@ static void test_no_content(int port) WinHttpCloseHandle(ses); } +static void test_not_modified(int port) +{ + static const WCHAR pathW[] = {'/','n','o','t','_','m','o','d','i','f','i','e','d',0}; + static const WCHAR ifmodifiedW[] = {'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',':',' '}; + BOOL ret; + HINTERNET session, request, connection; + DWORD status, size, start = GetTickCount(); + SYSTEMTIME st; + WCHAR today[(sizeof(ifmodifiedW) + WINHTTP_TIME_FORMAT_BUFSIZE)/sizeof(WCHAR) + 3]; + + memcpy(today, ifmodifiedW, sizeof(ifmodifiedW)); + GetSystemTime(&st); + WinHttpTimeFromSystemTime(&st, &today[sizeof(ifmodifiedW)/sizeof(WCHAR)]); + + session = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, + WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); + ok(session != NULL, "WinHttpOpen failed: %u\n", GetLastError()); + + connection = WinHttpConnect(session, localhostW, port, 0); + ok(connection != NULL, "WinHttpConnect failed: %u\n", GetLastError()); + + request = WinHttpOpenRequest(connection, NULL, pathW, NULL, WINHTTP_NO_REFERER, + WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); + ok(request != NULL, "WinHttpOpenrequest failed: %u\n", GetLastError()); + + ret = WinHttpSendRequest(request, today, ~0u, NULL, 0, 0, 0); + ok(ret, "WinHttpSendRequest failed: %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(request, NULL); + ok(ret, "WinHttpReceiveResponse failed: %u\n", GetLastError()); + + size = sizeof(status); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, + NULL, &status, &size, NULL); + ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(status == HTTP_STATUS_NOT_MODIFIED, "got %u\n", status); + + size = 0xdeadbeef; + ret = WinHttpQueryDataAvailable(request, &size); + ok(ret, "WinHttpQueryDataAvailable failed: %u\n", GetLastError()); + ok(!size, "got %u\n", size); + + WinHttpCloseHandle(request); + WinHttpCloseHandle(connection); + WinHttpCloseHandle(session); + start = GetTickCount() - start; + ok(start <= 2000, "Expected less than 2 seconds for the test, got %u ms\n", start); +} + static void test_bad_header( int port ) { static const WCHAR bad_headerW[] = @@ -3211,6 +3270,7 @@ START_TEST (winhttp) test_basic_request(si.port, NULL, basicW); test_no_headers(si.port); test_no_content(si.port); + test_not_modified(si.port); test_basic_authentication(si.port); test_bad_header(si.port); test_multiple_reads(si.port);

1 0

Hans Leidekker : winhttp: Check the return value of send_request.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 97cd0291b004a2fe455fbf95758d45ada10a67ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=97cd0291b004a2fe455fbf957… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:49:28 2014 +0100 winhttp: Check the return value of send_request. --- dlls/winhttp/request.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 04e71d9..62ecfee 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2314,22 +2314,17 @@ static BOOL receive_response( request_t *request, BOOL async ) if (!(ret = handle_redirect( request, status ))) break; /* recurse synchronously */ - send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ); - continue; + if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue; } else if (status == HTTP_STATUS_DENIED || status == HTTP_STATUS_PROXY_AUTH_REQ) { if (request->hdr.disable_flags & WINHTTP_DISABLE_AUTHENTICATION) break; drain_content( request ); - if (!handle_authorization( request, status )) - { - ret = TRUE; - break; - } + if (!handle_authorization( request, status )) break; + /* recurse synchronously */ - send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ); - continue; + if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue; } break; }

1 0

Hans Leidekker : winhttp: Double the size of the internal read buffer.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: cd7806b2239baea45355a166a3bc0af3025eb839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7806b2239baea45355a166a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:49:02 2014 +0100 winhttp: Double the size of the internal read buffer. --- dlls/winhttp/winhttp_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 0f7749c..d08d153 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -194,7 +194,7 @@ typedef struct BOOL read_chunked_size; /* chunk size remaining */ DWORD read_pos; /* current read position in read_buf */ DWORD read_size; /* valid data size in read_buf */ - char read_buf[4096]; /* buffer for already read but not returned data */ + char read_buf[8192]; /* buffer for already read but not returned data */ header_t *headers; DWORD num_headers; WCHAR **accept_types;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
32
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 December 2014