Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[mkupfer] 51871: patch by Igor Paliychuk <mansonigor at gmail dot com>: - [CMAKE] Reduce difference with cmake branch - msvc fixes - minor changes by me

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Mon May 23 19:30:50 2011 New Revision: 51871 URL: http://svn.reactos.org/svn/reactos?rev=51871&view=rev Log: patch by Igor Paliychuk <mansonigor at gmail dot com>: - [CMAKE] Reduce difference with cmake branch - msvc fixes - minor changes by me Modified: trunk/reactos/base/setup/usetup/filesup.c trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/configure.sh trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc trunk/reactos/drivers/bus/acpi/busmgr/button.c trunk/reactos/drivers/bus/acpi/busmgr/power.c trunk/reactos/drivers/bus/acpi/busmgr/system.c trunk/reactos/drivers/bus/acpi/main.c trunk/reactos/drivers/bus/acpi/pnp.c trunk/reactos/drivers/bus/acpi/power.c trunk/reactos/drivers/bus/pcix/pci/busno.c trunk/reactos/hal/halx86/mp/i386/mps.S trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -126,7 +126,7 @@ FILE_SEQUENTIAL_ONLY); if(!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile failed: %x\n", Status); + DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName); goto done; } #else Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Mon May 23 19:30:50 2011 @@ -40,6 +40,7 @@ fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 ext2fs.sys=,,,,,,x,,,,,,4 +vgafonts.cab=,,,,,,,,,,,,1 classpnp.sys=,,,,,,,,,,,,4 pcix.sys=,,,,,,,,,,,,4 pcmcia.sys=,,,,,,,,,,,,4 Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=51871&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Mon May 23 19:30:50 2011 @@ -10,7 +10,6 @@ REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH -echo ARCH $ARCH ROS $ROS_ARCH if [ "$REACTOS_SOURCE_DIR" == "$PWD" ] then echo Creating directories in $REACTOS_OUTPUT_PATH @@ -34,5 +33,5 @@ cd ../reactos cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" -echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, makex, etc...). +echo "Configure script complete! Enter directories and execute appropriate build commands(ex: make, makex, etc...)." Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Mon May 23 19:30:50 2011 @@ -9,8 +9,8 @@ #include "locale_rc.rc" +#include "lang/en-US.rc" #include "lang/de-DE.rc" -#include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] Mon May 23 19:30:50 2011 @@ -33,10 +33,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Ne jelenÃ&tse meg ezt az Ã¼zenetet mÃ©gegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&MÃ©gse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&MÃ©gse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] Mon May 23 19:30:50 2011 @@ -34,10 +34,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "NÃ£o &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&NÃ£o" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&NÃ£o", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE Modified: trunk/reactos/drivers/bus/acpi/busmgr/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -42,13 +42,13 @@ static int acpi_button_remove (struct acpi_device *device, int type); static struct acpi_driver acpi_button_driver = { - .name = ACPI_BUTTON_DRIVER_NAME, - .class = ACPI_BUTTON_CLASS, - .ids = "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", - .ops = { - .add = acpi_button_add, - .remove = acpi_button_remove, - }, + {0,0}, + ACPI_BUTTON_DRIVER_NAME, + ACPI_BUTTON_CLASS, + 0, + 0, + "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", + {acpi_button_add,acpi_button_remove} }; struct acpi_button { Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -64,14 +64,13 @@ static int acpi_power_resume(struct acpi_device *device, int state); static struct acpi_driver acpi_power_driver = { - .name = ACPI_POWER_DRIVER_NAME, - .class = ACPI_POWER_CLASS, - .ids = ACPI_POWER_HID, - .ops = { - .add = acpi_power_add, - .remove = acpi_power_remove, - .resume = acpi_power_resume, - }, + {0,0}, + ACPI_POWER_DRIVER_NAME, + ACPI_POWER_CLASS, + 0, + 0, + ACPI_POWER_HID, + {acpi_power_add, acpi_power_remove, NULL, NULL, acpi_power_resume} }; struct acpi_power_reference { Modified: trunk/reactos/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/sy… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -48,13 +48,13 @@ ACPI_STATUS acpi_suspend (UINT32 state); static struct acpi_driver acpi_system_driver = { - .name = ACPI_SYSTEM_DRIVER_NAME, - .class = ACPI_SYSTEM_CLASS, - .ids = ACPI_SYSTEM_HID, - .ops = { - .add = acpi_system_add, - .remove = acpi_system_remove - }, + {0,0}, + ACPI_SYSTEM_DRIVER_NAME, + ACPI_SYSTEM_CLASS, + 0, + 0, + ACPI_SYSTEM_HID, + {acpi_system_add, acpi_system_remove} }; struct acpi_system Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -11,6 +11,13 @@ #define NDEBUG #include <debug.h> + +NTSTATUS +NTAPI +DriverEntry ( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath + ); #ifdef ALLOC_PRAGMA #pragma alloc_text (INIT, DriverEntry) Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -9,12 +9,17 @@ #include <wdmguid.h> #define NDEBUG #include <debug.h> + +NTSTATUS +Bus_PlugInDevice ( + struct acpi_device *Device, + PFDO_DEVICE_DATA FdoData + ); #ifdef ALLOC_PRAGMA #pragma alloc_text (PAGE, Bus_PnP) #pragma alloc_text (PAGE, Bus_PlugInDevice) #pragma alloc_text (PAGE, Bus_InitializePdo) -#pragma alloc_text (PAGE, Bus_UnPlugDevice) #pragma alloc_text (PAGE, Bus_DestroyPdo) #pragma alloc_text (PAGE, Bus_FDO_PnP) #pragma alloc_text (PAGE, Bus_StartFdo) Modified: trunk/reactos/drivers/bus/acpi/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -224,7 +224,7 @@ return status; } -#ifndef NDEBUG +#if !defined(NDEBUG) || defined(_MSC_VER) PCHAR PowerMinorFunctionString ( Modified: trunk/reactos/drivers/bus/pcix/pci/busno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/busno… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -20,8 +20,9 @@ NTAPI PciAreBusNumbersConfigured(IN PPCI_PDO_EXTENSION PdoExtension) { + UCHAR PrimaryBus, BaseBus, SecondaryBus, SubordinateBus; + PAGED_CODE(); - UCHAR PrimaryBus, BaseBus, SecondaryBus, SubordinateBus; /* Get all relevant bus number details */ PrimaryBus = PdoExtension->Dependent.type1.PrimaryBus; Modified: trunk/reactos/hal/halx86/mp/i386/mps.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/i386/mps.S?r… ============================================================================== --- trunk/reactos/hal/halx86/mp/i386/mps.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/i386/mps.S [iso-8859-1] Mon May 23 19:30:50 2011 @@ -11,7 +11,9 @@ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> +#include <asm.inc> + +#include <ks386.inc> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -30,6 +30,9 @@ #include "float_cast.h" #include "common.h" +#include <windows.h> +#include <debug.h> + static int linear_vari_process (SRC_PRIVATE *psrc, SRC_DATA *data) ; static void linear_reset (SRC_PRIVATE *psrc) ; @@ -107,8 +110,8 @@ src_ratio = psrc->last_ratio + priv->out_gen * (data->src_ratio - psrc->last_ratio) / priv->out_count ; if (SRC_DEBUG && priv->in_used < priv->channels && input_index < 1.0) - { printf ("Whoops!!!! in_used : %ld channels : %d input_index : %f\n", priv->in_used, priv->channels, input_index) ; - exit (1) ; + { DPRINT1 ("Whoops!!!! in_used : %ld channels : %d input_index : %f\n", priv->in_used, priv->channels, input_index) ; + ASSERT (0) ; } ; for (ch = 0 ; ch < priv->channels ; ch++) Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Mon May 23 19:30:50 2011 @@ -41,7 +41,7 @@ ULONG KeIcacheFlushCount = 0; ULONG KiDmaIoCoherency = 0; ULONG KePrefetchNTAGranularity = 32; -CHAR KeNumberProcessors; +CHAR KeNumberProcessors = 0; KAFFINITY KeActiveProcessors = 1; BOOLEAN KiI386PentiumLockErrataPresent; BOOLEAN KiSMTProcessorsPresent;

13 years, 5 months

[akhaldi] 51870: [CMAKE] * Remove meaningless target_link_libraries(${MODULE})

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 23 18:52:04 2011 New Revision: 51870 URL: http://svn.reactos.org/svn/reactos?rev=51870&view=rev Log: [CMAKE] * Remove meaningless target_link_libraries(${MODULE}) Modified: trunk/reactos/msc.cmake Modified: trunk/reactos/msc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/msc.cmake?rev=51870&r1=518… ============================================================================== --- trunk/reactos/msc.cmake [iso-8859-1] (original) +++ trunk/reactos/msc.cmake [iso-8859-1] Mon May 23 18:52:04 2011 @@ -108,7 +108,6 @@ set_image_base(${MODULE} 0x00010000) add_linkerflag(${MODULE} "/DRIVER") add_dependencies(${MODULE} bugcodes) - target_link_libraries(${MODULE}) endif() endmacro() @@ -195,4 +194,3 @@ #pseh workaround set(PSEH_LIB "pseh") -

13 years, 5 months

[ekohl] 51869: Real fix of the broken build.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon May 23 18:49:03 2011 New Revision: 51869 URL: http://svn.reactos.org/svn/reactos?rev=51869&view=rev Log: Real fix of the broken build. Modified: trunk/reactos/dll/win32/msports/comdb.c Modified: trunk/reactos/dll/win32/msports/comdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/comdb.c?… ============================================================================== --- trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] Mon May 23 18:49:03 2011 @@ -20,7 +20,6 @@ HKEY hKey; DWORD dwSize; PBYTE pBitmap; - PBYTE pData; } COMDB, *PCOMDB; @@ -92,7 +91,7 @@ L"ComDB", 0, REG_BINARY, - pComDB->pData, + pComDB->pBitmap, pComDB->dwSize); } @@ -171,10 +170,10 @@ { /* Allocate a new bitmap */ pComDB->dwSize = COMDB_MIN_PORTS_ARBITRATED / BITS_PER_BYTE; - pComDB->pData = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - pComDB->dwSize); - if (pComDB->pData == NULL) + pComDB->pBitmap = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + pComDB->dwSize); + if (pComDB->pBitmap == NULL) { ERR("Failed to allocaete the bitmap!\n"); lError = ERROR_ACCESS_DENIED; @@ -186,7 +185,7 @@ L"ComDB", 0, REG_BINARY, - pComDB->pData, + pComDB->pBitmap, pComDB->dwSize); } @@ -197,8 +196,8 @@ if (pComDB->hKey != NULL) RegCloseKey(pComDB->hKey); - if (pComDB->pData != NULL) - HeapFree(GetProcessHeap(), 0, pComDB->pData); + if (pComDB->pBitmap != NULL) + HeapFree(GetProcessHeap(), 0, pComDB->pBitmap); HeapFree(GetProcessHeap(), 0, pComDB);

13 years, 5 months

