Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 38320: Bulgarian translations by CCTAHEB (sstpr [at] narod [dot] ru). Bug #3965 (1/2).
by dgorbachev＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: dgorbachev Date: Wed Dec 24 01:50:52 2008 New Revision: 38320 URL: http://svn.reactos.org/svn/reactos?rev=38320&view=rev Log: Bulgarian translations by CCTAHEB (sstpr [at] narod [dot] ru). Bug #3965 (1/2). Added: trunk/reactos/base/system/regsvr32/lang/bg-BG.rc (with props) Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc trunk/reactos/base/applications/notepad/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/bg-BG.rc trunk/reactos/base/system/regsvr32/rsrc.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1] Wed Dec 24 01:50:52 2008 @@ -50,7 +50,7 @@ IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Äà ïðåêðàòÿ ëè èãðàòà?" IDS_SOL_WIN "Ïîçäðàâëåíèÿ, ïîáåäèõòå!!" - IDS_SOL_DEAL "Deal again?" + IDS_SOL_DEAL "Íîâî ðàçäàâàíå?" END Modified: trunk/reactos/base/applications/notepad/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/bg-BG.rc [iso-8859-1] Wed Dec 24 01:50:52 2008 @@ -201,5 +201,5 @@ STRING_CRLF, "Óüèíäîóüñ" STRING_LF, "Þíèêñ" STRING_CR, "Ìàê" -STRING_LINE_COLUMN, "Line %d, column %d" -END +STRING_LINE_COLUMN, "Ðåä %d, ñòúëá %d" +END Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] Wed Dec 24 01:50:52 2008 @@ -76,8 +76,8 @@ CONTROL "Ñëàãàíå íà íà÷àëåí çàðåæäà÷ (MBR) íà òâúðäèÿ äèñê", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Áåç ñëàãàíå íà íà÷àëåí çàðåæäà÷", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Äîáðå", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Îòêàç", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -103,7 +103,7 @@ LTEXT "Êîãàòî íàòèñíåòå Êðàé, êîìïþòúðúò âè ùå ñå ïðåçàïóñíå.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Àêî â óñòðîéñòâîòî èìà ÊÄ, ãî èçâàäåòå. Ñëåä òîâà íàòèñíåòå Ïðèêëþ÷âàíå, çà ä àïðåçàïóñíåòå êîìïþòúðà., IDC_STATIC, 10, 180, 297, 20 + LTEXT "Àêî â óñòðîéñòâîòî èìà ÊÄ, ãî èçâàäåòå. Ñëåä òîâà íàòèñíåòå Ïðèêëþ÷âàíå, çà äà ïðåçàïóñíåòå êîìïþòúðà., IDC_STATIC, 10, 180, 297, 20 END Added: trunk/reactos/base/system/regsvr32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/bg-BG.rc (added) +++ trunk/reactos/base/system/regsvr32/lang/bg-BG.rc [iso-8859-1] Wed Dec 24 01:50:52 2008 @@ -1,0 +1,28 @@ +#include "resource.h" + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN + +IDS_UsageMessage, "%s\n\nUsage: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n\ +/u - Unregister server\n\ +/s - Silent; display no message boxes\n\ +/c - Console output\n\ +/i - Call DllInstall passing it an optional [cmdline]; when used with /u calls dll uninstall\n\ +/n - Do not call DllRegisterServer; this option must be used with /i" + +IDS_NoDllSpecified, "Íå å óêàçàíî èìå íà DLL." + +IDS_InvalidFlag, "Íåðàçïîçíàò ñòÿã: %s" + +IDS_SwitchN_NoI, "Íåðàçïîçíàò ñòÿã: /n ñòðÿáâà äà ñå èçïîëçâà ñ êëþ÷à /i" + +IDS_DllNotLoaded, "Íåóñïåøíî LoadLibrary('%s').\nGetLastError âðúùà 0x%08x." + +IDS_MissingEntry, "%s áå çàðåäåí, íî âõîäíàòà òî÷êà %s íå å íàìåðåíà.\n\n\ +Âúçìîæíî å %s äà å íåèçíîñèì èëè â ïàìåòòà äà ñå íàìèðà ïîâðåäåíà âåðñèÿ íà %s. Ìîæåòå äà èçïîëçâàòå PView, çà äà ãî îòêðèåòå è ïðåìàõíåòå." + +IDS_FailureMessage, "%s â %s íå óñïÿ.\nÂúðíàòà ãðåøêà: 0x%08x" + +IDS_SuccessMessage "%s â %s óñïÿ." +END Propchange: trunk/reactos/base/system/regsvr32/lang/bg-BG.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/regsvr32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/rsrc.… ============================================================================== --- trunk/reactos/base/system/regsvr32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/rsrc.rc [iso-8859-1] Wed Dec 24 01:50:52 2008 @@ -3,6 +3,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc"

1 0

[dgorbachev] 38319: Fix error: suggest explicit braces to avoid ambiguous 'else'. When compiling with GCC 4.4.0.
by dgorbachev＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: dgorbachev Date: Wed Dec 24 01:04:49 2008 New Revision: 38319 URL: http://svn.reactos.org/svn/reactos?rev=38319&view=rev Log: Fix error: suggest explicit braces to avoid ambiguous 'else'. When compiling with GCC 4.4.0. Modified: trunk/reactos/base/applications/network/telnet/src/tnmain.cpp Modified: trunk/reactos/base/applications/network/telnet/src/tnmain.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tnmain.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tnmain.cpp [iso-8859-1] Wed Dec 24 01:04:49 2008 @@ -143,7 +143,7 @@ MustRefresh = 1; break; case VK_RIGHT: //crn(a)ozemail.com.au (added ctrl+arrow) - if (cursor < current) + if (cursor < current) { if (InputRecord.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) { unsigned int j, k; @@ -159,8 +159,9 @@ cursor++; MustRefresh = 1; break; + } case VK_LEFT: //crn(a)ozemail.com.au (added ctrl+arrow) - if (cursor > 0) + if (cursor > 0) { if(InputRecord.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) { int j, k; @@ -176,6 +177,7 @@ cursor--; MustRefresh = 1; break; + } case VK_HOME: if (cursor>0) cursor = 0; MustRefresh = 1;

1 0

