September 2017 - Wine-commits

Hugh McMaster : regedit: Export Unicode registry files by default.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 0ab54e4a6486c62723cb4a3ce5f52337673b7ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab54e4a6486c62723cb4a3ce… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:43 2017 +0000 regedit: Export Unicode registry files by default. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 2 +- programs/regedit/regedit.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index cb7738c..c6fcee4 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -431,7 +431,7 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAMEW *pofn) snprintfW( FilterBuffer, MAX_PATH, filterW, filter_reg, 0, 0, filter_reg4, 0, 0, filter_all, 0, 0 ); } pofn->lpstrFilter = FilterBuffer; - pofn->nFilterIndex = 2; + pofn->nFilterIndex = 1; pofn->lpstrFile = FileNameBuffer; pofn->nMaxFile = _MAX_PATH; pofn->lpstrFileTitle = FileTitleBuffer; diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 4dd889b..4dd71ca 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -157,9 +157,9 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) WCHAR *key_name = argv[++(*i)]; if (key_name && *key_name) - export_registry_key(filename, key_name, REG_FORMAT_4); + export_registry_key(filename, key_name, REG_FORMAT_5); else - export_registry_key(filename, NULL, REG_FORMAT_4); + export_registry_key(filename, NULL, REG_FORMAT_5); break; } default:

1 0

Alexandre Julliard : winebuild: Put the thunk hint/ name in FirstThunk too instead of zero.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 75a830e8e16b305cbc341037757749c333540740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a830e8e16b305cbc3410377… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 18 15:35:20 2017 +0200 winebuild: Put the thunk hint/name in FirstThunk too instead of zero. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 43dfa50..01a418f 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -708,7 +708,7 @@ int has_imports(void) /* output the import table of a Win32 module */ static void output_immediate_imports(void) { - int j; + int i, j; struct import *import; if (list_empty( &dll_imports )) return; /* no immediate imports */ @@ -742,30 +742,28 @@ static void output_immediate_imports(void) output( "\t.long 0\n" ); /* FirstThunk */ output( "\n\t.align %d\n", get_alignment(get_ptr_size()) ); - output( ".L__wine_spec_import_data_names:\n" ); - LIST_FOR_EACH_ENTRY( import, &dll_imports, struct import, entry ) + /* output the names twice, once for OriginalFirstThunk and once for FirstThunk */ + for (i = 0; i < 2; i++) { - for (j = 0; j < import->nb_imports; j++) + output( ".L__wine_spec_import_data_%s:\n", i ? "ptrs" : "names" ); + LIST_FOR_EACH_ENTRY( import, &dll_imports, struct import, entry ) { - struct import_func *func = &import->imports[j]; - if (func->name) - output( "\t%s .L__wine_spec_import_data_%s_%s-.L__wine_spec_rva_base\n", - get_asm_ptr_keyword(), import->c_name, func->name ); - else + for (j = 0; j < import->nb_imports; j++) { - if (get_ptr_size() == 8) - output( "\t.quad 0x800000000000%04x\n", func->ordinal ); + struct import_func *func = &import->imports[j]; + if (func->name) + output( "\t%s .L__wine_spec_import_data_%s_%s-.L__wine_spec_rva_base\n", + get_asm_ptr_keyword(), import->c_name, func->name ); else - output( "\t.long 0x8000%04x\n", func->ordinal ); + { + if (get_ptr_size() == 8) + output( "\t.quad 0x800000000000%04x\n", func->ordinal ); + else + output( "\t.long 0x8000%04x\n", func->ordinal ); + } } + output( "\t%s 0\n", get_asm_ptr_keyword() ); } - output( "\t%s 0\n", get_asm_ptr_keyword() ); - } - output( ".L__wine_spec_import_data_ptrs:\n" ); - LIST_FOR_EACH_ENTRY( import, &dll_imports, struct import, entry ) - { - for (j = 0; j < import->nb_imports; j++) output( "\t%s 0\n", get_asm_ptr_keyword() ); - output( "\t%s 0\n", get_asm_ptr_keyword() ); } output( ".L__wine_spec_imports_end:\n" );

1 0

Alexandre Julliard : libwine: Also apply the load delta to the FirstThunk table.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 20d13d0b788c807d54cd8d0896350818989fd5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d13d0b788c807d54cd8d089… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 18 15:41:43 2017 +0200 libwine: Also apply the load delta to the FirstThunk table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/loader.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 172bfa0..c07042a 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -320,22 +320,27 @@ static inline void fixup_rva_dwords( DWORD *ptr, int delta, unsigned int count ) } +/* fixup an array of name/ordinal RVAs by adding the specified delta */ +static inline void fixup_rva_names( UINT_PTR *ptr, int delta ) +{ + while (*ptr) + { + if (!(*ptr & IMAGE_ORDINAL_FLAG)) *ptr += delta; + ptr++; + } +} + + /* fixup RVAs in the import directory */ static void fixup_imports( IMAGE_IMPORT_DESCRIPTOR *dir, BYTE *base, int delta ) { - UINT_PTR *ptr; - while (dir->Name) { fixup_rva_dwords( &dir->u.OriginalFirstThunk, delta, 1 ); fixup_rva_dwords( &dir->Name, delta, 1 ); fixup_rva_dwords( &dir->FirstThunk, delta, 1 ); - ptr = (UINT_PTR *)(base + (dir->u.OriginalFirstThunk ? dir->u.OriginalFirstThunk : dir->FirstThunk)); - while (*ptr) - { - if (!(*ptr & IMAGE_ORDINAL_FLAG)) *ptr += delta; - ptr++; - } + if (dir->u.OriginalFirstThunk) fixup_rva_names( (UINT_PTR *)(base + dir->u.OriginalFirstThunk), delta ); + if (dir->FirstThunk) fixup_rva_names( (UINT_PTR *)(base + dir->FirstThunk), delta ); dir++; } }

1 0

Alexandre Julliard : server: Don' t return debug registers unless explicitly requested.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: cb7f04ce6f9bbd4d0d951ca19e924b912e29b9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7f04ce6f9bbd4d0d951ca19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 18 15:50:16 2017 +0200 server: Don't return debug registers unless explicitly requested. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index 903420b..2c864a6 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1653,7 +1653,7 @@ DECL_HANDLER(get_thread_context) memset( context, 0, sizeof(context_t) ); context->cpu = thread->process->cpu; if (thread->context) copy_context( context, thread->context, req->flags & ~flags ); - if (flags) get_thread_context( thread, context, flags ); + if (req->flags & flags) get_thread_context( thread, context, req->flags & flags ); } release_object( thread ); }

1 0

Alexandre Julliard : kernel32/tests: Add tests for the register values at process start.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 985cf6731cc55a42c3a5ef9ec903e207dbd4a80f URL: http://source.winehq.org/git/wine.git/?a=commit;h=985cf6731cc55a42c3a5ef9ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 18 15:45:10 2017 +0200 kernel32/tests: Add tests for the register values at process start. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index ca51a41..e7fe35c 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3020,6 +3020,8 @@ static void test_SuspendProcessState(void) BOOL pipe_connected; ULONG pipe_magic, numb; BOOL ret; + void *entry_ptr, *peb_ptr; + PEB child_peb; exit_process_ptr = GetProcAddress(hkernel32, "ExitProcess"); ok(exit_process_ptr != NULL, "GetProcAddress ExitProcess failed\n"); @@ -3103,6 +3105,19 @@ static void test_SuspendProcessState(void) ok(ret, "Failed to write to remote process memory (%d)\n", GetLastError()); #ifdef __x86_64__ + ok( ctx.ContextFlags == CONTEXT_FULL, "wrong flags %x\n", ctx.ContextFlags ); + ok( !ctx.Rax, "rax is not zero %lx\n", ctx.Rax ); + todo_wine + { + ok( !ctx.Rbx, "rbx is not zero %lx\n", ctx.Rbx ); + ok( !ctx.Rsi, "rsi is not zero %lx\n", ctx.Rsi ); + ok( !ctx.Rdi, "rdi is not zero %lx\n", ctx.Rdi ); + ok( !ctx.Rbp, "rbp is not zero %lx\n", ctx.Rbp ); + ok( !((ctx.Rsp + 0x28) & 0xfff), "rsp is not at top of stack page %lx\n", ctx.Rsp ); + } + entry_ptr = (void *)ctx.Rcx; + peb_ptr = (void *)ctx.Rdx; + rop_chain.exit_process_ptr = exit_process_ptr; ctx.Rcx = (ULONG_PTR)remote_pipe_params + offsetof(struct pipe_params, pipe_name); ctx.Rdx = (ULONG_PTR)remote_pipe_params + offsetof(struct pipe_params, pipe_write_buf); @@ -3117,6 +3132,20 @@ static void test_SuspendProcessState(void) ret = WriteProcessMemory(pi.hProcess, (void *)ctx.Rsp, &rop_chain, sizeof(rop_chain), NULL); ok(ret, "Failed to write to remote process thread stack (%d)\n", GetLastError()); #else + ok( ctx.ContextFlags == CONTEXT_FULL, "wrong flags %x\n", ctx.ContextFlags ); + todo_wine + ok( !ctx.Ebp || broken(ctx.Ebp), /* winxp */ "ebp is not zero %08x\n", ctx.Ebp ); + if (!ctx.Ebp) /* winxp is completely different */ + { + ok( !ctx.Ecx, "ecx is not zero %08x\n", ctx.Ecx ); + ok( !ctx.Edx, "edx is not zero %08x\n", ctx.Edx ); + ok( !ctx.Esi, "esi is not zero %08x\n", ctx.Esi ); + ok( !ctx.Edi, "edi is not zero %08x\n", ctx.Edi ); + ok( !((ctx.Esp + 0x10) & 0xfff), "esp is not at top of stack page %08x\n", ctx.Esp ); + } + entry_ptr = (void *)ctx.Eax; + peb_ptr = (void *)ctx.Ebx; + rop_chain.exit_process_ptr = exit_process_ptr; rop_chain.pipe_name = (ULONG_PTR)remote_pipe_params + offsetof(struct pipe_params, pipe_name); rop_chain.pipe_write_buf = (ULONG_PTR)remote_pipe_params + offsetof(struct pipe_params, pipe_write_buf); @@ -3132,6 +3161,18 @@ static void test_SuspendProcessState(void) ret = WriteProcessMemory(pi.hProcess, (void *)ctx.Esp, &rop_chain, sizeof(rop_chain), NULL); ok(ret, "Failed to write to remote process thread stack (%d)\n", GetLastError()); #endif + + ret = ReadProcessMemory( pi.hProcess, peb_ptr, &child_peb, sizeof(child_peb), NULL ); + todo_wine + ok( ret, "Failed to read PEB (%u)\n", GetLastError() ); + if (ret) + ok( child_peb.ImageBaseAddress == exe_base, "wrong base %p/%p\n", + child_peb.ImageBaseAddress, exe_base ); + todo_wine + ok( entry_ptr == (char *)exe_base + nt_header.OptionalHeader.AddressOfEntryPoint, + "wrong entry point %p/%p\n", entry_ptr, + (char *)exe_base + nt_header.OptionalHeader.AddressOfEntryPoint ); + ret = SetThreadContext(pi.hThread, &ctx); ok(ret, "Failed to set remote thread context (%d)\n", GetLastError());

1 0

Nikolay Sivov : gdiplus: Implement playback for EmfPlusRecordTypeSetPixelOffsetMode.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 10a80b8c1b7ed2945d701796cec3c1a4782c2702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a80b8c1b7ed2945d701796c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 18 10:42:44 2017 +0300 gdiplus: Implement playback for EmfPlusRecordTypeSetPixelOffsetMode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 6260cb3..e8e35d3 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1832,6 +1832,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, break; } + case EmfPlusRecordTypeSetPixelOffsetMode: + { + return GdipSetPixelOffsetMode(real_metafile->playback_graphics, (flags >> 8) & 0xf); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Nikolay Sivov : gdiplus: Implement playback for EmfPlusRecordTypeSetCompositingQuality.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 024750b182929847a316c0810e33df50281d5966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024750b182929847a316c0810… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 18 10:42:45 2017 +0300 gdiplus: Implement playback for EmfPlusRecordTypeSetCompositingQuality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index e8e35d3..fbaee28 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1836,6 +1836,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return GdipSetPixelOffsetMode(real_metafile->playback_graphics, (flags >> 8) & 0xf); } + case EmfPlusRecordTypeSetCompositingQuality: + { + return GdipSetCompositingQuality(real_metafile->playback_graphics, (flags >> 8) & 0xf); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Nikolay Sivov : gdiplus: Implement playback for EmfPlusRecordTypeSetInterpolationMode.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 071d7c3fbe91b813dad06f8d77e9ebd6699a5be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=071d7c3fbe91b813dad06f8d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 18 10:42:46 2017 +0300 gdiplus: Implement playback for EmfPlusRecordTypeSetInterpolationMode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index fbaee28..d135e36 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1840,6 +1840,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return GdipSetCompositingQuality(real_metafile->playback_graphics, (flags >> 8) & 0xf); } + case EmfPlusRecordTypeSetInterpolationMode: + { + return GdipSetInterpolationMode(real_metafile->playback_graphics, (flags >> 8) & 0xf); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Matteo Bruni : wined3d: Don' t claim SYSMEM location to be current if memory was evicted.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 58016408c2d12dbf35797f6910f9e9d14d941c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58016408c2d12dbf35797f691… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 15 15:12:22 2017 +0200 wined3d: Don't claim SYSMEM location to be current if memory was evicted. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 608447f..f35d5df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3539,7 +3539,8 @@ static DWORD cpu_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit ERR("Failed to blit.\n"); wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); - return dst_texture->resource.map_binding | dst_location; + return dst_location | (dst_texture->sub_resources[dst_sub_resource_idx].locations + & dst_texture->resource.map_binding); } static const struct wined3d_blitter_ops cpu_blitter_ops =

1 0

Matteo Bruni : wined3d: Consider all the system memory locations when choosing the surface upload path.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 10a62ee062b71011f66349f34fc6027566829f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a62ee062b71011f66349f34… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 15 15:12:23 2017 +0200 wined3d: Consider all the system memory locations when choosing the surface upload path. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f35d5df..134b6d2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3709,8 +3709,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst { blit_op = WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST; } - else if ((src_sub_resource->locations & WINED3D_LOCATION_SYSMEM) - && !(dst_sub_resource->locations & WINED3D_LOCATION_SYSMEM)) + else if ((src_sub_resource->locations & surface_simple_locations) + && !(dst_sub_resource->locations & surface_simple_locations)) { /* Upload */ if (scale)

1 0