December 2014 - Wine-Commits

Nikolay Sivov : dwrite: Implement IsMonospacedFont().
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

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 Dec. 9, 2014

Dec. 9, 2014

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

André Hentschel : qmgr/tests: Remove unused macro.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: 8ae3c7ae275b0a85ce189ec0734f381e2c9658a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae3c7ae275b0a85ce189ec07… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 00:59:16 2014 +0100 qmgr/tests: Remove unused macro. --- dlls/qmgr/tests/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qmgr/tests/file.c b/dlls/qmgr/tests/file.c index c77ff11..5e6eb34 100644 --- a/dlls/qmgr/tests/file.c +++ b/dlls/qmgr/tests/file.c @@ -28,7 +28,6 @@ #include "bits.h" /* Globals used by many tests */ -#define NUM_FILES 1 static const WCHAR test_remoteName[] = {'r','e','m','o','t','e', 0}; static const WCHAR test_localName[] = {'l','o','c','a','l', 0}; static WCHAR test_localFile[MAX_PATH];

1 0

André Hentschel : ntdll: Remove unused macros.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: 550f556dca616ae1a639e16f0170d483029f040d URL: http://source.winehq.org/git/wine.git/?a=commit;h=550f556dca616ae1a639e16f0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 00:59:28 2014 +0100 ntdll: Remove unused macros. --- dlls/ntdll/signal_i386.c | 1 - dlls/ntdll/time.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 13df4bb..1a69bc0 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -177,7 +177,6 @@ typedef struct ucontext #define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpregs)) #define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpregs->status >> 16) ? (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1) : NULL) -#define VM86_EAX 0 /* the %eax value while vm86_enter is executing */ #define VIF_FLAG 0x00080000 #define VIP_FLAG 0x00100000 diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 5ec5a1c..0f14a3e 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -74,12 +74,8 @@ static RTL_CRITICAL_SECTION TIME_tz_section = { &critsect_debug, -1, 0, 0, 0, 0 #define HOURSPERDAY 24 #define EPOCHWEEKDAY 1 /* Jan 1, 1601 was Monday */ #define DAYSPERWEEK 7 -#define EPOCHYEAR 1601 -#define DAYSPERNORMALYEAR 365 -#define DAYSPERLEAPYEAR 366 #define MONSPERYEAR 12 #define DAYSPERQUADRICENTENNIUM (365 * 400 + 97) -#define DAYSPERNORMALCENTURY (365 * 100 + 24) #define DAYSPERNORMALQUADRENNIUM (365 * 4 + 1) /* 1601 to 1970 is 369 years plus 89 leap days */

1 0

Martin Storsjo : msvcr120: Implement the _dclass/_fdclass/ _ldclass functions.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

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

Michael Stefaniuc : comctl32: Remove a stray unused GetFocus() statement ( PVS-Studio).
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: 47fa711bbcff49e28d605eecabff70e229cb5c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47fa711bbcff49e28d605eeca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 9 22:11:03 2014 +0100 comctl32: Remove a stray unused GetFocus() statement (PVS-Studio). --- dlls/comctl32/toolbar.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index a1b7966..a329c26 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5067,8 +5067,6 @@ TOOLBAR_SetHotItem2 (TOOLBAR_INFO *infoPtr, INT nHotItem, LPARAM lParam) TOOLBAR_SetHotItemEx(infoPtr, nHotItem, lParam); - GetFocus(); - return (nOldHotItem < 0) ? -1 : (LRESULT)nOldHotItem; }

1 0

Hans Leidekker : winhttp/tests: Close the connection immediately after authentication.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

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 report data pending in the socket.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: 2b6dacfdbe3f4c902a9243170880757ac2f7f806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6dacfdbe3f4c902a9243170… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:48:26 2014 +0100 winhttp: Don't report data pending in the socket. Some installers make assumptions about the size of the internal buffer. We could exceed that size when there's enough data pending in the socket. --- dlls/winhttp/net.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index b77c706..7213dd9 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -740,16 +740,8 @@ ULONG netconn_query_data_available( netconn_t *conn ) if(!netconn_connected(conn)) return 0; - if(conn->secure) { + if(conn->secure) return conn->peek_len; - }else { -#ifdef FIONREAD - ULONG unread; - - if(!ioctlsocket(conn->socket, FIONREAD, &unread)) - return unread; -#endif - } return 0; }

1 0

Hans Leidekker : winhttp/tests: Handle more potential connection failures.
by Alexandre Julliard Dec. 9, 2014

Dec. 9, 2014

Module: wine Branch: master Commit: 0d50168570e77f917abbefd16a7209ae3644741a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d50168570e77f917abbefd16… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 9 12:44:38 2014 +0100 winhttp/tests: Handle more potential connection failures. --- dlls/winhttp/tests/notification.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 13 +++---------- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index ffbea03..e14af6d 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -186,6 +186,11 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); @@ -209,6 +214,11 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); @@ -253,6 +263,11 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); @@ -276,6 +291,11 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); @@ -288,6 +308,7 @@ static void test_connection_cache( void ) ok(status == 200, "request failed unexpectedly %u\n", status); setup_test( &info, winhttp_close_handle, __LINE__ ); +done: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); @@ -353,6 +374,11 @@ static void test_redirect( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); @@ -365,6 +391,7 @@ static void test_redirect( void ) ok(status == 200, "request failed unexpectedly %u\n", status); setup_test( &info, winhttp_close_handle, __LINE__ ); +done: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); @@ -435,6 +462,15 @@ static void test_async( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); + CloseHandle( info.wait ); + return; + } ok(ret, "failed to send request %u\n", GetLastError()); WaitForSingleObject( info.wait, INFINITE ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1c56923..eda83e4 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -954,7 +954,7 @@ static void test_request_parameter_defaults(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + if (!ret && (GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT || GetLastError() == ERROR_WINHTTP_TIMEOUT)) { skip("connection failed, skipping\n"); goto done; @@ -3044,12 +3044,8 @@ static void test_WinHttpGetProxyForUrl(void) options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; memset( &info, 0, sizeof(info) ); - SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); - error = GetLastError(); - if (!ret) ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED || - error == ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT, "got %u\n", error ); - else + if (ret) { trace("Proxy.AccessType=%u\n", info.dwAccessType); trace("Proxy.Proxy=%s\n", wine_dbgstr_w(info.lpszProxy)); @@ -3063,11 +3059,8 @@ static void test_WinHttpGetProxyForUrl(void) options.lpszAutoConfigUrl = wpadW; memset( &info, 0, sizeof(info) ); - SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); - error = GetLastError(); - if (!ret) ok( error == ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT, "got %u\n", error ); - else + if (ret) { trace("Proxy.AccessType=%u\n", info.dwAccessType); trace("Proxy.Proxy=%s\n", wine_dbgstr_w(info.lpszProxy));

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 Dec. 9, 2014

Dec. 9, 2014

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