May 2011 - Wine-commits - list.winehq.org

Marcus Meissner : netapi32: Mark internal symbols with hidden visibility.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: d6c0dec1588dd327030c1b6e8527f4234ff2db48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c0dec1588dd327030c1b6e8… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:39:17 2011 +0200 netapi32: Mark internal symbols with hidden visibility. --- dlls/netapi32/nbcmdqueue.h | 12 ++++++------ dlls/netapi32/nbnamecache.h | 8 ++++---- dlls/netapi32/netbios.h | 18 +++++++++--------- dlls/netapi32/wksta.c | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/netapi32/nbcmdqueue.h b/dlls/netapi32/nbcmdqueue.h index 9eb7075..57e6411 100644 --- a/dlls/netapi32/nbcmdqueue.h +++ b/dlls/netapi32/nbcmdqueue.h @@ -30,12 +30,12 @@ struct NBCmdQueue; /* Allocates a new command queue from heap. */ -struct NBCmdQueue *NBCmdQueueCreate(HANDLE heap); +struct NBCmdQueue *NBCmdQueueCreate(HANDLE heap) DECLSPEC_HIDDEN; /* Adds ncb to queue. Assumes queue is not NULL, and ncb is not already in the * queue. If ncb is already in the queue, returns NRC_TOOMANY. */ -UCHAR NBCmdQueueAdd(struct NBCmdQueue *queue, PNCB ncb); +UCHAR NBCmdQueueAdd(struct NBCmdQueue *queue, PNCB ncb) DECLSPEC_HIDDEN; /* Cancels the given ncb. Blocks until the command completes. Implicitly * removes ncb from the queue. Assumes queue and ncb are not NULL, and that @@ -44,23 +44,23 @@ UCHAR NBCmdQueueAdd(struct NBCmdQueue *queue, PNCB ncb); * completed before it could be cancelled, and various other return values for * different failures. */ -UCHAR NBCmdQueueCancel(struct NBCmdQueue *queue, PNCB ncb); +UCHAR NBCmdQueueCancel(struct NBCmdQueue *queue, PNCB ncb) DECLSPEC_HIDDEN; /* Sets the return code of the given ncb, and implicitly removes the command * from the queue. Assumes queue and ncb are not NULL, and that ncb has been * added to queue previously. * Returns NRC_GOODRET on success. */ -UCHAR NBCmdQueueComplete(struct NBCmdQueue *queue, PNCB ncb, UCHAR retcode); +UCHAR NBCmdQueueComplete(struct NBCmdQueue *queue, PNCB ncb, UCHAR retcode) DECLSPEC_HIDDEN; /* Cancels all pending commands in the queue (useful for a RESET or a shutdown). * Returns when all commands have been completed. */ -UCHAR NBCmdQueueCancelAll(struct NBCmdQueue *queue); +UCHAR NBCmdQueueCancelAll(struct NBCmdQueue *queue) DECLSPEC_HIDDEN; /* Frees all memory associated with the queue. Blocks until all commands * pending in the queue have been completed. */ -void NBCmdQueueDestroy(struct NBCmdQueue *queue); +void NBCmdQueueDestroy(struct NBCmdQueue *queue) DECLSPEC_HIDDEN; #endif /* __NBCMDQUEUE_H__ */ diff --git a/dlls/netapi32/nbnamecache.h b/dlls/netapi32/nbnamecache.h index ffefbc5..233f800 100644 --- a/dlls/netapi32/nbnamecache.h +++ b/dlls/netapi32/nbnamecache.h @@ -51,7 +51,7 @@ typedef struct _NBNameCacheEntry /* Allocates a new name cache from heap, and sets the expire time on new * entries to entryExpireTimeMS after a cache entry is added. */ -struct NBNameCache *NBNameCacheCreate(HANDLE heap, DWORD entryExpireTimeMS); +struct NBNameCache *NBNameCacheCreate(HANDLE heap, DWORD entryExpireTimeMS) DECLSPEC_HIDDEN; /* Adds an entry to the cache. The entry is assumed to have been allocated * from the same heap as the name cache; the name cache will own the entry @@ -60,14 +60,14 @@ struct NBNameCache *NBNameCacheCreate(HANDLE heap, DWORD entryExpireTimeMS); * same name was in the cache, the entry is replaced. Returns TRUE on success * or FALSE on failure. */ -BOOL NBNameCacheAddEntry(struct NBNameCache *cache, NBNameCacheEntry *entry); +BOOL NBNameCacheAddEntry(struct NBNameCache *cache, NBNameCacheEntry *entry) DECLSPEC_HIDDEN; /* Finds the entry with name name in the cache and returns a pointer to it, or * NULL if it isn't found. */ const NBNameCacheEntry *NBNameCacheFindEntry(struct NBNameCache *cache, - const UCHAR name[NCBNAMSZ]); + const UCHAR name[NCBNAMSZ]) DECLSPEC_HIDDEN; -void NBNameCacheDestroy(struct NBNameCache *cache); +void NBNameCacheDestroy(struct NBNameCache *cache) DECLSPEC_HIDDEN; #endif /* ndef __WINE_NBNAMECACHE_H */ diff --git a/dlls/netapi32/netbios.h b/dlls/netapi32/netbios.h index 1279a5a..4cc9b2e 100644 --- a/dlls/netapi32/netbios.h +++ b/dlls/netapi32/netbios.h @@ -32,8 +32,8 @@ * Public functions */ -void NetBIOSInit(void); -void NetBIOSShutdown(void); +void NetBIOSInit(void) DECLSPEC_HIDDEN; +void NetBIOSShutdown(void) DECLSPEC_HIDDEN; struct _NetBIOSTransport; @@ -41,7 +41,7 @@ struct _NetBIOSTransport; * a unique id (the transport_id of ACTION_HEADER, for example) and an * implementation. Returns TRUE on success, and FALSE on failure. */ -BOOL NetBIOSRegisterTransport(ULONG id, struct _NetBIOSTransport *transport); +BOOL NetBIOSRegisterTransport(ULONG id, struct _NetBIOSTransport *transport) DECLSPEC_HIDDEN; /* Registers an adapter with the given transport and ifIndex with NetBIOS. * ifIndex is an interface index usable by the IpHlpApi. ifIndex is not @@ -51,7 +51,7 @@ BOOL NetBIOSRegisterTransport(ULONG id, struct _NetBIOSTransport *transport); * FIXME: need functions for retrieving the name and hardware index, rather * than assuming a correlation with IpHlpApi. */ -BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *adapter); +BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *adapter) DECLSPEC_HIDDEN; /* During enumeration, all adapters from your transport are disabled * internally. If an adapter is still valid, reenable it with this function. @@ -59,13 +59,13 @@ BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *adapter); * function (see below) called on them, and will be removed from the table. * (This is to deal with lack of plug-and-play--sorry.) */ -void NetBIOSEnableAdapter(UCHAR lana); +void NetBIOSEnableAdapter(UCHAR lana) DECLSPEC_HIDDEN; /* Gets a quick count of the number of NetBIOS adapters. Not guaranteed not * to change from one call to the next, depending on what's been enumerated * lately. See also NetBIOSEnumAdapters. */ -UCHAR NetBIOSNumAdapters(void); +UCHAR NetBIOSNumAdapters(void) DECLSPEC_HIDDEN; typedef struct _NetBIOSAdapterImpl { UCHAR lana; @@ -84,7 +84,7 @@ typedef BOOL (*NetBIOSEnumAdaptersCallback)(UCHAR totalLANAs, UCHAR lanaIndex, * Your callback should return FALSE if it no longer wishes to be called. */ void NetBIOSEnumAdapters(ULONG transport, NetBIOSEnumAdaptersCallback cb, - void *closure); + void *closure) DECLSPEC_HIDDEN; /* Hangs up the session identified in the NCB; the NCB need not be a NCBHANGUP. * Will result in the transport's hangup function being called, so release any @@ -92,7 +92,7 @@ void NetBIOSEnumAdapters(ULONG transport, NetBIOSEnumAdaptersCallback cb, * This function is intended for use by a transport, if the session is closed * by some error in the transport layer. */ -void NetBIOSHangupSession(const NCB *ncb); +void NetBIOSHangupSession(const NCB *ncb) DECLSPEC_HIDDEN; /** * Functions a transport implementation must implement @@ -178,6 +178,6 @@ typedef struct _NetBIOSTransport /* Not defined by MS, so make my own private define: */ #define TRANSPORT_NBT "MNBT" -void NetBTInit(void); +void NetBTInit(void) DECLSPEC_HIDDEN; #endif /* ndef __WINE_NETBIOS_H__ */ diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 122a685..ad8d87e 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); * * Checks whether the server name indicates local machine. */ -BOOL NETAPI_IsLocalComputer(LMCSTR ServerName) +DECLSPEC_HIDDEN BOOL NETAPI_IsLocalComputer(LMCSTR ServerName) { if (!ServerName) {

1 0

Marcus Meissner : mstask: Mark internal symbol with hidden visibility.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: e7fc8583283574f5f7522a45273105ba11e0a21e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fc8583283574f5f7522a452… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:34:18 2011 +0200 mstask: Mark internal symbol with hidden visibility. --- dlls/mstask/mstask_private.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 28c579d..17c20fe 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -29,13 +29,13 @@ #include "ole2.h" #include "mstask.h" -extern LONG dll_ref; +extern LONG dll_ref DECLSPEC_HIDDEN; typedef struct ClassFactoryImpl ClassFactoryImpl; -extern ClassFactoryImpl MSTASK_ClassFactory; +extern ClassFactoryImpl MSTASK_ClassFactory DECLSPEC_HIDDEN; -extern HRESULT TaskTriggerConstructor(LPVOID *ppObj); -extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj); -extern HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj); +extern HRESULT TaskTriggerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) DECLSPEC_HIDDEN; #endif /* __MSTASK_PRIVATE_H__ */

1 0

Marcus Meissner : msimtf: Mark internal symbol as hidden.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 5fe6c550d99fbf0c7415b84c6196cfd7d34df04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe6c550d99fbf0c7415b84c6… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:33:18 2011 +0200 msimtf: Mark internal symbol as hidden. --- dlls/msimtf/activeimmapp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msimtf/activeimmapp.c b/dlls/msimtf/activeimmapp.c index 6b8b014..a9c259a 100644 --- a/dlls/msimtf/activeimmapp.c +++ b/dlls/msimtf/activeimmapp.c @@ -812,7 +812,7 @@ static const IActiveIMMAppVtbl ActiveIMMAppVtbl = ActiveIMMApp_EnumInputContext }; -HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ActiveIMMApp *This; if (pUnkOuter)

1 0

Marcus Meissner : msctf: Mark internal symbols with hidden visibility.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 12ea910ece2e551406f9a275705ef7c7bc97dfe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12ea910ece2e551406f9a2757… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:32:21 2011 +0200 msctf: Mark internal symbols with hidden visibility. --- dlls/msctf/msctf_internal.h | 58 +++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 9aaaad0..5dd823f 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -28,42 +28,42 @@ #define COOKIE_MAGIC_EDITCOOKIE 0x0050 #define COOKIE_MAGIC_COMPARTMENTSINK 0x0060 -extern DWORD tlsIndex; -extern TfClientId processId; -extern ITfCompartmentMgr *globalCompartmentMgr; +extern DWORD tlsIndex DECLSPEC_HIDDEN; +extern TfClientId processId DECLSPEC_HIDDEN; +extern ITfCompartmentMgr *globalCompartmentMgr DECLSPEC_HIDDEN; -extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); -extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut); -extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore); -extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); -extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); -extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut); -extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut); -extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This); -extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); -extern HRESULT DisplayAttributeMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); +extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut) DECLSPEC_HIDDEN; +extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore) DECLSPEC_HIDDEN; +extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) DECLSPEC_HIDDEN; +extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This) DECLSPEC_HIDDEN; +extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT DisplayAttributeMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; -extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager); -extern HRESULT Context_Uninitialize(ITfContext *cxt); -extern void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *tm, ITfDocumentMgr *mgr); -extern HRESULT TF_SELECTION_to_TS_SELECTION_ACP(const TF_SELECTION *tf, TS_SELECTION_ACP *tsAcp); +extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager) DECLSPEC_HIDDEN; +extern HRESULT Context_Uninitialize(ITfContext *cxt) DECLSPEC_HIDDEN; +extern void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *tm, ITfDocumentMgr *mgr) DECLSPEC_HIDDEN; +extern HRESULT TF_SELECTION_to_TS_SELECTION_ACP(const TF_SELECTION *tf, TS_SELECTION_ACP *tsAcp) DECLSPEC_HIDDEN; /* cookie function */ -extern DWORD generate_Cookie(DWORD magic, LPVOID data); -extern DWORD get_Cookie_magic(DWORD id); -extern LPVOID get_Cookie_data(DWORD id); -extern LPVOID remove_Cookie(DWORD id); -extern DWORD enumerate_Cookie(DWORD magic, DWORD *index); +extern DWORD generate_Cookie(DWORD magic, LPVOID data) DECLSPEC_HIDDEN; +extern DWORD get_Cookie_magic(DWORD id) DECLSPEC_HIDDEN; +extern LPVOID get_Cookie_data(DWORD id) DECLSPEC_HIDDEN; +extern LPVOID remove_Cookie(DWORD id) DECLSPEC_HIDDEN; +extern DWORD enumerate_Cookie(DWORD magic, DWORD *index) DECLSPEC_HIDDEN; /* activated text services functions */ -extern HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp); -extern BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *lp); -extern HRESULT activate_textservices(ITfThreadMgr *tm); -extern HRESULT deactivate_textservices(void); +extern HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) DECLSPEC_HIDDEN; +extern BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *lp) DECLSPEC_HIDDEN; +extern HRESULT activate_textservices(ITfThreadMgr *tm) DECLSPEC_HIDDEN; +extern HRESULT deactivate_textservices(void) DECLSPEC_HIDDEN; -extern CLSID get_textservice_clsid(TfClientId tid); -extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sink); -extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink); +extern CLSID get_textservice_clsid(TfClientId tid) DECLSPEC_HIDDEN; +extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sink) DECLSPEC_HIDDEN; +extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink) DECLSPEC_HIDDEN; extern const WCHAR szwSystemTIPKey[]; extern const WCHAR szwSystemCTFKey[];

1 0

Alexandre Julliard : crypt32/tests: Get rid of the iTunes chain that no longer validates.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 5d19caf9e5405ff6f80c7ff7d915b6cb2383ff91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d19caf9e5405ff6f80c7ff7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 22 10:52:12 2011 +0200 crypt32/tests: Get rid of the iTunes chain that no longer validates. --- dlls/crypt32/tests/chain.c | 201 -------------------------------------------- 1 files changed, 0 insertions(+), 201 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d19caf9e5405ff6f80c7…

1 0

Alexandre Julliard : makefiles: Avoid creating an intermediate rc file for test binaries.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 305aca28b4a6dd800529d68001f21aad42df7f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305aca28b4a6dd800529d6800… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 22 12:50:10 2011 +0200 makefiles: Avoid creating an intermediate rc file for test binaries. --- .gitignore | 1 - aclocal.m4 | 5 ++--- configure | 5 ++--- programs/winetest/Makefile.in | 5 ++--- tools/make_makefiles | 1 - 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index db020cc..ff9dd9c 100644 --- a/.gitignore +++ b/.gitignore @@ -265,7 +265,6 @@ programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c programs/winetest/*_test.exe -programs/winetest/*_test.rc programs/winetest/build.nfo programs/winetest/build.rc programs/winhlp32/macro.lex.yy.c diff --git a/aclocal.m4 b/aclocal.m4 index 6b7788d..bb8a248 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -395,9 +395,8 @@ wine_fn_config_test () wine_fn_append_rule ALL_WINETEST_DEPENDS \ "$ac_name.exe: \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT cp \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT \$[@] && \$(STRIP) \$[@] -$ac_name.rc: - echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" >\$[@] || (\$(RM) \$[@] && false) -$ac_name.res: $ac_name.rc $ac_name.exe" +$ac_name.res: $ac_name.exe + echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" | \$(LDPATH) \$(WRC) \$(RCFLAGS) -o \$[@]" wine_fn_all_dir_rules $ac_dir Maketest.rules AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ diff --git a/configure b/configure index 7bd9dc6..6de7b01 100755 --- a/configure +++ b/configure @@ -14861,9 +14861,8 @@ wine_fn_config_test () wine_fn_append_rule ALL_WINETEST_DEPENDS \ "$ac_name.exe: \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT cp \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT \$@ && \$(STRIP) \$@ -$ac_name.rc: - echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" >\$@ || (\$(RM) \$@ && false) -$ac_name.res: $ac_name.rc $ac_name.exe" +$ac_name.res: $ac_name.exe + echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" | \$(LDPATH) \$(WRC) \$(RCFLAGS) -o \$@" wine_fn_all_dir_rules $ac_dir Maketest.rules if test "x$enable_tests" = xno; then : diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 6d8f9b4..c9a2c71 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -15,13 +15,12 @@ RC_SRCS = \ SVG_SRCS = winetest.svg TESTBINS = @ALL_TEST_BINARIES@ -TESTRCS = build.rc $(TESTBINS:.exe=.rc) -EXTRA_OBJS = $(TESTRCS:.rc=.res) +EXTRA_OBJS = build.res $(TESTBINS:.exe=.res) @MAKE_PROG_RULES@ clean:: - $(RM) build.nfo winetest-dist.exe $(TESTBINS) $(TESTRCS) + $(RM) build.rc build.nfo winetest-dist.exe $(TESTBINS) build.rc: dummy build="BUILD_INFO STRINGRES build.nfo STRINGTABLE { 1 \"`GIT_DIR=$(top_srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1) diff --git a/tools/make_makefiles b/tools/make_makefiles index 2c68997..3d50dec 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -99,7 +99,6 @@ my @ignores = ( "include/stamp-h", "msg.pot", "programs/winetest/*_test.exe", - "programs/winetest/*_test.rc", "programs/winetest/build.nfo", "programs/winetest/build.rc", "rsrc.pot",

1 0

Alexandre Julliard : makefiles: Create the binary resources for winetest from the top-level makefile.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: e4eff85c8b6e38421165e91f180760b8dd0105b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4eff85c8b6e38421165e91f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 22 13:15:03 2011 +0200 makefiles: Create the binary resources for winetest from the top-level makefile. --- aclocal.m4 | 15 +++++++-------- configure | 17 +++++++---------- programs/winetest/Makefile.in | 2 -- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index bb8a248..b5c756d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -151,7 +151,6 @@ Makefile: Makefile.in Make.vars.in Make.rules config.status @./config.status Make.tmp Makefile" ALL_POT_FILES="" -AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) AC_SUBST(ALL_TEST_BINARIES,"") wine_fn_append_file () @@ -392,19 +391,19 @@ wine_fn_config_test () ac_dir=$[1] ac_name=$[2] wine_fn_append_file ALL_TEST_BINARIES $ac_name.exe - wine_fn_append_rule ALL_WINETEST_DEPENDS \ -"$ac_name.exe: \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT - cp \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT \$[@] && \$(STRIP) \$[@] -$ac_name.res: $ac_name.exe - echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" | \$(LDPATH) \$(WRC) \$(RCFLAGS) -o \$[@]" wine_fn_all_dir_rules $ac_dir Maketest.rules AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all programs/winetest: $ac_dir +"all $ac_dir/$ac_name.exe$DLLEXT: $ac_dir .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) -test: $ac_dir/__test__ +programs/winetest/$ac_name.exe: $ac_dir/$ac_name.exe$DLLEXT + cp $ac_dir/$ac_name.exe$DLLEXT \$[@] && \$(STRIP) \$[@] +programs/winetest/$ac_name.res: programs/winetest/$ac_name.exe + echo \"$ac_name.exe TESTRES \\\"programs/winetest/$ac_name.exe\\\"\" | \$(LDPATH) \$(WRC) \$(RCFLAGS) -o \$[@] +programs/winetest: programs/winetest/$ac_name.res +check test: $ac_dir/__test__ .PHONY: $ac_dir/__test__ $ac_dir/__test__: dummy @cd $ac_dir && \$(MAKE) test diff --git a/configure b/configure index 6de7b01..5e0f5d5 100755 --- a/configure +++ b/configure @@ -606,7 +606,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS LINGUAS ALL_TEST_BINARIES -ALL_WINETEST_DEPENDS LDAPLIBS LIBPOLL LIBDL @@ -14609,8 +14608,6 @@ Makefile: Makefile.in Make.vars.in Make.rules config.status @./config.status Make.tmp Makefile" ALL_POT_FILES="" -ALL_WINETEST_DEPENDS="# Test binaries" - ALL_TEST_BINARIES="" @@ -14858,22 +14855,22 @@ wine_fn_config_test () ac_dir=$1 ac_name=$2 wine_fn_append_file ALL_TEST_BINARIES $ac_name.exe - wine_fn_append_rule ALL_WINETEST_DEPENDS \ -"$ac_name.exe: \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT - cp \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT \$@ && \$(STRIP) \$@ -$ac_name.res: $ac_name.exe - echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" | \$(LDPATH) \$(WRC) \$(RCFLAGS) -o \$@" wine_fn_all_dir_rules $ac_dir Maketest.rules if test "x$enable_tests" = xno; then : else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all programs/winetest: $ac_dir +"all $ac_dir/$ac_name.exe$DLLEXT: $ac_dir .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) -test: $ac_dir/__test__ +programs/winetest/$ac_name.exe: $ac_dir/$ac_name.exe$DLLEXT + cp $ac_dir/$ac_name.exe$DLLEXT \$@ && \$(STRIP) \$@ +programs/winetest/$ac_name.res: programs/winetest/$ac_name.exe + echo \"$ac_name.exe TESTRES \\\"programs/winetest/$ac_name.exe\\\"\" | \$(LDPATH) \$(WRC) \$(RCFLAGS) -o \$@ +programs/winetest: programs/winetest/$ac_name.res +check test: $ac_dir/__test__ .PHONY: $ac_dir/__test__ $ac_dir/__test__: dummy @cd $ac_dir && \$(MAKE) test diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index c9a2c71..6efd895 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -39,5 +39,3 @@ dist: winetest-dist.exe$(DLLEXT) winetest-dist.exe$(DLLEXT): winetest.exe$(DLLEXT) cp winetest.exe$(DLLEXT) $@ -upx -9 -qqq $@ - -(a)ALL_WINETEST_DEPENDS@

1 0

Alexandre Julliard : winetest: Get rid of the dist rules.
by Alexandre Julliard 23 May '11

23 May '11

Module: wine Branch: master Commit: 60723297121090b97e350a7ebe9960ac926b4bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=60723297121090b97e350a7eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 22 13:22:31 2011 +0200 winetest: Get rid of the dist rules. --- programs/winetest/Makefile.in | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 6efd895..1416d7a 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -20,7 +20,7 @@ EXTRA_OBJS = build.res $(TESTBINS:.exe=.res) @MAKE_PROG_RULES@ clean:: - $(RM) build.rc build.nfo winetest-dist.exe $(TESTBINS) + $(RM) build.rc build.nfo $(TESTBINS) build.rc: dummy build="BUILD_INFO STRINGRES build.nfo STRINGTABLE { 1 \"`GIT_DIR=$(top_srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1) @@ -29,13 +29,3 @@ build.nfo: -$(CC) -v 2>$@ build.res: build.nfo - -# Rules for building distributable executable - -.PHONY: dist - -dist: winetest-dist.exe$(DLLEXT) - -winetest-dist.exe$(DLLEXT): winetest.exe$(DLLEXT) - cp winetest.exe$(DLLEXT) $@ - -upx -9 -qqq $@

1 0

Alexandre Julliard : winetest: Simplify the winetest crossbuild a little.
by Alexandre Julliard 23 May '11

23 May '11

Module: tools Branch: master Commit: cb3d61cfcc13c6b629481584b63132cbe8d3d440 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cb3d61cfcc13c6b629481584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 23 11:39:22 2011 +0200 winetest: Simplify the winetest crossbuild a little. --- winetest/make-winetest | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/winetest/make-winetest b/winetest/make-winetest index f45ce59..9fd21a0 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -109,14 +109,12 @@ umask 022 (cd build-mingw && make depend && make programs/winetest && - cd programs/winetest && - $mingw32-gcc -v 2> build.nfo && - make dist) || exit + upx -9 -qq programs/winetest/winetest.exe) || exit # install everything - chmod 644 build-mingw/programs/winetest/winetest-dist.exe - mv -f build-mingw/programs/winetest/winetest-dist.exe $destdir/winetest-$head.exe + chmod 644 build-mingw/programs/winetest/winetest.exe + mv -f build-mingw/programs/winetest/winetest.exe $destdir/winetest-$head.exe ln -sf winetest-$head.exe $destdir/winetest-latest.exe rm -f $servicedir/*.cookie $servicedir/*.url sha1sum $destdir/winetest-latest.exe | cut -c1-40 > $servicedir/winetest-$head.cookie @@ -133,13 +131,10 @@ umask 022 (cd build-mingw64 && make depend && - make programs/winetest && - cd programs/winetest && - $mingw64-gcc -v 2> build.nfo && - make dist) || exit + make programs/winetest) || exit - chmod 644 build-mingw64/programs/winetest/winetest-dist.exe - mv -f build-mingw64/programs/winetest/winetest-dist.exe $destdir/winetest64-$head.exe + chmod 644 build-mingw64/programs/winetest/winetest.exe + mv -f build-mingw64/programs/winetest/winetest.exe $destdir/winetest64-$head.exe ln -sf winetest64-$head.exe $destdir/winetest64-latest.exe echo "winetest64-$head.exe built successfully."

1 0

André Hentschel : Fix typo in german news entry
by Jeremy Newman 23 May '11

23 May '11

Module: website Branch: master Commit: bfba1cb138024eb2c927eab6244f4c1218b7dfbb URL: http://source.winehq.org/git/website.git/?a=commit;h=bfba1cb138024eb2c927ea… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 22 00:04:10 2011 +0200 Fix typo in german news entry --- news/de/2011051301.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/de/2011051301.xml b/news/de/2011051301.xml index 2e48833..37625c4 100644 --- a/news/de/2011051301.xml +++ b/news/de/2011051301.xml @@ -5,7 +5,7 @@ <p> Die Entwicklungsversion 1.3.20 von Wine ist jetzt verfügbar.</p> <p> <a href="{$root}/announce/1.3.20">Neuerungen (en)</a> in dieser Version: <ul> - <li>Option die Maus in eine Vollbildfenster einzufangen.</li> + <li>Option die Maus in einem Vollbildfenster einfangen zu lassen.</li> <li>Unterstützung für anhaltende HTTP Verbindungen.</li> <li>Anfängliche Implementierung des XML Writer.</li> <li>Unterstützung zum zeichnen von Rechtecken in der DIB Engine.</li>

1 0