July 2020 - Wine-commits - list.winehq.org

Zebediah Figura : wine.inf: Map the Sounds section of win.ini to the registry.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 90ed63618a5733b10e8e9855833d80fce96270b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ed63618a5733b10e8e9855… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 18:40:59 2020 -0500 wine.inf: Map the Sounds section of win.ini to the registry. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9f612cdc76..35992a01df 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -569,6 +569,7 @@ HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Des HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"printerports",,"USR:Software\Microsoft\Windows NT\CurrentVersion\PrinterPorts" +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"sounds",,"USR:Control Panel\Sounds" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\LanguagePack,,16

1 0

Zebediah Figura : winegstreamer: Preserve the frame rate when converting video formats.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 5ea1287e08a78e182bfca19d0d1069ca0408bb95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea1287e08a78e182bfca19d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 19:29:21 2020 -0500 winegstreamer: Preserve the frame rate when converting video formats. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1aa564f212..9de1b16411 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1718,13 +1718,18 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, if (!strcmp(type, "video/x-raw") && index < ARRAY_SIZE(video_formats)) { - gint width, height; + gint width, height, fps_n, fps_d; GstVideoInfo info; gst_caps_unref(caps); gst_structure_get_int(structure, "width", &width); gst_structure_get_int(structure, "height", &height); gst_video_info_set_format(&info, video_formats[index], width, height); + if (gst_structure_get_fraction(structure, "framerate", &fps_n, &fps_d) && fps_n) + { + info.fps_n = fps_n; + info.fps_d = fps_d; + } if (!amt_from_gst_video_info(&info, mt)) return E_OUTOFMEMORY; return S_OK;

1 0

Zebediah Figura : winegstreamer: Release the IAsyncReader on disconnection.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: e7075780077cbbcb9d994f4a4cdbba6cc88b2d01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7075780077cbbcb9d994f4a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 19:29:22 2020 -0500 winegstreamer: Release the IAsyncReader on disconnection. This allows "Zero Escape: Nine Hours, Nine Persons, Nine Doors" to start. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/mediadet.c | 4 ++-- dlls/winegstreamer/gstdemux.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 9bf6c43a2a..dc83bb9a0a 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -1147,9 +1147,9 @@ START_TEST(mediadet) test_COM_sg_enumpins(); ret = DeleteFileW(test_avi_filename); - todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); ret = DeleteFileW(test_sound_avi_filename); - todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); CoUninitialize(); } diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9de1b16411..fe5fe0e60d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1598,6 +1598,9 @@ static void gstdemux_sink_disconnect(struct strmbase_sink *iface) mark_wine_thread(); GST_RemoveOutputPins(filter); + + IAsyncReader_Release(filter->reader); + filter->reader = NULL; } static const struct strmbase_sink_ops sink_ops =

1 0

Zebediah Figura : quartz/dsoundrender: Clear the DirectSound buffer on EOS.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 79129db1cdcb3117bc24f02c5d4a219bb9e28e0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=79129db1cdcb3117bc24f02c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 19:29:23 2020 -0500 quartz/dsoundrender: Clear the DirectSound buffer on EOS. "Zero Escape: Nine Hours, Nine Persons, Nine Doors" does not stop or destroy the graph after it is finished running, so the last second of audio repeats otherwise. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index a3155477fd..8b914751e1 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -477,6 +477,8 @@ static HRESULT dsound_render_sink_eos(struct strmbase_sink *iface) struct dsound_render *filter = impl_from_strmbase_pin(&iface->pin); IFilterGraph *graph = filter->filter.graph; IMediaEventSink *event_sink; + void *buffer; + DWORD size; EnterCriticalSection(&filter->stream_cs); @@ -494,6 +496,10 @@ static HRESULT dsound_render_sink_eos(struct strmbase_sink *iface) DSoundRender_HandleEndOfStream(filter); + IDirectSoundBuffer_Lock(filter->dsbuffer, 0, 0, &buffer, &size, NULL, NULL, DSBLOCK_ENTIREBUFFER); + memset(buffer, 0, size); + IDirectSoundBuffer_Unlock(filter->dsbuffer, buffer, size, NULL, 0); + LeaveCriticalSection(&filter->stream_cs); return S_OK; }

1 0

Jacek Caban : kernel32/tests: Add more console output tests.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 716bdfcbfa9563f8dd72dc32076344c04b46e26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=716bdfcbfa9563f8dd72dc32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:32:23 2020 +0200 kernel32/tests: Add more console output tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 158 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index dd8cc2c188..6e05fbd4fa 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -640,7 +640,8 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Top = H / 2; clip.Bottom = min(H + H / 2, sbSize.Y - 1); - ok(ScrollConsoleScreenBufferA(hCon, &scroll, &clip, dst, &ci), "Scrolling SB\n"); + ret = ScrollConsoleScreenBufferA(hCon, &scroll, &clip, dst, &ci); + ok(ret, "ScrollConsoleScreenBufferA failed: %u\n", GetLastError()); for (c.Y = 0; c.Y < sbSize.Y; c.Y++) { @@ -2046,6 +2047,12 @@ static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) ret = WriteConsoleOutputCharacterA(output_handle, output, 1, origin, &count); ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); ok(count == 1, "Expected count to be 1, got %u\n", count); + + count = 0xdeadbeef; + origin.X = 200; + ret = WriteConsoleOutputCharacterA(output_handle, output, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); } static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) @@ -2130,6 +2137,13 @@ static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) ret = WriteConsoleOutputCharacterW(output_handle, outputW, 1, origin, &count); ok(ret == TRUE, "Expected WriteConsoleOutputCharacterW to return TRUE, got %d\n", ret); ok(count == 1, "Expected count to be 1, got %u\n", count); + + count = 0xdeadbeef; + origin.X = 200; + ret = WriteConsoleOutputCharacterW(output_handle, outputW, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + } static void test_WriteConsoleOutputAttribute(HANDLE output_handle) @@ -2213,6 +2227,147 @@ static void test_WriteConsoleOutputAttribute(HANDLE output_handle) ret = WriteConsoleOutputAttribute(output_handle, &attr, 1, origin, &count); ok(ret == TRUE, "Expected WriteConsoleOutputAttribute to return TRUE, got %d\n", ret); ok(count == 1, "Expected count to be 1, got %u\n", count); + + count = 0xdeadbeef; + origin.X = 200; + ret = WriteConsoleOutputAttribute(output_handle, &attr, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputAttribute to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); +} + +static void set_region(SMALL_RECT *region, unsigned int left, unsigned int top, unsigned int right, unsigned int bottom) +{ + region->Left = left; + region->Top = top; + region->Right = right; + region->Bottom = bottom; +} + +#define check_region(a,b,c,d,e) check_region_(__LINE__,a,b,c,d,e) +static void check_region_(unsigned int line, const SMALL_RECT *region, unsigned int left, unsigned int top, unsigned int right, unsigned int bottom) +{ + ok_(__FILE__,line)(region->Left == left, "Left = %u, expected %u\n", region->Left, left); + ok_(__FILE__,line)(region->Top == top, "Top = %u, expected %u\n", region->Top, top); + ok_(__FILE__,line)(region->Right == right, "Right = %u, expected %u\n", region->Right, right); + ok_(__FILE__,line)(region->Bottom == bottom, "Bottom = %u, expected %u\n", region->Bottom, bottom); +} + +static void test_WriteConsoleOutput(HANDLE console) +{ + CONSOLE_SCREEN_BUFFER_INFO info; + CHAR_INFO char_info_buf[2048]; + SMALL_RECT region; + COORD size, coord; + unsigned int i; + BOOL ret; + + for (i = 0; i < ARRAY_SIZE(char_info_buf); i++) + { + char_info_buf[i].Char.UnicodeChar = '0' + i % 10; + char_info_buf[i].Attributes = 0; + } + + ret = GetConsoleScreenBufferInfo(console, &info); + ok(ret, "GetConsoleScreenBufferInfo failed: %u\n", GetLastError()); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, 10, 7, 15, 11); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 200, 7, 15, 211); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 200, 7, 15, 211); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 200, 7, 211, 8); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, 200, 7, 211, 8); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 9, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 10, 7, 9, 11); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 11, 6); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 10, 7, 11, 6); + + size.X = 2; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 10, 7, 15, 11); + + size.X = 23; + size.Y = 3; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 10, 7, 15, 11); + + size.X = 6; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, 10, 7, 13, 11); + + size.X = 6; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW((HANDLE)0xdeadbeef, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + if (!skip_nt) check_region(&region, 10, 7, 13, 11); + + size.X = 16; + size.Y = 7; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, 10, 7, 15, 10); + + size.X = 16; + size.Y = 7; + coord.X = 2; + coord.Y = 3; + set_region(&region, info.dwSize.X - 2, 7, info.dwSize.X + 2, 7); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, info.dwSize.X - 2, 7, info.dwSize.X - 1, 7); } static void test_FillConsoleOutputCharacterA(HANDLE output_handle) @@ -3597,6 +3752,7 @@ START_TEST(console) test_WriteConsoleOutputCharacterA(hConOut); test_WriteConsoleOutputCharacterW(hConOut); test_WriteConsoleOutputAttribute(hConOut); + test_WriteConsoleOutput(hConOut); test_FillConsoleOutputCharacterA(hConOut); test_FillConsoleOutputCharacterW(hConOut); test_FillConsoleOutputAttribute(hConOut);

