February 2006 - Wine-Commits

Mike McCormack : kernel32: Add a stub implementation for CmdBatNotification .
by Alexandre Julliard Feb. 22, 2006

Feb. 22, 2006

Module: wine Branch: refs/heads/master Commit: a7e36dd27eadfe6f8726820d6cc11594dcf6b92a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7e36dd27eadfe6f8726820… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Feb 22 20:54:16 2006 +0900 kernel32: Add a stub implementation for CmdBatNotification. --- dlls/kernel/kernel32.spec | 2 +- dlls/kernel/process.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 0454111..a29f8ab 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -205,7 +205,7 @@ @ stdcall CloseHandle(long) @ stdcall CloseProfileUserMapping() @ stub CloseSystemHandle -@ stub CmdBatNotification +@ stdcall CmdBatNotification(long) @ stdcall CommConfigDialogA(str long ptr) @ stdcall CommConfigDialogW(wstr long ptr) @ stdcall CompareFileTime(ptr ptr) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 4d447ce..62b6669 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -2743,3 +2743,16 @@ HANDLE WINAPI GetCurrentProcess(void) { return (HANDLE)0xffffffff; } + +/*********************************************************************** + * CmdBatNotification (KERNEL32.@) + * + * Called by cmd.exe with + * (1) when a batch file is started + * (0) when a batch file finishes executing + */ +BOOL WINAPI CmdBatNotification( BOOL bBatchRunning ) +{ + FIXME("%d\n", bBatchRunning); + return FALSE; +}

1 0

Alexandre Julliard : kernel: Initialize the dll path from the main exe name explicitly
by Alexandre Julliard Feb. 22, 2006

Feb. 22, 2006

Module: wine Branch: refs/heads/master Commit: 3229e293d3eb40591fc18f3e6529d8c02f082419 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3229e293d3eb40591fc18f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 22 17:02:25 2006 +0100 kernel: Initialize the dll path from the main exe name explicitly since ImagePathName is not always set at that point. --- dlls/kernel/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index bf5d938..4d447ce 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -905,7 +905,7 @@ void __wine_kernel_init(void) debugstr_w(main_exe_name), debugstr_a(__wine_main_argv[0]) ); RtlInitUnicodeString( &NtCurrentTeb()->Peb->ProcessParameters->DllPath, - MODULE_get_dll_load_path(NULL) ); + MODULE_get_dll_load_path(main_exe_name) ); if (!(module = LoadLibraryExW( main_exe_name, 0, DONT_RESOLVE_DLL_REFERENCES ))) {

1 0

Alexandre Julliard : explorer: Moved systray configuration option to a more appropriate place
by Alexandre Julliard Feb. 22, 2006

Feb. 22, 2006

Module: wine Branch: refs/heads/master Commit: acdd03add66e4ba93651416e8db72ff3b8e44e32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=acdd03add66e4ba93651416… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 22 17:01:15 2006 +0100 explorer: Moved systray configuration option to a more appropriate place and make it compatible with the way other options are stored. --- programs/explorer/systray.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 73e5021..7520f8b 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -41,6 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); +#define IS_OPTION_FALSE(ch) \ + ((ch) == 'n' || (ch) == 'N' || (ch) == 'f' || (ch) == 'F' || (ch) == '0') + const static WCHAR adaptor_classname[] = /* Adaptor */ {'A','d','a','p','t','o','r',0}; /* tray state */ @@ -338,26 +341,23 @@ static LRESULT WINAPI listener_wndproc(H static BOOL is_systray_hidden(void) { - const WCHAR hide_systray_keyname[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'S','y','s','t','r','a','y',0}; - const WCHAR hide_systray_valuename[] = {'H','i','d','d','e','n',0}; - DWORD hidden; + const WCHAR show_systray_keyname[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', + 'X','1','1',' ','D','r','i','v','e','r',0}; + const WCHAR show_systray_valuename[] = {'S','h','o','w','S','y','s','t','r','a','y',0}; HKEY hkey; - DWORD size; - DWORD type; BOOL ret = FALSE; - /* @@ Wine registry key: HKCU\Software\Wine\Systray */ - if (RegOpenKeyW(HKEY_CURRENT_USER, hide_systray_keyname, &hkey) == ERROR_SUCCESS) + /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver */ + if (RegOpenKeyW(HKEY_CURRENT_USER, show_systray_keyname, &hkey) == ERROR_SUCCESS) { - size = sizeof(hidden); - if (RegQueryValueExW(hkey, hide_systray_valuename, 0, &type, (LPBYTE)&hidden, &size) == ERROR_SUCCESS && type == REG_DWORD) + WCHAR value[10]; + DWORD type, size = sizeof(value); + if (RegQueryValueExW(hkey, show_systray_valuename, 0, &type, (LPBYTE)&value, &size) == ERROR_SUCCESS) { - if (hidden != 0) ret = TRUE; + ret = IS_OPTION_FALSE(value[0]); } RegCloseKey(hkey); } - return ret; }

