Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 28561: Remove all apps from the Downloader XML file, which don't work under this branch
by cfinck＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: cfinck Date: Sun Aug 26 00:05:21 2007 New Revision: 28561 URL: http://svn.reactos.org/svn/reactos?rev=28561&view=rev Log: Remove all apps from the Downloader XML file, which don't work under this branch Modified: branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml Modified: branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/rosapps/do… ============================================================================== --- branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml (original) +++ branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml Sun Aug 26 00:05:21 2007 @@ -14,7 +14,7 @@ <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> </application> - <application name="Thunderbird"> + <application name="Thunderbird 1.5"> <regname>Mozilla Thunderbird (1.5)</regname> <licence>MPL/GPL/LGPL</licence> <version>1.5.0.9</version> @@ -27,12 +27,6 @@ <version>2.0.0.6</version> <description>The most popular and one of the best free Mail Clients out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location> - </application> - <application name="SeaMonkey"> - <regname>SeaMonkey (1.1.4)</regname> - <version>1.1.4</version> - <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.1.4/se…</location> </application> <application name="Mozilla ActiveX Control"> <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> @@ -55,76 +49,16 @@ <description>Open source multiprotocol instant messaging application - May not work completely.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.6.8-unicode…</location> </application> - <application name="Putty"> - <regname>PuTTY version 0.60</regname> - <licence>MIT</licence> - <version>0.60</version> - <description>A free SSH, Telnet, rlogin, and raw TCP client.</description> - <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.60-installer.exe</location> - </application> - </category> - <category name="Office" icon="2"> - <application name="Abiword"> - <regname>"AbiWord 2.4.6 (remove only)"</regname> - <version>2.4.6</version> - <description>Word processor.</description> - <location>http://www.abiword.org/downloads/abiword/2.4.6/Windows/abiword-setup-2.4.6.…</location> - </application> - <application name="OpenOffice"> - <regname>OpenOffice.org 2.2</regname> - <version>2.2.1</version> - <description>THE Open Source Office Suite.</description> - <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.2.1/OOo_2.2.1_Wi…</location> - </application> - </category> - <category name="Graphics" icon="3"> - <application name="IrfanView"> - <regname>IrfanView (remove only)</regname> - <version>4.00</version> - <description>Viewer for all kinds of graphics/audio files/video files.</description> - <location>http://gd.tuwien.ac.at/graphics/irfanview/iview400_setup.exe</location> - </application> - <application name="IrfanView Plugins"> - <version>4.00</version> - <description>Additional Plugins for supporting more file types.</description> - <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_400_setup.exe</location> - </application> - <application name="TuxPaint"> - <regname>Tux Paint 0.9.17</regname> - <version>0.9.17</version> - <description>An Open Source bitmap graphics editor geared towards young children.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.17-win32-in…</location> - </application> - </category> - <category name="Multimedia" icon="4"> </category> <category name="Development" icon="5"> - <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 0.3.7</regname> - <version>0.3.7</version> - <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.7.exe</location> - </application> <application name="MinGW"> <regname>MinGW 5.1.3</regname> <version>5.1.3</version> <description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description> <location>http://puzzle.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> </application> - <application name="FreeBASIC"> - <regname>FreeBASIC 0.17b</regname> - <version>0.17b</version> - <description>Open Source BASIC Compiler. The BASIC syntax is compatible to QBASIC.</description> - <location>http://switch.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.17b-win32.exe</location> - </application> </category> <category name="Games & Fun" icon="6"> - <application name="ScummVM"> - <regname>ScummVM 0.10.0</regname> - <version>0.10.0</version> - <description>SamNMax, Day of Tentacle, etc on ReactOS</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.10.0-win32.exe</location> - </application> <application name="Tile World"> <description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description> <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location> @@ -134,24 +68,6 @@ <version>0.5.3-RC2</version> <description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.5.3-RC2-win32.e…</location> - </application> - <application name="LBreakout2"> - <regname>LBreakout2 2.4.1</regname> - <version>2.4.1</version> - <description>Breakout Clone using SDL libs.</description> - <location>http://switch.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.…</location> - </application> - <application name="LGeneral"> - <regname>LGeneral 1.1</regname> - <version>1.1</version> - <description>Panzer General Clone using SDL libs.</description> - <location>http://kent.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe</location> - </application> - <application name="LMarbles"> - <regname>LMarbles 1.0.6</regname> - <version>1.0.6</version> - <description>Atomix Clone using SDL libs.</description> - <location>http://heanet.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> </application> </category> <category name="Tools" icon="7"> @@ -167,23 +83,5 @@ <description>Small and fast BitTorrent Client.</description> <location>http://download.utorrent.com/1.7.2/utorrent.exe</location> </application> - <application name="Audio Grabber"> - <regname>Audiograbber 1.83 SE</regname> - <version>1.83 SE</version> - <description>A very good CD Ripper/Audio File Converter.</description> - <location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location> - </application> - </category> - <category name="Others" icon="8"> - <application name="Simple Direct Media Layer (SDL) Runtime"> - <version>1.2.12</version> - <description>Needed for many Open Source Games to run. You need 7-Zip or a similar Utility to extract it.</description> - <location>http://www.libsdl.org/release/SDL-1.2.12-win32.zip</location> - </application> - <application name="DOSBox"> - <version>0.71</version> - <description>DOSBox is a DOS emulator.</description> - <location>http://puzzle.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.71-win32-instal…</location> - </application> </category> </tree>

