Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[hpoussin] 29079: Get rid of "Video Save SVGA" group. Clean up group order entries

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 17 13:42:01 2007 New Revision: 29079 URL: http://svn.reactos.org/svn/reactos?rev=29079&view=rev Log: Get rid of "Video Save SVGA" group. Clean up group order entries Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Mon Sep 17 13:42:01 2007 @@ -394,7 +394,6 @@ "Debug", \ "Video Init", \ "Video", \ - "Video Save SVGA", \ "Video Save", \ "File System", \ "Event log", \ @@ -406,21 +405,14 @@ ; Group order, the first DWORD is the count of entries, ; the following dwords are the tag entries for the load order. -HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Boot Bus Extender", 0x00000001, \ +HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Video Save", 0x00000001, \ 0x02, 0x00, 0x00, 0x00, \ 0x01, 0x00, 0x00, 0x00, \ 0x02, 0x00, 0x00, 0x00 HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","SCSI Miniport", 0x00000001, \ - 0x09, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00, \ 0x10, 0x00, 0x00, 0x00, \ - 0x20, 0x00, 0x00, 0x00, \ - 0x30, 0x00, 0x00, 0x00, \ - 0x40, 0x00, 0x00, 0x00, \ - 0x50, 0x00, 0x00, 0x00, \ - 0x60, 0x00, 0x00, 0x00, \ - 0x70, 0x00, 0x00, 0x00, \ - 0x80, 0x00, 0x00, 0x00, \ - 0x90, 0x00, 0x00, 0x00 + 0x20, 0x00, 0x00, 0x00 ; Session Manager stuff HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute", 0x00010000, \ @@ -733,10 +725,11 @@ ; VBE SVGA driver HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save SVGA" +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save" HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys" HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 @@ -750,6 +743,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\drivers\vgamp.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi" HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.VRefresh",0x00010001,1

17 years

[hpoussin] 29078: No need to create a service group only for VBE driver. By using tags, VBE driver can be installed as the first one in the "Video Save" group

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 17 13:35:31 2007 New Revision: 29078 URL: http://svn.reactos.org/svn/reactos?rev=29078&view=rev Log: No need to create a service group only for VBE driver. By using tags, VBE driver can be installed as the first one in the "Video Save" group Modified: trunk/reactos/media/inf/display.inf Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/display.inf (original) +++ trunk/reactos/media/inf/display.inf Mon Sep 17 13:35:31 2007 @@ -46,7 +46,7 @@ [VGA_Inst.NT.Services] AddService = VGA, , VGA_Service_Inst -AddService = VBE, 0x00000002, VBE_Service_Inst +AddService = VBE, 0x00000003, VBE_Service_Inst ; SPSVCINST_TAGTOFRONT + SPSVCINST_ASSOCSERVICE [VGA_Service_Inst] ServiceType = 1 @@ -60,7 +60,7 @@ StartType = 1 ErrorControl = 0 ServiceBinary = %12%\vbemp.sys -LoadOrderGroup = Video SVGA Save +LoadOrderGroup = Video Save ;-------------------------------- STRINGS -------------------------------

17 years

[frik85] 29077: RosCMS update: * added "version" entry to "order" and "column" filters * improved archive view (sorting by name and version)

by frik85＠svn.reactos.org

Author: frik85 Date: Mon Sep 17 13:27:00 2007 New Revision: 29077 URL: http://svn.reactos.org/svn/reactos?rev=29077&view=rev Log: RosCMS update: * added "version" entry to "order" and "column" filters * improved archive view (sorting by name and version) Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php Mon Sep 17 13:27:00 2007 @@ -172,6 +172,9 @@ case "usr": // user $roscms_mtbl_order .= "r.rev_usrid ".$roscms_d_f2_typeb.", "; break; + case "ver": // version + $roscms_mtbl_order .= "r.rev_version ".$roscms_d_f2_typeb.", "; + break; case "nbr": // number ("dynamic" entry) $roscms_d_tags_counter++; $roscms_mtbl_order .= " v".$roscms_d_tags_counter.".tv_value ".$roscms_d_f2_typeb.", "; @@ -809,6 +812,9 @@ case "Rights": $roscms_mtbl_cols2 .= roscms_security_explain($tblentry_d_id2) ."|"; break; + case "Version": + $roscms_mtbl_cols2 .= $tblentry_d_r_ver ."|"; + break; } } Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_list.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_list.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Mon Sep 17 13:27:00 2007 @@ -1382,7 +1382,7 @@ load_frametable('my'); break; case '12': - filtstring2 = 'k_is_archive_0|c_is_type_0|l_is_'+getlang()+'_0|o_asc_name'; + filtstring2 = 'k_is_archive_0|c_is_version_0|c_is_type_0|l_is_'+getlang()+'_0|o_asc_name|o_desc_ver'; roscms_archive = 1; /* activate archive mode*/ load_frametable('archive'); break; @@ -1758,11 +1758,11 @@ break; case 'c': /* column */ filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="is">is</option></select>'; - filtentryselstrs2 = '<select id="sfc'+filterid+'"><option value="language">Language</option><option value="user">User</option><option value="type">Type</option><?php if ($roscms_security_level > 1) { ?><option value="security"<?php echo $cbm_item_hide; ?>>Security</option><option value="rights"<?php echo $cbm_item_hide; ?>>Rights</option><?php } ?></select>'; + filtentryselstrs2 = '<select id="sfc'+filterid+'"><option value="language">Language</option><option value="user">User</option><option value="type">Type</option><option value="version">Version</option><?php if ($roscms_security_level > 1) { ?><option value="security"<?php echo $cbm_item_hide; ?>>Security</option><option value="rights"<?php echo $cbm_item_hide; ?>>Rights</option><?php } ?></select>'; break; case 'o': /* order by */ filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="asc">Ascending</option><option value="desc">Descending</option></select>'; - filtentryselstrs2 = '<select id="sfc'+filterid+'"><option value="datetime">Date & Time</option><option value="name">Name</option><option value="lang">Language</option><option value="usr">User</option><option value="type">Type</option><option value="nbr">Number ("dynamic" entry)</option><?php if ($roscms_security_level > 1) { ?><option value="security"<?php echo $cbm_item_hide; ?>>Security</option><option value="revid"<?php echo $cbm_item_hide; ?>>RevID</option><option value="ext"<?php echo $cbm_item_hide; ?>>Extension</option><option value="status"<?php echo $cbm_item_hide; ?>>Status</option><option value="kind"<?php echo $cbm_item_hide; ?>>Kind</option><?php } ?></select>'; + filtentryselstrs2 = '<select id="sfc'+filterid+'"><option value="datetime">Date & Time</option><option value="name">Name</option><option value="lang">Language</option><option value="usr">User</option><option value="type">Type</option><option value="ver">Version</option><option value="nbr">Number ("dynamic" entry)</option><?php if ($roscms_security_level > 1) { ?><option value="security"<?php echo $cbm_item_hide; ?>>Security</option><option value="revid"<?php echo $cbm_item_hide; ?>>RevID</option><option value="ext"<?php echo $cbm_item_hide; ?>>Extension</option><option value="status"<?php echo $cbm_item_hide; ?>>Status</option><option value="kind"<?php echo $cbm_item_hide; ?>>Kind</option><?php } ?></select>'; break; case 'i': /* security (ACL) */ filtentryselstrs1 = '<select id="sfb'+filterid+'"><option value="is">is</option><option value="no">is not</option></select>';

