November 2008 - Wine-Commits

Peter Dons Tychsen : winedos: Add support for the Color Control Register ( CGA).
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 49ad04c1f79bc987711bc23e1589eed7dfbddbb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ad04c1f79bc987711bc23e1… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Sun Nov 9 18:29:41 2008 +0100 winedos: Add support for the Color Control Register (CGA). --- dlls/winedos/vga.c | 80 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 70 insertions(+), 10 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 6a94d32..bc8bc85 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -99,6 +99,7 @@ static char *vga_fb_data = 0; static int vga_fb_window = 0; static int vga_fb_window_size; static char *vga_fb_window_data; +static PALETTEENTRY *vga_fb_palette; /* * VGA text mode data. @@ -171,9 +172,43 @@ static HWND vga_hwnd = NULL; */ static PALETTEENTRY cga_palette1[] = { {0x00, 0x00, 0x00}, /* 0 - Black */ - {0x00, 0x80, 0x80}, /* 1 - Cyan */ - {0x80, 0x00, 0x80}, /* 2 - Magenta */ - {0xFF, 0xFF, 0xFF} /* 3 - White */ + {0x00, 0xAA, 0xAA}, /* 1 - Cyan */ + {0xAA, 0x00, 0xAA}, /* 2 - Magenta */ + {0xAA, 0xAA, 0xAA} /* 3 - White */ +}; + +/* + * CGA palette 1 in the bright variant + * intensities, when signalled to do so + * in register 0x3d9 + */ +static PALETTEENTRY cga_palette1_bright[] = { + {0x00, 0x00, 0x00}, /* 0 - Black */ + {0x55, 0xFF, 0xFF}, /* 1 - Light cyan */ + {0xFF, 0x55, 0xFF}, /* 2 - Light magenta */ + {0xFF, 0xFF, 0xFF}, /* 3 - Bright White */ +}; + +/* + * CGA palette 2 + */ +static PALETTEENTRY cga_palette2[] = { + {0x00, 0x00, 0x00}, /* 0 - Black */ + {0x00, 0xAA, 0x00}, /* 1 - Green */ + {0xAA, 0x00, 0x00}, /* 2 - Red */ + {0xAA, 0x55, 0xFF} /* 3 - Brown */ +}; + +/* + * CGA palette 2 in the bright variant + * intensities, when signalled to do so + * in register 0x3d9 + */ +static PALETTEENTRY cga_palette2_bright[] = { + {0x00, 0x00, 0x00}, /* 0 - Black */ + {0x55, 0xFF, 0x55}, /* 1 - Light green */ + {0xFF, 0x55, 0x55}, /* 2 - Light red */ + {0xFF, 0xFF, 0x55}, /* 3 - Yellow */ }; /* @@ -731,12 +766,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) return; } - if(vga_fb_depth == 2){ - res=IDirectDrawPalette_SetEntries(lpddpal,0,0,4,cga_palette1); - } - else{ - res=IDirectDrawPalette_SetEntries(lpddpal,0,0,256,vga_def_palette); - } + res=IDirectDrawPalette_SetEntries(lpddpal,0,0,4,vga_fb_palette); if (res != S_OK) { ERR("Could not set default palette entries (res = 0x%x)\n", res); } @@ -795,11 +825,13 @@ int VGA_SetMode(unsigned Xres,unsigned Yres,unsigned Depth) { vga_fb_window_data = VGA_WINDOW_START; vga_fb_window_size = VGA_WINDOW_SIZE; + vga_fb_palette = vga_def_palette; } else { vga_fb_window_data = CGA_WINDOW_START; vga_fb_window_size = CGA_WINDOW_SIZE; + vga_fb_palette = cga_palette1; } /* Clean the HW buffer */ @@ -980,7 +1012,6 @@ void VGA_ShowMouse( BOOL show ) MZ_RunInThread( VGA_DoShowMouse, (ULONG_PTR)show ); } - /*** TEXT MODE ***/ /* prepare the text mode video memory copy that is used to only @@ -1472,6 +1503,35 @@ void VGA_ioport_out( WORD port, BYTE val ) FIXME("Unsupported index, VGA crt controller register 0x3b4/0x3d4: 0x%02x (value 0x%02x)\n", vga_index_3d4, val); break; + /* Colour control register (CGA) */ + case 0x3d9: + /* Check for "switch to bright" */ + if(val & 0x10) + { + if(vga_fb_palette == cga_palette1) + { + /* Switch to palette 1 bright version */ + VGA_SetPalette(cga_palette1_bright,0,4); + vga_fb_palette = cga_palette1_bright; + } + else if(vga_fb_palette == cga_palette2) + { + /* Switch to palette 2 bright version */ + VGA_SetPalette(cga_palette2_bright,0,4); + vga_fb_palette = cga_palette2_bright; + } + } + + /* Check for "deselect palette1" */ + if(val & 0x20) + { + if(vga_fb_palette == cga_palette1) + { + VGA_SetPalette(cga_palette2,0,4); + vga_fb_palette = cga_palette2; + } + } + break; default: FIXME("Unsupported VGA register: 0x%04x (value 0x%02x)\n", port, val); }

1 0

Andrew Talbot : secur32: Sign-compare warning fix.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: f39725207100be66b35cc586eae79d6d20057c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39725207100be66b35cc586e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 8 15:16:26 2008 +0000 secur32: Sign-compare warning fix. --- dlls/secur32/secur32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 27e0263..f194ab7 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -987,7 +987,7 @@ BOOLEAN WINAPI GetComputerObjectNameW( DWORD size = sizeof(name)/sizeof(name[0]); if (GetComputerNameW(name, &size)) { - int len = domainInfo->Name.Length + size + 3; + DWORD len = domainInfo->Name.Length + size + 3; if (lpNameBuffer) { if (*nSize < len)

1 0

Andrew Talbot : rsaenh: Sign-compare warnings fix.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: c44dcda12be80bc22f9d88eb969c98f89cfc65c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44dcda12be80bc22f9d88eb9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 8 15:16:22 2008 +0000 rsaenh: Sign-compare warnings fix. --- dlls/rsaenh/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 40ca9e3..5467d64 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3557,7 +3557,7 @@ BOOL WINAPI RSAENH_CPSetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa { CRYPTHASH *pCryptHash; CRYPTKEY *pCryptKey; - int i; + DWORD i; TRACE("(hProv=%08lx, hHash=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", hProv, hHash, dwParam, pbData, dwFlags);

1 0

Alexandre Julliard : kernel32: Explicitly request execute permission in MapViewOfFile.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: b97d63d76ff488278622f3e1ec9907519f6b8e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97d63d76ff488278622f3e1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 10 11:09:40 2008 +0100 kernel32: Explicitly request execute permission in MapViewOfFile. --- dlls/kernel32/virtual.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 4db68ca..2b89655 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -543,6 +543,8 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access, else if (access & FILE_MAP_COPY) protect = PAGE_WRITECOPY; else protect = PAGE_NOACCESS; + if (access & FILE_MAP_EXECUTE) protect <<= 4; + if ((status = NtMapViewOfSection( handle, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, protect ))) {

1 0

Alexandre Julliard : kernel32/tests: Fix some resource test failures on NT4 .
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 220a2c2c0bd77988925a0e562c167eb169e86747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=220a2c2c0bd77988925a0e562… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 10 11:09:11 2008 +0100 kernel32/tests: Fix some resource test failures on NT4. --- dlls/kernel32/tests/resource.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 90c8e9d..cde27a8 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -252,7 +252,8 @@ static void check_exe( res_check_func fn ) dir = (void*) ((BYTE*) dos + sec[1].VirtualAddress); ok( dir->Characteristics == 0, "Characteristics wrong\n"); - ok( dir->TimeDateStamp == 0, "TimeDateStamp wrong\n"); + ok( dir->TimeDateStamp == 0 || abs( dir->TimeDateStamp - GetTickCount() ) < 1000 /* nt4 */, + "TimeDateStamp wrong %u\n", dir->TimeDateStamp); ok( dir->MajorVersion == 4, "MajorVersion wrong\n"); ok( dir->MinorVersion == 0, "MinorVersion wrong\n");

1 0

Alexandre Julliard : kernel32/tests: Fix the thread test on NT4.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 1ff8e7dd411a572eb012f3a17bf0097821a65285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff8e7dd411a572eb012f3a17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 10 11:09:18 2008 +0100 kernel32/tests: Fix the thread test on NT4. --- dlls/kernel32/tests/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 649c49c..75b450c 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1188,7 +1188,7 @@ static void test_TLS(void) } ret = WaitForMultipleObjects(2, threads, TRUE, 60000); - ok(ret == WAIT_OBJECT_0, "WaitForMultipleObjects failed\n"); + ok(ret == WAIT_OBJECT_0 || ret == WAIT_OBJECT_0+1 /* nt4 */, "WaitForMultipleObjects failed %u\n",ret); for (i = 0; i < 2; ++i) CloseHandle(threads[i]);

1 0

Alexandre Julliard : kernel32/tests: Fix some profile test failures on NT4.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 181e4f08b61b993ccea45e645425550bebedb87b URL: http://source.winehq.org/git/wine.git/?a=commit;h=181e4f08b61b993ccea45e645… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 10 11:09:02 2008 +0100 kernel32/tests: Fix some profile test failures on NT4. --- dlls/kernel32/tests/profile.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 2a9f08a..3cd8af1 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -279,6 +279,7 @@ static void test_profile_existing(void) DWORD dwShareMode; DWORD write_error; BOOL read_error; + DWORD broken_error; } pe[] = { {GENERIC_READ, FILE_SHARE_READ, ERROR_SHARING_VIOLATION, FALSE }, {GENERIC_READ, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION, TRUE }, @@ -286,10 +287,10 @@ static void test_profile_existing(void) {GENERIC_WRITE, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION, TRUE }, {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, ERROR_SHARING_VIOLATION, FALSE }, {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION, TRUE }, - {GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE }, - {GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE }, + {GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE, ERROR_SHARING_VIOLATION /* nt4 */}, + {GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE, ERROR_SHARING_VIOLATION /* nt4 */}, /*Thief demo (bug 5024) opens .ini file like this*/ - {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE } + {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE, ERROR_SHARING_VIOLATION /* nt4 */} }; int i; @@ -308,10 +309,15 @@ static void test_profile_existing(void) ret = WritePrivateProfileString(SECTION, KEY, "12345", testfile1); if (!pe[i].write_error) { - ok( ret, "%d: WritePrivateProfileString failed with error %u\n", i, GetLastError() ); + if (!ret) + ok( broken(GetLastError() == pe[i].broken_error), + "%d: WritePrivateProfileString failed with error %u\n", i, GetLastError() ); CloseHandle(h); size = GetPrivateProfileString(SECTION, KEY, 0, buffer, MAX_PATH, testfile1); - ok( size == 5, "%d: test failed, number of characters copied: %d instead of 5\n", i, size ); + if (ret) + ok( size == 5, "%d: test failed, number of characters copied: %d instead of 5\n", i, size ); + else + ok( !size, "%d: test failed, number of characters copied: %d instead of 0\n", i, size ); } else {

1 0

Nikolay Sivov : gdiplus: Added GdipGetTextContrast.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 56173d400583915f60b0bfe75d08d9782b002cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56173d400583915f60b0bfe75… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 9 14:32:26 2008 +0300 gdiplus: Added GdipGetTextContrast. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 13 +++++++++++++ dlls/gdiplus/tests/graphics.c | 23 +++++++++++++++++++++++ include/gdiplusflat.h | 1 + 5 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a2790a3..0a29c10 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -395,7 +395,7 @@ @ stdcall GdipGetStringFormatTabStopCount(ptr ptr) @ stdcall GdipGetStringFormatTabStops(ptr long ptr ptr) @ stdcall GdipGetStringFormatTrimming(ptr ptr) -@ stub GdipGetTextContrast +@ stdcall GdipGetTextContrast(ptr ptr) @ stdcall GdipGetTextRenderingHint(ptr ptr) @ stub GdipGetTextureImage @ stdcall GdipGetTextureTransform(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d3dce6a..57d63c2 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -100,6 +100,7 @@ struct GpGraphics{ GpMatrix * worldtrans; /* world transform */ BOOL busy; /* hdc handle obtained by GdipGetDC */ GpRegion *clip; + UINT textcontrast; /* not used yet. get/set only */ }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3273494..764e9ac 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -763,6 +763,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra (*graphics)->unit = UnitDisplay; (*graphics)->scale = 1.0; (*graphics)->busy = FALSE; + (*graphics)->textcontrast = 4; return Ok; } @@ -2507,6 +2508,18 @@ GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics *graphics, SmoothingMode *mo return Ok; } +GpStatus WINGDIPAPI GdipGetTextContrast(GpGraphics *graphics, UINT *contrast) +{ + TRACE("(%p, %p)\n", graphics, contrast); + + if(!graphics || !contrast) + return InvalidParameter; + + *contrast = graphics->textcontrast; + + return Ok; +} + /* FIXME: Text rendering hint is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics *graphics, TextRenderingHint *hint) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 1b4e310..9d06fd9 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -902,6 +902,28 @@ static void test_clear(void) expect(InvalidParameter, status); } +static void test_textcontrast(void) +{ + GpStatus status; + HDC hdc = GetDC(0); + GpGraphics *graphics; + UINT contrast; + + status = GdipGetTextContrast(NULL, NULL); + expect(InvalidParameter, status); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipGetTextContrast(graphics, NULL); + expect(InvalidParameter, status); + status = GdipGetTextContrast(graphics, &contrast); + expect(4, contrast); + + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -926,6 +948,7 @@ START_TEST(graphics) test_get_set_clip(); test_isempty(); test_clear(); + test_textcontrast(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 203bcec..b8f14e1 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -200,6 +200,7 @@ GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*); GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); +GpStatus WINGDIPAPI GdipGetTextContrast(GpGraphics*,UINT*); GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*); GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB);

1 0

Nikolay Sivov : gdiplus: Added GdipSetTextContrast.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 71264731a4e447f8006bd3d9f097d93f49706e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71264731a4e447f8006bd3d9f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 9 14:38:16 2008 +0300 gdiplus: Added GdipSetTextContrast. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 12 ++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0a29c10..c25d4b7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -593,7 +593,7 @@ @ stdcall GdipSetStringFormatMeasurableCharacterRanges(ptr long ptr) @ stdcall GdipSetStringFormatTabStops(ptr long long ptr) @ stdcall GdipSetStringFormatTrimming(ptr long) -@ stub GdipSetTextContrast +@ stdcall GdipSetTextContrast(ptr long) @ stdcall GdipSetTextRenderingHint(ptr long) @ stdcall GdipSetTextureTransform(ptr ptr) @ stdcall GdipSetTextureWrapMode(ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 764e9ac..fa90d73 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2954,6 +2954,18 @@ GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mod return Ok; } +GpStatus WINGDIPAPI GdipSetTextContrast(GpGraphics *graphics, UINT contrast) +{ + TRACE("(%p, %d)\n", graphics, contrast); + + if(!graphics) + return InvalidParameter; + + graphics->textcontrast = contrast; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics *graphics, TextRenderingHint hint) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b8f14e1..ea4bec5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -231,6 +231,7 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics*,REAL); GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics*,GpUnit); GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode); GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); +GpStatus WINGDIPAPI GdipSetTextContrast(GpGraphics*,UINT); GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics*,TextRenderingHint); GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics*, GpCoordinateSpace, GpCoordinateSpace,

1 0

Detlef Riekenberg : advapi32/tests: Fix broken GetLastError tests.
by Alexandre Julliard Nov. 10, 2008

Nov. 10, 2008

Module: wine Branch: master Commit: 44540a664f369a497aec2b7da07b864143e754b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44540a664f369a497aec2b7da… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 9 22:05:08 2008 +0100 advapi32/tests: Fix broken GetLastError tests. --- dlls/advapi32/tests/security.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index af2c6df..2d58946 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -728,13 +728,13 @@ static void test_FileSecurity(void) /* Create a temporary directory and in it a temporary file */ strcat (strcpy (path, wintmpdir), "rary"); - SetLastError (NO_ERROR); + SetLastError(0xdeadbeef); rc = CreateDirectoryA (path, NULL); ok (rc || GetLastError() == ERROR_ALREADY_EXISTS, "CreateDirectoryA " "failed for '%s' with %d\n", path, GetLastError()); strcat (strcpy (file, path), "\\ess"); - SetLastError (NO_ERROR); + SetLastError(0xdeadbeef); fh = CreateFileA (file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok (fh != INVALID_HANDLE_VALUE, "CreateFileA " "failed for '%s' with %d\n", file, GetLastError()); @@ -744,7 +744,7 @@ static void test_FileSecurity(void) /* Get size needed */ retSize = 0; - SetLastError (NO_ERROR); + SetLastError(0xdeadbeef); rc = pGetFileSecurityA (file, request, NULL, 0, &retSize); if (!rc && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("GetFileSecurityA is not implemented\n"); @@ -761,22 +761,18 @@ static void test_FileSecurity(void) /* Get security descriptor for real */ retSize = 0; - SetLastError (NO_ERROR); + SetLastError(0xdeadbeef); rc = pGetFileSecurityA (file, request, sd, sdSize, &retSize); ok (rc, "GetFileSecurityA " - "was not expected to fail '%s'\n", file); - ok (GetLastError () == NO_ERROR, "GetFileSecurityA " - "returned %d; expected NO_ERROR\n", GetLastError ()); + "was not expected to fail '%s': %d\n", file, GetLastError()); ok (retSize == sdSize, "GetFileSecurityA " "returned size %d; expected %d\n", retSize, sdSize); /* Use it to set security descriptor */ - SetLastError (NO_ERROR); + SetLastError(0xdeadbeef); rc = pSetFileSecurityA (file, request, sd); ok (rc, "SetFileSecurityA " - "was not expected to fail '%s'\n", file); - ok (GetLastError () == NO_ERROR, "SetFileSecurityA " - "returned %d; expected NO_ERROR\n", GetLastError ()); + "was not expected to fail '%s': %d\n", file, GetLastError()); HeapFree (GetProcessHeap (), 0, sd); @@ -784,7 +780,7 @@ static void test_FileSecurity(void) /* Get size needed */ retSize = 0; - SetLastError (NO_ERROR); + SetLastError(0xdeadbeef); rc = pGetFileSecurityA (path, request, NULL, 0, &retSize); ok (!rc, "GetFileSecurityA " "was expected to fail for '%s'\n", path); @@ -797,28 +793,23 @@ static void test_FileSecurity(void) /* Get security descriptor for real */ retSize = 0; - SetLastError (NO_ERROR); + SetLastError(0xdeadbeef); rc = pGetFileSecurityA (path, request, sd, sdSize, &retSize); ok (rc, "GetFileSecurityA " - "was not expected to fail '%s'\n", path); - ok (GetLastError () == NO_ERROR, "GetFileSecurityA " - "returned %d; expected NO_ERROR\n", GetLastError ()); + "was not expected to fail '%s': %d\n", path, GetLastError()); ok (retSize == sdSize, "GetFileSecurityA " "returned size %d; expected %d\n", retSize, sdSize); /* Use it to set security descriptor */ - SetLastError (NO_ERROR); + SetLastError(0xdeadbeef); rc = pSetFileSecurityA (path, request, sd); ok (rc, "SetFileSecurityA " - "was not expected to fail '%s'\n", path); - ok (GetLastError () == NO_ERROR, "SetFileSecurityA " - "returned %d; expected NO_ERROR\n", GetLastError ()); - + "was not expected to fail '%s': %d\n", path, GetLastError()); HeapFree (GetProcessHeap (), 0, sd); /* Old test */ strcpy (wintmpdir, "\\Should not exist"); - SetLastError (NO_ERROR); + SetLastError(0xdeadbeef); rc = pGetFileSecurityA (wintmpdir, OWNER_SECURITY_INFORMATION, NULL, 0, &sdSize); ok (!rc, "GetFileSecurityA should fail for not existing directories/files\n"); ok (GetLastError() == ERROR_FILE_NOT_FOUND,

1 0