July 2006 - Wine-commits - list.winehq.org

Mike McCormack : configure: Check for freetype-config first, then use the libraries it specifies.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: d9ef88cd7d236bfa715a52b5c54e7ac9c4107ace URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d9ef88cd7d236bfa715a52b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 15:24:44 2006 +0900 configure: Check for freetype-config first, then use the libraries it specifies. --- configure | 187 +++++++++++++++++++++++++++++----------------------------- configure.ac | 31 +++++----- 2 files changed, 112 insertions(+), 106 deletions(-) diff --git a/configure b/configure index dcc6a5c..5463ff9 100755 --- a/configure +++ b/configure @@ -13125,13 +13125,103 @@ FREETYPELIBS="" FREETYPEINCL="" -{ echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5 +# Extract the first word of "freetype-config", so it can be a program name with args. +set dummy freetype-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ft_devel+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ft_devel"; then + ac_cv_prog_ft_devel="$ft_devel" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ft_devel="freetype-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_ft_devel" && ac_cv_prog_ft_devel="no" +fi +fi +ft_devel=$ac_cv_prog_ft_devel +if test -n "$ft_devel"; then + { echo "$as_me:$LINENO: result: $ft_devel" >&5 +echo "${ECHO_T}$ft_devel" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +if test "$ft_devel" = "no" +then + # Extract the first word of "freetype2-config", so it can be a program name with args. +set dummy freetype2-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ft_devel2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ft_devel2"; then + ac_cv_prog_ft_devel2="$ft_devel2" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ft_devel2="freetype2-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_ft_devel2" && ac_cv_prog_ft_devel2="no" +fi +fi +ft_devel2=$ac_cv_prog_ft_devel2 +if test -n "$ft_devel2"; then + { echo "$as_me:$LINENO: result: $ft_devel2" >&5 +echo "${ECHO_T}$ft_devel2" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + if test "$ft_devel2" = "freetype2-config" + then + ft_devel=$ft_devel2 + fi +fi + +if test "$ft_devel" = "no" +then + wine_cv_msg_freetype=yes +else + FREETYPELIBS=`$ft_devel --libs` + FREETYPEINCL=`$ft_devel --cflags` + { echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5 echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; } if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lfreetype $X_LIBS $LIBS" +LIBS="-lfreetype $FREETYPELIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13208,99 +13298,12 @@ else ft_lib=no fi -if test "$ft_lib" = "no" -then - wine_cv_msg_freetype=no -else - # Extract the first word of "freetype-config", so it can be a program name with args. -set dummy freetype-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ft_devel+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ft_devel"; then - ac_cv_prog_ft_devel="$ft_devel" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ft_devel="freetype-config" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_ft_devel" && ac_cv_prog_ft_devel="no" -fi -fi -ft_devel=$ac_cv_prog_ft_devel -if test -n "$ft_devel"; then - { echo "$as_me:$LINENO: result: $ft_devel" >&5 -echo "${ECHO_T}$ft_devel" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - if test "$ft_devel" = "no" - then - # Extract the first word of "freetype2-config", so it can be a program name with args. -set dummy freetype2-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ft_devel2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ft_devel2"; then - ac_cv_prog_ft_devel2="$ft_devel2" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ft_devel2="freetype2-config" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_ft_devel2" && ac_cv_prog_ft_devel2="no" -fi -fi -ft_devel2=$ac_cv_prog_ft_devel2 -if test -n "$ft_devel2"; then - { echo "$as_me:$LINENO: result: $ft_devel2" >&5 -echo "${ECHO_T}$ft_devel2" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - if test "$ft_devel2" = "freetype2-config" - then - ft_devel=$ft_devel2 - fi - fi - if test "$ft_devel" = "no" + if test "$ft_lib" = "no" then wine_cv_msg_freetype=yes + FREETYPELIBS="" + FREETYPEINCL="" else - FREETYPELIBS=`$ft_devel --libs` - FREETYPEINCL=`$ft_devel --cflags` ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$FREETYPEINCL $CPPFLAGS" diff --git a/configure.ac b/configure.ac index 05d2c54..426389d 100644 --- a/configure.ac +++ b/configure.ac @@ -660,26 +660,29 @@ fi dnl **** Check for FreeType 2 **** AC_SUBST(FREETYPELIBS,"") AC_SUBST(FREETYPEINCL,"") -AC_CHECK_LIB(freetype,FT_Init_FreeType,ft_lib=yes,ft_lib=no,$X_LIBS) -if test "$ft_lib" = "no" +AC_CHECK_PROG(ft_devel,freetype-config,freetype-config,no) +if test "$ft_devel" = "no" then - wine_cv_msg_freetype=no -else - AC_CHECK_PROG(ft_devel,freetype-config,freetype-config,no) - if test "$ft_devel" = "no" + AC_CHECK_PROG(ft_devel2,freetype2-config,freetype2-config,no) + if test "$ft_devel2" = "freetype2-config" then - AC_CHECK_PROG(ft_devel2,freetype2-config,freetype2-config,no) - if test "$ft_devel2" = "freetype2-config" - then - ft_devel=$ft_devel2 - fi + ft_devel=$ft_devel2 fi - if test "$ft_devel" = "no" +fi + +if test "$ft_devel" = "no" +then + wine_cv_msg_freetype=yes +else + FREETYPELIBS=`$ft_devel --libs` + FREETYPEINCL=`$ft_devel --cflags` + AC_CHECK_LIB(freetype,FT_Init_FreeType,ft_lib=yes,ft_lib=no,$FREETYPELIBS) + if test "$ft_lib" = "no" then wine_cv_msg_freetype=yes + FREETYPELIBS="" + FREETYPEINCL="" else - FREETYPELIBS=`$ft_devel --libs` - FREETYPEINCL=`$ft_devel --cflags` ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$FREETYPEINCL $CPPFLAGS" AC_CHECK_HEADERS(ft2build.h \

1 0

Mike McCormack : msi: Move COM server implementation to a separate file.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 0bfb9c3e3d87ea8b15c01b6c6a7c39566196f958 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0bfb9c3e3d87ea8b15c01b6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 19:47:00 2006 +0900 msi: Move COM server implementation to a separate file. --- dlls/msi/Makefile.in | 1 dlls/msi/msi.c | 149 ----------------------------------------- dlls/msi/msi_main.c | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msipriv.h | 1 4 files changed, 182 insertions(+), 149 deletions(-) create mode 100644 dlls/msi/msi_main.c diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index dabdf1f..744ce2b 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -25,6 +25,7 @@ C_SRCS = \ insert.c \ install.c \ msi.c \ + msi_main.c \ msiquery.c \ order.c \ package.c \ diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7e4bae3..70f9c9b 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -43,34 +43,8 @@ #include "action.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); -/* the UI level */ -INSTALLUILEVEL gUILevel = INSTALLUILEVEL_BASIC; -HWND gUIhwnd = 0; -INSTALLUI_HANDLERA gUIHandlerA = NULL; -INSTALLUI_HANDLERW gUIHandlerW = NULL; -DWORD gUIFilter = 0; -LPVOID gUIContext = NULL; -WCHAR gszLogFile[MAX_PATH]; -HINSTANCE msi_hInstance; - -static LONG dll_count; - static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; -/* - * Dll lifetime tracking declaration - */ -static void LockModule(void) -{ - InterlockedIncrement(&dll_count); -} - -static void UnlockModule(void) -{ - InterlockedDecrement(&dll_count); -} - - UINT WINAPI MsiOpenProductA(LPCSTR szProduct, MSIHANDLE *phProduct) { UINT r; @@ -1320,129 +1294,6 @@ end: return ret; } - -/****************************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - msi_hInstance = hinstDLL; - DisableThreadLibraryCalls(hinstDLL); - msi_dialog_register_class(); - break; - case DLL_PROCESS_DETACH: - msi_dialog_unregister_class(); - /* FIXME: Cleanup */ - break; - } - return TRUE; -} - -typedef struct tagIClassFactoryImpl -{ - const IClassFactoryVtbl *lpVtbl; -} IClassFactoryImpl; - -static HRESULT WINAPI MsiCF_QueryInterface(LPCLASSFACTORY iface, - REFIID riid,LPVOID *ppobj) -{ - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - FIXME("%p %s %p\n",This,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI MsiCF_AddRef(LPCLASSFACTORY iface) -{ - LockModule(); - return 2; -} - -static ULONG WINAPI MsiCF_Release(LPCLASSFACTORY iface) -{ - UnlockModule(); - return 1; -} - -static HRESULT WINAPI MsiCF_CreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) -{ - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - - FIXME("%p %p %s %p\n", This, pOuter, debugstr_guid(riid), ppobj); - return E_FAIL; -} - -static HRESULT WINAPI MsiCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) -{ - TRACE("(%p)->(%d)\n", iface, dolock); - - if(dolock) - LockModule(); - else - UnlockModule(); - - return S_OK; -} - -static const IClassFactoryVtbl MsiCF_Vtbl = -{ - MsiCF_QueryInterface, - MsiCF_AddRef, - MsiCF_Release, - MsiCF_CreateInstance, - MsiCF_LockServer -}; - -static IClassFactoryImpl Msi_CF = { &MsiCF_Vtbl }; - -/****************************************************************** - * DllGetClassObject [MSI.@] - */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) -{ - TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - - if( IsEqualCLSID (rclsid, &CLSID_IMsiServer) || - IsEqualCLSID (rclsid, &CLSID_IMsiServerMessage) || - IsEqualCLSID (rclsid, &CLSID_IMsiServerX1) || - IsEqualCLSID (rclsid, &CLSID_IMsiServerX2) || - IsEqualCLSID (rclsid, &CLSID_IMsiServerX3) ) - { - *ppv = (LPVOID) &Msi_CF; - return S_OK; - } - return CLASS_E_CLASSNOTAVAILABLE; -} - -/****************************************************************** - * DllGetVersion [MSI.@] - */ -HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *pdvi) -{ - TRACE("%p\n",pdvi); - - if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) - return E_INVALIDARG; - - pdvi->dwMajorVersion = MSI_MAJORVERSION; - pdvi->dwMinorVersion = MSI_MINORVERSION; - pdvi->dwBuildNumber = MSI_BUILDNUMBER; - pdvi->dwPlatformID = 1; - - return S_OK; -} - -/****************************************************************** - * DllCanUnloadNow [MSI.@] - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return dll_count == 0 ? S_OK : S_FALSE; -} - /*********************************************************************** * MsiGetFeatureUsageW [MSI.@] */ diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c new file mode 100644 index 0000000..1cd36a0 --- /dev/null +++ b/dlls/msi/msi_main.c @@ -0,0 +1,180 @@ +/* + * Implementation of the Microsoft Installer (msi.dll) + * + * Copyright 2006 Mike McCormack 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 + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" +#include "msipriv.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msi); + +static LONG dll_count; + +/* the UI level */ +INSTALLUILEVEL gUILevel = INSTALLUILEVEL_BASIC; +HWND gUIhwnd = 0; +INSTALLUI_HANDLERA gUIHandlerA = NULL; +INSTALLUI_HANDLERW gUIHandlerW = NULL; +DWORD gUIFilter = 0; +LPVOID gUIContext = NULL; +WCHAR gszLogFile[MAX_PATH]; +HINSTANCE msi_hInstance; + +/* + * Dll lifetime tracking declaration + */ +static void LockModule(void) +{ + InterlockedIncrement(&dll_count); +} + +static void UnlockModule(void) +{ + InterlockedDecrement(&dll_count); +} + +/****************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + msi_hInstance = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); + msi_dialog_register_class(); + break; + case DLL_PROCESS_DETACH: + msi_dialog_unregister_class(); + break; + } + return TRUE; +} + +typedef struct tagIClassFactoryImpl +{ + const IClassFactoryVtbl *lpVtbl; +} IClassFactoryImpl; + +static HRESULT WINAPI MsiCF_QueryInterface(LPCLASSFACTORY iface, + REFIID riid,LPVOID *ppobj) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + FIXME("%p %s %p\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI MsiCF_AddRef(LPCLASSFACTORY iface) +{ + LockModule(); + return 2; +} + +static ULONG WINAPI MsiCF_Release(LPCLASSFACTORY iface) +{ + UnlockModule(); + return 1; +} + +static HRESULT WINAPI MsiCF_CreateInstance(LPCLASSFACTORY iface, + LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + + FIXME("%p %p %s %p\n", This, pOuter, debugstr_guid(riid), ppobj); + return E_FAIL; +} + +static HRESULT WINAPI MsiCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) +{ + TRACE("%p %d\n", iface, dolock); + + if (dolock) + LockModule(); + else + UnlockModule(); + + return S_OK; +} + +static const IClassFactoryVtbl MsiCF_Vtbl = +{ + MsiCF_QueryInterface, + MsiCF_AddRef, + MsiCF_Release, + MsiCF_CreateInstance, + MsiCF_LockServer +}; + +static IClassFactoryImpl Msi_CF = { &MsiCF_Vtbl }; + +/****************************************************************** + * DllGetClassObject [MSI.@] + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if( IsEqualCLSID (rclsid, &CLSID_IMsiServer) || + IsEqualCLSID (rclsid, &CLSID_IMsiServerMessage) || + IsEqualCLSID (rclsid, &CLSID_IMsiServerX1) || + IsEqualCLSID (rclsid, &CLSID_IMsiServerX2) || + IsEqualCLSID (rclsid, &CLSID_IMsiServerX3) ) + { + *ppv = (LPVOID) &Msi_CF; + return S_OK; + } + return CLASS_E_CLASSNOTAVAILABLE; +} + +/****************************************************************** + * DllGetVersion [MSI.@] + */ +HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *pdvi) +{ + TRACE("%p\n",pdvi); + + if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) + return E_INVALIDARG; + + pdvi->dwMajorVersion = MSI_MAJORVERSION; + pdvi->dwMinorVersion = MSI_MINORVERSION; + pdvi->dwBuildNumber = MSI_BUILDNUMBER; + pdvi->dwPlatformID = 1; + + return S_OK; +} + +/****************************************************************** + * DllCanUnloadNow [MSI.@] + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return dll_count == 0 ? S_OK : S_FALSE; +} diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index b2fe5bc..3fa8466 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -466,6 +466,7 @@ extern INSTALLUI_HANDLERW gUIHandlerW; extern DWORD gUIFilter; extern LPVOID gUIContext; extern WCHAR gszLogFile[MAX_PATH]; +extern HINSTANCE msi_hInstance; /* memory allocation macro functions */ static inline void *msi_alloc( size_t len )

1 0

Jason Green : wined3d: Improve traces for D3DTRANSFORMSTATETYPE.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: ac8f2c033c8b182be476701f9314a65dc3bf7c60 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac8f2c033c8b182be476701… Author: Jason Green <jave27(a)gmail.com> Date: Sun Jul 23 22:54:30 2006 -0400 wined3d: Improve traces for D3DTRANSFORMSTATETYPE. Added debug function for WINED3DTRANSFORMSTATETYPE and changed all references from D3DTS_* to WINED3DTS_*. --- dlls/wined3d/device.c | 30 +++++++++++++++--------------- dlls/wined3d/drawprim.c | 8 ++++---- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/utils.c | 25 +++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_types.h | 21 +++++++++++++++++++++ 6 files changed, 70 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ac8f2c033c8b182be47…

1 0

Alexandre Julliard : ntdll: Support memory allocations inside reserved areas.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: cc297050f9e8b1f247991a0ef56b51c1fe4a5df2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc297050f9e8b1f247991a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 14:00:19 2006 +0200 ntdll: Support memory allocations inside reserved areas. --- dlls/ntdll/virtual.c | 169 ++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 123 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 20a94b9..96aca43 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -140,6 +140,8 @@ #define VIRTUAL_DEBUG_DUMP_VIEW(view) \ do { if (TRACE_ON(virtual)) VIRTUAL_DumpView(view); } while (0) static void *user_space_limit = USER_SPACE_LIMIT; +static void *preload_reserve_start; +static void *preload_reserve_end; /*********************************************************************** @@ -267,6 +269,53 @@ static struct file_view *find_view_range /*********************************************************************** + * find_free_area + * + * Find a free area between views inside the specified range. + * The csVirtual section must be held by caller. + */ +static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) +{ + struct list *ptr; + void *start; + + if (top_down) + { + start = ROUND_ADDR( (char *)end - size, mask ); + if (start >= end || start < base) return NULL; + + for (ptr = views_list.prev; ptr != &views_list; ptr = ptr->prev) + { + struct file_view *view = LIST_ENTRY( ptr, struct file_view, entry ); + + if ((char *)view->base + view->size <= (char *)start) break; + if ((char *)view->base >= (char *)start + size) continue; + start = ROUND_ADDR( (char *)view->base - size, mask ); + /* stop if remaining space is not large enough */ + if (!start || start >= end || start < base) return NULL; + } + } + else + { + start = ROUND_ADDR( (char *)base + mask, mask ); + if (start >= end || (char *)end - (char *)start < size) return NULL; + + for (ptr = views_list.next; ptr != &views_list; ptr = ptr->next) + { + struct file_view *view = LIST_ENTRY( ptr, struct file_view, entry ); + + if ((char *)view->base >= (char *)start + size) break; + if ((char *)view->base + view->size <= (char *)start) continue; + start = ROUND_ADDR( (char *)view->base + view->size + mask, mask ); + /* stop if remaining space is not large enough */ + if (!start || start >= end || (char *)end - (char *)start < size) return NULL; + } + } + return start; +} + + +/*********************************************************************** * add_reserved_area * * Add a reserved area to the list maintained by libwine. @@ -291,46 +340,6 @@ static void add_reserved_area( void *add /*********************************************************************** - * remove_reserved_area - * - * Remove a reserved area from the list maintained by libwine. - * The csVirtual section must be held by caller. - */ -static void remove_reserved_area( void *addr, size_t size ) -{ - struct file_view *view; - - LIST_FOR_EACH_ENTRY( view, &views_list, struct file_view, entry ) - { - if ((char *)view->base >= (char *)addr + size) break; - if ((char *)view->base + view->size <= (char *)addr) continue; - /* now we have an overlapping view */ - if (view->base > addr) - { - wine_mmap_remove_reserved_area( addr, (char *)view->base - (char *)addr, TRUE ); - size -= (char *)view->base - (char *)addr; - addr = view->base; - } - if ((char *)view->base + view->size >= (char *)addr + size) - { - /* view covers all the remaining area */ - wine_mmap_remove_reserved_area( addr, size, FALSE ); - size = 0; - break; - } - else /* view covers only part of the area */ - { - wine_mmap_remove_reserved_area( addr, (char *)view->base + view->size - (char *)addr, FALSE ); - size -= (char *)view->base + view->size - (char *)addr; - addr = (char *)view->base + view->size; - } - } - /* remove remaining space */ - if (size) wine_mmap_remove_reserved_area( addr, size, TRUE ); -} - - -/*********************************************************************** * is_beyond_limit * * Check if an address range goes beyond a given limit. @@ -578,6 +587,55 @@ static inline void *unmap_extra_space( v } +struct alloc_area +{ + size_t size; + size_t mask; + int top_down; + void *result; +}; + +/*********************************************************************** + * alloc_reserved_area_callback + * + * Try to map some space inside a reserved area. Callback for wine_mmap_enum_reserved_areas. + */ +static int alloc_reserved_area_callback( void *start, size_t size, void *arg ) +{ + static void * const address_space_start = (void *)0x110000; + struct alloc_area *alloc = arg; + void *end = (char *)start + size; + + if (start < address_space_start) start = address_space_start; + if (user_space_limit && end > user_space_limit) end = user_space_limit; + if (start >= end) return 0; + + /* make sure we don't touch the preloader reserved range */ + if (preload_reserve_end >= start) + { + if (preload_reserve_end >= end) + { + if (preload_reserve_start <= start) return 0; /* no space in that area */ + if (preload_reserve_start < end) end = preload_reserve_start; + } + else if (preload_reserve_start <= start) start = preload_reserve_end; + else + { + /* range is split in two by the preloader reservation, try first part */ + if ((alloc->result = find_free_area( start, preload_reserve_start, alloc->size, + alloc->mask, alloc->top_down ))) + return 1; + /* then fall through to try second part */ + start = preload_reserve_end; + } + } + if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down ))) + return 1; + + return 0; +} + + /*********************************************************************** * map_view * @@ -627,6 +685,19 @@ static NTSTATUS map_view( struct file_vi else { size_t view_size = size + mask + 1; + struct alloc_area alloc; + + alloc.size = size; + alloc.mask = mask; + alloc.top_down = top_down; + if (wine_mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) + { + ptr = alloc.result; + TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size ); + if (wine_anon_mmap( ptr, size, VIRTUAL_GetUnixProt(vprot), MAP_FIXED ) != ptr) + return STATUS_INVALID_PARAMETER; + goto done; + } for (;;) { @@ -635,13 +706,14 @@ static NTSTATUS map_view( struct file_vi if (errno == ENOMEM) return STATUS_NO_MEMORY; return STATUS_INVALID_PARAMETER; } + TRACE( "got mem with anon mmap %p-%p\n", ptr, (char *)ptr + size ); /* if we got something beyond the user limit, unmap it and retry */ if (is_beyond_limit( ptr, view_size, user_space_limit )) add_reserved_area( ptr, view_size ); else break; } ptr = unmap_extra_space( ptr, view_size, size, mask ); } - +done: status = create_view( view_ret, ptr, size, vprot ); if (status != STATUS_SUCCESS) unmap_area( ptr, size ); return status; @@ -1135,6 +1207,7 @@ BOOL is_current_process( HANDLE handle ) */ static inline void virtual_init(void) { + const char *preload; #ifndef page_mask page_size = getpagesize(); page_mask = page_size - 1; @@ -1143,6 +1216,15 @@ #ifndef page_mask page_shift = 0; while ((1 << page_shift) != page_size) page_shift++; #endif /* page_mask */ + if ((preload = getenv("WINEPRELOADRESERVE"))) + { + unsigned long start, end; + if (sscanf( preload, "%lx-%lx", &start, &end ) == 2) + { + preload_reserve_start = (void *)start; + preload_reserve_end = (void *)end; + } + } } @@ -1217,14 +1299,9 @@ BOOL VIRTUAL_HasMapping( LPCVOID addr ) */ void VIRTUAL_UseLargeAddressSpace(void) { - if (user_space_limit >= ADDRESS_SPACE_LIMIT) return; /* no large address space on win9x */ if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; - - RtlEnterCriticalSection( &csVirtual ); - remove_reserved_area( user_space_limit, (char *)ADDRESS_SPACE_LIMIT - (char *)user_space_limit ); user_space_limit = ADDRESS_SPACE_LIMIT; - RtlLeaveCriticalSection( &csVirtual ); }

1 0

Alexandre Julliard : ntdll: Allocate the PEB with NtAllocateVirtualMemory too.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 6c9ade0529fa2fe5230805acc63442a1b9cba735 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c9ade0529fa2fe5230805a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 15:19:32 2006 +0200 ntdll: Allocate the PEB with NtAllocateVirtualMemory too. --- dlls/ntdll/ntdll_misc.h | 3 ++- dlls/ntdll/thread.c | 53 +++++++++++++++++++++++++++++++++++------------ dlls/ntdll/virtual.c | 28 ++++++------------------- 3 files changed, 48 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 7a0da37..3a872ca 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -50,6 +50,8 @@ extern size_t get_signal_stack_total_siz extern void version_init( const WCHAR *appname ); extern void debug_init(void); extern HANDLE thread_init(void); +extern void virtual_init(void); +extern void virtual_init_threading(void); /* server support */ extern time_t server_start_time; @@ -106,7 +108,6 @@ extern NTSTATUS DIR_unmount_device( HAND extern NTSTATUS DIR_get_unix_cwd( char **cwd ); /* virtual memory */ -extern NTSTATUS VIRTUAL_alloc_teb( void **ret, size_t size ); extern NTSTATUS VIRTUAL_HandleFault(LPCVOID addr); extern BOOL VIRTUAL_HasMapping( LPCVOID addr ); extern void VIRTUAL_UseLargeAddressSpace(void); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index cd75090..91dbcd8 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -52,7 +52,6 @@ struct startup_info void *entry_arg; }; -static PEB peb; static PEB_LDR_DATA ldr; static RTL_USER_PROCESS_PARAMETERS params; /* default parameters if no parent */ static WCHAR current_dir[MAX_NT_PATH_LENGTH]; @@ -75,7 +74,6 @@ static inline NTSTATUS init_teb( TEB *te teb->Tib.ExceptionList = (void *)~0UL; teb->Tib.StackBase = (void *)~0UL; teb->Tib.Self = &teb->Tib; - teb->Peb = &peb; teb->StaticUnicodeString.Buffer = teb->StaticUnicodeBuffer; teb->StaticUnicodeString.MaximumLength = sizeof(teb->StaticUnicodeBuffer); @@ -148,7 +146,7 @@ static NTSTATUS init_user_process_params if (status != STATUS_SUCCESS) return status; params->AllocationSize = info_size; - peb.ProcessParameters = params; + NtCurrentTeb()->Peb->ProcessParameters = params; SERVER_START_REQ( get_startup_info ) { @@ -201,37 +199,62 @@ static NTSTATUS init_user_process_params */ HANDLE thread_init(void) { + PEB *peb; TEB *teb; void *addr; - SIZE_T info_size; + SIZE_T size, info_size; HANDLE exe_file = 0; struct ntdll_thread_data *thread_data; struct ntdll_thread_regs *thread_regs; struct wine_pthread_thread_info thread_info; static struct debug_info debug_info; /* debug info for initial thread */ - peb.NumberOfProcessors = 1; - peb.ProcessParameters = &params; - peb.TlsBitmap = &tls_bitmap; - peb.TlsExpansionBitmap = &tls_expansion_bitmap; - peb.LdrData = &ldr; + virtual_init(); + + /* reserve space for shared user data */ + + addr = (void *)0x7ffe0000; + size = 0x10000; + NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_RESERVE, PAGE_READONLY ); + + /* allocate and initialize the PEB */ + + addr = NULL; + size = sizeof(*peb); + NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 1, &size, + MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ); + peb = addr; + + peb->NumberOfProcessors = 1; + peb->ProcessParameters = &params; + peb->TlsBitmap = &tls_bitmap; + peb->TlsExpansionBitmap = &tls_expansion_bitmap; + peb->LdrData = &ldr; params.CurrentDirectory.DosPath.Buffer = current_dir; params.CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); params.wShowWindow = 1; /* SW_SHOWNORMAL */ - RtlInitializeBitMap( &tls_bitmap, peb.TlsBitmapBits, sizeof(peb.TlsBitmapBits) * 8 ); - RtlInitializeBitMap( &tls_expansion_bitmap, peb.TlsExpansionBitmapBits, - sizeof(peb.TlsExpansionBitmapBits) * 8 ); + RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 ); + RtlInitializeBitMap( &tls_expansion_bitmap, peb->TlsExpansionBitmapBits, + sizeof(peb->TlsExpansionBitmapBits) * 8 ); InitializeListHead( &ldr.InLoadOrderModuleList ); InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); InitializeListHead( &tls_links ); + /* allocate and initialize the initial TEB */ + sigstack_total_size = get_signal_stack_total_size(); while (1 << sigstack_zero_bits < sigstack_total_size) sigstack_zero_bits++; assert( 1 << sigstack_zero_bits == sigstack_total_size ); /* must be a power of 2 */ thread_info.teb_size = sigstack_total_size; - VIRTUAL_alloc_teb( &addr, thread_info.teb_size ); + + addr = NULL; + size = sigstack_total_size; + NtAllocateVirtualMemory( NtCurrentProcess(), &addr, sigstack_zero_bits, + &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ); teb = addr; + teb->Peb = peb; + thread_info.teb_size = size; init_teb( teb ); thread_data = (struct ntdll_thread_data *)teb->SystemReserved2; thread_regs = (struct ntdll_thread_regs *)teb->SpareBytes1; @@ -245,6 +268,7 @@ HANDLE thread_init(void) wine_pthread_get_functions( &pthread_functions, sizeof(pthread_functions) ); pthread_functions.init_current_teb( &thread_info ); pthread_functions.init_thread( &thread_info ); + virtual_init_threading(); debug_info.str_pos = debug_info.strings; debug_info.out_pos = debug_info.output; @@ -255,7 +279,7 @@ HANDLE thread_init(void) info_size = server_init_thread( thread_info.pid, thread_info.tid, NULL ); /* create the process heap */ - if (!(peb.ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ))) + if (!(peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ))) { MESSAGE( "wine: failed to create the process heap\n" ); exit(1); @@ -421,6 +445,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) goto error; teb = addr; + teb->Peb = NtCurrentTeb()->Peb; info->pthread_info.teb_size = size; if ((status = init_teb( teb ))) goto error; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 96aca43..65b929d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -142,6 +142,7 @@ #define VIRTUAL_DEBUG_DUMP_VIEW(view) \ static void *user_space_limit = USER_SPACE_LIMIT; static void *preload_reserve_start; static void *preload_reserve_end; +static int use_locks; /*********************************************************************** @@ -1205,7 +1206,7 @@ BOOL is_current_process( HANDLE handle ) /*********************************************************************** * virtual_init */ -static inline void virtual_init(void) +void virtual_init(void) { const char *preload; #ifndef page_mask @@ -1229,26 +1230,11 @@ #endif /* page_mask */ /*********************************************************************** - * VIRTUAL_alloc_teb - * - * Allocate a memory view for a new TEB, properly aligned to a multiple of the size. + * virtual_init_threading */ -NTSTATUS VIRTUAL_alloc_teb( void **ret, size_t size ) +void virtual_init_threading(void) { - NTSTATUS status; - struct file_view *view; - - virtual_init(); - - *ret = NULL; - status = map_view( &view, NULL, size, size - 1, TRUE, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED ); - if (status == STATUS_SUCCESS) - { - view->flags |= VFLAG_VALLOC; - *ret = view->base; - } - return status; + use_locks = 1; } @@ -1369,7 +1355,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( /* Reserve the memory */ - RtlEnterCriticalSection( &csVirtual ); + if (use_locks) RtlEnterCriticalSection( &csVirtual ); if (type & MEM_SYSTEM) { @@ -1397,7 +1383,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( else if (!VIRTUAL_SetProt( view, base, size, vprot )) status = STATUS_ACCESS_DENIED; } - RtlLeaveCriticalSection( &csVirtual ); + if (use_locks) RtlLeaveCriticalSection( &csVirtual ); if (status == STATUS_SUCCESS) {

