Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[aandrejevic] 72508: [NTVDM:EMS] Implement EMS function 4E/03: "Get Size of Page-Mapping Array".

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Aug 30 02:13:40 2016 New Revision: 72508 URL: http://svn.reactos.org/svn/reactos?rev=72508&view=rev Log: [NTVDM:EMS] Implement EMS function 4E/03: "Get Size of Page-Mapping Array". Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Tue Aug 30 02:13:40 2016 @@ -394,6 +394,39 @@ break; } + /* Get or Set Page Map */ + case 0x4E: + { + switch (getAL()) + { + /* Get Mapping Registers */ + // case 0x00: // TODO: NOT IMPLEMENTED + + /* Set Mapping Registers */ + // case 0x01: // TODO: NOT IMPLEMENTED + + /* Get and Set Mapping Registers At Once */ + // case 0x02: // TODO: NOT IMPLEMENTED + + /* Get Size of Page-Mapping Array */ + case 0x03: + { + setAH(EMS_STATUS_SUCCESS); + setAL(sizeof(Mapping)); + break; + } + + default: + { + DPRINT1("EMS function AH = 0x4E, subfunction AL = %02X NOT IMPLEMENTED\n", getAL()); + setAH(EMS_STATUS_UNKNOWN_FUNCTION); + break; + } + } + + break; + } + /* Get/Set Handle Name */ case 0x53: {

8 years, 1 month

[dchapyshev] 72507: [NTOS:EX] - Remove duplicate check

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Mon Aug 29 21:11:01 2016 New Revision: 72507 URL: http://svn.reactos.org/svn/reactos?rev=72507&view=rev Log: [NTOS:EX] - Remove duplicate check Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Mon Aug 29 21:11:01 2016 @@ -1246,8 +1246,7 @@ while ((HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle))) { /* Validate the entry */ - if ((HandleTableEntry) && - (HandleTableEntry->Object) && + if ((HandleTableEntry->Object) && (HandleTableEntry->NextFreeTableEntry != -2)) { /* Lock the entry */

8 years, 1 month

[dchapyshev] 72506: [NTOS:EX] - Blocking of the user buffer before obtaining information - Use of ObpGetHandleObject macro for receiving ObjectHeader - Remove duplicate NULL pointer check for Handl...

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Mon Aug 29 20:41:23 2016 New Revision: 72506 URL: http://svn.reactos.org/svn/reactos?rev=72506&view=rev Log: [NTOS:EX] - Blocking of the user buffer before obtaining information - Use of ObpGetHandleObject macro for receiving ObjectHeader - Remove duplicate NULL pointer check for HandleTableEntry Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Aug 29 20:41:23 2016 @@ -1167,24 +1167,26 @@ /* Class 16 - Handle Information */ QSI_DEF(SystemHandleInformation) { + PSYSTEM_HANDLE_INFORMATION HandleInformation; + KPROCESSOR_MODE PreviousMode; PEPROCESS Process; PEPROCESS SystemProcess; ULONG CurrentSize; ULONG NumberOfHandles = 0; ULONG Index; - - PSYSTEM_HANDLE_INFORMATION HandleInformation = - (PSYSTEM_HANDLE_INFORMATION) Buffer; + NTSTATUS Status; + PMDL Mdl; DPRINT("NtQuerySystemInformation - SystemHandleInformation\n"); + /* Check user's buffer size */ if (Size < sizeof(SYSTEM_HANDLE_INFORMATION)) { *ReqSize = sizeof(SYSTEM_HANDLE_INFORMATION); return STATUS_INFO_LENGTH_MISMATCH; } - /* First Calc Size from Count. */ + /* Retrieve needed buffer size to hold the list of handles */ SystemProcess = PsGetNextProcess(NULL); Process = SystemProcess; @@ -1195,19 +1197,37 @@ } while ((Process != SystemProcess) && (Process != NULL)); + /* Dereference the process which was referenced by PsGetNextProcess */ if (Process != NULL) ObDereferenceObject(Process); + /* Calculate the current size of all handles */ CurrentSize = sizeof(SYSTEM_HANDLE_INFORMATION) + ((sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) * NumberOfHandles) - (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO))); + *ReqSize = CurrentSize; + + /* Check user's buffer size */ + if (CurrentSize > Size) return STATUS_INFO_LENGTH_MISMATCH; + + /* We need to lock down the memory */ + PreviousMode = ExGetPreviousMode(); + Status = ExLockUserBuffer(Buffer, + Size, + PreviousMode, + IoWriteAccess, + (PVOID*)&HandleInformation, + &Mdl); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to lock the user buffer: 0x%lx\n", Status); + return Status; + } + + /* Initialization of count of handles */ HandleInformation->NumberOfHandles = NumberOfHandles; - *ReqSize = CurrentSize; - - if (CurrentSize > Size) return STATUS_INFO_LENGTH_MISMATCH; - - /* Now get Handles from all processes. */ + /* Now get handles from all processes. */ SystemProcess = PsGetNextProcess(NULL); Process = SystemProcess; @@ -1226,16 +1246,13 @@ while ((HandleTableEntry = ExpLookupHandleTableEntry(Process->ObjectTable, Handle))) { /* Validate the entry */ - if ((HandleTableEntry) && - (HandleTableEntry->Object) && + if ((HandleTableEntry->Object) && (HandleTableEntry->NextFreeTableEntry != -2)) { /* Lock the entry */ if (ExpLockHandleTableEntry(Process->ObjectTable, HandleTableEntry)) { - POBJECT_HEADER ObjectHeader; - - ObjectHeader = (POBJECT_HEADER)(((ULONG_PTR) HandleTableEntry->Object) & ~OBJ_HANDLE_ATTRIBUTES); + POBJECT_HEADER ObjectHeader = ObpGetHandleObject(HandleTableEntry); /* Filling handle information */ HandleInformation->Handles[Index].UniqueProcessId = (USHORT)(ULONG_PTR) Process->UniqueProcessId; @@ -1257,25 +1274,21 @@ Handle.Value += sizeof(HANDLE); } - /* Leave the critical region and return callback result */ + /* Leave the critical region */ KeLeaveCriticalRegion(); Process = PsGetNextProcess(Process); } while ((Process != SystemProcess) && (Process != NULL)); + /* Dereference the process which was referenced by PsGetNextProcess */ if (Process != NULL) ObDereferenceObject(Process); - return STATUS_SUCCESS; - -} -/* -SSI_DEF(SystemHandleInformation) -{ - - return STATUS_SUCCESS; -} -*/ + /* Release the locked user buffer */ + ExUnlockUserBuffer(Mdl); + + return STATUS_SUCCESS; +} /* Class 17 - Information */ QSI_DEF(SystemObjectInformation)

