Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[greatlrd] 17901: Fix some part of MoveFileExW Bug, Can not move folder, but it still can not move folder. some bit more work.
by greatlrd＠svn.reactos.com 17 Sep '05

17 Sep '05

Fix some part of MoveFileExW Bug, Can not move folder, but it still can not move folder. some bit more work. Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-17 19:38:34 UTC (rev 17900) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-17 21:02:38 UTC (rev 17901) @@ -325,7 +325,7 @@ FILE_SHARE_WRITE|FILE_SHARE_READ, NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, + FILE_FLAG_BACKUP_SEMANTICS, NULL); if (hFile == INVALID_HANDLE_VALUE) @@ -366,6 +366,13 @@ sizeof(FILE_RENAME_INFORMATION) + DstPathU.Length, FileRenameInformation); CloseHandle(hFile); + + /* + * FIXME: + * Fail now move the folder + * Before we fail at CreateFileW + */ + if (NT_SUCCESS(errCode)) { Result = TRUE;

1 0

[gvg] 17900: Add back support for older binutils versions
by gvg＠svn.reactos.com 17 Sep '05

17 Sep '05

Add back support for older binutils versions Modified: trunk/reactos/lib/ntdll/main/i386/dispatch.S Modified: trunk/reactos/lib/rtl/i386/except.s Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/lib/ntdll/main/i386/dispatch.S --- trunk/reactos/lib/ntdll/main/i386/dispatch.S 2005-09-17 19:30:05 UTC (rev 17899) +++ trunk/reactos/lib/ntdll/main/i386/dispatch.S 2005-09-17 19:38:34 UTC (rev 17900) @@ -15,7 +15,7 @@ #define EXCEPTION_NONCONTINUABLE 1 #define EXCEPTION_UNWINDING 2 #define EXCEPTION_EXIT_UNWIND 4 -#define EXCEPTION_UNWIND (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND) +#define EXCEPTION_UNWIND (EXCEPTION_UNWINDING + EXCEPTION_EXIT_UNWIND) #define STATUS_CALLBACK_POP_STACK 0xC0000423 _____ Modified: trunk/reactos/lib/rtl/i386/except.s --- trunk/reactos/lib/rtl/i386/except.s 2005-09-17 19:30:05 UTC (rev 17899) +++ trunk/reactos/lib/rtl/i386/except.s 2005-09-17 19:38:34 UTC (rev 17900) @@ -15,7 +15,7 @@ #define EXCEPTION_UNWINDING 2 #define EXCEPTION_EXIT_UNWIND 4 -#define EXCEPTION_UNWIND (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND) +#define EXCEPTION_UNWIND (EXCEPTION_UNWINDING + EXCEPTION_EXIT_UNWIND) #define ExceptionContinueExecution 0 #define ExceptionContinueSearch 1 _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-09-17 19:30:05 UTC (rev 17899) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-09-17 19:38:34 UTC (rev 17900) @@ -499,7 +499,9 @@ /* We will be cleaning up the stack ourselves */ pop edx /* New Ring 3 EIP */ add esp, 4 /* Skip Ring 3 DS */ - and dword ptr [esp], ~X86_EFLAGS_IF /* Remove IRQ hack from EFLAGS */ +/* and dword ptr [esp], ~X86_EFLAGS_IF Line below is equivalent to this, + but older binutils versions don't understand ~ */ + and dword ptr [esp], 0xfffffdff /* Remove IRQ hack from EFLAGS */ popf /* Restore old EFLAGS */ pop ecx /* Old Ring 3 SS:ESP */

1 0

[gvg] 17899: Open handle to sfd.sys as asynchromous. This fixes bug 713.
by gvg＠svn.reactos.com 17 Sep '05

17 Sep '05

Open handle to sfd.sys as asynchromous. This fixes bug 713. Modified: trunk/reactos/lib/msafd/misc/dllmain.c _____ Modified: trunk/reactos/lib/msafd/misc/dllmain.c --- trunk/reactos/lib/msafd/misc/dllmain.c 2005-09-17 18:56:16 UTC (rev 17898) +++ trunk/reactos/lib/msafd/misc/dllmain.c 2005-09-17 19:30:05 UTC (rev 17899) @@ -65,7 +65,6 @@ PHELPER_DATA HelperData; PVOID HelperDLLContext; DWORD HelperEvents; - DWORD IOOptions = 0; UNICODE_STRING TransportName; UNICODE_STRING DevName; LARGE_INTEGER GroupData; @@ -204,10 +203,10 @@ 0, 0); - /* Set IO Flag */ - if ((dwFlags & WSA_FLAG_OVERLAPPED) == 0) IOOptions = FILE_SYNCHRONOUS_IO_NONALERT; - - /* Create the Socket */ + /* Create the Socket as asynchronous. That means we have to block + ourselves after every call to NtDeviceIoControlFile. This is + because the kernel doesn't support overlapping synchronous I/O + requests (made from multiple threads) at this time (Sep 2005) */ ZwCreateFile(&Sock, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &Object, @@ -216,7 +215,7 @@ 0, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN_IF, - IOOptions, + 0, EABuffer, SizeOfEA); @@ -510,6 +509,11 @@ 0xA + Socket->SharedData.SizeOfLocalAddress, /* Can't figure out a way to calculate this in C*/ BindData, 0xA + Socket->SharedData.SizeOfLocalAddress); /* Can't figure out a way to calculate this C */ + + /* Wait for return */ + if (Status == STATUS_PENDING) { + WaitForSingleObject(SockEvent, INFINITE); + } /* Set up Socket Data */ Socket->SharedData.State = SocketBound; @@ -558,6 +562,11 @@ sizeof(ListenData), NULL, 0); + + /* Wait for return */ + if (Status == STATUS_PENDING) { + WaitForSingleObject(SockEvent, INFINITE); + } /* Set to Listening */ Socket->SharedData.Listening = TRUE; @@ -827,6 +836,12 @@ sizeof(PendingAcceptData), &PendingAcceptData, sizeof(PendingAcceptData)); + + /* Wait for return */ + if (Status == STATUS_PENDING) { + WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; + } if (!NT_SUCCESS(Status)) { NtClose( SockEvent ); @@ -856,6 +871,12 @@ PendingData, PendingDataLength); + /* Wait for return */ + if (Status == STATUS_PENDING) { + WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; + } + if (!NT_SUCCESS(Status)) { NtClose( SockEvent ); MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); @@ -942,6 +963,12 @@ NULL, 0); + /* Wait for return */ + if (Status == STATUS_PENDING) { + WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; + } + NtClose( SockEvent ); if (!NT_SUCCESS(Status)) { @@ -987,6 +1014,12 @@ sizeof(AcceptData), NULL, 0); + + /* Wait for return */ + if (Status == STATUS_PENDING) { + WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; + } if (!NT_SUCCESS(Status)) { WSPCloseSocket( AcceptSocket, lpErrno ); @@ -1077,6 +1110,11 @@ ConnectDataLength, NULL, 0); + /* Wait for return */ + if (Status == STATUS_PENDING) { + WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; + } } /* Dynamic Structure...ugh */ @@ -1113,6 +1151,12 @@ sizeof(InConnectDataLength), NULL, 0); + + /* Wait for return */ + if (Status == STATUS_PENDING) { + WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; + } } /* AFD doesn't seem to care if these are invalid, but let's 0 them anyways */ @@ -1136,6 +1180,11 @@ 0x22, NULL, 0); + /* Wait for return */ + if (Status == STATUS_PENDING) { + WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; + } /* Get any pending connect data */ if (lpCalleeData != NULL) { @@ -1149,6 +1198,11 @@ 0, lpCalleeData->buf, lpCalleeData->len); + /* Wait for return */ + if (Status == STATUS_PENDING) { + WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; + } } /* Re-enable Async Event */

1 0

[greatlrd] 17898: Bug fix dir *. it only show folders
by greatlrd＠svn.reactos.com 17 Sep '05

17 Sep '05

Bug fix dir *. it only show folders Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-09-17 17:16:33 UTC (rev 17897) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-09-17 18:56:16 UTC (rev 17898) @@ -240,6 +240,8 @@ BOOL bPNegative; /* Negative switch parameter */ BOOL bIntoQuotes; /* A flag showing if we are in quotes (") */ LPTSTR ptrLast; /* A pointer to the last character of param */ + INT t = 0; + /* Initialize variables; */ cCurSwitch = _T(' '); @@ -258,6 +260,32 @@ lpFlags->stOrderBy.bParSetted = TRUE; lpFlags->stTimeField.bParSetted = TRUE; + + /* Add correct handling of *. */ + for(t=0;t<_tcslen(Line);t++) + { + static INT count=0; + + if ((count==0) && (Line[t]==_T('*'))) + count++; + + else if ((count==1) && (Line[t]==_T('.'))) + count++; + + else if ((count==2) && (Line[t]==_T('*'))) + count++; + + else if (!_istspace(Line[t])) + { + if (count==2) + lpFlags->bWideListColSort = ! bNegative; + count=-1; + } + } + + + + /* Main Loop (see README_DIR.txt) */ /* scan the command line char per char, and we process its char */ while (*Line)

1 0

[ekohl] 17897: - String id 0 becomes a reserved (invalid) id.
by ekohl＠svn.reactos.com 17 Sep '05

17 Sep '05

- String id 0 becomes a reserved (invalid) id. - StringTableStringFromId returns a pointer to an empty string if the string id is invalid. This fixes the stringtable tests. Modified: trunk/reactos/lib/setupapi/stringtable.c _____ Modified: trunk/reactos/lib/setupapi/stringtable.c --- trunk/reactos/lib/setupapi/stringtable.c 2005-09-17 16:02:37 UTC (rev 17896) +++ trunk/reactos/lib/setupapi/stringtable.c 2005-09-17 17:16:33 UTC (rev 17897) @@ -49,7 +49,9 @@ DWORD dwMaxDataSize; } STRING_TABLE, *PSTRING_TABLE; +WCHAR empty[] = {0}; + /*********************************************************************** *** * StringTableInitialize [SETUPAPI.@] * @@ -240,14 +242,14 @@ { if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) { - return i; + return i + 1; } } else { if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) { - return i; + return i + 1; } } } @@ -276,7 +278,7 @@ pStringTable->dwUsedSlots++; - return i; + return i + 1; } } @@ -437,20 +439,20 @@ return FALSE; } - if (dwId >= pStringTable->dwMaxSlots) + if (dwId == 0 || dwId > pStringTable->dwMaxSlots) { ERR("Invalid Slot id!\n"); return FALSE; } - if (pStringTable->pSlots[dwId].dwSize < dwExtraDataSize) + if (pStringTable->pSlots[dwId - 1].dwSize < dwExtraDataSize) { ERR("Data size is too large!\n"); return FALSE; } memcpy(lpExtraData, - pStringTable->pSlots[dwId].pData, + pStringTable->pSlots[dwId - 1].pData, dwExtraDataSize); return TRUE; @@ -497,12 +499,12 @@ if (dwFlags & 1) { if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) - return i; + return i + 1; } else { if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) - return i; + return i + 1; } } } @@ -573,7 +575,7 @@ return FALSE; } - if (dwId >= pStringTable->dwMaxSlots) + if (dwId == 0 || dwId > pStringTable->dwMaxSlots) { ERR("Invalid Slot id!\n"); return FALSE; @@ -585,17 +587,17 @@ return FALSE; } - pStringTable->pSlots[dwId].pData = MyMalloc(dwExtraDataSize); - if (pStringTable->pSlots[dwId].pData == NULL) + pStringTable->pSlots[dwId - 1].pData = MyMalloc(dwExtraDataSize); + if (pStringTable->pSlots[dwId - 1].pData == NULL) { ERR("\n"); return FALSE; } - memcpy(pStringTable->pSlots[dwId].pData, + memcpy(pStringTable->pSlots[dwId - 1].pData, lpExtraData, dwExtraDataSize); - pStringTable->pSlots[dwId].dwSize = dwExtraDataSize; + pStringTable->pSlots[dwId - 1].dwSize = dwExtraDataSize; return TRUE; } @@ -629,10 +631,10 @@ return NULL; } - if (dwId >= pStringTable->dwMaxSlots) - return NULL; + if (dwId == 0 || dwId > pStringTable->dwMaxSlots) + return empty; - return pStringTable->pSlots[dwId].pString; + return pStringTable->pSlots[dwId - 1].pString; } @@ -672,18 +674,18 @@ return FALSE; } - if (dwId >= pStringTable->dwMaxSlots || - pStringTable->pSlots[dwId].pString == NULL) + if (dwId == 0 || dwId > pStringTable->dwMaxSlots || + pStringTable->pSlots[dwId - 1].pString == NULL) { WARN("Invalid string ID!\n"); *lpBufferLength = 0; return FALSE; } - dwLength = (lstrlenW(pStringTable->pSlots[dwId].pString) + 1) * sizeof(WCHAR); + dwLength = (lstrlenW(pStringTable->pSlots[dwId - 1].pString) + 1) * sizeof(WCHAR); if (dwLength <= *lpBufferLength) { - lstrcpyW(lpBuffer, pStringTable->pSlots[dwId].pString); + lstrcpyW(lpBuffer, pStringTable->pSlots[dwId - 1].pString); bResult = TRUE; }

1 0

[greatlrd] 17896: Update the swedish translation by Harteex.
by greatlrd＠svn.reactos.com 17 Sep '05

17 Sep '05

Update the swedish translation by Harteex. Modified: trunk/reactos/subsys/system/regedit/Sv.rc _____ Modified: trunk/reactos/subsys/system/regedit/Sv.rc --- trunk/reactos/subsys/system/regedit/Sv.rc 2005-09-17 13:48:38 UTC (rev 17895) +++ trunk/reactos/subsys/system/regedit/Sv.rc 2005-09-17 16:02:37 UTC (rev 17896) @@ -123,6 +123,23 @@ MENUITEM "&DWORD-võrde", ID_EDIT_NEW_DWORDVALUE END END + POPUP "" + BEGIN + MENUITEM "Visa/d÷lj nivÕ", ID_TREE_EXPANDBRANCH + POPUP "&Ny(tt)" + BEGIN + MENUITEM "&Nyckel", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Strõngvõrde", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binõrvõrde", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD-võrde", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM "&S÷k", ID_EDIT_FIND, GRAYED + MENUITEM "&Ta bort", ID_TREE_DELETE + MENUITEM "&Byt namn", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "&Kopiera nyckelnamn", ID_EDIT_COPYKEYNAME, GRAYED + END END @@ -314,6 +331,12 @@ IDS_INHERIT_SUBKEYSONLY "Endast undernycklar" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Visa nivÕ" + IDS_COLLAPSE "&D÷lj nivÕ" +END + /*****************************************************************/

1 0

[royce] 17895: Fix "numberf" function to correctly handle 'g' format specifier. Debugged by Michael Fritscher <michael@fritscher.net>
by royce＠svn.reactos.com 17 Sep '05

17 Sep '05

Fix "numberf" function to correctly handle 'g' format specifier. Debugged by Michael Fritscher <michael(a)fritscher.net> (fixed a couple return values while I was in there) Modified: trunk/reactos/tools/rbuild/ssprintf.cpp _____ Modified: trunk/reactos/tools/rbuild/ssprintf.cpp --- trunk/reactos/tools/rbuild/ssprintf.cpp 2005-09-17 11:20:25 UTC (rev 17894) +++ trunk/reactos/tools/rbuild/ssprintf.cpp 2005-09-17 13:48:38 UTC (rev 17895) @@ -126,7 +126,7 @@ if (type & LEFT) type &= ~ZEROPAD; if (base < 2 || base > 36) - return 0; + return false; c = (type & ZEROPAD) ? '0' : ' '; sign = 0; if (type & SIGN) { @@ -205,7 +205,7 @@ if (base < 2 || base > 36) return 0; c = (type & ZEROPAD) ? L'0' : L' '; - sign = 0; + sign = false; if (type & SIGN) { if (num < 0) { sign = L'-'; @@ -305,7 +305,9 @@ if ( exp_sign == 'g' || exp_sign == 'G' ) { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E + exp_sign -= 2; // g -> e and G -> E + else + exp_sign = 'f'; } if ( exp_sign == 'e' || exp_sign == 'E' ) { @@ -495,7 +497,9 @@ { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E + exp_sign -= 2; // g -> e and G -> E + else + exp_sign = L'f'; } if ( exp_sign == L'e' || exp_sign == L'E' ) @@ -694,7 +698,9 @@ if ( exp_sign == 'g' || exp_sign == 'G' ) { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E + exp_sign -= 2; // g -> e and G -> E + else + exp_sign = 'f'; } if ( exp_sign == 'e' || exp_sign == 'E' ) { @@ -789,7 +795,7 @@ { while ( intr > 0.0 ) { - p=intr; + p=intr; intr/=10.0L; modfl(intr, &intr); @@ -896,7 +902,9 @@ if ( exp_sign == L'g' || exp_sign == L'G' ) { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E + exp_sign -= 2; // g -> e and G -> E + else + exp_sign = 'f'; } if ( exp_sign == L'e' || exp_sign == L'E' ) {

1 0

[navaraf] 17894: Fix "numberf" function to correctly handle 'g' format specifier. Debugged by Michael Fritscher <michael@fritscher.net>.
by navaraf＠svn.reactos.com 17 Sep '05

17 Sep '05

Fix "numberf" function to correctly handle 'g' format specifier. Debugged by Michael Fritscher <michael(a)fritscher.net>. Modified: trunk/reactos/lib/crt/stdio/vfprintf.c Modified: trunk/reactos/lib/crt/stdio/vfwprint.c _____ Modified: trunk/reactos/lib/crt/stdio/vfprintf.c --- trunk/reactos/lib/crt/stdio/vfprintf.c 2005-09-17 10:55:29 UTC (rev 17893) +++ trunk/reactos/lib/crt/stdio/vfprintf.c 2005-09-17 11:20:25 UTC (rev 17894) @@ -225,6 +225,8 @@ type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) exp_sign -= 2; // g -> e and G -> E + else + exp_sign = 'f'; } if ( exp_sign == 'e' || exp_sign == 'E' ) { _____ Modified: trunk/reactos/lib/crt/stdio/vfwprint.c --- trunk/reactos/lib/crt/stdio/vfwprint.c 2005-09-17 10:55:29 UTC (rev 17893) +++ trunk/reactos/lib/crt/stdio/vfwprint.c 2005-09-17 11:20:25 UTC (rev 17894) @@ -238,6 +238,8 @@ type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) exp_sign -= 2; // g -> e and G -> E + else + exp_sign = 'f'; } if ( exp_sign == L'e' || exp_sign == L'E' ) {

1 0

[navaraf] 17893: Patricio Martínez Ros <silencium@wanadoo.es>
by navaraf＠svn.reactos.com 17 Sep '05

17 Sep '05

Patricio Martínez Ros <silencium(a)wanadoo.es> Spanish translation. Modified: trunk/reactos/subsys/system/calc/Es.rc _____ Modified: trunk/reactos/subsys/system/calc/Es.rc --- trunk/reactos/subsys/system/calc/Es.rc 2005-09-17 10:54:46 UTC (rev 17892) +++ trunk/reactos/subsys/system/calc/Es.rc 2005-09-17 10:55:29 UTC (rev 17893) @@ -1,7 +1,7 @@ /* - * WineCalc (Es.rc) + * WineCalc (Spanish resources) * - * Copyright 2003 James Briggs + * Copyright 2005 Patricio MartÝnez Ros * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,19 +22,19 @@ #include "resource.h" #include "winecalc.h" -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH STRINGTABLE DISCARDABLE { - IDS_APPNAME, "Calculator" + IDS_APPNAME, "Calculadora" - IDS_COPYRIGHT1, "Calculator 5.0. Licensed under LGPL 2" + IDS_COPYRIGHT1, "Calculadora 5.0. bajo licencia LGPL 2" IDS_COPYRIGHT2 "Copyright 2003, James Briggs" IDS_COPYRIGHT3 "San Jose, California, USA" IDS_COPYRIGHT4 "james(a)ActionMessage.com" IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" - IDS_BTN_BACKSPACE, "Backspace" + IDS_BTN_BACKSPACE, "Retroceso" IDS_BTN_CLEAR_ENTRY, "CE" IDS_BTN_CLEAR_ALL, "C" IDS_BTN_MEM_CLEAR, "MC" @@ -43,84 +43,84 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" - IDS_ERR_INVALID_INPUT, "Invalid input for function." - IDS_ERR_DIVIDE_BY_ZERO, "Cannot divide by zero." - IDS_ERR_UNDEFINED, "Result of function is undefined." + IDS_ERR_INVALID_INPUT, "Entrada no vßlida para la funci¾n." + IDS_ERR_DIVIDE_BY_ZERO, "No se puede dividir entre cero." + IDS_ERR_UNDEFINED, "El resultado de esta funci¾n no estß definido." } MAIN_MENU MENU DISCARDABLE { - POPUP "&Edit" { - MENUITEM "&Copy Ctrl+C", IDM_COPY - MENUITEM "&Paste Ctrl+V", IDM_PASTE + POPUP "&Editar" { + MENUITEM "&Copiar Ctrl+C", IDM_COPY + MENUITEM "&Pegar Ctrl+V", IDM_PASTE } - POPUP "&View" { - MENUITEM "Standard", IDM_MODE_STANDARD - MENUITEM "Scientific", IDM_MODE_SCIENTIFIC + POPUP "&Ver" { + MENUITEM "Estßndar", IDM_MODE_STANDARD + MENUITEM "CientÝfica", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "Digit Grouping", IDM_DIGIT_GROUPING + MENUITEM "Agrupaci¾n de dÝgitos", IDM_DIGIT_GROUPING } - POPUP "&Help" { - MENUITEM "Help Topics", IDM_HELP_TOPICS + POPUP "Ayuda" { + MENUITEM "Temas de Ayuda", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "About Calculator", IDM_ABOUT + MENUITEM "Acerca de Calculadora", IDM_ABOUT } } SCIMS_MENU MENU DISCARDABLE { - POPUP "&Edit" { - MENUITEM "&Copy Ctrl+C", IDM_COPY - MENUITEM "&Paste Ctrl+V", IDM_PASTE + POPUP "&Editar" { + MENUITEM "&Copiar Ctrl+C", IDM_COPY + MENUITEM "&Pegar Ctrl+V", IDM_PASTE } - POPUP "&View" { - MENUITEM "Standard", IDM_MODE_STANDARD - MENUITEM "Scientific", IDM_MODE_SCIENTIFIC + POPUP "&Ver" { + MENUITEM "Estßndar", IDM_MODE_STANDARD + MENUITEM "CientÝfica", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "Hex\tF5", ID_CALC_NS_HEX + MENUITEM "Hesadecimal\tF5", ID_CALC_NS_HEX MENUITEM "Decimal\tF6", ID_CALC_NS_DEC MENUITEM "Octal\tF7", ID_CALC_NS_OCT - MENUITEM "Binary\tF8", ID_CALC_NS_BIN + MENUITEM "Binario\tF8", ID_CALC_NS_BIN MENUITEM SEPARATOR - MENUITEM "Degrees\tF2", ID_CALC_MS_DEGREES - MENUITEM "Radians\tF3", ID_CALC_MS_RADIANS - MENUITEM "Grads\tF4", ID_CALC_MS_GRADS + MENUITEM "Sexagesimal\tF2", ID_CALC_MS_DEGREES + MENUITEM "Radißn\tF3", ID_CALC_MS_RADIANS + MENUITEM "Centesimal\tF4", ID_CALC_MS_GRADS MENUITEM SEPARATOR - MENUITEM "Digit Grouping", IDM_DIGIT_GROUPING + MENUITEM "Agrupaci¾n de dÝgitos", IDM_DIGIT_GROUPING } - POPUP "&Help" { - MENUITEM "Help Topics", IDM_HELP_TOPICS + POPUP "Ayuda" { + MENUITEM "Temas de Ayuda", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "About Calculator", IDM_ABOUT + MENUITEM "Acerca de Calculadora", IDM_ABOUT } } SCIWS_MENU MENU DISCARDABLE { - POPUP "&Edit" { - MENUITEM "&Copy Ctrl+C", IDM_COPY - MENUITEM "&Paste Ctrl+V", IDM_PASTE + POPUP "&Editar" { + MENUITEM "&Copiar Ctrl+C", IDM_COPY + MENUITEM "&Pegar Ctrl+V", IDM_PASTE } - POPUP "&View" { - MENUITEM "Standard", IDM_MODE_STANDARD - MENUITEM "Scientific", IDM_MODE_SCIENTIFIC + POPUP "&Ver" { + MENUITEM "Estßndar", IDM_MODE_STANDARD + MENUITEM "CientÝfica", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "Hex\tF5", ID_CALC_NS_HEX + MENUITEM "Hexadecimal\tF5", ID_CALC_NS_HEX MENUITEM "Decimal\tF6", ID_CALC_NS_DEC MENUITEM "Octal\tF7", ID_CALC_NS_OCT - MENUITEM "Binary\tF8", ID_CALC_NS_BIN + MENUITEM "Binario\tF8", ID_CALC_NS_BIN MENUITEM SEPARATOR MENUITEM "Qword\tF12", ID_CALC_WS_QWORD MENUITEM "Dword\tF2", ID_CALC_WS_DWORD MENUITEM "Word\tF3", ID_CALC_WS_WORD MENUITEM "Byte\tF4", ID_CALC_WS_BYTE MENUITEM SEPARATOR - MENUITEM "Digit Grouping", IDM_DIGIT_GROUPING + MENUITEM "Agrupaci¾n de dÝgitos", IDM_DIGIT_GROUPING } - POPUP "&Help" { - MENUITEM "Help Topics", IDM_HELP_TOPICS + POPUP "Ayuda" { + MENUITEM "Temas de Ayuda", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "About Calculator", IDM_ABOUT + MENUITEM "Acerca de Calculadora", IDM_ABOUT } } @@ -129,27 +129,27 @@ VK_F1, IDV_HELP, VIRTKEY END -WHATS_THIS_MENU MENU DISCARDABLE -{ - POPUP "" { - MENUITEM "What's This?", IDM_WHATS_THIS - } -} - DLG_ABOUT DIALOG 12,0,120,82 -CAPTION "About GNU winecalc" +CAPTION "Acerca de GNU winecalc" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN - DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Aceptar", IDOK, 42, 60, 29, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "?QuÚ es esto?", IDM_WHATS_THIS + } +} + DLG_STATS DIALOG 12,0,125,78 -CAPTION "Statistics Box" +CAPTION "Cuadro de estadÝsticas" FONT 9, "Tahoma" STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Cargar", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP END

1 0

[mf] 17892: add new winefile icon images in 48x48 and 16x16 resolutions
by mf＠svn.reactos.com 17 Sep '05

17 Sep '05

add new winefile icon images in 48x48 and 16x16 resolutions Modified: trunk/reactos/subsys/system/winefile/winefile.ico _____ Modified: trunk/reactos/subsys/system/winefile/winefile.ico (Binary files differ)

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
59
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005