Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 38993: revert 38992 as the problem is in wine's ole32.dll
by cwittich＠svn.reactos.org 21 Jan '09

21 Jan '09

Author: cwittich Date: Wed Jan 21 07:21:28 2009 New Revision: 38993 URL: http://svn.reactos.org/svn/reactos?rev=38993&view=rev Log: revert 38992 as the problem is in wine's ole32.dll Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] Wed Jan 21 07:21:28 2009 @@ -184,9 +184,7 @@ } } - - if (lpNumberOfBytesTransferred) - *lpNumberOfBytesTransferred = lpOverlapped->InternalHigh; + *lpNumberOfBytesTransferred = lpOverlapped->InternalHigh; if (!NT_SUCCESS(lpOverlapped->Internal)) {

1 0

[cwittich] 38992: check for null (fixes ole32 compobj winetest crash)
by cwittich＠svn.reactos.org 21 Jan '09

21 Jan '09

Author: cwittich Date: Wed Jan 21 06:50:24 2009 New Revision: 38992 URL: http://svn.reactos.org/svn/reactos?rev=38992&view=rev Log: check for null (fixes ole32 compobj winetest crash) Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] Wed Jan 21 06:50:24 2009 @@ -184,7 +184,9 @@ } } - *lpNumberOfBytesTransferred = lpOverlapped->InternalHigh; + + if (lpNumberOfBytesTransferred) + *lpNumberOfBytesTransferred = lpOverlapped->InternalHigh; if (!NT_SUCCESS(lpOverlapped->Internal)) {

1 0

[hyperion] 38991: modified tools/rbuild/backend/mingw/modulehandler.cpp modified tools/rbuild/backend/mingw/rule.cpp Add a few long overdue macros to the Rule class. Make rules now a little more readable Fixed winebuildDefRule: "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).auto.def" -> "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).auto.def" -> "$(intermediate_path_unique).auto.def" Fixed "$(source_path)$(SEP)$(source_name_noext).spec
by hyperion＠svn.reactos.org 21 Jan '09

21 Jan '09

Author: hyperion Date: Wed Jan 21 06:20:59 2009 New Revision: 38991 URL: http://svn.reactos.org/svn/reactos?rev=38991&view=rev Log: modified tools/rbuild/backend/mingw/modulehandler.cpp modified tools/rbuild/backend/mingw/rule.cpp Add a few long overdue macros to the Rule class. Make rules now a little more readable Fixed winebuildDefRule: "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).auto.def" -> "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).auto.def" -> "$(intermediate_path_unique).auto.def" Fixed "$(source_path)$(SEP)$(source_name_noext).spec" -> "$(source)" (what the eff, Arch?) makefile.auto stays identical after this change Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/rule.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Wed Jan 21 06:20:59 2009 @@ -1049,9 +1049,9 @@ module.pch->file->name + ".gch" ); } -Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: $($(module_name)_OBJS) $(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule arRule1 ( "$(intermediate_path_noext).a: $($(module_name)_OBJS) $(dependencies) | $(intermediate_dir)\n", + "$(intermediate_path_noext).a", + "$(intermediate_dir)$(SEP)", NULL ); Rule arRule2 ( "\t$(ECHO_AR)\n" "\t${ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); @@ -1059,143 +1059,143 @@ "\t${host_ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); Rule gasRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_unique).o: $(source)$(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_GAS)\n" "\t${gcc} -x assembler-with-cpp -o $@ -D__ASM__ $($(module_name)_CFLAGS) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); + "$(intermediate_path_unique).o", + "$(intermediate_dir)$(SEP)", NULL ); Rule bootRule ( "$(source): ${$(module_name)_precondition}\n" "$(module_output): $(source)$(dependencies) | $(OUTPUT)$(SEP)$(source_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAGS)\n", "$(OUTPUT)$(SEP)$(source_dir)$(SEP)", NULL ); Rule nasmRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_unique).o: $(source)$(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAGS)\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); + "$(intermediate_path_unique).o", + "$(intermediate_dir)$(SEP)", NULL ); Rule windresRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).coff: $(source)$(dependencies) $(WRC_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" + "$(intermediate_path_unique).coff: $(source)$(dependencies) $(WRC_TARGET) | $(intermediate_dir) $(TEMPORARY)\n" "\t$(ECHO_WRC)\n" "\t${gcc} -xc -E -DRC_INVOKED ${$(module_name)_RCFLAGS} $(source) > $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp\n" "\t$(Q)$(WRC_TARGET) ${$(module_name)_RCFLAGS} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp\n" "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp 2>$(NUL)\n" "\t${windres} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp -o $@\n" "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp 2>$(NUL)\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).coff", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h: $(WMC_TARGET) $(source) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_unique).coff", + "$(intermediate_dir)$(SEP)", NULL ); +Rule wmcRule ( "$(intermediate_path_noext).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h: $(WMC_TARGET) $(source) | $(intermediate_dir)\n" "\t$(ECHO_WMC)\n" - "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc $(source)\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc", + "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h -o $(intermediate_path_noext).rc $(source)\n", + "$(intermediate_path_noext).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule winebuildPDefRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_dir)$(SEP)", NULL ); +Rule winebuildPDefRule ( "$(intermediate_path_unique).spec: $(source)$(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CPP)\n" - "\t${gcc} -xc -E ${$(module_name)_RCFLAGS} $(source) > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec\n\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).auto.def: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t${gcc} -xc -E ${$(module_name)_RCFLAGS} $(source) > $(intermediate_path_unique).spec\n\n" + "$(intermediate_path_unique).auto.def: $(intermediate_path_unique).spec $(WINEBUILD_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WINEBLD)\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).auto.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec --filename $(module_dllname)\n\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).auto.def", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule winebuildPRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(intermediate_path_unique).auto.def --def -E $(intermediate_path_unique).spec --filename $(module_dllname)\n\n", + "$(intermediate_path_unique).spec", + "$(intermediate_path_unique).auto.def", + "$(intermediate_dir)$(SEP)", NULL ); +Rule winebuildPRule ( "$(intermediate_path_unique).stubs.c: $(intermediate_path_unique).spec $(WINEBUILD_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WINEBLD)\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $@ --pedll $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec --filename $(module_dllname)\n\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $@ --pedll $(intermediate_path_unique).spec --filename $(module_dllname)\n\n" + "$(intermediate_path_unique).stubs.o: $(intermediate_path_unique).stubs.c | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule winebuildDefRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).auto.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_unique).spec", + "$(intermediate_path_unique).stubs.c", + "$(intermediate_path_unique).stubs.o", + "$(intermediate_dir)$(SEP)", NULL ); +Rule winebuildDefRule ( "$(intermediate_path_unique).auto.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WINEBLD)\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).auto.def --def -E $(source) --filename $(module_dllname)\n\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).auto.def", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(intermediate_path_unique).auto.def --def -E $(source) --filename $(module_dllname)\n\n", + "$(intermediate_path_noext).spec", + "$(intermediate_path_unique).auto.def", + "$(intermediate_dir)$(SEP)", NULL ); +Rule winebuildRule ( "$(intermediate_path_unique).stubs.c: $(source) $(WINEBUILD_TARGET)\n" "\t$(ECHO_WINEBLD)\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $@ --pedll $(source_path)$(SEP)$(source_name_noext).spec --filename $(module_dllname)\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $@ --pedll $(source) --filename $(module_dllname)\n" + "$(intermediate_path_unique).stubs.o: $(intermediate_path_unique).stubs.c$(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); + "$(intermediate_path_unique).stubs.c", + "$(intermediate_path_unique).stubs.o", + "$(intermediate_dir)$(SEP)", NULL ); Rule widlHeaderRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_noext).h: $(source)$(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h $(source)\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(intermediate_path_noext).h $(source)\n", + "$(intermediate_path_noext).h", + "$(intermediate_dir)$(SEP)", NULL ); Rule widlServerRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_noext)_s.c $(intermediate_path_noext)_s.h: $(source)$(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(intermediate_path_noext)_s.h -s -S $(intermediate_path_noext)_s.c $(source)\n" + "$(intermediate_path_noext)_s.o: $(intermediate_path_noext)_s.c $(intermediate_path_noext)_s.h$(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); + "$(intermediate_path_noext)_s.h", + "$(intermediate_path_noext)_s.c", + "$(intermediate_path_noext)_s.o", + "$(intermediate_dir)$(SEP)", NULL ); Rule widlClientRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_noext)_c.c $(intermediate_path_noext)_c.h: $(source)$(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(intermediate_path_noext)_c.h -c -C $(intermediate_path_noext)_c.c $(source)\n" + "$(intermediate_path_noext)_c.o: $(intermediate_path_noext)_c.c $(intermediate_path_noext)_c.h$(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); + "$(intermediate_path_noext)_c.h", + "$(intermediate_path_noext)_c.c", + "$(intermediate_path_noext)_c.o", + "$(intermediate_dir)$(SEP)", NULL ); Rule widlProxyRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_noext)_p.c $(intermediate_path_noext)_p.h: $(source)$(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(intermediate_path_noext)_p.h -p -P $(intermediate_path_noext)_p.c $(source)\n" + "$(intermediate_path_noext)_p.o: $(intermediate_path_noext)_p.c $(intermediate_path_noext)_p.h$(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlDlldataRule ( "$(source): $(dependencies) ${$(module_name)_precondition} $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_noext)_p.h", + "$(intermediate_path_noext)_p.c", + "$(intermediate_path_noext)_p.o", + "$(intermediate_dir)$(SEP)", NULL ); +Rule widlDlldataRule ( "$(source): $(dependencies) ${$(module_name)_precondition} $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) --dlldata-only --dlldata=$(source) $(bare_dependencies)\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_noext).o: $(source) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).o", NULL ); + "$(intermediate_path_noext).o", NULL ); Rule widlTlbRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_dir)$(SEP)$(module_name).tlb: $(source)$(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(intermediate_path_noext).tlb $(source)\n", + "$(intermediate_dir)$(SEP)", NULL ); Rule gccRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_unique).o: $(source)$(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); + "$(intermediate_path_unique).o", NULL ); Rule gccHostRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_unique).o: $(source)$(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_HOSTCC)\n" "\t${host_gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); + "$(intermediate_path_unique).o", NULL ); Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_unique).o: $(source)$(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" "\t${gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); + "$(intermediate_path_unique).o", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(intermediate_path_unique).o: $(source)$(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_HOSTCC)\n" "\t${host_gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); + "$(intermediate_path_unique).o", NULL ); Rule emptyRule ( "", NULL ); void Modified: trunk/reactos/tools/rbuild/backend/mingw/rule.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rule.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rule.cpp [iso-8859-1] Wed Jan 21 06:20:59 2009 @@ -52,6 +52,9 @@ ReplaceVariable ( ret, "$(source_name)", source->name ); ReplaceVariable ( ret, "$(source_name_noext)", ReplaceExtension ( source->name , "" ) ); ReplaceVariable ( ret, "$(source_path)", backend->GetFullPath ( *source ) ); + ReplaceVariable ( ret, "$(intermediate_dir)", backend->GetFullPath ( FileLocation ( IntermediateDirectory, source->relative_path, "" ) ) ); + ReplaceVariable ( ret, "$(intermediate_path_noext)", ReplaceExtension ( backend->GetFullName ( FileLocation ( IntermediateDirectory, source->relative_path, source->name ) ), "" ) ); + ReplaceVariable ( ret, "$(intermediate_path_unique)", ReplaceExtension ( backend->GetFullName ( FileLocation ( IntermediateDirectory, source->relative_path, source->name ) ), "" ) + "_" + module.name ); } ReplaceVariable ( ret, "$(dependencies)", dep ); ReplaceVariable ( ret, "$(bare_dependencies)", additional_dependencies );

1 0

[cwittich] 38990: fix typo
by cwittich＠svn.reactos.org 21 Jan '09

21 Jan '09

Author: cwittich Date: Wed Jan 21 06:13:17 2009 New Revision: 38990 URL: http://svn.reactos.org/svn/reactos?rev=38990&view=rev Log: fix typo Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Jan 21 06:13:17 2009 @@ -109,7 +109,7 @@ ; Dynamic Link Libraries dll\3rdparty\freetype\freetype.dll 1 dll\3rdparty\mesa32\mesa32.dll 1 -dll\3rdparty\libxslt\ibxslt.dll 1 +dll\3rdparty\libxslt\libxslt.dll 1 dll\3rdparty\dxtn\dxtn.dll 1 optional dll\cpl\access\access.cpl 1

1 0

[cwittich] 38989: -add libxslt 1.1.24 -update libxml2 to 2.7.3 -add a new lib "wineldr" to hack around wine's .so lib crap (attention this depends on kernel32!) -enable the usage of libxslt in msxml3
by cwittich＠svn.reactos.org 21 Jan '09

21 Jan '09

Author: cwittich Date: Wed Jan 21 06:09:32 2009 New Revision: 38989 URL: http://svn.reactos.org/svn/reactos?rev=38989&view=rev Log: -add libxslt 1.1.24 -update libxml2 to 2.7.3 -add a new lib "wineldr" to hack around wine's .so lib crap (attention this depends on kernel32!) -enable the usage of libxslt in msxml3 Added: trunk/reactos/dll/3rdparty/libxslt/ (with props) trunk/reactos/dll/3rdparty/libxslt/AUTHORS (with props) trunk/reactos/dll/3rdparty/libxslt/COPYING (with props) trunk/reactos/dll/3rdparty/libxslt/ChangeLog (with props) trunk/reactos/dll/3rdparty/libxslt/Makefile.am (with props) trunk/reactos/dll/3rdparty/libxslt/Makefile.in (with props) trunk/reactos/dll/3rdparty/libxslt/NEWS (with props) trunk/reactos/dll/3rdparty/libxslt/README (with props) trunk/reactos/dll/3rdparty/libxslt/attributes.c (with props) trunk/reactos/dll/3rdparty/libxslt/attributes.h (with props) trunk/reactos/dll/3rdparty/libxslt/attrvt.c (with props) trunk/reactos/dll/3rdparty/libxslt/config.h (with props) trunk/reactos/dll/3rdparty/libxslt/documents.c (with props) trunk/reactos/dll/3rdparty/libxslt/documents.h (with props) trunk/reactos/dll/3rdparty/libxslt/extensions.c (with props) trunk/reactos/dll/3rdparty/libxslt/extensions.h (with props) trunk/reactos/dll/3rdparty/libxslt/extra.c (with props) trunk/reactos/dll/3rdparty/libxslt/extra.h (with props) trunk/reactos/dll/3rdparty/libxslt/functions.c (with props) trunk/reactos/dll/3rdparty/libxslt/functions.h (with props) trunk/reactos/dll/3rdparty/libxslt/imports.c (with props) trunk/reactos/dll/3rdparty/libxslt/imports.h (with props) trunk/reactos/dll/3rdparty/libxslt/keys.c (with props) trunk/reactos/dll/3rdparty/libxslt/keys.h (with props) trunk/reactos/dll/3rdparty/libxslt/libxslt.3 (with props) trunk/reactos/dll/3rdparty/libxslt/libxslt.h (with props) trunk/reactos/dll/3rdparty/libxslt/libxslt.rbuild (with props) trunk/reactos/dll/3rdparty/libxslt/namespaces.c (with props) trunk/reactos/dll/3rdparty/libxslt/namespaces.h (with props) trunk/reactos/dll/3rdparty/libxslt/numbers.c (with props) trunk/reactos/dll/3rdparty/libxslt/numbersInternals.h (with props) trunk/reactos/dll/3rdparty/libxslt/pattern.c (with props) trunk/reactos/dll/3rdparty/libxslt/pattern.h (with props) trunk/reactos/dll/3rdparty/libxslt/preproc.c (with props) trunk/reactos/dll/3rdparty/libxslt/preproc.h (with props) trunk/reactos/dll/3rdparty/libxslt/security.c (with props) trunk/reactos/dll/3rdparty/libxslt/security.h (with props) trunk/reactos/dll/3rdparty/libxslt/templates.c (with props) trunk/reactos/dll/3rdparty/libxslt/templates.h (with props) trunk/reactos/dll/3rdparty/libxslt/transform.c (with props) trunk/reactos/dll/3rdparty/libxslt/transform.h (with props) trunk/reactos/dll/3rdparty/libxslt/trio.h (with props) trunk/reactos/dll/3rdparty/libxslt/triodef.h (with props) trunk/reactos/dll/3rdparty/libxslt/variables.c (with props) trunk/reactos/dll/3rdparty/libxslt/variables.h (with props) trunk/reactos/dll/3rdparty/libxslt/win32config.h (with props) trunk/reactos/dll/3rdparty/libxslt/xslt.c (with props) trunk/reactos/dll/3rdparty/libxslt/xslt.h (with props) trunk/reactos/dll/3rdparty/libxslt/xsltInternals.h (with props) trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h (with props) trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h.in (with props) trunk/reactos/dll/3rdparty/libxslt/xsltexports.h (with props) trunk/reactos/dll/3rdparty/libxslt/xsltutils.c (with props) trunk/reactos/dll/3rdparty/libxslt/xsltutils.h (with props) trunk/reactos/dll/3rdparty/libxslt/xsltwin32config.h (with props) trunk/reactos/dll/3rdparty/libxslt/xsltwin32config.h.in (with props) trunk/reactos/include/reactos/libs/libxslt/ (with props) trunk/reactos/include/reactos/libs/libxslt/extensions.h (with props) trunk/reactos/include/reactos/libs/libxslt/libxslt.h (with props) trunk/reactos/include/reactos/libs/libxslt/numbersInternals.h (with props) trunk/reactos/include/reactos/libs/libxslt/pattern.h (with props) trunk/reactos/include/reactos/libs/libxslt/transform.h (with props) trunk/reactos/include/reactos/libs/libxslt/xslt.h (with props) trunk/reactos/include/reactos/libs/libxslt/xsltInternals.h (with props) trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h (with props) trunk/reactos/include/reactos/libs/libxslt/xsltexports.h (with props) trunk/reactos/include/reactos/libs/libxslt/xsltutils.h (with props) trunk/reactos/lib/3rdparty/libwine/loader.c (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/3rdparty/3rdparty.rbuild trunk/reactos/dll/win32/msxml3/msxml3.rbuild trunk/reactos/include/psdk/msxml2.idl trunk/reactos/include/reactos/libs/libxml/parser.h trunk/reactos/include/reactos/libs/libxml/parserInternals.h trunk/reactos/include/reactos/libs/libxml/relaxng.h trunk/reactos/include/reactos/libs/libxml/tree.h trunk/reactos/include/reactos/libs/libxml/valid.h trunk/reactos/include/reactos/libs/libxml/xmlerror.h trunk/reactos/include/reactos/libs/libxml/xmlmemory.h trunk/reactos/include/reactos/libs/libxml/xmlschemas.h trunk/reactos/include/reactos/libs/libxml/xmlversion.h trunk/reactos/include/reactos/libs/libxml/xmlversion.h.in trunk/reactos/include/reactos/libs/libxml/xmlwriter.h trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/library.h trunk/reactos/lib/3rdparty/libwine/libwine.rbuild trunk/reactos/lib/3rdparty/libxml2/ChangeLog trunk/reactos/lib/3rdparty/libxml2/SAX2.c trunk/reactos/lib/3rdparty/libxml2/configure trunk/reactos/lib/3rdparty/libxml2/configure.in trunk/reactos/lib/3rdparty/libxml2/elfgcchack.h trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild trunk/reactos/lib/3rdparty/libxml2/libxml2.spec trunk/reactos/lib/3rdparty/libxml2/parser.c trunk/reactos/lib/3rdparty/libxml2/testapi.c trunk/reactos/lib/3rdparty/libxml2/threads.c trunk/reactos/lib/3rdparty/libxml2/tree.c trunk/reactos/lib/3rdparty/libxml2/valid.c trunk/reactos/lib/3rdparty/libxml2/xmllint.c trunk/reactos/lib/3rdparty/libxml2/xmlwriter.c trunk/reactos/lib/3rdparty/libxml2/xpath.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/3rdparty.rbui… Added: trunk/reactos/dll/3rdparty/libxslt/AUTHORS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/AUTHO… Added: trunk/reactos/dll/3rdparty/libxslt/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/COPYI… Added: trunk/reactos/dll/3rdparty/libxslt/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/Chang… Added: trunk/reactos/dll/3rdparty/libxslt/Makefile.am URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/Makef… Added: trunk/reactos/dll/3rdparty/libxslt/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/Makef… Added: trunk/reactos/dll/3rdparty/libxslt/NEWS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/NEWS?… Added: trunk/reactos/dll/3rdparty/libxslt/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/READM… Added: trunk/reactos/dll/3rdparty/libxslt/attributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/attri… Added: trunk/reactos/dll/3rdparty/libxslt/attributes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/attri… Added: trunk/reactos/dll/3rdparty/libxslt/attrvt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/attrv… Added: trunk/reactos/dll/3rdparty/libxslt/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/confi… Added: trunk/reactos/dll/3rdparty/libxslt/documents.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/docum… Added: trunk/reactos/dll/3rdparty/libxslt/documents.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/docum… Added: trunk/reactos/dll/3rdparty/libxslt/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/exten… Added: trunk/reactos/dll/3rdparty/libxslt/extensions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/exten… Added: trunk/reactos/dll/3rdparty/libxslt/extra.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/extra… Added: trunk/reactos/dll/3rdparty/libxslt/extra.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/extra… Added: trunk/reactos/dll/3rdparty/libxslt/functions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/funct… Added: trunk/reactos/dll/3rdparty/libxslt/functions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/funct… Added: trunk/reactos/dll/3rdparty/libxslt/imports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/impor… Added: trunk/reactos/dll/3rdparty/libxslt/imports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/impor… Added: trunk/reactos/dll/3rdparty/libxslt/keys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/keys.… Added: trunk/reactos/dll/3rdparty/libxslt/keys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/keys.… Added: trunk/reactos/dll/3rdparty/libxslt/libxslt.3 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/libxs… Added: trunk/reactos/dll/3rdparty/libxslt/libxslt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/libxs… Added: trunk/reactos/dll/3rdparty/libxslt/libxslt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/libxs… Added: trunk/reactos/dll/3rdparty/libxslt/namespaces.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/names… Added: trunk/reactos/dll/3rdparty/libxslt/namespaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/names… Added: trunk/reactos/dll/3rdparty/libxslt/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/numbe… Added: trunk/reactos/dll/3rdparty/libxslt/numbersInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/numbe… Added: trunk/reactos/dll/3rdparty/libxslt/pattern.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/patte… Added: trunk/reactos/dll/3rdparty/libxslt/pattern.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/patte… Added: trunk/reactos/dll/3rdparty/libxslt/preproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/prepr… Added: trunk/reactos/dll/3rdparty/libxslt/preproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/prepr… Added: trunk/reactos/dll/3rdparty/libxslt/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/secur… Added: trunk/reactos/dll/3rdparty/libxslt/security.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/secur… Added: trunk/reactos/dll/3rdparty/libxslt/templates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/templ… Added: trunk/reactos/dll/3rdparty/libxslt/templates.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/templ… Added: trunk/reactos/dll/3rdparty/libxslt/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/trans… Added: trunk/reactos/dll/3rdparty/libxslt/transform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/trans… Added: trunk/reactos/dll/3rdparty/libxslt/trio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/trio.… Added: trunk/reactos/dll/3rdparty/libxslt/triodef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/triod… Added: trunk/reactos/dll/3rdparty/libxslt/variables.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/varia… Added: trunk/reactos/dll/3rdparty/libxslt/variables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/varia… Added: trunk/reactos/dll/3rdparty/libxslt/win32config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/win32… Added: trunk/reactos/dll/3rdparty/libxslt/xslt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xslt.… Added: trunk/reactos/dll/3rdparty/libxslt/xslt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xslt.… Added: trunk/reactos/dll/3rdparty/libxslt/xsltInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltI… Added: trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltc… Added: trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltc… Added: trunk/reactos/dll/3rdparty/libxslt/xsltexports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xslte… Added: trunk/reactos/dll/3rdparty/libxslt/xsltutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltu… Added: trunk/reactos/dll/3rdparty/libxslt/xsltutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltu… Added: trunk/reactos/dll/3rdparty/libxslt/xsltwin32config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltw… Added: trunk/reactos/dll/3rdparty/libxslt/xsltwin32config.h.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltw… Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… Modified: trunk/reactos/include/reactos/libs/libxml/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/parserInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/relaxng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/tree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/valid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlmemory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlschemas.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlversion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlversion.h.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlwriter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Added: trunk/reactos/include/reactos/libs/libxslt/extensions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… Added: trunk/reactos/include/reactos/libs/libxslt/libxslt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… Added: trunk/reactos/include/reactos/libs/libxslt/numbersInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… Added: trunk/reactos/include/reactos/libs/libxslt/pattern.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… Added: trunk/reactos/include/reactos/libs/libxslt/transform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… Added: trunk/reactos/include/reactos/libs/libxslt/xslt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… Added: trunk/reactos/include/reactos/libs/libxslt/xsltInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… Added: trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… Added: trunk/reactos/include/reactos/libs/libxslt/xsltexports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… Added: trunk/reactos/include/reactos/libs/libxslt/xsltutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… Modified: trunk/reactos/include/reactos/wine/library.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/libra… Modified: trunk/reactos/lib/3rdparty/libwine/libwine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/libwi… Added: trunk/reactos/lib/3rdparty/libwine/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/loade… Modified: trunk/reactos/lib/3rdparty/libxml2/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/Chang… Modified: trunk/reactos/lib/3rdparty/libxml2/SAX2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/SAX2.… Modified: trunk/reactos/lib/3rdparty/libxml2/configure URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/configure.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/elfgcchack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/elfgc… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/parse… Modified: trunk/reactos/lib/3rdparty/libxml2/testapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testa… Modified: trunk/reactos/lib/3rdparty/libxml2/threads.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/threa… Modified: trunk/reactos/lib/3rdparty/libxml2/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/tree.… Modified: trunk/reactos/lib/3rdparty/libxml2/valid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/valid… Modified: trunk/reactos/lib/3rdparty/libxml2/xmllint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlli… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlwriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlwr… Modified: trunk/reactos/lib/3rdparty/libxml2/xpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xpath…