17 years

[frik85] 29076: RosCMS update: * additional group check-code added * new dynamic entry function fixed * improved alertbox information

by frik85＠svn.reactos.org

Author: frik85 Date: Mon Sep 17 13:14:08 2007 New Revision: 29076 URL: http://svn.reactos.org/svn/reactos?rev=29076&view=rev Log: RosCMS update: * additional group check-code added * new dynamic entry function fixed * improved alertbox information Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php Mon Sep 17 13:14:08 2007 @@ -914,6 +914,7 @@ FROM data_revision r, data_tag a, data_tag_name n, data_tag_value v WHERE r.data_id = '".mysql_real_escape_string($RosCMS_GET_d_id)."' AND r.rev_language = '".mysql_real_escape_string($RosCMS_GET_d_r_lang)."' + AND r.rev_version > 0 AND r.data_id = a.data_id AND r.rev_id = a.data_rev_id AND (a.tag_usrid = '-1') @@ -1247,6 +1248,7 @@ } else { if ($RosCMS_GET_debug) echo "<ul>"; + for ($i=0; $i < count($entry_ids); $i++) { $entry_ids2 = split("_", $entry_ids[$i]); @@ -1258,6 +1260,22 @@ AND r.data_id = d.data_id LIMIT 1;"); $result_rev_data = mysql_fetch_array($query_rev_data); + + if (($entr_flag == "ms" || $entr_flag == "mn") && $roscms_security_level > 1) { + if (roscms_security_grp_member("transmaint")) { + + $query_account_lang = @mysql_query("SELECT user_language FROM users WHERE user_id = '".mysql_real_escape_string($roscms_intern_account_id)."'"); + $result_account_lang = @mysql_fetch_array($query_account_lang); + + if ($result_account_lang['user_language'] == "") { + die("Set a valid language in your myReactOS account settings!"); + } + else if ($result_account_lang['user_language'] != $result_rev_data['data_id']) { + echo "As Language Maintainer you can only mark entries of '".$result_account_lang['user_language']."' language as new!"; + continue; + } + } + } $t_tagid = ""; @@ -1289,11 +1307,8 @@ } - if ($entr_flag == "ms") { - // @todo: check that only one entry per name is stable, promt a decicion-box, if an entry should be moved to archive - tag_add($result_rev_data['data_id'], $result_rev_data['rev_id'], "status" /* name */, "stable" /* value */, "-1" /* usrid */); - } - else if ($entr_flag == "mn") { + // 'mn': mark as new + if ($entr_flag == "mn") { tag_add($result_rev_data['data_id'], $result_rev_data['rev_id'], "status" /* name */, "new" /* value */, "-1" /* usrid */); } @@ -1301,7 +1316,10 @@ // 'ms': mark as stable if ($entr_flag == "ms") { log_event_low("mark entry as stable: data-id ".$result_rev_data['data_id'].", rev-id ".$result_rev_data['rev_id'].log_prep_info($result_rev_data['data_id'], $result_rev_data['rev_id'])."{changetags}"); - + + + tag_add($result_rev_data['data_id'], $result_rev_data['rev_id'], "status" /* name */, "stable" /* value */, "-1" /* usrid */); + if ($result_rev_data['rev_version'] == 0) { $temp_dynamic = getTagValue($result_rev_data['data_id'], $result_rev_data['rev_id'], '-1', 'number'); // get dynamic content number @@ -1383,13 +1401,14 @@ if ($RosCMS_GET_debug) echo "<p>! generate_page_output_update(".$result_rev_data['data_id'].", ".$tmp_lang.", ".$temp_dynamic.")</p>"; - echo generate_page_output_update($result_entry['data_id'], $tmp_lang, $temp_dynamic); + //echo generate_page_output_update($result_entry['data_id'], $tmp_lang, $temp_dynamic); + echo "Page generation process finished"; } else { echo "Only 'new' entries can be made stable"; } } - + // 'mn': mark as new if ($entr_flag == "mn") { $update_rev_ver = mysql_query("UPDATE data_revision SET rev_version = '0' WHERE rev_id = '".mysql_real_escape_string($result_rev_data['rev_id'])."' LIMIT 1;"); Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_list.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_list.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Mon Sep 17 13:14:08 2007 @@ -3361,18 +3361,13 @@ alertbox('Action performed'); break; case 'changetags2': - //alert('!!! changetags !!!'+http_request.responseText); <?php if ($RosCMS_GET_debug) { echo " alert('!!! changetags(*ms*): '+http_request.responseText); "; } ?> load_frametable_cp(0); - <?php - if (!$RosCMS_GET_debug) { - echo " alertbox('Page generation process finished'); "; - } - ?> + alertbox(http_request.responseText); break; case 'editalterfields': //alert('!!! saved?: '+http_request.responseText);

