[ros-diffs] [dchapyshev] 39453: - Add stub program for winhlp32 (should be located in system32) - winhlp32 now it is located in c:\reactos BUG: Stub program and winhlp32 have an identical name of a file, but are located in different directories. At installation winhlp32 it is copied in system32 and c:\reactos. We need to think up a way to install two or more files with identical names
dchapyshev at svn.reactos.org
dchapyshev at svn.reactos.org
Sat Feb 7 12:21:07 CET 2009
Author: dchapyshev
Date: Sat Feb 7 05:21:07 2009
New Revision: 39453
URL: http://svn.reactos.org/svn/reactos?rev=39453&view=rev
Log:
- Add stub program for winhlp32 (should be located in system32)
- winhlp32 now it is located in c:\reactos
BUG: Stub program and winhlp32 have an identical name of a file, but are located in different directories. At installation winhlp32 it is copied in system32 and c:\reactos. We need to think up a way to install two or more files with identical names
Added:
trunk/reactos/base/applications/winhstb/ (with props)
trunk/reactos/base/applications/winhstb/res/ (with props)
trunk/reactos/base/applications/winhstb/res/4000.ico (with props)
trunk/reactos/base/applications/winhstb/resource.h (with props)
trunk/reactos/base/applications/winhstb/winhstb.c (with props)
trunk/reactos/base/applications/winhstb/winhstb.rbuild (with props)
trunk/reactos/base/applications/winhstb/winhstb.rc (with props)
Modified:
trunk/reactos/base/applications/applications.rbuild
trunk/reactos/base/applications/winhlp32/winhlp32.rbuild
trunk/reactos/boot/bootdata/packages/reactos.dff
Modified: trunk/reactos/base/applications/applications.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applications.rbuild?rev=39453&r1=39452&r2=39453&view=diff
==============================================================================
--- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Sat Feb 7 05:21:07 2009
@@ -73,6 +73,9 @@
<directory name="winhlp32">
<xi:include href="winhlp32/winhlp32.rbuild" />
</directory>
+ <directory name="winhstb">
+ <xi:include href="winhstb/winhstb.rbuild" />
+ </directory>
<directory name="wordpad">
<xi:include href="wordpad/wordpad.rbuild" />
</directory>
Modified: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/winhlp32.rbuild?rev=39453&r1=39452&r2=39453&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] Sat Feb 7 05:21:07 2009
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="winhlp32" type="win32gui" installbase="system32" installname="winhlp32.exe" allowwarnings="true" unicode="no">
+<module name="winhlp32" type="win32gui" installname="winhlp32.exe" allowwarnings="true" unicode="no">
<include base="winhlp32">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="__ROS_LONG64__" />
Propchange: trunk/reactos/base/applications/winhstb/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Feb 7 05:21:07 2009
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: trunk/reactos/base/applications/winhstb/
------------------------------------------------------------------------------
bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/reactos/base/applications/winhstb/
------------------------------------------------------------------------------
bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: trunk/reactos/base/applications/winhstb/
------------------------------------------------------------------------------
tsvn:logminsize = 10
Propchange: trunk/reactos/base/applications/winhstb/res/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Feb 7 05:21:07 2009
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: trunk/reactos/base/applications/winhstb/res/
------------------------------------------------------------------------------
bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/reactos/base/applications/winhstb/res/
------------------------------------------------------------------------------
bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: trunk/reactos/base/applications/winhstb/res/
------------------------------------------------------------------------------
tsvn:logminsize = 10
Added: trunk/reactos/base/applications/winhstb/res/4000.ico
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/res/4000.ico?rev=39453&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/reactos/base/applications/winhstb/res/4000.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/winhstb/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/resource.h?rev=39453&view=auto
==============================================================================
--- trunk/reactos/base/applications/winhstb/resource.h (added)
+++ trunk/reactos/base/applications/winhstb/resource.h [iso-8859-1] Sat Feb 7 05:21:07 2009
@@ -1,0 +1,2 @@
+/* Icons */
+#define IDI_MAIN 4000
Propchange: trunk/reactos/base/applications/winhstb/resource.h
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/base/applications/winhstb/winhstb.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/winhstb.c?rev=39453&view=auto
==============================================================================
--- trunk/reactos/base/applications/winhstb/winhstb.c (added)
+++ trunk/reactos/base/applications/winhstb/winhstb.c [iso-8859-1] Sat Feb 7 05:21:07 2009
@@ -1,0 +1,46 @@
+/*
+ * PROJECT: winhlp32.exe
+ * FILE: base\applications\winhlp32\winhstb\winhstb.c
+ * PURPOSE: Stub winhelp32
+ * PROGRAMMERS: Dmitry Chapyshev (dmitry at reactos.org)
+ */
+
+#include <windows.h>
+#include <tchar.h>
+#include <shellapi.h>
+#include <shlwapi.h>
+#include "resource.h"
+
+#define WINHLP _T("winhlp32.exe")
+
+int
+WINAPI
+_tWinMain(HINSTANCE hCurInst,
+ HINSTANCE hPrevInst,
+ LPTSTR lpsCmdLine,
+ int nCmdShow)
+{
+ TCHAR szPath[MAX_PATH];
+
+ if(GetWindowsDirectory(szPath, MAX_PATH))
+ {
+ PathAppend(szPath, WINHLP);
+ ShellExecute(NULL,
+ NULL,
+ szPath,
+ lpsCmdLine,
+ NULL,
+ nCmdShow);
+ }
+ else
+ {
+ ShellExecute(NULL,
+ NULL,
+ WINHLP,
+ lpsCmdLine,
+ NULL,
+ nCmdShow);
+ }
+
+ return 0;
+}
Propchange: trunk/reactos/base/applications/winhstb/winhstb.c
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/base/applications/winhstb/winhstb.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/winhstb.rbuild?rev=39453&view=auto
==============================================================================
--- trunk/reactos/base/applications/winhstb/winhstb.rbuild (added)
+++ trunk/reactos/base/applications/winhstb/winhstb.rbuild [iso-8859-1] Sat Feb 7 05:21:07 2009
@@ -1,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="winhstb" type="win32gui" installbase="system32" installname="winhlp32.exe" unicode="no">
+ <include base="winhstb">.</include>
+ <library>user32</library>
+ <library>kernel32</library>
+ <library>shell32</library>
+ <library>shlwapi</library>
+ <file>winhstb.c</file>
+ <file>winhstb.rc</file>
+</module>
Propchange: trunk/reactos/base/applications/winhstb/winhstb.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/base/applications/winhstb/winhstb.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/winhstb.rc?rev=39453&view=auto
==============================================================================
--- trunk/reactos/base/applications/winhstb/winhstb.rc (added)
+++ trunk/reactos/base/applications/winhstb/winhstb.rc [iso-8859-1] Sat Feb 7 05:21:07 2009
@@ -1,0 +1,11 @@
+#include "resource.h"
+#include <windows.h>
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION "ReactOS WinHlp32 Stub\0"
+#define REACTOS_STR_INTERNAL_NAME "winhstb\0"
+#define REACTOS_STR_ORIGINAL_FILENAME "winhlp32.exe\0"
+#include <reactos/version.rc>
+
+IDI_MAIN ICON "res/4000.ico"
Propchange: trunk/reactos/base/applications/winhstb/winhstb.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/reactos.dff?rev=39453&r1=39452&r2=39453&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Feb 7 05:21:07 2009
@@ -74,7 +74,8 @@
base\applications\shutdown\shutdown.exe 1
base\applications\sndvol32\sndvol32.exe 1
base\applications\taskmgr\taskmgr.exe 1
-base\applications\winhlp32\winhlp32.exe 1
+base\applications\winhlp32\winhlp32.exe 4
+base\applications\winhstb\winhlp32.exe 1
base\applications\wordpad\wordpad.exe 1
base\services\audiosrv\audiosrv.exe 1
More information about the Ros-diffs
mailing list