Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[winesync] 32915: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Apr 11 07:46:01 2008 New Revision: 32915 URL: http://svn.reactos.org/svn/reactos?rev=32915&view=rev Log: Autosyncing with Wine HEAD Added: trunk/rostests/winetests/mshtml/dom.c (with props) trunk/rostests/winetests/mshtml/htmldoc.c (with props) trunk/rostests/winetests/mshtml/misc.c (with props) trunk/rostests/winetests/mshtml/mshtml.rbuild (with props) trunk/rostests/winetests/mshtml/protocol.c (with props) trunk/rostests/winetests/mshtml/script.c (with props) trunk/rostests/winetests/mshtml/testlist.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/winetests/mshtml/dom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/dom.c?re… Added: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… Added: trunk/rostests/winetests/mshtml/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/misc.c?r… Added: trunk/rostests/winetests/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/mshtml.r… Added: trunk/rostests/winetests/mshtml/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/protocol… Added: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… Added: trunk/rostests/winetests/mshtml/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/testlist…

16 years, 8 months

[winesync] 32914: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Apr 11 07:45:31 2008 New Revision: 32914 URL: http://svn.reactos.org/svn/reactos?rev=32914&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/mshtml/ trunk/reactos/dll/win32/mshtml/Bg.rc (with props) trunk/reactos/dll/win32/mshtml/De.rc (with props) trunk/reactos/dll/win32/mshtml/En.rc (with props) trunk/reactos/dll/win32/mshtml/Es.rc (with props) trunk/reactos/dll/win32/mshtml/Fi.rc (with props) trunk/reactos/dll/win32/mshtml/Fr.rc (with props) trunk/reactos/dll/win32/mshtml/Hu.rc (with props) trunk/reactos/dll/win32/mshtml/Ko.rc (with props) trunk/reactos/dll/win32/mshtml/Nl.rc (with props) trunk/reactos/dll/win32/mshtml/No.rc (with props) trunk/reactos/dll/win32/mshtml/Pl.rc (with props) trunk/reactos/dll/win32/mshtml/Ru.rc (with props) trunk/reactos/dll/win32/mshtml/Si.rc (with props) trunk/reactos/dll/win32/mshtml/Sv.rc (with props) trunk/reactos/dll/win32/mshtml/Tr.rc (with props) trunk/reactos/dll/win32/mshtml/blank.htm (with props) trunk/reactos/dll/win32/mshtml/conpoint.c (with props) trunk/reactos/dll/win32/mshtml/editor.c (with props) trunk/reactos/dll/win32/mshtml/hlink.c (with props) trunk/reactos/dll/win32/mshtml/htmlanchor.c (with props) trunk/reactos/dll/win32/mshtml/htmlbody.c (with props) trunk/reactos/dll/win32/mshtml/htmldoc.c (with props) trunk/reactos/dll/win32/mshtml/htmldoc3.c (with props) trunk/reactos/dll/win32/mshtml/htmldoc5.c (with props) trunk/reactos/dll/win32/mshtml/htmlelem.c (with props) trunk/reactos/dll/win32/mshtml/htmlelem2.c (with props) trunk/reactos/dll/win32/mshtml/htmlinput.c (with props) trunk/reactos/dll/win32/mshtml/htmllocation.c (with props) trunk/reactos/dll/win32/mshtml/htmlnode.c (with props) trunk/reactos/dll/win32/mshtml/htmloption.c (with props) trunk/reactos/dll/win32/mshtml/htmlscript.c (with props) trunk/reactos/dll/win32/mshtml/htmlselect.c (with props) trunk/reactos/dll/win32/mshtml/htmlstyle.c (with props) trunk/reactos/dll/win32/mshtml/htmlstylesheet.c (with props) trunk/reactos/dll/win32/mshtml/htmltable.c (with props) trunk/reactos/dll/win32/mshtml/htmltextarea.c (with props) trunk/reactos/dll/win32/mshtml/htmltextcont.c (with props) trunk/reactos/dll/win32/mshtml/htmlwindow.c (with props) trunk/reactos/dll/win32/mshtml/install.c (with props) trunk/reactos/dll/win32/mshtml/loadopts.c (with props) trunk/reactos/dll/win32/mshtml/main.c (with props) trunk/reactos/dll/win32/mshtml/mshtml.inf (with props) trunk/reactos/dll/win32/mshtml/mshtml.rbuild (with props) trunk/reactos/dll/win32/mshtml/mshtml.spec (with props) trunk/reactos/dll/win32/mshtml/mshtml_private.h (with props) trunk/reactos/dll/win32/mshtml/navigate.c (with props) trunk/reactos/dll/win32/mshtml/nsembed.c (with props) trunk/reactos/dll/win32/mshtml/nsevents.c (with props) trunk/reactos/dll/win32/mshtml/nsiface.idl (with props) trunk/reactos/dll/win32/mshtml/nsio.c (with props) trunk/reactos/dll/win32/mshtml/nsservice.c (with props) trunk/reactos/dll/win32/mshtml/olecmd.c (with props) trunk/reactos/dll/win32/mshtml/oleobj.c (with props) trunk/reactos/dll/win32/mshtml/olewnd.c (with props) trunk/reactos/dll/win32/mshtml/omnavigator.c (with props) trunk/reactos/dll/win32/mshtml/persist.c (with props) trunk/reactos/dll/win32/mshtml/protocol.c (with props) trunk/reactos/dll/win32/mshtml/resource.h (with props) trunk/reactos/dll/win32/mshtml/rsrc.rc (with props) trunk/reactos/dll/win32/mshtml/script.c (with props) trunk/reactos/dll/win32/mshtml/selection.c (with props) trunk/reactos/dll/win32/mshtml/service.c (with props) trunk/reactos/dll/win32/mshtml/task.c (with props) trunk/reactos/dll/win32/mshtml/txtrange.c (with props) trunk/reactos/dll/win32/mshtml/view.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/mshtml/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Bg.rc?rev… Added: trunk/reactos/dll/win32/mshtml/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/De.rc?rev… Added: trunk/reactos/dll/win32/mshtml/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/En.rc?rev… Added: trunk/reactos/dll/win32/mshtml/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Es.rc?rev… Added: trunk/reactos/dll/win32/mshtml/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Fi.rc?rev… Added: trunk/reactos/dll/win32/mshtml/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Fr.rc?rev… Added: trunk/reactos/dll/win32/mshtml/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Hu.rc?rev… Added: trunk/reactos/dll/win32/mshtml/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ko.rc?rev… Added: trunk/reactos/dll/win32/mshtml/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Nl.rc?rev… Added: trunk/reactos/dll/win32/mshtml/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/No.rc?rev… Added: trunk/reactos/dll/win32/mshtml/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Pl.rc?rev… Added: trunk/reactos/dll/win32/mshtml/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ru.rc?rev… Added: trunk/reactos/dll/win32/mshtml/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Si.rc?rev… Added: trunk/reactos/dll/win32/mshtml/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Sv.rc?rev… Added: trunk/reactos/dll/win32/mshtml/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Tr.rc?rev… Added: trunk/reactos/dll/win32/mshtml/blank.htm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/blank.htm… Added: trunk/reactos/dll/win32/mshtml/conpoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/conpoint.… Added: trunk/reactos/dll/win32/mshtml/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/editor.c?… Added: trunk/reactos/dll/win32/mshtml/hlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/hlink.c?r… Added: trunk/reactos/dll/win32/mshtml/htmlanchor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlancho… Added: trunk/reactos/dll/win32/mshtml/htmlbody.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlbody.… Added: trunk/reactos/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc.c… Added: trunk/reactos/dll/win32/mshtml/htmldoc3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc3.… Added: trunk/reactos/dll/win32/mshtml/htmldoc5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc5.… Added: trunk/reactos/dll/win32/mshtml/htmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem.… Added: trunk/reactos/dll/win32/mshtml/htmlelem2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem2… Added: trunk/reactos/dll/win32/mshtml/htmlinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlinput… Added: trunk/reactos/dll/win32/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmllocat… Added: trunk/reactos/dll/win32/mshtml/htmlnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlnode.… Added: trunk/reactos/dll/win32/mshtml/htmloption.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmloptio… Added: trunk/reactos/dll/win32/mshtml/htmlscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscrip… Added: trunk/reactos/dll/win32/mshtml/htmlselect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlselec… Added: trunk/reactos/dll/win32/mshtml/htmlstyle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Added: trunk/reactos/dll/win32/mshtml/htmlstylesheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Added: trunk/reactos/dll/win32/mshtml/htmltable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable… Added: trunk/reactos/dll/win32/mshtml/htmltextarea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltexta… Added: trunk/reactos/dll/win32/mshtml/htmltextcont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextc… Added: trunk/reactos/dll/win32/mshtml/htmlwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlwindo… Added: trunk/reactos/dll/win32/mshtml/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/install.c… Added: trunk/reactos/dll/win32/mshtml/loadopts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/loadopts.… Added: trunk/reactos/dll/win32/mshtml/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/main.c?re… Added: trunk/reactos/dll/win32/mshtml/mshtml.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.in… Added: trunk/reactos/dll/win32/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.rb… Added: trunk/reactos/dll/win32/mshtml/mshtml.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.sp… Added: trunk/reactos/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_pr… Added: trunk/reactos/dll/win32/mshtml/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/navigate.… Added: trunk/reactos/dll/win32/mshtml/nsembed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsembed.c… Added: trunk/reactos/dll/win32/mshtml/nsevents.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsevents.… Added: trunk/reactos/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsiface.i… Added: trunk/reactos/dll/win32/mshtml/nsio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsio.c?re… Added: trunk/reactos/dll/win32/mshtml/nsservice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsservice… Added: trunk/reactos/dll/win32/mshtml/olecmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/olecmd.c?… Added: trunk/reactos/dll/win32/mshtml/oleobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/oleobj.c?… Added: trunk/reactos/dll/win32/mshtml/olewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/olewnd.c?… Added: trunk/reactos/dll/win32/mshtml/omnavigator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/omnavigat… Added: trunk/reactos/dll/win32/mshtml/persist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/persist.c… Added: trunk/reactos/dll/win32/mshtml/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/protocol.… Added: trunk/reactos/dll/win32/mshtml/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/resource.… Added: trunk/reactos/dll/win32/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/rsrc.rc?r… Added: trunk/reactos/dll/win32/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/script.c?… Added: trunk/reactos/dll/win32/mshtml/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/selection… Added: trunk/reactos/dll/win32/mshtml/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/service.c… Added: trunk/reactos/dll/win32/mshtml/task.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/task.c?re… Added: trunk/reactos/dll/win32/mshtml/txtrange.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/txtrange.… Added: trunk/reactos/dll/win32/mshtml/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/view.c?re…

16 years, 8 months

[hpoussin] 32913: Prepare import of mshtml (2/2)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Apr 11 07:44:35 2008 New Revision: 32913 URL: http://svn.reactos.org/svn/reactos?rev=32913&view=rev Log: Prepare import of mshtml (2/2) Modified: trunk/rostests/winetests/directory.rbuild Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… ============================================================================== --- trunk/rostests/winetests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/directory.rbuild [iso-8859-1] Fri Apr 11 07:44:35 2008 @@ -45,6 +45,9 @@ </directory> <directory name="mlang"> <xi:include href="mlang/mlang.rbuild" /> + </directory> + <directory name="mshtml"> + <xi:include href="mshtml/mshtml.rbuild" /> </directory> <directory name="msi"> <xi:include href="msi/msi.rbuild" />

16 years, 8 months

[hpoussin] 32912: Prepare import of mshtml (1/2)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Apr 11 07:44:26 2008 New Revision: 32912 URL: http://svn.reactos.org/svn/reactos?rev=32912&view=rev Log: Prepare import of mshtml (1/2) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=329… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Fri Apr 11 07:44:26 2008 @@ -116,6 +116,7 @@ <property name="BASEADDRESS_LSASRV" value="0x76540000" /> <property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> <property name="BASEADDRESS_ODBC32" value="0x76660000" /> + <property name="BASEADDRESS_MSHTML" value="0x76660000" /> <property name="BASEADDRESS_ODBCCP32" value="0x76380000" /> <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> 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] Fri Apr 11 07:44:26 2008 @@ -212,6 +212,7 @@ dll\win32\msacm32\msacm32.dll 1 dll\win32\msafd\msafd.dll 1 dll\win32\msgina\msgina.dll 1 +dll\win32\mshtml\mshtml.dll 1 dll\win32\msi\msi.dll 1 dll\win32\msimg32\msimg32.dll 1 dll\win32\msvcrt\msvcrt.dll 1 @@ -567,6 +568,7 @@ modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional modules\rostests\winetests\mapi32\mapi32_winetest.exe 7 optional modules\rostests\winetests\mlang\mlang_winetest.exe 7 optional +modules\rostests\winetests\mshtml\mshtml_winetest.exe 7 optional modules\rostests\winetests\msi\msi_winetest.exe 7 optional modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional modules\rostests\winetests\netapi32\netapi32_winetest.exe 7 optional Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Fri Apr 11 07:44:26 2008 @@ -145,6 +145,9 @@ <directory name="msgina"> <xi:include href="msgina/msgina.rbuild" /> </directory> +<directory name="mshtml"> + <xi:include href="mshtml/mshtml.rbuild" /> +</directory> <directory name="msi"> <xi:include href="msi/msi.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Apr 11 07:44:26 2008 @@ -53,6 +53,7 @@ reactos/dll/win32/mlang # Autosync reactos/dll/win32/mpr # Autosync reactos/dll/win32/msacm32 # Out of sync +reactos/dll/win32/mshtml # Autosync reactos/dll/win32/msimg32 # Autosync reactos/dll/win32/msi # Autosync reactos/dll/win32/msvcrt20 # Autosync

16 years, 8 months

[hpoussin] 32911: Add wine_get_data_dir()/wine_get_build_dir() functions Add missing header in uuid library

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Apr 11 07:40:19 2008 New Revision: 32911 URL: http://svn.reactos.org/svn/reactos?rev=32911&view=rev Log: Add wine_get_data_dir()/wine_get_build_dir() functions Add missing header in uuid library Added: trunk/reactos/lib/3rdparty/libwine/config.c (with props) Modified: trunk/reactos/include/reactos/wine/library.h trunk/reactos/lib/3rdparty/libwine/debug.c (props changed) trunk/reactos/lib/3rdparty/libwine/libwine.rbuild trunk/reactos/lib/3rdparty/libwine/string.c (props changed) trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/include/reactos/wine/library.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/libra… ============================================================================== --- trunk/reactos/include/reactos/wine/library.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/library.h [iso-8859-1] Fri Apr 11 07:40:19 2008 @@ -29,7 +29,9 @@ /* configuration */ +extern const char *wine_get_build_dir(void); extern const char *wine_get_config_dir(void); +extern const char *wine_get_data_dir(void); extern const char *wine_get_server_dir(void); extern const char *wine_get_user_name(void); extern void wine_init_argv0_path( const char *argv0 ); Added: trunk/reactos/lib/3rdparty/libwine/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/confi… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/config.c (added) +++ trunk/reactos/lib/3rdparty/libwine/config.c [iso-8859-1] Fri Apr 11 07:40:19 2008 @@ -1,0 +1,33 @@ +/* + * Configuration parameters shared between Wine server and clients + * + * Copyright 2002 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/library.h" + +/* retrieve the wine data dir */ +const char *wine_get_data_dir(void) +{ + return NULL; +} + +/* retrieve the wine build dir (if we are running from there) */ +const char *wine_get_build_dir(void) +{ + return NULL; +} Propchange: trunk/reactos/lib/3rdparty/libwine/config.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/3rdparty/libwine/debug.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/lib/3rdparty/libwine/libwine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/libwi… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/libwine.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/libwine.rbuild [iso-8859-1] Fri Apr 11 07:40:19 2008 @@ -2,6 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="wine" type="staticlibrary"> <define name="_DISABLE_TIDENTS" /> + <file>config.c</file> <file>debug.c</file> <file>string.c</file> </module> Propchange: trunk/reactos/lib/3rdparty/libwine/string.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=32… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Fri Apr 11 07:40:19 2008 @@ -69,6 +69,7 @@ #include "urlhist.h" #include "hlguids.h" #include "isguids.h" +#include "objsafe.h" /* FIXME: cguids declares GUIDs but does not define their values */

16 years, 8 months

[hpoussin] 32910: Update some headers (from Wine)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Apr 11 07:30:27 2008 New Revision: 32910 URL: http://svn.reactos.org/svn/reactos?rev=32910&view=rev Log: Update some headers (from Wine) Added: trunk/reactos/include/psdk/dimm.idl (with props) Modified: trunk/reactos/include/psdk/activscp.idl trunk/reactos/include/psdk/mshtmdid.h trunk/reactos/include/psdk/mshtml.idl trunk/reactos/include/psdk/psdk.rbuild trunk/reactos/include/psdk/shlguid.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/activscp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/activscp.idl?… Added: trunk/reactos/include/psdk/dimm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dimm.idl?rev=… Modified: trunk/reactos/include/psdk/mshtmdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtmdid.h?re… Modified: trunk/reactos/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?re… Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev…

16 years, 8 months