17 years

[fireball] 29075: Cameron Gutman <aicommander@gmail.com> - Use /SOS to disable bootlogo in the LiveCD too.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Sep 17 12:48:14 2007 New Revision: 29075 URL: http://svn.reactos.org/svn/reactos?rev=29075&view=rev Log: Cameron Gutman <aicommander(a)gmail.com> - Use /SOS to disable bootlogo in the LiveCD too. Modified: trunk/reactos/boot/bootdata/livecd.ini Modified: trunk/reactos/boot/bootdata/livecd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.ini (original) +++ trunk/reactos/boot/bootdata/livecd.ini Mon Sep 17 12:48:14 2007 @@ -25,4 +25,4 @@ [ReactOS] BootType=ReactOS SystemPath=LiveCD -Options=/DEBUGPORT=COM1 /NOGUIBOOT +Options=/DEBUGPORT=COM1 /SOS

17 years

[arty] 29074: Add missing include path.

by arty＠svn.reactos.org

Author: arty Date: Mon Sep 17 10:12:40 2007 New Revision: 29074 URL: http://svn.reactos.org/svn/reactos?rev=29074&view=rev Log: Add missing include path. Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon Sep 17 10:12:40 2007 @@ -17,6 +17,7 @@ <include base="cmlib">.</include> <include base="ntoskrnl">include</include> <include base="ntoskrnl" root="intermediate"></include> + <include base="ntoskrnl" root="intermediate">include</include> <include base="ReactOS">include/reactos/drivers</include> <library>csq</library> <library>hal</library>

17 years

[arty] 29073: Microsoft and the open group both specify towupper and towlower as taking int and returning int of some flavor. Make this true of ours. http://msdn2.microsoft.com/en-us/library/45119yx3(VS.80).aspx http://opengroup.org/onlinepubs/007908799/xsh/towupper.html

by arty＠svn.reactos.org

Author: arty Date: Mon Sep 17 09:57:54 2007 New Revision: 29073 URL: http://svn.reactos.org/svn/reactos?rev=29073&view=rev Log: Microsoft and the open group both specify towupper and towlower as taking int and returning int of some flavor. Make this true of ours. http://msdn2.microsoft.com/en-us/library/45119yx3(VS.80).aspx http://opengroup.org/onlinepubs/007908799/xsh/towupper.html Modified: trunk/reactos/lib/sdk/libcntpr/string/ctype.c Modified: trunk/reactos/lib/sdk/libcntpr/string/ctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/string/ct… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/string/ctype.c (original) +++ trunk/reactos/lib/sdk/libcntpr/string/ctype.c Mon Sep 17 09:57:54 2007 @@ -571,7 +571,7 @@ /* * @implemented */ -wchar_t towlower(wchar_t c) +wint_t towlower(wint_t c) { if (iswctype (c, _UPPER)) return (c - upalpha); @@ -581,7 +581,7 @@ /* * @implemented */ -wchar_t towupper(wchar_t c) +wint_t towupper(wint_t c) { if (iswctype (c, _LOWER)) return (c + upalpha);

17 years

[arty] 29072: Fixen for PPC. Exclude relocation. We'll be situated properly by the ELF layer anyway, and it's x86 specific. Tweak definitions in _mingw.h

by arty＠svn.reactos.org

