wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Detlef Riekenberg : msvcrt20: Forward more functions to msvcrt.dll.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: 583f0f08ed8c1e4f8dce679db5256fdc4c142ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=583f0f08ed8c1e4f8dce679db… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 26 17:00:57 2010 +0100 msvcrt20: Forward more functions to msvcrt.dll. --- dlls/msvcrt20/msvcrt20.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 56f961c..91e633c 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -225,7 +225,7 @@ @ stub ??_Gstrstream@@UAEPAXI@Z # @ stub ??_Gstrstreambuf@@UAEPAXI@Z # @ cdecl ?_query_new_handler@@YAP6AHI@ZXZ() msvcrt.?_query_new_handler@@YAP6AHI@ZXZ -@ cdecl ?_query_new_mode@@YAHXZ() msvcrt.?_query_new_mode@@YAHXZ +@ cdecl ?_query_new_mode@@YAHXZ() msvcrt.?_query_new_mode@@YAHXZ @ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z @ cdecl ?_set_new_mode@@YAHH@Z(long) msvcrt.?_set_new_mode@@YAHH@Z @ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z @@ -436,7 +436,7 @@ @ stub ?xalloc@ios@@SAHXZ # @ stub ?xsgetn@streambuf@@UAEHPADH@Z # @ stub ?xsputn@streambuf@@UAEHPBDH@Z # -@ stub $I10_OUTPUT # +@ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT @ cdecl -arch=i386 _CIacos() msvcrt._CIacos @ cdecl -arch=i386 _CIasin() msvcrt._CIasin @ cdecl -arch=i386 _CIatan() msvcrt._CIatan

1 0

Detlef Riekenberg : msvcr71: Forward more functions to msvcrt.dll.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: 2feb3aa7f984f1e8eee8605710e7bff22489a548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2feb3aa7f984f1e8eee860571… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 26 16:58:54 2010 +0100 msvcr71: Forward more functions to msvcrt.dll. --- dlls/msvcr71/msvcr71.spec | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index d4323b3..e9b06fb 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -78,11 +78,11 @@ @ cdecl __CppXcptFilter(long ptr) msvcrt.__CppXcptFilter @ stub __CxxCallUnwindDtor @ stub __CxxCallUnwindVecDtor -@ stub __CxxDetectRethrow +@ cdecl __CxxDetectRethrow(ptr) msvcrt.__CxxDetectRethrow @ stub __CxxExceptionFilter @ cdecl -i386 __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler @ stdcall __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind -@ stub __CxxQueryExceptionSize +@ cdecl __CxxQueryExceptionSize() msvcrt.__CxxQueryExceptionSize @ stub __CxxRegisterExceptionObject @ stub __CxxUnregisterExceptionObject @ stub __DestructExceptionObject @@ -224,7 +224,7 @@ @ stub _cputws @ cdecl _creat(str long) msvcrt._creat @ varargs _cscanf(str) msvcrt._cscanf -@ stub _ctime64 +@ cdecl _ctime64(ptr) msvcrt._ctime64 @ cdecl _cwait(ptr long long) msvcrt._cwait @ stub _cwprintf @ stub _cwscanf @@ -281,11 +281,11 @@ @ cdecl _fstat64(long ptr) msvcrt._fstat64 @ cdecl _fstati64(long ptr) msvcrt._fstati64 @ cdecl _ftime(ptr) msvcrt._ftime -@ stub _ftime64 +@ cdecl _ftime64(ptr) msvcrt._ftime64 @ cdecl -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime -@ stub _futime64 +@ cdecl _futime64(long ptr) msvcrt._futime64 @ cdecl _gcvt(double long str) msvcrt._gcvt @ stub _get_heap_handle @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @@ -307,7 +307,7 @@ @ stub _getwche @ cdecl _getws(ptr) msvcrt._getws @ cdecl _global_unwind2(ptr) msvcrt._global_unwind2 -@ stub _gmtime64 +@ cdecl _gmtime64(ptr) msvcrt._gmtime64 @ cdecl _heapadd(ptr long) msvcrt._heapadd @ cdecl _heapchk() msvcrt._heapchk @ cdecl _heapmin() msvcrt._heapmin @@ -544,7 +544,7 @@ @ cdecl _unloaddll(long) msvcrt._unloaddll @ cdecl _unlock(long) msvcrt._unlock @ cdecl _utime(str ptr) msvcrt._utime -@ stub _utime64 +@ cdecl _utime64(str ptr) msvcrt._utime64 @ cdecl _vscprintf(str ptr) msvcrt._vscprintf @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vsnprintf(ptr long ptr ptr) msvcrt._vsnprintf @@ -570,7 +570,7 @@ @ stub _wcstoui64 @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ cdecl _wctime(ptr) msvcrt._wctime -@ stub _wctime64 +@ cdecl _wctime64(ptr) msvcrt._wctime64 @ stub _wctype @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl @@ -636,7 +636,7 @@ @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wunlink(wstr) msvcrt._wunlink @ cdecl _wutime(wstr ptr) msvcrt._wutime -@ stub _wutime64 +@ cdecl _wutime64(wstr ptr) msvcrt._wutime64 @ cdecl _y0(double) msvcrt._y0 @ cdecl _y1(double) msvcrt._y1 @ cdecl _yn(long double ) msvcrt._yn

