- Revert 49927 "Update to trunk" as it breaks KsStudio (again)
authorJohannes Anderwald <johannes.anderwald@reactos.org>
Tue, 7 Dec 2010 21:46:43 +0000 (21:46 +0000)
committerJohannes Anderwald <johannes.anderwald@reactos.org>
Tue, 7 Dec 2010 21:46:43 +0000 (21:46 +0000)
svn path=/branches/audio-bringup/; revision=49979

708 files changed:
base/applications/applications.rbuild
base/applications/calc/lang/sk-SK.rc
base/applications/network/ipconfig/ipconfig.c
base/applications/network/tracert/tracert.c
base/applications/rapps/rapps/7zip.txt
base/applications/rapps/rapps/abyss.txt
base/applications/rapps/rapps/comctl32ocx.txt
base/applications/rapps/rapps/dosblaster.txt
base/applications/rapps/rapps/fap.txt
base/applications/rapps/rapps/firefox36.txt
base/applications/rapps/rapps/go-oo.txt
base/applications/rapps/rapps/kdewin.txt
base/applications/rapps/rapps/libreoffice.txt
base/applications/rapps/rapps/mirandaim.txt
base/applications/rapps/rapps/mirc.txt
base/applications/rapps/rapps/mono2.txt
base/applications/rapps/rapps/mpc.txt
base/applications/rapps/rapps/net11.txt
base/applications/rapps/rapps/net20.txt
base/applications/rapps/rapps/net20sp2.txt
base/applications/rapps/rapps/openttd.txt
base/applications/rapps/rapps/opera.txt
base/applications/rapps/rapps/python.txt
base/applications/rapps/rapps/remood.txt
base/applications/rapps/rapps/scite.txt
base/applications/rapps/rapps/scummvm.txt
base/applications/rapps/rapps/seamonkey.txt
base/applications/rapps/rapps/steam.txt
base/applications/rapps/rapps/superfinder.txt
base/applications/rapps/rapps/tahoma.txt
base/applications/rapps/rapps/thunderbird.txt
base/applications/rapps/rapps/ultravnc.txt
base/applications/rapps/rapps/utorrent.txt
base/applications/rapps/rapps/vlc.txt
base/applications/regedit/childwnd.c
base/applications/regedit/edit.c
base/applications/regedit/error.c [deleted file]
base/applications/regedit/framewnd.c
base/applications/regedit/lang/bg-BG.rc
base/applications/regedit/lang/cs-CZ.rc
base/applications/regedit/lang/de-DE.rc
base/applications/regedit/lang/el-GR.rc
base/applications/regedit/lang/en-US.rc
base/applications/regedit/lang/es-ES.rc
base/applications/regedit/lang/fr-FR.rc
base/applications/regedit/lang/hu-HU.rc
base/applications/regedit/lang/id-ID.rc
base/applications/regedit/lang/it-IT.rc
base/applications/regedit/lang/ja-JP.rc
base/applications/regedit/lang/ko-KR.rc
base/applications/regedit/lang/nl-NL.rc
base/applications/regedit/lang/no-NO.rc
base/applications/regedit/lang/pl-PL.rc
base/applications/regedit/lang/pt-BR.rc
base/applications/regedit/lang/pt-PT.rc
base/applications/regedit/lang/ru-RU.rc
base/applications/regedit/lang/sk-SK.rc
base/applications/regedit/lang/sl-SI.rc
base/applications/regedit/lang/sv-SE.rc
base/applications/regedit/lang/th-TH.rc
base/applications/regedit/lang/uk-UA.rc
base/applications/regedit/lang/zh-CN.rc
base/applications/regedit/listview.c
base/applications/regedit/main.h
base/applications/regedit/regedit.rbuild
base/applications/regedit/resource.h
base/applications/regedit/treeview.c
base/applications/taskmgr/lang/ru-RU.rc
base/setup/usetup/lang/sk-SK.h
base/shell/cmd/cmd.c
base/shell/cmd/cmd.h
base/shell/cmd/console.c
base/shell/cmd/lang/sk-SK.rc
base/shell/cmd/precomp.h
base/shell/explorer/desktop/desktop.cpp
base/system/format/format.c
base/system/format/lang/sk-SK.rc
base/system/services/rpcserver.c
boot/armllb/armllb.rbuild
boot/armllb/boot.s
boot/armllb/crtsupp.c
boot/armllb/envir.c
boot/armllb/fw.c
boot/armllb/hw/matrix.c [deleted file]
boot/armllb/hw/omap3-beagle/hwinfo.c [deleted file]
boot/armllb/hw/omap3-beagle/hwuart.c [deleted file]
boot/armllb/hw/omap3-zoom2/hwinfo.c [deleted file]
boot/armllb/hw/omap3-zoom2/hwinit.c [deleted file]
boot/armllb/hw/omap3-zoom2/hwlcd.c [deleted file]
boot/armllb/hw/omap3-zoom2/hwsynkp.c [deleted file]
boot/armllb/hw/omap3-zoom2/hwtwl40x.c [deleted file]
boot/armllb/hw/omap3-zoom2/hwuart.c [deleted file]
boot/armllb/hw/omap3/hwinfo.c [new file with mode: 0755]
boot/armllb/hw/omap3/hwinit.c [moved from boot/armllb/hw/omap3-beagle/hwinit.c with 78% similarity]
boot/armllb/hw/time.c
boot/armllb/hw/video.c
boot/armllb/inc/envir.h
boot/armllb/inc/keyboard.h
boot/armllb/inc/machtype.h
boot/armllb/inc/omap3.h [deleted file]
boot/armllb/inc/precomp.h
boot/armllb/main.c
boot/armllb/os/loader.c
boot/bootdata/hivesys_i386.inf
boot/bootdata/packages/reactos.dff
boot/freeldr/freeldr.rbuild
boot/freeldr/freeldr/arch/amd64/arch.S
boot/freeldr/freeldr/arch/amd64/boot.S
boot/freeldr/freeldr/arch/amd64/i386pnp.S
boot/freeldr/freeldr/arch/amd64/int386.S
boot/freeldr/freeldr/arch/amd64/mb.S
boot/freeldr/freeldr/arch/arm/boot.s
boot/freeldr/freeldr/arch/arm/macharm.c
boot/freeldr/freeldr/arch/i386/arch.S
boot/freeldr/freeldr/arch/i386/i386bug.c [deleted file]
boot/freeldr/freeldr/arch/i386/i386trap.S
boot/freeldr/freeldr/debug.c
boot/freeldr/freeldr/freeldr.rbuild
boot/freeldr/freeldr/freeldr_arch.rbuild
boot/freeldr/freeldr/freeldr_arm.lnk [deleted file]
boot/freeldr/freeldr/freeldr_base.rbuild
boot/freeldr/freeldr/freeldr_startup.rbuild
boot/freeldr/freeldr/include/keycodes.h
boot/freeldr/freeldr/mm/mm.c
boot/freeldr/freeldr/rtl/bget.c
boot/freeldr/freeldr/windows/arm/wlmemory.c
boot/freeldr/freeldr/windows/conversion.c
boot/freeldr/freeldr/windows/winldr.c
boot/freeldr/freeldr/windows/wlregistry.c
config-arm.template.rbuild
config.template.rbuild
dll/cpl/timedate/lang/fr-FR.rc
dll/directx/ddraw/Ddraw/callbacks_dd_hel.c
dll/directx/ddraw/Ddraw/ddraw_main.c
dll/directx/ddraw/Ddraw/ddraw_stubs.c
dll/directx/ddraw/Palette/createpalette.c [deleted file]
dll/directx/ddraw/Palette/palette.c [deleted file]
dll/directx/ddraw/Surface/createsurface.c
dll/directx/ddraw/Surface/surface_main.c
dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c
dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c
dll/directx/ddraw/ddraw.rbuild
dll/directx/ddraw/rosdraw.h
dll/directx/ddraw/startup.c
dll/directx/directx.rbuild
dll/ntdll/dispatch/i386/dispatch.S
dll/ntdll/ldr/utils.c
dll/win32/atl/atl.rgs
dll/win32/atl/atl_ax.c
dll/win32/atl/atliface.idl
dll/win32/atl/registrar.c
dll/win32/gdi32/include/gdi32p.h
dll/win32/gdi32/misc/wingl.c
dll/win32/gdi32/objects/bitmap.c
dll/win32/gdi32/objects/coord.c
dll/win32/gdi32/objects/dc.c
dll/win32/gdiplus/brush.c
dll/win32/gdiplus/font.c
dll/win32/gdiplus/gdiplus.c
dll/win32/gdiplus/gdiplus.spec
dll/win32/gdiplus/gdiplus_private.h
dll/win32/gdiplus/graphics.c
dll/win32/gdiplus/graphicspath.c
dll/win32/gdiplus/image.c
dll/win32/gdiplus/pen.c
dll/win32/gdiplus/region.c
dll/win32/hlink/hlink.spec
dll/win32/hlink/hlink_main.c
dll/win32/hlink/link.c
dll/win32/kernel32/except/except.c
dll/win32/kernel32/thread/amd64/fiber.S
dll/win32/kernel32/thread/amd64/thread.S
dll/win32/kernel32/thread/i386/fiber.S
dll/win32/kernel32/thread/i386/thread.S
dll/win32/mprapi/mprapi.c
dll/win32/mprapi/mprapi.spec
dll/win32/netcfgx/tcpipconf_notify.c
dll/win32/setupapi/cfgmgr.c
dll/win32/shdocvw/De.rc [deleted file]
dll/win32/shdocvw/En.rc
dll/win32/shdocvw/Es.rc [deleted file]
dll/win32/shdocvw/Fr.rc [deleted file]
dll/win32/shdocvw/He.rc [deleted file]
dll/win32/shdocvw/It.rc [deleted file]
dll/win32/shdocvw/Ko.rc [deleted file]
dll/win32/shdocvw/Lt.rc [deleted file]
dll/win32/shdocvw/Nl.rc [deleted file]
dll/win32/shdocvw/Pl.rc [deleted file]
dll/win32/shdocvw/Pt.rc [deleted file]
dll/win32/shdocvw/Ro.rc [deleted file]
dll/win32/shdocvw/Si.rc [deleted file]
dll/win32/shdocvw/Sr.rc [deleted file]
dll/win32/shdocvw/Sv.rc [deleted file]
dll/win32/shdocvw/Uk.rc [deleted file]
dll/win32/shdocvw/dochost.c
dll/win32/shdocvw/frame.c
dll/win32/shdocvw/ie.c
dll/win32/shdocvw/ietoolbar.bmp [deleted file]
dll/win32/shdocvw/ietoolbar.svg [deleted file]
dll/win32/shdocvw/iexplore.c
dll/win32/shdocvw/intshcut.c
dll/win32/shdocvw/navigate.c
dll/win32/shdocvw/resource.h
dll/win32/shdocvw/shdocvw.h
dll/win32/shdocvw/shdocvw.rbuild
dll/win32/shdocvw/shdocvw.rc
dll/win32/shdocvw/shdocvw.spec
dll/win32/shdocvw/shdocvw_main.c
dll/win32/shdocvw/webbrowser.c
dll/win32/shell32/drive.c
dll/win32/shlwapi/shlwapi.rbuild
dll/win32/user32/include/cursor.h
dll/win32/user32/include/user32.h
dll/win32/user32/include/user32p.h
dll/win32/user32/misc/display.c
dll/win32/user32/misc/misc.c
dll/win32/user32/misc/stubs.c
dll/win32/user32/user32.pspec
dll/win32/user32/windows/class.c
dll/win32/user32/windows/cursoricon.c
dll/win32/user32/windows/defwnd.c
dll/win32/user32/windows/draw.c
dll/win32/user32/windows/hook.c
dll/win32/user32/windows/input.c
dll/win32/user32/windows/menu.c
dll/win32/user32/windows/message.c
dll/win32/user32/windows/window.c
dll/win32/wdmaud.drv/wdmaud.c
dll/win32/wer/main.c [deleted file]
dll/win32/wer/wer.rbuild [deleted file]
dll/win32/wer/wer.spec [deleted file]
dll/win32/win32.rbuild
dll/win32/wtsapi32/wtsapi32.c
dll/win32/wtsapi32/wtsapi32.spec
drivers/filesystems/npfs/create.c
drivers/filesystems/npfs/finfo.c
drivers/filesystems/npfs/fsctrl.c
drivers/filesystems/npfs/npfs.c
drivers/filesystems/npfs/npfs.h
drivers/filesystems/npfs/rw.c
hal/halarm/directory.rbuild
hal/halarm/omap3/halinit_up.c [deleted file]
hal/halarm/omap3/halup.rbuild [deleted file]
hal/halarm/omap3/halup.rc [deleted file]
hal/halx86/amd64/mps.S
hal/halx86/amd64/systimer.S
hal/halx86/generic/cmos.c
hal/halx86/generic/dma.c
hal/halx86/generic/halinit.c
hal/halx86/generic/i386/systimer.S
hal/halx86/generic/i386/trap.S
hal/halx86/generic/legacy/bus/libpcidata.a [deleted file]
hal/halx86/generic/legacy/bus/pcibus.c
hal/halx86/generic/legacy/bus/pcidata.c
hal/halx86/generic/legacy/bussupp.c
hal/halx86/generic/legacy/halpcat.c
hal/halx86/generic/memory.c
hal/halx86/generic/misc.c
hal/halx86/generic/timer.c
hal/halx86/generic/usage.c
hal/halx86/include/halp.h
include/crt/mingw32/intrin_arm.h
include/crt/setjmp.h
include/crt/stddef.h
include/ddk/ntifs.h
include/ddk/wdm.h
include/ndk/arm/ketypes.h
include/ndk/arm/mmtypes.h
include/ndk/umfuncs.h
include/psdk/specstrings.h [deleted file]
include/psdk/werapi.h [deleted file]
include/psdk/windef.h
include/psdk/winnt.h
include/reactos/arm/armddk.h
include/reactos/asm.inc [deleted file]
include/reactos/ks386.inc [deleted file]
include/reactos/win32k/ntuser.h
include/reactos/wine/exception.h
lib/atl/atlcore.h
lib/rtl/amd64/debug_asm.S
lib/rtl/amd64/except_asm.S
lib/rtl/amd64/rtlmem.S
lib/rtl/amd64/slist.S
lib/rtl/i386/debug_asm.S
lib/rtl/i386/except_asm.s
lib/rtl/i386/interlck.S
lib/rtl/i386/res_asm.s
lib/rtl/i386/rtlmem.s
lib/rtl/rtl.rbuild
lib/rtl/sprintf.c
lib/rtl/swprintf.c
lib/sdk/crt/conio/cprintf.c
lib/sdk/crt/crt.rbuild
lib/sdk/crt/except/amd64/chkstk_asm.s
lib/sdk/crt/except/amd64/seh.s
lib/sdk/crt/except/i386/chkstk_asm.s
lib/sdk/crt/except/i386/prolog.s
lib/sdk/crt/except/i386/seh.s
lib/sdk/crt/float/i386/logb.c
lib/sdk/crt/libcntpr.rbuild
lib/sdk/crt/math/amd64/alldiv.S
lib/sdk/crt/math/amd64/atan.S
lib/sdk/crt/math/amd64/atan2.S
lib/sdk/crt/math/amd64/ceil.S
lib/sdk/crt/math/amd64/ceilf.S
lib/sdk/crt/math/amd64/exp.S
lib/sdk/crt/math/amd64/fabs.S
lib/sdk/crt/math/amd64/floor.S
lib/sdk/crt/math/amd64/floorf.S
lib/sdk/crt/math/amd64/fmod.S
lib/sdk/crt/math/amd64/fmodf.S
lib/sdk/crt/math/amd64/ldexp.S
lib/sdk/crt/math/amd64/log.S
lib/sdk/crt/math/amd64/log10.S
lib/sdk/crt/math/amd64/pow.S
lib/sdk/crt/math/amd64/sqrt.S
lib/sdk/crt/math/amd64/sqrtf.S
lib/sdk/crt/math/amd64/tan.S
lib/sdk/crt/math/i386/alldiv_asm.s
lib/sdk/crt/math/i386/alldvrm_asm.s
lib/sdk/crt/math/i386/allmul_asm.s
lib/sdk/crt/math/i386/allrem_asm.s
lib/sdk/crt/math/i386/allshl_asm.s
lib/sdk/crt/math/i386/allshr_asm.s
lib/sdk/crt/math/i386/atan2_asm.s [deleted file]
lib/sdk/crt/math/i386/atan_asm.s
lib/sdk/crt/math/i386/aulldiv_asm.s
lib/sdk/crt/math/i386/aulldvrm_asm.s
lib/sdk/crt/math/i386/aullrem_asm.s
lib/sdk/crt/math/i386/aullshr_asm.s
lib/sdk/crt/math/i386/ceil_asm.s
lib/sdk/crt/math/i386/ceilf.S
lib/sdk/crt/math/i386/cos_asm.s
lib/sdk/crt/math/i386/exp_asm.s [deleted file]
lib/sdk/crt/math/i386/fabs_asm.s
lib/sdk/crt/math/i386/floor_asm.s
lib/sdk/crt/math/i386/floorf.S
lib/sdk/crt/math/i386/fmod_asm.s [deleted file]
lib/sdk/crt/math/i386/fmodf_asm.s [deleted file]
lib/sdk/crt/math/i386/ftol2_asm.s [deleted file]
lib/sdk/crt/math/i386/ftol_asm.s
lib/sdk/crt/math/i386/log10_asm.s
lib/sdk/crt/math/i386/log_asm.s
lib/sdk/crt/math/i386/pow_asm.s
lib/sdk/crt/math/i386/sin_asm.s
lib/sdk/crt/math/i386/sqrt_asm.s
lib/sdk/crt/math/i386/tan_asm.s
lib/sdk/crt/mbstring/mbstrlen.c
lib/sdk/crt/mem/i386/memchr_asm.s
lib/sdk/crt/mem/i386/memcpy_asm.s
lib/sdk/crt/mem/i386/memmove_asm.s
lib/sdk/crt/mem/i386/memset_asm.s
lib/sdk/crt/misc/assert.c
lib/sdk/crt/misc/crtmain.c [new file with mode: 0644]
lib/sdk/crt/printf/_cprintf.c [deleted file]
lib/sdk/crt/printf/_snprintf.c [deleted file]
lib/sdk/crt/printf/_snwprintf.c [deleted file]
lib/sdk/crt/printf/_vcprintf.c [deleted file]
lib/sdk/crt/printf/_vsnprintf.c [deleted file]
lib/sdk/crt/printf/_vsnwprintf.c [deleted file]
lib/sdk/crt/printf/fprintf.c [deleted file]
lib/sdk/crt/printf/fwprintf.c [deleted file]
lib/sdk/crt/printf/printf.c [deleted file]
lib/sdk/crt/printf/sprintf.c [deleted file]
lib/sdk/crt/printf/streamout.c [deleted file]
lib/sdk/crt/printf/swprintf.c [deleted file]
lib/sdk/crt/printf/vfprintf.c [deleted file]
lib/sdk/crt/printf/vfwprintf.c [deleted file]
lib/sdk/crt/printf/vprintf.c [deleted file]
lib/sdk/crt/printf/vsprintf.c [deleted file]
lib/sdk/crt/printf/vswprintf.c [deleted file]
lib/sdk/crt/printf/vwprintf.c [deleted file]
lib/sdk/crt/printf/wprintf.c [deleted file]
lib/sdk/crt/printf/wstreamout.c [deleted file]
lib/sdk/crt/setjmp/amd64/setjmp.s
lib/sdk/crt/setjmp/i386/setjmp.s
lib/sdk/crt/stdio/file.c
lib/sdk/crt/stdio/lnx_sprintf.c
lib/sdk/crt/stdio/lock_file.c [deleted file]
lib/sdk/crt/string/i386/strcat_asm.s
lib/sdk/crt/string/i386/strchr_asm.s
lib/sdk/crt/string/i386/strcmp_asm.s
lib/sdk/crt/string/i386/strcpy_asm.s
lib/sdk/crt/string/i386/strlen_asm.s
lib/sdk/crt/string/i386/strncat_asm.s
lib/sdk/crt/string/i386/strncmp_asm.s
lib/sdk/crt/string/i386/strncpy_asm.s
lib/sdk/crt/string/i386/strnlen_asm.s
lib/sdk/crt/string/i386/strrchr_asm.s
lib/sdk/crt/string/i386/tchar.h
lib/sdk/crt/string/i386/tcscat.h [new file with mode: 0644]
lib/sdk/crt/string/i386/tcscat.inc [deleted file]
lib/sdk/crt/string/i386/tcschr.h [new file with mode: 0644]
lib/sdk/crt/string/i386/tcschr.inc [deleted file]
lib/sdk/crt/string/i386/tcscmp.h [new file with mode: 0644]
lib/sdk/crt/string/i386/tcscmp.inc [deleted file]
lib/sdk/crt/string/i386/tcscpy.h [new file with mode: 0644]
lib/sdk/crt/string/i386/tcscpy.inc [deleted file]
lib/sdk/crt/string/i386/tcslen.h [new file with mode: 0644]
lib/sdk/crt/string/i386/tcslen.inc [deleted file]
lib/sdk/crt/string/i386/tcsncat.h [new file with mode: 0644]
lib/sdk/crt/string/i386/tcsncat.inc [deleted file]
lib/sdk/crt/string/i386/tcsncmp.h [new file with mode: 0644]
lib/sdk/crt/string/i386/tcsncmp.inc [deleted file]
lib/sdk/crt/string/i386/tcsncpy.h [new file with mode: 0644]
lib/sdk/crt/string/i386/tcsncpy.inc [deleted file]
lib/sdk/crt/string/i386/tcsnlen.h [new file with mode: 0644]
lib/sdk/crt/string/i386/tcsnlen.inc [deleted file]
lib/sdk/crt/string/i386/tcsrchr.h [new file with mode: 0644]
lib/sdk/crt/string/i386/tcsrchr.inc [deleted file]
lib/sdk/crt/string/i386/wcscat_asm.s
lib/sdk/crt/string/i386/wcschr_asm.s
lib/sdk/crt/string/i386/wcscmp_asm.s
lib/sdk/crt/string/i386/wcscpy_asm.s
lib/sdk/crt/string/i386/wcslen_asm.s
lib/sdk/crt/string/i386/wcsncat_asm.s
lib/sdk/crt/string/i386/wcsncmp_asm.s
lib/sdk/crt/string/i386/wcsncpy_asm.s
lib/sdk/crt/string/i386/wcsnlen_asm.s
lib/sdk/crt/string/i386/wcsrchr_asm.s
lib/sdk/crt/string/wcs.c
media/doc/README.WINE
modules/directory.rbuild
ntoskrnl/cache/cachesub.c [deleted file]
ntoskrnl/cache/copysup.c [deleted file]
ntoskrnl/cache/fssup.c [deleted file]
ntoskrnl/cache/lazyrite.c [deleted file]
ntoskrnl/cache/logsup.c [deleted file]
ntoskrnl/cache/mdlsup.c [deleted file]
ntoskrnl/cache/newcc.h [deleted file]
ntoskrnl/cache/pinsup.c [deleted file]
ntoskrnl/cache/section/data.c [deleted file]
ntoskrnl/cache/section/fault.c [deleted file]
ntoskrnl/cache/section/io.c [deleted file]
ntoskrnl/cache/section/newmm.h [deleted file]
ntoskrnl/cache/section/reqtools.c [deleted file]
ntoskrnl/cache/section/sptab.c [deleted file]
ntoskrnl/cache/section/swapout.c [deleted file]
ntoskrnl/cc/cacheman.c
ntoskrnl/cc/copy.c
ntoskrnl/cc/view.c
ntoskrnl/config/cmalloc.c
ntoskrnl/config/cmboot.c
ntoskrnl/config/cmconfig.c
ntoskrnl/config/cmcontrl.c
ntoskrnl/config/cmdata.c
ntoskrnl/config/cmdelay.c
ntoskrnl/config/cmhook.c
ntoskrnl/config/cmkcbncb.c
ntoskrnl/config/cmse.c
ntoskrnl/config/cmsysini.c
ntoskrnl/config/powerpc/cmhardwr.c
ntoskrnl/ex/handle.c
ntoskrnl/ex/hdlsterm.c
ntoskrnl/ex/i386/fastinterlck_asm.S
ntoskrnl/ex/i386/interlck_asm.S
ntoskrnl/ex/i386/ioport.S
ntoskrnl/ex/init.c
ntoskrnl/ex/lookas.c
ntoskrnl/ex/pushlock.c
ntoskrnl/ex/sysinfo.c
ntoskrnl/ex/xipdisp.c
ntoskrnl/fsrtl/dbcsname.c
ntoskrnl/fsrtl/faulttol.c
ntoskrnl/fsrtl/filtrctx.c
ntoskrnl/fsrtl/fsrtlpc.c
ntoskrnl/fsrtl/name.c
ntoskrnl/fstub/fstubex.c
ntoskrnl/inbv/inbv.c
ntoskrnl/include/internal/arm/kxarm.h
ntoskrnl/include/internal/arm/mm.h
ntoskrnl/include/internal/fsrtl.h
ntoskrnl/include/internal/i386/asmmacro.S
ntoskrnl/include/internal/i386/mm.h
ntoskrnl/include/internal/io.h
ntoskrnl/include/internal/ke.h
ntoskrnl/include/internal/mm.h
ntoskrnl/include/internal/ntoskrnl.h
ntoskrnl/include/internal/po.h
ntoskrnl/include/internal/ps.h
ntoskrnl/io/iomgr/arcname.c
ntoskrnl/io/iomgr/controller.c
ntoskrnl/io/iomgr/device.c
ntoskrnl/io/iomgr/driver.c
ntoskrnl/io/iomgr/file.c
ntoskrnl/io/iomgr/iorsrce.c
ntoskrnl/io/iomgr/irp.c
ntoskrnl/io/iomgr/ramdisk.c
ntoskrnl/io/iomgr/rawfs.c
ntoskrnl/io/pnpmgr/pnpinit.c
ntoskrnl/io/pnpmgr/pnpmgr.c
ntoskrnl/io/pnpmgr/pnpreport.c
ntoskrnl/io/pnpmgr/pnpres.c
ntoskrnl/kd/kdinit.c
ntoskrnl/kd/kdio.c
ntoskrnl/kd/kdmain.c
ntoskrnl/kd64/kdinit.c
ntoskrnl/kdbg/amd64/kdb_help.S
ntoskrnl/kdbg/i386/kdb_help.S
ntoskrnl/kdbg/kdb.c
ntoskrnl/ke/amd64/boot.S
ntoskrnl/ke/amd64/ctxswitch.S
ntoskrnl/ke/amd64/trap.S
ntoskrnl/ke/arm/boot.s
ntoskrnl/ke/arm/cpu.c
ntoskrnl/ke/arm/ctxswtch.s
ntoskrnl/ke/arm/thrdini.c
ntoskrnl/ke/arm/trapc.c
ntoskrnl/ke/config.c
ntoskrnl/ke/dpc.c
ntoskrnl/ke/freeldr.c
ntoskrnl/ke/i386/cpu.c
ntoskrnl/ke/i386/ctxswitch.S
ntoskrnl/ke/i386/kiinit.c
ntoskrnl/ke/i386/mtrr.c
ntoskrnl/ke/i386/patpge.c
ntoskrnl/ke/i386/thrdini.c
ntoskrnl/ke/i386/trap.s
ntoskrnl/ke/i386/usercall_asm.S
ntoskrnl/ke/krnlinit.c
ntoskrnl/ke/procobj.c
ntoskrnl/ke/thrdobj.c
ntoskrnl/ke/thrdschd.c
ntoskrnl/ke/wait.c
ntoskrnl/lpc/port.c
ntoskrnl/mm/ARM3/arm/init.c
ntoskrnl/mm/ARM3/contmem.c
ntoskrnl/mm/ARM3/expool.c
ntoskrnl/mm/ARM3/i386/init.c
ntoskrnl/mm/ARM3/largepag.c
ntoskrnl/mm/ARM3/mdlsup.c
ntoskrnl/mm/ARM3/miarm.h
ntoskrnl/mm/ARM3/mminit.c
ntoskrnl/mm/ARM3/pagfault.c
ntoskrnl/mm/ARM3/pfnlist.c
ntoskrnl/mm/ARM3/pool.c
ntoskrnl/mm/ARM3/procsup.c
ntoskrnl/mm/ARM3/section.c
ntoskrnl/mm/ARM3/sysldr.c
ntoskrnl/mm/ARM3/syspte.c
ntoskrnl/mm/ARM3/vadnode.c
ntoskrnl/mm/ARM3/virtual.c
ntoskrnl/mm/ARM3/zeropage.c
ntoskrnl/mm/amd64/init.c
ntoskrnl/mm/amd64/page.c
ntoskrnl/mm/anonmem.c
ntoskrnl/mm/arm/page.c
ntoskrnl/mm/arm/stubs.c
ntoskrnl/mm/balance.c
ntoskrnl/mm/freelist.c
ntoskrnl/mm/i386/page.c
ntoskrnl/mm/marea.c
ntoskrnl/mm/mmfault.c
ntoskrnl/mm/mminit.c
ntoskrnl/mm/pagefile.c
ntoskrnl/mm/rmap.c
ntoskrnl/mm/section.c
ntoskrnl/ntoskrnl-generic.rbuild
ntoskrnl/ntoskrnl.pspec
ntoskrnl/ntoskrnl_i386.lnk
ntoskrnl/ob/obname.c
ntoskrnl/ob/obsdcach.c
ntoskrnl/po/poshtdwn.c
ntoskrnl/po/power.c
ntoskrnl/ps/job.c
ntoskrnl/ps/kill.c
ntoskrnl/ps/process.c
ntoskrnl/ps/psmgr.c
ntoskrnl/ps/quota.c
ntoskrnl/rtl/i386/stack.S
ntoskrnl/se/semgr.c
ntoskrnl/vdm/vdmmain.c
subsystems/win32/csrss/win32csr/desktopbg.c
subsystems/win32/csrss/win32csr/win32csr.rbuild
subsystems/win32/win32k/dib/alphablend.c [deleted file]
subsystems/win32/win32k/dib/dib.c
subsystems/win32/win32k/dib/dib.h
subsystems/win32/win32k/dib/dib16bpp.c
subsystems/win32/win32k/dib/dib1bpp.c
subsystems/win32/win32k/dib/dib24bpp.c
subsystems/win32/win32k/dib/dib32bpp.c
subsystems/win32/win32k/dib/dib4bpp.c
subsystems/win32/win32k/dib/dib8bpp.c
subsystems/win32/win32k/dib/i386/dib24bpp_hline.s
subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s
subsystems/win32/win32k/dib/i386/dib32bpp_hline.s
subsystems/win32/win32k/eng/alphablend.c
subsystems/win32/win32k/eng/bitblt.c
subsystems/win32/win32k/eng/copybits.c
subsystems/win32/win32k/eng/device.c
subsystems/win32/win32k/eng/engbrush.c
subsystems/win32/win32k/eng/engmisc.c
subsystems/win32/win32k/eng/gradient.c
subsystems/win32/win32k/eng/i386/floatobj.S
subsystems/win32/win32k/eng/ldevobj.c [deleted file]
subsystems/win32/win32k/eng/lineto.c
subsystems/win32/win32k/eng/mapping.c
subsystems/win32/win32k/eng/mem.c
subsystems/win32/win32k/eng/mouse.c
subsystems/win32/win32k/eng/paint.c
subsystems/win32/win32k/eng/pdevobj.c [deleted file]
subsystems/win32/win32k/eng/rlecomp.c [deleted file]
subsystems/win32/win32k/eng/semaphor.c
subsystems/win32/win32k/eng/stretchblt.c
subsystems/win32/win32k/eng/surface.c
subsystems/win32/win32k/eng/transblt.c
subsystems/win32/win32k/eng/xlate.c
subsystems/win32/win32k/include/accelerator.h
subsystems/win32/win32k/include/bitmaps.h
subsystems/win32/win32k/include/dc.h
subsystems/win32/win32k/include/desktop.h
subsystems/win32/win32k/include/device.h [deleted file]
subsystems/win32/win32k/include/dib.h
subsystems/win32/win32k/include/eng.h
subsystems/win32/win32k/include/gdiobj.h
subsystems/win32/win32k/include/guicheck.h
subsystems/win32/win32k/include/hook.h
subsystems/win32/win32k/include/hotkey.h
subsystems/win32/win32k/include/input.h
subsystems/win32/win32k/include/inteng.h
subsystems/win32/win32k/include/intgdi.h
subsystems/win32/win32k/include/ldevobj.h [deleted file]
subsystems/win32/win32k/include/menu.h
subsystems/win32/win32k/include/misc.h
subsystems/win32/win32k/include/monitor.h
subsystems/win32/win32k/include/mouse.h
subsystems/win32/win32k/include/msgqueue.h
subsystems/win32/win32k/include/ntuser.h
subsystems/win32/win32k/include/palette.h
subsystems/win32/win32k/include/pdevobj.h
subsystems/win32/win32k/include/region.h
subsystems/win32/win32k/include/surface.h
subsystems/win32/win32k/include/timer.h
subsystems/win32/win32k/include/win32.h
subsystems/win32/win32k/include/win32kp.h
subsystems/win32/win32k/include/window.h
subsystems/win32/win32k/include/winpos.h
subsystems/win32/win32k/include/winsta.h
subsystems/win32/win32k/include/xlateobj.h
subsystems/win32/win32k/ldr/loader.c [new file with mode: 0644]
subsystems/win32/win32k/main/dllmain.c
subsystems/win32/win32k/misc/copy.c
subsystems/win32/win32k/misc/driver.c
subsystems/win32/win32k/misc/file.c
subsystems/win32/win32k/misc/i386/atan2_asm.s
subsystems/win32/win32k/misc/i386/ceil_asm.s
subsystems/win32/win32k/misc/i386/cos_asm.s
subsystems/win32/win32k/misc/i386/floor_asm.s
subsystems/win32/win32k/misc/i386/sin_asm.s
subsystems/win32/win32k/misc/registry.c
subsystems/win32/win32k/ntddraw/dxeng.c
subsystems/win32/win32k/ntuser/accelerator.c
subsystems/win32/win32k/ntuser/callback.c
subsystems/win32/win32k/ntuser/caret.c
subsystems/win32/win32k/ntuser/clipboard.c
subsystems/win32/win32k/ntuser/cursoricon.c
subsystems/win32/win32k/ntuser/desktop.c
subsystems/win32/win32k/ntuser/display.c
subsystems/win32/win32k/ntuser/event.c
subsystems/win32/win32k/ntuser/focus.c
subsystems/win32/win32k/ntuser/guicheck.c
subsystems/win32/win32k/ntuser/hook.c
subsystems/win32/win32k/ntuser/hotkey.c
subsystems/win32/win32k/ntuser/input.c
subsystems/win32/win32k/ntuser/kbdlayout.c
subsystems/win32/win32k/ntuser/keyboard.c
subsystems/win32/win32k/ntuser/menu.c
subsystems/win32/win32k/ntuser/message.c
subsystems/win32/win32k/ntuser/metric.c
subsystems/win32/win32k/ntuser/misc.c
subsystems/win32/win32k/ntuser/monitor.c
subsystems/win32/win32k/ntuser/msgqueue.c
subsystems/win32/win32k/ntuser/ntstubs.c
subsystems/win32/win32k/ntuser/ntuser.c
subsystems/win32/win32k/ntuser/object.c
subsystems/win32/win32k/ntuser/simplecall.c
subsystems/win32/win32k/ntuser/timer.c
subsystems/win32/win32k/ntuser/windc.c
subsystems/win32/win32k/ntuser/window.c
subsystems/win32/win32k/ntuser/winpos.c
subsystems/win32/win32k/ntuser/winsta.c
subsystems/win32/win32k/objects/arc.c
subsystems/win32/win32k/objects/bitblt.c
subsystems/win32/win32k/objects/bitmaps.c
subsystems/win32/win32k/objects/brush.c
subsystems/win32/win32k/objects/cliprgn.c
subsystems/win32/win32k/objects/dcattr.c
subsystems/win32/win32k/objects/dclife.c
subsystems/win32/win32k/objects/dcobjs.c
subsystems/win32/win32k/objects/dcstate.c
subsystems/win32/win32k/objects/dcutil.c
subsystems/win32/win32k/objects/device.c
subsystems/win32/win32k/objects/dibobj.c
subsystems/win32/win32k/objects/drawing.c
subsystems/win32/win32k/objects/fillshap.c
subsystems/win32/win32k/objects/freetype.c
subsystems/win32/win32k/objects/gdibatch.c
subsystems/win32/win32k/objects/gdiobj.c
subsystems/win32/win32k/objects/icm.c
subsystems/win32/win32k/objects/line.c
subsystems/win32/win32k/objects/palette.c
subsystems/win32/win32k/objects/path.c
subsystems/win32/win32k/objects/pen.c
subsystems/win32/win32k/objects/region.c
subsystems/win32/win32k/objects/stockobj.c
subsystems/win32/win32k/pch.h
subsystems/win32/win32k/stubs/stubs.c
subsystems/win32/win32k/win32k.rbuild