[dgorbachev] 38318: Do not print garbage, initialize the variable. Bug #3916.
by dgorbachev＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: dgorbachev Date: Wed Dec 24 01:00:43 2008 New Revision: 38318 URL: http://svn.reactos.org/svn/reactos?rev=38318&view=rev Log: Do not print garbage, initialize the variable. Bug #3916. Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.c… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] Wed Dec 24 01:00:43 2008 @@ -142,6 +142,8 @@ if (!buf) { DPRINT1("Mke2fs: while allocating zeroizing buffer"); + if (ret_blk) + *ret_blk = blk; return false; } memset(buf, 0, fs->blocksize * STRIDE_LENGTH);

1 0

[jimtabor] 38317: - Add IntGetCharDimensions and text metrics for win32k server info.
by jimtabor＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: jimtabor Date: Tue Dec 23 20:23:30 2008 New Revision: 38317 URL: http://svn.reactos.org/svn/reactos?rev=38317&view=rev Log: - Add IntGetCharDimensions and text metrics for win32k server info. Modified: trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/font.c Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Tue Dec 23 20:23:30 2008 @@ -106,6 +106,7 @@ DWORD FASTCALL ftGdiGetKerningPairs(PFONTGDI,DWORD,LPKERNINGPAIR); BOOL NTAPI GreExtTextOutW(IN HDC,IN INT,IN INT,IN UINT,IN OPTIONAL LPRECT, IN LPWSTR, IN INT, IN OPTIONAL LPINT, IN DWORD); +DWORD FASTCALL IntGetCharDimensions(HDC, PTEXTMETRICW, PDWORD); #define IntLockProcessPrivateFonts(W32Process) \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&W32Process->PrivateFontListLock) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Tue Dec 23 20:23:30 2008 @@ -294,6 +294,7 @@ BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID) { + TEXTMETRICW tmw; UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"DISPLAY"); if (! IntCreatePrimarySurface()) { @@ -316,9 +317,13 @@ IntGdiSetDCOwnerEx( hSystemBM, GDI_OBJ_HMGR_PUBLIC, FALSE); // FIXME! Move these to a update routine. - gpsi->Planes = NtGdiGetDeviceCaps(ScreenDeviceContext, PLANES); - gpsi->BitsPixel = NtGdiGetDeviceCaps(ScreenDeviceContext, BITSPIXEL); - gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; + gpsi->Planes = NtGdiGetDeviceCaps(ScreenDeviceContext, PLANES); + gpsi->BitsPixel = NtGdiGetDeviceCaps(ScreenDeviceContext, BITSPIXEL); + gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; + gpsi->dmLogPixels = NtGdiGetDeviceCaps(ScreenDeviceContext, LOGPIXELSY); + // Font is realized and this dc was previously set to internal DC_ATTR. + gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, &gpsi->cySysFontChar); + gpsi->tmSysFont = tmw; return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Tue Dec 23 20:23:30 2008 @@ -53,6 +53,49 @@ } return Count; } + +DWORD +FASTCALL +IntGetCharDimensions(HDC hdc, PTEXTMETRICW ptm, PDWORD height) +{ + PDC pdc; + PDC_ATTR pDc_Attr; + PTEXTOBJ TextObj; + SIZE sz; + TMW_INTERNAL tmwi; + BOOL Good; + + static const WCHAR alphabet[] = { + 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q', + 'r','s','t','u','v','w','x','y','z','A','B','C','D','E','F','G','H', + 'I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',0}; + + if(!ftGdiGetTextMetricsW(hdc, &tmwi)) return 0; + + pdc = DC_LockDc(hdc); + + if (!pdc) return 0; + + pDc_Attr = pdc->pDc_Attr; + if(!pDc_Attr) pDc_Attr = &pdc->Dc_Attr; + + TextObj = RealizeFontInit(pDc_Attr->hlfntNew); + if ( !TextObj ) + { + DC_UnlockDc(pdc); + return 0; + } + Good = TextIntGetTextExtentPoint(pdc, TextObj, alphabet, 52, 0, NULL, 0, &sz); + TEXTOBJ_UnlockText(TextObj); + DC_UnlockDc(pdc); + + if (!Good) return 0; + if (ptm) *ptm = tmwi.TextMetric; + if (height) *height = tmwi.TextMetric.tmHeight; + + return (sz.cx / 26 + 1) / 2; +} + DWORD FASTCALL

1 0

[hyperion] 38316: Also print messages to output, so the tool is more generally useful
by hyperion＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: hyperion Date: Tue Dec 23 14:37:53 2008 New Revision: 38316 URL: http://svn.reactos.org/svn/reactos?rev=38316&view=rev Log: Also print messages to output, so the tool is more generally useful Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] Tue Dec 23 14:37:53 2008 @@ -31,7 +31,7 @@ return -1; } - if (_tcsstr(argv[1], "--winetest") && (argc == 3)) + if (_tcsstr(argv[1], "--winetest") && (argc == 3)) { char psBuffer[128]; char psBuffer2[128]; @@ -63,6 +63,7 @@ char *nlptr2 = strchr(psBuffer2, '\n'); if (nlptr2) *nlptr2 = '\0'; + puts(psBuffer2); OutputDebugStringA(psBuffer2); } _pclose(pPipe2); @@ -72,7 +73,7 @@ _pclose(pPipe); } } - else if (_tcsstr(argv[1], "--process") && (argc == 3)) + else if (_tcsstr(argv[1], "--process") && (argc == 3)) { char psBuffer[128]; FILE *pPipe; @@ -82,6 +83,7 @@ { while(fgets(psBuffer, 128, pPipe)) { + puts(psBuffer); OutputDebugStringA(psBuffer); } _pclose(pPipe); @@ -112,6 +114,7 @@ } offset++; } + _putts(buf); OutputDebugString(buf); HeapFree(GetProcessHeap(), 0, buf); }

1 0

