Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[dreimer] 37189: Bug 3830: Spanish netshell update and more by Javier Remacha Bug 3833: Ukrainian translation update by Artem Reznikov Bug 3834: another fix for slovak translationby Mario Kacmar

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Nov 4 15:27:56 2008 New Revision: 37189 URL: http://svn.reactos.org/svn/reactos?rev=37189&view=rev Log: Bug 3830: Spanish netshell update and more by Javier Remacha Bug 3833: Ukrainian translation update by Artem Reznikov Bug 3834: another fix for slovak translationby Mario Kacmar Added: trunk/rosapps/applications/devutils/zoomin/lang/es-ES.rc (with props) trunk/rosapps/applications/fraginator/lang/es-ES.rc (with props) trunk/rosapps/applications/screensavers/circles/lang/uk-UA.rc (with props) Modified: trunk/rosapps/applications/devutils/zoomin/zoomin.rc trunk/rosapps/applications/fraginator/Fraginator.rc trunk/rosapps/applications/imagesoft/lang/es-ES.rc trunk/rosapps/applications/packmgr/gui/lang/es-ES.rc trunk/rosapps/applications/packmgr/lib/download.cpp trunk/rosapps/applications/screensavers/circles/circles.rc Added: trunk/rosapps/applications/devutils/zoomin/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom… ============================================================================== --- trunk/rosapps/applications/devutils/zoomin/lang/es-ES.rc (added) +++ trunk/rosapps/applications/devutils/zoomin/lang/es-ES.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -1,0 +1,85 @@ +/* $Id: zoomin.rc 31932 2008-01-21 21:29:59Z dreimer $ */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ZOOMIN ICON DISCARDABLE "zoomin.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_ZOOMIN_MENU MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "Sa&lir\tAlt-F4", ID_EDIT_EXIT + END + POPUP "&Edición" + BEGIN + MENUITEM "&Copiar\tCtrl+C", ID_EDIT_COPY, GRAYED + MENUITEM "&Actualizar\tF5", ID_EDIT_REFRESH + END + POPUP "&Opciones" + BEGIN + MENUITEM "&Velocidad de actualización...", ID_OPTIONS_REFRESH_RATE, GRAYED + END + POPUP "Ay&uda" + BEGIN + MENUITEM "&Acerca de ...", ID_HELP_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 230, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Acerca de" +FONT 8, "System" +BEGIN + ICON IDI_ZOOMIN,IDI_ZOOMIN,14,9,16,16 + LTEXT "ReactOS zoomin Version 1.0",IDC_STATIC,49,10,119,8, + SS_NOPREFIX + LTEXT "Copyright (C) 2002 ReactOS Team",IDC_STATIC,49,20,119,8 + DEFPUSHBUTTON "Aceptar",IDOK,195,6,30,11,WS_GROUP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "ReactOS Zoomin" +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDR_ZOOMIN ACCELERATORS DISCARDABLE +BEGIN + VK_F5, ID_REFRESH, VIRTKEY, NOINVERT +END Propchange: trunk/rosapps/applications/devutils/zoomin/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/devutils/zoomin/zoomin.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom… ============================================================================== --- trunk/rosapps/applications/devutils/zoomin/zoomin.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/zoomin/zoomin.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -9,5 +9,6 @@ #include <reactos/version.rc> #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/no-NO.rc" #include "lang/sk-SK.rc" Modified: trunk/rosapps/applications/fraginator/Fraginator.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/Fr… ============================================================================== --- trunk/rosapps/applications/fraginator/Fraginator.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/Fraginator.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -14,5 +14,6 @@ #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/no-NO.rc" #include "lang/sk-SK.rc" Added: trunk/rosapps/applications/fraginator/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/es-ES.rc (added) +++ trunk/rosapps/applications/fraginator/lang/es-ES.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -1,0 +1,229 @@ +// Microsoft Visual C++ generated resource script. +// + +///////////////////////////////////////////////////////////////////////////// + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_MAIN DIALOGEX 0, 0, 346, 103 +STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Comenzar",IDC_STARTSTOP,294,7,45,15 + PUSHBUTTON "Ayuda",ID_MAIN_HELP,294,28,45,15 + PUSHBUTTON "Salir",IDC_QUIT,294,49,45,15 + CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | + WS_BORDER,7,7,63,58 + LTEXT "Seleccione una unidad:",-1,78,40,50,8 + LTEXT "Seleccione una acción:",-1,135,40,58,8 + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | + 0x1,7,71,299,10 + CONTROL "Static",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | + SS_SUNKEN | WS_GROUP,7,86,332,10 + LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,91,8 + LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT + LTEXT "Prioridad del proceso:",-1,223,40,51,8 +END + +IDD_REPORT DIALOGEX 0, 0, 391, 169 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION +CAPTION "Informe" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Bytes",IDC_BYTES,7,148,50,14 + DEFPUSHBUTTON "Kilobytes",IDC_KILOBYTES,61,148,50,14 + DEFPUSHBUTTON "Megabytes",IDC_MEGABYTES,115,148,50,14 + DEFPUSHBUTTON "Gigabytes",IDC_GIGABYTES,169,148,50,14 + DEFPUSHBUTTON "Aceptar",IDC_REPORTOK,334,148,50,14 + RTEXT "Volumen",-1,7,7,24,8 + LTEXT "Capacidad",-1,7,51,28,8 + RTEXT "(Letra de la unidad)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN + RTEXT "(Tamaño del disco, Bytes)",IDC_DISKSIZEBYTES,63,51,117,10, + SS_SUNKEN + RTEXT "(Tamaño del disco, Clusters)",IDC_DISKSIZECLUSTERS,63,73,117, + 10,SS_SUNKEN + LTEXT "Clusters totales",-1,7,73,43,8 + RTEXT "(Tamaño del Cluster)",IDC_DISKCLUSTERSIZE,63,84,117,10, + SS_SUNKEN + LTEXT "Tamaño del Cluster",-1,7,84,36,8 + RTEXT "(Cantidad de archivos)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN + RTEXT "(Tamaño de archivos, bytes)",IDC_FILESSIZEBYTES,267,29,117,10, + SS_SUNKEN + LTEXT "# de archivos",-1,194,18,28,8 + LTEXT "Tamaño total",-1,194,29,31,8 + LTEXT "Tamaño en disco",-1,194,40,39,8 + RTEXT "(Tamaño total, bytes)",IDC_FILESSIZEONDISK,267,40,117,10, + SS_SUNKEN + RTEXT "(Files slack bytes)",IDC_FILESSLACKBYTES,267,51,117,10, + SS_SUNKEN + LTEXT "Wasted slack",-1,194,51,44,8 + RTEXT "(Espacio libre, Bytes)",IDC_DISKFREEBYTES,63,62,117,10, + SS_SUNKEN + LTEXT "Espacio libre",-1,7,62,36,8 + RTEXT "(Archivos fragmentados, cantidad)",IDC_FILESFRAGGED,267,62,117, + 10,SS_SUNKEN + LTEXT "Archivos fragmentados",-1,194,62,52,8 + RTEXT "(Cantidad de directorios)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN + LTEXT "# de directorios",-1,194,7,48,8 + RTEXT "Sistema de archivos",-1,7,40,36,8 + RTEXT "(Nombre del sistema de archivos)",IDC_FILESYSTEM,63,40,117,10, + SS_SUNKEN + RTEXT "Etiqueta del volumen",-1,7,18,44,8 + RTEXT "(Etiqueta del volumen)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN + RTEXT "Serie",-1,7,29,18,8 + RTEXT "(Serie del volumen)",IDC_VOLUMESERIAL,63,29,117,10, + SS_SUNKEN + RTEXT "(Media de fragmentos por archivo)",IDC_AVERAGEFRAGS,267,73,117, + 10,SS_SUNKEN + LTEXT "Media de fragmentos por archivo",-1,194,73,60,20 + LTEXT "XX.X% de los archivos de esta unidad están fragmentados. Es recomendable que realice una SSSSSSS defragmentación.", + IDC_RECOMMEND,7,106,377,38,SS_SUNKEN + LTEXT "Recomendaciones:",-1,7,96,62,8 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_MAIN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 339 + TOPMARGIN, 7 + BOTTOMMARGIN, 96 + END + + IDD_REPORT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 384 + TOPMARGIN, 7 + BOTTOMMARGIN, 162 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""windows.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,3,0,0 + PRODUCTVERSION 1,3,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Organización", " " + VALUE "FileDescription", "Fraginator" + VALUE "Versión del archivo", "1.03" + VALUE "Nombre interno", "Fraginator" + VALUE "Copyright", "Copyright © 2000-2002 Rick Brewster" + VALUE "Nombre original del archivo", "Fraginator.exe" + VALUE "Nombre del producto", "Fraginator" + VALUE "Versión del producto", "1.03" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_LOGO BITMAP "Fraginator Motif Icon.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON ICON "icon1.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// RT_MANIFEST +// + +1 RT_MANIFEST "default1.bin" +#endif // Spanish resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/rosapps/applications/fraginator/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/imagesoft/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… ============================================================================== --- trunk/rosapps/applications/imagesoft/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/imagesoft/lang/es-ES.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -210,7 +210,7 @@ IDS_HINT_CLOSEALL " Cerrar todas las ventanas." IDS_HINT_SAVE " Guardar el documento activo." IDS_HINT_SAVEAS " Guardar el documento activo con un nuevo nombre." - IDS_HINT_PRINTPRE " Previews the printed documento." + IDS_HINT_PRINTPRE " Previsualizar impresión." IDS_HINT_PRINT " Imprimir el documento activo." IDS_HINT_PROP " Mostrar las propiedades de la imagen activa." IDS_HINT_EXIT " Cerrar esta aplicación." Modified: trunk/rosapps/applications/packmgr/gui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/gui/l… ============================================================================== --- trunk/rosapps/applications/packmgr/gui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/packmgr/gui/lang/es-ES.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -22,7 +22,7 @@ CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 - PUSHBUTTON "Abort", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED + PUSHBUTTON "Cancelar", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED END IDR_POPUP MENU DISCARDABLE Modified: trunk/rosapps/applications/packmgr/lib/download.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/lib/d… ============================================================================== --- trunk/rosapps/applications/packmgr/lib/download.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/packmgr/lib/download.cpp [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -13,6 +13,7 @@ #include "package.hpp" #include "expat.h" #include "log.h" +#include <string> #include <urlmon.h> HRESULT WINAPI URLDownloadToFileA( Modified: trunk/rosapps/applications/screensavers/circles/circles.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -15,3 +15,4 @@ #include "lang/es-ES.rc" #include "lang/no-NO.rc" #include "lang/sk-SK.rc" +#include "lang/uk-UA.rc" Added: trunk/rosapps/applications/screensavers/circles/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/lang/uk-UA.rc (added) +++ trunk/rosapps/applications/screensavers/circles/lang/uk-UA.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -1,0 +1,15 @@ +/* + * PROJECT: Circles ScreenSaver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: applications/screensavers/circles/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Circles ScreenSaver + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Çàñòàâêà ""Êîëà""" + IDS_TEXT "Öÿ çàñòàâêà íå ìàº íàëàøòîâóâàíèõ ïàðàìåòð³â." +END Propchange: trunk/rosapps/applications/screensavers/circles/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 10 months

