Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINHLP32]

Browse source 
* 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

svn path=/trunk/; revision=61602
This commit is contained in:
Amine Khaldi 2014-01-13 12:43:38 +00:00
parent 2cfbaf8c67
commit d6ad93027a
36 changed files with 23 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/base/applications/winhlp32/callback.c
View file

@ -18,16 +18,8 @@
* 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)
{
WINE_FIXME("()\n");

11
reactos/base/applications/winhlp32/hlpfile.c
View file

@ -20,19 +20,8 @@
* 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)
{
return (BYTE)buffer[i] + 0x100 * (BYTE)buffer[i + 1];

2
reactos/base/applications/winhlp32/lang/Bg.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
/* Menu */

2
reactos/base/applications/winhlp32/lang/Cs.rc
View file

@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */

2
reactos/base/applications/winhlp32/lang/Da.rc
View file

@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
#pragma code_page(65001)
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT

2
reactos/base/applications/winhlp32/lang/De.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
#pragma code_page(65001)

2
reactos/base/applications/winhlp32/lang/En.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
/* Menu */
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

2
reactos/base/applications/winhlp32/lang/Es.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
/* Menu */

2
reactos/base/applications/winhlp32/lang/Fi.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
/* Menu */

2
reactos/base/applications/winhlp32/lang/Fr.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
/* UTF-8 */

2
reactos/base/applications/winhlp32/lang/He.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
#pragma code_page(65001)
/* Menu */

2
reactos/base/applications/winhlp32/lang/Hu.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
/* Menu */

2
reactos/base/applications/winhlp32/lang/It.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/base/applications/winhlp32/lang/Ja.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
/* UTF-8 */

2
reactos/base/applications/winhlp32/lang/Ko.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
#pragma code_page(65001)
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

2
reactos/base/applications/winhlp32/lang/Lt.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/base/applications/winhlp32/lang/Nl.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
#pragma code_page(65001)
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

2
reactos/base/applications/winhlp32/lang/No.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
/* Menu */

2
reactos/base/applications/winhlp32/lang/Pl.rc
View file

@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
/* Menu */

2
reactos/base/applications/winhlp32/lang/Pt.rc
View file

@ -25,8 +25,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
#pragma code_page(65001)
/* Menu */

2
reactos/base/applications/winhlp32/lang/Rm.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT
#pragma code_page(65001)

2
reactos/base/applications/winhlp32/lang/Ro.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)

2
reactos/base/applications/winhlp32/lang/Ru.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/base/applications/winhlp32/lang/Si.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
#pragma code_page(65001)

2
reactos/base/applications/winhlp32/lang/Sk.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
MAIN_MENU MENU

2
reactos/base/applications/winhlp32/lang/Sq.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
/* Menu */
LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL

2
reactos/base/applications/winhlp32/lang/Sr.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
#pragma code_page(65001)
/* Menu */

2
reactos/base/applications/winhlp32/lang/Sv.rc
View file

@ -22,8 +22,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
/* Menu */

2
reactos/base/applications/winhlp32/lang/Tr.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
/* Menu */

2
reactos/base/applications/winhlp32/lang/Uk.rc
View file

@ -23,8 +23,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "winhelp_res.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/base/applications/winhlp32/lang/Zh.rc
View file

@ -21,8 +21,6 @@
* 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)

11
reactos/base/applications/winhlp32/macro.c
View file

@ -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 <shellapi.h>
#include <wine/debug.h>
#include "winhelp.h"
WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
#include <shellapi.h>
/**************************************************/
/* Macro table */

5
reactos/base/applications/winhlp32/macro.h
View file

@ -19,11 +19,6 @@
* 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;
BOOL bool;

12
reactos/base/applications/winhlp32/macro.lex.yy.c
View file

@ -502,21 +502,11 @@ char *yytext;
#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;
LPSTR strptr;

21
reactos/base/applications/winhlp32/winhelp.c
View file

@ -22,30 +22,11 @@
* 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};
#define CTL_ID_BUTTON 0x700

23
reactos/base/applications/winhlp32/winhelp.h
View file

@ -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