November 2013 - Wine-Commits

David Quintana : shlwapi: Test and fix the behaviour of the CopyTo method for file sizes not multiple of the internal buffer size , on SHCreateStreamOnFileEx-returned IStreams.
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: 899e59ffe3b2160df4719780949f8de0cc4ba8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=899e59ffe3b2160df47197809… Author: David Quintana <gigaherz(a)gmail.com> Date: Tue Oct 29 15:00:53 2013 +0100 shlwapi: Test and fix the behaviour of the CopyTo method for file sizes not multiple of the internal buffer size, on SHCreateStreamOnFileEx-returned IStreams. --- dlls/shlwapi/istream.c | 16 +++++++------- dlls/shlwapi/tests/istream.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 42f47fe..044594b 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -231,22 +231,22 @@ static HRESULT WINAPI IStream_fnCopyTo(IStream *iface, IStream* pstm, ULARGE_INT ulSize = cb.QuadPart; while (ulSize) { - ULONG ulLeft, ulAmt; + ULONG ulLeft, ulRead, ulWritten; ulLeft = ulSize > sizeof(copyBuff) ? sizeof(copyBuff) : ulSize; /* Read */ - hRet = IStream_fnRead(iface, copyBuff, ulLeft, &ulAmt); - if (pcbRead) - pcbRead->QuadPart += ulAmt; - if (FAILED(hRet) || ulAmt != ulLeft) + hRet = IStream_fnRead(iface, copyBuff, ulLeft, &ulRead); + if (FAILED(hRet) || ulRead == 0) break; + if (pcbRead) + pcbRead->QuadPart += ulRead; /* Write */ - hRet = IStream_fnWrite(pstm, copyBuff, ulLeft, &ulAmt); + hRet = IStream_fnWrite(pstm, copyBuff, ulRead, &ulWritten); if (pcbWritten) - pcbWritten->QuadPart += ulAmt; - if (FAILED(hRet) || ulAmt != ulLeft) + pcbWritten->QuadPart += ulWritten; + if (FAILED(hRet) || ulWritten != ulLeft) break; ulSize -= ulLeft; diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 097e70a..760b847 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -655,6 +655,52 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) } +void test_SHCreateStreamOnFileEx_CopyTo(void) +{ + HRESULT ret; + IStream *src, *dst; + WCHAR tmpPath[MAX_PATH]; + WCHAR srcFileName[MAX_PATH]; + WCHAR dstFileName[MAX_PATH]; + ULARGE_INTEGER count, read, written; + LARGE_INTEGER distance; + static const char srcContents[1]; + static const WCHAR prefix[] = { 'T', 'S', 'T', 0 }; + + GetTempPathW(MAX_PATH, tmpPath); + GetTempFileNameW(tmpPath, prefix, 0, srcFileName); + GetTempFileNameW(tmpPath, prefix, 0, dstFileName); + + ret = pSHCreateStreamOnFileEx(srcFileName, STGM_CREATE | STGM_READWRITE | STGM_DELETEONRELEASE, FILE_ATTRIBUTE_TEMPORARY, FALSE, NULL, &src); + ok(SUCCEEDED(ret), "SHCreateStreamOnFileEx failed with ret=0x%08x\n", ret); + + written.QuadPart = 0; + ret = IStream_Write(src, srcContents, sizeof(srcContents), &written.LowPart); + ok(SUCCEEDED(ret), "ISequentialStream_Write failed with ret=0x%08x\n", ret); + + distance.QuadPart = 0; + ret = IStream_Seek(src, distance, STREAM_SEEK_SET, &written); + ok(SUCCEEDED(ret), "ISequentialStream_Seek failed with ret=0x%08x\n", ret); + + ret = pSHCreateStreamOnFileEx(dstFileName, STGM_CREATE | STGM_READWRITE | STGM_DELETEONRELEASE, FILE_ATTRIBUTE_TEMPORARY, FALSE, NULL, &dst); + ok(SUCCEEDED(ret), "SHCreateStreamOnFileEx failed with ret=0x%08x\n", ret); + + /* Test using a count larger than the source file, so that the Read operation will fall short */ + count.QuadPart = 2; + + ret = IStream_CopyTo(src, dst, count, &read, &written); + ok(SUCCEEDED(ret), "CopyTo failed with ret=0x%08x\n", ret); + + ok(read.QuadPart == 1, "read does not match size: %d != 1\n", read.LowPart); + ok(written.QuadPart == 1, "written does not match size: %d != 1\n", written.LowPart); + + IStream_Release(dst); + IStream_Release(src); + DeleteFileW( srcFileName ); + DeleteFileW( dstFileName ); +} + + START_TEST(istream) { static const DWORD stgm_access[] = { @@ -712,4 +758,6 @@ START_TEST(istream) } } } + + test_SHCreateStreamOnFileEx_CopyTo(); }

