May 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Add missing GL locking to check_fbo_compat().
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: 3022a4a73c2d0df7457e44361c3386d1d1bfed2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3022a4a73c2d0df7457e44361… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 14 19:40:55 2009 +0200 wined3d: Add missing GL locking to check_fbo_compat(). --- dlls/wined3d/utils.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d697372..c4de001 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -449,6 +449,8 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form GLuint tex, fb; GLenum status; + ENTER_GL(); + while(glGetError()); glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_2D, tex); @@ -464,6 +466,8 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form checkGLcall("Framebuffer format check"); + LEAVE_GL(); + return status == GL_FRAMEBUFFER_COMPLETE_EXT; }

1 0

Henri Verbeet : wined3d: Document functions that depend on the caller to do GL locking.
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: b35e469d9d6f42695e18a290e746faae4e69e61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b35e469d9d6f42695e18a290e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 14 19:40:56 2009 +0200 wined3d: Document functions that depend on the caller to do GL locking. --- dlls/wined3d/arb_program_shader.c | 11 +++++++++++ dlls/wined3d/ati_fragment_shader.c | 2 ++ dlls/wined3d/basetexture.c | 2 ++ dlls/wined3d/context.c | 13 +++++++++++++ dlls/wined3d/directx.c | 1 + dlls/wined3d/drawprim.c | 5 +++++ dlls/wined3d/glsl_shader.c | 22 ++++++++++++++++++++++ dlls/wined3d/nvidia_texture_shader.c | 3 +++ dlls/wined3d/pixelshader.c | 2 ++ dlls/wined3d/state.c | 2 ++ dlls/wined3d/surface.c | 2 ++ dlls/wined3d/utils.c | 3 +++ dlls/wined3d/vertexshader.c | 2 ++ 13 files changed, 70 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b35e469d9d6f42695e18a…

1 0

Vincent Povirk : gdiplus: Stub GdipWarpPath.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 0c71d5b3f70b45f60ae9b91302477170a6cd17af URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c71d5b3f70b45f60ae9b9130… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 8 11:43:45 2009 -0500 gdiplus: Stub GdipWarpPath. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 10 ++++++++++ include/gdiplusenums.h | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8968528..34c897a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -621,7 +621,7 @@ @ stdcall GdipTranslateWorldTransform(ptr long long long) @ stdcall GdipVectorTransformMatrixPoints(ptr ptr long) @ stdcall GdipVectorTransformMatrixPointsI(ptr ptr long) -@ stub GdipWarpPath +@ stdcall GdipWarpPath(ptr ptr ptr long long long long long long long) @ stdcall GdipWidenPath(ptr ptr ptr long) @ stub GdipWindingModeOutline @ stdcall GdiplusNotificationHook(ptr) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 87b27fd..8ffe531 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1465,6 +1465,16 @@ GpStatus WINGDIPAPI GdipTransformPath(GpPath *path, GpMatrix *matrix) path->pathdata.Count); } +GpStatus WINGDIPAPI GdipWarpPath(GpPath *path, GpMatrix* matrix, + GDIPCONST GpPointF *points, INT count, REAL x, REAL y, REAL width, + REAL height, WarpMode warpmode, REAL flatness) +{ + FIXME("(%p,%p,%p,%i,%0.2f,%0.2f,%0.2f,%0.2f,%i,%0.2f)\n", path, matrix, + points, count, x, y, width, height, warpmode, flatness); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, REAL flatness) { diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index c989000..9997bf1 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -181,6 +181,11 @@ enum ImageType ImageTypeMetafile }; +enum WarpMode { + WarpModePerspective, + WarpModeBilinear +}; + enum WrapMode { WrapModeTile, @@ -436,6 +441,7 @@ typedef enum DashStyle DashStyle; typedef enum MatrixOrder MatrixOrder; typedef enum ImageType ImageType; typedef enum ImageFlags ImageFlags; +typedef enum WarpMode WarpMode; typedef enum WrapMode WrapMode; typedef enum MetafileType MetafileType; typedef enum LinearGradientMode LinearGradientMode;

1 0

Gerald Pfeifer : msi: Initialize variable in MSI_ApplyPatchW.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: aea6418ff0fb916d4e0fb58a98d0c079f074907e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea6418ff0fb916d4e0fb58a9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 13 01:25:40 2009 +0200 msi: Initialize variable in MSI_ApplyPatchW. --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ed8b4ab..be1ad93 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -304,7 +304,7 @@ done: static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWSTR szCommandLine) { MSIHANDLE patch = 0, info = 0; - UINT r, type; + UINT r = ERROR_SUCCESS, type; DWORD size = 0; LPCWSTR cmd_ptr = szCommandLine; LPCWSTR product_code = szProductCode;

1 0

Dmitry Timoshkov : system.sfd: Make lower case latin letters in 18 pixel Japanese bitmap font not bold.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 073bd5a1b84a02c2c45a5e6bd219ebdeba276af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=073bd5a1b84a02c2c45a5e6bd… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 14 19:53:23 2009 +0900 system.sfd: Make lower case latin letters in 18 pixel Japanese bitmap font not bold. I just copied them from Wine's 16 pixel MS Sans Serif font. --- fonts/system.sfd | 94 ++++++++++++++++++++++++++--------------------------- fonts/system.ttf | Bin 24776 -> 24820 bytes 2 files changed, 46 insertions(+), 48 deletions(-) diff --git a/fonts/system.sfd b/fonts/system.sfd index 44cdba2..c84ad8e 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -46,10 +46,10 @@ LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge 1.0 (http://fontf Encoding: UnicodeBmp UnicodeInterp: none NameList: Adobe Glyph List -DisplaySize: 16 +DisplaySize: 18 AntiAlias: 0 FitToEm: 1 -WinInfo: 42 42 15 +WinInfo: 38 38 14 OnlyBitmaps: 1 BeginChars: 65536 484 @@ -4696,58 +4696,58 @@ BDFChar: 63 95 8 0 7 -2 -2 rr<$! BDFChar: 64 96 4 1 3 11 13 J3Y4W -BDFChar: 65 97 8 1 6 0 6 -Gg$SDbfkG7 +BDFChar: 65 97 8 1 7 0 6 +G_CHtKS4XO BDFChar: 66 98 8 1 6 0 9 -^qdb\bfn;TbkM/< +J:N0[`.Wes`4,dI BDFChar: 67 99 8 1 6 0 6 -Gg*t=^s%$' +G_CTtJ:r.I BDFChar: 68 100 8 1 6 0 9 -$k*Plbfn;Tb^9Bj +"9\jLN.ck;N-#%" BDFChar: 69 101 9 1 6 0 6 -Gg+D,^s%$' -BDFChar: 70 102 5 0 3 0 9 -0OS;X?smAM?sis7 +G_CbJJ:r.I +BDFChar: 70 102 5 0 2 0 9 ++@&3M5X7S"5X5;L BDFChar: 71 103 8 1 6 -3 6 -I*BgYbfkGCb]j*f -BDFChar: 72 104 8 1 6 0 9 -^qdb\bfn;Tbfg%e +FGtm+KT(!UKQmIs +BDFChar: 72 104 8 1 5 0 9 +J:N0SaG>Y.Lkl$2 BDFChar: 73 105 3 1 2 0 9 -^q]rc^qdb$^q]pM -BDFChar: 74 106 4 0 2 -3 9 -?sitB?smAM?smAM^]4?7 +J,fS"J:N0#J:IV" +BDFChar: 74 106 4 0 1 -3 9 +5QCdL5X7S"5X7S"J,fQL BDFChar: 75 107 7 1 6 0 9 -^qdb0f^RhgfZX<q +J:N0#Lle:VLkGa. BDFChar: 76 108 3 1 2 0 9 -^qdb$^qdb$^q]pM +J:N0#J:N0#J:IV" BDFChar: 77 109 11 1 10 0 6 -s+&>/beVH<beVH<beO2Y -BDFChar: 78 110 8 1 6 0 6 -prpt+bfn92 +ZN/4"Lk(;3Lk(;3Lk#I* +BDFChar: 78 110 8 1 5 0 6 +YfMWVLkpie BDFChar: 79 111 9 1 6 0 6 -Gg+CUbfk;3 +G_Ca'KS4RM BDFChar: 80 112 8 1 6 -3 6 -prpt+bfojt^q]pM +\AX&RKZ(BNJ:IV" BDFChar: 81 113 8 1 6 -3 6 -I*BgYbfkGC$k*+9 -BDFChar: 82 114 6 1 4 0 6 -nDM*t^qd_c +FGtm+KT(!U"9\]) +BDFChar: 82 114 6 1 3 0 6 +TYQ).J:N.M BDFChar: 83 115 7 1 6 0 6 -Gg'PL(sI4) +E/9$`#`*F" BDFChar: 84 116 5 0 3 0 8 -?srJ3?smAM0E;(Q +5X=6m5X7S"+92BA BDFChar: 85 117 8 1 6 0 6 -bfn;TbfkG7 -BDFChar: 86 118 7 1 6 0 6 -bfn:%GVCfO -BDFChar: 87 119 9 1 8 0 6 -_qWr#IV*0l +LkpkCLmViU +BDFChar: 86 118 7 0 6 0 6 +Jq?BY-n#W, +BDFChar: 87 119 9 0 8 0 6 +Lk(;3Lk&J*<<+3C+ohTC BDFChar: 88 120 7 0 6 0 6 -`b[UG3,HS7 +KLddN0M$is BDFChar: 89 121 7 0 6 -3 6 -`l;n44?+/p0OOk\ -BDFChar: 90 122 7 1 6 0 6 -r!XDr@)2[? +Jq?BY-n#W<+M[sW +BDFChar: 90 122 7 1 4 0 6 +n.6^-5_/>( BDFChar: 91 123 5 1 3 -2 12 +@&1W5X7Sb5X7S"5X6Fl BDFChar: 92 124 3 1 1 -2 13 @@ -4948,7 +4948,7 @@ BDFChar: 211 222 6 0 4 12 15 OH<"( BDFChar: 212 223 5 0 3 12 15 @$$IX -BDFChar: 213 224 8 1 6 0 10 +BDFChar: 213 224 9 1 6 0 10 E%i+/Gg$SDbfkG7 BDFChar: 214 225 8 1 6 0 10 3&"_?Gg$SDbfkG7 @@ -5002,23 +5002,21 @@ BDFChar: 353 158 8 1 6 -1 13 r;?Kjr;?Kjr;?Kjr;?Hm BDFChar: 354 159 8 1 6 -1 13 r;?Kjr;?Kjr;?Kjr;?Hm -BDFChar: 475 302 5 1 3 -2 12 +BDFChar: 469 1108 5 1 3 -2 12 i'9Om5X7S"5X7S"i':ZM -BDFChar: 476 303 3 1 2 -2 9 +BDFChar: 470 1028 3 1 2 -2 9 ^q]rc^qdb$^qbK9 -BDFChar: 477 362 11 2 8 0 14 +BDFChar: 471 1118 11 2 8 0 14 HiSbMJqAT+JqAT+Jj_Qu -BDFChar: 478 363 8 1 6 0 9 +BDFChar: 472 1038 8 1 6 0 9 r;6Q=bfn;Tb^9Bj -BDFChar: 479 370 11 2 8 -2 12 +BDFChar: 473 1168 11 2 8 -2 12 JqAT+JqAT+JqASB3!]om -BDFChar: 480 371 8 1 6 -2 6 +BDFChar: 474 1169 8 1 6 -2 6 bfn;TbfkG?$ig8- -BDFChar: 481 278 7 1 5 0 14 +BDFChar: 475 302 7 1 5 0 14 +9;1eJ:N1>J:N0#J:RCp -BDFChar: 482 279 9 1 6 0 9 +BDFChar: 476 303 9 1 6 0 9 0JEKObfojtb]j*f -BDFChar: 483 27 18 0 0 0 0 -z EndBitmapFont EndSplineFont diff --git a/fonts/system.ttf b/fonts/system.ttf index 7d44945..7e79ed0 100644 Binary files a/fonts/system.ttf and b/fonts/system.ttf differ

1 0

Alexandre Julliard : wininet: Centralize detection of chunked mode and add a flag for it in the http request structure .
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: e531ccd6b0fd93bafa96f0ae07d8bee9e77e38ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=e531ccd6b0fd93bafa96f0ae0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 14 16:42:44 2009 +0200 wininet: Centralize detection of chunked mode and add a flag for it in the http request structure. --- dlls/wininet/http.c | 62 ++++++++++++++++++++++------------------------- dlls/wininet/internet.h | 1 + 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9c75862..a4a5f76 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -138,6 +138,29 @@ static LPHTTPHEADERW HTTP_GetHeader(LPWININETHTTPREQW req, LPCWSTR head) return &req->pCustHeaders[HeaderIndex]; } +/* set the request content length based on the headers */ +static DWORD set_content_length( LPWININETHTTPREQW lpwhr ) +{ + static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; + WCHAR encoding[20]; + DWORD size; + + size = sizeof(lpwhr->dwContentLength); + if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &lpwhr->dwContentLength, &size, NULL)) + lpwhr->dwContentLength = ~0u; + + size = sizeof(encoding); + if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_TRANSFER_ENCODING, encoding, &size, NULL) && + !strcmpiW(encoding, szChunked)) + { + lpwhr->dwContentLength = ~0u; + lpwhr->read_chunked = TRUE; + } + + return lpwhr->dwContentLength; +} + /*********************************************************************** * HTTP_Tokenize (internal) * @@ -753,13 +776,7 @@ static BOOL HTTP_HttpEndRequestW(LPWININETHTTPREQW lpwhr, DWORD dwFlags, DWORD_P /* process cookies here. Is this right? */ HTTP_ProcessCookies(lpwhr); - dwBufferSize = sizeof(lpwhr->dwContentLength); - if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, - &lpwhr->dwContentLength, &dwBufferSize, NULL)) - lpwhr->dwContentLength = -1; - - if (lpwhr->dwContentLength == 0) - HTTP_FinishedReading(lpwhr); + if (!set_content_length( lpwhr )) HTTP_FinishedReading(lpwhr); if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT)) { @@ -1740,15 +1757,8 @@ static DWORD HTTP_ReadChunked(WININETHTTPREQW *req, void *buffer, DWORD size, DW static DWORD HTTPREQ_Read(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD *read, BOOL sync) { - WCHAR encoding[20]; - DWORD buflen = sizeof(encoding); - static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; - - if (HTTP_HttpQueryInfoW(req, HTTP_QUERY_TRANSFER_ENCODING, encoding, &buflen, NULL) && - !strcmpiW(encoding, szChunked)) - { + if (req->read_chunked) return HTTP_ReadChunked(req, buffer, size, read, sync); - } else return HTTP_Read(req, buffer, size, read, sync); } @@ -3124,6 +3134,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) NETCON_close(&lpwhr->netConnection); if (!HTTP_ResolveName(lpwhr)) return FALSE; if (!NETCON_init(&lpwhr->netConnection, lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) return FALSE; + lpwhr->read_chunked = FALSE; } } else @@ -3402,8 +3413,6 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, { DWORD dwBufferSize; DWORD dwStatusCode; - WCHAR encoding[20]; - static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); @@ -3421,22 +3430,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, HTTP_ProcessCookies(lpwhr); - dwBufferSize = sizeof(lpwhr->dwContentLength); - if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, - &lpwhr->dwContentLength,&dwBufferSize,NULL)) - lpwhr->dwContentLength = -1; - - if (lpwhr->dwContentLength == 0) - HTTP_FinishedReading(lpwhr); - - /* Correct the case where both a Content-Length and Transfer-encoding = chunked are set */ - - dwBufferSize = sizeof(encoding); - if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_TRANSFER_ENCODING, encoding, &dwBufferSize, NULL) && - !strcmpiW(encoding, szChunked)) - { - lpwhr->dwContentLength = -1; - } + if (!set_content_length( lpwhr )) HTTP_FinishedReading(lpwhr); dwBufferSize = sizeof(dwStatusCode); if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, @@ -3826,6 +3820,8 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) bSuccess = TRUE; lend: + lpwhr->read_chunked = FALSE; + TRACE("%d <--\n", bSuccess); return bSuccess; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index f69c424..fcd95d9 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -206,6 +206,7 @@ typedef struct LPWSTR lpszCacheFile; struct HttpAuthInfo *pAuthInfo; struct HttpAuthInfo *pProxyAuthInfo; + BOOL read_chunked; /* are we reading in chunked mode? */ } WININETHTTPREQW, *LPWININETHTTPREQW;