[cfinck] 32909: Manually sync "comctl32" and "comdlg32" on request of Apostolos Alexiadis. Just translation updates

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Apr 10 16:00:16 2008 New Revision: 32909 URL: http://svn.reactos.org/svn/reactos?rev=32909&view=rev Log: Manually sync "comctl32" and "comdlg32" on request of Apostolos Alexiadis. Just translation updates Modified: trunk/reactos/dll/win32/comctl32/comctl_El.rc trunk/reactos/dll/win32/comctl32/comctl_Si.rc trunk/reactos/dll/win32/comdlg32/cdlg_El.rc trunk/reactos/dll/win32/comdlg32/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc Modified: trunk/reactos/dll/win32/comctl32/comctl_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_El.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl_El.rc [iso-8859-1] Thu Apr 10 16:00:16 2008 @@ -24,7 +24,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "¶êõñï", IDCANCEL,58,122,50,14 + PUSHBUTTON "¢êõñï", IDCANCEL,58,122,50,14 PUSHBUTTON "&ÅöáñìïãÞ", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "ÂïÞèåéá", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 @@ -36,10 +36,10 @@ CAPTION "Âïçèüò" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "< &Ðñïçãïýìåíï", IDC_BACK_BUTTON,66,138,55,14 + PUSHBUTTON "< &Ðñïçãïýìåíï", IDC_BACK_BUTTON,63,138,55,14 DEFPUSHBUTTON "&Åðüìåíï >", IDC_NEXT_BUTTON,121,138,55,14 DEFPUSHBUTTON "ÏëïêëÞñùóç", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "¶êõñï", IDCANCEL,178,138,50,14 + PUSHBUTTON "¢êõñï", IDCANCEL,178,138,50,14 PUSHBUTTON "ÂïÞèåéá", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 @@ -53,7 +53,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&Êëåßóéìï", IDCANCEL,308,6,44,14 - PUSHBUTTON "R&eset", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "Å&ðáíáöïñÜ", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "&ÂïÞèåéá", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "Ìåôáêßíçóç &ÐÜíù", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "Ìåôáêßíçóç &ÊÜôù", IDC_MOVEDN_BTN,308,91,44,14 Modified: trunk/reactos/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Si.rc [iso-8859-1] Thu Apr 10 16:00:16 2008 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2003 Rok Mandeljc <rok.mandeljc(a)gimb.org> + * Copyright 2002, 2003, 2008 Rok Mandeljc * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) + LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 @@ -24,23 +26,23 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "V redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Preklièi", IDCANCEL,58,122,50,14 + PUSHBUTTON "PrekliÄi", IDCANCEL,58,122,50,14 PUSHBUTTON "&Uporabi", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Pomoè", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + PUSHBUTTON "PomoÄ", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Èarovnik" +CAPTION "Äarovnik" FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< Na&zaj", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "Naprej >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Dokonèaj", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Preklièi", IDCANCEL,178,138,50,14 - PUSHBUTTON "Pomoè", IDHELP,235,138,50,14,WS_GROUP + DEFPUSHBUTTON "&Naprej >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "DokonÄaj", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "PrekliÄi", IDCANCEL,178,138,50,14 + PUSHBUTTON "PomoÄ", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE @@ -54,10 +56,10 @@ BEGIN DEFPUSHBUTTON "&Zapri", IDCANCEL,308,6,44,14 PUSHBUTTON "Po&nastavi", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Pomoè", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "&PomoÄ", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "N&avzgor", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "Na&vzdol", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "&Gumbi na voljo:", -1,4,5,84,10 + LTEXT "RazpoloÅ¾ljivi &gumbi:", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Dodaj ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- &Odstrani", IDC_REMOVE_BTN,131,62,44,14 @@ -73,10 +75,17 @@ STRINGTABLE DISCARDABLE { IDM_TODAY "Danes:" - IDM_GOTODAY "&Poglejte danes" + IDM_GOTODAY "Pojdi na danes" } STRINGTABLE DISCARDABLE { - IDS_SEPARATOR "Loèilo" + IDS_SEPARATOR "LoÄilo" } + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Brez" +} + +#pragma code_page(default) Modified: trunk/reactos/dll/win32/comdlg32/cdlg_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_El… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_El.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_El.rc [iso-8859-1] Thu Apr 10 16:00:16 2008 @@ -24,7 +24,7 @@ OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "¶íïéãìá" +CAPTION "¢íïéãìá" FONT 8, "MS Shell Dlg" { LTEXT "File &¼íïìá:", 1090, 6, 6, 76, 9 @@ -37,8 +37,8 @@ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Dri&ves:", 1091, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "¶íïéãìá", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "¶êõñï", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "¢íïéãìá", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "¢êõñï", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&ÂïÞèåéá", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "&Ìüíï ãéá ÁíÜãíùóç", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -60,7 +60,7 @@ LTEXT "Dri&ves:", 1091, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "ÁðïèÞêåõóç ùò", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "¶êõñï", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "¢êõñï", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&ÂïÞèåéá", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "&Ìüíï ãéá ÁíÜãíùóç", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -78,7 +78,7 @@ RADIOBUTTON "Å&ðéëïãÞ", rad2, 16, 60, 60, 12 RADIOBUTTON "&Óåëßäåò", rad3, 16, 75, 60, 12 DEFPUSHBUTTON "Åêôýðùóç", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "¶êõñï", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "¢êõñï", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&ÅãêáôÜóôáóç", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&Áðü:", 1090, 60, 80, 30, 9 LTEXT "&¸ùò:", 1091, 120, 80, 30, 9 @@ -100,7 +100,7 @@ RADIOBUTTON "Specific &Printer", rad2, 16, 50, 80, 12 COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "¶êõñï", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "¢êõñï", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&ÅãêáôÜóôáóç", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP GROUPBOX "Orientation", grp2, 6, 85, 100, 50, BS_GROUPBOX RADIOBUTTON "Po&rtrait", rad3, 50, 100, 40, 12 @@ -130,7 +130,7 @@ COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "¶êõñï",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "¢êõñï",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&ÅöáñìïãÞ", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&ÂïÞèåéá" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "ÅööÝ",grp1,6,72,84,34,WS_GROUP @@ -152,8 +152,8 @@ CAPTION "×ñþìá" FONT 8, "MS Shell Dlg" { - LTEXT "&ÂÁóéêÜ ÷ñþìáôá:", 1088, 4, 4, 140, 10 - LTEXT "&Custom ÷ñþìáôá:", 1089, 4, 106, 140, 10 + LTEXT "&ÂáóéêÜ ÷ñþìáôá:", 1088, 4, 4, 140, 10 + LTEXT "&ÐñïóáñìïóìÝíá ÷ñþìáôá:", 1089, 4, 106, 150, 10 LTEXT "×ñþìá | Sol&id", 1090, 150, 151, 48, 10 LTEXT "&Êüêêéíï:", 726 /*1094*/,249,126,24,10 EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP @@ -165,7 +165,7 @@ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Sat:" ,724 /*1092*/,202,140,22,10 EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum:" ,725 /*1093*/,202,154,22,10 + LTEXT "&Öùôåéíüôçôá:" ,725 /*1093*/,202,154,22,10 EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 @@ -175,8 +175,8 @@ DEFPUSHBUTTON "OK", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Help", pshHelp,100,166, 44, 14 - PUSHBUTTON "&ÐñïóèÞêç óôá Custom ×ñþìáôá", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ïñéóìüò Custom ×ñùìÜôùí >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&ÐñïóèÞêç óôá ðñïóáñìïóìÝíá ÷ñþìáôá", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ïñéóìüò ðñïóáñìïóìÝíùí ÷ñùìÜôùí >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } @@ -186,7 +186,7 @@ CAPTION "Åýñåóç" FONT 8, "MS Shell Dlg" { - LTEXT "Fi&nd What:", -1, 4, 8, 42, 8 + LTEXT "Åý&ñåóç ôïõ:", -1, 4, 8, 42, 8 EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Ôáßñéáóìá &Ïëüêëçñçò ËÝîçò Ìüíï", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Ôáßñéáóìá &Êåöáëáßùí", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP @@ -195,7 +195,7 @@ CONTROL "&ÊÜôù", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 DEFPUSHBUTTON "&Åýñåóç Åðüìåíïõ", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "¶Êõñï", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "¢êõñï", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&ÂïÞèåéá", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -205,7 +205,7 @@ CAPTION "ÁíôéêáôÜóôáóç" FONT 8, "MS Shell Dlg" { - LTEXT "Fi&nd What:", -1, 4, 9, 48, 8 + LTEXT "Åý&ñåóç ôïõ:", -1, 4, 9, 48, 8 EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "Áí&ôéêáôÜóôáóç Ìå:", -1, 4, 26, 48, 8 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP @@ -215,7 +215,7 @@ DEFPUSHBUTTON "&Åýñåóç Åðüìåíïõ", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&ÁíôéêáôÜóôáóç", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "ÁíôéêáôÜóôáóç &¼ëùí", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "¶êõñï", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "¢êõñï", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&ÂïÞèåéá", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP } @@ -227,7 +227,7 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "¶êõñï", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "¢êõñï", IDCANCEL, 232,164, 48,14, WS_GROUP PUSHBUTTON "&ÂïÞèåéá", pshHelp, 50, 161, 48,14, WS_GROUP GROUPBOX "ÅêôõðùôÞò", grp4, 8, 4, 272,84, WS_GROUP @@ -267,7 +267,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "¶êõñï",IDCANCEL,232,156,48,14 + PUSHBUTTON "¢êõñï",IDCANCEL,232,156,48,14 /* PUSHBUTTON "Äßêôõï...", psh5, 284,156,48,14 */ GROUPBOX "ÅêôõðùôÞò", grp4, 8, 4, 272,84, WS_GROUP @@ -320,13 +320,13 @@ LTEXT "&ÊÜôù:", stc18, 159, 192, 23, 8 EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "¶êõñï", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "Åê&ôõðùôÞò...", psh3, 184, 220, 48, 14 END NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "¶íïéãìá" +CAPTION "¢íïéãìá" FONT 8, "MS Shell Dlg" { LTEXT "Look &in:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY @@ -341,10 +341,10 @@ LTEXT "Áñ÷åßá ôïõ &ôýðïõ:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "¶íïéãìá ùò &ìüíï-ãéá-áíÜãíùóç",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 - - DEFPUSHBUTTON "&¶íïéãìá", IDOK,222,110,50,14 - PUSHBUTTON "¶êõñï", IDCANCEL,222,128,50,14 + CONTROL "¢íïéãìá ùò &ìüíï-ãéá-áíÜãíùóç",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + + DEFPUSHBUTTON "&¢íïéãìá", IDOK,222,110,50,14 + PUSHBUTTON "¢êõñï", IDCANCEL,222,128,50,14 PUSHBUTTON "&ÂïÞèåéá", pshHelp,222,145,50,14 } @@ -403,7 +403,7 @@ PD32_CANT_FIND_PRINTER "Äåí Þôáí äõíáôÞ ç åýñåóç ôïõ åêôõðùôÞ." PD32_OUT_OF_MEMORY "Out of memory." PD32_GENERIC_ERROR "ÐñïêëÞèçêå óöÜëìá." - PD32_DRIVER_UNKNOWN "¶ãíùóôïò ïäçãüò åêôõðùôÞ." + PD32_DRIVER_UNKNOWN "¢ãíùóôïò ïäçãüò åêôõðùôÞ." PD32_NO_DEVICES "Before you can perform printer-related tasks \ such as page setup or printing a document, you need to install a printer. \ Please install one and retry." @@ -467,7 +467,7 @@ IDS_COLOR_BLUE "Ìðëå" IDS_COLOR_FUCHSIA "Fuchsia" IDS_COLOR_AQUA "Aqua" - IDS_COLOR_WHITE "¶óðñï" + IDS_COLOR_WHITE "¢óðñï" } STRINGTABLE DISCARDABLE @@ -477,5 +477,5 @@ IDS_SAVE_IN "ÁðïèÞêåõóç &óå:" IDS_SAVE "ÁðïèÞêåõóç" IDS_SAVE_AS "ÁðïèÞêåõóç ùò" - IDS_OPEN_FILE "¶íïéãìá Áñ÷åßïõ" -} + IDS_OPEN_FILE "¢íïéãìá Áñ÷åßïõ" +} Modified: trunk/reactos/dll/win32/comdlg32/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_No… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_No.rc [iso-8859-1] Thu Apr 10 16:00:16 2008 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2007 Alexander N. Sørnes + * Copyright 2005-2008 Alexander N. Sørnes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -439,6 +439,14 @@ PD32_PRINTER_STATUS_POWER_SAVE "Strømsparingsmodus; " } +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "Normal" + IDS_FONT_BOLD "Fet" + IDS_FONT_ITALIC "Kursiv" + IDS_FONT_BOLD_ITALIC "Fet kursiv" +} + STRINGTABLE DISCARDABLE /* Color names */ { IDS_COLOR_BLACK "Svart" Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Si… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc [iso-8859-1] Thu Apr 10 16:00:16 2008 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2003 Rok Mandeljc <rok.mandeljc(a)gimb.org> + * Copyright 2002, 2003, 2008 Rok Mandeljc * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +20,13 @@ * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. */ +#pragma code_page(65001) + LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Odpiranje" +CAPTION "Odpri" FONT 8, "MS Shell Dlg" { LTEXT "Ime &datoteke:", 1090, 6, 6, 76, 9 @@ -37,16 +39,16 @@ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Pog&oni:", 1091, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "V redu", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Preklièi", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Pomoè", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Odpri", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "PrekliÄi", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&PomoÄ", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "Samo za b&ranje", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Shrani kot" +CAPTION "Shrani kot ..." FONT 8, "MS Shell Dlg" { LTEXT "Ime &datoteke:", 1090, 6, 6, 76, 9 @@ -59,9 +61,9 @@ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Pog&oni:", 1091, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "V redu", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Preklièi", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Pomoè", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Shrani", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "PrekliÄi", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&PomoÄ", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "Samo za b&ranje", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -77,39 +79,39 @@ RADIOBUTTON "&Vse", rad1, 16, 45, 60, 12 RADIOBUTTON "I&zbor", rad2, 16, 60, 60, 12 RADIOBUTTON "St&rani", rad3, 16, 75, 60, 12 - DEFPUSHBUTTON "V redu", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Preklièi", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Pripr&ava ...", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Natisni", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "PrekliÄi", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nastavitve", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&od:", 1090, 60, 80, 30, 9 LTEXT "&do:", 1091, 120, 80, 30, 9 LTEXT "Kakovost ti&skanja:", 1092, 6, 100, 76, 9 COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "&Tiskanje v datoteko", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Z&biranje kopij", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Na&tisni v datoteko", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Zbiranje kopij", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Priprava za tiskanje" +CAPTION "Nastavitve tiskanja" FONT 8, "MS Shell Dlg" { GROUPBOX "Tiskalnik", grp1, 6, 10, 180, 65, BS_GROUPBOX RADIOBUTTON "Privzeti &tiskalnik", rad1, 16, 20, 80, 12 - LTEXT "(Ni privzetega tiskalnika)", 1088, 35, 35, 120, 9 - RADIOBUTTON "Doloèeni ti&skalnik:", rad2, 16, 50, 80, 12 + LTEXT "[brez]", 1088, 35, 35, 120, 9 + RADIOBUTTON "DoloÄen ti&skalnik", rad2, 16, 50, 80, 12 COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "V redu", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Preklièi", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Monosti ...", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "PrekliÄi", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&MoÅ¾nosti", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP GROUPBOX "Usmerjenost", grp2, 6, 85, 100, 50, BS_GROUPBOX - RADIOBUTTON "P&okonèna", rad3, 50, 100, 40, 12 - RADIOBUTTON "L&eeèa", rad4, 50, 115, 40, 12 + RADIOBUTTON "P&okonÄno", rad3, 50, 100, 40, 12 + RADIOBUTTON "L&eÅ¾eÄe", rad4, 50, 115, 40, 12 ICON "LANDSCAP", stc10, 10, 95, 32, 32 ICON "PORTRAIT", stc11, 10, 95, 32, 32 GROUPBOX "Papir", grp3, 120, 85, 180, 50, BS_GROUPBOX - LTEXT "Veli&kost:", 1089, 130, 95, 30, 9 - LTEXT "&Vir:", 1090, 130, 110, 30, 9 + LTEXT "Veli&kost", 1089, 130, 95, 30, 9 + LTEXT "&Vir", 1090, 130, 110, 30, 9 COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP } @@ -120,28 +122,28 @@ CAPTION "Pisava" FONT 8, "MS Shell Dlg" { - LTEXT "Pis&ava:",1088 ,6,3,40,9 + LTEXT "Pis&ava:",stc1 ,6,3,40,9 COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "Slog pi&save:",1089 ,108,3,44,9 + LTEXT "Slog pi&save:",stc2 ,108,3,44,9 COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&Velikost:",1090,179,3,30,9 + LTEXT "&Velikost:",stc3,179,3,30,9 COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "V redu",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Preklièi",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "PrekliÄi",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Uporabi", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Pomoè" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP - GROUPBOX "Uèinki",1072,6,72,84,34,WS_GROUP - CHECKBOX "Pr&eèrtano", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Po&dèrtano", chx2, 10,94,50,10, BS_AUTOCHECKBOX - LTEXT "&Barva:", 1091 ,6,110,30,9 + PUSHBUTTON "&PomoÄ" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP + GROUPBOX "UÄinki",grp1,6,72,84,34,WS_GROUP + CHECKBOX "Pr&eÄrtano", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "P&odÄrtano", chx2, 10,94,50,10, BS_AUTOCHECKBOX + LTEXT "&Barva:", stc4 ,6,110,30,9 COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Vzorec",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 + LTEXT "Sis&tem pisave:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -153,19 +155,19 @@ FONT 8, "MS Shell Dlg" { LTEXT "Osno&vne barve:", 1088, 4, 4, 140, 10 - LTEXT "Nameane &barve:", 1089, 4, 106, 140, 10 - LTEXT "Barva | T&emelj", 1090, 150, 151, 48, 10 - LTEXT "&Rdeèa:", 726 /*1094*/,249,126,24,10 + LTEXT "NameÅ¡ane &barve:", 1089, 4, 106, 140, 10 + LTEXT "Barva | T&emelj", 1090, 150, 151, 48, 10 + LTEXT "&RdeÄa:", 726 /*1094*/,249,126,24,10 EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Zelena:",727/*1095*/,249,140,24,10 EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Modr&a:",728 /*1096*/,249,154,24,10 + LTEXT "&Modra:",728 /*1096*/,249,154,24,10 EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Od&tenek:" ,723 /*1091*/,202,126,22,10 + LTEXT "Od&tn.:" ,723 /*1091*/,202,126,22,10 EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Nasièenost:" ,724 /*1092*/,202,140,22,10 + LTEXT "&NasiÄ.:" ,724 /*1092*/,202,140,22,10 EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Svetlost:" ,725 /*1093*/,202,154,22,10 + LTEXT "&Svetl.:" ,725 /*1093*/,202,154,22,10 EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 @@ -173,11 +175,11 @@ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "V redu", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Preklièi", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Pomoè", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Dodaj med nameane barve", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Meanje barv >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ + PUSHBUTTON "PrekliÄi", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "PomoÄ", pshHelp,100,166, 44, 14 + PUSHBUTTON "&Dodaj med nameÅ¡ane barve", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "M&eÅ¡anje barv >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&e",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } @@ -187,16 +189,16 @@ FONT 8, "MS Shell Dlg" { LTEXT "N&ajdi:", -1, 4, 8, 42, 8 - EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT edt1, 47, 7, 120, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "&Samo cele besede", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Razlikovanje malih in velikih èrk", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Smer iskanja", grp1, 107, 26, 68, 28 - CONTROL "&Gor", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "&Dol", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - - DEFPUSHBUTTON "&Nadaljuj iskanje", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Preklièi", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Pomoè", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&Razlikuj velikost Ärk", chx2, 4, 42, 96, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Smer iskanja", grp1, 103, 26, 64, 28 + CONTROL "&Gor", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 107, 38, 30, 12 + CONTROL "&Dol", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 136, 38, 30, 12 + + DEFPUSHBUTTON "&Najdi naslednje", IDOK, 174, 5, 58, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "PrekliÄi", IDCANCEL , 174, 23, 58, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&PomoÄ", pshHelp , 174, 45, 58, 14, WS_GROUP | WS_TABSTOP } @@ -206,17 +208,17 @@ FONT 8, "MS Shell Dlg" { LTEXT "N&ajdi:", -1, 4, 9, 48, 8 - EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Za&menjaj z:", -1, 4, 26, 48, 8 - EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT edt1, 54, 7, 106, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Zamenjaj &z:", -1, 4, 26, 48, 8 + EDITTEXT edt2, 54, 24, 106, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "&Samo cele besede", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Razlikovanje malih in velikih èrk", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - - DEFPUSHBUTTON "&Nadaljuj iskanje", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "&Zamenjaj", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Zamenjaj &vse", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Preklièi", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Pomoè", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&Razlikuj velikost Ärk", chx2, 5, 62, 96, 12, BS_AUTOCHECKBOX | WS_TABSTOP + + DEFPUSHBUTTON "&Najdi naslednje", IDOK, 166, 4, 58, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "&Zamenjaj", psh1 , 166, 21, 58, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Zamenjaj &vse", psh2 , 166, 38, 58, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "PrekliÄi", IDCANCEL , 166, 55, 58, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&PomoÄ", pshHelp , 166, 75, 58, 14, WS_GROUP | WS_TABSTOP } @@ -227,14 +229,14 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "V redu", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "Preklièi", IDCANCEL, 232,164, 48,14, WS_GROUP - PUSHBUTTON "&Pomoè", pshHelp, 50, 161, 48,14, WS_GROUP + PUSHBUTTON "PrekliÄi", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "&PomoÄ", pshHelp, 50, 161, 48,14, WS_GROUP GROUPBOX "Tiskalnik", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "&Tiskanje v datoteko", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 - PUSHBUTTON "&Lastnosti", psh2, 212, 17, 60,14, WS_GROUP + CONTROL "Na&tisni v datoteko", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,204,70,72,12 + PUSHBUTTON "&Lastnosti", psh2, 204, 17, 68,14, WS_GROUP LTEXT "&Ime:", stc6, 16, 20, 36,8 - COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + COMBOBOX cmb4, 52, 18, 144,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stanje:", stc8, 16, 36, 36,10, SS_NOPREFIX LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Vrsta:", stc7, 16, 48, 36,10, SS_NOPREFIX @@ -244,31 +246,31 @@ LTEXT "Komentar:", stc9, 16, 72, 36,10, SS_NOPREFIX LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Kopije", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "tevilo &kopij:",stc5,168,108,68,8 - ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "Z&biranje", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 - EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER - - GROUPBOX "Obseg tiskanja", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Vse", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "St&rani", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "I&zbor", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 - EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER - EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&od:", stc2, 52,124, 20,8 - RTEXT "&do:", stc3, 100,124, 16,8 + GROUPBOX "Kopije", grp2, 152, 92, 128,64, WS_GROUP + LTEXT "Å tevilo &kopij:",stc5,160,108,68,8 + ICON "", ico3, 154,124, 76,24, WS_GROUP | SS_CENTERIMAGE + CONTROL "Z&biranje", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,232,130,44,12 + EDITTEXT edt3, 232,106, 40,12, WS_GROUP | ES_NUMBER + + GROUPBOX "Obseg tiskanja", grp1, 8,92, 136,64, WS_GROUP + CONTROL "&Vse", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,30,12 + CONTROL "St&rani", rad3,"Button",BS_AUTORADIOBUTTON,16,122,30,12 + CONTROL "I&zbor", rad2,"Button",BS_AUTORADIOBUTTON,16,138,30,12 + EDITTEXT edt1, 64,122, 26,12, WS_GROUP | ES_NUMBER + EDITTEXT edt2, 108,122, 26,12, WS_GROUP | ES_NUMBER + LTEXT "&od:", stc2, 52,124, 10,8 + LTEXT "&do:", stc3, 94,124, 10,8 } PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -CAPTION "Priprava za tiskanje" +CAPTION "Nastavitev tiskanja" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "V redu",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "Preklièi",IDCANCEL,232,156,48,14 -/* PUSHBUTTON "Omreje...", psh5, 284,156,48,14 */ + PUSHBUTTON "PrekliÄi",IDCANCEL,232,156,48,14 +/* PUSHBUTTON "OmreÅ¾je ...", psh5, 284,156,48,14 */ GROUPBOX "Tiskalnik", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Lastnosti", psh2, 212, 17, 60,14, WS_GROUP @@ -291,13 +293,13 @@ GROUPBOX "Usmerjenost", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "P&okonèna", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "L&eeèa", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + CONTROL "P&okonÄno", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 + CONTROL "L&eÅ¾eÄe", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Priprava strani" +CAPTION "Nastavitev strani" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 @@ -309,8 +311,8 @@ LTEXT "&Vir:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Usmerjenost", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "P&okonèna", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "L&e¾eèa", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "P&okonÄno", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "L&eÅ¾eÄe", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Robovi", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Levo:", stc15, 88, 172, 21, 8 EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER @@ -321,16 +323,16 @@ LTEXT "&Spodaj:", stc18, 159, 192, 23, 8 EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER DEFPUSHBUTTON "V redu", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "Preklièi", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "PrekliÄi", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&Tiskalnik ...", psh3, 184, 220, 48, 14 END NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "Odpiranje" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Ièi v",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY +CAPTION "Odpri" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&IÅ¡Äi v:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE @@ -339,14 +341,14 @@ LTEXT "Ime &datoteke:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - LTEXT "Vrsta da&totek:",IDC_FILETYPESTATIC,5,128,49,8, SS_NOTIFY + LTEXT "Vrsta da&totek:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Samo za branje",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 DEFPUSHBUTTON "&Odpri", IDOK,222,110,50,14 - PUSHBUTTON "Preklièi", IDCANCEL,222,128,50,14 - PUSHBUTTON "&Pomoè", pshHelp,222,145,50,14 + PUSHBUTTON "PrekliÄi", IDCANCEL,222,128,50,14 + PUSHBUTTON "&PomoÄ", pshHelp,222,145,50,14 } STRINGTABLE DISCARDABLE @@ -358,18 +360,18 @@ IDS_PATH "Sistemska pot" IDS_DESKTOP "Namizje" IDS_FONTS "Pisave" - IDS_MYCOMPUTER "Moj raèunalnik" + IDS_MYCOMPUTER "Moj raÄunalnik" } STRINGTABLE DISCARDABLE { IDS_SYSTEMFOLDERS "Sistemske mape" IDS_LOCALHARDRIVES "Lokalni trdi diski" - IDS_FILENOTFOUND "Datoteke ni mogoèe najti" + IDS_FILENOTFOUND "Datoteke ni mogoÄe najti" IDS_VERIFYFILE "Preverite, ali ste vnesli pravilno ime datoteke" - IDS_CREATEFILE "Datoteka ne obstaja\nAli jo elite ustvariti?" - IDS_OVERWRITEFILE "Datoteka e obstaja.\nAli jo elite zamenjati?" - IDS_INVALID_FILENAME_TITLE "Neustrezni znaki v imenu" + IDS_CREATEFILE "Datoteka ne obstaja.\nAli jo Å¾elite ustvariti?" + IDS_OVERWRITEFILE "Datoteka Å¾e obstaja.\nAli jo Å¾elite zamenjati?" + IDS_INVALID_FILENAME_TITLE "Neveljavni znaki v imenu" IDS_INVALID_FILENAME "Ime datoteke ne sme vsebovati naslednjih znakov: \n / : < > |" IDS_PATHNOTEXISTING "Pot ne obstaja" IDS_FILENOTEXISTING "Datoteka ne obstaja" @@ -386,56 +388,98 @@ STRINGTABLE DISCARDABLE { - PD32_PRINT_TITLE "Tiskalnik:" - - PD32_VALUE_UREADABLE "Velikost mora biti izraena s tevilko." - PD32_INVALID_PAGE_RANGE "Ta vrednost ni znotraj dovoljenega obsega.\n\ -Vnesite tevilo med %d in %d." - PD32_FROM_NOT_ABOVE_TO "Vrednost 'od' ne more biti veèja od vrednosti 'do'." - PD32_MARGINS_OVERLAP "Robovi se ne prekrivajo ali pa niso na listu papirja.\nVnesite nove velikosti robov." - PD32_NR_OF_COPIES_EMPTY "tevilo kopij ne more biti 0 in mora biti pozitivno." - PD32_TOO_LARGE_COPIES "Ta tiskalnik ne omogoèa toliknega \ -tevila kopij.\nVnesite tevilo med 1 in %d." - PD32_PRINT_ERROR "Napaka pri tiskanju" - PD32_NO_DEFAULT_PRINTER "Preden lahko tiskate, morate namestiti tiskalnik." - PD32_CANT_FIND_PRINTER "Tiskalnika ni bilo mogoèe najti." - PD32_OUT_OF_MEMORY "Na voljo ni dovolj pomnilnika, da bi bilo mogoèe dokonèati operacijo." - PD32_GENERIC_ERROR "Med operacijo je prilo do napake." + PD32_PRINT_TITLE "Tiskanje" + + PD32_VALUE_UREADABLE "Neveljavna vrednost" + PD32_INVALID_PAGE_RANGE "Podana vrednost ne leÅ¾i znotraj obsega strani.\n\ +Podajte vrednost med %d in %d." + PD32_FROM_NOT_ABOVE_TO "Vrednost 'od' ne more biti veÄja od \ +vrednosti 'do'." + PD32_MARGINS_OVERLAP "Robovi se prekrivajo ali pa niso \ +znotraj meja papirja.\nPonovno vnesite vrednosti robov." + PD32_NR_OF_COPIES_EMPTY "Polje 'Å tevilo kopij' ne sme biti prazno." + PD32_TOO_LARGE_COPIES "Tiskalnik ne podpira tako velikega \ +Å¡tevila kopij.\nVnesite vrednost med 1 in %d." + PD32_PRINT_ERROR "Napaka pri tiskanju." + PD32_NO_DEFAULT_PRINTER "Privzeti tiskalnik ni nastavljen." + PD32_CANT_FIND_PRINTER "Tiskalnika ni mogoÄe najti." + PD32_OUT_OF_MEMORY "Zmanjkalo je pomnilnika." + PD32_GENERIC_ERROR "Med operacijo je priÅ¡lo do napake." PD32_DRIVER_UNKNOWN "Neznan gonilnik tiskalnika." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." - - PD32_DEFAULT_PRINTER "Privzeti tiskalnik; " - PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d èakajoèih dok." + PD32_NO_DEVICES "Preden lahko izvajate operacije, \ +povezane s tiskanjem, morate namestiti tiskalnik. Po namestitvi tiskalnika \ +poskusite znova." + + PD32_DEFAULT_PRINTER "Priveti tiskalnik; " + PD32_NR_OF_DOCUMENTS_IN_QUEUE "V Äakalni vrsti je %d dokumentov" PD32_MARGINS_IN_INCHES "Robovi [palci]" PD32_MARGINS_IN_MILIMETERS "Robovi [mm]" PD32_MILIMETERS "mm" PD32_PRINTER_STATUS_READY "Pripravljen" - PD32_PRINTER_STATUS_PAUSED "Zaèasno zaustavljen; " + PD32_PRINTER_STATUS_PAUSED "ZaÄasno zaustavljen; " PD32_PRINTER_STATUS_ERROR "Napaka; " - PD32_PRINTER_STATUS_PENDING_DELETION "Prilo bo do brisanja; " - PD32_PRINTER_STATUS_PAPER_JAM "Papir se je zagozdil; " - PD32_PRINTER_STATUS_PAPER_OUT "Ni veè papirja; " - PD32_PRINTER_STATUS_MANUAL_FEED "Roèno podajanje; " - PD32_PRINTER_STATUS_PAPER_PROBLEM "Teave s papirjem; " + PD32_PRINTER_STATUS_PENDING_DELETION "Priprava na brisanje; " + PD32_PRINTER_STATUS_PAPER_JAM "Papir se je zataknil; " + PD32_PRINTER_STATUS_PAPER_OUT "Zmanjkalo je papirja; " + PD32_PRINTER_STATUS_MANUAL_FEED "RoÄno podajanje papirja; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "TeÅ¾ave s papirjem; " PD32_PRINTER_STATUS_OFFLINE "Ne sprejema podatkov; " PD32_PRINTER_STATUS_IO_ACTIVE "V/I aktiven; " PD32_PRINTER_STATUS_BUSY "Zaposlen; " PD32_PRINTER_STATUS_PRINTING "Tiska; " PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Izhodni predal je poln; " PD32_PRINTER_STATUS_NOT_AVAILABLE "Ni na voljo; " - PD32_PRINTER_STATUS_WAITING "Èaka; " + PD32_PRINTER_STATUS_WAITING "Äaka; " PD32_PRINTER_STATUS_PROCESSING "Obdeluje; " - PD32_PRINTER_STATUS_INITIALIZING "Se inicializira; " - PD32_PRINTER_STATUS_WARMING_UP "Se ogreva; " + PD32_PRINTER_STATUS_INITIALIZING "Inicializacija; " + PD32_PRINTER_STATUS_WARMING_UP "Ogrevanje; " PD32_PRINTER_STATUS_TONER_LOW "Zmanjkuje tonerja; " PD32_PRINTER_STATUS_NO_TONER "Ni tonerja; " - PD32_PRINTER_STATUS_PAGE_PUNT "Predmet strani; " + PD32_PRINTER_STATUS_PAGE_PUNT "Premet strani; " PD32_PRINTER_STATUS_USER_INTERVENTION "Poseg uporabnika; " PD32_PRINTER_STATUS_OUT_OF_MEMORY "Zmanjkalo je pomnilnika; " - PD32_PRINTER_STATUS_DOOR_OPEN "Odprto ohije; " - PD32_PRINTER_STATUS_SERVER_UNKNOWN "Neznan strenik; " + PD32_PRINTER_STATUS_DOOR_OPEN "Odprto ohiÅ¡je; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "Neznan streÅ¾nik; " PD32_PRINTER_STATUS_POWER_SAVE "V pripravljenosti; " } + +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "Navadno" + IDS_FONT_BOLD "Krepko" + IDS_FONT_ITALIC "LeÅ¾eÄe" + IDS_FONT_BOLD_ITALIC "Krepko leÅ¾eÄe" +} + +STRINGTABLE DISCARDABLE /* Color names */ +{ + IDS_COLOR_BLACK "Ärna" + IDS_COLOR_MAROON "Kostanjeva" + IDS_COLOR_GREEN "Zelena" + IDS_COLOR_OLIVE "Olivna" + IDS_COLOR_NAVY "MornariÅ¡ka" + IDS_COLOR_PURPLE "VijoliÄna" + IDS_COLOR_TEAL "Zelenomodra" + IDS_COLOR_GRAY "Siva" + IDS_COLOR_SILVER "Srebrna" + IDS_COLOR_RED "RdeÄa" + IDS_COLOR_LIME "Citronska" + IDS_COLOR_YELLOW "Rumena" + IDS_COLOR_BLUE "Modra" + IDS_COLOR_FUCHSIA "Roza" + IDS_COLOR_AQUA "Akvamarin" + IDS_COLOR_WHITE "Bela" +} + +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "Izberite velikost pisave med %d in %d toÄk." + IDS_SAVE_BUTTON "&Shrani" + IDS_SAVE_IN "Shrani &v:" + IDS_SAVE "Shrani" + IDS_SAVE_AS "Shrani kot" + IDS_OPEN_FILE "Odpri datoteko" +} + +#pragma code_page(default)

