wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Jacek Caban : mshtml: Merge htmltablerow.c into htmltable.c.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 865b93495c2b3d4f1f9c113f634dcb63f8472127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=865b93495c2b3d4f1f9c113f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:58:28 2018 +0100 mshtml: Merge htmltablerow.c into htmltable.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmltable.c | 446 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmltablerow.c | 477 --------------------------------------------- 3 files changed, 445 insertions(+), 479 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=865b93495c2b3d4f1f9c…

1 0

Jacek Caban : mshtml: Merge htmloption.c into htmlselect.c.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 6683740c669f6b6122bde77b793e332150b2658a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6683740c669f6b6122bde77b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:58:18 2018 +0100 mshtml: Merge htmloption.c into htmlselect.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmloption.c | 623 ----------------------------------------------- dlls/mshtml/htmlselect.c | 592 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 591 insertions(+), 625 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6683740c669f6b6122bd…

1 0

Jacek Caban : mshtml: Merge htmlmeta.c into htmlhead.c.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: ecc6ee0810f8ca503d1b7dc6ae4fb1347d75646b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecc6ee0810f8ca503d1b7dc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:58:04 2018 +0100 mshtml: Merge htmlmeta.c into htmlhead.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlhead.c | 243 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlmeta.c | 273 ------------------------------------------------ 3 files changed, 242 insertions(+), 275 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ecc6ee0810f8ca503d1b…

1 0

Jacek Caban : mshtml: Merge htmlembed.c into htmlobject.c.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: ac3b1f3201928673a505fbd967e0e4fd7a200788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac3b1f3201928673a505fbd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:57:53 2018 +0100 mshtml: Merge htmlembed.c into htmlobject.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlembed.c | 289 ----------------------------------------------- dlls/mshtml/htmlobject.c | 256 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 256 insertions(+), 290 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac3b1f3201928673a505…

1 0

Jacek Caban : mshtml: Merge htmliframe.c into htmlframe.c.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 48365004b0472ac577507b5f50321443719b9bba URL: https://source.winehq.org/git/wine.git/?a=commit;h=48365004b0472ac577507b5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:57:43 2018 +0100 mshtml: Merge htmliframe.c into htmlframe.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlframe.c | 590 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmliframe.c | 616 ------------------------------------------- dlls/mshtml/mshtml_private.h | 4 - 4 files changed, 587 insertions(+), 624 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48365004b0472ac57750…

1 0

Jacek Caban : mshtml: Merge htmlframebase.c into htmlframe.c.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 1f8ff829d99bb35b18159eb4c6f515d4c90f78fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f8ff829d99bb35b18159eb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 27 14:57:29 2018 +0100 mshtml: Merge htmlframebase.c into htmlframe.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlframe.c | 742 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlframebase.c | 752 -------------------------------------------- 3 files changed, 731 insertions(+), 764 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f8ff829d99bb35b1815…

1 0

Henri Verbeet : usp10/tests: Cleanup test_ScriptStringXtoCP_CPtoX().
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: e7b66cfe609cf4109771d562311e93da2209b172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7b66cfe609cf4109771d562… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 27 12:02:37 2018 +0330 usp10/tests: Cleanup test_ScriptStringXtoCP_CPtoX(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 261 ++++++++++++++++++++--------------------------- 1 file changed, 112 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7b66cfe609cf4109771…

1 0

Alexandre Julliard : user32/tests: Also test device caps on a released DC.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: f80802edd70851f8b01faf1702c94328ff5b6ecd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f80802edd70851f8b01faf17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 16:36:22 2018 +0100 user32/tests: Also test device caps on a released DC. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 587f36f..18ded33 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -40,7 +40,7 @@ static void test_dc_attributes(void) { HDC hdc, old_hdc; HDC hdcs[20]; - INT i, rop, def_rop; + INT i, rop, def_rop, caps; BOOL found_dc; /* test cache DC */ @@ -118,8 +118,29 @@ static void test_dc_attributes(void) ok( rop == 0, "got %d\n", rop ); rop = GetROP2( old_hdc ); ok( rop == 0, "got %d\n", rop ); + caps = GetDeviceCaps( old_hdc, HORZRES ); + ok( caps == 0, "got %d\n", caps ); + caps = GetDeviceCaps( old_hdc, VERTRES ); + ok( caps == 0, "got %d\n", caps ); + caps = GetDeviceCaps( old_hdc, NUMCOLORS ); + ok( caps == 0, "got %d\n", caps ); ok( WindowFromDC( old_hdc ) == 0, "wrong window\n" ); + hdc = GetDC(0); + caps = GetDeviceCaps( hdc, HORZRES ); + ok( caps != 0, "got %d\n", caps ); + caps = GetDeviceCaps( hdc, VERTRES ); + ok( caps != 0, "got %d\n", caps ); + caps = GetDeviceCaps( hdc, NUMCOLORS ); + ok( caps != 0, "got %d\n", caps ); + ReleaseDC( 0, hdc ); + caps = GetDeviceCaps( hdc, HORZRES ); + ok( caps == 0, "got %d\n", caps ); + caps = GetDeviceCaps( hdc, VERTRES ); + ok( caps == 0, "got %d\n", caps ); + caps = GetDeviceCaps( hdc, NUMCOLORS ); + ok( caps == 0, "got %d\n", caps ); + /* test own DC */ hdc = GetDC( hwnd_owndc );

1 0

Alexandre Julliard : kernel32/tests: Add test for loading a dll under different names.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: bab3a3d59d674be6a1cf66b27fff4a287c12c075 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bab3a3d59d674be6a1cf66b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 18:20:41 2018 +0100 kernel32/tests: Add test for loading a dll under different names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 25d3bf5..484b602 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1252,6 +1252,94 @@ static void test_Loader(void) section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; } +static void test_filenames(void) +{ + IMAGE_NT_HEADERS nt_header = nt_header_template; + char dll_name[MAX_PATH], long_path[MAX_PATH], short_path[MAX_PATH], buffer[MAX_PATH]; + HMODULE mod, mod2; + BOOL ret; + + nt_header.FileHeader.NumberOfSections = 1; + nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + + nt_header.OptionalHeader.SectionAlignment = page_size; + nt_header.OptionalHeader.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT; + nt_header.OptionalHeader.FileAlignment = page_size; + nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); + nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + page_size; + + create_test_dll( &dos_header, sizeof(dos_header), &nt_header, dll_name ); + strcpy( long_path, dll_name ); + strcpy( strrchr( long_path, '\\' ), "\\this-is-a-long-name.dll" ); + ret = MoveFileA( dll_name, long_path ); + ok( ret, "MoveFileA failed err %u\n", GetLastError() ); + GetShortPathNameA( long_path, short_path, MAX_PATH ); + + mod = LoadLibraryA( short_path ); + ok( mod != NULL, "loading failed err %u\n", GetLastError() ); + GetModuleFileNameA( mod, buffer, MAX_PATH ); + ok( !lstrcmpiA( buffer, short_path ), "got wrong path %s / %s\n", buffer, short_path ); + mod2 = GetModuleHandleA( short_path ); + ok( mod == mod2, "wrong module %p for %s\n", mod2, short_path ); + mod2 = GetModuleHandleA( long_path ); + todo_wine + ok( mod == mod2, "wrong module %p for %s\n", mod2, long_path ); + mod2 = LoadLibraryA( long_path ); + ok( mod2 != NULL, "loading failed err %u\n", GetLastError() ); + todo_wine + ok( mod == mod2, "library loaded twice\n" ); + GetModuleFileNameA( mod2, buffer, MAX_PATH ); + todo_wine + ok( !lstrcmpiA( buffer, short_path ), "got wrong path %s / %s\n", buffer, short_path ); + FreeLibrary( mod2 ); + FreeLibrary( mod ); + + mod = LoadLibraryA( long_path ); + ok( mod != NULL, "loading failed err %u\n", GetLastError() ); + GetModuleFileNameA( mod, buffer, MAX_PATH ); + ok( !lstrcmpiA( buffer, long_path ), "got wrong path %s / %s\n", buffer, long_path ); + mod2 = GetModuleHandleA( short_path ); + todo_wine + ok( mod == mod2, "wrong module %p for %s\n", mod2, short_path ); + mod2 = GetModuleHandleA( long_path ); + ok( mod == mod2, "wrong module %p for %s\n", mod2, long_path ); + mod2 = LoadLibraryA( short_path ); + ok( mod2 != NULL, "loading failed err %u\n", GetLastError() ); + todo_wine + ok( mod == mod2, "library loaded twice\n" ); + GetModuleFileNameA( mod2, buffer, MAX_PATH ); + todo_wine + ok( !lstrcmpiA( buffer, long_path ), "got wrong path %s / %s\n", buffer, long_path ); + FreeLibrary( mod2 ); + FreeLibrary( mod ); + + strcpy( dll_name, long_path ); + strcpy( strrchr( dll_name, '\\' ), "\\this-is-another-name.dll" ); + ret = CreateHardLinkA( dll_name, long_path, NULL ); + ok( ret, "CreateHardLinkA failed err %u\n", GetLastError() ); + if (ret) + { + mod = LoadLibraryA( dll_name ); + ok( mod != NULL, "loading failed err %u\n", GetLastError() ); + GetModuleFileNameA( mod, buffer, MAX_PATH ); + ok( !lstrcmpiA( buffer, dll_name ), "got wrong path %s / %s\n", buffer, dll_name ); + mod2 = GetModuleHandleA( long_path ); + todo_wine + ok( mod == mod2, "wrong module %p for %s\n", mod2, long_path ); + mod2 = LoadLibraryA( long_path ); + ok( mod2 != NULL, "loading failed err %u\n", GetLastError() ); + todo_wine + ok( mod == mod2, "library loaded twice\n" ); + GetModuleFileNameA( mod2, buffer, MAX_PATH ); + todo_wine + ok( !lstrcmpiA( buffer, dll_name ), "got wrong path %s / %s\n", buffer, short_path ); + FreeLibrary( mod2 ); + FreeLibrary( mod ); + DeleteFileA( dll_name ); + } + DeleteFileA( long_path ); +} + /* Verify linking style of import descriptors */ static void test_ImportDescriptors(void) { @@ -3488,6 +3576,7 @@ START_TEST(loader) } test_Loader(); + test_filenames(); test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); test_section_access();

1 0

Alexandre Julliard : ntoskrnl: Avoid forwarding to ntdll, link directly instead.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: bf35c2612c3c2a166e540fb062b96e9f062131e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf35c2612c3c2a166e540fb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 27 13:47:47 2018 +0100 ntoskrnl: Avoid forwarding to ntdll, link directly instead. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 18 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 732 ++++++++++++++++++------------------ 2 files changed, 375 insertions(+), 375 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf35c2612c3c2a166e54…

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2018