Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[tfaber] 54494: [CRT] - Remove some differences to Wine. Fixes comparing a char against EOF in fgetwc.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Nov 24 13:27:34 2011 New Revision: 54494 URL: http://svn.reactos.org/svn/reactos?rev=54494&view=rev Log: [CRT] - Remove some differences to Wine. Fixes comparing a char against EOF in fgetwc. Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Thu Nov 24 13:27:34 2011 @@ -120,7 +120,7 @@ static inline BOOL is_valid_fd(int fd) { - return fd >= 0 && fd < fdend && (fdesc[fd].wxflag & WX_OPEN); + return fd >= 0 && fd < fdend && (fdesc[fd].wxflag & WX_OPEN); } /* INTERNAL: Get the HANDLE for a fd @@ -177,6 +177,7 @@ WARN(":files exhausted!\n"); return -1; } + fdesc[fd].handle = hand; fdesc[fd].wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT)); @@ -233,6 +234,7 @@ return fstreams[i]; } } + return NULL; } @@ -341,9 +343,10 @@ if (!(fdesc[0].wxflag & WX_OPEN) || fdesc[0].handle == INVALID_HANDLE_VALUE) { #ifndef __REACTOS__ - DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_INPUT_HANDLE), - GetCurrentProcess(), &fdesc[0].handle, 0, TRUE, - DUPLICATE_SAME_ACCESS); + HANDLE std = GetStdHandle(STD_INPUT_HANDLE); + if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, + GetCurrentProcess(), &fdesc[0].handle, + 0, TRUE, DUPLICATE_SAME_ACCESS)) #else fdesc[0].handle = GetStdHandle(STD_INPUT_HANDLE); if (fdesc[0].handle == NULL) @@ -351,12 +354,14 @@ #endif fdesc[0].wxflag = WX_OPEN | WX_TEXT; } + if (!(fdesc[1].wxflag & WX_OPEN) || fdesc[1].handle == INVALID_HANDLE_VALUE) { #ifndef __REACTOS__ - DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_OUTPUT_HANDLE), - GetCurrentProcess(), &fdesc[1].handle, 0, TRUE, - DUPLICATE_SAME_ACCESS); + HANDLE std = GetStdHandle(STD_OUTPUT_HANDLE); + if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, + GetCurrentProcess(), &fdesc[1].handle, + 0, TRUE, DUPLICATE_SAME_ACCESS)) #else fdesc[1].handle = GetStdHandle(STD_OUTPUT_HANDLE); if (fdesc[1].handle == NULL) @@ -364,12 +369,14 @@ #endif fdesc[1].wxflag = WX_OPEN | WX_TEXT; } + if (!(fdesc[2].wxflag & WX_OPEN) || fdesc[2].handle == INVALID_HANDLE_VALUE) { #ifndef __REACTOS__ - DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_ERROR_HANDLE), - GetCurrentProcess(), &fdesc[2].handle, 0, TRUE, - DUPLICATE_SAME_ACCESS); + HANDLE std = GetStdHandle(STD_ERROR_HANDLE); + if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, + GetCurrentProcess(), &fdesc[2].handle, + 0, TRUE, DUPLICATE_SAME_ACCESS)) #else fdesc[2].handle = GetStdHandle(STD_ERROR_HANDLE); if (fdesc[2].handle == NULL) @@ -378,8 +385,8 @@ fdesc[2].wxflag = WX_OPEN | WX_TEXT; } - TRACE(":handles (%p)(%p)(%p)\n",fdesc[0].handle, - fdesc[1].handle,fdesc[2].handle); + TRACE(":handles (%p)(%p)(%p)\n", fdesc[0].handle, + fdesc[1].handle, fdesc[2].handle); memset(_iob,0,3*sizeof(FILE)); for (i = 0; i < 3; i++) @@ -425,7 +432,7 @@ } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ -static void int_to_base32(int num, char *str) +static int int_to_base32(int num, char *str) { char *p; int n = num; @@ -445,6 +452,8 @@ *p += ('a' - '0' - 10); num >>= 5; } + + return digits; } /********************************************************************* @@ -1953,12 +1962,13 @@ */ wint_t CDECL fgetwc(FILE* file) { - char c; + int c; if (!(fdesc[file->_file].wxflag & WX_TEXT)) { wchar_t wc; - int i,j; + unsigned int i; + int j; char *chp, *wcp; wcp = (char *)&wc; for(i=0; i<sizeof(wc); i++)

