January 2020 - Wine-Commits

Michael Stefaniuc : dmstyle: Partially implement Chord track GetParam/SetParam methods.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: d0780e37ed7fbf31766ba1444b255afc20da855e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0780e37ed7fbf31766ba144… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 22 22:24:29 2020 +0100 dmstyle: Partially implement Chord track GetParam/SetParam methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/chordtrack.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index 09d0bf3c9f..90db0a202a 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -120,24 +120,42 @@ static HRESULT WINAPI chord_track_Play(IDirectMusicTrack8 *iface, void *pStateDa return S_OK; } -static HRESULT WINAPI chord_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI chord_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - if (!rguidType) + TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) return E_POINTER; - return S_OK; + if (IsEqualGUID(type, &GUID_ChordParam)) { + FIXME("GUID_ChordParam not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_RhythmParam)) { + FIXME("GUID_RhythmParam not handled yet\n"); + return S_OK; + } + + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { - IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_ChordParam)) + return DMUS_E_SET_UNSUPPORTED; + + FIXME("GUID_ChordParam not handled yet\n"); + + return S_OK; } static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type)

1 0

Jacek Caban : vbscript: Use parser_error to set unhandled parser error.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: b2de64eeedbc5ed2cf76b4aa079745dad60b8dbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2de64eeedbc5ed2cf76b4aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:27:35 2020 +0100 vbscript: Use parser_error to set unhandled parser error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 2 +- dlls/vbscript/parse.h | 1 - dlls/vbscript/parser.y | 25 ++++++++++--------------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 986693e3e1..db104fd892 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -351,7 +351,7 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx) skip_spaces(ctx); *loc = ctx->ptr - ctx->code; if(ctx->ptr == ctx->end) - return ctx->last_token == tNL ? tEOF : tNL; + return ctx->last_token == tNL ? 0 : tNL; c = *ctx->ptr; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 37ddd7a11c..8d68e781fb 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -284,7 +284,6 @@ typedef struct { const WCHAR *end; BOOL option_explicit; - BOOL parse_complete; BOOL is_html; HRESULT hres; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7a09d0c074..b54d4af32f 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -110,7 +110,7 @@ static statement_t *link_statements(statement_t*,statement_t*); double dbl; } -%token tEXPRESSION tEOF tNL tEMPTYBRACKETS tEXPRLBRACKET +%token tEXPRESSION tNL tEMPTYBRACKETS tEXPRLBRACKET %token tLTEQ tGTEQ tNEQ %token tSTOP tME tREM tDOT %token <string> tTRUE tFALSE @@ -153,8 +153,8 @@ static statement_t *link_statements(statement_t*,statement_t*); %% Program - : OptionExplicit_opt SourceElements tEOF { parse_complete(ctx, $1); } - | tEXPRESSION ExpressionNl_opt tEOF { handle_isexpression_script(ctx, $2); } + : OptionExplicit_opt SourceElements { parse_complete(ctx, $1); } + | tEXPRESSION ExpressionNl_opt { handle_isexpression_script(ctx, $2); } OptionExplicit_opt : /* empty */ { $$ = FALSE; } @@ -506,6 +506,12 @@ StSep static int parser_error(unsigned *loc, parser_ctx_t *ctx, const char *str) { + if(ctx->hres == S_OK) { + FIXME("%s: %s\n", debugstr_w(ctx->code + *loc), debugstr_a(str)); + ctx->hres = E_FAIL; + }else { + WARN("%s: %08x\n", debugstr_w(ctx->code + *loc), ctx->hres); + } return 0; } @@ -530,7 +536,6 @@ static void source_add_class(parser_ctx_t *ctx, class_decl_t *class_decl) static void parse_complete(parser_ctx_t *ctx, BOOL option_explicit) { - ctx->parse_complete = TRUE; ctx->option_explicit = option_explicit; } @@ -538,7 +543,6 @@ static void handle_isexpression_script(parser_ctx_t *ctx, expression_t *expr) { retval_statement_t *stat; - ctx->parse_complete = TRUE; if(!expr) return; @@ -1143,9 +1147,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite heap_pool_init(&ctx->heap); - ctx->parse_complete = FALSE; ctx->hres = S_OK; - ctx->last_token = tNL; ctx->last_nl = 0; ctx->stats = ctx->stats_tail = NULL; @@ -1158,14 +1160,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite parser_parse(ctx); - if(FAILED(ctx->hres)) - return ctx->hres; - if(!ctx->parse_complete) { - FIXME("parser failed around %s\n", debugstr_w(ctx->code+20 > ctx->ptr ? ctx->code : ctx->ptr-20)); - return E_FAIL; - } - - return S_OK; + return ctx->hres; } void parser_release(parser_ctx_t *ctx)

1 0

Jacek Caban : vbscript: Store source cookie and starting line in vbscode_t.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 5436fc90f458ce86f2a7e073e1d4a08ebf967254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5436fc90f458ce86f2a7e073… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:27:25 2020 +0100 vbscript: Store source cookie and starting line in vbscode_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 15 ++++++++++----- dlls/vbscript/vbscript.c | 5 +++-- dlls/vbscript/vbscript.h | 9 ++++++--- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 6e86bb07d0..769bbf15ba 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1856,7 +1856,7 @@ void release_vbscode(vbscode_t *code) heap_free(code); } -static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) +static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source, DWORD_PTR cookie, unsigned start_line) { vbscode_t *ret; size_t len; @@ -1878,6 +1878,9 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) memcpy(ret->source, source, len * sizeof(WCHAR)); ret->source[len] = 0; + ret->cookie = cookie; + ret->start_line = start_line; + ret->instrs = heap_alloc(32*sizeof(instr_t)); if(!ret->instrs) { release_vbscode(ret); @@ -1904,7 +1907,8 @@ static void release_compiler(compile_ctx_t *ctx) release_vbscode(ctx->code); } -HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, vbscode_t **ret) +HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD_PTR cookie, + unsigned start_line, DWORD flags, vbscode_t **ret) { function_decl_t *func_decl; class_decl_t *class_decl; @@ -1913,7 +1917,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli vbscode_t *code; HRESULT hres; - code = ctx.code = alloc_vbscode(&ctx, src); + code = ctx.code = alloc_vbscode(&ctx, src, cookie, start_line); if(!ctx.code) return E_OUTOFMEMORY; @@ -1978,13 +1982,14 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli return S_OK; } -HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, class_desc_t **ret) +HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD_PTR cookie, + unsigned start_line, DWORD flags, class_desc_t **ret) { class_desc_t *desc; vbscode_t *code; HRESULT hres; - hres = compile_script(script, src, delimiter, flags & ~SCRIPTTEXT_ISPERSISTENT, &code); + hres = compile_script(script, src, delimiter, cookie, start_line, flags & ~SCRIPTTEXT_ISPERSISTENT, &code); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index e068d19161..12681672ca 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -875,7 +875,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, } } - hres = compile_script(This->ctx, pstrCode, pstrDelimiter, dwFlags, &code); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, dwSourceContextCookie, ulStartingLine, dwFlags, &code); if(FAILED(hres)) return hres; @@ -939,7 +939,8 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_procedure(This->ctx, pstrCode, pstrDelimiter, dwFlags, &desc); + hres = compile_procedure(This->ctx, pstrCode, pstrDelimiter, dwSourceContextCookie, ulStartingLineNumber, + dwFlags, &desc); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index d8b571b7d1..51797fbdfc 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -335,9 +335,12 @@ struct _function_t { struct _vbscode_t { instr_t *instrs; - WCHAR *source; unsigned ref; + WCHAR *source; + DWORD_PTR cookie; + unsigned start_line; + BOOL option_explicit; BOOL pending_exec; @@ -363,8 +366,8 @@ static inline void grab_vbscode(vbscode_t *code) } void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; -HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t**) DECLSPEC_HIDDEN; -HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,class_desc_t**) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,vbscode_t**) DECLSPEC_HIDDEN; +HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,class_desc_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_var(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Store source location in statement_t.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 21346c76b4f8dae3cff5ac915bf59e08cfdfc3a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21346c76b4f8dae3cff5ac91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:27:14 2020 +0100 vbscript: Store source location in statement_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 7 ++- dlls/vbscript/parse.h | 4 +- dlls/vbscript/parser.y | 163 +++++++++++++++++++++++++------------------------ 3 files changed, 90 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21346c76b4f8dae3cff5…

1 0

Jacek Caban : vbscript/tests: Add error position tests.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: d12de646635d717e7a580f23d5ae35da7da81319 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d12de646635d717e7a580f23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:27:03 2020 +0100 vbscript/tests: Add error position tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 194 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 143 insertions(+), 51 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index d45416a94a..696c3f530b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1829,21 +1829,22 @@ static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, S } static IActiveScriptError **store_script_error; +static ULONG error_line; +static LONG error_char; static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, IActiveScriptError *pscripterror) { HRESULT hr = onerror_hres, hres; + hres = IActiveScriptError_GetSourcePosition(pscripterror, NULL, &error_line, &error_char); + ok(hres == S_OK, "GetSourcePosition failed: %08x\n", hres); + if(!expect_OnScriptError) { EXCEPINFO info; - ULONG line; - HRESULT hres; - hres = IActiveScriptError_GetSourcePosition(pscripterror, NULL, &line, NULL); + hres = IActiveScriptError_GetExceptionInfo(pscripterror, &info); if(SUCCEEDED(hres)) - hres = IActiveScriptError_GetExceptionInfo(pscripterror, &info); - if(SUCCEEDED(hres)) - trace("Error in line %u: %x %s\n", line+1, info.wCode, wine_dbgstr_w(info.bstrDescription)); + trace("Error in line %u: %x %s\n", error_line + 1, info.wCode, wine_dbgstr_w(info.bstrDescription)); }else { IDispatchEx *dispex; @@ -2390,60 +2391,151 @@ static void test_gc(void) static void test_parse_errors(void) { - static const char *invalid_scripts[] = + static const struct + { + const char *src; + unsigned error_line; + int error_char; + } + invalid_scripts[] = { - /* If...End If */ - "If 0 > 1 Then\n" - " x = 0 End If\n", - - /* While...End While */ - "While False\n" - " x = 0 End While\n", - - /* While...Wend */ - "While False\n" - " x = 0 Wend\n", - - /* Do While...Loop */ - "Do While False\n" - " x = 0 Loop\n", - - /* Do Until...Loop */ - "Do Until True\n" - " x = 0 Loop\n", - - /* Do...Loop While */ - "Do\n" - " x = 0 Loop While False\n", - - /* Do...Loop Until */ - "Do\n" - " x = 0 Loop Until True\n", - - /* Select...End Select */ - "x = False\n" - "Select Case 42\n" - " Case 0\n" - " Call ok(False, \"unexpected case\")\n" - " Case 42\n" - " x = True End Select\n" - "Call ok(x, \"wrong case\")\n", - - /* Class...End Class (empty) */ - "Class C End Class", - - /* invalid use of parentheses for call statement */ - "strcomp(\"x\", \"y\")" + { + /* If...End If */ + "If 0 > 1 Then\n" + " x = 0 End If\n", + 1, 10 + }, + { + /* While...End While */ + "While False\n" + " x = 0 End While\n", + 1, 10 + }, + { + /* While...Wend */ + "While False\n" + " x = 0 Wend\n", + 1, 10 + }, + { + /* Do While...Loop */ + "Do While False\n" + " x = 0 Loop\n", + 1, 10 + }, + { + /* Do Until...Loop */ + "Do Until True\n" + " x = 0 Loop\n", + 1, 10 + }, + { + /* Do...Loop While */ + "Do\n" + " x = 0 Loop While False\n", + 1, 10 + }, + { + /* Do...Loop Until */ + "Do\n" + " x = 0 Loop Until True\n", + 1, 10 + }, + { + /* Select...End Select */ + "x = False\n" + "Select Case 42\n" + " Case 0\n" + " Call ok(False, \"unexpected case\")\n" + " Case 42\n" + " x = True End Select\n" + "Call ok(x, \"wrong case\")\n", + 5, 17 + }, + { + /* Class...End Class (empty) */ + "Class C End Class", + 0, 8 + }, + { + /* Class...End Class (empty) */ + "Class C _\nEnd Class", + 1, 0 + }, + { + /* invalid use of parentheses for call statement */ + "strcomp(\"x\", \"y\")", + 0, -17 + }, + { + "\n\n\n cint _\n throwInt(&h80001234&)", + 3, 2 + }, + { + "dim x\n" + "if true then throwInt(&h80001234&)", + 1, 13 + }, + { + "dim x\n" + "if x = throwInt(&h80001234&) then x = 1", + 1, 0 + }, + { + "sub test\n" + " dim x\n" + " if x = throwInt(&h80001234&) then x = 1\n" + "end sub\n" + "test\n", + 2, 4 + }, + { + "dim x\n" + "do\n" + " x = 1\n" + "loop until throwInt(&h80001234&)\n", + 3, 0 + }, + { + "\n select case 3\n" + " case 2\n" + " ok false, \"unexpected case\"\n" + " case throwInt(&h80001234&)\n" + " throwInt &h87001234&\n" + "end select\n", + 1, 2 + }, + { + "if false then\n" + " ok false, \"unexpected case\"\n" + " elseif throwInt(&h80001234&) then\n" + " throwInt &h87001234&\n" + "else\n" + " throwInt &h87001234&\n" + "end if\n", + 2, 1 + } }; HRESULT hres; UINT i; for (i = 0; i < ARRAY_SIZE(invalid_scripts); i++) { + error_line = ~0; + error_char = -1; + onerror_hres = S_OK; + SET_EXPECT(OnScriptError); - hres = parse_script_ar(invalid_scripts[i]); - ok(FAILED(hres), "[%u] script did not fail\n", i); + hres = parse_script_ar(invalid_scripts[i].src); + ok(hres == SCRIPT_E_REPORTED, "[%u] script returned: %08x\n", i, hres); CHECK_CALLED(OnScriptError); + + todo_wine_if(invalid_scripts[i].error_line) + ok(error_line == invalid_scripts[i].error_line, "[%u] error line %u expected %u\n", + i, error_line, invalid_scripts[i].error_line); + todo_wine_if(invalid_scripts[i].error_char) + ok(error_char == abs(invalid_scripts[i].error_char), "[%u] error char %d expected %d\n", + i, error_char, invalid_scripts[i].error_char); } }

1 0

Michael Stefaniuc : dmstyle: Partially implement Mute track GetParam/SetParam methods.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 0b8333d26f5ae529e65931cf75e3dfef2942dbc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b8333d26f5ae529e65931cf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 22 22:24:32 2020 +0100 dmstyle: Partially implement Mute track GetParam/SetParam methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/mutetrack.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 2d60beffcc..deba4966a9 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -117,24 +117,38 @@ static HRESULT WINAPI mute_track_Play(IDirectMusicTrack8 *iface, void *pStateDat return S_OK; } -static HRESULT WINAPI mute_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI mute_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - if (!rguidType) + TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) return E_POINTER; + if (!IsEqualGUID(type, &GUID_MuteParam)) + return DMUS_E_TYPE_UNSUPPORTED; + + FIXME("GUID_MuteParam not handled yet\n"); return S_OK; } -static HRESULT WINAPI mute_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI mute_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { - IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_MuteParam)) + return DMUS_E_TYPE_UNSUPPORTED; + + FIXME("GUID_MuteParam not handled yet\n"); + + return S_OK; } static HRESULT WINAPI mute_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType)