1 0

Alexandre Julliard : makefiles: Make sure that makedep is rebuilt before updating dependencies in tools.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: 6066177ea0cf4eb368298b34aecf8361b790c7ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6066177ea0cf4eb368298b34a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 16:56:23 2010 +0100 makefiles: Make sure that makedep is rebuilt before updating dependencies in tools. --- Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 187f563..d93ea81 100644 --- a/Makefile.in +++ b/Makefile.in @@ -222,6 +222,7 @@ tools/winedump/__install__ tools/winedump/__install-dev__: tools/winedump tools/winegcc/__install__ tools/winegcc/__install-dev__: tools/winegcc tools/wmc/__install__ tools/wmc/__install-dev__: tools/wmc tools/wrc/__install__ tools/wrc/__install-dev__: tools/wrc +tools/__depend__: $(MAKEDEP) RECURSE_TARGETS = \ __clean__ \

1 0

Hans Leidekker : msi: The table for isolated components is called IsolatedComponent.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: 930b5e1c68632138d9a70fd7eeca230cd68c9ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930b5e1c68632138d9a70fd7e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 26 14:09:29 2010 +0100 msi: The table for isolated components is called IsolatedComponent. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7422edb..872e8dd 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6750,7 +6750,7 @@ static UINT ACTION_BindImage( MSIPACKAGE *package ) static UINT ACTION_IsolateComponents( MSIPACKAGE *package ) { static const WCHAR table[] = { - 'I','s','o','l','a','t','e','C','o','m','p','o','n','e','n','t',0 }; + 'I','s','o','l','a','t','e','d','C','o','m','p','o','n','e','n','t',0 }; return msi_unimplemented_action_stub( package, "IsolateComponents", table ); }

1 0

Hans Leidekker : msi: Remove empty directories as part of the RemoveFiles action.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: fd5887e5a9c9c21d2b1aaa551210ba5ce59664dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd5887e5a9c9c21d2b1aaa551… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 26 14:09:02 2010 +0100 msi: Remove empty directories as part of the RemoveFiles action. --- dlls/msi/files.c | 31 +++++++++++++++++------ dlls/msi/tests/install.c | 62 ++++++++++++---------------------------------- 2 files changed, 39 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd5887e5a9c9c21d2b1aa…

1 0