1 0

[dchapyshev] 38988: - Update Russian translation
by dchapyshev＠svn.reactos.org 21 Jan '09

21 Jan '09

Author: dchapyshev Date: Wed Jan 21 05:27:19 2009 New Revision: 38988 URL: http://svn.reactos.org/svn/reactos?rev=38988&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc [iso-8859-1] Wed Jan 21 05:27:19 2009 @@ -13,7 +13,7 @@ GROUPBOX "Ôèëüòðàöèÿ ââîäà",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Èãíîðèðîâàíèå ñëó÷àéíûõ êðàòêîâðåìåííûõ èëè ïîâòîðíûõ íàæàòèé êëàâèø.",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "Èñïîëüçîâàòü &ôèëüòðàöèþ ââîäà",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+6,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + AUTOCHECKBOX "Èñïîëüçîâàòü &ôèëüòðàöèþ ââîäà",IDC_FILTER_BOX, 12, 125, 134, 14 PUSHBUTTON "Í&àñòðîéêà",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(13)+6,PROPSHEETPADDING(15)-5,14 GROUPBOX "Îçâó÷èâàíèå ïåðåêëþ÷åíèÿ ðåæèìîâ",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) @@ -32,12 +32,12 @@ BEGIN GROUPBOX "Âèçóàëüíîå îïîâåùåíèå",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Ñîïðîâîæäåíèå çâóêîâûõ ñèãíàëîâ âèçóàëüíûì îïîâåùåíèåì.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "Â&èçóàëüíîå îïîâåùåíèå",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15)+2,14 + AUTOCHECKBOX "Â&èçóàëüíîå îïîâåùåíèå",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15)+10,14 LTEXT "Îïîâåùåíèå ïîëüçîâàòåëÿ:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Ñóáòèòðû",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Ñîïðîâîæäåíèå çâóêîâ è ðå÷è ñóáòèòðàìè.",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + LTEXT "Ñîïðîâîæäåíèå çâóêîâ è ðå÷è ñóáòèòðàìè.",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)-7 AUTOCHECKBOX "Ñ&óáòèòðû",IDC_SSHOW_BOX,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 END @@ -52,15 +52,15 @@ AUTOCHECKBOX "&Âûñîêàÿ êîíòðàñòíîñòü",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "&Íàñòðîéêà",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) - LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) - LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + GROUPBOX "Ïàðàìåòðû êóðñîðà",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "×òîáû èçìåíèòü ÷àñòîòó ìåðöàíèÿ êóðñîðà è åãî øèðèíó, âîñïîëüçóéòåñü ñëåäóþùèìè ïîëçóíêàìè.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "&×àñòîòà ìåðöàíèÿ:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Ðåæå",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "×àùå",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) - CTEXT "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) - LTEXT "Wide",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CTEXT "&Òîëùèíà:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Óæå",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Øèðå",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(2) LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 END @@ -84,7 +84,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Àâòîìàòè÷åñêèé ñáðîñ",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "&Îòêëþ÷àòü ïðè ïðîñòîå â òå÷åíèå:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Îòêëþ÷àòü ïðè ïðîñòîå â òå÷åíèå:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -93,9 +93,9 @@ AUTOCHECKBOX "Âûäàâàòü çâóêîâîé ñèãíàë ïðè èçìåíåíèè ð&åæèìà",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 GROUPBOX "Àëüòåðíàòèâíûå óñòðîéñòâà ââîäà",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - LTEXT "Èñïîëüçîâàíèå àëüòåðíàòèâíûõ óñòðîéñòâ ââîäà, çàìåíÿþùèõ ìûøü è êëàâèàòóðó.",-1,PROPSHEETPADDING(2),LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - AUTOCHECKBOX "&Àëüòåðíàòèâíûå óñòðîéñòâà ââîäà",IDC_SERIAL_BOX,PROPSHEETPADDING(2),LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 - PUSHBUTTON "Íà&ñòðîéêà",IDC_SERIAL_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(16)-4,PROPSHEETPADDING(15),14 + LTEXT "Èñïîëüçîâàíèå àëüòåðíàòèâíûõ óñòðîéñòâ ââîäà, çàìåíÿþùèõ ìûøü è êëàâèàòóðó.",-1,12,124,222,18 + AUTOCHECKBOX "&Àëüòåðíàòèâíûå óñòðîéñòâà ââîäà",IDC_SERIAL_BOX,12,142,138,14 + PUSHBUTTON "Íà&ñòðîéêà",IDC_SERIAL_BUTTON,153,142,81,14 GROUPBOX "Àäìèíèñòðàòèâíûå ïàðàìåòðû",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Ïðèìåíèòü &ê ðàáî÷åìó ñòîëó âõîäà â ñèñòåìó",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 @@ -112,13 +112,13 @@ LTEXT "Íàæàòèå êëàâèøè SHIFT 5 ðàç àêòèâèðóåò çàëèïàíèå êëàâèø.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Àêòèâèðîâàòü çàëèïàíèå êëàâèø",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - GROUPBOX "Options",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + GROUPBOX "Ïàðàìåòðû",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Äâîéíîå íàæàòèå çàïèðàåò êëàâèøè Ctrl, Shift è Alt",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "Îòê&ëþ÷àòü çàëèïàíèå ïðè íàæàòèè ñðàçó äâóõ êëàâèø",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Óâåäîìëåíèå",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Âûäàâàòü çâóêîâîé ñèãíàë ïðè íàæàòèè Ctrl, Shift è Alt",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Îòîáðàæàòü ñîñòîÿíèå ðåæèìà çàëèïàíèÿ íà ýêðàíå",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -127,178 +127,178 @@ IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Filter Keys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for FilterKeys is: \nHold down <Right Shift> for eight seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "&Use shortcut",IDC_FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 - - GROUPBOX "Filter options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5 - AUTORADIOBUTTON "Ign&ore repeated keystrokes",IDC_FILTER_BOUNCE_RADIO,PROPSHEETPADDING(2),LABELLINE(9)+7,PROPSHEETPADDING(20),LABELLINE(1),WS_GROUP|WS_TABSTOP - AUTORADIOBUTTON "Ig&nore quick keystrokes and slow down the repeat rate",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHEETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE - PUSHBUTTON "&Settings",IDC_FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PROPSHEETPADDING(15),14,WS_GROUP - PUSHBUTTON "S&ettings",IDC_FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,PROPSHEETPADDING(15),14,WS_GROUP - LTEXT "&Click here and type here to test the settings:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) +CAPTION "Íàñòðîéêà ðåæèìà ôèëüòðàöèè" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Âêëþ÷åíèå ðåæèìà",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Âêëþ÷åíèå ðåæèìà ôèëüòðàöèè: \nóäåðæèâàíèå êëàâèøè <Shift ñïðàâà> â òå÷åíèå 8 ñåêóíä.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Èñïîëüçîâàòü òàêîé ñïîñîá âêëþ÷åíèÿ",IDC_FILTER_ACTIVATE_CHECK,12,49,154,14 + + GROUPBOX "Ïàðàìåòðû ôèëüòðàöèè",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5 + AUTORADIOBUTTON "Èãíîðèðîâàòü &ïîâòîðíûå íàæàòèÿ",IDC_FILTER_BOUNCE_RADIO,12,90,141,11,WS_GROUP|WS_TABSTOP + AUTORADIOBUTTON "Èãíîðèðîâàòü &êðàòêèå íàæàòèÿ; çàìåäëèòü ïîâòîð",IDC_FILTER_REPEAT_RADIO,12,106,142,20,BS_TOP|BS_MULTILINE + PUSHBUTTON "&Íàñòðîéêà",IDC_FILTER_BOUNCE_BUTTON, 159, 88, 75, 14,WS_GROUP + PUSHBUTTON "Í&àñòðîéêà",IDC_FILTER_REPEAT_BUTTON, 159, 106, 75, 14,WS_GROUP + LTEXT "&Îáëàñòü ïðîâåðêè ïàðàìåòðîâ ôèëüòðàöèè:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) EDITTEXT IDC_FILTER_TEST_EDIT,PROPSHEETPADDING(2),LABELLINE(15)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),14,WS_GROUP|ES_AUTOHSCROLL - GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(17)+6,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+3 - AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + GROUPBOX "Óâåäîìëåíèå",-1,PROPSHEETPADDING(1),LABELLINE(17)+6,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+3 + AUTOCHECKBOX "&Çâóêîâîé ñèãíàë ïðè íàæàòèè êëàâèø è ïðèåìå ââîäà",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + AUTOCHECKBOX "Îòîáðàæàòü ñîñòîÿíèå ðåæèìà ôèëüòðàöèè íà &ýêðàíå",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_TOGGLEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Toggle Keys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +CAPTION "Íàñòðîéêà ðåæèìà îçâó÷èâàíèÿ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Âêëþ÷åíèå ðåæèìà",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Âêëþ÷åíèå ðåæèìà îçâó÷èâàíèÿ: \nóäåðæèâàíèå êëàâèøè <Num Lock> â òå÷åíèå 5 ñåêóíä.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Èñïîëüçîâàòü òàêîé ñïîñîá âêëþ÷åíèÿ",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "High Contrast Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - LTEXT "Current Color Scheme:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) +CAPTION "Íàñòðîéêà ðåæèìà âûñîêîé êîíòðàñòíîñòè" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Âêëþ÷åíèå ðåæèìà",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Âêëþ÷åíèå ðåæèìà âûñîêîé êîíòðàñòíîñòè: \n<Alt ñëåâà>+ <Shift ñëåâà>+<Print Screen>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Èñïîëüçîâàòü òàêîé ñïîñîá âêëþ÷åíèÿ",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Êîíòðàñòíàÿ ñõåìà îôîðìëåíèÿ",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "&Òåêóùàÿ êîíòðàñòíàÿ ñõåìà îôîðìëåíèÿ:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Mouse Keys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) - - LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) - LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) +CAPTION "Íàñòðîéêà óïðàâëåíèÿ óêàçàòåëåì ñ êëàâèàòóðû" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Âêëþ÷åíèå ðåæèìà",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Âêëþ÷åíèå óïðàâëåíèÿ óêàçàòåëåì ñ êëàâèàòóðû: \n<Alt ñëåâà>+<Shift ñëåâà>+<Num Lock>",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Èñïîëüçîâàòü òàêîé ñïîñîá âêëþ÷åíèÿ",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Ñêîðîñòü ïåðåìåùåíèÿ óêàçàòåëÿ",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Ìàêñèìàëüíàÿ:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8)+2,LABELLINE(1) + LTEXT "íèæå",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) - LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + LTEXT "âûøå",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Ó&ñêîðåíèå:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "íèæå",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) - - AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - - AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + LTEXT "âûøå",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "<CTRL> - óñ&êîðåíèå, <SHIFT> - çàìåäëåíèå äâèæåíèÿ",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Èñïîëüçîâàòü óïðàâëåíèå ñ êëàâèàòóðû, åñëè <Num Lock>:",-1, 6, 171, 118, 19 + AUTORADIOBUTTON "&âêëþ÷åí",IDC_MOUSEKEYS_ON_RADIO, 129, 174, 49, 11 + AUTORADIOBUTTON "î&òêëþ÷åí",IDC_MOUSEKEYS_OFF_RADIO, 182, 174, 52, 11 + + AUTOCHECKBOX "&Îòîáðàæàòü ñîñòîÿíèå ðåæèìà óïðàâëåíèÿ íà ýêðàíå",IDC_MOUSEKEYS_STATUS_CHECK, 6, 190, 220, 14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_BOUNCEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced FilterKeys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) +CAPTION "Äîïîëíèòåëüíûå ïàðàìåòðû ðåæèìà ôèëüòðàöèè" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ïàðàìåòðû",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Èãíîðèðîâàòü íàæàòèÿ ñ èíòåðâàëîì ïîâòîðà ìåíåå:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "&Ïðîâåðêà:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced FilterKeys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) - LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) - - LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) +CAPTION "Äîïîëíèòåëüíûå ïàðàìåòðû ðåæèìà ôèëüòðàöèè" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ïîâòîð ñèìâîëîâ",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Èçìåíåíèå ïàðàìåòðîâ ðàáîòû ñ êëàâèàòóðîé:",-1, 12, 20, 190, 11 + + AUTORADIOBUTTON "&íåò ïîâòîðîâ ïðè óäåðæèâàíèè êëàâèø",IDC_REPEAT_NOREPEAT_RADIO,12, 32, 160, 11,WS_GROUP + AUTORADIOBUTTON "çà&ìåäëåíèå ïîâòîðîâ",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "&Çàäåðæêà ïåðåä íà÷àëîì ïîâòîðà ñèìâîëà:",-1, 24, 60, 167, 11 COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + LTEXT "Ñ&êîðîñòü ïîâòîðà:",-1, 24, 89, 89, 11 COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 - LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + GROUPBOX "Ìåäëåííîå íàæàòèå êëàâèø",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Óäåðæèâàíèå íàæàòîé êëàâèøè:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "&Ïðîâåðêà:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "SerialKeys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) - LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "&Serial port:",-1,PROPSHEETPADDING(2),LABELLINE(3)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) +CAPTION "Íàñòðîéêà àëüòåðíàòèâíîãî óñòðîéñòâà ââîäà" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ïàðàìåòðû",-1, 6, 6, 234, 92 + LTEXT "Óêàæèòå ïîðò, ê êîòîðîìó ïðèñîåäèíåíî àëüòåðíàòèâíîå óñòðîéñòâî ââîäà.",-1, 12, 16, 222, 20 + + LTEXT "&Ïîñëåäîâàòåëüíûé ïîðò:",-1, 12, 34, 222, 10 COMBOBOX IDC_SERIAL_PORT_COMBO, PROPSHEETPADDING(2), LABELLINE(4)+7, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "&Baud rate:",-1,PROPSHEETPADDING(2),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + LTEXT "&Ñêîðîñòü (áèò/ñ):",-1, 12, 65, 222, 10 COMBOBOX IDC_SERIAL_BAUD_COMBO, PROPSHEETPADDING(2), LABELLINE(8)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Ñïåöèàëüíûå âîçìîæíîñòè" - IDS_CPLSYSTEMDESCRIPTION "Íàñòðîéêà ñïåöèàëüíûõ âîçìîæíîñòåé Âàøåãî êîìïüþòåðà." + IDS_CPLSYSTEMDESCRIPTION "Íàñòðîéêà ñïåöèàëüíûõ âîçìîæíîñòåé âàøåãî êîìïüþòåðà." IDS_SENTRY_NONE "[íåò]" - IDS_SENTRY_TITLE "Ïîäñâå÷èâàòü çàãîëîâê" + IDS_SENTRY_TITLE "Ïîäñâå÷èâàòü çàãîëîâîê" IDS_SENTRY_WINDOW "Ïîäñâå÷èâàòü àêòèâíîå îêíî" IDS_SENTRY_DISPLAY "Ïîäñâå÷èâàòü ðàáî÷èé ñòîë" - IDS_SECONDS "Seconds" - IDS_MINUTES "Ìèíóòû" -END + IDS_SECONDS "ñåê." + IDS_MINUTES "ìèí." +END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] Wed Jan 21 05:27:19 2009 @@ -142,6 +142,6 @@ IDS_ISCONNECTED "Ïîäêëþ÷åíî ëè óñòðîéñòâî?" IDS_PROBELISTTITLE "Íà ýòîì êîìïüþòåðå óæå óñòàíîâëåíî ñëåäóþùåå îáîðóäîâàíèå" IDS_ADDNEWDEVICE "Äîáàâëåíèå íîâîãî óñòðîéñòâà" - IDS_SELECTWAYTITLE "The wizard can help you install other hardware" - IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" + IDS_SELECTWAYTITLE "Ýòîò ìàñòåð ïîìîãàåò óñòàíîâèòü íîâîå îáîðóäîâàíèå" + IDS_HDTYPESTITLE "Âûáåðèòå òèï óñòàíàâëèâàåìîãî îáîðóäîâàíèÿ èç ñïèñêà." END

1 0

[dchapyshev] 38987: - Replace watermark.bmp and header.bmp with better (from me)
by dchapyshev＠svn.reactos.org 21 Jan '09

21 Jan '09

Author: dchapyshev Date: Wed Jan 21 04:20:53 2009 New Revision: 38987 URL: http://svn.reactos.org/svn/reactos?rev=38987&view=rev Log: - Replace watermark.bmp and header.bmp with better (from me) Modified: trunk/reactos/base/setup/reactos/res/watermark.bmp trunk/reactos/base/setup/vmwinst/resources/header.bmp trunk/reactos/base/setup/vmwinst/resources/watermark.bmp trunk/reactos/dll/cpl/appwiz-new/resources/watermark.bmp trunk/reactos/dll/cpl/appwiz/resources/watermark.bmp trunk/reactos/dll/cpl/hdwwiz/resources/header.bmp trunk/reactos/dll/cpl/hdwwiz/resources/watermark.bmp trunk/reactos/dll/win32/newdev/resources/header.bmp trunk/reactos/dll/win32/newdev/resources/watermark.bmp trunk/reactos/dll/win32/syssetup/resources/header.bmp trunk/reactos/dll/win32/syssetup/resources/watermark.bmp Modified: trunk/reactos/base/setup/reactos/res/watermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/res/wat… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/setup/vmwinst/resources/header.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/resourc… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/setup/vmwinst/resources/watermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/resourc… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/appwiz-new/resources/watermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/resourc… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/appwiz/resources/watermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/w… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/hdwwiz/resources/header.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resources/h… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/hdwwiz/resources/watermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resources/w… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/newdev/resources/header.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/newdev/resources/watermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/syssetup/resources/header.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/syssetup/resources/watermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== Binary files - no diff available.

1 0

[mjmartin] 38986: - npfs.h: The member named WriteMode is meaningless for pipes, as the write mode is the PipeType for both client and server. Change names to something more descriptive, ServerReadMode and ClientReadMode, for the members new use. - create.c: Use new members. - finfo.c: Check whether the pipe side is server or client and change/return appropriate ReadMode. - fsctrl.c: Opps. Previous implementation was pretty much correct. - rw.c: Silence debug message and use new members. Add mul
by mjmartin＠svn.reactos.org 21 Jan '09

21 Jan '09

Author: mjmartin Date: Wed Jan 21 01:52:45 2009 New Revision: 38986 URL: http://svn.reactos.org/svn/reactos?rev=38986&view=rev Log: - npfs.h: The member named WriteMode is meaningless for pipes, as the write mode is the PipeType for both client and server. Change names to something more descriptive,ServerReadMode and ClientReadMode, for the members new use. - create.c: Use new members. - finfo.c: Check whether the pipe side is server or client and change/return appropriate ReadMode. - fsctrl.c: Opps. Previous implementation was pretty much correct. - rw.c: Silence debug message and use new members. Add multiple checks on whether pipe side is server or client and use appropriate ReadMode. If handling the next Irp in NpfsRead, remove the cancel routine before continuing the loop. Fixes BugCheck when running ntdll_winetest for file. Thank Christoph von Wittich for pointing this out. Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/finfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/npfs.h trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Wed Jan 21 01:52:45 2009 @@ -420,10 +420,9 @@ KeInitializeMutex(&Fcb->CcbListLock, 0); Fcb->PipeType = Buffer->NamedPipeType; - /* FIXME: Verify which is correct */ - Fcb->WriteMode = Buffer->ReadMode;//Buffer->NamedPipeType; + Fcb->ServerReadMode = Buffer->ReadMode; /* MSDN documentation reads that clients always start off in byte mode */ - Fcb->ReadMode = FILE_PIPE_BYTE_STREAM_MODE; + Fcb->ClientReadMode = FILE_PIPE_BYTE_STREAM_MODE; Fcb->CompletionMode = Buffer->CompletionMode; switch (IoStack->Parameters.CreatePipe.ShareAccess & (FILE_SHARE_READ|FILE_SHARE_WRITE)) Modified: trunk/reactos/drivers/filesystems/npfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] Wed Jan 21 01:52:45 2009 @@ -35,9 +35,17 @@ DPRINT("Cannot change readmode to message type on a byte type pipe!\n"); return STATUS_ACCESS_DENIED; } - + /* Set Pipe Data */ - Fcb->ReadMode = Request->ReadMode; + if (Ccb->PipeEnd == FILE_PIPE_CLIENT_END) + { + Fcb->ClientReadMode = Request->ReadMode; + } + else + { + Fcb->ServerReadMode = Request->ReadMode; + } + Fcb->CompletionMode = Request->CompletionMode; /* Return Success */ @@ -75,6 +83,7 @@ PULONG BufferLength) { PNPFS_FCB Fcb; + ULONG ConnectionSideReadMode; DPRINT("NpfsQueryPipeInformation()\n"); /* Get the Pipe */ @@ -82,10 +91,14 @@ /* Clear Info */ RtlZeroMemory(Info, sizeof(FILE_PIPE_INFORMATION)); + + + if (Ccb->PipeEnd == FILE_PIPE_CLIENT_END) ConnectionSideReadMode=Ccb->Fcb->ClientReadMode; + else ConnectionSideReadMode = Ccb->Fcb->ServerReadMode; /* Return Info */ Info->CompletionMode = Fcb->CompletionMode; - Info->ReadMode = Fcb->ReadMode; + Info->ReadMode = ConnectionSideReadMode; /* Return success */ *BufferLength -= sizeof(FILE_PIPE_INFORMATION); Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Wed Jan 21 01:52:45 2009 @@ -432,28 +432,14 @@ ReadDataAvailable -= MessageLength; MessageCount++; - if (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) - { + /* If its the first message, copy the Message if the size of buffer is large enough */ + if (MessageCount==1) + { if ((Reply->Data[0]) - && (OutputBufferLength >= (MessageLength + ReturnLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])))) - { - memcpy((PVOID)((ULONG_PTR)&Reply->Data[0] + ReturnLength), - (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), - MessageLength); - ReturnLength += MessageLength; - } - } - else - { - /* If its the first message, copy the Message if the size of buffer is large enough */ - if (MessageCount==1) - { - if ((Reply->Data[0]) - && (OutputBufferLength >= (MessageLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])))) - { - memcpy(&Reply->Data[0], (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), MessageLength); - ReturnLength = MessageLength; - } + && (OutputBufferLength >= (MessageLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])))) + { + memcpy(&Reply->Data[0], (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), MessageLength); + ReturnLength = MessageLength; } } Modified: trunk/reactos/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] Wed Jan 21 01:52:45 2009 @@ -26,8 +26,8 @@ LIST_ENTRY WaiterListHead; LIST_ENTRY EmptyBufferListHead; ULONG PipeType; - ULONG ReadMode; - ULONG WriteMode; + ULONG ClientReadMode; + ULONG ServerReadMode; ULONG CompletionMode; ULONG PipeConfiguration; ULONG MaximumInstances; Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Wed Jan 21 01:52:45 2009 @@ -346,7 +346,7 @@ if (Ccb->Data == NULL) { - DPRINT1("Pipe is NOT readable!\n"); + DPRINT("Pipe is NOT readable!\n"); Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; goto done; @@ -426,13 +426,18 @@ { if (Ccb->ReadDataAvailable == 0) { + ULONG ConnectionSideReadMode; + + if (Ccb->PipeEnd == FILE_PIPE_CLIENT_END) ConnectionSideReadMode=Ccb->Fcb->ClientReadMode; + else ConnectionSideReadMode = Ccb->Fcb->ServerReadMode; + if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) { ASSERT(Ccb->OtherSide != NULL); KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); } if (Information > 0 && - (Ccb->Fcb->ReadMode != FILE_PIPE_BYTE_STREAM_MODE || + (ConnectionSideReadMode != FILE_PIPE_BYTE_STREAM_MODE || Ccb->PipeState != FILE_PIPE_CONNECTED_STATE)) { break; @@ -473,7 +478,6 @@ Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; Context->WaitEvent = &Ccb->ReadEvent; - Status = NpfsAddWaitingReadWriteRequest(DeviceObject, Irp); if (NT_SUCCESS(Status)) @@ -488,7 +492,7 @@ ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); /* If the pipe type and read mode are both byte stream */ - if ((Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_TYPE) && (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE)) + if (Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_TYPE) { DPRINT("Byte stream mode: Ccb->Data %x\n", Ccb->Data); /* Byte stream mode */ @@ -613,7 +617,12 @@ if (Information > 0) { - if ((Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) && (Ccb->ReadDataAvailable) && (Length > CopyLength)) + ULONG ConnectionSideReadMode; + + if (Ccb->PipeEnd == FILE_PIPE_CLIENT_END) ConnectionSideReadMode=Ccb->Fcb->ClientReadMode; + else ConnectionSideReadMode = Ccb->Fcb->ServerReadMode; + + if ((ConnectionSideReadMode == FILE_PIPE_BYTE_STREAM_MODE) && (Ccb->ReadDataAvailable) && (Length > CopyLength)) { Buffer = (PVOID)((ULONG_PTR)Buffer + CopyLength); Length -= CopyLength; @@ -660,6 +669,8 @@ } else { + KIRQL oldIrql; + if (IsOriginalRequest) { IsOriginalRequest = FALSE; @@ -679,8 +690,23 @@ DPRINT("NpfsRead done (Status %lx)\n", OriginalStatus); return OriginalStatus; } + + IoAcquireCancelSpinLock(&oldIrql); Context = CONTAINING_RECORD(Ccb->ReadRequestListHead.Flink, NPFS_CONTEXT, ListEntry); + Irp = CONTAINING_RECORD(Context, IRP, Tail.Overlay.DriverContext); + /* Verify the Irp wasnt cancelled */ + if (Irp->Cancel) + { + IoReleaseCancelSpinLock(oldIrql); + RemoveEntryList(&Context->ListEntry); + ExReleaseFastMutex(&Ccb->DataListLock); + Status = STATUS_CANCELLED; + goto done; + } + /* The Irp will now be handled, so remove the CancelRoutine */ + (void)IoSetCancelRoutine(Irp, NULL); + IoReleaseCancelSpinLock(oldIrql); } } @@ -810,7 +836,7 @@ ExAcquireFastMutex(&ReaderCcb->DataListLock); } - if ((Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_TYPE) && (Ccb->Fcb->WriteMode == FILE_PIPE_BYTE_STREAM_MODE)) + if (Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_TYPE) { DPRINT("Byte stream mode: Ccb->Data %x, Ccb->WritePtr %x\n", ReaderCcb->Data, ReaderCcb->WritePtr); @@ -853,7 +879,7 @@ break; } } - else if ((Ccb->Fcb->PipeType == FILE_PIPE_MESSAGE_TYPE) && (Ccb->Fcb->WriteMode == FILE_PIPE_MESSAGE_MODE)) + else if (Ccb->Fcb->PipeType == FILE_PIPE_MESSAGE_TYPE) { /* For Message Type Pipe, the Pipes memory will be used to store the size of each message */ DPRINT("Message mode: Ccb->Data %x, Ccb->WritePtr %x\n",ReaderCcb->Data, ReaderCcb->WritePtr);

1 0

[tkreuzer] 38985: kdcom: Implement KdpReceivePacketLeader that tries to get a packet leader and starts over as soon as a single byte is wrong. Use it instead of the old code in KdReceivePacket. Implement more of KdReceivePacket, handling the actual packets. Make use of CurrentPacketId that gets xored with 1 when sending acks and initialized on a reset. Not handling this correctly made WinDbg wait for more packets, although it sent an ack packet already. Only return KdPacketReceived on an ack pac
by tkreuzer＠svn.reactos.org 21 Jan '09

21 Jan '09

Author: tkreuzer Date: Tue Jan 20 20:53:48 2009 New Revision: 38985 URL: http://svn.reactos.org/svn/reactos?rev=38985&view=rev Log: kdcom: Implement KdpReceivePacketLeader that tries to get a packet leader and starts over as soon as a single byte is wrong. Use it instead of the old code in KdReceivePacket. Implement more of KdReceivePacket, handling the actual packets. Make use of CurrentPacketId that gets xored with 1 when sending acks and initialized on a reset. Not handling this correctly made WinDbg wait for more packets, although it sent an ack packet already. Only return KdPacketReceived on an ack packet, when we requested one. Stuff starts to work now. WinDbg connects then reports "Assertion 'Data->Length == 0' failed at ntoskrnl\kd64\kdapi.c line 310". Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Tue Jan 20 20:53:48 2009 @@ -563,17 +563,48 @@ Ret = KdPortGetByteEx(&DefaultPort, &ByteBuffer[i]); TimeOut = FALSE; // FIXME timeout after 10 Sec } - while (!Ret | TimeOut); + while (!Ret || TimeOut); if (TimeOut) { return KdPacketTimedOut; } - FrLdrDbgPrint("Received byte: %x\n", ByteBuffer[i]); +// FrLdrDbgPrint("Received byte: %x\n", ByteBuffer[i]); } return KdPacketReceived; } + +KDSTATUS +NTAPI +KdpReceivePacketLeader( + OUT PULONG PacketLeader) +{ + UCHAR Byte, PrevByte; + ULONG i, Temp; + KDSTATUS RcvCode; + + Temp = 0; + PrevByte = 0; + for (i = 0; i < 4; i++) + { + RcvCode = KdpReceiveBuffer(&Byte, sizeof(UCHAR)); + Temp = (Temp << 8) | Byte; + if ( (RcvCode != KdPacketReceived) || + ((Byte != PACKET_LEADER_BYTE) && + (Byte != CONTROL_PACKET_LEADER_BYTE)) || + (PrevByte != 0 && Byte != PrevByte) ) + { + return KdPacketNeedsResend; + } + PrevByte = Byte; + } + + *PacketLeader = Temp; + + return KdPacketReceived; +} + VOID NTAPI @@ -713,8 +744,8 @@ } /****************************************************************************** - * \name KdDebuggerInitialize0 - * \brief Phase 0 initialization. + * \name KdDebuggerInitialize1 + * \brief Phase 1 initialization. * \param [opt] LoaderBlock Pointer to the Loader parameter block. Can be NULL. * \return Status */ @@ -852,16 +883,17 @@ OUT PULONG DataLength, IN OUT PKD_CONTEXT Context) { - UCHAR BreakIn = 0; + UCHAR Byte = 0; KDSTATUS RcvCode; KD_PACKET Packet; + ULONG Checksum; /* Special handling for breakin packet */ if(PacketType == PACKET_TYPE_KD_POLL_BREAKIN) { - if (KdPortGetByteEx(&DefaultPort, &BreakIn)) - { - if (BreakIn == BREAKIN_PACKET_BYTE) + if (KdPortGetByteEx(&DefaultPort, &Byte)) + { + if (Byte == BREAKIN_PACKET_BYTE) { return KdPacketReceived; } @@ -871,12 +903,11 @@ for (;;) { + FrLdrDbgPrint("KdReceivePacket 0\n"); + /* Step 1 - Read PacketLeader */ - RcvCode = KdpReceiveBuffer(&Packet.PacketLeader, sizeof(ULONG)); - if ( (RcvCode != KdPacketReceived) || - ((Packet.PacketLeader != BREAKIN_PACKET) && - (Packet.PacketLeader != PACKET_LEADER) && - (Packet.PacketLeader != CONTROL_PACKET_LEADER)) ) + RcvCode = KdpReceivePacketLeader(&Packet.PacketLeader); + if (RcvCode != KdPacketReceived) { /* Couldn't read a correct packet leader. Start over. */ continue; @@ -886,7 +917,7 @@ /* Step 2 - Read PacketType */ RcvCode = KdpReceiveBuffer(&Packet.PacketType, sizeof(USHORT)); - if (RcvCode != KdPacketReceived) // FIXME: check PacketType + if (RcvCode != KdPacketReceived) { /* Didn't receive a PacketType or PacketType is bad. Start over. */ continue; @@ -937,8 +968,12 @@ switch (Packet.PacketType) { case PACKET_TYPE_KD_ACKNOWLEDGE: - /* Remote acknowledges the last packet */ - return KdPacketReceived; + if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE) + { + /* Remote acknowledges the last packet */ + return KdPacketReceived; + } + continue; case PACKET_TYPE_KD_RESEND: /* Remote wants us to resend the last packet */ @@ -946,7 +981,8 @@ case PACKET_TYPE_KD_RESET: FrLdrDbgPrint("KdReceivePacket - got a reset packet\n"); - KdpSendControlPacket(PACKET_TYPE_KD_RESET, INITIAL_PACKET_ID); + KdpSendControlPacket(PACKET_TYPE_KD_RESET, 0); + CurrentPacketId = INITIAL_PACKET_ID; return KdPacketNeedsResend; default: @@ -955,6 +991,110 @@ } } + /* Did we wait for an ack packet? */ + if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE) + { + /* We received something different, start over */ + continue; + } + + /* Did we get the right packet type? */ + if (PacketType != Packet.PacketType) + { + /* We received something different, start over */ + continue; + } + + /* Get size of the message header */ + switch (Packet.PacketType) + { + case PACKET_TYPE_KD_STATE_CHANGE64: + MessageHeader->Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); + break; + + case PACKET_TYPE_KD_STATE_MANIPULATE: + MessageHeader->Length = sizeof(DBGKD_MANIPULATE_STATE64); + break; + + case PACKET_TYPE_KD_DEBUG_IO: + MessageHeader->Length = sizeof(DBGKD_DEBUG_IO); + break; + + default: + FrLdrDbgPrint("KdReceivePacket - unknown PacketType\n"); + return KdPacketNeedsResend; + } + +FrLdrDbgPrint("KdReceivePacket - got normal PacketType\n"); + + /* Packet smaller than expected? */ + if (MessageHeader->Length > Packet.ByteCount) + { + FrLdrDbgPrint("KdReceivePacket - too few data (%d) for type %d\n", + Packet.ByteCount, MessageHeader->Length); + MessageHeader->Length = Packet.ByteCount; + } + +FrLdrDbgPrint("KdReceivePacket - got normal PacketType, Buffer = %p\n", MessageHeader->Buffer); + + /* Receive the message header data */ + RcvCode = KdpReceiveBuffer(MessageHeader->Buffer, + MessageHeader->Length); + if (RcvCode != KdPacketReceived) + { + /* Didn't receive data. Start over. */ + FrLdrDbgPrint("KdReceivePacket - Didn't receive message header data. Start over\n"); + continue; + } + +FrLdrDbgPrint("KdReceivePacket - got normal PacketType 3\n"); + + /* Calculate checksum for the header data */ + Checksum = KdpCalculateChecksum(MessageHeader->Buffer, + MessageHeader->Length); + + /* Shall we receive messsage data? */ + if (MessageData && Packet.ByteCount > MessageHeader->Length) + { + FrLdrDbgPrint("KdReceivePacket - got normal PacketType 2b\n"); + /* Calculate the length of the message data */ + MessageData->Length = Packet.ByteCount - MessageHeader->Length; + + /* Receive the message data */ + RcvCode = KdpReceiveBuffer(MessageData->Buffer, + MessageData->Length); + if (RcvCode != KdPacketReceived) + { + /* Didn't receive data. Start over. */ + FrLdrDbgPrint("KdReceivePacket - Didn't receive message data. Start over\n"); + continue; + } + + /* Add cheksum for message data */ + Checksum += KdpCalculateChecksum(MessageData->Buffer, + MessageData->Length); + } + + /* Compare checksum */ + if (Packet.Checksum != Checksum) + { + // Send PACKET_TYPE_KD_RESEND + FrLdrDbgPrint("KdReceivePacket - wrong cheksum, got %x, calculated %x\n", + Packet.Checksum, Checksum); + continue; + } + + /* We must receive a PACKET_TRAILING_BYTE now */ + RcvCode = KdpReceiveBuffer(&Byte, sizeof(UCHAR)); + + /* Acknowledge the received packet */ + KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, CurrentPacketId); + CurrentPacketId ^= 1; + +FrLdrDbgPrint("KdReceivePacket - all ok\n"); + + return KdPacketReceived; + }

1 0

[fireball] 38984: [FORMATTING] - TABS -> SPACES
by fireball＠svn.reactos.org 20 Jan '09

20 Jan '09

Author: fireball Date: Tue Jan 20 13:15:08 2009 New Revision: 38984 URL: http://svn.reactos.org/svn/reactos?rev=38984&view=rev Log: [FORMATTING] - TABS -> SPACES Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.h [iso-8859-1] Tue Jan 20 13:15:08 2009 @@ -65,31 +65,31 @@ // typedef struct _PACKED_BIOS_PARAMETER_BLOCK { - UCHAR BytesPerSector[2]; - UCHAR SectorsPerCluster[1]; - UCHAR ReservedSectors[2]; - UCHAR Fats[1]; - UCHAR RootEntries[2]; - UCHAR Sectors[2]; - UCHAR Media[1]; - UCHAR SectorsPerFat[2]; - UCHAR SectorsPerTrack[2]; - UCHAR Heads[2]; - UCHAR HiddenSectors[4]; - UCHAR LargeSectors[4]; + UCHAR BytesPerSector[2]; + UCHAR SectorsPerCluster[1]; + UCHAR ReservedSectors[2]; + UCHAR Fats[1]; + UCHAR RootEntries[2]; + UCHAR Sectors[2]; + UCHAR Media[1]; + UCHAR SectorsPerFat[2]; + UCHAR SectorsPerTrack[2]; + UCHAR Heads[2]; + UCHAR HiddenSectors[4]; + UCHAR LargeSectors[4]; } PACKED_BIOS_PARAMETER_BLOCK, *PPACKED_BIOS_PARAMETER_BLOCK; // sizeof = 0x019 typedef struct _PACKED_BIOS_PARAMETER_BLOCK_EX { - PACKED_BIOS_PARAMETER_BLOCK Block; - UCHAR LargeSectorsPerFat[4]; - UCHAR ExtendedFlags[2]; - UCHAR FsVersion[2]; - UCHAR RootDirFirstCluster[4]; - UCHAR FsInfoSector[2]; - UCHAR BackupBootSector[2]; - UCHAR Reserved[12]; + PACKED_BIOS_PARAMETER_BLOCK Block; + UCHAR LargeSectorsPerFat[4]; + UCHAR ExtendedFlags[2]; + UCHAR FsVersion[2]; + UCHAR RootDirFirstCluster[4]; + UCHAR FsInfoSector[2]; + UCHAR BackupBootSector[2]; + UCHAR Reserved[12]; } PACKED_BIOS_PARAMETER_BLOCK_EX, *PPACKED_BIOS_PARAMETER_BLOCK_EX; // sizeof = 0x035 53 @@ -98,82 +98,82 @@ // typedef struct BIOS_PARAMETER_BLOCK { - USHORT BytesPerSector; - UCHAR SectorsPerCluster; - USHORT ReservedSectors; - UCHAR Fats; - USHORT RootEntries; - USHORT Sectors; - UCHAR Media; - USHORT SectorsPerFat; - USHORT SectorsPerTrack; - USHORT Heads; - ULONG HiddenSectors; - ULONG LargeSectors; - ULONG LargeSectorsPerFat; + USHORT BytesPerSector; + UCHAR SectorsPerCluster; + USHORT ReservedSectors; + UCHAR Fats; + USHORT RootEntries; + USHORT Sectors; + UCHAR Media; + USHORT SectorsPerFat; + USHORT SectorsPerTrack; + USHORT Heads; + ULONG HiddenSectors; + ULONG LargeSectors; + ULONG LargeSectorsPerFat; union { - USHORT ExtendedFlags; + USHORT ExtendedFlags; struct { - ULONG ActiveFat:4; - ULONG Reserved0:3; - ULONG MirrorDisabled:1; - ULONG Reserved1:8; - }; - }; - USHORT FsVersion; - ULONG RootDirFirstCluster; - USHORT FsInfoSector; - USHORT BackupBootSector; + ULONG ActiveFat:4; + ULONG Reserved0:3; + ULONG MirrorDisabled:1; + ULONG Reserved1:8; + }; + }; + USHORT FsVersion; + ULONG RootDirFirstCluster; + USHORT FsInfoSector; + USHORT BackupBootSector; } BIOS_PARAMETER_BLOCK, *PBIOS_PARAMETER_BLOCK; #define FatValidBytesPerSector(xBytes) \ - (!((xBytes) & ((xBytes)-1)) && (xBytes)>=0x80 && (xBytes)<=0x1000) + (!((xBytes) & ((xBytes)-1)) && (xBytes)>=0x80 && (xBytes)<=0x1000) #define FatValidSectorsPerCluster(xSectors) \ - (!((xSectors) & ((xSectors)-1)) && (xSectors)>=0 && (xSectors)<=0x80) + (!((xSectors) & ((xSectors)-1)) && (xSectors)>=0 && (xSectors)<=0x80) typedef struct _PACKED_BOOT_SECTOR { - UCHAR Jump[3]; - UCHAR Oem[8]; + UCHAR Jump[3]; + UCHAR Oem[8]; PACKED_BIOS_PARAMETER_BLOCK PackedBpb; - UCHAR PhysicalDriveNumber; - UCHAR CurrentHead; - UCHAR Signature; - UCHAR Id[4]; - UCHAR VolumeLabel[11]; - UCHAR SystemId[8]; + UCHAR PhysicalDriveNumber; + UCHAR CurrentHead; + UCHAR Signature; + UCHAR Id[4]; + UCHAR VolumeLabel[11]; + UCHAR SystemId[8]; } PACKED_BOOT_SECTOR, *PPACKED_BOOT_SECTOR; // sizeof = 0x03E typedef struct _PACKED_BOOT_SECTOR_EX { - UCHAR Jump[3]; - UCHAR Oem[8]; - PACKED_BIOS_PARAMETER_BLOCK_EX PackedBpb; - UCHAR PhysicalDriveNumber; - UCHAR CurrentHead; - UCHAR Signature; - UCHAR Id[4]; - UCHAR VolumeLabel[11]; - UCHAR SystemId[8]; + UCHAR Jump[3]; + UCHAR Oem[8]; + PACKED_BIOS_PARAMETER_BLOCK_EX PackedBpb; + UCHAR PhysicalDriveNumber; + UCHAR CurrentHead; + UCHAR Signature; + UCHAR Id[4]; + UCHAR VolumeLabel[11]; + UCHAR SystemId[8]; } PACKED_BOOT_SECTOR_EX, *PPACKED_BOOT_SECTOR_EX; // sizeof = 0x060 #define FatBootSectorJumpValid(xMagic) \ - ((xMagic)[0] == 0xe9 || (xMagic)[0] == 0xeb || (xMagic)[0] == 0x49) + ((xMagic)[0] == 0xe9 || (xMagic)[0] == 0xeb || (xMagic)[0] == 0x49) typedef struct _FSINFO_SECTOR { - ULONG SectorBeginSignature; - UCHAR Reserved[480]; - ULONG FsInfoSignature; - ULONG FreeClusterCount; - ULONG NextFreeCluster; - UCHAR Reserved0[12]; - ULONG SectorEndSignature; + ULONG SectorBeginSignature; + UCHAR Reserved[480]; + ULONG FsInfoSignature; + ULONG FreeClusterCount; + ULONG NextFreeCluster; + UCHAR Reserved0[12]; + ULONG SectorEndSignature; } FSINFO_SECTOR, *PFSINFO_SECTOR; // sizeof = 0x200 #define FSINFO_SECTOR_BEGIN_SIGNATURE 0x41615252 @@ -182,11 +182,10 @@ // // Cluster Markers: // -// -#define FAT_CLUSTER_AVAILABLE 0x00000000 -#define FAT_CLUSTER_RESERVED 0x0ffffff0 -#define FAT_CLUSTER_BAD 0x0ffffff7 -#define FAT_CLUSTER_LAST 0x0fffffff +#define FAT_CLUSTER_AVAILABLE 0x00000000 +#define FAT_CLUSTER_RESERVED 0x0ffffff0 +#define FAT_CLUSTER_BAD 0x0ffffff7 +#define FAT_CLUSTER_LAST 0x0fffffff // // Directory Structure: // @@ -232,31 +231,31 @@ // typedef struct _DIR_ENTRY { - UCHAR FileName[11]; - UCHAR Attributes; - UCHAR Case; - UCHAR CreationTimeTenMs; + UCHAR FileName[11]; + UCHAR Attributes; + UCHAR Case; + UCHAR CreationTimeTenMs; FAT_DATETIME CreationDateTime; FAT_DATE LastAccessDate; - union { - USHORT ExtendedAttributes; - USHORT FirstClusterOfFileHi; - }; + union { + USHORT ExtendedAttributes; + USHORT FirstClusterOfFileHi; + }; FAT_DATETIME LastWriteDateTime; - USHORT FirstCluster; - ULONG FileSize; + USHORT FirstCluster; + ULONG FileSize; } DIR_ENTRY, *PDIR_ENTRY; // sizeof = 0x020 typedef struct _LONG_FILE_NAME_ENTRY { - UCHAR Index; - UCHAR NameA[10]; - UCHAR Attributes; - UCHAR Type; - UCHAR Checksum; - USHORT NameB[6]; - USHORT Reserved; - USHORT NameC[2]; + UCHAR Index; + UCHAR NameA[10]; + UCHAR Attributes; + UCHAR Type; + UCHAR Checksum; + USHORT NameB[6]; + USHORT Reserved; + USHORT NameC[2]; } LONG_FILE_NAME_ENTRY, *PLONG_FILE_NAME_ENTRY; // sizeof = 0x020 @@ -285,14 +284,14 @@ FAT_DIRENT_ATTR_VOLUME_ID) typedef struct _PACKED_LFN_DIRENT { - UCHAR Ordinal; // offset = 0 - UCHAR Name1[10]; // offset = 1 (Really 5 chars, but not WCHAR aligned) - UCHAR Attributes; // offset = 11 - UCHAR Type; // offset = 12 - UCHAR Checksum; // offset = 13 - WCHAR Name2[6]; // offset = 14 - USHORT MustBeZero; // offset = 26 - WCHAR Name3[2]; // offset = 28 + UCHAR Ordinal; // offset = 0 + UCHAR Name1[10]; // offset = 1 (Really 5 chars, but not WCHAR aligned) + UCHAR Attributes; // offset = 11 + UCHAR Type; // offset = 12 + UCHAR Checksum; // offset = 13 + WCHAR Name2[6]; // offset = 14 + USHORT MustBeZero; // offset = 26 + WCHAR Name3[2]; // offset = 28 } PACKED_LFN_DIRENT; // sizeof = 32 #endif//__FAT_H__

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