March 2008 - Wine-Commits - list.winehq.org

Francois Gouget : hal: Add a stub for HalGetBusData() to make 3DMark2001SE happy in WinNT mode.
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: a555658ba1cfcfc887b973fa8b7ae260a17e7fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a555658ba1cfcfc887b973fa8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 6 13:28:27 2008 +0100 hal: Add a stub for HalGetBusData() to make 3DMark2001SE happy in WinNT mode. --- dlls/hal/hal.c | 9 ++++++++- dlls/hal/hal.spec | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 10c695b..0b64809 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -31,7 +31,7 @@ #include "windef.h" #include "winternl.h" #include "excpt.h" -#include "ddk/wdm.h" +#include "ddk/ntddk.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); @@ -99,3 +99,10 @@ VOID WINAPI KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) { FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); } + +ULONG WINAPI HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length) +{ + FIXME("(%u %u %u %p %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); + /* Claim that there is no such bus */ + return 0; +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 298dc8e..5afbee0 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -33,7 +33,7 @@ @ stub HalFlushCommonBuffer @ stub HalFreeCommonBuffer @ stub HalGetAdapter -@ stub HalGetBusData +@ stdcall HalGetBusData(long long long ptr long) @ stub HalGetBusDataByOffset @ stub HalGetEnvironmentVariable @ stub HalGetInterruptVector

1 0

Rob Shearman : rpcrt4: Use closesocket to close sockets and define it to close on Unix platforms to make the code more portable .
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: a1e4bcda1a6c79b672f7c271bab1e3911b3438fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e4bcda1a6c79b672f7c271b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 6 14:59:02 2008 +0000 rpcrt4: Use closesocket to close sockets and define it to close on Unix platforms to make the code more portable. --- dlls/rpcrt4/rpc_transport.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 0859537..b02c11d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -64,6 +64,7 @@ # ifdef HAVE_SYS_POLL_H # include <sys/poll.h> # endif +# define closesocket close #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ #include "windef.h" @@ -801,7 +802,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) if (0>connect(sock, ai_cur->ai_addr, ai_cur->ai_addrlen)) { WARN("connect() failed: %s\n", strerror(errno)); - close(sock); + closesocket(sock); continue; } @@ -880,7 +881,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr if (ret < 0) { WARN("bind failed: %s\n", strerror(errno)); - close(sock); + closesocket(sock); if (errno == EADDRINUSE) status = RPC_S_DUPLICATE_ENDPOINT; else @@ -892,7 +893,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr endpoint, NULL, NULL, NULL); if (create_status != RPC_S_OK) { - close(sock); + closesocket(sock); status = create_status; continue; } @@ -1046,7 +1047,7 @@ static int rpcrt4_conn_tcp_close(RpcConnection *Connection) TRACE("%d\n", tcpc->sock); if (tcpc->sock != -1) - close(tcpc->sock); + closesocket(tcpc->sock); tcpc->sock = -1; close(tcpc->cancel_fds[0]); close(tcpc->cancel_fds[1]);

1 0

Rob Shearman : adsiid: Add static import library for active directory GUIDs .
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: 76e089692e13a07beb06db802a2568cd711f2301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e089692e13a07beb06db802… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 6 15:01:34 2008 +0000 adsiid: Add static import library for active directory GUIDs. --- Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 3 +++ dlls/adsiid/Makefile.in | 12 ++++++++++++ dlls/adsiid/adsiid.c | 27 +++++++++++++++++++++++++++ 6 files changed, 48 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 164763b..6b22eb0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -160,6 +160,7 @@ ALL_MAKEFILES = \ dlls/acledit/Makefile \ dlls/activeds/Makefile \ dlls/actxprxy/Makefile \ + dlls/adsiid/Makefile \ dlls/advapi32/Makefile \ dlls/advapi32/tests/Makefile \ dlls/advpack/Makefile \ @@ -576,6 +577,7 @@ dlls/Makefile: dlls/Makefile.in Make.rules dlls/acledit/Makefile: dlls/acledit/Makefile.in dlls/Makedll.rules dlls/activeds/Makefile: dlls/activeds/Makefile.in dlls/Makedll.rules dlls/actxprxy/Makefile: dlls/actxprxy/Makefile.in dlls/Makedll.rules +dlls/adsiid/Makefile: dlls/adsiid/Makefile.in dlls/Makeimplib.rules dlls/advapi32/Makefile: dlls/advapi32/Makefile.in dlls/Makedll.rules dlls/advapi32/tests/Makefile: dlls/advapi32/tests/Makefile.in dlls/Maketest.rules dlls/advpack/Makefile: dlls/advpack/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 7be6eb1..edcabe9 100755 --- a/configure +++ b/configure @@ -21182,6 +21182,8 @@ ac_config_files="$ac_config_files dlls/activeds/Makefile" ac_config_files="$ac_config_files dlls/actxprxy/Makefile" +ac_config_files="$ac_config_files dlls/adsiid/Makefile" + ac_config_files="$ac_config_files dlls/advapi32/Makefile" ac_config_files="$ac_config_files dlls/advapi32/tests/Makefile" @@ -22548,6 +22550,7 @@ do "dlls/acledit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/acledit/Makefile" ;; "dlls/activeds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/activeds/Makefile" ;; "dlls/actxprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/actxprxy/Makefile" ;; + "dlls/adsiid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/adsiid/Makefile" ;; "dlls/advapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/Makefile" ;; "dlls/advapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/tests/Makefile" ;; "dlls/advpack/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advpack/Makefile" ;; diff --git a/configure.ac b/configure.ac index 3234493..c2d628b 100644 --- a/configure.ac +++ b/configure.ac @@ -1664,6 +1664,7 @@ AC_CONFIG_FILES([dlls/Makefile]) AC_CONFIG_FILES([dlls/acledit/Makefile]) AC_CONFIG_FILES([dlls/activeds/Makefile]) AC_CONFIG_FILES([dlls/actxprxy/Makefile]) +AC_CONFIG_FILES([dlls/adsiid/Makefile]) AC_CONFIG_FILES([dlls/advapi32/Makefile]) AC_CONFIG_FILES([dlls/advapi32/tests/Makefile]) AC_CONFIG_FILES([dlls/advpack/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index d294a19..9ed67df 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -271,6 +271,7 @@ BASEDIRS = \ wtsapi32 IMPLIBSUBDIRS = \ + adsiid \ dxerr8 \ dxerr9 \ dxguid \ @@ -523,6 +524,7 @@ IMPORT_SYMLINKS = \ IMPORT_LIBS = \ $(IMPORT_SYMLINKS) \ + adsiid/libadsiid.a \ dxerr8/libdxerr8.a \ dxerr9/libdxerr9.a \ dxguid/libdxguid.a \ @@ -1073,6 +1075,7 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR # Map library name to the corresponding directory +adsiid/libadsiid.a: adsiid dxerr8/libdxerr8.a: dxerr8 dxerr9/libdxerr9.a: dxerr9 dxguid/libdxguid.a: dxguid diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in new file mode 100644 index 0000000..099b811 --- /dev/null +++ b/dlls/adsiid/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = libadsiid.a + +C_SRCS = \ + adsiid.c + +(a)MAKE_IMPLIB_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/adsiid/adsiid.c b/dlls/adsiid/adsiid.c new file mode 100644 index 0000000..e4e85d8 --- /dev/null +++ b/dlls/adsiid/adsiid.c @@ -0,0 +1,27 @@ +/* + * Active Directory GUID definitions + * + * Copyright 2008 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "objbase.h" +#include "initguid.h" + +#include "iads.h"

1 0

Rob Shearman : include: Add defines for GetExceptionCode, GetExceptionInformation and AbnormalTermination to excpt. h for the MS compiler when using compiler exceptions.
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: ba29e89870659cb039cfabfa795cd365af1cd217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba29e89870659cb039cfabfa7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 6 15:03:26 2008 +0000 include: Add defines for GetExceptionCode, GetExceptionInformation and AbnormalTermination to excpt.h for the MS compiler when using compiler exceptions. --- include/excpt.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/excpt.h b/include/excpt.h index 13fa584..3369f3b 100644 --- a/include/excpt.h +++ b/include/excpt.h @@ -38,5 +38,14 @@ typedef enum _EXCEPTION_DISPOSITION #define EXCEPTION_CONTINUE_EXECUTION -1 +#if defined(_MSC_VER) && defined(USE_COMPILER_EXCEPTIONS) +#define GetExceptionCode _exception_code +#define GetExceptionInformation (struct _EXCEPTION_POINTERS *)_exception_info +#define AbnormalTermination _abnormal_termination + +unsigned long __cdecl _exception_code(void); +void * __cdecl _exception_info(void); +int __cdecl _abnormal_termination(void); +#endif /* defined(_MSC_VER) && defined(USE_COMPILER_EXCEPTIONS) */ #endif /* __WINE_EXCPT_H */

1 0

Francois Gouget : ddk: Add a stub ntddk.h header.
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: ae9411089ab5e1d6df7b5bfaf776d3957d1fcf5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9411089ab5e1d6df7b5bfaf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 6 13:27:39 2008 +0100 ddk: Add a stub ntddk.h header. --- include/Makefile.in | 1 + include/ddk/ntddk.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 73d1cb0..287cfa9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -135,6 +135,7 @@ SRCDIR_INCLUDES = \ ddk/imm.h \ ddk/mountmgr.h \ ddk/ntddcdvd.h \ + ddk/ntddk.h \ ddk/ntddser.h \ ddk/ntddtape.h \ ddk/wdm.h \ diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h new file mode 100644 index 0000000..47b6b1e --- /dev/null +++ b/include/ddk/ntddk.h @@ -0,0 +1,49 @@ +/* + * Copyright 2008 Francois Gouget for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _NTDDK_ +#define _NTDDK_ + +/* Note: We will probably have to duplicate everything ultimately :-( */ +#include <ddk/wdm.h> + +#include <excpt.h> +/* FIXME: #include <ntdef.h> */ +#include <ntstatus.h> +/* FIXME: #include <bugcodes.h> */ +/* FIXME: #include <ntiologc.h> */ + + +typedef enum _BUS_DATA_TYPE +{ + ConfigurationSpaceUndefined = -1, + Cmos, + EisaConfiguration, + Pos, + CbusConfiguration, + PCIConfiguration, + VMEConfiguration, + NuBusConfiguration, + PCMCIAConfiguration, + MPIConfiguration, + MPSAConfiguration, + PNPISAConfiguration, + MaximumBusDataType +} BUS_DATA_TYPE, *PBUS_DATA_TYPE; + +#endif

1 0

Ethan Chen : gdiplus: Implemented GdipCreateBitmapFromFileICM.
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: e0552c1bc6a24a54310f8e58904c7a3d8792a26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0552c1bc6a24a54310f8e589… Author: Ethan Chen <echen(a)thunder-08-L> Date: Tue Mar 4 19:22:01 2008 -0800 gdiplus: Implemented GdipCreateBitmapFromFileICM. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 7 +++++++ include/gdiplusflat.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b4f314a..6e28a0e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -72,7 +72,7 @@ @ stub GdipCreateAdjustableArrowCap @ stub GdipCreateBitmapFromDirectDrawSurface @ stdcall GdipCreateBitmapFromFile(wstr ptr) -@ stub GdipCreateBitmapFromFileICM +@ stdcall GdipCreateBitmapFromFileICM(wstr ptr) @ stub GdipCreateBitmapFromGdiDib @ stdcall GdipCreateBitmapFromGraphics(long long ptr ptr) @ stub GdipCreateBitmapFromHBITMAP diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 96db406..a5b6ef8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -250,6 +250,13 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, return stat; } +/* FIXME: no icm */ +GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR* filename, + GpBitmap **bitmap) +{ + return GdipCreateBitmapFromFile(filename, bitmap); +} + GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, HBITMAP* hbmReturn, ARGB background) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1f635ba..b787ab3 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -249,6 +249,7 @@ GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics*,GpMetafile*,INT*, GpStatus WINGDIPAPI GdipConvertToEmfPlusToFile(const GpGraphics*,GpMetafile*,INT*,const WCHAR*,EmfType,const WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipConvertToEmfPlusToStream(const GpGraphics*,GpMetafile*,INT*,IStream*,EmfType,const WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**); +GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*, GpBitmap**);

1 0

Francois Gouget : port: s/#if/#ifdef/ so it still works if HAVE_XXX is not defined.
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: 63040e4d90e5de7b6420ab1490680cc98f4490d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63040e4d90e5de7b6420ab149… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 6 12:35:33 2008 +0100 port: s/#if/#ifdef/ so it still works if HAVE_XXX is not defined. --- libs/port/getopt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/port/getopt.c b/libs/port/getopt.c index 7bcf279..be82779 100644 --- a/libs/port/getopt.c +++ b/libs/port/getopt.c @@ -77,7 +77,7 @@ #ifdef VMS # include <unixlib.h> -# if HAVE_STRING_H - 0 +# ifdef HAVE_STRING_H # include <string.h> # endif #endif

1 0

Francois Gouget : configure: s/#if/#ifdef/ so it still works if HAVE_XXX is not defined.
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: 9e67edfc1661f961767e26e1d4a1b063ba032996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e67edfc1661f961767e26e1d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 6 12:34:48 2008 +0100 configure: s/#if/#ifdef/ so it still works if HAVE_XXX is not defined. --- configure | 28 ++++++++++++++-------------- configure.ac | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/configure b/configure index efd7008..7be6eb1 100755 --- a/configure +++ b/configure @@ -7309,7 +7309,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/types.h> - #if HAVE_SYS_PARAM_H + #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -7378,13 +7378,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/types.h> - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - #if HAVE_SYS_SOCKETVAR_H + #ifdef HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif - #if HAVE_NETINET_IN_H + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif @@ -7446,13 +7446,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/types.h> - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - #if HAVE_SYS_SOCKETVAR_H + #ifdef HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif - #if HAVE_NETINET_IN_H + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif #ifdef HAVE_NETINET_TCP_H @@ -7520,7 +7520,7 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_ASM_TYPES_H # include <asm/types.h> #endif - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -7582,13 +7582,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/types.h> - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - #if HAVE_NETINET_IN_H + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif - #if HAVE_ARPA_NAMESER_H + #ifdef HAVE_ARPA_NAMESER_H # include <arpa/nameser.h> #endif @@ -7709,7 +7709,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/types.h> -#if HAVE_UCONTEXT_H +#ifdef HAVE_UCONTEXT_H #include <ucontext.h> #endif @@ -13644,8 +13644,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#if HAVE_FT2BUILD_H - #include <ft2build.h> +#ifdef HAVE_FT2BUILD_H + # include <ft2build.h> #endif #include <$ac_header> diff --git a/configure.ac b/configure.ac index b23a586..3234493 100644 --- a/configure.ac +++ b/configure.ac @@ -329,31 +329,31 @@ dnl **** Checks for headers that depend on other ones **** AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,, [#include <sys/types.h> - #if HAVE_SYS_PARAM_H + #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif]) AC_CHECK_HEADERS([netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if_dl.h net/if_types.h net/route.h netipx/ipx.h],,, [#include <sys/types.h> - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - #if HAVE_SYS_SOCKETVAR_H + #ifdef HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif - #if HAVE_NETINET_IN_H + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif]) AC_CHECK_HEADERS([netinet/tcp_var.h],,, [#include <sys/types.h> - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - #if HAVE_SYS_SOCKETVAR_H + #ifdef HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif - #if HAVE_NETINET_IN_H + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif #ifdef HAVE_NETINET_TCP_H @@ -365,19 +365,19 @@ AC_CHECK_HEADERS([linux/ipx.h],,, #ifdef HAVE_ASM_TYPES_H # include <asm/types.h> #endif - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif]) AC_CHECK_HEADERS([resolv.h],,, [#include <sys/types.h> - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - #if HAVE_NETINET_IN_H + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif - #if HAVE_ARPA_NAMESER_H + #ifdef HAVE_ARPA_NAMESER_H # include <arpa/nameser.h> #endif]) @@ -385,7 +385,7 @@ AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>]) AC_CHECK_HEADERS([sys/thr.h],,, [#include <sys/types.h> -#if HAVE_UCONTEXT_H +#ifdef HAVE_UCONTEXT_H #include <ucontext.h> #endif]) @@ -969,8 +969,8 @@ then freetype/ftwinfnt.h \ freetype/ftmodapi.h \ freetype/internal/sfnt.h,,, - [#if HAVE_FT2BUILD_H - #include <ft2build.h> + [#ifdef HAVE_FT2BUILD_H + # include <ft2build.h> #endif]) AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <ft2build.h> #include <freetype/fttrigon.h>]])],[AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1,

1 0

Francois Gouget : ws2_32: s/#if/#ifdef/ so it still works if HAVE_XXX is not defined.
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: f5ea0fd2e47f30991a9aef9d75eca42d5b350c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ea0fd2e47f30991a9aef9d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 6 12:33:25 2008 +0100 ws2_32: s/#if/#ifdef/ so it still works if HAVE_XXX is not defined. --- dlls/ws2_32/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 502f309..a06aabf 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3390,7 +3390,7 @@ static int convert_eai_u2w(int unixret) { */ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addrinfo *hints, struct WS_addrinfo **res) { -#if HAVE_GETADDRINFO +#ifdef HAVE_GETADDRINFO struct addrinfo *unixaires = NULL; int result; struct addrinfo unixhints, *punixhints = NULL; @@ -3507,7 +3507,7 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, DWORD hostlen, PCHAR serv, DWORD servlen, INT flags) { -#if HAVE_GETNAMEINFO +#ifdef HAVE_GETNAMEINFO int ret; union generic_unix_sockaddr sa_u; unsigned int size;

1 0

James Hawkins : msi: Break out the publishing tests into their respective actions.
by Alexandre Julliard March 6, 2008

March 6, 2008

Module: wine Branch: master Commit: c8acf21e0ce636207e1a4a0786dd3ee9780dbdd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8acf21e0ce636207e1a4a078… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Mar 5 23:10:05 2008 -0600 msi: Break out the publishing tests into their respective actions. --- dlls/msi/tests/install.c | 705 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 529 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8acf21e0ce636207e1a4…

1 0