1 0

Michael Stefaniuc : dmstyle: Partially implement Motif track GetParam/SetParam methods.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 68132a7d204f0200cd4c85dd031b11709e753dcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=68132a7d204f0200cd4c85dd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 22 22:24:31 2020 +0100 dmstyle: Partially implement Motif track GetParam/SetParam methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/motiftrack.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index d8cc17b32a..2452d1a94d 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -117,24 +117,45 @@ static HRESULT WINAPI motif_track_Play(IDirectMusicTrack8 *iface, void *pStateDa return S_OK; } -static HRESULT WINAPI motif_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI motif_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - if (!rguidType) + TRACE("(%p, %s, %d, %p, %p):\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) return E_POINTER; + if (!IsEqualGUID(type, &GUID_Valid_Start_Time)) + return DMUS_E_GET_UNSUPPORTED; + + FIXME("GUID_Valid_Start_Time not handled yet\n"); return S_OK; } -static HRESULT WINAPI motif_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI motif_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { - IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + + if (IsEqualGUID(type, &GUID_DisableTimeSig)) { + FIXME("GUID_DisableTimeSig not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_EnableTimeSig)) { + FIXME("GUID_EnableTimeSig not handled yet\n"); + return S_OK; + } else if (IsEqualGUID(type, &GUID_SeedVariations)) { + FIXME("GUID_SeedVariations not handled yet\n"); + return S_OK; + } + + return DMUS_E_SET_UNSUPPORTED; } static HRESULT WINAPI motif_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType)

