March 2012 - Wine-Commits - list.winehq.org

Jozef Kucia : d3dx9/tests: Don't leak D3DXBuffer in D3DXWeldVertices tests.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: c76743631dab828410d038ae7b1b456f08089049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c76743631dab828410d038ae7… Author: Jozef Kucia <joseph.kucia(a)gmail.com> Date: Fri Mar 9 18:43:25 2012 +0100 d3dx9/tests: Don't leak D3DXBuffer in D3DXWeldVertices tests. --- dlls/d3dx9_36/tests/mesh.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d24326f..2a05e0d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -8060,12 +8060,6 @@ static void test_weld_vertices(void) skip("Couldn't allocate face_remap array.\n"); goto cleanup; } - hr = D3DXCreateBuffer(tc[i].num_vertices * sizeof(DWORD), &vertex_remap); - if (FAILED(hr)) - { - skip("Couldn't create vertex_remap buffer.\n"); - goto cleanup; - } hr = D3DXWeldVertices(mesh, tc[i].flags, tc[i].epsilons, tc[i].adjacency, adjacency_out, face_remap, &vertex_remap);

1 0

Kusanagi Kouichi : gdi32: Move font signature of font link from Face to SYSTEM_LINKS.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: d696d5fee8864ddcfe240a188416573b84c2be3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d696d5fee8864ddcfe240a188… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:02 2012 +0900 gdi32: Move font signature of font link from Face to SYSTEM_LINKS. --- dlls/gdi32/freetype.c | 125 +++++++++++++++++++++++++------------------------ 1 files changed, 63 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d696d5fee8864ddcfe240…

1 0

Kusanagi Kouichi : gdi32: Remove unused parameters and code, and a useless wrapper function.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: d77104b93d87a7169966f17b4bb977a60a527e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77104b93d87a7169966f17b4… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:27 2012 +0900 gdi32: Remove unused parameters and code, and a useless wrapper function. --- dlls/gdi32/freetype.c | 77 ++++++++++++++----------------------------------- 1 files changed, 22 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d77104b93d87a7169966f…

1 0

Austin English : ntoskrnl.exe: Add a stub for IoStartNextPacket.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 902d619dfef06c7eab46f1afd6e616bc5ef81a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902d619dfef06c7eab46f1afd… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 8 13:14:28 2012 -0800 ntoskrnl.exe: Add a stub for IoStartNextPacket. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 89f5b17..6eda074 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1760,3 +1760,11 @@ PKEVENT WINAPI IoCreateSynchronizationEvent(PUNICODE_STRING name, PHANDLE handle FIXME("(%p %p) stub\n", name, handle); return NULL; } + +/***************************************************** + * IoStartNextPacket (NTOSKRNL.EXE.@) + */ +VOID WINAPI IoStartNextPacket(PDEVICE_OBJECT deviceobject, BOOLEAN cancelable) +{ + FIXME("(%p %d) stub\n", deviceobject, cancelable); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index da3d38e..97a71fc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -458,7 +458,7 @@ @ stub IoSetSystemPartition @ stdcall IoSetThreadHardErrorMode(long) @ stub IoSetTopLevelIrp -@ stub IoStartNextPacket +@ stdcall IoStartNextPacket(ptr long) @ stub IoStartNextPacketByKey @ stub IoStartPacket @ stdcall IoStartTimer(ptr)

1 0

Austin English : kernel32: Add a stub for WerRegisterRuntimeExceptionModule .
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: f135f18b58cd6e7d6704a437c183df9806fb1d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f135f18b58cd6e7d6704a437c… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Mar 4 14:41:18 2012 -0800 kernel32: Add a stub for WerRegisterRuntimeExceptionModule. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/wer.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e6baa38..d933155 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1244,6 +1244,7 @@ @ stdcall WaitNamedPipeA (str long) @ stdcall WaitNamedPipeW (wstr long) @ stdcall WerRegisterFile(wstr long long) +@ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) @ stdcall Wow64EnableWow64FsRedirection(long) diff --git a/dlls/kernel32/wer.c b/dlls/kernel32/wer.c index d5e27b6..a131ad0 100644 --- a/dlls/kernel32/wer.c +++ b/dlls/kernel32/wer.c @@ -39,3 +39,15 @@ HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, FIXME("(%s, %d, %d) stub!\n", debugstr_w(file), regfiletype, flags); return E_NOTIMPL; } + +/*********************************************************************** + * WerRegisterRuntimeExceptionModule (KERNEL32.@) + * + * Register a custom runtime exception handler. + */ + +HRESULT WINAPI WerRegisterRuntimeExceptionModule(PCWSTR callbackdll, PVOID context) +{ + FIXME("(%s, %p) stub!\n", debugstr_w(callbackdll), context); + return S_OK; +}

1 0

André Hentschel : inetcpl: Add stub for DllInstall.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 0ff72271d1cd946747a1f475798f2d90dbcf1385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff72271d1cd946747a1f4757… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:32:00 2012 +0100 inetcpl: Add stub for DllInstall. --- dlls/inetcpl.cpl/inetcpl.c | 9 +++++++++ dlls/inetcpl.cpl/inetcpl.cpl.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index 6981277..e11bf85 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -60,6 +60,15 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) return TRUE; } +/*********************************************************************** + * DllInstall (inetcpl.@) + */ +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + FIXME("(%s, %s): stub\n", bInstall ? "TRUE" : "FALSE", debugstr_w(cmdline)); + return S_OK; +} + /****************************************************************************** * propsheet_callback [internal] * diff --git a/dlls/inetcpl.cpl/inetcpl.cpl.spec b/dlls/inetcpl.cpl/inetcpl.cpl.spec index 90f1d43..2e59562 100644 --- a/dlls/inetcpl.cpl/inetcpl.cpl.spec +++ b/dlls/inetcpl.cpl/inetcpl.cpl.spec @@ -3,7 +3,7 @@ @ stub AddInternetPropertySheetsEx @ stdcall CPlApplet(long long long long) @ stub DisplayPopupWindowManagementDialog -@ stub DllInstall +@ stdcall -private DllInstall(long wstr) @ stub GetAddSitesDisplayUrl @ stub ImportExportPFX @ stub LaunchAddSitesDialog

1 0

Kusanagi Kouichi : gdi32: Add a helper function to create a full name from a family name and a style name .
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: fc03398cd50a338739dc2bc815d09091a535cf8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc03398cd50a338739dc2bc81… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:08 2012 +0900 gdi32: Add a helper function to create a full name from a family name and a style name. --- dlls/gdi32/freetype.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c6bfe8d..9a4a6b6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4626,6 +4626,15 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, free_font(font); } +static void create_full_name(WCHAR *full_name, const WCHAR *family_name, const WCHAR *style_name) +{ + static const WCHAR spaceW[] = { ' ', 0 }; + + strcpyW(full_name, family_name); + strcatW(full_name, spaceW); + strcatW(full_name, style_name); +} + static BOOL family_matches(Family *family, const LOGFONTW *lf) { struct list *face_elem_ptr; @@ -4634,7 +4643,6 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) LIST_FOR_EACH(face_elem_ptr, &family->faces) { - static const WCHAR spaceW[] = { ' ',0 }; WCHAR full_family_name[LF_FULLFACESIZE]; Face *face = LIST_ENTRY(face_elem_ptr, Face, entry); @@ -4645,9 +4653,7 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) continue; } - strcpyW(full_family_name, family->FamilyName); - strcatW(full_family_name, spaceW); - strcatW(full_family_name, face->StyleName); + create_full_name(full_family_name, family->FamilyName, face->StyleName); if (!strcmpiW(lf->lfFaceName, full_family_name)) return TRUE; } @@ -4656,7 +4662,6 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) static BOOL face_matches(Face *face, const LOGFONTW *lf) { - static const WCHAR spaceW[] = { ' ',0 }; WCHAR full_family_name[LF_FULLFACESIZE]; if (!strcmpiW(lf->lfFaceName, face->family->FamilyName)) return TRUE; @@ -4668,9 +4673,7 @@ static BOOL face_matches(Face *face, const LOGFONTW *lf) return FALSE; } - strcpyW(full_family_name, face->family->FamilyName); - strcatW(full_family_name, spaceW); - strcatW(full_family_name, face->StyleName); + create_full_name(full_family_name, face->family->FamilyName, face->StyleName); return !strcmpiW(lf->lfFaceName, full_family_name); }

1 0

Jacek Caban : jscript: Don't store compiler_ctx_t in parser_ctx_t.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 9d4b0bd502d396957fc1983c7b3aaf556ba3ba5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4b0bd502d396957fc1983c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 19:23:19 2012 +0100 jscript: Don't store compiler_ctx_t in parser_ctx_t. --- dlls/jscript/compile.c | 49 +++++++++++++++-------------------------------- dlls/jscript/engine.h | 5 ---- dlls/jscript/parser.y | 2 - 3 files changed, 16 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index dc6f099..40ad782 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -40,7 +40,7 @@ typedef struct _statement_ctx_t { struct _statement_ctx_t *next; } statement_ctx_t; -struct _compiler_ctx_t { +typedef struct { parser_ctx_t *parser; bytecode_t *code; @@ -52,7 +52,7 @@ struct _compiler_ctx_t { unsigned labels_cnt; statement_ctx_t *stat_ctx; -}; +} compiler_ctx_t; static const struct { const char *op_str; @@ -1703,44 +1703,22 @@ void release_bytecode(bytecode_t *code) heap_free(code); } -void release_compiler(compiler_ctx_t *ctx) +static HRESULT init_code(compiler_ctx_t *compiler) { - heap_free(ctx); -} - -static HRESULT init_compiler(parser_ctx_t *parser) -{ - compiler_ctx_t *compiler; - - if(parser->compiler) - return S_OK; - - compiler = heap_alloc_zero(sizeof(*compiler)); - if(!compiler) - return E_OUTOFMEMORY; - compiler->code = heap_alloc_zero(sizeof(bytecode_t)); - if(!compiler->code) { - release_compiler(compiler); + if(!compiler->code) return E_OUTOFMEMORY; - } jsheap_init(&compiler->code->heap); compiler->code->instrs = heap_alloc(64 * sizeof(instr_t)); if(!compiler->code->instrs) { release_bytecode(compiler->code); - release_compiler(compiler); return E_OUTOFMEMORY; } compiler->code_size = 64; compiler->code_off = 1; - - compiler->parser = parser; - - parser->code = compiler->code; - parser->compiler = compiler; return S_OK; } @@ -1781,21 +1759,26 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter, BOOL from_eval, parser_ctx_t **ret) { - parser_ctx_t *parser; + compiler_ctx_t compiler = {0}; HRESULT hres; - hres = script_parse(ctx, code, delimiter, from_eval, &parser); + hres = script_parse(ctx, code, delimiter, from_eval, &compiler.parser); if(FAILED(hres)) return hres; - hres = init_compiler(parser); - if(SUCCEEDED(hres)) - hres = compile_function(parser->compiler, parser->source, from_eval); + hres = init_code(&compiler); + if(SUCCEEDED(hres)) { + hres = compile_function(&compiler, compiler.parser->source, from_eval); + if(FAILED(hres)) + release_bytecode(compiler.code); + } + if(FAILED(hres)) { - parser_release(parser); + parser_release(compiler.parser); return hres; } - *ret = parser; + compiler.parser->code = compiler.code; + *ret = compiler.parser; return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 73553b6..1c4f49a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -160,10 +160,6 @@ typedef struct { void release_bytecode(bytecode_t*); -typedef struct _compiler_ctx_t compiler_ctx_t; - -void release_compiler(compiler_ctx_t*); - typedef struct _parser_ctx_t { LONG ref; @@ -183,7 +179,6 @@ typedef struct _parser_ctx_t { func_stack_t *func_stack; bytecode_t *code; - compiler_ctx_t *compiler; struct _parser_ctx_t *next; } parser_ctx_t; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 66b5476..41a99c4 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1537,8 +1537,6 @@ void parser_release(parser_ctx_t *ctx) if(ctx->code) release_bytecode(ctx->code); - if(ctx->compiler) - release_compiler(ctx->compiler); script_release(ctx->script); heap_free(ctx->begin); jsheap_free(&ctx->heap);

1 0

Vincent Povirk : gdiplus: Set path gradient center points based on the path 's bounding rect.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 1515a4b89cb078b2ad0545643ed0530a7fe4b7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1515a4b89cb078b2ad0545643… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 20 15:02:39 2012 -0600 gdiplus: Set path gradient center points based on the path's bounding rect. --- dlls/gdiplus/brush.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index c601c10..48dd14d 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -484,9 +484,13 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect* rect static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) { + GpRectF bounds; + if(!path || !grad) return InvalidParameter; + GdipGetPathWorldBounds(path, &bounds, NULL, NULL); + *grad = GdipAlloc(sizeof(GpPathGradient)); if (!*grad) { @@ -513,8 +517,8 @@ static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) (*grad)->wrap = WrapModeClamp; (*grad)->gamma = FALSE; /* FIXME: this should be set to the "centroid" of the path by default */ - (*grad)->center.X = 0.0; - (*grad)->center.Y = 0.0; + (*grad)->center.X = bounds.X + bounds.Width / 2; + (*grad)->center.Y = bounds.Y + bounds.Height / 2; (*grad)->focus.X = 0.0; (*grad)->focus.Y = 0.0;

1 0

Jacek Caban : jscript: Simplify compile_subscript_stat.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 4fb1cad149eb3c225a2fd27c261db0f2ba445494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb1cad149eb3c225a2fd27c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 19:21:42 2012 +0100 jscript: Simplify compile_subscript_stat. --- dlls/jscript/compile.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 8569c53..0a84aef 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1756,10 +1756,7 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL fro return hres; off = parser->compiler->code_off; - if(stat->next) - hres = compile_block_statement(parser->compiler, stat); - else - hres = compile_statement(parser->compiler, NULL, stat); + hres = compile_block_statement(parser->compiler, stat); if(FAILED(hres)) return hres;

1 0