Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[sginsberg] 42696: - Update the winesync script to define _WINE for shared DLLs to simplify syncing -- reported by Herve
by sginsberg＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: sginsberg Date: Sat Aug 15 14:45:28 2009 New Revision: 42696 URL: http://svn.reactos.org/svn/reactos?rev=42696&view=rev Log: - Update the winesync script to define _WINE for shared DLLs to simplify syncing -- reported by Herve Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=42696&r1=… ============================================================================== --- trunk/tools/wineimport.cmd [iso-8859-1] (original) +++ trunk/tools/wineimport.cmd [iso-8859-1] Sat Aug 15 14:45:28 2009 @@ -153,6 +153,7 @@ IF "%WINE_IS_EXE%" == "0" ( ECHO ^<include base="ReactOS"^>include/reactos/wine^</include^> ECHO ^<define name="__WINESRC__" /^> + ECHO ^<define name="_WINE" /^> ) SET WINE_FULL_LINE= SET WINE_END_PREC_LINE=

1 0

[dchapyshev] 42695: - Define APPLICATION_DATEBASE_URL
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 13:41:56 2009 New Revision: 42695 URL: http://svn.reactos.org/svn/reactos?rev=42695&view=rev Log: - Define APPLICATION_DATEBASE_URL Modified: trunk/reactos/base/applications/rapps/available.c trunk/reactos/base/applications/rapps/rapps.h Modified: trunk/reactos/base/applications/rapps/available.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/av… ============================================================================== --- trunk/reactos/base/applications/rapps/available.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/available.c [iso-8859-1] Sat Aug 15 13:41:56 2009 @@ -76,7 +76,7 @@ if (hFind == INVALID_HANDLE_VALUE) { if (GetFileAttributesW(szCabPath) == 0xFFFFFFFF) - DownloadApplicationsDB(L"http://opendn.org/rappmgr.cab"); + DownloadApplicationsDB(APPLICATION_DATEBASE_URL); ExtractFilesFromCab(szCabPath, szAppsPath); hFind = FindFirstFileW(szPath, &FindFileData); Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sat Aug 15 13:41:56 2009 @@ -8,6 +8,8 @@ #include <wchar.h> #include "resource.h" + +#define APPLICATION_DATEBASE_URL L"http://opendn.org/rappmgr.cab" #define SPLIT_WIDTH 4 #define MAX_STR_LEN 256

1 0

[dchapyshev] 42694: - Add README.ENG - Change rapps.cab to rappmgr.cab (in CreateCabFile.bat)
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 13:36:44 2009 New Revision: 42694 URL: http://svn.reactos.org/svn/reactos?rev=42694&view=rev Log: - Add README.ENG - Change rapps.cab to rappmgr.cab (in CreateCabFile.bat) Added: trunk/reactos/base/applications/rapps/README.ENG (with props) Modified: trunk/reactos/base/applications/rapps/CreateCabFile.bat Modified: trunk/reactos/base/applications/rapps/CreateCabFile.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/Cr… ============================================================================== --- trunk/reactos/base/applications/rapps/CreateCabFile.bat [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CreateCabFile.bat [iso-8859-1] Sat Aug 15 13:36:44 2009 @@ -1,1 +1,1 @@ -e:\cabman.exe -M raw -S rapps.cab \rapps\*.txt +c:\cabman.exe -M raw -S rappmgr.cab \rapps\*.txt Added: trunk/reactos/base/applications/rapps/README.ENG URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/RE… ============================================================================== --- trunk/reactos/base/applications/rapps/README.ENG (added) +++ trunk/reactos/base/applications/rapps/README.ENG [iso-8859-1] Sat Aug 15 13:36:44 2009 @@ -1,0 +1,54 @@ +ADDING DOWNLOADABLE PROGRAMMS + +For an each programm would be creacted an INI alike syntax. +Also an each field is language inhdepended and individual, an URL's to a source programm is +also maybe different or even nonexisting for anothers languages. +For instance a programm 1C which is mostly interested only for russian users and have no +reason for peoples living in another countries. + +The File Overview: + +[Section] +Name = program name +RegName = Name in registry +Version = 1.1.1 +Licence = GPL +Description = Description +Size = 10 mb +Category = 5 +URLSite = http://www.site.com/ +URLDownload = http://ftp.site.com/pub/installer.exe +CDPath = ; Ïîêà íå èñïîëüçóåòñÿ + +[Section.0419] ; 0419 - for Russian language +Description = Description in Russian language + + +Obligatory fields are: Name, Category, URLDownload +Other fields to fill not necessarily. + +Categories list: +1 - Audio +2 - Video +3 - Graphics +4 - Games +5 - Internet +6 - Office +7 - Development +8 - Edutainment +9 - Engineering +10 - Finance +11 - Science +12 - Tools +13 - Drivers +14 - Libraries +15 - Other + +The list downloadable programms is keeping on a server and updating from a server +automatically at first time thes programm is running! +For generating a list of a programm (usually a CAB archive), could be used a batch file CreateCabFile.bat +After downloading (at first time the programm runs around), this file is placing +in the same folder where downloaded programm located to future usage them. +If in some cases an unpacked file is moved, deleted or not exist, then the procedure +to create a new one would be repeated. +If the CAB file is moved, deleted or not exist, then it would be downloaded again. Propchange: trunk/reactos/base/applications/rapps/README.ENG ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 42693: - Remove appwiz-new - Simplify appwiz (appwiz now starts rapps.exe)
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 13:14:07 2009 New Revision: 42693 URL: http://svn.reactos.org/svn/reactos?rev=42693&view=rev Log: - Remove appwiz-new - Simplify appwiz (appwiz now starts rapps.exe) Removed: trunk/reactos/dll/cpl/appwiz-new/ trunk/reactos/dll/cpl/appwiz/add.c trunk/reactos/dll/cpl/appwiz/remove.c trunk/reactos/dll/cpl/appwiz/resources/reactos.ico trunk/reactos/dll/cpl/appwiz/resources/updates.ico trunk/reactos/dll/cpl/appwiz/rossetup.c trunk/reactos/dll/cpl/appwiz/updates.c Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/appwiz/appwiz.h trunk/reactos/dll/cpl/appwiz/appwiz.rbuild trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc trunk/reactos/dll/cpl/appwiz/lang/en-US.rc trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc trunk/reactos/dll/cpl/appwiz/resource.h trunk/reactos/dll/cpl/cpl.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/cpl/appwiz/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/add.c?rev=4… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.h?re… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rbui… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… Modified: trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/bg-BG.… Modified: trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.… Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/de-DE.… Modified: trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/el-GR.… Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/en-US.… Modified: trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/es-ES.… Modified: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/fr-FR.… Modified: trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/it-IT.… Modified: trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/no-NO.… Modified: trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… Modified: trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/sk-SK.… Modified: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/uk-UA.… Modified: trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/zh-CN.… Removed: trunk/reactos/dll/cpl/appwiz/remove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/remove.c?re… Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?… Removed: trunk/reactos/dll/cpl/appwiz/resources/reactos.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/r… Removed: trunk/reactos/dll/cpl/appwiz/resources/updates.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/u… Removed: trunk/reactos/dll/cpl/appwiz/rossetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rossetup.c?… Removed: trunk/reactos/dll/cpl/appwiz/updates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/updates.c?r… Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=426…

1 0