[hyperion] 37187: KJK::Hyperion is proud to present "dllimport purity", another landmark commit that you should really build only after a "clean" Disclaimer: in an uncharacteristic and daring move, I actually built, installed and booted this revision modified tools/rbuild/backend/mingw/mingw.cpp modified tools/rbuild/backend/mingw/modulehandler.cpp modified tools/rbuild/module.cpp modified tools/rbuild/project.dtd modified tools/rbuild/rbuild.h modified include/crt/_mingw.h New module attribute

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Nov 4 12:16:58 2008 New Revision: 37187 URL: http://svn.reactos.org/svn/reactos?rev=37187&view=rev Log: KJK::Hyperion is proud to present "dllimport purity", another landmark commit that you should really build only after a "clean" Disclaimer: in an uncharacteristic and daring move, I actually built, installed and booted this revision modified tools/rbuild/backend/mingw/mingw.cpp modified tools/rbuild/backend/mingw/modulehandler.cpp modified tools/rbuild/module.cpp modified tools/rbuild/project.dtd modified tools/rbuild/rbuild.h modified include/crt/_mingw.h New module attribute iscrt for marking modules that implement a C runtime library New module attribute crt for compiling and linking modules to a specific C runtime library. Can be "ntdll" (for ntdll.dll) "msvcrt" (msvcrt.dll), "crt" (statically-linked runtime), "libcntpr" (libcntpr.lib), "dll" (one of the <library> entries specifies a CRT DLL) or "static". Defaults to "msvcrt" for Win32 modules, to "static" for CRT modules themselves, and to "dll" for drivers Define _DLL for code that compiles against a dynamically-linked CRT Define __MINGW_IMPORT and _CRTIMP according to whether _DLL is defined. We finally use __declspec(dllimport) somewhere, anywhere (SDK headers still don't use it) Bonus fix: actually use compiler-specific command line flags when compiling files modified lib/3rdparty/adns/adns.rbuild modified lib/3rdparty/libxml2/libxml2.rbuild modified lib/3rdparty/mingw/mingw.rbuild And for the downside: static libraries that will be linked to a module that links to the CRT dynamically have to be compiled for a dynamically-linked CRT, as well. Say it out aloud. modified base/applications/wordpad/wordpad.rbuild modified base/setup/usetup/usetup.rbuild modified dll/3rdparty/dxtn/dxtn.rbuild modified dll/3rdparty/freetype/freetype.rbuild modified dll/3rdparty/mesa32/mesa32.rbuild modified dll/cpl/desk/desk.rbuild modified dll/cpl/input/input.rbuild modified dll/cpl/intl/intl.rbuild modified dll/cpl/joy/joy.rbuild modified dll/cpl/main/main.rbuild modified dll/cpl/mmsys/mmsys.rbuild modified dll/cpl/odbccp32/odbccp32.rbuild modified dll/cpl/powercfg/powercfg.rbuild modified dll/cpl/sysdm/sysdm.rbuild modified dll/cpl/telephon/telephon.rbuild modified dll/cpl/timedate/timedate.rbuild modified dll/cpl/usrmgr/usrmgr.rbuild modified dll/directx/ddraw/ddraw.rbuild modified dll/directx/dsound/dsound.rbuild modified dll/directx/wine/wined3d/wined3d.rbuild modified dll/nls/idndl_redist/idndl_redist.rbuild modified dll/nls/normaliz_redist/normaliz_redist.rbuild modified dll/shellext/deskadp/deskadp.rbuild modified dll/shellext/deskmon/deskmon.rbuild modified dll/shellext/fontext/fontext.rbuild modified dll/win32/dhcpcsvc/dhcpcsvc.rbuild modified dll/win32/dnsapi/dnsapi.rbuild modified dll/win32/glu32/glu32.rbuild modified dll/win32/icmp/icmp.rbuild modified dll/win32/winmm/midimap/midimap.rbuild modified drivers/video/displays/framebuf/framebuf.rbuild modified drivers/video/displays/framebufacc/framebufacc.rbuild modified drivers/video/displays/vga/vgaddi.rbuild modified subsystems/win32/csrss/csrss.rbuild modified subsystems/win32/csrss/win32csr/win32csr.rbuild modified subsystems/win32/win32k/win32k.rbuild Don't specify msvcrt explicitely as a <library> if it's going to be linked implicitely as the CRT <library>libcntpr</library> -> crt="libcntpr" Remove miscellaneous unused <library> entries modified dll/win32/crtdll/crtdll.rbuild modified dll/win32/msvcrt20/msvcrt20.rbuild modified dll/win32/msvcrt40/msvcrt40.rbuild modified dll/win32/msvcrt/msvcrt.rbuild Mark CRT DLLs as CRT modules modified dll/win32/user32/windows/font.c modified include/reactos/wine/unicode.h Don't redefine or redeclare CRT functions modified dll/win32/ws2_32/include/ws2_32.h Arch, you idiot, it's defined in <stdlib.h> modified include/crt/ctype.h modified include/crt/wctype.h Don't import ctype routines that were already defined as inlines modified include/crt/stdio.h modified include/reactos/wine/config.h Avoid linking to libmingwex.a if possible modified base/applications/taskmgr/taskmgr.rbuild modified tools/nci/nci.mak modified tools/nci/ncitool.c modified dll/ntdll/ntdll.rbuild Mark ntdll module as a CRT New "ntsys" module to import just Nt/Zw from ntdll.dll. Avoids accidentally linking to ntdll.dll's CRT when importing system calls modified include/psdk/winternl.h Nope, it doesn't. modified base/applications/network/net/help.c modified base/applications/network/net/main.c Replace printf with puts, or GCC will do it on its own and link to the dllimport thunk for puts modified base/applications/network/ping/ping.c Removed broken, unnecessary workaround modified base/shell/cmd/cmd.rbuild Simplify cmd module This commit dediHAPPY BIRTHDAY STEFAN GINSBERG <3 <3 <3 Modified: trunk/reactos/base/applications/network/net/help.c trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/ping/ping.c trunk/reactos/base/applications/taskmgr/taskmgr.rbuild trunk/reactos/base/applications/wordpad/wordpad.rbuild trunk/reactos/base/setup/usetup/usetup.rbuild trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild trunk/reactos/dll/3rdparty/freetype/freetype.rbuild trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/input/input.rbuild trunk/reactos/dll/cpl/intl/intl.rbuild trunk/reactos/dll/cpl/joy/joy.rbuild trunk/reactos/dll/cpl/main/main.rbuild trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild trunk/reactos/dll/cpl/powercfg/powercfg.rbuild trunk/reactos/dll/cpl/sysdm/sysdm.rbuild trunk/reactos/dll/cpl/telephon/telephon.rbuild trunk/reactos/dll/cpl/timedate/timedate.rbuild trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/dsound/dsound.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/shellext/deskadp/deskadp.rbuild trunk/reactos/dll/shellext/deskmon/deskmon.rbuild trunk/reactos/dll/shellext/fontext/fontext.rbuild trunk/reactos/dll/win32/crtdll/crtdll.rbuild trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild trunk/reactos/dll/win32/glu32/glu32.rbuild trunk/reactos/dll/win32/icmp/icmp.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild trunk/reactos/dll/win32/msvcrt40/msvcrt40.rbuild trunk/reactos/dll/win32/user32/windows/font.c trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild trunk/reactos/dll/win32/ws2_32/include/ws2_32.h trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/ctype.h trunk/reactos/include/crt/stdio.h trunk/reactos/include/crt/wctype.h trunk/reactos/include/psdk/winternl.h trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/unicode.h trunk/reactos/lib/3rdparty/adns/adns.rbuild trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/subsystems/win32/csrss/csrss.rbuild trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild trunk/reactos/subsystems/win32/win32k/win32k.rbuild trunk/reactos/tools/nci/nci.mak trunk/reactos/tools/nci/ncitool.c trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.dtd trunk/reactos/tools/rbuild/rbuild.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/network/net/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… Modified: trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/dxtn.rbu… Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/free… Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32… Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… Modified: trunk/reactos/dll/cpl/joy/joy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.rbuild?rev… Modified: trunk/reactos/dll/cpl/main/main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rbuild?r… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild… Modified: trunk/reactos/dll/cpl/telephon/telephon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… Modified: trunk/reactos/dll/cpl/timedate/timedate.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui… Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl_redist/idndl… Modified: trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz_redist/no… Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… Modified: trunk/reactos/dll/shellext/deskadp/deskadp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/deska… Modified: trunk/reactos/dll/shellext/deskmon/deskmon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/deskm… Modified: trunk/reactos/dll/shellext/fontext/fontext.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/fonte… Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rb… Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpcsv… Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.rb… Modified: trunk/reactos/dll/win32/glu32/glu32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/glu32.rbui… Modified: trunk/reactos/dll/win32/icmp/icmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/icmp/icmp.rbuild… Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… Modified: trunk/reactos/dll/win32/msvcrt40/msvcrt40.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/msvcrt4… Modified: trunk/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f… Modified: trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/midimap/mi… Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/w… Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… Modified: trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=3… Modified: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=37… Modified: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=37… Modified: trunk/reactos/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wctype.h?rev=3… Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… Modified: trunk/reactos/lib/3rdparty/adns/adns.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/adns.rbu… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=3718… Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=37… Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… Modified: trunk/reactos/tools/rbuild/project.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?r… Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=…

15 years, 10 months

[jimtabor] 37186: - Fix RealizationInfo, it should use DC font not cFont if 0.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 4 07:05:47 2008 New Revision: 37186 URL: http://svn.reactos.org/svn/reactos?rev=37186&view=rev Log: - Fix RealizationInfo, it should use DC font not cFont if 0. Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Tue Nov 4 07:05:47 2008 @@ -586,6 +586,7 @@ PDC pDc; PTEXTOBJ pTextObj; PFONTGDI pFontGdi; + PDC_ATTR Dc_Attr; BOOL Ret = FALSE; INT i = 0; REALIZATION_INFO ri; @@ -596,7 +597,9 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } - pTextObj = RealizeFontInit(hf); + Dc_Attr = pDc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &pDc->Dc_Attr; + pTextObj = RealizeFontInit(Dc_Attr->hlfntNew); pFontGdi = ObjToGDI(pTextObj->Font, FONT); TEXTOBJ_UnlockText(pTextObj); DC_UnlockDc(pDc);

15 years, 10 months

[jimtabor] 37185: - Fix code page and charector set support. More miscellaneous changes and fixes.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 4 06:49:49 2008 New Revision: 37185 URL: http://svn.reactos.org/svn/reactos?rev=37185&view=rev Log: - Fix code page and charector set support. More miscellaneous changes and fixes. Modified: trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -16,46 +16,45 @@ /* * For TranslateCharsetInfo */ -#define FS(x) {{0,0,0,0},{0x1<<(x),0}} #define MAXTCIINDEX 32 static const CHARSETINFO FONT_tci[MAXTCIINDEX] = { /* ANSI */ - { ANSI_CHARSET, 1252, FS(0)}, - { EASTEUROPE_CHARSET, 1250, FS(1)}, - { RUSSIAN_CHARSET, 1251, FS(2)}, - { GREEK_CHARSET, 1253, FS(3)}, - { TURKISH_CHARSET, 1254, FS(4)}, - { HEBREW_CHARSET, 1255, FS(5)}, - { ARABIC_CHARSET, 1256, FS(6)}, - { BALTIC_CHARSET, 1257, FS(7)}, - { VIETNAMESE_CHARSET, 1258, FS(8)}, + { ANSI_CHARSET, 1252, {{0,0,0,0},{FS_LATIN1,0}} }, + { EASTEUROPE_CHARSET, 1250, {{0,0,0,0},{FS_LATIN2,0}} }, + { RUSSIAN_CHARSET, 1251, {{0,0,0,0},{FS_CYRILLIC,0}} }, + { GREEK_CHARSET, 1253, {{0,0,0,0},{FS_GREEK,0}} }, + { TURKISH_CHARSET, 1254, {{0,0,0,0},{FS_TURKISH,0}} }, + { HEBREW_CHARSET, 1255, {{0,0,0,0},{FS_HEBREW,0}} }, + { ARABIC_CHARSET, 1256, {{0,0,0,0},{FS_ARABIC,0}} }, + { BALTIC_CHARSET, 1257, {{0,0,0,0},{FS_BALTIC,0}} }, + { VIETNAMESE_CHARSET, 1258, {{0,0,0,0},{FS_VIETNAMESE,0}} }, /* reserved by ANSI */ - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, /* ANSI and OEM */ - { THAI_CHARSET, 874, FS(16)}, - { SHIFTJIS_CHARSET, 932, FS(17)}, - { GB2312_CHARSET, 936, FS(18)}, - { HANGEUL_CHARSET, 949, FS(19)}, - { CHINESEBIG5_CHARSET, 950, FS(20)}, - { JOHAB_CHARSET, 1361, FS(21)}, + { THAI_CHARSET, 874, {{0,0,0,0},{FS_THAI,0}} }, + { SHIFTJIS_CHARSET, 932, {{0,0,0,0},{FS_JISJAPAN,0}} }, + { GB2312_CHARSET, 936, {{0,0,0,0},{FS_CHINESESIMP,0}} }, + { HANGEUL_CHARSET, 949, {{0,0,0,0},{FS_WANSUNG,0}} }, + { CHINESEBIG5_CHARSET, 950, {{0,0,0,0},{FS_CHINESETRAD,0}} }, + { JOHAB_CHARSET, 1361, {{0,0,0,0},{FS_JOHAB,0}} }, /* reserved for alternate ANSI and OEM */ - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, /* reserved for system */ - { DEFAULT_CHARSET, 0, FS(0)}, - { SYMBOL_CHARSET, CP_SYMBOL, FS(31)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { SYMBOL_CHARSET, CP_SYMBOL, {{0,0,0,0},{FS_SYMBOL,0}} } }; #define INITIAL_FAMILY_COUNT 64 Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -503,6 +503,7 @@ #define FS_HEBREW 32 #define FS_ARABIC 64 #define FS_BALTIC 128 +#define FS_VIETNAMESE 256 #define FS_THAI 0x10000 #define FS_JISJAPAN 0x20000 #define FS_CHINESESIMP 0x40000 Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -389,6 +389,8 @@ FLOAT f; ULONG l; } gxf_long; + +#define CFONT_REALIZATION 0x0080 typedef struct _CFONT { Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -96,9 +96,8 @@ INT FASTCALL IntGetOutlineTextMetrics(PFONTGDI,UINT,OUTLINETEXTMETRICW *); BOOL FASTCALL ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS); BOOL FASTCALL TextIntGetTextExtentPoint(PDC,PTEXTOBJ,LPCWSTR,int,int,LPINT,LPINT,LPSIZE); -DWORD FASTCALL IntGdiGetCharSet(HDC); BOOL FASTCALL ftGdiGetTextMetricsW(HDC,PTMW_INTERNAL); -DWORD FASTCALL ftGetFontLanguageInfo(PDC); +DWORD FASTCALL IntGetFontLanguageInfo(PDC); INT FASTCALL ftGdiGetTextCharsetInfo(PDC,PFONTSIGNATURE,DWORD); DWORD FASTCALL ftGetFontUnicodeRanges(PFONTGDI, PGLYPHSET); DWORD FASTCALL ftGdiGetFontData(PFONTGDI,DWORD,DWORD,PVOID,DWORD); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -849,6 +849,8 @@ NewDC->erclWindow.bottom = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulVertRes; NewDC->DcLevel.flPath &= ~DCPATH_CLOCKWISE; // Default is CCW. + nDc_Attr->iCS_CP = ftGdiGetTextCharsetInfo(NewDC,NULL,0); + DC_UnlockDc( NewDC ); hVisRgn = NtGdiCreateRectRgn(0, 0, ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulHorzRes, @@ -877,7 +879,6 @@ NewDC->DC_Type = DC_TYPE_INFO; DC_UnlockDc( NewDC ); } - nDc_Attr->iCS_CP = IntGdiGetCharSet(hNewDC); return hNewDC; } @@ -2413,7 +2414,7 @@ case GdiGetEMFRestorDc: break; case GdiGetFontLanguageInfo: - SafeResult = ftGetFontLanguageInfo(dc); + SafeResult = IntGetFontLanguageInfo(dc); break; case GdiGetIsMemDc: SafeResult = dc->DC_Type; Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -23,7 +23,6 @@ switch (Count) { - case sizeof(ENUMLOGFONTEXDVW): RtlCopyMemory( (LPENUMLOGFONTEXDVW) Buffer, &TFont->logfont, @@ -55,6 +54,58 @@ return Count; } +DWORD +FASTCALL +IntGetFontLanguageInfo(PDC Dc) +{ + PDC_ATTR Dc_Attr; + FONTSIGNATURE fontsig; + static const DWORD GCP_DBCS_MASK=0x003F0000, + GCP_DIACRITIC_MASK=0x00000000, + FLI_GLYPHS_MASK=0x00000000, + GCP_GLYPHSHAPE_MASK=0x00000040, + GCP_KASHIDA_MASK=0x00000000, + GCP_LIGATE_MASK=0x00000000, + GCP_USEKERNING_MASK=0x00000000, + GCP_REORDER_MASK=0x00000060; + + DWORD result=0; + + ftGdiGetTextCharsetInfo( Dc, &fontsig, 0 ); + + /* We detect each flag we return using a bitmask on the Codepage Bitfields */ + if( (fontsig.fsCsb[0]&GCP_DBCS_MASK)!=0 ) + result|=GCP_DBCS; + + if( (fontsig.fsCsb[0]&GCP_DIACRITIC_MASK)!=0 ) + result|=GCP_DIACRITIC; + + if( (fontsig.fsCsb[0]&FLI_GLYPHS_MASK)!=0 ) + result|=FLI_GLYPHS; + + if( (fontsig.fsCsb[0]&GCP_GLYPHSHAPE_MASK)!=0 ) + result|=GCP_GLYPHSHAPE; + + if( (fontsig.fsCsb[0]&GCP_KASHIDA_MASK)!=0 ) + result|=GCP_KASHIDA; + + if( (fontsig.fsCsb[0]&GCP_LIGATE_MASK)!=0 ) + result|=GCP_LIGATE; + + if( (fontsig.fsCsb[0]&GCP_USEKERNING_MASK)!=0 ) + result|=GCP_USEKERNING; + + Dc_Attr = Dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + + /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */ + if ( Dc_Attr->lTextAlign & TA_RTLREADING ) + if( (fontsig.fsCsb[0]&GCP_REORDER_MASK)!=0 ) + result|=GCP_REORDER; + + return result; +} + PTEXTOBJ FASTCALL RealizeFontInit(HFONT hFont) @@ -114,14 +165,14 @@ Status = MmCopyFromCaller(SafeFileName.Buffer + 4, src, SafeFileName.MaximumLength - (4 * sizeof(WCHAR))); if(!NT_SUCCESS(Status)) { - ExFreePool(SafeFileName.Buffer); + ExFreePoolWithTag(SafeFileName.Buffer, TAG_STRING); SetLastNtError(Status); return 0; } Ret = IntGdiAddFontResource(&SafeFileName, (DWORD)fl); - ExFreePool(SafeFileName.Buffer); + ExFreePoolWithTag(SafeFileName.Buffer, TAG_STRING); return Ret; } @@ -223,8 +274,8 @@ } FontGdi = ObjToGDI(TextObj->Font, FONT); - Size = ftGetFontUnicodeRanges( FontGdi, NULL); + if (Size && pgs) { pgsSafe = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); @@ -376,48 +427,48 @@ NTSTATUS Status; dc = DC_LockDc(hDC); - if (dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; hFont = Dc_Attr->hlfntNew; TextObj = RealizeFontInit(hFont); DC_UnlockDc(dc); - if (TextObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } FontGDI = ObjToGDI(TextObj->Font, FONT); TEXTOBJ_UnlockText(TextObj); Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); if (!otm) return Size; if (Size > Data) - { + { SetLastWin32Error(ERROR_INSUFFICIENT_BUFFER); return 0; - } + } potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); - if (NULL == potm) - { + if (!potm) + { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; - } + } IntGetOutlineTextMetrics(FontGDI, Size, potm); if (otm) - { - Status = MmCopyToCaller(otm, potm, Size); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - ExFreePool(potm); - return 0; - } - } - ExFreePool(potm); + { + Status = MmCopyToCaller(otm, potm, Size); + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + ExFreePoolWithTag(potm,TAG_GDITEXT); + return 0; + } + } + ExFreePoolWithTag(potm,TAG_GDITEXT); return Size; } @@ -486,7 +537,7 @@ { SetLastNtError(Status); /* Free the string buffer for the safe filename */ - ExFreePool(SafeFileNames.Buffer); + ExFreePoolWithTag(SafeFileNames.Buffer,TAG('R','T','S','U')); return FALSE; } @@ -517,9 +568,77 @@ } /* Free the string for the safe filenames */ - ExFreePool(SafeFileNames.Buffer); + ExFreePoolWithTag(SafeFileNames.Buffer,TAG('R','T','S','U')); return bRet; +} + + /* + * @unimplemented + */ +BOOL +APIENTRY +NtGdiGetRealizationInfo( + IN HDC hdc, + OUT PREALIZATION_INFO pri, + IN HFONT hf) +{ + PDC pDc; + PTEXTOBJ pTextObj; + PFONTGDI pFontGdi; + BOOL Ret = FALSE; + INT i = 0; + REALIZATION_INFO ri; + + pDc = DC_LockDc(hdc); + if (!pDc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + pTextObj = RealizeFontInit(hf); + pFontGdi = ObjToGDI(pTextObj->Font, FONT); + TEXTOBJ_UnlockText(pTextObj); + DC_UnlockDc(pDc); + + Ret = ftGdiRealizationInfo(pFontGdi, &ri); + if (Ret) + { + if (pri) + { + NTSTATUS Status = STATUS_SUCCESS; + _SEH_TRY + { + ProbeForWrite(pri, sizeof(REALIZATION_INFO), 1); + RtlCopyMemory(pri, &ri, sizeof(REALIZATION_INFO)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + } + do + { + if (GdiHandleTable->cfPublic[i].hf == hf) + { + GdiHandleTable->cfPublic[i].iTechnology = ri.iTechnology; + GdiHandleTable->cfPublic[i].iUniq = ri.iUniq; + GdiHandleTable->cfPublic[i].dwUnknown = ri.dwUnknown; + GdiHandleTable->cfPublic[i].dwCFCount = GdiHandleTable->dwCFCount; + GdiHandleTable->cfPublic[i].fl |= CFONT_REALIZATION; + } + i++; + } + while ( i < GDI_CFONT_MAX ); + } + return Ret; } HFONT Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -50,6 +50,12 @@ #define NDEBUG #include <debug.h> +#ifndef FT_MAKE_TAG +#define FT_MAKE_TAG( ch0, ch1, ch2, ch3 ) \ + ( ((DWORD)(BYTE)(ch0) << 24) | ((DWORD)(BYTE)(ch1) << 16) | \ + ((DWORD)(BYTE)(ch2) << 8) | (DWORD)(BYTE)(ch3) ) +#endif + FT_Library library; typedef struct _FONT_ENTRY { @@ -107,7 +113,6 @@ * For TranslateCharsetInfo */ #define CP_SYMBOL 42 -#define FS_VIETNAMESE 0x00000100L #define MAXTCIINDEX 32 static const CHARSETINFO FontTci[MAXTCIINDEX] = { /* ANSI */ @@ -381,7 +386,7 @@ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; } - memcpy(FontGDI->Filename, FileName->Buffer, FileName->Length); + RtlCopyMemory(FontGDI->Filename, FileName->Buffer, FileName->Length); FontGDI->Filename[FileName->Length / sizeof(WCHAR)] = L'\0'; FontGDI->face = Face; @@ -486,7 +491,7 @@ } *NewFont = TextObj->BaseObject.hHmgr; - memcpy(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONTW)); + RtlCopyMemory(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONTW)); if (lf->lfEscapement != lf->lfOrientation) { /* this should really depend on whether GM_ADVANCED is set */ @@ -547,10 +552,10 @@ return FALSE; } - if (MAXTCIINDEX <= Index || DEFAULT_CHARSET == FontTci[Index].ciCharset) - { - return FALSE; - } + if (Index >= MAXTCIINDEX || DEFAULT_CHARSET == FontTci[Index].ciCharset) + { + return FALSE; + } RtlCopyMemory(Cs, &FontTci[Index], sizeof(CHARSETINFO)); @@ -796,7 +801,7 @@ RtlCopyMemory(&Otm->otmTextMetrics, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); Otm->otmFiller = 0; - memcpy(&Otm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT); + RtlCopyMemory(&Otm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT); Otm->otmfsSelection = pOS2->fsSelection; Otm->otmfsType = pOS2->fsType; Otm->otmsCharSlopeRise = pHori->caret_Slope_Rise; @@ -939,21 +944,21 @@ UNICODE_STRING StyleW; TT_OS2 *pOS2; FONTSIGNATURE fs; - DWORD fs_fsCsb0; CHARSETINFO CharSetInfo; unsigned i, Size; OUTLINETEXTMETRICW *Otm; LOGFONTW *Lf; TEXTMETRICW *TM; NEWTEXTMETRICW *Ntm; + DWORD fs0; RtlZeroMemory(Info, sizeof(FONTFAMILYINFO)); Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); Otm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); - if (NULL == Otm) - { - return; - } + if (!Otm) + { + return; + } IntGetOutlineTextMetrics(FontGDI, Size, Otm); Lf = &Info->EnumLogFontEx.elfLogFont; @@ -991,14 +996,10 @@ Ntm->tmPitchAndFamily = TM->tmPitchAndFamily; Ntm->tmCharSet = TM->tmCharSet; Ntm->ntmFlags = TM->tmItalic ? NTM_ITALIC : 0; - if (550 < TM->tmWeight) - { - Ntm->ntmFlags |= NTM_BOLD; - } - if (0 == Ntm->ntmFlags) - { - Ntm->ntmFlags = NTM_REGULAR; - } + + if (550 < TM->tmWeight) Ntm->ntmFlags |= NTM_BOLD; + + if (0 == Ntm->ntmFlags) Ntm->ntmFlags = NTM_REGULAR; Ntm->ntmSizeEM = Otm->otmEMSquare; Ntm->ntmCellHeight = 0; @@ -1006,10 +1007,9 @@ Info->FontType = (0 != (TM->tmPitchAndFamily & TMPF_TRUETYPE) ? TRUETYPE_FONTTYPE : 0); + if (0 == (TM->tmPitchAndFamily & TMPF_VECTOR)) - { - Info->FontType |= RASTER_FONTTYPE; - } + Info->FontType |= RASTER_FONTTYPE; ExFreePool(Otm); @@ -1026,76 +1026,64 @@ pOS2 = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_os2); IntUnLockFreeType; if (NULL != pOS2) - { - Info->NewTextMetricEx.ntmFontSig.fsCsb[0] = pOS2->ulCodePageRange1; - Info->NewTextMetricEx.ntmFontSig.fsCsb[1] = pOS2->ulCodePageRange2; - Info->NewTextMetricEx.ntmFontSig.fsUsb[0] = pOS2->ulUnicodeRange1; - Info->NewTextMetricEx.ntmFontSig.fsUsb[1] = pOS2->ulUnicodeRange2; - Info->NewTextMetricEx.ntmFontSig.fsUsb[2] = pOS2->ulUnicodeRange3; - Info->NewTextMetricEx.ntmFontSig.fsUsb[3] = pOS2->ulUnicodeRange4; - - fs_fsCsb0 = pOS2->ulCodePageRange1; - if (0 == pOS2->version) + { + fs.fsCsb[0] = pOS2->ulCodePageRange1; + fs.fsCsb[1] = pOS2->ulCodePageRange2; + fs.fsUsb[0] = pOS2->ulUnicodeRange1; + fs.fsUsb[1] = pOS2->ulUnicodeRange2; + fs.fsUsb[2] = pOS2->ulUnicodeRange3; + fs.fsUsb[3] = pOS2->ulUnicodeRange4; + + if (0 == pOS2->version) + { + FT_UInt Dummy; + + if (FT_Get_First_Char(FontGDI->face, &Dummy) < 0x100) + fs.fsCsb[0] |= FS_LATIN1; + else + fs.fsCsb[0] |= FS_SYMBOL; + } + if (fs.fsCsb[0] == 0) + { /* let's see if we can find any interesting cmaps */ + for (i = 0; i < FontGDI->face->num_charmaps; i++) { - FT_UInt Dummy; - - if (FT_Get_First_Char(FontGDI->face, &Dummy) < 0x100) - { - fs_fsCsb0 |= 1; - } - else - { - fs_fsCsb0 |= 1L << 31; - } + switch (FontGDI->face->charmaps[i]->encoding) + { + case FT_ENCODING_UNICODE: + case FT_ENCODING_APPLE_ROMAN: + fs.fsCsb[0] |= FS_LATIN1; + break; + case FT_ENCODING_MS_SYMBOL: + fs.fsCsb[0] |= FS_SYMBOL; + break; + default: + break; + } } - if (0 == fs_fsCsb0) - { /* let's see if we can find any interesting cmaps */ - for (i = 0; i < FontGDI->face->num_charmaps; i++) - { - switch (FontGDI->face->charmaps[i]->encoding) - { - case ft_encoding_unicode: - case ft_encoding_apple_roman: - fs_fsCsb0 |= 1; - break; - case ft_encoding_symbol: - fs_fsCsb0 |= 1L << 31; - break; - default: - break; - } - } + } + for (i = 0; i < MAXTCIINDEX; i++) + { + fs0 = 1L << i; + if (fs.fsCsb[0] & fs0) + { + if (!IntTranslateCharsetInfo(&fs0, &CharSetInfo, TCI_SRCFONTSIG)) + { + CharSetInfo.ciCharset = DEFAULT_CHARSET; + } + if (DEFAULT_CHARSET != CharSetInfo.ciCharset) + { + Info->EnumLogFontEx.elfLogFont.lfCharSet = CharSetInfo.ciCharset; + if (NULL != ElfScripts[i]) + wcscpy(Info->EnumLogFontEx.elfScript, ElfScripts[i]); + else + { + DPRINT1("Unknown elfscript for bit %d\n", i); + } + } } - - for(i = 0; i < 32; i++) - { - if (0 != (fs_fsCsb0 & (1L << i))) - { - fs.fsCsb[0] = 1L << i; - fs.fsCsb[1] = 0; - if (! IntTranslateCharsetInfo(fs.fsCsb, &CharSetInfo, TCI_SRCFONTSIG)) - { - CharSetInfo.ciCharset = DEFAULT_CHARSET; - } - if (31 == i) - { - CharSetInfo.ciCharset = SYMBOL_CHARSET; - } - if (DEFAULT_CHARSET != CharSetInfo.ciCharset) - { - Info->EnumLogFontEx.elfLogFont.lfCharSet = CharSetInfo.ciCharset; - if (NULL != ElfScripts[i]) - { - wcscpy(Info->EnumLogFontEx.elfScript, ElfScripts[i]); - } - else - { - DPRINT1("Unknown elfscript for bit %d\n", i); - } - } - } - } - } + } + Info->NewTextMetricEx.ntmFontSig = fs; + } } static int FASTCALL @@ -2203,35 +2191,6 @@ return TRUE; } -DWORD -FASTCALL -IntGdiGetCharSet(HDC hDC) -{ - UINT cp = 0; - CHARSETINFO csi; - DWORD charset = NtGdiGetTextCharsetInfo(hDC,NULL,0); - if (IntTranslateCharsetInfo(&charset, &csi, TCI_SRCCHARSET)) - cp = csi.ciACP; - else - { - switch(charset) - { - case ANSI_CHARSET: - break; - case OEM_CHARSET: - cp = 1; - break; - case DEFAULT_CHARSET: - cp = 0; - break; - default: - DPRINT1("Can't find codepage for charset %d\n", charset); - break; - } - } - DPRINT("charset %d => cp %d\n", charset, LOWORD(cp)); - return (MAKELONG(cp, charset)); -} INT FASTCALL @@ -2249,19 +2208,20 @@ TT_OS2 *pOS2; FT_Face Face; CHARSETINFO csi; - DWORD charset; + DWORD cp; DWORD fs0; + USHORT usACP, usOEM; Dc_Attr = Dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; hFont = Dc_Attr->hlfntNew; TextObj = RealizeFontInit(hFont); - if ( TextObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return Ret; - } + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return Ret; + } FontGdi = ObjToGDI(TextObj->Font, FONT); Face = FontGdi->face; TEXTOBJ_UnlockText(TextObj); @@ -2312,7 +2272,10 @@ RtlCopyMemory(lpSig, &fs, sizeof(FONTSIGNATURE)); } - if (IntTranslateCharsetInfo(&charset, &csi, TCI_SRCCODEPAGE)) + RtlGetDefaultCodePage(&usACP, &usOEM); + cp = usACP; + + if (IntTranslateCharsetInfo(&cp, &csi, TCI_SRCCODEPAGE)) if (csi.fs.fsCsb[0] & fs.fsCsb[0]) { DPRINT("Hit 1\n"); @@ -2333,12 +2296,12 @@ goto Exit; } else - DPRINT("TCI failing on %x\n", fs0); + DPRINT1("TCI failing on %x\n", fs0); } } Exit: - DPRINT("CharSet %d CodePage %d\n",Ret, csi.ciACP); - return Ret; + DPRINT("CharSet %d CodePage %d\n",csi.ciCharset, csi.ciACP); + return (MAKELONG(csi.ciACP, csi.ciCharset)); } @@ -2409,59 +2372,6 @@ } -DWORD -FASTCALL -ftGetFontLanguageInfo(PDC Dc) -{ - PDC_ATTR Dc_Attr; - FONTSIGNATURE fontsig; - static const DWORD GCP_DBCS_MASK=0x003F0000, - GCP_DIACRITIC_MASK=0x00000000, - FLI_GLYPHS_MASK=0x00000000, - GCP_GLYPHSHAPE_MASK=0x00000040, - GCP_KASHIDA_MASK=0x00000000, - GCP_LIGATE_MASK=0x00000000, - GCP_USEKERNING_MASK=0x00000000, - GCP_REORDER_MASK=0x00000060; - - DWORD result=0; - - ftGdiGetTextCharsetInfo( Dc, &fontsig, 0 ); - - /* We detect each flag we return using a bitmask on the Codepage Bitfields */ - if( (fontsig.fsCsb[0]&GCP_DBCS_MASK)!=0 ) - result|=GCP_DBCS; - - if( (fontsig.fsCsb[0]&GCP_DIACRITIC_MASK)!=0 ) - result|=GCP_DIACRITIC; - - if( (fontsig.fsCsb[0]&FLI_GLYPHS_MASK)!=0 ) - result|=FLI_GLYPHS; - - if( (fontsig.fsCsb[0]&GCP_GLYPHSHAPE_MASK)!=0 ) - result|=GCP_GLYPHSHAPE; - - if( (fontsig.fsCsb[0]&GCP_KASHIDA_MASK)!=0 ) - result|=GCP_KASHIDA; - - if( (fontsig.fsCsb[0]&GCP_LIGATE_MASK)!=0 ) - result|=GCP_LIGATE; - - if( (fontsig.fsCsb[0]&GCP_USEKERNING_MASK)!=0 ) - result|=GCP_USEKERNING; - - Dc_Attr = Dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; - - /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */ - if ( Dc_Attr->lTextAlign & TA_RTLREADING ) - if( (fontsig.fsCsb[0]&GCP_REORDER_MASK)!=0 ) - result|=GCP_REORDER; - - return result; -} - - BOOL FASTCALL ftGdiGetTextMetricsW( @@ -2749,6 +2659,7 @@ IntFontType(PFONTGDI Font) { PS_FontInfoRec psfInfo; + FT_ULong tmp_size = 0; if (FT_HAS_MULTIPLE_MASTERS(Font->face)) Font->FontObj.flFontType |= FO_MULTIPLEMASTER; @@ -2765,6 +2676,11 @@ if (!FT_Get_PS_Font_Info(Font->face, &psfInfo )) { Font->FontObj.flFontType |= FO_POSTSCRIPT; + } + /* check for the presence of the 'CFF ' table to check if the font is Type1 */ + if (!FT_Load_Sfnt_Table(Font->face, FT_MAKE_TAG('C','F','F',' '), 0, NULL, &tmp_size)) + { + Font->FontObj.flFontType |= (FO_CFF|FO_POSTSCRIPT); } } @@ -2979,14 +2895,14 @@ case 1: /* Copy the full font name */ Size = wcslen(Info.EnumLogFontEx.elfFullName) + 1; Size = min(Size , LF_FULLFACESIZE) * sizeof(WCHAR); - memcpy(pBuffer, Info.EnumLogFontEx.elfFullName, Size); + RtlCopyMemory(pBuffer, Info.EnumLogFontEx.elfFullName, Size); // FIXME: Do we have to zeroterminate? *pdwBytes = Size; break; case 2: /* Copy a LOGFONTW structure */ Info.EnumLogFontEx.elfLogFont.lfWidth = 0; - memcpy(pBuffer, &Info.EnumLogFontEx.elfLogFont, sizeof(LOGFONTW)); + RtlCopyMemory(pBuffer, &Info.EnumLogFontEx.elfLogFont, sizeof(LOGFONTW)); *pdwBytes = sizeof(LOGFONTW); break; Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -21,7 +21,7 @@ { PDC Dc; PDC_ATTR Dc_Attr; - DWORD cscp = IntGdiGetCharSet(hDC); + DWORD cscp; // If here, update everything! Dc = DC_LockDc(hDC); if (!Dc) @@ -29,6 +29,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } + cscp = ftGdiGetTextCharsetInfo(Dc,NULL,0); Dc_Attr = Dc->pDc_Attr; if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; Dc_Attr->iCS_CP = cscp; @@ -96,10 +97,13 @@ if (!lpSig) pfsSafe = NULL; - Ret = ftGdiGetTextCharsetInfo( Dc, pfsSafe, dwFlags); + Ret = HIWORD(ftGdiGetTextCharsetInfo( Dc, pfsSafe, dwFlags)); if (lpSig) { + if (Ret == DEFAULT_CHARSET) + RtlZeroMemory(pfsSafe, sizeof(FONTSIGNATURE)); + _SEH_TRY { ProbeForWrite( lpSig, Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -2125,20 +2125,6 @@ */ BOOL APIENTRY -NtGdiGetRealizationInfo( - IN HDC hdc, - OUT PREALIZATION_INFO pri, - IN HFONT hf) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY NtGdiDrawStream( IN HDC hdcDst, IN ULONG cjIn,

15 years, 10 months

[dchapyshev] 37184: - Change params types for NtUserLockWindowUpdate - Implement LockWindowUpdate in user32 (but not implemented in win32k)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Nov 4 06:29:47 2008 New Revision: 37184 URL: http://svn.reactos.org/svn/reactos?rev=37184&view=rev Log: - Change params types for NtUserLockWindowUpdate - Implement LockWindowUpdate in user32 (but not implemented in win32k) Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Tue Nov 4 06:29:47 2008 @@ -62,15 +62,14 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL LockWindowUpdate( HWND hWndLock) { - UNIMPLEMENTED; - return FALSE; + return NtUserLockWindowUpdate(hWndLock); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Nov 4 06:29:47 2008 @@ -1805,10 +1805,10 @@ NtUserLockWindowStation( HWINSTA hWindowStation); -DWORD -NTAPI +BOOL +STDCALL NtUserLockWindowUpdate( - DWORD Unknown0); + HWND hWnd); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Nov 4 06:29:47 2008 @@ -3882,8 +3882,8 @@ /* * @unimplemented */ -DWORD STDCALL -NtUserLockWindowUpdate(DWORD Unknown0) +BOOL STDCALL +NtUserLockWindowUpdate(HWND hWnd) { UNIMPLEMENTED

15 years, 10 months

