Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57536: [CRT] Use a temporary buffer to parse the program's arguments, instead of using (and thus overwriting) the _a/wcmdln variable. Fix msvcrt_apitest:CommandLine test. CORE-6717 #comm...
by hbelusca＠svn.reactos.org 11 Oct '12

11 Oct '12

Author: hbelusca Date: Thu Oct 11 00:30:57 2012 New Revision: 57536 URL: http://svn.reactos.org/svn/reactos?rev=57536&view=rev Log: [CRT] Use a temporary buffer to parse the program's arguments, instead of using (and thus overwriting) the _a/wcmdln variable. Fix msvcrt_apitest:CommandLine test. CORE-6717 #comment Fixed in revision r57536. #resolve Modified: trunk/reactos/lib/sdk/crt/misc/getargs.c Modified: trunk/reactos/lib/sdk/crt/misc/getargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/getargs.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] Thu Oct 11 00:30:57 2012 @@ -183,6 +183,7 @@ { int i, afterlastspace, ignorespace, doexpand; size_t len; + char* aNewCmdln; /* missing threading init */ @@ -203,10 +204,12 @@ len = strlen(_acmdln); - - while (_acmdln[i]) - { - if (_acmdln[i] == '"') + /* Allocate a temporary buffer to be used instead of the original _acmdln parameter. */ + aNewCmdln = strndup(_acmdln, len); + + while (aNewCmdln[i]) + { + if (aNewCmdln[i] == '"') { if(ignorespace) { @@ -217,16 +220,16 @@ ignorespace = 1; doexpand = 0; } - memmove(_acmdln + i, _acmdln + i + 1, len - i); + memmove(aNewCmdln + i, aNewCmdln + i + 1, len - i); len--; continue; } - if (_acmdln[i] == ' ' && !ignorespace) - { - aexpand(strndup(_acmdln + afterlastspace, i - afterlastspace), doexpand); + if (aNewCmdln[i] == ' ' && !ignorespace) + { + aexpand(strndup(aNewCmdln + afterlastspace, i - afterlastspace), doexpand); i++; - while (_acmdln[i]==' ') + while (aNewCmdln[i] == ' ') i++; afterlastspace=i; doexpand = expand_wildcards; @@ -237,10 +240,13 @@ } } - if (_acmdln[afterlastspace] != 0) - { - aexpand(strndup(_acmdln+afterlastspace, i - afterlastspace), doexpand); - } + if (aNewCmdln[afterlastspace] != 0) + { + aexpand(strndup(aNewCmdln + afterlastspace, i - afterlastspace), doexpand); + } + + /* Free the temporary buffer. */ + free(aNewCmdln); HeapValidate(GetProcessHeap(), 0, NULL); @@ -265,6 +271,7 @@ { int i, afterlastspace, ignorespace, doexpand; size_t len; + wchar_t* wNewCmdln; /* missing threading init */ @@ -285,9 +292,12 @@ len = wcslen(_wcmdln); - while (_wcmdln[i]) - { - if (_wcmdln[i] == L'"') + /* Allocate a temporary buffer to be used instead of the original _wcmdln parameter. */ + wNewCmdln = wcsndup(_wcmdln, len); + + while (wNewCmdln[i]) + { + if (wNewCmdln[i] == L'"') { if(ignorespace) { @@ -298,16 +308,16 @@ ignorespace = 1; doexpand = 0; } - memmove(_wcmdln + i, _wcmdln + i + 1, (len - i) * sizeof(wchar_t)); + memmove(wNewCmdln + i, wNewCmdln + i + 1, (len - i) * sizeof(wchar_t)); len--; continue; } - if (_wcmdln[i] == L' ' && !ignorespace) - { - wexpand(wcsndup(_wcmdln + afterlastspace, i - afterlastspace), doexpand); + if (wNewCmdln[i] == L' ' && !ignorespace) + { + wexpand(wcsndup(wNewCmdln + afterlastspace, i - afterlastspace), doexpand); i++; - while (_wcmdln[i]==L' ') + while (wNewCmdln[i] == L' ') i++; afterlastspace=i; doexpand = expand_wildcards; @@ -318,10 +328,13 @@ } } - if (_wcmdln[afterlastspace] != 0) - { - wexpand(wcsndup(_wcmdln+afterlastspace, i - afterlastspace), doexpand); - } + if (wNewCmdln[afterlastspace] != 0) + { + wexpand(wcsndup(wNewCmdln + afterlastspace, i - afterlastspace), doexpand); + } + + /* Free the temporary buffer. */ + free(wNewCmdln); HeapValidate(GetProcessHeap(), 0, NULL);

1 0

[jgardou] 57535: [GDI32] - Assume that the provided buffer size is maximal in GetDIBits [WIN32K] - Probe buffer before writing to it - Fail DIB Section creation if palette creation failed
by jgardou＠svn.reactos.org 10 Oct '12

10 Oct '12

Author: jgardou Date: Wed Oct 10 23:05:38 2012 New Revision: 57535 URL: http://svn.reactos.org/svn/reactos?rev=57535&view=rev Log: [GDI32] - Assume that the provided buffer size is maximal in GetDIBits [WIN32K] - Probe buffer before writing to it - Fail DIB Section creation if palette creation failed Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Wed Oct 10 23:05:38 2012 @@ -13,7 +13,7 @@ * 11/16/1999 (RJJ) lifted from wine */ -INT FASTCALL DIB_BitmapInfoSize(const BITMAPINFO * info, WORD coloruse) +INT FASTCALL DIB_BitmapInfoSize(const BITMAPINFO * info, WORD coloruse, BOOL max) { unsigned int colors, size, masks = 0; @@ -26,7 +26,7 @@ } else /* assume BITMAPINFOHEADER */ { - colors = info->bmiHeader.biClrUsed; + colors = max ? 1 << info->bmiHeader.biBitCount : info->bmiHeader.biClrUsed; if (colors > 256) colors = 256; if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; @@ -409,7 +409,8 @@ } cjBmpScanSize = DIB_BitmapMaxBitsSize(lpbmi, cScanLines); - cjInfoSize = DIB_BitmapInfoSize(lpbmi, uUsage); + /* Caller must provide maximum size possible */ + cjInfoSize = DIB_BitmapInfoSize(lpbmi, uUsage, TRUE); if ( lpvBits ) { Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Wed Oct 10 23:05:38 2012 @@ -1038,7 +1038,7 @@ _SEH2_TRY { /* Probe and copy the BITMAPINFO */ - ProbeForWrite(pbmiUser, cjMaxInfo, 1); + ProbeForRead(pbmiUser, cjMaxInfo, 1); RtlCopyMemory(pbmi, pbmiUser, cjMaxInfo); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1082,7 +1082,8 @@ /* Use SEH to copy back to user mode */ _SEH2_TRY { - /* Buffer is already probed, copy the data back */ + /* Copy the data back */ + ProbeForWrite(pbmiUser, cjMaxInfo, 1); RtlCopyMemory(pbmiUser, pbmi, cjMaxInfo); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1551,7 +1552,7 @@ HBITMAP res = 0; SURFACE *bmp = NULL; void *mapBits = NULL; - PPALETTE ppalDIB; + PPALETTE ppalDIB = NULL; // Fill BITMAP32 structure with DIB data CONST BITMAPINFOHEADER *bi = &bmi->bmiHeader; @@ -1685,15 +1686,10 @@ /* Create a palette for the DIB */ ppalDIB = CreateDIBPalette(bmi, dc, usage); - if (ppalDIB) - { - SURFACE_vSetPalette(bmp, ppalDIB); - PALETTE_ShareUnlockPalette(ppalDIB); - } // Clean up in case of errors cleanup: - if (!res || !bmp || !bm.bmBits) + if (!res || !bmp || !bm.bmBits || !ppalDIB) { DPRINT("Got an error res=%p, bmp=%p, bm.bmBits=%p\n", res, bmp, bm.bmBits); if (bm.bmBits) @@ -1709,17 +1705,28 @@ } if (bmp) + { + SURFACE_ShareUnlockSurface(bmp); bmp = NULL; + } if (res) { GreDeleteObject(res); res = 0; } + + if(ppalDIB) + { + PALETTE_ShareUnlockPalette(ppalDIB); + } } if (bmp) { + /* If we're here, everything went fine */ + SURFACE_vSetPalette(bmp, ppalDIB); + PALETTE_ShareUnlockPalette(ppalDIB); SURFACE_ShareUnlockSurface(bmp); }

1 0

[hbelusca] 57534: [MSVCRT:APITEST] Modify the test for GetModuleFileName, should work better now.
by hbelusca＠svn.reactos.org 10 Oct '12

10 Oct '12

Author: hbelusca Date: Wed Oct 10 21:56:27 2012 New Revision: 57534 URL: http://svn.reactos.org/svn/reactos?rev=57534&view=rev Log: [MSVCRT:APITEST] Modify the test for GetModuleFileName, should work better now. Modified: trunk/rostests/apitests/msvcrt/CommandLine.c Modified: trunk/rostests/apitests/msvcrt/CommandLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLi… ============================================================================== --- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Wed Oct 10 21:56:27 2012 @@ -286,17 +286,16 @@ { ULONG i; - DWORD dwError; + DWORD dwRet; LPWSTR p = NULL; /* * Initialize the UtilityProgramDirectory variable. */ - GetModuleFileNameW(NULL, UtilityProgramDirectory, COUNT_OF(UtilityProgramDirectory)); - dwError = GetLastError(); - ok(dwError == ERROR_SUCCESS, "ERROR: Cannot retrieve the path to the current running process, last error %lu\n", dwError); - if (dwError != ERROR_SUCCESS) return; + dwRet = GetModuleFileNameW(NULL, UtilityProgramDirectory, COUNT_OF(UtilityProgramDirectory)); + ok(dwRet != 0, "ERROR: Cannot retrieve the path to the current running process, last error %lu\n", GetLastError()); + if (dwRet == 0) return; /* Path : executable.exe or "executable.exe" or C:\path\executable.exe or "C:\path\executable.exe" */ p = wcsrchr(UtilityProgramDirectory, L'\\');

1 0

[hbelusca] 57533: [MSVCRT:APITEST] Update a comment. No code changes.
by hbelusca＠svn.reactos.org 10 Oct '12

10 Oct '12

Author: hbelusca Date: Wed Oct 10 21:23:49 2012 New Revision: 57533 URL: http://svn.reactos.org/svn/reactos?rev=57533&view=rev Log: [MSVCRT:APITEST] Update a comment. No code changes. Modified: trunk/rostests/apitests/msvcrt/CommandLine.c Modified: trunk/rostests/apitests/msvcrt/CommandLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLi… ============================================================================== --- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Wed Oct 10 21:23:49 2012 @@ -135,6 +135,7 @@ if (TestCase->bEncloseProgramNameInQuotes && bWasntInQuotes) wcscat(CmdLine, L"\""); + /* Add a separating space and copy the tested command line parameters. */ wcscat(CmdLine, L" "); wcscat(CmdLine, TestCase->CmdLine); @@ -306,7 +307,7 @@ wcscat(UtilityProgramDirectory, L"data\\CmdLineUtil.exe"); - /* Close the opened quote if needed, and add a separating space */ + /* Close the opened quote if needed. */ if (UtilityProgramDirectory[0] == L'"') wcscat(UtilityProgramDirectory, L"\"");

1 0

[hbelusca] 57532: [BOOTDATA] Remove unneeded %SystemRoot%\bin\data value in PATH environment variable.
by hbelusca＠svn.reactos.org 10 Oct '12

10 Oct '12

Author: hbelusca Date: Wed Oct 10 21:20:25 2012 New Revision: 57532 URL: http://svn.reactos.org/svn/reactos?rev=57532&view=rev Log: [BOOTDATA] Remove unneeded %SystemRoot%\bin\data value in PATH environment variable. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Wed Oct 10 21:20:25 2012 @@ -1200,7 +1200,7 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Wed Oct 10 21:20:25 2012 @@ -755,7 +755,7 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Oct 10 21:20:25 2012 @@ -1200,7 +1200,7 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP"

1 0

[hbelusca] 57531: [MSVCRT:APITEST] Update CommandLine test.
by hbelusca＠svn.reactos.org 10 Oct '12

10 Oct '12

Author: hbelusca Date: Wed Oct 10 21:19:45 2012 New Revision: 57531 URL: http://svn.reactos.org/svn/reactos?rev=57531&view=rev Log: [MSVCRT:APITEST] Update CommandLine test. Modified: trunk/rostests/apitests/msvcrt/CommandLine.c Modified: trunk/rostests/apitests/msvcrt/CommandLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLi… ============================================================================== --- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Wed Oct 10 21:19:45 2012 @@ -86,26 +86,29 @@ return; } - +/******************************************************************************/ + +/* The path to the utility program run by this test. */ +static WCHAR UtilityProgramDirectory[MAX_PATH]; + +/* The list of tests. */ typedef struct _TEST_CASE { LPWSTR CmdLine; + BOOL bEncloseProgramNameInQuotes; } TEST_CASE, *PTEST_CASE; static TEST_CASE TestCases[] = { - {L"CmdLineUtil.exe"}, - {L"CmdLineUtil.exe foo bar"}, - {L"CmdLineUtil.exe \"foo bar\""}, - {L"CmdLineUtil.exe foo \"bar John\" Doe"}, - - {L"\"CmdLineUtil.exe\""}, - {L"\"CmdLineUtil.exe\" foo bar"}, - {L"\"CmdLineUtil.exe\" \"foo bar\""}, - {L"\"CmdLineUtil.exe\" foo \"bar John\" Doe"}, - - {L"\"CmdLineUtil.exe\""}, - {L"\"CmdLineUtil.exe \"foo bar\"\""}, + {L"", FALSE}, + {L"foo bar", FALSE}, + {L"\"foo bar\"", FALSE}, + {L"foo \"bar John\" Doe", FALSE}, + + {L"", TRUE}, + {L"foo bar", TRUE}, + {L"\"foo bar\"", TRUE}, + {L"foo \"bar John\" Doe", TRUE}, }; static void Test_CommandLine(IN ULONG TestNumber, @@ -113,7 +116,8 @@ { BOOL bRet; - WCHAR CmdLine[MAX_PATH]; + BOOL bWasntInQuotes = (UtilityProgramDirectory[0] != L'"'); + WCHAR CmdLine[MAX_PATH] = L""; STARTUPINFOW si; PROCESS_INFORMATION pi; @@ -121,7 +125,19 @@ ZeroMemory(&pi, sizeof(pi)); si.cb = sizeof(si); - wcscpy(CmdLine, TestCase->CmdLine); + + /* Initialize the command line. */ + if (TestCase->bEncloseProgramNameInQuotes && bWasntInQuotes) + wcscpy(CmdLine, L"\""); + + wcscat(CmdLine, UtilityProgramDirectory); + + if (TestCase->bEncloseProgramNameInQuotes && bWasntInQuotes) + wcscat(CmdLine, L"\""); + + wcscat(CmdLine, L" "); + wcscat(CmdLine, TestCase->CmdLine); + /* * Launch the utility program and wait till it's terminated. @@ -133,7 +149,7 @@ CREATE_UNICODE_ENVIRONMENT, NULL, NULL, &si, &pi); - ok(bRet, "Test %lu - Failed to launch ' %S ', error = %lu.\n", TestNumber, TestCase->CmdLine, GetLastError()); + ok(bRet, "Test %lu - Failed to launch ' %S ', error = %lu.\n", TestNumber, CmdLine, GetLastError()); if (bRet) { @@ -269,6 +285,34 @@ { ULONG i; + DWORD dwError; + LPWSTR p = NULL; + + + /* + * Initialize the UtilityProgramDirectory variable. + */ + GetModuleFileNameW(NULL, UtilityProgramDirectory, COUNT_OF(UtilityProgramDirectory)); + dwError = GetLastError(); + ok(dwError == ERROR_SUCCESS, "ERROR: Cannot retrieve the path to the current running process, last error %lu\n", dwError); + if (dwError != ERROR_SUCCESS) return; + + /* Path : executable.exe or "executable.exe" or C:\path\executable.exe or "C:\path\executable.exe" */ + p = wcsrchr(UtilityProgramDirectory, L'\\'); + if (p && *p != 0) + *++p = 0; /* Null-terminate there : C:\path\ or "C:\path\ */ + else + UtilityProgramDirectory[0] = 0; /* Suppress the executable.exe name */ + + wcscat(UtilityProgramDirectory, L"data\\CmdLineUtil.exe"); + + /* Close the opened quote if needed, and add a separating space */ + if (UtilityProgramDirectory[0] == L'"') wcscat(UtilityProgramDirectory, L"\""); + + + /* + * Now launch the tests. + */ for (i = 0 ; i < COUNT_OF(TestCases) ; ++i) { Test_CommandLine(i, &TestCases[i]);

1 0

[mnordell] 57530: Hopefully fix a MultiByteToWideChar issue with UTF8.
by mnordell＠svn.reactos.org 10 Oct '12

10 Oct '12

Author: mnordell Date: Wed Oct 10 20:33:45 2012 New Revision: 57530 URL: http://svn.reactos.org/svn/reactos?rev=57530&view=rev Log: Hopefully fix a MultiByteToWideChar issue with UTF8. Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Wed Oct 10 20:33:45 2012 @@ -359,7 +359,7 @@ WCHAR WideChar; LONG Count; - if (Flags != 0) + if (Flags != 0 && Flags != MB_ERR_INVALID_CHARS) { SetLastError(ERROR_INVALID_FLAGS); return 0;

1 0

[mnordell] 57529: Test for MultiByteToWideChar added. Still needs alot fleshing out.
by mnordell＠svn.reactos.org 10 Oct '12

10 Oct '12

Author: mnordell Date: Wed Oct 10 19:10:49 2012 New Revision: 57529 URL: http://svn.reactos.org/svn/reactos?rev=57529&view=rev Log: Test for MultiByteToWideChar added. Still needs alot fleshing out. Added: trunk/rostests/apitests/kernel32/MultiByteToWideChar.c (with props) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Wed Oct 10 19:10:49 2012 @@ -6,6 +6,7 @@ GetDriveType.c GetModuleFileName.c lstrcpynW.c + MultiByteToWideChar.c SetCurrentDirectory.c SetUnhandledExceptionFilter.c testlist.c) Added: trunk/rostests/apitests/kernel32/MultiByteToWideChar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/MultiBy… ============================================================================== --- trunk/rostests/apitests/kernel32/MultiByteToWideChar.c (added) +++ trunk/rostests/apitests/kernel32/MultiByteToWideChar.c [iso-8859-1] Wed Oct 10 19:10:49 2012 @@ -1,0 +1,22 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for MultiByteToWideChar + * PROGRAMMER: Mike "tamlin" Nordell + */ + +#include <windows.h> +#include <stdio.h> +#include <wine/test.h> + + +START_TEST(MultiByteToWideChar) +{ + int ret; + + ret = MultiByteToWideChar(CP_UTF8, 0, "a", sizeof("a"), 0, 0); + ok(ret == 2, "ret should be 2, is %d\n", ret); + + ret = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, "a", sizeof("a"), 0, 0); + ok(ret == 2, "ret should be 2, is %d\n", ret); +} Propchange: trunk/rostests/apitests/kernel32/MultiByteToWideChar.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Wed Oct 10 19:10:49 2012 @@ -9,6 +9,7 @@ extern void func_GetDriveType(void); extern void func_GetModuleFileName(void); extern void func_lstrcpynW(void); +extern void func_MultiByteToWideChar(void); extern void func_SetCurrentDirectory(void); extern void func_SetUnhandledExceptionFilter(void); @@ -18,6 +19,7 @@ { "GetDriveType", func_GetDriveType }, { "GetModuleFileName", func_GetModuleFileName }, { "lstrcpynW", func_lstrcpynW }, + { "MultiByteToWideChar", func_MultiByteToWideChar }, { "SetCurrentDirectory", func_SetCurrentDirectory }, { "SetUnhandledExceptionFilter", func_SetUnhandledExceptionFilter},

1 0

[hbelusca] 57528: [MSVCRT:APITEST] Update encoding, no code changes.
by hbelusca＠svn.reactos.org 09 Oct '12

09 Oct '12

Author: hbelusca Date: Tue Oct 9 22:08:32 2012 New Revision: 57528 URL: http://svn.reactos.org/svn/reactos?rev=57528&view=rev Log: [MSVCRT:APITEST] Update encoding, no code changes. Modified: trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h trunk/rostests/apitests/msvcrt/CommandLine.c Modified: trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CmdLineUt… ============================================================================== --- trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c [iso-8859-1] Tue Oct 9 22:08:32 2012 @@ -2,7 +2,7 @@ * PROJECT: ReactOS API Tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for CRT command-line handling - Utility GUI program. - * PROGRAMMER: Hermès BÉLUSCA - MAÏTO <hermes.belusca(a)sfr.fr> + * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO <hermes.belusca(a)sfr.fr> */ #define WIN32_NO_STATUS Modified: trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CmdLineUt… ============================================================================== --- trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h [iso-8859-1] Tue Oct 9 22:08:32 2012 @@ -2,7 +2,7 @@ * PROJECT: ReactOS API Tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for CRT command-line handling - Utility GUI program. - * PROGRAMMER: Hermès BÉLUSCA - MAÏTO <hermes.belusca(a)sfr.fr> + * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO <hermes.belusca(a)sfr.fr> */ #pragma once Modified: trunk/rostests/apitests/msvcrt/CommandLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLi… ============================================================================== --- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Tue Oct 9 22:08:32 2012 @@ -2,7 +2,7 @@ * PROJECT: ReactOS API Tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for CRT command-line handling. - * PROGRAMMER: Hermès BÉLUSCA - MAÏTO <hermes.belusca(a)sfr.fr> + * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO <hermes.belusca(a)sfr.fr> */ #define WIN32_NO_STATUS

1 0

[hbelusca] 57527: [MSVCRT:APITEST] Move cmdline_util to CmdLineUtil and locate it in bin/data instead of bin
by hbelusca＠svn.reactos.org 09 Oct '12

09 Oct '12

Author: hbelusca Date: Tue Oct 9 22:03:50 2012 New Revision: 57527 URL: http://svn.reactos.org/svn/reactos?rev=57527&view=rev Log: [MSVCRT:APITEST] Move cmdline_util to CmdLineUtil and locate it in bin/data instead of bin Added: trunk/rostests/apitests/msvcrt/CmdLineUtil/ - copied from r57524, trunk/rostests/apitests/msvcrt/cmdline_util/ trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c (with props) trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h (with props) Removed: trunk/rostests/apitests/msvcrt/CmdLineUtil/cmdline_util.c trunk/rostests/apitests/msvcrt/cmdline_util/ Modified: trunk/rostests/apitests/msvcrt/CMakeLists.txt trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt trunk/rostests/apitests/msvcrt/CommandLine.c Modified: trunk/rostests/apitests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CMakeList… ============================================================================== --- trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] Tue Oct 9 22:03:50 2012 @@ -1,7 +1,5 @@ -add_subdirectory(cmdline_util) - -add_definitions(-D_DLL -D__USE_CRTIMP) +add_subdirectory(CmdLineUtil) list(APPEND SOURCE CommandLine.c Modified: trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CmdLineUt… ============================================================================== --- trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt [iso-8859-1] Tue Oct 9 22:03:50 2012 @@ -1,10 +1,8 @@ - -add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE - cmdline_util.c) + CmdLineUtil.c) -add_executable(cmdline_util ${SOURCE}) -set_module_type(cmdline_util win32gui UNICODE) -add_importlibs(cmdline_util msvcrt kernel32 ntdll) -add_cd_file(TARGET cmdline_util DESTINATION reactos/bin FOR all) +add_executable(CmdLineUtil ${SOURCE}) +set_module_type(CmdLineUtil win32gui UNICODE) +add_importlibs(CmdLineUtil msvcrt kernel32 ntdll) +add_cd_file(TARGET CmdLineUtil DESTINATION reactos/bin/data FOR all) Added: trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CmdLineUt… ============================================================================== --- trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c (added) +++ trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c [iso-8859-1] Tue Oct 9 22:03:50 2012 @@ -1,0 +1,96 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for CRT command-line handling - Utility GUI program. + * PROGRAMMER: Hermès BÉLUSCA - MAÏTO <hermes.belusca(a)sfr.fr> + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <windows.h> +#include <ndk/ntndk.h> + +#include "CmdLineUtil.h" + +int APIENTRY wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + int nCmdShow) +{ + /* + * Get the unparsed command line as seen in Win32 mode, + * and the NT-native mode one. + */ + LPWSTR CmdLine = GetCommandLineW(); + UNICODE_STRING CmdLine_U = NtCurrentPeb()->ProcessParameters->CommandLine; + + /* Write the results into a file. */ + HANDLE hFile = CreateFileW(DATAFILE, + GENERIC_WRITE, + 0, NULL, + CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + DWORD dwSize, dwStringSize; + + /* + * Format of the data file : + * + * [size_of_string 4 bytes][null_terminated_C_string] + * [size_of_string 4 bytes][null_terminated_C_string] + * [UNICODE_STRING_structure][string_buffer_of_UNICODE_STRING] + */ + + /* 1- Write the WinMain's command line. */ + dwStringSize = (wcslen(lpCmdLine) + 1) * sizeof(WCHAR); + + WriteFile(hFile, + &dwStringSize, + sizeof(dwStringSize), + &dwSize, + NULL); + + WriteFile(hFile, + lpCmdLine, + dwStringSize, + &dwSize, + NULL); + + /* 2- Write the Win32 mode command line. */ + dwStringSize = (wcslen(CmdLine) + 1) * sizeof(WCHAR); + + WriteFile(hFile, + &dwStringSize, + sizeof(dwStringSize), + &dwSize, + NULL); + + WriteFile(hFile, + CmdLine, + dwStringSize, + &dwSize, + NULL); + + /* 3- Finally, write the UNICODE_STRING command line. */ + WriteFile(hFile, + &CmdLine_U, + sizeof(CmdLine_U), + &dwSize, + NULL); + + WriteFile(hFile, + CmdLine_U.Buffer, + CmdLine_U.Length, + &dwSize, + NULL); + + /* Now close the file. */ + CloseHandle(hFile); + } + + return 0; +} + +/* EOF */ Propchange: trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CmdLineUt… ============================================================================== --- trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h (added) +++ trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h [iso-8859-1] Tue Oct 9 22:03:50 2012 @@ -1,0 +1,13 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for CRT command-line handling - Utility GUI program. + * PROGRAMMER: Hermès BÉLUSCA - MAÏTO <hermes.belusca(a)sfr.fr> + */ + +#pragma once + +// The path to the data file. +#define DATAFILE L"C:\\cmdline.dat" + +/* EOF */ Propchange: trunk/rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.h ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/rostests/apitests/msvcrt/CmdLineUtil/cmdline_util.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/cmdline_u… ============================================================================== --- trunk/rostests/apitests/msvcrt/CmdLineUtil/cmdline_util.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CmdLineUtil/cmdline_util.c (removed) @@ -1,94 +1,0 @@ -/* - * PROJECT: ReactOS API Tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Test for CRT command-line handling - Utility GUI program. - * PROGRAMMER: Hermès BÉLUSCA - MAÏTO <hermes.belusca(a)sfr.fr> - */ - -#define WIN32_NO_STATUS -#include <stdio.h> -#include <windows.h> -#include <ndk/ntndk.h> - -int APIENTRY wWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPWSTR lpCmdLine, - int nCmdShow) -{ - /* - * Get the unparsed command line as seen in Win32 mode, - * and the NT-native mode one. - */ - LPWSTR CmdLine = GetCommandLineW(); - UNICODE_STRING CmdLine_U = NtCurrentPeb()->ProcessParameters->CommandLine; - - /* Write the results into a file. */ - HANDLE hFile = CreateFileW(L"C:\\cmdline.dat", - GENERIC_WRITE, - 0, NULL, - CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (hFile != INVALID_HANDLE_VALUE) - { - DWORD dwSize, dwStringSize; - - /* - * Format of the data file : - * - * [size_of_string 4 bytes][null_terminated_C_string] - * [size_of_string 4 bytes][null_terminated_C_string] - * [UNICODE_STRING_structure][string_buffer_of_UNICODE_STRING] - */ - - /* 1- Write the WinMain's command line. */ - dwStringSize = (wcslen(lpCmdLine) + 1) * sizeof(WCHAR); - - WriteFile(hFile, - &dwStringSize, - sizeof(dwStringSize), - &dwSize, - NULL); - - WriteFile(hFile, - lpCmdLine, - dwStringSize, - &dwSize, - NULL); - - /* 2- Write the Win32 mode command line. */ - dwStringSize = (wcslen(CmdLine) + 1) * sizeof(WCHAR); - - WriteFile(hFile, - &dwStringSize, - sizeof(dwStringSize), - &dwSize, - NULL); - - WriteFile(hFile, - CmdLine, - dwStringSize, - &dwSize, - NULL); - - /* 3- Finally, write the UNICODE_STRING command line. */ - WriteFile(hFile, - &CmdLine_U, - sizeof(CmdLine_U), - &dwSize, - NULL); - - WriteFile(hFile, - CmdLine_U.Buffer, - CmdLine_U.Length, - &dwSize, - NULL); - - /* Now close the file. */ - CloseHandle(hFile); - } - - return 0; -} - -/* EOF */ Modified: trunk/rostests/apitests/msvcrt/CommandLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLi… ============================================================================== --- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Tue Oct 9 22:03:50 2012 @@ -11,20 +11,16 @@ #include <wine/test.h> #include <ndk/ntndk.h> +#include "./CmdLineUtil/CmdLineUtil.h" + #define COUNT_OF(x) (sizeof((x))/sizeof((x)[0])) - -/* - * The path to the data file is hardcoded in cmdline_util.c - * Please synchronize it whenever you do a change. - */ -#define DATAFILE L"C:\\cmdline.dat" /** * Extracts the command tail from the command line * (deletes the program's name and keep the rest). **/ #define SPACECHAR L' ' -#define DQUOTECHAR L'\"' +#define DQUOTECHAR L'"' LPWSTR ExtractCmdLine(IN LPWSTR lpszCommandLine) { @@ -98,18 +94,18 @@ static TEST_CASE TestCases[] = { - {L"cmdline_util.exe"}, - {L"cmdline_util.exe foo bar"}, - {L"cmdline_util.exe \"foo bar\""}, - {L"cmdline_util.exe foo \"bar John\" Doe"}, - - {L"\"cmdline_util.exe\""}, - {L"\"cmdline_util.exe\" foo bar"}, - {L"\"cmdline_util.exe\" \"foo bar\""}, - {L"\"cmdline_util.exe\" foo \"bar John\" Doe"}, - - {L"\"cmdline_util.exe\""}, - {L"\"cmdline_util.exe \"foo bar\"\""}, + {L"CmdLineUtil.exe"}, + {L"CmdLineUtil.exe foo bar"}, + {L"CmdLineUtil.exe \"foo bar\""}, + {L"CmdLineUtil.exe foo \"bar John\" Doe"}, + + {L"\"CmdLineUtil.exe\""}, + {L"\"CmdLineUtil.exe\" foo bar"}, + {L"\"CmdLineUtil.exe\" \"foo bar\""}, + {L"\"CmdLineUtil.exe\" foo \"bar John\" Doe"}, + + {L"\"CmdLineUtil.exe\""}, + {L"\"CmdLineUtil.exe \"foo bar\"\""}, }; static void Test_CommandLine(IN ULONG TestNumber, @@ -237,6 +233,7 @@ ExtractCmdLine_U(&NTCmdLine); /* Print the results */ + /* *(LPWSTR)((ULONG_PTR)NTCmdLine.Buffer + NTCmdLine.Length) = 0; printf("WinMain cmdline = '%S'\n" "Win32 cmdline = '%S'\n" @@ -245,6 +242,7 @@ WinMainCmdLine, Win32CmdLine, NTCmdLine.Buffer, NTCmdLine.Length); + */ /* * Now check the results.

1 0

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