[dchapyshev] 42692: - Add rapps.exe to bootcd - Add msgsm32.acm to bootcd - Add some optional modules - Remove downloader.exe and downloader.xml
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 12:19:50 2009 New Revision: 42692 URL: http://svn.reactos.org/svn/reactos?rev=42692&view=rev Log: - Add rapps.exe to bootcd - Add msgsm32.acm to bootcd - Add some optional modules - Remove downloader.exe and downloader.xml Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Aug 15 12:19:50 2009 @@ -42,8 +42,6 @@ base\applications\cmdutils\more\more.exe 1 base\applications\cmdutils\xcopy\xcopy.exe 1 base\applications\control\control.exe 1 -base\applications\downloader\downloader.exe 1 -base\applications\downloader\downloader.xml 1 base\applications\dxdiag\dxdiag.exe 1 base\applications\fontview\fontview.exe 1 base\applications\mscutils\devmgmt\devmgmt.exe 1 @@ -71,6 +69,7 @@ base\applications\network\whois\whois.exe 1 base\applications\notepad\notepad.exe 1 base\applications\paint\paint.exe 1 +base\applications\rapps\rapps.exe 1 base\applications\regedit\regedit.exe 4 base\applications\regedit\clb\clb.dll 1 base\applications\regedt32\regedt32.exe 1 @@ -332,6 +331,7 @@ dll\win32\msftedit\msftedit.dll 1 dll\win32\msg711.acm\msg711.acm 1 dll\win32\msgina\msgina.dll 1 +dll\win32\msgsm32.acm\msgsm32.acm 1 dll\win32\mshtml\mshtml.dll 1 dll\win32\mshtml.tlb\mshtml.tlb 1 dll\win32\msi\msi.dll 1 @@ -661,9 +661,13 @@ modules\optional\kvmnet.sys 2 optional modules\optional\mfc42.dll 1 optional modules\optional\mfc42u.dll 1 optional +modules\optional\mfc71.dll 1 optional +modules\optional\mfc71u.dll 1 optional modules\optional\msvbvm50.dll 1 optional modules\optional\msvbvm60.dll 1 optional modules\optional\msvcirt.dll 1 optional +modules\optional\msvcp71.dll 1 optional +modules\optional\msvcr71.dll 1 optional modules\optional\Systema.ttf 3 optional modules\optional\vmx_fb.dll 1 optional modules\optional\vmx_mode.dll 1 optional

1 0