[dreimer] 37183: Fix a bug caused by a leftover of the rosapps/rostools disable feature.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Nov 4 02:31:54 2008 New Revision: 37183 URL: http://svn.reactos.org/svn/reactos?rev=37183&view=rev Log: Fix a bug caused by a leftover of the rosapps/rostools disable feature. Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Tue Nov 4 02:31:54 2008 @@ -31,8 +31,7 @@ ) else ( "%_ROSBE_BASEDIR%\Tools\svn.exe" update ) -) -goto :EOC + goto :EOC ) if /i "%1" == "cleanup" ( title SVN Cleaning...

15 years, 10 months

[dchapyshev] 37182: - Update Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Nov 4 00:34:39 2008 New Revision: 37182 URL: http://svn.reactos.org/svn/reactos?rev=37182&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ru-RU.rc [iso-8859-1] Tue Nov 4 00:34:39 2008 @@ -200,5 +200,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Ìàêèíòîø" -STRING_LINE_COLUMN, "Line %d, column %d" -END +STRING_LINE_COLUMN, "Ñòðîêà %d, ñòîëáåö %d" +END Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] Tue Nov 4 00:34:39 2008 @@ -8,7 +8,7 @@ LTEXT "Ïàðàìåòðû ïðîòîêîëà IP ìîãóò íàçíà÷àòüñÿ àâòîìàòè÷åñêè, åñëè ñåòü ïîääåðæèâàåò òàêóþ âîçìîæíîñòü. Â ïðîòèâíîì ñëó÷àå ýòè ïàðàìåòðû ìîæíî ïîëó÷èòü ó ñåòåâîãî àäìèíèñòðàòîðà.", -1, 9, 9, 228, 27 CONTROL "Ïîëó÷àòü IP-àäðåñ àâòîìàòè÷åñêè", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX - CONTROL "&Èñïîëüçîâàòü óêàçàííûé IP-àäðåñ:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + CONTROL "&Èñïîëüçîâàòü óêàçàííûé IP-àäðåñ:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 140, 12 LTEXT "IP-àäðåñ:", -1, 14, 75, 135, 8 CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,150,75-2,80,12 LTEXT "Ìàñêà ïîäñåòè:", -1, 14, 90, 135, 8 @@ -17,32 +17,32 @@ CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,150,105-2,80,12 CONTROL "Ïîëó÷àòü àäðåñ DNS-ñåðâåðà àâòîìàòè÷åñêè", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12 GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX - CONTROL "&Èñïîëüçîâàòü ñëåäóþùèå àäðåñà DNS-ñåðâåðîâ", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + CONTROL "&Èñïîëüçîâàòü ñëåäóþùèå àäðåñà DNS-ñåðâåðîâ", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 185, 12 LTEXT "Ïðåäïî÷èòàåìûé DNS-ñåðâåð:", -1, 14, 171, 135, 8 CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,150,171-2,80,12 LTEXT "Àëüòåðíàòèâíûé DNS-ñåðâåð:", -1, 14, 186, 135, 8 CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12 - PUSHBUTTON "&Äîïîëíèòåëüíî", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP + PUSHBUTTON "&Äîïîëíèòåëüíî", IDC_ADVANCED, 162, 209, 74, 14, WS_TABSTOP END IDD_TCPIP_ALTCF_DLG DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Alternate Configuration" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 - CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 +CAPTION "Àëüòåðíàòèâíàÿ êîíôèãóðàöèÿ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Åñëè ýòîò êîìïüþòåð èñïîëüçóåòñÿ â íåñêîëüêèõ ñåòÿõ, ââåäèòå ïàðàìåòðû àëüòåðíàòèâíîé êîíôèãóðàöèè ïðîòîêîëà IP:", -1, 9, 9, 230, 20 + CONTROL "À&âòîìàòè÷åñêèé ÷àñòíûé IP-àäðåñ", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 - LTEXT "&IP àäðåñ:", -1, 14, 75, 135, 8 + CONTROL "Íàñòðàèâàåì&ûé ïîëüçîâàòåëåì", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 130, 12 + LTEXT "IP-&àäðåñ:", -1, 14, 75, 135, 8 CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 150, 75, 80, 12 - LTEXT "&Ìàñêà ïîäñåòè:", -1, 14, 95, 135, 8 + LTEXT "Ìà&ñêà ïîäñåòè:", -1, 14, 95, 135, 8 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP, 150, 95, 80, 12 - LTEXT "&Øëþç ïî óìîë÷àíèþ:", -1, 14, 115, 135, 8 + LTEXT "&Îñíîâíîé øëþç:", -1, 14, 115, 135, 8 CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP, 150, 115, 80, 12 - LTEXT "&Îñíîâíîé DNS ñåðâåð:", -1, 14, 150, 135, 8 + LTEXT "Ïð&åäïî÷èòàåìûé DNS-ñåðâåð:", -1, 14, 150, 135, 8 CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP, 150, 150, 80, 12 - LTEXT "&Äîïîëíèòåëüíûé DNS ñåðâåð:", -1, 14, 165, 180, 8 + LTEXT "Àë&üòåðíàòèâíûé DNS-ñåðâåð:", -1, 14, 165, 180, 8 CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP, 150, 165, 80, 12 END @@ -51,19 +51,19 @@ CAPTION "Ïàðàìåòðû IP" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP-&àäðåñà", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 - PUSHBUTTON "Äîáàâèòü...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Èçìåíèòü...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Óäàëèòü", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP - GROUPBOX "Default gateways:", -1, 5, 100, 240, 90 + PUSHBUTTON "&Äîáàâèòü...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "&Èçìåíèòü...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "&Óäàëèòü", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP + GROUPBOX "&Îñíîâíûå øëþçû:", -1, 5, 100, 240, 90 CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55 - PUSHBUTTON "Äîáàâèòü...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Èçìåíèòü...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Óäàëèòü", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Äî&áàâèòü...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "È&çìåíèòü...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Óäà&ëèòü", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP GROUPBOX "", -1, 5, 200, 240, 30 - CHECKBOX "Àâòîìàòè÷åñêàÿ ìåòðèêà", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "Ìåòðèêà èíòåðôåéñà:", -1, 15, 215, 90, 12 + CHECKBOX "À&âòîìàòè÷åñêîå íàçíà÷åíèå ìåòðèêè", IDC_AUTOMETRIC, 9, 200, 146, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "Ìåòðèêà èí&òåðôåéñà:", -1, 15, 215, 90, 12 EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER END @@ -73,26 +73,26 @@ FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY - LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 + LTEXT "&Àäðåñà DNS-ñåðâåðîâ, â ïîðÿäêå èñïîëüçîâàíèÿ:", -1, 5, 5, 180, 10 PUSHBUTTON "Ââåðõ", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Âíèç", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP PUSHBUTTON "&Äîáàâèòü...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP - PUSHBUTTON "&Èçìåíèòü...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "È&çìåíèòü...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP PUSHBUTTON "&Óäàëèòü", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP - LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24 - CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 - CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 + LTEXT "Ñëåäóþùèå òðè ïàðàìåòðà ïðèìåíÿþòñÿ äëÿ âñåõ ïîäêëþ÷åíèé, èñïîëüçóþùèõ TCP/IP. Äëÿ ðàçðåøåíèÿ íåèçâåñòíûõ èìåí:", -1, 5, 90, 238, 20 + CONTROL "Äîïèñûâàòü &îñíîâíîé DNS-ñóôôèêñ è ñóôôèêñ ïîäêëþ÷åíèÿ", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 234, 12 + CHECKBOX "Äîïèñûâàòü ðîäè&òåëüñêèå ñóôôèêñû îñí. DNS-ñóôôèêñà", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CONTROL "Äîïèñûâàòü ñë&åäóþùèå DNS-ñóôôèêñû (ïî ïîðÿäêó):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 206, 12 LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY PUSHBUTTON "Ââåðõ", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Âíèç", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "Ä&îáàâèòü...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP - PUSHBUTTON "È&çìåíèòü...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP - PUSHBUTTON "Óä&àëèòü", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP - LTEXT "DNS &suffix for this connection:", -1, 5, 225, 110, 14 + PUSHBUTTON "Äî&áàâèòü...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "Èç&ìåíèòü...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "Óäà&ëèòü", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP + LTEXT "DNS-&ñóôôèêñ ïîäêëþ÷åíèÿ:", -1, 5, 225, 110, 14 EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP - CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Çàðå&ãèñòðèðîâàòü àäðåñà ýòîãî ïîäêëþ÷åíèÿ â DNS", IDC_REGSUFFIX, 8, 240, 204, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Èñïîëüçîâàòü DNS-ñóôôèêñ ïîäêëþ÷åíèÿ ïðè ðåãèñòðàöèè â DNS", IDC_USESUFFIX, 8, 255, 270, 12, BS_AUTOCHECKBOX | WS_TABSTOP END @@ -148,39 +148,39 @@ IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Domain Suffix" +CAPTION "Äîìåííûé ñóôôèêñ TCP/IP" FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP - LTEXT "Domain suffix:", -1, 5, 10, 120, 12 + LTEXT "&Äîìåííûé ñóôôèêñ:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE 0, 0, 305, 220 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP ôèëüòðàöèÿ" -FONT 8, "MS Shell Dlg" -BEGIN - CHECKBOX "Enable TCP/IP-Filtering (All adapters)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CAPTION "Ôèëüòðàöèÿ TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "&Çàäåéñòâîâàòü ôèëüòðàöèþ TCP/IP (âñå àäàïòåðû)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "", -1, 5, 30, 90, 150 - CONTROL "Permit All", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 - CONTROL "Permit Only", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 + CONTROL "&Ìîæíî âñå", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 + CONTROL "&Òîëüêî", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 - PUSHBUTTON "Äîáàâèòü", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Óäàëèòü", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Äîáàâèòü...", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "&Óäàëèòü", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 105, 30, 90, 150 - CONTROL "Permit All", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 - CONTROL "Permit Only", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 + CONTROL "Ìî&æíî âñå", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 + CONTROL "Òî&ëüêî", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 - PUSHBUTTON "Äîáàâèòü", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Óäàëèòü", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Äîáàâèòü...", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Óä&àëèòü", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 205, 30, 90, 150 - CONTROL "Permit All", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 - CONTROL "Permit Only", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 + CONTROL "Ìîæíî &âñå", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 + CONTROL "Òîë&üêî", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 - PUSHBUTTON "Äîáàâèòü", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Óäàëèòü", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Äîáàâèòü...", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Óäàë&èòü", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Îòìåíà", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -198,32 +198,32 @@ STRINGTABLE BEGIN - IDS_NET_CONNECT "Ñåòåâîå ïîäêëþ÷åíèå" - IDS_NO_IPADDR_SET "The adapter requires at least one IP address. Please enter one." - IDS_NO_SUBMASK_SET "You have entered an address that is missing its subnet mask. Please add a subnet mask." - IDS_TCPFILTERDESC "TCP/IP filtering allows you to control the type of TCP/IP network traffic that reaches your computer." - IDS_TCPFILTER "TCP/IP Filtering" - IDS_IPADDR "IP àäðåñ" + IDS_NET_CONNECT "Ñåòåâûå ïîäêëþ÷åíèÿ" + IDS_NO_IPADDR_SET "Ýòîò àäàïòåð òðåáóåò ââîäà õîòÿ áû îäíîãî IP-àäðåñà. Ââåäèòå àäðåñ." + IDS_NO_SUBMASK_SET "Ââåäåí àäðåñ áåç óêàçàíèÿ ìàñêè ïîäñåòè. Ââåäèòå ìàñêó ïîäñåòè." + IDS_TCPFILTERDESC "Ôèëüòðàöèÿ TCP/IP ïîçâîëÿåò êîíòðîëèðîâàòü ñåòåâîé òðàôèê TCP/IP, ïîñòóïàþùèé íà äàííûé êîìïüþòåð." + IDS_TCPFILTER "Ôèëüòðàöèÿ TCP/IP" + IDS_IPADDR "IP-àäðåñ" IDS_SUBMASK "Ìàñêà ïîäñåòè" IDS_GATEWAY "Øëþç" IDS_METRIC "Ìåòðèêà" IDS_DHCPACTIVE "DHCP âêëþ÷åí" IDS_AUTOMATIC "Àâòîìàòè÷åñêè" - IDS_NOITEMSEL "You have not selected an item. Select one first." + IDS_NOITEMSEL "Íå âûáðàíî íè îäíîãî ýëåìåíòà. Ñëåäóåò âûáðàòü õîòû áû îäèí ýëåìåíò." IDS_TCPIP "ReactOS-TCP/IP" IDS_ADD "Äîáàâèòü" IDS_MOD "OK" - IDS_TCP_PORTS "TCP ïðîòû" - IDS_UDP_PORTS "UDP ïðîòû" - IDS_IP_PROTO "IP ïðîòîêîëû" - IDS_PORT_RANGE "Port numbers must be greater than 0 and less than 65536. Please enter a number within this range." - IDS_PROT_RANGE "Protocol numbers must be greater than 0 and less than 256. Please enter a number within this range." - IDS_DUP_NUMBER "The number you are trying to add is already in the list. Please enter a different number." - IDS_DISABLE_FILTER "Disabling this global TCP/IP setting will affect all adapters." - IDS_NO_SUFFIX "The current setting of search method requires at least one DNS suffix. Please enter one or change the setting." - IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." - IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." - IDS_DUP_SUFFIX "The DNS suffix is already on the list." - IDS_DUP_IPADDR "IP àäðåñ óæå â ñïèñêå." + IDS_TCP_PORTS "TCP-ïðîòû" + IDS_UDP_PORTS "UDP-ïðîòû" + IDS_IP_PROTO "IP-ïðîòîêîëû" + IDS_PORT_RANGE "Íîìåðà ïîðòîâ äîëæíû áûòü áîëüøå 0 è ìåíüøå 65536. Ââåäèòå íîìåð â ýòîì äèàïàçîíå." + IDS_PROT_RANGE "Íîìåðà ïðîòîêîëîâ äîëæíû áûòü áîëüøå 0 è ìåíüøå 256. Ââåäèòå íîìåð â ýòîì äèàïàçîíå." + IDS_DUP_NUMBER "Íîìåð, êîòîðûé âû õîòèòå äîáàâèòü, óæå èìååòñÿ â ñïèñêå. Ââåäèòå äðóãîé íîìåð." + IDS_DISABLE_FILTER "Çàïðåùåíèå ýòîãî ãëîáàëüíîãî ïàðàìåòðà TCP/IP ïîâëèÿåò íà âñå àäàïòåðû." + IDS_NO_SUFFIX "Òåêóùèå óñòàíîâêè ìåòîäà ïîèñêà òðåáóþò óêàçàíèÿ ïî ìåíüøåé ìåðå îäíîãî ñóôôèêñà DNS. Ââåäèòå ñóôôèêñ èëè èçìåíèòå óñòàíîâêè." + IDS_DOMAIN_SUFFIX "Íåïðàâèëüíûé ñóôôèêñ äîìåíà." + IDS_DNS_SUFFIX "DNS-èìÿ äîìåíà ""%s"" íå ÿâëÿåòñÿ äîïóñòèìûì DNS-èìåíåì." + IDS_DUP_SUFFIX "DNS-ñóôèêñ óæå èìååòñÿ â ñïèñêå." + IDS_DUP_IPADDR "IP-àäðåñ óæå èìååòñÿ â ñïèñêå." IDS_DUP_GW "Øëþç ïî óìîë÷àíèþ óæå â ñïèñêå." END