8 years, 1 month

[hbelusca] 72505: [CRT]: Fix typo. Thanks DopefishJustin:)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Aug 29 16:44:21 2016 New Revision: 72505 URL: http://svn.reactos.org/svn/reactos?rev=72505&view=rev Log: [CRT]: Fix typo. Thanks DopefishJustin:) Modified: trunk/reactos/sdk/lib/crt/stdlib/abort.c Modified: trunk/reactos/sdk/lib/crt/stdlib/abort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdlib/abort.c… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdlib/abort.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdlib/abort.c [iso-8859-1] Mon Aug 29 16:44:21 2016 @@ -13,7 +13,7 @@ static const char abort_msg[] = "This application has requested the Runtime to terminate in an unusual way.\n" - "Please contact the applications's support team for more information.\0"; + "Please contact the application's support team for more information.\0"; /*! * \brief Aborts the program.

8 years, 1 month

[hbelusca] 72504: [DOSKEY] Our kernel32.lib already exports all of the console API and in particular the console history API, so we can directly link doskey against it and use them, instead of dela...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Aug 29 15:39:19 2016 New Revision: 72504 URL: http://svn.reactos.org/svn/reactos?rev=72504&view=rev Log: [DOSKEY] Our kernel32.lib already exports all of the console API and in particular the console history API, so we can directly link doskey against it and use them, instead of delay-loading at runtime. We just need to add their prototypes in the source code since they are not declared by wincon.h by default. Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Mon Aug 29 15:39:19 2016 @@ -1,12 +1,31 @@ -#include <stdarg.h> +#include <stdio.h> +#include <wchar.h> +#include <locale.h> + #include <windef.h> #include <winbase.h> #include <winuser.h> #include <wincon.h> -#include <stdio.h> -#include <wchar.h> -#include <assert.h> -#include <locale.h> + +/* Console API functions which are absent from wincon.h */ +VOID +WINAPI +ExpungeConsoleCommandHistoryW(LPCWSTR lpExeName); + +DWORD +WINAPI +GetConsoleCommandHistoryW(LPWSTR lpHistory, + DWORD cbHistory, + LPCWSTR lpExeName); + +DWORD +WINAPI +GetConsoleCommandHistoryLengthW(LPCWSTR lpExeName); + +BOOL +WINAPI +SetConsoleNumberOfCommandsW(DWORD dwNumCommands, + LPCWSTR lpExeName); #include "doskey.h" @@ -14,19 +33,12 @@ WCHAR szStringBuf[MAX_STRING]; LPWSTR pszExeName = L"cmd.exe"; -/* Function pointers */ -typedef DWORD (WINAPI *GetConsoleCommandHistoryW_t) (LPWSTR sCommands, DWORD nBufferLength, LPWSTR sExeName); -typedef DWORD (WINAPI *GetConsoleCommandHistoryLengthW_t) (LPWSTR sExeName); -typedef BOOL (WINAPI *SetConsoleNumberOfCommandsW_t)(DWORD nNumber, LPWSTR sExeName); -typedef VOID (WINAPI *ExpungeConsoleCommandHistoryW_t)(LPWSTR sExeName); - -GetConsoleCommandHistoryW_t pGetConsoleCommandHistoryW; -GetConsoleCommandHistoryLengthW_t pGetConsoleCommandHistoryLengthW; -SetConsoleNumberOfCommandsW_t pSetConsoleNumberOfCommandsW; -ExpungeConsoleCommandHistoryW_t pExpungeConsoleCommandHistoryW; - static VOID SetInsert(DWORD dwFlag) { + /* + * NOTE: Enabling the ENABLE_INSERT_MODE mode can also be done by calling + * kernel32:SetConsoleCommandHistoryMode(CONSOLE_OVERSTRIKE) . + */ DWORD dwMode; HANDLE hConsole = GetStdHandle(STD_INPUT_HANDLE); GetConsoleMode(hConsole, &dwMode); @@ -36,7 +48,7 @@ static VOID PrintHistory(VOID) { - DWORD Length = pGetConsoleCommandHistoryLengthW(pszExeName); + DWORD Length = GetConsoleCommandHistoryLengthW(pszExeName); PBYTE HistBuf; WCHAR *Hist; WCHAR *HistEnd; @@ -48,9 +60,13 @@ Hist = (WCHAR *)HistBuf; HistEnd = (WCHAR *)&HistBuf[Length]; - if (pGetConsoleCommandHistoryW(Hist, Length, pszExeName)) + if (GetConsoleCommandHistoryW(Hist, Length, pszExeName)) + { for (; Hist < HistEnd; Hist += wcslen(Hist) + 1) + { wprintf(L"%s\n", Hist); + } + } HeapFree(GetProcessHeap(), 0, HistBuf); } @@ -102,8 +118,12 @@ AliasEnd = (WCHAR *)&AliasBuf[Length]; if (GetConsoleAliasesW(Alias, Length * sizeof(BYTE), pszExeName)) + { for (; Alias < AliasEnd; Alias += wcslen(Alias) + 1) + { wprintf(L"%s%s\n", Indent, Alias); + } + } HeapFree(GetProcessHeap(), 0, AliasBuf); } @@ -198,23 +218,12 @@ { WCHAR *pArgStart; WCHAR *pArgEnd; - HMODULE hKernel32; setlocale(LC_ALL, ""); /* Get the full command line using GetCommandLine(). We can't just use argv, * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ pArgEnd = GetCommandLineW(); - hKernel32 = LoadLibraryW(L"kernel32.dll"); - - /* Get function pointers */ - pGetConsoleCommandHistoryW = (GetConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryW"); - pGetConsoleCommandHistoryLengthW = (GetConsoleCommandHistoryLengthW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryLengthW"); - pSetConsoleNumberOfCommandsW = (SetConsoleNumberOfCommandsW_t)GetProcAddress( hKernel32, "SetConsoleNumberOfCommandsW"); - pExpungeConsoleCommandHistoryW = (ExpungeConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "ExpungeConsoleCommandHistoryW"); - - assert(pGetConsoleCommandHistoryW && pGetConsoleCommandHistoryLengthW && - pSetConsoleNumberOfCommandsW && pExpungeConsoleCommandHistoryW); /* Skip the application name */ GetArg(&pArgStart, &pArgEnd); @@ -242,11 +251,11 @@ } else if (!_wcsnicmp(pArgStart, L"/LISTSIZE=", 10)) { - pSetConsoleNumberOfCommandsW(_wtoi(pArgStart + 10), pszExeName); + SetConsoleNumberOfCommandsW(_wtoi(pArgStart + 10), pszExeName); } else if (!wcsicmp(pArgStart, L"/REINSTALL")) { - pExpungeConsoleCommandHistoryW(pszExeName); + ExpungeConsoleCommandHistoryW(pszExeName); } else if (!wcsicmp(pArgStart, L"/INSERT")) {