[dchapyshev] 42691: - Change downloader.exe to rapps.exe
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 12:17:48 2009 New Revision: 42691 URL: http://svn.reactos.org/svn/reactos?rev=42691&view=rev Log: - Change downloader.exe to rapps.exe Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/et-EE.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -759,7 +759,7 @@ /* Create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE); - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\downloader.exe"), IDS_CMT_DOWNLOADER, TRUE); + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\rapps.exe"), IDS_CMT_DOWNLOADER, TRUE); /* Create administrative tools startmenu shortcuts */ CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("%SystemRoot%\\system32\\servman.exe"), IDS_CMT_SERVMAN, TRUE); Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -266,7 +266,7 @@ BEGIN IDS_SHORT_CMD "Êîìàíäåí ïðîçîðåö.lnk" IDS_SHORT_EXPLORER "Èçñëåäîâàòåëÿò íà ÐåàêòÎÑ.lnk" - IDS_SHORT_DOWNLOADER "Ñâàëè!.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Óïðàâèòåë íà óñëóãèòå.lnk" IDS_SHORT_DEVICE "Óïðàâèòåë íà óñòðîéñòâàòà.lnk" IDS_SHORT_MPLAY32 "Ìóëòèìåäèåí âúçïðîèçâîäèòåë.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -250,7 +250,7 @@ IDS_SHORT_CHARMAP "Mapa znakù.lnk" IDS_SHORT_CMD "Pøíkazový øádek.lnk" IDS_SHORT_DEVICE "Správce zaøízení.lnk" - IDS_SHORT_DOWNLOADER "Download!.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_DXDIAG "Diagnostika ReactX.lnk" IDS_SHORT_EVENTVIEW "Prohlíeè událostí.lnk" IDS_SHORT_EXPLORER "ReactOS Prùzkumník.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -262,7 +262,7 @@ BEGIN IDS_SHORT_CMD "Eingabeaufforderung.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Dienste-Manager.lnk" IDS_SHORT_DEVICE "Geräte-Manager.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -263,7 +263,7 @@ BEGIN IDS_SHORT_CMD "ÃñáììÞ åíôïëþí.lnk" IDS_SHORT_EXPLORER "Åîåñåýíçóç ôïõ ReactOS.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Õðçñåóßåò.lnk" IDS_SHORT_DEVICE "Äéá÷åßñéóç óõóêåõþí.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -264,7 +264,7 @@ IDS_SHORT_CHARMAP "Character Map.lnk" IDS_SHORT_CMD "Command Prompt.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -272,7 +272,7 @@ BEGIN IDS_SHORT_CMD "Símbolo del sistema.lnk" IDS_SHORT_EXPLORER "Explorador de ReactOS.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Administrador de Servicios.lnk" IDS_SHORT_DEVICE "Administrador de Dispositivos.lnk" IDS_SHORT_MPLAY32 "Reproductor multimedia.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/et… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -263,7 +263,7 @@ IDS_SHORT_CHARMAP "Character Map.lnk" IDS_SHORT_CMD "Command Prompt.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -262,7 +262,7 @@ BEGIN IDS_SHORT_CMD "Invite de commandes.lnk" IDS_SHORT_EXPLORER "Explorateur ReactOS.lnk" - IDS_SHORT_DOWNLOADER "Télécharger !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Gestionnaire de services.lnk" IDS_SHORT_DEVICE "Gestionnaire de périphériques.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -275,7 +275,7 @@ BEGIN IDS_SHORT_CMD "Command Prompt.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -260,7 +260,7 @@ BEGIN IDS_SHORT_CMD "Command Prompt.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -253,7 +253,7 @@ BEGIN IDS_SHORT_CMD "Prompt dei comandi.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -264,7 +264,7 @@ IDS_SHORT_CHARMAP "LN^[ }bv.lnk" IDS_SHORT_CMD "R}h vvg.lnk" IDS_SHORT_DEVICE "foCX }l[W.lnk" - IDS_SHORT_DOWNLOADER "_E[h !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_DXDIAG "ReactX ff.lnk" IDS_SHORT_EVENTVIEW "Cxg r[A.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -262,7 +262,7 @@ BEGIN IDS_SHORT_CMD "Command Prompt.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -265,7 +265,7 @@ BEGIN IDS_SHORT_CMD "Command Prompt.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -271,7 +271,7 @@ BEGIN IDS_SHORT_CMD "Wiersz poleceñ.lnk" IDS_SHORT_EXPLORER "Eksplorator ReactOS.lnk" - IDS_SHORT_DOWNLOADER "Download!.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Mened¿er us³ug.lnk" IDS_SHORT_DEVICE "Mened¿er urz¹dzeñ.lnk" IDS_SHORT_MPLAY32 "Odtwarzacz multimedialny.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -265,7 +265,7 @@ IDS_SHORT_CHARMAP "HartÄ caractere.lnk" IDS_SHORT_CMD "Linie comandÄ.lnk" IDS_SHORT_DEVICE "Gestionar dispozitive.lnk" - IDS_SHORT_DOWNLOADER "DescarcÄ !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_DXDIAG "Diagnostic ReactX.lnk" IDS_SHORT_EVENTVIEW "Vizualizator evenimente.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -244,7 +244,7 @@ BEGIN IDS_SHORT_CMD "Êîìàíäíàÿ ñòðîêà.lnk" IDS_SHORT_EXPLORER "Ïðîâîäíèê ReactOS.lnk" - IDS_SHORT_DOWNLOADER "Ñêà÷àòü !.lnk" + IDS_SHORT_DOWNLOADER "Ìåíåäæåð ïðèëîæåíèé ReactOS.lnk" IDS_SHORT_SERVICE "Äèñïåò÷åð ñëóæá.lnk" IDS_SHORT_DEVICE "Äèñïåò÷åð óñòðîéñòâ.lnk" IDS_SHORT_MPLAY32 "Ïðîèãðûâàòåëü.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -248,7 +248,7 @@ BEGIN IDS_SHORT_CMD "Príkazový riadok.lnk" IDS_SHORT_EXPLORER "Prieskumník systému ReactOS.lnk" - IDS_SHORT_DOWNLOADER "ahaj!.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Správca sluieb.lnk" IDS_SHORT_DEVICE "Správca zariadení.lnk" IDS_SHORT_MPLAY32 "Multimediálny prehrávaè.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -252,7 +252,7 @@ BEGIN IDS_SHORT_CMD "Command Prompt.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Sat Aug 15 12:17:48 2009 @@ -251,7 +251,7 @@ BEGIN IDS_SHORT_CMD "ÃüÁîÌáÊ¾·û.lnk" IDS_SHORT_EXPLORER "ReactOS ×ÊÔ´¹ÜÀíÆ÷.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" IDS_SHORT_SERVICE "·þÎñ.lnk" IDS_SHORT_DEVICE "Éè±¸¹ÜÀí.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk"

