October 2006 - Wine-Devel - list.winehq.org

Re: [gdi32 1/6]: Cleanup the update_font_list().
by Huw Davies Oct. 3, 2006

Oct. 3, 2006

On Tue, Oct 03, 2006 at 01:39:23PM +0900, Byeong-Sik Jeon wrote: > Cleanup the update_font_list(). I'm not convinced this is a cleanup, see below for comments. > +#define AddNlsFontToRegistry(hKey, ValueNameA, Data, bForce) do\ > + {\ > + DWORD reg_type;\ > + if(bForce == TRUE ||\ > + RegQueryValueExA(hKey, ValueNameA, 0, &reg_type, NULL, NULL) != ERROR_SUCCESS ||\ > + reg_type != REG_SZ)\ > + {\ > + RegSetValueExA(hKey, ValueNameA, 0, REG_SZ, (const BYTE *)Data, (DWORD)(strlen(Data) + 1));\ > + }\ > + } while(0) Please avoid macro abuse like this and use an inlined function instead. It's also nicer to call it something like add_nls_font_to_registry so that it's easier to read and doesn't look like a Windows API. > + RegCreateKeyExW(HKEY_LOCAL_MACHINE, > + is_win9x() ? win9x_font_reg_key : winnt_font_reg_key, > + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); > + AddNlsFontToRegistry(hkey, "Courier" , matched_nls_font_list->courier, TRUE); > + AddNlsFontToRegistry(hkey, "MS Serif" , matched_nls_font_list->serif, TRUE); > + AddNlsFontToRegistry(hkey, "MS Sans Serif", matched_nls_font_list->sserif, TRUE); > + AddNlsFontToRegistry(hkey, "Small Fonts" , matched_nls_font_list->small, TRUE); > + RegCloseKey(hkey); Here you only create either the win9x key or the winnt key. I'd prefer that you created both like the old code did. Thanks, Huw. -- Huw Davies huw(a)codeweavers.com

1 0

Re: [PATCH] added debugregisters testcase
by Dmitry Timoshkov Oct. 3, 2006

Oct. 3, 2006

"Marcus Meissner" <marcus(a)jet.franken.de> wrote: >> exception.c:281: Test failed: failed to set debugregister 7 to 0x155, got >> 555 > > Interesting, it apparently changed the 0x155 from my code to > 0x555, turning a single byte watch into a 2 byte watch. Or perhaps > it did not use my code, but had something set there already. Looks like 0x400 is already set there, because changing 0x155 to 0x55 leads to the following: exception.c:281: Test failed: failed to set debugregister 7 to 0x55, got 455 -- Dmitry.

1 0

Re: [gdi32 5/6]: Use the [HKLM\...\GRE_Initialize] for languagedependent stock fonts.
by Dmitry Timoshkov Oct. 3, 2006

Oct. 3, 2006

"Byeong-Sik Jeon" <wjsqudtlr(a)gmail.com> wrote: > diff --git a/dlls/gdi/gdiobj.c b/dlls/gdi/gdiobj.c > index 3d5450d..740504c 100644 > --- a/dlls/gdi/gdiobj.c > +++ b/dlls/gdi/gdiobj.c > +static LOGFONTW SystemFont = > +static LOGFONTW DeviceDefaultFont = > +static LOGFONTW SystemFixedFont = > +static LOGFONTW DefaultGuiFont = Any reason you don't make LOGFONTs above const? -- Dmitry.

1 0

Re: [PATCH] added debugregisters testcase
by Dmitry Timoshkov Oct. 3, 2006

Oct. 3, 2006

"Marcus Meissner" <marcus(a)jet.franken.de> wrote: > + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; > + res = pNtGetContextThread(GetCurrentThread(), &ctx); > + ok (res == STATUS_SUCCESS,"NtGetContextThread failed with %lx", res); > + ok(ctx.Dr7 == 0x155,"failed to set debugregister 7 to 0x155"); This test fails for me under XP SP2 with all updates: exception.c:281: Test failed: failed to set debugregister 7 to 0x155, got 555 -- Dmitry.

1 0

Re: DDraw: Don't destroy complex attached surfaces even if explicitely requested as they will be liquidated anyway when the root is destroyed.
by Stefan Dösinger Oct. 3, 2006

Oct. 3, 2006

Am Freitag 22 September 2006 16:55 schrieb Elie Morisse: > A new version of my refcounting patch, lighter and honoring Stefan Dösinger > proposal. Is there any reason why this patch wasn't applied? It looks ok to me, and it complies with the wording of the msdn(complex surfaces can only be destroyed by destroying the root). It might be good to have a test case, but how can we test if something has been destroyed?

1 0

Re: DDraw: Implement depth filling through blit. ( Resubmit )
by Stefan Dösinger Oct. 3, 2006

Oct. 3, 2006

Am Freitag 22 September 2006 17:12 schrieb Elie Morisse: > Resubmit of my previous patch. Be aware that it is completing an older > Stefan Dosinger patch which hasn't been accepted, but can be applied > independently ( it'll be quite useless nevertheless.. ) I think you should replace the 4294967295.0 by something more meaningful like (float) DWORD_MAX, or how the constant is called.

1 0

RFC: dlls/user/tests/win.c fix
by Juan Lang Oct. 2, 2006

Oct. 2, 2006

The attached patch (sorry, crappy mailer) fixes the win.c failure I was seeing. Is it correct? --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 7

Re: Request for Test: exception handling test
by Stefan Leichter Oct. 2, 2006

Oct. 2, 2006

Am Thursday 01 January 1970 01:00 schrieb Marcus Meissner: > Hi, > > Can someone with ability to run the testsuite on Windows please test > the following new 2 testcases under Windows? > > They succeed in WINE now, but I wonder if they will work in Windows. > > Ciao, Marcus Hi, i don't get any new error on win2k. Attached is the logging of the modified test target. Bye Stefan

1 0

Scrambled VB Fonts improving.
by Joe Baker Oct. 2, 2006

Oct. 2, 2006

2 1

Request for Test: exception handling test
by Marcus Meissner Oct. 2, 2006

Oct. 2, 2006

Hi, Can someone with ability to run the testsuite on Windows please test the following new 2 testcases under Windows? They succeed in WINE now, but I wonder if they will work in Windows. Ciao, Marcus --- dlls/ntdll/tests/exception.c | 145 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 145 insertions(+), 0 deletions(-) ef86b7cd65ade45a1e1cd269bff378166d1ad677 diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 1d00816..20ff896 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -24,6 +24,7 @@ #define _WIN32_WINNT 0x500 /* For NTSTATUS */ #endif +#include <stdio.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -281,6 +282,148 @@ static void test_debug_regs(void) ok(ctx.Dr7 == 0x155,"failed to set debugregister 7 to 0x155"); } +/* 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; +} + +/* Not working in Linux now. Causes problems with unrelated functions. + * have to fix them sometime :( + */ +#undef STACK_ALIGN_TEST + +#ifdef STACK_ALIGN_TEST +static BYTE align_check_code2[] = { + 0x55, /* pushl %ebp */ + 0x89,0xe5, /* movl %esp,%ebp */ + 0x9c, /* pushf */ + 0x58, /* pop %eax */ + 0x0d,0,0,4,0, /* or $0x40000,%eax */ + 0x50, /* push %eax */ + 0x9d, /* popf */ + 0x35,0,0,4,0, /* xor $0x40000,%eax */ + 0x83,0xec,2, /* sub $0x2,%esp */ + 0x50, /* push %eax - test fault on stack */ + 0x89,0xec, /* movl %ebp, %esp */ + 0x50, /* push %eax */ + 0x9d, /* popf */ + 0x5d, /* popl %ebp */ + 0xcb /* lret */ +}; + +static DWORD align_check_handler2( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + ok (!(context->EFlags & 0x40000), "eflags has AC bit set\n"); + if (context->Esp & 0x2) { + gotalignfaults++; + context->Esp+=2; + } + return ExceptionContinueExecution; +} +#endif + + +static void test_align_faults(void) +{ + int twoints[2]; + struct { + EXCEPTION_REGISTRATION_RECORD frame; + } exc_frame; + void (*func1)(int*) = (void *)align_check_code; +#ifdef STACK_ALIGN_TEST + void (*func2)(void) = (void *)align_check_code2; +#endif + + 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); + +#ifdef STACK_ALIGN_TEST + exc_frame.frame.Handler = align_check_handler2; + gotalignfaults=0; + func2(); + ok(gotalignfaults == 0, "got %d alignment faults, expected 0\n", gotalignfaults); +#endif + + pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; +} + #endif /* __i386__ */ START_TEST(exception) @@ -288,5 +431,7 @@ START_TEST(exception) #ifdef __i386__ test_prot_fault(); test_debug_regs(); + test_single_step(); + test_align_faults(); #endif } -- 1.2.4

1 0