1 0

Erich E. Hoover : hhctrl.ocx: Do not destroy the HTML Help window when HH_HELP_CONTEXT finds no context id of 0 .
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: 87b1115db1aeb39d09fa5cdf349b1c0d6fea7d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b1115db1aeb39d09fa5cdf3… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Nov 6 11:59:16 2013 -0700 hhctrl.ocx: Do not destroy the HTML Help window when HH_HELP_CONTEXT finds no context id of 0. --- dlls/hhctrl.ocx/hhctrl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 3392715..8b42569 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -273,6 +273,8 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat url = FindContextAlias(info->pCHMInfo, data); if(!url) { + if(!data) /* there may legitimately be no context alias for id 0 */ + return info->WinType.hwndHelp; ReleaseHelpViewer(info); return NULL; }

1 0

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: da6c728195ab17ae9dcf83cd3c97c67093c72e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6c728195ab17ae9dcf83cd3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 7 16:47:33 2013 +0100 Assorted spelling fixes. --- dlls/advapi32/tests/service.c | 2 +- dlls/avifil32/icmstream.c | 2 +- dlls/kernel32/tests/comm.c | 2 +- dlls/localspl/provider.c | 2 +- dlls/urlmon/uri.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index b47a5e3..fac6bd9 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -415,7 +415,7 @@ static void test_create_delete_svc(void) /* Wait a while. One of the following tests also does a CreateService for the * same servicename and this would result in an ERROR_SERVICE_MARKED_FOR_DELETE - * error if we do this to quick. Vista seems more picky then the others. + * error if we do this too quickly. Vista seems more picky than the others. */ Sleep(1000); diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index 31dd2be..eaca594 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -314,7 +314,7 @@ static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos, return This->lLastKey; } } else if (flags & FIND_ANY) { - return pos; /* We really don't know, reread is to expensive, so guess. */ + return pos; /* We really don't know, reread is too expensive, so guess. */ } else if (flags & FIND_FORMAT) { if (flags & FIND_PREV) return 0; diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index db5a369..1f88707 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1070,7 +1070,7 @@ static void test_LoopbackRead(void) ok(read == sizeof(tbuf),"ReadFile read %d bytes, expected \"%s\"\n", read,rbuf); /* Now do the same with a slower Baud rate. - As we request more characters then written, we will hit the timeout + As we request more characters than written, we will hit the timeout */ ok(GetCommState(hcom, &dcb), "GetCommState failed\n"); diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 0c12a0e..87d84fd 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -251,7 +251,7 @@ static BOOL apd_copyfile( WCHAR *pathname, WCHAR *file_part, apd_data_t *apd ) * * RETURNS * the length (in WCHAR) of the serverpart (0 for the local computer) - * (-length), when the name is to long + * (-length), when the name is too long * */ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index dbdeaff..72e9053 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1904,7 +1904,7 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f return TRUE; } -/* Parses the path of an opaque URI (much less strict then the parser +/* Parses the path of an opaque URI (much less strict than the parser * for a hierarchical URI). * * NOTE:

1 0

Frédéric Delanoy : gdi32: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: adee328a508b5e2dc17fd2d6d833a75d26b2bb85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adee328a508b5e2dc17fd2d6d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 6 21:21:08 2013 +0100 gdi32: Use BOOL type where appropriate. --- dlls/gdi32/dibdrv/objects.c | 6 +++--- dlls/gdi32/enhmfdrv/objects.c | 2 +- dlls/gdi32/metafile.c | 2 +- dlls/gdi32/opengl.c | 4 ++-- dlls/gdi32/palette.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 5ff9d1a..1f05ab0 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1362,7 +1362,7 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P return; } -static int wide_line_segment( dibdrv_physdev *pdev, HRGN total, +static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, const POINT *pt_1, const POINT *pt_2, int dx, int dy, BOOL need_cap_1, BOOL need_cap_2, struct face *face_1, struct face *face_2 ) { @@ -1370,7 +1370,7 @@ static int wide_line_segment( dibdrv_physdev *pdev, HRGN total, BOOL sq_cap_1 = need_cap_1 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); BOOL sq_cap_2 = need_cap_2 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); - if (dx == 0 && dy == 0) return 0; + if (dx == 0 && dy == 0) return FALSE; if (dy == 0) { @@ -1487,7 +1487,7 @@ static int wide_line_segment( dibdrv_physdev *pdev, HRGN total, face_1->dx = face_2->dx = dx; face_1->dy = face_2->dy = dy; - return 1; + return TRUE; } static void wide_line_segments( dibdrv_physdev *pdev, int num, const POINT *pts, BOOL close, diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 4e1f3b1..60414a3 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -81,7 +81,7 @@ BOOL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) UINT index; BOOL ret = TRUE; - if(!(index = EMFDRV_FindObject(dev, obj))) return 0; + if(!(index = EMFDRV_FindObject(dev, obj))) return FALSE; emr.emr.iType = EMR_DELETEOBJECT; emr.emr.nSize = sizeof(emr); diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 406728e..0cb36af 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -471,7 +471,7 @@ BOOL WINAPI EnumMetaFile(HDC hdc, HMETAFILE hmf, MFENUMPROC lpEnumFunc, LPARAM l TRACE("(%p,%p,%p,%lx)\n", hdc, hmf, lpEnumFunc, lpData); - if (!mh) return 0; + if (!mh) return FALSE; /* save the current pen, brush and font */ hPen = GetCurrentObject(hdc, OBJ_PEN); diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 925a283..5787379 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -112,7 +112,7 @@ BOOL WINAPI SetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ) { if (!opengl32) opengl32 = LoadLibraryW( opengl32W ); if (!(wglSetPixelFormat = (void *)GetProcAddress( opengl32, "wglSetPixelFormat" ))) - return 0; + return FALSE; } return wglSetPixelFormat( hdc, fmt, pfd ); } @@ -126,7 +126,7 @@ BOOL WINAPI SwapBuffers( HDC hdc ) { if (!opengl32) opengl32 = LoadLibraryW( opengl32W ); if (!(wglSwapBuffers = (void *)GetProcAddress( opengl32, "wglSwapBuffers" ))) - return 0; + return FALSE; } return wglSwapBuffers( hdc ); } diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 81f0aa5..fb27f4f 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -319,13 +319,13 @@ BOOL WINAPI AnimatePalette( const PALETTEENTRY *pptr = PaletteColors; palPtr = GDI_GetObjPtr( hPal, OBJ_PAL ); - if (!palPtr) return 0; + if (!palPtr) return FALSE; pal_entries = palPtr->count; if (StartIndex >= pal_entries) { GDI_ReleaseObj( hPal ); - return 0; + return FALSE; } if (StartIndex+NumEntries > pal_entries) NumEntries = pal_entries - StartIndex;

1 0

André Hentschel : msctf/tests: Mark GUID_NULL as result broken for Win8.
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: 15543701a7e7ef459ad245c9b41a8b31d27cda4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=15543701a7e7ef459ad245c9b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 6 21:45:56 2013 +0100 msctf/tests: Mark GUID_NULL as result broken for Win8. --- dlls/msctf/tests/inputprocessor.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index d5df2dd..89d1e1a 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -938,7 +938,8 @@ static void test_EnumLanguageProfiles(void) { found = TRUE; ok(profile.langid == gLangid, "LangId Incorrect\n"); - ok(IsEqualGUID(&profile.catid,&GUID_TFCAT_TIP_KEYBOARD), "CatId Incorrect\n"); + ok(IsEqualGUID(&profile.catid,&GUID_TFCAT_TIP_KEYBOARD) || + broken(IsEqualGUID(&profile.catid,&GUID_NULL) /* Win8 */), "CatId Incorrect\n"); ok(IsEqualGUID(&profile.guidProfile,&CLSID_FakeService), "guidProfile Incorrect\n"); } }

1 0

André Hentschel : msctf/tests: Always set focus again explicitly for Win7+.
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: e22908a8678acf23931e712ea236838af22626a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22908a8678acf23931e712ea… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 6 21:28:51 2013 +0100 msctf/tests: Always set focus again explicitly for Win7+. --- dlls/msctf/tests/inputprocessor.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index eb293bc..d5df2dd 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2075,20 +2075,15 @@ static void test_AssociateFocus(void) processPendingMessages(); ITfThreadMgr_GetFocus(g_tm, &dmcheck); - if (dmcheck != NULL) - { - ok(dmcheck == dm1, "Expected DocumentMgr not focused\n"); - ITfDocumentMgr_Release(dmcheck); - } - else - { - /* Sometimes we need to explicitly set focus on Win7 */ - test_CurrentFocus = dm1; - test_PrevFocus = FOCUS_IGNORE; - test_OnSetFocus = SINK_EXPECTED; - ITfThreadMgr_SetFocus(g_tm, dm1); - sink_check_ok(&test_OnSetFocus,"OnSetFocus"); - } + ok(dmcheck == dm1 || broken(dmcheck == dmorig /* Win7+ */), "Expected DocumentMgr not focused\n"); + ITfDocumentMgr_Release(dmcheck); + + /* We need to explicitly set focus on Win7+ */ + test_CurrentFocus = dm1; + test_PrevFocus = FOCUS_IGNORE; + test_OnSetFocus = SINK_OPTIONAL; /* Doesn't always fire on Win7+ */ + ITfThreadMgr_SetFocus(g_tm, dm1); + sink_check_ok(&test_OnSetFocus, "OnSetFocus"); hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,dm2,&olddm); ok(SUCCEEDED(hr),"AssociateFocus failed\n"); @@ -2133,7 +2128,7 @@ static void test_AssociateFocus(void) test_CurrentFocus = dmorig; test_PrevFocus = dm1; - test_OnSetFocus = SINK_EXPECTED; + test_OnSetFocus = SINK_OPTIONAL; /* Doesn't always fire on Win7+ */ test_ACP_GetStatus = SINK_IGNORE; ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus");