index 0a1265c..232b44c 100644 (file)
@@ -22,9 +22,6 @@
        <directory name="extrac32">
                <xi:include href="extrac32/extrac32.rbuild" />
        </directory>
-       <directory name="findstr">
-               <xi:include href="findstr/findstr.rbuild" />
-       </directory>
        <directory name="fontview">
                <xi:include href="fontview/fontview.rbuild" />
        </directory>
index 41f9ca7..2bf46e6 100644 (file)
@@ -1,6 +1,6 @@
 /* TRANSLATOR :  Mário Kaèmár /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR.:  30-01-2008
- * LAST CHANGE:  17-09-2010
+ * LAST CHANGE:  31-05-2010
  * ---------------------------------------
  * TODO:
  * pridanie navigaèných znaèiek "&" ?
@@ -545,9 +545,9 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_ENERGY_15_C_CALORIES        "15 °C calories"
-    IDS_ENERGY_BTUS                 "Britské termálne jednotky"
+    IDS_ENERGY_BTUS                 "British Thermal Units"
     IDS_ENERGY_ERGS                 "Ergs"
-    IDS_ENERGY_EVS                  "Elektron-Volty"
+    IDS_ENERGY_EVS                  "Electron-Volts"
     IDS_ENERGY_FOOT_POUNDS          "Foot-Pounds"
     IDS_ENERGY_IT_CALORIES          "International Table calories"
     IDS_ENERGY_IT_KILOCALORIES      "International Table kilocalories"
@@ -593,7 +593,7 @@ BEGIN
     IDS_LENGTH_MILLIMETERS          "Milimetre"
     IDS_LENGTH_NAUTICAL_MILES       "Námorné míle"
     IDS_LENGTH_NIEU                 "Nieu"
-    IDS_LENGTH_PARSECS              "Parseky"
+    IDS_LENGTH_PARSECS              "Parsecy"
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japonsko)"
     IDS_LENGTH_RI_KOREA             "Ri (Kórea)"
@@ -626,10 +626,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmosféry"
     IDS_PRESSURE_BARS               "Bary"
-    IDS_PRESSURE_HECTOPASCALS       "Hektopascaly"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascaly"
-    IDS_PRESSURE_MM_OF_MERCURY      "Milimetre ortuti"
-    IDS_PRESSURE_PASCALS            "Pascaly"
+    IDS_PRESSURE_HECTOPASCALS       "Hektopascals"
+    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
+    IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
+    IDS_PRESSURE_PASCALS            "Pascals"
     IDS_PRESSURE_PSI                "Libry na \9atvorcový palec"
 END
 
index 2657614..3d9de7d 100644 (file)
 HINSTANCE hInstance;
 HANDLE ProcessHeap;
 
-int LoadStringAndOem(HINSTANCE hInst,
-               UINT uID,
-               LPTSTR szNode,
-               int Siz
-)      
-{
-  TCHAR szTmp[25];
-  int res = LoadString(hInst, uID, szTmp, sizeof(szTmp)); 
-  CharToOem(szTmp, szNode);
-  return(res);
-}
 
 LPTSTR GetNodeTypeName(UINT NodeType)
 {
@@ -44,27 +33,27 @@ LPTSTR GetNodeTypeName(UINT NodeType)
     switch (NodeType)
     {
         case 1:
-            if (!LoadStringAndOem(hInstance, IDS_BCAST, szNode,  sizeof(szNode)))
+            if (!LoadString(hInstance, IDS_BCAST, szNode, sizeof(szNode)))
                 return NULL;
             break;
 
         case 2:
-            if (!LoadStringAndOem(hInstance, IDS_P2P, szNode,  sizeof(szNode)))
+            if (!LoadString(hInstance, IDS_P2P, szNode, sizeof(szNode)))
                 return NULL;
             break;
 
         case 4:
-            if (!LoadStringAndOem(hInstance, IDS_MIXED, szNode,  sizeof(szNode)))
+            if (!LoadString(hInstance, IDS_MIXED, szNode,  sizeof(szNode)))
                 return NULL;
             break;
 
         case 8:
-            if (!LoadStringAndOem(hInstance, IDS_HYBRID, szNode,  sizeof(szNode)))
+            if (!LoadString(hInstance, IDS_HYBRID, szNode,  sizeof(szNode)))
                 return NULL;
             break;
 
         default :
-            if (!LoadStringAndOem(hInstance, IDS_UNKNOWN, szNode,  sizeof(szNode)))
+            if (!LoadString(hInstance, IDS_UNKNOWN, szNode,  sizeof(szNode)))
                 return NULL;
             break;
     }
@@ -80,42 +69,42 @@ LPTSTR GetInterfaceTypeName(UINT InterfaceType)
     switch (InterfaceType)
     {
         case MIB_IF_TYPE_OTHER:
-            if (!LoadStringAndOem(hInstance, IDS_OTHER, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_OTHER, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         case MIB_IF_TYPE_ETHERNET:
-            if (!LoadStringAndOem(hInstance, IDS_ETH, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_ETH, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         case MIB_IF_TYPE_TOKENRING:
-            if (!LoadStringAndOem(hInstance, IDS_TOKEN, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_TOKEN, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         case MIB_IF_TYPE_FDDI:
-            if (!LoadStringAndOem(hInstance, IDS_FDDI, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_FDDI, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         case MIB_IF_TYPE_PPP:
-            if (!LoadStringAndOem(hInstance, IDS_PPP, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_PPP, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         case MIB_IF_TYPE_LOOPBACK:
-            if (!LoadStringAndOem(hInstance, IDS_LOOP, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_LOOP, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         case MIB_IF_TYPE_SLIP:
-            if (!LoadStringAndOem(hInstance, IDS_SLIP, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_SLIP, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         default:
-            if (!LoadStringAndOem(hInstance, IDS_UNKNOWN, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_UNKNOWN, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
     }
@@ -164,7 +153,6 @@ LPTSTR GetConnectionType(LPTSTR lpClass)
 {
     HKEY hKey = NULL;
     LPTSTR ConType = NULL;
-    LPTSTR ConTypeTmp = NULL;
     TCHAR Path[256];
     LPTSTR PrePath  = _T("SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\");
     LPTSTR PostPath = _T("\\Connection");
@@ -192,34 +180,24 @@ LPTSTR GetConnectionType(LPTSTR lpClass)
                            NULL,
                            &dwDataSize) == ERROR_SUCCESS)
         {
-            ConTypeTmp = (LPTSTR)HeapAlloc(ProcessHeap,
-                                        0,
-                                        dwDataSize);
-
             ConType = (LPTSTR)HeapAlloc(ProcessHeap,
                                         0,
                                         dwDataSize);
-            if (ConType && ConTypeTmp)
+            if (ConType)
             {
                 if(RegQueryValueEx(hKey,
                                    _T("Name"),
                                    NULL,
                                    &dwType,
-                                   (PBYTE)ConTypeTmp,
+                                   (PBYTE)ConType,
                                    &dwDataSize) != ERROR_SUCCESS)
                 {
                     HeapFree(ProcessHeap,
                              0,
                              ConType);
 
-                    HeapFree(ProcessHeap,
-                             0,
-                             ConTypeTmp);
-
                     ConType = NULL;
                 }
-
-                if (ConType) CharToOem(ConTypeTmp, ConType);
             }
         }
     }
@@ -696,7 +674,7 @@ VOID Usage(VOID)
             if (lpUsage == NULL)
                 return;
 
-            if (LoadStringAndOem(hInstance,
+            if (LoadString(hInstance,
                            IDS_USAGE,
                            lpUsage,
                            Size))
index e3c1048..4ec2508 100644 (file)
@@ -422,7 +422,7 @@ AllocateBuffers(PAPPINFO pInfo)
 
     pInfo->RecvPacket = (PIPv4_HEADER)HeapAlloc(GetProcessHeap(),
                                                 0,
-                                                MAX_PING_PACKET_SIZE);
+                                                sizeof(IPv4_HEADER) + PACKET_SIZE);
     if (!pInfo->RecvPacket)
     {
         HeapFree(GetProcessHeap(),
index e5e8df8..93cdb8a 100644 (file)
@@ -2,13 +2,13 @@
 
 [Section]
 Name = 7-Zip
-Version = 9.20
+Version = 4.65
 Licence = LGPL
 Description = Utility to create and open 7zip, zip, tar, rar and other archive files.
-Size = 1.0M
+Size = 0.9M
 Category = 12
 URLSite = http://www.7-zip.org/
-URLDownload = http://ovh.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920.exe
+URLDownload = http://ovh.dl.sourceforge.net/project/sevenzip/7-Zip/4.65/7z465.exe
 CDPath = none
 
 [Section.0407]
@@ -17,8 +17,5 @@ Description = Tool zum Erstellen und Öffnen von 7zip, zip, tar, rar und andrern
 [Section.040a]
 Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos.
 
-[Section.0415]
-Description = Narzędzie do tworzenia i otwierania plików typu 7zip, zip, tar, i innych plików archiwizacyjnych.
-
 [Section.0422]
 Description = Утиліта для створення та відкриття 7zip, zip, tar, rar та інших архівних файлів.
index 8959327..49d505c 100644 (file)
@@ -14,10 +14,5 @@ CDPath = none
 [Section.0407]
 Description = Abyss Web Server ermöglicht es Webseiten auf Ihrem Computer zu hosten. Er unterstützt sichere SSL/TLS Verbindungen (HTTPS) sowie eine Vielfalt an Web Technologien. Er kann ebenfalls PHP, Perl, Python, ASP, ASP.NET, und Ruby on Rails Web Anwendungen ausführen, welche von Datenbanken, wie MySQL, SQLite, MS SQL Server, MS Access, oder Oracle unterstützt werden können.
 
-[Section.0415]
-Description = Abyss Web Server pozwala Ci na stworzenie serwera WWW na własnym komputerze. Ten program obsługuje zabezpieczone połączenia typu SSL/TLS (HTTPS) i wiele technologii Sieci.
-Może także uruchamiać zaawansowane aplikacje internetowe takie jak PHP, Perl, Python, ASP, ASP.NET, i Ruby on Rails.
-Mogą one zostać oparte o MySQL, SQLite, MS SQL Server, MS Access, lub Oracle.
-
 [Section.0422]
 Description = Abyss Web Server дозволить вам утримувати веб-сайти на вашому комп'ютері. Від підтримує безпечні SSL/TLS з'єднання (HTTPS) та великий ряд веб-технологій. Він також запускає PHP, Perl, Python, ASP, ASP.NET, та Ruby on Rails веб-додатки, які можуть підтримуватись такими базами даних, як MySQL, SQLite, MS SQL Server, MS Access, чи Oracle.
index 392e8fa..a678a33 100644 (file)
@@ -21,7 +21,7 @@ Description = X es necesario para varias aplicaciones.
 
 [Section.0415]
 Licence = Nieznana
-Description = Microsoft Visual Basic 6.0 Common Controls jest używany przez część aplikacji.
+Description = X jest używana przez część aplikacji.
 
 [Section.0422]
 Licence = Невідома
index a499b7a..3974dda 100644 (file)
@@ -17,8 +17,5 @@ Description = DosBlaster ist eine Shell Extension, die es ermöglicht jede DOS A
 [Section.040a]
 Description = DosBlaster en una extensión Shell que permite abrir cualquier ejecutable DOS en DOSBox desde el botón derecho del ratón. Esta versión contiene DOSBox 0.70, pero puede ser actualizado facilmente instalando una nueva versión de DOSBox en la carpeta de DosBlaster.
 
-[Section.0415]
-Description = DosBlaster to rozszerzenie powłoki, które umożliwia otwarcie każdego DOS-owego pliku wykonywalnego w DOSBox za pomocą prawego klawisza myszki. Ta wersja zawiera DosBox 0.70, ale można go łatwo zaktualizować, instalując nowszą wersje DOSBox do folderów DosBlaster.
-
 [Section.0422]
 Description = DosBlaster це розширення оболонки, яке дозволяє запустити будь-який виконавчий файл DOS в DOSBox через правий клік. Ця версія містить DOSBox 0.70, але може бути оновлена встановленням новішої версії DOSBox в теки DosBlaster.
index 56a42cb..6bbac0e 100644 (file)
@@ -14,8 +14,5 @@ CDPath = none
 [Section.0407]
 Description = Kleiner und einfacher Mediaplayer.
 
-[Section.0415]
-Description = Prosty i lekki odtwarzacz audio.
-
 [Section.0422]
 Description = Простий та маленький програвач аудіо файлів.
index 31b72a5..cff4b21 100644 (file)
@@ -2,47 +2,47 @@
 
 [Section]
 Name = Mozilla Firefox 3.6
-Version = 3.6.12
+Version = 3.6.10
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Web Browsers out there.
 Size = 8.1M
 Category = 5
 URLSite = http://www.mozilla.com/en-US/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/en-US/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/en-US/Firefox%20Setup%203.6.10.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
 Size = 8.0M
 URLSite = http://www.mozilla-europe.org/de/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/de/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/de/Firefox%20Setup%203.6.10.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
 Size = 8.0M
 URLSite = http://www.mozilla-europe.org/es/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/es-ES/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/es-ES/Firefox%20Setup%203.6.10.exe
 
 [Section.0414]
 Description = Mest populære og best også gratis nettleserene der ute.
 Size = 8.0M
 URLSite = http://www.mozilla-europe.org/no/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/nb-NO/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/nb-NO/Firefox%20Setup%203.6.10.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych.
 Size = 8.8M
 URLSite = http://www.mozilla-europe.org/pl/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/pl/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/pl/Firefox%20Setup%203.6.10.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных браузеров.
 Size = 8.4M
 URLSite = http://www.mozilla-europe.org/ru/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/ru/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/ru/Firefox%20Setup%203.6.10.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих безплатних веб-браузерів.
 Size = 8.4M
 URLSite = http://www.mozilla-europe.org/uk/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/uk/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/uk/Firefox%20Setup%203.6.10.exe
index 39dbe60..e32599e 100644 (file)
@@ -18,7 +18,7 @@ Description = Open Source Office Suite, basierend auf Open Office, aber viel bes
 Description = La suite de ofimática de código abierto.
 
 [Section.0415]
-Description = Otwarty pakiet biurowy, bazujący na Open Office, ale znacznie lepszy.
+Description = Otwarty pakiet biurowy.
 
 [Section.0422]
 Description = Відкритий офісний пакет.
index 4c47525..f0bd4ec 100644 (file)
@@ -14,8 +14,5 @@ CDPath = none
 [Section.0407]
 Description = KDE für Windows.
 
-[Section.0415]
-Description = KDE dla Windows.
-
 [Section.0422]
 Description = KDE для Windows.
index 65ae3c3..8edeb91 100644 (file)
@@ -2,13 +2,13 @@
 
 [Section]
 Name = LibreOffice
-Version = 3.3.0 Beta 3
+Version = 3.3.0 Beta 1
 Licence = LGPL
 Description = Former called OpenOffice. Open Source Office Suite.
-Size = 300.0MB
+Size = 138.0MB
 Category = 6
 URLSite = http://www.documentfoundation.org/
-URLDownload = http://download.documentfoundation.org/libreoffice/testing/3.3.0-beta3/win/x86/LibO_3.3.0_Win_x86_install_multi.exe
+URLDownload = http://download.documentfoundation.org/libreoffice/testing/LO_3.3.0-beta1_Win_x86_install_en-US.exe
 CDPath = none
 
 [Section.0407]
index d7a4180..5c9fc34 100644 (file)
@@ -2,13 +2,13 @@
 
 [Section]
 Name = Miranda IM
-Version = 0.9.11
+Version = 0.9.5
 Licence = GPL
 Description = Open source multiprotocol instant messaging application - May not work completely.
-Size = 3.0MB
+Size = 2.2MB
 Category = 5
 URLSite = http://www.miranda-im.org/
-URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.11-unicode.exe
+URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.5-unicode.exe
 CDPath = none
 
 [Section.0407]
index 1f7220a..695630a 100644 (file)
@@ -2,13 +2,13 @@
 
 [Section]
 Name = mIRC
-Version = 7.15
+Version = 7.1
 Licence = Shareware
 Description = The most popular client for the Internet Relay Chat (IRC).
-Size = 2.0M
+Size = 1.8M
 Category = 5
 URLSite = http://www.mirc.com/
-URLDownload = http://download.mirc.com/mirc715.exe
+URLDownload = http://download.mirc.com/mirc71.exe
 CDPath = none
 
 [Section.0407]
index 5911b62..6de2539 100644 (file)
@@ -2,17 +2,14 @@
 
 [Section]
 Name = Mono .net Development Framework
-Version = 2.8.1
+Version = 2.6.7
 Licence = Unknown
 Description = Open Source .net Framework.
-Size = 77MB
+Size = 72MB
 Category = 14
 URLSite = http://www.mono-project.com/Main_Page
-URLDownload = http://ftp.novell.com/pub/mono/archive/2.8.1/windows-installer/3/mono-2.8.1-gtksharp-2.12.10-win32-3.exe
+URLDownload = http://ftp.novell.com/pub/mono/archive/2.6.7/windows-installer/2/mono-2.6.7-gtksharp-2.12.10-win32-2.exe
 CDPath = none
 
-[Section.0415]
-Description = Pakiet Mono .net Framework dla Programistów.
-
 [Section.0422]
 Description = Відкритий .net Фреймворк.
index d89fb38..cf59628 100644 (file)
@@ -20,8 +20,5 @@ Description = Reproductor multimedia.
 [Section.0419]
 Description = Мультимедийный проигрыватель.
 
-[Section.0415]
-Description = Odtwarzacz multimediów.
-
 [Section.0422]
 Description = Мультимедійний програвач.
index 15966d9..f6d4ca6 100644 (file)
@@ -10,6 +10,3 @@ Category = 14
 URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyId=262D25E3-F589-4842-8157-034D1E7CF3A3
 URLDownload = http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe
 CDPath = none
-
-[Section.0415]
-Description = Microsoft .NET Framework Wersja 1.1 - Pakiet Dystrybucyjny.
index a29ed10..cb83683 100644 (file)
@@ -10,6 +10,3 @@ Category = 14
 URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5
 URLDownload = http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-52154438565a/dotnetfx.exe
 CDPath = none
-
-[Section.0415]
-Description = Microsoft .NET Framework Wersja 2.0 - Pakiet Dystrybucyjny.
index 1901bfe..65c9885 100644 (file)
@@ -10,6 +10,3 @@ Category = 14
 URLSite = http://www.microsoft.com/downloads/details.aspx?familyid=5B2C0358-915B-4EB5-9B1D-10E506DA9D0F
 URLDownload = http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe
 CDPath = none
-
-[Section.0415]
-Description = Microsoft .NET Framework Wersja 2.0 Service Pack 2.
\ No newline at end of file
index 43d5738..9f038ff 100644 (file)
@@ -2,13 +2,13 @@
 
 [Section]
 Name = OpenTTD
-Version = 1.0.5
+Version = 1.0.4
 Licence = GPL v2
 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.
 Size = 3.4MB
 Category = 4
 URLSite = http://www.openttd.org/
-URLDownload = http://cz.binaries.openttd.org/openttd/binaries/releases/1.0.5/openttd-1.0.5-windows-win32.exe
+URLDownload = http://cz.binaries.openttd.org/openttd/binaries/releases/1.0.4/openttd-1.0.4-windows-win32.exe
 CDPath = none
 
 [Section.0407]
index f16c517..6852b4c 100644 (file)
@@ -2,13 +2,13 @@
 
 [Section]
 Name = Opera
-Version = 10.63
+Version = 10.62
 Licence = Freeware
 Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.
 Size = 12.7M
 Category = 5
 URLSite = http://www.opera.com/
-URLDownload = http://get4.opera.com/pub/opera/win/1063/int/Opera_1063_int_Setup.exe
+URLDownload = http://get4.opera.com/pub/opera/win/1062/int/Opera_1062_int_Setup.exe
 CDPath = none
 
 [Section.0407]
index 4c77199..4664d47 100644 (file)
@@ -14,9 +14,5 @@ CDPath = none
 [Section.0407]
 Description = Eine sehr mächtige, dynamische Programmiersprache.
 
-
-[Section.0415]
-Description = Potęży i dynamiczny język programowania.
-
 [Section.0422]
 Description = Дуже потужна динамічна мова програмування.
index dd58417..7ee5f97 100644 (file)
@@ -14,8 +14,5 @@ CDPath = none
 [Section.0407]
 Description = ReMooD ist ein Port des Doom Legacy Sources. Es versucht das klassische Legacy Erfahrung zusammen mit neuen Features und mehr Stabilität zu bieten. Unterstützt werden Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x und höher; und Linux (x86 und x86_64).
 
-[Section.0415]
-Description = ¯ród³owy port Doom. Jego celem jest zapewnienie rozrywki znanej z klasycznej wersji z nowymi funkcjami, i lepsz¹ stabilno\9cci¹. Obs³uguje Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x i wy¿sze; i Linux (x86 i x86_64).
-
 [Section.0422]
 Description = ReMooD э Портом вихідних кодів Doom Legacy. Його метою є додати нові можливості та стабільність до досвіду класичного Legacy. Він підтримує Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x та новіші; а також Linux (x86 та x86_64).
index bdb5688..6fe68ef 100644 (file)
@@ -2,13 +2,13 @@
 
 [Section]
 Name = SciTE
-Version = 2.22
+Version = 2.21
 Licence = Freeware
 Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs.
 Size = 0.6M
 Category = 7
 URLSite = http://www.scintilla.org/
-URLDownload = http://kent.dl.sourceforge.net/project/scintilla/SciTE/2.22/Sc222.exe
+URLDownload = http://kent.dl.sourceforge.net/project/scintilla/SciTE/2.21/Sc221.exe
 CDPath = none
 
 [Section.0407]
@@ -17,8 +17,5 @@ Description = SciTE ist ein SCIntilla basierter Text Editor. Ursprünglich wurde
 [Section.040a]
 Description = Editor de texto basado en SCIntilla. Originalmente creado para demostrar Scintilla, a crecido para ser un gran editor con capacidad para crear y ejecutar programas.
 
-[Section.0415]
-Description = SciTE to edytor tekstu bazowany na SCIntilla. Oryginalnie stworzony aby pokazać Scintille, stał sie ogólnie przydatnym edytorem z infrastrukturą potrzebną do tworzenia i uruchamiania programów.
-
 [Section.0422]
 Description = Текстовий редактор на основі SCIntilla. Був зібраний як презентація Scintilla, але виріс до редактора загального користування з засобами збирання та запуску програм.
index bc7286e..2774758 100644 (file)
@@ -2,13 +2,13 @@
 
 [Section]
 Name = ScummVM
-Version = 1.2.0
+Version = 1.1.1
 Licence = GPL
 Description = Sam and Max, Day of the Tentacle, etc on ReactOS.
-Size = 3.5MB
+Size = 3.3MB
 Category = 4
 URLSite = http://scummvm.org/
-URLDownload = http://dfn.dl.sourceforge.net/project/scummvm/scummvm/1.2.0/scummvm-1.2.0-win32.exe
+URLDownload = http://dfn.dl.sourceforge.net/project/scummvm/scummvm/1.1.1/scummvm-1.1.1-win32.exe
 CDPath = none
 
 [Section.0407]
index ae5b913..3dd172c 100644 (file)
@@ -2,31 +2,31 @@
 
 [Section]
 Name = Mozilla SeaMonkey
-Version = 2.0.10
+Version = 2.0.8
 Licence = MPL/GPL/LGPL
 Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.
 Size = 10.1MB
 Category = 5
 URLSite = http://www.seamonkey-project.org/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32/en-US/SeaMonkey%20Setup%202.0.10.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/en-US/SeaMonkey%20Setup%202.0.8.exe
 CDPath = none
 
 [Section.0407]
 Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benötigen.
 Size = 10.0MB
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32/de/SeaMonkey%20Setup%202.0.10.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/de/SeaMonkey%20Setup%202.0.8.exe
 
 [Section.040a]
 Description = La suite de Mozilla está viva. Es el primero y único navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarás.
 Size = 10.0MB
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32/es-ES/SeaMonkey%20Setup%202.0.10.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/es-ES/SeaMonkey%20Setup%202.0.8.exe
 
 [Section.0415]
 Description = Pakiet Mozilla żyje. W zestawie: przeglądarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz.
 Size = 10.8MB
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32/pl/SeaMonkey%20Setup%202.0.10.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/pl/SeaMonkey%20Setup%202.0.8.exe
 
 [Section.0419]
 Description = Продолжение Mozilla Suite. Включает браузер, почтовый клиент, IRC-клиент и HTML-редактор.
 Size = 10.4MB
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32/ru/SeaMonkey%20Setup%202.0.10.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/ru/SeaMonkey%20Setup%202.0.8.exe
index 9d4a0af..3caccc4 100644 (file)
@@ -14,8 +14,5 @@ CDPath = none
 [Section.0407]
 Description = Die STEAM Spieleplattform, die von viele Spielen verwendet wird.
 
-[Section.0415]
-Description = STEAM - platforma, którą używa obecnie wiele gier.
-
 [Section.0422]
 Description = Ігрова платформа, що використовується багатьма іграми.
index 9098b11..02b5560 100644 (file)
@@ -13,6 +13,3 @@ CDPath = none
 
 [Section.0407]
 Description = Eine schnelle und effektive Suchanwendung.
-
-[Section.0415]
-Description = Szybka i bogata w opcje aplikacja szukająca.
index c5e57fd..b5c87a0 100644 (file)
@@ -15,9 +15,6 @@ CDPath = none
 Licence = Unbekannt
 Description = Tahoma Font pack, der von einigen Anwendungen benötigt wird (Steam).
 
-[Section.0415]
-Description = Pakiet Czcionki Tahoma wymagany przez niektóre programy (np. Steam).
-
 [Section.0422]
 Licence = Невідома
 Description = Пакет шрифтів Tahoma, що необхідні деяким програмам (Steam).
index 2e120b0..71dce2f 100644 (file)
@@ -2,41 +2,41 @@
 
 [Section]
 Name = Mozilla Thunderbird
-Version = 3.1.6
+Version = 3.1.4
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Mail Clients out there.
 Size = 9.0M
 Category = 5
 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win32/en-US/Thunderbird%20Setup%203.1.6.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win32/en-US/Thunderbird%20Setup%203.1.4.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Mail-Clients.
 Size = 8.8M
 URLSite = http://www.mozilla-europe.org/de/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win32/de/Thunderbird%20Setup%203.1.6.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win32/de/Thunderbird%20Setup%203.1.4.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores clientes mail que hay.
 Size = 8.8M
 URLSite = http://www.mozilla-europe.org/es/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win32/es-ES/Thunderbird%20Setup%203.1.6.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win32/es-ES/Thunderbird%20Setup%203.1.4.exe
 
 [Section.0415]
 Description = Najpopularniejszy i jeden z najlepszych darmowych klientów poczty.
 Size = 9.7M
 URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win32/pl/Thunderbird%20Setup%203.1.6.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win32/pl/Thunderbird%20Setup%203.1.4.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных почтовых клиентов.
 Size = 9.2M
 URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win32/ru/Thunderbird%20Setup%203.1.6.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win32/ru/Thunderbird%20Setup%203.1.4.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих поштових клієнтів.
 Size = 9.2M
 URLSite = http://www.mozillamessaging.com/uk/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win32/uk/Thunderbird%20Setup%203.1.6.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win32/uk/Thunderbird%20Setup%203.1.4.exe
index 89ab674..f00b143 100644 (file)
@@ -2,20 +2,17 @@
 
 [Section]
 Name = UltraVNC
-Version = 1.0.9.1
+Version = 1.0.8.2
 Licence = GPL
 Description = Open-source VNC client/server.
-Size = 2.0MB
+Size = 1.9MB
 Category = 5
 URLSite = http://www.uvnc.com/
-URLDownload = http://support1.uvnc.com/download/109/UltraVNC_1.0.9.1_Setup.exe
+URLDownload = http://support1.uvnc.com/download/1082/UltraVNC_1.0.8.2_Setup.exe
 CDPath = none
 
 [Section.040a]
 Description = Cliente/Servidor VNC de código abierto.
 
-[Section.0415]
-Description = Otwarty klient/serwer VNC.
-
 [Section.0422]
 Description = Відкритий VNC клієнт/сервер.
index 86fa5ae..cb05f9b 100644 (file)
@@ -2,13 +2,13 @@
 
 [Section]
 Name = µTorrent
-Version = 2.2
+Version = 2.0.4
 Licence = Freeware for non-commercial uses
 Description = Small and fast BitTorrent Client.
-Size = 385K
+Size = 320K
 Category = 5
 URLSite = http://www.utorrent.com/
-URLDownload = http://download.utorrent.com/2.2/utorrent.exe
+URLDownload = http://download.utorrent.com/2.0.4/utorrent.exe
 CDPath = none
 
 
index 76c8c74..8a362fa 100644 (file)
@@ -2,13 +2,13 @@
 
 [Section]
 Name = VLC media player
-Version = 1.1.5
+Version = 1.1.4
 Licence = GPL
 Description = A media player.
-Size = 19.1MB
+Size = 18.7MB
 Category = 1
 URLSite = http://www.videolan.org/vlc/
-URLDownload = http://ignum.dl.sourceforge.net/project/vlc/1.1.5/win32/vlc-1.1.5-win32.exe
+URLDownload = http://ignum.dl.sourceforge.net/project/vlc/1.1.4/win32/vlc-1.1.4-win32.exe
 CDPath = none
 
 [Section.0407]
@@ -20,8 +20,5 @@ Description = Reproductor multimedia.
 [Section.0419]
 Description = Мультимедийный проигрыватель.
 
-[Section.0415]
-Description = Odtwarzacz multimediów.
-
 [Section.0422]
 Description = Мультимедійний програвач.
index 56ab005..6675e21 100644 (file)
@@ -67,21 +67,19 @@ static void draw_splitbar(HWND hWnd, int x)
 
 static void ResizeWnd(ChildWnd* pChildWnd, int cx, int cy)
 {
-    HDWP hdwp = BeginDeferWindowPos(3);
-    RECT rt, rs, rb;
-    const int tHeight = 18;
+    HDWP hdwp = BeginDeferWindowPos(2);
+    RECT rt, rs;
+
     SetRect(&rt, 0, 0, cx, cy);
     cy = 0;
     if (hStatusBar != NULL) {
         GetWindowRect(hStatusBar, &rs);
-        cy = rs.bottom - rs.top;
+        cy = rs.bottom - rs.top + 8;
     }
-    GetWindowRect(pChildWnd->hAddressBtnWnd, &rb);
     cx = pChildWnd->nSplitPos + SPLIT_WIDTH/2;
-    DeferWindowPos(hdwp, pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - tHeight-2, tHeight, SWP_NOZORDER|SWP_NOACTIVATE);
-    DeferWindowPos(hdwp, pChildWnd->hAddressBtnWnd, 0, rt.right - tHeight, rt.top, tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE);
-    DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top + tHeight+2, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
-    DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx, rt.top + tHeight+2, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
+       DeferWindowPos(hdwp, pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left, 23, SWP_NOZORDER|SWP_NOACTIVATE);
+    DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top + 25, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
+    DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx  , rt.top + 25, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
     EndDeferWindowPos(hdwp);
 }
 
@@ -261,7 +259,7 @@ static void SuggestKeys(HKEY hRootKey, LPCTSTR pszKeyPath, LPTSTR pszSuggestions
                /* Check CLSID key */
                if (RegOpenKey(hRootKey, pszKeyPath, &hSubKey) == ERROR_SUCCESS)
                {
-                       if (QueryStringValue(hSubKey, TEXT("CLSID"), NULL, szBuffer,
+                       if (QueryStringValue(hSubKey, TEXT("CLSID"), NULL, szBuffer, 
                                             COUNT_OF(szBuffer)) == ERROR_SUCCESS)
                        {
                                lstrcpyn(pszSuggestions, TEXT("HKCR\\CLSID\\"), (int) iSuggestionsLength);
@@ -326,35 +324,29 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
         /* load "My Computer" string */
         LoadString(hInst, IDS_MY_COMPUTER, buffer, sizeof(buffer)/sizeof(TCHAR));
 
-        g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd));
+           g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd));
 
         if (!pChildWnd) return 0;
         _tcsncpy(pChildWnd->szPath, buffer, MAX_PATH);
         pChildWnd->nSplitPos = 250;
         pChildWnd->hWnd = hWnd;
-        pChildWnd->hAddressBarWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Edit"), NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP,
+               pChildWnd->hAddressBarWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Edit"), NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP,
                                                                                CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
                                                                                hWnd, (HMENU)0, hInst, 0);
-        pChildWnd->hAddressBtnWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Button"), _T("»"), WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_DEFPUSHBUTTON,
-                                        CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
-                                        hWnd, (HMENU)0, hInst, 0);
                pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW);
         pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, pChildWnd->szPath*/);
         SetFocus(pChildWnd->hTreeWnd);
 
-        /* set the address bar and button font */
-        if ((pChildWnd->hAddressBarWnd) && (pChildWnd->hAddressBtnWnd))
+        /* set the address bar font */
+        if (pChildWnd->hAddressBarWnd)
         {
             hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
             SendMessage(pChildWnd->hAddressBarWnd,
                         WM_SETFONT,
                         (WPARAM)hFont,
                         0);
-            SendMessage(pChildWnd->hAddressBtnWnd,
-                        WM_SETFONT,
-                        (WPARAM)hFont,
-                        0);
         }
+
                /* Subclass the AddressBar */
                oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_WNDPROC);
         SetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_USERDATA, (DWORD_PTR)oldproc);
@@ -362,10 +354,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
                break;
     }
     case WM_COMMAND:
-        if(HIWORD(wParam) == BN_CLICKED){
-            PostMessage(pChildWnd->hAddressBarWnd, WM_KEYUP, VK_RETURN, 0);
-        }
-        else if (!_CmdWndProc(hWnd, message, wParam, lParam)) {
+        if (!_CmdWndProc(hWnd, message, wParam, lParam)) {
             goto def;
         }
         break;
@@ -488,28 +477,10 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
                        rootName = get_root_key_name(hRootKey);
                        fullPath = HeapAlloc(GetProcessHeap(), 0, (_tcslen(rootName) + 1 + _tcslen(keyPath) + 1) * sizeof(TCHAR));
                        if (fullPath) {
-                           /* set (correct) the address bar text */
-                if(keyPath[0] != '\0')
-                    _stprintf(fullPath, _T("%s\\%s"), rootName, keyPath);
-                else
-                    fullPath = _tcscpy(fullPath, rootName);
+                           _stprintf(fullPath, _T("%s\\%s"), rootName, keyPath);
                            SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)fullPath);
                                SendMessage(pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath);
-                HeapFree(GetProcessHeap(), 0, fullPath);
-                /* disable hive manipulation items temporarily (enable only if necessary) */
-                EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_GRAYED);
-                EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_GRAYED);
-                               /* compare the strings to see if we should enable/disable the "Load Hive" menus accordingly */
-                               if (!(_tcsicmp(rootName, TEXT("HKEY_LOCAL_MACHINE")) &&
-                      _tcsicmp(rootName, TEXT("HKEY_USERS"))))
-                {
-                    // enable the unload menu item if at the root
-                    // otherwise enable the load menu item if there is no slash in keyPath (ie. immediate child selected)
-                                   if(keyPath[0] == '\0')
-                        EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_ENABLED);
-                                   else if(!_tcschr(keyPath, _T('\\')))
-                        EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_ENABLED);
-                               }
+                           HeapFree(GetProcessHeap(), 0, fullPath);
 
                            {
                                HKEY hKey;
index 85a5bd8..9812b9b 100644 (file)
@@ -59,10 +59,19 @@ void error(HWND hwnd, INT resId, ...)
 
 static void error_code_messagebox(HWND hwnd, DWORD error_code)
 {
+    LPTSTR lpMsgBuf;
+    DWORD status;
     TCHAR title[256];
+    static const TCHAR fallback[] = TEXT("Error displaying error message.\n");
     if (!LoadString(hInst, IDS_ERROR, title, COUNT_OF(title)))
         lstrcpy(title, TEXT("Error"));
-    ErrorMessageBox(hwnd, title, error_code);
+    status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+                           NULL, error_code, 0, (LPTSTR)&lpMsgBuf, 0, NULL);
+    if (!status)
+        lpMsgBuf = (LPTSTR)fallback;
+    MessageBox(hwnd, lpMsgBuf, title, MB_OK | MB_ICONERROR);
+    if (lpMsgBuf != fallback)
+        LocalFree(lpMsgBuf);
 }
 
 void warning(HWND hwnd, INT resId, ...)
diff --git a/base/applications/regedit/error.c b/base/applications/regedit/error.c
deleted file mode 100644 (file)
index aaadf1a..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <regedit.h>
-void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code)
-{
-    LPTSTR lpMsgBuf;
-    DWORD status;
-    static const TCHAR fallback[] = TEXT("Error displaying error message.\n");
-    status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                           NULL, code, 0, (LPTSTR)&lpMsgBuf, 0, NULL);
-    if (!status)
-        lpMsgBuf = (LPTSTR)fallback;
-    MessageBox(hWnd, lpMsgBuf, title, MB_OK | MB_ICONERROR);
-    if (lpMsgBuf != fallback)
-        LocalFree(lpMsgBuf);
-}
index aa3a649..4e465e6 100644 (file)
@@ -282,105 +282,6 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME* pofn)
     return TRUE;
 }
 
-static INT_PTR CALLBACK LoadHive_KeyNameInHookProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    static LPTSTR sKey = NULL;
-    static INT sLength = 0;
-    switch(uMsg)
-    {
-     case WM_INITDIALOG:
-        sKey = (LPTSTR)lParam;
-        sLength = 128; /* FIXME: Ugly hack! */
-     case WM_COMMAND:
-        switch(LOWORD(wParam))
-        {
-         case IDOK:
-            if(GetDlgItemText(hWndDlg, IDC_EDIT_KEY, sKey, sLength))
-                return EndDialog(hWndDlg, -1);
-            else
-                return EndDialog(hWndDlg, 0);
-         case IDCANCEL:
-            return EndDialog(hWndDlg, 0);
-        }
-        break;
-    }
-    return FALSE;
-}
-
-static BOOL LoadHive(HWND hWnd)
-{
-    OPENFILENAME ofn;
-    TCHAR Caption[128];
-    LPCTSTR pszKeyPath;
-    TCHAR xPath[128];
-    HKEY hRootKey;
-    TCHAR Filter[1024];
-    FILTERPAIR filter;
-    /* get the item key to load the hive in */
-    pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey);
-    /* initialize the "open file" dialog */
-    InitOpenFileName(hWnd, &ofn);
-    /* build the "All Files" filter up */
-    filter.DisplayID = IDS_FLT_ALLFILES;
-    filter.FilterID = IDS_FLT_ALLFILES_FLT;
-    BuildFilterStrings(Filter, &filter, sizeof(filter));
-    ofn.lpstrFilter = Filter;
-    /* load and set the caption and flags for dialog */
-    LoadString(hInst, IDS_LOAD_HIVE, Caption, COUNT_OF(Caption));
-    ofn.lpstrTitle = Caption;
-    ofn.Flags |= OFN_ENABLESIZING;
-    /*    ofn.lCustData = ;*/
-    /* now load the hive */
-    if (GetOpenFileName(&ofn))
-    {
-        if(DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_LOADHIVE), hWnd, &LoadHive_KeyNameInHookProc, (LPARAM)xPath))
-        {
-            LONG regLoadResult = RegLoadKey(hRootKey, xPath, ofn.lpstrFile);
-            if(regLoadResult == ERROR_SUCCESS)
-            {
-                /* refresh tree and list views */
-                RefreshTreeView(g_pChildWnd->hTreeWnd);
-                pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey);
-                RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath);
-            }
-            else
-            {
-                ErrorMessageBox(hWnd, Caption, regLoadResult);
-                return FALSE;
-            }
-        }
-    } else {
-        CheckCommDlgError(hWnd);
-    }
-    return TRUE;
-}
-
-static BOOL UnloadHive(HWND hWnd)
-{
-    TCHAR Caption[128];
-    LPCTSTR pszKeyPath;
-    HKEY hRootKey;
-    /* get the item key to unload */
-    pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey);
-    /* load and set the caption and flags for dialog */
-    LoadString(hInst, IDS_UNLOAD_HIVE, Caption, COUNT_OF(Caption));
-    /* now unload the hive */
-    LONG regUnloadResult = RegUnLoadKey(hRootKey, pszKeyPath);
-    if(regUnloadResult == ERROR_SUCCESS)
-    {
-        /* refresh tree and list views */
-        RefreshTreeView(g_pChildWnd->hTreeWnd);
-        pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey);
-        RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath);
-    }
-    else
-    {
-        ErrorMessageBox(hWnd, Caption, regUnloadResult);
-        return FALSE;
-    }
-    return TRUE;
-}
-
 static BOOL ImportRegistryFile(HWND hWnd)
 {
     OPENFILENAME ofn;
@@ -415,6 +316,7 @@ static BOOL ImportRegistryFile(HWND hWnd)
     return TRUE;
 }
 
+
 static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)
 {
     HWND hwndExportAll;
@@ -495,7 +397,7 @@ BOOL ExportRegistryFile(HWND hWnd)
     if (GetSaveFileName(&ofn)) {
         BOOL result;
         DWORD format;
-
         if (ofn.nFilterIndex == 1)
             format = REG_FORMAT_5;
         else
@@ -856,12 +758,6 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     UNREFERENCED_PARAMETER(message);
 
     switch (LOWORD(wParam)) {
-    case ID_REGISTRY_LOADHIVE:
-        LoadHive(hWnd);
-        return TRUE;
-    case ID_REGISTRY_UNLOADHIVE:
-        UnloadHive(hWnd);
-        return TRUE;
     case ID_REGISTRY_IMPORTREGISTRYFILE:
         ImportRegistryFile(hWnd);
         return TRUE;
index da8521b..7ecabed 100644 (file)
@@ -177,16 +177,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -286,10 +276,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Âíàñÿ ñëîâåñåí ôàéë â ðåãèñòúðà"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Èçíàñÿ öåëèÿ ðåãèñòúð èëè ÷àñòè îò íåãî â ñëîâåñåí ôàéë"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Ñâúðçâà ñå ñ ðåãèñòúðà íà äàëå÷åí êîìïþòúð"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -346,8 +332,6 @@ BEGIN
     IDS_MY_COMPUTER         "Ìîÿò êîìïþòúð"
     IDS_IMPORT_REG_FILE     "Âíîñ íà ðåãèñòúðåí ôàéë"
     IDS_EXPORT_REG_FILE     "Èçíîñ íà ðåãèñòúðåí ôàéë"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(ñàìîñòîÿòåëíà ñòîéíîñò íà äâîéíà äóìà)"
 END
 
index 9226c8e..c1d12db 100644 (file)
@@ -175,16 +175,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -284,10 +274,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Importuje textový soubor do registru"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Exportuje v\9aechny èásti registru do textového souboru"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Pøipojí se ke vzdálenému registru jiného poèítaèe"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -344,8 +330,6 @@ BEGIN
     IDS_MY_COMPUTER         "Tento poèítaè"
     IDS_IMPORT_REG_FILE     "Importovat soubor registru"
     IDS_EXPORT_REG_FILE     "Exportovat do souboru registru"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(Neplatná hodnota DWORD)"
 END
 
index 8d6f251..4cf8657 100644 (file)
@@ -177,16 +177,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -286,10 +276,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Importiert eine Textddatei in die Registry"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Exportiert Teile oder die ganze Registry in eine Textdatei"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Verbindet zu einer Registry eines Fremdcomputers"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -346,8 +332,6 @@ BEGIN
     IDS_MY_COMPUTER         "Arbeitsplatz"
     IDS_IMPORT_REG_FILE     "Registry importieren"
     IDS_EXPORT_REG_FILE     "Registry exportieren"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(ungültiger DWORD-Wert)"
 END
 
index 44ca2d9..281ed2d 100644 (file)
@@ -177,16 +177,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -286,10 +276,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "ÅéóÜãåé Ýíá áñ÷åßï êåéìÝíïõ óôç registry"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "ÅîÜãùç üëç Þ Ýíá êïììÜôé ôçò registry óå Ýíá áñ÷åßï êåéìÝíïõ"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "ÓõíäÝååôáé óôç registry åíüò áðïìáêñõóìÝíïõ õðïëïãéóôÞ"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -346,8 +332,6 @@ BEGIN
     IDS_MY_COMPUTER         "Ï ÕðïëïãéóôÞò Ìïõ"
     IDS_IMPORT_REG_FILE     "ÅéóáãùãÞ Áñ÷åßïõ Registry"
     IDS_EXPORT_REG_FILE     "ÅîáãùãÞ Áñ÷åßïõ Registry"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(ìç Ýãêõñç DWORD ôéìÞ)"
 END
 
index fb81f16..e5a94cb 100644 (file)
@@ -274,10 +274,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Imports a text file into the registry"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Exports all or part of the registry to a text file"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Connects to a remote computer's registry"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -334,8 +330,6 @@ BEGIN
     IDS_MY_COMPUTER         "My Computer"
     IDS_IMPORT_REG_FILE     "Import Registry File"
     IDS_EXPORT_REG_FILE     "Export Registry File"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(invalid DWORD value)"
 END
 
@@ -398,20 +392,6 @@ BEGIN
    EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12
 END
 
-//
-// Dialog resources
-//
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
-
 IDD_ADDFAVORITES DIALOGEX DISCARDABLE  0, 0, 186, 46
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Add to Favorites"
index 0e1dc4c..b128846 100644 (file)
@@ -180,16 +180,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -289,10 +279,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Importa un archivo de texto al registro"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Exporta todo o parte del registro a un archivo de texto"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Se conecta al registro de un ordenador remoto"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -349,8 +335,6 @@ BEGIN
     IDS_MY_COMPUTER         "Mi PC"
     IDS_IMPORT_REG_FILE     "Importa Fichero de Registro"
     IDS_EXPORT_REG_FILE     "Exporta Fichero de Registro"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(valor DWORD invalido)"
 END
 
index 56e31bc..c5042da 100644 (file)
@@ -180,16 +180,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -289,10 +279,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Importe un fichier texte dans les registres"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Exporte tout ou une partie des registres dans un fichier texte"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Connecte aux registres d'un ordinateur distant"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -349,8 +335,6 @@ BEGIN
     IDS_MY_COMPUTER         "Mon ordinateur"
     IDS_IMPORT_REG_FILE     "Importer un fichier registre"
     IDS_EXPORT_REG_FILE     "Exporter un fichier registre"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(valeur mot double invalide)"
 END
 
index 7efa45d..42faef3 100644 (file)
@@ -178,16 +178,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -287,10 +277,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Imports a text file into the registry"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Exports all or part of the registry to a text file"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Connects to a remote computer's registry"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -347,8 +333,6 @@ BEGIN
     IDS_MY_COMPUTER         "My Computer"
     IDS_IMPORT_REG_FILE     "Import Registry File"
     IDS_EXPORT_REG_FILE     "Export Registry File"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(invalid DWORD value)"
 END
 
index 4d85714..059abec 100644 (file)
@@ -177,16 +177,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -286,10 +276,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Mengimpor file teks ke dalam registri"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Mengekspor semua atau sebagian registri le file teks"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Menyambung ke registri komputer remote"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -346,8 +332,6 @@ BEGIN
     IDS_MY_COMPUTER         "My Computer"
     IDS_IMPORT_REG_FILE     "Impor File Registri"
     IDS_EXPORT_REG_FILE     "Ekspor File Registri"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(nilai DWORD tidak benar)"
 END
 
index 8f81f05..53c6856 100644 (file)
@@ -180,16 +180,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -291,10 +281,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Importa un file di testo nel Registro"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Esporta tutto o parte del Registro in un file di testo"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Si connette al Registro di un computer remoto"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -351,8 +337,6 @@ BEGIN
     IDS_MY_COMPUTER         "Il mio Computer"
     IDS_IMPORT_REG_FILE     "Importa file di Registro"
     IDS_EXPORT_REG_FILE     "Esporta file di Registro"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(valore DWORD non valido)"
 END
 
index 66a0967..8b1816b 100644 (file)
@@ -175,16 +175,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -284,10 +274,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "\83e\83L\83X\83\83t\83@\83C\83\8b\82ð\83\8c\83W\83X\83g\83\8a\82É\83C\83\93\83|\81[\83g\82µ\82Ü\82·\81B"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "\83\8c\83W\83X\83g\83\8a\82Ì\88ê\95\94\82Ü\82½\82Í\91S\91Ì\82ð\83e\83L\83X\83\83t\83@\83C\83\8b\82É\83G\83N\83X\83|\81[\83g\82µ\82Ü\82·\81B"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "\83\8a\83\82\81[\83\83R\83\93\83s\83\85\81[\83^\82Ì\83\8c\83W\83X\83g\83\8a\82É\90Ú\91±\82µ\82Ü\82·\81B"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -344,8 +330,6 @@ BEGIN
     IDS_MY_COMPUTER         "\83}\83\83R\83\93\83s\83\85\81[\83^"
     IDS_IMPORT_REG_FILE     "\83\8c\83W\83X\83g\83\8a \83t\83@\83C\83\8b\82Ì\83C\83\93\83|\81[\83g"
     IDS_EXPORT_REG_FILE     "\83\8c\83W\83X\83g\83\8a \83t\83@\83C\83\8b\82Ì\83G\83N\83X\83|\81[\83g"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(\96³\8cø\82È DWORD \92l)"
 END
 
index b205797..01777d0 100644 (file)
@@ -162,16 +162,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -271,10 +261,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "ÅؽºÆ® ÆÄÀÏÀ» ·¹Áö½ºÆ®¸®·Î ºÒ·¯ ¿É´Ï´Ù"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "ÅؽºÆ® ÆÄÀϷΠ·¹Áö½ºÆ®¸®ÀÇ Àüü³ª ÀϺθ¦ ³»º¸³À´Ï´Ù"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "¿ø°Ý ÄÄÇ»ÅÍÀÇ ·¹Áö½ºÆ®¸®·Î Á¢¼ÓÇÕ´Ï´Ù"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -331,8 +317,6 @@ BEGIN
     IDS_MY_COMPUTER         "³» ÄÄÇ»ÅÍ"
     IDS_IMPORT_REG_FILE     "·¹Áö½ºÆ®¸® ÆÄÀÏ ºÒ·¯¿À±â"
     IDS_EXPORT_REG_FILE     "·¹Áö½ºÆ®¸® ÆÄÀÏ ³»º¸³»±â"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(À߸øµÈ DWORD°ª)"
 END
 
index 2bc0979..be86610 100644 (file)
@@ -177,16 +177,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -286,10 +276,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Een tekstbestand in het register importeren"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Het register of een gedeelte ervan naar een tekstbestand exporteren"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Een verbinding maken met het register van een externe computer"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -346,8 +332,6 @@ BEGIN
     IDS_MY_COMPUTER         "My Computer"
     IDS_IMPORT_REG_FILE     "Import Registry File"
     IDS_EXPORT_REG_FILE     "Export Registry File"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(invalid DWORD value)"
 END
 
index 60d0d1a..b052432 100644 (file)
@@ -177,16 +177,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | 
@@ -286,10 +276,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Importerer en tekstfil inn i Registret"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Eksporterer hele eller deler av Registret til en tekstfil"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Kobler til Registret på en annen datamaskin"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -346,8 +332,6 @@ BEGIN
     IDS_MY_COMPUTER         "Min datamaskin"
     IDS_IMPORT_REG_FILE     "Importer registerfil"
     IDS_EXPORT_REG_FILE     "Eksporter registerfil"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(ugyldig DWORD-verdi)"
 END
 
index 4f864f3..198125c 100644 (file)
@@ -182,16 +182,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -291,10 +281,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Importuje plik do rejestru"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Eksportuje ca³o\9cæ lub czê\9cæ rejestru do pliku"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Po³¹czenie z rejestrem zdalnego komputera"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -351,8 +337,6 @@ BEGIN
     IDS_MY_COMPUTER         "Mój komputer"
     IDS_IMPORT_REG_FILE     "Importuj plik rejestru"
     IDS_EXPORT_REG_FILE     "Eksportuj plik rejestru"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(niew³a\9cciwa warto\9cæ DWORD)"
 END
 
index 7abc3c2..4cd2199 100644 (file)
@@ -178,16 +178,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -287,10 +277,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Importa um arquivo de texto para o registro"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Exporta todo ou parte do Registro para um arquivo texto"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Conecta-se ao Registro de um computador remoto"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -347,8 +333,6 @@ BEGIN
     IDS_MY_COMPUTER         "Meu computador"
     IDS_IMPORT_REG_FILE     "Importar arquivo do Registro"
     IDS_EXPORT_REG_FILE     "Exportar arquivo do Registro"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(valor DWORD inválido)"
 END
 
index 52b15fd..15fee2f 100644 (file)
@@ -277,10 +277,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Importa um arquivo texto para o registro."
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Exporta todo ou parte do registro para um arquivo texto."
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Conecta a um registro em um computador remoto."
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -337,8 +333,6 @@ BEGIN
     IDS_MY_COMPUTER         "My Computer"
     IDS_IMPORT_REG_FILE     "Import Registry File"
     IDS_EXPORT_REG_FILE     "Export Registry File"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(invalid DWORD value)"
 END
 
@@ -390,16 +384,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EXPORTRANGE DIALOGEX DISCARDABLE  50, 50, 370, 50
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
index f8e7466..6289280 100644 (file)
@@ -177,16 +177,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
@@ -285,8 +275,6 @@ BEGIN
     ID_EDIT_NEW_DWORDVALUE                "Äîáàâëÿåò íîâîå DWORD-çíà÷åíèå"
     ID_REGISTRY_IMPORTREGISTRYFILE        "Èìïîðòèðóåò òåêñòîâîé ôàéë â ðååñòð"
     ID_REGISTRY_EXPORTREGISTRYFILE        "Ýêñïîðòèðóåò âåñü ðååñòð èëè åãî ÷àñòü â òåêñòîâîé ôàéë"
-    ID_REGISTRY_LOADHIVE                  "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE                "Unloads a hive from the registry"
 
     ID_REGISTRY_CONNECTNETWORKREGISTRY    "Ïîäêëþ÷àåòñÿ ê ðååñòðó óäàë¸ííîãî êîìïüþòåðà"
 
@@ -344,8 +332,6 @@ BEGIN
     IDS_MY_COMPUTER         "Ìîé êîìïüþòåð"
     IDS_IMPORT_REG_FILE     "Èìïîðòèðîâàíèå ôàéëà ðååñòðà"
     IDS_EXPORT_REG_FILE     "Ýêñïîðòèðîâàíèå ôàéëà ðååñòðà"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(íåïðàâèëüíîå çíà÷åíèå DWORD)"
 END
 
index b6cb475..f5437e9 100644 (file)
@@ -162,16 +162,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -271,10 +261,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Imports a text file into the registry"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Exports all or part of the registry to a text file"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Connects to a remote computer's registry"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -331,8 +317,6 @@ BEGIN
     IDS_MY_COMPUTER         "Tento poèítaè"
     IDS_IMPORT_REG_FILE     "Import Registry File"
     IDS_EXPORT_REG_FILE     "Export Registry File"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(neplatná DWORD hodnota)"
 END
 
index 0be7a42..d5c5804 100644 (file)
@@ -177,16 +177,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -286,10 +276,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "V register uvozi datoteko z besedilom"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Registrsko datoteko ali njen del izvozi v besedilno datoteko"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Vzpostavi povezavo z registrom oddaljenega raèunalnika"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -346,8 +332,6 @@ BEGIN
     IDS_MY_COMPUTER         "My Computer"
     IDS_IMPORT_REG_FILE     "Import Registry File"
     IDS_EXPORT_REG_FILE     "Export Registry File"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(invalid DWORD value)"
 END
 
index 70832d3..ee1515d 100644 (file)
@@ -175,16 +175,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -284,10 +274,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Importerar en textfil till registret"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Exporterar hela eller en del av registret till en textfil"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Ansluter till en annan dators register"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -344,8 +330,6 @@ BEGIN
     IDS_MY_COMPUTER         "Den här datorn"
     IDS_IMPORT_REG_FILE     "Importera registerfil"
     IDS_EXPORT_REG_FILE     "Exportera registerfil"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(felaktigt DWORD-värde)"
 END
 
index 51aa5da..c7bb7fd 100644 (file)
@@ -177,16 +177,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -286,10 +276,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Imports a text file into the registry"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Exports all or part of the registry to a text file"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Connects to a remote computer's registry"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -346,8 +332,6 @@ BEGIN
     IDS_MY_COMPUTER         "My Computer"
     IDS_IMPORT_REG_FILE     "Import Registry File"
     IDS_EXPORT_REG_FILE     "Export Registry File"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(invalid DWORD value)"
 END
 
index 6f98e38..5fd1fa5 100644 (file)
@@ -178,16 +178,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -287,10 +277,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "²ìïîðòóº òåêñòîâèé ôàéë äî ðåºñòðó"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Åêñïîðòóº âåñü ðåºñòð àáî éîãî ÷àñòèíó â òåêñòîâèé ôàéë"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "ϳäêëþ÷àºòüñÿ äî ðåºñòðó â³ääàëåíîãî êîìï'þòåðà"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -347,8 +333,6 @@ BEGIN
     IDS_MY_COMPUTER         "̳é êîìï'þòåð"
     IDS_IMPORT_REG_FILE     "²ìïîðòóâàòè ôàéë ðåºñòðó"
     IDS_EXPORT_REG_FILE     "Åêñïîðòóâàòè ôàéë ðåºñòðó"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(Íåïðàâèëüíå çíà÷åííÿ DWORD)"
 END
 
index 8e09846..0d20667 100644 (file)
@@ -177,16 +177,6 @@ END
 /*
  * Dialog
  */
-IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
-FONT 8, "Ms Shell Dlg"
-{
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
-    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
-    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
-}
 
 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
@@ -286,10 +276,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "½«Îļþµ¼Èëµ½×¢²á±íÖС£"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "½«×¢²á±íÈ«²¿»ò²¿·Öµ¼³öµ½ÎļþÖС£"
-    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
                             "Á¬½Óµ½Ô¶³Ì¼ÆËã»úµÄ×¢²á±í¡£"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@@ -346,8 +332,6 @@ BEGIN
     IDS_MY_COMPUTER         "My Computer"
     IDS_IMPORT_REG_FILE     "µ¼Èë×¢²á±íÎļþ"
     IDS_EXPORT_REG_FILE     "µ¼³ö×¢²á±íÎļþ"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
     IDS_INVALID_DWORD       "(²»ÕýÈ·µÄ DWORD Öµ)"
 END
 
index fcf9f52..d7eac59 100644 (file)
@@ -556,12 +556,18 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCTSTR keyPath)
         /*                } */
         /*                dwValSize = max_val_size; */
         while (RegEnumValue(hNewKey, dwIndex, ValName, &dwValNameLen, NULL, &dwValType, ValBuf, &dwValSize) == ERROR_SUCCESS) {
+            /* Remove unwanted path from key name */
+            TCHAR *pLastBl = _tcsrchr(ValName, TEXT('\\'));
+            if (pLastBl != NULL)
+                ++pLastBl;
+            else
+                pLastBl = ValName;
             /* Add a terminating 0 character. Usually this is only necessary for strings. */
             ValBuf[dwValSize] = 0;
 #ifdef UNICODE
             ValBuf[dwValSize + 1] = 0;
 #endif
-            AddEntryToList(hwndLV, ValName, dwValType, ValBuf, dwValSize, -1, TRUE);
+            AddEntryToList(hwndLV, pLastBl, dwValType, ValBuf, dwValSize, -1, TRUE);
             dwValNameLen = max_val_name_len;
             dwValSize = max_val_size;
             dwValType = 0L;
index c822049..4b837d9 100644 (file)
@@ -58,7 +58,6 @@ typedef struct {
     HWND    hTreeWnd;
     HWND    hListWnd;
        HWND    hAddressBarWnd;
-       HWND    hAddressBtnWnd;
     int     nFocusPanel;      /* 0: left  1: right */
     int            nSplitPos;
     WINDOWPLACEMENT pos;
@@ -89,9 +88,6 @@ extern void ShowAboutBox(HWND hWnd);
 /* childwnd.c */
 extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM);
 
-/* error.c */
-extern void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code);
-
 /* find.c */
 extern void FindDialog(HWND hWnd);
 extern BOOL FindNext(HWND hWnd);
index 786ee44..c29768c 100644 (file)
@@ -23,7 +23,6 @@
        <file>hexedit.c</file>
        <file>listview.c</file>
        <file>main.c</file>
-       <file>error.c</file>
        <file>regedit.c</file>
        <file>regproc.c</file>
        <file>security.c</file>
index 771d743..2190e0e 100644 (file)
 #define IDS_ERR_RENVAL_CAPTION         32856
 #define IDS_ERR_RENVAL_TOEMPTY         32857
 #define IDS_BAD_KEY                     32858
-#define IDS_LOAD_HIVE           32859
-#define IDS_UNLOAD_HIVE         32860
 
-#define ID_EDIT_NEW_MULTISTRINGVALUE           32861
-#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE      32862
+#define ID_EDIT_NEW_MULTISTRINGVALUE           32860
+#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE      32861
 
 #define ID_SWITCH_PANELS                32871
 #define ID_EDIT_PERMISSIONS            32872
 #define IDC_EXPORT_BRANCH       2009
 #define IDC_EXPORT_BRANCH_TEXT  2010
 
-#define IDD_LOADHIVE                           2500
-#define IDC_EDIT_KEY                           2501
 
 #define IDC_FAVORITENAME                2011
 #define IDC_FAVORITESLIST               2012
index 5e0727f..cd59203 100644 (file)
@@ -633,7 +633,7 @@ BOOL SelectNode(HWND hwndTV, LPCTSTR keyPath)
        TVITEM tvi;
 
     /* Total no-good hack */
-    if (!_tcsnicmp(keyPath, _T("My Computer\\"), 12))
+    if (!_tcsncmp(keyPath, _T("My Computer\\"), 12))
         keyPath += 12;
 
        hRoot = TreeView_GetRoot(hwndTV);
@@ -647,17 +647,17 @@ BOOL SelectNode(HWND hwndTV, LPCTSTR keyPath)
                /* Special case for root to expand root key abbreviations */
                if (hItem == hRoot)
                {
-                       if (!_tcsicmp(szPathPart, TEXT("HKCR")))
+                       if (!_tcscmp(szPathPart, TEXT("HKCR")))
                                _tcscpy(szPathPart, TEXT("HKEY_CLASSES_ROOT"));
-                       else if (!_tcsicmp(szPathPart, TEXT("HKCU")))
+                       else if (!_tcscmp(szPathPart, TEXT("HKCU")))
                                _tcscpy(szPathPart, TEXT("HKEY_CURRENT_USER"));
-                       else if (!_tcsicmp(szPathPart, TEXT("HKLM")))
+                       else if (!_tcscmp(szPathPart, TEXT("HKLM")))
                                _tcscpy(szPathPart, TEXT("HKEY_LOCAL_MACHINE"));
-                       else if (!_tcsicmp(szPathPart, TEXT("HKU")))
+                       else if (!_tcscmp(szPathPart, TEXT("HKU")))
                                _tcscpy(szPathPart, TEXT("HKEY_USERS"));
-                       else if (!_tcsicmp(szPathPart, TEXT("HKCC")))
+                       else if (!_tcscmp(szPathPart, TEXT("HKCC")))
                                _tcscpy(szPathPart, TEXT("HKEY_CURRENT_CONFIG"));
-                       else if (!_tcsicmp(szPathPart, TEXT("HKDD")))
+                       else if (!_tcscmp(szPathPart, TEXT("HKDD")))
                                _tcscpy(szPathPart, TEXT("HKEY_DYN_DATA"));
                }
 
@@ -672,7 +672,7 @@ BOOL SelectNode(HWND hwndTV, LPCTSTR keyPath)
 
                        (void)TreeView_GetItem(hwndTV, &tvi);
 
-                       if (!_tcsicmp(szBuffer, szPathPart))
+                       if (!_tcscmp(szBuffer, szPathPart))
                                break;
                }
 
index 97d9215..b632ad5 100644 (file)
@@ -641,10 +641,10 @@ BEGIN
     IDS_MSG_UNABLEDEBUGPROCESS    "Îòëàäêà ïðîöåññà íåâîçìîæíà"
     IDS_MSG_WARNINGDEBUG          "ÂÍÈÌÀÍÈÅ: Îòëàäêà ýòîãî ïðîöåññà ìîæåò çàêîí÷èòüñÿ ïîòåðåé äàííûõ.\nÂû óâåðåíû, ÷òî ìîæíî ïðîäîëæàòü?"
     IDS_MSG_TASKMGRWARNING        "Îøèáêà Ìåíåäæåðà çàäà÷"
-    IDS_MSG_WARNINGTERMINATING    "ÂÍÈÌÀÍÈÅ: Çàâåðøåíèå ïðîöåññà ìîæåò ïîâëå÷ü íåóñòîé÷èâóþ ðàáîòó ñèñòåìû è ïîòåðþ äàííûõ\nÑîõðàíèòå âàæíûå äàííûå ïåðåä ïðîäîëæåíèåì.\nÏðîäîëæèòü çàâåðøåíèå ïðîöåññà?"
+    IDS_MSG_WARNINGTERMINATING    "ÂÍÈÌÀÍÈÅ: Çàâåðøåíèå ïðîöåññà ìîæåò ïîâëå÷ íåóñòîé÷èâóþ ðàáîòó ñèñòåìû è ïîòåðþ äàííûõ\nÑîõðàíèòå âàæíûå äàííûå ïåðåä ïðîäîëæåíèåì.\nÏðîäîëæèòü çàâåðøåíèå ïðîöåññà?"
     IDS_MSG_UNABLETERMINATEPRO    "Íå óäàëîñü çàâåðøèòü ïðîöåññ"
     IDS_MSG_UNABLECHANGEPRIORITY  "Íå óäàëîñü èçìåíèòü ïðèîðèòåò"
-    IDS_MSG_WARNINGCHANGEPRIORITY "ÂÍÈÌÀÍÈÅ: Èçìåíåíèå ïðèîðèòåòà ìîæåò ïîâëå÷ü íåóñòîé÷èâóþ ðàáîòó è ïîòåðþ äàííûõ.\nÂû óâåðåíû, ÷òî ìîæíî ïðîäîëæàòü?"
+    IDS_MSG_WARNINGCHANGEPRIORITY "ÂÍÈÌÀÍÈÅ: Èçìåíåíèå ïðèîðèòåòà ìîæåò ïîâëå÷ íåóñòîé÷èâóþ ðàáîòó è ïîòåðþ äàííûõ.\nÂû óâåðåíû, ÷òî ìîæíî ïðîäîëæàòü?"
     IDS_MSG_TRAYICONCPUUSAGE      "Çàãðóçêà ÖÏ: %d%%"
     IDS_STATUS_MEMUSAGE           "Âûäåëåíèå ïàìÿòè: %dK / %dK"
     IDS_STATUS_CPUUSAGE           "Çàãðóçêà ÖÏ: %3d%%"
index 6c35e8d..73117a4 100644 (file)
@@ -1,7 +1,7 @@
 /* TRANSLATOR:  M rio Ka\9fm r /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR:  22-01-2008
  * Encoding  :  Latin II (852)
- * LastChange:  05-09-2010
+ * LastChange:  31-05-2010
  */
 
 #pragma once
@@ -993,13 +993,13 @@ static MUI_ENTRY skSKBootLoaderEntries[] =
     {
         8,
         12,
-        "Nainçtalova\9c zav dza\9f syst\82mu na pevnì disk (MBR a VBR).",
+        "Install bootloader on the harddisk (MBR and VBR).",
         TEXT_STYLE_NORMAL
     },
     {
         8,
         13,
-        "Nainçtalova\9c zav dza\9f syst\82mu na pevnì disk (iba VBR).",
+        "Install bootloader on the harddisk (VBR only).",
         TEXT_STYLE_NORMAL
     },
     {
index 1c63be6..09f362d 100644 (file)
@@ -180,7 +180,7 @@ WORD wDefColor;           /* default color */
  * insert commas into a number
  */
 INT
-ConvertULargeInteger(ULONGLONG num, LPTSTR des, UINT len, BOOL bPutSeperator)
+ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator)
 {
        TCHAR temp[39];   /* maximum length with nNumberGroups == 1 */
        UINT  n, iTarget;
index 9344ac9..c6605de 100644 (file)
@@ -99,7 +99,7 @@ INT cmd_cls (LPTSTR);
 
 
 /* Prototypes for CMD.C */
-INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, UINT len, BOOL bPutSeperator);
+INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator);
 HANDLE RunFile(DWORD, LPTSTR, LPTSTR, LPTSTR, INT);
 INT ParseCommandLine(LPTSTR);
 struct _PARSED_COMMAND;
index e583058..8184af7 100644 (file)
@@ -131,7 +131,7 @@ static VOID ConWrite(TCHAR *str, DWORD len, DWORD nStdHandle)
                        error_out_of_memory();
                        return;
                }
-               len = MultiByteToWideChar(OutputCodePage, 0, str, len, buffer, len);
+               len = MultiByteToWideChar(OutputCodePage, 0, str, len, buffer, len, NULL, NULL);
                str = (PVOID)buffer;
 #endif
                WriteFile(hOutput, str, len * sizeof(WCHAR), &dwWritten, NULL);
index cec75b0..f436e5c 100644 (file)
@@ -1,9 +1,9 @@
 /* Slovak translation for CMD
  * TRANSLATOR:  Mário Kaèmár /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR:  21-03-2009
- * LastChange:  10-08-2010
+ * LastChange:  21-06-2009
  * _________________________________________________________________
- * NOTE      :  this file is not fully translated
+ * NOTE      :  this file is not really translated (only scrap yet)
  */
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
@@ -118,7 +118,7 @@ dec  hex  name       dec  hex  name\n\
 6    6    Yellow     14   E    Bright Yellow\n\
 7    7    White      15   F    Bright White\n"
 
-STRING_COPY_HELP1,  "Prepísa\9d %s (Yes/No/All)? "
+STRING_COPY_HELP1,  "Overwrite %s (Yes/No/All)? "
 
 STRING_COPY_HELP2, "Skopíruje jeden alebo viac súborov na iné umiestnenie.\n\n\
 COPY [/V][/Y|/-Y][/A|/B] source [/A|/B]\n\
@@ -141,7 +141,7 @@ STRING_DATE_HELP2, "\nZadajte nov
 
 STRING_DATE_HELP3, "\nZadajte nový dátum (rrrr%cmm%cdd): "
 
-STRING_DATE_HELP4, "Zobrazí alebo nastaví dátum.\n\n\
+STRING_DATE_HELP4, "Displays or sets the date.\n\n\
 DATE [/T][date]\n\n\
   /T    display only\n\n\
 Type DATE without parameters to display the current date setting and\n\
@@ -469,7 +469,7 @@ STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n\
 TITLE [string]\n\n\
 string       Specifies the title for the command prompt window.\n"
 
-STRING_TIME_HELP1, "Zobrazí alebo nastaví systémový èas.\n\n\
+STRING_TIME_HELP1, "Displays or sets the system time.\n\n\
 TIME [/T][time]\n\n\
   /T    display only\n\n\
 Type TIME with no parameters to display the current time setting and a prompt\n\
@@ -547,18 +547,18 @@ STRING_WINDOW_HELP1, "change console window aspect\n\n\
 WINDOW [/POS[=]left,top,width,heigth]\n\
               [MIN|MAX|RESTORE] ['title']\n\n\
 /POS          specify window placement and dimensions\n\
-MIN           minimalizova\9d okno\n\
-MAX           maximalizujte okno\n\
-RESTORE       obnovi\9d okno"
+MIN           minimize the window\n\
+MAX           maximize the window\n\
+RESTORE       restore the window"
 
 STRING_WINDOW_HELP2, "change console window aspect\n\n\
 ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\
               [MIN|MAX|RESTORE] ['title']\n\n\
 window        tile of window on which perform actions\n\
 /POS          specify window placement and dimensions\n\
-MIN           minimalizova\9d okno\n\
-MAX           maximalizujte okno\n\
-RESTORE       obnovi\9d okno\n\
+MIN           minimize the window\n\
+MAX           maximize the window\n\
+RESTORE       restore the window\n\
 title         new title\n"
 
 
@@ -576,7 +576,7 @@ CLS      Vyma
 CMD      Starts a new instance of the ReactOS command interpreter.\n\
 COLOR    Sets the default console foreground and background colors.\n\
 COPY     Skopíruje jeden alebo viac súborov na iné umiestnenie.\n\
-DATE     Zobrazí alebo nastaví dátum.\n\
+DATE     Displays or sets the date.\n\
 DELETE   Deletes one or more files.\n\
 DIR      Displays a list of files and subdirectories in a directory.\n\
 ECHO     Displays messages, or turns command echoing on or off.\n\
@@ -590,8 +590,8 @@ HELP     Provides Help information for ReactOS commands.\n\
 HISTORY  List all commands which has been used\n\
 IF       Performs conditional processing in batch programs.\n\
 LABEL    Creates, changes, or deletes the volume label of a disk.\n\
-MD       Vytvorí adresár.\n\
-MKDIR    Vytvorí adresár.\n\
+MD       Creates a directory.\n\
+MKDIR    Creates a directory.\n\
 MKLINK   Creates a filesystem link object.\n\
 MOVE     Moves one or more files from one directory to another\n\
          directory.\n\
@@ -603,8 +603,8 @@ PROMPT   Changes the command prompt.\n\
 PUSHD    Saves the current directory then changes it.\n\
 RD       Removes a directory.\n\
 REM      Records comments (remarks) in batch files.\n\
-REN      Premenuje súbor alebo súbory.\n\
-RENAME   Premenuje súbor alebo súbory.\n\
+REN      Renames a file or files.\n\
+RENAME   Renames a file or files.\n\
 REPLACE  Replaces files.\n\
 RMDIR    Removes a directory.\n\
 SCREEN   Move cursor and optionally print text.\n\
@@ -612,7 +612,7 @@ SET      Displays, sets, or removes ReactOS environment variables.\n\
 SHIFT    Shifts the position of replaceable parameters in batch files.\n"
 STRING_HELP2, "START    Starts a separate window to run a specified program or command.\n\
          Executes command.\n\
-TIME     Zobrazí alebo nastaví systémový èas.\n\
+TIME     Displays or sets the system time.\n\
 TIMER    Allow the use of ten stopwatches.\n\
 TITLE    Sets the window title for a CMD.EXE session.\n\
 TYPE     Displays the contents of a text file.\n\
@@ -651,9 +651,9 @@ STRING_COPY_ERROR3,          "Error writing destination!\n"
 STRING_COPY_ERROR4,          "Chyba: Zatia¾ neimplementované!\n" //Not implemented yet
 STRING_DATE_ERROR,           "Neplatný dátum."
 STRING_DEL_ERROR5,           "The file %s will be deleted! "
-STRING_DEL_ERROR6,           "Ste si istý (Y/N)?"
+STRING_DEL_ERROR6,           "Are you sure (Y/N)?"
 STRING_DEL_ERROR7,           "Deleting: %s\n"
-STRING_ERROR_ERROR1,         "Neznáma chyba! Kód chyby: 0x%lx\n"
+STRING_ERROR_ERROR1,         "Unknown error! Error code: 0x%lx\n"
 STRING_ERROR_ERROR2,         "Syntax error"
 STRING_FOR_ERROR1,           "'in' missing in for statement."
 STRING_FOR_ERROR2,           "no brackets found."
@@ -675,47 +675,47 @@ STRING_TIME_ERROR1,          "Neplatn
 
 STRING_TYPE_ERROR1,          "Invalid option '/%s'\n"
 
-STRING_WINDOW_ERROR1,        "okno sa nena\9alo"
+STRING_WINDOW_ERROR1,        "window not found"
 
 
 STRING_ERROR_PARAMETERF_ERROR,     "Parameter format not correct - %c\n"
-STRING_ERROR_INVALID_SWITCH,       "Neplatný prepínaè - /%c\n"
+STRING_ERROR_INVALID_SWITCH,       "Invalid switch - /%c\n"
 STRING_ERROR_TOO_MANY_PARAMETERS,  "Príli\9a ve¾a parametrov - %s\n"
-STRING_ERROR_PATH_NOT_FOUND,       "Cesta sa nena\9ala\n"
-STRING_ERROR_FILE_NOT_FOUND,       "Súbor sa nena\9aiel\n"
+STRING_ERROR_PATH_NOT_FOUND,       "Path not found\n"
+STRING_ERROR_FILE_NOT_FOUND,       "File not found\n"
 STRING_ERROR_REQ_PARAM_MISSING,    "Required parameter missing\n"
 STRING_ERROR_INVALID_DRIVE,        "Invalid drive specification\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n"
-STRING_ERROR_BADCOMMAND,           "Chybný príkaz alebo názov súboru - %s\n"
+STRING_ERROR_BADCOMMAND,           "Bad command or filename - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "Chyba (z) nedostatku pamäte.\n" //Out of memory error.
-STRING_ERROR_CANNOTPIPE,           "Chyba!  Cannot pipe!  Cannot open temporary file!\n"
+STRING_ERROR_CANNOTPIPE,           "Error!  Cannot pipe!  Cannot open temporary file!\n"
 STRING_ERROR_D_PAUSEMSG,           "Pokraèujte stlaèením ¾ubovo¾ného klávesu ..."
-STRING_ERROR_DRIVER_NOT_READY,     "Jednotka nie je pripravená"
+STRING_ERROR_DRIVER_NOT_READY,     "Drive not ready"
 
 STRING_PATH_ERROR,                 "CMD: Not in environment '%s'\n"
 
-STRING_REPLACE_ERROR1, "Neplatný prepínaè - %s\n"
-STRING_REPLACE_ERROR2, "Cesta sa nena\9ala - %s\n"
+STRING_REPLACE_ERROR1, "Invalid switch - %s\n"
+STRING_REPLACE_ERROR2, "Path not found - %s\n"
 STRING_REPLACE_ERROR3, "The filename, directory name, or volume label syntax is incorrect.\n"
 STRING_REPLACE_ERROR4, "Invalid parameter combination\n"
-STRING_REPLACE_ERROR5, "Prístup zamietnutý - %s\n"
-STRING_REPLACE_ERROR6, "\8eiadne súbory sa nena\9ali - %s\n"
+STRING_REPLACE_ERROR5, "Access denied - %s\n"
+STRING_REPLACE_ERROR6, "No files found - %s\n"
 STRING_REPLACE_ERROR7, "Extended Error 32\n"
 
 STRING_REACTOS_VERSION,            "Operaèný systém ReactOS [Verzia %s-%s]\n"
-STRING_CMD_SHELLINFO,              "\nInterpréter príkazového riadku systému ReactOS\nVerzia %s %s"
+STRING_CMD_SHELLINFO,              "\nReactOS Command Line Interpreter\nVerzia %s %s"
 STRING_VERSION_RUNVER,             " running on %s"
 STRING_COPY_FILE ,                 "        %d súbor(ov) skopírovaný(ch)\n"
 STRING_DELETE_WIPE,                "wiped"
 STRING_FOR_ERROR,                  "bad variable specification."
-STRING_SCREEN_COL,                 "neplatná hodnota pre ståpec"
-STRING_SCREEN_ROW,                 "neplatná hodnota pre riadok"
+STRING_SCREEN_COL,                 "invalid value for col"
+STRING_SCREEN_ROW,                 "invalid value for row"
 STRING_TIMER_TIME                  "Timer %d is %s: "
 STRING_MKLINK_CREATED_SYMBOLIC,    "Symbolic link created for %s <<===>> %s\n"
 STRING_MKLINK_CREATED_HARD,        "Hard link created for %s <<===>> %s\n"
 STRING_MKLINK_CREATED_JUNCTION,    "Junction created for %s <<===>> %s\n"
 STRING_MORE,                       "Viac? " //"More? "
-STRING_CANCEL_BATCH_FILE,          "\r\nStlaèené Ctrl-Break.  Cancel batch file? (Yes/No/All) "
+STRING_CANCEL_BATCH_FILE,          "\r\nCtrl-Break pressed.  Cancel batch file? (Yes/No/All) "
 
 STRING_INVALID_OPERAND,            "Invalid operand."
 STRING_EXPECTED_CLOSE_PAREN,       "Oèakávaná ')'."
index 3eb404b..915246c 100644 (file)
@@ -23,7 +23,6 @@
 #include <stdarg.h>
 #include <math.h>
 #include <time.h>
-#include <assert.h>
 
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
index 99b990b..aa63996 100644 (file)
@@ -435,12 +435,6 @@ LRESULT DesktopWindow::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
                explorer_show_frame(SW_SHOWNORMAL);
                break;
 
-      case WM_DISPLAYCHANGE:
-        MoveWindow(_hwnd, 0, 0, LOWORD(lparam), HIWORD(lparam), TRUE);
-        MoveWindow(g_Globals._hwndShellView, 0, 0, LOWORD(lparam), HIWORD(lparam), TRUE);
-        MoveWindow(_desktopBar, 0, HIWORD(lparam) - DESKTOPBARBAR_HEIGHT, LOWORD(lparam), DESKTOPBARBAR_HEIGHT, TRUE);
-        break;
-
          case WM_GETISHELLBROWSER:
                return (LRESULT)static_cast<IShellBrowser*>(this);
 
index 8c356e6..4eae18b 100755 (executable)
@@ -48,19 +48,6 @@ SIZEDEFINITION LegalSizes[] = {
 };
 
 
-int LoadStringAndOem(HINSTANCE hInst,
-               UINT uID,
-               LPTSTR szStr,
-               int Siz
-)      
-{
-  TCHAR szTmp[RC_STRING_MAX_SIZE];
-  int res = LoadString(hInst, uID, szTmp, sizeof(szTmp)); 
-  CharToOem(szTmp, szStr);
-  return(res);
-}
-
-
 //----------------------------------------------------------------------
 //
 // PrintWin32Error
@@ -184,7 +171,7 @@ FormatExCallback (
 
        case PROGRESS:
                percent = (PDWORD) Argument;
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                _tprintf(szMsg, *percent);
                break;
 
@@ -197,7 +184,7 @@ FormatExCallback (
                status = (PBOOLEAN) Argument;
                if( *status == FALSE ) {
 
-                       LoadStringAndOem( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+                       LoadString( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                        _tprintf("%s", szMsg);
                        Error = TRUE;
                }
@@ -216,7 +203,7 @@ FormatExCallback (
        case UNKNOWND:
        case STRUCTUREPROGRESS:
        case CLUSTERSIZETOOSMALL:
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                _tprintf("%s", szMsg);
                return FALSE;
        }
@@ -274,7 +261,7 @@ static VOID Usage( LPTSTR ProgramName )
        BYTE dummy;
        BOOLEAN lastestVersion;
 
-       LoadStringAndOem( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+       LoadString( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
        if (!LoadFMIFSEntryPoints())
        {
                _tprintf(szMsg, ProgramName, _T(""));
@@ -332,7 +319,7 @@ _tmain(int argc, TCHAR *argv[])
        // Get function pointers
        //
        if( !LoadFMIFSEntryPoints()) {
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                _tprintf("%s", szMsg);
                return -1;
        }
@@ -342,7 +329,7 @@ _tmain(int argc, TCHAR *argv[])
        //
        if( (badArg = ParseCommandLine( argc, argv ))) {
 
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_UNKNOW_ARG, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_UNKNOW_ARG, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                _tprintf(szMsg, argv[badArg] );
 
                Usage(argv[0]);
@@ -354,7 +341,7 @@ _tmain(int argc, TCHAR *argv[])
        //
        if( !Drive ) {
 
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_DRIVE_PARM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_DRIVE_PARM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                _tprintf(szMsg);
                Usage( argv[0] );
                return -1;
@@ -372,7 +359,7 @@ _tmain(int argc, TCHAR *argv[])
        driveType = GetDriveType( RootDirectory );
 
        if( driveType == 0 ) {
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                PrintWin32Error( szMsg, GetLastError());
                return -1;
        }
@@ -384,7 +371,7 @@ _tmain(int argc, TCHAR *argv[])
        }
 
        if( driveType != DRIVE_FIXED ) {
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                _tprintf(szMsg, RootDirectory[0] );
                _fgetts( input, sizeof(input)/2, stdin );
 
@@ -399,7 +386,7 @@ _tmain(int argc, TCHAR *argv[])
                                                &serialNumber, &maxComponent, &flags,
                                                fileSystem, sizeof(fileSystem)/2)) {
 
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                PrintWin32Error( szMsg, GetLastError());
                return -1;
        }
@@ -409,11 +396,11 @@ _tmain(int argc, TCHAR *argv[])
                        &totalNumberOfBytes,
                        &totalNumberOfFreeBytes )) {
 
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                PrintWin32Error( szMsg, GetLastError());
                return -1;
        }
-       LoadStringAndOem( GetModuleHandle(NULL), STRING_FILESYSTEM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+       LoadString( GetModuleHandle(NULL), STRING_FILESYSTEM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
        _tprintf(szMsg, fileSystem );
 
        //
@@ -425,7 +412,7 @@ _tmain(int argc, TCHAR *argv[])
 
                        while(1 ) {
 
-                               LoadStringAndOem( GetModuleHandle(NULL), STRING_LABEL_NAME_EDIT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+                               LoadString( GetModuleHandle(NULL), STRING_LABEL_NAME_EDIT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                                _tprintf(szMsg, RootDirectory[0] );
                                _fgetts( input, sizeof(input)/2, stdin );
                                input[ _tcslen( input ) - 1] = 0;
@@ -434,15 +421,15 @@ _tmain(int argc, TCHAR *argv[])
 
                                        break;
                                }
-                               LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+                               LoadString( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                                _tprintf("%s", szMsg);
                        }
                }
 
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                _tprintf(szMsg, RootDirectory[0] );
 
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 
                while( 1 ) {
                        _fgetts( input, sizeof(input)/2, stdin );
@@ -473,7 +460,7 @@ _tmain(int argc, TCHAR *argv[])
                }
        } else {
 
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_FAST_FMT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_FAST_FMT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) {
 
                        _tprintf(_T("%s %luM\n"),szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024)));
@@ -483,7 +470,7 @@ _tmain(int argc, TCHAR *argv[])
                        _tprintf(_T("%s %.2fM\n"),szMsg,
                                ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0));
                }
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                _tprintf("%s", szMsg);
        }
 
@@ -501,7 +488,7 @@ _tmain(int argc, TCHAR *argv[])
                        ClusterSize, FormatExCallback );
 #endif
        if( Error ) return -1;
-       LoadStringAndOem( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+       LoadString( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
        _tprintf("%s", szMsg);
 
        //
@@ -516,7 +503,7 @@ _tmain(int argc, TCHAR *argv[])
                if( !EnableVolumeCompression( RootDirectory, TRUE )) {
 #endif
 
-                       LoadStringAndOem( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+                       LoadString( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                        _tprintf("%s", szMsg);
                }
        }
@@ -533,7 +520,7 @@ _tmain(int argc, TCHAR *argv[])
                input[ _tcslen(input)-1] = 0;
                if( !SetVolumeLabel( RootDirectory, input )) {
 
-                       LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+                       LoadString( GetModuleHandle(NULL), STRING_NO_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                        PrintWin32Error(szMsg, GetLastError());
                        return -1;
                }
@@ -544,7 +531,7 @@ _tmain(int argc, TCHAR *argv[])
                                                &serialNumber, &maxComponent, &flags,
                                                fileSystem, sizeof(fileSystem)/2)) {
 
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                PrintWin32Error( szMsg, GetLastError());
                return -1;
        }
@@ -557,12 +544,12 @@ _tmain(int argc, TCHAR *argv[])
                        &totalNumberOfBytes,
                        &totalNumberOfFreeBytes )) {
 
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                PrintWin32Error(szMsg, GetLastError());
                return -1;
        }
 
-       LoadStringAndOem( GetModuleHandle(NULL), STRING_FREE_SPACE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+       LoadString( GetModuleHandle(NULL), STRING_FREE_SPACE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
        _tprintf(szMsg, totalNumberOfBytes.QuadPart, totalNumberOfFreeBytes.QuadPart );
 
        //
@@ -573,11 +560,11 @@ _tmain(int argc, TCHAR *argv[])
                                                &serialNumber, &maxComponent, &flags,
                                                fileSystem, sizeof(fileSystem)/2)) {
 
-               LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+               LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
                PrintWin32Error( szMsg, GetLastError());
                return -1;
        }
-       LoadStringAndOem( GetModuleHandle(NULL), STRING_SERIAL_NUMBER, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+       LoadString( GetModuleHandle(NULL), STRING_SERIAL_NUMBER, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
        _tprintf(szMsg, (unsigned int)(serialNumber >> 16),
                                        (unsigned int)(serialNumber & 0xFFFF) );
 
index c40b08f..deaee25 100644 (file)
@@ -1,6 +1,6 @@
 /* TRANSLATOR :  M rio Ka\9fm r /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR.:  15-02-2008
- * LAST CHANGE:  10-08-2010
+ * LAST CHANGE:  08-08-2008
  */
 
 #include "resource.h"
@@ -14,14 +14,14 @@ STRING_HELP,  "Pou
   -FS:syst\82m s£borov  Ur\9fuje typ s£borov\82ho syst\82mu (%s).\n\
   -V:menovka          Ur\9fuje menovku zv\84zku.\n\
   -Q                  Vykon va rìchle form tovanie.\n\
-  -A:ve\96kos\9c          Prep¡çe predvolen£ ve\96kos\9c aloka\9fnej jednotky. Pre vçeobecn\82\n\
-                      pou§itie s£ d\93razne odpor£\9fan\82 predvolen\82 nastavenia\n\
-                      NTFS podporuje 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\
-                      FAT podporuje 8192, 16K, 32K, 64K, 128K, 256K.\n\
-                      NTFS kompresia nie je podporovan  pre ve\96kosti aloka\9fnej\n\
-                      jednotky nad 4096.\n\
-  -C                  S£bory vytvoren\82 na novom zv\84zku bud£ automaticky\n\
-                      komprimovan\82.\n\n"
+  -A:ve\96kos\9c          Overrides the default allocation unit size. Default settings\n\
+                      are strongly recommended for general use\n\
+                      NTFS supports 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\
+                      FAT supports 8192, 16K, 32K, 64K, 128K, 256K.\n\
+                      NTFS compression is not supported for allocation unit sizes\n\
+                      above 4096.\n\
+  -C                  Files created on the new volume will be compressed by\n\
+                      default.\n\n"
 
 STRING_COMPLETE   "Dokon\9fen\82 na %lu percent.\r"
 
@@ -29,19 +29,19 @@ STRING_FORMAT_FAIL "FormatEx nebol schopn
 
 STRING_NO_SUPPORT  "Oper cia nie je podporovan "
 
-STRING_FMIFS_FAIL  "Nepodarilo sa lokalizova\9c vstupn\82 body FMIFS.\n\n"
+STRING_FMIFS_FAIL  "Could not located FMIFS entry points.\n\n"
 
 STRING_UNKNOW_ARG  "Nezn my argument: %s\n"
 
 STRING_DRIVE_PARM  "Chìba nevyhnutnì parameter jednotky.\n\n"
 
-STRING_ERROR_DRIVE_TYPE  "Nemo§no z¡ska\9c typ jednotky"
+STRING_ERROR_DRIVE_TYPE  "Could not get drive type"
 
 STRING_INSERT_DISK       "Vlo§te nov£ disketu do jednotky %C:\na potom stla\9fte ENTER..."
 
-STRING_NO_VOLUME         "Nemo§no dotazova\9c zv\84zok"
+STRING_NO_VOLUME         "Could not query volume"
 
-STRING_NO_VOLUME_SIZE    "Nemo§no dotazova\9c ve\96kos\9c zv\84zku"
+STRING_NO_VOLUME_SIZE    "Could not query volume size"
 
 STRING_FILESYSTEM        "Typ syst\82mu s£borov je %s.\n"
 
@@ -49,8 +49,8 @@ STRING_LABEL_NAME_EDIT  "Vlo
 
 STRING_ERROR_LABEL     "Bola zadan  nespr vna menovka zv\84zku pre t£to jednotku.\n"
 
-STRING_YN_FORMAT       "\nUPOZORNENIE: VæETKY éDAJE NA NIE_VYMENITE\95NEJ DISKOVEJ\n\
-JEDNOTKE %C: BUDé STRATEN\90!\nPokra\9fova\9c s form tovan¡m (A/N)? "
+STRING_YN_FORMAT       "\nWARNING, ALL DATA ON NON_REMOVABLE DISK\n\
+DRIVE %C: WILL BE LOST!\nProceed with Format (A/N)? "
 
 STRING_YES_NO_FAQ      "AN"
 
index cc45ff5..914e013 100644 (file)
@@ -24,6 +24,7 @@
 typedef struct _SCMGR_HANDLE
 {
     DWORD Tag;
+    DWORD RefCount;
     DWORD DesiredAccess;
 } SCMGR_HANDLE;
 
@@ -31,6 +32,9 @@ typedef struct _SCMGR_HANDLE
 typedef struct _MANAGER_HANDLE
 {
     SCMGR_HANDLE Handle;
+
+    /* FIXME: Insert more data here */
+
     WCHAR DatabaseName[1];
 } MANAGER_HANDLE, *PMANAGER_HANDLE;
 
@@ -38,7 +42,12 @@ typedef struct _MANAGER_HANDLE
 typedef struct _SERVICE_HANDLE
 {
     SCMGR_HANDLE Handle;
+
+    DWORD DesiredAccess;
     PSERVICE ServiceEntry;
+
+    /* FIXME: Insert more data here */
+
 } SERVICE_HANDLE, *PSERVICE_HANDLE;
 
 
@@ -142,7 +151,7 @@ ScmCreateManagerHandle(LPWSTR lpDatabaseName,
     if (lpDatabaseName == NULL)
         lpDatabaseName = SERVICES_ACTIVE_DATABASEW;
 
-    if (_wcsicmp(lpDatabaseName, SERVICES_FAILED_DATABASEW) == 0)
+    if (_wcsicmp(lpDatabaseName,SERVICES_FAILED_DATABASEW)==0)
     {
         DPRINT("Database %S, does not exist\n",lpDatabaseName);
         return ERROR_DATABASE_DOES_NOT_EXIST;
@@ -160,6 +169,9 @@ ScmCreateManagerHandle(LPWSTR lpDatabaseName,
         return ERROR_NOT_ENOUGH_MEMORY;
 
     Ptr->Handle.Tag = MANAGER_TAG;
+    Ptr->Handle.RefCount = 1;
+
+    /* FIXME: initialize more data here */
 
     wcscpy(Ptr->DatabaseName, lpDatabaseName);
 
@@ -182,7 +194,9 @@ ScmCreateServiceHandle(PSERVICE lpServiceEntry,
         return ERROR_NOT_ENOUGH_MEMORY;
 
     Ptr->Handle.Tag = SERVICE_TAG;
+    Ptr->Handle.RefCount = 1;
 
+    /* FIXME: initialize more data here */
     Ptr->ServiceEntry = lpServiceEntry;
 
     *Handle = (SC_HANDLE)Ptr;
@@ -191,46 +205,6 @@ ScmCreateServiceHandle(PSERVICE lpServiceEntry,
 }
 
 
-static PMANAGER_HANDLE
-ScmGetServiceManagerFromHandle(SC_RPC_HANDLE Handle)
-{
-    PMANAGER_HANDLE pManager = NULL;
-
-    _SEH2_TRY
-    {
-        if (((PMANAGER_HANDLE)Handle)->Handle.Tag == MANAGER_TAG)
-            pManager = (PMANAGER_HANDLE)Handle;
-    }
-    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-    {
-        DPRINT1("Exception: Invalid Service Manager handle!\n");
-    }
-    _SEH2_END;
-
-    return pManager;
-}
-
-
-static PSERVICE_HANDLE
-ScmGetServiceFromHandle(SC_RPC_HANDLE Handle)
-{
-    PSERVICE_HANDLE pService = NULL;
-
-    _SEH2_TRY
-    {
-        if (((PSERVICE_HANDLE)Handle)->Handle.Tag == SERVICE_TAG)
-            pService = (PSERVICE_HANDLE)Handle;
-    }
-    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-    {
-        DPRINT1("Exception: Invalid Service handle!\n");
-    }
-    _SEH2_END;
-
-    return pService;
-}
-
-
 static DWORD
 ScmCheckAccess(SC_HANDLE Handle,
                DWORD dwDesiredAccess)
@@ -443,33 +417,42 @@ DWORD RCloseServiceHandle(
     if (*hSCObject == 0)
         return ERROR_INVALID_HANDLE;
 
-    hManager = ScmGetServiceManagerFromHandle(*hSCObject);
-    hService = ScmGetServiceFromHandle(*hSCObject);
-
-    if (hManager != NULL)
+    hManager = (PMANAGER_HANDLE)*hSCObject;
+    hService = (PSERVICE_HANDLE)*hSCObject;
+    if (hManager->Handle.Tag == MANAGER_TAG)
     {
         DPRINT("Found manager handle\n");
 
-        /* FIXME: add handle cleanup code */
+        hManager->Handle.RefCount--;
+        if (hManager->Handle.RefCount == 0)
+        {
+            /* FIXME: add handle cleanup code */
 
-        HeapFree(GetProcessHeap(), 0, hManager);
-        hManager = NULL;
+            HeapFree(GetProcessHeap(), 0, hManager);
+            hManager = NULL;
+        }
 
         DPRINT("RCloseServiceHandle() done\n");
         return ERROR_SUCCESS;
     }
-    else if (hService != NULL)
+    else if (hService->Handle.Tag == SERVICE_TAG)
     {
         DPRINT("Found service handle\n");
 
         /* Get the pointer to the service record */
         lpService = hService->ServiceEntry;
 
-        /* FIXME: add handle cleanup code */
+        ASSERT(hService->Handle.RefCount > 0);
 
-        /* Free the handle */
-        HeapFree(GetProcessHeap(), 0, hService);
-        hService = NULL;
+        hService->Handle.RefCount--;
+        if (hService->Handle.RefCount == 0)
+        {
+            /* FIXME: add handle cleanup code */
+
+            /* Free the handle */
+            HeapFree(GetProcessHeap(), 0, hService);
+            hService = NULL;
+        }
 
         ASSERT(lpService->dwRefCount > 0);
 
@@ -552,8 +535,6 @@ DWORD RControlService(
     DWORD dwError = ERROR_SUCCESS;
     DWORD pcbBytesNeeded = 0;
     DWORD dwServicesReturned = 0;
-    DWORD dwControlsAccepted;
-    DWORD dwCurrentState;
     HKEY hServicesKey = NULL;
 
     DPRINT("RControlService() called\n");
@@ -562,19 +543,18 @@ DWORD RControlService(
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
     /* Check the service handle */
-    hSvc = ScmGetServiceFromHandle(hService);
-    if (hSvc == NULL)
+    hSvc = (PSERVICE_HANDLE)hService;
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
-
     /* Check the service entry point */
     lpService = hSvc->ServiceEntry;
     if (lpService == NULL)
     {
-        DPRINT1("lpService == NULL!\n"); 
+        DPRINT("lpService == NULL!\n"); 
         return ERROR_INVALID_HANDLE;
     }
 
@@ -655,49 +635,6 @@ DWORD RControlService(
     }
     else
     {
-        dwControlsAccepted = lpService->Status.dwControlsAccepted;
-        dwCurrentState = lpService->Status.dwCurrentState;
-
-        /* Check the current state before sending a control request */
-        switch (dwCurrentState)
-        {
-            case SERVICE_STOP_PENDING:
-            case SERVICE_STOPPED:
-                return ERROR_SERVICE_CANNOT_ACCEPT_CTRL;
-
-            case SERVICE_START_PENDING:
-                switch (dwControl)
-                {
-                    case SERVICE_CONTROL_STOP:
-                        break;
-
-                    case SERVICE_CONTROL_INTERROGATE:
-                        RtlCopyMemory(lpServiceStatus,
-                                      &lpService->Status,
-                                      sizeof(SERVICE_STATUS));
-                        return ERROR_SUCCESS;
-
-                    default:
-                        return ERROR_SERVICE_CANNOT_ACCEPT_CTRL;
-                }
-                break;
-        }
-
-        /* Check if the control code is acceptable to the service */
-        switch (dwControl)
-        {
-            case SERVICE_CONTROL_STOP:
-                if ((dwControlsAccepted & SERVICE_ACCEPT_STOP) == 0)
-                    return ERROR_INVALID_SERVICE_CONTROL;
-                break;
-
-            case SERVICE_CONTROL_PAUSE:
-            case SERVICE_CONTROL_CONTINUE:
-                if ((dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) == 0)
-                    return ERROR_INVALID_SERVICE_CONTROL;
-                break;
-        }
-
         /* Send control code to the service */
         dwError = ScmControlService(lpService,
                                     dwControl);
@@ -737,12 +674,9 @@ DWORD RDeleteService(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
-    if (hSvc == NULL)
-    {
-        DPRINT1("Invalid service handle!\n");
+    hSvc = (PSERVICE_HANDLE)hService;
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
         return ERROR_INVALID_HANDLE;
-    }
 
     if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess,
                                   DELETE))
@@ -787,12 +721,9 @@ DWORD RLockServiceDatabase(
 
     *lpLock = 0;
 
-    hMgr = ScmGetServiceManagerFromHandle(hSCManager);
-    if (hMgr == NULL)
-    {
-        DPRINT1("Invalid service manager handle!\n");
+    hMgr = (PMANAGER_HANDLE)hSCManager;
+    if (!hMgr || hMgr->Handle.Tag != MANAGER_TAG)
         return ERROR_INVALID_HANDLE;
-    }
 
     if (!RtlAreAllAccessesGranted(hMgr->Handle.DesiredAccess,
                                   SC_MANAGER_LOCK))
@@ -827,15 +758,15 @@ DWORD RQueryServiceObjectSecurity(
 
     DPRINT("RQueryServiceObjectSecurity() called\n");
 
-    hSvc = ScmGetServiceFromHandle(hService);
-    if (hSvc == NULL)
+    hSvc = (PSERVICE_HANDLE)hService;
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
-    if (dwSecurityInformation & (DACL_SECURITY_INFORMATION |
-                                 GROUP_SECURITY_INFORMATION |
+    if (dwSecurityInformation & (DACL_SECURITY_INFORMATION ||
+                                 GROUP_SECURITY_INFORMATION ||
                                  OWNER_SECURITY_INFORMATION))
         DesiredAccess |= READ_CONTROL;
 
@@ -909,10 +840,10 @@ DWORD RSetServiceObjectSecurity(
 
     DPRINT("RSetServiceObjectSecurity() called\n");
 
-    hSvc = ScmGetServiceFromHandle(hService);
-    if (hSvc == NULL)
+    hSvc = (PSERVICE_HANDLE)hService;
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -1026,10 +957,10 @@ DWORD RQueryServiceStatus(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
-    if (hSvc == NULL)
+    hSvc = (PSERVICE_HANDLE)hService;
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -1212,10 +1143,10 @@ DWORD RChangeServiceConfigW(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
-    if (hSvc == NULL)
+    hSvc = (PSERVICE_HANDLE)hService;
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -1832,10 +1763,10 @@ DWORD RCreateServiceW(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hManager = ScmGetServiceManagerFromHandle(hSCManager);
-    if (hManager == NULL)
+    hManager = (PMANAGER_HANDLE)hSCManager;
+    if (!hManager || hManager->Handle.Tag != MANAGER_TAG)
     {
-        DPRINT1("Invalid service manager handle!\n");
+        DPRINT("Invalid manager handle!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -2142,6 +2073,7 @@ DWORD REnumDependentServicesW(
     DWORD dwServicesReturned = 0;
     DWORD dwServiceCount;
     HKEY hServicesKey = NULL;
+    LPSC_RPC_HANDLE hSCObject;
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService = NULL;
     PSERVICE *lpServicesArray = NULL;
@@ -2153,13 +2085,8 @@ DWORD REnumDependentServicesW(
 
     DPRINT("REnumDependentServicesW() called\n");
 
-    hSvc = ScmGetServiceFromHandle(hService);
-    if (hSvc == NULL)
-    {
-        DPRINT1("Invalid service handle!\n");
-        return ERROR_INVALID_HANDLE;
-    }
-
+    hSCObject = &hService;
+    hSvc = (PSERVICE_HANDLE) *hSCObject;
     lpService = hSvc->ServiceEntry;
 
     /* Check access rights */
@@ -2291,14 +2218,13 @@ DWORD REnumServicesStatusW(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hManager = ScmGetServiceManagerFromHandle(hSCManager);
-    if (hManager == NULL)
+    hManager = (PMANAGER_HANDLE)hSCManager;
+    if (!hManager || hManager->Handle.Tag != MANAGER_TAG)
     {
-        DPRINT1("Invalid service manager handle!\n");
+        DPRINT("Invalid manager handle!\n");
         return ERROR_INVALID_HANDLE;
     }
 
-
     *pcbBytesNeeded = 0;
     *lpServicesReturned = 0;
 
@@ -2543,10 +2469,10 @@ DWORD ROpenServiceW(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hManager = ScmGetServiceManagerFromHandle(hSCManager);
-    if (hManager == NULL)
+    hManager = (PMANAGER_HANDLE)hSCManager;
+    if (!hManager || hManager->Handle.Tag != MANAGER_TAG)
     {
-        DPRINT1("Invalid service manager handle!\n");
+        DPRINT("Invalid manager handle!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -2623,10 +2549,10 @@ DWORD RQueryServiceConfigW(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
-    if (hSvc == NULL)
+    hSvc = (PSERVICE_HANDLE)hService;
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -2831,10 +2757,10 @@ DWORD RStartServiceW(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
-    if (hSvc == NULL)
+    hSvc = (PSERVICE_HANDLE)hService;
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -3057,10 +2983,10 @@ DWORD RChangeServiceConfigA(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
-    if (hSvc == NULL)
+    hSvc = (PSERVICE_HANDLE)hService;
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -3475,6 +3401,7 @@ DWORD REnumDependentServicesA(
     DWORD dwServicesReturned = 0;
     DWORD dwServiceCount;
     HKEY hServicesKey = NULL;
+    LPSC_RPC_HANDLE hSCObject;
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService = NULL;
     PSERVICE *lpServicesArray = NULL;
@@ -3486,13 +3413,8 @@ DWORD REnumDependentServicesA(
 
     DPRINT("REnumDependentServicesA() called\n");
 
-    hSvc = ScmGetServiceFromHandle(hService);
-    if (hSvc == NULL)
-    {
-        DPRINT1("Invalid service handle!\n");
-        return ERROR_INVALID_HANDLE;
-    }
-
+    hSCObject = &hService;
+    hSvc = (PSERVICE_HANDLE) *hSCObject;
     lpService = hSvc->ServiceEntry;
 
     /* Check access rights */
@@ -3801,10 +3723,10 @@ DWORD RQueryServiceConfigA(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
-    if (hSv