1 0

Robert Shearman : shell32: Move systray handling to the explorer process.
by Alexandre Julliard Feb. 22, 2006

Feb. 22, 2006

Module: wine Branch: refs/heads/master Commit: f689e3fca4c8af277b1c650d20c417cf304532d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f689e3fca4c8af277b1c650… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Feb 19 17:50:27 2006 +0000 shell32: Move systray handling to the explorer process. --- dlls/shell32/shell32_main.c | 1 dlls/shell32/shell32_main.h | 3 dlls/shell32/systray.c | 485 ++++++++++++----------------------------- programs/explorer/Makefile.in | 5 programs/explorer/explorer.c | 64 +++++ programs/explorer/systray.c | 435 +++++++++++++++++++++++++++++++++++++ programs/explorer/systray.h | 23 ++ 7 files changed, 665 insertions(+), 351 deletions(-) create mode 100644 programs/explorer/systray.c create mode 100644 programs/explorer/systray.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f689e3fca4c8af277b1…

1 0

Alexandre Julliard : kernel: Get rid of module.h.
by Alexandre Julliard Feb. 22, 2006

Feb. 22, 2006

Module: wine Branch: refs/heads/master Commit: 0199b4410a9baf53d670f3f0f0186935522d5534 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0199b4410a9baf53d670f3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 22 16:30:22 2006 +0100 kernel: Get rid of module.h. --- dlls/kernel/module.c | 1 - dlls/kernel/thread.c | 3 ++- include/module.h | 43 ------------------------------------------- 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 include/module.h diff --git a/dlls/kernel/module.c b/dlls/kernel/module.c index 432cd69..d4cc7ca 100644 --- a/dlls/kernel/module.c +++ b/dlls/kernel/module.c @@ -37,7 +37,6 @@ #include "winbase.h" #include "winternl.h" #include "thread.h" -#include "module.h" #include "kernel_private.h" #include "wine/exception.h" diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c index 09c3081..a695612 100644 --- a/dlls/kernel/thread.c +++ b/dlls/kernel/thread.c @@ -36,7 +36,6 @@ #include "winerror.h" #include "winnls.h" #include "thread.h" -#include "module.h" #include "wine/winbase16.h" #include "wine/exception.h" #include "wine/library.h" @@ -55,6 +54,8 @@ struct new_thread_info void *arg; }; +extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ); /* FIXME */ + /*********************************************************************** * THREAD_Start * diff --git a/include/module.h b/include/module.h deleted file mode 100644 index 95c07d6..0000000 --- a/include/module.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Module definitions - * - * Copyright 1995 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_MODULE_H -#define __WINE_MODULE_H - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> - -enum loadorder_type -{ - LOADORDER_INVALID = 0, /* Must be 0 */ - LOADORDER_DLL, /* Native DLLs */ - LOADORDER_BI, /* Built-in modules */ - LOADORDER_NTYPES -}; - -/* module.c */ -extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ); - -/* loadorder.c */ -extern void MODULE_GetLoadOrderW( enum loadorder_type plo[], const WCHAR *app_name, - const WCHAR *path ); - -#endif /* __WINE_MODULE_H */

1 0

Alexandre Julliard : ntdll: Simplify loadorder code by using an enum instead of an array
by Alexandre Julliard Feb. 22, 2006

Feb. 22, 2006

Module: wine Branch: refs/heads/master Commit: 4107751dd32f1a1b88115fabf3d0d37bab01cd1b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4107751dd32f1a1b88115fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 22 16:30:05 2006 +0100 ntdll: Simplify loadorder code by using an enum instead of an array to represent load order values. Added a special value for default load order so that we can handle it differently later on. --- dlls/ntdll/loader.c | 30 +++++--- dlls/ntdll/loadorder.c | 183 +++++++++++++++-------------------------------- dlls/ntdll/ntdll.spec | 1 dlls/ntdll/ntdll_misc.h | 15 ++++ 4 files changed, 93 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4107751dd32f1a1b881…

1 0

Alexandre Julliard : kernel: Don' t bother checking load order of the exe in the parent process.
by Alexandre Julliard Feb. 22, 2006

Feb. 22, 2006

Module: wine Branch: refs/heads/master Commit: a877fdc4dc6662ed031fcddb02e8cb057451b787 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a877fdc4dc6662ed031fcdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 22 16:21:12 2006 +0100 kernel: Don't bother checking load order of the exe in the parent process. --- dlls/kernel/process.c | 72 ++++++++++--------------------------------------- 1 files changed, 14 insertions(+), 58 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 07851b0..bf5d938 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -39,7 +39,6 @@ #include "wine/winuser16.h" #include "winioctl.h" #include "winternl.h" -#include "module.h" #include "kernel_private.h" #include "wine/exception.h" #include "wine/server.h" @@ -189,46 +188,20 @@ static void *open_builtin_exe_file( cons */ static HANDLE open_exe_file( const WCHAR *name ) { - enum loadorder_type loadorder[LOADORDER_NTYPES]; - WCHAR buffer[MAX_PATH]; HANDLE handle; - int i, file_exists; TRACE("looking for %s\n", debugstr_w(name) ); if ((handle = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE) { + WCHAR buffer[MAX_PATH]; /* file doesn't exist, check for builtin */ if (!contains_path( name )) goto error; if (!get_builtin_path( name, NULL, buffer, sizeof(buffer) )) goto error; - name = buffer; - } - - MODULE_GetLoadOrderW( loadorder, NULL, name ); - - for(i = 0; i < LOADORDER_NTYPES; i++) - { - if (loadorder[i] == LOADORDER_INVALID) break; - switch(loadorder[i]) - { - case LOADORDER_DLL: - TRACE( "Trying native exe %s\n", debugstr_w(name) ); - if (handle != INVALID_HANDLE_VALUE) return handle; - break; - case LOADORDER_BI: - TRACE( "Trying built-in exe %s\n", debugstr_w(name) ); - open_builtin_exe_file( name, NULL, 0, 1, &file_exists ); - if (file_exists) - { - if (handle != INVALID_HANDLE_VALUE) CloseHandle(handle); - return 0; - } - default: - break; - } + handle = 0; } - if (handle != INVALID_HANDLE_VALUE) CloseHandle(handle); + return handle; error: SetLastError( ERROR_FILE_NOT_FOUND ); @@ -247,9 +220,7 @@ static HANDLE open_exe_file( const WCHAR static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, HANDLE *handle ) { static const WCHAR exeW[] = {'.','e','x','e',0}; - - enum loadorder_type loadorder[LOADORDER_NTYPES]; - int i, file_exists; + int file_exists; TRACE("looking for %s\n", debugstr_w(name) ); @@ -268,34 +239,19 @@ static BOOL find_exe_file( const WCHAR * return FALSE; } - MODULE_GetLoadOrderW( loadorder, NULL, buffer ); + TRACE( "Trying native exe %s\n", debugstr_w(buffer) ); + if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, 0 )) != INVALID_HANDLE_VALUE) + return TRUE; - for(i = 0; i < LOADORDER_NTYPES; i++) + TRACE( "Trying built-in exe %s\n", debugstr_w(buffer) ); + open_builtin_exe_file( buffer, NULL, 0, 1, &file_exists ); + if (file_exists) { - if (loadorder[i] == LOADORDER_INVALID) break; - switch(loadorder[i]) - { - case LOADORDER_DLL: - TRACE( "Trying native exe %s\n", debugstr_w(buffer) ); - if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, - NULL, OPEN_EXISTING, 0, 0 )) != INVALID_HANDLE_VALUE) - return TRUE; - if (GetLastError() != ERROR_FILE_NOT_FOUND) return TRUE; - break; - case LOADORDER_BI: - TRACE( "Trying built-in exe %s\n", debugstr_w(buffer) ); - open_builtin_exe_file( buffer, NULL, 0, 1, &file_exists ); - if (file_exists) - { - *handle = 0; - return TRUE; - } - break; - default: - break; - } + *handle = 0; + return TRUE; } - SetLastError( ERROR_FILE_NOT_FOUND ); + return FALSE; }