12 years, 9 months

[tfaber] 54493: [EXPLORER] - Fix incorrect virtual function override of Entry::do_context_menu. CID 1630

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Nov 24 13:12:56 2011 New Revision: 54493 URL: http://svn.reactos.org/svn/reactos?rev=54493&view=rev Log: [EXPLORER] - Fix incorrect virtual function override of Entry::do_context_menu. CID 1630 Modified: trunk/reactos/base/shell/explorer/shell/shellfs.cpp trunk/reactos/base/shell/explorer/shell/shellfs.h Modified: trunk/reactos/base/shell/explorer/shell/shellfs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellfs.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/shellfs.cpp [iso-8859-1] Thu Nov 24 13:12:56 2011 @@ -221,14 +221,14 @@ } -HRESULT ShellEntry::do_context_menu(HWND hwnd, LPPOINT pptScreen, CtxMenuInterfaces& cm_ifs) +HRESULT ShellEntry::do_context_menu(HWND hwnd, const POINT& pptScreen, CtxMenuInterfaces& cm_ifs) { ShellDirectory* dir = static_cast<ShellDirectory*>(_up); ShellFolder folder = dir? dir->_folder: GetDesktopFolder(); LPCITEMIDLIST pidl = _pidl; - return ShellFolderContextMenu(folder, hwnd, 1, &pidl, pptScreen->x, pptScreen->y, cm_ifs); + return ShellFolderContextMenu(folder, hwnd, 1, &pidl, pptScreen.x, pptScreen.y, cm_ifs); } Modified: trunk/reactos/base/shell/explorer/shell/shellfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellfs.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/shellfs.h [iso-8859-1] Thu Nov 24 13:12:56 2011 @@ -36,7 +36,7 @@ virtual ShellPath create_absolute_pidl() const; virtual HRESULT GetUIObjectOf(HWND hWnd, REFIID riid, LPVOID* ppvOut); virtual BOOL launch_entry(HWND hwnd, UINT nCmdShow=SW_SHOWNORMAL); - virtual HRESULT do_context_menu(HWND hwnd, LPPOINT pptScreen, CtxMenuInterfaces& cm_ifs); + virtual HRESULT do_context_menu(HWND hwnd, const POINT& pptScreen, CtxMenuInterfaces& cm_ifs); virtual ShellFolder get_shell_folder() const; IShellFolder* get_parent_folder() const;

12 years, 9 months

[akhaldi] 54492: [IP] * Remove unused value. CID 11342.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 24 12:51:27 2011 New Revision: 54492 URL: http://svn.reactos.org/svn/reactos?rev=54492&view=rev Log: [IP] * Remove unused value. CID 11342. Modified: trunk/reactos/lib/drivers/ip/network/arp.c Modified: trunk/reactos/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/arp… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] Thu Nov 24 12:51:27 2011 @@ -228,8 +228,8 @@ /* The packet had our protocol address as target. The sender may want to communicate with us soon, so add his address to our address cache */ - NCE = NBAddNeighbor(Interface, &SrcAddress, SenderHWAddress, - Header->HWAddrLen, 0, ARP_COMPLETE_TIMEOUT); + NBAddNeighbor(Interface, &SrcAddress, SenderHWAddress, + Header->HWAddrLen, 0, ARP_COMPLETE_TIMEOUT); } if (Header->Opcode != ARP_OPCODE_REQUEST)

12 years, 9 months

[akhaldi] 54491: [WIN32K] * Comment out some unused but set variables. * Check for NtDeviceIoControlFile returned status and warn on failure.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 24 12:38:26 2011 New Revision: 54491 URL: http://svn.reactos.org/svn/reactos?rev=54491&view=rev Log: [WIN32K] * Comment out some unused but set variables. * Check for NtDeviceIoControlFile returned status and warn on failure. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu Nov 24 12:38:26 2011 @@ -134,14 +134,15 @@ NTSTATUS MouStatus = STATUS_UNSUCCESSFUL, KbdStatus = STATUS_UNSUCCESSFUL, Status; IO_STATUS_BLOCK MouIosb, KbdIosb; PFILE_OBJECT pKbdDevice, pMouDevice; - LARGE_INTEGER WaitTimeout, ByteOffset; + LARGE_INTEGER ByteOffset; + //LARGE_INTEGER WaitTimeout; PVOID WaitObjects[3], pSignaledObject = NULL; ULONG cWaitObjects = 0, cMaxWaitObjects = 1; MOUSE_INPUT_DATA MouseInput; KEYBOARD_INPUT_DATA KeyInput; ByteOffset.QuadPart = (LONGLONG)0; - WaitTimeout.QuadPart = (LONGLONG)(-10000000); + //WaitTimeout.QuadPart = (LONGLONG)(-10000000); ptiRawInput = PsGetCurrentThreadWin32Thread(); ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Thu Nov 24 12:38:26 2011 @@ -170,6 +170,11 @@ IOCTL_KEYBOARD_QUERY_INDICATORS, NULL, 0, &gIndicators, sizeof(gIndicators)); + + if (!NT_SUCCESS(Status)) + { + WARN("NtDeviceIoControlFile() failed, ignored\n"); + } SET_KEY_LOCKED(gafAsyncKeyState, VK_CAPITAL, gIndicators.LedFlags & KEYBOARD_CAPS_LOCK_ON); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Thu Nov 24 12:38:26 2011 @@ -951,7 +951,7 @@ BOOL APIENTRY NtUserFlashWindowEx(IN PFLASHWINFO pfwi) { - PWND pWnd; + //PWND pWnd; FLASHWINFO finfo = {0}; BOOL Ret = TRUE; @@ -971,7 +971,7 @@ if (!Ret) goto Exit; - if (!(pWnd = (PWND)UserGetObject(gHandleTable, finfo.hwnd, otWindow)) || + if (!(/* pWnd = */ (PWND)UserGetObject(gHandleTable, finfo.hwnd, otWindow)) || finfo.cbSize != sizeof(FLASHWINFO) || finfo.dwFlags & ~(FLASHW_ALL|FLASHW_TIMER|FLASHW_TIMERNOFG) ) {

12 years, 9 months

[akhaldi] 54490: [KS] * Add a missing break. CID 13502.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 24 12:36:49 2011 New Revision: 54490 URL: http://svn.reactos.org/svn/reactos?rev=54490&view=rev Log: [KS] * Add a missing break. CID 13502. Modified: trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Thu Nov 24 12:36:49 2011 @@ -1963,6 +1963,7 @@ break; case IRP_MJ_PNP: Dispatch = KsDefaultDispatchPnp; + break; default: Dispatch = NULL; }

12 years, 9 months

[akhaldi] 54489: [SHELL32] * Initialize fSite in the constructor. CID 15134.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 24 11:40:43 2011 New Revision: 54489 URL: http://svn.reactos.org/svn/reactos?rev=54489&view=rev Log: [SHELL32] * Initialize fSite in the constructor. CID 15134. Modified: trunk/reactos/dll/win32/shell32/shv_item_new.cpp Modified: trunk/reactos/dll/win32/shell32/shv_item_new.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_new.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_item_new.cpp [iso-8859-1] Thu Nov 24 11:40:43 2011 @@ -27,8 +27,9 @@ CNewMenu::CNewMenu() { + szPath = NULL; s_SnHead = NULL; - szPath = NULL; + fSite = NULL; }

12 years, 9 months

[akhaldi] 54488: [SHLWAPI] * Fix the syntax of some resource files (Spotted by windres).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 24 11:27:36 2011 New Revision: 54488 URL: http://svn.reactos.org/svn/reactos?rev=54488&view=rev Log: [SHLWAPI] * Fix the syntax of some resource files (Spotted by windres). Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.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] Thu Nov 24 11:27:36 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 "&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&MÃ©gse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&MÃ©gse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&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] Thu Nov 24 11:27:36 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 "&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&NÃ£o" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&NÃ£o", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE

12 years, 9 months

[akhaldi] 54487: [HAL] * Timo Kreuzer: Fix a NULL pointer dereference. CID 13453.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 24 11:25:40 2011 New Revision: 54487 URL: http://svn.reactos.org/svn/reactos?rev=54487&view=rev Log: [HAL] * Timo Kreuzer: Fix a NULL pointer dereference. CID 13453. Modified: trunk/reactos/hal/halx86/acpi/halacpi.c Modified: trunk/reactos/hal/halx86/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halacpi.c?… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] Thu Nov 24 11:25:40 2011 @@ -747,19 +747,22 @@ { /* Use HAL heap */ HalpUnmapVirtualAddress(MappedAddress, TableLength); + + LoaderExtension = LoaderBlock->Extension; } else { /* Use Mm */ MmUnmapIoSpace(MappedAddress, TableLength << PAGE_SHIFT); + + LoaderExtension = NULL; } /* Cache the RSDT */ HalpAcpiCacheTable(&Rsdt->Header); /* Check for compatible loader block extension */ - LoaderExtension = LoaderBlock->Extension; - if (LoaderExtension->Size >= 0x58) + if (LoaderExtension && (LoaderExtension->Size >= 0x58)) { /* Compatible loader: did it provide an ACPI table override? */ if ((LoaderExtension->AcpiTable) && (LoaderExtension->AcpiTableSize))

12 years, 9 months

[akhaldi] 54486: [NTOSKRNL] * Timo Kreuzer: Fix some dead code. CID 14595.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 24 11:22:18 2011 New Revision: 54486 URL: http://svn.reactos.org/svn/reactos?rev=54486&view=rev Log: [NTOSKRNL] * Timo Kreuzer: Fix some dead code. CID 14595. Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Thu Nov 24 11:22:18 2011 @@ -213,7 +213,7 @@ { /* We should have a process for user land addresses */ ASSERT(Process != NULL); - + if(Process != PsGetCurrentProcess()) { PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); @@ -229,8 +229,9 @@ return NULL; } MI_SET_USAGE(MI_USAGE_LEGACY_PAGE_DIRECTORY); - if (Process) MI_SET_PROCESS2(Process->ImageFileName); - if (!Process) MI_SET_PROCESS2("Kernel Legacy"); + + MI_SET_PROCESS2(Process->ImageFileName); + Status = MmRequestPageMemoryConsumer(MC_SYSTEM, FALSE, &Pfn); if (!NT_SUCCESS(Status) || Pfn == 0) { @@ -264,8 +265,8 @@ return NULL; } MI_SET_USAGE(MI_USAGE_LEGACY_PAGE_DIRECTORY); - if (Process) MI_SET_PROCESS2(Process->ImageFileName); - if (!Process) MI_SET_PROCESS2("Kernel Legacy"); + MI_SET_PROCESS2(Process->ImageFileName); + Status = MmRequestPageMemoryConsumer(MC_SYSTEM, FALSE, &Pfn); if (!NT_SUCCESS(Status) || Pfn == 0) {

12 years, 9 months

[akhaldi] 54485: [SHELL32] * Fix the syntax of the Japanese resource file (Spotted by windres).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 24 10:17:48 2011 New Revision: 54485 URL: http://svn.reactos.org/svn/reactos?rev=54485&view=rev Log: [SHELL32] * Fix the syntax of the Japanese resource file (Spotted by windres). Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Thu Nov 24 10:17:48 2011 @@ -31,7 +31,7 @@ BEGIN POPUP "" BEGIN - POPUP "è¡¨\ç¤º(&V)" + POPUP "è¡¨ç¤º(&V)" BEGIN MENUITEM "å¤§ããã¢ã¤ã³ã³(&G)", FCIDM_SHVIEW_BIGICON MENUITEM "å°ããã¢ã¤ã³ã³(&M)", FCIDM_SHVIEW_SMALLICON @@ -52,8 +52,8 @@ MENUITEM SEPARATOR MENUITEM "ææ°ã®æå ±ã«æ´æ°", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR - MENUITEM "è²¼\ãä»ã", FCIDM_SHVIEW_INSERT - MENUITEM "ã·ã§ã¼ãã«ããã®è²¼\ãä»ã", FCIDM_SHVIEW_INSERTLINK + MENUITEM "è²¼ãä»ã", FCIDM_SHVIEW_INSERT + MENUITEM "ã·ã§ã¼ãã«ããã®è²¼ãä»ã", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR MENUITEM "ããããã£", FCIDM_SHVIEW_PROPERTIES END @@ -159,7 +159,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "å®è¡ããããã°ã©ã åãã¾ãã¯éããã©ã«ããææ¸åãã¤ã³ã¿ã¼ããã ãªã½\ã¼ã¹åãå¥åãã¦ãã ããã", 12289, 36, 11, 182, 18 + LTEXT "å®è¡ããããã°ã©ã åãã¾ãã¯éããã©ã«ããææ¸åãã¤ã³ã¿ã¼ããã ãªã½ã¼ã¹åãå¥åãã¦ãã ããã", 12289, 36, 11, 182, 18 LTEXT "åå(&O):", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -336,7 +336,7 @@ LTEXT "ãã®ããã°ã©ã ãå®è¡ããã¦ã¼ã¶ã¼ã¢ã«ã¦ã³ããé¸æãã¦ãã ãã", -1, 10, 20, 220, 20 CHECKBOX "ç¾å¨ã®ã¦ã¼ã¶ã¼ (%s)", 14000, 10, 45, 150, 10 LTEXT "è¨±å¯ããã¦ããªãããã°ã©ã ã®æ´»åããã³ã³ãã¥ã¼ã¿ã¨ãã¼ã¿ãä¿è·ãã", -1, 25, 57, 200, 10, WS_DISABLED - CHECKBOX "ãã®ãªãã·ã§ã³ã¯ã³ã³ãã¥ã¼ã¿ãåäººãã¼ã¿ã«å±å®³ãããããã³ã³ãã¥ã¼ã¿ã¦ã¤ã«ã¹ãæªç¶ã«é²æ¢ãããã¨ãã§ãã¾ãããã ãããã®ãªãã·ã§ã³ãé¸æããã¨ããã°ã©ã ãæ£å¸¸ã«æ©è½\ããªããªãå¯è½\æ§ãããã¾ãã", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "ãã®ãªãã·ã§ã³ã¯ã³ã³ãã¥ã¼ã¿ãåäººãã¼ã¿ã«å±å®³ãããããã³ã³ãã¥ã¼ã¿ã¦ã¤ã«ã¹ãæªç¶ã«é²æ¢ãããã¨ãã§ãã¾ãããã ãããã®ãªãã·ã§ã³ãé¸æããã¨ããã°ã©ã ãæ£å¸¸ã«æ©è½ããªããªãå¯è½æ§ãããã¾ãã", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE CHECKBOX "æ¬¡ã®ã¦ã¼ã¶ã¼:", 14002, 10, 100, 90, 10 LTEXT "ã¦ã¼ã¶ã¼å:", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -360,7 +360,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "æå¤§ãµã¤ãº(MB)(&A):", -1, 20, 105, 70, 10 RADIOBUTTON "ãã¡ã¤ã«ããã¿ç®±ã«ã»ï¾åããã«ããã«åé¤ããã(&R)", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - AUTOCHECKBOX "åé¤ã®ç¢ºèªãã¤ã¢ãã°ãè¡¨\ç¤ºãã(&D)", 14004, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "åé¤ã®ç¢ºèªãã¤ã¢ãã°ãè¡¨ç¤ºãã(&D)", 14004, 20, 155, 140, 10, WS_TABSTOP END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -386,7 +386,7 @@ BEGIN GROUPBOX "ã¿ã¹ã¯", -1, 7, 10, 249, 45 ICON "", 30109, 14, 25, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "ãã©ã«ãã«å±éã®ã¿ã¹ã¯ãè¡¨\ç¤ºãã(&F)", 14001, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "ãã©ã«ãã«å±éã®ã¿ã¹ã¯ãè¡¨ç¤ºãã(&F)", 14001, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "ReactOS ã¯ã©ã·ãã¯ ãã©ã«ããä½¿ç¨ãã(&I)", 14002, 40, 37, 120, 10, WS_TABSTOP | WS_GROUP GROUPBOX "ãã©ã«ãã®åç§", -1, 7, 60, 249, 45, WS_TABSTOP ICON "", 30110, 14, 70, 21, 20, SS_REALSIZECONTROL @@ -403,12 +403,12 @@ FOLDER_OPTIONS_VIEW_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "è¡¨\ç¤º" -FONT 9, "MS UI Gothic", 0, 0, 0x0 -BEGIN -GROUPBOX "ãã©ã«ãã®è¡¨\ç¤ºæ¹æ³", -1, 7, 10, 249, 60 +CAPTION "è¡¨ç¤º" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN +GROUPBOX "ãã©ã«ãã®è¡¨ç¤ºæ¹æ³", -1, 7, 10, 249, 60 //ICON -LTEXT "ãã®ãã©ã«ãã«ä½¿ç¨ãã¦ããè¡¨\ç¤ºæ¹æ³(è©³ç´°è¡¨\ç¤ºãä¸¦ã¹ã¦è¡¨\ç¤ºãªã©)\nããã¹ã¦ã®ãã©ã«ãã«é©ç¨ã§ãã¾ãã", -1, 60, 20, 180, 20 +LTEXT "ãã®ãã©ã«ãã«ä½¿ç¨ãã¦ããè¡¨ç¤ºæ¹æ³(è©³ç´°è¡¨ç¤ºãä¸¦ã¹ã¦è¡¨ç¤ºãªã©)\nããã¹ã¦ã®ãã©ã«ãã«é©ç¨ã§ãã¾ãã", -1, 60, 20, 180, 20 PUSHBUTTON "ãã¹ã¦ã®ãã©ã«ãã«é©ç¨(&L)", 14001, 60, 50, 80, 14, WS_TABSTOP PUSHBUTTON "ãã¹ã¦ã®ãã©ã«ãããªã»ãã(&R)", 14002, 150, 50, 80, 14, WS_TABSTOP LTEXT "è©³ç´°è¨å®:", -1, 7, 80, 100, 10 @@ -510,7 +510,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS ã¯ãã£ã¹ã¯ãæ¿å¥ãããããããã¯ãã®ãã¡ã¤ã«ã®ç¨®é¡ã®ããã¤ã¹ãæ¥ç¶ãããã¨ãæ¯ååãåä½ãå¯è½\ã§ã:", 1001, 30, 7, 193, 20 + LTEXT "ReactOS ã¯ãã£ã¹ã¯ãæ¿å¥ãããããããã¯ãã®ãã¡ã¤ã«ã®ç¨®é¡ã®ããã¤ã¹ãæ¥ç¶ãããã¨ãæ¯ååãåä½ãå¯è½ã§ã:", 1001, 30, 7, 193, 20 ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "ReactOS ãå®è¡ããåä½ãé¸æãã¦ãã ãã", 1002, 32, 41, 190, 8 @@ -526,7 +526,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS ã¯ãã®ããã¤ã¹ãæ¥ç¶ãããã¨ãæ¯ååãåä½ãå¯è½\ã§ãã", 1001, 32, 7, 190, 22 + LTEXT "ReactOS ã¯ãã®ããã¤ã¹ãæ¥ç¶ãããã¨ãæ¯ååãåä½ãå¯è½ã§ãã", 1001, 32, 7, 190, 22 LTEXT "ReactOS ãå®è¡ããåä½ãé¸æãã¦ãã ãã(&W)", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 AUTOCHECKBOX "å¸¸ã«é¸æããåä½ãè¡ã(&A)", 1004, 32, 143, 190, 8 @@ -727,21 +727,21 @@ IDS_EMPTY_BITBUCKET "ãã¿ç®±ãç©ºã«ãã" IDS_PICK_ICON_TITLE "ã¢ã¤ã³ã³ã®é¸æ" IDS_PICK_ICON_FILTER "ã¢ã¤ã³ã³ãã¡ã¤ã« (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" - IDS_OPEN_WITH_FILTER "å®è¡å¯è½\ ãã¡ã¤ã« (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "å®è¡å¯è½ ãã¡ã¤ã« (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "ãã©ã«ã" IDS_VIRTUAL_DRIVER "ä»®æ³ ããã¤ã¹ ãã©ã¤ã" IDS_BAT_FILE "ReactOS ããã ãã¡ã¤ã«" IDS_CMD_FILE "ReactOS ã³ãã³ã ã¹ã¯ãªãã" IDS_COM_FILE "Dos ã¢ããªã±ã¼ã·ã§ã³" IDS_CPL_FILE "ã³ã³ããã¼ã« ããã«ã®é ç®" - IDS_CUR_FILE "ã«ã¼ã½\ã«" + IDS_CUR_FILE "ã«ã¼ã½ã«" IDS_DLL_FILE "ã¢ããªã±ã¼ã·ã§ã³ æ¡å¼µ" IDS_DRV_FILE "ããã¤ã¹ ãã©ã¤ã" IDS_EXE_FILE "ã¢ããªã±ã¼ã·ã§ã³" IDS_FON_FILE "ãã©ã³ã ãã¡ã¤ã«" IDS_TTF_FILE "TrueType ãã©ã³ã ãã¡ã¤ã«" IDS_HLP_FILE "ãã«ã ãã¡ã¤ã«" - IDS_INI_FILE "æ§\æè¨å®" + IDS_INI_FILE "æ§æè¨å®" IDS_LNK_FILE "ã·ã§ã¼ãã«ãã" IDS_SYS_FILE "ã·ã¹ãã ãã¡ã¤ã«"

12 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
28
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 November 2011