* 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
* 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");
* 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];
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
/* Menu */
* 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 */
* 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
* 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)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
/* Menu */
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
/* Menu */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
/* Menu */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
/* UTF-8 */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
#pragma code_page(65001)
/* Menu */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
/* Menu */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
/* UTF-8 */
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
/* UTF-8 */
* 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
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
/* UTF-8 */
#pragma code_page(65001)
* 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
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
/* Menu */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
/* Menu */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
#pragma code_page(65001)
/* Menu */
* 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)
* 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)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
/* UTF-8 */
#pragma code_page(65001)
* 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)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
MAIN_MENU MENU
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
/* Menu */
LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
#pragma code_page(65001)
/* Menu */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
/* Menu */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
/* Menu */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "winhelp_res.h"
-
/* UTF-8 */
#pragma code_page(65001)
* 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)
* 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 */
* 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;
#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;
* 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
#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