[gschneider] 38315: - Skip certain process and pipe tests due to timeouts as it was done before, update diff file
by gschneider＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: gschneider Date: Tue Dec 23 14:05:39 2008 New Revision: 38315 URL: http://svn.reactos.org/svn/reactos?rev=38315&view=rev Log: - Skip certain process and pipe tests due to timeouts as it was done before, update diff file Modified: trunk/rostests/winetests/kernel32/pipe.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/roshack.diff Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c… ============================================================================== --- trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] Tue Dec 23 14:05:39 2008 @@ -1327,6 +1327,9 @@ { HMODULE hmod; + skip("ROS-HACK: Skipping pipe tests -- ros' npfs is in a sorry state\n"); + return; + hmod = GetModuleHandle("advapi32.dll"); pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx"); Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… ============================================================================== --- trunk/rostests/winetests/kernel32/process.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/process.c [iso-8859-1] Tue Dec 23 14:05:39 2008 @@ -1202,6 +1202,9 @@ const char* msg = "This is a std-handle inheritance test."; unsigned msg_len; BOOL run_tests = TRUE; + + skip("ROS-HACK: Skipping process console tests\n"); + return; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); Modified: trunk/rostests/winetests/kernel32/roshack.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/roshac… ============================================================================== --- trunk/rostests/winetests/kernel32/roshack.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/roshack.diff [iso-8859-1] Tue Dec 23 14:05:39 2008 @@ -1,8 +1,8 @@ Index: pipe.c =================================================================== ---- pipe.c (revision 38229) +--- pipe.c (revision 38314) +++ pipe.c (working copy) -@@ -1325,6 +1325,9 @@ +@@ -1327,6 +1327,9 @@ { HMODULE hmod; @@ -14,12 +14,12 @@ Index: process.c =================================================================== ---- process.c (revision 38229) +--- process.c (revision 38314) +++ process.c (working copy) -@@ -1127,6 +1127,9 @@ - HANDLE hChildIn, hChildInInh, hChildOut, hChildOutInh, hParentIn, hParentOut; +@@ -1202,6 +1202,9 @@ const char* msg = "This is a std-handle inheritance test."; unsigned msg_len; + BOOL run_tests = TRUE; + + skip("ROS-HACK: Skipping process console tests\n"); + return;

1 0

[gschneider] 38314: - Update kernel32 winetest, thanks to Stefan100 for making this possible
by gschneider＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: gschneider Date: Tue Dec 23 14:02:47 2008 New Revision: 38314 URL: http://svn.reactos.org/svn/reactos?rev=38314&view=rev Log: - Update kernel32 winetest, thanks to Stefan100 for making this possible Modified: trunk/rostests/winetests/kernel32/actctx.c trunk/rostests/winetests/kernel32/atom.c trunk/rostests/winetests/kernel32/change.c trunk/rostests/winetests/kernel32/codepage.c trunk/rostests/winetests/kernel32/comm.c trunk/rostests/winetests/kernel32/console.c trunk/rostests/winetests/kernel32/debugger.c trunk/rostests/winetests/kernel32/environ.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/format_msg.c trunk/rostests/winetests/kernel32/heap.c trunk/rostests/winetests/kernel32/loader.c trunk/rostests/winetests/kernel32/locale.c trunk/rostests/winetests/kernel32/mailslot.c trunk/rostests/winetests/kernel32/module.c trunk/rostests/winetests/kernel32/path.c trunk/rostests/winetests/kernel32/pipe.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/profile.c trunk/rostests/winetests/kernel32/resource.c trunk/rostests/winetests/kernel32/sync.c trunk/rostests/winetests/kernel32/thread.c trunk/rostests/winetests/kernel32/timer.c trunk/rostests/winetests/kernel32/toolhelp.c trunk/rostests/winetests/kernel32/version.c trunk/rostests/winetests/kernel32/virtual.c trunk/rostests/winetests/kernel32/volume.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/actctx… Modified: trunk/rostests/winetests/kernel32/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/atom.c… Modified: trunk/rostests/winetests/kernel32/change.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/change… Modified: trunk/rostests/winetests/kernel32/codepage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/codepa… Modified: trunk/rostests/winetests/kernel32/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/comm.c… Modified: trunk/rostests/winetests/kernel32/console.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/consol… Modified: trunk/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugg… Modified: trunk/rostests/winetests/kernel32/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/enviro… Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… Modified: trunk/rostests/winetests/kernel32/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/format… Modified: trunk/rostests/winetests/kernel32/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/heap.c… Modified: trunk/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader… Modified: trunk/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/locale… Modified: trunk/rostests/winetests/kernel32/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/mailsl… Modified: trunk/rostests/winetests/kernel32/module.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/module… Modified: trunk/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/path.c… Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c… Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… Modified: trunk/rostests/winetests/kernel32/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/profil… Modified: trunk/rostests/winetests/kernel32/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/resour… Modified: trunk/rostests/winetests/kernel32/sync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/sync.c… Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… Modified: trunk/rostests/winetests/kernel32/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/timer.… Modified: trunk/rostests/winetests/kernel32/toolhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/toolhe… Modified: trunk/rostests/winetests/kernel32/version.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/versio… Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… Modified: trunk/rostests/winetests/kernel32/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/volume…

1 0

[hyperion] 38313: Missing from previous commit
by hyperion＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: hyperion Date: Tue Dec 23 13:56:42 2008 New Revision: 38313 URL: http://svn.reactos.org/svn/reactos?rev=38313&view=rev Log: Missing from previous commit Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Dec 23 13:56:42 2008 @@ -16,7 +16,7 @@ 1 = system32 2 = system32\drivers 3 = Fonts -4 = +4 = 5 = system32\drivers\etc 6 = inf 7 = bin @@ -617,6 +617,7 @@ modules\rosapps\drivers\avtest\avtest.sys 2 optional modules\rosapps\drivers\green\green.sys 2 optional modules\rosapps\templates\dialog\dialog.exe 1 optional +modules\rostests\tests\pseh2\pseh2_test.exe 7 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional

1 0

[sginsberg] 38312: - Kill 1 static, kill 1 allowarnings=true
by sginsberg＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: sginsberg Date: Tue Dec 23 13:53:44 2008 New Revision: 38312 URL: http://svn.reactos.org/svn/reactos?rev=38312&view=rev Log: - Kill 1 static, kill 1 allowarnings=true Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] Tue Dec 23 13:53:44 2008 @@ -259,7 +259,7 @@ } -static IDmaChannelSlaveVtbl vt_IDmaChannelSlaveVtbl = +IDmaChannelSlaveVtbl vt_IDmaChannelSlaveVtbl = { /* IUnknown methods */ IDmaChannelSlave_fnQueryInterface, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Tue Dec 23 13:53:44 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd"> -<module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys" allowwarnings="true"> +<module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys"> <importlibrary definition="portcls.spec" /> <define name="_NTDDK_" /> <define name="PC_NO_IMPORTS" />

1 0

