February 2016 - Wine-commits

André Hentschel : ntdll: Set TPIDRURW also on ARMv8-A.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: b363f386cda116901db126be3f4688c4cc5c481c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b363f386cda116901db126be3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Feb 25 21:29:26 2016 +0100 ntdll: Set TPIDRURW also on ARMv8-A. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 1f6da96..5ee9f45 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -926,7 +926,7 @@ void signal_init_thread( TEB *teb ) init_done = TRUE; } -#ifdef __ARM_ARCH_7A__ +#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) /* Win32/ARM applications expect the TEB pointer to be in the TPIDRURW register. */ __asm__ __volatile__( "mcr p15, 0, %0, c13, c0, 2" : : "r" (teb) ); #endif

1 0

Daniel Lehman : winedbg: Handle the 4th parameter for 64-bit C++ exceptions.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: 26b37c40e753c0741e543f1b72332ca0546cb695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b37c40e753c0741e543f1b7… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Nov 24 16:19:39 2010 -0800 winedbg: Handle the 4th parameter for 64-bit C++ exceptions. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 08ac938..e521252 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -953,6 +953,10 @@ void info_win32_exception(void) if(rec->NumberParameters == 3 && rec->ExceptionInformation[0] == CXX_FRAME_MAGIC) dbg_printf("C++ exception(object = 0x%08lx, type = 0x%08lx)", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + else if(rec->NumberParameters == 4 && rec->ExceptionInformation[0] == CXX_FRAME_MAGIC) + dbg_printf("C++ exception(object = %p, type = %p, base = %p)", + (void*)rec->ExceptionInformation[1], (void*)rec->ExceptionInformation[2], + (void*)rec->ExceptionInformation[3]); else dbg_printf("C++ exception with strange parameter count %d or magic 0x%08lx", rec->NumberParameters, rec->ExceptionInformation[0]);

1 0

Jacek Caban : user32: Always enable owner window in EndDialog.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: 142133ae6c973a06e90b6de32c55fae757372a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142133ae6c973a06e90b6de32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 25 17:32:54 2016 +0100 user32: Always enable owner window in EndDialog. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 8 ++------ dlls/user32/tests/msg.c | 28 ++++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index e841152..f3c8289 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -921,7 +921,6 @@ INT_PTR WINAPI DialogBoxIndirectParamW(HINSTANCE hInstance, LPCDLGTEMPLATEW temp */ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) { - BOOL wasEnabled; DIALOGINFO * dlgInfo; HWND owner; @@ -934,10 +933,9 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) } dlgInfo->idResult = retval; dlgInfo->flags |= DF_END; - wasEnabled = (dlgInfo->flags & DF_OWNERENABLED); owner = GetWindow( hwnd, GW_OWNER ); - if (wasEnabled && owner) + if (owner) DIALOG_EnableOwner( owner ); /* Windows sets the focus to the dialog itself in EndDialog */ @@ -953,9 +951,7 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) if (hwnd == GetActiveWindow()) { - /* If this dialog was given an owner then set the focus to that owner - even when the owner is disabled (normally when a window closes any - disabled windows cannot receive the focus). */ + /* If this dialog was given an owner then set the focus to that owner. */ if (owner) SetForegroundWindow( owner ); else diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 98bf53d..cc92acf 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12226,7 +12226,7 @@ static void test_EndDialog(void) hother = CreateWindowExA(0, "TestParentClass", "Test parent 2", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 100, 100, 200, 200, 0, 0, 0, NULL); + 200, 100, 200, 200, 0, 0, 0, NULL); ok (hother != 0, "Failed to create parent window\n"); ok(GetClassInfoA(0, "#32770", &cls), "GetClassInfo failed\n"); @@ -12240,20 +12240,40 @@ static void test_EndDialog(void) hactive = GetForegroundWindow(); ok(hother == hactive, "Wrong window has focus (%p != %p)\n", hother, hactive); - /* create a dialog where the parent is disabled, this parent should still - receive the focus when the dialog exits (even though "normally" a - disabled window should not receive the focus) */ + /* create a dialog where the parent is disabled, this parent should be + * enabled and receive focus when dialog exits */ hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", hparent, test_dlg_proc, 0); ok(IsWindow(hdlg), "CreateDialogParam failed\n"); SetForegroundWindow(hdlg); hactive = GetForegroundWindow(); ok(hdlg == hactive, "Wrong window has focus (%p != %p)\n", hdlg, hactive); EndDialog(hdlg, 0); + ok(IsWindowEnabled(hparent), "parent is not enabled\n"); hactive = GetForegroundWindow(); ok(hparent == hactive, "Wrong window has focus (parent != active) (active: %p, parent: %p, dlg: %p, other: %p)\n", hactive, hparent, hdlg, hother); DestroyWindow(hdlg); flush_sequence(); + /* create a dialog where the parent is disabled and set active window to other window before calling EndDialog */ + EnableWindow(hparent, FALSE); + hdlg = CreateWindowExA(0, "TestDialogClass", NULL, + WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_DLGFRAME, + 0, 0, 100, 100, hparent, 0, 0, NULL); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + flush_sequence(); + SetForegroundWindow(hother); + flush_sequence(); + hactive = GetForegroundWindow(); + ok(hactive == hother, "Wrong foreground (%p != %p)\n", hactive, hother); + hactive = GetActiveWindow(); + ok(hactive == hother, "Wrong active window (%p != %p)\n", hactive, hother); + EndDialog(hdlg, 0); + ok(IsWindowEnabled(hparent), "parent is not enabled\n"); + hactive = GetForegroundWindow(); + ok(hother == hactive, "Wrong window has focus (other != active) (active: %p, parent: %p, dlg: %p, other: %p)\n", hactive, hparent, hdlg, hother); + DestroyWindow(hdlg); + flush_sequence(); + DestroyWindow( hother ); DestroyWindow( hparent ); UnregisterClassA(cls.lpszClassName, cls.hInstance);

1 0

Jacek Caban : user32: Ignore WM_CHILDACTIVATE on disabled windows in DefMDIChildProc.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: aa5762d5c20a6f1281b9018813169a67c79896b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa5762d5c20a6f1281b901881… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 12:35:34 2016 +0100 user32: Ignore WM_CHILDACTIVATE on disabled windows in DefMDIChildProc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 3 ++- dlls/user32/tests/msg.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/win.c | 6 ----- 3 files changed, 68 insertions(+), 7 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index b360528..bda2b00 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1485,7 +1485,8 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, break; case WM_CHILDACTIVATE: - MDI_ChildActivate( client, hwnd ); + if (IsWindowEnabled( hwnd )) + MDI_ChildActivate( client, hwnd ); return 0; case WM_SYSCOMMAND: diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cc92acf..bd02c89 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2343,6 +2343,28 @@ static const struct message WmCreateMDIchildVisibleSeq[] = { { WM_MDIACTIVATE, sent|defwinproc }, { 0 } }; +/* WM_CHILDACTIVATE sent to disabled window */ +static const struct message WmChildActivateDisabledWindowSeq[] = { + { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +/* WM_CHILDACTIVATE sent to enabled window */ +static const struct message WmChildActivateWindowSeq[] = { + { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, + { WM_NCACTIVATE, sent|wparam|defwinproc, 0 }, + { WM_MDIACTIVATE, sent|defwinproc }, + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCACTIVATE, sent|wparam|defwinproc, 1 }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent|defwinproc }, + { WM_SETFOCUS, sent }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_MDIACTIVATE, sent|defwinproc }, + { 0 } +}; /* CreateWindow for MDI child window with invisible parent */ static const struct message WmCreateMDIchildInvisibleParentSeq[] = { { HCBT_CREATEWND, hook }, @@ -3618,6 +3640,50 @@ static void test_mdi_messages(void) ok(GetActiveWindow() == mdi_frame, "wrong active window %p\n", GetActiveWindow()); ok(GetFocus() == 0, "wrong focus window %p\n", GetFocus()); + trace("Testing WM_CHILDACTIVATE\n"); + + mdi_child = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child", + WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_DISABLED, + 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, + mdi_client, 0, GetModuleHandleA(0), NULL); + + mdi_child2 = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child", + WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX, + 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, + mdi_client, 0, GetModuleHandleA(0), NULL); + + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); + ok(active_child == mdi_child2, "wrong active MDI child %p\n", active_child); + ok(!zoomed, "wrong zoomed state %d\n", zoomed); + + flush_sequence(); + SendMessageW(mdi_child, WM_CHILDACTIVATE, 0, 0); + ok_sequence(WmChildActivateDisabledWindowSeq, "WM_CHILDACTIVATE sent to disabled window", FALSE); + + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); + ok(active_child == mdi_child2, "wrong active MDI child %p\n", active_child); + ok(!zoomed, "wrong zoomed state %d\n", zoomed); + flush_sequence(); + + EnableWindow(mdi_child, TRUE); + + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); + ok(active_child == mdi_child2, "wrong active MDI child %p\n", active_child); + ok(!zoomed, "wrong zoomed state %d\n", zoomed); + + flush_sequence(); + SendMessageW(mdi_child, WM_CHILDACTIVATE, 0, 0); + ok_sequence(WmChildActivateWindowSeq, "WM_CHILDACTIVATE sent to enabled window", FALSE); + + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); + ok(active_child == mdi_child, "wrong active MDI child %p\n", active_child); + ok(!zoomed, "wrong zoomed state %d\n", zoomed); + flush_sequence(); + + DestroyWindow(mdi_child); + DestroyWindow(mdi_child2); + flush_sequence(); + /* test for maximized MDI children */ trace("creating maximized visible MDI child window 1\n"); mdi_child = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child", diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 988aa6c..4a09e39 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1411,7 +1411,6 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); -todo_wine ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1428,7 +1427,6 @@ todo_wine id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); -todo_wine ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1484,7 +1482,6 @@ todo_wine id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); -todo_wine ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1505,7 +1502,6 @@ todo_wine id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); -todo_wine ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1562,7 +1558,6 @@ todo_wine id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); -todo_wine ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1583,7 +1578,6 @@ todo_wine id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); -todo_wine ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n");

1 0

Charles Davis : server: Fix int-to-pointer conversion warning (Clang).
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: 1c862ca479f1cacb9827c7491b7b8915417a2091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c862ca479f1cacb9827c7491… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 26 02:46:06 2016 -0700 server: Fix int-to-pointer conversion warning (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index e995380..1fd1ce7 100644 --- a/server/fd.c +++ b/server/fd.c @@ -574,8 +574,8 @@ static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) if (kqueue_fd == -1) return; - EV_SET( &ev[0], fd->unix_fd, EVFILT_READ, 0, NOTE_LOWAT, 1, (void *)user ); - EV_SET( &ev[1], fd->unix_fd, EVFILT_WRITE, 0, NOTE_LOWAT, 1, (void *)user ); + EV_SET( &ev[0], fd->unix_fd, EVFILT_READ, 0, NOTE_LOWAT, 1, (void *)(long)user ); + EV_SET( &ev[1], fd->unix_fd, EVFILT_WRITE, 0, NOTE_LOWAT, 1, (void *)(long)user ); if (events == -1) /* stop waiting on this fd completely */ {

1 0

Alistair Leslie-Hughes : inetcpl: Implement default page button.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: 1510b8b92af23a2305de95f074468c231dc11fa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1510b8b92af23a2305de95f07… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 25 18:51:17 2016 +1100 inetcpl: Implement default page button. Based on a patch by Jared Smudde. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/general.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c index 0691579..e0f473c 100644 --- a/dlls/inetcpl.cpl/general.c +++ b/dlls/inetcpl.cpl/general.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; +static const WCHAR default_page[] = {'D','e','f','a','u','l','t','_','P','a','g','e','_','U','R','L',0}; static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\', @@ -43,7 +44,6 @@ static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', /* list of unimplemented buttons */ static DWORD disabled_general_buttons[] = {IDC_HOME_CURRENT, - IDC_HOME_DEFAULT, IDC_HISTORY_SETTINGS, 0}; static DWORD disabled_delhist_buttons[] = {IDC_DELETE_FORM_DATA, @@ -175,6 +175,10 @@ static DWORD parse_url_from_outside(LPCWSTR url, LPWSTR out, DWORD maxlen) */ static INT_PTR general_on_command(HWND hwnd, WPARAM wparam) { + WCHAR buffer[INTERNET_MAX_URL_LENGTH]; + DWORD len; + DWORD type; + LONG res; switch (wparam) { @@ -187,6 +191,13 @@ static INT_PTR general_on_command(HWND hwnd, WPARAM wparam) SetDlgItemTextW(hwnd, IDC_HOME_EDIT, about_blank); break; + case MAKEWPARAM(IDC_HOME_DEFAULT, BN_CLICKED): + len = sizeof(buffer); + type = REG_SZ; + res = SHRegGetUSValueW(reg_ie_main, default_page, &type, buffer, &len, FALSE, (LPBYTE) about_blank, sizeof(about_blank)); + if (!res && (type == REG_SZ)) SetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer); + break; + case MAKEWPARAM(IDC_HISTORY_DELETE, BN_CLICKED): DialogBoxW(hcpl, MAKEINTRESOURCEW(IDD_DELETE_HISTORY), hwnd, delhist_dlgproc);

1 0

Alexandre Julliard : makefiles: Generate rules for import libraries symlinks.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: f74638f94014d58cb73dda4a1f329686a9c51058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74638f94014d58cb73dda4a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 15:10:06 2016 +0900 makefiles: Generate rules for import libraries symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 12 ------------ configure | 12 ------------ tools/makedep.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 51 insertions(+), 34 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 4171f47..abe5ca4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -457,21 +457,9 @@ $ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) if test "$ac_name" != "$ac_implib" then - wine_fn_append_rule \ -"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT -dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT - \$(RM) \$[@] && \$(LN_S) $ac_name/lib$ac_implib.$IMPLIBEXT \$[@] -clean:: - \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT" if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then - wine_fn_append_rule \ -"__builddeps__: dlls/lib$ac_implib.cross.a -dlls/lib$ac_implib.cross.a: $ac_file.cross.a - \$(RM) \$[@] && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$[@] -clean:: - \$(RM) dlls/lib$ac_implib.cross.a" wine_fn_ignore_file "dlls/lib$ac_implib.cross.a" fi fi diff --git a/configure b/configure index 6342d91..06c6832 100755 --- a/configure +++ b/configure @@ -7684,21 +7684,9 @@ $ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) if test "$ac_name" != "$ac_implib" then - wine_fn_append_rule \ -"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT -dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT - \$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.$IMPLIBEXT \$@ -clean:: - \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT" if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then - wine_fn_append_rule \ -"__builddeps__: dlls/lib$ac_implib.cross.a -dlls/lib$ac_implib.cross.a: $ac_file.cross.a - \$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$@ -clean:: - \$(RM) dlls/lib$ac_implib.cross.a" wine_fn_ignore_file "dlls/lib$ac_implib.cross.a" fi fi diff --git a/tools/makedep.c b/tools/makedep.c index 45c9209..4174cb1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2167,6 +2167,41 @@ static struct strarray output_install_rules( const struct makefile *make, struct /******************************************************************* + * output_importlib_symlinks + */ +static struct strarray output_importlib_symlinks( const struct makefile *parent, + const struct makefile *make ) +{ + struct strarray ret = empty_strarray; + const char *dir, *lib; + + if (!make->module) return ret; + if (!make->importlib) return ret; + if (strncmp( make->base_dir, "dlls/", 5 )) return ret; + if (!strcmp( make->module, make->importlib )) return ret; + if (!strchr( make->importlib, '.' ) && + !strncmp( make->module, make->importlib, strlen( make->importlib )) && + !strcmp( make->module + strlen( make->importlib ), ".dll" )) + return ret; + + dir = obj_dir_path( parent, "dlls" ); + lib = strmake( "lib%s.%s", make->importlib, *dll_ext ? "def" : "a" ); + output( "%s/%s: %s\n", dir, lib, base_dir_path( make, lib )); + output( "\trm -f $@ && $(LN_S) %s/%s $@\n", make->base_dir + strlen("dlls/"), lib ); + strarray_add( &ret, strmake( "%s/%s", dir, lib )); + + if (crosstarget && !make->is_win16) + { + lib = strmake( "lib%s.cross.a", make->importlib ); + output( "%s/%s: %s\n", dir, lib, base_dir_path( make, lib )); + output( "\trm -f $@ && $(LN_S) %s/%s $@\n", make->base_dir + strlen("dlls/"), lib ); + strarray_add( &ret, strmake( "%s/%s", dir, lib )); + } + return ret; +} + + +/******************************************************************* * output_po_files */ static void output_po_files( const struct makefile *make ) @@ -3006,18 +3041,20 @@ static struct strarray output_sources( const struct makefile *make ) if (make->subdirs.count) { + struct strarray build_deps = empty_strarray; struct strarray makefile_deps = empty_strarray; struct strarray distclean_files = empty_strarray; for (i = 0; i < make->subdirs.count; i++) { - strarray_add( &makefile_deps, top_dir_path( make, base_dir_path( make->submakes[i], + const struct makefile *submake = make->submakes[i]; + + strarray_add( &makefile_deps, top_dir_path( make, base_dir_path( submake, strmake ( "%s.in", output_makefile_name )))); - strarray_add( &distclean_files, base_dir_path( make->submakes[i], output_makefile_name )); - if (!make->src_dir) - strarray_add( &distclean_files, base_dir_path( make->submakes[i], ".gitignore" )); - if (make->submakes[i]->testdll) - strarray_add( &distclean_files, base_dir_path( make->submakes[i], "testlist.c" )); + strarray_add( &distclean_files, base_dir_path( submake, output_makefile_name )); + if (!make->src_dir) strarray_add( &distclean_files, base_dir_path( submake, ".gitignore" )); + if (submake->testdll) strarray_add( &distclean_files, base_dir_path( submake, "testlist.c" )); + strarray_addall( &build_deps, output_importlib_symlinks( make, submake )); } output( "Makefile:" ); output_filenames( makefile_deps ); @@ -3030,10 +3067,7 @@ static struct strarray output_sources( const struct makefile *make ) if (msgfmt && strcmp( msgfmt, "false" )) { - strarray_addall( &clean_files, mo_files ); - output( "__builddeps__:" ); - output_filenames( mo_files ); - output( "\n" ); + strarray_addall( &build_deps, mo_files ); for (i = 0; i < linguas.count; i++) { output( "%s/%s.mo:", obj_dir_path( make, "po" ), linguas.str[i] ); @@ -3041,6 +3075,13 @@ static struct strarray output_sources( const struct makefile *make ) output( "\t%s -o $@ %s/%s.po\n", msgfmt, src_dir_path( make, "po" ), linguas.str[i] ); } } + if (build_deps.count) + { + output( "__builddeps__:" ); + output_filenames( build_deps ); + output( "\n" ); + strarray_addall( &clean_files, build_deps ); + } if (get_expanded_make_variable( make, "GETTEXTPO_LIBS" )) output_po_files( make ); }

1 0

Alexandre Julliard : makefiles: Expand the ln -s command into the makefiles.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: fb43551a0d031f0dc6f2d0d6b66ff43f482243f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb43551a0d031f0dc6f2d0d6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 15:13:00 2016 +0900 makefiles: Expand the ln -s command into the makefiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4174cb1..27fc997 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -147,6 +147,7 @@ static const char *rsvg; static const char *icotool; static const char *dlltool; static const char *msgfmt; +static const char *ln_s; struct makefile { @@ -2150,7 +2151,7 @@ static struct strarray output_install_rules( const struct makefile *make, struct install_sh, src_dir_path( make, file ), dest + 1 ); break; case 'y': /* symlink */ - output( "\trm -f $(DESTDIR)%s && $(LN_S) %s $(DESTDIR)%s\n", dest + 1, file, dest + 1 ); + output( "\trm -f $(DESTDIR)%s && %s %s $(DESTDIR)%s\n", dest + 1, ln_s, file, dest + 1 ); break; default: assert(0); @@ -2187,14 +2188,14 @@ static struct strarray output_importlib_symlinks( const struct makefile *parent, dir = obj_dir_path( parent, "dlls" ); lib = strmake( "lib%s.%s", make->importlib, *dll_ext ? "def" : "a" ); output( "%s/%s: %s\n", dir, lib, base_dir_path( make, lib )); - output( "\trm -f $@ && $(LN_S) %s/%s $@\n", make->base_dir + strlen("dlls/"), lib ); + output( "\trm -f $@ && %s %s/%s $@\n", ln_s, make->base_dir + strlen("dlls/"), lib ); strarray_add( &ret, strmake( "%s/%s", dir, lib )); if (crosstarget && !make->is_win16) { lib = strmake( "lib%s.cross.a", make->importlib ); output( "%s/%s: %s\n", dir, lib, base_dir_path( make, lib )); - output( "\trm -f $@ && $(LN_S) %s/%s $@\n", make->base_dir + strlen("dlls/"), lib ); + output( "\trm -f $@ && %s %s/%s $@\n", ln_s, make->base_dir + strlen("dlls/"), lib ); strarray_add( &ret, strmake( "%s/%s", dir, lib )); } return ret; @@ -2837,7 +2838,7 @@ static struct strarray output_sources( const struct makefile *make ) for (i = 1; i < names.count; i++) { output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); - output( "\trm -f $@ && $(LN_S) %s $@\n", names.str[i-1] ); + output( "\trm -f $@ && %s %s $@\n", ln_s, names.str[i-1] ); add_install_rule( make, install_rules, names.str[i], names.str[i-1], strmake( "y$(libdir)/%s", names.str[i] )); } @@ -2998,7 +2999,7 @@ static struct strarray output_sources( const struct makefile *make ) { output_filenames_obj_dir( make, symlinks ); output( ": %s\n", obj_dir_path( make, program )); - output( "\trm -f $@ && $(LN_S) %s $@\n", obj_dir_path( make, program )); + output( "\trm -f $@ && %s %s $@\n", ln_s, obj_dir_path( make, program )); strarray_addall( &all_targets, symlinks ); } @@ -3542,6 +3543,7 @@ int main( int argc, char *argv[] ) icotool = get_expanded_make_variable( top_makefile, "ICOTOOL" ); dlltool = get_expanded_make_variable( top_makefile, "DLLTOOL" ); msgfmt = get_expanded_make_variable( top_makefile, "MSGFMT" ); + ln_s = get_expanded_make_variable( top_makefile, "LN_S" ); if (root_src_dir && !strcmp( root_src_dir, "." )) root_src_dir = NULL; if (tools_dir && !strcmp( tools_dir, "." )) tools_dir = NULL;

1 0

Alexandre Julliard : makefiles: Generate the top-level .gitignore and the distclean rules.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: 77c1b7e352ecd2716aa7f70eaeebf3648dc6c7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c1b7e352ecd2716aa7f70ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 18:06:25 2016 +0900 makefiles: Generate the top-level .gitignore and the distclean rules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- aclocal.m4 | 28 +++----------------- configure | 80 ++++++++++++--------------------------------------------- configure.ac | 30 +--------------------- tools/makedep.c | 9 ++++--- 5 files changed, 28 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77c1b7e352ecd2716aa7f…

1 0

Alexandre Julliard : configure: Only check for libgettextpo when explicitly requested.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: d5b3afe35719209c4dbb402cac6bf453e1e807f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b3afe35719209c4dbb402ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 18:20:21 2016 +0900 configure: Only check for libgettextpo when explicitly requested. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 9 +++------ configure.ac | 13 +++++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/configure b/configure index eddf07b..f189c99 100755 --- a/configure +++ b/configure @@ -12416,7 +12416,7 @@ This is an error since --with-zlib was requested." "$LINENO" 5 ;; esac fi -if test "x$enable_tools" != xno +if test "x$enable_tools" != xno -a "x$with_gettextpo" = xyes then if test "$ac_cv_header_gettext_po_h" = "yes" then @@ -12465,9 +12465,7 @@ $as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h fi fi - if test "x$with_gettextpo" = xyes - then - if test "x$GETTEXTPO_LIBS" = "x"; then : + if test "x$GETTEXTPO_LIBS" = "x"; then : case "x$with_gettextpo" in x) as_fn_append wine_notices "|GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt." ;; xno) ;; @@ -12475,7 +12473,7 @@ fi This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; esac fi - if test "$srcdir" != .; then : + if test "$srcdir" != .; then : case "x$with_gettextpo" in x) as_fn_append wine_notices "|Rebuilding po files is not supported for out of tree builds." ;; xno) ;; @@ -12483,7 +12481,6 @@ fi This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; esac fi - fi fi if test "x$with_pulse" != "xno"; diff --git a/configure.ac b/configure.ac index 73e4140..e20cbe7 100644 --- a/configure.ac +++ b/configure.ac @@ -1435,7 +1435,7 @@ fi WINE_NOTICE_WITH(zlib,[test "x$Z_LIBS" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.]) dnl **** Check for gettextpo **** -if test "x$enable_tools" != xno +if test "x$enable_tools" != xno -a "x$with_gettextpo" = xyes then if test "$ac_cv_header_gettext_po_h" = "yes" then @@ -1443,13 +1443,10 @@ then [AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).]) AC_SUBST(GETTEXTPO_LIBS,"-lgettextpo")]) fi - if test "x$with_gettextpo" = xyes - then - WINE_NOTICE_WITH(gettextpo,[test "x$GETTEXTPO_LIBS" = "x"], - [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) - WINE_NOTICE_WITH(gettextpo,[test "$srcdir" != .], - [Rebuilding po files is not supported for out of tree builds.]) - fi + WINE_NOTICE_WITH(gettextpo,[test "x$GETTEXTPO_LIBS" = "x"], + [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) + WINE_NOTICE_WITH(gettextpo,[test "$srcdir" != .], + [Rebuilding po files is not supported for out of tree builds.]) fi dnl **** Check for PulseAudio ****

1 0