13 Jan
2014
13 Jan
'14
12:43 p.m.
Author: akhaldi
Date: Mon Jan 13 12:43:38 2014
New Revision: 61602
URL: http://svn.reactos.org/svn/reactos?rev=61602&view=rev
Log:
[WINHLP32]
* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header/resource file.
CORE-7716
Modified:
trunk/reactos/base/applications/winhlp32/callback.c
trunk/reactos/base/applications/winhlp32/hlpfile.c
trunk/reactos/base/applications/winhlp32/lang/Bg.rc
trunk/reactos/base/applications/winhlp32/lang/Cs.rc
trunk/reactos/base/applications/winhlp32/lang/Da.rc
trunk/reactos/base/applications/winhlp32/lang/De.rc
trunk/reactos/base/applications/winhlp32/lang/En.rc
trunk/reactos/base/applications/winhlp32/lang/Es.rc
trunk/reactos/base/applications/winhlp32/lang/Fi.rc
trunk/reactos/base/applications/winhlp32/lang/Fr.rc
trunk/reactos/base/applications/winhlp32/lang/He.rc
trunk/reactos/base/applications/winhlp32/lang/Hu.rc
trunk/reactos/base/applications/winhlp32/lang/It.rc
trunk/reactos/base/applications/winhlp32/lang/Ja.rc
trunk/reactos/base/applications/winhlp32/lang/Ko.rc
trunk/reactos/base/applications/winhlp32/lang/Lt.rc
trunk/reactos/base/applications/winhlp32/lang/Nl.rc
trunk/reactos/base/applications/winhlp32/lang/No.rc
trunk/reactos/base/applications/winhlp32/lang/Pl.rc
trunk/reactos/base/applications/winhlp32/lang/Pt.rc
trunk/reactos/base/applications/winhlp32/lang/Rm.rc
trunk/reactos/base/applications/winhlp32/lang/Ro.rc
trunk/reactos/base/applications/winhlp32/lang/Ru.rc
trunk/reactos/base/applications/winhlp32/lang/Si.rc
trunk/reactos/base/applications/winhlp32/lang/Sk.rc
trunk/reactos/base/applications/winhlp32/lang/Sq.rc
trunk/reactos/base/applications/winhlp32/lang/Sr.rc
trunk/reactos/base/applications/winhlp32/lang/Sv.rc
trunk/reactos/base/applications/winhlp32/lang/Tr.rc
trunk/reactos/base/applications/winhlp32/lang/Uk.rc
trunk/reactos/base/applications/winhlp32/lang/Zh.rc
trunk/reactos/base/applications/winhlp32/macro.c
trunk/reactos/base/applications/winhlp32/macro.h
trunk/reactos/base/applications/winhlp32/macro.lex.yy.c
trunk/reactos/base/applications/winhlp32/winhelp.c
trunk/reactos/base/applications/winhlp32/winhelp.h
Modified: trunk/reactos/base/applications/winhlp32/callback.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/callback.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/callback.c [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -18,15 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-#include <windef.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <wine/debug.h>
-
#include "winhelp.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
static WORD CALLBACK WHD_GetFSError(void)
{
Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -20,18 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <string.h>
-#include <windef.h>
-//#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <wine/debug.h>
-
#include "winhelp.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
static inline unsigned short GET_USHORT(const BYTE* buffer, unsigned i)
{
Modified: trunk/reactos/base/applications/winhlp32/lang/Bg.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Bg.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Bg.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -17,8 +17,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/base/applications/winhlp32/lang/Cs.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Cs.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Cs.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -20,8 +20,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
Modified: trunk/reactos/base/applications/winhlp32/lang/Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Da.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Da.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -20,8 +20,6 @@
* 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 "winhelp_res.h"
#pragma code_page(65001)
Modified: trunk/reactos/base/applications/winhlp32/lang/De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/De.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/De.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -18,8 +18,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
Modified: trunk/reactos/base/applications/winhlp32/lang/En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/En.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/En.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -18,8 +18,6 @@
* 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 "winhelp_res.h"
/* Menu */
Modified: trunk/reactos/base/applications/winhlp32/lang/Es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Es.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Es.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -19,8 +19,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
Modified: trunk/reactos/base/applications/winhlp32/lang/Fi.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Fi.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Fi.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -19,8 +19,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
Modified: trunk/reactos/base/applications/winhlp32/lang/Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Fr.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Fr.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -19,8 +19,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
Modified: trunk/reactos/base/applications/winhlp32/lang/He.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/He.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/He.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -19,8 +19,6 @@
* 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 "winhelp_res.h"
#pragma code_page(65001)
Modified: trunk/reactos/base/applications/winhlp32/lang/Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Hu.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Hu.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -19,8 +19,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/base/applications/winhlp32/lang/It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/It.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/It.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -18,8 +18,6 @@
* 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 "winhelp_res.h"
/* UTF-8 */
#pragma code_page(65001)
Modified: trunk/reactos/base/applications/winhlp32/lang/Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Ja.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Ja.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -18,8 +18,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
Modified: trunk/reactos/base/applications/winhlp32/lang/Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Ko.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Ko.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -18,8 +18,6 @@
* 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 "winhelp_res.h"
#pragma code_page(65001)
Modified: trunk/reactos/base/applications/winhlp32/lang/Lt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Lt.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Lt.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -17,8 +17,6 @@
* 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 "winhelp_res.h"
/* UTF-8 */
#pragma code_page(65001)
Modified: trunk/reactos/base/applications/winhlp32/lang/Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Nl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Nl.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -18,8 +18,6 @@
* 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 "winhelp_res.h"
#pragma code_page(65001)
Modified: trunk/reactos/base/applications/winhlp32/lang/No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/No.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/No.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -17,8 +17,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
Modified: trunk/reactos/base/applications/winhlp32/lang/Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Pl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Pl.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -20,8 +20,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
Modified: trunk/reactos/base/applications/winhlp32/lang/Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Pt.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Pt.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -24,8 +24,6 @@
* 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 "winhelp_res.h"
#pragma code_page(65001)
Modified: trunk/reactos/base/applications/winhlp32/lang/Rm.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Rm.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Rm.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -19,8 +19,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT
Modified: trunk/reactos/base/applications/winhlp32/lang/Ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Ro.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Ro.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -19,8 +19,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
Modified: trunk/reactos/base/applications/winhlp32/lang/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Ru.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Ru.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -17,8 +17,6 @@
* 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 "winhelp_res.h"
/* UTF-8 */
#pragma code_page(65001)
Modified: trunk/reactos/base/applications/winhlp32/lang/Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Si.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Si.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -17,8 +17,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
Modified: trunk/reactos/base/applications/winhlp32/lang/Sk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Sk.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Sk.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -17,8 +17,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
Modified: trunk/reactos/base/applications/winhlp32/lang/Sq.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Sq.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Sq.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -19,8 +19,6 @@
* 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 "winhelp_res.h"
/* Menu */
Modified: trunk/reactos/base/applications/winhlp32/lang/Sr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Sr.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Sr.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -18,8 +18,6 @@
* 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 "winhelp_res.h"
#pragma code_page(65001)
Modified: trunk/reactos/base/applications/winhlp32/lang/Sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Sv.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Sv.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -21,8 +21,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
Modified: trunk/reactos/base/applications/winhlp32/lang/Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Tr.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Tr.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -17,8 +17,6 @@
* 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 "winhelp_res.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
Modified: trunk/reactos/base/applications/winhlp32/lang/Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Uk.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Uk.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -22,8 +22,6 @@
* 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 "winhelp_res.h"
/* UTF-8 */
#pragma code_page(65001)
Modified: trunk/reactos/base/applications/winhlp32/lang/Zh.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Zh.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Zh.rc [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -20,8 +20,6 @@
* 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 "winhelp_res.h"
/* Chinese text is encoded in UTF-8 */
#pragma code_page(65001)
Modified: trunk/reactos/base/applications/winhlp32/macro.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -19,18 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commdlg.h>
+#include "winhelp.h"
+
#include <shellapi.h>
-#include <wine/debug.h>
-
-#include "winhelp.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
/**************************************************/
/* Macro table */
Modified: trunk/reactos/base/applications/winhlp32/macro.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/macro.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/macro.h [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -18,11 +18,6 @@
* 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 <stdarg.h>
-
-//#include "windef.h"
-#include <winbase.h>
struct lexret {
LPCSTR proto;
Modified: trunk/reactos/base/applications/winhlp32/macro.lex.yy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/macro.lex.yy.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/macro.lex.yy.c [iso-8859-1] Mon Jan 13
12:43:38 2014
@@ -502,20 +502,10 @@
#define YY_NO_INPUT 1
#line 26 "macro.lex.l"
-#include "config.h"
-#include <assert.h>
-#include <stdarg.h>
+#include <config.h>
#define YY_NO_UNISTD_H
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
#include "winhelp.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
struct lex_data {
LPCSTR macroptr;
Modified: trunk/reactos/base/applications/winhlp32/winhelp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -22,29 +22,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <assert.h>
-#include <stdio.h>
-//#include <string.h>
-//#include <stdarg.h>
-//#include <stdlib.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-//#include "winbase.h"
-#include <wingdi.h>
-#include <winuser.h>
-#include <commdlg.h>
#include "winhelp.h"
-//#include "winhelp_res.h"
-//#include "shellapi.h"
+
#include <richedit.h>
#include <commctrl.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
WINHELP_GLOBALS Globals = {3, NULL, TRUE, NULL, NULL, NULL, NULL, NULL,
{{{NULL,NULL}},0}, NULL};
Modified: trunk/reactos/base/applications/winhlp32/winhelp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] Mon Jan 13 12:43:38
2014
@@ -32,12 +32,29 @@
#ifndef RC_INVOKED
-//#include <stdarg.h>
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <commdlg.h>
#include "hlpfile.h"
-//#include "windef.h"
-//#include "winbase.h"
#include "macro.h"
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
+
#include "winhelp_res.h"
typedef struct tagHelpButton