Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[fireball] 14005: Fixed typos, removed excess copy of accidently inserted twice russian language resources, also fixed "To add new program, click Install" (was cut, so now height increased to 16).
by fireball＠svn.reactos.com 13 Mar '05

13 Mar '05

Fixed typos, removed excess copy of accidently inserted twice russian language resources, also fixed "To add new program, click Install" (was cut, so now height increased to 16). Modified: trunk/reactos/lib/cpl/appwiz/Ru.rc Modified: trunk/reactos/lib/cpl/timedate/Ru.rc _____ Modified: trunk/reactos/lib/cpl/appwiz/Ru.rc --- trunk/reactos/lib/cpl/appwiz/Ru.rc 2005-03-13 10:45:23 UTC (rev 14004) +++ trunk/reactos/lib/cpl/appwiz/Ru.rc 2005-03-13 13:47:45 UTC (rev 14005) @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 - LTEXT "Î?¯ß¹ ¾±?ÓÝ¯ÔÞ?³ Ý¯Ô¾? ´¯ÒÓýý¾, ""Ë±?ÓÝ¯ ÔÛÓ""",-1,36,18,PROPSHEETWIDTH-48,8 + LTEXT "Î?¯ß¹ ¾±?ÓÝ¯ÔÞ?³ Ý¯Ô¾? ´¯ÒÓýý¾, ÝÓµýÞ?Õ ""Ë±?ÓÝ¯ ÔÛÓ"".",-1,36,18,PROPSHEETWIDTH-48,16 PUSHBUTTON "&Ë±?ÓÝ¯ÔÛÓ...", IDC_INSTALL, PROPSHEETWIDTH-72, 36, 60, 14 LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN @@ -48,53 +48,3 @@ IDS_CPLSYSTEMNAME "Ë±?ÓÝ¯ÔÛÓ Þ ¾õÓÙÕÝÞÕ ´¯ÒÓýý" IDS_CPLSYSTEMDESCRIPTION "Ë±?ÓÝ¯ÔÛÓ ÞÙÞ ¾õÓÙÕÝÞÕ ´¯ÒÓýý Þ Û¯ý´¯ÝÕÝ? ¯Ô ReactOS" END -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ë±?ÓÝ¯ÔÞ?³/ËõÓÙÞ?³" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 - LTEXT "Î?¯ß¹ ¾±?ÓÝ¯ÔÞ?³ Ý¯Ô¾? ´¯ÒÓýý¾, ""Ë±?ÓÝ¯ ÔÛÓ""",-1,36,18,PROPSHEETWIDTH-48,8 - PUSHBUTTON "&Ë±?ÓÝ¯ÔÛÓ...", IDC_INSTALL, PROPSHEETWIDTH-72, 36, 60, 14 - LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN - - ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 - LTEXT "Î?¯ß¹ ¾±?ÓÝ¯ÔÞ?³ ´¯ÒÓýý¾ ÞÙÞ ÞþýÕÝÞ?³ Õ© ¾±?ÓÝ¯ÔÙÕÝÝ¹Õ Û¯ý´¯ÝÕÝ?¹, Ô¹õÕÙÞ?Õ Õ© Ô ±´Þ±ÛÕ Þ ÝÓµýÞ?Õ ""ÃÓýÕÝÞ?³/ËõÓÙÞ ?³"".",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "&ÃÓýÕÝÞ?³/ËõÓÙÞ?³", IDC_ADDREMOVE, PROPSHEETWIDTH-98, 198, 85, 14 -END - -IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ë±?ÓÝ¯ÔÛÓ Û¯ý´¯ÝÕÝ?¯Ô ReactOS" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - -END - -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Create link" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 -END - -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Create link" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 -END - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Ë±?ÓÝ¯ÔÛÓ Þ ¾õÓÙÕÝÞÕ ´¯ÒÓýý" - IDS_CPLSYSTEMDESCRIPTION "Ë±?ÓÝ¯ÔÛÓ ÞÙÞ ¾õÓÙÕÝÞÕ ´¯ÒÓýý Þ Û¯ý´¯ÝÕÝ? ¯Ô ReactOS" -END _____ Modified: trunk/reactos/lib/cpl/timedate/Ru.rc --- trunk/reactos/lib/cpl/timedate/Ru.rc 2005-03-13 10:45:23 UTC (rev 14004) +++ trunk/reactos/lib/cpl/timedate/Ru.rc 2005-03-13 13:47:45 UTC (rev 14005) @@ -40,45 +40,3 @@ IDS_TIMEZONEINVALID "?ÕõÕÚ±?ÔÞ?ÕÙ³ÝÓ " IDS_TIMEZONEUNKNOWN "?ÕÞþÔÕ±?ÝÓ " END -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "?Ó?Ó Þ ÔÕý " -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "&?Ó?Ó", -1, 4, 2, 122, 125 - CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_SHORTDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, - 11, 17, 108, 12 - CONTROL "", IDC_MONTHCALENDAR, "SysMonthCal32", - WS_CHILD | WS_VISIBLE | WS_TABSTOP, - 11, 37, 108, 80 - GROUPBOX "&?Õý ", -1, 132, 2, 113, 125 - CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", - DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, - 144, 17, 90, 12 - LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 -END - - -IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "ÎÓ±¯Ô¯Ú ´¯ ±" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - AUTOCHECKBOX "?Ô?¯ýÓ?Þ&¸Õ±ÛÞÚ ´ÕÕ§¯õ ÝÓ ÙÕ?ÝÕÕ ÔÕý Þ ¯ßÓ?Ý¯", - IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP -END - - -STRINGTABLE -BEGIN - IDS_CPLNAME "?Ó?Ó Þ ÔÕý " - IDS_CPLDESCRIPTION "Ë±?ÓÝ¯ÔÛÓ õÓ?¹, ÔÕýÕÝÞ Þ ¸Ó±¯Ô¯Ò¯ ´¯ ±Ó õÙ ²? ¯Ò¯ Û¯ý´³??ÕÓ" - IDS_TIMEZONETEXT "ÊÕÛ¾¨ÞÚ ¸Ó±¯Ô¯Ú ´¯ ±: %s" - IDS_TIMEZONEINVALID "?ÕõÕÚ±?ÔÞ?ÕÙ³ÝÓ " - IDS_TIMEZONEUNKNOWN "?ÕÞþÔÕ±?ÝÓ " -END

1 0

[greatlrd] 14004: getdevicedata
by greatlrd＠svn.reactos.com 13 Mar '05

13 Mar '05

getdevicedata Make the mouse less choopy. But it still choopy. It need implement real buffer. instead it being fild when it is call. Fix the buffer seq are in right order. Modified: trunk/reactos/lib/dinput/mouse.c _____ Modified: trunk/reactos/lib/dinput/mouse.c --- trunk/reactos/lib/dinput/mouse.c 2005-03-13 10:33:15 UTC (rev 14003) +++ trunk/reactos/lib/dinput/mouse.c 2005-03-13 10:45:23 UTC (rev 14004) @@ -895,9 +895,9 @@ // this is only need if some apps calling on getdevice data direcly // in windows GetdeviceData does always update first the data // then return it. - SysMouseAImpl_Acquire(iface); - - + //SysMouseAImpl_Acquire(iface); < -- remove it geting UT2004 working + // less choopy but it need when user hook are implement in ros. + if (This->acquired == 0) { WARN(" application tries to get data from an unacquired device !\n"); return DIERR_NOTACQUIRED; @@ -923,59 +923,82 @@ for (count=0;count<*entries;count++) { if (save_point.x != point.x) { - dod[count].dwOfs = DIMOFS_X; + dod[count_ent].dwOfs = DIMOFS_X; calc = point.x - save_point.x; - if (calc >2) dod[count].dwData = 2; - else if (calc < -2) dod[count].dwData = -2; - else dod[count].dwData = calc; + if (calc >2) dod[count_ent].dwData = 2; + else if (calc < -2) dod[count_ent].dwData = -2; + else dod[count_ent].dwData = calc; - dod[count].dwTimeStamp = time +1; - dod[count].dwSequence = last_event++; + dod[count_ent].dwTimeStamp = time +1; + dod[count_ent].dwSequence = last_event++; count_ent++; save_point.x = point.x; } - if (save_point.y != point.y) { - dod[count].dwOfs = DIMOFS_Y; + else if (save_point.y != point.y) { + dod[count_ent].dwOfs = DIMOFS_Y; calc = point.y - save_point.y; - if (calc >2) dod[count].dwData = 2; - else if (calc < -2) dod[count].dwData = -2; - else dod[count].dwData = calc; + if (calc >2) dod[count_ent].dwData = 2; + else if (calc < -2) dod[count_ent].dwData = -2; + else dod[count_ent].dwData = calc; - dod[count].dwTimeStamp = time +1; - dod[count].dwSequence = last_event++; + dod[count_ent].dwTimeStamp = time +1; + dod[count_ent].dwSequence = last_event++; count_ent++; save_point.y = point.y; } - - for (count_button=0;count_button<5;count_button++) - { - if (save_b[count_button] != b[count_button]) { - if (count_button==0) { - dod[count].dwOfs = DIMOFS_BUTTON0; - } + + else if (save_b[0] != b[0]) { + dod[count_ent].dwOfs = DIMOFS_BUTTON0; + + dod[count_ent].dwData = b[0]; + dod[count_ent].dwTimeStamp = time +1; + dod[count_ent].dwSequence = last_event++; + count_ent++; + save_b[0] = b[0]; + } - if (count_button==1) { - dod[count].dwOfs = DIMOFS_BUTTON1; - } - if (count_button==2) { - dod[count].dwOfs = DIMOFS_BUTTON2; - } - if (count_button==3) { - dod[count].dwOfs = DIMOFS_BUTTON3; - } - if (count_button==4) { - dod[count].dwOfs = DIMOFS_BUTTON4; - } + else if (save_b[1] != b[1]) { + dod[count_ent].dwOfs = DIMOFS_BUTTON1; + + dod[count_ent].dwData = b[1]; + dod[count_ent].dwTimeStamp = time +1; + dod[count_ent].dwSequence = last_event++; + count_ent++; + save_b[1] = b[1]; + } - dod[count].dwData = b[count_button]; - dod[count].dwTimeStamp = time +1; - dod[count].dwSequence = last_event++; + else if (save_b[2] != b[2]) { + dod[count_ent].dwOfs = DIMOFS_BUTTON2; + + dod[count_ent].dwData = b[2]; + dod[count_ent].dwTimeStamp = time +1; + dod[count_ent].dwSequence = last_event++; count_ent++; - save_b[count_button] = b[count_button]; + save_b[2] = b[2]; } - } + else if (save_b[3] != b[3]) { + dod[count_ent].dwOfs = DIMOFS_BUTTON3; + + dod[count_ent].dwData = b[3]; + dod[count_ent].dwTimeStamp = time +1; + dod[count_ent].dwSequence = last_event++; + count_ent++; + save_b[3] = b[3]; + } + + else if (save_b[4] != b[4]) { + dod[count_ent].dwOfs = DIMOFS_BUTTON4; + + dod[count_ent].dwData = b[4]; + dod[count_ent].dwTimeStamp = time +1; + dod[count_ent].dwSequence = last_event++; + count_ent++; + save_b[4] = b[4]; + } + + } // end for

1 0

[chorns] 14003: Make tests build again
by chorns＠svn.reactos.com 13 Mar '05

13 Mar '05

Make tests build again Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp 2005-03-13 10:24:34 UTC (rev 14002) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp 2005-03-13 10:33:15 UTC (rev 14003) @@ -6,16 +6,16 @@ { string projectFilename ( RBUILD_BASE "tests/data/define.xml" ); Project project ( projectFilename ); - ARE_EQUAL(1, project.defines.size()); - Define& define1 = *project.defines[0]; + ARE_EQUAL(1, project.non_if_data.defines.size()); + Define& define1 = *project.non_if_data.defines[0]; ARE_EQUAL("define1", define1.name); ARE_EQUAL("value1", define1.value); ARE_EQUAL(1, project.modules.size()); Module& module1 = *project.modules[0]; - ARE_EQUAL(1, module1.defines.size()); - Define& define2 = *module1.defines[0]; + ARE_EQUAL(1, module1.non_if_data.defines.size()); + Define& define2 = *module1.non_if_data.defines[0]; ARE_EQUAL("define2", define2.name); ARE_EQUAL("value2", define2.value); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp 2005-03-13 10:24:34 UTC (rev 14002) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp 2005-03-13 10:33:15 UTC (rev 14003) @@ -10,16 +10,16 @@ ARE_EQUAL ( 1, project.modules.size () ); Module& module1 = *project.modules[0]; - ARE_EQUAL ( 1, module1.ifs.size () ); - If& if1 = *module1.ifs[0]; + ARE_EQUAL ( 1, module1.non_if_data.ifs.size () ); + If& if1 = *module1.non_if_data.ifs[0]; ARE_EQUAL ( "VAR1", if1.property ); ARE_EQUAL ( "value1", if1.value ); - ARE_EQUAL ( 1, if1.files.size () ); - File& file1 = *if1.files[0]; + ARE_EQUAL ( 1, if1.data.files.size () ); + File& file1 = *if1.data.files[0]; ARE_EQUAL( "." SSEP "file1.c", file1.name ); - ARE_EQUAL ( 1, module1.files.size () ); - File& file2 = *module1.files[0]; + ARE_EQUAL ( 1, module1.non_if_data.files.size () ); + File& file2 = *module1.non_if_data.files[0]; ARE_EQUAL( "." SSEP "file2.c", file2.name ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp 2005-03-13 10:24:34 UTC (rev 14002) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp 2005-03-13 10:33:15 UTC (rev 14003) @@ -6,19 +6,19 @@ { string projectFilename ( RBUILD_BASE "tests/data/include.xml" ); Project project ( projectFilename ); - ARE_EQUAL(1, project.includes.size()); - Include& include1 = *project.includes[0]; + ARE_EQUAL(1, project.non_if_data.includes.size()); + Include& include1 = *project.non_if_data.includes[0]; ARE_EQUAL("include1", include1.directory); ARE_EQUAL(2, project.modules.size()); Module& module1 = *project.modules[0]; Module& module2 = *project.modules[1]; - ARE_EQUAL(1, module1.includes.size()); - Include& include2 = *module1.includes[0]; + ARE_EQUAL(1, module1.non_if_data.includes.size()); + Include& include2 = *module1.non_if_data.includes[0]; ARE_EQUAL("include2", include2.directory); - ARE_EQUAL(1, module2.includes.size()); - Include& include3 = *module2.includes[0]; + ARE_EQUAL(1, module2.non_if_data.includes.size()); + Include& include3 = *module2.non_if_data.includes[0]; ARE_EQUAL(FixSeparator("./dir1/include3"), include3.directory); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-03-13 10:24:34 UTC (rev 14002) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-03-13 10:33:15 UTC (rev 14003) @@ -10,20 +10,20 @@ Module& module1 = *project.modules[0]; IS_TRUE(module1.type == BuildTool); - ARE_EQUAL(2, module1.files.size()); - ARE_EQUAL("." SSEP "dir1" SSEP "file1.c", module1.files[0]->name); - ARE_EQUAL("." SSEP "dir1" SSEP "file2.c", module1.files[1]->name); + ARE_EQUAL(2, module1.non_if_data.files.size()); + ARE_EQUAL("." SSEP "dir1" SSEP "file1.c", module1.non_if_data.files[0]->name); + ARE_EQUAL("." SSEP "dir1" SSEP "file2.c", module1.non_if_data.files[1]->name); - ARE_EQUAL(0, module1.libraries.size()); + ARE_EQUAL(0, module1.non_if_data.libraries.size()); Module& module2 = *project.modules[1]; IS_TRUE(module2.type == KernelModeDLL); - ARE_EQUAL(2, module2.files.size()); - ARE_EQUAL("." SSEP "dir2" SSEP "file3.c", module2.files[0]->name); - ARE_EQUAL("." SSEP "dir2" SSEP "file4.c", module2.files[1]->name); + ARE_EQUAL(2, module2.non_if_data.files.size()); + ARE_EQUAL("." SSEP "dir2" SSEP "file3.c", module2.non_if_data.files[0]->name); + ARE_EQUAL("." SSEP "dir2" SSEP "file4.c", module2.non_if_data.files[1]->name); - ARE_EQUAL(1, module2.libraries.size()); - Library& library1 = *module2.libraries[0]; + ARE_EQUAL(1, module2.non_if_data.libraries.size()); + Library& library1 = *module2.non_if_data.libraries[0]; ARE_EQUAL("module1", library1.name); ARE_EQUAL(1, module2.dependencies.size());

1 0

[ekohl] 14002: Implement [string] attribute for pointers to char and wchar_t.
by ekohl＠svn.reactos.com 13 Mar '05

13 Mar '05

Implement [string] attribute for pointers to char and wchar_t. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-03-13 09:19:33 UTC (rev 14001) +++ trunk/reactos/tools/widl/ChangeLog 2005-03-13 10:24:34 UTC (rev 14002) @@ -5,6 +5,14 @@ tools/widl/client.c tools/widl/server.c +Implement [string] attribute for pointers to char and wchar_t. + + +2005-03-12 ekohl + + tools/widl/client.c + tools/widl/server.c + Implement [in], [out] and [in, out] support for pointers to basic types. _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-03-13 09:19:33 UTC (rev 14001) +++ trunk/reactos/tools/widl/client.c 2005-03-13 10:24:34 UTC (rev 14002) @@ -164,6 +164,7 @@ func_t *func = iface->funcs; var_t *var; int out_attr; + int string_attr; print_client("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_client("{\n"); @@ -183,6 +184,7 @@ while (var) { out_attr = is_attr(var->attrs, ATTR_OUT); + string_attr = is_attr(var->attrs, ATTR_STRING); if (var->ptr_level > 1) { @@ -199,7 +201,20 @@ print_client("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); else print_client("0x11, 0x08, /* FC_RP [simple_pointer] */\n"); - print_client("0x%02x, /* FC_<type> */\n", var->type->type); + if (string_attr) + { + if (var->type->type == RPC_FC_CHAR) + print_client("0x%02x, /* FC_C_CSTRING */\n", RPC_FC_C_CSTRING); + else if (var->type->type == RPC_FC_WCHAR) + print_client("0x%02x, /* FC_C_WSTRING */\n", RPC_FC_C_WSTRING); + else + { + error("%s: Invalid type!\n", __FUNCTION__); + return; + } + } + else + print_client("0x%02x, /* FC_<type> */\n", var->type->type); print_client("0x5c, /* FC_PAD */\n"); } } @@ -229,9 +244,12 @@ int last_size = -1; int in_attr; int out_attr; + int string_attr; int nothing_printed = 1; var_t *var; + unsigned int type_offset = 2; + print_client("_StubMsg.BufferLength ="); if (func->args) { var = func->args; @@ -240,6 +258,7 @@ { out_attr = is_attr(var->attrs, ATTR_OUT); in_attr = is_attr(var->attrs, ATTR_IN); + string_attr = is_attr(var->attrs, ATTR_STRING); /* set 'in' attribute if neither 'in' nor 'out' is found */ if (!out_attr && !in_attr) @@ -248,53 +267,65 @@ if (!in_attr) continue; - alignment = 0; - switch (var->type->type) + if (var->ptr_level == 1 && + string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - size = 1; + size = 12; alignment = 0; - break; + fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); + nothing_printed = 0; + } + else + { + alignment = 0; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + alignment = 0; + break; - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size > 0 && last_size < 2) - alignment += (2 - last_size); - break; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size > 0 && last_size < 2) + alignment += (2 - last_size); + break; - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - size = 4; - if (last_size > 0 && last_size < 4) - alignment += (4 - last_size); - break; + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + if (last_size > 0 && last_size < 4) + alignment += (4 - last_size); + break; - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size > 0 && last_size < 4) - alignment += (4 - last_size); - break; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size > 0 && last_size < 4) + alignment += (4 - last_size); + break; - case RPC_FC_IGNORE: - size = 0; - break; + case RPC_FC_IGNORE: + size = 0; + break; - default: - error("Unknown/unsupported type!"); - return; + default: + error("Unknown/unsupported type!"); + return; + } + + if (last_size != -1) + fprintf(client, " +"); + fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); + nothing_printed = 0; } - if (last_size != -1) - fprintf(client, " +"); - fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); - nothing_printed = 0; - last_size = size; } } @@ -303,16 +334,65 @@ { fprintf(client, " 0U"); } + fprintf(client, ";\n"); + + /* get string size */ + if (func->args) + { + nothing_printed = 0; + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + for (; var; var = PREV_LINK(var)) + { + out_attr = is_attr(var->attrs, ATTR_OUT); + in_attr = is_attr(var->attrs, ATTR_IN); + string_attr = is_attr(var->attrs, ATTR_STRING); + + /* set 'in' attribute if neither 'in' nor 'out' is found */ + if (!out_attr && !in_attr) + in_attr = 1; + + if (!in_attr) + continue; + + if (var->ptr_level == 1 && + string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + { + print_client("NdrConformantStringBufferSize(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", type_offset + 2); + nothing_printed = 1; + indent--; + } + + /* calculate the next type offset */ + if (var->ptr_level == 1) + { + if (is_base_type(var->type)) + { + type_offset += 4; + } + } + } + + if (nothing_printed) + fprintf(client, "\n"); + } } static void marshall_in_arguments(func_t *func) { + unsigned int type_offset = 2; unsigned int alignment; unsigned int size; unsigned int last_size = 0; int in_attr; int out_attr; + int string_attr; var_t *var; if (!func->args) @@ -324,6 +404,7 @@ { out_attr = is_attr(var->attrs, ATTR_OUT); in_attr = is_attr(var->attrs, ATTR_IN); + string_attr = is_attr(var->attrs, ATTR_STRING); /* set 'in' attribute if neither 'in' nor 'out' is set */ if (!out_attr && !in_attr) @@ -339,63 +420,87 @@ return; } - alignment = 0; - switch (var->type->type) + if (var->ptr_level == 1 && + string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - size = 1; + print_client("NdrConformantStringMarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", type_offset + 2); + indent--; + fprintf(client, "\n"); + } + else + { alignment = 0; - break; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + alignment = 0; + break; - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size > 0 && last_size < 2) - alignment = (2 - last_size); - break; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size > 0 && last_size < 2) + alignment = (2 - last_size); + break; - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - size = 4; - if (last_size > 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size > 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_IGNORE: - size = 0; - break; + case RPC_FC_IGNORE: + size = 0; + break; - default: - error("Unknown/unsupported type!"); - } + default: + error("Unknown/unsupported type!"); + } - if (size != 0) - { - if (alignment != 0) - print_client("_StubMsg.Buffer += %u;\n", alignment); + if (size != 0) + { + if (alignment != 0) + print_client("_StubMsg.Buffer += %u;\n", alignment); - print_client("*(("); - write_type(client, var->type, NULL, var->tname); - fprintf(client, " __RPC_FAR*)_StubMsg.Buffer)++ = "); - if (var->ptr_level == 1) - fprintf(client, "*"); - write_name(client, var); - fprintf(client, ";\n"); - fprintf(client, "\n"); + print_client("*(("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, " __RPC_FAR*)_StubMsg.Buffer)++ = "); + if (var->ptr_level == 1) + fprintf(client, "*"); + write_name(client, var); + fprintf(client, ";\n"); + fprintf(client, "\n"); - last_size = size; + last_size = size; + } } + + /* calculate the next type offset */ + if (var->ptr_level == 1) + { + if (is_base_type(var->type)) + { + type_offset += 4; + } + } } } @@ -676,11 +781,8 @@ } /* emit the message buffer size */ - print_client("_StubMsg.BufferLength ="); print_message_buffer_size(func); - fprintf(client, ";\n"); - print_client("NdrGetBuffer(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-03-13 09:19:33 UTC (rev 14001) +++ trunk/reactos/tools/widl/server.c 2005-03-13 10:24:34 UTC (rev 14002) @@ -169,6 +169,7 @@ func_t *func = iface->funcs; var_t *var; int out_attr; + int string_attr; print_server("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_server("{\n"); @@ -188,6 +189,7 @@ while (var) { out_attr = is_attr(var->attrs, ATTR_OUT); + string_attr = is_attr(var->attrs, ATTR_STRING); if (var->ptr_level > 1) { @@ -204,7 +206,20 @@ print_server("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); else print_server("0x11, 0x08, /* FC_RP [simple_pointer] */\n"); - print_server("0x%02x, /* FC_<type> */\n", var->type->type); + if (string_attr) + { + if (var->type->type == RPC_FC_CHAR) + print_server("0x%02x, /* FC_C_CSTRING */\n", RPC_FC_C_CSTRING); + else if (var->type->type == RPC_FC_WCHAR) + print_server("0x%02x, /* FC_C_WSTRING */\n", RPC_FC_C_WSTRING); + else + { + error("%s: Invalid type!\n", __FUNCTION__); + return; + } + } + else + print_server("0x%02x, /* FC_<type> */\n", var->type->type); print_server("0x5c, /* FC_PAD */\n"); } } @@ -229,13 +244,17 @@ static void print_message_buffer_size(func_t *func) { - unsigned int alignment; - int size; + unsigned int alignment = 0; + int size = 0; int last_size = -1; int in_attr; int out_attr; + int string_attr; + int empty_line; var_t *var; + fprintf(server, "\n"); + print_server("_StubMsg.BufferLength ="); if (func->args) { var = func->args; @@ -286,6 +305,7 @@ if (last_size != -1) fprintf(server, " +"); fprintf(server, " %dU", (size == 0) ? 0 : size + alignment); + printf("1: %dU", (size == 0) ? 0 : size + alignment); last_size = size; } @@ -327,6 +347,39 @@ fprintf(server, " %dU", (size == 0) ? 0 : size + alignment); } + fprintf(server, ";\n"); + + /* get string size */ + if (func->args) + { + empty_line = 0; + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + for (; var; var = PREV_LINK(var)) + { + out_attr = is_attr(var->attrs, ATTR_OUT); + in_attr = is_attr(var->attrs, ATTR_IN); + string_attr = is_attr(var->attrs, ATTR_STRING); + + /* set 'in' attribute if neither 'in' nor 'out' is found */ + if (!out_attr && !in_attr) + in_attr = 1; + + if (!in_attr) + continue; + + if (var->ptr_level == 1 && + string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + { + print_server("_StubMsg.BufferLength += 16;\n"); + empty_line = 1; + } + } + + if (empty_line) + fprintf(server, "\n"); + } } @@ -361,12 +414,14 @@ static void unmarshall_in_arguments(func_t *func) { + unsigned int type_offset = 2; unsigned int alignment; unsigned int size; unsigned int last_size = 0; var_t *var; int in_attr; int out_attr; + int string_attr; if (!func->args) return; @@ -377,6 +432,7 @@ { out_attr = is_attr(var->attrs, ATTR_OUT); in_attr = is_attr(var->attrs, ATTR_IN); + string_attr = is_attr(var->attrs, ATTR_STRING); /* set 'in' attribute if neither 'in' nor 'out' is set */ if (!out_attr && !in_attr) @@ -385,80 +441,105 @@ if (!in_attr) continue; - alignment = 0; - switch (var->type->type) + if (var->ptr_level == 1 && + string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - size = 1; + print_server("NdrConformantStringUnmarshall(\n"); + indent++; + print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_server("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); + print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", type_offset + 2); + print_server("(unsigned char)0);\n"); + indent--; + fprintf(server, "\n"); + } + else + { alignment = 0; - break; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + alignment = 0; + break; - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size != 0 && last_size < 2) - alignment = (2 - last_size); - break; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size != 0 && last_size < 2) + alignment = (2 - last_size); + break; - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - size = 4; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_IGNORE: - size = 0; - break; + case RPC_FC_IGNORE: + size = 0; + break; - default: - error("Unknown/unsupported type!"); + default: + error("Unknown/unsupported type!"); + } + + if (size != 0) + { + if (alignment != 0) + print_server("_StubMsg.Buffer += %u;\n", alignment); + + if (var->ptr_level == 0) + { + print_server(""); + write_name(server, var); + fprintf(server, " = *(("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, " __RPC_FAR*)_StubMsg.Buffer)++;\n"); + fprintf(server, "\n"); + } + else if (var->ptr_level == 1) + { + print_server(""); + write_name(server, var); + fprintf(server, " = ("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, " __RPC_FAR*)_StubMsg.Buffer;\n"); + print_server("_StubMsg.Buffer += sizeof("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, ");\n"); + fprintf(server, "\n"); + } + else + { + error("Pointer level %d is not supported!\n", var->ptr_level); + return; + } + + last_size = size; + } } - if (size != 0) + /* calculate the next type offset */ + if (var->ptr_level == 1) { - if (alignment != 0) - print_server("_StubMsg.Buffer += %u;\n", alignment); - - if (var->ptr_level == 0) + if (is_base_type(var->type)) { - print_server(""); - write_name(server, var); - fprintf(server, " = *(("); - write_type(server, var->type, NULL, var->tname); - fprintf(server, " __RPC_FAR*)_StubMsg.Buffer)++;\n"); - fprintf(server, "\n"); + type_offset += 4; } - else if (var->ptr_level == 1) - { - print_server(""); - write_name(server, var); - fprintf(server, " = ("); - write_type(server, var->type, NULL, var->tname); - fprintf(server, " __RPC_FAR*)_StubMsg.Buffer;\n"); - print_server("_StubMsg.Buffer += sizeof("); - write_type(server, var->type, NULL, var->tname); - fprintf(server, ");\n"); - fprintf(server, "\n"); - } - else - { - error("Pointer level %d is not supported!\n", var->ptr_level); - return; - } - - last_size = size; } } } @@ -825,10 +906,7 @@ /* allocate and fill the return message buffer */ if (use_return_buffer(func)) { - fprintf(server, "\n"); - print_server("_StubMsg.BufferLength ="); print_message_buffer_size(func); - fprintf(server, ";\n"); print_server("_pRpcMessage->BufferLength = _StubMsg.BufferLength;\n"); fprintf(server, "\n"); print_server("_Status = I_RpcGetBuffer(_pRpcMessage);\n");

1 0

[hbirr] 14001: Use KeGetCurrentPrcb instead of KeGetCurrentKPCR.
by hbirr＠svn.reactos.com 13 Mar '05

13 Mar '05

Use KeGetCurrentPrcb instead of KeGetCurrentKPCR. Modified: trunk/reactos/ntoskrnl/ke/device.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/ke/device.c --- trunk/reactos/ntoskrnl/ke/device.c 2005-03-13 09:14:59 UTC (rev 14000) +++ trunk/reactos/ntoskrnl/ke/device.c 2005-03-13 09:19:33 UTC (rev 14001) @@ -57,17 +57,17 @@ { KIRQL OldIrql; PKPROCESS Process = NULL; - PKPCR Pcr = NULL; + PKPRCB Prcb = NULL; /* Raise the IRQL for the TB Flush */ OldIrql = KeRaiseIrqlToSynchLevel(); /* All CPUs need to have the TB flushed. */ if (CurrentCpuOnly == FALSE) { - Pcr = KeGetCurrentKPCR(); - + Prcb = KeGetCurrentPrcb(); + /* How many CPUs is our caller using? */ - Process = Pcr->PrcbData.CurrentThread->ApcState.Process; + Process = Prcb->CurrentThread->ApcState.Process; /* More then one, so send an IPI */ if (Process->ActiveProcessors > 1) { @@ -83,7 +83,7 @@ /* Did we send an IPI? If so, wait for completion */ if (Process->ActiveProcessors > 1) { do { - } while (Pcr->PrcbData.TargetSet != 0); + } while (Prcb->TargetSet != 0); } } _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-03-13 09:14:59 UTC (rev 14000) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-03-13 09:19:33 UTC (rev 14001) @@ -81,7 +81,7 @@ if (!KeIsExecutingDpc() && OldIrql < DISPATCH_LEVEL && KeGetCurrentThread() != NULL && - KeGetCurrentThread() == KeGetCurrentKPCR()->PrcbData.IdleThread) + KeGetCurrentThread() == KeGetCurrentPrcb()->IdleThread) { PsDispatchThreadNoLock(THREAD_STATE_READY); KeLowerIrql(OldIrql); _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-03-13 09:14:59 UTC (rev 14000) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-03-13 09:19:33 UTC (rev 14001) @@ -63,11 +63,11 @@ PKTHREAD Thread; Ke386SaveFlags(Flags); Ke386DisableInterrupts(); - Thread = KeGetCurrentKPCR()->PrcbData.CurrentThread; + Thread = KeGetCurrentPrcb()->CurrentThread; Ke386RestoreFlags(Flags); return Thread; #else - return(KeGetCurrentKPCR()->PrcbData.CurrentThread); + return(KeGetCurrentPrcb()->CurrentThread); #endif } @@ -437,7 +437,7 @@ OldThread = CurrentThread; CurrentThread = Candidate; - IdleThread = KeGetCurrentKPCR()->PrcbData.IdleThread; + IdleThread = KeGetCurrentPrcb()->IdleThread; if (&OldThread->Tcb == IdleThread) { @@ -464,7 +464,7 @@ { KIRQL oldIrql; - if (!DoneInitYet || KeGetCurrentKPCR()->PrcbData.IdleThread == NULL) + if (!DoneInitYet || KeGetCurrentPrcb()->IdleThread == NULL) { return; } @@ -777,7 +777,7 @@ FirstThread->Tcb.FreezeCount = 0; FirstThread->Tcb.UserAffinity = (1 << 0); /* Set the affinity of the first thread to the boot processor */ FirstThread->Tcb.Affinity = (1 << 0); - KeGetCurrentKPCR()->PrcbData.CurrentThread = (PVOID)FirstThread; + KeGetCurrentPrcb()->CurrentThread = (PVOID)FirstThread; NtClose(FirstThreadHandle); DPRINT("FirstThread %x\n",FirstThread);

1 0

[hbirr] 14000: Use only one access to the spinlock in the assertion, because the value may change between two access' on smp machines.
by hbirr＠svn.reactos.com 13 Mar '05

13 Mar '05

Use only one access to the spinlock in the assertion, because the value may change between two access' on smp machines. Modified: trunk/reactos/ntoskrnl/ke/spinlock.c _____ Modified: trunk/reactos/ntoskrnl/ke/spinlock.c --- trunk/reactos/ntoskrnl/ke/spinlock.c 2005-03-13 09:10:36 UTC (rev 13999) +++ trunk/reactos/ntoskrnl/ke/spinlock.c 2005-03-13 09:14:59 UTC (rev 14000) @@ -178,7 +178,7 @@ * FIXME: This depends on gcc assembling this test to a single load from * the spinlock's value. */ - ASSERT(*SpinLock == 0 || *SpinLock == 1); + ASSERT(*SpinLock < 2); while ((i = InterlockedExchangeUL(SpinLock, 1)) == 1) {

1 0

[hbirr] 13999: Ignore exception 15 in KiTrapHandler.
by hbirr＠svn.reactos.com 13 Mar '05

13 Mar '05

Ignore exception 15 in KiTrapHandler. Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-03-13 09:08:26 UTC (rev 13998) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-03-13 09:10:36 UTC (rev 13999) @@ -509,6 +509,21 @@ ExceptionNr = 12; } + if (ExceptionNr == 15) + { + /* + * FIXME: + * This exception should never occur. The P6 has a bug, which does sometimes deliver + * the apic spurious interrupt as exception 15. On an athlon64, I get one exception + * in the early boot phase in apic mode (using the smp build). I've looked to the linux + * sources. Linux does ignore this exception. + * + * Hartmut Birr + */ + DPRINT1("Ignoring P6 Local APIC Spurious Interrupt Bug...\n"); + return(0); + } + /* * Maybe handle the page fault and return */

1 0

[hbirr] 13998: Initialized the key name before each call to ZwCreateKey in IopCreateDeviceKeyPath.
by hbirr＠svn.reactos.com 13 Mar '05

13 Mar '05

Initialized the key name before each call to ZwCreateKey in IopCreateDeviceKeyPath. Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-03-13 09:06:14 UTC (rev 13997) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-03-13 09:08:26 UTC (rev 13998) @@ -764,16 +764,15 @@ } wcsncpy (KeyBuffer, Path, MAX_PATH-1); - RtlInitUnicodeString (&KeyName, KeyBuffer); /* Skip \\Registry\\ */ - Current = KeyName.Buffer; - Current = wcschr (Current, '\\') + 1; - Current = wcschr (Current, '\\') + 1; + Current = KeyBuffer; + Current = wcschr (Current, L'\\') + 1; + Current = wcschr (Current, L'\\') + 1; while (TRUE) { - Next = wcschr (Current, '\\'); + Next = wcschr (Current, L'\\'); if (Next == NULL) { /* The end */ @@ -783,6 +782,7 @@ *Next = 0; } + RtlInitUnicodeString (&KeyName, KeyBuffer); InitializeObjectAttributes (&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE,

1 0

[hbirr] 13997: Define IPI_REQUEST_FREEZE.
by hbirr＠svn.reactos.com 13 Mar '05

13 Mar '05

Define IPI_REQUEST_FREEZE. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-03-13 07:38:40 UTC (rev 13996) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-03-13 09:06:14 UTC (rev 13997) @@ -47,6 +47,7 @@ #define IPI_REQUEST_FUNCTIONCALL 0 #define IPI_REQUEST_APC 1 #define IPI_REQUEST_DPC 2 +#define IPI_REQUEST_FREEZE 3 /* ipi.c ********************************************************************/

1 0

[royce] 13996: don't end a string if the last character outputted was an escape, will cause output file to be invalid
by royce＠svn.reactos.com 13 Mar '05

13 Mar '05

don't end a string if the last character outputted was an escape, will cause output file to be invalid Modified: trunk/reactos/tools/wmc/write.c _____ Modified: trunk/reactos/tools/wmc/write.c --- trunk/reactos/tools/wmc/write.c 2005-03-13 07:37:33 UTC (rev 13995) +++ trunk/reactos/tools/wmc/write.c 2005-03-13 07:38:40 UTC (rev 13996) @@ -360,7 +360,7 @@ cptr += n; b += n; } - if(i < len-1 && b >= 72) + if(i < len-1 && b >= 72 && cptr[-1] != '\\') { *cptr++ = '"'; *cptr++ = ','; @@ -424,7 +424,7 @@ b += n; } } - if(i < len-1 && b >= 72) + if(i < len-1 && b >= 72 && cptr[-1] != '\\') { *cptr++ = '"'; *cptr++ = ',';

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005