1 0

[dchapyshev] 42690: - Returns TRUE in AttachConsole (like in Wine)
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 12:04:45 2009 New Revision: 42690 URL: http://svn.reactos.org/svn/reactos?rev=42690&view=rev Log: - Returns TRUE in AttachConsole (like in Wine) Modified: trunk/reactos/dll/win32/kernel32/misc/console.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Sat Aug 15 12:04:45 2009 @@ -3753,8 +3753,7 @@ AttachConsole(DWORD dwProcessId) { DPRINT1("AttachConsole(0x%x) UNIMPLEMENTED!\n", dwProcessId); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; } /*--------------------------------------------------------------

1 0

[dchapyshev] 42689: - Partially sync locale.c with Wine
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 12:01:28 2009 New Revision: 42689 URL: http://svn.reactos.org/svn/reactos?rev=42689&view=rev Log: - Partially sync locale.c with Wine Modified: trunk/reactos/lib/sdk/crt/locale/locale.c Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Sat Aug 15 12:01:28 2009 @@ -234,7 +234,8 @@ res->match_flags = flags; res->found_lang_id = LangID; } - if (flags & (FOUND_LANGUAGE & FOUND_COUNTRY & FOUND_CODEPAGE)) + if ((flags & (FOUND_LANGUAGE | FOUND_COUNTRY | FOUND_CODEPAGE)) == + (FOUND_LANGUAGE | FOUND_COUNTRY | FOUND_CODEPAGE)) { TRACE(":found exact locale match\n"); return STOP_LOOKING; @@ -316,7 +317,7 @@ { int i; char str[3]; - unsigned char *traverse = (unsigned char *)cp.LeadByte; + unsigned char *traverse = cp.LeadByte; memset(MSVCRT_current_ctype, 0, sizeof(MSVCRT__ctype)); MSVCRT___lc_codepage = codepage; @@ -387,8 +388,8 @@ { MSVCRT_current_lc_all[0] = 'C'; MSVCRT_current_lc_all[1] = '\0'; - MSVCRT___lc_codepage = 1252; - MSVCRT___lc_collate_cp = 1252; + MSVCRT___lc_codepage = GetACP(); + MSVCRT___lc_collate_cp = GetACP(); switch (category) { case MSVCRT_LC_ALL:

1 0

[dchapyshev] 42688: - Add debug print for unimplemented function
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 12:00:15 2009 New Revision: 42688 URL: http://svn.reactos.org/svn/reactos?rev=42688&view=rev Log: - Add debug print for unimplemented function Modified: trunk/reactos/lib/rtl/process.c Modified: trunk/reactos/lib/rtl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/process.c?rev=4268… ============================================================================== --- trunk/reactos/lib/rtl/process.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/process.c [iso-8859-1] Sat Aug 15 12:00:15 2009 @@ -362,6 +362,7 @@ IN BOOLEAN IsWinlogon) { //TODO + UNIMPLEMENTED; } ULONG

1 0