15 years, 10 months

[cfinck] 37181: That's it, tag the ReactOS 0.3.7 release

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Nov 3 23:18:05 2008 New Revision: 37181 URL: http://svn.reactos.org/svn/reactos?rev=37181&view=rev Log: That's it, tag the ReactOS 0.3.7 release Added: tags/ReactOS-0.3.7/ - copied from r37180, branches/ros-branch-0_3_7/ Removed: branches/ros-branch-0_3_7/

15 years, 10 months

[jimtabor] 37180: - Update and fix CodePage and CharSet.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 3 19:57:38 2008 New Revision: 37180 URL: http://svn.reactos.org/svn/reactos?rev=37180&view=rev Log: - Update and fix CodePage and CharSet. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Mon Nov 3 19:57:38 2008 @@ -224,5 +224,7 @@ STDCALL GdiSetLastError( DWORD dwErrCode ); +DWORD STDCALL GdiGetCodePage(HDC); + /* EOF */ Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Mon Nov 3 19:57:38 2008 @@ -101,7 +101,7 @@ */ static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP) { - UINT cp = CP_ACP; // GdiGetCodePage( hdc ); + UINT cp = GdiGetCodePage( hdc ); INT lenW; LPWSTR strW; @@ -660,7 +660,7 @@ str[i] = (BYTE)(iFirstChar + i); str[i] = '\0'; - wstr = FONT_mbtowc(NULL, str, count+1, &wlen, NULL); + wstr = FONT_mbtowc(hdc, str, count+1, &wlen, NULL); if (!wstr) { HeapFree(GetProcessHeap(), 0, str); @@ -707,7 +707,7 @@ str[i] = (BYTE)(iFirstChar + i); str[i] = '\0'; - wstr = FONT_mbtowc(NULL, str, count+1, &wlen, NULL); + wstr = FONT_mbtowc(hdc, str, count+1, &wlen, NULL); if (!wstr) { HeapFree(GetProcessHeap(), 0, str); @@ -754,7 +754,7 @@ str[i] = (BYTE)(iFirstChar + i); str[i] = '\0'; - wstr = FONT_mbtowc(NULL, str, count+1, &wlen, NULL); + wstr = FONT_mbtowc(hdc, str, count+1, &wlen, NULL); if (!wstr) { HeapFree(GetProcessHeap(), 0, str); @@ -970,7 +970,7 @@ len = 1; mbchs[0] = (uChar & 0xff); } - p = FONT_mbtowc(NULL, mbchs, len, NULL, NULL); + p = FONT_mbtowc(hdc, mbchs, len, NULL, NULL); c = p[0]; } else c = uChar; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Mon Nov 3 19:57:38 2008 @@ -144,6 +144,7 @@ if (oDc_Attr->dwLayout & LAYOUT_ORIENTATIONMASK) Layout = oDc_Attr->dwLayout; NewDC->DcLevel.flPath = OrigDC->DcLevel.flPath; nDc_Attr->ulDirty_ = oDc_Attr->ulDirty_; + nDc_Attr->iCS_CP = oDc_Attr->iCS_CP; DC_UnlockDc(NewDC); DC_UnlockDc(OrigDC); @@ -876,6 +877,7 @@ NewDC->DC_Type = DC_TYPE_INFO; DC_UnlockDc( NewDC ); } + nDc_Attr->iCS_CP = IntGdiGetCharSet(hNewDC); return hNewDC; } Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Mon Nov 3 19:57:38 2008 @@ -106,46 +106,47 @@ /* * For TranslateCharsetInfo */ -#define FS(x) {{0,0,0,0},{0x1<<(x),0}} +#define CP_SYMBOL 42 +#define FS_VIETNAMESE 0x00000100L #define MAXTCIINDEX 32 -static CHARSETINFO FontTci[MAXTCIINDEX] = { +static const CHARSETINFO FontTci[MAXTCIINDEX] = { /* ANSI */ - { ANSI_CHARSET, 1252, FS(0)}, - { EASTEUROPE_CHARSET, 1250, FS(1)}, - { RUSSIAN_CHARSET, 1251, FS(2)}, - { GREEK_CHARSET, 1253, FS(3)}, - { TURKISH_CHARSET, 1254, FS(4)}, - { HEBREW_CHARSET, 1255, FS(5)}, - { ARABIC_CHARSET, 1256, FS(6)}, - { BALTIC_CHARSET, 1257, FS(7)}, - { VIETNAMESE_CHARSET, 1258, FS(8)}, + { ANSI_CHARSET, 1252, {{0,0,0,0},{FS_LATIN1,0}} }, + { EASTEUROPE_CHARSET, 1250, {{0,0,0,0},{FS_LATIN2,0}} }, + { RUSSIAN_CHARSET, 1251, {{0,0,0,0},{FS_CYRILLIC,0}} }, + { GREEK_CHARSET, 1253, {{0,0,0,0},{FS_GREEK,0}} }, + { TURKISH_CHARSET, 1254, {{0,0,0,0},{FS_TURKISH,0}} }, + { HEBREW_CHARSET, 1255, {{0,0,0,0},{FS_HEBREW,0}} }, + { ARABIC_CHARSET, 1256, {{0,0,0,0},{FS_ARABIC,0}} }, + { BALTIC_CHARSET, 1257, {{0,0,0,0},{FS_BALTIC,0}} }, + { VIETNAMESE_CHARSET, 1258, {{0,0,0,0},{FS_VIETNAMESE,0}} }, /* reserved by ANSI */ - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, /* ANSI and OEM */ - { THAI_CHARSET, 874, FS(16)}, - { SHIFTJIS_CHARSET, 932, FS(17)}, - { GB2312_CHARSET, 936, FS(18)}, - { HANGEUL_CHARSET, 949, FS(19)}, - { CHINESEBIG5_CHARSET, 950, FS(20)}, - { JOHAB_CHARSET, 1361, FS(21)}, + { THAI_CHARSET, 874, {{0,0,0,0},{FS_THAI,0}} }, + { SHIFTJIS_CHARSET, 932, {{0,0,0,0},{FS_JISJAPAN,0}} }, + { GB2312_CHARSET, 936, {{0,0,0,0},{FS_CHINESESIMP,0}} }, + { HANGEUL_CHARSET, 949, {{0,0,0,0},{FS_WANSUNG,0}} }, + { CHINESEBIG5_CHARSET, 950, {{0,0,0,0},{FS_CHINESETRAD,0}} }, + { JOHAB_CHARSET, 1361, {{0,0,0,0},{FS_JOHAB,0}} }, /* reserved for alternate ANSI and OEM */ - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, /* reserved for system */ - { DEFAULT_CHARSET, 0, FS(0)}, - { SYMBOL_CHARSET, 42 /* CP_SYMBOL */, FS(31)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { SYMBOL_CHARSET, CP_SYMBOL, {{0,0,0,0},{FS_SYMBOL,0}} } }; BOOL FASTCALL @@ -531,13 +532,13 @@ } break; case TCI_SRCCODEPAGE: - while ((UINT) (Src) != FontTci[Index].ciACP && Index < MAXTCIINDEX) + while ( *Src != FontTci[Index].ciACP && Index < MAXTCIINDEX) { Index++; } break; case TCI_SRCCHARSET: - while ((UINT) (Src) != FontTci[Index].ciCharset && Index < MAXTCIINDEX) + while ( *Src != FontTci[Index].ciCharset && Index < MAXTCIINDEX) { Index++; } @@ -551,7 +552,7 @@ return FALSE; } - memcpy(Cs, &FontTci[Index], sizeof(CHARSETINFO)); + RtlCopyMemory(Cs, &FontTci[Index], sizeof(CHARSETINFO)); return TRUE; } @@ -2215,6 +2216,8 @@ { switch(charset) { + case ANSI_CHARSET: + break; case OEM_CHARSET: cp = 1; break; @@ -2238,13 +2241,16 @@ DWORD dwFlags) { PDC_ATTR Dc_Attr; - UINT Ret = DEFAULT_CHARSET, i = 0, fs_fsCsb0 = 0; + UINT Ret = DEFAULT_CHARSET, i; HFONT hFont; PTEXTOBJ TextObj; PFONTGDI FontGdi; FONTSIGNATURE fs; TT_OS2 *pOS2; FT_Face Face; + CHARSETINFO csi; + DWORD charset; + DWORD fs0; Dc_Attr = Dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; @@ -2259,58 +2265,79 @@ FontGdi = ObjToGDI(TextObj->Font, FONT); Face = FontGdi->face; TEXTOBJ_UnlockText(TextObj); + IntLockFreeType; pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2); IntUnLockFreeType; memset(&fs, 0, sizeof(FONTSIGNATURE)); if (NULL != pOS2) - { + { fs.fsCsb[0] = pOS2->ulCodePageRange1; fs.fsCsb[1] = pOS2->ulCodePageRange2; fs.fsUsb[0] = pOS2->ulUnicodeRange1; fs.fsUsb[1] = pOS2->ulUnicodeRange2; fs.fsUsb[2] = pOS2->ulUnicodeRange3; fs.fsUsb[3] = pOS2->ulUnicodeRange4; - fs_fsCsb0 = pOS2->ulCodePageRange1; if (pOS2->version == 0) - { + { FT_UInt dummy; if(FT_Get_First_Char( Face, &dummy ) < 0x100) - fs_fsCsb0 |= 1; + fs.fsCsb[0] |= FS_LATIN1; else - fs_fsCsb0 |= 1L << 31; - } - } + fs.fsCsb[0] |= FS_SYMBOL; + } + } DPRINT("Csb 1=%x 0=%x\n", fs.fsCsb[1],fs.fsCsb[0]); + if (fs.fsCsb[0] == 0) + { /* let's see if we can find any interesting cmaps */ + for (i = 0; i < Face->num_charmaps; i++) + { + switch (Face->charmaps[i]->encoding) + { + case FT_ENCODING_UNICODE: + case FT_ENCODING_APPLE_ROMAN: + fs.fsCsb[0] |= FS_LATIN1; + break; + case FT_ENCODING_MS_SYMBOL: + fs.fsCsb[0] |= FS_SYMBOL; + break; + default: + break; + } + } + } if (lpSig) { RtlCopyMemory(lpSig, &fs, sizeof(FONTSIGNATURE)); } - if (0 == fs_fsCsb0) - { /* let's see if we can find any interesting cmaps */ - for (i = 0; i < Face->num_charmaps; i++) - { - switch (Face->charmaps[i]->encoding) - { - case ft_encoding_unicode: - case ft_encoding_apple_roman: - fs_fsCsb0 |= 1; - break; - case ft_encoding_symbol: - fs_fsCsb0 |= 1L << 31; - break; - default: - break; - } - } - } - while (0 == (fs_fsCsb0 >> i & 0x0001) && i < MAXTCIINDEX) - { - i++; - } - Ret = FontTci[i].ciCharset; - DPRINT("CharSet %d\n",Ret); + + if (IntTranslateCharsetInfo(&charset, &csi, TCI_SRCCODEPAGE)) + if (csi.fs.fsCsb[0] & fs.fsCsb[0]) + { + DPRINT("Hit 1\n"); + Ret = csi.ciCharset; + goto Exit; + } + + for (i = 0; i < MAXTCIINDEX; i++) + { + fs0 = 1L << i; + if (fs.fsCsb[0] & fs0) + { + if (IntTranslateCharsetInfo(&fs0, &csi, TCI_SRCFONTSIG)) + { + //*cp = csi.ciACP; + DPRINT("Hit 2\n"); + Ret = csi.ciCharset; + goto Exit; + } + else + DPRINT("TCI failing on %x\n", fs0); + } + } +Exit: + DPRINT("CharSet %d CodePage %d\n",Ret, csi.ciACP); return Ret; }

15 years, 10 months

[janderwald] 37179: - Apply changes to Hide / Show Network Notification setting on exit

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Nov 3 16:13:24 2008 New Revision: 37179 URL: http://svn.reactos.org/svn/reactos?rev=37179&view=rev Log: - Apply changes to Hide / Show Network Notification setting on exit Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] Mon Nov 3 16:13:24 2008 @@ -307,7 +307,11 @@ PNET_ITEM pItem; INetConnectionPropertyUiImpl * This; LPPSHNOTIFY lppsn; + DWORD dwShowIcon; HRESULT hr; + WCHAR szKey[200]; + LPOLESTR pStr; + HKEY hKey; switch(uMsg) { @@ -326,14 +330,31 @@ if (This->pNCfg) { hr = INetCfg_Apply(This->pNCfg); - if (SUCCEEDED(hr)) - return PSNRET_NOERROR; - else + if (FAILED(hr)) return PSNRET_INVALID; } + + if (SendDlgItemMessageW(hwndDlg, IDC_SHOWTASKBAR, BM_GETCHECK, 0, 0) == BST_CHECKED) + dwShowIcon = 1; + else + dwShowIcon = 0; + + + if (StringFromCLSID(&This->pProperties->guidId, &pStr) == ERROR_SUCCESS) + { + swprintf(szKey, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection", pStr); + CoTaskMemFree(pStr); + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKey, 0, KEY_WRITE, &hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey, L"ShowIcon", 0, REG_DWORD, (LPBYTE)&dwShowIcon, sizeof(DWORD)); + RegCloseKey(hKey); + } + } + return PSNRET_NOERROR; } - else if (lppsn->hdr.code == PSN_APPLY) +#if 0 + else if (lppsn->hdr.code == PSN_CANCEL) { This = (INetConnectionPropertyUiImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER); if (This->pNCfg) @@ -346,6 +367,7 @@ } return PSNRET_NOERROR; } +#endif if (lppl->hdr.code == LVN_ITEMCHANGING) { ZeroMemory(&li, sizeof(li));

15 years, 10 months

← Newer
1
...
57
58
59
60
61
62
63
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008