1 0

[greatlrd] 28560: Alex is god of haven and shall rise to the sky ... (my poem to alex for he found I did a mistake) in protypes for NtGdiEngCreateDeviceSurface, NtGdiEngCreateDeviceBitmap, NtGdiEngCreateBitmap Part (2/2)
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 23:25:24 2007 New Revision: 28560 URL: http://svn.reactos.org/svn/reactos?rev=28560&view=rev Log: Alex is god of haven and shall rise to the sky ... (my poem to alex for he found I did a mistake) in protypes for NtGdiEngCreateDeviceSurface, NtGdiEngCreateDeviceBitmap, NtGdiEngCreateBitmap Part (2/2) Modified: trunk/reactos/include/psdk/ntgdi.h Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h (original) +++ trunk/reactos/include/psdk/ntgdi.h Sat Aug 25 23:25:24 2007 @@ -2934,8 +2934,7 @@ IN LONG lWidth, IN ULONG iFormat, IN FLONG fl, - IN OPTIONAL PVOID pvBits, - IN DWORD UNKNOWN + IN OPTIONAL PVOID pvBits ); W32KAPI @@ -2972,8 +2971,7 @@ NtGdiEngCreateDeviceSurface( IN DHSURF dhsurf, IN SIZEL sizl, - IN ULONG iFormatCompat, - IN DWORD UNKNOWN + IN ULONG iFormatCompat ); W32KAPI @@ -2982,8 +2980,7 @@ NtGdiEngCreateDeviceBitmap( IN DHSURF dhsurf, IN SIZEL sizl, - IN ULONG iFormatCompat, - IN DWORD UNKNOWN + IN ULONG iFormatCompat ); W32KAPI

1 0

[greatlrd] 28559: Alex is god of haven and shall rise to the sky ... (my poem to alex for he found I did a mistake) in protypes for NtGdiEngCreateDeviceSurface, NtGdiEngCreateDeviceBitmap, NtGdiEngCreateBitmap Part (1/2)
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 23:24:20 2007 New Revision: 28559 URL: http://svn.reactos.org/svn/reactos?rev=28559&view=rev Log: Alex is god of haven and shall rise to the sky ... (my poem to alex for he found I did a mistake) in protypes for NtGdiEngCreateDeviceSurface, NtGdiEngCreateDeviceBitmap, NtGdiEngCreateBitmap Part (1/2) Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c 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 (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sat Aug 25 23:24:20 2007 @@ -1363,8 +1363,7 @@ HSURF STDCALL NtGdiEngCreateDeviceSurface( IN DHSURF Surface, IN SIZEL Size, - IN ULONG FormatVersion, - IN DWORD UNKNOWN) + IN ULONG FormatVersion) { UNIMPLEMENTED; return 0; @@ -1377,8 +1376,7 @@ NtGdiEngCreateDeviceBitmap( IN DHSURF dhsurf, IN SIZEL sizl, - IN ULONG iFormatCompat, - IN DWORD UNKNOWN) + IN ULONG iFormatCompat) { UNIMPLEMENTED; return NULL; @@ -1408,8 +1406,7 @@ IN LONG Width, IN ULONG Format, IN ULONG Flags, - IN PVOID Bits, - IN DWORD UNKNOWN) + IN PVOID Bits) { UNIMPLEMENTED; return NULL;

1 0

