winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
734 discussions
Start a n
N
ew thread
Peter Dons Tychsen : winedos: Add support for the Color Control Register ( CGA).
by Alexandre Julliard
10 Nov '08
10 Nov '08
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
0
0
Andrew Talbot : secur32: Sign-compare warning fix.
by Alexandre Julliard
10 Nov '08
10 Nov '08
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
0
0
Andrew Talbot : rsaenh: Sign-compare warnings fix.
by Alexandre Julliard
10 Nov '08
10 Nov '08
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
0
0
Alexandre Julliard : kernel32: Explicitly request execute permission in MapViewOfFile.
by Alexandre Julliard
10 Nov '08
10 Nov '08
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
0
0
Alexandre Julliard : kernel32/tests: Fix the thread test on NT4.
by Alexandre Julliard
10 Nov '08
10 Nov '08
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
0
0
Alexandre Julliard : kernel32/tests: Fix some resource test failures on NT4 .
by Alexandre Julliard
10 Nov '08
10 Nov '08
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
0
0
Alexandre Julliard : kernel32/tests: Fix some profile test failures on NT4.
by Alexandre Julliard
10 Nov '08
10 Nov '08
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
0
0
Ryan Schmidt : jscript: Fix build with bison 2.4.
by Alexandre Julliard
10 Nov '08
10 Nov '08
Module: wine Branch: master Commit: 2827a74cb137001aff4ce440f7e11acd11d91c7b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2827a74cb137001aff4ce440f…
Author: Ryan Schmidt <wine-2008d(a)ryandesign.com> Date: Mon Nov 10 01:04:47 2008 -0600 jscript: Fix build with bison 2.4. --- dlls/jscript/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 7a74e46..c96f8a3 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -317,7 +317,7 @@ StatementList_opt /* ECMA-262 3rd Edition 12.1 */ Block : '{' StatementList '}' { $$ = new_block_statement(ctx, $2); } - | '{' '}' { $$ = new_block_statement(ctx, NULL) } + | '{' '}' { $$ = new_block_statement(ctx, NULL); } /* ECMA-262 3rd Edition 12.2 */ VariableStatement
1
0
0
0
Detlef Riekenberg : advapi32/tests: Fix broken GetLastError tests.
by Alexandre Julliard
10 Nov '08
10 Nov '08
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
0
0
Detlef Riekenberg : advapi32/tests: Fix tests on win9x ( GetFileSecurity not implemented).
by Alexandre Julliard
10 Nov '08
10 Nov '08
Module: wine Branch: master Commit: 21a70825bc0e84efac6ac31baf31bdd6fc4be82a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=21a70825bc0e84efac6ac31ba…
Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 9 20:50:51 2008 +0100 advapi32/tests: Fix tests on win9x (GetFileSecurity not implemented). --- dlls/advapi32/tests/security.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 62c6ba8..af2c6df 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -746,6 +746,10 @@ static void test_FileSecurity(void) retSize = 0; SetLastError (NO_ERROR); rc = pGetFileSecurityA (file, request, NULL, 0, &retSize); + if (!rc && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { + win_skip("GetFileSecurityA is not implemented\n"); + goto cleanup; + } ok (!rc, "GetFileSecurityA " "was expected to fail for '%s'\n", file); ok (GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetFileSecurityA " @@ -812,19 +816,18 @@ static void test_FileSecurity(void) HeapFree (GetProcessHeap (), 0, sd); - /* Remove temporary file and directory */ - DeleteFileA (file); - RemoveDirectoryA (path); - /* Old test */ strcpy (wintmpdir, "\\Should not exist"); SetLastError (NO_ERROR); 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 ) || - (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), - "last error ERROR_FILE_NOT_FOUND / ERROR_CALL_NOT_IMPLEMENTED (98) " - "expected, got %d\n", GetLastError()); + ok (GetLastError() == ERROR_FILE_NOT_FOUND, + "last error ERROR_FILE_NOT_FOUND expected, got %d\n", GetLastError()); + +cleanup: + /* Remove temporary file and directory */ + DeleteFileA(file); + RemoveDirectoryA(path); } static void test_AccessCheck(void)
1
0
0
0
← Newer
1
...
50
51
52
53
54
55
56
...
74
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
Results per page:
10
25
50
100
200