1 0

Rémi Bernon : winegcc: Align sections in PE files to page size.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: e36bed4f37de27d38494ece999c5a63adf4eb996 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36bed4f37de27d38494ece9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 13 19:49:22 2020 +0200 winegcc: Align sections in PE files to page size. This makes sure it will be possible to mmap the section directly instead of having to copy them. It then also makes perf able to figure the code origin for Wine modules. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 25 ++++++++++++------------- tools/winegcc/winegcc.c | 3 +++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index da7524dd60..c92423ee19 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -791,7 +791,7 @@ free_page: } static void check_QueryWorkingSetEx(PVOID addr, const char *desc, DWORD expected_valid, - DWORD expected_protection, DWORD expected_shared, BOOL todo, BOOL todo_shared) + DWORD expected_protection, DWORD expected_shared, BOOL todo) { PSAPI_WORKING_SET_EX_INFORMATION info; BOOL ret; @@ -814,7 +814,6 @@ static void check_QueryWorkingSetEx(PVOID addr, const char *desc, DWORD expected ok(info.VirtualAttributes.LargePage == 0, "%s expected LargePage=0 but got %u\n", desc, info.VirtualAttributes.LargePage); - todo_wine_if(todo_shared) ok(info.VirtualAttributes.Shared == expected_shared || broken(!info.VirtualAttributes.Valid) /* w2003 */, "%s expected Shared=%u but got %u\n", desc, expected_shared, info.VirtualAttributes.Shared); if (info.VirtualAttributes.Valid && info.VirtualAttributes.Shared) @@ -838,44 +837,44 @@ static void test_QueryWorkingSetEx(void) } addr = GetModuleHandleA(NULL); - check_QueryWorkingSetEx(addr, "exe", 1, PAGE_READONLY, 1, FALSE, TRUE); + check_QueryWorkingSetEx(addr, "exe", 1, PAGE_READONLY, 1, FALSE); ret = VirtualProtect(addr, 0x1000, PAGE_NOACCESS, &prot); ok(ret, "VirtualProtect failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "exe,noaccess", 0, 0, 1, FALSE, TRUE); + check_QueryWorkingSetEx(addr, "exe,noaccess", 0, 0, 1, FALSE); ret = VirtualProtect(addr, 0x1000, prot, &prot); ok(ret, "VirtualProtect failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "exe,readonly1", 0, 0, 1, TRUE, TRUE); + check_QueryWorkingSetEx(addr, "exe,readonly1", 0, 0, 1, TRUE); *(volatile char *)addr; ok(ret, "VirtualProtect failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "exe,readonly2", 1, PAGE_READONLY, 1, FALSE, TRUE); + check_QueryWorkingSetEx(addr, "exe,readonly2", 1, PAGE_READONLY, 1, FALSE); addr = VirtualAlloc(NULL, 0x1000, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); ok(addr != NULL, "VirtualAlloc failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "valloc", 0, 0, 0, FALSE, FALSE); + check_QueryWorkingSetEx(addr, "valloc", 0, 0, 0, FALSE); *(volatile char *)addr; - check_QueryWorkingSetEx(addr, "valloc,read", 1, PAGE_READWRITE, 0, FALSE, FALSE); + check_QueryWorkingSetEx(addr, "valloc,read", 1, PAGE_READWRITE, 0, FALSE); *(volatile char *)addr = 0x42; - check_QueryWorkingSetEx(addr, "valloc,write", 1, PAGE_READWRITE, 0, FALSE, FALSE); + check_QueryWorkingSetEx(addr, "valloc,write", 1, PAGE_READWRITE, 0, FALSE); ret = VirtualProtect(addr, 0x1000, PAGE_NOACCESS, &prot); ok(ret, "VirtualProtect failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "valloc,noaccess", 0, 0, 0, FALSE, FALSE); + check_QueryWorkingSetEx(addr, "valloc,noaccess", 0, 0, 0, FALSE); ret = VirtualProtect(addr, 0x1000, prot, &prot); ok(ret, "VirtualProtect failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "valloc,readwrite1", 0, 0, 0, TRUE, FALSE); + check_QueryWorkingSetEx(addr, "valloc,readwrite1", 0, 0, 0, TRUE); *(volatile char *)addr; - check_QueryWorkingSetEx(addr, "valloc,readwrite2", 1, PAGE_READWRITE, 0, FALSE, FALSE); + check_QueryWorkingSetEx(addr, "valloc,readwrite2", 1, PAGE_READWRITE, 0, FALSE); ret = VirtualFree(addr, 0, MEM_RELEASE); ok(ret, "VirtualFree failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "valloc,free", FALSE, 0, 0, FALSE, FALSE); + check_QueryWorkingSetEx(addr, "valloc,free", FALSE, 0, 0, FALSE); } START_TEST(psapi_main) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 29c1b0549d..274f93f40f 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -521,6 +521,9 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) if (opts->debug_file && strendswith(opts->debug_file, ".pdb")) strarray_add(link_args, strmake("-Wl,-pdb,%s", opts->debug_file)); + if (!try_link( opts->prefix, link_args, "-Wl,--file-alignment,0x1000" )) + strarray_add( link_args, "-Wl,--file-alignment,0x1000" ); + strarray_addall( link_args, flags ); return link_args;

1 0

Alexandre Julliard : winegc: Support overriding the default PE file alignment.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 0e4d22bd8dcfd9af8ddd0e0e9f9c3873f91f13ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e4d22bd8dcfd9af8ddd0e0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 23 20:33:16 2020 +0200 winegc: Support overriding the default PE file alignment. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 274f93f40f..90ef16aa1f 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -223,6 +223,7 @@ struct options const char* output_name; const char* image_base; const char* section_align; + const char* file_align; const char* sysroot; const char* isysroot; const char* lib_suffix; @@ -522,7 +523,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add(link_args, strmake("-Wl,-pdb,%s", opts->debug_file)); if (!try_link( opts->prefix, link_args, "-Wl,--file-alignment,0x1000" )) - strarray_add( link_args, "-Wl,--file-alignment,0x1000" ); + strarray_add( link_args, strmake( "-Wl,--file-alignment,%s", + opts->file_align ? opts->file_align : "0x1000" )); strarray_addall( link_args, flags ); return link_args; @@ -1918,6 +1920,11 @@ int main(int argc, char **argv) opts.section_align = strdup( Wl->base[++j] ); continue; } + if (!strcmp(Wl->base[j], "--file-alignment") && j < Wl->size - 1) + { + opts.file_align = strdup( Wl->base[++j] ); + continue; + } if (!strcmp(Wl->base[j], "--large-address-aware")) { opts.large_address_aware = 1;

1 0

Alexandre Julliard : ntdll: Update the TEB and PEB structures for newer Windows versions.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 0bf52b09f2913b2f718fb32ccd0b1300bdada679 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bf52b09f2913b2f718fb32c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 23 20:35:00 2020 +0200 ntdll: Update the TEB and PEB structures for newer Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/kernel16_private.h | 3 +- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_i386.c | 7 +-- dlls/ntdll/unix/signal_arm.c | 4 +- dlls/ntdll/unix/signal_arm64.c | 16 +++---- dlls/ntdll/unix/signal_i386.c | 17 +++---- dlls/ntdll/unix/signal_x86_64.c | 14 +++--- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 2 + include/winternl.h | 87 ++++++++++++++++++++++++++--------- 10 files changed, 102 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf52b09f2913b2f718f…

1 0

Zhiyi Zhang : winex11.drv: Allow reporting a virtual desktop mode with the same width or height as the current mode.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 6436600db5a680d016bc428326d0f67417315ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6436600db5a680d016bc4283… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 22 15:24:14 2020 +0800 winex11.drv: Allow reporting a virtual desktop mode with the same width or height as the current mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 5a9e0f59ae..b5894d5e02 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -108,7 +108,7 @@ static void make_modes(void) } } } - if ((max_width != screen_width) && (max_height != screen_height)) + if ((max_width != screen_width) || (max_height != screen_height)) { /* root window size (if different from desktop window) */ X11DRV_Settings_AddOneMode(max_width, max_height, 0, 60);

1 0

Zhiyi Zhang : winex11.drv: Migrate the virtual desktop display settings handler to a new interface.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: dd13b274104b561f05873e8acdc4bfd34bbe796e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd13b274104b561f05873e8a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 22 15:24:30 2020 +0800 winex11.drv: Migrate the virtual desktop display settings handler to a new interface. The old display settings handler interface can only support one adapter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 41 ++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 27 +++++++++++++++++++++++++ 3 files changed, 116 insertions(+) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b5894d5e02..d3dcf90fb9 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -2,6 +2,7 @@ * X11DRV desktop window handling * * Copyright 2001 Alexandre Julliard + * Copyright 2020 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,9 @@ #include <X11/cursorfont.h> #include <X11/Xlib.h> +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + #include "x11drv.h" /* avoid conflict with field names in included win32 headers */ @@ -152,6 +156,35 @@ static LONG X11DRV_desktop_SetCurrentMode(int mode) return DISP_CHANGE_SUCCESSFUL; } +/* Virtual desktop display settings handler */ +static BOOL X11DRV_desktop_get_id( const WCHAR *device_name, ULONG_PTR *id ) +{ + WCHAR primary_adapter[CCHDEVICENAME]; + + if (!get_primary_adapter( primary_adapter ) || lstrcmpiW( primary_adapter, device_name )) + return FALSE; + + *id = 0; + return TRUE; +} + +static BOOL X11DRV_desktop_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) +{ + RECT primary_rect = get_primary_monitor_rect(); + + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->dmBitsPerPel = screen_bpp; + mode->dmPelsWidth = primary_rect.right - primary_rect.left; + mode->dmPelsHeight = primary_rect.bottom - primary_rect.top; + mode->u2.dmDisplayFlags = 0; + mode->dmDisplayFrequency = 60; + mode->u1.s2.dmPosition.x = 0; + mode->u1.s2.dmPosition.y = 0; + return TRUE; +} + static void query_desktop_work_area( RECT *rc_work ) { static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; @@ -242,6 +275,7 @@ static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) { RECT primary_rect = get_host_primary_monitor_rect(); + struct x11drv_settings_handler settings_handler; root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ @@ -270,6 +304,13 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) make_modes(); X11DRV_Settings_AddDepthModes(); dd_mode_count = X11DRV_Settings_GetModeCount(); + + /* TODO: Remove the old display settings handler once the migration to the new interface is done */ + settings_handler.name = "Virtual Desktop"; + settings_handler.priority = 1000; + settings_handler.get_id = X11DRV_desktop_get_id; + settings_handler.get_current_mode = X11DRV_desktop_get_current_mode; + X11DRV_Settings_SetHandler( &settings_handler ); } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index bbbb6fdf0a..e0dee95154 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -2,6 +2,7 @@ * Wine X11drv display settings functions * * Copyright 2003 Alexander James Pasadyn + * Copyright 2020 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -125,6 +126,18 @@ unsigned int X11DRV_Settings_GetModeCount(void) return dd_mode_count; } +/* TODO: Remove the old display settings handler interface once all backends are migrated to the new interface */ +static struct x11drv_settings_handler handler; + +void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display settings are now handled by: %s.\n", handler.name); + } +} + /*********************************************************************** * Default handlers if resolution switching is not enabled * @@ -308,7 +321,42 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo { static const WCHAR dev_name[CCHDEVICENAME] = { 'W','i','n','e',' ','X','1','1',' ','d','r','i','v','e','r',0 }; + ULONG_PTR id; + + /* Use the new interface if it is available */ + if (!handler.name || (n != ENUM_REGISTRY_SETTINGS && n != ENUM_CURRENT_SETTINGS)) + goto old_interface; + + if (n == ENUM_REGISTRY_SETTINGS) + { + if (!read_registry_settings(name, devmode)) + { + ERR("Failed to get %s registry display settings.\n", wine_dbgstr_w(name)); + return FALSE; + } + goto done; + } + + if (n == ENUM_CURRENT_SETTINGS) + { + if (!handler.get_id(name, &id) || !handler.get_current_mode(id, devmode)) + { + ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); + return FALSE; + } + goto done; + } + +done: + /* Set generic fields */ + devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); + devmode->dmDriverExtra = 0; + devmode->dmSpecVersion = DM_SPECVERSION; + devmode->dmDriverVersion = DM_SPECVERSION; + lstrcpyW(devmode->dmDeviceName, dev_name); + return TRUE; +old_interface: devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); devmode->dmSpecVersion = DM_SPECVERSION; devmode->dmDriverVersion = DM_SPECVERSION; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9bbb48f1ee..49059e09b7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -657,6 +657,33 @@ struct x11drv_mode_info unsigned int refresh_rate; }; +/* Required functions for changing and enumerating display settings */ +struct x11drv_settings_handler +{ + /* A name to tell what host driver is used */ + const char *name; + + /* Higher priority can override handlers with a lower priority */ + UINT priority; + + /* get_id() will be called to map a device name, e.g., \\.\DISPLAY1 to a driver specific id. + * Following functions use this id to identify the device. + * + * Return FALSE if the device can not be found and TRUE on success */ + BOOL (*get_id)(const WCHAR *device_name, ULONG_PTR *id); + + /* get_current_mode() will be called to get the current display mode of the device of id + * + * Following fields in DEVMODE must be valid: + * dmFields, dmDisplayOrientation, dmBitsPerPel, dmPelsWidth, dmPelsHeight, dmDisplayFlags, + * dmDisplayFrequency and dmPosition + * + * Return FALSE on failure with parameters unchanged and error code set. Return TRUE on success */ + BOOL (*get_current_mode)(ULONG_PTR id, DEVMODEW *mode); +}; + +extern void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *handler) DECLSPEC_HIDDEN; + extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(BOOL) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN;

1 0