[tkreuzer] 51868: [CMAKE] - Remove last traces of mingw_common - adopt msvcrtex on msvc builds - Fix MSVC warnings in crtexe.c, already pushed upstream

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 23 18:27:16 2011 New Revision: 51868 URL: http://svn.reactos.org/svn/reactos?rev=51868&view=rev Log: [CMAKE] - Remove last traces of mingw_common - adopt msvcrtex on msvc builds - Fix MSVC warnings in crtexe.c, already pushed upstream Added: trunk/reactos/lib/sdk/crt/misc/ofmt_stub.c - copied unchanged from r51859, trunk/reactos/lib/3rdparty/mingw/ofmt_stub.c trunk/reactos/lib/sdk/crt/startup/crtdll.c - copied unchanged from r51859, trunk/reactos/lib/3rdparty/mingw/crtdll.c trunk/reactos/lib/sdk/crt/startup/dllentry.c - copied unchanged from r51859, trunk/reactos/lib/3rdparty/mingw/dllentry.c trunk/reactos/lib/sdk/crt/startup/pseudo-reloc-list.c - copied unchanged from r51859, trunk/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c Modified: trunk/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt trunk/reactos/base/shell/explorer/CMakeLists.txt trunk/reactos/base/system/autochk/CMakeLists.txt trunk/reactos/base/system/smss/CMakeLists.txt trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt trunk/reactos/dll/win32/dnsapi/CMakeLists.txt trunk/reactos/dll/win32/olesvr32/CMakeLists.txt trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt trunk/reactos/lib/sdk/crt/CMakeLists.txt trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/lib/sdk/crt/startup/crtexe.c trunk/reactos/msc.cmake trunk/reactos/subsystems/ntvdm/CMakeLists.txt Modified: trunk/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -11,5 +11,5 @@ add_library(kbsdll SHARED ${SOURCE}) set_module_type(kbsdll win32dll) -add_importlibs(kbsdll user32 comctl32 kernel32 msvcrt) +add_importlibs(kbsdll user32 comctl32 msvcrt kernel32) add_cd_file(TARGET kbsdll DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -64,8 +64,6 @@ -lgcc -lmingwex wine - mingw_wmain - mingw_common uuid) add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 notifyhook msvcrt kernel32 ntdll) Modified: trunk/reactos/base/system/autochk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/CMakeL… ============================================================================== --- trunk/reactos/base/system/autochk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -3,6 +3,6 @@ set_module_type(autochk nativecui) -target_link_libraries(autochk mingw_common nt) -add_importlibs(autochk kernel32 ntdll) +target_link_libraries(autochk nt) +add_importlibs(autochk ntdll) add_cd_file(TARGET autochk DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/smss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/CMakeList… ============================================================================== --- trunk/reactos/base/system/smss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -25,7 +25,7 @@ add_executable(smss WIN32 ${CMAKE_CURRENT_BINARY_DIR}/smss_smss.h.gch ${SOURCE}) -target_link_libraries(smss mingw_common nt smlib) +target_link_libraries(smss nt smlib) if(MSVC) target_link_libraries(smss msvcsup) set_entrypoint(smss DllMainCRTStartup) Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -61,11 +61,6 @@ set_entrypoint(libjpeg 0) -if(MSVC) -# for _fltused -target_link_libraries(libjpeg mingw_common) -endif() - add_importlibs(libjpeg msvcrt kernel32) add_dependencies(libjpeg psdk) Modified: trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/CMakeL… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -30,7 +30,7 @@ set_entrypoint(libpng 0) -target_link_libraries(libpng mingw_common zlib) +target_link_libraries(libpng zlib) add_importlibs(libpng msvcrt kernel32) Modified: trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -53,7 +53,7 @@ set_entrypoint(libtiff 0) -target_link_libraries(libtiff mingw_common zlib getopt) +target_link_libraries(libtiff zlib getopt) add_importlibs(libtiff user32 msvcrt kernel32) Modified: trunk/reactos/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -28,10 +28,6 @@ set_entrypoint(dnsapi 0) target_link_libraries(dnsapi adns) -if(MSVC) - target_link_libraries(dnsapi msvcsup) -endif() - add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE}) add_dependencies(dnsapi psdk) Modified: trunk/reactos/dll/win32/olesvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olesvr32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -13,9 +13,7 @@ set_entrypoint(olesvr32 0) -target_link_libraries(olesvr32 - wine - mingw_common) +target_link_libraries(olesvr32 wine) add_importlibs(olesvr32 kernel32 ntdll) add_dependencies(olesvr32 psdk) Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/CMak… ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -18,7 +18,6 @@ set_target_properties(winemp3.acm PROPERTIES SUFFIX "") target_link_libraries(winemp3.acm - mingw_common wine libmpg123) Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -7,18 +7,6 @@ include(libcntpr.cmake) include(msvcrtex.cmake) include(oldnames.cmake) - -if(MSVC) -# This is a temporary solution until we have proper crt libs - list(APPEND MSVCSUP_SOURCE - misc/fltused.c - except/i386/chkstk_asm.s - math/i386/ci.c - math/i386/ftol2_asm.S) - - add_library(msvcsup ${MSVCSUP_SOURCE}) - add_dependencies(msvcsup psdk asm) -endif() add_library(user32_wsprintf printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Mon May 23 18:27:16 2011 @@ -8,6 +8,7 @@ list(APPEND MSVCRTEX_SOURCE startup/crtexe.c startup/wcrtexe.c + startup/crtdll.c startup/_newmode.c startup/wildcard.c startup/tlssup.c @@ -18,6 +19,7 @@ startup/atonexit.c startup/txtmode.c startup/pseudo-reloc.c + startup/pseudo-reloc-list.c startup/tlsmcrt.c startup/tlsthrd.c startup/tlsmthread.c @@ -28,9 +30,19 @@ startup/wdllargv.c startup/crt0_c.c startup/crt0_w.c + startup/dllentry.c + misc/fltused.c + misc/ofmt_stub.c +) - misc/fltused.c +if(ARCH MATCHES i386) +list(APPEND MSVCRTEX_SOURCE + except/i386/chkstk_asm.s + math/i386/ci.c + math/i386/ftol2_asm.S + math/i386/alldiv_asm.s ) +endif() if(MSVC) list(APPEND MSVCRTEX_SOURCE startup/mscmain.c) @@ -40,6 +52,7 @@ add_library(msvcrtex ${MSVCRTEX_SOURCE}) set_target_properties(msvcrtex PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) +set_source_files_properties(startup/crtdll.c PROPERTIES COMPILE_DEFINITIONS CRTDLL) if(NOT MSVC) target_link_libraries(msvcrtex oldnames) Modified: trunk/reactos/lib/sdk/crt/startup/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtexe… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] Mon May 23 18:27:16 2011 @@ -56,7 +56,7 @@ #if defined(__GNUC__) int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0; #else -int _MINGW_INSTALL_DEBUG_MATHERR = 0; +int __declspec(selectany) _MINGW_INSTALL_DEBUG_MATHERR = 0; #endif extern int __defaultmatherr; extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *); @@ -108,8 +108,8 @@ static int __cdecl pre_c_init (void); static void __cdecl pre_cpp_init (void); static void __cdecl __mingw_prepare_except_for_msvcr80_and_higher (void); -_CRTALLOC(".CRT$XIAA") _PIFV mingw_pcinit = pre_c_init; -_CRTALLOC(".CRT$XCAA") _PVFV mingw_pcppinit = pre_cpp_init; +_CRTALLOC(".CRT$XIAA") _PIFV __declspec(selectany) mingw_pcinit = pre_c_init; +_CRTALLOC(".CRT$XCAA") _PVFV __declspec(selectany) mingw_pcppinit = pre_cpp_init; static int __cdecl pre_c_init (void) Modified: trunk/reactos/msc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/msc.cmake?rev=51868&r1=518… ============================================================================== --- trunk/reactos/msc.cmake [iso-8859-1] (original) +++ trunk/reactos/msc.cmake [iso-8859-1] Mon May 23 18:27:16 2011 @@ -26,7 +26,7 @@ add_definitions(-D__x86_64) endif() -link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) +link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/sdk/crt) set(CMAKE_RC_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) set(CMAKE_ASM_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) @@ -70,28 +70,21 @@ if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) set_entrypoint(${MODULE} NtProcessStartup@4) - endif() - if (${TYPE} MATCHES win32gui) + elseif (${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) - set_entrypoint(${MODULE} WinMainCRTStartup) if(IS_UNICODE) - target_link_libraries(${MODULE} mingw_wmain) + set_entrypoint(${MODULE} wWinMainCRTStartup) else() - target_link_libraries(${MODULE} mingw_main) - endif() - target_link_libraries(${MODULE} mingw_common msvcsup) - endif () - if (${TYPE} MATCHES win32cui) + set_entrypoint(${MODULE} WinMainCRTStartup) + endif(IS_UNICODE) + elseif (${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) - set_entrypoint(${MODULE} mainCRTStartup) if(IS_UNICODE) - target_link_libraries(${MODULE} mingw_wmain) + set_entrypoint(${MODULE} wmainCRTStartup) else() - target_link_libraries(${MODULE} mingw_main) - endif() - target_link_libraries(${MODULE} mingw_common msvcsup) - endif () - if(${TYPE} MATCHES win32dll) + set_entrypoint(${MODULE} mainCRTStartup) + endif(IS_UNICODE) + elseif(${TYPE} MATCHES win32dll) # Need this only because mingw library is broken set_entrypoint(${MODULE} DllMainCRTStartup@12) if(DEFINED baseaddress_${MODULE}) @@ -99,29 +92,23 @@ else() message(STATUS "${MODULE} has no base address") endif() - target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) add_linkerflag(${MODULE} "/DLL") - endif() - if(${TYPE} MATCHES win32ocx) + elseif(${TYPE} MATCHES win32ocx) set_entrypoint(${MODULE} DllMainCRTStartup@12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") - target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) add_linkerflag(${MODULE} "/DLL") - endif() - if(${TYPE} MATCHES cpl) + elseif(${TYPE} MATCHES cpl) set_entrypoint(${MODULE} DllMainCRTStartup@12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") - target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) add_linkerflag(${MODULE} "/DLL") - endif() - if(${TYPE} MATCHES kernelmodedriver) + elseif(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") set_entrypoint(${MODULE} DriverEntry@8) set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) add_linkerflag(${MODULE} "/DRIVER") add_dependencies(${MODULE} bugcodes) - target_link_libraries(${MODULE} msvcsup) + target_link_libraries(${MODULE}) endif() endmacro() @@ -182,6 +169,9 @@ macro(add_importlibs MODULE) foreach(LIB ${ARGN}) + if ("${LIB}" MATCHES "msvcrt") + target_link_libraries(${MODULE} msvcrtex) + endif() target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.lib) add_dependencies(${MODULE} lib${LIB}) endforeach() Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/CMakeList… ============================================================================== --- trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Mon May 23 18:27:16 2011 @@ -9,11 +9,7 @@ set_module_type(ntvdm win32cui) -target_link_libraries(ntvdm - mingw_main - mingw_common) - -add_importlibs(ntvdm ntdll user32 gdi32 advapi32 kernel32 msvcrt) +add_importlibs(ntvdm ntdll user32 gdi32 advapi32 msvcrt kernel32) add_dependencies(ntvdm ndk bugcodes) -add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all)

13 years, 5 months

[tkreuzer] 51867: [MSPORTS] Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 23 18:22:24 2011 New Revision: 51867 URL: http://svn.reactos.org/svn/reactos?rev=51867&view=rev Log: [MSPORTS] Fix build Modified: trunk/reactos/dll/win32/msports/comdb.c Modified: trunk/reactos/dll/win32/msports/comdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/comdb.c?… ============================================================================== --- trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] Mon May 23 18:22:24 2011 @@ -20,6 +20,7 @@ HKEY hKey; DWORD dwSize; PBYTE pBitmap; + PBYTE pData; } COMDB, *PCOMDB; @@ -214,4 +215,4 @@ return lError; } -/* EOF */ +/* EOF */

13 years, 5 months

