September 2006 - Wine-Commits

Jacek Caban : shdocvw: Added [get|put]_Silent implementation.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: f86827317b3cb854be580d86c81d1deca378ff27 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f86827317b3cb854be580d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 21 18:07:04 2006 +0200 shdocvw: Added [get|put]_Silent implementation. As we don't have any dialog in WebBrowser implemented yet, all we have to do is to store silent value. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/tests/webbrowser.c | 44 +++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/webbrowser.c | 15 ++++++++++--- 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index ee4bf8e..a022eb2 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -128,6 +128,7 @@ struct WebBrowser { VARIANT_BOOL address_bar; VARIANT_BOOL status_bar; VARIANT_BOOL tool_bar; + VARIANT_BOOL silent; DocHost doc_host; }; diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 2897857..161f608 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -809,6 +809,49 @@ static void test_ie_funcs(IUnknown *unk) IWebBrowser2_Release(wb); } +static void test_Silent(IUnknown *unk) +{ + IWebBrowser2 *wb; + VARIANT_BOOL b; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); + ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08lx\n", hres); + if(FAILED(hres)) + return; + + b = 100; + hres = IWebBrowser2_get_Silent(wb, &b); + ok(hres == S_OK, "get_Silent failed: %08lx\n", hres); + ok(b == VARIANT_FALSE, "b=%x\n", b); + + hres = IWebBrowser2_put_Silent(wb, VARIANT_TRUE); + ok(hres == S_OK, "set_Silent failed: %08lx\n", hres); + + b = 100; + hres = IWebBrowser2_get_Silent(wb, &b); + ok(hres == S_OK, "get_Silent failed: %08lx\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_Silent(wb, 100); + ok(hres == S_OK, "set_Silent failed: %08lx\n", hres); + + b = 100; + hres = IWebBrowser2_get_Silent(wb, &b); + ok(hres == S_OK, "get_Silent failed: %08lx\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_Silent(wb, VARIANT_FALSE); + ok(hres == S_OK, "set_Silent failed: %08lx\n", hres); + + b = 100; + hres = IWebBrowser2_get_Silent(wb, &b); + ok(hres == S_OK, "get_Silent failed: %08lx\n", hres); + ok(b == VARIANT_FALSE, "b=%x\n", b); + + IWebBrowser_Release(wb); +} + static void test_GetControlInfo(IUnknown *unk) { IOleControl *control; @@ -911,6 +954,7 @@ static void test_WebBrowser(void) test_ClientSite(unk, NULL); test_ie_funcs(unk); test_GetControlInfo(unk); + test_Silent(unk); ref = IUnknown_Release(unk); ok(ref == 0, "ref=%ld, expected 0\n", ref); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 6d46132..9e56733 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -749,15 +749,21 @@ static HRESULT WINAPI WebBrowser_put_Off static HRESULT WINAPI WebBrowser_get_Silent(IWebBrowser2 *iface, VARIANT_BOOL *pbSilent) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pbSilent); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pbSilent); + + *pbSilent = This->silent; + return S_OK; } static HRESULT WINAPI WebBrowser_put_Silent(IWebBrowser2 *iface, VARIANT_BOOL bSilent) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, bSilent); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, bSilent); + + This->silent = bSilent ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI WebBrowser_get_RegisterAsBrowser(IWebBrowser2 *iface, @@ -947,6 +953,7 @@ static HRESULT WebBrowser_Create(INT ver ret->address_bar = VARIANT_TRUE; ret->status_bar = VARIANT_TRUE; ret->tool_bar = VARIANT_TRUE; + ret->silent = VARIANT_FALSE; WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret);

1 0

Huw Davies : advapi32: Fix ADVAPI_GetComputerSid to work correctly if a sid doesn' t exist in the registry.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 38d33e33aebdcc64ae95efe0318b547a9481cdb1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38d33e33aebdcc64ae95efe… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 21 12:59:52 2006 +0100 advapi32: Fix ADVAPI_GetComputerSid to work correctly if a sid doesn't exist in the registry. This makes the tests run correctly on first invocation. --- dlls/advapi32/security.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 51a28d8..3aa99b6 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -386,6 +386,7 @@ BOOL ADVAPI_GetComputerSid(PSID sid) { HKEY key; LONG ret; + BOOL retval = FALSE; static const WCHAR Account[] = { 'S','E','C','U','R','I','T','Y','\\','S','A','M','\\','D','o','m','a','i','n','s','\\','A','c','c','o','u','n','t',0 }; static const WCHAR V[] = { 'V',0 }; @@ -404,9 +405,7 @@ BOOL ADVAPI_GetComputerSid(PSID sid) { /* the SID is in the last 24 bytes of the binary data */ CopyMemory(sid, &data[size-24], 24); - HeapFree(GetProcessHeap(), 0, data); - RegCloseKey(key); - return TRUE; + retval = TRUE; } HeapFree(GetProcessHeap(), 0, data); } @@ -414,6 +413,8 @@ BOOL ADVAPI_GetComputerSid(PSID sid) RegCloseKey(key); } + if(retval == TRUE) return retval; + /* create a new random SID */ if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, Account, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL) == ERROR_SUCCESS) @@ -427,18 +428,15 @@ BOOL ADVAPI_GetComputerSid(PSID sid) if (AllocateAndInitializeSid(&identifierAuthority, 4, SECURITY_NT_NON_UNIQUE, id[0], id[1], id[2], 0, 0, 0, 0, &new_sid)) { if (RegSetValueExW(key, V, 0, REG_BINARY, new_sid, GetLengthSid(new_sid)) == ERROR_SUCCESS) - { - FreeSid(new_sid); - RegCloseKey(key); - return CopySid(GetLengthSid(new_sid), sid, &new_sid); - } + retval = CopySid(GetLengthSid(new_sid), sid, new_sid); + FreeSid(new_sid); } } RegCloseKey(key); } - return FALSE; + return retval; } /* ##############################

1 0

Huw Davies : gdi32: Win 2000 and Win XP behave differently if there's a '\n ' in the string, so remove the width test completely.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: e41992ccaf56f467780159cf8f3d66fb3c79ebb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e41992ccaf56f467780159c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 21 10:11:28 2006 +0100 gdi32: Win 2000 and Win XP behave differently if there's a '\n' in the string, so remove the width test completely. --- dlls/gdi/tests/font.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index beb7436..6891f14 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -383,11 +383,11 @@ static void test_text_extents(void) GetTextExtentPointW(hdc, wt, len, &sz2); ok(sz1.cy == sz2.cy, "cy from GetTextExtentExPointW (%ld) and GetTextExtentPointW (%ld) differ\n", sz1.cy, sz2.cy); -todo_wine { - /* The \n in the string is apparently handled differently in GetTextExtentPoint and GetTextExtentExPoint */ - ok(sz1.cx != sz2.cx, - "cx from GetTextExtentExPointW (%ld) and GetTextExtentPointW (%ld) are the same\n", sz1.cx, sz2.cx); - } + /* Because of the '\n' in the string GetTextExtentExPoint and + GetTextExtentPoint return different widths under Win2k, but + under WinXP they return the same width. So we don't test that + here. */ + for (i = 1; i < len; ++i) ok(extents[i-1] <= extents[i], "GetTextExtentExPointW generated a non-increasing sequence of partial extents (at position %d)\n",

1 0

Kai Blin : secur32: Stop loading Negotiate until it is actually working.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 35bf41bc161cbee6090548d24f5c409c4cd03985 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35bf41bc161cbee6090548d… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Sep 17 11:28:23 2006 +0200 secur32: Stop loading Negotiate until it is actually working. --- dlls/secur32/secur32.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index a6c12b2..1e0b704 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -545,7 +545,12 @@ static void SECUR32_initializeProviders( InitializeCriticalSection(&cs); /* First load built-in providers */ SECUR32_initSchannelSP(); + /* Do not load Negotiate yet. This breaks for some user on the wine-users + * mailing list as of 2006-09-12. Without Negotiate, applications should + * fall back to NTLM and that should work.*/ +#if 0 SECUR32_initNegotiateSP(); +#endif SECUR32_initNTLMSP(); /* Now load providers from registry */ apiRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, securityProvidersKeyW, 0,

1 0

Alexandre Julliard : make_makefiles: Merged the make_progs script into make_makefiles.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 48c14238b877df2fe04a4b54738e073a69266ae0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=48c14238b877df2fe04a4b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 24 12:11:39 2006 +0200 make_makefiles: Merged the make_progs script into make_makefiles. --- programs/.gitignore | 2 programs/make_progs | 225 -------------------------------------------------- tools/make_makefiles | 109 +++++++++++++++++++++--- 3 files changed, 97 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=48c14238b877df2fe04…

1 0

Detlef Riekenberg : include: Open Watcom compatibility ( Fix _BSDTYPES_DEFINED typo).
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: ca788bbc26676466ec7aa01a906efc0a17210408 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca788bbc26676466ec7aa01… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Sep 20 22:26:44 2006 +0200 include: Open Watcom compatibility (Fix _BSDTYPES_DEFINED typo). --- include/msvcrt/sys/types.h | 4 ++-- include/winsock.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/sys/types.h b/include/msvcrt/sys/types.h index fc6f269..abb05a3 100644 --- a/include/msvcrt/sys/types.h +++ b/include/msvcrt/sys/types.h @@ -52,12 +52,12 @@ typedef long time_t; #define _TIME_T_DEFINED #endif -#ifndef _BSD_TYPES_DEFINED +#ifndef _BSDTYPES_DEFINED typedef unsigned char u_char; typedef unsigned short u_short; typedef unsigned int u_int; typedef unsigned long u_long; -#define _BSD_TYPES_DEFINED +#define _BSDTYPES_DEFINED #endif #define dev_t _dev_t diff --git a/include/winsock.h b/include/winsock.h index b86bda7..14ce99a 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -110,12 +110,13 @@ #endif #ifndef _WINSOCKAPI_ #define _WINSOCKAPI_ -#if (defined(_MSC_VER) || defined(__MINGW_H)) && !defined(_BSD_TYPES_DEFINED) +#if (defined(_MSC_VER) || defined(__MINGW_H) || defined(__WATCOMC__)) && !defined(_BSDTYPES_DEFINED) /* MinGW doesn't define the u_xxx types */ typedef unsigned char u_char; typedef unsigned short u_short; typedef unsigned int u_int; typedef unsigned long u_long; +#define _BSDTYPES_DEFINED #endif #ifdef USE_WS_PREFIX

1 0

Alexandre Julliard : configure: Moved the libGL. a check to the final warnings.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: c84c47842e218b888daf83382bc029440146d322 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c84c47842e218b888daf833… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 09:36:12 2006 +0200 configure: Moved the libGL.a check to the final warnings. --- configure | 38 +++++++++++++++----------------------- configure.ac | 32 ++++++++++++-------------------- 2 files changed, 27 insertions(+), 43 deletions(-) diff --git a/configure b/configure index 801ec4f..2df837e 100755 --- a/configure +++ b/configure @@ -9494,30 +9494,15 @@ fi echo "${ECHO_T}$ac_cv_lib_GL_glXCreateContext" >&6; } if test $ac_cv_lib_GL_glXCreateContext = yes; then OPENGL_LIBS="-lGL" - -fi - - - if test "$ac_cv_lib_GL_glXCreateContext" = "yes" - then - OPENGLFILES='$(OPENGLFILES)' + OPENGLFILES='$(OPENGLFILES)' cat >>confdefs.h <<\_ACEOF #define HAVE_OPENGL 1 _ACEOF - else - if test -f /usr/X11R6/lib/libGL.a - then - { { echo "$as_me:$LINENO: error: /usr/X11R6/lib/libGL.a is present on your system. -This prevents linking to OpenGL. Delete the file and restart configure." >&5 -echo "$as_me: error: /usr/X11R6/lib/libGL.a is present on your system. -This prevents linking to OpenGL. Delete the file and restart configure." >&2;} - { (exit 1); exit 1; }; } - else - wine_cv_opengl_libs_found="no" - fi - fi + +fi + { echo "$as_me:$LINENO: checking for gluLookAt in -lGLU" >&5 echo $ECHO_N "checking for gluLookAt in -lGLU... $ECHO_C" >&6; } @@ -25579,7 +25564,7 @@ echo "$as_me: WARNING: isn't what you wa echo "$as_me: WARNING: packages of Xlib/Xfree86 at the very least." >&2;} fi -if test "$wine_cv_opengl_headers_found" = "no" -o "$wine_cv_opengl_header_version_OK" = "no" -o "$wine_cv_opengl_libs_found" = "no" +if test -z "$OPENGLFILES" then echo >&2 { echo "$as_me:$LINENO: WARNING: Wine will be build without OpenGL or Direct3D support" >&5 @@ -25595,11 +25580,18 @@ echo "$as_me: WARNING: No OpenGL develop then { echo "$as_me:$LINENO: WARNING: Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" >&5 echo "$as_me: WARNING: Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" >&2;} - fi - if test "$wine_cv_opengl_libs_found" = "no" + elif test "$ac_cv_lib_GL_glXCreateContext" = "no" then - { echo "$as_me:$LINENO: WARNING: No OpenGL library found on this system." >&5 + if test -f /usr/X11R6/lib/libGL.a + then + { echo "$as_me:$LINENO: WARNING: /usr/X11R6/lib/libGL.a is present on your system. +This probably prevents linking to OpenGL. Try deleting the file and restarting configure." >&5 +echo "$as_me: WARNING: /usr/X11R6/lib/libGL.a is present on your system. +This probably prevents linking to OpenGL. Try deleting the file and restarting configure." >&2;} + else + { echo "$as_me:$LINENO: WARNING: No OpenGL library found on this system." >&5 echo "$as_me: WARNING: No OpenGL library found on this system." >&2;} + fi fi fi diff --git a/configure.ac b/configure.ac index 9a4be02..f7246c0 100644 --- a/configure.ac +++ b/configure.ac @@ -413,25 +413,12 @@ #endif]) then dnl Check for the presence of the library AC_CHECK_LIB(GL,glXCreateContext, - OPENGL_LIBS="-lGL" + [OPENGL_LIBS="-lGL" + OPENGLFILES='$(OPENGLFILES)' + AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])] ,, $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) - if test "$ac_cv_lib_GL_glXCreateContext" = "yes" - then - OPENGLFILES='$(OPENGLFILES)' - AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system]) - else - if test -f /usr/X11R6/lib/libGL.a - then - AC_MSG_ERROR([/usr/X11R6/lib/libGL.a is present on your system. -This prevents linking to OpenGL. Delete the file and restart configure.]) - else - dnl The compile test most likely failed because no libGL.so was found - wine_cv_opengl_libs_found="no" - fi - fi - dnl Check for GLU32 library. AC_CHECK_LIB(GLU,gluLookAt, [OPENGL_LIBS="$OPENGL_LIBS -lGLU" @@ -1975,7 +1962,7 @@ then AC_MSG_WARN([ packages of Xlib/Xfree86 at the very least.]) fi -if test "$wine_cv_opengl_headers_found" = "no" -o "$wine_cv_opengl_header_version_OK" = "no" -o "$wine_cv_opengl_libs_found" = "no" +if test -z "$OPENGLFILES" then echo >&2 AC_MSG_WARN([Wine will be build without OpenGL or Direct3D support]) @@ -1987,10 +1974,15 @@ then if test "$wine_cv_opengl_header_version_OK" = "no" then AC_MSG_WARN([Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).]) - fi - if test "$wine_cv_opengl_libs_found" = "no" + elif test "$ac_cv_lib_GL_glXCreateContext" = "no" then - AC_MSG_WARN([No OpenGL library found on this system.]) + if test -f /usr/X11R6/lib/libGL.a + then + AC_MSG_WARN([/usr/X11R6/lib/libGL.a is present on your system. +This probably prevents linking to OpenGL. Try deleting the file and restarting configure.]) + else + AC_MSG_WARN([No OpenGL library found on this system.]) + fi fi fi

1 0

Alexandre Julliard : Makefile: Automatically update config. h if configure changed.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: c4704c2d7e1d0fada2fb7c3ac9872de76c4bea91 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4704c2d7e1d0fada2fb7c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 09:33:00 2006 +0200 Makefile: Automatically update config.h if configure changed. --- Makefile.in | 8 ++++++-- configure | 5 +++++ configure.ac | 2 ++ include/.gitignore | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 80002a2..085fb3c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -70,6 +70,10 @@ INSTALLDIRS = $(DESTDIR)$(datadir)/acloc config.status: configure @./config.status --recheck +include/config.h: include/stamp-h +include/stamp-h: include/config.h.in config.status + @./config.status include/config.h include/stamp-h + wine: $(WINEWRAPPER) $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ @@ -114,7 +118,7 @@ RECURSE_TARGETS = \ $(TESTSUBDIRS:%=%/__test__) \ $(TESTSUBDIRS:%=%/__testclean__) -depend $(RECURSE_TARGETS): $(MAKEDEP) +depend $(RECURSE_TARGETS): $(MAKEDEP) include/config.h $(MAKEDEP): @cd $(TOOLSDIR)/tools && $(MAKE) makedep @@ -139,7 +143,7 @@ clean:: $(RM) wine distclean:: clean - $(RM) config.* configure.lineno TAGS tags include/config.h + $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h $(RM) -r autom4te.cache .PHONY: manpages htmlpages sgmlpages distclean diff --git a/configure b/configure index 7934c02..801ec4f 100755 --- a/configure +++ b/configure @@ -23778,6 +23778,9 @@ Makefile: dummy +ac_config_commands="$ac_config_commands include/stamp-h" + + ac_config_commands="$ac_config_commands dlls/gdi/enhmfdrv" ac_config_commands="$ac_config_commands dlls/gdi/mfdrv" @@ -24354,6 +24357,7 @@ for ac_config_target in $ac_config_targe do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; + "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; "dlls/gdi/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/enhmfdrv" ;; "dlls/gdi/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;; "dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;; @@ -25361,6 +25365,7 @@ echo "$as_me: executing $ac_file command case $ac_file$ac_mode in + "include/stamp-h":C) echo timestamp > include/stamp-h ;; "dlls/gdi/enhmfdrv":C) test -d "dlls/gdi/enhmfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/enhmfdrv" >&5 echo "$as_me: creating dlls/gdi/enhmfdrv" >&6;} && mkdir "dlls/gdi/enhmfdrv") ;; "dlls/gdi/mfdrv":C) test -d "dlls/gdi/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/mfdrv" >&5 diff --git a/configure.ac b/configure.ac index 3430985..9a4be02 100644 --- a/configure.ac +++ b/configure.ac @@ -1482,6 +1482,8 @@ Makefile: dummy AH_TOP([#define __WINE_CONFIG_H]) +AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) + WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv) WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls) diff --git a/include/.gitignore b/include/.gitignore index 4276dd8..d782fca 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -37,6 +37,7 @@ /shldisp.h /shobjidl.h /shtypes.h +/stamp-h /strmif.h /tom.h /unknwn.h

1 0

Alexandre Julliard : make_makefiles: Parse the makefiles to find the correct rules file dependency.
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 44db04c01e68c7b321a6ff4850e5d9cfb419cef7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44db04c01e68c7b321a6ff4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 09:27:29 2006 +0200 make_makefiles: Parse the makefiles to find the correct rules file dependency. --- tools/make_makefiles | 71 ++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 51 insertions(+), 20 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index ff0aaa2..cc77d40 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -19,6 +19,17 @@ # License along with this library; if no # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # +my %makerules = +( + "MAKE_RULES" => "Make.rules", + "MAKE_DLL_RULES" => "dlls/Makedll.rules", + "MAKE_IMPLIB_RULES" => "dlls/Makeimplib.rules", + "MAKE_TEST_RULES" => "dlls/Maketest.rules", + "MAKE_PROG_RULES" => "programs/Makeprog.rules", +); + +my (@makefiles, %makefiles); + # update a file if changed sub update_file($) { @@ -27,7 +38,7 @@ sub update_file($) if (!$ret) { unlink "$file.new"; - print "$file is unchanged\n"; + #print "$file is unchanged\n"; } else { @@ -70,26 +81,56 @@ sub replace_in_file($$$@) return update_file($file); } -my (@makefiles, @makerules); +# parse the specified makefile to identify the rules file +sub parse_makefile($) +{ + my $file = shift; + + open MAKE, "$file.in" or die "cannot open $file.in\n"; + + while (<MAKE>) + { + chomp; + while (/\\$/) { chop; $_ .= <MAKE>; chomp; } # merge continued lines + + if (/^\@(MAKE.*RULES)\@/) + { + my $var = $1; + $makefiles{$file} = $makerules{$var}; + return; + } + } +} if (-d ".git") { @makefiles = map { s/\.in$//; $_; } split /\s/, `git ls-files -c Makefile.in \\*/Makefile.in`; - @makerules = map { s/\.in$//; $_; } split /\s/, `git ls-files -c Make\\*rules.in \\*/Make\\*rules.in`; } else { @makefiles = map { s/^\.\/(.*)\.in/$1/; $_; } split(/\s/,`find . -name Makefile.in -print`); - @makerules = map { s/^\.\/(.*)\.in/$1/; $_; } split(/\s/,`find . -name Make\\*.rules.in -print`); } +foreach my $file (sort values %makerules, @makefiles) +{ + parse_makefile( $file ); +} ################################################################ # update the makefile list in configure.ac -replace_in_file( "configure.ac", '^AC_CONFIG_FILES$', '\]$$', +my @lines = (); + +foreach my $var (sort { $makerules{$a} cmp $makerules{$b}; } keys %makerules) +{ + push @lines, "$var=$makerules{$var}\n"; + push @lines, "AC_SUBST_FILE($var)\n\n"; +} + +replace_in_file( "configure.ac", '^MAKE_RULES', '\]\)$', + @lines, "AC_CONFIG_FILES([\n", - join ("\n", (sort @makerules), (sort @makefiles) ), "])\n" ); + join ("\n", (sort values %makerules), (sort @makefiles) ), "])\n" ); ################################################################ @@ -97,7 +138,7 @@ # update the tests list in programs/wine my %modules = ( "gdi" => "gdi32", "user" => "user32" ); my %tests; -my @lines = ( "TESTBINS =" ); +(a)lines = ( "TESTBINS =" ); foreach my $file (sort grep /^dlls\/.*\/tests\/Makefile/, @makefiles) { @@ -135,27 +176,17 @@ # update the makefile list in Makefile.i my @targets; my @depends; -foreach my $file (sort @makerules) +foreach my $file (sort values %makerules) { push @targets, $file; - if ($file eq "Make.rules") { push @depends, "$file: $file.in"; } + if (!defined($makefiles{$file})) { push @depends, "$file: $file.in"; } else { push @depends, "$file: $file.in Make.rules"; } } foreach my $file (sort @makefiles) { push @targets, $file unless $file eq "Makefile"; - - # find the right rules file (FIXME: should parse the Makefile.in instead) - my $dep = "Make.rules"; - if ($file =~ /^programs\/.*\/Makefile/) { $dep = "programs/Makeprog.rules"; } - elsif ($file =~ /^dlls\/.*\/tests\/Makefile/) { $dep = "dlls/Maketest.rules"; } - elsif ($file =~ /^dlls\/(.*)\/Makefile/) - { - $dep = ($1 eq "dxerr8" || $1 eq "dxerr9" || $1 eq "dxguid" || - $1 eq "strmiids" || $1 eq "uuid" || $1 eq "winecrt0") ? - "dlls/Makeimplib.rules" : "dlls/Makedll.rules"; - } + my $dep = $makefiles{$file}; push @depends, "$file: $file.in $dep"; }

1 0

Alexandre Julliard : makedep: Update dependencies even with no source files .
by Alexandre Julliard Sept. 25, 2006

Sept. 25, 2006

Module: wine Branch: master Commit: 1b9535afc872082b8c6d4d1e3c738da41ca87e0c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b9535afc872082b8c6d4d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 09:25:49 2006 +0200 makedep: Update dependencies even with no source files. --- tools/makedep.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 905c93b..300ed8d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -710,9 +710,12 @@ static void output_dependencies(void) if (Separator && ((file = fopen( OutputFileName, "r+" )))) { while ((buffer = get_line( file ))) - if (!strncmp( buffer, Separator, strlen(Separator) )) break; - ftruncate( fileno(file), ftell(file) ); - fseek( file, 0L, SEEK_END ); + { + if (strncmp( buffer, Separator, strlen(Separator) )) continue; + ftruncate( fileno(file), ftell(file) ); + fseek( file, 0L, SEEK_END ); + break; + } } if (!file) { @@ -815,6 +818,6 @@ int main( int argc, char *argv[] ) parse_file( pFile, 1 ); } LIST_FOR_EACH_ENTRY( pFile, &includes, INCL_FILE, entry ) parse_file( pFile, 0 ); - if (!list_empty( &sources )) output_dependencies(); + output_dependencies(); return 0; }

1 0