Adam Petaccia : mshtml: Test IHTMLScriptElement_put_type.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: 9f303c89421d6e141d758eccdf893f9da38b1fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f303c89421d6e141d758eccd… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Feb 25 16:55:27 2010 -0500 mshtml: Test IHTMLScriptElement_put_type. --- dlls/mshtml/tests/dom.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f4f673c..25bf764 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5592,9 +5592,18 @@ static void test_elems(IHTMLDocument2 *doc) { VARIANT_BOOL vb; + hres = IHTMLScriptElement_put_type (script, NULL); + ok(hres == S_OK, "put_type failed: %08x\n", hres); + hres = IHTMLScriptElement_get_type(script, &type); + ok(hres == S_OK, "get_type failed: %08x\n", hres); + ok(type == NULL, "Unexpected type %s\n", wine_dbgstr_w(type)); + + hres = IHTMLScriptElement_put_type (script, a2bstr ("text/javascript")); + ok(hres == S_OK, "put_type failed: %08x\n", hres); hres = IHTMLScriptElement_get_type(script, &type); ok(hres == S_OK, "get_type failed: %08x\n", hres); ok(!strcmp_wa(type, "text/javascript"), "Unexpected type %s\n", wine_dbgstr_w(type)); + SysFreeString(type); /* test defer */

1 0

Adam Petaccia : mshtml: Implement HTMLScriptElement_put_type.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: a7c9ae4d08254f92a39c467a3f147e759776b2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c9ae4d08254f92a39c467a3… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Feb 25 16:55:22 2010 -0500 mshtml: Implement HTMLScriptElement_put_type. --- dlls/mshtml/htmlscript.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 2427309..f39e306 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -214,8 +214,18 @@ static HRESULT WINAPI HTMLScriptElement_get_onerror(IHTMLScriptElement *iface, V static HRESULT WINAPI HTMLScriptElement_put_type(IHTMLScriptElement *iface, BSTR v) { HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nstype_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_Init(&nstype_str, v); + nsres = nsIDOMHTMLScriptElement_SetType(This->nsscript, &nstype_str); + if (NS_FAILED(nsres)) + ERR("SetType failed: %08x\n", nsres); + nsAString_Finish (&nstype_str); + + return S_OK; } static HRESULT WINAPI HTMLScriptElement_get_type(IHTMLScriptElement *iface, BSTR *p)

1 0

Justin Chevrier : gdiplus: Basic implementation of GdipGetNearestColor with changes to test to reflect fixes .
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: b4bfa6e1c1568321b124f402e0ee45d5240e839d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bfa6e1c1568321b124f402e… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Thu Feb 25 21:45:55 2010 -0500 gdiplus: Basic implementation of GdipGetNearestColor with changes to test to reflect fixes. --- dlls/gdiplus/graphics.c | 5 +++-- dlls/gdiplus/tests/graphics.c | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 359b954..1fd870e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3173,9 +3173,10 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, return Ok; } +/* FIXME: Need to handle color depths less than 24bpp */ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) { - FIXME("(%p, %p): stub\n", graphics, argb); + FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); if(!graphics || !argb) return InvalidParameter; @@ -3183,7 +3184,7 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) if(graphics->busy) return ObjectBusy; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics *graphics, REAL *scale) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 32d115e..b2dc9b2 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2299,7 +2299,7 @@ static void test_GdipGetNearestColor(void) if (status == Ok) { status = GdipGetNearestColor(graphics, &color); - todo_wine expect(Ok, status); + expect(Ok, status); expect(0xdeadbeef, color); GdipDeleteGraphics(graphics); } @@ -2312,7 +2312,7 @@ static void test_GdipGetNearestColor(void) if (status == Ok) { status = GdipGetNearestColor(graphics, &color); - todo_wine expect(Ok, status); + expect(Ok, status); expect(0xdeadbeef, color); GdipDeleteGraphics(graphics); } @@ -2325,7 +2325,7 @@ static void test_GdipGetNearestColor(void) if (status == Ok) { status = GdipGetNearestColor(graphics, &color); - todo_wine expect(Ok, status); + expect(Ok, status); expect(0xdeadbeef, color); GdipDeleteGraphics(graphics); } @@ -2344,7 +2344,7 @@ static void test_GdipGetNearestColor(void) status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); expect(Ok, status); status = GdipGetNearestColor(graphics, &color); - todo_wine expect(Ok, status); + expect(Ok, status); expect(0xdeadbeef, color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap); @@ -2354,7 +2354,7 @@ static void test_GdipGetNearestColor(void) status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); expect(Ok, status); status = GdipGetNearestColor(graphics, &color); - todo_wine expect(Ok, status); + expect(Ok, status); expect(0xdeadbeef, color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap); @@ -2364,7 +2364,7 @@ static void test_GdipGetNearestColor(void) status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); expect(Ok, status); status = GdipGetNearestColor(graphics, &color); - todo_wine expect(Ok, status); + expect(Ok, status); expect(0xdeadbeef, color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap); @@ -2374,7 +2374,7 @@ static void test_GdipGetNearestColor(void) status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); expect(Ok, status); status = GdipGetNearestColor(graphics, &color); - todo_wine expect(Ok, status); + expect(Ok, status); expect(0xdeadbeef, color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap); @@ -2384,7 +2384,7 @@ static void test_GdipGetNearestColor(void) status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); expect(Ok, status); status = GdipGetNearestColor(graphics, &color); - todo_wine expect(Ok, status); + expect(Ok, status); expect(0xdeadbeef, color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap); @@ -2394,7 +2394,7 @@ static void test_GdipGetNearestColor(void) status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); expect(Ok, status); status = GdipGetNearestColor(graphics, &color); - todo_wine expect(Ok, status); + expect(Ok, status); expect(0xdeadbeef, color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap); @@ -2404,7 +2404,7 @@ static void test_GdipGetNearestColor(void) status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); expect(Ok, status); status = GdipGetNearestColor(graphics, &color); - todo_wine expect(Ok, status); + expect(Ok, status); todo_wine expect(0xffa8bce8, color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap); @@ -2414,7 +2414,7 @@ static void test_GdipGetNearestColor(void) status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); expect(Ok, status); status = GdipGetNearestColor(graphics, &color); - todo_wine expect(Ok, status); + expect(Ok, status); todo_wine expect(0xffa8b8e8, color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap);

1 0

Justin Chevrier : gdiplus/test: Add GdipGetNearestColor test.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: 56238cd70e2b3c7835c6d1aab9ba27c984cb2952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56238cd70e2b3c7835c6d1aab… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Thu Feb 25 21:45:54 2010 -0500 gdiplus/test: Add GdipGetNearestColor test. --- dlls/gdiplus/tests/graphics.c | 153 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 153 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 45bd9f7..32d115e 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2270,6 +2270,158 @@ static void test_GdipIsVisibleRect(void) ReleaseDC(0, hdc); } +static void test_GdipGetNearestColor(void) +{ + GpStatus status; + GpGraphics *graphics; + GpBitmap *bitmap; + ARGB color = 0xdeadbeef; + HDC hdc = GetDC(0); + + /* create a graphics object */ + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipGetNearestColor(graphics, NULL); + expect(InvalidParameter, status); + + status = GdipGetNearestColor(NULL, &color); + expect(InvalidParameter, status); + GdipDeleteGraphics(graphics); + + status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat1bppIndexed, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + ok(broken(status == OutOfMemory) /* winver < Win7 */ || status == Ok, "status=%u\n", status); + if (status == Ok) + { + status = GdipGetNearestColor(graphics, &color); + todo_wine expect(Ok, status); + expect(0xdeadbeef, color); + GdipDeleteGraphics(graphics); + } + GdipDisposeImage((GpImage*)bitmap); + + status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat4bppIndexed, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + ok(broken(status == OutOfMemory) /* winver < Win7 */ || status == Ok, "status=%u\n", status); + if (status == Ok) + { + status = GdipGetNearestColor(graphics, &color); + todo_wine expect(Ok, status); + expect(0xdeadbeef, color); + GdipDeleteGraphics(graphics); + } + GdipDisposeImage((GpImage*)bitmap); + + status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat8bppIndexed, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + ok(broken(status == OutOfMemory) /* winver < Win7 */ || status == Ok, "status=%u\n", status); + if (status == Ok) + { + status = GdipGetNearestColor(graphics, &color); + todo_wine expect(Ok, status); + expect(0xdeadbeef, color); + GdipDeleteGraphics(graphics); + } + GdipDisposeImage((GpImage*)bitmap); + + status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppGrayScale, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + todo_wine expect(OutOfMemory, status); + if (status == Ok) + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + + status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat24bppRGB, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + status = GdipGetNearestColor(graphics, &color); + todo_wine expect(Ok, status); + expect(0xdeadbeef, color); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + + status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat32bppRGB, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + status = GdipGetNearestColor(graphics, &color); + todo_wine expect(Ok, status); + expect(0xdeadbeef, color); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + + status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + status = GdipGetNearestColor(graphics, &color); + todo_wine expect(Ok, status); + expect(0xdeadbeef, color); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + + status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat48bppRGB, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + status = GdipGetNearestColor(graphics, &color); + todo_wine expect(Ok, status); + expect(0xdeadbeef, color); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + + status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat64bppARGB, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + status = GdipGetNearestColor(graphics, &color); + todo_wine expect(Ok, status); + expect(0xdeadbeef, color); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + + status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat64bppPARGB, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + status = GdipGetNearestColor(graphics, &color); + todo_wine expect(Ok, status); + expect(0xdeadbeef, color); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + + status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppRGB565, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + status = GdipGetNearestColor(graphics, &color); + todo_wine expect(Ok, status); + todo_wine expect(0xffa8bce8, color); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + + status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppRGB555, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + status = GdipGetNearestColor(graphics, &color); + todo_wine expect(Ok, status); + todo_wine expect(0xffa8b8e8, color); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + + ReleaseDC(0, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2296,6 +2448,7 @@ START_TEST(graphics) test_GdipDrawLineI(); test_GdipDrawLinesI(); test_GdipDrawString(); + test_GdipGetNearestColor(); test_GdipGetVisibleClipBounds(); test_GdipIsVisiblePoint(); test_GdipIsVisibleRect();

1 0

Alexandre Julliard : ntdll/tests: Add some test cases for Wow64 registry redirection.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: 52a05108fefdad7ecfb6a8da6f141538371fc6b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a05108fefdad7ecfb6a8da6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 13:32:37 2010 +0100 ntdll/tests: Add some test cases for Wow64 registry redirection. --- dlls/ntdll/tests/reg.c | 304 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 304 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52a05108fefdad7ecfb6a…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010