[janderwald] 28558: - fix typo
by janderwald＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: janderwald Date: Sat Aug 25 22:40:23 2007 New Revision: 28558 URL: http://svn.reactos.org/svn/reactos?rev=28558&view=rev Log: - fix typo Modified: trunk/reactos/dll/win32/gdi32/gdi32.def Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Aug 25 22:40:23 2007 @@ -205,7 +205,7 @@ DdEntry54@8=NtGdiDdUnlockD3D@8 DdEntry55@12=NtGdiDdUpdateOverlay@12 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 -EngUnlockSurface@4=NtGdiEngLockSurface@4 +EngUnlockSurface@4=NtGdiEngUnlockSurface@4 EngWideCharToMultiByte@20 EnumEnhMetaFile@20 EnumFontFamiliesA@16

1 0

[janderwald] 28557: -fix build some broke
by janderwald＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: janderwald Date: Sat Aug 25 22:35:14 2007 New Revision: 28557 URL: http://svn.reactos.org/svn/reactos?rev=28557&view=rev Log: -fix build some broke Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Sat Aug 25 22:35:14 2007 @@ -563,7 +563,7 @@ * @implemented */ VOID STDCALL -NtGdiEngUnLockSurface(IN SURFOBJ *Surface) +NtGdiEngUnlockSurface(IN SURFOBJ *Surface) { EngUnlockSurface(Surface); }

1 0

[dreimer] 28556: Some fixes in my translation to let the text better fit.
by dreimer＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: dreimer Date: Sat Aug 25 21:38:23 2007 New Revision: 28556 URL: http://svn.reactos.org/svn/reactos?rev=28556&view=rev Log: Some fixes in my translation to let the text better fit. Modified: trunk/rosapps/magnify/lang/de-DE.rc Modified: trunk/rosapps/magnify/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/de-DE.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/de-DE.rc (original) +++ trunk/rosapps/magnify/lang/de-DE.rc Sat Aug 25 21:38:23 2007 @@ -30,12 +30,12 @@ IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Bildschirm-Lupe Einstellungen" +CAPTION "Einstellungen" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Beenden",IDOK,96,161,50,14 PUSHBUTTON "Hilfe",IDOK,38,161,50,14 - LTEXT "Vergrößerungsfaktor:",IDC_STATIC,6,12,68,8 + LTEXT "Vergrößerungsgrad:",IDC_STATIC,6,12,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Folgen",IDC_STATIC,7,25,139,59 GROUPBOX "Präsentation",IDC_STATIC,7,87,139,57

1 0

[greatlrd] 28555: implement EngUnlockSurface
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 21:36:45 2007 New Revision: 28555 URL: http://svn.reactos.org/svn/reactos?rev=28555&view=rev Log: implement EngUnlockSurface Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Aug 25 21:36:45 2007 @@ -205,7 +205,7 @@ DdEntry54@8=NtGdiDdUnlockD3D@8 DdEntry55@12=NtGdiDdUpdateOverlay@12 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 -EngUnlockSurface@4 +EngUnlockSurface@4=NtGdiEngLockSurface@4 EngWideCharToMultiByte@20 EnumEnhMetaFile@20 EnumFontFamiliesA@16 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Aug 25 21:36:45 2007 @@ -2503,15 +2503,6 @@ return NtGdiEllipse(hdc,nLeftRect,nTopRect,nRightRect,nBottomRect); } -/* - * @unimplemented - */ -VOID STDCALL -EngUnlockSurface(SURFOBJ *pso) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -} /* * @unimplemented

1 0

[greatlrd] 28554: implement NtGdiEngLockSurface (not tested)
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 21:34:03 2007 New Revision: 28554 URL: http://svn.reactos.org/svn/reactos?rev=28554&view=rev Log: implement NtGdiEngLockSurface (not tested) Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Sat Aug 25 21:34:03 2007 @@ -558,6 +558,16 @@ return NULL; } + +/* + * @implemented + */ +VOID STDCALL +NtGdiEngUnLockSurface(IN SURFOBJ *Surface) +{ + EngUnlockSurface(Surface); +} + /* * @implemented */ @@ -567,4 +577,6 @@ if (Surface != NULL) GDIOBJ_UnlockObjByPtr(GdiHandleTable, Surface); } + + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Aug 25 21:34:03 2007 @@ -615,7 +615,7 @@ NtGdiEngDeletePalette 1 NtGdiEngDeleteSurface 1 NtGdiEngEraseSurface 3 -# NtGdiEngUnlockSurface 1 +NtGdiEngUnlockSurface 1 NtGdiEngLockSurface 1 NtGdiEngBitBlt 11 NtGdiEngStretchBlt 11

1 0

[cfinck] 28553: - Hardcode the Window Class string, there is no reason for it to be in localized resource files - Remove duplicate header inclusions
by cfinck＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: cfinck Date: Sat Aug 25 21:24:27 2007 New Revision: 28553 URL: http://svn.reactos.org/svn/reactos?rev=28553&view=rev Log: - Hardcode the Window Class string, there is no reason for it to be in localized resource files - Remove duplicate header inclusions Modified: trunk/rosapps/magnify/lang/de-DE.rc trunk/rosapps/magnify/lang/en-US.rc trunk/rosapps/magnify/lang/fr-FR.rc trunk/rosapps/magnify/lang/uk-UA.rc trunk/rosapps/magnify/magnifier.c Modified: trunk/rosapps/magnify/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/de-DE.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/de-DE.rc (original) +++ trunk/rosapps/magnify/lang/de-DE.rc Sat Aug 25 21:24:27 2007 @@ -61,5 +61,4 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Bildschirm-Lupe" - IDC_MAGNIFIER "BILDSCHIRM-LUPE" END Modified: trunk/rosapps/magnify/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/en-US.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/en-US.rc (original) +++ trunk/rosapps/magnify/lang/en-US.rc Sat Aug 25 21:24:27 2007 @@ -61,5 +61,4 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Magnifier" - IDC_MAGNIFIER "MAGNIFIER" END Modified: trunk/rosapps/magnify/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/fr-FR.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/fr-FR.rc (original) +++ trunk/rosapps/magnify/lang/fr-FR.rc Sat Aug 25 21:24:27 2007 @@ -61,5 +61,4 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Loupe" - IDC_MAGNIFIER "LOUPE" END Modified: trunk/rosapps/magnify/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/uk-UA.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/uk-UA.rc (original) +++ trunk/rosapps/magnify/lang/uk-UA.rc Sat Aug 25 21:24:27 2007 @@ -69,5 +69,4 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Åêðàííà ëóïà" - IDC_MAGNIFIER "MAGNIFIER" END Modified: trunk/rosapps/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/magnifier.c?rev=28… ============================================================================== --- trunk/rosapps/magnify/magnifier.c (original) +++ trunk/rosapps/magnify/magnifier.c Sat Aug 25 21:24:27 2007 @@ -8,14 +8,11 @@ */ #include <windows.h> -//#include <stdio.h> #include <shellapi.h> - -#include "shellapi.h" -#include "windows.h" - #include "magnifier.h" #include "resource.h" + +const TCHAR szWindowClass[] = TEXT("MAGNIFIER"); #define MAX_LOADSTRING 100 @@ -24,7 +21,6 @@ HWND hMainWnd; TCHAR szTitle[MAX_LOADSTRING]; // The title bar text -TCHAR szWindowClass[MAX_LOADSTRING]; // the main window class name #define REPAINT_SPEED 100 @@ -57,7 +53,6 @@ // Initialize global strings LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - LoadString(hInstance, IDC_MAGNIFIER, szWindowClass, MAX_LOADSTRING); MyRegisterClass(hInstance); // Perform application initialization:

1 0