1 0

Jacek Caban : vbscript: Alloc vbscode_t before parsing the script.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 70cd4153c558fbfba9ddb86a591872ce55d4184e URL: https://source.winehq.org/git/wine.git/?a=commit;h=70cd4153c558fbfba9ddb86a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:27:09 2020 +0100 vbscript: Alloc vbscode_t before parsing the script. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c76ba73bd8..4a1f1a5c6a 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1851,16 +1851,24 @@ void release_vbscode(vbscode_t *code) static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) { vbscode_t *ret; + size_t len; + + len = source ? lstrlenW(source) : 0; + if(len > INT32_MAX) + return NULL; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) return NULL; - ret->source = heap_strdupW(source); + ret->source = heap_alloc((len + 1) * sizeof(WCHAR)); if(!ret->source) { heap_free(ret); return NULL; } + if(len) + memcpy(ret->source, source, len * sizeof(WCHAR)); + ret->source[len] = 0; ret->instrs = heap_alloc(32*sizeof(instr_t)); if(!ret->instrs) { @@ -1872,8 +1880,6 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ctx->instr_size = 32; heap_pool_init(&ret->heap); - ret->option_explicit = ctx->parser.option_explicit; - ret->main_code.type = FUNC_GLOBAL; ret->main_code.code_ctx = ret; ret->ref = 1; @@ -1899,15 +1905,16 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli vbscode_t *code; HRESULT hres; - if (!src) src = L""; - - hres = parse_script(&ctx.parser, src, delimiter, flags); - if(FAILED(hres)) - return compile_error(script, hres); - code = ctx.code = alloc_vbscode(&ctx, src); if(!ctx.code) - return compile_error(script, E_OUTOFMEMORY); + return E_OUTOFMEMORY; + + hres = parse_script(&ctx.parser, code->source, delimiter, flags); + if(FAILED(hres)) { + hres = compile_error(script, hres); + release_vbscode(code); + return hres; + } ctx.func_decls = NULL; ctx.labels = NULL; @@ -1922,6 +1929,8 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli } ctx.global_consts = ctx.const_decls; + code->option_explicit = ctx.parser.option_explicit; + for(func_decl = ctx.func_decls; func_decl; func_decl = func_decl->next) { hres = create_function(&ctx, func_decl, &new_func);

