wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Alexandre Julliard : configure: Get rid of the check for strings.h.
by Alexandre Julliard 09 Jan '13

09 Jan '13

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

Alexandre Julliard : configure: Get rid of the check for getpagesize.
by Alexandre Julliard 09 Jan '13

09 Jan '13

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 09 Jan '13

09 Jan '13

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

Alexandre Julliard : server: Use sysconf() instead of getpagesize().
by Alexandre Julliard 09 Jan '13

09 Jan '13

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 : dbghelp: Use sysconf() instead of getpagesize().
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: a81996d757a484cb4f3a41651b1ececb3889dfc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81996d757a484cb4f3a41651… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 22:01:40 2013 +0100 dbghelp: Use sysconf() instead of getpagesize(). --- dlls/dbghelp/elf_module.c | 16 ++++++---------- dlls/dbghelp/macho_module.c | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 92b4a31..874835d 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -102,9 +102,7 @@ struct elf_module_info const char* elf_map_section(struct image_section_map* ism) { struct elf_file_map* fmap = &ism->fmap->u.elf; - - unsigned long pgsz = getpagesize(); - unsigned long ofst, size; + size_t ofst, size, pgsz = sysconf( _SC_PAGESIZE ); assert(ism->fmap->modtype == DMT_ELF); if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.elf.elfhdr.e_shnum || @@ -174,12 +172,10 @@ void elf_unmap_section(struct image_section_map* ism) if (ism->sidx >= 0 && ism->sidx < fmap->elfhdr.e_shnum && !fmap->target_copy && fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP) { - unsigned long pgsz = getpagesize(); - unsigned long ofst, size; - - ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(pgsz - 1); - size = ((fmap->sect[ism->sidx].shdr.sh_offset + - fmap->sect[ism->sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst; + size_t pgsz = sysconf( _SC_PAGESIZE ); + size_t ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(pgsz - 1); + size_t size = ((fmap->sect[ism->sidx].shdr.sh_offset + + fmap->sect[ism->sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst; if (munmap((char*)fmap->sect[ism->sidx].mapped, size) < 0) WARN("Couldn't unmap the section\n"); fmap->sect[ism->sidx].mapped = IMAGE_NO_MAP; @@ -279,7 +275,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* struct stat statbuf; int i; Elf_Phdr phdr; - unsigned long tmp, page_mask = getpagesize() - 1; + size_t tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; char* filename; unsigned len; BOOL ret = FALSE; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4d908a6..1aaa7f1 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -135,7 +135,7 @@ static void macho_calc_range(const struct macho_file_map* fmap, unsigned offset, unsigned* out_aligned_end, unsigned* out_aligned_len, unsigned* out_misalign) { - unsigned pagemask = getpagesize() - 1; + unsigned pagemask = sysconf( _SC_PAGESIZE ) - 1; unsigned file_offset, misalign; file_offset = fmap->arch_offset + offset; @@ -383,7 +383,7 @@ static int macho_accum_segs_range(struct macho_file_map* fmap, const struct load_command* lc, void* user) { const struct segment_command* sc = (const struct segment_command*)lc; - unsigned tmp, page_mask = getpagesize() - 1; + unsigned tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; TRACE("(%p/%d, %p, %p) before: 0x%08x - 0x%08x\n", fmap, fmap->fd, lc, user, (unsigned)fmap->segs_start, (unsigned)fmap->segs_size);

1 0

Alexandre Julliard : kernel32: Retrieve the system info from ntdll on startup.
by Alexandre Julliard 09 Jan '13

09 Jan '13

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 : winedevice: Retrieve the page size from ntdll.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: 58176bba105c4e9af54f0ea9ef13fe06ce886819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58176bba105c4e9af54f0ea9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 22:01:48 2013 +0100 winedevice: Retrieve the page size from ntdll. --- programs/winedevice/device.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index e48218e..72bc124 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -66,7 +66,7 @@ static HMODULE load_driver_module( const WCHAR *name ) { IMAGE_NT_HEADERS *nt; const IMAGE_IMPORT_DESCRIPTOR *imports; - size_t page_size = getpagesize(); + SYSTEM_BASIC_INFORMATION info; int i; INT_PTR delta; ULONG size; @@ -80,7 +80,8 @@ static HMODULE load_driver_module( const WCHAR *name ) /* the loader does not apply relocations to non page-aligned binaries or executables, * we have to do it ourselves */ - if (nt->OptionalHeader.SectionAlignment < page_size || + NtQuerySystemInformation( SystemBasicInformation, &info, sizeof(info), NULL ); + if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { DWORD old; @@ -94,10 +95,10 @@ static HMODULE load_driver_module( const WCHAR *name ) while (rel < end && rel->SizeOfBlock) { void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, page_size, PAGE_EXECUTE_READWRITE, &old ); + VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, page_size, old, NULL ); + if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, NULL ); if (!rel) goto error; } /* make sure we don't try again */

1 0

Jacek Caban : winegecko: Added 1.9 release.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: tools Branch: master Commit: 381335d0e6de554d74d34b2a26909e7e720aca57 URL: http://source.winehq.org/git/tools.git/?a=commit;h=381335d0e6de554d74d34b2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 9 14:20:57 2013 +0100 winegecko: Added 1.9 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index c311be7..8f4186e 100644 --- a/winegecko.php +++ b/winegecko.php @@ -70,7 +70,9 @@ $aFileSizes = array( '1.7-x86'=>16995328, '1.7-x86_64'=>17438720, '1.8-x86'=>17774592, - '1.8-x86_64'=>18238976 + '1.8-x86_64'=>18238976, + '1.9-x86'=>19060224, + '1.9-x86_64'=>19622400 ); // Exact size of the file:

1 0

Huw Davies : usp10: Simplify the offset calculation by always using ETO_PDY .
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 082f98957587aa442b3ae1ffeb5d414bfff41425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082f98957587aa442b3ae1ffe… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 8 16:05:31 2013 +0000 usp10: Simplify the offset calculation by always using ETO_PDY. --- dlls/usp10/usp10.c | 40 +++++++++------------------------------- 1 files changed, 9 insertions(+), 31 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 6ff640e..75fe597 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3253,41 +3253,19 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2); + fuOptions |= ETO_PDY; - if (pGoffset) - { - for (i = 0; i < cGlyphs; i++) - if (!(fuOptions&ETO_PDY) && pGoffset[i].dv) - fuOptions |= ETO_PDY; - } for (i = 0; i < cGlyphs; i++) { - int idx = i; - if (fuOptions&ETO_PDY) - { - idx *=2; - lpDx[idx+1] = 0; - } - lpDx[idx] = piAdvance[i]; - } - if (pGoffset) - { - for (i = 1; i < cGlyphs; i++) + lpDx[i * 2] = piAdvance[i]; + lpDx[i * 2 + 1] = 0; + + if (pGoffset && i > 0) { - int idx = i; - int prev_idx = i-1; - if (fuOptions&ETO_PDY) - { - idx*=2; - prev_idx = idx-2; - } - lpDx[prev_idx] += pGoffset[i].du; - lpDx[idx] -= pGoffset[i].du; - if (fuOptions&ETO_PDY) - { - lpDx[prev_idx+1] += pGoffset[i].dv; - lpDx[idx+1] -= pGoffset[i].dv; - } + lpDx[(i - 1) * 2] += pGoffset[i].du; + lpDx[(i - 1) * 2 + 1] += pGoffset[i].dv; + lpDx[i * 2] -= pGoffset[i].du; + lpDx[i * 2 + 1] -= pGoffset[i].dv; } }

1 0

Aric Stewart : usp10: Add GSUB ccmp feature to Hebrew.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: a1648ac5e735df5b1395fb75a0b25060031236b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1648ac5e735df5b1395fb75a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 8 10:01:24 2013 -0600 usp10: Add GSUB ccmp feature to Hebrew. --- dlls/usp10/shape.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index d446db1..b7a8baf 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -182,6 +182,7 @@ static OPENTYPE_FEATURE_RECORD arabic_gpos_features[] = static OPENTYPE_FEATURE_RECORD hebrew_features[] = { + { MS_MAKE_TAG('c','c','m','p'), 1}, { MS_MAKE_TAG('d','l','i','g'), 0}, }; @@ -457,7 +458,7 @@ static const ScriptShapeData ShapingData[] = {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, - {{ hebrew_features, 1}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, ShapeCharGlyphProp_Hebrew}, + {{ hebrew_features, 2}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, ShapeCharGlyphProp_Hebrew}, {{ syriac_features, 4}, {syriac_gpos_features, 3}, required_syriac_features, 0, ContextualShape_Syriac, ShapeCharGlyphProp_None}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ NULL, 0}, {NULL, 0}, NULL, 0, ContextualShape_Thaana, ShapeCharGlyphProp_None}, @@ -528,7 +529,7 @@ static const ScriptShapeData ShapingData[] = {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ hebrew_features, 1}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, NULL}, + {{ hebrew_features, 2}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, NULL}, {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, {{ thai_features, 1}, {thai_gpos_features, 3}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, };

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
74
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 January 2013