1 0

Rico Schüller : wined3d: Use GL_EXT_texture_mirror_clamp when available.
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: fb926490fed5d1d2dcfe71760c1c048fe2241d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb926490fed5d1d2dcfe71760… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Nov 6 21:33:15 2013 +0100 wined3d: Use GL_EXT_texture_mirror_clamp when available. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 69d3401..3fc4664 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -179,6 +179,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 }, {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, + {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, @@ -2933,6 +2934,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (!counter_bits) gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; } + if (!gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] && gl_info->supported[EXT_TEXTURE_MIRROR_CLAMP]) + { + TRACE(" IMPLIED: ATI_texture_mirror_once support (by EXT_texture_mirror_clamp).\n"); + gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] = TRUE; + } if (!gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] && gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) { TRACE(" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 76b8767..b357bb1 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -127,6 +127,7 @@ enum wined3d_gl_extension EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_FILTER_ANISOTROPIC, EXT_TEXTURE_LOD_BIAS, + EXT_TEXTURE_MIRROR_CLAMP, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE, EXT_VERTEX_ARRAY_BGRA,

1 0

Ričardas Barkauskas : wininet: Check if connection is alive before sending request.
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: 6c0ee62d7aeeb8933e6b82b2ed1c6b73d89f8e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0ee62d7aeeb8933e6b82b2e… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Thu Nov 7 00:31:06 2013 +0200 wininet: Check if connection is alive before sending request. --- dlls/wininet/http.c | 6 ++++++ dlls/wininet/tests/http.c | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f7d6650..9c2d5d4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4935,6 +4935,12 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, char *ascii_req; loop_next = FALSE; + + if (request->netconn && !NETCON_is_alive(request->netconn)) + { + free_netconn(request->netconn); + request->netconn = NULL; + } reusing_connection = request->netconn != NULL; if(redirected) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b2c4c37..7b7a33c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2883,22 +2883,21 @@ static void test_connection_closing(int port) CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); - todo_wine CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); - todo_wine CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); - test_status_code_todo(req, 210); + test_status_code(req, 210); SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); - SET_WINE_ALLOW(INTERNET_STATUS_SENDING_REQUEST); SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); @@ -2916,7 +2915,7 @@ static void test_connection_closing(int port) CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); - todo_wine CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); @@ -2924,7 +2923,7 @@ static void test_connection_closing(int port) CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); - test_status_code_todo(req, 200); + test_status_code(req, 200); SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED);

1 0

Sebastian Lackner : shlwapi: Fix UrlCombineW for URLs containing a quotation mark.
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: 7ee2c24a8cb0ea3ca50d62634fc5772438c2ae39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee2c24a8cb0ea3ca50d62634… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 6 23:01:42 2013 +0100 shlwapi: Fix UrlCombineW for URLs containing a quotation mark. --- dlls/shlwapi/tests/url.c | 2 ++ dlls/shlwapi/url.c | 15 +++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index d2ac077..7c1fdb5 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -327,6 +327,8 @@ static const TEST_URL_COMBINE TEST_COMBINE[] = { {"http://www.winehq.org/test12", "#", 0, S_OK, "http://www.winehq.org/test12#"}, {"http://www.winehq.org/test13#aaa", "#bbb", 0, S_OK, "http://www.winehq.org/test13#bbb"}, {"http://www.winehq.org/test14#aaa/bbb#ccc", "#", 0, S_OK, "http://www.winehq.org/test14#"}, + {"http://www.winehq.org/tests/?query=x/y/z", "tests15", 0, S_OK, "http://www.winehq.org/tests/tests15"}, + {"http://www.winehq.org/tests/?query=x/y/z#example", "tests16", 0, S_OK, "http://www.winehq.org/tests/tests16"}, {"file:///C:\\dir\\file.txt", "test.txt", 0, S_OK, "file:///C:/dir/test.txt"}, {"file:///C:\\dir\\file.txt#hash\\hash", "test.txt", 0, S_OK, "file:///C:/dir/file.txt#hash/test.txt"}, {"file:///C:\\dir\\file.html#hash\\hash", "test.html", 0, S_OK, "file:///C:/dir/test.html"}, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 102faf5..11589e4 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -665,6 +665,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, DWORD i, len, res1, res2, process_case = 0; LPWSTR work, preliminary, mbase, mrelative; static const WCHAR myfilestr[] = {'f','i','l','e',':','/','/','/','\0'}; + static const WCHAR fragquerystr[] = {'#','?',0}; HRESULT ret; TRACE("(base %s, Relative %s, Combine size %d, flags %08x)\n", @@ -736,17 +737,19 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, } } - /* If there is a '#' and the characters immediately preceding it are - * ".htm[l]", then begin looking for the last leaf starting from - * the '#'. Otherwise the '#' is not meaningful and just start - * looking from the end. */ - if ((work = strchrW(base.pszSuffix + sizeloc, '#'))) { + /* If there is a '?', then the remaining part can only contain a + * query string or fragment, so start looking for the last leaf + * from the '?'. Otherwise, if there is a '#' and the characters + * immediately preceding it are ".htm[l]", then begin looking for + * the last leaf starting from the '#'. Otherwise the '#' is not + * meaningful and just start looking from the end. */ + if ((work = strpbrkW(base.pszSuffix + sizeloc, fragquerystr))) { const WCHAR htmlW[] = {'.','h','t','m','l',0}; const int len_htmlW = 5; const WCHAR htmW[] = {'.','h','t','m',0}; const int len_htmW = 4; - if (base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) + if (*work == '?' || base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) manual_search = TRUE; else if (work - base.pszSuffix > len_htmW) { work -= len_htmW;

1 0

Frédéric Delanoy : gdi32/tests: Align return type from SetVirtualResolution prototype with its definition.
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: 4da17dbf5d5747dcc2741b7f322353379b4cbe55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da17dbf5d5747dcc2741b7f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 6 21:21:07 2013 +0100 gdi32/tests: Align return type from SetVirtualResolution prototype with its definition. --- dlls/gdi32/tests/mapping.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 4850c29..573a97f 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -32,7 +32,7 @@ static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static DWORD (WINAPI *pGetLayout)(HDC hdc); static INT (WINAPI *pGetRandomRgn)(HDC hDC, HRGN hRgn, INT iCode); static BOOL (WINAPI *pGetTransform)(HDC, DWORD, XFORM *); -static DWORD (WINAPI *pSetVirtualResolution)(HDC, DWORD, DWORD, DWORD, DWORD); +static BOOL (WINAPI *pSetVirtualResolution)(HDC, DWORD, DWORD, DWORD, DWORD); #define rough_match(got, expected) (abs( MulDiv( (got) - (expected), 1000, (expected) )) <= 5)

1 0