1 0

Alexandre Julliard : preloader: Allocate more space in low memory as well as for top-down allocations.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: e325efbd8dfe650a4cec7caf24b30961506aa2b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e325efbd8dfe650a4cec7ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 15:25:39 2006 +0200 preloader: Allocate more space in low memory as well as for top-down allocations. --- configure | 2 +- configure.ac | 2 +- loader/main.c | 6 +++--- loader/preloader.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 9de6bf4..dcc6a5c 100755 --- a/configure +++ b/configure @@ -17118,7 +17118,7 @@ echo "${ECHO_T}$ac_cv_c_dll_macho" >&6; IOKITLIB="-framework IOKit -framework CoreFoundation" - LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7ffe0000" + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000" if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then diff --git a/configure.ac b/configure.ac index 95d78b1..05d2c54 100644 --- a/configure.ac +++ b/configure.ac @@ -1147,7 +1147,7 @@ case $host_os in dnl declare needed frameworks AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") - AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7ffe0000"]) + AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000"]) if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then dnl CoreServices needed by AudioUnit diff --git a/loader/main.c b/loader/main.c index 5d20449..d74d4a4 100644 --- a/loader/main.c +++ b/loader/main.c @@ -24,9 +24,9 @@ #include "wine/library.h" #include "main.h" #ifdef __APPLE__ -asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x20000000"); -asm(".zerofill WINE_SHARED_HEAP, WINE_SHARED_HEAP, ___wine_shared_heap, 0x01020000"); -extern char __wine_dos[0x20000000], __wine_shared_heap[0x01020000]; +asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x60000000"); +asm(".zerofill WINE_SHARED_HEAP, WINE_SHARED_HEAP, ___wine_shared_heap, 0x02000000"); +extern char __wine_dos[0x60000000], __wine_shared_heap[0x02000000]; static const struct wine_preload_info wine_main_preload_info[] = { diff --git a/loader/preloader.c b/loader/preloader.c index d9b749c..46e96a5 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -108,9 +108,9 @@ #endif static struct wine_preload_info preload_info[] = { - { (void *)0x00000000, 0x00110000 }, /* DOS area */ - { (void *)0x7ffe0000, 0x01020000 }, /* shared user data + shared heap */ - { (void *)0x00110000, 0x1fef0000 }, /* PE exe range (may be set with WINEPRELOADRESERVE), defaults to 512mb */ + { (void *)0x00000000, 0x60000000 }, /* low memory area */ + { (void *)0x7f000000, 0x02000000 }, /* top-down allocations + shared heap */ + { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */ };

1 0

Alexandre Julliard : libwine: Added a function to enumerate the reserved mmap areas.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 0b39d1a89e00afec9d13adcad74df44ac2027102 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b39d1a89e00afec9d13adc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 13:59:10 2006 +0200 libwine: Added a function to enumerate the reserved mmap areas. --- include/wine/library.h | 2 ++ libs/wine/mmap.c | 35 +++++++++++++++++++++++++++++++++++ libs/wine/wine.def | 1 + libs/wine/wine.map | 1 + 4 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/wine/library.h b/include/wine/library.h index c593bd2..cbaa026 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -75,6 +75,8 @@ extern void *wine_anon_mmap( void *start extern void wine_mmap_add_reserved_area( void *addr, size_t size ); extern void wine_mmap_remove_reserved_area( void *addr, size_t size, int unmap ); extern int wine_mmap_is_in_reserved_area( void *addr, size_t size ); +extern int wine_mmap_enum_reserved_areas( int (*enum_func)(void *base, size_t size, void *arg), + void *arg, int top_down ); /* LDT management */ diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 16bf302..a8654dc 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -539,3 +539,38 @@ int wine_mmap_is_in_reserved_area( void } return 0; } + + +/*********************************************************************** + * wine_mmap_enum_reserved_areas + * + * Enumerate the list of reserved areas, sorted by addresses. + * If enum_func returns a non-zero value, enumeration is stopped and the value is returned. + * + * Note: the reserved areas functions are not reentrant, caller is + * responsible for proper locking. + */ +int wine_mmap_enum_reserved_areas( int (*enum_func)(void *base, size_t size, void *arg), void *arg, + int top_down ) +{ + int ret = 0; + struct list *ptr; + + if (top_down) + { + for (ptr = reserved_areas.prev; ptr != &reserved_areas; ptr = ptr->prev) + { + struct reserved_area *area = LIST_ENTRY( ptr, struct reserved_area, entry ); + if ((ret = enum_func( area->base, area->size, arg ))) break; + } + } + else + { + for (ptr = reserved_areas.next; ptr != &reserved_areas; ptr = ptr->next) + { + struct reserved_area *area = LIST_ENTRY( ptr, struct reserved_area, entry ); + if ((ret = enum_func( area->base, area->size, arg ))) break; + } + } + return ret; +} diff --git a/libs/wine/wine.def b/libs/wine/wine.def index 6fe8ade..462a619 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -103,6 +103,7 @@ EXPORTS wine_ldt_realloc_entries wine_ldt_set_entry wine_mmap_add_reserved_area + wine_mmap_enum_reserved_areas wine_mmap_is_in_reserved_area wine_mmap_remove_reserved_area wine_pthread_get_functions diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 84e4e5d..47e58ce 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -103,6 +103,7 @@ WINE_1.0 wine_ldt_realloc_entries; wine_ldt_set_entry; wine_mmap_add_reserved_area; + wine_mmap_enum_reserved_areas; wine_mmap_is_in_reserved_area; wine_mmap_remove_reserved_area; wine_pthread_get_functions;