1 0

Alexandre Julliard : wininet: Add a read-ahead buffer to allow InternetQueryDataAvailable to return the right values in chunked mode .
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 3d02c42b39c7346a97c41974418a6d01a29f9b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d02c42b39c7346a97c419744… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 14 16:45:38 2009 +0200 wininet: Add a read-ahead buffer to allow InternetQueryDataAvailable to return the right values in chunked mode. --- dlls/wininet/http.c | 376 ++++++++++++++++++++++++++++------------------- dlls/wininet/internet.h | 3 + 2 files changed, 227 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d02c42b39c7346a97c41…

1 0

Alexandre Julliard : wininet/tests: Add a test for reading chunked data.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: bb5d973127a4f2ef5cb55be7ce7ffdd109adf528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb5d973127a4f2ef5cb55be7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 14 16:49:19 2009 +0200 wininet/tests: Add a test for reading chunked data. --- dlls/wininet/tests/http.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 085bd67..7e3c08c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -493,6 +493,114 @@ abort: first_connection_to_test_url = FALSE; } +static void InternetReadFile_chunked_test(void) +{ + BOOL res; + CHAR buffer[4000]; + DWORD length; + const char *types[2] = { "*", NULL }; + HINTERNET hi, hic = 0, hor = 0; + + trace("Starting InternetReadFile chunked test\n"); + + trace("InternetOpenA <--\n"); + hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); + trace("InternetOpenA -->\n"); + + if (hi == 0x0) goto abort; + + trace("InternetConnectA <--\n"); + hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, + NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); + ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); + trace("InternetConnectA -->\n"); + + if (hic == 0x0) goto abort; + + trace("HttpOpenRequestA <--\n"); + hor = HttpOpenRequestA(hic, "GET", "/testchunked", NULL, NULL, types, + INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, + 0xdeadbead); + if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { + /* + * If the internet name can't be resolved we are probably behind + * a firewall or in some other way not directly connected to the + * Internet. Not enough reason to fail the test. Just ignore and + * abort. + */ + } else { + ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError()); + } + trace("HttpOpenRequestA -->\n"); + + if (hor == 0x0) goto abort; + + trace("HttpSendRequestA -->\n"); + SetLastError(0xdeadbeef); + res = HttpSendRequestA(hor, "", -1, NULL, 0); + ok(res || (GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED), + "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); + trace("HttpSendRequestA <--\n"); + + length = 100; + res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); + buffer[length]=0; + trace("Option CONTENT_TYPE -> %i %s\n",res,buffer); + + SetLastError( 0xdeadbeef ); + length = 100; + res = HttpQueryInfoA(hor,HTTP_QUERY_TRANSFER_ENCODING,buffer,&length,0x0); + buffer[length]=0; + trace("Option TRANSFER_ENCODING -> %i %s\n",res,buffer); + ok( res, "Failed to get TRANSFER_ENCODING option, error %u\n", GetLastError() ); + ok( !strcmp( buffer, "chunked" ), "Wrong transfer encoding '%s'\n", buffer ); + + SetLastError( 0xdeadbeef ); + length = 16; + res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,0x0); + ok( !res, "Found CONTENT_LENGTH option '%s'\n", buffer ); + ok( GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "Wrong error %u\n", GetLastError() ); + + length = 100; + trace("Entering Query loop\n"); + + while (TRUE) + { + res = InternetQueryDataAvailable(hor,&length,0x0,0x0); + ok(!(!res && length != 0),"InternetQueryDataAvailable failed with non-zero length\n"); + ok(res, "InternetQueryDataAvailable failed, error %d\n", GetLastError()); + trace("got %u available\n",length); + if (length) + { + DWORD got; + char *buffer = HeapAlloc(GetProcessHeap(),0,length+1); + + res = InternetReadFile(hor,buffer,length,&got); + + buffer[got]=0; + trace("ReadFile -> %i %i\n",res,got); + ok( length == got, "only got %u of %u available\n", got, length ); + ok( buffer[got-1] == '\n', "received partial line '%s'\n", buffer ); + + HeapFree(GetProcessHeap(),0,buffer); + if (!got) break; + } + if (length == 0) + break; + } +abort: + trace("aborting\n"); + if (hor != 0x0) { + res = InternetCloseHandle(hor); + ok (res, "InternetCloseHandle of handle opened by HttpOpenRequestA failed\n"); + } + if (hi != 0x0) { + res = InternetCloseHandle(hi); + ok (res, "InternetCloseHandle of handle opened by InternetOpenA failed\n"); + } +} + static void InternetReadFileExA_test(int flags) { DWORD rc; @@ -2571,5 +2679,6 @@ START_TEST(http) test_http_connection(); test_user_agent_header(); test_bogus_accept_types_array(); + InternetReadFile_chunked_test(); HttpSendRequestEx_test(); }

1 0

Alexandre Julliard : wininet: Get rid of the SSL-specific read-ahead buffer .
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: d1de5f37d03c8ccc52008e5b3c34d2b17776e730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1de5f37d03c8ccc52008e5b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 14 16:55:29 2009 +0200 wininet: Get rid of the SSL-specific read-ahead buffer. --- dlls/wininet/internet.h | 4 - dlls/wininet/netconnection.c | 148 +---------------------------------------- 2 files changed, 4 insertions(+), 148 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 0a4e71b..48271d6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -53,9 +53,6 @@ typedef struct BOOL useSSL; int socketFD; void *ssl_s; - char *peek_msg; - char *peek_msg_mem; - size_t peek_len; } WININET_NETCONNECTION; static inline LPWSTR WININET_strdupW( LPCWSTR str ) @@ -414,7 +411,6 @@ BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, int *recvd /* out */); BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available); -BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer); LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection); DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 3c55528..b5ca18a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -209,8 +209,6 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) pBIO_new_fp(stderr, BIO_NOCLOSE); /* FIXME: should use winedebug stuff */ meth = pSSLv23_method(); - connection->peek_msg = NULL; - connection->peek_msg_mem = NULL; #else FIXME("can't use SSL, not compiled in.\n"); INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); @@ -329,11 +327,6 @@ BOOL NETCON_close(WININET_NETCONNECTION *connection) #ifdef SONAME_LIBSSL if (connection->useSSL) { - HeapFree(GetProcessHeap(),0,connection->peek_msg_mem); - connection->peek_msg = NULL; - connection->peek_msg_mem = NULL; - connection->peek_len = 0; - pSSL_shutdown(connection->ssl_s); pSSL_free(connection->ssl_s); connection->ssl_s = NULL; @@ -541,54 +534,7 @@ BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int f else { #ifdef SONAME_LIBSSL - size_t peek_read = 0, read; - - if (flags & ~(MSG_PEEK|MSG_WAITALL)) - FIXME("SSL_read does not support the following flag: %08x\n", flags); - - /* this ugly hack is all for MSG_PEEK. eww gross */ - if(connection->peek_msg) { - if(connection->peek_len >= len) { - memcpy(buf, connection->peek_msg, len); - if(!(flags & MSG_PEEK)) { - if(connection->peek_len == len) { - HeapFree(GetProcessHeap(), 0, connection->peek_msg); - connection->peek_msg = NULL; - connection->peek_len = 0; - }else { - memmove(connection->peek_msg, connection->peek_msg+len, connection->peek_len-len); - connection->peek_len -= len; - connection->peek_msg = HeapReAlloc(GetProcessHeap(), 0, connection->peek_msg, connection->peek_len); - } - } - - *recvd = len; - return TRUE; - } - - memcpy(buf, connection->peek_msg, connection->peek_len); - peek_read = connection->peek_len; - - if(!(flags & MSG_PEEK)) { - HeapFree(GetProcessHeap(), 0, connection->peek_msg); - connection->peek_msg = NULL; - connection->peek_len = 0; - } - } - - read = pSSL_read(connection->ssl_s, (BYTE*)buf+peek_read, len-peek_read); - - if(flags & MSG_PEEK) { - if(connection->peek_msg) - connection->peek_msg = HeapReAlloc(GetProcessHeap(), 0, connection->peek_msg, - connection->peek_len+read); - else - connection->peek_msg = HeapAlloc(GetProcessHeap(), 0, read); - memcpy(connection->peek_msg+connection->peek_len, (BYTE*)buf+peek_read, read); - connection->peek_len += read; - } - - *recvd = read + peek_read; + *recvd = pSSL_read(connection->ssl_s, buf, len); return *recvd > 0 || !len; #else return FALSE; @@ -607,13 +553,9 @@ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *avail if (!NETCON_connected(connection)) return FALSE; -#ifdef SONAME_LIBSSL - if (connection->peek_msg) *available = connection->peek_len + pSSL_pending(connection->ssl_s); -#endif - -#ifdef FIONREAD if (!connection->useSSL) { +#ifdef FIONREAD int unread; int retval = ioctlsocket(connection->socketFD, FIONREAD, &unread); if (!retval) @@ -621,99 +563,17 @@ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *avail TRACE("%d bytes of queued, but unread data\n", unread); *available += unread; } - } #endif - return TRUE; -} - -/****************************************************************************** - * NETCON_getNextLine - */ -BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer) -{ - - TRACE("\n"); - - if (!NETCON_connected(connection)) return FALSE; - - if (!connection->useSSL) - { - struct pollfd pfd; - DWORD nRecv = 0; - int ret; - - pfd.fd = connection->socketFD; - pfd.events = POLLIN; - - while (nRecv < *dwBuffer) - { - if (poll(&pfd,1, RESPONSE_TIMEOUT * 1000) > 0) - { - if ((ret = recv(connection->socketFD, &lpszBuffer[nRecv], 1, 0)) <= 0) - { - if (ret == -1) INTERNET_SetLastError(sock_get_error(errno)); - break; - } - - if (lpszBuffer[nRecv] == '\n') - { - lpszBuffer[nRecv++] = '\0'; - *dwBuffer = nRecv; - TRACE(":%u %s\n", nRecv, debugstr_a(lpszBuffer)); - return TRUE; - } - if (lpszBuffer[nRecv] != '\r') - nRecv++; - } - else - { - INTERNET_SetLastError(ERROR_INTERNET_TIMEOUT); - break; - } - } } else { #ifdef SONAME_LIBSSL - long prev_timeout; - DWORD nRecv = 0; - BOOL success = TRUE; - - prev_timeout = pSSL_CTX_get_timeout(ctx); - pSSL_CTX_set_timeout(ctx, RESPONSE_TIMEOUT); - - while (nRecv < *dwBuffer) - { - int recv = 1; - if (!NETCON_recv(connection, &lpszBuffer[nRecv], 1, 0, &recv)) - { - INTERNET_SetLastError(ERROR_CONNECTION_ABORTED); - success = FALSE; - } - - if (lpszBuffer[nRecv] == '\n') - { - success = TRUE; - break; - } - if (lpszBuffer[nRecv] != '\r') - nRecv++; - } - - pSSL_CTX_set_timeout(ctx, prev_timeout); - if (success) - { - lpszBuffer[nRecv++] = '\0'; - *dwBuffer = nRecv; - TRACE("_SSL:%u %s\n", nRecv, lpszBuffer); - return TRUE; - } + *available = pSSL_pending(connection->ssl_s); #endif } - return FALSE; + return TRUE; } - LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) { #ifdef SONAME_LIBSSL

1 0

Damjan Jovanovic : oleaut32: Strip trailing decimal zeroes when rounding a number in VarFormat.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 80dfd00530d2b73b8a18129f44e6ff7f5a58c507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80dfd00530d2b73b8a18129f4… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 14 15:31:50 2009 +0200 oleaut32: Strip trailing decimal zeroes when rounding a number in VarFormat. --- dlls/oleaut32/tests/varformat.c | 1 + dlls/oleaut32/varformat.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index c2d45ae..3c0e72e 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -380,6 +380,7 @@ static void test_VarFormat(void) VARFMT(VT_R8,V_R8,-1.57,"#.##",S_OK,"-1.57"); VARFMT(VT_R8,V_R8,-0.1,".#",S_OK,"-.1"); VARFMT(VT_R8,V_R8,0.099,"#.#",S_OK,".1"); + VARFMT(VT_R8,V_R8,0.0999,"#.##",S_OK,".1"); /* 'out' is not cleared */ diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index fd257f0..f6c142d 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1313,6 +1313,9 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, } else (*prgbDig)++; + /* We converted trailing digits to zeroes => have_frac has changed */ + while (have_frac > 0 && rgbDig[have_int + have_frac - 1] == 0) + have_frac--; } } TRACE("have_int=%d,need_int=%d,have_frac=%d,need_frac=%d,pad=%d,exp=%d\n",

1 0