Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 17 Sep '07

17 Sep '07

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);

1 0

[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 17 Sep '07

17 Sep '07

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

1 0

[arty] 29071: Fix build for new rosbe-ppc.
by arty＠svn.reactos.org 17 Sep '07

17 Sep '07

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)

1 0

[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 16 Sep '07

16 Sep '07

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 "dyn-cont-number: ".$temp_dynamic.""; + + $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 "dyn-cont-number: ".$temp_dynamic.""; - - 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 "old v.: ".$result_revision_stable['rev_version']."; new v.: ".$temp_version.""; + if ($RosCMS_GET_debug) echo "### old v.: ".$result_revision_stable['rev_version']."; new v.: ".$temp_version.""; // 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 "! generate_page_output_update(".$result_rev_data['data_id'].", ".$tmp_lang.", ".$temp_dynamic.")"; + 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>"; } ?>   type: <?php echo $result_edit_mef_data['data_type']; ?>   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 "!!!!!!!!!!!!!!!!!<hr />asdadasdawddsda"; + + echo "DynNumber: ".$RosCMS_GET_d_value4.""; + + + + 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 "".getTagValue($RosCMS_GET_d_id, $result_data_save_find_draft['rev_id'], "-1", "status").""; - - - if(getTagValue($RosCMS_GET_d_id, $result_data_save_find_draft['rev_id'], "-1", "status") == "draft") { -// echo "draft-lang: ".$result_data_save_find_draft['rev_language'].""; + + //echo "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'].""; + + if (getTagValue($RosCMS_GET_d_id, $result_data_save_find_draft['rev_id'], "-1", "status") == "draft") { + //echo "draft-lang: ".$RosCMS_GET_d_value3."|".$RosCMS_GET_d_value4."|".$result_data_save_find_draft['rev_language'].""; $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 "else-lang: ".$RosCMS_GET_d_value3."|".$RosCMS_GET_d_r_lang.""; + //echo "else-lang: ".$RosCMS_GET_d_value3."|".$RosCMS_GET_d_value4."|".$RosCMS_GET_d_r_lang.""; //$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 "ADD"; - 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 "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;"; -*/ $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 "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 "delete draft: ".$result_data_delete_old_drafts['rev_id'].""; 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 "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;"; -*/ $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 "UPDATE"; @@ -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 "<pre>".$_POST["pdtext".$i].": \n".$_POST["plm".$i]."</pre>"; } + //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 } ?>

1 0

[fireball] 29069: - Move W32CLTINFO_TEB structure out of NDK, since it's module-internal structure. - Add a define for easier accessing this field.
by fireball＠svn.reactos.org 16 Sep '07

16 Sep '07

Author: fireball Date: Sun Sep 16 21:37:41 2007 New Revision: 29069 URL: http://svn.reactos.org/svn/reactos?rev=29069&view=rev Log: - Move W32CLTINFO_TEB structure out of NDK, since it's module-internal structure. - Add a define for easier accessing this field. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Sun Sep 16 21:37:41 2007 @@ -675,21 +675,6 @@ } GDI_TEB_BATCH, *PGDI_TEB_BATCH; // -// Window Client Information structure -// -typedef struct _W32CLTINFO_TEB -{ - ULONG Win32ClientInfo0[2]; - ULONG ulWindowsVersion; - ULONG ulAppCompatFlags; - ULONG ulAppCompatFlags2; - ULONG Win32ClientInfo1[5]; - HWND hWND; - PVOID pvWND; - ULONG Win32ClientInfo2[50]; -} W32CLTINFO_TEB, *PW32CLTINFO_TEB; - -// // Initial TEB // typedef struct _INITIAL_TEB @@ -748,7 +733,7 @@ ULONG GdiClientPID; ULONG GdiClientTID; PVOID GdiThreadLocalInfo; - W32CLTINFO_TEB Win32ClientInfo; + ULONG Win32ClientInfo[62]; PVOID glDispatchTable[0xE9]; ULONG glReserved1[0x1D]; PVOID glReserved2; Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h Sun Sep 16 21:37:41 2007 @@ -8,5 +8,19 @@ ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); +/* Window Client Information structure */ +typedef struct _W32CLTINFO_TEB +{ + ULONG Win32ClientInfo0[2]; + ULONG ulWindowsVersion; + ULONG ulAppCompatFlags; + ULONG ulAppCompatFlags2; + ULONG Win32ClientInfo1[5]; + HWND hWND; + PVOID pvWND; + ULONG Win32ClientInfo2[50]; +} W32CLTINFO_TEB, *PW32CLTINFO_TEB; + +#define GetWin32ClientInfo() (PW32CLTINFO_TEB)(NtCurrentTeb()->Win32ClientInfo) #endif /* __WIN32K_MISC_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Sun Sep 16 21:37:41 2007 @@ -116,22 +116,22 @@ { HWND hWndS = *hWnd; PWINDOW_OBJECT Window = UserGetWindowObject(*hWnd); - PTEB Teb = NtCurrentTeb(); - - *hWnd = Teb->Win32ClientInfo.hWND; - *pWnd = Teb->Win32ClientInfo.pvWND; - - Teb->Win32ClientInfo.hWND = hWndS; - Teb->Win32ClientInfo.pvWND = (PVOID) Window; + PW32CLTINFO_TEB ClientInfo = GetWin32ClientInfo(); + + *hWnd = ClientInfo->hWND; + *pWnd = ClientInfo->pvWND; + + ClientInfo->hWND = hWndS; + ClientInfo->pvWND = (PVOID) Window; } static VOID IntRestoreTebWndCallback (HWND hWnd, PVOID pWnd) { - PTEB Teb = NtCurrentTeb(); - - Teb->Win32ClientInfo.hWND = hWnd; - Teb->Win32ClientInfo.pvWND = pWnd; + PW32CLTINFO_TEB ClientInfo = GetWin32ClientInfo(); + + ClientInfo->hWND = hWnd; + ClientInfo->pvWND = pWnd; } /* FUNCTIONS *****************************************************************/

1 0

[jimtabor] 29068: Fix def and size for NtUserValidateHandleSecure.
by jimtabor＠svn.reactos.org 16 Sep '07

16 Sep '07

Author: jimtabor Date: Sun Sep 16 19:32:58 2007 New Revision: 29068 URL: http://svn.reactos.org/svn/reactos?rev=29068&view=rev Log: Fix def and size for NtUserValidateHandleSecure. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Sun Sep 16 19:32:58 2007 @@ -2002,10 +2002,11 @@ DWORD Unknown1, DWORD Unknown2); -DWORD +BOOL NTAPI NtUserValidateHandleSecure( - DWORD Unknown0); + HANDLE hHdl, + BOOL Restricted); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Sun Sep 16 19:32:58 2007 @@ -637,10 +637,11 @@ return 0; } -DWORD +BOOL STDCALL NtUserValidateHandleSecure( - DWORD Unknown0) + HANDLE hHdl, + BOOL Restricted) { UNIMPLEMENTED Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sun Sep 16 19:32:58 2007 @@ -590,7 +590,7 @@ NtUserSetLayeredWindowAttributes 4 NtUserUpdatePerUserSystemParameters 2 NtUserUserHandleGrantAccess 3 -# NtUserValidateHandleSecure 2 Wrong number of param ? +NtUserValidateHandleSecure 2 # NtUserValidateRect 2 # NtUserValidateTimerCallback 3 NtUserVkKeyScanEx 3 @@ -685,7 +685,6 @@ NtUserInitTask 11 NtUserSetCursorIconData 6 NtUserUnregisterClass 2 -NtUserValidateHandleSecure 1 # #ReactOS specify syscall NtGdiSelectObject 2

1 0

[ekohl] 29067: Indentation clean-up. No code changes.
by ekohl＠svn.reactos.org 16 Sep '07

16 Sep '07

Author: ekohl Date: Sun Sep 16 17:38:26 2007 New Revision: 29067 URL: http://svn.reactos.org/svn/reactos?rev=29067&view=rev Log: Indentation clean-up. No code changes. Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/liccpa/liccpa.c Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.c (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.c Sun Sep 16 17:38:26 2007 @@ -19,7 +19,7 @@ /* $Id$ * * PROJECT: ReactOS Software Control Panel - * FILE: lib/cpl/system/appwiz.c + * FILE: dll/cpl/appwiz/appwiz.c * PURPOSE: ReactOS Software Control Panel * PROGRAMMER: Gero Kuehn (reactos.filter(a)gkware.com) * UPDATE HISTORY: @@ -49,214 +49,221 @@ /* Applets */ APPLET Applets[NUM_APPLETS] = { - {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} + {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; static VOID CallUninstall(HWND hwndDlg) { - STARTUPINFO si; - PROCESS_INFORMATION pi; - int nIndex; - HKEY hKey; - DWORD dwType; - TCHAR pszUninstallString[MAX_PATH]; - DWORD dwSize; - - nIndex = (int) SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0); - if (nIndex == -1) - { - MessageBox(hwndDlg, - _TEXT("No item selected"), - _TEXT("Error"), - MB_ICONSTOP); - } - else - { - hKey = (HKEY)SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETITEMDATA, (WPARAM)nIndex, 0); - - dwType = REG_SZ; + STARTUPINFO si; + PROCESS_INFORMATION pi; + INT nIndex; + HKEY hKey; + DWORD dwType; + TCHAR pszUninstallString[MAX_PATH]; + DWORD dwSize; + + nIndex = (INT)SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0); + if (nIndex == -1) + { + MessageBox(hwndDlg, + _TEXT("No item selected"), + _TEXT("Error"), + MB_ICONSTOP); + } + else + { + hKey = (HKEY)SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETITEMDATA, (WPARAM)nIndex, 0); + + dwType = REG_SZ; + dwSize = MAX_PATH; + if (RegQueryValueEx(hKey, + _TEXT("UninstallString"), + NULL, + &dwType, + (LPBYTE)pszUninstallString, + &dwSize) == ERROR_SUCCESS) + { + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + si.wShowWindow = SW_SHOW; + if (CreateProcess(NULL,pszUninstallString,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + } + else + { + MessageBox(hwndDlg, + _TEXT("Unable to read UninstallString. This entry is invalid or has been created by an MSI installer."), + _TEXT("Error"), + MB_ICONSTOP); + } + } +} + + +static VOID +FillSoftwareList(HWND hwndDlg) +{ + TCHAR pszName[MAX_PATH]; + TCHAR pszDisplayName[MAX_PATH]; + TCHAR pszParentKeyName[MAX_PATH]; + FILETIME FileTime; + HKEY hKey; + HKEY hSubKey; + DWORD dwType; + DWORD dwSize; + DWORD dwValue = 0; + BOOL bIsUpdate = FALSE; + BOOL bIsSystemComponent = FALSE; + BOOL bShowUpdates = FALSE; + INT i; + ULONG ulIndex; + + bShowUpdates = (SendMessage(GetDlgItem(hwndDlg, IDC_SHOWUPDATES), BM_GETCHECK, 0, 0) == BST_CHECKED); + + if (RegOpenKey(HKEY_LOCAL_MACHINE, + _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"), + &hKey) != ERROR_SUCCESS) + { + MessageBox(hwndDlg, + _TEXT("Unable to open Uninstall Key"), + _TEXT("Error"), + MB_ICONSTOP); + return; + } + + i = 0; dwSize = MAX_PATH; - if (RegQueryValueEx(hKey, - _TEXT("UninstallString"), - NULL, - &dwType, - (LPBYTE)pszUninstallString, - &dwSize) == ERROR_SUCCESS) - { - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - si.wShowWindow = SW_SHOW; - if (CreateProcess(NULL,pszUninstallString,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi)) - { - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - } - } - else - { - MessageBox(hwndDlg, - _TEXT("Unable to read UninstallString. This entry is invalid or has been created by an MSI installer."), - _TEXT("Error"), - MB_ICONSTOP); - } - } -} - - -static void FillSoftwareList(HWND hwndDlg) -{ - TCHAR pszName[MAX_PATH]; - TCHAR pszDisplayName[MAX_PATH]; - TCHAR pszParentKeyName[MAX_PATH]; - FILETIME FileTime; - HKEY hKey; - HKEY hSubKey; - DWORD dwType; - DWORD dwSize; - DWORD dwValue = 0; - BOOL bIsUpdate = FALSE; - BOOL bIsSystemComponent = FALSE; - BOOL bShowUpdates = FALSE; - int i; - ULONG index; - - bShowUpdates = (SendMessage(GetDlgItem(hwndDlg, IDC_SHOWUPDATES), BM_GETCHECK, 0, 0) == BST_CHECKED); - - if (RegOpenKey(HKEY_LOCAL_MACHINE, - _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"), - &hKey) != ERROR_SUCCESS) - { - MessageBox(hwndDlg, - _TEXT("Unable to open Uninstall Key"), - _TEXT("Error"), - MB_ICONSTOP); - return; - } - - i = 0; - dwSize = MAX_PATH; - while (RegEnumKeyEx (hKey, i, pszName, &dwSize, NULL, NULL, NULL, &FileTime) == ERROR_SUCCESS) - { - if (RegOpenKey(hKey,pszName,&hSubKey)==ERROR_SUCCESS) - { - dwType = REG_DWORD; - dwSize = sizeof(DWORD); - if (RegQueryValueEx(hSubKey, - _TEXT("SystemComponent"), - NULL, - &dwType, - (LPBYTE)&dwValue, - &dwSize) == ERROR_SUCCESS) - { - bIsSystemComponent = (dwValue == 0x1); - } - else { - bIsSystemComponent = FALSE; - } - dwType = REG_SZ; - dwSize = MAX_PATH; - bIsUpdate = (RegQueryValueEx(hSubKey, - _TEXT("ParentKeyName"), - NULL, - &dwType, - (LPBYTE)pszParentKeyName, - &dwSize) == ERROR_SUCCESS); - dwSize = MAX_PATH; - if (RegQueryValueEx(hSubKey, - _TEXT("DisplayName"), - NULL, - &dwType, - (LPBYTE)pszDisplayName, - &dwSize) == ERROR_SUCCESS) - { - if ((!bIsUpdate) && (!bIsSystemComponent)) + while (RegEnumKeyEx (hKey, i, pszName, &dwSize, NULL, NULL, NULL, &FileTime) == ERROR_SUCCESS) + { + if (RegOpenKey(hKey,pszName,&hSubKey) == ERROR_SUCCESS) { - index = (ULONG) SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); - SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey); + dwType = REG_DWORD; + dwSize = sizeof(DWORD); + if (RegQueryValueEx(hSubKey, + _TEXT("SystemComponent"), + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize) == ERROR_SUCCESS) + { + bIsSystemComponent = (dwValue == 0x1); + } + else + { + bIsSystemComponent = FALSE; + } + + dwType = REG_SZ; + dwSize = MAX_PATH; + bIsUpdate = (RegQueryValueEx(hSubKey, + _TEXT("ParentKeyName"), + NULL, + &dwType, + (LPBYTE)pszParentKeyName, + &dwSize) == ERROR_SUCCESS); + dwSize = MAX_PATH; + if (RegQueryValueEx(hSubKey, + _TEXT("DisplayName"), + NULL, + &dwType, + (LPBYTE)pszDisplayName, + &dwSize) == ERROR_SUCCESS) + { + if ((!bIsUpdate) && (!bIsSystemComponent)) + { + ulIndex = (ULONG)SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); + SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,ulIndex,(LPARAM)hSubKey); + } + else if (bIsUpdate && bShowUpdates) + { + ulIndex = (ULONG)SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); + SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,ulIndex,(LPARAM)hSubKey); + } + } } - else if (bIsUpdate && bShowUpdates) - { - index = (ULONG) SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); - SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey); - } - } - } - - dwSize = MAX_PATH; - i++; - } - - RegCloseKey(hKey); -} + + dwSize = MAX_PATH; + i++; + } + + RegCloseKey(hKey); +} + /* Property page dialog callback */ static INT_PTR CALLBACK -InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) -{ - UNREFERENCED_PARAMETER(lParam); - switch (uMsg) - { - case WM_INITDIALOG: - EnableWindow(GetDlgItem(hwndDlg,IDC_INSTALL), FALSE); - FillSoftwareList(hwndDlg); - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_SHOWUPDATES: - if (HIWORD(wParam) == BN_CLICKED) - { - SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_RESETCONTENT, 0, 0); +InstallPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (uMsg) + { + case WM_INITDIALOG: + EnableWindow(GetDlgItem(hwndDlg, IDC_INSTALL), FALSE); FillSoftwareList(hwndDlg); - } - break; - case IDC_SOFTWARELIST: - if (HIWORD(wParam) == LBN_DBLCLK) - { - CallUninstall(hwndDlg); - } - break; - - case IDC_ADDREMOVE: - CallUninstall(hwndDlg); - break; - } - break; - } - - return FALSE; + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_SHOWUPDATES: + if (HIWORD(wParam) == BN_CLICKED) + { + SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_RESETCONTENT, 0, 0); + FillSoftwareList(hwndDlg); + } + break; + + case IDC_SOFTWARELIST: + if (HIWORD(wParam) == LBN_DBLCLK) + { + CallUninstall(hwndDlg); + } + break; + + case IDC_ADDREMOVE: + CallUninstall(hwndDlg); + break; + } + break; + } + + return FALSE; } /* Property page dialog callback */ static INT_PTR CALLBACK -RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) -{ - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - - return FALSE; +RosPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); + + switch (uMsg) + { + case WM_INITDIALOG: + break; + } + + return FALSE; } static VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) { - ZeroMemory(psp, sizeof(PROPSHEETPAGE)); - psp->dwSize = sizeof(PROPSHEETPAGE); - psp->dwFlags = PSP_DEFAULT; - psp->hInstance = hApplet; - psp->pszTemplate = MAKEINTRESOURCE(idDlg); - psp->pfnDlgProc = DlgProc; + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; } @@ -265,28 +272,28 @@ LONG CALLBACK SystemApplet(VOID) { - PROPSHEETPAGE psp[2]; - PROPSHEETHEADER psh; - TCHAR Caption[1024]; - - LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); - - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE; - psh.hwndParent = NULL; - psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); - psh.pszCaption = Caption; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); - psh.nStartPage = 0; - psh.ppsp = psp; - psh.pfnCallback = NULL; - - InitPropSheetPage(&psp[0], IDD_PROPPAGEINSTALL, (DLGPROC) InstallPageProc); - InitPropSheetPage(&psp[1], IDD_PROPPAGEROSSETUP, (DLGPROC) RosPageProc); - - return (LONG)(PropertySheet(&psh) != -1); + PROPSHEETPAGE psp[2]; + PROPSHEETHEADER psh; + TCHAR Caption[1024]; + + LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + psh.pszCaption = Caption; + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nStartPage = 0; + psh.ppsp = psp; + psh.pfnCallback = NULL; + + InitPropSheetPage(&psp[0], IDD_PROPPAGEINSTALL, (DLGPROC) InstallPageProc); + InitPropSheetPage(&psp[1], IDD_PROPPAGEROSSETUP, (DLGPROC) RosPageProc); + + return (LONG)(PropertySheet(&psh) != -1); } @@ -294,47 +301,49 @@ LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - CPLINFO *CPlInfo; - DWORD i; - - UNREFERENCED_PARAMETER(hwndCPl); - - i = (DWORD)lParam1; - switch(uMsg) - { - case CPL_INIT: - return TRUE; - - case CPL_GETCOUNT: - return NUM_APPLETS; - - case CPL_INQUIRE: - CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; - break; - - case CPL_DBLCLK: - Applets[i].AppletProc(); - break; - } - - return FALSE; + CPLINFO *CPlInfo; + DWORD i; + + UNREFERENCED_PARAMETER(hwndCPl); + + i = (DWORD)lParam1; + switch (uMsg) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return NUM_APPLETS; + + case CPL_INQUIRE: + CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + break; + + case CPL_DBLCLK: + Applets[i].AppletProc(); + break; + } + + return FALSE; } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - hApplet = hinstDLL; - break; - } - return TRUE; -} + UNREFERENCED_PARAMETER(lpvReserved); + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + + return TRUE; +} Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c Sun Sep 16 17:38:26 2007 @@ -18,7 +18,7 @@ */ /* * PROJECT: ReactOS Add hardware control panel - * FILE: lib/cpl/hdwwiz/hdwwiz.c + * FILE: dll/cpl/hdwwiz/hdwwiz.c * PURPOSE: ReactOS Add hardware control panel * PROGRAMMER: Hervé Poussineau (hpoussin(a)reactos.org) */ @@ -39,7 +39,7 @@ /* Applets */ APPLET Applets[] = { - {IDI_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet} + {IDI_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet} }; typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); @@ -47,105 +47,108 @@ static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { - HMODULE hNewDev = NULL; - PINSTALL_NEW_DEVICE InstallNewDevice; - DWORD Reboot; - BOOL ret; - LONG rc; + HMODULE hNewDev = NULL; + PINSTALL_NEW_DEVICE InstallNewDevice; + DWORD Reboot; + BOOL ret; + LONG rc; - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); - hNewDev = LoadLibrary(_T("newdev.dll")); - if (!hNewDev) - { - rc = 1; - goto cleanup; - } + hNewDev = LoadLibrary(_T("newdev.dll")); + if (!hNewDev) + { + rc = 1; + goto cleanup; + } - InstallNewDevice = (PINSTALL_NEW_DEVICE)GetProcAddress(hNewDev, (LPCSTR)"InstallNewDevice"); - if (!InstallNewDevice) - { - rc = 2; - goto cleanup; - } + InstallNewDevice = (PINSTALL_NEW_DEVICE)GetProcAddress(hNewDev, (LPCSTR)"InstallNewDevice"); + if (!InstallNewDevice) + { + rc = 2; + goto cleanup; + } - ret = InstallNewDevice(hwnd, NULL, &Reboot); - if (!ret) - { - rc = 3; - goto cleanup; - } + ret = InstallNewDevice(hwnd, NULL, &Reboot); + if (!ret) + { + rc = 3; + goto cleanup; + } - if (Reboot != DI_NEEDRESTART && Reboot != DI_NEEDREBOOT) - { - /* We're done with installation */ - rc = 0; - goto cleanup; - } + if (Reboot != DI_NEEDRESTART && Reboot != DI_NEEDREBOOT) + { + /* We're done with installation */ + rc = 0; + goto cleanup; + } - /* We need to reboot */ - if (SetupPromptReboot(NULL, hwnd, FALSE) == -1) - { - /* User doesn't want to reboot, or an error occurred */ - rc = 5; - goto cleanup; - } + /* We need to reboot */ + if (SetupPromptReboot(NULL, hwnd, FALSE) == -1) + { + /* User doesn't want to reboot, or an error occurred */ + rc = 5; + goto cleanup; + } - rc = 0; + rc = 0; cleanup: - if (hNewDev != NULL) - FreeLibrary(hNewDev); - return rc; + if (hNewDev != NULL) + FreeLibrary(hNewDev); + return rc; } + /* Control Panel Callback */ LONG CALLBACK CPlApplet(HWND hwndCpl, - UINT uMsg, - LPARAM lParam1, - LPARAM lParam2) + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) { - int i = (int)lParam1; + INT i = (INT)lParam1; - switch (uMsg) - { - case CPL_INIT: - return TRUE; + switch (uMsg) + { + case CPL_INIT: + return TRUE; - case CPL_GETCOUNT: - return sizeof(Applets)/sizeof(Applets[0]); + case CPL_GETCOUNT: + return sizeof(Applets)/sizeof(Applets[0]); - case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; - break; - } + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + break; - case CPL_DBLCLK: - { - Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); - break; - } - } - return FALSE; + case CPL_DBLCLK: + Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + break; + } + + return FALSE; } + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - hApplet = hinstDLL; - break; - } - return TRUE; + UNREFERENCED_PARAMETER(lpvReserved); + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hApplet = hinstDLL; + break; + } + + return TRUE; } Modified: trunk/reactos/dll/cpl/liccpa/liccpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.c?re… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.c (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.c Sun Sep 16 17:38:26 2007 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS License Manager - * FILE: lib/cpl/liccpa + * FILE: dll/cpl/liccpa/liccpa.c * PURPOSE: License Manager GUI * * PROGRAMMERS: Steven Edwards (steven_ed4153(a)yahoo.com) @@ -20,108 +20,97 @@ HINSTANCE hApplet = 0; + INT_PTR CALLBACK -DlgMainProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) +DlgMainProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - TCHAR szString[256]; + TCHAR szString[256]; - switch(uMsg) - { - case WM_INITDIALOG: - break; + switch (uMsg) + { + case WM_INITDIALOG: + break; - case WM_COMMAND: - { - switch(HIWORD(wParam)) - { - case LBN_DBLCLK: - { - switch(LOWORD(wParam)) - { - } - break; - } - default: - { - switch(LOWORD(wParam)) - { - case IDC_OK: + case WM_COMMAND: + switch (HIWORD(wParam)) { - break; + case LBN_DBLCLK: + switch (LOWORD(wParam)) + { + } + break; + + default: + switch (LOWORD(wParam)) + { + case IDC_OK: + break; + + case IDC_CANCEL: + EndDialog(hwndDlg, IDC_CANCEL); + break; + } + break; } - case IDC_CANCEL: - { - EndDialog(hwndDlg, IDC_CANCEL); - break; - } - } - break; - } - } - break; + break; + + case WM_CLOSE: + EndDialog(hwndDlg, IDC_CANCEL); + return TRUE; } - case WM_CLOSE: - { - EndDialog(hwndDlg, IDC_CANCEL); - return TRUE; - } - } - return FALSE; + + return FALSE; } + LONG CALLBACK -CPlApplet( - HWND hwndCPl, - UINT uMsg, - LPARAM lParam1, - LPARAM lParam2) +CPlApplet(HWND hwndCPl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) { - switch(uMsg) - { - case CPL_INIT: + switch (uMsg) { - return TRUE; + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return 1; + + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = IDC_CPLICON_1; + CPlInfo->idName = IDS_CPLNAME_1; + CPlInfo->idInfo = IDS_CPLDESCRIPTION_1; + } + break; + + case CPL_DBLCLK: + DialogBox(hApplet, MAKEINTRESOURCE(IDD_PROPPAGE1), NULL, DlgMainProc); + break; } - case CPL_GETCOUNT: - { - return 1; - } - case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = IDC_CPLICON_1; - CPlInfo->idName = IDS_CPLNAME_1; - CPlInfo->idInfo = IDS_CPLDESCRIPTION_1; - break; - } - case CPL_DBLCLK: - { - DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_PROPPAGE1), hwndCPl, DlgMainProc, WM_INITDIALOG); - break; - } - } - return FALSE; + + return FALSE; } BOOL STDCALL -DllMain( - HINSTANCE hinstDLL, - DWORD dwReason, - LPVOID lpvReserved) +DllMain(HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpvReserved) { - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - hApplet = hinstDLL; - break; - } - return TRUE; + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + + return TRUE; }

1 0

[ekohl] 29066: Enable the filter keys settings when the test area EDITTEXT control gets the focus and disable the settings when the focus leaves the control.
by ekohl＠svn.reactos.org 16 Sep '07

16 Sep '07

Author: ekohl Date: Sun Sep 16 17:25:34 2007 New Revision: 29066 URL: http://svn.reactos.org/svn/reactos?rev=29066&view=rev Log: Enable the filter keys settings when the test area EDITTEXT control gets the focus and disable the settings when the focus leaves the control. Modified: trunk/reactos/dll/cpl/access/keyboard.c Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Sun Sep 16 17:25:34 2007 @@ -42,6 +42,47 @@ static INT nWaitArray[WAITTICKS] = {0, 300, 500, 700, 1000, 1500, 2000, 5000, 10000, 20000}; +static VOID +EnableFilterKeysTest(PGLOBAL_DATA pGlobalData) +{ + pGlobalData->filterKeys.dwFlags |= FKF_FILTERKEYSON; + pGlobalData->filterKeys.dwFlags &= ~FKF_INDICATOR; + + SystemParametersInfo(SPI_SETFILTERKEYS, + sizeof(FILTERKEYS), + &pGlobalData->filterKeys, + 0); +} + + +static VOID +DisableFilterKeysTest(PGLOBAL_DATA pGlobalData) +{ + if (pGlobalData->oldFilterKeys.dwFlags & FKF_FILTERKEYSON) + { + pGlobalData->filterKeys.dwFlags |= FKF_FILTERKEYSON; + } + else + { + pGlobalData->filterKeys.dwFlags &= ~FKF_FILTERKEYSON; + } + + if (pGlobalData->oldFilterKeys.dwFlags & FKF_INDICATOR) + { + pGlobalData->filterKeys.dwFlags |= FKF_INDICATOR; + } + else + { + pGlobalData->filterKeys.dwFlags &= ~FKF_INDICATOR; + } + + SystemParametersInfo(SPI_SETFILTERKEYS, + sizeof(FILTERKEYS), + &pGlobalData->filterKeys, + 0); +} + + /* Property page dialog callback */ INT_PTR CALLBACK StickyKeysDlgProc(HWND hwndDlg, @@ -182,13 +223,31 @@ case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_BOUNCE_TIME_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + i = SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_COMBO, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + pGlobalData->filterKeys.iBounceMSec = nBounceArray[i]; + } + } + break; + + case IDC_BOUNCE_TEST_EDIT: + switch (HIWORD(wParam)) + { + case EN_SETFOCUS: + EnableFilterKeysTest(pGlobalData); + break; + + case EN_KILLFOCUS: + DisableFilterKeysTest(pGlobalData); + break; + } + break; + case IDOK: - i = SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_COMBO, CB_GETCURSEL, 0, 0); - if (i != CB_ERR) - { - pGlobalData->filterKeys.iBounceMSec = nBounceArray[i]; - } - EndDialog(hwndDlg, TRUE); break; @@ -296,25 +355,53 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_REPEAT_COMBO), TRUE); break; + case IDC_REPEAT_DELAY_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_DELAY_COMBO, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + pGlobalData->filterKeys.iDelayMSec = nDelayArray[i]; + } + } + break; + + case IDC_REPEAT_REPEAT_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_REPEAT_COMBO, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + pGlobalData->filterKeys.iRepeatMSec = nRepeatArray[i]; + } + } + break; + + case IDC_REPEAT_WAIT_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_WAIT_COMBO, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + pGlobalData->filterKeys.iWaitMSec = nWaitArray[i]; + } + } + break; + + case IDC_REPEAT_TEST_EDIT: + switch (HIWORD(wParam)) + { + case EN_SETFOCUS: + EnableFilterKeysTest(pGlobalData); + break; + + case EN_KILLFOCUS: + DisableFilterKeysTest(pGlobalData); + break; + } + break; + case IDOK: - i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_DELAY_COMBO, CB_GETCURSEL, 0, 0); - if (i != CB_ERR) - { - pGlobalData->filterKeys.iDelayMSec = nDelayArray[i]; - } - - i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_REPEAT_COMBO, CB_GETCURSEL, 0, 0); - if (i != CB_ERR) - { - pGlobalData->filterKeys.iRepeatMSec = nRepeatArray[i]; - } - - i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_WAIT_COMBO, CB_GETCURSEL, 0, 0); - if (i != CB_ERR) - { - pGlobalData->filterKeys.iWaitMSec = nWaitArray[i]; - } - EndDialog(hwndDlg, TRUE); break; @@ -402,6 +489,19 @@ hwndDlg, (DLGPROC)BounceKeysDlgProc, (LPARAM)pGlobalData); + break; + + case IDC_FILTER_TEST_EDIT: + switch (HIWORD(wParam)) + { + case EN_SETFOCUS: + EnableFilterKeysTest(pGlobalData); + break; + + case EN_KILLFOCUS: + DisableFilterKeysTest(pGlobalData); + break; + } break; case IDC_FILTER_SOUND_CHECK:

1 0

[fireball] 29065: Gregor Brunmar <gregor.brunmar@home.se>: - Don't include files that aren't in the source directory to the project generation. - Fix tab indentation in generated files.
by fireball＠svn.reactos.org 16 Sep '07

16 Sep '07

Author: fireball Date: Sun Sep 16 16:54:52 2007 New Revision: 29065 URL: http://svn.reactos.org/svn/reactos?rev=29065&view=rev Log: Gregor Brunmar <gregor.brunmar(a)home.se>: - Don't include files that aren't in the source directory to the project generation. - Fix tab indentation in generated files. Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Sun Sep 16 16:54:52 2007 @@ -101,6 +101,9 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { + if (files[i]->file.directory != SourceDirectory) + continue; + // We want the full path here for directory support later on string path = Path::RelativeFromDirectory ( files[i]->file.relative_path, Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sun Sep 16 16:54:52 2007 @@ -156,6 +156,9 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { + if (files[i]->file.directory != SourceDirectory) + continue; + // We want the full path here for directory support later on string path = Path::RelativeFromDirectory ( files[i]->file.relative_path, @@ -622,27 +625,31 @@ break; } - if ( same_folder_index < split_path.size() ) - { + if ( same_folder_index < split_path.size() || last_folder.size() > split_path.size() ) + { + int tabStart = 1; if ( split_path.size() > last_folder.size() ) { for ( size_t ifolder = last_folder.size(); ifolder < split_path.size(); ifolder++ ) indent_tab.push_back('\t'); + tabStart = split_path.size() - last_folder.size() + 1; } else if ( split_path.size() < last_folder.size() ) { indent_tab.resize( split_path.size() + 3 ); - } - - for ( size_t ifolder = last_folder.size(); ifolder > same_folder_index; ifolder-- ) - { - fprintf ( OUT, "%s</Filter>\r\n", indent_tab.substr(0, indent_tab.size() - 1).c_str() ); - } - - for ( size_t ifolder = same_folder_index; ifolder < split_path.size(); ifolder++ ) - { - fprintf ( OUT, "%s<Filter\r\n", indent_tab.substr(0, indent_tab.size() - 1).c_str() ); - fprintf ( OUT, "%sName=\"%s\">\r\n", indent_tab.c_str(), split_path[ifolder].c_str() ); + tabStart = split_path.size() - last_folder.size() + 1; + } + + for ( size_t ifolder = last_folder.size(), itab = tabStart; ifolder > same_folder_index; ifolder--, itab++ ) + { + fprintf ( OUT, "%s</Filter>\r\n", indent_tab.substr(0, indent_tab.size() - itab).c_str() ); + } + + for ( size_t ifolder = same_folder_index, itab = split_path.size() - same_folder_index; ifolder < split_path.size(); ifolder++, itab-- ) + { + const string tab = indent_tab.substr(0, indent_tab.size() - itab); + fprintf ( OUT, "%s<Filter\r\n", tab.c_str() ); + fprintf ( OUT, "%s\tName=\"%s\">\r\n", tab.c_str(), split_path[ifolder].c_str() ); } last_folder = split_path; @@ -723,7 +730,7 @@ for ( size_t ifolder = last_folder.size(); ifolder > 0; ifolder-- ) { - indent_tab.resize( ifolder + 3 ); + indent_tab.resize( ifolder + 2 ); fprintf ( OUT, "%s</Filter>\r\n", indent_tab.c_str() ); }

1 0

[hpoussin] 29064: Add back support for files not in the root of the module directory Patch by Gregor Brunmar, gregor (dot) brunmar (at) home (dot) se
by hpoussin＠svn.reactos.org 16 Sep '07

16 Sep '07

Author: hpoussin Date: Sun Sep 16 13:12:15 2007 New Revision: 29064 URL: http://svn.reactos.org/svn/reactos?rev=29064&view=rev Log: Add back support for files not in the root of the module directory Patch by Gregor Brunmar, gregor (dot) brunmar (at) home (dot) se Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Sun Sep 16 13:12:15 2007 @@ -82,7 +82,6 @@ //$output->progress("$dsp_file (file $progress_current of $progress_max)"); // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'? - string dsp_path = module.output->relative_path; vector<string> c_srcs, source_files, header_files, resource_files, includes, libraries; StringSet common_defines; vector<const IfableData*> ifs_list; @@ -102,8 +101,11 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { - // TODO FIXME - do we want only the name of the file here? - string file = files[i]->file.name; + // We want the full path here for directory support later on + string path = Path::RelativeFromDirectory ( + files[i]->file.relative_path, + module.output->relative_path ); + string file = path + std::string("\\") + files[i]->file.name; source_files.push_back ( file ); if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sun Sep 16 13:12:15 2007 @@ -131,7 +131,6 @@ bool console = exe && (module.type == Win32CUI); bool include_idl = false; - string vcproj_path = module.output->relative_path; vector<string> source_files, resource_files, header_files, includes, includes_ros, libraries; StringSet common_defines; vector<const IfableData*> ifs_list; @@ -157,8 +156,11 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { - // TODO FIXME - do we want only the name of the file here? - string file = files[i]->file.name; + // We want the full path here for directory support later on + string path = Path::RelativeFromDirectory ( + files[i]->file.relative_path, + module.output->relative_path ); + string file = path + std::string("\\") + files[i]->file.name; if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file );

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs