Author: dreimer Date: Sat Oct 24 19:23:52 2009 New Revision: 43719
URL: http://svn.reactos.org/svn/reactos?rev=43719&view=rev Log: Sync wordpad and winhlp32 to Wine 1.1.31 Update 3rd Party Files.txt
Modified: trunk/reactos/base/applications/winhlp32/callback.c trunk/reactos/base/applications/winhlp32/lex.yy.c trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/applications/winhlp32/macro.lex.l trunk/reactos/base/applications/winhlp32/winhelp.h trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/media/doc/3rd Party Files.txt
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] Sat Oct 24 19:23:52 2009 @@ -158,23 +158,23 @@ return 0; }
-FARPROC Callbacks[] = +const struct winhelp_callbacks Callbacks = { - (FARPROC)WHD_GetFSError, - (FARPROC)WHD_Open, - (FARPROC)WHD_Close, - (FARPROC)WHD_OpenBag, - (FARPROC)WHD_CloseBag, - (FARPROC)WHD_ReadBag, - (FARPROC)WHD_TellBag, - (FARPROC)WHD_SeekBag, - (FARPROC)WHD_IsEofBag, - (FARPROC)WHD_SizeBag, - (FARPROC)WHD_Access, - (FARPROC)WHD_LLInfoFromBag, - (FARPROC)WHD_LLInfoFromFile, - (FARPROC)WHD_Error, - (FARPROC)WHD_ErrorString, - (FARPROC)WHD_GetInfo, - (FARPROC)WHD_API + WHD_GetFSError, + WHD_Open, + WHD_Close, + WHD_OpenBag, + WHD_CloseBag, + WHD_ReadBag, + WHD_TellBag, + WHD_SeekBag, + WHD_IsEofBag, + WHD_SizeBag, + WHD_Access, + WHD_LLInfoFromBag, + WHD_LLInfoFromFile, + WHD_Error, + WHD_ErrorString, + WHD_GetInfo, + WHD_API };
Modified: trunk/reactos/base/applications/winhlp32/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] Sat Oct 24 19:23:52 2009 @@ -380,9 +380,9 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "macro.lex.l" +#line 1 ".\macro.lex.l" #define INITIAL 0 -#line 2 "macro.lex.l" +#line 2 ".\macro.lex.l" /* * Help Viewer * @@ -407,7 +407,7 @@ #define YY_NO_UNPUT 1 #define quote 1
-#line 26 "macro.lex.l" +#line 26 ".\macro.lex.l" #include "config.h" #include <assert.h> #include <stdarg.h> @@ -593,7 +593,7 @@ register char *yy_cp, *yy_bp; register int yy_act;
-#line 61 "macro.lex.l" +#line 61 ".\macro.lex.l"
#line 600 "lex.yy.c" @@ -681,32 +681,32 @@
case 1: YY_RULE_SETUP -#line 63 "macro.lex.l" +#line 63 ".\macro.lex.l" yylval.integer = strtol(yytext, NULL, 10); return INTEGER; YY_BREAK case 2: YY_RULE_SETUP -#line 64 "macro.lex.l" +#line 64 ".\macro.lex.l" yylval.integer = strtol(yytext, NULL, 16); return INTEGER; YY_BREAK case 3: YY_RULE_SETUP -#line 66 "macro.lex.l" +#line 66 ".\macro.lex.l" return MACRO_Lookup(yytext, &yylval); YY_BREAK case 4: -#line 69 "macro.lex.l" +#line 69 ".\macro.lex.l" case 5: -#line 70 "macro.lex.l" +#line 70 ".\macro.lex.l" case 6: -#line 71 "macro.lex.l" +#line 71 ".\macro.lex.l" case 7: -#line 72 "macro.lex.l" +#line 72 ".\macro.lex.l" case 8: -#line 73 "macro.lex.l" +#line 73 ".\macro.lex.l" case 9: YY_RULE_SETUP -#line 73 "macro.lex.l" +#line 73 ".\macro.lex.l" { if (lex_data->quote_stk_idx == 0 || (yytext[0] == '"' && lex_data->quote_stack[lex_data->quote_stk_idx - 1] != '"') || @@ -741,31 +741,31 @@ YY_BREAK case 10: YY_RULE_SETUP -#line 105 "macro.lex.l" +#line 105 ".\macro.lex.l" *lex_data->strptr++ = yytext[0]; YY_BREAK case 11: YY_RULE_SETUP -#line 106 "macro.lex.l" +#line 106 ".\macro.lex.l" *lex_data->strptr++ = yytext[1]; YY_BREAK case YY_STATE_EOF(quote): -#line 107 "macro.lex.l" +#line 107 ".\macro.lex.l" return 0; YY_BREAK case 12: YY_RULE_SETUP -#line 109 "macro.lex.l" +#line 109 ".\macro.lex.l"
YY_BREAK case 13: YY_RULE_SETUP -#line 110 "macro.lex.l" +#line 110 ".\macro.lex.l" return yytext[0]; YY_BREAK case 14: YY_RULE_SETUP -#line 111 "macro.lex.l" +#line 111 ".\macro.lex.l" ECHO; YY_BREAK #line 772 "lex.yy.c" @@ -1654,7 +1654,7 @@ return 0; } #endif -#line 111 "macro.lex.l" +#line 111 ".\macro.lex.l"
#if 0 @@ -1699,7 +1699,7 @@ } }
-static int MACRO_CallBoolFunc(FARPROC fn, const char* args, void** ret); +static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret);
/****************************************************************** * MACRO_CheckArgs @@ -1769,7 +1769,7 @@ * Invokes boolean function fn, which arguments are defined by args * stores bool result into ret */ -static int MACRO_CallBoolFunc(FARPROC fn, const char* args, void** ret) +static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret) { void* pa[2]; int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); @@ -1781,8 +1781,18 @@
switch (strlen(args)) { - case 0: *ret = (void*)(fn)(); break; - case 1: *ret = (void*)(fn)(pa[0]); break; + case 0: + { + BOOL (WINAPI *func)(void) = fn; + *ret = (void *)(ULONG_PTR)func(); + break; + } + case 1: + { + BOOL (WINAPI *func)(void *) = fn; + *ret = (void *)(ULONG_PTR)func( pa[0]); + break; + } default: WINE_FIXME("NIY\n"); }
@@ -1794,7 +1804,7 @@ * * */ -static int MACRO_CallVoidFunc(FARPROC fn, const char* args) +static int MACRO_CallVoidFunc(void *fn, const char* args) { void* pa[6]; int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); @@ -1806,13 +1816,48 @@
switch (strlen(args)) { - case 0: (fn)(); break; - case 1: (fn)(pa[0]); break; - case 2: (fn)(pa[0],pa[1]); break; - case 3: (fn)(pa[0],pa[1],pa[2]); break; - case 4: (fn)(pa[0],pa[1],pa[2],pa[3]); break; - case 5: (fn)(pa[0],pa[1],pa[2],pa[3],pa[4]); break; - case 6: (fn)(pa[0],pa[1],pa[2],pa[3],pa[4],pa[5]); break; + case 0: + { + void (WINAPI *func)(void) = fn; + func(); + break; + } + case 1: + { + void (WINAPI *func)(void*) = fn; + func( pa[0] ); + break; + } + case 2: + { + void (WINAPI *func)(void*,void*) = fn; + func( pa[0], pa[1] ); + break; + } + case 3: + { + void (WINAPI *func)(void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2] ); + break; + } + case 4: + { + void (WINAPI *func)(void*,void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2], pa[3] ); + break; + } + case 5: + { + void (WINAPI *func)(void*,void*,void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2], pa[3], pa[4] ); + break; + } + case 6: + { + void (WINAPI *func)(void*,void*,void*,void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2], pa[3], pa[4], pa[5] ); + break; + } default: WINE_FIXME("NIY\n"); }
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] Sat Oct 24 19:23:52 2009 @@ -39,7 +39,7 @@ const char* alias; BOOL isBool; const char* arguments; - FARPROC fn; + void *fn; };
static struct MacroDesc*MACRO_Loaded /* = NULL */; @@ -696,7 +696,7 @@
static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR args) { - FARPROC fn = NULL; + void *fn = NULL; int size; WINHELP_DLL* dll;
@@ -735,7 +735,7 @@ dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG; WINE_TRACE("Got class %x for DLL %s\n", dll->class, dll_name); if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0); - if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD)Callbacks, 0); + if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (LONG_PTR)&Callbacks, 0); } else WINE_WARN("OOM\n"); } @@ -857,97 +857,97 @@ */
static struct MacroDesc MACRO_Builtins[] = { - {"About", NULL, 0, "", (FARPROC)MACRO_About}, - {"AddAccelerator", "AA", 0, "UUS", (FARPROC)MACRO_AddAccelerator}, - {"ALink", "AL", 0, "SUS", (FARPROC)MACRO_ALink}, - {"Annotate", NULL, 0, "", (FARPROC)MACRO_Annotate}, - {"AppendItem", NULL, 0, "SSSS", (FARPROC)MACRO_AppendItem}, - {"Back", NULL, 0, "", (FARPROC)MACRO_Back}, - {"BackFlush", "BF", 0, "", (FARPROC)MACRO_BackFlush}, - {"BookmarkDefine", NULL, 0, "", (FARPROC)MACRO_BookmarkDefine}, - {"BookmarkMore", NULL, 0, "", (FARPROC)MACRO_BookmarkMore}, - {"BrowseButtons", NULL, 0, "", (FARPROC)MACRO_BrowseButtons}, - {"ChangeButtonBinding", "CBB",0, "SS", (FARPROC)MACRO_ChangeButtonBinding}, - {"ChangeEnable", "CE", 0, "SS", (FARPROC)MACRO_ChangeEnable}, - {"ChangeItemBinding", "CIB",0, "SS", (FARPROC)MACRO_ChangeItemBinding}, - {"CheckItem", "CI", 0, "S", (FARPROC)MACRO_CheckItem}, - {"CloseSecondarys", "CS", 0, "", (FARPROC)MACRO_CloseSecondarys}, - {"CloseWindow", "CW", 0, "S", (FARPROC)MACRO_CloseWindow}, - {"Compare", NULL, 0, "S", (FARPROC)MACRO_Compare}, - {"Contents", NULL, 0, "", (FARPROC)MACRO_Contents}, - {"ControlPanel", NULL, 0, "SSU", (FARPROC)MACRO_ControlPanel}, - {"CopyDialog", NULL, 0, "", (FARPROC)MACRO_CopyDialog}, - {"CopyTopic", "CT", 0, "", (FARPROC)MACRO_CopyTopic}, - {"CreateButton", "CB", 0, "SSS", (FARPROC)MACRO_CreateButton}, - {"DeleteItem", NULL, 0, "S", (FARPROC)MACRO_DeleteItem}, - {"DeleteMark", NULL, 0, "S", (FARPROC)MACRO_DeleteMark}, - {"DestroyButton", NULL, 0, "S", (FARPROC)MACRO_DestroyButton}, - {"DisableButton", "DB", 0, "S", (FARPROC)MACRO_DisableButton}, - {"DisableItem", "DI", 0, "S", (FARPROC)MACRO_DisableItem}, - {"EnableButton", "EB", 0, "S", (FARPROC)MACRO_EnableButton}, - {"EnableItem", "EI", 0, "S", (FARPROC)MACRO_EnableItem}, - {"EndMPrint", NULL, 0, "", (FARPROC)MACRO_EndMPrint}, - {"ExecFile", "EF", 0, "SSUS", (FARPROC)MACRO_ExecFile}, - {"ExecProgram", "EP", 0, "SU", (FARPROC)MACRO_ExecProgram}, - {"Exit", NULL, 0, "", (FARPROC)MACRO_Exit}, - {"ExtAbleItem", NULL, 0, "SU", (FARPROC)MACRO_ExtAbleItem}, - {"ExtInsertItem", NULL, 0, "SSSSUU", (FARPROC)MACRO_ExtInsertItem}, - {"ExtInsertMenu", NULL, 0, "SSSUU", (FARPROC)MACRO_ExtInsertMenu}, - {"FileExist", "FE", 1, "S", (FARPROC)MACRO_FileExist}, - {"FileOpen", "FO", 0, "", (FARPROC)MACRO_FileOpen}, - {"Find", NULL, 0, "", (FARPROC)MACRO_Find}, - {"Finder", "FD", 0, "", (FARPROC)MACRO_Finder}, - {"FloatingMenu", NULL, 0, "", (FARPROC)MACRO_FloatingMenu}, - {"Flush", "FH", 0, "", (FARPROC)MACRO_Flush}, - {"FocusWindow", NULL, 0, "S", (FARPROC)MACRO_FocusWindow}, - {"Generate", NULL, 0, "SUU", (FARPROC)MACRO_Generate}, - {"GotoMark", NULL, 0, "S", (FARPROC)MACRO_GotoMark}, - {"HelpOn", NULL, 0, "", (FARPROC)MACRO_HelpOn}, - {"HelpOnTop", NULL, 0, "", (FARPROC)MACRO_HelpOnTop}, - {"History", NULL, 0, "", (FARPROC)MACRO_History}, - {"InitMPrint", NULL, 1, "", (FARPROC)MACRO_InitMPrint}, - {"InsertItem", NULL, 0, "SSSSU", (FARPROC)MACRO_InsertItem}, - {"InsertMenu", NULL, 0, "SSU", (FARPROC)MACRO_InsertMenu}, - {"IfThen", "IF", 0, "BS", (FARPROC)MACRO_IfThen}, - {"IfThenElse", "IE", 0, "BSS", (FARPROC)MACRO_IfThenElse}, - {"IsBook", NULL, 1, "", (FARPROC)MACRO_IsBook}, - {"IsMark", NULL, 1, "S", (FARPROC)MACRO_IsMark}, - {"IsNotMark", "NM", 1, "S", (FARPROC)MACRO_IsNotMark}, - {"JumpContents", NULL, 0, "SS", (FARPROC)MACRO_JumpContents}, - {"JumpContext", "JC", 0, "SSU", (FARPROC)MACRO_JumpContext}, - {"JumpHash", "JH", 0, "SSU", (FARPROC)MACRO_JumpHash}, - {"JumpHelpOn", NULL, 0, "", (FARPROC)MACRO_JumpHelpOn}, - {"JumpID", "JI", 0, "SS", (FARPROC)MACRO_JumpID}, - {"JumpKeyword", "JK", 0, "SSS", (FARPROC)MACRO_JumpKeyword}, - {"KLink", "KL", 0, "SUSS", (FARPROC)MACRO_KLink}, - {"Menu", "MU", 0, "", (FARPROC)MACRO_Menu}, - {"MPrintHash", NULL, 0, "U", (FARPROC)MACRO_MPrintHash}, - {"MPrintID", NULL, 0, "S", (FARPROC)MACRO_MPrintID}, - {"Next", NULL, 0, "", (FARPROC)MACRO_Next}, - {"NoShow", "NS", 0, "", (FARPROC)MACRO_NoShow}, - {"PopupContext", "PC", 0, "SU", (FARPROC)MACRO_PopupContext}, - {"PopupHash", NULL, 0, "SU", (FARPROC)MACRO_PopupHash}, - {"PopupId", "PI", 0, "SS", (FARPROC)MACRO_PopupId}, - {"PositionWindow", "PW", 0, "IIUUUS", (FARPROC)MACRO_PositionWindow}, - {"Prev", NULL, 0, "", (FARPROC)MACRO_Prev}, - {"Print", NULL, 0, "", (FARPROC)MACRO_Print}, - {"PrinterSetup", NULL, 0, "", (FARPROC)MACRO_PrinterSetup}, - {"RegisterRoutine", "RR", 0, "SSS", (FARPROC)MACRO_RegisterRoutine}, - {"RemoveAccelerator", "RA", 0, "UU", (FARPROC)MACRO_RemoveAccelerator}, - {"ResetMenu", NULL, 0, "", (FARPROC)MACRO_ResetMenu}, - {"SaveMark", NULL, 0, "S", (FARPROC)MACRO_SaveMark}, - {"Search", NULL, 0, "", (FARPROC)MACRO_Search}, - {"SetContents", NULL, 0, "SU", (FARPROC)MACRO_SetContents}, - {"SetHelpOnFile", NULL, 0, "S", (FARPROC)MACRO_SetHelpOnFile}, - {"SetPopupColor", "SPC",0, "UUU", (FARPROC)MACRO_SetPopupColor}, - {"ShellExecute", "SE", 0, "SSUUSS", (FARPROC)MACRO_ShellExecute}, - {"ShortCut", "SH", 0, "SSUUS", (FARPROC)MACRO_ShortCut}, - {"TCard", NULL, 0, "U", (FARPROC)MACRO_TCard}, - {"Test", NULL, 0, "U", (FARPROC)MACRO_Test}, - {"TestALink", NULL, 1, "S", (FARPROC)MACRO_TestALink}, - {"TestKLink", NULL, 1, "S", (FARPROC)MACRO_TestKLink}, - {"UncheckItem", "UI", 0, "S", (FARPROC)MACRO_UncheckItem}, - {"UpdateWindow", "UW", 0, "SS", (FARPROC)MACRO_UpdateWindow}, + {"About", NULL, 0, "", MACRO_About}, + {"AddAccelerator", "AA", 0, "UUS", MACRO_AddAccelerator}, + {"ALink", "AL", 0, "SUS", MACRO_ALink}, + {"Annotate", NULL, 0, "", MACRO_Annotate}, + {"AppendItem", NULL, 0, "SSSS", MACRO_AppendItem}, + {"Back", NULL, 0, "", MACRO_Back}, + {"BackFlush", "BF", 0, "", MACRO_BackFlush}, + {"BookmarkDefine", NULL, 0, "", MACRO_BookmarkDefine}, + {"BookmarkMore", NULL, 0, "", MACRO_BookmarkMore}, + {"BrowseButtons", NULL, 0, "", MACRO_BrowseButtons}, + {"ChangeButtonBinding", "CBB",0, "SS", MACRO_ChangeButtonBinding}, + {"ChangeEnable", "CE", 0, "SS", MACRO_ChangeEnable}, + {"ChangeItemBinding", "CIB",0, "SS", MACRO_ChangeItemBinding}, + {"CheckItem", "CI", 0, "S", MACRO_CheckItem}, + {"CloseSecondarys", "CS", 0, "", MACRO_CloseSecondarys}, + {"CloseWindow", "CW", 0, "S", MACRO_CloseWindow}, + {"Compare", NULL, 0, "S", MACRO_Compare}, + {"Contents", NULL, 0, "", MACRO_Contents}, + {"ControlPanel", NULL, 0, "SSU", MACRO_ControlPanel}, + {"CopyDialog", NULL, 0, "", MACRO_CopyDialog}, + {"CopyTopic", "CT", 0, "", MACRO_CopyTopic}, + {"CreateButton", "CB", 0, "SSS", MACRO_CreateButton}, + {"DeleteItem", NULL, 0, "S", MACRO_DeleteItem}, + {"DeleteMark", NULL, 0, "S", MACRO_DeleteMark}, + {"DestroyButton", NULL, 0, "S", MACRO_DestroyButton}, + {"DisableButton", "DB", 0, "S", MACRO_DisableButton}, + {"DisableItem", "DI", 0, "S", MACRO_DisableItem}, + {"EnableButton", "EB", 0, "S", MACRO_EnableButton}, + {"EnableItem", "EI", 0, "S", MACRO_EnableItem}, + {"EndMPrint", NULL, 0, "", MACRO_EndMPrint}, + {"ExecFile", "EF", 0, "SSUS", MACRO_ExecFile}, + {"ExecProgram", "EP", 0, "SU", MACRO_ExecProgram}, + {"Exit", NULL, 0, "", MACRO_Exit}, + {"ExtAbleItem", NULL, 0, "SU", MACRO_ExtAbleItem}, + {"ExtInsertItem", NULL, 0, "SSSSUU", MACRO_ExtInsertItem}, + {"ExtInsertMenu", NULL, 0, "SSSUU", MACRO_ExtInsertMenu}, + {"FileExist", "FE", 1, "S", MACRO_FileExist}, + {"FileOpen", "FO", 0, "", MACRO_FileOpen}, + {"Find", NULL, 0, "", MACRO_Find}, + {"Finder", "FD", 0, "", MACRO_Finder}, + {"FloatingMenu", NULL, 0, "", MACRO_FloatingMenu}, + {"Flush", "FH", 0, "", MACRO_Flush}, + {"FocusWindow", NULL, 0, "S", MACRO_FocusWindow}, + {"Generate", NULL, 0, "SUU", MACRO_Generate}, + {"GotoMark", NULL, 0, "S", MACRO_GotoMark}, + {"HelpOn", NULL, 0, "", MACRO_HelpOn}, + {"HelpOnTop", NULL, 0, "", MACRO_HelpOnTop}, + {"History", NULL, 0, "", MACRO_History}, + {"InitMPrint", NULL, 1, "", MACRO_InitMPrint}, + {"InsertItem", NULL, 0, "SSSSU", MACRO_InsertItem}, + {"InsertMenu", NULL, 0, "SSU", MACRO_InsertMenu}, + {"IfThen", "IF", 0, "BS", MACRO_IfThen}, + {"IfThenElse", "IE", 0, "BSS", MACRO_IfThenElse}, + {"IsBook", NULL, 1, "", MACRO_IsBook}, + {"IsMark", NULL, 1, "S", MACRO_IsMark}, + {"IsNotMark", "NM", 1, "S", MACRO_IsNotMark}, + {"JumpContents", NULL, 0, "SS", MACRO_JumpContents}, + {"JumpContext", "JC", 0, "SSU", MACRO_JumpContext}, + {"JumpHash", "JH", 0, "SSU", MACRO_JumpHash}, + {"JumpHelpOn", NULL, 0, "", MACRO_JumpHelpOn}, + {"JumpID", "JI", 0, "SS", MACRO_JumpID}, + {"JumpKeyword", "JK", 0, "SSS", MACRO_JumpKeyword}, + {"KLink", "KL", 0, "SUSS", MACRO_KLink}, + {"Menu", "MU", 0, "", MACRO_Menu}, + {"MPrintHash", NULL, 0, "U", MACRO_MPrintHash}, + {"MPrintID", NULL, 0, "S", MACRO_MPrintID}, + {"Next", NULL, 0, "", MACRO_Next}, + {"NoShow", "NS", 0, "", MACRO_NoShow}, + {"PopupContext", "PC", 0, "SU", MACRO_PopupContext}, + {"PopupHash", NULL, 0, "SU", MACRO_PopupHash}, + {"PopupId", "PI", 0, "SS", MACRO_PopupId}, + {"PositionWindow", "PW", 0, "IIUUUS", MACRO_PositionWindow}, + {"Prev", NULL, 0, "", MACRO_Prev}, + {"Print", NULL, 0, "", MACRO_Print}, + {"PrinterSetup", NULL, 0, "", MACRO_PrinterSetup}, + {"RegisterRoutine", "RR", 0, "SSS", MACRO_RegisterRoutine}, + {"RemoveAccelerator", "RA", 0, "UU", MACRO_RemoveAccelerator}, + {"ResetMenu", NULL, 0, "", MACRO_ResetMenu}, + {"SaveMark", NULL, 0, "S", MACRO_SaveMark}, + {"Search", NULL, 0, "", MACRO_Search}, + {"SetContents", NULL, 0, "SU", MACRO_SetContents}, + {"SetHelpOnFile", NULL, 0, "S", MACRO_SetHelpOnFile}, + {"SetPopupColor", "SPC",0, "UUU", MACRO_SetPopupColor}, + {"ShellExecute", "SE", 0, "SSUUSS", MACRO_ShellExecute}, + {"ShortCut", "SH", 0, "SSUUS", MACRO_ShortCut}, + {"TCard", NULL, 0, "U", MACRO_TCard}, + {"Test", NULL, 0, "U", MACRO_Test}, + {"TestALink", NULL, 1, "S", MACRO_TestALink}, + {"TestKLink", NULL, 1, "S", MACRO_TestKLink}, + {"UncheckItem", "UI", 0, "S", MACRO_UncheckItem}, + {"UpdateWindow", "UW", 0, "SS", MACRO_UpdateWindow}, {NULL, NULL, 0, NULL, NULL} };
Modified: trunk/reactos/base/applications/winhlp32/macro.lex.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.lex.l [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.lex.l [iso-8859-1] Sat Oct 24 19:23:52 2009 @@ -152,7 +152,7 @@ } }
-static int MACRO_CallBoolFunc(FARPROC fn, const char* args, void** ret); +static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret);
/****************************************************************** * MACRO_CheckArgs @@ -222,7 +222,7 @@ * Invokes boolean function fn, which arguments are defined by args * stores bool result into ret */ -static int MACRO_CallBoolFunc(FARPROC fn, const char* args, void** ret) +static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret) { void* pa[2]; int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); @@ -234,8 +234,18 @@
switch (strlen(args)) { - case 0: *ret = (void*)(fn)(); break; - case 1: *ret = (void*)(fn)(pa[0]); break; + case 0: + { + BOOL (WINAPI *func)(void) = fn; + *ret = (void *)(ULONG_PTR)func(); + break; + } + case 1: + { + BOOL (WINAPI *func)(void *) = fn; + *ret = (void *)(ULONG_PTR)func( pa[0]); + break; + } default: WINE_FIXME("NIY\n"); }
@@ -247,7 +257,7 @@ * * */ -static int MACRO_CallVoidFunc(FARPROC fn, const char* args) +static int MACRO_CallVoidFunc(void *fn, const char* args) { void* pa[6]; int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); @@ -259,13 +269,48 @@
switch (strlen(args)) { - case 0: (fn)(); break; - case 1: (fn)(pa[0]); break; - case 2: (fn)(pa[0],pa[1]); break; - case 3: (fn)(pa[0],pa[1],pa[2]); break; - case 4: (fn)(pa[0],pa[1],pa[2],pa[3]); break; - case 5: (fn)(pa[0],pa[1],pa[2],pa[3],pa[4]); break; - case 6: (fn)(pa[0],pa[1],pa[2],pa[3],pa[4],pa[5]); break; + case 0: + { + void (WINAPI *func)(void) = fn; + func(); + break; + } + case 1: + { + void (WINAPI *func)(void*) = fn; + func( pa[0] ); + break; + } + case 2: + { + void (WINAPI *func)(void*,void*) = fn; + func( pa[0], pa[1] ); + break; + } + case 3: + { + void (WINAPI *func)(void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2] ); + break; + } + case 4: + { + void (WINAPI *func)(void*,void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2], pa[3] ); + break; + } + case 5: + { + void (WINAPI *func)(void*,void*,void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2], pa[3], pa[4] ); + break; + } + case 6: + { + void (WINAPI *func)(void*,void*,void*,void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2], pa[3], pa[4], pa[5] ); + break; + } default: WINE_FIXME("NIY\n"); }
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] Sat Oct 24 19:23:52 2009 @@ -115,7 +115,7 @@ #define DW_ACTIVATE 9 #define DW_CALLBACKS 10
-typedef long (CALLBACK *WINHELP_LDLLHandler)(WORD, LONG, LONG); +typedef LONG (CALLBACK *WINHELP_LDLLHandler)(WORD, LONG_PTR, LONG_PTR);
typedef struct tagDll { @@ -140,8 +140,28 @@ HFONT hButtonFont; } WINHELP_GLOBALS;
+extern const struct winhelp_callbacks +{ + WORD (WINAPI *GetFSError)(void); + HANDLE (WINAPI *HfsOpenSz)(LPSTR,BYTE); + WORD (WINAPI *RcCloseHfs)(HANDLE); + HANDLE (WINAPI *HfOpenHfs)(HANDLE,LPSTR,BYTE); + HANDLE (WINAPI *RcCloseHf)(HANDLE); + LONG (WINAPI *LcbReadHf)(HANDLE,BYTE*,LONG); + LONG (WINAPI *LTellHf)(HANDLE); + LONG (WINAPI *LSeekHf)(HANDLE,LONG,WORD); + BOOL (WINAPI *FEofHf)(HANDLE); + LONG (WINAPI *LcbSizeHf)(HANDLE); + BOOL (WINAPI *FAccessHfs)(HANDLE,LPSTR,BYTE); + WORD (WINAPI *RcLLInfoFromHf)(HANDLE,WORD,LPWORD,LPLONG,LPLONG); + WORD (WINAPI *RcLLInfoFromHfs)(HANDLE,LPSTR,WORD,LPWORD,LPLONG,LPLONG); + void (WINAPI *ErrorW)(int); + void (WINAPI *ErrorSz)(LPSTR); + ULONG_PTR (WINAPI *GetInfo)(WORD,HWND); + LONG (WINAPI *API)(LPSTR,WORD,DWORD); +} Callbacks; + extern WINHELP_GLOBALS Globals; -extern FARPROC Callbacks[];
BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int, BOOL); BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*)(HLPFILE*, LONG, ULONG*),
Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/R... ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Sat Oct 24 19:23:52 2009 @@ -219,8 +219,8 @@ STRING_PREVIEW_PRINT, "ÐеÑаÑÑ" STRING_PREVIEW_NEXTPAGE, "СледÑÑÑÐ°Ñ ÑÑÑаниÑа" STRING_PREVIEW_PREVPAGE, "ÐÑедÑдÑÑÐ°Ñ ÑÑÑаниÑа" - STRING_PREVIEW_TWOPAGES, "Two pages" - STRING_PREVIEW_ONEPAGE, "One page" + STRING_PREVIEW_TWOPAGES, "Ðве ÑÑÑаниÑÑ" + STRING_PREVIEW_ONEPAGE, "Ðдна ÑÑÑаниÑа" STRING_PREVIEW_CLOSE, "ÐакÑÑÑÑ" END
@@ -231,7 +231,7 @@
STRINGTABLE DISCARDABLE BEGIN - STRING_DEFAULT_FILENAME, "Document" + STRING_DEFAULT_FILENAME, "ÐокÑменÑ" STRING_PROMPT_SAVE_CHANGES, "Ð¡Ð¾Ñ ÑаниÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² '%s'?" STRING_SEARCH_FINISHED, "ÐоиÑк в докÑменÑе завеÑÑен." STRING_LOAD_RICHED_FAILED, "ÐÑибка загÑÑзки библиоÑеки RichEdit." @@ -240,6 +240,11 @@ "ÑÑой опеÑаÑии?" STRING_INVALID_NUMBER, "ÐепÑавилÑнÑй ÑиÑловой ÑоÑмаÑ" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage докÑменÑÑ Ð½Ðµ поддеÑживаÑÑÑÑ" + STRING_WRITE_FAILED, "Ðевозможно ÑÐ¾Ñ ÑаниÑÑ Ñайл." + STRING_WRITE_ACCESS_DENIED, "ÐедоÑÑаÑоÑно пÑав Ð´Ð»Ñ ÑÐ¾Ñ ÑÐ°Ð½ÐµÐ½Ð¸Ñ Ñайла." + STRING_OPEN_FAILED, "Ðевозможно оÑкÑÑÑÑ Ñайл." + STRING_OPEN_ACCESS_DENIED, "ÐедоÑÑаÑоÑно пÑав Ð´Ð»Ñ Ð¾ÑкÑÑÑÐ¸Ñ Ñайла." STRING_PRINTING_NOT_IMPLEMENTED, "ÐеÑаÑÑ Ð½Ðµ поддеÑживаеÑÑÑ" + STRING_MAX_TAB_STOPS, "ÐелÑÐ·Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð±Ð¾Ð»ÐµÐµ 32 позиÑий ÑабÑлÑÑии." END #pragma code_page(default)
Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fil... ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Sat Oct 24 19:23:52 2009 @@ -43,7 +43,7 @@ Website: http://expat.sourceforge.net
Title: LibXML -Version: 2.7.1 +Version: 2.7.6 Actual Version: 2.7.6 Website: http://xmlsoft.org
-
dreimer＠svn.reactos.org