16 years, 8 months

[hpoussin] 32908: Use R- prefix instead of Scmr- prefix for service RPC calls

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Apr 10 11:39:01 2008 New Revision: 32908 URL: http://svn.reactos.org/svn/reactos?rev=32908&view=rev Log: Use R- prefix instead of Scmr- prefix for service RPC calls Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Thu Apr 10 11:39:01 2008 @@ -236,13 +236,13 @@ /* Function 0 */ -DWORD ScmrCloseServiceHandle( +DWORD RCloseServiceHandle( handle_t BindingHandle, LPSC_RPC_HANDLE hSCObject) { PMANAGER_HANDLE hManager; - DPRINT("ScmrCloseServiceHandle() called\n"); + DPRINT("RCloseServiceHandle() called\n"); DPRINT("hSCObject = %p\n", *hSCObject); @@ -262,7 +262,7 @@ HeapFree(GetProcessHeap(), 0, hManager); } - DPRINT("ScmrCloseServiceHandle() done\n"); + DPRINT("RCloseServiceHandle() done\n"); return ERROR_SUCCESS; } else if (hManager->Handle.Tag == SERVICE_TAG) @@ -277,7 +277,7 @@ HeapFree(GetProcessHeap(), 0, hManager); } - DPRINT("ScmrCloseServiceHandle() done\n"); + DPRINT("RCloseServiceHandle() done\n"); return ERROR_SUCCESS; } @@ -288,7 +288,7 @@ /* Function 1 */ -DWORD ScmrControlService( +DWORD RControlService( handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwControl, @@ -299,7 +299,7 @@ ACCESS_MASK DesiredAccess; DWORD dwError = ERROR_SUCCESS; - DPRINT("ScmrControlService() called\n"); + DPRINT("RControlService() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -377,7 +377,7 @@ /* Function 2 */ -DWORD ScmrDeleteService( +DWORD RDeleteService( handle_t BindingHandle, SC_RPC_HANDLE hService) { @@ -385,7 +385,7 @@ PSERVICE lpService; DWORD dwError; - DPRINT("ScmrDeleteService() called\n"); + DPRINT("RDeleteService() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -420,21 +420,21 @@ /* FIXME: Release service database lock */ - DPRINT("ScmrDeleteService() done\n"); + DPRINT("RDeleteService() done\n"); return dwError; } /* Function 3 */ -DWORD ScmrLockServiceDatabase( +DWORD RLockServiceDatabase( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPSC_RPC_LOCK lpLock) { PMANAGER_HANDLE hMgr; - DPRINT("ScmrLockServiceDatabase() called\n"); + DPRINT("RLockServiceDatabase() called\n"); *lpLock = 0; @@ -456,7 +456,7 @@ /* Function 4 */ -DWORD ScmrQueryServiceObjectSecurity( +DWORD RQueryServiceObjectSecurity( handle_t BindingHandle, SC_RPC_HANDLE hService, SECURITY_INFORMATION dwSecurityInformation, @@ -472,7 +472,7 @@ DWORD dwBytesNeeded; DWORD dwError; - DPRINT("ScmrQueryServiceObjectSecurity() called\n"); + DPRINT("RQueryServiceObjectSecurity() called\n"); hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) @@ -540,7 +540,7 @@ /* Function 5 */ -DWORD ScmrSetServiceObjectSecurity( +DWORD RSetServiceObjectSecurity( handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwSecurityInformation, @@ -555,7 +555,7 @@ NTSTATUS Status; DWORD dwError; - DPRINT1("ScmrSetServiceObjectSecurity() called\n"); + DPRINT1("RSetServiceObjectSecurity() called\n"); hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) @@ -653,14 +653,14 @@ /* FIXME: Unlock service database */ - DPRINT("ScmrSetServiceObjectSecurity() done (Error %lu)\n", dwError); + DPRINT("RSetServiceObjectSecurity() done (Error %lu)\n", dwError); return dwError; } /* Function 6 */ -DWORD ScmrQueryServiceStatus( +DWORD RQueryServiceStatus( handle_t BindingHandle, SC_RPC_HANDLE hService, LPSERVICE_STATUS lpServiceStatus) @@ -668,7 +668,7 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService; - DPRINT("ScmrQueryServiceStatus() called\n"); + DPRINT("RQueryServiceStatus() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -704,14 +704,14 @@ /* Function 7 */ -DWORD ScmrSetServiceStatus( +DWORD RSetServiceStatus( handle_t BindingHandle, SC_RPC_HANDLE hServiceStatus, LPSERVICE_STATUS lpServiceStatus) { PSERVICE lpService; - DPRINT("ScmrSetServiceStatus() called\n"); + DPRINT("RSetServiceStatus() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -728,14 +728,14 @@ sizeof(SERVICE_STATUS)); DPRINT("Set %S to %lu\n", lpService->lpDisplayName, lpService->Status.dwCurrentState); - DPRINT("ScmrSetServiceStatus() done\n"); + DPRINT("RSetServiceStatus() done\n"); return ERROR_SUCCESS; } /* Function 8 */ -DWORD ScmrUnlockServiceDatabase( +DWORD RUnlockServiceDatabase( handle_t BindingHandle, LPSC_RPC_LOCK Lock) { @@ -745,7 +745,7 @@ /* Function 9 */ -DWORD ScmrNotifyBootConfigStatus( +DWORD RNotifyBootConfigStatus( handle_t BindingHandle, SVCCTL_HANDLEW lpMachineName, DWORD BootAcceptable) @@ -756,7 +756,7 @@ /* Function 10 */ -DWORD ScmrSetServiceBitsW( +DWORD RSetServiceBitsW( handle_t BindingHandle, SC_RPC_HANDLE hServiceStatus, DWORD dwServiceBits, @@ -770,7 +770,7 @@ /* Function 11 */ -DWORD ScmrChangeServiceConfigW( +DWORD RChangeServiceConfigW( handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwServiceType, @@ -791,7 +791,7 @@ PSERVICE lpService = NULL; HKEY hServiceKey = NULL; - DPRINT("ScmrChangeServiceConfigW() called\n"); + DPRINT("RChangeServiceConfigW() called\n"); DPRINT("dwServiceType = %lu\n", dwServiceType); DPRINT("dwStartType = %lu\n", dwStartType); DPRINT("dwErrorControl = %lu\n", dwErrorControl); @@ -984,7 +984,7 @@ if (hServiceKey != NULL) RegCloseKey(hServiceKey); - DPRINT("ScmrChangeServiceConfigW() done (Error %lu)\n", dwError); + DPRINT("RChangeServiceConfigW() done (Error %lu)\n", dwError); return dwError; } @@ -1365,7 +1365,7 @@ /* Function 12 */ -DWORD ScmrCreateServiceW( +DWORD RCreateServiceW( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPWSTR lpServiceName, @@ -1391,7 +1391,7 @@ LPWSTR lpImagePath = NULL; HKEY hServiceKey = NULL; - DPRINT("ScmrCreateServiceW() called\n"); + DPRINT("RCreateServiceW() called\n"); DPRINT("lpServiceName = %S\n", lpServiceName); DPRINT("lpDisplayName = %S\n", lpDisplayName); DPRINT("dwDesiredAccess = %lx\n", dwDesiredAccess); @@ -1633,14 +1633,14 @@ if (lpImagePath != NULL) HeapFree(GetProcessHeap(), 0, lpImagePath); - DPRINT("ScmrCreateServiceW() done (Error %lu)\n", dwError); + DPRINT("RCreateServiceW() done (Error %lu)\n", dwError); return dwError; } /* Function 13 */ -DWORD ScmrEnumDependentServicesW( +DWORD REnumDependentServicesW( handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwServiceState, @@ -1655,14 +1655,14 @@ *pcbBytesNeeded = 0; *lpServicesReturned = 0; - DPRINT1("ScmrEnumDependentServicesW() done (Error %lu)\n", dwError); + DPRINT1("REnumDependentServicesW() done (Error %lu)\n", dwError); return dwError; } /* Function 14 */ -DWORD ScmrEnumServicesStatusW( +DWORD REnumServicesStatusW( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, DWORD dwServiceType, @@ -1686,7 +1686,7 @@ LPENUM_SERVICE_STATUSW lpStatusPtr; LPWSTR lpStringPtr; - DPRINT("ScmrEnumServicesStatusW() called\n"); + DPRINT("REnumServicesStatusW() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -1854,14 +1854,14 @@ Done:; /* FIXME: Unlock the service list */ - DPRINT("ScmrEnumServicesStatusW() done (Error %lu)\n", dwError); + DPRINT("REnumServicesStatusW() done (Error %lu)\n", dwError); return dwError; } /* Function 15 */ -DWORD ScmrOpenSCManagerW( +DWORD ROpenSCManagerW( handle_t BindingHandle, LPWSTR lpMachineName, LPWSTR lpDatabaseName, @@ -1871,7 +1871,7 @@ DWORD dwError; SC_HANDLE hHandle; - DPRINT("ScmrOpenSCManagerW() called\n"); + DPRINT("ROpenSCManagerW() called\n"); DPRINT("lpMachineName = %p\n", lpMachineName); DPRINT("lpMachineName: %S\n", lpMachineName); DPRINT("lpDataBaseName = %p\n", lpDatabaseName); @@ -1905,14 +1905,14 @@ *lpScHandle = (unsigned long)hHandle; /* FIXME: 64 bit portability */ DPRINT("*hScm = %p\n", *lpScHandle); - DPRINT("ScmrOpenSCManagerW() done\n"); + DPRINT("ROpenSCManagerW() done\n"); return ERROR_SUCCESS; } /* Function 16 */ -DWORD ScmrOpenServiceW( +DWORD ROpenServiceW( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPWSTR lpServiceName, @@ -1924,7 +1924,7 @@ SC_HANDLE hHandle; DWORD dwError; - DPRINT("ScmrOpenServiceW() called\n"); + DPRINT("ROpenServiceW() called\n"); DPRINT("hSCManager = %p\n", hSCManager); DPRINT("lpServiceName = %p\n", lpServiceName); DPRINT("lpServiceName: %S\n", lpServiceName); @@ -1975,14 +1975,14 @@ *lpServiceHandle = (unsigned long)hHandle; /* FIXME: 64 bit portability */ DPRINT("*hService = %p\n", *lpServiceHandle); - DPRINT("ScmrOpenServiceW() done\n"); + DPRINT("ROpenServiceW() done\n"); return ERROR_SUCCESS; } /* Function 17 */ -DWORD ScmrQueryServiceConfigW( +DWORD RQueryServiceConfigW( handle_t BindingHandle, SC_RPC_HANDLE hService, LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGW lpServiceConfig, @@ -2000,7 +2000,7 @@ LPQUERY_SERVICE_CONFIGW lpConfig; LPWSTR lpStr; - DPRINT("ScmrQueryServiceConfigW() called\n"); + DPRINT("RQueryServiceConfigW() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -2136,14 +2136,14 @@ /* FIXME: Unlock the service database */ - DPRINT("ScmrQueryServiceConfigW() done\n"); + DPRINT("RQueryServiceConfigW() done\n"); return dwError; } /* Function 18 */ -DWORD ScmrQueryServiceLockStatusW( +DWORD RQueryServiceLockStatusW( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus, @@ -2156,7 +2156,7 @@ /* Function 19 */ -DWORD ScmrStartServiceW( +DWORD RStartServiceW( handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD argc, @@ -2166,7 +2166,7 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; - DPRINT("ScmrStartServiceW() called\n"); + DPRINT("RStartServiceW() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -2211,7 +2211,7 @@ /* Function 20 */ -DWORD ScmrGetServiceDisplayNameW( +DWORD RGetServiceDisplayNameW( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPWSTR lpServiceName, @@ -2223,7 +2223,7 @@ DWORD dwLength; DWORD dwError; - DPRINT("ScmrGetServiceDisplayNameW() called\n"); + DPRINT("RGetServiceDisplayNameW() called\n"); DPRINT("hSCManager = %p\n", hSCManager); DPRINT("lpServiceName: %S\n", lpServiceName); DPRINT("lpDisplayName: %p\n", lpDisplayName); @@ -2261,7 +2261,7 @@ /* Function 21 */ -DWORD ScmrGetServiceKeyNameW( +DWORD RGetServiceKeyNameW( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPWSTR lpDisplayName, @@ -2273,7 +2273,7 @@ DWORD dwLength; DWORD dwError; - DPRINT("ScmrGetServiceKeyNameW() called\n"); + DPRINT("RGetServiceKeyNameW() called\n"); DPRINT("hSCManager = %p\n", hSCManager); DPRINT("lpDisplayName: %S\n", lpDisplayName); DPRINT("lpServiceName: %p\n", lpServiceName); @@ -2311,7 +2311,7 @@ /* Function 22 */ -DWORD ScmrSetServiceBitsA( +DWORD RSetServiceBitsA( handle_t BindingHandle, SC_RPC_HANDLE hServiceStatus, DWORD dwServiceBits, @@ -2325,7 +2325,7 @@ /* Function 23 */ -DWORD ScmrChangeServiceConfigA( +DWORD RChangeServiceConfigA( handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwServiceType, @@ -2347,7 +2347,7 @@ /* Function 24 */ -DWORD ScmrCreateServiceA( +DWORD RCreateServiceA( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPSTR lpServiceName, @@ -2372,7 +2372,7 @@ /* Function 25 */ -DWORD ScmrEnumDependentServicesA( +DWORD REnumDependentServicesA( handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwServiceState, @@ -2389,7 +2389,7 @@ /* Function 26 */ -DWORD ScmrEnumServicesStatusA( +DWORD REnumServicesStatusA( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, DWORD dwServiceType, @@ -2406,7 +2406,7 @@ /* Function 27 */ -DWORD ScmrOpenSCManagerA( +DWORD ROpenSCManagerA( handle_t BindingHandle, LPSTR lpMachineName, LPSTR lpDatabaseName, @@ -2417,7 +2417,7 @@ UNICODE_STRING DatabaseName; DWORD dwError; - DPRINT("ScmrOpenSCManagerA() called\n"); + DPRINT("ROpenSCManagerA() called\n"); if (lpMachineName) RtlCreateUnicodeStringFromAsciiz(&MachineName, @@ -2427,7 +2427,7 @@ RtlCreateUnicodeStringFromAsciiz(&DatabaseName, lpDatabaseName); - dwError = ScmrOpenSCManagerW(BindingHandle, + dwError = ROpenSCManagerW(BindingHandle, lpMachineName ? MachineName.Buffer : NULL, lpDatabaseName ? DatabaseName.Buffer : NULL, dwDesiredAccess, @@ -2444,7 +2444,7 @@ /* Function 28 */ -DWORD ScmrOpenServiceA( +DWORD ROpenServiceA( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPSTR lpServiceName, @@ -2454,12 +2454,12 @@ UNICODE_STRING ServiceName; DWORD dwError; - DPRINT("ScmrOpenServiceA() called\n"); + DPRINT("ROpenServiceA() called\n"); RtlCreateUnicodeStringFromAsciiz(&ServiceName, lpServiceName); - dwError = ScmrOpenServiceW(BindingHandle, + dwError = ROpenServiceW(BindingHandle, hSCManager, ServiceName.Buffer, dwDesiredAccess, @@ -2472,7 +2472,7 @@ /* Function 29 */ -DWORD ScmrQueryServiceConfigA( +DWORD RQueryServiceConfigA( handle_t BindingHandle, SC_RPC_HANDLE hService, LPQUERY_SERVICE_CONFIGA lpServiceConfig, @@ -2485,7 +2485,7 @@ /* Function 30 */ -DWORD ScmrQueryServiceLockStatusA( +DWORD RQueryServiceLockStatusA( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus, @@ -2498,7 +2498,7 @@ /* Function 31 */ -DWORD ScmrStartServiceA( +DWORD RStartServiceA( handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD argc, @@ -2508,7 +2508,7 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; - DPRINT1("ScmrStartServiceA() called\n"); + DPRINT1("RStartServiceA() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -2552,7 +2552,7 @@ /* Function 32 */ -DWORD ScmrGetServiceDisplayNameA( +DWORD RGetServiceDisplayNameA( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPSTR lpServiceName, @@ -2565,7 +2565,7 @@ /* Function 33 */ -DWORD ScmrGetServiceKeyNameA( +DWORD RGetServiceKeyNameA( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPSTR lpDisplayName, @@ -2578,7 +2578,7 @@ /* Function 34 */ -DWORD ScmrGetCurrentGroupStateW( +DWORD RGetCurrentGroupStateW( handle_t BindingHandle) { UNIMPLEMENTED; @@ -2587,7 +2587,7 @@ /* Function 35 */ -DWORD ScmrEnumServiceGroupW( +DWORD REnumServiceGroupW( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, DWORD dwServiceType, @@ -2605,7 +2605,7 @@ /* Function 36 */ -DWORD ScmrChangeServiceConfig2A( +DWORD RChangeServiceConfig2A( handle_t BindingHandle, SC_RPC_HANDLE hService, SC_RPC_CONFIG_INFOA Info) @@ -2616,7 +2616,7 @@ /* Function 37 */ -DWORD ScmrChangeServiceConfig2W( +DWORD RChangeServiceConfig2W( handle_t BindingHandle, SC_RPC_HANDLE hService, SC_RPC_CONFIG_INFOW Info) @@ -2626,7 +2626,7 @@ PSERVICE lpService = NULL; HKEY hServiceKey = NULL; - DPRINT("ScmrChangeServiceConfig2W() called\n"); + DPRINT("RChangeServiceConfig2W() called\n"); DPRINT("dwInfoLevel = %lu\n", Info.dwInfoLevel); if (ScmShutdown) @@ -2702,14 +2702,14 @@ if (hServiceKey != NULL) RegCloseKey(hServiceKey); - DPRINT("ScmrChangeServiceConfig2W() done (Error %lu)\n", dwError); + DPRINT("RChangeServiceConfig2W() done (Error %lu)\n", dwError); return dwError; } /* Function 38 */ -DWORD ScmrQueryServiceConfig2A( +DWORD RQueryServiceConfig2A( handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwInfoLevel, @@ -2723,7 +2723,7 @@ /* Function 39 */ -DWORD ScmrQueryServiceConfig2W( +DWORD RQueryServiceConfig2W( handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwInfoLevel, @@ -2738,7 +2738,7 @@ DWORD dwRequiredSize; LPWSTR lpDescription = NULL; - DPRINT("ScmrQueryServiceConfig2W() called\n"); + DPRINT("RQueryServiceConfig2W() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -2814,14 +2814,14 @@ /* FIXME: Unlock database */ - DPRINT("ScmrQueryServiceConfig2W() done (Error %lu)\n", dwError); + DPRINT("RQueryServiceConfig2W() done (Error %lu)\n", dwError); return dwError; } /* Function 40 */ -DWORD ScmrQueryServiceStatusEx( +DWORD RQueryServiceStatusEx( handle_t BindingHandle, SC_RPC_HANDLE hService, SC_STATUS_TYPE InfoLevel, @@ -2833,7 +2833,7 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService; - DPRINT("ScmrQueryServiceStatusEx() called\n"); + DPRINT("RQueryServiceStatusEx() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -2882,7 +2882,7 @@ /* Function 41 */ -DWORD ScmrEnumServicesStatusExA( +DWORD REnumServicesStatusExA( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, SC_ENUM_TYPE InfoLevel, @@ -2903,7 +2903,7 @@ /* Function 42 */ -DWORD ScmrEnumServicesStatusExW( +DWORD REnumServicesStatusExW( handle_t BindingHandle, SC_RPC_HANDLE hSCManager, SC_ENUM_TYPE InfoLevel, @@ -2929,7 +2929,7 @@ LPENUM_SERVICE_STATUS_PROCESSW lpStatusPtr; LPWSTR lpStringPtr; - DPRINT("ScmrEnumServicesStatusExW() called\n"); + DPRINT("REnumServicesStatusExW() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -3147,14 +3147,14 @@ Done:; /* Unlock the service list */ - DPRINT("ScmrEnumServicesStatusExW() done (Error %lu)\n", dwError); + DPRINT("REnumServicesStatusExW() done (Error %lu)\n", dwError); return dwError; } /* Function 43 */ -DWORD ScmrSendTSMessage( +DWORD RSendTSMessage( handle_t BindingHandle) { UNIMPLEMENTED; @@ -3163,7 +3163,7 @@ /* Function 44 */ -DWORD ScmrCreateServiceWOW64A( +DWORD RCreateServiceWOW64A( handle_t BindingHandle, LPSTR lpServiceName, LPSTR lpDisplayName, @@ -3187,7 +3187,7 @@ /* Function 45 */ -DWORD ScmrCreateServiceWOW64W( +DWORD RCreateServiceWOW64W( handle_t BindingHandle, LPWSTR lpServiceName, LPWSTR lpDisplayName, @@ -3211,7 +3211,7 @@ /* Function 46 */ -DWORD ScmrFunction46( +DWORD RQueryServiceTagInfo( handle_t BindingHandle) { UNIMPLEMENTED; @@ -3220,7 +3220,7 @@ /* Function 47 */ -DWORD ScmrNotifyServiceStatusChange( +DWORD RNotifyServiceStatusChange( handle_t BindingHandle, SC_RPC_HANDLE hService, SC_RPC_NOTIFY_PARAMS NotifyParams, @@ -3235,7 +3235,7 @@ /* Function 48 */ -DWORD ScmrGetNotifyResults( +DWORD RGetNotifyResults( handle_t BindingHandle, SC_NOTIFY_RPC_HANDLE hNotify, PSC_RPC_NOTIFY_PARAMS_LIST *ppNotifyParams) @@ -3246,7 +3246,7 @@ /* Function 49 */ -DWORD ScmrCloseNotifyHandle( +DWORD RCloseNotifyHandle( handle_t BindingHandle, LPSC_NOTIFY_RPC_HANDLE phNotify, PBOOL pfApcFired) @@ -3257,7 +3257,7 @@ /* Function 50 */ -DWORD ScmrControlServiceExA( +DWORD RControlServiceExA( handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwControl, @@ -3269,7 +3269,7 @@ /* Function 51 */ -DWORD ScmrControlServiceExW( +DWORD RControlServiceExW( handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwControl, @@ -3281,7 +3281,7 @@ /* Function 52 */ -DWORD ScmrFunction52( +DWORD RSendPnPMessage( handle_t BindingHandle) { UNIMPLEMENTED; @@ -3290,7 +3290,7 @@ /* Function 53 */ -DWORD ScmrFunction53( +DWORD RValidatePnPService( handle_t BindingHandle) { UNIMPLEMENTED; @@ -3299,7 +3299,7 @@ /* Function 54 */ -DWORD ScmrFunction54( +DWORD ROpenServiceStatusHandle( handle_t BindingHandle) { UNIMPLEMENTED; @@ -3308,7 +3308,7 @@ /* Function 55 */ -DWORD ScmrFunction55( +DWORD RFunction55( handle_t BindingHandle) { UNIMPLEMENTED; Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Thu Apr 10 11:39:01 2008 @@ -116,12 +116,12 @@ HandleBind(); - dwError = ScmrChangeServiceConfig2A(BindingHandle, - (SC_RPC_HANDLE)hService, - Info); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrChangeServiceConfig2A() failed (Error %lu)\n", dwError); + dwError = RChangeServiceConfig2A(BindingHandle, + (SC_RPC_HANDLE)hService, + Info); + if (dwError != ERROR_SUCCESS) + { + ERR("RChangeServiceConfig2A() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -170,12 +170,12 @@ HandleBind(); - dwError = ScmrChangeServiceConfig2W(BindingHandle, - (SC_RPC_HANDLE)hService, - Info); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrChangeServiceConfig2W() failed (Error %lu)\n", dwError); + dwError = RChangeServiceConfig2W(BindingHandle, + (SC_RPC_HANDLE)hService, + Info); + if (dwError != ERROR_SUCCESS) + { + ERR("RChangeServiceConfig2W() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -227,23 +227,23 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrChangeServiceConfigA(BindingHandle, - (unsigned int)hService, - dwServiceType, - dwStartType, - dwErrorControl, - (LPSTR)lpBinaryPathName, - (LPSTR)lpLoadOrderGroup, - lpdwTagId, - (LPSTR)lpDependencies, - dwDependenciesLength, - (LPSTR)lpServiceStartName, - NULL, /* FIXME: lpPassword */ - 0, /* FIXME: dwPasswordLength */ - (LPSTR)lpDisplayName); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrChangeServiceConfigA() failed (Error %lu)\n", dwError); + dwError = RChangeServiceConfigA(BindingHandle, + (SC_RPC_HANDLE)hService, + dwServiceType, + dwStartType, + dwErrorControl, + (LPSTR)lpBinaryPathName, + (LPSTR)lpLoadOrderGroup, + lpdwTagId, + (LPSTR)lpDependencies, + dwDependenciesLength, + (LPSTR)lpServiceStartName, + NULL, /* FIXME: lpPassword */ + 0, /* FIXME: dwPasswordLength */ + (LPSTR)lpDisplayName); + if (dwError != ERROR_SUCCESS) + { + ERR("RChangeServiceConfigA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -295,23 +295,23 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrChangeServiceConfigW(BindingHandle, - (SC_RPC_HANDLE)hService, - dwServiceType, - dwStartType, - dwErrorControl, - (LPWSTR)lpBinaryPathName, - (LPWSTR)lpLoadOrderGroup, - lpdwTagId, - (LPBYTE)lpDependencies, - dwDependenciesLength, - (LPWSTR)lpServiceStartName, - NULL, /* FIXME: lpPassword */ - 0, /* FIXME: dwPasswordLength */ - (LPWSTR)lpDisplayName); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrChangeServiceConfigW() failed (Error %lu)\n", dwError); + dwError = RChangeServiceConfigW(BindingHandle, + (SC_RPC_HANDLE)hService, + dwServiceType, + dwStartType, + dwErrorControl, + (LPWSTR)lpBinaryPathName, + (LPWSTR)lpLoadOrderGroup, + lpdwTagId, + (LPBYTE)lpDependencies, + dwDependenciesLength, + (LPWSTR)lpServiceStartName, + NULL, /* FIXME: lpPassword */ + 0, /* FIXME: dwPasswordLength */ + (LPWSTR)lpDisplayName); + if (dwError != ERROR_SUCCESS) + { + ERR("RChangeServiceConfigW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -335,11 +335,11 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrCloseServiceHandle(BindingHandle, - (LPSC_RPC_HANDLE)&hSCObject); + dwError = RCloseServiceHandle(BindingHandle, + (LPSC_RPC_HANDLE)&hSCObject); if (dwError) { - ERR("ScmrCloseServiceHandle() failed (Error %lu)\n", dwError); + ERR("RCloseServiceHandle() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -368,13 +368,13 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrControlService(BindingHandle, - (unsigned int)hService, - dwControl, - lpServiceStatus); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrControlService() failed (Error %lu)\n", dwError); + dwError = RControlService(BindingHandle, + (SC_RPC_HANDLE)hService, + dwControl, + lpServiceStatus); + if (dwError != ERROR_SUCCESS) + { + ERR("RControlService() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -615,26 +615,26 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrCreateServiceW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - (LPWSTR)lpServiceName, - (LPWSTR)lpDisplayName, - dwDesiredAccess, - dwServiceType, - dwStartType, - dwErrorControl, - (LPWSTR)lpBinaryPathName, - (LPWSTR)lpLoadOrderGroup, - lpdwTagId, - (LPBYTE)lpDependencies, - dwDependenciesLength, - (LPWSTR)lpServiceStartName, - NULL, /* FIXME: lpPassword */ - 0, /* FIXME: dwPasswordLength */ - (SC_RPC_HANDLE *)&hService); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrCreateServiceW() failed (Error %lu)\n", dwError); + dwError = RCreateServiceW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPWSTR)lpServiceName, + (LPWSTR)lpDisplayName, + dwDesiredAccess, + dwServiceType, + dwStartType, + dwErrorControl, + (LPWSTR)lpBinaryPathName, + (LPWSTR)lpLoadOrderGroup, + lpdwTagId, + (LPBYTE)lpDependencies, + dwDependenciesLength, + (LPWSTR)lpServiceStartName, + NULL, /* FIXME: lpPassword */ + 0, /* FIXME: dwPasswordLength */ + (SC_RPC_HANDLE *)&hService); + if (dwError != ERROR_SUCCESS) + { + ERR("RCreateServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -658,11 +658,11 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrDeleteService(BindingHandle, - (unsigned int)hService); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrDeleteService() failed (Error %lu)\n", dwError); + dwError = RDeleteService(BindingHandle, + (SC_RPC_HANDLE)hService); + if (dwError != ERROR_SUCCESS) + { + ERR("RDeleteService() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -692,13 +692,13 @@ HandleBind(); - dwError = ScmrEnumDependentServicesA(BindingHandle, - (unsigned int)hService, - dwServiceState, - (unsigned char *)lpServices, - cbBufSize, - pcbBytesNeeded, - lpServicesReturned); + dwError = REnumDependentServicesA(BindingHandle, + (SC_RPC_HANDLE)hService, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned); lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) @@ -716,7 +716,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("ScmrEnumDependentServicesA() failed (Error %lu)\n", dwError); + ERR("REnumDependentServicesA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -748,13 +748,13 @@ HandleBind(); - dwError = ScmrEnumDependentServicesW(BindingHandle, - (unsigned int)hService, - dwServiceState, - (unsigned char *)lpServices, - cbBufSize, - pcbBytesNeeded, - lpServicesReturned); + dwError = REnumDependentServicesW(BindingHandle, + (SC_RPC_HANDLE)hService, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned); lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) @@ -772,7 +772,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("ScmrEnumDependentServicesW() failed (Error %lu)\n", dwError); + ERR("REnumDependentServicesW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -830,15 +830,15 @@ HandleBind(); - dwError = ScmrEnumServicesStatusA(BindingHandle, - (unsigned int)hSCManager, - dwServiceType, - dwServiceState, - (unsigned char *)lpServices, - cbBufSize, - pcbBytesNeeded, - lpServicesReturned, - lpResumeHandle); + dwError = REnumServicesStatusA(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + dwServiceType, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle); lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) @@ -856,7 +856,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("ScmrEnumServicesStatusA() failed (Error %lu)\n", dwError); + ERR("REnumServicesStatusA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -890,15 +890,15 @@ HandleBind(); - dwError = ScmrEnumServicesStatusW(BindingHandle, - (unsigned int)hSCManager, - dwServiceType, - dwServiceState, - (unsigned char *)lpServices, - cbBufSize, - pcbBytesNeeded, - lpServicesReturned, - lpResumeHandle); + dwError = REnumServicesStatusW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + dwServiceType, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle); lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) @@ -916,7 +916,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("ScmrEnumServicesStatusW() failed (Error %lu)\n", dwError); + ERR("REnumServicesStatusW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -952,17 +952,17 @@ HandleBind(); - dwError = ScmrEnumServicesStatusExA(BindingHandle, - (unsigned int)hSCManager, - (unsigned long)InfoLevel, - dwServiceType, - dwServiceState, - (unsigned char *)lpServices, - cbBufSize, - pcbBytesNeeded, - lpServicesReturned, - lpResumeHandle, - (char *)pszGroupName); + dwError = REnumServicesStatusExA(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + InfoLevel, + dwServiceType, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle, + (LPSTR)pszGroupName); if (dwError == ERROR_MORE_DATA) { @@ -988,7 +988,7 @@ } else { - ERR("ScmrEnumServicesStatusExA() failed (Error %lu)\n", dwError); + ERR("REnumServicesStatusExA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1024,17 +1024,17 @@ HandleBind(); - dwError = ScmrEnumServicesStatusExW(BindingHandle, - (unsigned int)hSCManager, - (unsigned long)InfoLevel, - dwServiceType, - dwServiceState, - (unsigned char *)lpServices, - cbBufSize, - pcbBytesNeeded, - lpServicesReturned, - lpResumeHandle, - (wchar_t *)pszGroupName); + dwError = REnumServicesStatusExW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + InfoLevel, + dwServiceType, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle, + (LPWSTR)pszGroupName); if (dwError == ERROR_MORE_DATA) { @@ -1060,7 +1060,7 @@ } else { - ERR("ScmrEnumServicesStatusExW() failed (Error %lu)\n", dwError); + ERR("REnumServicesStatusExW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1088,14 +1088,14 @@ HandleBind(); - dwError = ScmrGetServiceDisplayNameA(BindingHandle, - (unsigned int)hSCManager, - (LPSTR)lpServiceName, - lpDisplayName, - lpcchBuffer); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrGetServiceDisplayNameA() failed (Error %lu)\n", dwError); + dwError = RGetServiceDisplayNameA(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPSTR)lpServiceName, + lpDisplayName, + lpcchBuffer); + if (dwError != ERROR_SUCCESS) + { + ERR("RGetServiceDisplayNameA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1123,14 +1123,14 @@ HandleBind(); - dwError = ScmrGetServiceDisplayNameW(BindingHandle, - (unsigned int)hSCManager, - (LPWSTR)lpServiceName, - lpDisplayName, - lpcchBuffer); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrGetServiceDisplayNameW() failed (Error %lu)\n", dwError); + dwError = RGetServiceDisplayNameW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPWSTR)lpServiceName, + lpDisplayName, + lpcchBuffer); + if (dwError != ERROR_SUCCESS) + { + ERR("RGetServiceDisplayNameW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1158,14 +1158,14 @@ HandleBind(); - dwError = ScmrGetServiceKeyNameA(BindingHandle, - (unsigned int)hSCManager, - (LPSTR)lpDisplayName, - lpServiceName, - lpcchBuffer); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrGetServiceKeyNameA() failed (Error %lu)\n", dwError); + dwError = RGetServiceKeyNameA(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPSTR)lpDisplayName, + lpServiceName, + lpcchBuffer); + if (dwError != ERROR_SUCCESS) + { + ERR("RGetServiceKeyNameA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1193,14 +1193,14 @@ HandleBind(); - dwError = ScmrGetServiceKeyNameW(BindingHandle, - (unsigned int)hSCManager, - (LPWSTR)lpDisplayName, - lpServiceName, - lpcchBuffer); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrGetServiceKeyNameW() failed (Error %lu)\n", dwError); + dwError = RGetServiceKeyNameW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPWSTR)lpDisplayName, + lpServiceName, + lpcchBuffer); + if (dwError != ERROR_SUCCESS) + { + ERR("RGetServiceKeyNameW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1227,12 +1227,12 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrLockServiceDatabase(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - (SC_RPC_LOCK *)&hLock); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); + dwError = RLockServiceDatabase(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (SC_RPC_LOCK *)&hLock); + if (dwError != ERROR_SUCCESS) + { + ERR("RLockServiceDatabase() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1304,14 +1304,14 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrOpenSCManagerA(BindingHandle, - (LPSTR)lpMachineName, - (LPSTR)lpDatabaseName, - dwDesiredAccess, - (unsigned long*)&hScm); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); + dwError = ROpenSCManagerA(BindingHandle, + (LPSTR)lpMachineName, + (LPSTR)lpDatabaseName, + dwDesiredAccess, + (SC_RPC_HANDLE *)&hScm); + if (dwError != ERROR_SUCCESS) + { + ERR("ROpenSCManagerA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1343,14 +1343,14 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrOpenSCManagerW(BindingHandle, - (LPWSTR)lpMachineName, - (LPWSTR)lpDatabaseName, - dwDesiredAccess, - (unsigned long*)&hScm); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrOpenSCManagerW() failed (Error %lu)\n", dwError); + dwError = ROpenSCManagerW(BindingHandle, + (LPWSTR)lpMachineName, + (LPWSTR)lpDatabaseName, + dwDesiredAccess, + (SC_RPC_HANDLE *)&hScm); + if (dwError != ERROR_SUCCESS) + { + ERR("ROpenSCManagerW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1380,14 +1380,14 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrOpenServiceA(BindingHandle, - (unsigned int)hSCManager, - (LPSTR)lpServiceName, - dwDesiredAccess, - (unsigned long*)&hService); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrOpenServiceA() failed (Error %lu)\n", dwError); + dwError = ROpenServiceA(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPSTR)lpServiceName, + dwDesiredAccess, + (SC_RPC_HANDLE *)&hService); + if (dwError != ERROR_SUCCESS) + { + ERR("ROpenServiceA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1417,14 +1417,14 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrOpenServiceW(BindingHandle, - (unsigned int)hSCManager, - (LPWSTR)lpServiceName, - dwDesiredAccess, - (unsigned long*)&hService); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrOpenServiceW() failed (Error %lu)\n", dwError); + dwError = ROpenServiceW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPWSTR)lpServiceName, + dwDesiredAccess, + (SC_RPC_HANDLE *)&hService); + if (dwError != ERROR_SUCCESS) + { + ERR("ROpenServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1454,14 +1454,14 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrQueryServiceConfigA(BindingHandle, - (SC_RPC_HANDLE)hService, - lpServiceConfig, - cbBufSize, - pcbBytesNeeded); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrQueryServiceConfigA() failed (Error %lu)\n", dwError); + dwError = RQueryServiceConfigA(BindingHandle, + (SC_RPC_HANDLE)hService, + lpServiceConfig, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + ERR("RQueryServiceConfigA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1517,14 +1517,14 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrQueryServiceConfigW(BindingHandle, - (SC_RPC_HANDLE)hService, - (LPBYTE)lpServiceConfig, - cbBufSize, - pcbBytesNeeded); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrQueryServiceConfigW() failed (Error %lu)\n", dwError); + dwError = RQueryServiceConfigW(BindingHandle, + (SC_RPC_HANDLE)hService, + (LPBYTE)lpServiceConfig, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + ERR("RQueryServiceConfigW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1581,15 +1581,15 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrQueryServiceConfig2A(BindingHandle, - (unsigned int)hService, - dwInfoLevel, - (unsigned char *)lpBuffer, - cbBufSize, - pcbBytesNeeded); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrQueryServiceConfig2A() failed (Error %lu)\n", dwError); + dwError = RQueryServiceConfig2A(BindingHandle, + (SC_RPC_HANDLE)hService, + dwInfoLevel, + lpBuffer, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + ERR("RQueryServiceConfig2A() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1656,15 +1656,15 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrQueryServiceConfig2W(BindingHandle, - (unsigned int)hService, - dwInfoLevel, - (unsigned char *)lpBuffer, - cbBufSize, - pcbBytesNeeded); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrQueryServiceConfig2W() failed (Error %lu)\n", dwError); + dwError = RQueryServiceConfig2W(BindingHandle, + (SC_RPC_HANDLE)hService, + dwInfoLevel, + lpBuffer, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + ERR("RQueryServiceConfig2W() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1729,14 +1729,14 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrQueryServiceLockStatusA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - lpLockStatus, - cbBufSize, - pcbBytesNeeded); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrQueryServiceLockStatusA() failed (Error %lu)\n", dwError); + dwError = RQueryServiceLockStatusA(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + lpLockStatus, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + ERR("RQueryServiceLockStatusA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1771,14 +1771,14 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrQueryServiceLockStatusW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - lpLockStatus, - cbBufSize, - pcbBytesNeeded); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrQueryServiceLockStatusW() failed (Error %lu)\n", dwError); + dwError = RQueryServiceLockStatusW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + lpLockStatus, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + ERR("RQueryServiceLockStatusW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1815,12 +1815,12 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrQueryServiceObjectSecurity(BindingHandle, - (unsigned int)hService, - dwSecurityInformation, - (unsigned char *)lpSecurityDescriptor, - cbBufSize, - pcbBytesNeeded); + dwError = RQueryServiceObjectSecurity(BindingHandle, + (SC_RPC_HANDLE)hService, + dwSecurityInformation, + (LPBYTE)lpSecurityDescriptor, + cbBufSize, + pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { ERR("QueryServiceObjectSecurity() failed (Error %lu)\n", dwError); @@ -1876,17 +1876,17 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrSetServiceObjectSecurity(BindingHandle, - (unsigned int)hService, - dwSecurityInformation, - (unsigned char *)SelfRelativeSD, - Length); + dwError = RSetServiceObjectSecurity(BindingHandle, + (SC_RPC_HANDLE)hService, + dwSecurityInformation, + (LPBYTE)SelfRelativeSD, + Length); HeapFree(GetProcessHeap(), 0, SelfRelativeSD); if (dwError != ERROR_SUCCESS) { - ERR("ScmrServiceObjectSecurity() failed (Error %lu)\n", dwError); + ERR("RServiceObjectSecurity() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1912,12 +1912,12 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrQueryServiceStatus(BindingHandle, - (unsigned int)hService, - lpServiceStatus); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrQueryServiceStatus() failed (Error %lu)\n", dwError); + dwError = RQueryServiceStatus(BindingHandle, + (SC_RPC_HANDLE)hService, + lpServiceStatus); + if (dwError != ERROR_SUCCESS) + { + ERR("RQueryServiceStatus() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1945,15 +1945,15 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrQueryServiceStatusEx(BindingHandle, - (unsigned int)hService, - InfoLevel, - lpBuffer, - cbBufSize, - pcbBytesNeeded); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrQueryServiceStatusEx() failed (Error %lu)\n", dwError); + dwError = RQueryServiceStatusEx(BindingHandle, + (SC_RPC_HANDLE)hService, + InfoLevel, + lpBuffer, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + ERR("RQueryServiceStatusEx() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1974,15 +1974,15 @@ { DWORD dwError; - dwError = ScmrStartServiceA(BindingHandle, - (SC_RPC_HANDLE)hService, - dwNumServiceArgs, - (LPSTRING_PTRSA)lpServiceArgVectors); - - - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrStartServiceA() failed (Error %lu)\n", dwError); + dwError = RStartServiceA(BindingHandle, + (SC_RPC_HANDLE)hService, + dwNumServiceArgs, + (LPSTRING_PTRSA)lpServiceArgVectors); + + + if (dwError != ERROR_SUCCESS) + { + ERR("RStartServiceA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2003,14 +2003,14 @@ { DWORD dwError; - dwError = ScmrStartServiceW(BindingHandle, - (SC_RPC_HANDLE)hService, - dwNumServiceArgs, - (LPSTRING_PTRSW)lpServiceArgVectors); - - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrStartServiceW() failed (Error %lu)\n", dwError); + dwError = RStartServiceW(BindingHandle, + (SC_RPC_HANDLE)hService, + dwNumServiceArgs, + (LPSTRING_PTRSW)lpServiceArgVectors); + + if (dwError != ERROR_SUCCESS) + { + ERR("RStartServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2034,11 +2034,11 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrUnlockServiceDatabase(BindingHandle, - (SC_RPC_LOCK)ScLock); - if (dwError != ERROR_SUCCESS) - { - ERR("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); + dwError = RUnlockServiceDatabase(BindingHandle, + (SC_RPC_LOCK)ScLock); + if (dwError != ERROR_SUCCESS) + { + ERR("RUnlockServiceDatabase() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2062,9 +2062,9 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrNotifyBootConfigStatus(BindingHandle, - NULL, - BootAcceptable); + dwError = RNotifyBootConfigStatus(BindingHandle, + NULL, + BootAcceptable); if (dwError != ERROR_SUCCESS) { ERR("NotifyBootConfigStatus() failed (Error %lu)\n", dwError); Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Thu Apr 10 11:39:01 2008 @@ -561,9 +561,9 @@ HandleBind(); /* Call to services.exe using RPC */ - dwError = ScmrSetServiceStatus(BindingHandle, - (unsigned long)hServiceStatus, - lpServiceStatus); + dwError = RSetServiceStatus(BindingHandle, + (SC_RPC_HANDLE)hServiceStatus, + lpServiceStatus); if (dwError != ERROR_SUCCESS) { ERR("ScmrSetServiceStatus() failed (Error %lu)\n", dwError); Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Thu Apr 10 11:39:01 2008 @@ -14,8 +14,6 @@ const unsigned short SC_MAX_COMMENT_LENGTH = 128; const unsigned short SC_MAX_ARGUMENT_LENGTH = 1024; const unsigned short SC_MAX_ARGUMENTS = 1024; - -#define R(fn) Scmr ## fn typedef unsigned long SECURITY_INFORMATION; typedef [handle] LPSTR SVCCTL_HANDLEA; @@ -304,30 +302,30 @@ interface svcctl { /* Function 0 */ - DWORD R(CloseServiceHandle) ( + DWORD RCloseServiceHandle( [in] handle_t BindingHandle, [in, out] LPSC_RPC_HANDLE hSCObject); /* Function 1 */ - DWORD R(ControlService) ( + DWORD RControlService( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwControl, [out] LPSERVICE_STATUS lpServiceStatus); /* Function 2 */ - DWORD R(DeleteService) ( + DWORD RDeleteService( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService); /* Function 3 */ - DWORD R(LockServiceDatabase) ( + DWORD RLockServiceDatabase( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [out] LPSC_RPC_LOCK lpLock); /* Function 4 */ - DWORD R(QueryServiceObjectSecurity) ( + DWORD RQueryServiceObjectSecurity( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] SECURITY_INFORMATION dwSecurityInformation, @@ -336,7 +334,7 @@ [out] LPBOUNDED_DWORD_256K pcbBytesNeeded); /* Function 5 */ - DWORD R(SetServiceObjectSecurity) ( + DWORD RSetServiceObjectSecurity( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwSecurityInformation, @@ -344,30 +342,30 @@ [in] DWORD dwSecuityDescriptorSize); /* Function 6 */ - DWORD R(QueryServiceStatus) ( + DWORD RQueryServiceStatus( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [out] LPSERVICE_STATUS lpServiceStatus); /* Function 7 */ - DWORD R(SetServiceStatus) ( + DWORD RSetServiceStatus( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hServiceStatus, [in] LPSERVICE_STATUS lpServiceStatus); /* Function 8 */ - DWORD R(UnlockServiceDatabase) ( + DWORD RUnlockServiceDatabase( [in] handle_t BindingHandle, [in, out] LPSC_RPC_LOCK Lock); /* Function 9 */ - DWORD R(NotifyBootConfigStatus) ( + DWORD RNotifyBootConfigStatus( [in] handle_t BindingHandle, [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEW lpMachineName, [in] DWORD BootAcceptable); /* Function 10 */ - DWORD R(SetServiceBitsW) ( + DWORD RSetServiceBitsW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hServiceStatus, [in] DWORD dwServiceBits, @@ -376,7 +374,7 @@ [in, string, unique] LPWSTR lpString); /* Function 11 */ - DWORD R(ChangeServiceConfigW) ( + DWORD RChangeServiceConfigW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwServiceType, @@ -393,7 +391,7 @@ [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDisplayName); /* Function 12 */ - DWORD R(CreateServiceW) ( + DWORD RCreateServiceW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, @@ -413,7 +411,7 @@ [out] LPSC_RPC_HANDLE lpServiceHandle); /* Function 13 */ - DWORD R(EnumDependentServicesW) ( + DWORD REnumDependentServicesW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwServiceState, @@ -423,7 +421,7 @@ [out] LPBOUNDED_DWORD_256K lpServicesReturned); /* Function 14 */ - DWORD R(EnumServicesStatusW) ( + DWORD REnumServicesStatusW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in] DWORD dwServiceType, @@ -435,7 +433,7 @@ [in, out, unique] LPBOUNDED_DWORD_256K lpResumeHandle); /* Function 15 */ - DWORD R(OpenSCManagerW) ( + DWORD ROpenSCManagerW( [in] handle_t BindingHandle, [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] LPWSTR lpMachineName, [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDatabaseName, @@ -443,7 +441,7 @@ [out] LPSC_RPC_HANDLE lpScHandle); /* Function 16 */ - DWORD R(OpenServiceW) ( + DWORD ROpenServiceW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, @@ -451,7 +449,7 @@ [out] LPSC_RPC_HANDLE lpServiceHandle); /* Function 17 */ - DWORD R(QueryServiceConfigW) ( + DWORD RQueryServiceConfigW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, @@ -460,7 +458,7 @@ [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); /* Function 18 */ - DWORD R(QueryServiceLockStatusW) ( + DWORD RQueryServiceLockStatusW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [out] LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus, @@ -468,14 +466,14 @@ [out] LPBOUNDED_DWORD_4K pcbBytesNeeded); /* Function 19 */ - DWORD R(StartServiceW) ( + DWORD RStartServiceW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in, range(0, SC_MAX_ARGUMENTS)] DWORD argc, [in, unique, size_is(argc)] LPSTRING_PTRSW argv); /* Function 20 */ - DWORD R(GetServiceDisplayNameW) ( + DWORD RGetServiceDisplayNameW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, @@ -483,7 +481,7 @@ [in, out] DWORD* lpcchBuffer); /* Function 21 */ - DWORD R(GetServiceKeyNameW) ( + DWORD RGetServiceKeyNameW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDisplayName, @@ -491,7 +489,7 @@ [in, out] DWORD* lpcchBuffer); /* Function 22 */ - DWORD R(SetServiceBitsA) ( + DWORD RSetServiceBitsA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hServiceStatus, [in] DWORD dwServiceBits, @@ -500,7 +498,7 @@ [in, string, unique] LPSTR lpString); /* Function 23 */ - DWORD R(ChangeServiceConfigA) ( + DWORD RChangeServiceConfigA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwServiceType, @@ -517,7 +515,7 @@ [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName); /* Function 24 */ - DWORD R(CreateServiceA) ( + DWORD RCreateServiceA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, @@ -537,7 +535,7 @@ [out] LPSC_RPC_HANDLE lpServiceHandle); /* Function 25 */ - DWORD R(EnumDependentServicesA) ( + DWORD REnumDependentServicesA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwServiceState, @@ -547,7 +545,7 @@ [out] LPBOUNDED_DWORD_256K lpServicesReturned); /* Function 26 */ - DWORD R(EnumServicesStatusA) ( + DWORD REnumServicesStatusA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in] DWORD dwServiceType, @@ -559,7 +557,7 @@ [in, out, unique] LPBOUNDED_DWORD_256K lpResumeHandle); /* Function 27 */ - DWORD R(OpenSCManagerA) ( + DWORD ROpenSCManagerA( [in] handle_t BindingHandle, [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] LPSTR lpMachineName, [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDatabaseName, @@ -567,7 +565,7 @@ [out] LPSC_RPC_HANDLE lpScHandle); /* Function 28 */ - DWORD R(OpenServiceA) ( + DWORD ROpenServiceA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, @@ -575,7 +573,7 @@ [out] LPSC_RPC_HANDLE lpServiceHandle); /* Function 29 */ - DWORD R(QueryServiceConfigA) ( + DWORD RQueryServiceConfigA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, @@ -583,7 +581,7 @@ [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); /* Function 30 */ - DWORD R(QueryServiceLockStatusA) ( + DWORD RQueryServiceLockStatusA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [out] LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus, @@ -591,14 +589,14 @@ [out] LPBOUNDED_DWORD_4K pcbBytesNeeded); /* Function 31 */ - DWORD R(StartServiceA) ( + DWORD RStartServiceA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in, range(0, SC_MAX_ARGUMENTS)] DWORD argc, [in, unique, size_is(argc)] LPSTRING_PTRSA argv); /* Function 32 */ - DWORD R(GetServiceDisplayNameA) ( + DWORD RGetServiceDisplayNameA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, @@ -606,7 +604,7 @@ [in, out] LPBOUNDED_DWORD_4K lpcchBuffer); /* Function 33 */ - DWORD R(GetServiceKeyNameA) ( + DWORD RGetServiceKeyNameA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName, @@ -614,11 +612,11 @@ [in, out] LPBOUNDED_DWORD_4K lpcchBuffer); /* Function 34 */ - DWORD R(GetCurrentGroupStateW) ( + DWORD RGetCurrentGroupStateW( [in] handle_t BindingHandle); /* FIXME */ /* Function 35 */ - DWORD R(EnumServiceGroupW) ( + DWORD REnumServiceGroupW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in] DWORD dwServiceType, @@ -631,19 +629,19 @@ [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR pszGroupName); /* Function 36 */ - DWORD R(ChangeServiceConfig2A) ( + DWORD RChangeServiceConfig2A( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] SC_RPC_CONFIG_INFOA Info); /* Function 37 */ - DWORD R(ChangeServiceConfig2W) ( + DWORD RChangeServiceConfig2W( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] SC_RPC_CONFIG_INFOW Info); /* Function 38 */ - DWORD R(QueryServiceConfig2A) ( + DWORD RQueryServiceConfig2A( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwInfoLevel, @@ -652,7 +650,7 @@ [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); /* Function 39 */ - DWORD R(QueryServiceConfig2W) ( + DWORD RQueryServiceConfig2W( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwInfoLevel, @@ -661,7 +659,7 @@ [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); /* Function 40 */ - DWORD R(QueryServiceStatusEx) ( + DWORD RQueryServiceStatusEx( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] SC_STATUS_TYPE InfoLevel, @@ -670,7 +668,7 @@ [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); /* Function 41 */ - DWORD R(EnumServicesStatusExA) ( + DWORD REnumServicesStatusExA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in] SC_ENUM_TYPE InfoLevel, @@ -684,7 +682,7 @@ [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCSTR pszGroupName); /* Function 42 */ - DWORD R(EnumServicesStatusExW) ( + DWORD REnumServicesStatusExW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in] SC_ENUM_TYPE InfoLevel, @@ -698,11 +696,11 @@ [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPCWSTR pszGroupName); /* Function 43 */ - DWORD R(SendTSMessage) ( + DWORD RSendTSMessage( [in] handle_t BindingHandle); /* FIXME */ /* Function 44 */ - DWORD R(CreateServiceWOW64A) ( + DWORD RCreateServiceWOW64A( [in] handle_t BindingHandle, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName, @@ -721,7 +719,7 @@ [out] LPSC_RPC_HANDLE lpServiceHandle); /* Function 45 */ - DWORD R(CreateServiceWOW64W) ( + DWORD RCreateServiceWOW64W( [in] handle_t BindingHandle, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDisplayName, @@ -740,11 +738,11 @@ [out] LPSC_RPC_HANDLE lpServiceHandle); /* Function 46 */ - DWORD R(Function46) ( + DWORD RQueryServiceTagInfo( [in] handle_t BindingHandle); /* FIXME */ /* Function 47 */ - DWORD R(NotifyServiceStatusChange) ( + DWORD RNotifyServiceStatusChange( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] SC_RPC_NOTIFY_PARAMS NotifyParams, @@ -754,19 +752,19 @@ [out] LPSC_NOTIFY_RPC_HANDLE phNotify); /* Function 48 */ - DWORD R(GetNotifyResults) ( + DWORD RGetNotifyResults( [in] handle_t BindingHandle, [in] SC_NOTIFY_RPC_HANDLE hNotify, [out] PSC_RPC_NOTIFY_PARAMS_LIST *ppNotifyParams); /* Function 49 */ - DWORD R(CloseNotifyHandle) ( + DWORD RCloseNotifyHandle( [in] handle_t BindingHandle, [in, out] LPSC_NOTIFY_RPC_HANDLE phNotify, [out] PBOOL pfApcFired); /* Function 50 */ - DWORD R(ControlServiceExA) ( + DWORD RControlServiceExA( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwControl, @@ -775,7 +773,7 @@ [out, switch_is(dwInfoLevel)] PSC_RPC_SERVICE_CONTROL_IN_PARAMSA pControlOutParams*/); /* Function 51 */ - DWORD R(ControlServiceExW) ( + DWORD RControlServiceExW( [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwControl, @@ -784,18 +782,18 @@ [out, switch_is(dwInfoLevel)] PSC_RPC_SERVICE_CONTROL_IN_PARAMSW pControlOutParams*/); /* Function 52 */ - DWORD R(Function52) ( + DWORD RSendPnPMessage( [in] handle_t BindingHandle); /* FIXME */ /* Function 53 */ - DWORD R(Function53) ( + DWORD RValidatePnPService( [in] handle_t BindingHandle); /* FIXME */ /* Function 54 */ - DWORD R(Function54) ( + DWORD ROpenServiceStatusHandle( [in] handle_t BindingHandle); /* FIXME */ /* Function 55 */ - DWORD R(Function55) ( + DWORD RFunction55( [in] handle_t BindingHandle); /* FIXME */ }

