September 2006 - Wine-commits

Paul Vriens : crypt32/tests: Some tests for CryptSIPLoad.
by Alexandre Julliard 14 Sep '06

14 Sep '06

Module: wine Branch: master Commit: efb65fcac9927f8f9d8a9056792cd9a2ede5c7b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efb65fcac9927f8f9d8a905… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Sep 13 19:17:36 2006 +0200 crypt32/tests: Some tests for CryptSIPLoad. --- dlls/crypt32/tests/main.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 76ffab7..1c89f72 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -420,6 +420,81 @@ static void test_AddRemoveProvider(void) GetLastError()); } +static void test_SIPLoad(void) +{ + BOOL ret; + GUID subject; + static GUID dummySubject = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }}; + static GUID unknown = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + SIP_DISPATCH_INFO sdi; + + /* All NULL */ + SetLastError(0xdeadbeef); + ret = CryptSIPLoad(NULL, 0, NULL); + ok ( !ret, "Expected CryptSIPLoad to fail\n"); + todo_wine + ok ( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got 0x%08lx\n", GetLastError()); + + /* Only pSipDispatch NULL */ + SetLastError(0xdeadbeef); + ret = CryptSIPLoad(&subject, 0, NULL); + ok ( !ret, "Expected CryptSIPLoad to fail\n"); + todo_wine + ok ( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got 0x%08lx\n", GetLastError()); + + /* No NULLs, but nonexistent pgSubject */ + SetLastError(0xdeadbeef); + memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); + sdi.cbSize = sizeof(SIP_DISPATCH_INFO); + ret = CryptSIPLoad(&dummySubject, 0, &sdi); + ok ( !ret, "Expected CryptSIPLoad to fail\n"); + todo_wine + ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN, + "Expected TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08lx\n", GetLastError()); + + /* cbSize not initialized */ + SetLastError(0xdeadbeef); + memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); + ret = CryptSIPLoad(&dummySubject, 0, &sdi); + ok ( !ret, "Expected CryptSIPLoad to fail\n"); + todo_wine + ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN, + "Expected TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08lx\n", GetLastError()); + + /* cbSize not initialized, but valid subject (named unknown but registered by wintrust) */ + SetLastError(0xdeadbeef); + memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); + ret = CryptSIPLoad(&unknown, 0, &sdi); + todo_wine + { + ok ( ret, "Expected CryptSIPLoad to succeed\n"); + ok ( GetLastError() == ERROR_PROC_NOT_FOUND, + "Expected ERROR_PROC_NOT_FOUND, got 0x%08lx\n", GetLastError()); + } + + /* All OK */ + SetLastError(0xdeadbeef); + memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); + sdi.cbSize = sizeof(SIP_DISPATCH_INFO); + ret = CryptSIPLoad(&unknown, 0, &sdi); + todo_wine + ok ( ret, "Expected CryptSIPLoad to succeed\n"); + ok ( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", GetLastError()); + + /* Reserved parameter not 0 */ + SetLastError(0xdeadbeef); + memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); + sdi.cbSize = sizeof(SIP_DISPATCH_INFO); + ret = CryptSIPLoad(&unknown, 1, &sdi); + ok ( !ret, "Expected CryptSIPLoad to fail\n"); + todo_wine + ok ( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got 0x%08lx\n", GetLastError()); +} + START_TEST(main) { hCrypt = LoadLibraryA("crypt32.dll"); @@ -432,4 +507,5 @@ START_TEST(main) test_readTrustedPublisherDWORD(); test_getDefaultCryptProv(); test_AddRemoveProvider(); + test_SIPLoad(); }

1 0

Hans Leidekker : dnsapi: Use the proper type for the return value in dns_do_query_netbios().
by Alexandre Julliard 14 Sep '06

14 Sep '06

Module: wine Branch: master Commit: a9a04fb386b0c8e074be1a60780e5b1ee9e2daf3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a9a04fb386b0c8e074be1a6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Sep 13 14:36:49 2006 +0200 dnsapi: Use the proper type for the return value in dns_do_query_netbios(). Remove some unnecessary casts. --- dlls/dnsapi/query.c | 11 ++++++----- dlls/dnsapi/record.c | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 975e77d..836255c 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -485,6 +485,7 @@ static DNS_STATUS dns_do_query_netbios( FIND_NAME_HEADER *header; DNS_RECORDA *record = NULL; unsigned int i, len; + DNS_STATUS status = ERROR_INVALID_NAME; len = strlen( name ); if (len >= NCBNAMSZ) return DNS_ERROR_RCODE_NAME_ERROR; @@ -509,7 +510,7 @@ static DNS_STATUS dns_do_query_netbios( record = dns_zero_alloc( sizeof(DNS_RECORDA) ); if (!record) { - ret = ERROR_NOT_ENOUGH_MEMORY; + status = ERROR_NOT_ENOUGH_MEMORY; goto exit; } else @@ -517,7 +518,7 @@ static DNS_STATUS dns_do_query_netbios( record->pName = dns_strdup_u( name ); if (!record->pName) { - ret = ERROR_NOT_ENOUGH_MEMORY; + status = ERROR_NOT_ENOUGH_MEMORY; goto exit; } @@ -536,12 +537,12 @@ static DNS_STATUS dns_do_query_netbios( exit: DNS_RRSET_TERMINATE( rrset ); - if (ret != ERROR_SUCCESS) + if (status != ERROR_SUCCESS) DnsRecordListFree( rrset.pFirstRR, DnsFreeRecordList ); else *recp = (DNS_RECORDA *)rrset.pFirstRR; - return ret; + return status; } /* The resolver lock must be held and res_init() must have been @@ -816,7 +817,7 @@ #ifdef HAVE_RESOLV LOCK_RESOLVER(); res_init(); - ret = dns_get_serverlist( (IP4_ARRAY *)buffer, len ); + ret = dns_get_serverlist( buffer, len ); UNLOCK_RESOLVER(); break; diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 0c34697..eaba46a 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -115,9 +115,9 @@ #undef X static int dns_strcmpX( LPCVOID str1, LPCVOID str2, BOOL wide ) { if (wide) - return lstrcmpiW( (LPCWSTR)str1, (LPCWSTR)str2 ); + return lstrcmpiW( str1, str2 ); else - return lstrcmpiA( (LPCSTR)str1, (LPCSTR)str2 ); + return lstrcmpiA( str1, str2 ); } /******************************************************************************

1 0

Hans Leidekker : dnsapi: Implement and test DnsRecordSetDetach.
by Alexandre Julliard 14 Sep '06

14 Sep '06

Module: wine Branch: master Commit: 0c0d1903761c37b9da0bebf5b8712a08e86fa9cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c0d1903761c37b9da0bebf… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Sep 13 14:36:33 2006 +0200 dnsapi: Implement and test DnsRecordSetDetach. --- dlls/dnsapi/dnsapi.spec | 2 +- dlls/dnsapi/record.c | 22 ++++++++++++++++++++++ dlls/dnsapi/tests/record.c | 25 +++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 2d00d38..977bde4 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -88,7 +88,7 @@ @ stdcall DnsRecordListFree(ptr long) @ stdcall DnsRecordSetCompare(ptr ptr ptr ptr) @ stdcall DnsRecordSetCopyEx(ptr long long) -@ stub DnsRecordSetDetach +@ stdcall DnsRecordSetDetach(ptr) @ stub DnsRecordStringForType @ stub DnsRecordStringForWritableType @ stub DnsRecordTypeForName diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index ee8062b..0c34697 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -748,3 +748,25 @@ PDNS_RECORD WINAPI DnsRecordSetCopyEx( P DNS_RRSET_TERMINATE( dst_set ); return dst_set.pFirstRR; } + +/****************************************************************************** + * DnsRecordSetDetach [DNSAPI.@] + * + */ +PDNS_RECORD WINAPI DnsRecordSetDetach( PDNS_RECORD set ) +{ + DNS_RECORD *r, *s; + + TRACE( "(%p)\n", set ); + + for (r = set; (set = r); r = set->pNext) + { + if (r->pNext && !r->pNext->pNext) + { + s = r->pNext; + r->pNext = NULL; + return s; + } + } + return NULL; +} diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index b0e34c7..7da1c29 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -32,6 +32,7 @@ static HMODULE dnsapi; static BOOL (WINAPI *pDnsRecordCompare)(PDNS_RECORD,PDNS_RECORD); static BOOL (WINAPI *pDnsRecordSetCompare)(PDNS_RECORD,PDNS_RECORD,PDNS_RECORD*,PDNS_RECORD*); +static DNS_RECORD* (WINAPI *pDnsRecordSetDetach)(PDNS_RECORD); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( dnsapi, #func ); \ if (!p##func) return FALSE; @@ -40,6 +41,7 @@ static BOOL init_function_ptrs( void ) { GETFUNCPTR( DnsRecordCompare ) GETFUNCPTR( DnsRecordSetCompare ) + GETFUNCPTR( DnsRecordSetDetach ) return TRUE; } @@ -48,6 +50,7 @@ static char name2[] = "LOCALHOST"; static DNS_RECORDA r1 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; static DNS_RECORDA r2 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; +static DNS_RECORDA r3 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; static void test_DnsRecordCompare( void ) { @@ -123,6 +126,27 @@ static void test_DnsRecordSetCompare( vo ok( pDnsRecordSetCompare( rr1.pFirstRR, rr2.pFirstRR, &diff1, &diff2 ) == FALSE, "succeeded unexpectedly\n" ); } +static void test_DnsRecordSetDetach( void ) +{ + DNS_RRSET rr; + DNS_RECORDA *r, *s; + + DNS_RRSET_INIT( rr ); + DNS_RRSET_ADD( rr, &r1 ); + DNS_RRSET_ADD( rr, &r2 ); + DNS_RRSET_ADD( rr, &r3 ); + DNS_RRSET_TERMINATE( rr ); + + ok( !pDnsRecordSetDetach( NULL ), "succeeded unexpectedly\n" ); + + r = rr.pFirstRR; + s = pDnsRecordSetDetach( r ); + + ok( s == &r3, "failed unexpectedly: got %p, expected %p\n", s, &r3 ); + ok( r == &r1, "failed unexpectedly: got %p, expected %p\n", r, &r1 ); + ok( !r2.pNext, "failed unexpectedly\n" ); +} + START_TEST(record) { dnsapi = LoadLibraryA( "dnsapi.dll" ); @@ -136,6 +160,7 @@ START_TEST(record) test_DnsRecordCompare(); test_DnsRecordSetCompare(); + test_DnsRecordSetDetach(); FreeLibrary( dnsapi ); }

1 0

Mikołaj Zalewski : comctl32: listview: Don' t edit labels after the first click of a double click.
by Alexandre Julliard 14 Sep '06

14 Sep '06

Module: wine Branch: master Commit: 9de2c506dd6b0d15a5e02e1e039b4d746f807135 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9de2c506dd6b0d15a5e02e1… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 13 13:08:06 2006 +0200 comctl32: listview: Don't edit labels after the first click of a double click. --- dlls/comctl32/listview.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index df306a8..d99b1e2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -240,6 +240,12 @@ typedef struct tagITERATOR INT index; } ITERATOR; +typedef struct tagDELAYED_ITEM_EDIT +{ + BOOL fEnabled; + INT iItem; +} DELAYED_ITEM_EDIT; + typedef struct tagLISTVIEW_INFO { HWND hwndSelf; @@ -310,6 +316,7 @@ typedef struct tagLISTVIEW_INFO BOOL bIsDrawing; INT nMeasureItemHeight; INT xTrackLine; /* The x coefficient of the track line or -1 if none */ + DELAYED_ITEM_EDIT itemEdit; /* Pointer to this structure will be the timer ID */ } LISTVIEW_INFO; /* @@ -7615,7 +7622,32 @@ static BOOL LISTVIEW_DrawTrackLine(LISTV return TRUE; } - +/*** + * DESCRIPTION: + * Called when an edit control should be displayed. This function is called after + * we are sure that there was a single click - not a double click (this is a TIMERPROC). + * + * PARAMETER(S): + * [I] hwnd : Handle to the listview + * [I] uMsg : WM_TIMER (ignored) + * [I] idEvent : The timer ID interpreted as a pointer to a DELAYED_EDIT_ITEM struct + * [I] dwTimer : The elapsed time (ignored) + * + * RETURN: + * None. + */ +static CALLBACK VOID LISTVIEW_DelayedEditItem(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + DELAYED_ITEM_EDIT *editItem = (DELAYED_ITEM_EDIT *)idEvent; + LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); + + KillTimer(hwnd, idEvent); + editItem->fEnabled = FALSE; + /* check if the item is still selected */ + if (infoPtr->bFocus && LISTVIEW_GetItemState(infoPtr, editItem->iItem, LVIS_SELECTED)) + LISTVIEW_EditLabelT(infoPtr, editItem->iItem, TRUE); +} + /*** * DESCRIPTION: * Creates the listview control. @@ -7668,6 +7700,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd infoPtr->dwHoverTime = -1; /* default system hover time */ infoPtr->nMeasureItemHeight = 0; infoPtr->xTrackLine = -1; /* no track line */ + infoPtr->itemEdit.fEnabled = FALSE; /* get default font (icon title) */ SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); @@ -8220,6 +8253,13 @@ static LRESULT LISTVIEW_LButtonDblClk(LI LVHITTESTINFO htInfo; TRACE("(key=%hu, X=%hu, Y=%hu)\n", wKey, x, y); + + /* Cancel the item edition if any */ + if (infoPtr->itemEdit.fEnabled) + { + KillTimer(infoPtr->hwndSelf, (UINT_PTR)&infoPtr->itemEdit); + infoPtr->itemEdit.fEnabled = FALSE; + } /* send NM_RELEASEDCAPTURE notification */ if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; @@ -8392,7 +8432,17 @@ static LRESULT LISTVIEW_LButtonUp(LISTVI /* if we clicked on a selected item, edit the label */ if(lvHitTestInfo.iItem == infoPtr->nEditLabelItem && (lvHitTestInfo.flags & LVHT_ONITEMLABEL)) - LISTVIEW_EditLabelT(infoPtr, lvHitTestInfo.iItem, TRUE); + { + /* we want to make sure the user doesn't want to do a double click. So we will + * delay the edit. WM_LBUTTONDBLCLICK will cancel the timer + */ + infoPtr->itemEdit.fEnabled = TRUE; + infoPtr->itemEdit.iItem = lvHitTestInfo.iItem; + SetTimer(infoPtr->hwndSelf, + (UINT_PTR)&infoPtr->itemEdit, + GetDoubleClickTime(), + LISTVIEW_DelayedEditItem); + } return 0; }

1 0

Nicolas Delcros : include/windows.h: Added _INC_WINDOWS declaration.
by Alexandre Julliard 14 Sep '06

14 Sep '06

Module: wine Branch: master Commit: e21f6df630da6cac84fb4e2f429c526b4894e3aa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e21f6df630da6cac84fb4e2… Author: Nicolas Delcros <nicolas(a)dyalog.com> Date: Tue Sep 12 11:50:13 2006 +0100 include/windows.h: Added _INC_WINDOWS declaration. --- include/windows.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/windows.h b/include/windows.h index b93b303..af83f83 100644 --- a/include/windows.h +++ b/include/windows.h @@ -28,6 +28,9 @@ #if defined(_MSC_VER) && (_MSC_VER >= 80 # pragma warning(disable:4116) #endif +#ifndef _INC_WINDOWS +#define _INC_WINDOWS + #if defined(RC_INVOKED) && !defined(NOWINRES) #include <winresrc.h> #else /* RC_INVOKED && !NOWINRES */ @@ -100,4 +103,5 @@ #include <imm.h> #endif /* !NOIMM */ #endif /* RC_INVOKED && !NOWINRES */ +#endif /* _INC_WINDOWS */ #endif /* __WINE_WINDOWS_H */

1 0

Nicolas Delcros : include/commctrl.h: TV_DISPINFO constants definition.
by Alexandre Julliard 14 Sep '06

14 Sep '06

Module: wine Branch: master Commit: 523cf3d4641b6e8058a8e9ac1a4f2542397c6218 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=523cf3d4641b6e8058a8e9a… Author: Nicolas Delcros <nicolas(a)dyalog.com> Date: Wed Sep 13 17:51:08 2006 +0100 include/commctrl.h: TV_DISPINFO constants definition. --- include/commctrl.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 86d7bfd..87712ae 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2572,6 +2572,8 @@ typedef struct tagTVDISPINFOW { #define NMTVDISPINFO WINELIB_NAME_AW(NMTVDISPINFO) #define LPNMTVDISPINFO WINELIB_NAME_AW(LPNMTVDISPINFO) +#define TV_DISPINFOA NMTVDISPINFOA +#define TV_DISPINFOW NMTVDISPINFOW #define TV_DISPINFO NMTVDISPINFO typedef INT (CALLBACK *PFNTVCOMPARE)(LPARAM, LPARAM, LPARAM);

1 0

Mikołaj Zalewski : comctl32: listview: Don' t edit labels on click if the view was not focused.
by Alexandre Julliard 14 Sep '06

14 Sep '06

Module: wine Branch: master Commit: 88b0e04de75e66a9aa923452bb5b2553dbb5752c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88b0e04de75e66a9aa92345… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Sep 13 13:06:52 2006 +0200 comctl32: listview: Don't edit labels on click if the view was not focused. --- dlls/comctl32/listview.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 239a4cd..df306a8 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8253,6 +8253,7 @@ static LRESULT LISTVIEW_LButtonDown(LIST { LVHITTESTINFO lvHitTestInfo; static BOOL bGroupSelect = TRUE; + BOOL bReceivedFocus = FALSE; POINT pt = { x, y }; INT nItem; @@ -8261,7 +8262,11 @@ static LRESULT LISTVIEW_LButtonDown(LIST /* send NM_RELEASEDCAPTURE notification */ if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; - if (!infoPtr->bFocus) SetFocus(infoPtr->hwndSelf); + if (!infoPtr->bFocus) + { + bReceivedFocus = TRUE; + SetFocus(infoPtr->hwndSelf); + } /* set left button down flag and record the click position */ infoPtr->bLButtonDown = TRUE; @@ -8348,6 +8353,9 @@ static LRESULT LISTVIEW_LButtonDown(LIST LISTVIEW_DeselectAll(infoPtr); ReleaseCapture(); } + + if (bReceivedFocus) + infoPtr->nEditLabelItem = -1; return 0; }

1 0

Alexandre Julliard : makefiles: Remove the dependencies comment in files that don't need it.
by Alexandre Julliard 14 Sep '06

14 Sep '06

Module: wine Branch: master Commit: 84cb26e48a26326487418f441268d885c7518f8d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=84cb26e48a26326487418f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 14 09:38:39 2006 +0200 makefiles: Remove the dependencies comment in files that don't need it. --- Makefile.in | 2 -- dlls/Makefile.in | 2 -- dlls/make_dlls | 2 -- documentation/Makefile.in | 2 -- fonts/Makefile.in | 2 -- libs/Makefile.in | 2 -- programs/Makefile.in | 2 -- programs/make_progs | 2 -- 8 files changed, 0 insertions(+), 16 deletions(-) diff --git a/Makefile.in b/Makefile.in index df2acbb..72ee32e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -133,5 +133,3 @@ distclean: clean $(RM) `find . $ -name Makefile -o -size 0 $ -print` .PHONY: manpages htmlpages sgmlpages distclean - -### Dependencies: diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 66279d5..5c7951d 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -1006,5 +1006,3 @@ uninstall:: clean:: $(RM) $(IMPORT_SYMLINKS) $(WIN16_FILES) - -### Dependencies: diff --git a/dlls/make_dlls b/dlls/make_dlls index 27828e7..f85fd89 100755 --- a/dlls/make_dlls +++ b/dlls/make_dlls @@ -344,8 +344,6 @@ uninstall:: clean:: \$(RM) \$(IMPORT_SYMLINKS) \$(WIN16_FILES) - -### Dependencies: EOF close NEWMAKE; diff --git a/documentation/Makefile.in b/documentation/Makefile.in index 18cf1de..9e2c773 100644 --- a/documentation/Makefile.in +++ b/documentation/Makefile.in @@ -24,5 +24,3 @@ install:: manpages $(DESTDIR)$(mandir)/m clean:: $(RM) -r html api-guide man$(api_manext) - -### Dependencies: diff --git a/fonts/Makefile.in b/fonts/Makefile.in index d3a74fa..2a69d6a 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -352,5 +352,3 @@ uninstall:: clean:: $(RM) *.fon *.fnt *.ttf - -### Dependencies: diff --git a/libs/Makefile.in b/libs/Makefile.in index 3b17bd1..05b1904 100644 --- a/libs/Makefile.in +++ b/libs/Makefile.in @@ -22,5 +22,3 @@ install-dev:: $(INSTALLSUBDIRS:%=%/__ins # Directory dependencies wine wine/__install__ wine/__install-lib__: port - -### Dependencies: diff --git a/programs/Makefile.in b/programs/Makefile.in index 0e0c67e..fb22ad4 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -137,5 +137,3 @@ clean:: # Rules for testing check test:: $(SUBDIRS:%=%/__test__) - -### Dependencies: diff --git a/programs/make_progs b/programs/make_progs index e8cda3b..860c636 100755 --- a/programs/make_progs +++ b/programs/make_progs @@ -196,8 +196,6 @@ clean:: # Rules for testing check test:: \$(SUBDIRS:%=%/__test__) - -### Dependencies: EOF close NEWMAKE;

1 0

Alexandre Julliard : makefiles: Attempt to automatically run make depend when reading an updated makefile.
by Alexandre Julliard 14 Sep '06

14 Sep '06

Module: wine Branch: master Commit: 8598a4c6007e4197b5a382f52438731904244794 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8598a4c6007e4197b5a382f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 14 09:40:00 2006 +0200 makefiles: Attempt to automatically run make depend when reading an updated makefile. --- Make.rules.in | 8 +------- Makefile.in | 16 ++++++++++++++-- configure | 5 +++++ configure.ac | 5 +++++ tools/Makefile.in | 2 ++ 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 894c377..9e7ec07 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -179,7 +179,7 @@ # Implicit rules # 'all' target first in case the enclosing Makefile didn't define any target -all: Makefile +all: filter: dummy @$(TOPSRCDIR)/tools/winapi/make_filter --make $(MAKE) all @@ -193,12 +193,6 @@ # Rules for resources $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES) $(IDL_TLB_SRCS:.idl=.tlb) -# Rules for makefile - -Makefile: Makefile.in $(TOPSRCDIR)/configure - @echo Makefile is older than $?, please rerun $(TOPSRCDIR)/configure - @exit 1 - # Rule for linting $(MODULE).ln : $(LINTS) diff --git a/Makefile.in b/Makefile.in index 72ee32e..df64bf0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -103,10 +103,22 @@ fonts/__install__ loader/__install__ ser programs/__install__: libs tools include dlls/__install-lib__ tools/__install-lib__ tools/__install-dev__: tools -depend $(SUBDIRS:%=%/__depend__): $(MAKEDEP) +RECURSE_TARGETS = \ + $(SUBDIRS) \ + $(SUBDIRS:%=%/__clean__) \ + $(SUBDIRS:%=%/__depend__) \ + $(SUBDIRS:%=%/__install-dev__) \ + $(SUBDIRS:%=%/__install-lib__) \ + $(SUBDIRS:%=%/__install__) \ + $(SUBDIRS:%=%/__uninstall__) \ + $(TESTSUBDIRS:%=%/__crosstest__) \ + $(TESTSUBDIRS:%=%/__test__) \ + $(TESTSUBDIRS:%=%/__testclean__) + +depend $(RECURSE_TARGETS): $(MAKEDEP) $(MAKEDEP): - @cd $(TOOLSDIR)/tools && $(MAKE) makedep + @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(EXEEXT) # Test rules diff --git a/configure b/configure index e153f2f..3838f92 100755 --- a/configure +++ b/configure @@ -23765,6 +23765,11 @@ esac DEPENDENCIES="### Dependencies: +.INIT: Makefile +.BEGIN: Makefile +Makefile: dummy + -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) + \$(ALL_OBJS): \$(IDL_SRCS:.idl=.h) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)" diff --git a/configure.ac b/configure.ac index 229cecd..0c1322a 100644 --- a/configure.ac +++ b/configure.ac @@ -1459,6 +1459,11 @@ dnl **** Generate output files **** AC_SUBST(DEPENDENCIES,"### Dependencies: +.INIT: Makefile +.BEGIN: Makefile +Makefile: dummy + -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) + \$(ALL_OBJS): \$(IDL_SRCS:.idl=.h) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)") diff --git a/tools/Makefile.in b/tools/Makefile.in index 111d605..14ded8a 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -95,3 +95,5 @@ uninstall:: -$(UPDATE_DESKTOP_DATABASE) @DEPENDENCIES@ # everything below this line is overwritten by make depend + +Makefile: makedep$(EXEEXT)

1 0

Alexandre Julliard : makefiles: Automatically rebuild makefiles when their sources and/ or configure changed.
by Alexandre Julliard 14 Sep '06

14 Sep '06

Module: wine Branch: master Commit: 5ea4e5ba4608d95d3de5b0ccf0fb82be3c1e1032 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ea4e5ba4608d95d3de5b0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 14 09:41:21 2006 +0200 makefiles: Automatically rebuild makefiles when their sources and/or configure changed. --- Makefile.in | 637 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 43 +++ 2 files changed, 675 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5ea4e5ba4608d95d3de…

1 0