1 0

Huw Davies : gdi32: Update due to last minute api change in freetype 2.2.0.
by Alexandre Julliard Feb. 22, 2006

Feb. 22, 2006

Module: wine Branch: refs/heads/master Commit: d8a6c278fa33fc9614a6d1ed52449bdb1404746e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8a6c278fa33fc9614a6d1e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 22 12:24:25 2006 +0000 gdi32: Update due to last minute api change in freetype 2.2.0. FT_Module_Get_Flags existed briefly in freetype 2.2.0.rc1 but has now been replaced by FT_Get_TrueType_Engine_Type. There's no point in supporting an rc1 release, so this removes support for FT_Module_Get_Flags and adds support for FT_Get_TrueType_Engine_Type. --- configure | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + dlls/gdi/freetype.c | 23 +++++++++++------- include/config.h.in | 3 ++ 4 files changed, 83 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 30aff74..b962b54 100755 --- a/configure +++ b/configure @@ -10156,6 +10156,71 @@ sed 's/^/| /' conftest.$ac_ext >&5 wine_cv_fttrigon=no fi rm -f conftest.err conftest.$ac_ext + echo "$as_me:$LINENO: checking for FT_TrueTypeEngineType" >&5 +echo $ECHO_N "checking for FT_TrueTypeEngineType... $ECHO_C" >&6 +if test "${ac_cv_type_FT_TrueTypeEngineType+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <freetype/ftmodapi.h> + +int +main () +{ +if ((FT_TrueTypeEngineType *) 0) + return 0; +if (sizeof (FT_TrueTypeEngineType)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_FT_TrueTypeEngineType=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_FT_TrueTypeEngineType=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_FT_TrueTypeEngineType" >&5 +echo "${ECHO_T}$ac_cv_type_FT_TrueTypeEngineType" >&6 +if test $ac_cv_type_FT_TrueTypeEngineType = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_FT_TRUETYPEENGINETYPE 1 +_ACEOF + + +fi + CPPFLAGS="$ac_save_CPPFLAGS" if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes" then diff --git a/configure.ac b/configure.ac index 652de1a..a8b4e2e 100644 --- a/configure.ac +++ b/configure.ac @@ -606,6 +606,7 @@ else [Define if you have the <freetype/fttrigon.h> header file.]) wine_cv_fttrigon=yes], wine_cv_fttrigon=no) + AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>]) CPPFLAGS="$ac_save_CPPFLAGS" dnl Check that we have at least freetype/freetype.h if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes" diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index a983d25..ad0d6eb 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -90,8 +90,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); #define SONAME_LIBFREETYPE "libfreetype.so" #endif -#ifndef FT_MODULE_DRIVER_HAS_HINTER -#define FT_MODULE_DRIVER_HAS_HINTER 0x400 +#ifndef HAVE_FT_TRUETYPEENGINETYPE +typedef enum +{ + FT_TRUETYPE_ENGINE_TYPE_NONE = 0, + FT_TRUETYPE_ENGINE_TYPE_UNPATENTED, + FT_TRUETYPE_ENGINE_TYPE_PATENTED +} FT_TrueTypeEngineType; #endif static FT_Library library = 0; @@ -126,7 +131,7 @@ MAKE_FUNCPTR(FT_Vector_Transform); static void (*pFT_Library_Version)(FT_Library,FT_Int*,FT_Int*,FT_Int*); static FT_Error (*pFT_Load_Sfnt_Table)(FT_Face,FT_ULong,FT_Long,FT_Byte*,FT_ULong*); static FT_ULong (*pFT_Get_First_Char)(FT_Face,FT_UInt*); -static FT_Error (*pFT_Module_Get_Flags)(FT_Module,FT_ULong*); +static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); #ifdef HAVE_FREETYPE_FTWINFNT_H MAKE_FUNCPTR(FT_Get_WinFNT_Header); #endif @@ -1504,7 +1509,7 @@ BOOL WineEngInit(void) pFT_Library_Version = wine_dlsym(ft_handle, "FT_Library_Version", NULL, 0); pFT_Load_Sfnt_Table = wine_dlsym(ft_handle, "FT_Load_Sfnt_Table", NULL, 0); pFT_Get_First_Char = wine_dlsym(ft_handle, "FT_Get_First_Char", NULL, 0); - pFT_Module_Get_Flags = wine_dlsym(ft_handle, "FT_Module_Get_Flags", NULL, 0); + pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0); #ifdef HAVE_FREETYPE_FTWINFNT_H pFT_Get_WinFNT_Header = wine_dlsym(ft_handle, "FT_Get_WinFNT_Header", NULL, 0); #endif @@ -3844,19 +3849,19 @@ BOOL WINAPI FontIsLinked(HDC hdc) static BOOL is_hinting_enabled(void) { - FT_Module mod = pFT_Get_Module(library, "truetype"); + FT_Module mod; /* Use the >= 2.2.0 function if available */ - if(pFT_Module_Get_Flags) + if(pFT_Get_TrueType_Engine_Type) { - FT_ULong flags; - pFT_Module_Get_Flags(mod, &flags); - return flags & FT_MODULE_DRIVER_HAS_HINTER; + FT_TrueTypeEngineType type = pFT_Get_TrueType_Engine_Type(library); + return type == FT_TRUETYPE_ENGINE_TYPE_PATENTED; } /* otherwise if we've been compiled with < 2.2.0 headers use the internal macro */ #ifdef FT_DRIVER_HAS_HINTER + mod = pFT_Get_Module(library, "truetype"); if(mod && FT_DRIVER_HAS_HINTER(mod)) return TRUE; #endif diff --git a/include/config.h.in b/include/config.h.in index 8d25021..18f1127 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -149,6 +149,9 @@ /* Define to 1 if you have the `ftruncate' function. */ #undef HAVE_FTRUNCATE +/* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ +#undef HAVE_FT_TRUETYPEENGINETYPE + /* Define to 1 if you have the `futimes' function. */ #undef HAVE_FUTIMES