8 years, 1 month

[mjansen] 72503: [APPHELP][APPHELP_APITEST] Partially implement SdbMakeIndexKeyFromString

by mjansen＠svn.reactos.org

Author: mjansen Date: Mon Aug 29 15:19:55 2016 New Revision: 72503 URL: http://svn.reactos.org/svn/reactos?rev=72503&view=rev Log: [APPHELP][APPHELP_APITEST] Partially implement SdbMakeIndexKeyFromString Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/rostests/apitests/apphelp/CMakeLists.txt trunk/rostests/apitests/apphelp/db.c Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Mon Aug 29 15:19:55 2016 @@ -94,7 +94,7 @@ @ stub SdbIsTagrefFromLocalDB @ stub SdbIsTagrefFromMainDB @ stub SdbLoadString -@ stub SdbMakeIndexKeyFromString +@ stdcall SdbMakeIndexKeyFromString(wstr) @ stub SdbOpenApphelpDetailsDatabase @ stub SdbOpenApphelpDetailsDatabaseSP @ stub SdbOpenApphelpInformation Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Mon Aug 29 15:19:55 2016 @@ -614,6 +614,47 @@ return TRUE; } + + +/** + * Converts the specified string to an index key. + * + * @param [in] str The string which will be converted. + * + * @return The resulting index key + * + * @todo: Fix this for unicode strings. + */ +LONGLONG WINAPI SdbMakeIndexKeyFromString(LPCWSTR str) +{ + LONGLONG result = 0; + int shift = 56; + + while (*str && shift >= 0) + { + WCHAR c = toupper(*(str++)); + + if (c & 0xff) + { + result |= (((LONGLONG)(c & 0xff)) << shift); + shift -= 8; + } + + if (shift < 0) + break; + + c >>= 8; + + if (c & 0xff) + { + result |= (((LONGLONG)(c & 0xff)) << shift); + shift -= 8; + } + } + + return result; +} + /** * Converts specified tag into a string. Modified: trunk/rostests/apitests/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/CMakeLis… ============================================================================== --- trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] Mon Aug 29 15:19:55 2016 @@ -1,5 +1,5 @@ project(appcompat) -add_definitions(-D__ROS_LONG64__) +add_definitions(-D__ROS_LONG64__ -DWINETEST_USE_DBGSTR_LONGLONG) list(APPEND SOURCE apphelp.c Modified: trunk/rostests/apitests/apphelp/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.c?rev… ============================================================================== --- trunk/rostests/apitests/apphelp/db.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/db.c [iso-8859-1] Mon Aug 29 15:19:55 2016 @@ -166,6 +166,8 @@ static TAGID (WINAPI *pSdbGetNextChild)(PDB, TAGID, TAGID); static BOOL (WINAPI *pSdbGetDatabaseID)(PDB, GUID*); static BOOL (WINAPI *pSdbGUIDToString)(CONST GUID *, PCWSTR, SIZE_T); +static LONGLONG(WINAPI* pSdbMakeIndexKeyFromString)(LPCWSTR); + DEFINE_GUID(GUID_DATABASE_TEST,0xe39b0eb0,0x55db,0x450b,0x9b,0xd4,0xd2,0x0c,0x94,0x84,0x26,0x0f); @@ -966,6 +968,90 @@ DeleteFileA("test_db.sdb"); } + +static void expect_indexA_imp(const char* text, LONGLONG expected) +{ + static WCHAR wide_string[100] = { 0 }; + LONGLONG result; + MultiByteToWideChar(CP_ACP, 0, text, -1, wide_string, 100); + + result = pSdbMakeIndexKeyFromString(wide_string); + winetest_ok(result == expected, "Expected %s to result in %s, was: %s\n", text, wine_dbgstr_longlong(expected), wine_dbgstr_longlong(result)); +} + +#define expect_indexA (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : expect_indexA_imp + +static void test_IndexKeyFromString(void) +{ + static WCHAR tmp [] = { 0xabba, 0xbcde, 0x2020, 0x20, 0x4444, 0}; + static WCHAR tmp2 [] = { 0xabba, 0xbcde, 0x20, 0x4444, 0}; + static WCHAR tmp3 [] = { 0x20, 0xbcde, 0x4041, 0x4444, 0}; + static WCHAR tmp4 [] = { 0x20, 0xbcde, 0x4041, 0x4444, 0x4444, 0}; + static WCHAR tmp5 [] = { 0x2020, 0xbcde, 0x4041, 0x4444, 0x4444, 0}; + static WCHAR tmp6 [] = { 0x20, 0xbcde, 0x4041, 0x4444, 0x4444, 0x4444, 0}; + static WCHAR tmp7 [] = { 0xbcde, 0x4041, 0x4444, 0x4444, 0x4444, 0x4444, 0x4444, 0x4444, 0x4444, 0}; + static WCHAR tmp8 [] = { 0xbc00, 0x4041, 0x4444, 0x4444, 0x4444, 0x4444, 0x4444, 0x4444, 0x4444, 0}; + LONGLONG result; + +#if 0 + /* This crashes. */ + pSdbMakeIndexKeyFromString(NULL); +#endif + + expect_indexA("", 0x0000000000000000); + expect_indexA("a", 0x4100000000000000); + expect_indexA("aa", 0x4141000000000000); + expect_indexA("aaa", 0x4141410000000000); + expect_indexA("aaaa", 0x4141414100000000); + expect_indexA("aaaaa", 0x4141414141000000); + expect_indexA("aaaaaa", 0x4141414141410000); + expect_indexA("aaaaaaa", 0x4141414141414100); + expect_indexA("aaaaaaaa", 0x4141414141414141); + expect_indexA("aaa aaaaa", 0x4141412041414141); + /* Does not change */ + expect_indexA("aaaaaaaaa", 0x4141414141414141); + expect_indexA("aaaaaaaab", 0x4141414141414141); + expect_indexA("aaaaaaaac", 0x4141414141414141); + expect_indexA("aaaaaaaaF", 0x4141414141414141); + /* Upcase */ + expect_indexA("AAAAAAAA", 0x4141414141414141); + expect_indexA("ABABABAB", 0x4142414241424142); + expect_indexA("ABABABABZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ", 0x4142414241424142); + + result = pSdbMakeIndexKeyFromString(tmp); + ok(result == 0xbaabdebc20200000, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp), + wine_dbgstr_longlong(0xbaabdebc20200000), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp2); + ok(result == 0xbaabdebc00000000, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp2), + wine_dbgstr_longlong(0xbaabdebc00000000), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp3); + ok(result == 0x20debc4140000000, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp3), + wine_dbgstr_longlong(0x20debc4140000000), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp4); + ok(result == 0x20debc4140000000, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp4), + wine_dbgstr_longlong(0x20debc4140000000), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp5); + ok(result == 0x2020debc41400000, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp5), + wine_dbgstr_longlong(0x2020debc41400000), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp6); + ok(result == 0x20debc4140444400, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp6), + wine_dbgstr_longlong(0x20debc4140444400), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp7); + ok(result == 0xdebc414044444444, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp7), + wine_dbgstr_longlong(0xdebc414044444444), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp8); + ok(result == 0xbc414044444444, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp8), + wine_dbgstr_longlong(0xbc414044444444), wine_dbgstr_longlong(result)); +} + + START_TEST(db) { //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4"); @@ -1001,9 +1087,11 @@ pSdbGetNextChild = (void *) GetProcAddress(hdll, "SdbGetNextChild"); pSdbGetDatabaseID = (void *) GetProcAddress(hdll, "SdbGetDatabaseID"); pSdbGUIDToString = (void *) GetProcAddress(hdll, "SdbGUIDToString"); + pSdbMakeIndexKeyFromString = (void*) GetProcAddress(hdll, "SdbMakeIndexKeyFromString"); test_Sdb(); test_write_ex(); test_stringtable(); test_CheckDatabaseManually(); -} + test_IndexKeyFromString(); +}

8 years, 1 month

[mjansen] 72502: [INCLUDE/WINE] Update test.h with a debug function for longlong. Disabled by default because it introduces a new dependency on ntdll (_aullshr)

by mjansen＠svn.reactos.org

Author: mjansen Date: Mon Aug 29 15:16:50 2016 New Revision: 72502 URL: http://svn.reactos.org/svn/reactos?rev=72502&view=rev Log: [INCLUDE/WINE] Update test.h with a debug function for longlong. Disabled by default because it introduces a new dependency on ntdll (_aullshr) Modified: trunk/reactos/sdk/include/reactos/wine/test.h Modified: trunk/reactos/sdk/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/wine/t… ============================================================================== --- trunk/reactos/sdk/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/wine/test.h [iso-8859-1] Mon Aug 29 15:16:50 2016 @@ -73,6 +73,9 @@ extern const char *wine_dbgstr_point( const POINT *guid ); extern const char *wine_dbgstr_size( const SIZE *guid ); extern const char *wine_dbgstr_rect( const RECT *rect ); +#ifdef WINETEST_USE_DBGSTR_LONGLONG +extern const char *wine_dbgstr_longlong( ULONGLONG ll ); +#endif static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } /* strcmpW is available for tests compiled under Wine, but not in standalone @@ -622,6 +625,21 @@ return res; } +#ifdef WINETEST_USE_DBGSTR_LONGLONG +const char *wine_dbgstr_longlong( ULONGLONG ll ) +{ + char *res; + + res = get_temp_buffer( 20 ); + if (/*sizeof(ll) > sizeof(unsigned long) &&*/ ll >> 32) /* ULONGLONG is always > long in ReactOS */ + sprintf( res, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll ); + else + sprintf( res, "%lx", (unsigned long)ll ); + release_temp_buffer( res, strlen(res) + 1 ); + return res; +} +#endif + /* Find a test by name */ static const struct test *find_test( const char *name ) {

8 years, 1 month

[hbelusca] 72501: [SHELL32]: We are not Windows! (and not completely Wine either).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Aug 29 14:30:51 2016 New Revision: 72501 URL: http://svn.reactos.org/svn/reactos?rev=72501&view=rev Log: [SHELL32]: We are not Windows! (and not completely Wine either). Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -407,7 +407,7 @@ GROUPBOX "ÐÐ°Ð´Ð°ÑÐ¸", -1, 7, 10, 249, 45 CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20 AUTORADIOBUTTON "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾Ð±ÑÐ¸ÑÐµ Ð·Ð°Ð´Ð°ÑÐ¸ Ð² Ð¿Ð°Ð¿ÐºÐ¸ÑÐµ", IDC_FOLDER_OPTIONS_COMMONTASKS, 20, 25, 210, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "ÐÐ·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾Ð±Ð¸ÑÐ°Ð¹Ð½Ð¸ÑÐµ Ð¿Ð°Ð¿ÐºÐ¸ Ð½Ð° Windows", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 20, 37, 210, 10 + AUTORADIOBUTTON "ÐÐ·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾Ð±Ð¸ÑÐ°Ð¹Ð½Ð¸ÑÐµ Ð¿Ð°Ð¿ÐºÐ¸ Ð½Ð° ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 20, 37, 210, 10 GROUPBOX "ÐÐ±Ð·Ð¾Ñ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ¸ÑÐµ", -1, 7, 60, 249, 45, WS_TABSTOP CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20 AUTORADIOBUTTON "ÐÑÐ²Ð°ÑÑÐ½Ðµ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ Ð¿Ð°Ð¿ÐºÐ¸ Ð² &ÐµÐ´Ð¸Ð½ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ", IDC_FOLDER_OPTIONS_SAMEWINDOW, 20, 70, 210, 10, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -816,7 +816,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -706,9 +706,9 @@ /* message box strings */ IDS_RESTART_TITLE "KÃ¤ynnistÃ¤ uudestaan" - IDS_RESTART_PROMPT "Haluatko simuloida Windows:n uudelleenkÃ¤ynnistÃ¤mistÃ¤?" + IDS_RESTART_PROMPT "Haluatko simuloida ReactOS:n uudelleenkÃ¤ynnistÃ¤mistÃ¤?" IDS_SHUTDOWN_TITLE "Sammuta" - IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine:n istunnon?" + IDS_SHUTDOWN_PROMPT "Haluatko lopettaa ReactOS:n istunnon?" /* Run File dialog */ IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Taille d'allocation par dÃ©faut" IDS_COPY_OF "Copie de" - IDS_SHLEXEC_NOASSOC "Aucun programme Windows n'est configurÃ© pour ouvrir ce type de fichier." + IDS_SHLEXEC_NOASSOC "Aucun programme ReactOS n'est configurÃ© pour ouvrir ce type de fichier." IDS_FILE_DETAILS "DÃ©tails concernant l'extension '%s'" IDS_FILE_DETAILSADV "Les fichiers avec l'extension '%s' sont de type '%s'. Pour modifier les paramÃ¨tres qui concernent tous les fichiers '%s', cliquez sur AvancÃ©." Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." 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] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "ããã©ã«ã ã¢ãã±ã¼ã·ã§ã³ ãµã¤ãº" IDS_COPY_OF "ã³ãã¼ ï½" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "æ¡å¼µå '%s' ã®è©³ç´°" IDS_FILE_DETAILSADV "æ¡å¼µå '%s' ã®ãã¡ã¤ã«ã®ç¨®é¡ã¯'%s'ã§ãã '%s' ã®ãã¡ã¤ã«ãã¹ã¦ã«å¯¾ããè¨å®ãå¤æ´ããã«ã¯ è©³ç´°è¨å®ãã¯ãªãã¯ãã¦ãã ããã" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -157,7 +157,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. Wine zal het vervolgens openen.", 12289, 36, 11, 182, 18 + LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. ReactOS zal het vervolgens openen.", 12289, 36, 11, 182, 18 LTEXT "&Openen:", 12305, 7, 39, 28, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "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 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "Er is geen Windows-programma geconfigureerd om dit soort bestanden te openen." + IDS_SHLEXEC_NOASSOC "Er is geen ReactOS-programma geconfigureerd om dit soort bestanden te openen." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Standard tildelingsstÃ¸rrelse" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "Intet Windows-program er satt opp til Ã¥ Ã¥pne denne filtypen." + IDS_SHLEXEC_NOASSOC "Intet ReactOS-program er satt opp til Ã¥ Ã¥pne denne filtypen." IDS_FILE_DETAILS "Detailjer for '%s' utvidelser" IDS_FILE_DETAILSADV "Filer med utvidelser '%s' er av typen '%s'. For Ã¥ endre innstillingene som er av filen '%s', trykk pÃ¥ avansert." Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -706,7 +706,7 @@ /* message box strings */ IDS_RESTART_TITLE "Reiniciar" - IDS_RESTART_PROMPT "VocÃª quer simular a reinicializaÃ§Ã£o do Windows?" + IDS_RESTART_PROMPT "VocÃª quer simular a reinicializaÃ§Ã£o do ReactOS?" IDS_SHUTDOWN_TITLE "Desligar" IDS_SHUTDOWN_PROMPT "VocÃª quer finalizar a sessÃ£o?" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -706,7 +706,7 @@ /* message box strings */ IDS_RESTART_TITLE "Reiniciar" - IDS_RESTART_PROMPT "Deseja simular a reinicializaÃ§Ã£o do Windows?" + IDS_RESTART_PROMPT "Deseja simular a reinicializaÃ§Ã£o do ReactOS?" IDS_SHUTDOWN_TITLE "Desligar" IDS_SHUTDOWN_PROMPT "Deseja finalizar esta sessÃ£o do ReactOS?" @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Tamanho da unidade de atribuiÃ§Ã£o" IDS_COPY_OF "CÃ³pia de" - IDS_SHLEXEC_NOASSOC "NÃ£o existe um programa Windows configurado para abrir este tipo de ficheiro." + IDS_SHLEXEC_NOASSOC "NÃ£o existe um programa ReactOS configurado para abrir este tipo de ficheiro." IDS_FILE_DETAILS "Detalhes para '%s' extensÃ£o" IDS_FILE_DETAILSADV "Ficheiros com extensÃ£o '%s' sÃ£o do tipo '%s'. Para mudar definiÃ§Ãµes que afectam todos '%s' ficheiros, click AvanÃ§ado." Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -157,7 +157,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in Wine ga (jo) bo odprl.", 12289, 36, 11, 182, 18 + LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in ReactOS ga (jo) bo odprl.", 12289, 36, 11, 182, 18 LTEXT "&Odpri:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "V redu", IDOK, 62, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -814,7 +814,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Masa parazgjedhur shpÃ«rndarjes" IDS_COPY_OF "Kopjo" - IDS_SHLEXEC_NOASSOC "Nuk ka asnjÃ« program tÃ« Windows tÃ« konfiguruar pÃ«r tÃ« hapur kÃ«tÃ« lloj file." + IDS_SHLEXEC_NOASSOC "Nuk ka asnjÃ« program tÃ« ReactOS tÃ« konfiguruar pÃ«r tÃ« hapur kÃ«tÃ« lloj file." IDS_FILE_DETAILS "Detaje pÃ«r '%s' prapashtesÃ«" IDS_FILE_DETAILSADV "Dokumente me prapashtesÃ« '%s' janÃ« tÃ« tipit '%s'. PÃ«r tÃ« ndryshuar cilÃ«simet qÃ« ndikojnÃ« tÃ« gjithÃ« '%s' dokumentet, kliko Avancuar." Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -157,7 +157,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv namnet pÃ¥ ett program, en mapp eller ett dokument och wine kommer att Ã¶ppna det fÃ¶r dig.", 12289, 36, 11, 182, 18 + LTEXT "Skriv namnet pÃ¥ ett program, en mapp eller ett dokument och ReactOS kommer att Ã¶ppna det fÃ¶r dig.", 12289, 36, 11, 182, 18 LTEXT "&Ãppna:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "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 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -810,7 +810,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Ð Ð¾Ð·Ð¼ÑÑ ÐºÐ»Ð°ÑÑÐµÑÐ° Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼" IDS_COPY_OF "ÐÐ¾Ð¿ÑÑ" - IDS_SHLEXEC_NOASSOC "ÐÐµÐ¼Ð°Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸ Windows, ÑÐºÐ¾Ð½ÑÑÐ³ÑÑÐ¾Ð²Ð°Ð½Ð¾Ñ Ð´Ð»Ñ Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ ÑÑÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ñ ÑÐ°Ð¹Ð»ÑÐ²." + IDS_SHLEXEC_NOASSOC "ÐÐµÐ¼Ð°Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸ ReactOS, ÑÐºÐ¾Ð½ÑÑÐ³ÑÑÐ¾Ð²Ð°Ð½Ð¾Ñ Ð´Ð»Ñ Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ ÑÑÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ñ ÑÐ°Ð¹Ð»ÑÐ²." IDS_FILE_DETAILS "ÐÐ¾Ð´ÑÐ¾Ð±Ð¸ÑÑ Ð´Ð»Ñ ÑÐ¾Ð·ÑÐ¸ÑÐµÐ½Ð½Ñ '%s'" IDS_FILE_DETAILSADV "Ð¤Ð°Ð¹Ð»Ð¸ Ð· ÑÐ¾Ð·ÑÐ¸ÑÐµÐ½Ð½ÑÐ¼ '%s' Ð¼Ð°ÑÑÑ ÑÐ¸Ð¿ '%s'. Ð©Ð¾Ð± Ð·Ð¼ÑÐ½Ð¸ÑÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸, ÑÐºÑ Ð²Ð¿Ð»Ð¸Ð²Ð°ÑÐ¸Ð¼ÑÑÑ Ð½Ð° Ð²ÑÑ ÑÐ°Ð¹Ð»Ð¸ '%s', Ð½Ð°ÑÐ¸ÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ 'ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ð¾'." Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Mon Aug 29 14:30:51 2016 @@ -818,7 +818,7 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" IDS_COPY_OF "Copy of" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." IDS_FILE_DETAILS "Details for '%s' extension" IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced."

8 years, 1 month

[mjansen] 72500: Fix the build for msvc users.

by mjansen＠svn.reactos.org

Author: mjansen Date: Mon Aug 29 13:15:44 2016 New Revision: 72500 URL: http://svn.reactos.org/svn/reactos?rev=72500&view=rev Log: Fix the build for msvc users. Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/windows/message.c trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Mon Aug 29 13:15:44 2016 @@ -79,6 +79,7 @@ set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE) target_link_libraries(user32 user32_wsprintf wine win32ksys ${PSEH_LIB}) +add_dependencies(user32 asm) if(MSVC) # for __ftol2_sse, float to int cast helper Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Mon Aug 29 13:15:44 2016 @@ -17,8 +17,8 @@ #ifdef __i386__ /* For bad applications which provide bad (non stdcall) WndProc */ extern +LRESULT __cdecl -LRESULT CALL_EXTERN_WNDPROC( WNDPROC WndProc, HWND hWnd, Modified: trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S [iso-8859-1] Mon Aug 29 13:15:44 2016 @@ -15,8 +15,8 @@ .code /* + * LRESULT * __cdecl - * LRESULT * CALL_EXTERN_WNDPROC( * WNDPROC WndProc, * HWND hWnd, @@ -54,3 +54,5 @@ ret ENDFUNC + +END

8 years, 1 month

[mjansen] 72499: [ATL][SHELL32] Add basic support for _ATL_NO_EXCEPTIONS in CString, use it in shell32 so that we can link without exception support. CORE-11841 #comment Please retest!

by mjansen＠svn.reactos.org

Author: mjansen Date: Mon Aug 29 12:29:45 2016 New Revision: 72499 URL: http://svn.reactos.org/svn/reactos?rev=72499&view=rev Log: [ATL][SHELL32] Add basic support for _ATL_NO_EXCEPTIONS in CString, use it in shell32 so that we can link without exception support. CORE-11841 #comment Please retest! Added: trunk/reactos/sdk/lib/atl/atlexcept.h (with props) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/sdk/lib/atl/atlsimpstr.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Mon Aug 29 12:29:45 2016 @@ -4,7 +4,7 @@ add_subdirectory(shellmenu) add_subdirectory(shellrecyclebin) -set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) +set_cpp(WITH_RUNTIME) spec2def(shell32.dll shell32.spec ADD_IMPORTLIB) if(NOT MSVC) @@ -17,7 +17,8 @@ add_definitions( -D_SHELL32_ - -D_WINE) + -D_WINE + -D_ATL_NO_EXCEPTIONS) include_directories( ${REACTOS_SOURCE_DIR}/sdk/lib/atl Added: trunk/reactos/sdk/lib/atl/atlexcept.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlexcept.h?re… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlexcept.h (added) +++ trunk/reactos/sdk/lib/atl/atlexcept.h [iso-8859-1] Mon Aug 29 12:29:45 2016 @@ -0,0 +1,38 @@ + +#ifndef __ATLEXCEPT_H__ +#define __ATLEXCEPT_H__ + + +//FIXME: Enable when RaiseException is marked as NORETURN +//DECLSPEC_NORETURN +inline void AtlThrowImp(HRESULT hr) +{ +#ifdef ATLTRACE + ATLTRACE(hr); +#endif + +#ifdef _ATL_NO_EXCEPTIONS + + ATLASSERT(false); + + RaiseException( + hr == E_OUTOFMEMORY ? STATUS_NO_MEMORY : EXCEPTION_ILLEGAL_INSTRUCTION, + EXCEPTION_NONCONTINUABLE, 0, NULL + ); + +#else + + // FIXME: This is horribly wrong, we should implement CException! + throw; + +#endif + +} + + + +#ifndef AtlThrow +#define AtlThrow(x) AtlThrowImp(x) +#endif + +#endif Propchange: trunk/reactos/sdk/lib/atl/atlexcept.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/sdk/lib/atl/atlsimpstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlsimpstr.h?r… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlsimpstr.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atlsimpstr.h [iso-8859-1] Mon Aug 29 12:29:45 2016 @@ -4,7 +4,7 @@ #pragma once #include <atlcore.h> - +#include <atlexcept.h> namespace ATL { @@ -485,7 +485,7 @@ CStringData* pNewData = pOldData->pStringMgr->Clone()->Allocate(nLength, sizeof(XCHAR)); if (pNewData == NULL) { - throw; // ThrowMemoryException(); + ThrowMemoryException(); } int nCharsToCopy = ((nOldLength < nLength) ? nOldLength : nLength) + 1; CopyChars(PXSTR(pNewData->data()), nCharsToCopy, @@ -550,7 +550,7 @@ CStringData* pNewData = pStringMgr->Reallocate(pOldData, nLength, sizeof(XCHAR)); if (pNewData == NULL) { - throw; // ThrowMemoryException(); + ThrowMemoryException(); } Attach(pNewData); @@ -562,7 +562,9 @@ ATLASSERT(nLength <= GetData()->nAllocLength); if (nLength < 0 || nLength > GetData()->nAllocLength) - throw; + { + AtlThrow(E_INVALIDARG); + } GetData()->nDataLength = nLength; m_pszData[nLength] = 0; @@ -583,7 +585,7 @@ pNewData = pNewStringMgr->Allocate(pData->nDataLength, sizeof(XCHAR)); if (pNewData == NULL) { - throw; // ThrowMemoryException(); + ThrowMemoryException(); } pNewData->nDataLength = pData->nDataLength; @@ -594,6 +596,12 @@ return pNewData; } + + static void ThrowMemoryException() + { + AtlThrow(E_OUTOFMEMORY); + } + }; }

8 years, 1 month

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 August 2016