Author: arty Date: Mon Sep 17 09:33:08 2007 New Revision: 29072 URL: http://svn.reactos.org/svn/reactos?rev=29072&view=rev Log: Fixen for PPC. Exclude relocation. We'll be situated properly by the ELF layer anyway, and it's x86 specific. Tweak definitions in _mingw.h Modified: trunk/reactos/lib/3rdparty/mingw/crt1.c trunk/reactos/lib/3rdparty/mingw/include/_mingw.h trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/3rdparty/mingw/wcrt1.c Modified: trunk/reactos/lib/3rdparty/mingw/crt1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt1.c?… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crt1.c (original) +++ trunk/reactos/lib/3rdparty/mingw/crt1.c Mon Sep 17 09:33:08 2007 @@ -41,7 +41,10 @@ #define __UNKNOWN_APP 0 #define __CONSOLE_APP 1 #define __GUI_APP 2 -__MINGW_IMPORT void __set_app_type(int); +#ifndef _M_PPC +__MINGW_IMPORT +#endif +void __set_app_type(int); #endif /* __MSVCRT__ */ /* Global _fmode for this .exe, not the one in msvcrt.dll, @@ -213,7 +216,9 @@ _mingw32_init_fmode (); /* Adust references to dllimported data that have non-zero offsets. */ +#if defined(__i386__) _pei386_runtime_relocator (); +#endif #if defined(__i386__) /* Align the stack to 16 bytes for the sake of SSE ops in main Modified: trunk/reactos/lib/3rdparty/mingw/include/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/include… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/include/_mingw.h (original) +++ trunk/reactos/lib/3rdparty/mingw/include/_mingw.h Mon Sep 17 09:33:08 2007 @@ -72,11 +72,16 @@ # endif # define __DECLSPEC_SUPPORTED # else /* __declspec */ -# undef __DECLSPEC_SUPPORTED -# undef __MINGW_IMPORT -# ifndef _CRTIMP +# ifndef __PowerPC__ +# undef __DECLSPEC_SUPPORTED +# undef __MINGW_IMPORT +# ifndef _CRTIMP +# define _CRTIMP +# endif +# else /* __PowerPC__ */ +# define __declspec(x) # define _CRTIMP -# endif +# endif /* __PowerPC__ */ # endif /* __declspec */ # ifndef __cdecl # define __cdecl __attribute__ ((__cdecl__)) Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild Mon Sep 17 09:33:08 2007 @@ -14,12 +14,14 @@ <file>isascii.c</file> <file>iscsym.c</file> <file>iscsymf.c</file> - <file>pseudo-reloc.c</file> <file>strcasecmp.c</file> <file>strncasecmp.c</file> <file>toascii.c</file> <file>wcscmpi.c</file> <file>_wgetopt.c</file> + <if property="ARCH" value="i386"> + <file>pseudo-reloc.c</file> + </if> </module> <module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true"> <include base="ReactOS">include/crt</include> Modified: trunk/reactos/lib/3rdparty/mingw/wcrt1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/wcrt1.c… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/wcrt1.c (original) +++ trunk/reactos/lib/3rdparty/mingw/wcrt1.c Mon Sep 17 09:33:08 2007 @@ -214,7 +214,9 @@ _mingw32_init_fmode (); /* Adust references to dllimported data that have non-zero offsets. */ +#if defined(__i386__) _pei386_runtime_relocator (); +#endif #if defined(__i386__) /* Align the stack to 16 bytes for the sake of SSE ops in main

17 years

[arty] 29071: Fix build for new rosbe-ppc.

by arty＠svn.reactos.org

Author: arty Date: Mon Sep 17 09:32:04 2007 New Revision: 29071 URL: http://svn.reactos.org/svn/reactos?rev=29071&view=rev Log: Fix build for new rosbe-ppc. Modified: branches/powerpc/reactos/lib/mmu/ppcmmu.mak trunk/reactos/include/psdk/intrin_ppc.h Modified: branches/powerpc/reactos/lib/mmu/ppcmmu.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/ppcmmu.… ============================================================================== --- branches/powerpc/reactos/lib/mmu/ppcmmu.mak (original) +++ branches/powerpc/reactos/lib/mmu/ppcmmu.mak Mon Sep 17 09:32:04 2007 @@ -1,30 +1,32 @@ -O=obj-ppc/lib/ppcmmu +O=$(INTERMEDIATE)/lib/ppcmmu S=lib/ppcmmu -CC=powerpc-unknown-linux-gnu-gcc -I$T/include/reactos/ppcmmu -AR=powerpc-unknown-linux-gnu-ar -OBJCOPY=powerpc-unknown-linux-gnu-objcopy +CC=powerpc-unknown-elf-gcc -I$T/include/reactos/ppcmmu +AR=powerpc-unknown-elf-ar +OBJCOPY=powerpc-unknown-elf-objcopy LDSCRIPT=-Wl,-T,$S/ldscript PPCMMU_TARGETS=$O/libppcmmu.a $O/libppcmmu_code.a +$O: + mkdir -p $O -$O/libppcmmu.a: $O/mmuutil.o +$O/libppcmmu.a: $O/mmuutil.o | $O mkdir -p `dirname $@` $(AR) cr $@ $O/mmuutil.o -$O/mmuutil.o: $S/mmuutil.c +$O/mmuutil.o: $S/mmuutil.c | $O $(CC) -Iinclude/reactos/libs -g -c -o $@ $S/mmuutil.c -$O/libppcmmu_code.a: $O/mmuobject.o $O/mmuutil.o $O/mmutest.o +$O/libppcmmu_code.a: $O/mmuobject.o $O/mmuutil.o $O/mmutest.o | $O $(CC) -nostartfiles -nostdlib -o $O/mmuobject -Ttext=0x10000 $(LDSCRIPT) -Wl,-u,mmumain -Wl,-u,data_miss_start -Wl,-u,data_miss_end $O/mmuobject.o $O/mmuutil.o $O/mmutest.o $(OBJCOPY) -O binary $O/mmuobject mmucode $(OBJCOPY) -I binary -O elf32-powerpc -B powerpc:common mmucode $O/mmucode.o mkdir -p `dirname $@` $(AR) cr $@ $O/mmucode.o -$O/mmuobject.o: $S/mmuobject.c $S/mmuobject.h +$O/mmuobject.o: $S/mmuobject.c $S/mmuobject.h | $O $(CC) -Iinclude/reactos -Iinclude/reactos/libs -g -c -o $@ $S/mmuobject.c -$O/mmutest.o: $S/mmutest.c $S/mmuobject.h +$O/mmutest.o: $S/mmutest.c $S/mmuobject.h | $O $(CC) -Iinclude/reactos/libs -g -c -o $@ $S/mmutest.c ppcmmu_clean: Modified: trunk/reactos/include/psdk/intrin_ppc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_ppc.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_ppc.h (original) +++ trunk/reactos/include/psdk/intrin_ppc.h Mon Sep 17 09:32:04 2007 @@ -447,23 +447,6 @@ return (y & ~mask) != 0; } - -static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) -{ - long retval = Comperand; - __asm__ __volatile__ ( - "sync\n" - "1: lwarx %0,0,%1\n" - " subf. %0,%2,%0\n" - " bne 2f\n" - " stwcx. %3,0,%1\n" - " bne- 1b\n" - "2: isync" - : "=b" (retval) - : "b" (Destination), "r" (Comperand), "r" (Exchange) - : "cr0", "memory"); - return retval; -} #endif static __inline__ __attribute__((always_inline)) long _InterlockedDecrement(volatile long * const lpAddend)