[hyperion] 38311: PSEH 2 test suite - around 90 tests so far, and more coming
by hyperion＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: hyperion Date: Tue Dec 23 13:47:30 2008 New Revision: 38311 URL: http://svn.reactos.org/svn/reactos?rev=38311&view=rev Log: PSEH 2 test suite - around 90 tests so far, and more coming Added: trunk/rostests/tests/pseh2/ trunk/rostests/tests/pseh2/pseh2.rbuild (with props) trunk/rostests/tests/pseh2/psehtest.c (with props) trunk/rostests/tests/pseh2/psehtest2.c (with props) Modified: trunk/rostests/tests/directory.rbuild Modified: trunk/rostests/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/directory.rbuild?re… ============================================================================== --- trunk/rostests/tests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/directory.rbuild [iso-8859-1] Tue Dec 23 13:47:30 2008 @@ -109,7 +109,7 @@ <directory name="Imagelistviewer"> <xi:include href="Imagelistviewer/imagelistviewer.rbuild" /> </directory> - +  <directory name="isotest"> @@ -174,6 +174,9 @@ <directory name="primitives"> <xi:include href="primitives/primitives.rbuild" /> </directory> + <directory name="pseh2"> + <xi:include href="pseh2/pseh2.rbuild" /> + </directory>  Added: trunk/rostests/tests/pseh2/pseh2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/pseh2.rbuild?… ============================================================================== --- trunk/rostests/tests/pseh2/pseh2.rbuild (added) +++ trunk/rostests/tests/pseh2/pseh2.rbuild [iso-8859-1] Tue Dec 23 13:47:30 2008 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<module name="pseh2_test" type="win32cui" installbase="bin" installname="pseh2_test.exe" allowwarnings="true"> + <library>wine</library> + <library>pseh</library> + <file>psehtest.c</file> + <file>psehtest2.c</file> +</module> Propchange: trunk/rostests/tests/pseh2/pseh2.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c (added) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Tue Dec 23 13:47:30 2008 @@ -1,0 +1,2436 @@ +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include <pseh/pseh2.h> + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#define STANDALONE +#include <wine/test.h> + +extern void no_op(void); +extern int return_arg(int); + +extern int return_zero(void); +extern int return_positive(void); +extern int return_negative(void); +extern int return_one(void); +extern int return_minusone(void); + +extern int return_zero_2(void *); +extern int return_positive_2(void *); +extern int return_negative_2(void *); +extern int return_one_2(void *); +extern int return_minusone_2(void *); + +extern int return_zero_3(int); +extern int return_positive_3(int); +extern int return_negative_3(int); +extern int return_one_3(int); +extern int return_minusone_3(int); + +extern int return_zero_4(void *, int); +extern int return_positive_4(void *, int); +extern int return_negative_4(void *, int); +extern int return_one_4(void *, int); +extern int return_minusone_4(void *, int); + +extern void set_positive(int *); + +static int call_test(int (*)(void)); + +#define DEFINE_TEST(NAME_) \ + static int test_ ## NAME_(void); \ + \ + static void NAME_(void) { ok(call_test(test_ ## NAME_), "test failed\n"); } \ + \ + static int test_ ## NAME_(void) + +/* Empty statements *///{{{ +DEFINE_TEST(empty_1) +{ + _SEH2_TRY { } _SEH2_EXCEPT(0) { } _SEH2_END; + return 1; +} + +DEFINE_TEST(empty_2) +{ + _SEH2_TRY { } _SEH2_EXCEPT(-1) { } _SEH2_END; + return 1; +} + +DEFINE_TEST(empty_3) +{ + _SEH2_TRY { } _SEH2_EXCEPT(1) { } _SEH2_END; + return 1; +} + +DEFINE_TEST(empty_4) +{ + _SEH2_TRY { } _SEH2_FINALLY { } _SEH2_END; + return 1; +} + +DEFINE_TEST(empty_5) +{ + _SEH2_TRY { _SEH2_TRY { } _SEH2_EXCEPT(0) { } _SEH2_END; } _SEH2_FINALLY { } _SEH2_END; + return 1; +} + +DEFINE_TEST(empty_6) +{ + _SEH2_TRY { _SEH2_TRY { } _SEH2_EXCEPT(-1) { } _SEH2_END; } _SEH2_FINALLY { } _SEH2_END; + return 1; +} + +DEFINE_TEST(empty_7) +{ + _SEH2_TRY { _SEH2_TRY { } _SEH2_EXCEPT(1) { } _SEH2_END; } _SEH2_FINALLY { } _SEH2_END; + return 1; +} + +DEFINE_TEST(empty_8) +{ + _SEH2_TRY { _SEH2_TRY { } _SEH2_FINALLY { } _SEH2_END; } _SEH2_FINALLY { } _SEH2_END; + return 1; +} +//}}} + +/* Static exception filters *///{{{ +DEFINE_TEST(execute_handler_1) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_execution_1) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_positive(); + } + _SEH2_EXCEPT(EXCEPTION_CONTINUE_EXECUTION) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_search_1) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(EXCEPTION_CONTINUE_SEARCH) + { + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(execute_handler_2) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(12345) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_execution_2) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_positive(); + } + _SEH2_EXCEPT(-12345) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} +//}}} + +/* Dynamic exception filters *///{{{ +DEFINE_TEST(execute_handler_3) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(return_one()) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_execution_3) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_positive(); + } + _SEH2_EXCEPT(return_minusone()) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_search_2) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(return_zero()) + { + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(execute_handler_4) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(return_positive()) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_execution_4) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_positive(); + } + _SEH2_EXCEPT(return_negative()) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} +//}}} + +/* Dynamic exception filters, using _SEH2_GetExceptionInformation() *///{{{ +DEFINE_TEST(execute_handler_5) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(return_one_2(_SEH2_GetExceptionInformation())) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_execution_5) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_positive(); + } + _SEH2_EXCEPT(return_minusone_2(_SEH2_GetExceptionInformation())) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_search_3) +{ + static int ret; + + ret = return_positive(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(return_zero_2(_SEH2_GetExceptionInformation())) + { + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(execute_handler_6) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(return_positive_2(_SEH2_GetExceptionInformation())) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_execution_6) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_positive(); + } + _SEH2_EXCEPT(return_negative_2(_SEH2_GetExceptionInformation())) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} +//}}} + +/* Dynamic exception filters, using _SEH2_GetExceptionCode() *///{{{ +DEFINE_TEST(execute_handler_7) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(return_one_3(_SEH2_GetExceptionCode())) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_execution_7) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_positive(); + } + _SEH2_EXCEPT(return_minusone_3(_SEH2_GetExceptionCode())) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_search_4) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(return_zero_3(_SEH2_GetExceptionCode())) + { + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(execute_handler_8) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(return_positive_3(_SEH2_GetExceptionCode())) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_execution_8) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_positive(); + } + _SEH2_EXCEPT(return_negative_3(_SEH2_GetExceptionCode())) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} +//}}} + +/* Dynamic exception filters, using _SEH2_GetExceptionInformation() and _SEH2_GetExceptionCode() *///{{{ +DEFINE_TEST(execute_handler_9) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(return_one_4(_SEH2_GetExceptionInformation(), _SEH2_GetExceptionCode())) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_execution_9) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_positive(); + } + _SEH2_EXCEPT(return_minusone_4(_SEH2_GetExceptionInformation(), _SEH2_GetExceptionCode())) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_search_5) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(return_zero_4(_SEH2_GetExceptionInformation(), _SEH2_GetExceptionCode())) + { + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(execute_handler_10) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(return_positive_4(_SEH2_GetExceptionInformation(), _SEH2_GetExceptionCode())) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_execution_10) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_positive(); + } + _SEH2_EXCEPT(return_negative_4(_SEH2_GetExceptionInformation(), _SEH2_GetExceptionCode())) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} +//}}} + +/* Constant exception filters with side effects *///{{{ +DEFINE_TEST(execute_handler_11) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(set_positive(&ret), EXCEPTION_EXECUTE_HANDLER) + { + ret = ret ? return_positive() : return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_execution_11) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = ret ? return_positive() : return_zero(); + } + _SEH2_EXCEPT(set_positive(&ret), EXCEPTION_CONTINUE_EXECUTION) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_search_6) +{ + static int ret; + static int ret2; + + ret = return_zero(); + ret2 = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + ret2 = return_zero(); + } + _SEH2_EXCEPT(set_positive(&ret), EXCEPTION_CONTINUE_SEARCH) + { + ret = return_zero(); + ret2 = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(set_positive(&ret2), EXCEPTION_EXECUTE_HANDLER) + { + ret = return_arg(ret); + ret2 = return_arg(ret2); + } + _SEH2_END; + + return ret == return_positive() && ret2 == return_positive(); +} + +DEFINE_TEST(execute_handler_12) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(set_positive(&ret), 12345) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(continue_execution_12) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_arg(ret); + } + _SEH2_EXCEPT(set_positive(&ret), -12345) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} +//}}} + +/* _SEH2_LEAVE *///{{{ +DEFINE_TEST(leave_1) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + ret = return_positive(); + _SEH2_LEAVE; + ret = return_zero(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(leave_2) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + ret = return_positive(); + _SEH2_LEAVE; + + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(leave_3) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + ret = return_positive(); + + if(return_one()) + _SEH2_LEAVE; + + ret = return_zero(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(leave_4) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + int i; + int n = return_one() + return_one(); + + for(i = return_zero(); i < n; ++ i) + { + if(i == return_one()) + { + ret = return_positive(); + _SEH2_LEAVE; + } + } + + ret = return_zero(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(leave_5) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + switch(return_one()) + { + case 0: ret = return_zero(); + case 1: ret = return_positive(); _SEH2_LEAVE; + case 2: ret = return_zero(); + } + + ret = return_zero(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(leave_6) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + _SEH2_LEAVE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_zero(); + } + _SEH2_END; + + ret = return_positive(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} +//}}} + +/* _SEH2_YIELD() *///{{{ +static +int test_yield_1_helper(void) +{ + _SEH2_TRY + { + _SEH2_YIELD(return return_positive()); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return return_zero()); + } + _SEH2_END; + + return return_zero(); +} + +DEFINE_TEST(yield_1) +{ + return test_yield_1_helper() == return_positive(); +} + +static +int test_yield_2_helper(void) +{ + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + _SEH2_YIELD(return return_zero()); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return return_positive()); + } + _SEH2_END; + + return return_zero(); +} + +DEFINE_TEST(yield_2) +{ + return test_yield_2_helper() == return_positive(); +} + +static +int test_yield_3_helper(void) +{ + _SEH2_TRY + { + _SEH2_TRY + { + _SEH2_YIELD(return return_positive()); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return return_zero()); + } + _SEH2_END; + + _SEH2_YIELD(return return_zero()); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return return_zero()); + } + _SEH2_END; + + return return_zero(); +} + +DEFINE_TEST(yield_3) +{ + return test_yield_3_helper() == return_positive(); +} + +static +int test_yield_4_helper(void) +{ + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + _SEH2_YIELD(return return_zero()); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return return_positive()); + } + _SEH2_END; + + _SEH2_YIELD(return return_zero()); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return return_zero()); + } + _SEH2_END; + + return return_zero(); +} + +DEFINE_TEST(yield_4) +{ + return test_yield_4_helper() == return_positive(); +} + +static int test_yield_5_ret; + +static +int test_yield_5_helper(void) +{ + test_yield_5_ret = return_zero(); + + _SEH2_TRY + { + _SEH2_YIELD(return return_positive()); + } + _SEH2_FINALLY + { + test_yield_5_ret = return_positive(); + } + _SEH2_END; + + return return_zero(); +} + +DEFINE_TEST(yield_5) +{ + return test_yield_5_helper() == return_positive() && test_yield_5_ret == return_positive(); +} + +int test_yield_6_ret; + +static +int test_yield_6_helper(void) +{ + test_yield_6_ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + _SEH2_YIELD(return return_positive()); + } + _SEH2_FINALLY + { + test_yield_6_ret = return_positive(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + test_yield_6_ret += return_one(); + } + _SEH2_END; + + return return_zero(); +} + +DEFINE_TEST(yield_6) +{ + return test_yield_6_helper() == return_positive() && test_yield_6_ret == return_positive() + return_one(); +} +//}}} + +/* Termination blocks *///{{{ +DEFINE_TEST(finally_1) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + ret = return_arg(ret); + } + _SEH2_FINALLY + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(finally_2) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + ret = return_arg(ret); + _SEH2_LEAVE; + } + _SEH2_FINALLY + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(finally_3) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + ret = return_arg(ret); + _SEH2_YIELD(goto leave); + } + _SEH2_FINALLY + { + ret = return_positive(); + } + _SEH2_END; + +leave: + return ret == return_positive(); +} + +static int test_finally_4_ret; + +static int test_finally_4_helper(void) +{ + test_finally_4_ret = return_zero(); + + _SEH2_TRY + { + test_finally_4_ret = return_arg(test_finally_4_ret); + _SEH2_YIELD(return return_positive()); + } + _SEH2_FINALLY + { + test_finally_4_ret = return_positive(); + } + _SEH2_END; + + return return_zero(); +} + +DEFINE_TEST(finally_4) +{ + return test_finally_4_helper() == return_positive() && test_finally_4_ret; +} + +DEFINE_TEST(finally_5) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_FINALLY + { + ret = return_positive(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(finally_6) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + ret = return_arg(ret); + } + _SEH2_FINALLY + { + if(ret == return_zero()) + ret = return_positive(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + if(ret == return_positive()) + ret = return_positive() + return_one(); + } + _SEH2_END; + + return ret == return_positive() + return_one(); +} + +DEFINE_TEST(finally_7) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + ret = return_arg(ret); + _SEH2_LEAVE; + } + _SEH2_FINALLY + { + if(ret == return_zero()) + ret = return_positive(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + if(ret == return_positive()) + ret = return_positive() + return_one(); + } + _SEH2_END; + + return ret == return_positive() + return_one(); +} + +DEFINE_TEST(finally_8) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + ret = return_arg(ret); + _SEH2_YIELD(goto leave); + } + _SEH2_FINALLY + { + if(ret == return_zero()) + ret = return_positive(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + if(ret == return_positive()) + ret = return_positive() + return_one(); + } + _SEH2_END; + +leave: + return ret == return_positive() + return_one(); +} + +static int test_finally_9_ret; + +static int test_finally_9_helper(void) +{ + test_finally_9_ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + test_finally_9_ret = return_arg(test_finally_9_ret); + _SEH2_YIELD(return return_positive()); + } + _SEH2_FINALLY + { + if(test_finally_9_ret == return_zero()) + test_finally_9_ret = return_positive(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + if(test_finally_9_ret == return_positive()) + test_finally_9_ret = return_positive() + return_one(); + } + _SEH2_END; + + return return_zero(); +} + +DEFINE_TEST(finally_9) +{ + return test_finally_9_helper() == return_positive() && test_finally_9_ret == return_positive() + return_one(); +} + +DEFINE_TEST(finally_10) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_FINALLY + { + if(ret == return_zero()) + ret = return_positive(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + if(ret == return_positive()) + ret = return_positive() + return_one(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive() + return_one(); +} + +DEFINE_TEST(finally_11) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + _SEH2_TRY + { + ret = return_arg(ret); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + ret = return_positive(); + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + if(ret == return_positive()) + ret += return_one(); + } + _SEH2_END; + + return ret == return_positive() + return_one(); +} + +DEFINE_TEST(finally_12) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + _SEH2_TRY + { + ret = return_arg(ret); + } + _SEH2_FINALLY + { + ret = return_positive(); + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + if(ret == return_positive()) + ret += return_one(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + if(ret == return_positive() + return_one()) + ret += return_one(); + } + _SEH2_END; + + return ret == return_positive() + return_one() + return_one(); +} + +#if 0 +static int test_finally_13_ret; + +static +void test_finally_13_helper(void) +{ + test_finally_13_ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + test_finally_13_ret = return_positive(); + _SEH2_YIELD(return); + test_finally_13_ret = return_zero(); + } + _SEH2_FINALLY + { + if(test_finally_13_ret == return_positive()) + test_finally_13_ret += return_one(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + if(test_finally_13_ret == return_positive() + return_one()) + test_finally_13_ret += return_one(); + + RaiseException(0xE00DEAD0, 0, 0, NULL); + test_finally_13_ret = return_zero(); + } + _SEH2_END; + + test_finally_13_ret = return_zero(); +} + +DEFINE_TEST(finally_13) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + ret = return_arg(ret); + test_finally_13_helper(); + ret = return_zero(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive() && test_finally_13_ret == return_positive() + return_one() + return_one(); +} + +static int test_finally_14_ret; + +static +void test_finally_14_helper(void) +{ + test_finally_14_ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + _SEH2_TRY + { + test_finally_14_ret = return_positive(); + RaiseException(0xE00DEAD0, 0, 0, NULL); + test_finally_14_ret = return_zero(); + } + _SEH2_FINALLY + { + if(test_finally_14_ret == return_positive()) + test_finally_14_ret += return_one(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + if(test_finally_14_ret == return_positive() + return_one()) + test_finally_14_ret += return_one(); + + RaiseException(0xE00DEAD0, 0, 0, NULL); + test_finally_14_ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + test_finally_14_ret = return_zero(); + } + _SEH2_END; + + test_finally_14_ret = return_zero(); +} + +DEFINE_TEST(finally_14) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + ret = return_arg(ret); + test_finally_14_helper(); + ret = return_zero(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive() && test_finally_14_ret == return_positive() + return_one() + return_one(); +} +#endif +//}}} + +/* _SEH2_GetExceptionInformation() *///{{{ +static +int verify_xpointers(struct _EXCEPTION_POINTERS * ep, DWORD code, DWORD flags, DWORD argc, const ULONG_PTR * argv, int * ret, int filter) +{ + *ret = + ep && + ep->ExceptionRecord && + ep->ContextRecord && + ep->ExceptionRecord->ExceptionCode == code && + ep->ExceptionRecord->ExceptionFlags == flags && + ep->ExceptionRecord->NumberParameters == argc && + (argv || !argc) && + memcmp(ep->ExceptionRecord->ExceptionInformation, argv, sizeof(argv[0]) * argc) == 0; + + if(*ret) + *ret = return_positive(); + + return filter; +} + +DEFINE_TEST(xpointers_1) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, 0, 0, NULL, &ret, EXCEPTION_EXECUTE_HANDLER)) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_2) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 0, NULL); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 0, NULL, &ret, EXCEPTION_EXECUTE_HANDLER)) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_3) +{ + static int ret; + static const ULONG_PTR args[] = { 1, 2, 12345 }; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 0, args); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 0, args, &ret, EXCEPTION_EXECUTE_HANDLER)) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_4) +{ + static int ret; + static const ULONG_PTR args[] = { 1, 2, 12345 }; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 1, args); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 1, args, &ret, EXCEPTION_EXECUTE_HANDLER)) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_5) +{ + static int ret; + static const ULONG_PTR args[] = { 1, 2, 12345 }; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 2, args); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 2, args, &ret, EXCEPTION_EXECUTE_HANDLER)) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_6) +{ + static int ret; + static const ULONG_PTR args[] = { 1, 2, 12345 }; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 3, args); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 3, args, &ret, EXCEPTION_EXECUTE_HANDLER)) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_7) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_arg(ret); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, 0, 0, NULL, &ret, EXCEPTION_CONTINUE_EXECUTION)) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_8) +{ + static int ret; + static const ULONG_PTR args[] = { 1, 2, 12345 }; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, args); + ret = return_arg(ret); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, 0, 0, args, &ret, EXCEPTION_CONTINUE_EXECUTION)) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_9) +{ + static int ret; + static const ULONG_PTR args[] = { 1, 2, 12345 }; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 1, args); + ret = return_arg(ret); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, 0, 1, args, &ret, EXCEPTION_CONTINUE_EXECUTION)) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_10) +{ + static int ret; + static const ULONG_PTR args[] = { 1, 2, 12345 }; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 2, args); + ret = return_arg(ret); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, 0, 2, args, &ret, EXCEPTION_CONTINUE_EXECUTION)) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_11) +{ + static int ret; + static const ULONG_PTR args[] = { 1, 2, 12345 }; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 3, args); + ret = return_arg(ret); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, 0, 3, args, &ret, EXCEPTION_CONTINUE_EXECUTION)) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_12) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 0, NULL); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 0, NULL, &ret, EXCEPTION_CONTINUE_SEARCH)) + { + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_13) +{ + static int ret; + static const ULONG_PTR args[] = { 1, 2, 12345 }; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 0, args); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 0, args, &ret, EXCEPTION_CONTINUE_SEARCH)) + { + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_14) +{ + static int ret; + static const ULONG_PTR args[] = { 1, 2, 12345 }; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 1, args); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 1, args, &ret, EXCEPTION_CONTINUE_SEARCH)) + { + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_15) +{ + static int ret; + static const ULONG_PTR args[] = { 1, 2, 12345 }; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 2, args); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 2, args, &ret, EXCEPTION_CONTINUE_SEARCH)) + { + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xpointers_16) +{ + static int ret; + static const ULONG_PTR args[] = { 1, 2, 12345 }; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 3, args); + } + _SEH2_EXCEPT(verify_xpointers(_SEH2_GetExceptionInformation(), 0xE00DEAD0, EXCEPTION_NONCONTINUABLE, 3, args, &ret, EXCEPTION_CONTINUE_SEARCH)) + { + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} +//}}} + +/* _SEH2_GetExceptionCode() *///{{{ +static +int verify_xcode(int code, int xcode, int * ret, int filter) +{ + *ret = code == xcode; + + if(*ret) + *ret = return_positive(); + + return filter; +} + +DEFINE_TEST(xcode_1) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(verify_xcode(_SEH2_GetExceptionCode(), 0xE00DEAD0, &ret, EXCEPTION_EXECUTE_HANDLER)) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xcode_2) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_arg(ret); + } + _SEH2_EXCEPT(verify_xcode(_SEH2_GetExceptionCode(), 0xE00DEAD0, &ret, EXCEPTION_CONTINUE_EXECUTION)) + { + ret = return_zero(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(xcode_3) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(verify_xcode(_SEH2_GetExceptionCode(), 0xE00DEAD0, &ret, EXCEPTION_CONTINUE_SEARCH)) + { + ret = return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} +//}}} + +/* _SEH2_AbnormalTermination() *///{{{ +DEFINE_TEST(abnorm_1) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + ret = return_arg(ret); + } + _SEH2_FINALLY + { + ret = _SEH2_AbnormalTermination() ? return_zero() : return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(abnorm_2) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_LEAVE; + } + _SEH2_FINALLY + { + ret = _SEH2_AbnormalTermination() ? return_zero() : return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(abnorm_3) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_YIELD(goto leave); + } + _SEH2_FINALLY + { + ret = _SEH2_AbnormalTermination() ? return_positive() : return_zero(); + } + _SEH2_END; + +leave: + return ret == return_positive(); +} + +DEFINE_TEST(abnorm_4) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_FINALLY + { + ret = _SEH2_AbnormalTermination() ? return_positive() : return_zero(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(abnorm_5) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + ret = return_arg(ret); + } + _SEH2_FINALLY + { + ret = _SEH2_AbnormalTermination() ? return_zero() : return_positive(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + ret = ret == return_positive() && !_SEH2_AbnormalTermination() ? return_positive() + return_one() : ret; + } + _SEH2_END; + + return ret == return_positive() + return_one(); +} + +DEFINE_TEST(abnorm_6) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + _SEH2_LEAVE; + } + _SEH2_FINALLY + { + ret = _SEH2_AbnormalTermination() ? return_zero() : return_positive(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + ret = ret == return_positive() && !_SEH2_AbnormalTermination() ? return_positive() + return_one() : ret; + } + _SEH2_END; + + return ret == return_positive() + return_one(); +} + +DEFINE_TEST(abnorm_7) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + _SEH2_YIELD(goto leave); + } + _SEH2_FINALLY + { + ret = _SEH2_AbnormalTermination() ? return_positive() : return_zero(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + ret = ret == return_positive() && _SEH2_AbnormalTermination() ? return_positive() + return_one() : ret; + } + _SEH2_END; + +leave: + return ret == return_positive() + return_one(); +} + +DEFINE_TEST(abnorm_8) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_FINALLY + { + ret = _SEH2_AbnormalTermination() ? return_positive() : return_zero(); + } + _SEH2_END; + } + _SEH2_FINALLY + { + ret = ret == return_positive() && _SEH2_AbnormalTermination() ? return_positive() + return_one() : ret; + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_arg(ret); + } + _SEH2_END; + + return ret == return_positive() + return_one(); +} +//}}} + +/* System support *///{{{ +// TODO +//}}} + +/* CPU faults *///{{{ +// TODO +//}}} + +#define USE_TEST_NAME_(NAME_) # NAME_ +#define USE_TEST_NAME(NAME_) USE_TEST_NAME_(NAME_) +#define USE_TEST(NAME_) { USE_TEST_NAME(NAME_), NAME_ } + +const struct test winetest_testlist[] = +{ + USE_TEST(empty_1), + USE_TEST(empty_2), + USE_TEST(empty_3), + USE_TEST(empty_4), + USE_TEST(empty_5), + USE_TEST(empty_6), + USE_TEST(empty_7), + USE_TEST(empty_8), + + USE_TEST(execute_handler_1), + USE_TEST(continue_execution_1), + USE_TEST(continue_search_1), + USE_TEST(execute_handler_2), + USE_TEST(continue_execution_2), + + USE_TEST(execute_handler_3), + USE_TEST(continue_execution_3), + USE_TEST(continue_search_2), + USE_TEST(execute_handler_4), + USE_TEST(continue_execution_4), + + USE_TEST(execute_handler_5), + USE_TEST(continue_execution_5), + USE_TEST(continue_search_3), + USE_TEST(execute_handler_6), + USE_TEST(continue_execution_6), + + USE_TEST(execute_handler_7), + USE_TEST(continue_execution_7), + USE_TEST(continue_search_4), + USE_TEST(execute_handler_8), + USE_TEST(continue_execution_8), + + USE_TEST(execute_handler_9), + USE_TEST(continue_execution_9), + USE_TEST(continue_search_5), + USE_TEST(execute_handler_10), + USE_TEST(continue_execution_10), + + USE_TEST(execute_handler_11), + USE_TEST(continue_execution_11), + USE_TEST(continue_search_6), + USE_TEST(execute_handler_12), + USE_TEST(continue_execution_12), + + USE_TEST(leave_1), + USE_TEST(leave_2), + USE_TEST(leave_3), + USE_TEST(leave_4), + USE_TEST(leave_5), + USE_TEST(leave_6), + + USE_TEST(yield_1), + USE_TEST(yield_2), + USE_TEST(yield_3), + USE_TEST(yield_4), + USE_TEST(yield_5), + USE_TEST(yield_6), + + USE_TEST(finally_1), + USE_TEST(finally_2), + USE_TEST(finally_3), + USE_TEST(finally_4), + USE_TEST(finally_5), + USE_TEST(finally_6), + USE_TEST(finally_7), + USE_TEST(finally_8), + USE_TEST(finally_9), + USE_TEST(finally_10), + USE_TEST(finally_11), + USE_TEST(finally_12), +#if 0 + USE_TEST(finally_13), + USE_TEST(finally_14), +#endif + + USE_TEST(xpointers_1), + USE_TEST(xpointers_2), + USE_TEST(xpointers_3), + USE_TEST(xpointers_4), + USE_TEST(xpointers_5), + USE_TEST(xpointers_6), + USE_TEST(xpointers_7), + USE_TEST(xpointers_8), + USE_TEST(xpointers_9), + USE_TEST(xpointers_10), + USE_TEST(xpointers_11), + USE_TEST(xpointers_12), + USE_TEST(xpointers_13), + USE_TEST(xpointers_14), + USE_TEST(xpointers_15), + USE_TEST(xpointers_16), + + USE_TEST(xcode_1), + USE_TEST(xcode_2), + USE_TEST(xcode_3), + + USE_TEST(abnorm_1), + USE_TEST(abnorm_2), + USE_TEST(abnorm_3), + USE_TEST(abnorm_4), + USE_TEST(abnorm_5), + USE_TEST(abnorm_6), + USE_TEST(abnorm_7), + USE_TEST(abnorm_8), + + { 0, 0 } +}; + +static +LONG WINAPI unhandled_exception(PEXCEPTION_POINTERS ExceptionInfo) +{ + ok(0, "unhandled exception %08lX thrown from %p\n", ExceptionInfo->ExceptionRecord->ExceptionCode, ExceptionInfo->ExceptionRecord->ExceptionAddress); + return EXCEPTION_CONTINUE_SEARCH; +} + +#if defined(_M_IX86) +struct volatile_context +{ + void * esp; + void * ebp; + void * ebx; + void * esi; + void * edi; +}; +#else +#error TODO +#endif + +#if defined(__GNUC__) +static +__attribute__((noinline)) +int sanity_check(int ret, struct volatile_context * before, struct volatile_context * after) +{ + if(ret && memcmp(before, after, sizeof(before))) + ok(0, "volatile context corrupted\n"); + + return ret; +} + +static +__attribute__((noinline)) +int call_test(int (* func)(void)) +{ + static int ret; + static LPTOP_LEVEL_EXCEPTION_FILTER prev_unhandled_exception; + + prev_unhandled_exception = SetUnhandledExceptionFilter(&unhandled_exception); + +#if defined(__i386__) + static struct volatile_context before, after; + + __asm__ __volatile__ + ( + "mov %%esp, 0x00 + %c[before]\n" + "mov %%ebp, 0x04 + %c[before]\n" + "mov %%ebx, 0x08 + %c[before]\n" + "mov %%esi, 0x0c + %c[before]\n" + "mov %%edi, 0x10 + %c[before]\n" + "call *%[test]\n" + "mov %%esp, 0x00 + %c[after]\n" + "mov %%ebp, 0x04 + %c[after]\n" + "mov %%ebx, 0x08 + %c[after]\n" + "mov %%esi, 0x0c + %c[after]\n" + "mov %%edi, 0x10 + %c[after]\n" + "push %[after]\n" + "push %[before]\n" + "push %[ret]\n" + "call %c[sanity_check]\n" + "pop %%ecx\n" + "pop %%ecx\n" + "pop %%ecx\n" : + [ret] "=a" (ret) : + [test] "r" (func), [before] "i" (&before), [after] "i" (&after), [sanity_check] "i" (&sanity_check) : + "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" + ); +#else +#error TODO +#endif + + SetUnhandledExceptionFilter(prev_unhandled_exception); + return ret; +} +#else +#error TODO +#endif + +/* EOF */ Propchange: trunk/rostests/tests/pseh2/psehtest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/pseh2/psehtest2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest2.c?r… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest2.c (added) +++ trunk/rostests/tests/pseh2/psehtest2.c [iso-8859-1] Tue Dec 23 13:47:30 2008 @@ -1,0 +1,138 @@ +extern +int return_arg(int arg) +{ + return arg; +} + +extern +void no_op(void) +{ +} + +extern +int return_zero(void) +{ + return 0; +} + +extern +int return_positive(void) +{ + return 1234; +} + +extern +int return_negative(void) +{ + return -1234; +} + +extern +int return_one(void) +{ + return 1; +} + +extern +int return_minusone(void) +{ + return -1; +} + +extern +int return_zero_2(void * p) +{ + return 0; +} + +extern +int return_positive_2(void * p) +{ + return 1234; +} + +extern +int return_negative_2(void * p) +{ + return -1234; +} + +extern +int return_one_2(void * p) +{ + return 1; +} + +extern +int return_minusone_2(void * p) +{ + return -1; +} + +extern +int return_zero_3(int n) +{ + return 0; +} + +extern +int return_positive_3(int n) +{ + return 1234; +} + +extern +int return_negative_3(int n) +{ + return -1234; +} + +extern +int return_one_3(int n) +{ + return 1; +} + +extern +int return_minusone_3(int n) +{ + return -1; +} + +extern +int return_zero_4(void * p, int n) +{ + return 0; +} + +extern +int return_positive_4(void * p, int n) +{ + return 1234; +} + +extern +int return_negative_4(void * p, int n) +{ + return -1234; +} + +extern +int return_one_4(void * p, int n) +{ + return 1; +} + +extern +int return_minusone_4(void * p, int n) +{ + return -1; +} + +extern +void set_positive(int * p) +{ + *p = 1234; +} + +/* EOF */ Propchange: trunk/rostests/tests/pseh2/psehtest2.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs