wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Ken Thomases : winemac: Don' t accidentally clear Cocoa window style mask bits.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: bdcb8138fe5549071eb3339ced67180b00bafb5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdcb8138fe5549071eb3339ce… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 8 02:21:27 2013 -0500 winemac: Don't accidentally clear Cocoa window style mask bits. --- dlls/winemac.drv/cocoa_window.m | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ede86d5..9b3fa9d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -569,8 +569,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) setWindowFeatures:(const struct macdrv_window_features*)wf { + static const NSUInteger usedStyles = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | + NSResizableWindowMask | NSUtilityWindowMask | NSBorderlessWindowMask; NSUInteger currentStyle = [self styleMask]; - NSUInteger newStyle = style_mask_for_features(wf); + NSUInteger newStyle = style_mask_for_features(wf) | (currentStyle & ~usedStyles); if (newStyle != currentStyle) {

1 0

Ken Thomases : winemac: Use unsigned type for bitfields.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 0e8e45cf99c479dbef4bca491e4f1cc58992c1f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8e45cf99c479dbef4bca491… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 8 02:21:21 2013 -0500 winemac: Use unsigned type for bitfields. --- dlls/winemac.drv/macdrv.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index e6b5295..e2a54cc 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -131,12 +131,12 @@ struct macdrv_win_data macdrv_view gl_view; /* view for GL */ RECT gl_rect; /* GL view rectangle relative to whole_rect */ COLORREF color_key; /* color key for layered window; CLR_INVALID is not color keyed */ - BOOL on_screen : 1; /* is window ordered in? (minimized or not) */ - BOOL shaped : 1; /* is window using a custom region shape? */ - BOOL layered : 1; /* is window layered and with valid attributes? */ - BOOL ulw_layered : 1; /* has UpdateLayeredWindow() been called for window? */ - BOOL per_pixel_alpha : 1; /* is window using per-pixel alpha? */ - BOOL minimized : 1; /* is window minimized? */ + unsigned int on_screen : 1; /* is window ordered in? (minimized or not) */ + unsigned int shaped : 1; /* is window using a custom region shape? */ + unsigned int layered : 1; /* is window layered and with valid attributes? */ + unsigned int ulw_layered : 1; /* has UpdateLayeredWindow() been called for window? */ + unsigned int per_pixel_alpha : 1; /* is window using per-pixel alpha? */ + unsigned int minimized : 1; /* is window minimized? */ struct window_surface *surface; struct window_surface *unminimized_surface; };

1 0

Qian Hong : user32/tests: Added foreground window tests on different desktops.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 5da10c9a0e405c4b502be820ae0385d634306a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da10c9a0e405c4b502be820a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 8 11:40:26 2013 +0800 user32/tests: Added foreground window tests on different desktops. --- dlls/user32/tests/winstation.c | 147 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index d9b8a0e..f4e86ee 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -717,6 +717,152 @@ todo_wine ok(ret, "CloseDesktop failed!\n"); } +static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_DESTROY) + { + trace("destroying hwnd %p\n", hWnd); + PostQuitMessage(0); + return 0; + } + return DefWindowProcA( hWnd, msg, wParam, lParam ); +} + +typedef struct tag_wnd_param +{ + const char *wnd_name; + HWND hwnd; + HDESK hdesk; + HANDLE hevent; +} wnd_param; + +static DWORD WINAPI create_window(LPVOID param) +{ + wnd_param *param1 = param; + DWORD ret; + MSG msg; + + ret = SetThreadDesktop(param1->hdesk); + ok(ret, "SetThreadDesktop failed!\n"); + param1->hwnd = CreateWindowA("test_class", param1->wnd_name, WS_POPUP, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(param1->hwnd != 0, "CreateWindowA failed!\n"); + ret = SetEvent(param1->hevent); + ok(ret, "SetEvent failed!\n"); + + while (GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return 0; +} + +static void test_foregroundwindow(void) +{ + HWND hwnd, hwnd_test, partners[2], hwnds[2]; + HDESK hdesks[2]; + int thread_desk_id, input_desk_id, hwnd_id; + WNDCLASSA wclass; + wnd_param param; + DWORD ret; + +#define DESKTOPS 2 + + memset( &wclass, 0, sizeof(wclass) ); + wclass.lpszClassName = "test_class"; + wclass.lpfnWndProc = WndProc; + RegisterClassA(&wclass); + param.wnd_name = "win_name"; + + hdesks[0] = GetThreadDesktop(GetCurrentThreadId()); + ok(hdesks[0] != NULL, "OpenDesktop failed!\n"); + hdesks[1] = CreateDesktop("desk2", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); + ok(hdesks[1] != NULL, "CreateDesktop failed!\n"); + + for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) + { + param.hdesk = hdesks[thread_desk_id]; + param.hevent = CreateEventA(NULL, TRUE, FALSE, NULL); + CreateThread(NULL, 0, create_window, &param, 0, NULL); + ret = WaitForSingleObject(param.hevent, INFINITE); + ok(ret == WAIT_OBJECT_0, "wait failed!\n"); + hwnds[thread_desk_id] = param.hwnd; + } + + for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) + { + param.hdesk = hdesks[thread_desk_id]; + param.hevent = CreateEventA(NULL, TRUE, FALSE, NULL); + CreateThread(NULL, 0, create_window, &param, 0, NULL); + ret = WaitForSingleObject(param.hevent, INFINITE); + ok(ret == WAIT_OBJECT_0, "wait failed!\n"); + partners[thread_desk_id] = param.hwnd; + } + + trace("hwnd0 %p hwnd1 %p partner0 %p partner1 %p\n", hwnds[0], hwnds[1], partners[0], partners[1]); + + for (hwnd_id = 0; hwnd_id < DESKTOPS; hwnd_id++) + for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) + for (input_desk_id = 0; input_desk_id < DESKTOPS; input_desk_id++) + { + trace("testing thread_desk %d input_desk %d hwnd %d\n", + thread_desk_id, input_desk_id, hwnd_id); + hwnd_test = hwnds[hwnd_id]; + ret = SetThreadDesktop(hdesks[thread_desk_id]); + ok(ret, "set thread desktop failed!\n"); + ret = SwitchDesktop(hdesks[input_desk_id]); + ok(ret, "switch desktop failed!\n"); + SetForegroundWindow(partners[0]); + SetForegroundWindow(partners[1]); + hwnd = GetForegroundWindow(); + ok(hwnd != hwnd_test, "unexpected foreground window %p\n", hwnd); + ret = SetForegroundWindow(hwnd_test); + Sleep(250); + hwnd = GetForegroundWindow(); + if (input_desk_id == hwnd_id) + { + if (input_desk_id == thread_desk_id) + { + ok(ret, "SetForegroundWindow failed!\n"); + ok(hwnd == hwnd_test , "unexpected foreground window %p\n", hwnd); + } + else + { + todo_wine ok(ret, "SetForegroundWindow failed!\n"); + todo_wine ok(hwnd == 0, "unexpected foreground window %p\n", hwnd); + } + } + else + { + if (input_desk_id == thread_desk_id) + { + ok(!ret, "SetForegroundWindow should fail!\n"); + ok(hwnd == partners[input_desk_id] , "unexpected foreground window %p\n", hwnd); + } + else + { + todo_wine ok(!ret, "SetForegroundWindow should fail!\n"); + todo_wine ok(hwnd == 0, "unexpected foreground window %p\n", hwnd); + } + } + } + + /* Clean up */ + + for (thread_desk_id = DESKTOPS - 1; thread_desk_id >= 0; thread_desk_id--) + { + ret = SetThreadDesktop(hdesks[thread_desk_id]); + ok(ret, "set thread desktop failed!\n"); + SendMessage(hwnds[thread_desk_id], WM_DESTROY, 0, 0); + SendMessage(partners[thread_desk_id], WM_DESTROY, 0, 0); + } + + ret = SwitchDesktop(hdesks[0]); + ok(ret, "switch desktop failed!\n"); + CloseDesktop(hdesks[1]); +} + START_TEST(winstation) { /* Check whether this platform supports WindowStation calls */ @@ -735,4 +881,5 @@ START_TEST(winstation) test_enumdesktops(); test_handles(); test_getuserobjectinformation(); + test_foregroundwindow(); }

1 0

Qian Hong : user32/tests: Added input desktop tests on different winstations.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 43e1df02d2fdb0f4a3aa3d273e9666dfe5f74b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e1df02d2fdb0f4a3aa3d273… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 8 11:40:13 2013 +0800 user32/tests: Added input desktop tests on different winstations. --- dlls/user32/tests/winstation.c | 66 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 560b34f..d9b8a0e 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -652,6 +652,71 @@ todo_wine ok(ret, "CloseDesktop failed!\n"); } +static void test_inputdesktop2(void) +{ + HWINSTA w1, w2; + HDESK thread_desk, new_desk, input_desk, hdesk; + DWORD ret; + + thread_desk = GetThreadDesktop(GetCurrentThreadId()); + ok(thread_desk != NULL, "GetThreadDesktop failed!\n"); + w1 = GetProcessWindowStation(); + ok(w1 != NULL, "GetProcessWindowStation failed!\n"); + w2 = CreateWindowStation("winsta_test", 0, WINSTA_ALL_ACCESS, NULL); + ok(w2 != NULL, "CreateWindowStation failed!\n"); + ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); + ok(!ret, "EnumDesktopsA failed!\n"); + input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); +todo_wine + ok(input_desk != NULL, "OpenInputDesktop failed!\n"); + ret = CloseDesktop(input_desk); +todo_wine + ok(ret, "CloseDesktop failed!\n"); + + ret = SetProcessWindowStation(w2); + ok(ret, "SetProcessWindowStation failed!\n"); + hdesk = GetThreadDesktop(GetCurrentThreadId()); + ok(hdesk != NULL, "GetThreadDesktop failed!\n"); + ok(hdesk == thread_desk, "thread desktop should not change after winstation changed!\n"); + ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); + + new_desk = CreateDesktop("desk_test", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); + ok(new_desk != NULL, "CreateDesktop failed!\n"); + ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); + ok(!ret, "EnumDesktopsA failed!\n"); + SetLastError(0xdeadbeef); + input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); + ok(input_desk == NULL, "OpenInputDesktop should fail on non default winstation!\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_FUNCTION || broken(GetLastError() == 0xdeadbeef), "last error %08x\n", GetLastError()); + + hdesk = OpenDesktop("desk_test", 0, TRUE, DESKTOP_ALL_ACCESS); + ok(hdesk != NULL, "OpenDesktop failed!\n"); + SetLastError(0xdeadbeef); + ret = SwitchDesktop(hdesk); +todo_wine + ok(!ret, "Switch to desktop belong to non default winstation should fail!\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == 0xdeadbeef), "last error %08x\n", GetLastError()); + ret = SetThreadDesktop(hdesk); + ok(ret, "SetThreadDesktop failed!\n"); + + /* clean side effect */ + ret = SetThreadDesktop(thread_desk); +todo_wine + ok(ret, "SetThreadDesktop should success even desktop is not belong to process winstation!\n"); + ret = SetProcessWindowStation(w1); + ok(ret, "SetProcessWindowStation failed!\n"); + ret = SetThreadDesktop(thread_desk); + ok(ret, "SetThreadDesktop failed!\n"); + ret = CloseWindowStation(w2); + ok(ret, "CloseWindowStation failed!\n"); + ret = CloseDesktop(new_desk); + ok(ret, "CloseDesktop failed!\n"); + ret = CloseDesktop(hdesk); + ok(ret, "CloseDesktop failed!\n"); +} + START_TEST(winstation) { /* Check whether this platform supports WindowStation calls */ @@ -665,6 +730,7 @@ START_TEST(winstation) } test_inputdesktop(); + test_inputdesktop2(); test_enumstations(); test_enumdesktops(); test_handles();

1 0

Qian Hong : user32/tests: Clean side effect after testing winstation.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 834ce9a2d7115440517552ea449d5a627d69514f URL: http://source.winehq.org/git/wine.git/?a=commit;h=834ce9a2d7115440517552ea4… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 8 11:39:54 2013 +0800 user32/tests: Clean side effect after testing winstation. --- dlls/user32/tests/winstation.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index d6a4879..560b34f 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -270,6 +270,9 @@ static void test_handles(void) trace( "get other thread desktop: %p\n", GetThreadDesktop(id) ); WaitForSingleObject( hthread, INFINITE ); CloseHandle( hthread ); + + /* clean side effect */ + SetProcessWindowStation( w1 ); } /* Enumeration tests */

1 0

Qian Hong : user32/tests: Fixed typo in comments.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: a07e0c5a4a40979844ef97497099dab3ebf52798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a07e0c5a4a40979844ef97497… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 8 11:39:30 2013 +0800 user32/tests: Fixed typo in comments. --- dlls/user32/tests/winstation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 1804345..d6a4879 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -526,7 +526,7 @@ todo_wine ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); ok(ret == 1, "unexpected return count %d\n", ret); - /* Set thread desktop to the new desktop, SendInput should failed. */ + /* Set thread desktop to the new desktop, SendInput should fail. */ new_desk = CreateDesktopA("new_desk", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); ok(new_desk != NULL, "CreateDesktop failed!\n"); ret = SetThreadDesktop(new_desk); @@ -573,7 +573,7 @@ todo_wine ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); ok(ret == 1, "unexpected return count %d\n", ret); - /* Switch input desktop to the new desktop, SendInput should failed. */ + /* Switch input desktop to the new desktop, SendInput should fail. */ ret = SwitchDesktop(new_desk); ok(ret, "SwitchDesktop failed!\n"); input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS);

1 0

Alexandre Julliard : makefiles: Remove some obsolete rules.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 7260277e1db30d574161a10b8c19b765f0047955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7260277e1db30d574161a10b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 8 10:18:56 2013 +0200 makefiles: Remove some obsolete rules. --- Make.rules.in | 36 +----------------------------------- Make.vars.in | 5 ++--- Makefile.in | 2 -- configure | 50 -------------------------------------------------- configure.ac | 9 --------- 5 files changed, 3 insertions(+), 99 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index aeb605b..db3a45f 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -16,7 +16,6 @@ INCLUDES = -I$(srcdir) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL) DEFS = -D__WINESRC__ $(EXTRADEFS) ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) -ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(INCLUDES) $(DEFS) $(EXTRARCFLAGS) @@ -25,7 +24,7 @@ IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl=.h) \ $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h) -CLEAN_FILES = *.o *.a *.so *.mo *.ln *.res *.fake *.ok *.tab.[ch] *.yy.c +CLEAN_FILES = *.o *.a *.so *.mo *.res *.fake *.ok *.tab.[ch] *.yy.c CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) \ $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:.idl=_p.c dlldata.c) \ $(PO_SRCS:.rc=.res rsrc.pot) $(MC_SRCS:.mc=.res msg.pot) $(XTEMPLATE_SRCS:.x=.h) @@ -34,12 +33,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) -LINTS = $(C_SRCS:.c=.ln) - -filter: dummy - @$(top_srcdir)/tools/winapi/make_filter --make $(MAKE) all - -.PHONY: all filter # Implicit rules @@ -93,9 +86,6 @@ filter: dummy .idl_t.res: $(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -o $@ $< -.c.ln: - $(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 ) - .c.ok: $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ @@ -119,26 +109,6 @@ filter: dummy dlldata.c: $(WIDL) Makefile.in $(WIDL) $(IDLFLAGS) --dlldata-only -o $@ $(IDL_P_SRCS) -# Rule for linting - -$(MODULE).ln : $(LINTS) - if test "$(LINTS)" ; \ - then \ - $(LINT) $(ALLLINTFLAGS) -o$(MODULE) $(LINTS) ; \ - $(MV) llib-l$(MODULE).ln $(MODULE).ln ; \ - else \ - $(LINT) $(ALLLINTFLAGS) -C$(MODULE) /dev/null ; \ - fi - -lint:: $(MODULE).ln - -# Rules for Windows API checking - -winapi_check:: dummy - $(WINAPI_CHECK) $(WINAPI_CHECK_FLAGS) $(WINAPI_CHECK_EXTRA_FLAGS) . - -.PHONY: winapi_check - # Rules for dependencies DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ @@ -200,8 +170,4 @@ $(PO_SRCS:.rc=.res): $(ALL_MO_FILES) $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_TLB_RES) $(IDL_R_SRCS:.idl=_r.res): $(WIDL) -dummy: - -.PHONY: dummy - # End of global rules diff --git a/Make.vars.in b/Make.vars.in index b5cca68..570009e 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -45,8 +45,6 @@ MKDIR_P = @MKDIR_P@ TOOLSDIR = @TOOLSDIR@ LDFLAGS = @LDFLAGS@ PRELINK = @PRELINK@ -LINT = @LINT@ -LINTFLAGS = @LINTFLAGS@ FONTFORGE = @FONTFORGE@ RSVG = @RSVG@ CONVERT = @CONVERT@ @@ -58,7 +56,6 @@ ALL_MO_FILES = $(LINGUAS:%=@top_builddir@/po/%.mo) PORCFLAGS = @PORCFLAGS@ CROSSAR = $(CROSSTARGET)-ar CROSSRANLIB = $(CROSSTARGET)-ranlib -WINAPI_CHECK = $(top_srcdir)/tools/winapi/winapi_check BUILDIMAGE = $(top_srcdir)/tools/buildimage C2MAN = $(top_srcdir)/tools/c2man.pl RUNTEST = $(top_srcdir)/tools/runtest @@ -89,5 +86,7 @@ conf_manext = 5 @SET_MAKE@ all: +dummy: +.PHONY: all dummy # End of common header diff --git a/Makefile.in b/Makefile.in index a07abd2..7635612 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,8 +35,6 @@ INSTALLDIRS = \ all: wine @echo "Wine build complete." -WINAPI_CHECK_EXTRA_FLAGS = --global - @MAKE_RULES@ # Rules for re-running configure diff --git a/configure b/configure index 602eaca..b022253 100755 --- a/configure +++ b/configure @@ -723,8 +723,6 @@ ICOTOOL CONVERT RSVG FONTFORGE -LINTFLAGS -LINT INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM @@ -5535,54 +5533,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -for ac_prog in lclint lint -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LINT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LINT"; then - ac_cv_prog_LINT="$LINT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_LINT="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -LINT=$ac_cv_prog_LINT -if test -n "$LINT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINT" >&5 -$as_echo "$LINT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$LINT" && break -done - -if test "$LINT" = "lint" -then - LINTFLAGS="$LINTFLAGS -errchk=%all,no%longptr64 -errhdr=%user -Ncheck=macro -Nlevel=4" - fi - - for ac_prog in fontforge do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index fc4f096..f407355 100644 --- a/configure.ac +++ b/configure.ac @@ -268,15 +268,6 @@ dnl Use the correct strip to install programs test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" AC_PROG_INSTALL -dnl Check for lint -AC_CHECK_PROGS(LINT, lclint lint) -if test "$LINT" = "lint" -then - LINTFLAGS="$LINTFLAGS -errchk=%all,no%longptr64 -errhdr=%user -Ncheck=macro -Nlevel=4" - dnl LINTFLAGS='-D_SIZE_T "-Dsize_t=unsigned long" -errchk=longptr64' -fi -AC_SUBST(LINTFLAGS) - dnl Check for various programs AC_CHECK_PROGS(FONTFORGE, fontforge, false) AC_CHECK_PROGS(RSVG, rsvg, false)

1 0

Alexandre Julliard : makefiles: Get rid of the recursive installation rules for dlls and programs.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 08eea24b94dc8a238b0af295471f512719acfb55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08eea24b94dc8a238b0af2954… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 19:41:25 2013 +0200 makefiles: Get rid of the recursive installation rules for dlls and programs. --- Make.rules.in | 3 --- configure | 3 --- configure.ac | 1 - dlls/Makedll.rules.in | 19 ------------------- programs/Makeprog.rules.in | 19 ------------------- 5 files changed, 0 insertions(+), 45 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 2f3f29a..aeb605b 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -163,9 +163,6 @@ install-man-pages:: $(MANPAGE) $(DESTDIR)$(mandir)/man$(prog_manext) uninstall-man-pages:: $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/$(MANPAGE:.man=).$(prog_manext) -install:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in install-man-pages) -uninstall:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in uninstall-man-pages) - .PHONY: install-man-pages uninstall-man-pages # Rules for cleaning diff --git a/configure b/configure index 6c2d41f..602eaca 100755 --- a/configure +++ b/configure @@ -741,7 +741,6 @@ AR BISON FLEX TOOLSDIR -WOW64_DISABLE TARGETFLAGS CPPBIN ac_ct_CXX @@ -4775,8 +4774,6 @@ then 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 - WOW64_DISABLE=\# - enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} elif test "x$enable_win64" = "xyes" diff --git a/configure.ac b/configure.ac index 763889b..fc4f096 100644 --- a/configure.ac +++ b/configure.ac @@ -194,7 +194,6 @@ then 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 - AC_SUBST([WOW64_DISABLE],[\#]) enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} elif test "x$enable_win64" = "xyes" diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index dba64f6..3a226ce 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -16,7 +16,6 @@ IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) IMPLIBFLAGS = $(TARGETFLAGS) $(EXTRAIMPLIBFLAGS) IMPORTLIBFILE = $(IMPORTLIB:%=lib%.@IMPLIBEXT@) STATICIMPLIB = $(IMPORTLIBFILE:.def=.def.a) -INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(datadir)/wine @MAKE_RULES@ @@ -63,24 +62,6 @@ sgmlpages:: $(C_SRCS) dummy xmlpages:: $(C_SRCS) dummy $(C2MAN) -o $(top_builddir)/documentation/api-guide-xml -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Tx $(MAINSPEC:%=-w %) $(C_SRCS) -# Rules for installation - -.PHONY: install_dll install_dll.so install_dll.fake - -install_dll: $(MODULE) $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) - -install_dll.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE).so - -install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy - $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) - -install install-lib:: install_dll$(DLLEXT) install_dll$(FAKEEXT) - -uninstall:: - $(RM) $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) - # Misc. rules clean:: diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index f72ad2e..802baff 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -11,7 +11,6 @@ DLLFLAGS = @DLLFLAGS@ ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS) -INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext) @MAKE_RULES@ @@ -20,23 +19,5 @@ all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT) $(MODULE) $(MODULE).so $(MODULE).fake: $(OBJS) Makefile.in $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) -# Rules for installation - -.PHONY: install_prog install_prog.so install_prog.fake - -install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE).so - -install_prog.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy - $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) - -install_prog: $(MODULE) $(DESTDIR)$(bindir) dummy - $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(bindir)/$(MODULE) - -install install-lib:: install_prog$(DLLEXT) install_prog$(FAKEEXT) - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/$(MODULE) $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) - clean:: $(RM) $(MODULE)

1 0

Alexandre Julliard : configure: Make some shell variables global.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: c48232661d3ac59e5bd7a8569374a83b3da789b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48232661d3ac59e5bd7a8569… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 8 13:20:36 2013 +0200 configure: Make some shell variables global. --- aclocal.m4 | 111 ++++++++++++++++++++++++++--------------------------------- configure | 111 ++++++++++++++++++++++++++--------------------------------- 2 files changed, 98 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c48232661d3ac59e5bd7a…

1 0

Alexandre Julliard : configure: Use more user-friendly names for subdirectory targets.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: bedf4757a8b11ce55940bb97289005a79e005cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bedf4757a8b11ce55940bb972… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 19:35:07 2013 +0200 configure: Use more user-friendly names for subdirectory targets. --- Make.rules.in | 6 +- aclocal.m4 | 118 ++++++++++++++++++++++++++++---------------------------- configure | 118 ++++++++++++++++++++++++++++---------------------------- 3 files changed, 121 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bedf4757a8b11ce55940b…

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013