17 years

[frik85] 29070: RosCMS update: * fixed save function (dynamic content number save bug fixed) * fixed stable button function (also related to dynamic content number) * various other minor glitches fixed

by frik85＠svn.reactos.org

Author: frik85 Date: Sun Sep 16 22:01:38 2007 New Revision: 29070 URL: http://svn.reactos.org/svn/reactos?rev=29070&view=rev Log: RosCMS update: * fixed save function (dynamic content number save bug fixed) * fixed stable button function (also related to dynamic content number) * various other minor glitches fixed Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php trunk/web/reactos.org/htdocs/roscms/inc/data_export_text.php trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php Sun Sep 16 22:01:38 2007 @@ -1216,6 +1216,7 @@ global $roscms_intern_account_id; global $roscms_standard_language; global $RosCMS_GET_debug; + global $roscms_security_level; global $h_a; global $h_a2; @@ -1302,26 +1303,44 @@ log_event_low("mark entry as stable: data-id ".$result_rev_data['data_id'].", rev-id ".$result_rev_data['rev_id'].log_prep_info($result_rev_data['data_id'], $result_rev_data['rev_id'])."{changetags}"); if ($result_rev_data['rev_version'] == 0) { + + $temp_dynamic = getTagValue($result_rev_data['data_id'], $result_rev_data['rev_id'], '-1', 'number'); // get dynamic content number + + if ($RosCMS_GET_debug) echo "<p>dyn-cont-number: ".$temp_dynamic."</p>"; + + $roscms_sql_tags = ""; + $roscms_sql_tags2 = ""; + $roscms_sql_tags3 = ""; + + if ($temp_dynamic != "") { + $roscms_sql_tags .= ", data_tag a, data_tag_name n, data_tag_value v "; + $roscms_sql_tags2 .= ", n.tn_name, v.tv_value "; + $roscms_sql_tags3 .= " AND r.data_id = a.data_id + AND r.rev_id = a.data_rev_id + AND a.tag_usrid = '-1' + AND a.tag_name_id = n.tn_id + AND n.tn_name = 'number' + AND a.tag_value_id = v.tv_id + AND v.tv_value = '".mysql_real_escape_string($temp_dynamic)."' "; + } + $query_revision_stable = mysql_query("SELECT * - FROM data_revision - WHERE data_id = '".mysql_real_escape_string($result_rev_data['data_id'])."' - AND rev_version > 0 - AND rev_language = '".mysql_real_escape_string($result_rev_data['rev_language'])."' - ORDER BY rev_version DESC, rev_id DESC + FROM data_revision r ".$roscms_sql_tags." + WHERE r.data_id = '".mysql_real_escape_string($result_rev_data['data_id'])."' + AND r.rev_version > 0 + AND r.rev_language = '".mysql_real_escape_string($result_rev_data['rev_language'])."' + ".$roscms_sql_tags3." + ORDER BY r.rev_version DESC, r.rev_id DESC LIMIT 1;"); $result_revision_stable = mysql_fetch_array($query_revision_stable); - + $temp_version = 1; - $temp_dynamic = getTagValue($result_rev_data['data_id'], $result_rev_data['rev_id'], '-1', 'number'); // get dynamic content number - - if ($RosCMS_GET_debug) echo "<p>dyn-cont-number: ".$temp_dynamic."</p>"; - - if ($result_revision_stable['rev_id'] != "" && $temp_dynamic == "") { // no stable entry exist, so skip move-process + if ($result_revision_stable['rev_id'] != "") { // no stable entry exist, so skip move-process $temp_version = $result_revision_stable['rev_version']; $temp_version++; - if ($RosCMS_GET_debug) echo "<p>old v.: ".$result_revision_stable['rev_version']."; new v.: ".$temp_version."</p>"; + if ($RosCMS_GET_debug) echo "<p>### old v.: ".$result_revision_stable['rev_version']."; new v.: ".$temp_version."</p>"; // delete old tag(s) $delete_old_tags = mysql_query("DELETE FROM data_tag WHERE data_rev_id = '".mysql_real_escape_string($result_rev_data['rev_id'])."' AND data_id = '".mysql_real_escape_string($result_rev_data['data_id'])."';"); @@ -1361,7 +1380,9 @@ $result_entry = mysql_fetch_array($query_entry); log_event_generate_low("+++++ [generate_page_output_update(".$result_rev_data['data_id'].", ".$tmp_lang.", ".$temp_dynamic.")]"); + if ($RosCMS_GET_debug) echo "<p>! generate_page_output_update(".$result_rev_data['data_id'].", ".$tmp_lang.", ".$temp_dynamic.")</p>"; + echo generate_page_output_update($result_entry['data_id'], $tmp_lang, $temp_dynamic); } else { @@ -1717,6 +1738,10 @@ $temp_dynamic = getTagValue($RosCMS_GET_d_id, $RosCMS_GET_d_r_id, '-1', 'number'); if ($result_edit_mef_data['data_type'] == "content" && $temp_dynamic != "") { echo "_".$temp_dynamic; + echo "<div id=\"entryeditdynnbr\" style=\"display:none;\">".$temp_dynamic."</div>"; + } + else { + echo "<div id=\"entryeditdynnbr\" style=\"display:none;\">no</div>"; } ?> </span>   <span style="white-space: nowrap;">type: <span class="frmeditheader"><?php echo $result_edit_mef_data['data_type']; ?></span></span>   Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_text.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_export_text.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_export_text.php Sun Sep 16 22:01:38 2007 @@ -238,6 +238,7 @@ global $RosCMS_GET_d_value; global $RosCMS_GET_d_value2; global $RosCMS_GET_d_value3; + global $RosCMS_GET_d_value4; $RosCMS_intern_save_rev_id = ""; $RosCMS_intern_d_rev_version = 0; @@ -246,30 +247,53 @@ // echo "<h2>lang: ".$RosCMS_intern_d_rev_lang."</h2>"; $RosCMS_intern_d_rev_usrid = ""; - if ($RosCMS_GET_d_value3 == "draft") { /* draft */ - $query_data_save_find_draft = mysql_query("SELECT rev_id, data_id rev_version, rev_language, rev_usrid, rev_datetime - FROM data_revision - WHERE data_id = '".mysql_real_escape_string($RosCMS_GET_d_id)."' - AND rev_usrid = '".mysql_real_escape_string($roscms_intern_account_id)."' - AND rev_date = '".mysql_real_escape_string(date("Y-m-d"))."' - AND rev_language = '".mysql_real_escape_string($RosCMS_intern_d_rev_lang)."' - ORDER BY rev_id DESC + $RosCMS_intern_d_rev_number = ""; + + echo "<p>!!!!!!!!!!!!!!!!!</p><hr /><p>asdadasdawddsda</p>"; + + echo "<p>DynNumber: ".$RosCMS_GET_d_value4."</p>"; + + + + if ($RosCMS_GET_d_value3 == "draft") { // draft + $roscms_sql_tags = ""; + $roscms_sql_tags2 = ""; + $roscms_sql_tags3 = ""; + + if ($RosCMS_GET_d_value4 != "no") { + $roscms_sql_tags .= ", data_tag a, data_tag_name n, data_tag_value v "; + $roscms_sql_tags2 .= ", n.tn_name, v.tv_value "; + $roscms_sql_tags3 .= " AND r.data_id = a.data_id + AND r.rev_id = a.data_rev_id + AND a.tag_usrid = '-1' + AND a.tag_name_id = n.tn_id + AND n.tn_name = 'number' + AND a.tag_value_id = v.tv_id + AND v.tv_value = '".mysql_real_escape_string($RosCMS_GET_d_value4)."' "; + } + + $query_data_save_find_draft = mysql_query("SELECT r.rev_id, r.data_id, r.rev_version, r.rev_language, r.rev_usrid, r.rev_datetime ".$roscms_sql_tags2." + FROM data_revision r ".$roscms_sql_tags." + WHERE r.data_id = '".mysql_real_escape_string($RosCMS_GET_d_id)."' + AND r.rev_usrid = '".mysql_real_escape_string($roscms_intern_account_id)."' + AND r.rev_date = '".mysql_real_escape_string(date("Y-m-d"))."' + AND r.rev_language = '".mysql_real_escape_string($RosCMS_intern_d_rev_lang)."' + ".$roscms_sql_tags3." + ORDER BY r.rev_id DESC LIMIT 1;"); $result_data_save_find_draft = mysql_fetch_array($query_data_save_find_draft); - //echo "<p>".getTagValue($RosCMS_GET_d_id, $result_data_save_find_draft['rev_id'], "-1", "status")."</p>"; - - - if(getTagValue($RosCMS_GET_d_id, $result_data_save_find_draft['rev_id'], "-1", "status") == "draft") { -// echo "<p>draft-lang: ".$result_data_save_find_draft['rev_language']."</p>"; + + //echo "<p>DraftEntry: ".$result_data_save_find_draft['rev_id'].", ".$result_data_save_find_draft['data_id'].", ".$result_data_save_find_draft['rev_version'].", ".$result_data_save_find_draft['tv_value']."</p>"; + + if (getTagValue($RosCMS_GET_d_id, $result_data_save_find_draft['rev_id'], "-1", "status") == "draft") { + //echo "<p>draft-lang: ".$RosCMS_GET_d_value3."|".$RosCMS_GET_d_value4."|".$result_data_save_find_draft['rev_language']."</p>"; $RosCMS_intern_save_rev_id = $result_data_save_find_draft['rev_id']; $RosCMS_intern_d_rev_lang = $result_data_save_find_draft['rev_language']; $RosCMS_intern_d_rev_usrid = $result_data_save_find_draft['rev_usrid']; $RosCMS_intern_d_rev_version = 0; - /*$RosCMS_intern_d_rev_stext_id = $result_data_save_find_draft['rev_usrid']; - $RosCMS_intern_d_rev_stext_id = $result_data_save_find_draft['rev_usrid'];*/ } else { // save changes as draft based on a new/stable entry -// echo "<p>else-lang: ".$RosCMS_GET_d_value3."|".$RosCMS_GET_d_r_lang."</p>"; + //echo "<p>else-lang: ".$RosCMS_GET_d_value3."|".$RosCMS_GET_d_value4."|".$RosCMS_GET_d_r_lang."</p>"; //$RosCMS_GET_d_value3 = "submit"; // save instead of update $RosCMS_intern_save_rev_id = ""; $RosCMS_intern_d_rev_version = 0; @@ -277,26 +301,21 @@ $RosCMS_intern_d_rev_usrid = $roscms_intern_account_id; //die("Saving draft not possible !?!"); } - } - - - if (($RosCMS_GET_d_value3 == "draft" && $RosCMS_intern_save_rev_id == "") || $RosCMS_GET_d_value3 == "submit") { /* add */ + + + } + + + if (($RosCMS_GET_d_value3 == "draft" && $RosCMS_intern_save_rev_id == "") || $RosCMS_GET_d_value3 == "submit") { // add //echo "<p>ADD</p>"; - if ($RosCMS_GET_d_value3 == "submit") { +/* if ($RosCMS_GET_d_value3 == "submit") { $query_data_save_find_submit = mysql_query("SELECT rev_id, data_id rev_version, rev_language, rev_usrid, rev_datetime FROM data_revision WHERE data_id = '".mysql_real_escape_string($RosCMS_GET_d_id)."' AND rev_language = '".mysql_real_escape_string($RosCMS_intern_d_rev_lang)."' ORDER BY rev_id DESC LIMIT 1;"); -/* echo "<p>SELECT rev_id, data_id rev_version, rev_language, rev_usrid, rev_datetime - FROM data_revision - WHERE data_id = '".mysql_real_escape_string($RosCMS_GET_d_id)."' - AND rev_language = '".mysql_real_escape_string($RosCMS_intern_d_rev_lang)."' - ORDER BY rev_id DESC - LIMIT 1;</p>"; -*/ $result_data_save_find_submit = mysql_fetch_array($query_data_save_find_submit); $RosCMS_intern_d_rev_version = 0; @@ -313,49 +332,35 @@ AND rev_version = 0 AND rev_language = '".mysql_real_escape_string($RosCMS_intern_d_rev_lang)."' AND rev_usrid = '".mysql_real_escape_string($RosCMS_intern_d_rev_usrid)."' ;"); -/* echo "<p>delete_draft: SELECT * - FROM data_revision - WHERE data_id = '".mysql_real_escape_string($RosCMS_GET_d_id)."' - AND rev_version = 0 - AND rev_language = '".mysql_real_escape_string($RosCMS_intern_d_rev_lang)."' - AND rev_usrid = '".mysql_real_escape_string($RosCMS_intern_d_rev_usrid)."' ;"; -*/ while ($result_data_delete_old_drafts = mysql_fetch_array($query_data_delete_old_drafts)) { // echo "<p>delete draft: ".$result_data_delete_old_drafts['rev_id']."</p>"; deleteRevision($result_data_delete_old_drafts['rev_id']); } } +*/ $insert_data_save = mysql_query("INSERT INTO data_revision ( rev_id , data_id , rev_version , rev_language , rev_usrid , rev_datetime , rev_date , rev_time ) VALUES ( NULL , '".mysql_real_escape_string($RosCMS_GET_d_id)."', - '".mysql_real_escape_string(0)/*$RosCMS_intern_d_rev_version*/."', + '0', '".mysql_real_escape_string($RosCMS_intern_d_rev_lang)."', '".mysql_real_escape_string($RosCMS_intern_d_rev_usrid)."', NOW( ), CURDATE( ), CURTIME( ) - );"); + );");//$RosCMS_intern_d_rev_version $query_data_save_find_submit2 = mysql_query("SELECT rev_id FROM data_revision WHERE data_id = '".mysql_real_escape_string($RosCMS_GET_d_id)."' - AND rev_version = '".mysql_real_escape_string(0)/*$RosCMS_intern_d_rev_version*/."' + AND rev_version = '0' AND rev_language = '".mysql_real_escape_string($RosCMS_intern_d_rev_lang)."' AND rev_usrid = '".mysql_real_escape_string($roscms_intern_account_id)."' ORDER BY rev_datetime DESC;"); -/* echo "<p>SELECT rev_id - FROM data_revision - WHERE data_id = '".mysql_real_escape_string($RosCMS_GET_d_id)."' - AND rev_version = '".mysql_real_escape_string($RosCMS_intern_d_rev_version)."' - AND rev_language = '".mysql_real_escape_string($RosCMS_intern_d_rev_lang)."' - AND rev_usrid = '".mysql_real_escape_string($roscms_intern_account_id)."' - ORDER BY rev_datetime DESC;</p>"; -*/ $result_data_save_find_submit2 = mysql_fetch_array($query_data_save_find_submit2); //$result_data_save_find_submit2['rev_id']; - for ($i=1; $i <= $RosCMS_POST_d_stextsum; $i++) { /* short text */ + for ($i=1; $i <= $RosCMS_POST_d_stextsum; $i++) { //short text $insert_data_save_stext = mysql_query("INSERT INTO data_stext ( stext_id , data_rev_id , stext_name , stext_content ) VALUES ( NULL , @@ -364,7 +369,7 @@ '".mysql_real_escape_string($_POST["pstext".$i])."' );"); } - for ($i=1; $i <= $RosCMS_POST_d_textsum; $i++) { /* text */ + for ($i=1; $i <= $RosCMS_POST_d_textsum; $i++) { // text $insert_data_save_text = mysql_query("INSERT INTO data_text ( text_id , data_rev_id , text_name , text_content ) VALUES ( NULL , @@ -383,6 +388,11 @@ // echo "<h4>submit_process: tag_add(".$RosCMS_GET_d_id.", ".$result_data_save_find_submit2['rev_id'].", 'status', 'draft', '-1');</h4>"; tag_add($RosCMS_GET_d_id, $result_data_save_find_submit2['rev_id'], 'status', 'draft', '-1'); } + + if ($RosCMS_GET_d_value4 != "no") { + tag_add($RosCMS_GET_d_id, $result_data_save_find_submit2['rev_id'], 'number', $RosCMS_GET_d_value4, '-1'); + } + //tag_add($RosCMS_GET_d_id, $result_data_save_find_submit2['rev_id'], 'debug', '1', '-1'); } else if ($RosCMS_intern_save_rev_id != "" && $RosCMS_GET_d_value3 == "draft") { //echo "<p>UPDATE</p>"; @@ -390,7 +400,7 @@ $insert_data_save_stext = mysql_query("DELETE FROM data_stext WHERE data_rev_id = '".mysql_real_escape_string($RosCMS_intern_save_rev_id)."';"); $insert_data_save_stext = mysql_query("DELETE FROM data_text WHERE data_rev_id = '".mysql_real_escape_string($RosCMS_intern_save_rev_id)."';"); - for ($i=1; $i <= $RosCMS_POST_d_stextsum; $i++) { /* short text */ + for ($i=1; $i <= $RosCMS_POST_d_stextsum; $i++) { // short text if (array_key_exists("pdstext".$i, $_POST)) { $insert_data_save_stext = mysql_query("INSERT INTO data_stext ( stext_id , data_rev_id , stext_name , stext_content ) VALUES ( @@ -401,7 +411,7 @@ );"); } } - for ($i=1; $i <= $RosCMS_POST_d_textsum; $i++) { /* text */ + for ($i=1; $i <= $RosCMS_POST_d_textsum; $i++) { // text if (array_key_exists("pdtext".$i, $_POST)) { $insert_data_save_text = mysql_query("INSERT INTO data_text ( text_id , data_rev_id , text_name , text_content ) VALUES ( @@ -413,6 +423,7 @@ } //echo "<p><pre>".$_POST["pdtext".$i].": <br />\n".$_POST["plm".$i]."</pre></p>"; } + //tag_add($RosCMS_GET_d_id, $RosCMS_intern_save_rev_id, 'debug', '2', '-1'); } else { @@ -420,6 +431,8 @@ } + + } ?> Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php Sun Sep 16 22:01:38 2007 @@ -846,4 +846,4 @@ } -?> +?> Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_list.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_list.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Sun Sep 16 22:01:38 2007 @@ -2199,7 +2199,7 @@ cmdbarstr += cmdhtml_select_mn; cmdbarstr += cmdhtml_select_ms; cmdbarstr += cmdhtml_select_va; - cmdbarstr += cmdhtml_select_xe; + cmdbarstr += cmdhtml_select_xe2; cmdbarstr += cmdhtml_select2; break; case 'page': @@ -2626,7 +2626,7 @@ // alert('save_draft::::::::\n\n '+poststr.substr(1)); - usf_req = '?page=data_out&d_f=text&d_u=asi&d_fl=new&d_id='+encodeURIComponent(did)+'&d_r_id='+encodeURIComponent(drid)+'&d_r_lang='+encodeURIComponent(document.getElementById("mefrlang").innerHTML)+'&d_r_ver='+encodeURIComponent(document.getElementById("mefrverid").innerHTML)+'&d_val='+encodeURIComponent(document.getElementById("estextcount").className)+'&d_val2='+encodeURIComponent(document.getElementById("elmcount").className)+'&d_val3=draft'; + usf_req = '?page=data_out&d_f=text&d_u=asi&d_fl=new&d_id='+encodeURIComponent(did)+'&d_r_id='+encodeURIComponent(drid)+'&d_r_lang='+encodeURIComponent(document.getElementById("mefrlang").innerHTML)+'&d_r_ver='+encodeURIComponent(document.getElementById("mefrverid").innerHTML)+'&d_val='+encodeURIComponent(document.getElementById("estextcount").className)+'&d_val2='+encodeURIComponent(document.getElementById("elmcount").className)+'&d_val3=draft&d_val4='+encodeURIComponent(document.getElementById("entryeditdynnbr").innerHTML); <?php if ($RosCMS_GET_debug) { ?> debugLog(usf_req); <?php } ?>

17 years

← Newer
1
...
22
23
24
25
26
27
28
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007