January 2013 - Wine-Commits

Hans Leidekker : msi: Implement MsiQueryFeatureStateExA/W.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 5891ce25e5b45e69611c2848b87f9bf7a9c416bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5891ce25e5b45e69611c2848b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 9 11:44:19 2013 +0100 msi: Implement MsiQueryFeatureStateExA/W. --- dlls/msi/msi.c | 231 ++++++++++++++++++++++++++--------------------- dlls/msi/msi.spec | 4 +- dlls/msi/tests/action.c | 139 ++++++++++++++++++++--------- include/msi.h | 4 + 4 files changed, 230 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5891ce25e5b45e69611c2…

1 0

Alexandre Julliard : kernel32: Retrieve the system info from ntdll on startup.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 62f22dd4e3ab4f4b21f8e6b571fd7f9ba3547020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f22dd4e3ab4f4b21f8e6b57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 22:02:21 2013 +0100 kernel32: Retrieve the system info from ntdll on startup. --- dlls/kernel32/cpu.c | 19 +++++++++---------- dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/process.c | 2 ++ dlls/kernel32/virtual.c | 18 ++++++------------ 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 333e402..0ebf8f3 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -39,9 +39,10 @@ #include "winnt.h" #include "winternl.h" #include "psapi.h" +#include "ddk/wdm.h" #include "wine/unicode.h" +#include "kernel_private.h" #include "wine/debug.h" -#include "ddk/wdm.h" WINE_DEFAULT_DEBUG_CHANNEL(reg); @@ -104,13 +105,11 @@ VOID WINAPI GetSystemInfo( LPSYSTEM_INFO si /* [out] Destination for system information, may not be NULL */) { NTSTATUS nts; - SYSTEM_BASIC_INFORMATION sbi; SYSTEM_CPU_INFORMATION sci; TRACE("si=0x%p\n", si); - if ((nts = NtQuerySystemInformation( SystemBasicInformation, &sbi, sizeof(sbi), NULL )) != STATUS_SUCCESS || - (nts = NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL )) != STATUS_SUCCESS) + if ((nts = NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL )) != STATUS_SUCCESS) { SetLastError(RtlNtStatusToDosError(nts)); return; @@ -118,11 +117,11 @@ VOID WINAPI GetSystemInfo( si->u.s.wProcessorArchitecture = sci.Architecture; si->u.s.wReserved = 0; - si->dwPageSize = sbi.PageSize; - si->lpMinimumApplicationAddress = sbi.LowestUserAddress; - si->lpMaximumApplicationAddress = sbi.HighestUserAddress; - si->dwActiveProcessorMask = sbi.ActiveProcessorsAffinityMask; - si->dwNumberOfProcessors = sbi.NumberOfProcessors; + si->dwPageSize = system_info.PageSize; + si->lpMinimumApplicationAddress = system_info.LowestUserAddress; + si->lpMaximumApplicationAddress = system_info.HighestUserAddress; + si->dwActiveProcessorMask = system_info.ActiveProcessorsAffinityMask; + si->dwNumberOfProcessors = system_info.NumberOfProcessors; switch (sci.Architecture) { @@ -162,7 +161,7 @@ VOID WINAPI GetSystemInfo( FIXME("Unknown processor architecture %x\n", sci.Architecture); si->dwProcessorType = 0; } - si->dwAllocationGranularity = sbi.AllocationGranularity; + si->dwAllocationGranularity = system_info.AllocationGranularity; si->wProcessorLevel = sci.Level; si->wProcessorRevision = sci.Revision; } diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index feeeb55..cfc2935 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -53,6 +53,7 @@ static inline obj_handle_t console_handle_unmap(HANDLE h) #define KERNEL32_CONSOLE_SHELL ((HANDLE)2) extern HMODULE kernel32_handle DECLSPEC_HIDDEN; +extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; extern const WCHAR *DIR_Windows DECLSPEC_HIDDEN; extern const WCHAR *DIR_System DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 3a88aaa..8fcf67b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -87,6 +87,7 @@ static BOOL is_wow64; static const int is_win64 = (sizeof(void *) > sizeof(int)); HMODULE kernel32_handle = 0; +SYSTEM_BASIC_INFORMATION system_info = { 0 }; const WCHAR *DIR_Windows = NULL; const WCHAR *DIR_System = NULL; @@ -1146,6 +1147,7 @@ void CDECL __wine_kernel_init(void) setbuf(stderr,NULL); kernel32_handle = GetModuleHandleW(kernel32W); IsWow64Process( GetCurrentProcess(), &is_wow64 ); + NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); LOCALE_Init(); diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index bddd638..0470073 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -48,8 +48,6 @@ WINE_DECLARE_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(file); -static unsigned int page_size; - /*********************************************************************** * VirtualAlloc (KERNEL32.@) @@ -648,19 +646,17 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) { if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!ptr) return TRUE; - - if (!page_size) page_size = getpagesize(); __TRY { volatile const char *p = ptr; char dummy __attribute__((unused)); UINT count = size; - while (count > page_size) + while (count > system_info.PageSize) { dummy = *p; - p += page_size; - count -= page_size; + p += system_info.PageSize; + count -= system_info.PageSize; } dummy = p[0]; dummy = p[count - 1]; @@ -692,18 +688,16 @@ BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT size ) { if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!ptr) return TRUE; - - if (!page_size) page_size = getpagesize(); __TRY { volatile char *p = ptr; UINT count = size; - while (count > page_size) + while (count > system_info.PageSize) { *p |= 0; - p += page_size; - count -= page_size; + p += system_info.PageSize; + count -= system_info.PageSize; } p[0] |= 0; p[count - 1] |= 0;

1 0

Alexandre Julliard : server: Use sysconf() instead of getpagesize().
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 2b97a064e3a2a2a6bdfc9c16064193e4fde80b6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b97a064e3a2a2a6bdfc9c160… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 22:02:28 2013 +0100 server: Use sysconf() instead of getpagesize(). --- server/mapping.c | 35 +++-------------------------------- 1 files changed, 3 insertions(+), 32 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 90956e9..be0d885 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -108,36 +108,7 @@ static const struct fd_ops mapping_fd_ops = static struct list shared_list = LIST_INIT(shared_list); -#ifdef __i386__ - -/* These are always the same on an i386, and it will be faster this way */ -# define page_mask 0xfff -# define page_shift 12 -# define init_page_size() do { /* nothing */ } while(0) - -#else /* __i386__ */ - -static int page_shift, page_mask; - -static void init_page_size(void) -{ - int page_size; -# ifdef HAVE_GETPAGESIZE - page_size = getpagesize(); -# else -# ifdef __svr4__ - page_size = sysconf(_SC_PAGESIZE); -# else -# error Cannot get the page size on this platform -# endif -# endif - page_mask = page_size - 1; - /* Make sure we have a power of 2 */ - assert( !(page_size & page_mask) ); - page_shift = 0; - while ((1 << page_shift) != page_size) page_shift++; -} -#endif /* __i386__ */ +static size_t page_mask; #define ROUND_SIZE(size) (((size) + page_mask) & ~page_mask) @@ -474,7 +445,7 @@ static struct object *create_mapping( struct directory *root, const struct unico int unix_fd; struct stat st; - if (!page_mask) init_page_size(); + if (!page_mask) page_mask = sysconf( _SC_PAGESIZE ) - 1; if (!(mapping = create_named_object_dir( root, name, attr, &mapping_ops ))) return NULL; @@ -647,7 +618,7 @@ static enum server_fd_type mapping_get_fd_type( struct fd *fd ) int get_page_size(void) { - if (!page_mask) init_page_size(); + if (!page_mask) page_mask = sysconf( _SC_PAGESIZE ) - 1; return page_mask + 1; }

1 0

Alexandre Julliard : configure: Get rid of the check for strings.h.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: af59e6f1b7f88952e983434b383e3b8a7acb4384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af59e6f1b7f88952e983434b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 9 12:25:14 2013 +0100 configure: Get rid of the check for strings.h. --- configure | 1 - configure.ac | 1 - dlls/ntdll/serial.c | 3 --- libs/port/getopt.c | 20 ++------------------ 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/configure b/configure index be9e7df..0b58099 100755 --- a/configure +++ b/configure @@ -5896,7 +5896,6 @@ for ac_header in \ scsi/sg.h \ stdbool.h \ stdint.h \ - strings.h \ stropts.h \ sys/asoundlib.h \ sys/attr.h \ diff --git a/configure.ac b/configure.ac index d5b2a41..66a7aa6 100644 --- a/configure.ac +++ b/configure.ac @@ -483,7 +483,6 @@ AC_CHECK_HEADERS(\ scsi/sg.h \ stdbool.h \ stdint.h \ - strings.h \ stropts.h \ sys/asoundlib.h \ sys/attr.h \ diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 231466c..3763959 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -27,9 +27,6 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif #ifdef HAVE_TERMIOS_H #include <termios.h> #endif diff --git a/libs/port/getopt.c b/libs/port/getopt.c index e38d137..fb1e315 100644 --- a/libs/port/getopt.c +++ b/libs/port/getopt.c @@ -203,22 +203,8 @@ static enum /* Value of POSIXLY_CORRECT environment variable. */ static char *posixly_correct; -#ifdef __GNU_LIBRARY__ -/* We want to avoid inclusion of string.h with non-GNU libraries - because there are many ways it can cause trouble. - On some systems, it contains special magic macros that don't work - in GCC. */ -# include <string.h> -# define my_index strchr -#else - -# ifdef HAVE_STRING_H -# include <string.h> -# else -# include <strings.h> -# endif - -# define my_index strchr +#include <string.h> +#define my_index strchr /* If using GCC, we can safely declare strlen this way. If not using GCC, it is ok not to declare it. */ @@ -232,8 +218,6 @@ extern int strlen (const char *); # endif /* not __STDC__ */ #endif /* __GNUC__ */ -#endif /* not __GNU_LIBRARY__ */ - /* Handle permutation of arguments. */ /* Describe the part of ARGV that contains non-options that have

1 0

Dmitry Timoshkov : windowscodecs: Add a test for loading a . bmp file with BITMAPINFOHEADER.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 01ab797b64300f21dada7973c4278f3eab6dc342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ab797b64300f21dada7973c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 9 15:46:23 2013 +0800 windowscodecs: Add a test for loading a .bmp file with BITMAPINFOHEADER. --- dlls/windowscodecs/tests/bmpformat.c | 29 ++++++++++++++++++++++------- include/wincodec.idl | 1 + 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 39820b3..5140577 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -31,15 +31,21 @@ static const char testbmp_24bpp[] = { /* BITMAPFILEHEADER */ 66,77, /* "BM" */ - 50,0,0,0, /* file size */ + 78,0,0,0, /* file size */ 0,0,0,0, /* reserved */ - 26,0,0,0, /* offset to bits */ - /* BITMAPCOREHEADER */ - 12,0,0,0, /* header size */ - 2,0, /* width */ - 3,0, /* height */ + 54,0,0,0, /* offset to bits */ + /* BITMAPINFOHEADER */ + 40,0,0,0, /* header size */ + 2,0,0,0, /* width */ + 3,0,0,0, /* height */ 1,0, /* planes */ 24,0, /* bit count */ + 0,0,0,0, /* compression */ + 0,0,0,0, /* image size */ + 0x74,0x12,0,0, /* X pels per meter => 120 dpi */ + 0,0,0,0, /* Y pels per meter */ + 0,0,0,0, /* colors used */ + 0,0,0,0, /* colors important */ /* bits */ 0,0,0, 0,255,0, 0,0, 255,0,0, 255,255,0, 0,0, @@ -86,7 +92,14 @@ static void test_decode_24bpp(void) if (SUCCEEDED(hr)) { hr = IWICBitmapDecoder_Initialize(decoder, bmpstream, WICDecodeMetadataCacheOnLoad); - ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + ok(hr == S_OK || broken(hr == WINCODEC_ERR_BADIMAGE) /* XP */, "Initialize failed, hr=%x\n", hr); + if (FAILED(hr)) + { + win_skip("BMP decoder failed to initialize\n"); + GlobalFree(hbmpdata); + IWICBitmapDecoder_Release(decoder); + return; + } hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); @@ -125,7 +138,9 @@ static void test_decode_24bpp(void) hr = IWICBitmapFrameDecode_GetResolution(framedecode, &dpiX, &dpiY); ok(SUCCEEDED(hr), "GetResolution failed, hr=%x\n", hr); +todo_wine ok(dpiX == 96.0, "expected dpiX=96.0, got %f\n", dpiX); +todo_wine ok(dpiY == 96.0, "expected dpiY=96.0, got %f\n", dpiY); hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); diff --git a/include/wincodec.idl b/include/wincodec.idl index b4f2a6a..c727bf3 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -213,6 +213,7 @@ cpp_quote("#define WINCODEC_ERR_PROPERTYNOTFOUND 0x88982f40") cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50") +cpp_quote("#define WINCODEC_ERR_BADIMAGE 0x88982f60") cpp_quote("#define WINCODEC_ERR_FRAMEMISSING 0x88982f62") cpp_quote("#define WINCODEC_ERR_BADMETADATAHEADER 0x88982f63") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80")

1 0

Marcus Meissner : oleaut32: Mark various symbols as hidden.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 063dccdd8ac46589032191e4dbe9755b26d3a41f URL: http://source.winehq.org/git/wine.git/?a=commit;h=063dccdd8ac46589032191e4d… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Jan 9 03:20:24 2013 +0100 oleaut32: Mark various symbols as hidden. --- dlls/oleaut32/connpt.h | 2 +- dlls/oleaut32/typelib.h | 14 +++++++------- dlls/oleaut32/variant.h | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/connpt.h b/dlls/oleaut32/connpt.h index cac3ae6..e0bdd8b 100644 --- a/dlls/oleaut32/connpt.h +++ b/dlls/oleaut32/connpt.h @@ -19,6 +19,6 @@ #ifndef _CONNPT_H #define _CONNPT_H -HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid, IConnectionPoint **pCP); +HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid, IConnectionPoint **pCP) DECLSPEC_HIDDEN; #endif /* _CONNPT_H */ diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index d6e752a..7277b58 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -597,16 +597,16 @@ WORD typeofarray #include "poppack.h" /* heap allocation helpers */ -extern void* heap_alloc_zero(unsigned size); -extern void* heap_alloc(unsigned size); -extern void* heap_realloc(void *ptr, unsigned size); -extern void heap_free(void *ptr); +extern void* heap_alloc_zero(unsigned size) DECLSPEC_HIDDEN __WINE_ALLOC_SIZE(1); +extern void* heap_alloc(unsigned size) DECLSPEC_HIDDEN __WINE_ALLOC_SIZE(1); +extern void* heap_realloc(void *ptr, unsigned size) DECLSPEC_HIDDEN; +extern void heap_free(void *ptr) DECLSPEC_HIDDEN; -HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ); +HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) DECLSPEC_HIDDEN; -extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args); +extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) DECLSPEC_HIDDEN; -HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv); +HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN; /* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */ DEFINE_OLEGUID( CLSID_PSDispatch, 0x00020420, 0x0000, 0x0000 ); diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index 265fcc8..b6af547 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -48,12 +48,12 @@ #define VTBIT_VARIANT (1 << VT_VARIANT) #define VTBIT_15 (1 << 15) /* no variant type with this number */ -extern const char * const wine_vtypes[]; +extern const char * const wine_vtypes[] DECLSPEC_HIDDEN; #define debugstr_vt(v) (((v)&VT_TYPEMASK) <= VT_CLSID ? wine_vtypes[((v)&VT_TYPEMASK)] : \ ((v)&VT_TYPEMASK) == VT_BSTR_BLOB ? "VT_BSTR_BLOB": "Invalid") #define debugstr_VT(v) (!(v) ? "(null)" : debugstr_vt(V_TYPE((v)))) -extern const char * const wine_vflags[]; +extern const char * const wine_vflags[] DECLSPEC_HIDDEN; #define debugstr_vf(v) (wine_vflags[((v)&VT_EXTRA_TYPE)>>12]) #define debugstr_VF(v) (!(v) ? "(null)" : debugstr_vf(V_EXTRA_TYPE(v))) @@ -125,5 +125,5 @@ typedef struct tagVARIANT_NUMBER_CHARS } VARIANT_NUMBER_CHARS; -BOOL VARIANT_GetLocalisedText(LANGID, DWORD, WCHAR *); -HRESULT VARIANT_ClearInd(VARIANTARG *); +BOOL VARIANT_GetLocalisedText(LANGID, DWORD, WCHAR *) DECLSPEC_HIDDEN; +HRESULT VARIANT_ClearInd(VARIANTARG *) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3d8/tests: Merge texture.c into device.c.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 59aab5ca5c5c031635746a5c5ef10c87ee64d677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59aab5ca5c5c031635746a5c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 9 11:27:16 2013 +0100 d3d8/tests: Merge texture.c into device.c. --- dlls/d3d8/tests/Makefile.in | 1 - dlls/d3d8/tests/device.c | 157 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/tests/texture.c | 157 ------------------------------------------- 3 files changed, 157 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59aab5ca5c5c031635746…

1 0

Henri Verbeet : d3d8/tests: Merge surface.c into device.c.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: f279d09f78720691ad5eb7291d64f20a4f14e445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f279d09f78720691ad5eb7291… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 9 17:29:37 2013 +0100 d3d8/tests: Merge surface.c into device.c. --- dlls/d3d8/tests/Makefile.in | 1 - dlls/d3d8/tests/device.c | 705 ++++++++++++++++++++++++++++++++++++++++++- dlls/d3d8/tests/surface.c | 653 --------------------------------------- 3 files changed, 703 insertions(+), 656 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f279d09f78720691ad5eb…

1 0

Alexandre Julliard : configure: Get rid of the check for getpagesize.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 61768c0775c0a5feed3c54bc75d9034e085d5b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61768c0775c0a5feed3c54bc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 22:06:25 2013 +0100 configure: Get rid of the check for getpagesize. --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 6 +----- libs/port/Makefile.in | 1 - libs/port/getpagesize.c | 39 --------------------------------------- 6 files changed, 1 insertions(+), 50 deletions(-) diff --git a/configure b/configure index 6dc5b50..be9e7df 100755 --- a/configure +++ b/configure @@ -12963,7 +12963,6 @@ for ac_func in \ getattrlist \ getdirentries \ getopt_long_only \ - getpagesize \ getpwuid \ gettimeofday \ getuid \ diff --git a/configure.ac b/configure.ac index 4b0c360..d5b2a41 100644 --- a/configure.ac +++ b/configure.ac @@ -1999,7 +1999,6 @@ AC_CHECK_FUNCS(\ getattrlist \ getdirentries \ getopt_long_only \ - getpagesize \ getpwuid \ gettimeofday \ getuid \ diff --git a/include/config.h.in b/include/config.h.in index 9dc3e14..b8acb15 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -212,9 +212,6 @@ /* Define to 1 if you have the `getopt_long_only' function. */ #undef HAVE_GETOPT_LONG_ONLY -/* Define to 1 if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE - /* Define to 1 if you have the `getprotobyname' function. */ #undef HAVE_GETPROTOBYNAME diff --git a/include/wine/port.h b/include/wine/port.h index 9a9bb88..1bcc0e5 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -44,6 +44,7 @@ # include <process.h> #endif #include <string.h> +#include <stdlib.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -257,10 +258,6 @@ extern int getopt_long_only (int ___argc, char *const *___argv, int ffs( int x ); #endif -#ifndef HAVE_GETPAGESIZE -size_t getpagesize(void); -#endif /* HAVE_GETPAGESIZE */ - #ifndef HAVE_ISINF int isinf(double x); #endif @@ -453,7 +450,6 @@ extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, #define fstatvfs __WINE_NOT_PORTABLE(fstatvfs) #define getopt_long __WINE_NOT_PORTABLE(getopt_long) #define getopt_long_only __WINE_NOT_PORTABLE(getopt_long_only) -#define getpagesize __WINE_NOT_PORTABLE(getpagesize) #define interlocked_cmpxchg __WINE_NOT_PORTABLE(interlocked_cmpxchg) #define interlocked_cmpxchg_ptr __WINE_NOT_PORTABLE(interlocked_cmpxchg_ptr) #define interlocked_xchg __WINE_NOT_PORTABLE(interlocked_xchg) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 71074b2..79bd1fe 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -7,7 +7,6 @@ C_SRCS = \ fstatvfs.c \ getopt.c \ getopt1.c \ - getpagesize.c \ interlocked.c \ isinf.c \ isnan.c \ diff --git a/libs/port/getpagesize.c b/libs/port/getpagesize.c deleted file mode 100644 index 0271e5d..0000000 --- a/libs/port/getpagesize.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * getpagesize function - * - * Copyright 1996 Alexandre Julliard - * - * 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 "config.h" -#include "wine/port.h" - -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -#ifndef HAVE_GETPAGESIZE -size_t getpagesize(void) -{ -# ifdef __svr4__ - return sysconf(_SC_PAGESIZE); -# elif defined(__i386__) || defined(__x86_64__) - return 4096; -# else -# error Cannot get the page size on this platform -# endif -} -#endif /* HAVE_GETPAGESIZE */

1 0

Alexandre Julliard : libwine: Use sysconf() instead of getpagesize().
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: cef0fde53d4be918ea33df20f5e368d1cb3fce86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef0fde53d4be918ea33df20f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 22:02:37 2013 +0100 libwine: Use sysconf() instead of getpagesize(). --- libs/wine/loader.c | 2 +- libs/wine/mmap.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 9681381..302e9c1 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -380,7 +380,7 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) IMAGE_SECTION_HEADER *sec; BYTE *addr; DWORD code_start, data_start, data_end; - const size_t page_size = getpagesize(); + const size_t page_size = sysconf( _SC_PAGESIZE ); const size_t page_mask = page_size - 1; int delta, nb_sections = 2; /* code + data */ unsigned int i; diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 44fc53f..b219147 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -104,7 +104,7 @@ static int try_mmap_fixed (void *addr, size_t len, int prot, int flags, int fildes, off_t off) { char * volatile result = NULL; - int pagesize = getpagesize(); + const size_t pagesize = sysconf( _SC_PAGESIZE ); pid_t pid, wret; /* We only try to map to a fixed address if @@ -255,7 +255,7 @@ static inline void reserve_area( void *addr, void *end ) #if (defined(__svr4__) || defined(__NetBSD__)) && !defined(MAP_TRYFIXED) /* try_mmap_fixed is inefficient when using vfork, so we need a different algorithm here */ /* we assume no other thread is running at this point */ - size_t i, pagesize = getpagesize(); + size_t i, pagesize = sysconf( _SC_PAGESIZE ); char vec; while (size) @@ -321,19 +321,19 @@ static inline void reserve_malloc_space( size_t size ) */ static inline void reserve_dos_area(void) { - const size_t page_size = getpagesize(); + const size_t first_page = 0x1000; const size_t dos_area_size = 0x110000; void *ptr; /* first page has to be handled specially */ - ptr = wine_anon_mmap( (void *)page_size, dos_area_size - page_size, PROT_NONE, MAP_NORESERVE ); - if (ptr != (void *)page_size) + ptr = wine_anon_mmap( (void *)first_page, dos_area_size - first_page, PROT_NONE, MAP_NORESERVE ); + if (ptr != (void *)first_page) { - if (ptr != (void *)-1) munmap( ptr, dos_area_size - page_size ); + if (ptr != (void *)-1) munmap( ptr, dos_area_size - first_page ); return; } /* now add first page with MAP_FIXED */ - wine_anon_mmap( NULL, page_size, PROT_NONE, MAP_NORESERVE|MAP_FIXED ); + wine_anon_mmap( NULL, first_page, PROT_NONE, MAP_NORESERVE|MAP_FIXED ); wine_mmap_add_reserved_area( NULL, dos_area_size ); }

1 0