16 years, 8 months

[hpoussin] 32907: Fix build

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Apr 10 09:52:41 2008 New Revision: 32907 URL: http://svn.reactos.org/svn/reactos?rev=32907&view=rev Log: Fix build Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/setupapi/cfgmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Thu Apr 10 09:52:41 2008 @@ -1252,7 +1252,7 @@ /* Function 38 */ CONFIGRET PNP_IsDockStationPresent(handle_t BindingHandle, - unsigned long *Present) + BOOL *Present) { HKEY hKey; DWORD dwType; Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Thu Apr 10 09:52:41 2008 @@ -2569,7 +2569,7 @@ } return PNP_IsDockStationPresent(BindingHandle, - (unsigned long *)pbPresent); + pbPresent); }

16 years, 8 months

[hpoussin] 32906: Make service RPC interface more compatible with MS Windows

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Apr 10 09:49:04 2008 New Revision: 32906 URL: http://svn.reactos.org/svn/reactos?rev=32906&view=rev Log: Make service RPC interface more compatible with MS Windows Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/include/reactos/idl/svcctl.idl trunk/reactos/include/reactos/idl/wtypes.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… Modified: trunk/reactos/include/reactos/idl/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wtypes…

16 years, 8 months

← Newer
1
...
26
27
28
29
30
31
32
...
40
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 April 2008