1 0

Mike McCormack : server: Make sure we don' t get into an infinite loop freeing inodes.
by Alexandre Julliard Feb. 22, 2006

Feb. 22, 2006

Module: wine Branch: refs/heads/master Commit: 309a9bf36fa114ad59b61987cf27b4f39faf7125 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=309a9bf36fa114ad59b6198… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Feb 22 23:11:17 2006 +0900 server: Make sure we don't get into an infinite loop freeing inodes. --- server/change.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/change.c b/server/change.c index e1093d6..923bbce 100644 --- a/server/change.c +++ b/server/change.c @@ -492,10 +492,10 @@ static void free_inode( struct inode *in if (!subtree && !inode->parent) { - struct list *head; - while ( (head = list_head(&inode->children)) ) + struct inode *tmp, *next; + LIST_FOR_EACH_ENTRY_SAFE( tmp, next, &inode->children, + struct inode, ch_entry ) { - struct inode *tmp = LIST_ENTRY( head, struct inode, ch_entry ); assert( tmp != inode ); assert( tmp->parent == inode ); free_inode( tmp );

1 0

Jeff Latimer : usp10: Add ScriptGetCMap functionality to translate wchars to glyphs.
by Alexandre Julliard Feb. 22, 2006

Feb. 22, 2006

Module: wine Branch: refs/heads/master Commit: 4241adbfcf3f6ae2b8cbdcdfe337d31b021f228d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4241adbfcf3f6ae2b8cbdcd… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Wed Feb 22 23:24:52 2006 +1100 usp10: Add ScriptGetCMap functionality to translate wchars to glyphs. --- dlls/usp10/tests/usp10.c | 28 ++++++++++++++++++++++++---- dlls/usp10/usp10.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index a81af2e..12907dc 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -52,6 +52,8 @@ START_TEST(usp10) int cChars; int cMaxGlyphs; unsigned short pwOutGlyphs[256]; + unsigned short pwOutGlyphs2[256]; + unsigned short pwOutGlyphs3[256]; unsigned short pwLogClust[256]; SCRIPT_VISATTR psva[256]; int pcGlyphs; @@ -59,6 +61,7 @@ START_TEST(usp10) GOFFSET pGoffset[256]; ABC pABC[256]; int cnt; + DWORD dwFlags; /* We need a valid HDC to drive a lot of Script functions which requires the following * * to set up for the tests. */ @@ -170,23 +173,40 @@ START_TEST(usp10) pItem[0].a.fNoGlyphIndex = 1; /* say no translate */ hr = ScriptShape(NULL, &psc, TestItem2, cChars, cMaxGlyphs, &pItem[0].a, - pwOutGlyphs, pwLogClust, psva, &pcGlyphs); + pwOutGlyphs2, pwLogClust, psva, &pcGlyphs); ok (hr != E_PENDING, "If psc should not be NULL (%08x) and the E_PENDING should be returned\n", (unsigned int) hr); ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", (unsigned int) hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); - for (cnt=0; cnt < cChars && TestItem2[cnt] == pwOutGlyphs[cnt]; cnt++) {} + for (cnt=0; cnt < cChars && TestItem2[cnt] == pwOutGlyphs2[cnt]; cnt++) {} ok (cnt == cChars, "Translation to place when told not to. WCHAR %d - %04x != %04x\n", - cnt, TestItem2[cnt], pwOutGlyphs[cnt]); + cnt, TestItem2[cnt], pwOutGlyphs2[cnt]); if (hr ==0) { - hr = ScriptPlace(NULL, &psc, pwOutGlyphs, pcGlyphs, psva, &pItem[0].a, piAdvance, + hr = ScriptPlace(NULL, &psc, pwOutGlyphs2, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", (unsigned int) hr); } } hr = ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); + + /* Check to make sure that SCRIPT_CACHE gets allocated ok */ + dwFlags = 0; + hr = ScriptGetCMap(NULL, &psc, TestItem1, cInChars, dwFlags, pwOutGlyphs3); + ok (hr == E_PENDING, "If psc is NULL (%08x) the E_PENDING should be returned\n", + (unsigned int) hr); + /* Check to see if teh results are the same as those returned by ScriptShape */ + hr = ScriptGetCMap(hdc, &psc, TestItem1, cInChars, dwFlags, pwOutGlyphs3); + ok (hr == 0, "ScriptGetCMap should return 0 not (%08x)\n", (unsigned int) hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + for (cnt=0; cnt < cChars && pwOutGlyphs[cnt] == pwOutGlyphs3[cnt]; cnt++) {} + ok (cnt == cInChars, "Translation not correct. WCHAR %d - %04x != %04x\n", + cnt, pwOutGlyphs[cnt], pwOutGlyphs3[cnt]); + + hr = ScriptFreeCache( &psc); + ok (!psc, "psc is not null after ScriptFreeCache\n"); + } DeleteObject(hrgn); ReleaseDC(hwnd, hdc); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 75710d9..a150274 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -433,11 +433,49 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI * ScriptGetCMap (USP10.@) * */ +/*********************************************************************** + * ScriptGetCMap (USP10.@) + * + */ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars, int cChars, DWORD dwFlags, WORD *pwOutGlyphs) { - FIXME("(%p,%p,%s,%d,0x%lx,%p): stub\n", hdc, psc, debugstr_w(pwcInChars), cChars, dwFlags, pwOutGlyphs); - return E_NOTIMPL; + HDC phdc; + int cnt; + DWORD hr; + Scriptcache *pScriptcache; + FIXME("(%p,%p,%s,%d,0x%lx,%p): semi-stub\n", hdc, psc, debugstr_wn(pwcInChars,cChars), cChars, dwFlags, pwOutGlyphs); + + if (!hdc && !*psc) { + TRACE("No Script_Cache (psc) and no hdc. Ask for one. Hdc=%p, psc=%p\n", hdc, *psc); + return E_PENDING; + } else + if (hdc && !*psc) { + pScriptcache = HeapAlloc( GetProcessHeap(), 0, sizeof(Scriptcache) ); + pScriptcache->hdc = hdc; + phdc = hdc; + pScriptcache->HaveWidths = 0; + *psc = pScriptcache; + } else + if (*psc) { + pScriptcache = *psc; + phdc = pScriptcache->hdc; + } + + TRACE("Before: "); + for (cnt = 0; cnt < cChars; cnt++) + TRACE("%4x",pwcInChars[cnt]); + TRACE("\n"); + + hr = GetGlyphIndicesW(phdc, pwcInChars, cChars, pwOutGlyphs, 0); + TRACE("After: "); + for (cnt = 0; cnt < cChars; cnt++) { + TRACE("%04x",pwOutGlyphs[cnt]); + pScriptcache->GlyphToChar[pwOutGlyphs[cnt]] = pwcInChars[cnt]; /* save for ScriptPlace */ + } + TRACE("\n"); + + return 0; } /*********************************************************************** @@ -454,4 +492,3 @@ HRESULT WINAPI ScriptTextOut(const HDC h piAdvance, piJustify, pGoffset); return E_NOTIMPL; } -

1 0