[ekohl] 51866: [MSPORTS] - Add msports.h header file. - Add the initial version of the com port database and use it to track the used com ports.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon May 23 17:54:16 2011 New Revision: 51866 URL: http://svn.reactos.org/svn/reactos?rev=51866&view=rev Log: [MSPORTS] - Add msports.h header file. - Add the initial version of the com port database and use it to track the used com ports. Added: trunk/reactos/dll/win32/msports/comdb.c (with props) trunk/reactos/include/ddk/msports.h (with props) Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt trunk/reactos/dll/win32/msports/classinst.c trunk/reactos/dll/win32/msports/msports.rbuild trunk/reactos/dll/win32/msports/msports.spec Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Mon May 23 17:54:16 2011 @@ -5,6 +5,7 @@ list(APPEND SOURCE classinst.c + comdb.c msports.c msports.rc ${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c Modified: trunk/reactos/dll/win32/msports/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… ============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Mon May 23 17:54:16 2011 @@ -10,6 +10,7 @@ #include <windows.h> #include <cmtypes.h> #include <stdio.h> +#include <msports.h> #include <setupapi.h> #include <wine/debug.h> @@ -244,21 +245,33 @@ WCHAR szFriendlyName[256]; WCHAR szPortName[5]; DWORD dwPortNumber; + HCOMDB hComDB = HCOMDB_INVALID_HANDLE_VALUE; TRACE("InstallSerialPort(%p, %p)\n", DeviceInfoSet, DeviceInfoData); + + /* Open the com port database */ + ComDBOpen(&hComDB); dwPortNumber = GetSerialPortNumber(DeviceInfoSet, DeviceInfoData); if (dwPortNumber != 0) { swprintf(szPortName, L"COM%u", dwPortNumber); + + ComDBClaimPort(hComDB, + dwPortNumber, + FALSE, + NULL); } else { wcscpy(szPortName, L"COMx"); } + /* Close the com port database */ + if (hComDB != HCOMDB_INVALID_HANDLE_VALUE) + ComDBClose(hComDB); /* Install the device */ if (!SetupDiInstallDevice(DeviceInfoSet, Added: trunk/reactos/dll/win32/msports/comdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/comdb.c?… ============================================================================== --- trunk/reactos/dll/win32/msports/comdb.c (added) +++ trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] Mon May 23 17:54:16 2011 @@ -1,0 +1,217 @@ +/* + * PROJECT: Ports installer library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\msports\comdb.c + * PURPOSE: COM port database + * COPYRIGHT: Copyright 2011 Eric Kohl + */ + +#include <windows.h> +#include <msports.h> + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(msports); + +#define BITS_PER_BYTE 8 + +typedef struct _COMDB +{ + HKEY hKey; + DWORD dwSize; + PBYTE pBitmap; +} COMDB, *PCOMDB; + + +LONG +WINAPI +ComDBClaimPort(IN HCOMDB hComDB, + IN DWORD ComNumber, + IN BOOL ForceClaim, + OUT PBOOL Forced) +{ + PCOMDB pComDB; + PBYTE pByte; + BYTE cMask; + DWORD dwBitIndex; + DWORD dwType; + DWORD dwSize; + LONG lError; + + if (hComDB == INVALID_HANDLE_VALUE || + hComDB == NULL || + ComNumber == 0 || + ComNumber > COMDB_MAX_PORTS_ARBITRATED) + return ERROR_INVALID_PARAMETER; + + pComDB = (PCOMDB)hComDB; + + /* Update the bitmap */ + dwSize = pComDB->dwSize; + lError = RegQueryValueExW(pComDB->hKey, + L"ComDB", + NULL, + &dwType, + pComDB->pBitmap, + &dwSize); + if (lError != ERROR_SUCCESS) + return lError; + + /* Get the bit index */ + dwBitIndex = ComNumber - 1; + + /* Check if the bit to set fits into the bitmap */ + if (dwBitIndex >= (pComDB->dwSize * BITS_PER_BYTE)) + { + /* FIXME: Resize the bitmap */ + return ERROR_INVALID_PARAMETER; + } + + /* Get a pointer to the affected byte and calculate a mask for the affected bit */ + pByte = &(pComDB->pBitmap[dwBitIndex / BITS_PER_BYTE]); + cMask = 1 << (dwBitIndex % BITS_PER_BYTE); + + /* Check if the bit is not set */ + if ((*pByte & cMask) == 0) + { + /* Set the bit */ + *pByte |= cMask; + lError = ERROR_SUCCESS; + } + else + { + /* The bit is already set */ + lError = ERROR_SHARING_VIOLATION; + } + + /* Save the bitmap if it was modified */ + if (lError == ERROR_SUCCESS) + { + lError = RegSetValueExW(pComDB->hKey, + L"ComDB", + 0, + REG_BINARY, + pComDB->pData, + pComDB->dwSize); + } + + return lError; +} + + +LONG +WINAPI +ComDBClose(IN HCOMDB hComDB) +{ + PCOMDB pComDB; + + if (hComDB == HCOMDB_INVALID_HANDLE_VALUE || hComDB == NULL) + return ERROR_INVALID_PARAMETER; + + pComDB = (PCOMDB)hComDB; + + /* Close the registry key */ + if (pComDB->hKey != NULL) + RegCloseKey(pComDB->hKey); + + /* Release the bitmap */ + if (pComDB->pBitmap != NULL) + HeapFree(GetProcessHeap(), 0, pComDB->pBitmap); + + /* Release the database */ + HeapFree(GetProcessHeap(), 0, pComDB); + + return ERROR_SUCCESS; +} + + +LONG +WINAPI +ComDBOpen(OUT HCOMDB *phComDB) +{ + PCOMDB pComDB; + DWORD dwDisposition; + DWORD dwType; + LONG lError; + + TRACE("ComDBOpen(%p)\n", phComDB); + + /* Allocate a new database */ + pComDB = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(COMDB)); + if (pComDB == NULL) + { + ERR("Failed to allocaete the database!\n"); + return ERROR_ACCESS_DENIED; + } + + /* Create or open the database key */ + lError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\COM Name Arbiter", + 0, + NULL, + 0, + KEY_ALL_ACCESS, + NULL, + &pComDB->hKey, + &dwDisposition); + if (lError != ERROR_SUCCESS) + goto done; + + /* Get the required bitmap size */ + lError = RegQueryValueExW(pComDB->hKey, + L"ComDB", + NULL, + &dwType, + NULL, + &pComDB->dwSize); + if (lError == ERROR_FILE_NOT_FOUND) + { + /* Allocate a new bitmap */ + pComDB->dwSize = COMDB_MIN_PORTS_ARBITRATED / BITS_PER_BYTE; + pComDB->pData = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + pComDB->dwSize); + if (pComDB->pData == NULL) + { + ERR("Failed to allocaete the bitmap!\n"); + lError = ERROR_ACCESS_DENIED; + goto done; + } + + /* Read the bitmap from the registry */ + lError = RegSetValueExW(pComDB->hKey, + L"ComDB", + 0, + REG_BINARY, + pComDB->pData, + pComDB->dwSize); + } + +done:; + if (lError != ERROR_SUCCESS) + { + /* Clean up in case of failure */ + if (pComDB->hKey != NULL) + RegCloseKey(pComDB->hKey); + + if (pComDB->pData != NULL) + HeapFree(GetProcessHeap(), 0, pComDB->pData); + + HeapFree(GetProcessHeap(), 0, pComDB); + + *phComDB = HCOMDB_INVALID_HANDLE_VALUE; + } + else + { + /* Return the database handle */ + *phComDB = (HCOMDB)pComDB; + } + + TRACE("done (Error %lu)\n", lError); + + return lError; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/msports/comdb.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/comdb.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/msports/msports.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.rbuild [iso-8859-1] Mon May 23 17:54:16 2011 @@ -6,6 +6,7 @@ <library>advapi32</library> <library>setupapi</library> <file>classinst.c</file> + <file>comdb.c</file> <file>msports.c</file> <file>msports.rc</file> </module> Modified: trunk/reactos/dll/win32/msports/msports.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.spec [iso-8859-1] Mon May 23 17:54:16 2011 @@ -1,8 +1,8 @@ @ stub ComDBClaimNextFreePort -@ stub ComDBClaimPort -@ stub ComDBClose +@ stdcall ComDBClaimPort(ptr long long ptr) +@ stdcall ComDBClose(ptr) @ stub ComDBGetCurrentPortUsage -@ stub ComDBOpen +@ stdcall ComDBOpen(ptr) @ stub ComDBReleasePort @ stub ComDBResizeDatabase @ stdcall LibMain(ptr long ptr) DllMain Added: trunk/reactos/include/ddk/msports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/msports.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/msports.h (added) +++ trunk/reactos/include/ddk/msports.h [iso-8859-1] Mon May 23 17:54:16 2011 @@ -1,0 +1,52 @@ +#ifndef _MSPORTS_ +#define _MSPORTS_ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_HANDLE(HCOMDB); +typedef HCOMDB *PHCOMDB; +#define HCOMDB_INVALID_HANDLE_VALUE ((HCOMDB)INVALID_HANDLE_VALUE) + +#define COMDB_MIN_PORTS_ARBITRATED 256 +#define COMDB_MAX_PORTS_ARBITRATED 4096 + +LONG +WINAPI +ComDBClaimPort(IN HCOMDB hComDB, + IN DWORD ComNumber, + IN BOOL ForceClaim, + OUT PBOOL Forced); + +LONG +WINAPI +ComDBClose(IN HCOMDB hComDB); + +LONG +WINAPI +ComDBGetCurrentPortUsage(IN HCOMDB hComDB, + OUT PBYTE Buffer, + IN DWORD BufferSize, + IN ULONG ReportType, + OUT LPDWORD MaxPortsReported); + +LONG +WINAPI +ComDBOpen(OUT HCOMDB *phComDB); + +LONG +WINAPI +ComDBReleasePort(IN HCOMDB hComDB, + IN DWORD ComNumber); + +LONG +WINAPI +ComDBResizeDatabase(IN HCOMDB hComDB, + IN DWORD NewSize); + +#ifdef __cplusplus +} +#endif + +#endif /* _MSPORTS_ */ Propchange: trunk/reactos/include/ddk/msports.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/ddk/msports.h ------------------------------------------------------------------------------ svn:keywords = author date id revision

13 years, 5 months

[tkreuzer] 51865: [USETUP] Don't link to mingw_main/mingw_common/kernel32!

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 23 17:43:13 2011 New Revision: 51865 URL: http://svn.reactos.org/svn/reactos?rev=51865&view=rev Log: [USETUP] Don't link to mingw_main/mingw_common/kernel32! Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/CMakeLis… ============================================================================== --- trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] Mon May 23 17:43:13 2011 @@ -31,17 +31,11 @@ usetup.rc) target_link_libraries(usetup - mingw_main zlib inflib ext2lib - vfatlib - mingw_common) - -if(MSVC) - target_link_libraries(usetup msvcsup) -endif() + vfatlib) set_module_type(usetup nativecui) -add_importlibs(usetup kernel32 ntdll) +add_importlibs(usetup ntdll) add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest)

13 years, 5 months

[janderwald] 51864: [USBOHCI] - Start implementing control transfers - Move initialization of usb queue after the bulk / control head endpoints have been created - Add interface functions to retrie...

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon May 23 17:42:52 2011 New Revision: 51864 URL: http://svn.reactos.org/svn/reactos?rev=51864&view=rev Log: [USBOHCI] - Start implementing control transfers - Move initialization of usb queue after the bulk / control head endpoints have been created - Add interface functions to retrieve bulk / control head endpoint descriptors - Add macros for setting transfer descriptors field (taken from Haiku) - Partly implement IUSBQueue::AddUSBRequest for control / bulk transfers - Create endpoint descriptor for control request and link setup descriptor to it - Link setup descriptors to data descriptor / status descriptor - WIP (needs fixes) Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp branches/usb-bringup/drivers/usb/usbohci/hardware.h branches/usb-bringup/drivers/usb/usbohci/interfaces.h branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Mon May 23 17:42:52 2011 @@ -59,6 +59,10 @@ NTSTATUS PnpStop(void); NTSTATUS HandlePower(PIRP Irp); NTSTATUS GetDeviceDetails(PUSHORT VendorId, PUSHORT DeviceId, PULONG NumberOfPorts, PULONG Speed); + NTSTATUS GetBulkHeadEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor); + NTSTATUS GetControlHeadEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor); + VOID HeadEndpointDescriptorModified(ULONG HeadType); + NTSTATUS GetDMA(OUT struct IDMAMemoryManager **m_DmaManager); NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue); @@ -360,23 +364,23 @@ } // + // initializes the controller + // + Status = InitializeController(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to Initialize the controller \n"); + ASSERT(FALSE); + return Status; + } + + // // Initialize the UsbQueue now that we have an AdapterObject. // Status = m_UsbQueue->Initialize(PUSBHARDWAREDEVICE(this), m_Adapter, m_MemoryManager, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to Initialize the UsbQueue\n"); - return Status; - } - - // - // initializes the controller - // - Status = InitializeController(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to Initialize the controller \n"); - ASSERT(FALSE); return Status; } @@ -628,6 +632,42 @@ // // done // + return STATUS_SUCCESS; +} + +NTSTATUS +CUSBHardwareDevice::GetBulkHeadEndpointDescriptor( + struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor) +{ + *OutDescriptor = m_BulkEndpointDescriptor; + return STATUS_SUCCESS; +} + +VOID +CUSBHardwareDevice::HeadEndpointDescriptorModified( + ULONG Type) +{ + if (Type == USB_ENDPOINT_TYPE_CONTROL) + { + // + // notify controller + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET), OHCI_CONTROL_LIST_FILLED); + } + else if (Type == USB_ENDPOINT_TYPE_BULK) + { + // + // notify controller + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET), OHCI_BULK_LIST_FILLED); + } +} + +NTSTATUS +CUSBHardwareDevice::GetControlHeadEndpointDescriptor( + struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor) +{ + *OutDescriptor = m_ControlEndpointDescriptor; return STATUS_SUCCESS; } @@ -1128,7 +1168,7 @@ // head completed // DPRINT1("InterruptServiceRoutine> Done Head completion\n"); - + ASSERT(FALSE); // // FIXME: handle event // @@ -1148,9 +1188,11 @@ if (Status & OHCI_UNRECOVERABLE_ERROR) { DPRINT1("InterruptServiceRoutine> Controller error\n"); + // // halt controller // + ASSERT(FALSE); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_CONTROL_OFFSET), OHCI_HC_FUNCTIONAL_STATE_RESET); } Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] Mon May 23 17:42:52 2011 @@ -192,7 +192,7 @@ #define OHCI_PAGE_OFFSET(x) ((x) & 0xfff) -typedef struct +typedef struct _OHCI_ENDPOINT_DESCRIPTOR { // Hardware part ULONG Flags; @@ -202,10 +202,19 @@ // Software part PHYSICAL_ADDRESS PhysicalAddress; + PVOID Request; + PVOID NextDescriptor; }OHCI_ENDPOINT_DESCRIPTOR, *POHCI_ENDPOINT_DESCRIPTOR; #define OHCI_ENDPOINT_SKIP 0x00004000 +#define OHCI_ENDPOINT_SET_DEVICE_ADDRESS(s) (s) +#define OHCI_ENDPOINT_GET_ENDPOINT_NUMBER(s) (((s) >> 7) & 0xf) +#define OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(s) ((s) << 7) +#define OHCI_ENDPOINT_GET_MAX_PACKET_SIZE(s) (((s) >> 16) & 0x07ff) +#define OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(s) ((s) << 16) +#define OHCI_ENDPOINT_LOW_SPEED 0x00002000 +#define OHCI_ENDPOINT_FULL_SPEED 0x00000000 // // Maximum port count set by OHCI @@ -220,15 +229,51 @@ }OHCI_PORT_STATUS; -typedef struct { +typedef struct +{ // Hardware part 16 bytes - uint32 flags; // Flags field - uint32 buffer_physical; // Physical buffer pointer - uint32 next_physical_descriptor; // Physical pointer next descriptor - uint32 last_physical_byte_address; // Physical pointer to buffer end + ULONG Flags; // Flags field + ULONG BufferPhysical; // Physical buffer pointer + ULONG NextPhysicalDescriptor; // Physical pointer next descriptor + ULONG LastPhysicalByteAddress; // Physical pointer to buffer end // Software part - addr_t physical_address; // Physical address of this descriptor - size_t buffer_size; // Size of the buffer - void *buffer_logical; // Logical pointer to the buffer - void *next_logical_descriptor; // Logical pointer next descriptor -} ohci_general_td; + PHYSICAL_ADDRESS PhysicalAddress; // Physical address of this descriptor + ULONG BufferSize; // Size of the buffer + PVOID BufferLogical; // Logical pointer to the buffer + PVOID Request; // pointer to IUSBRequest +}OHCI_GENERAL_TD, *POHCI_GENERAL_TD; + + +#define OHCI_TD_BUFFER_ROUNDING 0x00040000 +#define OHCI_TD_DIRECTION_PID_MASK 0x00180000 +#define OHCI_TD_DIRECTION_PID_SETUP 0x00000000 +#define OHCI_TD_DIRECTION_PID_OUT 0x00080000 +#define OHCI_TD_DIRECTION_PID_IN 0x00100000 +#define OHCI_TD_GET_DELAY_INTERRUPT(x) (((x) >> 21) & 7) +#define OHCI_TD_SET_DELAY_INTERRUPT(x) ((x) << 21) +#define OHCI_TD_INTERRUPT_MASK 0x00e00000 +#define OHCI_TD_TOGGLE_CARRY 0x00000000 +#define OHCI_TD_TOGGLE_0 0x02000000 +#define OHCI_TD_TOGGLE_1 0x03000000 +#define OHCI_TD_TOGGLE_MASK 0x03000000 +#define OHCI_TD_GET_ERROR_COUNT(x) (((x) >> 26) & 3) +#define OHCI_TD_GET_CONDITION_CODE(x) ((x) >> 28) +#define OHCI_TD_SET_CONDITION_CODE(x) ((x) << 28) +#define OHCI_TD_CONDITION_CODE_MASK 0xf0000000 + +#define OHCI_TD_INTERRUPT_IMMEDIATE 0x00 +#define OHCI_TD_INTERRUPT_NONE 0x07 + +#define OHCI_TD_CONDITION_NO_ERROR 0x00 +#define OHCI_TD_CONDITION_CRC_ERROR 0x01 +#define OHCI_TD_CONDITION_BIT_STUFFING 0x02 +#define OHCI_TD_CONDITION_TOGGLE_MISMATCH 0x03 +#define OHCI_TD_CONDITION_STALL 0x04 +#define OHCI_TD_CONDITION_NO_RESPONSE 0x05 +#define OHCI_TD_CONDITION_PID_CHECK_FAILURE 0x06 +#define OHCI_TD_CONDITION_UNEXPECTED_PID 0x07 +#define OHCI_TD_CONDITION_DATA_OVERRUN 0x08 +#define OHCI_TD_CONDITION_DATA_UNDERRUN 0x09 +#define OHCI_TD_CONDITION_BUFFER_OVERRUN 0x0c +#define OHCI_TD_CONDITION_BUFFER_UNDERRUN 0x0d +#define OHCI_TD_CONDITION_NOT_ACCESSED 0x0f Modified: branches/usb-bringup/drivers/usb/usbohci/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/interfaces.h [iso-8859-1] Mon May 23 17:42:52 2011 @@ -107,7 +107,7 @@ typedef IHCDController *PHCDCONTROLLER; - +struct _OHCI_ENDPOINT_DESCRIPTOR; //========================================================================================= // // class IUSBHardwareDevice @@ -171,6 +171,33 @@ // Do not call Initialize on IUSBQueue, the object is already initialized virtual NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetBulkHeadEndpointDescriptor +// +// Description: returns the bulk head endpoint descriptor + + virtual NTSTATUS GetBulkHeadEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetControlHeadEndpointDescriptor +// +// Description: returns the control head endpoint descriptor + + virtual NTSTATUS GetControlHeadEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor) = 0; + +//----------------------------------------------------------------------------------------- +// +// HeadEndpointDescriptorModified +// +// Description: notifies the hardware that an endpoint descriptor was added to head endpoint descriptor + + virtual VOID HeadEndpointDescriptorModified(ULONG HeadType) = 0; + + + //----------------------------------------------------------------------------------------- // @@ -334,8 +361,6 @@ // CancelCallback routine is invoked. // -struct _QUEUE_HEAD; - DECLARE_INTERFACE_(IUSBRequest, IUnknown) { DEFINE_ABSTRACT_UNKNOWN() @@ -387,6 +412,14 @@ //----------------------------------------------------------------------------------------- // +// GetEndpointDescriptor +// +// Description: returns the general transfer descriptor + + virtual NTSTATUS GetEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor) = 0; + +//----------------------------------------------------------------------------------------- +// // GetResultStatus // // Description: returns the status code of the result Modified: branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Mon May 23 17:42:52 2011 @@ -46,6 +46,9 @@ protected: LONG m_Ref; // reference count KSPIN_LOCK m_Lock; // list lock + PUSBHARDWAREDEVICE m_Hardware; // hardware + POHCI_ENDPOINT_DESCRIPTOR m_BulkHeadEndpointDescriptor; // bulk head descriptor + POHCI_ENDPOINT_DESCRIPTOR m_ControlHeadEndpointDescriptor; // control head descriptor }; //================================================================================================= @@ -74,7 +77,26 @@ IN PDMAMEMORYMANAGER MemManager, IN OPTIONAL PKSPIN_LOCK Lock) { - UNIMPLEMENTED + // + // get bulk endpoint descriptor + // + Hardware->GetBulkHeadEndpointDescriptor(&m_BulkHeadEndpointDescriptor); + + // + // get control endpoint descriptor + // + Hardware->GetControlHeadEndpointDescriptor(&m_ControlHeadEndpointDescriptor); + + // + // initialize spinlock + // + KeInitializeSpinLock(&m_Lock); + + // + // store hardware + // + m_Hardware = Hardware; + return STATUS_SUCCESS; } @@ -96,6 +118,10 @@ NTSTATUS Status; ULONG Type; KIRQL OldLevel; + POHCI_ENDPOINT_DESCRIPTOR HeadDescriptor; + POHCI_ENDPOINT_DESCRIPTOR Descriptor; + + DPRINT1("CUSBQueue::AddUSBRequest\n"); // // sanity check @@ -143,6 +169,63 @@ // Request->AddRef(); + // + // get transfer descriptors + // + Status = Request->GetEndpointDescriptor(&Descriptor); + if (!NT_SUCCESS(Status)) + { + // + // failed to get transfer descriptor + // + DPRINT1("CUSBQueue::AddUSBRequest GetEndpointDescriptor failed with %x\n", Status); + + // + // release reference + // + Request->Release(); + return Status; + } + + // + // check type + // + if (Type == USB_ENDPOINT_TYPE_BULK) + { + // + // get head descriptor + // + HeadDescriptor = m_BulkHeadEndpointDescriptor; + } + else if (Type == USB_ENDPOINT_TYPE_CONTROL) + { + // + // get head descriptor + // + HeadDescriptor = m_ControlHeadEndpointDescriptor; + } + + // + // link endpoints + // + Descriptor->NextPhysicalEndpoint = HeadDescriptor->NextPhysicalEndpoint; + Descriptor->NextDescriptor = HeadDescriptor->NextDescriptor; + + HeadDescriptor->NextPhysicalEndpoint = Descriptor->PhysicalAddress.LowPart; + HeadDescriptor->NextDescriptor = Descriptor; + + // + // set descriptor active + // + Descriptor->Flags &= ~OHCI_ENDPOINT_SKIP; + + // + // notify hardware of our request + // + m_Hardware->HeadEndpointDescriptorModified(Type); + + DPRINT1("Request added to queue\n"); + return STATUS_SUCCESS; } Modified: branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Mon May 23 17:42:52 2011 @@ -40,6 +40,7 @@ virtual NTSTATUS InitializeWithIrp(IN PDMAMEMORYMANAGER DmaManager, IN OUT PIRP Irp); virtual BOOLEAN IsRequestComplete(); virtual ULONG GetTransferType(); + virtual NTSTATUS GetEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutEndpointDescriptor); virtual VOID GetResultStatus(OUT OPTIONAL NTSTATUS *NtStatusCode, OUT OPTIONAL PULONG UrbStatusCode); virtual BOOLEAN IsRequestInitialized(); virtual BOOLEAN IsQueueHeadComplete(struct _QUEUE_HEAD * QueueHead); @@ -51,6 +52,12 @@ UCHAR GetDeviceAddress(); NTSTATUS BuildSetupPacket(); NTSTATUS BuildSetupPacketFromURB(); + NTSTATUS BuildControlTransferDescriptor(POHCI_ENDPOINT_DESCRIPTOR * OutEndpointDescriptor); + NTSTATUS CreateGeneralTransferDescriptor(POHCI_GENERAL_TD* OutDescriptor, ULONG BufferSize); + VOID FreeDescriptor(POHCI_GENERAL_TD Descriptor); + NTSTATUS AllocateEndpointDescriptor(OUT POHCI_ENDPOINT_DESCRIPTOR *OutDescriptor); + UCHAR GetEndpointAddress(); + USHORT GetMaxPacketSize(); // constructor / destructor CUSBRequest(IUnknown *OuterUnknown){} @@ -348,6 +355,46 @@ return InternalGetTransferType(); } +USHORT +CUSBRequest::GetMaxPacketSize() +{ + if (!m_EndpointDescriptor) + { + // + // control request + // + return 0; + } + + ASSERT(m_Irp); + ASSERT(m_EndpointDescriptor); + + // + // return max packet size + // + return m_EndpointDescriptor->wMaxPacketSize; +} + +UCHAR +CUSBRequest::GetEndpointAddress() +{ + if (!m_EndpointDescriptor) + { + // + // control request + // + return 0; + } + + ASSERT(m_Irp); + ASSERT(m_EndpointDescriptor); + + // + // endpoint number is between 1-15 + // + return (m_EndpointDescriptor->bEndpointAddress & 0xF); +} + //---------------------------------------------------------------------------------------- ULONG CUSBRequest::InternalGetTransferType() @@ -444,9 +491,366 @@ return 0; } - - - +VOID +CUSBRequest::FreeDescriptor( + POHCI_GENERAL_TD Descriptor) +{ + if (Descriptor->BufferSize) + { + // + // free buffer + // + m_DmaManager->Release(Descriptor->BufferLogical, Descriptor->BufferSize); + } + + // + // release descriptor + // + m_DmaManager->Release(Descriptor, sizeof(OHCI_GENERAL_TD)); + +} +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBRequest::CreateGeneralTransferDescriptor( + POHCI_GENERAL_TD* OutDescriptor, + ULONG BufferSize) +{ + POHCI_GENERAL_TD Descriptor; + PHYSICAL_ADDRESS DescriptorAddress; + NTSTATUS Status; + + // + // allocate transfer descriptor + // + Status = m_DmaManager->Allocate(sizeof(OHCI_GENERAL_TD), (PVOID*)&Descriptor, &DescriptorAddress); + if (!NT_SUCCESS(Status)) + { + // + // no memory + // + return Status; + } + + // + // initialize descriptor, hardware part + // + Descriptor->Flags = 0; + Descriptor->BufferPhysical = 0; + Descriptor->NextPhysicalDescriptor = 0; + Descriptor->LastPhysicalByteAddress = 0; + + // + // software part + // + Descriptor->PhysicalAddress.QuadPart = DescriptorAddress.QuadPart; + Descriptor->BufferSize = BufferSize; + + if (BufferSize > 0) + { + // + // allocate buffer from dma + // + Status = m_DmaManager->Allocate(BufferSize, &Descriptor->BufferLogical, &DescriptorAddress); + if (!NT_SUCCESS(Status)) + { + // + // no memory + // + m_DmaManager->Release(Descriptor, sizeof(OHCI_GENERAL_TD)); + return Status; + } + + // + // set physical address of buffer + // + Descriptor->BufferPhysical = DescriptorAddress.LowPart; + Descriptor->LastPhysicalByteAddress = Descriptor->BufferPhysical + BufferSize - 1; + } + + // + // store result + // + *OutDescriptor = Descriptor; + + // + // done + // + return STATUS_SUCCESS; +} + +NTSTATUS +CUSBRequest::AllocateEndpointDescriptor( + OUT POHCI_ENDPOINT_DESCRIPTOR *OutDescriptor) +{ + POHCI_ENDPOINT_DESCRIPTOR Descriptor; + PHYSICAL_ADDRESS DescriptorAddress; + NTSTATUS Status; + + // + // allocate descriptor + // + Status = m_DmaManager->Allocate(sizeof(OHCI_ENDPOINT_DESCRIPTOR), (PVOID*)&Descriptor, &DescriptorAddress); + if (!NT_SUCCESS(Status)) + { + // + // failed to allocate descriptor + // + return Status; + } + + // + // intialize descriptor + // + Descriptor->Flags = OHCI_ENDPOINT_SKIP; + + // + // append device address and endpoint number + // + Descriptor->Flags |= OHCI_ENDPOINT_SET_DEVICE_ADDRESS(m_DeviceAddress); + Descriptor->Flags |= OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(GetEndpointAddress()); + Descriptor->Flags |= OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(GetMaxPacketSize()); + + // + // FIXME: detect type + // + Descriptor->Flags |= OHCI_ENDPOINT_FULL_SPEED; + + Descriptor->HeadPhysicalDescriptor = 0; + Descriptor->NextPhysicalEndpoint = 0; + Descriptor->TailPhysicalDescriptor = 0; + Descriptor->PhysicalAddress.QuadPart = DescriptorAddress.QuadPart; + + // + // store result + // + *OutDescriptor = Descriptor; + + // + // done + // + return STATUS_SUCCESS; +} + +NTSTATUS +CUSBRequest::BuildControlTransferDescriptor( + POHCI_ENDPOINT_DESCRIPTOR * OutEndpointDescriptor) +{ + POHCI_GENERAL_TD SetupDescriptor, StatusDescriptor, DataDescriptor = NULL; + POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor; + NTSTATUS Status; + + DPRINT1("CUSBRequest::BuildControlTransferDescriptor\n"); + + // + // allocate endpoint descriptor + // + Status = AllocateEndpointDescriptor(&EndpointDescriptor); + if (!NT_SUCCESS(Status)) + { + // + // failed to create setup descriptor + // + return Status; + } + + // + // first allocate setup descriptor + // + Status = CreateGeneralTransferDescriptor(&SetupDescriptor, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + if (!NT_SUCCESS(Status)) + { + // + // failed to create setup descriptor + // + m_DmaManager->Release(EndpointDescriptor, sizeof(OHCI_ENDPOINT_DESCRIPTOR)); + return Status; + } + + // + // now create the status descriptor + // + Status = CreateGeneralTransferDescriptor(&StatusDescriptor, 0); + if (!NT_SUCCESS(Status)) + { + // + // failed to create status descriptor + // + FreeDescriptor(SetupDescriptor); + m_DmaManager->Release(EndpointDescriptor, sizeof(OHCI_ENDPOINT_DESCRIPTOR)); + return Status; + } + + if (m_TransferBufferLength) + { + // + // FIXME: support more than one data descriptor + // + ASSERT(m_TransferBufferLength < 8192); + + // + // now create the data descriptor + // + Status = CreateGeneralTransferDescriptor(&DataDescriptor, 0); + if (!NT_SUCCESS(Status)) + { + // + // failed to create status descriptor + // + m_DmaManager->Release(EndpointDescriptor, sizeof(OHCI_ENDPOINT_DESCRIPTOR)); + FreeDescriptor(SetupDescriptor); + FreeDescriptor(StatusDescriptor); + return Status; + } + + // + // initialize data descriptor + // + DataDescriptor->Flags = OHCI_TD_BUFFER_ROUNDING| OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE) | OHCI_TD_TOGGLE_CARRY | OHCI_TD_DIRECTION_PID_IN; + + // + // store physical address of buffer + // + DataDescriptor->BufferPhysical = MmGetPhysicalAddress(MmGetMdlVirtualAddress(m_TransferBufferMDL)).LowPart; + DataDescriptor->LastPhysicalByteAddress = DataDescriptor->BufferPhysical + m_TransferBufferLength - 1; + } + + // + // initialize setup descriptor + // + SetupDescriptor->Flags = OHCI_TD_DIRECTION_PID_SETUP | OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_TOGGLE_0 | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE); + + if (m_SetupPacket) + { + // + // copy setup packet + // + RtlCopyMemory(SetupDescriptor->BufferLogical, m_SetupPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + } + else + { + // + // generate setup packet from urb + // + ASSERT(FALSE); + } + + // + // initialize status descriptor + // + StatusDescriptor->Flags = OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_TOGGLE_1 | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_IMMEDIATE); + if (m_TransferBufferLength == 0) + { + // + // input direction is flipped for the status descriptor + // + StatusDescriptor->Flags |= OHCI_TD_DIRECTION_PID_IN; + } + else + { + // + // output direction is flipped for the status descriptor + // + StatusDescriptor->Flags |= OHCI_TD_DIRECTION_PID_OUT; + } + + // + // now link the descriptors + // + if (m_TransferBufferLength) + { + // + // link setup descriptor to data descriptor + // + SetupDescriptor->NextPhysicalDescriptor = DataDescriptor->PhysicalAddress.LowPart; + + // + // FIXME: should link to last data descriptor to status descriptor + // + DataDescriptor->NextPhysicalDescriptor = StatusDescriptor->PhysicalAddress.LowPart; + } + else + { + // + // link setup descriptor to status descriptor + // + SetupDescriptor->NextPhysicalDescriptor = StatusDescriptor->PhysicalAddress.LowPart; + } + + // + // now link descriptor to endpoint + // + EndpointDescriptor->HeadPhysicalDescriptor = SetupDescriptor->PhysicalAddress.LowPart; + EndpointDescriptor->TailPhysicalDescriptor = SetupDescriptor->PhysicalAddress.LowPart; + DPRINT1("CUSBRequest::BuildControlTransferDescriptor done\n"); + + // + // store result + // + *OutEndpointDescriptor = EndpointDescriptor; + + // + // done + // + return STATUS_SUCCESS; +} + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBRequest::GetEndpointDescriptor( + struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor) +{ + ULONG TransferType; + NTSTATUS Status; + + // + // get transfer type + // + TransferType = InternalGetTransferType(); + + // + // build request depending on type + // + switch(TransferType) + { + case USB_ENDPOINT_TYPE_CONTROL: + Status = BuildControlTransferDescriptor((POHCI_ENDPOINT_DESCRIPTOR*)OutDescriptor); + break; + case USB_ENDPOINT_TYPE_BULK: + DPRINT1("USB_ENDPOINT_TYPE_BULK not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; //BuildBulkTransferQueueHead(OutDescriptor); + break; + case USB_ENDPOINT_TYPE_INTERRUPT: + DPRINT1("USB_ENDPOINT_TYPE_INTERRUPT not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + case USB_ENDPOINT_TYPE_ISOCHRONOUS: + DPRINT1("USB_ENDPOINT_TYPE_ISOCHRONOUS not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + default: + PC_ASSERT(FALSE); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + if (NT_SUCCESS(Status)) + { + // + // store queue head + // + //m_QueueHead = *OutDescriptor; + + // + // store request object + // + (*OutDescriptor)->Request = PVOID(this); + } + + // + // done + // + return Status; +} //---------------------------------------------------------------------------------------- VOID