1 0

Alexandre Julliard : winedump: Add dumping of codepage NLS files.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: b2c26f28f09a989168ba616b9aa96f2995ebc0e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2c26f28f09a989168ba616b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 22 23:06:32 2020 +0100 winedump: Add dumping of codepage NLS files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/nls.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/tools/winedump/nls.c b/tools/winedump/nls.c index a114b77086..ec42f86422 100644 --- a/tools/winedump/nls.c +++ b/tools/winedump/nls.c @@ -80,12 +80,98 @@ static void dump_casemap(void) printf( "\n\n" ); } +static void dump_codepage(void) +{ + unsigned int i, j, uni2cp_offset, pos = 0; + const unsigned short *header, *ptr; + + if (!(header = read_data( &pos, 13 * sizeof(*header) ))) return; + printf( "Codepage: %03u\n", header[1] ); + printf( "Char size: %u\n", header[2] ); + printf( "Default char A: %04x / %04x\n", header[3], header[5] ); + printf( "Default char W: %04x / %04x\n", header[4], header[6] ); + if (header[2] == 2) + { + printf( "Lead bytes: " ); + for (i = 0; i < 12; i++) + { + unsigned char val = ((unsigned char *)(header + 7))[i]; + if (!val) break; + printf( "%c%02x", (i % 2) ? '-' : ' ', val ); + } + printf( "\n" ); + } + printf( "\nCharacter map:\n" ); + pos = header[0] * sizeof(*ptr); + if (!(ptr = read_data( &pos, sizeof(*ptr) ))) return; + uni2cp_offset = pos / sizeof(*ptr) + *ptr; + if (!(ptr = read_data( &pos, 256 * sizeof(*ptr) ))) return; + for (i = 0; i < 256; i++) + { + if (!(i % 16)) printf( "\n%02x:", i ); + printf( " %04x", ptr[i] ); + } + printf( "\n" ); + if (!(ptr = read_data( &pos, sizeof(*ptr) ))) return; + if (*ptr == 256) + { + if (!(ptr = read_data( &pos, 256 * sizeof(*ptr) ))) return; + printf( "\nGlyph table:\n" ); + for (i = 0; i < 256; i++) + { + if (!(i % 16)) printf( "\n%02x:", i ); + printf( " %04x", ptr[i] ); + } + printf( "\n" ); + } + if (!(ptr = read_data( &pos, sizeof(*ptr) ))) return; + if (*ptr) + { + if (!(ptr = read_data( &pos, (uni2cp_offset - pos) * sizeof(*ptr) ))) return; + for (i = 0; i < 256; i++) + { + if (!ptr[i] || ptr[i] > pos - 256) continue; + for (j = 0; j < 256; j++) + { + if (!(j % 16)) printf( "\n%02x%02x:", i, j ); + printf( " %04x", ptr[ptr[i] + j] ); + } + } + printf( "\n" ); + } + printf( "\nUnicode table:\n" ); + pos = uni2cp_offset * sizeof(*ptr); + if (header[2] == 2) + { + if (!(ptr = read_data( &pos, 65536 * sizeof(*ptr) ))) return; + for (i = 0; i < 65536; i++) + { + if (!(i % 16)) printf( "\n%04x:", i ); + printf( " %04x", ptr[i] ); + } + printf( "\n" ); + } + else + { + const unsigned char *uni2cp; + if (!(uni2cp = read_data( &pos, 65536 ))) return; + for (i = 0; i < 65536; i++) + { + if (!(i % 16)) printf( "\n%04x:", i ); + printf( " %02x", uni2cp[i] ); + } + printf( "\n" ); + } + printf( "\n" ); +} + void nls_dump(void) { const char *name = strrchr( globals.input_name, '/' ); if (name) name++; else name = globals.input_name; if (!strcasecmp( name, "l_intl.nls" )) return dump_casemap(); + if (!strncasecmp( name, "c_", 2 )) return dump_codepage(); fprintf( stderr, "Unrecognized file name '%s'\n", globals.input_name ); }

1 0

Alexandre Julliard : winedump: Add dumping of case mapping NLS files.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 51cea310a0ac55d4db22dc7c9c7bf689bd5c2667 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51cea310a0ac55d4db22dc7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 22 22:11:23 2020 +0100 winedump: Add dumping of case mapping NLS files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/Makefile.in | 1 + tools/winedump/dump.c | 5 ++- tools/winedump/nls.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/winedump.h | 6 ++- 4 files changed, 106 insertions(+), 3 deletions(-) diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index b55ac72f6d..43e200ab6e 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ msc.c \ msmangle.c \ ne.c \ + nls.c \ output.c \ pdb.c \ pe.c \ diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 85bc6815d1..4e46687a35 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -40,8 +40,8 @@ #include "winbase.h" #include "winedump.h" -static void* dump_base; -static unsigned long dump_total_len; +void *dump_base = NULL; +unsigned long dump_total_len = 0; void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix ) { @@ -239,6 +239,7 @@ dumpers[] = {SIG_EMF, get_kind_emf, emf_dump}, {SIG_FNT, get_kind_fnt, fnt_dump}, {SIG_TLB, get_kind_tlb, tlb_dump}, + {SIG_NLS, get_kind_nls, nls_dump}, {SIG_UNKNOWN, NULL, NULL} /* sentinel */ }; diff --git a/tools/winedump/nls.c b/tools/winedump/nls.c new file mode 100644 index 0000000000..a114b77086 --- /dev/null +++ b/tools/winedump/nls.c @@ -0,0 +1,97 @@ +/* + * Dump a NLS file + * + * Copyright 2020 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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 <stdlib.h> +#include <string.h> +#include <assert.h> + +#include "windef.h" +#include "winedump.h" + +static const void *read_data( unsigned int *pos, unsigned int size ) +{ + const void *ret = PRD( *pos, size ); + *pos += size; + return ret; +} + +static unsigned short casemap( const unsigned short *table, unsigned int len, unsigned short ch ) +{ + unsigned int off = table[ch >> 8] + ((ch >> 4) & 0x0f); + if (off >= len) return 0; + off = table[off] + (ch & 0x0f); + if (off >= len) return 0; + return ch + table[off]; +} + +static void dump_casemap(void) +{ + int i, ch; + unsigned int pos = 0, upper_len, lower_len; + const unsigned short *header, *upper, *lower; + + if (!(header = read_data( &pos, 2 * sizeof(*header) ))) return; + upper_len = header[1]; + if (!(upper = read_data( &pos, upper_len * sizeof(*upper) ))) + { + printf( "Invalid len %04x\n", header[1] ); + return; + } + lower_len = dump_total_len / sizeof(*lower) - 2 - upper_len; + if (!(lower = read_data( &pos, lower_len * sizeof(*lower) ))) return; + + printf( "Magic: %04x\n", header[0] ); + printf( "Upper-case table:\n" ); + for (i = 0; i < 0x10000; i++) + { + if (!(i % 16)) printf( "\n%04x:", i ); + ch = casemap( upper, upper_len, i ); + if (ch == i) printf( " ...." ); + else printf( " %04x", ch ); + } + printf( "\n\nLower-case table:\n" ); + for (i = 0; i < 0x10000; i++) + { + if (!(i % 16)) printf( "\n%04x:", i ); + ch = casemap( lower, lower_len, i ); + if (ch == i) printf( " ...." ); + else printf( " %04x", ch ); + } + printf( "\n\n" ); +} + +void nls_dump(void) +{ + const char *name = strrchr( globals.input_name, '/' ); + if (name) name++; + else name = globals.input_name; + if (!strcasecmp( name, "l_intl.nls" )) return dump_casemap(); + fprintf( stderr, "Unrecognized file name '%s'\n", globals.input_name ); +} + +enum FileSig get_kind_nls(void) +{ + if (strlen( globals.input_name ) < 5) return SIG_UNKNOWN; + if (strcasecmp( globals.input_name + strlen(globals.input_name) - 4, ".nls" )) return SIG_UNKNOWN; + return SIG_NLS; +} diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index c165872b43..c267153900 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -137,6 +137,8 @@ typedef struct __globals } _globals; extern _globals globals; +extern void *dump_base; +extern unsigned long dump_total_len; /* Names to use for output DLL */ #define OUTPUT_DLL_NAME \ @@ -214,7 +216,7 @@ const char *get_machine_str(int mach); /* file dumping functions */ enum FileSig {SIG_UNKNOWN, SIG_DOS, SIG_PE, SIG_DBG, SIG_PDB, SIG_NE, SIG_LE, SIG_MDMP, SIG_COFFLIB, SIG_LNK, - SIG_EMF, SIG_FNT, SIG_TLB}; + SIG_EMF, SIG_FNT, SIG_TLB, SIG_NLS}; const void* PRD(unsigned long prd, unsigned long len); unsigned long Offset(const void* ptr); @@ -254,6 +256,8 @@ enum FileSig get_kind_fnt(void); void fnt_dump( void ); enum FileSig get_kind_tlb(void); void tlb_dump(void); +enum FileSig get_kind_nls(void); +void nls_dump(void); BOOL codeview_dump_symbols(const void* root, unsigned long size); BOOL codeview_dump_types_from_offsets(const void* table, const DWORD* offsets, unsigned num_types);

1 0