October 2006 - Wine-commits

Michael Stefaniuc : hhctrl.ocx: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 84473e5bfc27c1d8dd5da06ee02c1552ea6cad80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84473e5bfc27c1d8dd5da06ee… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 3 23:38:59 2006 +0200 hhctrl.ocx: Win64 printf format warning fixes. --- dlls/hhctrl.ocx/Makefile.in | 1 - dlls/hhctrl.ocx/hhctrl.c | 2 +- dlls/hhctrl.ocx/main.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index a4759ce..d3dca8f 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = hhctrl.ocx IMPORTS = advapi32 comctl32 shell32 ole32 oleaut32 user32 gdi32 kernel32 EXTRALIBS = -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ chm.c \ diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 7f64d4c..be9f597 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -76,7 +76,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWS { CHAR *file = NULL; - TRACE("(%p, %s, command=%s, data=%ld)\n", + TRACE("(%p, %s, command=%s, data=%d)\n", caller, debugstr_w( filename ), command_to_string( command ), data); diff --git a/dlls/hhctrl.ocx/main.c b/dlls/hhctrl.ocx/main.c index e8a8548..1faf1d0 100644 --- a/dlls/hhctrl.ocx/main.c +++ b/dlls/hhctrl.ocx/main.c @@ -30,7 +30,7 @@ HINSTANCE hhctrl_hinstance; BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p,%ld,%p)\n", hInstance, fdwReason, lpvReserved); + TRACE("(%p,%d,%p)\n", hInstance, fdwReason, lpvReserved); switch (fdwReason) {

1 0

Michael Stefaniuc : localspl/tests: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 4a4c025a521cc58d30cc134dfcaa3ae2ce18132a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4c025a521cc58d30cc134df… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 3 23:39:15 2006 +0200 localspl/tests: Win64 printf format warning fixes. --- dlls/localspl/tests/Makefile.in | 1 - dlls/localspl/tests/localmon.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/tests/Makefile.in b/dlls/localspl/tests/Makefile.in index db04d52..2d70a62 100644 --- a/dlls/localspl/tests/Makefile.in +++ b/dlls/localspl/tests/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = localspl.dll IMPORTS = kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ localmon.c diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 9b8fd0e..72a7048 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -51,13 +51,13 @@ static void test_InitializePrintMonitor( SetLastError(0xdeadbeef); res = pInitializePrintMonitor(NULL); ok( (res == NULL) && (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %p with %ld\n (expected NULL with " \ + "returned %p with %d\n (expected NULL with " \ "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pInitializePrintMonitor((LPWSTR) emptyW); ok( (res == NULL) && (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %p with %ld\n (expected NULL with " \ + "returned %p with %d\n (expected NULL with " \ "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); }

1 0

Michael Stefaniuc : nddeapi: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: bfe610264d08266329afa47b425103d92b8ed131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe610264d08266329afa47b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 3 23:39:44 2006 +0200 nddeapi: Win64 printf format warning fixes. --- dlls/nddeapi/Makefile.in | 1 - dlls/nddeapi/nddeapi.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/nddeapi/Makefile.in b/dlls/nddeapi/Makefile.in index d320ba1..79ebd6d 100644 --- a/dlls/nddeapi/Makefile.in +++ b/dlls/nddeapi/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = nddeapi.dll IMPORTLIB = libnddeapi.$(IMPLIBEXT) IMPORTS = kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ nddeapi.c diff --git a/dlls/nddeapi/nddeapi.c b/dlls/nddeapi/nddeapi.c index 455452a..998a628 100644 --- a/dlls/nddeapi/nddeapi.c +++ b/dlls/nddeapi/nddeapi.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(nddeapi); */ UINT WINAPI NDdeGetErrorStringA(UINT uErrorCode, LPSTR lpszErrorString, DWORD cBufSize) { - FIXME("(%u, %s, %ld): stub!\n",uErrorCode,debugstr_a(lpszErrorString), cBufSize); + FIXME("(%u, %s, %d): stub!\n",uErrorCode,debugstr_a(lpszErrorString), cBufSize); return E_NOTIMPL; } @@ -43,7 +43,7 @@ UINT WINAPI NDdeGetErrorStringA(UINT uEr */ UINT WINAPI NDdeGetErrorStringW(UINT uErrorCode, LPWSTR lpszErrorString, DWORD cBufSize) { - FIXME("(%u, %s, %ld): stub!\n",uErrorCode,debugstr_w(lpszErrorString), cBufSize); + FIXME("(%u, %s, %d): stub!\n",uErrorCode,debugstr_w(lpszErrorString), cBufSize); return E_NOTIMPL; }

1 0

Michael Stefaniuc : newdev: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: cd0796a9d04e5edb6a0e57bb601379b01fdb3780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0796a9d04e5edb6a0e57bb6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 3 23:39:59 2006 +0200 newdev: Win64 printf format warning fixes. --- dlls/newdev/Makefile.in | 1 - dlls/newdev/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/newdev/Makefile.in b/dlls/newdev/Makefile.in index a0c11af..6cc4bf3 100644 --- a/dlls/newdev/Makefile.in +++ b/dlls/newdev/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = newdev.dll IMPORTLIB = libnewdev.$(IMPLIBEXT) IMPORTS = kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = main.c diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index 3646612..f5d8ad3 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -42,7 +42,7 @@ BOOL WINAPI InstallNewDevice(HWND hwndPa BOOL WINAPI UpdateDriverForPlugAndPlayDevicesA(HWND hwndParent, LPCSTR HardwareId, LPCSTR FullInfPath, DWORD InstallFlags, PBOOL bRebootRequired OPTIONAL) { - FIXME("Stub! %s %s 0x%08lx\n", HardwareId, FullInfPath, InstallFlags); + FIXME("Stub! %s %s 0x%08x\n", HardwareId, FullInfPath, InstallFlags); return TRUE; } @@ -53,6 +53,6 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDe BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND hwndParent, LPCWSTR HardwareId, LPCWSTR FullInfPath, DWORD InstallFlags, PBOOL bRebootRequired OPTIONAL) { - FIXME("Stub! %s %s 0x%08lx\n", debugstr_w(HardwareId), debugstr_w(FullInfPath), InstallFlags); + FIXME("Stub! %s %s 0x%08x\n", debugstr_w(HardwareId), debugstr_w(FullInfPath), InstallFlags); return TRUE; }

1 0

Michael Stefaniuc : msvcrt: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 6520ee04c83342e24012646839b24482d44ce9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6520ee04c83342e2401264683… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 3 20:39:05 2006 +0200 msvcrt: Win64 printf format warning fixes. --- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/cppexcept.c | 2 +- dlls/msvcrt/except.c | 6 +++--- dlls/msvcrt/file.c | 48 ++++++++++++++++++++++++----------------------- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/main.c | 2 +- 6 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6520ee04c83342e240126…

1 0

Alexandre Julliard : git-notify: Put the repository name in the path portion of the URL.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: tools Branch: master Commit: eb86f80e1cc6e8bcf9192fe88656d7eb43d74a53 URL: http://source.winehq.org/git/?p=tools.git;a=commit;h=eb86f80e1cc6e8bcf9192f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 11:23:00 2006 +0200 git-notify: Put the repository name in the path portion of the URL. --- git-notify | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/git-notify b/git-notify index 228d7a4..a2bf65d 100755 --- a/git-notify +++ b/git-notify @@ -218,7 +218,7 @@ sub send_commit_notice($$) "Module: $repos_name", "Branch: $ref", "Tag: $obj", - "URL: $gitweb_url/?p=$repos_name.git;a=tag;h=$obj", + "URL: $gitweb_url/?a=tag;h=$obj", "", "Tagger: " . $info{"tagger"}, "Date: " . format_date($info{"tagger_date"},$info{"tagger_tz"}), @@ -232,7 +232,7 @@ sub send_commit_notice($$) "Module: $repos_name", "Branch: $ref", "Commit: $obj", - "URL: $gitweb_url/?p=$repos_name.git;a=commit;h=$obj", + "URL: $gitweb_url/?a=commit;h=$obj", "", "Author: " . $info{"author"}, "Date: " . format_date($info{"author_date"},$info{"author_tz"}), @@ -256,7 +256,7 @@ sub send_commit_notice($$) } else { - push @notice, "Diff: $gitweb_url/?p=$repos_name.git;a=commitdiff;h=$obj", + push @notice, "Diff: $gitweb_url/?a=commitdiff;h=$obj", } $subject = $info{"author_name"} . ": " . ${$info{"log"}}[0]; @@ -312,7 +312,7 @@ sub send_cia_notice($$) push @cia_text, " </files>", - " <url>" . xml_escape("$gitweb_url/?p=$repos_name.git;a=commit;h=$commit") . "</url>", + " <url>" . xml_escape("$gitweb_url/?a=commit;h=$commit") . "</url>", " </commit>", " </body>", " <timestamp>" . $info{"author_date"} . "</timestamp>", @@ -331,7 +331,7 @@ sub send_global_notice($$$) while (<LIST>) { chomp; - s/^commit /URL: $gitweb_url\/?p=$repos_name.git;a=commit;h=/; + s/^commit /URL: $gitweb_url\/?a=commit;h=/; push @notice, $_; } close LIST; @@ -342,6 +342,9 @@ sub send_global_notice($$$) $repos_name = get_repos_name(); parse_options(); +# append repository path to URL +$gitweb_url .= "/$repos_name.git"; + my $ref = $ARGV[0]; $ref =~ s/^refs\/heads\///;

1 0

Elie Morisse : ddraw: Don' t destroy complex attached surfaces even if explicitely
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: f9593bfe67aaacc17e7dccc9c634b1e7ca817de4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9593bfe67aaacc17e7dccc… Author: Elie Morisse <lachienne(a)wanadoo.fr> Date: Fri Sep 22 18:55:39 2006 +0400 ddraw: Don't destroy complex attached surfaces even if explicitely requested as they will be liquidated anyway when the root is destroyed. --- dlls/ddraw/surface.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 74987bf..111fa9e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -293,14 +293,11 @@ IDirectDrawSurfaceImpl_Release(IDirectDr IDirectDrawImpl *ddraw; IUnknown *ifaceToRelease = This->ifaceToRelease; - /* Destroy all complex attached surfaces - * Therefore, start with the first surface, - * except for textures. Not entirely sure what has - * to happen exactly in this case - */ - if( (This->first_complex != This) && !(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + /* Complex attached surfaces are destroyed implicitely when the root is released */ + if(This->first_complex != This) { - FIXME("(%p) Destroying a surface which is a attached to a complex root %p\n", This, This->first_complex); + WARN("(%p) Attempt to destroy a surface that is attached to a complex root %p\n", This, This->first_complex); + return ref; } ddraw = This->ddraw;

1 0

Marcus Meissner : crypt32/tests: Replace bad use of sprintf by 2 strcats.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: 8b1b0c71b8a8a20a09e677f90ea0933f5d525d2a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b1b0c71b8a8a20a09e677f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 3 19:20:23 2006 +0200 crypt32/tests: Replace bad use of sprintf by 2 strcats. --- dlls/crypt32/tests/sip.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 3b57f43..866951f 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -164,8 +164,10 @@ static void test_SIPRetrieveSubjectGUID( * * Use A-functions where possible as that should be available on all platforms */ - GetEnvironmentVariableA(windir, regeditPath, MAX_PATH); - sprintf(regeditPath, "%s\\%s", regeditPath, regeditExe); + ret = GetEnvironmentVariableA(windir, regeditPath, MAX_PATH); + ok (ret > 0, "expected GEVA(windir) to succeed, last error %d\n", GetLastError()); + strcat(regeditPath, "\\"); + strcat(regeditPath, regeditExe); MultiByteToWideChar( CP_ACP, 0, regeditPath, strlen(regeditPath)+1, regeditPathW, sizeof(regeditPathW)/sizeof(regeditPathW[0]) );

1 0

Marcus Meissner : crypt32: Include wine/port.h for strcasecmp.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: e25e1a4de213f05336ebadc5df51a2db89d5db91 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e25e1a4de213f05336ebadc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 30 12:26:20 2006 +0200 crypt32: Include wine/port.h for strcasecmp. --- dlls/crypt32/oid.c | 4 ++++ dlls/crypt32/store.c | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index ca4d40f..a2434dd 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -16,6 +16,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "config.h" +#include "wine/port.h" + #include <stdio.h> #include <stdarg.h> #define NONAMELESSUNION diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 0aaa89d..07e9290 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -23,6 +23,9 @@ * - Many flags, options and whatnot are unimplemented. */ +#include "config.h" +#include "wine/port.h" + #include <assert.h> #include <stdarg.h> #include "windef.h"

1 0

Marcus Meissner : ntdll: More tests for exception handling.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: ef5f3601636d17dec656894397b300152626ae10 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef5f3601636d17dec656894… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 3 17:19:36 2006 +0200 ntdll: More tests for exception handling. - Check if we really set the debug register. - Added unaligned access exception check. - Added single step exception check. --- dlls/ntdll/tests/exception.c | 101 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0639e74..84726df 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -232,7 +232,7 @@ static DWORD dreg_handler( EXCEPTION_REC CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { context->Eip += 2; /* Skips the popl (%eax) */ - context->Dr0 = 0; + context->Dr0 = 0x42424242; context->Dr1 = 0; context->Dr2 = 0; context->Dr3 = 0; @@ -277,10 +277,105 @@ static void test_debug_regs(void) pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; res = pNtGetContextThread(GetCurrentThread(), &ctx); - ok(res == STATUS_SUCCESS,"NtGetContextThread failed with %lx\n", res); + ok (res == STATUS_SUCCESS,"NtGetContextThread failed with %lx\n", res); + ok(ctx.Dr0 == 0x42424242,"failed to set debugregister 0 to 0x42424242, got %lx\n", ctx.Dr0); ok(ctx.Dr7 == 0x155,"failed to set debugregister 7 to 0x155, got %lx\n", ctx.Dr7); } +/* test the single step exception behaviour */ +static int gotsinglesteps = 0; +static DWORD single_step_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + gotsinglesteps++; + ok (!(context->EFlags & 0x100), "eflags has single stepping bit set\n"); + return ExceptionContinueExecution; +} + +static BYTE single_stepcode[] = { + 0x9c, /* pushf */ + 0x58, /* pop %eax */ + 0x0d,0,1,0,0, /* or $0x100,%eax */ + 0x50, /* push %eax */ + 0x9d, /* popf */ + 0x35,0,1,0,0, /* xor $0x100,%eax */ + 0x50, /* push %eax */ + 0x9d, /* popf */ + 0xc3 +}; + +static void test_single_step(void) +{ + struct { + EXCEPTION_REGISTRATION_RECORD frame; + } exc_frame; + void (*func)(void) = (void *)single_stepcode; + + pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); + if (!pNtCurrentTeb) { + trace( "NtCurrentTeb not found, skipping tests\n" ); + return; + } + exc_frame.frame.Handler = single_step_handler; + exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; + func(); + ok(gotsinglesteps == 1, "expected 1 single step exceptions, got %d\n", gotsinglesteps); + pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; +} + +/* Test the alignment check (AC) flag handling. */ +static BYTE align_check_code[] = { + 0x55, /* push %ebp */ + 0x89,0xe5, /* mov %esp,%ebp */ + 0x9c, /* pushf */ + 0x58, /* pop %eax */ + 0x0d,0,0,4,0, /* or $0x40000,%eax */ + 0x50, /* push %eax */ + 0x9d, /* popf */ + 0x8b,0x45,8, /* mov 0x8(%ebp),%eax */ + 0xc7,0x40,1,42,0,0,0, /* movl $42,0x1(%eax) */ + 0x9c, /* pushf */ + 0x58, /* pop %eax */ + 0x35,0,0,4,0, /* xor $0x40000,%eax */ + 0x50, /* push %eax */ + 0x9d, /* popf */ + 0x5d, /* pop %ebp */ + 0xc3, /* ret */ +}; + +static int gotalignfaults = 0; +static DWORD align_check_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + ok (!(context->EFlags & 0x40000), "eflags has AC bit set\n"); + gotalignfaults++; + return ExceptionContinueExecution; +} + +static void test_align_faults(void) +{ + int twoints[2]; + struct { + EXCEPTION_REGISTRATION_RECORD frame; + } exc_frame; + void (*func1)(int*) = (void *)align_check_code; + + pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); + if (!pNtCurrentTeb) { + trace( "NtCurrentTeb not found, skipping tests\n" ); + return; + } + exc_frame.frame.Handler = align_check_handler; + exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; + + gotalignfaults=0; + func1(twoints); + ok(gotalignfaults == 0, "got %d alignment faults, expected 0\n", gotalignfaults); + pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; +} + #endif /* __i386__ */ START_TEST(exception) @@ -288,5 +383,7 @@ START_TEST(exception) #ifdef __i386__ test_prot_fault(); test_debug_regs(); + test_single_step(); + test_align_faults(); #endif }

1 0