13 years, 5 months

[tkreuzer] 51863: [TASKMGR] Convert Japanese resource file to UTF-8 and fix a typo

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 23 17:33:21 2011 New Revision: 51863 URL: http://svn.reactos.org/svn/reactos?rev=51863&view=rev Log: [TASKMGR] Convert Japanese resource file to UTF-8 and fix a typo Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/rsrc.rc Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Mon May 23 17:33:21 2011 @@ -4,9 +4,9 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) #ifdef _WIN32 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -#pragma code_page(932) +#pragma code_page(65001) #endif //_WIN32 - +#define IDS_PHYSICAL_MEMORY_AVAILABLE 1067 ///////////////////////////////////////////////////////////////////////////// // // Menu @@ -14,85 +14,85 @@ IDR_TASKMANAGER MENU DISCARDABLE BEGIN - POPUP "t@C(&F)" - BEGIN - MENUITEM "Vµ¢^XNÌÀs(&N)", ID_FILE_NEW - MENUITEM SEPARATOR - MENUITEM "^XN }l[WÌI¹(&X)", ID_FILE_EXIT - END - POPUP "IvV(&O)" - BEGIN - MENUITEM "íÉèOÉ\\¦(&A)", ID_OPTIONS_ALWAYSONTOP + POPUP "ãã¡ã¤ã«(&F)" + BEGIN + MENUITEM "æ°ããã¿ã¹ã¯ã®å®è¡(&N)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "ã¿ã¹ã¯ ããã¼ã¸ã£ã®çµäº(&X)", ID_FILE_EXIT + END + POPUP "ãªãã·ã§ã³(&O)" + BEGIN + MENUITEM "å¸¸ã«æåã«è¡¨\ç¤º(&A)", ID_OPTIONS_ALWAYSONTOP , CHECKED - MENUITEM "¢gpÉÅ¬»(&M)", ID_OPTIONS_MINIMIZEONUSE + MENUITEM "æªä½¿ç¨æã«æå°å(&M)", ID_OPTIONS_MINIMIZEONUSE , CHECKED - MENUITEM "Å¬»ÉB·(&H)", ID_OPTIONS_HIDEWHENMINIMIZED + MENUITEM "æå°åæã«é ã(&H)", ID_OPTIONS_HIDEWHENMINIMIZED , CHECKED - MENUITEM "16 rbg ^XNÌ\\¦(&S)", ID_OPTIONS_SHOW16BITTASKS + MENUITEM "16 ããã ã¿ã¹ã¯ã®è¡¨\ç¤º(&S)", ID_OPTIONS_SHOW16BITTASKS , CHECKED END - POPUP "\\¦(&V)" - BEGIN - MENUITEM "ÅVÌóÔÉXV(&R)", ID_VIEW_REFRESH - POPUP "XVÌpx(&U)" + POPUP "è¡¨\ç¤º(&V)" + BEGIN + MENUITEM "ææ°ã®ç¶æã«æ´æ°(&R)", ID_VIEW_REFRESH + POPUP "æ´æ°ã®é »åº¦(&U)" BEGIN - MENUITEM "(&H)", ID_VIEW_UPDATESPEED_HIGH - MENUITEM "Êí(&N)", ID_VIEW_UPDATESPEED_NORMAL + MENUITEM "é«(&H)", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "éå¸¸(&N)", ID_VIEW_UPDATESPEED_NORMAL , CHECKED - MENUITEM "á(&L)", ID_VIEW_UPDATESPEED_LOW - MENUITEM "êâ~(&P)", ID_VIEW_UPDATESPEED_PAUSED + MENUITEM "ä½(&L)", ID_VIEW_UPDATESPEED_LOW + MENUITEM "ä¸æåæ¢(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "å«¢ACR(&G)", ID_VIEW_LARGE - MENUITEM "¬³¢ACR(&M)", ID_VIEW_SMALL - MENUITEM "Ú×(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "ñÌIð(&S)...", ID_VIEW_SELECTCOLUMNS - POPUP "CPU Ìð(&C)" + MENUITEM "å¤§ããã¢ã¤ã³ã³(&G)", ID_VIEW_LARGE + MENUITEM "å°ããã¢ã¤ã³ã³(&M)", ID_VIEW_SMALL + MENUITEM "è©³ç´°(&D)", ID_VIEW_DETAILS, CHECKED + MENUITEM "åã®é¸æ(&S)...", ID_VIEW_SELECTCOLUMNS + POPUP "CPU ã®å±¥æ´(&C)" BEGIN - MENUITEM "·×ÄÌ CPU Å 1 Ot(&O)",ID_VIEW_CPUHISTORY_ONEGRAPHALL - - MENUITEM "CPU ²ÆÉ 1 Ot(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + MENUITEM "ãã¹ã¦ã® CPU ã§ 1 ã°ã©ã(&O)",ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "CPU ãã¨ã« 1 ã°ã©ã(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU , CHECKED END - MENUITEM "J[lÔð\\¦·é(&S)", ID_VIEW_SHOWKERNELTIMES - END - POPUP "EBhE(&W)" - BEGIN - MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "¶EÉÀ×Ä\\¦(&V)", ID_WINDOWS_TILEVERTICALLY - MENUITEM "Å¬»(&M)", ID_WINDOWS_MINIMIZE - MENUITEM "Åå»(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "dËÄ\\¦(&C)", ID_WINDOWS_CASCADE - MENUITEM "èOÉ\\¦(&B)", ID_WINDOWS_BRINGTOFRONT - END - POPUP "wv(&H)" - BEGIN - MENUITEM "gsbNÌõ(&H)", ID_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "o[Wîñ(&A)", ID_HELP_ABOUT + MENUITEM "ã«ã¼ãã«æéãè¡¨\ç¤ºãã(&S)", ID_VIEW_SHOWKERNELTIMES + END + POPUP "ã¦ã£ã³ãã¦(&W)" + BEGIN + MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨\ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨\ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "æå°å(&M)", ID_WINDOWS_MINIMIZE + MENUITEM "æå¤§å(&X)", ID_WINDOWS_MAXIMIZE + MENUITEM "éãã¦è¡¨\ç¤º(&C)", ID_WINDOWS_CASCADE + MENUITEM "æåã«è¡¨\ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT + END + POPUP "ãã«ã(&H)" + BEGIN + MENUITEM "ãããã¯ã®æ¤ç´¢(&H)", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "ãã¼ã¸ã§ã³æå ±(&A)", ID_HELP_ABOUT END END IDR_WINDOWSMENU MENU DISCARDABLE BEGIN - MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "¶EÉÀ×Ä\\¦(&V)", ID_WINDOWS_TILEVERTICALLY - MENUITEM "Å¬»(&M)", ID_WINDOWS_MINIMIZE - MENUITEM "Åå»(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "dËÄ\\¦(&C)", ID_WINDOWS_CASCADE - MENUITEM "èOÉ\\¦(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨\ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨\ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "æå°å(&M)", ID_WINDOWS_MINIMIZE + MENUITEM "æå¤§å(&X)", ID_WINDOWS_MAXIMIZE + MENUITEM "éãã¦è¡¨\ç¤º(&C)", ID_WINDOWS_CASCADE + MENUITEM "æåã«è¡¨\ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT END IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE BEGIN POPUP "DUMMY" BEGIN - MENUITEM "Vµ¢^XNÌÀs(&N)", ID_FILE_NEW - MENUITEM SEPARATOR - MENUITEM "å«¢ACR(&G)", ID_VIEW_LARGE - MENUITEM "¬³¢ACR(&M)", ID_VIEW_SMALL - MENUITEM "Ú×(&D)", ID_VIEW_DETAILS, CHECKED + MENUITEM "æ°ããã¿ã¹ã¯ã®å®è¡(&N)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "å¤§ããã¢ã¤ã³ã³(&G)", ID_VIEW_LARGE + MENUITEM "å°ããã¢ã¤ã³ã³(&M)", ID_VIEW_SMALL + MENUITEM "è©³ç´°(&D)", ID_VIEW_DETAILS, CHECKED END END @@ -100,17 +100,17 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "ØèÖ¦(&S)", ID_APPLICATION_PAGE_SWITCHTO - MENUITEM "èOÉ\\¦(&B)", ID_WINDOWS_BRINGTOFRONT - MENUITEM SEPARATOR - MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "¶EÉÀ×Ä\\¦(&V)", ID_WINDOWS_TILEVERTICALLY - MENUITEM "Å¬»(&M)", ID_WINDOWS_MINIMIZE - MENUITEM "Åå»(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "dËÄ\\¦(&C)", ID_WINDOWS_CASCADE - MENUITEM SEPARATOR - MENUITEM "^XNÌI¹(&E)", ID_APPLICATION_PAGE_ENDTASK - MENUITEM "vZXÌ\\¦(&G)", ID_APPLICATION_PAGE_GOTOPROCESS + MENUITEM "åãæ¿ã(&S)", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "æåã«è¡¨\ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨\ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨\ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "æå°å(&M)", ID_WINDOWS_MINIMIZE + MENUITEM "æå¤§å(&X)", ID_WINDOWS_MAXIMIZE + MENUITEM "éãã¦è¡¨\ç¤º(&C)", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "ã¿ã¹ã¯ã®çµäº(&E)", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "ããã»ã¹ã®è¡¨\ç¤º(&G)", ID_APPLICATION_PAGE_GOTOPROCESS END END @@ -119,10 +119,10 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "³ÌTCYÉß·(&R)", ID_RESTORE - MENUITEM "Â¶é(&C)", ID_FILE_EXIT - MENUITEM SEPARATOR - MENUITEM "íÉèOÉ\\¦(&A)", ID_OPTIONS_ALWAYSONTOP + MENUITEM "åã®ãµã¤ãºã«æ»ã(&R)", ID_RESTORE + MENUITEM "éãã(&C)", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "å¸¸ã«æåã«è¡¨\ç¤º(&A)", ID_OPTIONS_ALWAYSONTOP END END @@ -130,28 +130,28 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "vZXÌI¹(&E)", ID_PROCESS_PAGE_ENDPROCESS - MENUITEM "vZX c[ÌI¹(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE - - MENUITEM "fobO(&D)", ID_PROCESS_PAGE_DEBUG - MENUITEM SEPARATOR - POPUP "DæxÌÝè(&P)" + MENUITEM "ããã»ã¹ã®çµäº(&E)", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "ããã»ã¹ ããªã¼ã®çµäº(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "ãããã°(&D)", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "åªååº¦ã®è¨å®(&P)" BEGIN - MENUITEM "A^C(&R)", ID_PROCESS_PAGE_SETPRIORITY_REALTIME - - MENUITEM "(&H)", ID_PROCESS_PAGE_SETPRIORITY_HIGH - - MENUITEM "ÊíÈã(&A)", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL - - MENUITEM "Êí(&N)", ID_PROCESS_PAGE_SETPRIORITY_NORMAL - - MENUITEM "ÊíÈº(&B)", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL - - MENUITEM "á(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW + MENUITEM "ãªã¢ã«ã¿ã¤ã (&R)", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "é«(&H)", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "éå¸¸ä»¥ä¸(&A)", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "éå¸¸(&N)", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "éå¸¸ä»¥ä¸(&B)", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "ä½(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW END - MENUITEM "ÖWÌÝè(&A)...", ID_PROCESS_PAGE_SETAFFINITY - MENUITEM "fobO `lÌÏX(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS + MENUITEM "é¢ä¿ã®è¨å®(&A)...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "ãããã° ãã£ã³ãã«ã®å¤æ´(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS END END @@ -166,7 +166,7 @@ STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "^XN }l[W" +CAPTION "ã¿ã¹ã¯ ããã¼ã¸ã£" MENU IDR_TASKMANAGER FONT 9, "MS UI Gothic" BEGIN @@ -179,9 +179,9 @@ BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "Vµ¢^XN(&N)...",IDC_NEWTASK,187,189,53,14 - PUSHBUTTON "ØèÖ¦(&S)",IDC_SWITCHTO,131,189,53,14,WS_DISABLED - PUSHBUTTON "^XNÌI¹(&E)",IDC_ENDTASK,75,189,53,14,WS_DISABLED + PUSHBUTTON "æ°ããã¿ã¹ã¯(&N)...",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "åãæ¿ã(&S)",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "ã¿ã¹ã¯ã®çµäº(&E)",IDC_ENDTASK,75,189,53,14,WS_DISABLED END IDD_PROCESS_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 @@ -191,8 +191,8 @@ CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "vZXÌI¹(&E)",IDC_ENDPROCESS,171,189,69,14 - CONTROL "S[U[ÌvZXð\\¦·é(&S)",IDC_SHOWALLPROCESSES, + PUSHBUTTON "ããã»ã¹ã®çµäº(&E)",IDC_ENDPROCESS,171,189,69,14 + CONTROL "å¨ã¦ã¼ã¶ã¼ã®ããã»ã¹ãè¡¨\ç¤ºãã(&S)",IDC_SHOWALLPROCESSES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END @@ -201,77 +201,77 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "CPU gp¦",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT - GROUPBOX "gpÊ",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT,WS_EX_TRANSPARENT - GROUPBOX "v",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "R~bg `[W (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "¨ (KB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "J[l (KB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "nh",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 - LTEXT "Xbh",IDS_TOTALS_THREAD_COUNT,12,140,27,8 - LTEXT "vZX",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + GROUPBOX "CPU ä½¿ç¨ç",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT + GROUPBOX "ã¡ã¢ãªä½¿ç¨é",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT,WS_EX_TRANSPARENT + GROUPBOX "åè¨",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "ã³ããã ãã£ã¼ã¸ (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "ç©çã¡ã¢ãª (KB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "ã«ã¼ãã« ã¡ã¢ãª (KB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "ãã³ãã«",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "ã¹ã¬ãã",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "ããã»ã¹",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "v",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "§Àl",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER - LTEXT "Åål",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + LTEXT "åè¨",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "å¶éå¤",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER + LTEXT "æå¤§å¤",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "v",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 - LTEXT "pÂ\\",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 - LTEXT "VXe LbV",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + LTEXT "åè¨",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 + LTEXT "å©ç¨å¯è½",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "ã·ã¹ãã ãã£ãã·ã¥",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "v",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 - LTEXT "y[W",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 - LTEXT "ñy[W",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + LTEXT "åè¨",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 + LTEXT "ãã¼ã¸",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "éãã¼ã¸",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - GROUPBOX "CPU gp¦Ìð",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT - GROUPBOX "gpÊÌð",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT - PUSHBUTTON "CPU gp¦Ì\\¦",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "gpÊÌ\\¦",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "CPU gp¦Ìð",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + GROUPBOX "CPU ä½¿ç¨çã®å±¥æ´",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "ã¡ã¢ãªä½¿ç¨éã®å±¥æ´",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "CPU ä½¿ç¨çã®è¡¨\ç¤º",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "ã¡ã¢ãªä½¿ç¨éã®è¡¨\ç¤º",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "CPU ä½¿ç¨çã®å±¥æ´",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "gpÊÌð",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + PUSHBUTTON "ã¡ã¢ãªä½¿ç¨éã®å±¥æ´",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE END IDD_DEBUG_CHANNELS_DIALOG DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "fobO `l" +CAPTION "ãããã° ãã£ã³ãã«" FONT 9, "MS UI Gothic" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING,7,7,233,177 - PUSHBUTTON "Â¶é",IDOK,171,189,69,14 + PUSHBUTTON "éãã",IDOK,171,189,69,14 END IDD_AFFINITY_DIALOG DIALOGEX DISCARDABLE 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "vZbTÌÖW" +CAPTION "ããã»ããµã®é¢ä¿" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 - PUSHBUTTON "LZ",IDCANCEL,174,133,50,14 - LTEXT "vZbTÌÖWÌÝèÍAÇÌ CPU ÅvZXðÀs·é©ð§äµÜ·B", + PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,174,133,50,14 + LTEXT "ããã»ããµã®é¢ä¿ã®è¨å®ã¯ãã©ã® CPU ã§ããã»ã¹ãå®è¡ããããå¶å¾¡ãã¾ãã", IDC_STATIC,5,5,220,16 CONTROL "CPU 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 11,28,37,10 @@ -341,62 +341,62 @@ IDD_COLUMNS_DIALOG DIALOGEX DISCARDABLE 0, 0, 195, 199 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ñÌIð" +CAPTION "åã®é¸æ" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 - PUSHBUTTON "LZ",IDCANCEL,138,178,50,14 - LTEXT "^XN }l[WÌ [vZX] y[WÉ\\¦·éñðIðµÜ·B", + PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,138,178,50,14 + LTEXT "ã¿ã¹ã¯ ããã¼ã¸ã£ã® [ããã»ã¹] ãã¼ã¸ã«è¡¨\ç¤ºããåãé¸æãã¾ãã", IDC_STATIC,7,7,181,17 - CONTROL "C[W¼(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + CONTROL "ã¤ã¡ã¼ã¸å(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,28,56,10 - CONTROL "PID (vZX ID)(&P)",IDC_PID,"Button", + CONTROL "PID (ããã»ã¹ ID)(&P)",IDC_PID,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 - CONTROL "CPU gp¦(&C)",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + CONTROL "CPU ä½¿ç¨ç(&C)",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,53,10 - CONTROL "CPU Ô(&E)",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + CONTROL "CPU æé(&E)",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,48,10 - CONTROL "gpÊ(&M)",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + CONTROL "ã¡ã¢ãªä½¿ç¨é(&M)",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,63,10 - CONTROL "gpÊf^(&D)",IDC_MEMORYUSAGEDELTA,"Button", + CONTROL "ã¡ã¢ãªä½¿ç¨éãã«ã¿(&D)",IDC_MEMORYUSAGEDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 - CONTROL "ÅågpÊ(&K)",IDC_PEAKMEMORYUSAGE,"Button", + CONTROL "æå¤§ã¡ã¢ãªä½¿ç¨é(&K)",IDC_PEAKMEMORYUSAGE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 - CONTROL "y[W tHg(&F)",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + CONTROL "ãã¼ã¸ ãã©ã«ã(&F)",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,105,53,10 - CONTROL "USER IuWFNg(&U)",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + CONTROL "USER ãªãã¸ã§ã¯ã(&U)",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,116,62,10 - CONTROL "I/O ÇÝæè",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + CONTROL "I/O èªã¿åã",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,49,10 - CONTROL "I/O ÇÝæèoCg",IDC_IOREADBYTES,"Button", + CONTROL "I/O èªã¿åããã¤ãæ°",IDC_IOREADBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 - CONTROL "ZbV ID(&S)",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + CONTROL "ã»ãã·ã§ã³ ID(&S)",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,50,10 - CONTROL "[U[¼(&N)",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + CONTROL "ã¦ã¼ã¶ã¼å(&N)",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,160,51,10 - CONTROL "y[W tHg f^(&A)",IDC_PAGEFAULTSDELTA,"Button", + CONTROL "ãã¼ã¸ ãã©ã«ã ãã«ã¿(&A)",IDC_PAGEFAULTSDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 - CONTROL "¼z TCY(&V)",IDC_VIRTUALMEMORYSIZE,"Button", + CONTROL "ä»®æ³ã¡ã¢ãª ãµã¤ãº(&V)",IDC_VIRTUALMEMORYSIZE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 - CONTROL "y[W v[(&G)",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + CONTROL "ãã¼ã¸ ãã¼ã«(&G)",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,50,53,10 - CONTROL "ñy[W v[(&O)",IDC_NONPAGEDPOOL,"Button", + CONTROL "éãã¼ã¸ ãã¼ã«(&O)",IDC_NONPAGEDPOOL,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 - CONTROL "î{Dæx(&R)",IDC_BASEPRIORITY,"Button", + CONTROL "åºæ¬åªååº¦(&R)",IDC_BASEPRIORITY,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 - CONTROL "nhÌ(&H)",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + CONTROL "ãã³ãã«ã®æ°(&H)",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,83,59,10 - CONTROL "XbhÌ(&T)",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + CONTROL "ã¹ã¬ããã®æ°(&T)",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,94,59,10 - CONTROL "GDI IuWFNg",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + CONTROL "GDI ãªãã¸ã§ã¯ã",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,105,55,10 - CONTROL "I/O «Ý",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + CONTROL "I/O æ¸ãè¾¼ã¿",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,116,49,10 - CONTROL "I/O «ÝoCg",IDC_IOWRITEBYTES,"Button", + CONTROL "I/O æ¸ãè¾¼ã¿ãã¤ãæ°",IDC_IOWRITEBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 - CONTROL "I/O »Ì¼",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + CONTROL "I/O ãã®ä»",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,138,46,10 - CONTROL "I/O »Ì¼ÌoCg",IDC_IOOTHERBYTES,"Button", + CONTROL "I/O ãã®ä»ã®ãã¤ãæ°",IDC_IOOTHERBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 END @@ -521,135 +521,135 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_TITLE "^XN }l[W" - IDC_TASKMGR "^XN }l[W" + IDS_APP_TITLE "ã¿ã¹ã¯ ããã¼ã¸ã£" + IDC_TASKMGR "ã¿ã¹ã¯ ããã¼ã¸ã£" IDS_IDLE_PROCESS "System Idle Process" END STRINGTABLE DISCARDABLE BEGIN - ID_FILE_NEW "Vµ¢vOðÀsµÜ·" - ID_OPTIONS_ALWAYSONTOP "Å¬»³êÈ¢ÀèAíÉ^XN }l[WªÙ©Ì·×ÄÌEBhEæèàèOÉ\\¦³êÜ·" + ID_FILE_NEW "æ°ããããã°ã©ã ãå®è¡ãã¾ã" + ID_OPTIONS_ALWAYSONTOP "æå°åãããªãéããå¸¸ã«ã¿ã¹ã¯ ããã¼ã¸ã£ãã»ãã®ãã¹ã¦ã®ã¦ã£ã³ãã¦ãããæåã«è¡¨\ç¤ºããã¾ã" ID_OPTIONS_MINIMIZEONUSE - "[ØèÖ¦] ìðÀs·éÆA^XN }l[WªÅ¬»³êÜ·" - ID_OPTIONS_HIDEWHENMINIMIZED "Å¬»³ê½Æ«ÉA^XN }l[WðBµÜ·" - ID_VIEW_REFRESH "[XVÌpx] ÌÝèÉ©©íç¸A¡·®^XN }l[WðXVµÜ·" - ID_VIEW_LARGE "å«¢ACRðgÁÄ^XNð\\¦µÜ·" - ID_VIEW_SMALL "¬³¢ACRðgÁÄ^XNð\\¦µÜ·" - ID_VIEW_DETAILS "e^XNÌîñð\\¦µÜ·" - ID_VIEW_UPDATESPEED_HIGH "b 2 ñ\\¦ðXVµÜ·" - ID_VIEW_UPDATESPEED_NORMAL "2 bÉ 1 ñ\\¦ðXVµÜ·" - ID_VIEW_UPDATESPEED_LOW "4 bÉ 1 ñ\\¦ðXVµÜ·" + "[åãæ¿ã] æä½ãå®è¡ããã¨ãã¿ã¹ã¯ ããã¼ã¸ã£ãæå°åããã¾ã" + ID_OPTIONS_HIDEWHENMINIMIZED "æå°åãããã¨ãã«ãã¿ã¹ã¯ ããã¼ã¸ã£ãé ãã¾ã" + ID_VIEW_REFRESH "[æ´æ°ã®é »åº¦] ã®è¨å®ã«ããããããä»ããã¿ã¹ã¯ ããã¼ã¸ã£ãæ´æ°ãã¾ã" + ID_VIEW_LARGE "å¤§ããã¢ã¤ã³ã³ãä½¿ã£ã¦ã¿ã¹ã¯ãè¡¨\ç¤ºãã¾ã" + ID_VIEW_SMALL "å°ããã¢ã¤ã³ã³ãä½¿ã£ã¦ã¿ã¹ã¯ãè¡¨\ç¤ºãã¾ã" + ID_VIEW_DETAILS "åã¿ã¹ã¯ã®æå ±ãè¡¨\ç¤ºãã¾ã" + ID_VIEW_UPDATESPEED_HIGH "æ¯ç§ 2 åè¡¨\ç¤ºãæ´æ°ãã¾ã" + ID_VIEW_UPDATESPEED_NORMAL "2 ç§ã« 1 åè¡¨\ç¤ºãæ´æ°ãã¾ã" + ID_VIEW_UPDATESPEED_LOW "4 ç§ã« 1 åè¡¨\ç¤ºãæ´æ°ãã¾ã" END STRINGTABLE DISCARDABLE BEGIN - ID_VIEW_UPDATESPEED_PAUSED "\\¦ð©®IÉXVµÜ¹ñ" + ID_VIEW_UPDATESPEED_PAUSED "è¡¨\ç¤ºãèªåçã«æ´æ°ãã¾ãã" ID_WINDOWS_TILEHORIZONTALLY - "fXNgbvãÅEBhEðdÈçÈ¢æ¤ÉãºÉÀ×Ä\\¦µÜ·" - ID_WINDOWS_TILEVERTICALLY "fXNgbvãÅEBhEðdÈçÈ¢æ¤É¶EÉÀ×Ä\\¦µÜ·" - ID_WINDOWS_MINIMIZE "EBhEðÅ¬»µÜ·" - ID_WINDOWS_MAXIMIZE "EBhEðÅå»µÜ·" - ID_WINDOWS_CASCADE "fXNgbvãÅEBhEðdËÄ\\¦µÜ·" - ID_WINDOWS_BRINGTOFRONT "EBhEðèOÉ\\¦µÜ·ªAØèÖ¦Ü¹ñB" - ID_HELP_TOPICS "^XN }l[WÌwv gsbNð\\¦µÜ·" - ID_HELP_ABOUT "vOîñAo[WÔAì ð\\¦µÜ·" - ID_FILE_EXIT "^XN }l[W AvP[VðI¹µÜ·" + "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãªããªãããã«ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨\ç¤ºãã¾ã" + ID_WINDOWS_TILEVERTICALLY "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãªããªãããã«å·¦å³ã«ä¸¦ã¹ã¦è¡¨\ç¤ºãã¾ã" + ID_WINDOWS_MINIMIZE "ã¦ã£ã³ãã¦ãæå°åãã¾ã" + ID_WINDOWS_MAXIMIZE "ã¦ã£ã³ãã¦ãæå¤§åãã¾ã" + ID_WINDOWS_CASCADE "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãã¦è¡¨\ç¤ºãã¾ã" + ID_WINDOWS_BRINGTOFRONT "ã¦ã£ã³ãã¦ãæåã«è¡¨\ç¤ºãã¾ãããåãæ¿ãã¾ããã" + ID_HELP_TOPICS "ã¿ã¹ã¯ ããã¼ã¸ã£ã®ãã«ã ãããã¯ãè¡¨\ç¤ºãã¾ã" + ID_HELP_ABOUT "ããã°ã©ã æå ±ããã¼ã¸ã§ã³çªå·ãèä½æ¨©ãè¡¨\ç¤ºãã¾ã" + ID_FILE_EXIT "ã¿ã¹ã¯ ããã¼ã¸ã£ ã¢ããªã±ã¼ã·ã§ã³ãçµäºãã¾ã" ID_OPTIONS_SHOW16BITTASKS - "16 rbg ^XNðAÖAt¯çê½ ntvdm.exe ÌºÉ\\¦µÜ·" - ID_VIEW_SELECTCOLUMNS "[vZX] y[WÉ\\¦·éñðIðµÜ·" - ID_VIEW_SHOWKERNELTIMES "J[lÔðptH[}X OtãÉ\\¦µÜ·" + "16 ããã ã¿ã¹ã¯ããé¢é£ä»ãããã ntvdm.exe ã®ä¸ã«è¡¨\ç¤ºãã¾ã" + ID_VIEW_SELECTCOLUMNS "[ããã»ã¹] ãã¼ã¸ã«è¡¨\ç¤ºããåãé¸æãã¾ã" + ID_VIEW_SHOWKERNELTIMES "ã«ã¼ãã«æéãããã©ã¼ãã³ã¹ ã°ã©ãä¸ã«è¡¨\ç¤ºãã¾ã" ID_VIEW_CPUHISTORY_ONEGRAPHALL - "1 ÂÌðOtÅ CPU gp¦Ìvð\\¦µÜ·" - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU gp¦Ìðð CPU ²ÆÉOtÅ\\¦µÜ·" + "1 ã¤ã®å±¥æ´ã°ã©ãã§ CPU ä½¿ç¨çã®åè¨ãè¡¨\ç¤ºãã¾ã" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU ä½¿ç¨çã®å±¥æ´ã CPU ãã¨ã«ã°ã©ãã§è¡¨\ç¤ºãã¾ã" ID_APPLICATION_PAGE_SWITCHTO - "^XNðèOÉ\\¦µAtH[JXðØèÖ¦Ü·" + "ã¿ã¹ã¯ãæåã«è¡¨\ç¤ºãããã©ã¼ã«ã¹ãåãæ¿ãã¾ã" END STRINGTABLE DISCARDABLE BEGIN - ID_ENDTASK "Ið³êÄ¢é^XNÉI¹·éæ¤w¦µÜ·" - ID_GOTOPROCESS "Ið³êÄ¢é^XNÌvZXÉtH[JXðØèÖ¦Ü·" - ID_RESTORE "BêÄ¢½^XN }l[Wð³ÉßµÜ·" - ID_PROCESS_PAGE_ENDPROCESS "VXe©çvZXðíµÜ·" + ID_ENDTASK "é¸æããã¦ããã¿ã¹ã¯ã«çµäºããããæç¤ºãã¾ã" + ID_GOTOPROCESS "é¸æããã¦ããã¿ã¹ã¯ã®ããã»ã¹ã«ãã©ã¼ã«ã¹ãåãæ¿ãã¾ã" + ID_RESTORE "é ãã¦ããã¿ã¹ã¯ ããã¼ã¸ã£ãåã«æ»ãã¾ã" + ID_PROCESS_PAGE_ENDPROCESS "ã·ã¹ãã ããããã»ã¹ãåé¤ãã¾ã" ID_PROCESS_PAGE_ENDPROCESSTREE - "±ÌvZXÆqvZXð·×ÄíµÜ·" - ID_PROCESS_PAGE_DEBUG "±ÌvZXÉfobKðYtµÜ·" + "ãã®ããã»ã¹ã¨åããã»ã¹ããã¹ã¦åé¤ãã¾ã" + ID_PROCESS_PAGE_DEBUG "ãã®ããã»ã¹ã«ãããã¬ãæ·»ä»ãã¾ã" ID_PROCESS_PAGE_SETAFFINITY - "ÇÌvZbTÅvZXðÀs·é©ð§äµÜ·" + "ã©ã®ããã»ããµã§ããã»ã¹ãå®è¡ããããå¶å¾¡ãã¾ã" ID_PROCESS_PAGE_SETPRIORITY_REALTIME - "vZXðA^CDæxNXÉÝèµÜ·" - ID_PROCESS_PAGE_SETPRIORITY_HIGH "vZXðDæxNXÉÝèµÜ·" + "ããã»ã¹ããªã¢ã«ã¿ã¤ã åªååº¦ã¯ã©ã¹ã«è¨å®ãã¾ã" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "ããã»ã¹ãé«åªååº¦ã¯ã©ã¹ã«è¨å®ãã¾ã" ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL - "vZXðÊíÈãÌDæxNXÉÝèµÜ·" + "ããã»ã¹ãéå¸¸ä»¥ä¸ã®åªååº¦ã¯ã©ã¹ã«è¨å®ãã¾ã" ID_PROCESS_PAGE_SETPRIORITY_NORMAL - "vZXðÊíDæxNXÉÝèµÜ·" + "ããã»ã¹ãéå¸¸åªååº¦ã¯ã©ã¹ã«è¨å®ãã¾ã" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL - "vZXðÊíÈºÌDæxNXÉÝèµÜ·" - ID_PROCESS_PAGE_SETPRIORITY_LOW "vZXðáDæxNXÉÝèµÜ·" + "ããã»ã¹ãéå¸¸ä»¥ä¸ã®åªååº¦ã¯ã©ã¹ã«è¨å®ãã¾ã" + ID_PROCESS_PAGE_SETPRIORITY_LOW "ããã»ã¹ãä½åªååº¦ã¯ã©ã¹ã«è¨å®ãã¾ã" END STRINGTABLE DISCARDABLE BEGIN - IDS_TAB_APPS "AvP[V" - IDS_TAB_PROCESSES "vZX" - IDS_TAB_PERFORMANCE "ptH[}X" - IDS_TAB_TASK "^XN" - IDS_TAB_STATUS "óÔ" - IDS_TAB_IMAGENAME "C[W¼" + IDS_TAB_APPS "ã¢ããªã±ã¼ã·ã§ã³" + IDS_TAB_PROCESSES "ããã»ã¹" + IDS_TAB_PERFORMANCE "ããã©ã¼ãã³ã¹" + IDS_TAB_TASK "ã¿ã¹ã¯" + IDS_TAB_STATUS "ç¶æ" + IDS_TAB_IMAGENAME "ã¤ã¡ã¼ã¸å" IDS_TAB_PID "PID" - IDS_TAB_USERNAME "[U[¼" - IDS_TAB_SESSIONID "ZbV ID" + IDS_TAB_USERNAME "ã¦ã¼ã¶ã¼å" + IDS_TAB_SESSIONID "ã»ãã·ã§ã³ ID" IDS_TAB_CPU "CPU" - IDS_TAB_CPUTIME "CPU Ô" - IDS_TAB_MEMUSAGE "gpÊ" - IDS_TAB_PEAKMEMUSAGE "ÅågpÊ" - IDS_TAB_MEMDELTA " f^" - IDS_TAB_PAGEFAULT "y[W tHg" - IDS_TAB_PFDELTA "y[W tHg f^" - IDS_TAB_VMSIZE "¼z TCY" - IDS_TAB_PAGEDPOOL "y[W v[" - IDS_TAB_NPPOOL "ñy[W v[" - IDS_TAB_BASEPRI "î{Dæx" - IDS_TAB_HANDLES "nh" - IDS_TAB_THREADS "Xbh" - IDS_TAB_USERPBJECTS "USER IuWFNg" - IDS_TAB_GDIOBJECTS "GDI IuWFNg" - IDS_TAB_IOREADS "I/O ÇÝæè" - IDS_TAB_IOWRITES "I/O «Ý" - IDS_TAB_IOOTHER "I/O »Ì¼" - IDS_TAB_IOREADBYTES "I/O ÇÝæèoCg" - IDS_TAB_IOWRITESBYTES "I/O «ÝoCg" - IDS_TAB_IOOTHERBYTES "I/O »Ì¼ÌoCg" - IDS_MENU_SELECTCOLUMNS "ñÌIð(&S)..." - IDS_MENU_16BITTASK "16 rbg ^XNÌ\\¦(&S)" - IDS_MENU_WINDOWS "EBhE(&W)" - IDS_MENU_LARGEICONS "å«¢ACR(&G)" - IDS_MENU_SMALLICONS "¬³¢ACR(&M)" - IDS_MENU_DETAILS "Ú×(&D)" - IDS_MENU_ONEGRAPHALLCPUS "·×ÄÌ CPU Å 1 Ot(&O)" - IDS_MENU_ONEGRAPHPERCPU "CPU ²ÆÉ 1 Ot(&P)" - IDS_MENU_CPUHISTORY "CPU ð(&C)" - IDS_MENU_SHOWKERNELTIMES "J[lÔð\\¦·é(&S)" - IDS_CREATENEWTASK "Vµ¢^XNÌì¬" - IDS_CREATENEWTASK_DESC "Às·évO¼AÜ½ÍJtH_âhLg¼AC^[lbg \\[X¼ðüÍµÄ¾³¢B" - IDS_MSG_ACCESSPROCESSAFF "vZXÌÖWÖÌANZXÜ½ÍÝèªÅ«Ü¹ñ" - IDS_MSG_PROCESSONEPRO "vZXÍAÈÆà 1 ÂÌvZbTÆÖWð½È¯êÎÈèÜ¹ñB" - IDS_MSG_INVALIDOPTION "³øÈIvV" - IDS_MSG_UNABLEDEBUGPROCESS "fobKðYtÅ«Ü¹ñ" - IDS_MSG_WARNINGDEBUG "x: ±ÌvZXðfobO·éÆAf[^ª¸íêéÂ\\«ª èÜ·B\nfobKðYtµÜ·©?" - IDS_MSG_TASKMGRWARNING "^XN }l[WÌx" - IDS_MSG_WARNINGTERMINATING "x: vZXðI¹·éÆAf[^ª¸íê½èAVXeª\nsÀèÉÈÁ½è·éÈÇÌA\\úµÈ¢ÊÉÈé±Æª èÜ·B\nvZXðI¹·éOÉAóÔÜ½Íf[^ðÛ¶·é©Ç¤©Ì\nmFbZ[WÍ\\¦³êÜ¹ñBvZXðI¹µÜ·©?" - IDS_MSG_UNABLETERMINATEPRO "vZXðI¹Å«Ü¹ñ" - IDS_MSG_UNABLECHANGEPRIORITY "DæxðÏXÅ«Ü¹ñ" - IDS_MSG_WARNINGCHANGEPRIORITY "x: ±ÌvZXÌDæxNXðÏX·éÆAVXeªsÀèÉ\nÈéÈÇA\\úµÈ¢ÊÉÈé±Æª èÜ·B\nDæxNXðÏXµÜ·©?" - IDS_MSG_TRAYICONCPUUSAGE "CPU gp¦: %d%%" - IDS_STATUS_MEMUSAGE "gpÊ: %dKB / %dKB" - IDS_STATUS_CPUUSAGE "CPU gp¦: %3d%%" - IDS_STATUS_PROCESSES "vZX: %d" - IDS_Not_Responding "Èµ" - IDS_Running "Às" + IDS_TAB_CPUTIME "CPU æé" + IDS_TAB_MEMUSAGE "ã¡ã¢ãªä½¿ç¨é" + IDS_TAB_PEAKMEMUSAGE "æå¤§ã¡ã¢ãªä½¿ç¨é" + IDS_TAB_MEMDELTA "ã¡ã¢ãª ãã«ã¿" + IDS_TAB_PAGEFAULT "ãã¼ã¸ ãã©ã«ã" + IDS_TAB_PFDELTA "ãã¼ã¸ ãã©ã«ã ãã«ã¿" + IDS_TAB_VMSIZE "ä»®æ³ã¡ã¢ãª ãµã¤ãº" + IDS_TAB_PAGEDPOOL "ãã¼ã¸ ãã¼ã«" + IDS_TAB_NPPOOL "éãã¼ã¸ ãã¼ã«" + IDS_TAB_BASEPRI "åºæ¬åªååº¦" + IDS_TAB_HANDLES "ãã³ãã«" + IDS_TAB_THREADS "ã¹ã¬ãã" + IDS_TAB_USERPBJECTS "USER ãªãã¸ã§ã¯ã" + IDS_TAB_GDIOBJECTS "GDI ãªãã¸ã§ã¯ã" + IDS_TAB_IOREADS "I/O èªã¿åã" + IDS_TAB_IOWRITES "I/O æ¸ãè¾¼ã¿" + IDS_TAB_IOOTHER "I/O ãã®ä»" + IDS_TAB_IOREADBYTES "I/O èªã¿åããã¤ãæ°" + IDS_TAB_IOWRITESBYTES "I/O æ¸ãè¾¼ã¿ãã¤ãæ°" + IDS_TAB_IOOTHERBYTES "I/O ãã®ä»ã®ãã¤ãæ°" + IDS_MENU_SELECTCOLUMNS "åã®é¸æ(&S)..." + IDS_MENU_16BITTASK "16 ããã ã¿ã¹ã¯ã®è¡¨\ç¤º(&S)" + IDS_MENU_WINDOWS "ã¦ã£ã³ãã¦(&W)" + IDS_MENU_LARGEICONS "å¤§ããã¢ã¤ã³ã³(&G)" + IDS_MENU_SMALLICONS "å°ããã¢ã¤ã³ã³(&M)" + IDS_MENU_DETAILS "è©³ç´°(&D)" + IDS_MENU_ONEGRAPHALLCPUS "ãã¹ã¦ã® CPU ã§ 1 ã°ã©ã(&O)" + IDS_MENU_ONEGRAPHPERCPU "CPU ãã¨ã« 1 ã°ã©ã(&P)" + IDS_MENU_CPUHISTORY "CPU å±¥æ´(&C)" + IDS_MENU_SHOWKERNELTIMES "ã«ã¼ãã«æéãè¡¨\ç¤ºãã(&S)" + IDS_CREATENEWTASK "æ°ããã¿ã¹ã¯ã®ä½æ" + IDS_CREATENEWTASK_DESC "å®è¡ããããã°ã©ã åãã¾ãã¯éããã©ã«ããããã¥ã¡ã³ãåãã¤ã³ã¿ã¼ããã ãªã½\ã¼ã¹åãå¥åãã¦ãã ããã" + IDS_MSG_ACCESSPROCESSAFF "ããã»ã¹ã®é¢ä¿ã¸ã®ã¢ã¯ã»ã¹ã¾ãã¯è¨å®ãã§ãã¾ãã" + IDS_MSG_PROCESSONEPRO "ããã»ã¹ã¯ãå°ãªãã¨ã 1 ã¤ã®ããã»ããµã¨é¢ä¿ãæããªããã°ãªãã¾ããã" + IDS_MSG_INVALIDOPTION "ç¡å¹ãªãªãã·ã§ã³" + IDS_MSG_UNABLEDEBUGPROCESS "ãããã¬ãæ·»ä»ã§ãã¾ãã" + IDS_MSG_WARNINGDEBUG "è¦å: ãã®ããã»ã¹ããããã°ããã¨ããã¼ã¿ãå¤±ãããå¯è½\æ§ãããã¾ãã\nãããã¬ãæ·»ä»ãã¾ãã?" + IDS_MSG_TASKMGRWARNING "ã¿ã¹ã¯ ããã¼ã¸ã£ã®è¦å" + IDS_MSG_WARNINGTERMINATING "è¦å: ããã»ã¹ãçµäºããã¨ããã¼ã¿ãå¤±ãããããã·ã¹ãã ã\nä¸å®å®ã«ãªã£ãããããªã©ã®ãäº\æããªãçµæã«ãªããã¨ãããã¾ãã\nããã»ã¹ãçµäºããåã«ãç¶æã¾ãã¯ãã¼ã¿ãä¿åãããã©ããã®\nç¢ºèªã¡ãã»ã¼ã¸ã¯è¡¨\ç¤ºããã¾ãããããã»ã¹ãçµäºãã¾ãã?" + IDS_MSG_UNABLETERMINATEPRO "ããã»ã¹ãçµäºã§ãã¾ãã" + IDS_MSG_UNABLECHANGEPRIORITY "åªååº¦ãå¤æ´ã§ãã¾ãã" + IDS_MSG_WARNINGCHANGEPRIORITY "è¦å: ãã®ããã»ã¹ã®åªååº¦ã¯ã©ã¹ãå¤æ´ããã¨ãã·ã¹ãã ãä¸å®å®ã«\nãªããªã©ãäº\æããªãçµæã«ãªããã¨ãããã¾ãã\nåªååº¦ã¯ã©ã¹ãå¤æ´ãã¾ãã?" + IDS_MSG_TRAYICONCPUUSAGE "CPU ä½¿ç¨ç: %d%%" + IDS_STATUS_MEMUSAGE "ã¡ã¢ãªä½¿ç¨é: %dKB / %dKB" + IDS_STATUS_CPUUSAGE "CPU ä½¿ç¨ç: %3d%%" + IDS_STATUS_PROCESSES "ããã»ã¹: %d" + IDS_Not_Responding "å¿çãªã" + IDS_Running "å®è¡ä¸" END Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/rsrc.rc [iso-8859-1] Mon May 23 17:33:21 2011 @@ -10,7 +10,6 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" @@ -23,5 +22,6 @@ // UTF-8 #pragma code_page(65001) +#include "lang/ja-JP.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc"

13 years, 5 months

[tkreuzer] 51862: [CRT] Check for _WIN32 instead of _WINDOWS_

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 23 17:33:04 2011 New Revision: 51862 URL: http://svn.reactos.org/svn/reactos?rev=51862&view=rev Log: [CRT] Check for _WIN32 instead of _WINDOWS_ Modified: trunk/reactos/include/crt/process.h Modified: trunk/reactos/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/process.h?rev=… ============================================================================== --- trunk/reactos/include/crt/process.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/process.h [iso-8859-1] Mon May 23 17:33:04 2011 @@ -112,7 +112,7 @@ int (__cdecl *__cdecl _getdllprocaddr(intptr_t _Handle,char *_ProcedureName,intptr_t _Ordinal))(void); #ifdef _DECL_DLLMAIN -#ifdef _WINDOWS_ +#ifdef _WIN32 WINBOOL WINAPI DllMain(HANDLE _HDllHandle,DWORD _Reason,LPVOID _Reserved); WINBOOL WINAPI _CRT_INIT(HANDLE _HDllHandle,DWORD _Reason,LPVOID _Reserved); WINBOOL WINAPI _wCRT_INIT(HANDLE _HDllHandle,DWORD _Reason,LPVOID _Reserved);

13 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011