1 0

Alexandre Julliard : ntdll: Propagate the MEM_TOP_DOWN flag into the map_view() function.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: c060cdbc149d5358931b5c69ae0b4146ed7ae5ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c060cdbc149d5358931b5c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 13:59:44 2006 +0200 ntdll: Propagate the MEM_TOP_DOWN flag into the map_view() function. --- dlls/ntdll/virtual.c | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 0782da2..20a94b9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -585,7 +585,7 @@ static inline void *unmap_extra_space( v * The csVirtual section must be held by caller. */ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, size_t mask, - BYTE vprot ) + int top_down, BYTE vprot ) { void *ptr; NTSTATUS status; @@ -861,11 +861,11 @@ static NTSTATUS map_image( HANDLE hmappi RtlEnterCriticalSection( &csVirtual ); if (base >= (char *)0x110000) /* make sure the DOS area remains free */ - status = map_view( &view, base, total_size, mask, + status = map_view( &view, base, total_size, mask, FALSE, VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE ); if (status == STATUS_CONFLICTING_ADDRESSES) - status = map_view( &view, NULL, total_size, mask, + status = map_view( &view, NULL, total_size, mask, FALSE, VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE ); if (status != STATUS_SUCCESS) goto error; @@ -1159,7 +1159,7 @@ NTSTATUS VIRTUAL_alloc_teb( void **ret, virtual_init(); *ret = NULL; - status = map_view( &view, NULL, size, size - 1, + status = map_view( &view, NULL, size, size - 1, TRUE, VPROT_READ | VPROT_WRITE | VPROT_COMMITTED ); if (status == STATUS_SUCCESS) { @@ -1276,17 +1276,12 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( size = (size + page_mask) & ~page_mask; } - if (type & MEM_TOP_DOWN) { - /* FIXME: MEM_TOP_DOWN allocates the largest possible address. */ - WARN("MEM_TOP_DOWN ignored\n"); - type &= ~MEM_TOP_DOWN; - } - /* Compute the alloc type flags */ if (!(type & MEM_SYSTEM)) { - if (!(type & (MEM_COMMIT | MEM_RESERVE)) || (type & ~(MEM_COMMIT | MEM_RESERVE))) + if (!(type & (MEM_COMMIT | MEM_RESERVE)) || + (type & ~(MEM_COMMIT | MEM_RESERVE | MEM_TOP_DOWN))) { WARN("called with wrong alloc type flags (%08lx) !\n", type); return STATUS_INVALID_PARAMETER; @@ -1311,7 +1306,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( } else if ((type & MEM_RESERVE) || !base) { - status = map_view( &view, base, size, mask, vprot ); + status = map_view( &view, base, size, mask, type & MEM_TOP_DOWN, vprot ); if (status == STATUS_SUCCESS) { view->flags |= VFLAG_VALLOC; @@ -1819,7 +1814,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND RtlEnterCriticalSection( &csVirtual ); - res = map_view( &view, *addr_ptr, size, mask, prot ); + res = map_view( &view, *addr_ptr, size, mask, FALSE, prot ); if (res) { RtlLeaveCriticalSection( &csVirtual );

1 0

appdb/ ./appdbStats.php ./maintainerdelete.php ...
by WineHQ 24 Jul '06

24 Jul '06

ChangeSet ID: 26779 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/24 11:20:40 Modified files: . : appdbStats.php maintainerdelete.php maintainersubmit.php admin : adminMaintainerQueue.php adminMaintainers.php cron : cleanup.php include : application.php maintainer.php sidebar_admin.php sidebar_login.php user.php util.php version.php unit_test : test_user.php Added files: unit_test : test_maintainer.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Start to move maintainer related functions into maintainer class and separate maintainer related queries and logic from display code. Also move maintainer related code from the user class. Fix up unit tests to work with the new maintainer class. Patch: http://cvs.winehq.org/patch.py?id=26779 Old revision New revision Changes Path 1.11 1.12 +1 -1 appdb/appdbStats.php 1.23 1.24 +2 -2 appdb/maintainerdelete.php 1.32 1.33 +8 -6 appdb/maintainersubmit.php 1.33 1.34 +30 -170 appdb/admin/adminMaintainerQueue.php 1.27 1.28 +4 -4 appdb/admin/adminMaintainers.php 1.30 1.31 +1 -1 appdb/cron/cleanup.php 1.69 1.70 +3 -3 appdb/include/application.php 1.13 1.14 +484 -15 appdb/include/maintainer.php 1.24 1.25 +2 -2 appdb/include/sidebar_admin.php 1.16 1.17 +1 -1 appdb/include/sidebar_login.php 1.79 1.80 +9 -189 appdb/include/user.php 1.75 1.76 +0 -25 appdb/include/util.php 1.79 1.80 +4 -6 appdb/include/version.php 1.6 1.7 +3 -204 appdb/unit_test/test_user.php Added 1.1 +0 -0 appdb/unit_test/test_maintainer.php

1 0

appdb/include util.php
by WineHQ 24 Jul '06

24 Jul '06

ChangeSet ID: 26778 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/24 10:55:56 Modified files: include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Darken up the top X highlighting to make it more visible Patch: http://cvs.winehq.org/patch.py?id=26778 Old revision New revision Changes Path 1.74 1.75 +1 -1 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.74 appdb/include/util.php:1.75 --- appdb/include/util.php:1.74 24 Jul 2006 15:55:56 -0000 +++ appdb/include/util.php 24 Jul 2006 15:55:56 -0000 @@ -280,7 +280,7 @@ function outputTopXRow($oRow) $oVersion = new Version($oRow->versionId); $oApp = new Application($oVersion->iAppId); $img = Screenshot::get_random_screenshot_img(null, $oRow->versionId, false); // image, disable extra formatting - html_tr_highlight_clickable('appview.php?iVersionId='.$oRow->versionId, "white", "#fffef6", "white"); + html_tr_highlight_clickable('appview.php?iVersionId='.$oRow->versionId, "white", "#f0f6ff", "white"); echo ' <td class="app_name"> <a href="appview.php?iVersionId='.$oRow->versionId.'">'.$oApp->sName.' '.$oVersion->sName.'</a></td>

1 0