[dchapyshev] 42687: - Implement EnumObjects (untested) - Implement PolyTextOutA/W (from Wine) - Implement GetICMProfileA (from Wine) - Stub-implement CreateScalableFontResourceW (from Wine)
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 11:56:22 2009 New Revision: 42687 URL: http://svn.reactos.org/svn/reactos?rev=42687&view=rev Log: - Implement EnumObjects (untested) - Implement PolyTextOutA/W (from Wine) - Implement GetICMProfileA (from Wine) - Stub-implement CreateScalableFontResourceW (from Wine) Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/misc/stubsw.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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Sat Aug 15 11:56:22 2009 @@ -138,7 +138,7 @@ /* - * @unimplemented + * @implemented */ int WINAPI @@ -147,10 +147,20 @@ GOBJENUMPROC lpObjectFunc, LPARAM lParam) { + ULONG ObjectsCount; + ULONG Size; + PVOID Buffer = NULL; + DWORD_PTR EndOfBuffer; + int Result = 0; + switch (nObjectType) { case OBJ_BRUSH: + Size = sizeof(LOGBRUSH); + break; + case OBJ_PEN: + Size = sizeof(LOGPEN); break; default: @@ -158,9 +168,32 @@ return 0; } - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ObjectsCount = NtGdiEnumObjects(hdc, nObjectType, 0, NULL); + if (!ObjectsCount) return 0; + + Buffer = HeapAlloc(GetProcessHeap(), 0, ObjectsCount * Size); + if (!Buffer) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + + if (!NtGdiEnumObjects(hdc, nObjectType, ObjectsCount * Size, Buffer)) + { + HeapFree(GetProcessHeap(), 0, Buffer); + return 0; + } + + EndOfBuffer = (DWORD_PTR)Buffer + (ObjectsCount * Size); + while ((DWORD_PTR)Buffer < EndOfBuffer) + { + Result = lpObjectFunc(Buffer, lParam); + if (!Result) break; + Buffer = (PVOID)((DWORD_PTR)Buffer + Size); + } + + HeapFree(GetProcessHeap(), 0, Buffer); + return Result; } Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c [iso-8859-1] Sat Aug 15 11:56:22 2009 @@ -40,15 +40,12 @@ */ BOOL WINAPI -PolyTextOutA( - HDC hdc, - CONST POLYTEXTA *a1, - int a2 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; +PolyTextOutA( HDC hdc, const POLYTEXTA *pptxt, INT cStrings ) +{ + for (; cStrings>0; cStrings--, pptxt++) + if (!ExtTextOutA( hdc, pptxt->x, pptxt->y, pptxt->uiFlags, &pptxt->rcl, pptxt->lpstr, pptxt->n, pptxt->pdx )) + return FALSE; + return TRUE; } /* @@ -79,9 +76,25 @@ LPSTR pszFilename ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + WCHAR filenameW[MAX_PATH]; + DWORD buflen = MAX_PATH; + BOOL ret = FALSE; + + if (!hdc || !pBufSize || !pszFilename) return FALSE; + + if (GetICMProfileW(hdc, &buflen, filenameW)) + { + int len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); + if (*pBufSize >= len) + { + WideCharToMultiByte(CP_ACP, 0, filenameW, -1, pszFilename, *pBufSize, NULL, NULL); + ret = TRUE; + } + else SetLastError(ERROR_INSUFFICIENT_BUFFER); + *pBufSize = len; + } + + return ret; } Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c [iso-8859-1] Sat Aug 15 11:56:22 2009 @@ -21,15 +21,12 @@ */ BOOL WINAPI -PolyTextOutW( - HDC hdc, - CONST POLYTEXTW *a1, - int a2 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; +PolyTextOutW( HDC hdc, const POLYTEXTW *pptxt, INT cStrings ) +{ + for (; cStrings>0; cStrings--, pptxt++) + if (!ExtTextOutW( hdc, pptxt->x, pptxt->y, pptxt->uiFlags, &pptxt->rcl, pptxt->lpstr, pptxt->n, pptxt->pdx )) + return FALSE; + return TRUE; } /* @@ -55,11 +52,13 @@ BOOL WINAPI GetICMProfileW( - HDC a0, - LPDWORD a1, - LPWSTR a2 - ) -{ + HDC hdc, + LPDWORD size, + LPWSTR filename + ) +{ + if (!hdc || !size || !filename) return FALSE; + UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -288,9 +287,22 @@ LPCWSTR lpszCurrentPath ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + HANDLE f; + + UNIMPLEMENTED; + + /* fHidden=1 - only visible for the calling app, read-only, not + * enumerated with EnumFonts/EnumFontFamilies + * lpszCurrentPath can be NULL + */ + + /* If the output file already exists, return the ERROR_FILE_EXISTS error as specified in MSDN */ + if ((f = CreateFileW(lpszFontRes, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)) != INVALID_HANDLE_VALUE) { + CloseHandle(f); + SetLastError(ERROR_FILE_EXISTS); + return FALSE; + } + return FALSE; /* create failed */ }

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009