May 2008 - Wine-Commits - list.winehq.org

Hans Leidekker : wininet: Partial implementation of InternetGet/SetCookieEx .
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: a3ea34c56e1342d1715510f8203086f575a11bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ea34c56e1342d1715510f82… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri May 9 15:16:05 2008 +0200 wininet: Partial implementation of InternetGet/SetCookieEx. --- dlls/wininet/cookie.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 2eef2d9..bd22bc6 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -544,10 +544,12 @@ BOOL WINAPI InternetSetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR lpszCookieData, DWORD dwFlags, DWORD_PTR dwReserved) { - FIXME("(%s, %s, %s, 0x%08x, 0x%08lx) stub\n", + TRACE("(%s, %s, %s, 0x%08x, 0x%08lx)\n", debugstr_a(lpszURL), debugstr_a(lpszCookieName), debugstr_a(lpszCookieData), dwFlags, dwReserved); - return TRUE; + + if (dwFlags) FIXME("flags 0x%08x not supported\n", dwFlags); + return InternetSetCookieA(lpszURL, lpszCookieName, lpszCookieData); } /*********************************************************************** @@ -563,10 +565,12 @@ DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCWSTR lpszCookieData, DWORD dwFlags, DWORD_PTR dwReserved) { - FIXME("(%s, %s, %s, 0x%08x, 0x%08lx) stub\n", + TRACE("(%s, %s, %s, 0x%08x, 0x%08lx)\n", debugstr_w(lpszURL), debugstr_w(lpszCookieName), debugstr_w(lpszCookieData), dwFlags, dwReserved); - return TRUE; + + if (dwFlags) FIXME("flags 0x%08x not supported\n", dwFlags); + return InternetSetCookieW(lpszURL, lpszCookieName, lpszCookieData); } /*********************************************************************** @@ -577,10 +581,12 @@ DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCW BOOL WINAPI InternetGetCookieExA( LPCSTR pchURL, LPCSTR pchCookieName, LPSTR pchCookieData, LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) { - FIXME("(%s, %s, %s, %p, 0x%08x, %p) stub\n", + TRACE("(%s, %s, %s, %p, 0x%08x, %p)\n", debugstr_a(pchURL), debugstr_a(pchCookieName), debugstr_a(pchCookieData), pcchCookieData, dwFlags, lpReserved); - return FALSE; + + if (dwFlags) FIXME("flags 0x%08x not supported\n", dwFlags); + return InternetGetCookieA(pchURL, pchCookieName, pchCookieData, pcchCookieData); } /*********************************************************************** @@ -596,10 +602,12 @@ BOOL WINAPI InternetGetCookieExA( LPCSTR pchURL, LPCSTR pchCookieName, LPSTR pch BOOL WINAPI InternetGetCookieExW( LPCWSTR pchURL, LPCWSTR pchCookieName, LPWSTR pchCookieData, LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) { - FIXME("(%s, %s, %s, %p, 0x%08x, %p) stub\n", + TRACE("(%s, %s, %s, %p, 0x%08x, %p)\n", debugstr_w(pchURL), debugstr_w(pchCookieName), debugstr_w(pchCookieData), pcchCookieData, dwFlags, lpReserved); - return FALSE; + + if (dwFlags) FIXME("flags 0x%08x not supported\n", dwFlags); + return InternetGetCookieW(pchURL, pchCookieName, pchCookieData, pcchCookieData); } /***********************************************************************

1 0

Hans Leidekker : wininet: Make a test pass on IE6.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 3f795c621dc8ad9d7f2558887d4f5f1e57b8ff88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f795c621dc8ad9d7f2558887… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri May 9 15:11:49 2008 +0200 wininet: Make a test pass on IE6. --- dlls/wininet/tests/http.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 58907ba..0a02dfe 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1792,7 +1792,9 @@ static void test_bogus_accept_types_array(void) size = sizeof(buffer); ret = HttpQueryInfo(req, HTTP_QUERY_ACCEPT | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); - ok(!strcmp(buffer, "*/*, %p, */*"), "got '%s' expected '*/*, %%p, */*'\n", buffer); + ok(!strcmp(buffer, ", */*, %p, , */*") || /* IE6 */ + !strcmp(buffer, "*/*, %p, */*"), + "got '%s' expected '*/*, %%p, */*' or ', */*, %%p, , */*'\n", buffer); InternetCloseHandle(req); InternetCloseHandle(con);

1 0

Hans Leidekker : wininet: Don' t overwrite content length header in HttpSendRequest.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: aec0e93d23f214d82e0bb7b7e2f5eb315eebb3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec0e93d23f214d82e0bb7b7e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri May 9 13:12:42 2008 +0200 wininet: Don't overwrite content length header in HttpSendRequest. --- dlls/wininet/http.c | 2 +- dlls/wininet/tests/http.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3cafcae..b8e3b4d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3171,7 +3171,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, if (dwContentLength || !strcmpW(lpwhr->lpszVerb, szPost)) { sprintfW(contentLengthStr, szContentLength, dwContentLength); - HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD_IF_NEW); } if (lpwhr->lpHttpSession->lpAppInfo->lpszAgent) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 705fcac..58907ba 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1452,6 +1452,17 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, page1, sizeof page1-1, 0); } + if (strstr(buffer, "POST /test7")) + { + if (strstr(buffer, "Content-Length: 100")) + { + send(c, okmsg, sizeof okmsg-1, 0); + send(c, page1, sizeof page1-1, 0); + } + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg-1, 0); @@ -1654,6 +1665,23 @@ static void test_header_handling_order(int port) ok(status == 200, "request failed with status %u\n", status); InternetCloseHandle(request); + + request = HttpOpenRequest(connect, "POST", "/test7", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeaders(request, "Content-Length: 100\r\n", ~0UL, HTTP_ADDREQ_FLAG_ADD_IF_NEW); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequest(request, connection, ~0UL, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok(ret, "HttpQueryInfo failed\n"); + ok(status == 200, "request failed with status %u\n", status); + + InternetCloseHandle(request); InternetCloseHandle(connect); InternetCloseHandle(session); }

1 0

Nikolay Sivov : gdiplus: Added GdipLoadImageFromFileICM (no icm yet).
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 888262ede77dea2bd97cdd38a5c056a3a2760a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888262ede77dea2bd97cdd38a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri May 9 16:40:21 2008 +0400 gdiplus: Added GdipLoadImageFromFileICM (no icm yet). --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 6 ++++++ dlls/gdiplus/tests/image.c | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 905cff5..e9de1cd 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -436,7 +436,7 @@ @ stub GdipIsVisibleRegionRect @ stub GdipIsVisibleRegionRectI @ stdcall GdipLoadImageFromFile(wstr ptr) -@ stub GdipLoadImageFromFileICM +@ stdcall GdipLoadImageFromFileICM(wstr ptr) @ stdcall GdipLoadImageFromStream(ptr ptr) @ stdcall GdipLoadImageFromStreamICM(ptr ptr) @ stub GdipMeasureCharacterRanges diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index fc4146f..72bf7f5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -727,6 +727,12 @@ GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR* filename, return stat; } +/* FIXME: no icm handling */ +GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage **image) +{ + return GdipLoadImageFromFile(filename, image); +} + GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) { IPicture *pic; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 26aede0..5142f7c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -121,6 +121,12 @@ static void test_LoadingImages(void) stat = GdipLoadImageFromFile(0, (GpImage**)0xdeadbeef); expect(InvalidParameter, stat); + + stat = GdipLoadImageFromFileICM(0, 0); + expect(InvalidParameter, stat); + + stat = GdipLoadImageFromFileICM(0, (GpImage**)0xdeadbeef); + expect(InvalidParameter, stat); } static void test_SavingImages(void)

1 0

Nikolay Sivov : gdiplus: GdipGetImageFlags simple stub with test.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 03b6c5e85f90b108281bfa4a2af5a2c1968cd4a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b6c5e85f90b108281bfa4a2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri May 9 16:39:43 2008 +0400 gdiplus: GdipGetImageFlags simple stub with test. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/image.c | 12 ++++++++++++ dlls/gdiplus/tests/image.c | 19 +++++++++++++++++++ 4 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ec3897a..905cff5 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -286,7 +286,7 @@ @ stdcall GdipGetImageDimension(ptr ptr ptr) @ stdcall GdipGetImageEncoders(long long ptr) @ stdcall GdipGetImageEncodersSize(ptr ptr) -@ stub GdipGetImageFlags +@ stdcall GdipGetImageFlags(ptr ptr) @ stdcall GdipGetImageGraphicsContext(ptr ptr) @ stdcall GdipGetImageHeight(ptr ptr) @ stdcall GdipGetImageHorizontalResolution(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 09ef83f..539254b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -149,6 +149,7 @@ struct GpCustomLineCap{ struct GpImage{ IPicture* picture; ImageType type; + UINT flags; }; struct GpMetafile{ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a89b6ea..fc4146f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -384,6 +384,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, } (*bitmap)->image.type = ImageTypeBitmap; + (*bitmap)->image.flags = ImageFlagsNone; (*bitmap)->width = width; (*bitmap)->height = height; (*bitmap)->format = format; @@ -789,6 +790,7 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) } (*image)->picture = pic; + (*image)->flags = ImageFlagsNone; return Ok; } @@ -1108,3 +1110,13 @@ GpStatus WINGDIPAPI GdipSetEffectParameters(CGpEffect *effect, return NotImplemented; } + +GpStatus WINGDIPAPI GdipGetImageFlags(GpImage *image, UINT *flags) +{ + if(!image || !flags) + return InvalidParameter; + + *flags = image->flags; + + return Ok; +} diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index dcb86fc..26aede0 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -417,6 +417,24 @@ static void test_GdipCreateBitmapFromHBITMAP(void) GlobalFree(hbm); } +static void test_GdipGetImageFlags(void) +{ + GpImage *img; + GpStatus stat; + UINT flags; + + img = (GpImage*)0xdeadbeef; + + stat = GdipGetImageFlags(NULL, NULL); + expect(InvalidParameter, stat); + + stat = GdipGetImageFlags(NULL, &flags); + expect(InvalidParameter, stat); + + stat = GdipGetImageFlags(img, NULL); + expect(InvalidParameter, stat); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -436,6 +454,7 @@ START_TEST(image) test_encoders(); test_LockBits(); test_GdipCreateBitmapFromHBITMAP(); + test_GdipGetImageFlags(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus: Added GdipCreateFromHWNDICM (no icm yet) with test .
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: eb18ce9d4e583d62afa2c3c69194c01fc14d15b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb18ce9d4e583d62afa2c3c69… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri May 9 16:40:41 2008 +0400 gdiplus: Added GdipCreateFromHWNDICM (no icm yet) with test. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 6 ++++++ dlls/gdiplus/tests/graphics.c | 5 +++++ include/gdiplusflat.h | 1 + 4 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e9de1cd..297fefe 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -92,7 +92,7 @@ @ stdcall GdipCreateFromHDC2(long long ptr) @ stdcall GdipCreateFromHDC(long ptr) @ stdcall GdipCreateFromHWND(long ptr) -@ stub GdipCreateFromHWNDICM +@ stdcall GdipCreateFromHWNDICM(long ptr) @ stdcall GdipCreateHBITMAPFromBitmap(ptr ptr long) @ stub GdipCreateHICONFromBitmap @ stub GdipCreateHalftonePalette diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a86a015..db12324 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -797,6 +797,12 @@ GpStatus WINGDIPAPI GdipCreateFromHWND(HWND hwnd, GpGraphics **graphics) return Ok; } +/* FIXME: no icm handling */ +GpStatus WINGDIPAPI GdipCreateFromHWNDICM(HWND hwnd, GpGraphics **graphics) +{ + return GdipCreateFromHWND(hwnd, graphics); +} + GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, GpMetafile **metafile) { diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 77f1597..168eae3 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -47,6 +47,11 @@ static void test_constructor_destructor(void) stat = GdipDeleteGraphics(graphics); expect(Ok, stat); + stat = GdipCreateFromHWNDICM(NULL, &graphics); + expect(Ok, stat); + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + stat = GdipDeleteGraphics(NULL); expect(InvalidParameter, stat); ReleaseDC(0, hdc); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8c46888..55ebe91 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -53,6 +53,7 @@ GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**); +GpStatus WINGDIPAPI GdipCreateFromHWNDICM(HWND,GpGraphics**); GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF*,GDIPCONST GpPointF*, ARGB,ARGB,GpWrapMode,GpLineGradient**); GpStatus WINGDIPAPI GdipCreateLineBrushI(GDIPCONST GpPoint*,GDIPCONST GpPoint*,

1 0

Nikolay Sivov : gdiplus: ImageFlags enum defined.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 388caf3255eefea0d0d91f657efed4a8eb023be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=388caf3255eefea0d0d91f657… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri May 9 16:39:13 2008 +0400 gdiplus: ImageFlags enum defined. --- include/gdiplusenums.h | 37 ++++++++++++++++++++++++++++--------- include/gdiplusflat.h | 1 + 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index b0d9884..4e937c0 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -259,15 +259,33 @@ enum HotkeyPrefix enum ImageCodecFlags { - ImageCodecFlagsEncoder = 1, - ImageCodecFlagsDecoder = 2, - ImageCodecFlagsSupportBitmap = 4, - ImageCodecFlagsSupportVector = 8, - ImageCodecFlagsSeekableEncode = 16, - ImageCodecFlagsBlockingDecode = 32, - ImageCodecFlagsBuiltin = 65536, - ImageCodecFlagsSystem = 131072, - ImageCodecFlagsUser = 262144 + ImageCodecFlagsEncoder = 1, + ImageCodecFlagsDecoder = 2, + ImageCodecFlagsSupportBitmap = 4, + ImageCodecFlagsSupportVector = 8, + ImageCodecFlagsSeekableEncode = 16, + ImageCodecFlagsBlockingDecode = 32, + ImageCodecFlagsBuiltin = 65536, + ImageCodecFlagsSystem = 131072, + ImageCodecFlagsUser = 262144 +}; + +enum ImageFlags +{ + ImageFlagsNone = 0, + ImageFlagsScalable = 0x0001, + ImageFlagsHasAlpha = 0x0002, + ImageFlagsHasTranslucent = 0x0004, + ImageFlagsPartiallyScalable = 0x0008, + ImageFlagsColorSpaceRGB = 0x0010, + ImageFlagsColorSpaceCMYK = 0x0020, + ImageFlagsColorSpaceGRAY = 0x0040, + ImageFlagsColorSpaceYCBCR = 0x0080, + ImageFlagsColorSpaceYCCK = 0x0100, + ImageFlagsHasRealDPI = 0x1000, + ImageFlagsHasRealPixelSize = 0x2000, + ImageFlagsReadOnly = 0x00010000, + ImageFlagsCaching = 0x00020000 }; enum CombineMode @@ -297,6 +315,7 @@ typedef enum DashCap DashCap; typedef enum DashStyle DashStyle; typedef enum MatrixOrder MatrixOrder; typedef enum ImageType ImageType; +typedef enum ImageFlags ImageFlags; typedef enum WrapMode WrapMode; typedef enum MetafileType MetafileType; typedef enum LinearGradientMode LinearGradientMode; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ddd4914..8c46888 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -301,6 +301,7 @@ GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*); GpStatus WINGDIPAPI GdipGetImageType(GpImage*,ImageType*); GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*); +GpStatus WINGDIPAPI GdipGetImageFlags(GpImage*,UINT*); GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE,MetafileHeader*); GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR*,MetafileHeader*); GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader*);

1 0

Nikolay Sivov : gdi32: Avoid null pointer dereference in CreateDIBSection.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 1441311d361d4d250baf5ceb7d95af1b6eac43f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1441311d361d4d250baf5ceb7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat May 10 11:14:29 2008 +0400 gdi32: Avoid null pointer dereference in CreateDIBSection. --- dlls/gdi32/dib.c | 5 +++++ dlls/gdi32/tests/bitmap.c | 7 +++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 980e0f3..ffd6f31 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1258,6 +1258,11 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, DWORD compression, sizeImage; void *mapBits = NULL; + if(!bmi){ + if(bits) *bits = NULL; + return NULL; + } + if (((bitmap_type = DIB_GetBitmapInfo( &bmi->bmiHeader, &width, &height, &planes, &bpp, &compression, &sizeImage )) == -1)) return 0; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 2ef2891..f8be7c0 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -416,6 +416,13 @@ static void test_dibsections(void) pbmi->bmiHeader.biCompression = BI_RGB; SetLastError(0xdeadbeef); + + /* invalid pointer for BITMAPINFO + (*bits should be NULL on error) */ + bits = (BYTE*)0xdeadbeef; + hdib = CreateDIBSection(hdc, NULL, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hdib == NULL && bits == NULL, "CreateDIBSection failed for invalid parameter: bmi == 0x0\n"); + hdib = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); ok(GetObject(hdib, sizeof(DIBSECTION), &dibsec) != 0, "GetObject failed for DIBSection\n");

1 0

Jacek Caban : urlmon: Better error handling in file protocol.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 02bf65a752400c20b1bfbf931a119c782774b8c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02bf65a752400c20b1bfbf931… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 10 14:20:53 2008 +0200 urlmon: Better error handling in file protocol. --- dlls/urlmon/file.c | 3 +++ dlls/urlmon/tests/protocol.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 5c059d1..d3004ac 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -119,6 +119,9 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl ReleaseBindInfo(&bindinfo); + if(!szUrl || !*szUrl) + return E_INVALIDARG; + if(lstrlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR) || memcmp(szUrl, wszFile, sizeof(wszFile))) return MK_E_SYNTAX; diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 60d0ae8..6361403 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1384,6 +1384,16 @@ static void test_file_protocol_fail(void) CHECK_CALLED(ReportProgress_SENDINGREQUEST); CHECK_CALLED(ReportResult); + SET_EXPECT(GetBindInfo); + hres = IInternetProtocol_Start(protocol, NULL, &protocol_sink, &bind_info, 0, 0); + ok(hres == E_INVALIDARG, "Start failed: %08x, expected E_INVALIDARG\n", hres); + CHECK_CALLED(GetBindInfo); + + SET_EXPECT(GetBindInfo); + hres = IInternetProtocol_Start(protocol, emptyW, &protocol_sink, &bind_info, 0, 0); + ok(hres == E_INVALIDARG, "Start failed: %08x, expected E_INVALIDARG\n", hres); + CHECK_CALLED(GetBindInfo); + IInternetProtocol_Release(protocol); }

1 0

Jacek Caban : urlmon: Correctly handle file URLs with '|' instead of ':' after drive letter.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 3efe4e68379c29714fd40340db3c9bec00ab4568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3efe4e68379c29714fd40340d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 10 14:20:43 2008 +0200 urlmon: Correctly handle file URLs with '|' instead of ':' after drive letter. --- dlls/urlmon/file.c | 3 +++ dlls/urlmon/tests/protocol.c | 17 ++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index b3691b0..5c059d1 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -154,6 +154,9 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl } } + if(file_name[1] == '|') + file_name[1] = ':'; + This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index c21134b..60d0ae8 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "ole2.h" #include "urlmon.h" +#include "wininet.h" #include "initguid.h" @@ -1387,7 +1388,7 @@ static void test_file_protocol_fail(void) } static void test_file_protocol(void) { - WCHAR buf[MAX_PATH]; + WCHAR buf[INTERNET_MAX_URL_LENGTH], file_name_buf[MAX_PATH]; DWORD size; ULONG len; HANDLE file; @@ -1429,17 +1430,19 @@ static void test_file_protocol(void) { test_file_protocol_url(buf); memcpy(buf, wszFile2, sizeof(wszFile2)); - len = sizeof(wszFile2)/sizeof(WCHAR)-1; - len += GetCurrentDirectoryW(sizeof(buf)/sizeof(WCHAR)-len, buf+len); - buf[len++] = '\\'; - memcpy(buf+len, wszIndexHtml, sizeof(wszIndexHtml)); - - file_name = buf + sizeof(wszFile2)/sizeof(WCHAR)-1; + len = GetCurrentDirectoryW(sizeof(file_name_buf)/sizeof(WCHAR), file_name_buf); + file_name_buf[len++] = '\\'; + memcpy(file_name_buf+len, wszIndexHtml, sizeof(wszIndexHtml)); + lstrcpyW(buf+sizeof(wszFile2)/sizeof(WCHAR)-1, file_name_buf); + file_name = file_name_buf; bindf = 0; test_file_protocol_url(buf); bindf = BINDF_FROMURLMON; test_file_protocol_url(buf); + buf[sizeof(wszFile2)/sizeof(WCHAR)] = '|'; + test_file_protocol_url(buf); + memcpy(buf, wszFile3, sizeof(wszFile3)); len = sizeof(wszFile3)/sizeof(WCHAR)-1; len += GetCurrentDirectoryW(sizeof(buf)/sizeof(WCHAR)-len, buf+len);

1 0