[greatlrd] 28552: partly implement EngComputeGlyphSet in eng.c move EngMultiByteToWideChar, EngQueryLocalTime, EngReleaseSemaphore from stub.c to eng.c start implement of EngQueryEMFInfo need bit more figout how it is done
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 21:12:59 2007 New Revision: 28552 URL: http://svn.reactos.org/svn/reactos?rev=28552&view=rev Log: partly implement EngComputeGlyphSet in eng.c move EngMultiByteToWideChar, EngQueryLocalTime, EngReleaseSemaphore from stub.c to eng.c start implement of EngQueryEMFInfo need bit more figout how it is done Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/eng.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Aug 25 21:12:59 2007 @@ -2446,16 +2446,7 @@ } -/* - * @unimplemented - */ -FD_GLYPHSET* STDCALL -EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented @@ -2468,58 +2459,33 @@ return 0; } - -/* - * @implemented - */ -INT STDCALL -EngMultiByteToWideChar(UINT CodePage, - LPWSTR WideCharString, - INT BytesInWideCharString, - LPSTR MultiByteString, - INT BytesInMultiByteString) -{ - return MultiByteToWideChar(CodePage,0,MultiByteString,BytesInMultiByteString,WideCharString,BytesInWideCharString / sizeof(WCHAR)); -} - -/* - * @implemented - * Obsolete GDI Function - * http://www.osronline.com/DDKx/graphics/gdioview_20tj.htm +/* + * @unimplemented + * wrong info it is not Obsolete GDI Function as http://www.osronline.com/DDKx/graphics/gdioview_20tj.htm say */ BOOL STDCALL EngQueryEMFInfo(HDEV hdev,EMFINFO *pEMFInfo) { - return FALSE; -} - -/* - * @implemented - */ -VOID STDCALL -EngQueryLocalTime(PENG_TIME_FIELDS etf) -{ - SYSTEMTIME SystemTime; - GetLocalTime( &SystemTime ); - etf->usYear = SystemTime.wYear; - etf->usMonth = SystemTime.wMonth; - etf->usWeekday = SystemTime.wDayOfWeek; - etf->usDay = SystemTime.wDay; - etf->usHour = SystemTime.wHour; - etf->usMinute = SystemTime.wMinute; - etf->usSecond = SystemTime.wSecond; - etf->usMilliseconds = SystemTime.wMilliseconds; -} - -/* - * @implemented - */ -VOID -STDCALL -EngReleaseSemaphore ( IN HSEMAPHORE hsem ) -{ - RtlLeaveCriticalSection( (PRTL_CRITICAL_SECTION) hsem); -} +#if 0 + BOOL retValue = FALSE; + DHPDEV Dhpdev; + + if ((!hdev) && (!pEMFInfo)) + { + if ((Dhpdev = NtGdiGetDhpdev(hdev))) + { + /* FIXME check if it support or if it is pEMFInfo we got */ + /* FIXME copy the data from Dhpdev to pEMFInfo */ + } + } + return retValue; +#else + return FALSE; +#endif +} + + + /* * @implemented Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/eng.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/eng.c Sat Aug 25 21:12:59 2007 @@ -118,4 +118,88 @@ return LoadLibraryExW ( pwsz, NULL, LOAD_LIBRARY_AS_DATAFILE); } - +/* + * @implemented + */ +INT STDCALL +EngMultiByteToWideChar(UINT CodePage, + LPWSTR WideCharString, + INT BytesInWideCharString, + LPSTR MultiByteString, + INT BytesInMultiByteString) +{ + return MultiByteToWideChar(CodePage,0,MultiByteString,BytesInMultiByteString,WideCharString,BytesInWideCharString / sizeof(WCHAR)); +} + +/* + * @implemented + */ +VOID STDCALL +EngQueryLocalTime(PENG_TIME_FIELDS etf) +{ + SYSTEMTIME SystemTime; + GetLocalTime( &SystemTime ); + etf->usYear = SystemTime.wYear; + etf->usMonth = SystemTime.wMonth; + etf->usWeekday = SystemTime.wDayOfWeek; + etf->usDay = SystemTime.wDay; + etf->usHour = SystemTime.wHour; + etf->usMinute = SystemTime.wMinute; + etf->usSecond = SystemTime.wSecond; + etf->usMilliseconds = SystemTime.wMilliseconds; +} + +/* + * @implemented + */ +VOID +STDCALL +EngReleaseSemaphore ( IN HSEMAPHORE hsem ) +{ + RtlLeaveCriticalSection( (PRTL_CRITICAL_SECTION) hsem); +} + +BOOL +copy_my_glyphset( FD_GLYPHSET *dst_glyphset , FD_GLYPHSET * src_glyphset, ULONG Size) +{ + BOOL retValue = FALSE; + + memcpy(src_glyphset, dst_glyphset, Size); + if (src_glyphset->cRuns == 0) + { + retValue = TRUE; + } + + /* FIXME copy wrun */ + return retValue; +} + +/* + * @unimplemented + */ +FD_GLYPHSET* STDCALL +EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) +{ + FD_GLYPHSET * ntfd_glyphset; + FD_GLYPHSET * myfd_glyphset = NULL; + + ntfd_glyphset = NtGdiEngComputeGlyphSet(nCodePage,nFirstChar,cChars); + + if (!ntfd_glyphset) + { + if (ntfd_glyphset->cjThis) + { + myfd_glyphset = GlobalAlloc(0,ntfd_glyphset->cjThis); + + if (!myfd_glyphset) + { + if (copy_my_glyphset(myfd_glyphset,ntfd_glyphset,ntfd_glyphset->cjThis) == FALSE) + { + GlobalFree(myfd_glyphset); + myfd_glyphset = NULL; + } + } + } + } + return myfd_glyphset; +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs