April 2009 - Wine-commits - list.winehq.org

Piotr Caban : jscript: Added html comments handling.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 84ef7eced2ab45000efc05c70a2b29fc782d639f URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ef7eced2ab45000efc05c70… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Apr 9 23:34:26 2009 +0200 jscript: Added html comments handling. --- dlls/jscript/engine.h | 3 ++- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 ++-- dlls/jscript/lex.c | 24 +++++++++++++++++++++--- dlls/jscript/parser.y | 15 ++++++++++++--- 5 files changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index e02b717..f1a78ec 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -55,6 +55,7 @@ typedef struct _parser_ctx_t { script_ctx_t *script; source_elements_t *source; BOOL nl; + BOOL is_html; HRESULT hres; jsheap_t heap; @@ -65,7 +66,7 @@ typedef struct _parser_ctx_t { struct _parser_ctx_t *next; } parser_ctx_t; -HRESULT script_parse(script_ctx_t*,const WCHAR*,parser_ctx_t**); +HRESULT script_parse(script_ctx_t*,const WCHAR*,const WCHAR*,parser_ctx_t**); void parser_release(parser_ctx_t*); int parser_lex(void*,parser_ctx_t*); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index d98b7b4..01d9eb2 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -264,7 +264,7 @@ static HRESULT JSGlobal_eval(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } TRACE("parsing %s\n", debugstr_w(V_BSTR(arg))); - hres = script_parse(dispex->ctx, V_BSTR(arg), &parser_ctx); + hres = script_parse(dispex->ctx, V_BSTR(arg), NULL, &parser_ctx); if(FAILED(hres)) { WARN("parse (%s) failed: %08x\n", debugstr_w(V_BSTR(arg)), hres); return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index fb99d24..b536014 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -596,7 +596,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = script_parse(This->ctx, pstrCode, &parser_ctx); + hres = script_parse(This->ctx, pstrCode, pstrDelimiter, &parser_ctx); if(FAILED(hres)) return hres; @@ -662,7 +662,7 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = script_parse(This->ctx, pstrCode, &parser_ctx); + hres = script_parse(This->ctx, pstrCode, pstrDelimiter, &parser_ctx); if(FAILED(hres)) { WARN("Parse failed %08x\n", hres); return hres; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index bf298bf..68bfef8 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -174,6 +174,20 @@ static void skip_spaces(parser_ctx_t *ctx) } } +static BOOL skip_html_comment(parser_ctx_t *ctx) +{ + const WCHAR html_commentW[] = {'<','!','-','-',0}; + + if(!ctx->is_html || ctx->ptr+3 >= ctx->end || + memcmp(ctx->ptr, html_commentW, sizeof(WCHAR)*4)) + return FALSE; + + ctx->nl = TRUE; + while(ctx->ptr < ctx->end && !is_endline(*ctx->ptr++)); + + return TRUE; +} + static BOOL skip_comment(parser_ctx_t *ctx) { if(ctx->ptr+1 >= ctx->end || *ctx->ptr != '/') @@ -466,13 +480,13 @@ int parser_lex(void *lval, parser_ctx_t *ctx) { int ret; - ctx->nl = FALSE; + ctx->nl = ctx->ptr == ctx->begin; do { skip_spaces(ctx); if(ctx->ptr == ctx->end) return 0; - }while(skip_comment(ctx)); + }while(skip_comment(ctx) || skip_html_comment(ctx)); if(isalphaW(*ctx->ptr)) { ret = check_keywords(ctx, lval); @@ -585,8 +599,12 @@ int parser_lex(void *lval, parser_ctx_t *ctx) ctx->ptr++; if(ctx->ptr < ctx->end) { switch(*ctx->ptr) { - case '-': /* -- */ + case '-': /* -- or --> */ ctx->ptr++; + if(ctx->is_html && ctx->nl && ctx->ptr < ctx->end && *ctx->ptr == '>') { + ctx->ptr++; + return tHTMLCOMMENT; + } return tDEC; case '=': /* -= */ ctx->ptr++; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 96ba29c..52a31c8 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -170,7 +170,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state /* keywords */ %token kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kIF kFINALLY kFOR kIN %token kINSTANCEOF kNEW kNULL kUNDEFINED kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH -%token tANDAND tOROR tINC tDEC +%token tANDAND tOROR tINC tDEC tHTMLCOMMENT %token <srcptr> kFUNCTION '}' @@ -251,7 +251,12 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state /* ECMA-262 3rd Edition 14 */ Program - : SourceElements { program_parsed(ctx, $1); } + : SourceElements HtmlComment + { program_parsed(ctx, $1); } + +HtmlComment + : tHTMLCOMMENT {} + | /* empty */ {} /* ECMA-262 3rd Edition 14 */ SourceElements @@ -1549,18 +1554,22 @@ void parser_release(parser_ctx_t *ctx) heap_free(ctx); } -HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, parser_ctx_t **ret) +HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter, + parser_ctx_t **ret) { parser_ctx_t *parser_ctx; jsheap_t *mark; HRESULT hres; + const WCHAR html_tagW[] = {'<','/','s','c','r','i','p','t','>',0}; + parser_ctx = heap_alloc_zero(sizeof(parser_ctx_t)); if(!parser_ctx) return E_OUTOFMEMORY; parser_ctx->ref = 1; parser_ctx->hres = E_FAIL; + parser_ctx->is_html = delimiter && !strcmpiW(delimiter, html_tagW); parser_ctx->begin = parser_ctx->ptr = code; parser_ctx->end = code + strlenW(code);

1 0

Piotr Caban : jscript: Added html comments tests.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 2dc78e555be83241c660f0c567b54a3b356101fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc78e555be83241c660f0c56… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Apr 9 23:34:56 2009 +0200 jscript: Added html comments tests. --- dlls/jscript/tests/run.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 39577cd..a1fe3b6 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -600,6 +600,47 @@ static void parse_script(BSTR script_str) IUnknown_Release(parser); } +static HRESULT parse_htmlscript(BSTR script_str) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + HRESULT hres; + BSTR tmp = a2bstr("</SCRIPT>"); + + engine = create_script(); + if(!engine) + return E_FAIL; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + if (FAILED(hres)) + { + IActiveScript_Release(engine); + return E_FAIL; + } + + hres = IActiveScriptParse64_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + hres = IActiveScript_AddNamedItem(engine, testW, + SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + hres = IActiveScriptParse64_ParseScriptText(parser, script_str, NULL, NULL, tmp, 0, 0, 0, NULL, NULL); + + IActiveScript_Release(engine); + IUnknown_Release(parser); + SysFreeString(tmp); + + return hres; +} + static void parse_script_a(const char *src) { BSTR tmp = a2bstr(src); @@ -607,6 +648,16 @@ static void parse_script_a(const char *src) SysFreeString(tmp); } +static HRESULT parse_htmlscript_a(const char *src) +{ + HRESULT hres; + BSTR tmp = a2bstr(src); + hres = parse_htmlscript(tmp); + SysFreeString(tmp); + + return hres; +} + static BSTR get_script_from_file(const char *filename) { DWORD size, len; @@ -741,6 +792,8 @@ static void test_isvisible(BOOL global_members) static void run_tests(void) { + HRESULT hres; + strict_dispid_check = TRUE; parse_script_a(""); @@ -776,6 +829,19 @@ static void run_tests(void) test_isvisible(FALSE); test_isvisible(TRUE); + + hres = parse_htmlscript_a(""); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + hres = parse_htmlscript_a("\n"); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + hres = parse_htmlscript_a("\n"); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + hres = parse_htmlscript_a("var a=1;\nif(a-->0) a=5;\n"); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + hres = parse_htmlscript_a("var a=1;\nif(a\n-->0) a=5;\n"); + ok(hres != S_OK, "ParseScriptText have not failed\n"); } START_TEST(run)

1 0

Patrick Gauthier : user32: Handle magic font size 0x7fff in dialog templates correctly.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 9096368b6a7dbc456d4f2b80da09c1da400afab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9096368b6a7dbc456d4f2b80d… Author: Patrick Gauthier <webmaster(a)korosoft.net> Date: Thu Apr 9 08:56:18 2009 -0400 user32: Handle magic font size 0x7fff in dialog templates correctly. --- dlls/user32/dialog.c | 68 ++++++++++++++++++++++++++++++++----------- dlls/user32/tests/dialog.c | 2 +- 2 files changed, 51 insertions(+), 19 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index bbe3ee2..5710807 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -436,16 +436,33 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result ) { result->pointSize = GET_WORD(p); p++; - if (result->dialogEx) + + /* If pointSize is 0x7fff, it means that we need to use the font + * in NONCLIENTMETRICSW.lfMessageFont, and NOT read the weight, + * italic, and facename from the dialog template. + */ + if (result->pointSize == 0x7fff) + { + /* We could call SystemParametersInfo here, but then we'd have + * to convert from pixel size to point size (which can be + * imprecise). + */ + TRACE(" FONT: Using message box font\n"); + } + else { - result->weight = GET_WORD(p); p++; - result->italic = LOBYTE(GET_WORD(p)); p++; + if (result->dialogEx) + { + result->weight = GET_WORD(p); p++; + result->italic = LOBYTE(GET_WORD(p)); p++; + } + result->faceName = p; + p += strlenW( result->faceName ) + 1; + + TRACE(" FONT %d, %s, %d, %s\n", + result->pointSize, debugstr_w( result->faceName ), + result->weight, result->italic ? "TRUE" : "FALSE" ); } - result->faceName = p; - p += strlenW( result->faceName ) + 1; - TRACE(" FONT %d, %s, %d, %s\n", - result->pointSize, debugstr_w( result->faceName ), - result->weight, result->italic ? "TRUE" : "FALSE" ); } /* First control is on dword boundary */ @@ -492,16 +509,31 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (template.style & DS_SETFONT) { - /* We convert the size to pixels and then make it -ve. This works - * for both +ve and -ve template.pointSize */ - HDC dc; - int pixels; - dc = GetDC(0); - pixels = MulDiv(template.pointSize, GetDeviceCaps(dc , LOGPIXELSY), 72); - hUserFont = CreateFontW( -pixels, 0, 0, 0, template.weight, - template.italic, FALSE, FALSE, DEFAULT_CHARSET, 0, 0, - PROOF_QUALITY, FF_DONTCARE, - template.faceName ); + HDC dc = GetDC(0); + + if (template.pointSize == 0x7fff) + { + /* We get the message font from the non-client metrics */ + NONCLIENTMETRICSW ncMetrics; + + ncMetrics.cbSize = sizeof(NONCLIENTMETRICSW); + if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, + sizeof(NONCLIENTMETRICSW), &ncMetrics, 0)) + { + hUserFont = CreateFontIndirectW( &ncMetrics.lfMessageFont ); + } + } + else + { + /* We convert the size to pixels and then make it -ve. This works + * for both +ve and -ve template.pointSize */ + int pixels = MulDiv(template.pointSize, GetDeviceCaps(dc , LOGPIXELSY), 72); + hUserFont = CreateFontW( -pixels, 0, 0, 0, template.weight, + template.italic, FALSE, FALSE, DEFAULT_CHARSET, 0, 0, + PROOF_QUALITY, FF_DONTCARE, + template.faceName ); + } + if (hUserFont) { SIZE charSize; diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 7f8dfae..060625c 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -999,7 +999,7 @@ static void test_MessageBoxFontTest(void) hDlg = CreateDialogIndirectParamW(g_hinst, (LPCDLGTEMPLATE)dlgTemplate, NULL, messageBoxFontDlgWinProc, 0); if (!hDlg) { - todo_wine win_skip("dialog wasn't created\n"); + win_skip("dialog wasn't created\n"); return; }

1 0

Alexandre Julliard : ntdll: Update the context on send_debug_event for any successful status.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: c709adcf165711b90a0b06747d58e293b0d5801a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c709adcf165711b90a0b06747… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 12:37:22 2009 +0200 ntdll: Update the context on send_debug_event for any successful status. --- dlls/ntdll/exception.c | 2 +- dlls/ntdll/tests/exception.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 5399c40..1309b4d 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -226,7 +226,7 @@ static NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTE ret = wine_server_call( req ); } SERVER_END_REQ; - if (!ret) ret = context_from_server( context, &server_context ); + if (ret >= 0) context_from_server( context, &server_context ); return ret; } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0632f2d..8972b69 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -206,14 +206,13 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce trace("vect. handler %08x addr:%p context.Eip:%x\n", rec->ExceptionCode, rec->ExceptionAddress, context->Eip); - todo_wine { + todo_wine ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); if (pNtCurrentTeb()->Peb->BeingDebugged) ok((void *)context->Eax == pRtlRaiseException, "debugger managed to modify Eax to %x should be %p\n", context->Eax, pRtlRaiseException); - } /* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT * even if raised by RtlRaiseException

1 0

Alexandre Julliard : ntdll: Add a raise_status function and avoid exporting __regs_RtlRaiseException.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 48199d70745adb0a3debe37977ab95aacc616746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48199d70745adb0a3debe3797… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 13:09:06 2009 +0200 ntdll: Add a raise_status function and avoid exporting __regs_RtlRaiseException. --- dlls/ntdll/exception.c | 62 +++++++++++++++++------------------------- dlls/ntdll/ntdll_misc.h | 3 +- dlls/ntdll/signal_i386.c | 33 ++++++++++++++--------- dlls/ntdll/signal_powerpc.c | 20 ++++++++++--- dlls/ntdll/signal_sparc.c | 28 ++++++++++++++----- dlls/ntdll/signal_x86_64.c | 20 ++++++++++--- 6 files changed, 98 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48199d70745adb0a3debe…

1 0

Alexandre Julliard : ntdll: Move the RtlRaiseException implementation into the respective platform-specific files .
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: f4eee1c73128e16352efd08e1f8b35f55f570173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4eee1c73128e16352efd08e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 13:14:05 2009 +0200 ntdll: Move the RtlRaiseException implementation into the respective platform-specific files. --- dlls/ntdll/exception.c | 23 ----------------------- dlls/ntdll/signal_i386.c | 12 ++++++++++++ dlls/ntdll/signal_powerpc.c | 13 +++++++++++++ dlls/ntdll/signal_sparc.c | 14 +++++++++++++- dlls/ntdll/signal_x86_64.c | 11 +++++++++++ 5 files changed, 49 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 757fe04..04996f3 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -427,29 +427,6 @@ void raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ) } -/*********************************************************************** - * RtlRaiseException (NTDLL.@) - */ -void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - NTSTATUS status = raise_exception( rec, context, TRUE ); - if (status != STATUS_SUCCESS) raise_status( status, rec ); -} - -/**********************************************************************/ - -#ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) -#else -void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) -{ - CONTEXT context; - RtlCaptureContext( &context ); - __regs_RtlRaiseException( rec, &context ); -} -#endif - - /******************************************************************* * RtlUnwind (NTDLL.@) */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 76807ca..53e0012 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2007,6 +2007,18 @@ void __wine_enter_vm86( CONTEXT *context ) } #endif /* __HAVE_VM86 */ + +/*********************************************************************** + * RtlRaiseException (NTDLL.@) + */ +void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + NTSTATUS status = raise_exception( rec, context, TRUE ); + if (status != STATUS_SUCCESS) raise_status( status, rec ); +} +DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 6191246..518b123 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1001,6 +1001,19 @@ void __wine_enter_vm86( CONTEXT *context ) MESSAGE("vm86 mode not supported on this platform\n"); } +/*********************************************************************** + * RtlRaiseException (NTDLL.@) + */ +void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) +{ + CONTEXT context; + NTSTATUS status; + + RtlCaptureContext( &context ); + status = raise_exception( rec, &context, TRUE ); + if (status) raise_status( status, rec ); +} + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 8029be3..0f4808e 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -699,7 +699,6 @@ void signal_init_process(void) this is correct, because that is what x86 does, or it is harmful because it could obscure problems in user code */ asm("ta 6"); /* 6 == ST_FIX_ALIGN defined in sys/trap.h */ - signal_init_thread(); return; error: @@ -716,6 +715,19 @@ void __wine_enter_vm86( CONTEXT *context ) MESSAGE("vm86 mode not supported on this platform\n"); } +/*********************************************************************** + * RtlRaiseException (NTDLL.@) + */ +void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) +{ + CONTEXT context; + NTSTATUS status; + + RtlCaptureContext( &context ); + status = raise_exception( rec, &context, TRUE ); + if (status) raise_status( status, rec ); +} + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0f7f26b..3deb583 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -804,6 +804,17 @@ PVOID WINAPI RtlVirtualUnwind ( ULONG type, ULONG64 base, ULONG64 pc, } +/*********************************************************************** + * RtlRaiseException (NTDLL.@) + */ +void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + NTSTATUS status = raise_exception( rec, context, TRUE ); + if (status != STATUS_SUCCESS) raise_status( status, rec ); +} +DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) + + /********************************************************************** * __wine_enter_vm86 (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Set the exception address to the program counter in RtlRaiseException.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 7f9750550a8cefb4b057e0420c32204f887a4f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9750550a8cefb4b057e0420… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 13:17:12 2009 +0200 ntdll: Set the exception address to the program counter in RtlRaiseException. --- dlls/ntdll/signal_i386.c | 5 ++++- dlls/ntdll/signal_powerpc.c | 1 + dlls/ntdll/signal_sparc.c | 1 + dlls/ntdll/signal_x86_64.c | 5 ++++- dlls/ntdll/tests/exception.c | 5 ++--- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 53e0012..b36b51e 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2013,7 +2013,10 @@ void __wine_enter_vm86( CONTEXT *context ) */ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) { - NTSTATUS status = raise_exception( rec, context, TRUE ); + NTSTATUS status; + + rec->ExceptionAddress = (void *)context->Eip; + status = raise_exception( rec, context, TRUE ); if (status != STATUS_SUCCESS) raise_status( status, rec ); } DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 518b123..f37fb71 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1010,6 +1010,7 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) NTSTATUS status; RtlCaptureContext( &context ); + rec->ExceptionAddress = (void *)context.Iar; status = raise_exception( rec, &context, TRUE ); if (status) raise_status( status, rec ); } diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 0f4808e..87da976 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -724,6 +724,7 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) NTSTATUS status; RtlCaptureContext( &context ); + rec->ExceptionAddress = (void *)context.pc; status = raise_exception( rec, &context, TRUE ); if (status) raise_status( status, rec ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 3deb583..9679c2c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -809,7 +809,10 @@ PVOID WINAPI RtlVirtualUnwind ( ULONG type, ULONG64 base, ULONG64 pc, */ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) { - NTSTATUS status = raise_exception( rec, context, TRUE ); + NTSTATUS status; + + rec->ExceptionAddress = (void *)context->Rip; + status = raise_exception( rec, context, TRUE ); if (status != STATUS_SUCCESS) raise_status( status, rec ); } DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8972b69..22c4b0d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -206,7 +206,6 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce trace("vect. handler %08x addr:%p context.Eip:%x\n", rec->ExceptionCode, rec->ExceptionAddress, context->Eip); - todo_wine ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); @@ -241,10 +240,8 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR trace( "exception: %08x flags:%x addr:%p context: Eip:%x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Eip ); - todo_wine { ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); - } /* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT * even if raised by RtlRaiseException @@ -319,6 +316,8 @@ static void run_rtlraiseexception_test(DWORD exceptioncode) } func(pRtlRaiseException, &record); + ok( record.ExceptionAddress == (char *)code_mem + 0x0b, + "address set to %p instead of %p\n", record.ExceptionAddress, (char *)code_mem + 0x0b ); if (have_vectored_api) pRtlRemoveVectoredExceptionHandler(vectored_handler);

1 0

Tobias Jakobi : wined3d: Add load_np2fixup_constants function to shader backend.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 9b067a6ca596f7f2e770d7556f231d929e8b6aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b067a6ca596f7f2e770d7556… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Apr 9 00:55:38 2009 +0200 wined3d: Add load_np2fixup_constants function to shader backend. --- dlls/wined3d/arb_program_shader.c | 11 +++++++++++ dlls/wined3d/baseshader.c | 2 ++ dlls/wined3d/glsl_shader.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8c08771..f046b6d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -174,6 +174,16 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl* This, con } /** + * Loads the texture dimensions for NP2 fixup into the currently set ARB_[vertex/fragment]_programs. + */ +static void shader_arb_load_np2fixup_constants( + IWineD3DDevice* device, + char usePixelShader, + char useVertexShader) { + /* not implemented */ +} + +/** * Loads the app-supplied constants into the currently set ARB_[vertex/fragment]_programs. * * We only support float constants in ARB at the moment, so don't @@ -2306,6 +2316,7 @@ const shader_backend_t arb_program_shader_backend = { shader_arb_update_float_vertex_constants, shader_arb_update_float_pixel_constants, shader_arb_load_constants, + shader_arb_load_np2fixup_constants, shader_arb_destroy, shader_arb_alloc, shader_arb_free, diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 235778e..f24f9bc 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1094,6 +1094,7 @@ static void shader_none_deselect_depth_blt(IWineD3DDevice *iface) {} static void shader_none_update_float_vertex_constants(IWineD3DDevice *iface, UINT start, UINT count) {} static void shader_none_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) {} static void shader_none_load_constants(IWineD3DDevice *iface, char usePS, char useVS) {} +static void shader_none_load_np2fixup_constants(IWineD3DDevice *iface, char usePS, char useVS) {} static void shader_none_destroy(IWineD3DBaseShader *iface) {} static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} static void shader_none_free(IWineD3DDevice *iface) {} @@ -1143,6 +1144,7 @@ const shader_backend_t none_shader_backend = { shader_none_update_float_vertex_constants, shader_none_update_float_pixel_constants, shader_none_load_constants, + shader_none_load_np2fixup_constants, shader_none_destroy, shader_none_alloc, shader_none_free, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1ed2161..626bda3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -483,6 +483,16 @@ static void reset_program_constant_version(void *value, void *context) } /** + * Loads the texture dimensions for NP2 fixup into the currently set GLSL program. + */ +static void shader_glsl_load_np2fixup_constants( + IWineD3DDevice* device, + char usePixelShader, + char useVertexShader) { + /* not implemented */ +} + +/** * Loads the app-supplied constants into the currently set GLSL program. */ static void shader_glsl_load_constants( @@ -4281,6 +4291,7 @@ const shader_backend_t glsl_shader_backend = { shader_glsl_update_float_vertex_constants, shader_glsl_update_float_pixel_constants, shader_glsl_load_constants, + shader_glsl_load_np2fixup_constants, shader_glsl_destroy, shader_glsl_alloc, shader_glsl_free, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebc7561..a5ae466 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -562,6 +562,7 @@ typedef struct { void (*shader_update_float_vertex_constants)(IWineD3DDevice *iface, UINT start, UINT count); void (*shader_update_float_pixel_constants)(IWineD3DDevice *iface, UINT start, UINT count); void (*shader_load_constants)(IWineD3DDevice *iface, char usePS, char useVS); + void (*shader_load_np2fixup_constants)(IWineD3DDevice *iface, char usePS, char useVS); void (*shader_destroy)(IWineD3DBaseShader *iface); HRESULT (*shader_alloc_private)(IWineD3DDevice *iface); void (*shader_free_private)(IWineD3DDevice *iface);

1 0

Tobias Jakobi : wined3d: glsl: Enable load_np2fixup_constants.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 6e970c5d95bd11fb0a5ecc01fbe5784cbb91b884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e970c5d95bd11fb0a5ecc01f… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Apr 9 01:43:02 2009 +0200 wined3d: glsl: Enable load_np2fixup_constants. --- dlls/wined3d/arb_program_shader.c | 6 ++++ dlls/wined3d/glsl_shader.c | 52 +++++++++++++++++++++++------------- dlls/wined3d/state.c | 7 ++--- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f046b6d..5cea411 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -670,6 +670,12 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD } else { tex_type = "2D"; } + if(shader_is_pshader_version(ins->reg_maps->shader_version)) { + const IWineD3DPixelShaderImpl* const ps = (const IWineD3DPixelShaderImpl*)This; + if(ps->cur_args->texrect_fixup & (1 << sampler_idx)) { + FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead)."); + } + } break; case WINED3DSTT_VOLUME: diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 626bda3..5fa9915 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -489,7 +489,39 @@ static void shader_glsl_load_np2fixup_constants( IWineD3DDevice* device, char usePixelShader, char useVertexShader) { - /* not implemented */ + + const IWineD3DDeviceImpl* deviceImpl = (const IWineD3DDeviceImpl*) device; + const struct glsl_shader_prog_link* prog = ((struct shader_glsl_priv *)(deviceImpl->shader_priv))->glsl_program; + + if (!prog) { + /* No GLSL program set - nothing to do. */ + return; + } + + if (!usePixelShader) { + /* NP2 texcoord fixup is (currently) only done for pixelshaders. */ + return; + } + + if (prog->ps_args.texrect_fixup) { + UINT i; + UINT fixup = prog->ps_args.texrect_fixup; + const WineD3D_GL_Info* gl_info = &deviceImpl->adapter->gl_info; + const IWineD3DStateBlockImpl* stateBlock = (const IWineD3DStateBlockImpl*) deviceImpl->stateBlock; + + for (i = 0; fixup; fixup >>= 1, ++i) { + if (-1 != prog->rectFixup_location[i]) { + const IWineD3DBaseTextureImpl* const tex = (const IWineD3DBaseTextureImpl*) stateBlock->textures[i]; + if (!tex) { + FIXME("Non-existant texture is flagged for NP2 texcoord fixup\n"); + continue; + } else { + const float tex_dim[2] = {tex->baseTexture.pow2Matrix[0], tex->baseTexture.pow2Matrix[5]}; + GL_EXTCALL(glUniform2fvARB(prog->rectFixup_location[i], 1, tex_dim)); + } + } + } + } } /** @@ -598,24 +630,6 @@ static void shader_glsl_load_constants( } GL_EXTCALL(glUniform4fvARB(prog->ycorrection_location, 1, correction_params)); } - - /* Constant loading for texture rect coord fixup. */ - if (prog->ps_args.texrect_fixup) { - UINT fixup = prog->ps_args.texrect_fixup; - - for (i = 0; fixup; fixup >>= 1, ++i) { - if (-1 != prog->rectFixup_location[i]) { - const IWineD3DBaseTextureImpl* const tex = (const IWineD3DBaseTextureImpl*) stateBlock->textures[i]; - if (!tex) { - FIXME("Non-existant texture is flagged for NP2 texcoord fixup\n"); - continue; - } else { - const float tex_dim[2] = {tex->baseTexture.pow2Matrix[0], tex->baseTexture.pow2Matrix[5]}; - GL_EXTCALL(glUniform2fvARB(prog->rectFixup_location[i], 1, tex_dim)); - } - } - } - } } if (priv->next_constant_version == UINT_MAX) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 755698c..05e52b0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3367,11 +3367,10 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont /* Trigger shader constant reloading (for NP2 texcoord fixup) * Only do this if pshaders are used (note: fixup is currently only implemented in GLSL). */ - if (!tex_impl->baseTexture.pow2Matrix_identity && use_ps(stateblock)) { + if (!tex_impl->baseTexture.pow2Matrix_identity) { IWineD3DDeviceImpl* d3ddevice = stateblock->wineD3DDevice; - /* FIXME: add something like shader_load_rectfixup_consts to the backend to only reload the - * constants that are used for the fixup (and not the other ones too) */ - d3ddevice->shader_backend->shader_load_constants((IWineD3DDevice*)d3ddevice, use_ps(stateblock), use_vs(stateblock)); + d3ddevice->shader_backend->shader_load_np2fixup_constants( + (IWineD3DDevice*)d3ddevice, use_ps(stateblock), use_vs(stateblock)); } } else if(mapped_stage < GL_LIMITS(textures)) { if(sampler < stateblock->lowest_disabled_stage) {

1 0

Nicolas Le Cam : msi/tests: Fix test when content indexing is disabled.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 112bb084f1d6e144997eb64648ea5bfdc49214c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=112bb084f1d6e144997eb6464… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Fri Apr 10 00:37:46 2009 +0200 msi/tests: Fix test when content indexing is disabled. --- dlls/msi/tests/install.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 768ece1..3500007 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2295,6 +2295,7 @@ static void test_setpropertyfolder(void) { UINT r; CHAR path[MAX_PATH]; + DWORD attr; lstrcpyA(path, PROG_FILES_DIR); lstrcatA(path, "\\msitest\\added"); @@ -2308,7 +2309,8 @@ static void test_setpropertyfolder(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - if (GetFileAttributesA(path) == FILE_ATTRIBUTE_DIRECTORY) + attr = GetFileAttributesA(path); + if (attr != INVALID_FILE_ATTRIBUTES && (attr & FILE_ATTRIBUTE_DIRECTORY)) { ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\added", FALSE), "File not installed\n");

1 0