November 2018 - Wine-commits

Zebediah Figura : dbghelp: Avoid using inline assembly in have_x86cpuid().
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 797f93be6553d4a759473886ad00826c3371d094 URL: https://source.winehq.org/git/wine.git/?a=commit;h=797f93be6553d4a759473886… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 27 19:29:45 2018 -0600 dbghelp: Avoid using inline assembly in have_x86cpuid(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/minidump.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 25c209c..04dc775 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -558,34 +558,29 @@ __ASM_GLOBAL_FUNC( do_x86cpuid, "popl %ebx\n\t" "popl %esi\n\t" "ret" ) +extern int have_x86cpuid(void); +__ASM_GLOBAL_FUNC( have_x86cpuid, + "pushfl\n\t" + "pushfl\n\t" + "movl (%esp),%ecx\n\t" + "xorl $0x00200000,(%esp)\n\t" + "popfl\n\t" + "pushfl\n\t" + "popl %eax\n\t" + "popfl\n\t" + "xorl %ecx,%eax\n\t" + "andl $0x00200000,%eax\n\t" + "ret" ) #else static void do_x86cpuid(unsigned int ax, unsigned int *p) { } -#endif -/* From xf86info havecpuid.c 1.11 */ -static inline int have_x86cpuid(void) +static int have_x86cpuid(void) { -#if defined(__GNUC__) && defined(__i386__) - unsigned int f1, f2; - __asm__("pushfl\n\t" - "pushfl\n\t" - "popl %0\n\t" - "movl %0,%1\n\t" - "xorl %2,%0\n\t" - "pushl %0\n\t" - "popfl\n\t" - "pushfl\n\t" - "popl %0\n\t" - "popfl" - : "=&r" (f1), "=&r" (f2) - : "ir" (0x00200000)); - return ((f1^f2) & 0x00200000) != 0; -#else return 0; -#endif } +#endif /****************************************************************** * dump_system_info

1 0

Ralf Habacker : server: Release atoms when destroying a window class.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 081a48ebabc5c258aa580ff05d31f29c3fb3e08d URL: https://source.winehq.org/git/wine.git/?a=commit;h=081a48ebabc5c258aa580ff0… Author: Ralf Habacker <ralf.habacker(a)freenet.de> Date: Mon Nov 26 13:14:01 2018 +0100 server: Release atoms when destroying a window class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46180 Signed-off-by: Ralf Habacker <ralf.habacker(a)freenet.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 4 ++++ server/class.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index d6910d9..2702fa0 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -115,6 +115,8 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) return; ok(classatom, "failed to register class\n"); + ok(GetClipboardFormatNameW(classatom, str, ARRAY_SIZE(str)) != 0, "atom not found\n"); + ok(!RegisterClassW (&cls), "RegisterClass of the same class should fail for the second time\n"); @@ -230,6 +232,8 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) ok(UnregisterClassW(className, hInstance), "UnregisterClass() failed\n"); + ok(GetClipboardFormatNameW(classatom, str, ARRAY_SIZE(str)) == 0, + "atom still found\n"); return; } diff --git a/server/class.c b/server/class.c index 403180d..b8240bd 100644 --- a/server/class.c +++ b/server/class.c @@ -76,6 +76,8 @@ static struct window_class *create_class( struct process *process, int extra_byt static void destroy_class( struct window_class *class ) { + release_global_atom( NULL, class->atom ); + release_global_atom( NULL, class->base_atom ); list_remove( &class->entry ); release_object( class->process ); free( class );

1 0

Brendan McGrath : ntdll: Use 32bit when COM header marks it required.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 8cd569cf2628fbb2497e5ef020e670f77cf36d40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd569cf2628fbb2497e5ef0… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Sun Nov 25 06:39:00 2018 +1100 ntdll: Use 32bit when COM header marks it required. Currently, when using wine64 to to load a .NET application which has the 32-bit required flag switched on, it fails with a c0000017 error (ERROR_NOT_ENOUGH_MEMORY). Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b00a5f8..631e8bd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1984,12 +1984,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) if (info->machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; #endif if (!info->contains_code) return TRUE; - if (info->image_flags & IMAGE_FLAGS_ComPlusNativeReady) - { - if (!convert_to_pe64( module, info )) return FALSE; - } - if (info->image_flags & IMAGE_FLAGS_ComPlusILOnly) return TRUE; - return FALSE; + if (!(info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)) return FALSE; + return convert_to_pe64( module, info ); #else return FALSE; /* no wow64 support on other platforms */ #endif

1 0

Gabriel Ivăncescu : comctl32/tests: Also include LBS_NODATA cases when testing ownerdraw.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 423ea9790b8cbe17de325327dd4c7457cc1929c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=423ea9790b8cbe17de325327… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 20 12:57:40 2018 +0200 comctl32/tests: Also include LBS_NODATA cases when testing ownerdraw. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 79 ++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 362447e..e789483 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -462,62 +462,71 @@ static HWND create_parent( void ) static void test_ownerdraw(void) { + static const DWORD styles[] = + { + 0, + LBS_NODATA + }; HWND parent, hLB; INT ret; RECT rc; + UINT i; parent = create_parent(); ok(parent != NULL, "Failed to create parent window.\n"); - hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); - ok(hLB != NULL, "Failed to create listbox window.\n"); + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE | styles[i], parent); + ok(hLB != NULL, "Failed to create listbox window.\n"); - SetForegroundWindow(hLB); - UpdateWindow(hLB); + SetForegroundWindow(hLB); + UpdateWindow(hLB); - /* make height short enough */ - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); + /* make height short enough */ + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); - /* make 0 item invisible */ - SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); - ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); - ok(ret == 1, "wrong top index %d\n", ret); + /* make 0 item invisible */ + SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); + ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); + ok(ret == 1, "wrong top index %d\n", ret); - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - ok(!IsRectEmpty(&rc), "empty item rect\n"); - ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + ok(!IsRectEmpty(&rc), "empty item rect\n"); + ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); - DestroyWindow(hLB); + DestroyWindow(hLB); - /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ - hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, - NULL, NULL, NULL, 0); - ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE | styles[i], + 0, 0, 100, 100, NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); - ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); + ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 0, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 1, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 13, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); - DestroyWindow (hLB); + DestroyWindow (hLB); + } DestroyWindow(parent); }

1 0

Gabriel Ivăncescu : user32/tests: Also include LBS_NODATA cases when testing ownerdraw.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 40e16ac150385536c1ed579adaaa422c7de4253d URL: https://source.winehq.org/git/wine.git/?a=commit;h=40e16ac150385536c1ed579a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 20 12:57:41 2018 +0200 user32/tests: Also include LBS_NODATA cases when testing ownerdraw. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 84 +++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 38 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index d13a4e3..b87acd7 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -338,65 +338,73 @@ static HWND create_parent( void ) static void test_ownerdraw(void) { + static const DWORD styles[] = + { + 0, + LBS_NODATA + }; HWND parent, hLB; INT ret; RECT rc; + UINT i; parent = create_parent(); assert(parent); - hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); - assert(hLB); + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE | styles[i], parent); + assert(hLB); - SetForegroundWindow(hLB); - UpdateWindow(hLB); + SetForegroundWindow(hLB); + UpdateWindow(hLB); - /* make height short enough */ - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, - SWP_NOZORDER | SWP_NOMOVE); + /* make height short enough */ + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, + SWP_NOZORDER | SWP_NOMOVE); - /* make 0 item invisible */ - SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); - ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); - ok(ret == 1, "wrong top index %d\n", ret); + /* make 0 item invisible */ + SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); + ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); + ok(ret == 1, "wrong top index %d\n", ret); - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - trace("item 0 rect %s\n", wine_dbgstr_rect(&rc)); - ok(!IsRectEmpty(&rc), "empty item rect\n"); - ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + trace("item 0 rect %s\n", wine_dbgstr_rect(&rc)); + ok(!IsRectEmpty(&rc), "empty item rect\n"); + ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); - DestroyWindow(hLB); + DestroyWindow(hLB); - /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ - hLB = CreateWindowA("listbox", "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, - NULL, NULL, NULL, 0); - ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA("listbox", "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE | styles[i], + 0, 0, 100, 100, NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); - ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); + ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 0, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 1, "Unexpected return value %d.\n", ret); - - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 13, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); - DestroyWindow (hLB); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); + DestroyWindow (hLB); + } DestroyWindow(parent); }

1 0

Gabriel Ivăncescu : comctl32/listbox: Store the items array size instead of using HeapSize().
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: ece6dfe52c4997942011f45199fcdbf79102ad85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ece6dfe52c4997942011f451… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 28 14:09:15 2018 +0300 comctl32/listbox: Store the items array size instead of using HeapSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 7525e7f..cb645b4 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -72,6 +72,7 @@ typedef struct INT height; /* Window height */ LB_ITEMDATA *items; /* Array of items */ INT nb_items; /* Number of items */ + UINT items_size; /* Total number of allocated items in the array */ INT top_item; /* Top visible item */ INT selected_item; /* Selected item */ INT focus_item; /* Item that has the focus */ @@ -688,7 +689,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) nb_items += LB_ARRAY_GRANULARITY - 1; nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); + nb_items += descr->items_size; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, nb_items * sizeof(LB_ITEMDATA)); } @@ -702,6 +703,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = nb_items; descr->items = item; return LB_OKAY; } @@ -1528,12 +1530,10 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; - if (!descr->items) max_items = 0; - else max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - if (descr->nb_items == max_items) + if (descr->nb_items == descr->items_size) { /* We need to grow the array */ - max_items += LB_ARRAY_GRANULARITY; + max_items = descr->items_size + LB_ARRAY_GRANULARITY; if (descr->items) item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); @@ -1545,6 +1545,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = max_items; descr->items = item; } @@ -1704,13 +1705,17 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) /* Shrink the item array if possible */ - max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(LB_ITEMDATA); + max_items = descr->items_size; if (descr->nb_items < max_items - 2*LB_ARRAY_GRANULARITY) { max_items -= LB_ARRAY_GRANULARITY; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); - if (item) descr->items = item; + if (item) + { + descr->items_size = max_items; + descr->items = item; + } } /* Repaint the items */ @@ -1756,6 +1761,7 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) descr->selected_item = -1; descr->focus_item = 0; descr->anchor_item = -1; + descr->items_size = 0; descr->items = NULL; } @@ -2493,6 +2499,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; descr->items = NULL; + descr->items_size = 0; descr->nb_items = 0; descr->top_item = 0; descr->selected_item = -1;

1 0

Alexandre Julliard : libwine: Add a helper function to read a symlink.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 27254d849b60f5103c06e530e10b40bbc8a5494d URL: https://source.winehq.org/git/wine.git/?a=commit;h=27254d849b60f5103c06e530… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 13:10:15 2018 +0100 libwine: Add a helper function to read a symlink. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 13f016a..8ebe970 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -54,9 +54,11 @@ static void fatal_perror( const char *err, ... ) __attribute__((noreturn,format #endif #if defined(__linux__) || defined(__FreeBSD_kernel__ ) -#define EXE_LINK "/proc/self/exe" +static const char exe_link[] = "/proc/self/exe"; #elif defined (__FreeBSD__) || defined(__DragonFly__) -#define EXE_LINK "/proc/curproc/file" +static const char exe_link[] = "/proc/curproc/file"; +#else +static const char exe_link[] = ""; #endif /* die on a fatal error */ @@ -151,30 +153,34 @@ static char *get_runtime_libdir(void) return NULL; } -/* return the directory that contains the main exe at run-time */ -static char *get_runtime_exedir(void) +/* read a symlink and return its directory */ +static char *symlink_dirname( const char *name ) { -#ifdef EXE_LINK - char *p, *bindir; - int size; + char *p, *buffer; + int ret, size; for (size = 256; ; size *= 2) { - int ret; - if (!(bindir = malloc( size ))) return NULL; - if ((ret = readlink( EXE_LINK, bindir, size )) == -1) break; + if (!(buffer = malloc( size ))) return NULL; + if ((ret = readlink( name, buffer, size )) == -1) break; if (ret != size) { - bindir[ret] = 0; - if (!(p = strrchr( bindir, '/' ))) break; - if (p == bindir) p++; + buffer[ret] = 0; + if (!(p = strrchr( buffer, '/' ))) break; + if (p == buffer) p++; *p = 0; - return bindir; + return buffer; } - free( bindir ); + free( buffer ); } - free( bindir ); -#endif + free( buffer ); + return NULL; +} + +/* return the directory that contains the main exe at run-time */ +static char *get_runtime_exedir(void) +{ + if (exe_link[0]) return symlink_dirname( exe_link ); return NULL; }

1 0

Alexandre Julliard : libwine: Look for the 64-bit wineserver using the 64-bit loader symlink.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 493129d638b5ee05522d4b1e0dd026f3f416ffcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=493129d638b5ee05522d4b1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 13:24:19 2018 +0100 libwine: Look for the 64-bit wineserver using the 64-bit loader symlink. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 8ebe970..f638412 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -47,6 +47,7 @@ static char *server_dir; static char *build_dir; static char *user_name; static char *argv0_name; +static char *wineserver64; #ifdef __GNUC__ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format(printf,1,2))); @@ -156,7 +157,7 @@ static char *get_runtime_libdir(void) /* read a symlink and return its directory */ static char *symlink_dirname( const char *name ) { - char *p, *buffer; + char *p, *buffer, *absdir = NULL; int ret, size; for (size = 256; ; size *= 2) @@ -169,11 +170,19 @@ static char *symlink_dirname( const char *name ) if (!(p = strrchr( buffer, '/' ))) break; if (p == buffer) p++; *p = 0; - return buffer; + if (buffer[0] == '/') return buffer; + /* make it absolute */ + absdir = xmalloc( strlen(name) + strlen(buffer) + 1 ); + strcpy( absdir, name ); + if (!(p = strrchr( absdir, '/' ))) break; + strcpy( p + 1, buffer ); + free( buffer ); + return absdir; } free( buffer ); } free( buffer ); + free( absdir ); return NULL; } @@ -446,6 +455,16 @@ done: if (build_dir) { argv0_name = build_path( "loader/", basename ); + if (sizeof(int) == sizeof(void *)) + { + char *loader, *linkname = build_path( build_dir, "loader/wine64" ); + if ((loader = symlink_dirname( linkname ))) + { + wineserver64 = build_path( loader, "../server/wineserver" ); + free( loader ); + } + free( linkname ); + } } else { @@ -565,7 +584,10 @@ void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ) /* if we are in build dir and name contains a path, try that */ if (build_dir) { - argv[0] = build_path( build_dir, name ); + if (wineserver64 && !strcmp( name, "server/wineserver" )) + argv[0] = xstrdup( wineserver64 ); + else + argv[0] = build_path( build_dir, name ); preloader_exec( argv, use_preloader ); free( argv[0] ); }

1 0

Alexandre Julliard : configure: Don' t create fonts and server symlinks in the WoW64 build tree.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 123b92373d4c64b52b9f3d9cfb53a1145f9d425e URL: https://source.winehq.org/git/wine.git/?a=commit;h=123b92373d4c64b52b9f3d9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 15:42:07 2018 +0100 configure: Don't create fonts and server symlinks in the WoW64 build tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 13 +++++-------- configure.ac | 14 ++++++-------- tools/make_makefiles | 5 ----- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/configure b/configure index f2be330..f7c1158 100755 --- a/configure +++ b/configure @@ -5657,8 +5657,6 @@ then fi test "$srcdir" != . || as_fn_error $? "--with-wine64 cannot be used when building inside the source tree. You should create a separate build directory and run configure from there." "$LINENO" 5 - enable_fonts=${enable_fonts:-no} - enable_server=${enable_server:-no} elif test "x$enable_win64" = "xyes" then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" @@ -20014,7 +20012,7 @@ wine_fn_config_makefile dlls/xmllite/tests enable_tests wine_fn_config_makefile dlls/xolehlp enable_xolehlp wine_fn_config_makefile dlls/xpsprint enable_xpsprint wine_fn_config_makefile dlls/xpssvcs enable_xpssvcs -test -n "$with_wine64" || wine_fn_config_makefile fonts enable_fonts +wine_fn_config_makefile fonts enable_fonts wine_fn_config_makefile include enable_include wine_fn_config_makefile libs/port enable_port wine_fn_config_makefile libs/wine enable_wine @@ -20124,7 +20122,7 @@ wine_fn_config_makefile programs/wscript/tests enable_tests wine_fn_config_makefile programs/wusa enable_wusa wine_fn_config_makefile programs/xcopy enable_xcopy wine_fn_config_makefile programs/xcopy/tests enable_tests -test -n "$with_wine64" || wine_fn_config_makefile server enable_server +wine_fn_config_makefile server enable_server test "x$enable_tools" = xno || wine_fn_config_makefile tools enable_tools test "x$enable_tools" = xno || wine_fn_config_makefile tools/sfnt2fon enable_sfnt2fon test "x$enable_tools" = xno || wine_fn_config_makefile tools/widl enable_widl @@ -20187,9 +20185,8 @@ then /*) reldir="" ;; *) reldir="../" ;; esac - wine_fn_append_rule "all: fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader -fonts server: - \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@ + rm -f fonts server 2>/dev/null + wine_fn_append_rule "all: loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader loader/wine64 loader/wine64-preloader: \$(RM) \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@ $with_wine64/loader/wine: @@ -20197,7 +20194,7 @@ $with_wine64/loader/wine: $with_wine64/loader/wine-preloader: \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ clean:: - \$(RM) fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader" + \$(RM) loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ diff --git a/configure.ac b/configure.ac index 328b572..c909ce4 100644 --- a/configure.ac +++ b/configure.ac @@ -235,8 +235,6 @@ then fi test "$srcdir" != . || AC_MSG_ERROR([--with-wine64 cannot be used when building inside the source tree. You should create a separate build directory and run configure from there.]) - enable_fonts=${enable_fonts:-no} - enable_server=${enable_server:-no} elif test "x$enable_win64" = "xyes" then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" @@ -3877,7 +3875,7 @@ WINE_CONFIG_MAKEFILE(dlls/xmllite/tests) WINE_CONFIG_MAKEFILE(dlls/xolehlp) WINE_CONFIG_MAKEFILE(dlls/xpsprint) WINE_CONFIG_MAKEFILE(dlls/xpssvcs) -WINE_CONFIG_MAKEFILE(fonts,,[test -n "$with_wine64"]) +WINE_CONFIG_MAKEFILE(fonts) WINE_CONFIG_MAKEFILE(include) WINE_CONFIG_MAKEFILE(libs/port) WINE_CONFIG_MAKEFILE(libs/wine) @@ -3987,7 +3985,7 @@ WINE_CONFIG_MAKEFILE(programs/wscript/tests) WINE_CONFIG_MAKEFILE(programs/wusa) WINE_CONFIG_MAKEFILE(programs/xcopy) WINE_CONFIG_MAKEFILE(programs/xcopy/tests) -WINE_CONFIG_MAKEFILE(server,,[test -n "$with_wine64"]) +WINE_CONFIG_MAKEFILE(server) WINE_CONFIG_MAKEFILE(tools,,[test "x$enable_tools" = xno]) WINE_CONFIG_MAKEFILE(tools/sfnt2fon,,[test "x$enable_tools" = xno]) WINE_CONFIG_MAKEFILE(tools/widl,,[test "x$enable_tools" = xno]) @@ -4065,10 +4063,10 @@ then /*) reldir="" ;; *) reldir="../" ;; esac + dnl Get rid of old symlinks + rm -f fonts server 2>/dev/null WINE_APPEND_RULE( -[all: fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader -fonts server: - \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@] +[all: loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader loader/wine64 loader/wine64-preloader: \$(RM) \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@] $with_wine64/loader/wine: @@ -4076,7 +4074,7 @@ $with_wine64/loader/wine: $with_wine64/loader/wine-preloader: \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] clean:: - \$(RM) fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) + \$(RM) loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ diff --git a/tools/make_makefiles b/tools/make_makefiles index b26406b..d1fe7f5 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -464,11 +464,6 @@ sub update_makefiles(@) die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; $args = ",,[test \"x\$enable_tools\" = xno]"; } - elsif (($dir eq "fonts") || ($dir eq "server")) - { - # these are created as symlinks for wow64 builds - $args = ",,[test -n \"\$with_wine64\"]"; - } push @lines, "WINE_CONFIG_MAKEFILE($dir$args)\n"; }

1 0

Alexandre Julliard : configure: Allow building a WoW64 tree inside the source directory.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 1582ae6b045bb1658f6d5bc83efc5f6ce042c06e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1582ae6b045bb1658f6d5bc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 20:55:13 2018 +0100 configure: Allow building a WoW64 tree inside the source directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 11 ++--------- configure.ac | 13 +++---------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/configure b/configure index f7c1158..d00057b 100755 --- a/configure +++ b/configure @@ -5648,17 +5648,10 @@ enable_win64=${enable_win64:-no} enable_winetest=${enable_winetest:-$enable_tests} -if test -n "$with_wine64" +if test "x$enable_win64" = "xyes" then - if test "x$enable_win64" = "xyes" - then - as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive. + test -z "$with_wine64" || as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5 - fi - test "$srcdir" != . || as_fn_error $? "--with-wine64 cannot be used when building inside the source tree. -You should create a separate build directory and run configure from there." "$LINENO" 5 -elif test "x$enable_win64" = "xyes" -then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi diff --git a/configure.ac b/configure.ac index c909ce4..50cf9a0 100644 --- a/configure.ac +++ b/configure.ac @@ -225,18 +225,11 @@ enable_win64=${enable_win64:-no} dnl Disable winetest too if tests are disabled enable_winetest=${enable_winetest:-$enable_tests} -dnl Some special cases for the wow64 build -if test -n "$with_wine64" +dnl Some special cases for the 64-bit build +if test "x$enable_win64" = "xyes" then - if test "x$enable_win64" = "xyes" - then - AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. + test -z "$with_wine64" || AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.]) - fi - test "$srcdir" != . || AC_MSG_ERROR([--with-wine64 cannot be used when building inside the source tree. -You should create a separate build directory and run configure from there.]) -elif test "x$enable_win64" = "xyes" -then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi

1 0