Sync Apps to Wine HEAD (2 of 2)

svn path=/trunk/; revision=38843

reactos/base/applications/winhlp32/hlpfile.h

@@ -164,20 +164,12 @@ typedef int (*HLPFILE_BPTreeCompare)(void *p, const void *key,
 typedef void (*HLPFILE_BPTreeCallback)(void *p, void **next, void *cookie);
 
 HLPFILE*      HLPFILE_ReadHlpFile(LPCSTR lpszPath);
-HLPFILE_PAGE* HLPFILE_Contents(HLPFILE* hlpfile, ULONG* relative);
 HLPFILE_PAGE* HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative);
 HLPFILE_PAGE* HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap, ULONG* relative);
 HLPFILE_PAGE* HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relative);
 LONG          HLPFILE_Hash(LPCSTR lpszContext);
 void          HLPFILE_FreeHlpFile(HLPFILE*);
-unsigned      HLPFILE_HalfPointsToTwips(unsigned pts);
 
-static inline unsigned HLPFILE_PointsToTwips(unsigned pts)
-{
-    return HLPFILE_HalfPointsToTwips(2 * pts);
-}
-
-void* HLPFILE_BPTreeSearch(BYTE*, const void*, HLPFILE_BPTreeCompare);
 void  HLPFILE_BPTreeEnum(BYTE*, HLPFILE_BPTreeCallback cb, void *cookie);
 
 struct RtfData {

reactos/base/applications/winhlp32/macro.h

@@ -39,96 +39,23 @@ int  MACRO_Lookup(const char* name, struct lexret* lr);
 
 enum token_types {EMPTY, VOID_FUNCTION, BOOL_FUNCTION, INTEGER, STRING, IDENTIFIER};
 void CALLBACK MACRO_About(void);
-void CALLBACK MACRO_AddAccelerator(LONG, LONG, LPCSTR);
-void CALLBACK MACRO_ALink(LPCSTR, LONG, LPCSTR);
 void CALLBACK MACRO_Annotate(void);
-void CALLBACK MACRO_AppendItem(LPCSTR, LPCSTR, LPCSTR, LPCSTR);
-void CALLBACK MACRO_Back(void);
-void CALLBACK MACRO_BackFlush(void);
 void CALLBACK MACRO_BookmarkDefine(void);
-void CALLBACK MACRO_BookmarkMore(void);
-void CALLBACK MACRO_BrowseButtons(void);
-void CALLBACK MACRO_ChangeButtonBinding(LPCSTR, LPCSTR);
-void CALLBACK MACRO_ChangeEnable(LPCSTR, LPCSTR);
-void CALLBACK MACRO_ChangeItemBinding(LPCSTR, LPCSTR);
-void CALLBACK MACRO_CheckItem(LPCSTR);
-void CALLBACK MACRO_CloseSecondarys(void);
-void CALLBACK MACRO_CloseWindow(LPCSTR);
-void CALLBACK MACRO_Compare(LPCSTR);
-void CALLBACK MACRO_Contents(void);
-void CALLBACK MACRO_ControlPanel(LPCSTR, LPCSTR, LONG);
 void CALLBACK MACRO_CopyDialog(void);
-void CALLBACK MACRO_CopyTopic(void);
 void CALLBACK MACRO_CreateButton(LPCSTR, LPCSTR, LPCSTR);
-void CALLBACK MACRO_DeleteItem(LPCSTR);
-void CALLBACK MACRO_DeleteMark(LPCSTR);
-void CALLBACK MACRO_DestroyButton(LPCSTR);
 void CALLBACK MACRO_DisableButton(LPCSTR);
-void CALLBACK MACRO_DisableItem(LPCSTR);
-void CALLBACK MACRO_EnableButton(LPCSTR);
-void CALLBACK MACRO_EnableItem(LPCSTR);
-void CALLBACK MACRO_EndMPrint(void);
-void CALLBACK MACRO_ExecFile(LPCSTR, LPCSTR, LONG, LPCSTR);
-void CALLBACK MACRO_ExecProgram(LPCSTR, LONG);
 void CALLBACK MACRO_Exit(void);
-void CALLBACK MACRO_ExtAbleItem(LPCSTR, LONG);
-void CALLBACK MACRO_ExtInsertItem(LPCSTR, LPCSTR, LPCSTR, LPCSTR, LONG, LONG);
-void CALLBACK MACRO_ExtInsertMenu(LPCSTR, LPCSTR, LPCSTR, LONG, LONG);
-BOOL CALLBACK MACRO_FileExist(LPCSTR);
 void CALLBACK MACRO_FileOpen(void);
-void CALLBACK MACRO_Find(void);
-void CALLBACK MACRO_Finder(void);
-void CALLBACK MACRO_FloatingMenu(void);
-void CALLBACK MACRO_Flush(void);
-void CALLBACK MACRO_FocusWindow(LPCSTR);
-void CALLBACK MACRO_Generate(LPCSTR, LONG, LONG);
-void CALLBACK MACRO_GotoMark(LPCSTR);
 void CALLBACK MACRO_HelpOn(void);
 void CALLBACK MACRO_HelpOnTop(void);
 void CALLBACK MACRO_History(void);
-void CALLBACK MACRO_IfThen(BOOL, LPCSTR);
-void CALLBACK MACRO_IfThenElse(BOOL, LPCSTR, LPCSTR);
-BOOL CALLBACK MACRO_InitMPrint(void);
-void CALLBACK MACRO_InsertItem(LPCSTR, LPCSTR, LPCSTR, LPCSTR, LONG);
-void CALLBACK MACRO_InsertMenu(LPCSTR, LPCSTR, LONG);
-BOOL CALLBACK MACRO_IsBook(void);
-BOOL CALLBACK MACRO_IsMark(LPCSTR);
-BOOL CALLBACK MACRO_IsNotMark(LPCSTR);
 void CALLBACK MACRO_JumpContents(LPCSTR, LPCSTR);
 void CALLBACK MACRO_JumpContext(LPCSTR, LPCSTR, LONG);
 void CALLBACK MACRO_JumpHash(LPCSTR, LPCSTR, LONG);
-void CALLBACK MACRO_JumpHelpOn(void);
-void CALLBACK MACRO_JumpID(LPCSTR, LPCSTR);
-void CALLBACK MACRO_JumpKeyword(LPCSTR, LPCSTR, LPCSTR);
-void CALLBACK MACRO_KLink(LPCSTR, LONG, LPCSTR, LPCSTR);
-void CALLBACK MACRO_Menu(void);
-void CALLBACK MACRO_MPrintHash(LONG);
-void CALLBACK MACRO_MPrintID(LPCSTR);
-void CALLBACK MACRO_Next(void);
-void CALLBACK MACRO_NoShow(void);
 void CALLBACK MACRO_PopupContext(LPCSTR, LONG);
-void CALLBACK MACRO_PopupHash(LPCSTR, LONG);
-void CALLBACK MACRO_PopupId(LPCSTR, LPCSTR);
-void CALLBACK MACRO_PositionWindow(LONG, LONG, LONG, LONG, LONG, LPCSTR);
-void CALLBACK MACRO_Prev(void);
 void CALLBACK MACRO_Print(void);
 void CALLBACK MACRO_PrinterSetup(void);
-void CALLBACK MACRO_RegisterRoutine(LPCSTR, LPCSTR, LPCSTR);
-void CALLBACK MACRO_RemoveAccelerator(LONG, LONG);
-void CALLBACK MACRO_ResetMenu(void);
-void CALLBACK MACRO_SaveMark(LPCSTR);
-void CALLBACK MACRO_Search(void);
 void CALLBACK MACRO_SetContents(LPCSTR, LONG);
-void CALLBACK MACRO_SetHelpOnFile(LPCSTR);
-void CALLBACK MACRO_SetPopupColor(LONG, LONG, LONG);
-void CALLBACK MACRO_ShellExecute(LPCSTR, LPCSTR, LONG, LONG, LPCSTR, LPCSTR);
-void CALLBACK MACRO_ShortCut(LPCSTR, LPCSTR, LONG, LONG, LPCSTR);
-void CALLBACK MACRO_TCard(LONG);
-void CALLBACK MACRO_Test(LONG);
-BOOL CALLBACK MACRO_TestALink(LPCSTR);
-BOOL CALLBACK MACRO_TestKLink(LPCSTR);
-void CALLBACK MACRO_UncheckItem(LPCSTR);
-void CALLBACK MACRO_UpdateWindow(LPCSTR, LPCSTR);
 
 /* Local Variables:    */
 /* c-file-style: "GNU" */

reactos/base/applications/winhlp32/winhelp.c

@@ -1327,7 +1327,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
             break;
         case MNID_OPTS_FONTS_NORMAL:
         case MNID_CTXT_FONTS_NORMAL:
-            win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
+            win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
             if (win->font_scale != 1)
             {
                 win->font_scale = 1;
@@ -1336,7 +1336,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
             break;
         case MNID_OPTS_FONTS_LARGE:
         case MNID_CTXT_FONTS_LARGE:
-            win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
+            win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
             if (win->font_scale != 2)
             {
                 win->font_scale = 2;
@@ -1443,7 +1443,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
                         HMENU       hMenu;
                         POINT       pt;
 
-                        win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
+                        win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
                         hMenu = LoadMenu(Globals.hInstance, (LPSTR)CONTEXT_MENU);
                         switch (win->font_scale)
                         {
@@ -1479,7 +1479,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
 
             case EN_REQUESTRESIZE:
                 rc = ((REQRESIZE*)lParam)->rc;
-                win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
+                win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
                 AdjustWindowRect(&rc, GetWindowLong(win->hMainWnd, GWL_STYLE),
                                  FALSE);
                 SetWindowPos(win->hMainWnd, HWND_TOP, 0, 0,
@@ -1492,7 +1492,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
         break;
 
     case WM_INITMENUPOPUP:
-        win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
+        win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
         CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_SMALL,
                       MF_BYCOMMAND | (win->font_scale == 0) ? MF_CHECKED : 0);
         CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_NORMAL,
@@ -1594,7 +1594,7 @@ static BOOL WINHELP_RegisterWinClasses(void)
     class_main.style               = CS_HREDRAW | CS_VREDRAW;
     class_main.lpfnWndProc         = WINHELP_MainWndProc;
     class_main.cbClsExtra          = 0;
-    class_main.cbWndExtra          = sizeof(LONG);
+    class_main.cbWndExtra          = sizeof(WINHELP_WINDOW *);
     class_main.hInstance           = Globals.hInstance;
     class_main.hIcon               = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP));
     class_main.hCursor             = LoadCursor(0, IDC_ARROW);