Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[hbelusca] 64470: [NTVDM]: improve some dprints.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Oct 2 19:47:58 2014 New Revision: 64470 URL: http://svn.reactos.org/svn/reactos?rev=64470&view=rev Log: [NTVDM]: improve some dprints. Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dem.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] Thu Oct 2 19:47:58 2014 @@ -70,7 +70,7 @@ ulDosKernelSize, &ulDosKernelSize); - DPRINT1("Windows NT DOS loading %s at 0x%04X:0x%04X, size 0x%x ; GetLastError() = %u\n", + DPRINT1("Windows NT DOS loading %s at %04X:%04X, size 0x%X ; GetLastError() = %u\n", (Success ? "succeeded" : "failed"), getDI(), 0x0000, ulDosKernelSize, @@ -211,7 +211,7 @@ ulDosBiosSize, &ulDosBiosSize); - DPRINT1("DOS BIOS loading %s at 0x%04X:0x%04X, size 0x%x ; GetLastError() = %u\n", + DPRINT1("DOS BIOS loading %s at %04X:%04X, size 0x%X ; GetLastError() = %u\n", (Success ? "succeeded" : "failed"), 0x0070, 0x0000, ulDosBiosSize,

9 years, 11 months

[ekohl] 64469: [SERVICES] Disable new events and replace them by debug messages.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Oct 2 17:58:55 2014 New Revision: 64469 URL: http://svn.reactos.org/svn/reactos?rev=64469&view=rev Log: [SERVICES] Disable new events and replace them by debug messages. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Thu Oct 2 17:58:55 2014 @@ -1339,9 +1339,11 @@ #ifdef USE_ASYNCHRONOUS_IO OVERLAPPED Overlapped = {0}; #endif +#if 0 LPCWSTR lpErrorStrings[3]; WCHAR szBuffer1[20]; WCHAR szBuffer2[20]; +#endif DPRINT("ScmWaitForServiceConnect()\n"); @@ -1373,6 +1375,7 @@ DPRINT1("CancelIo() failed (Error: %lu)\n", GetLastError()); } +#if 0 _ultow(PipeTimeout, szBuffer1, 10); lpErrorStrings[0] = Service->lpDisplayName; lpErrorStrings[1] = szBuffer1; @@ -1381,6 +1384,8 @@ EVENTLOG_ERROR_TYPE, 2, lpErrorStrings); +#endif + DPRINT1("Log EVENT_CONNECTION_TIMEOUT by %S\n", Service->lpDisplayName); return ERROR_SERVICE_REQUEST_TIMEOUT; } @@ -1437,6 +1442,7 @@ DPRINT1("CancelIo() failed (Error: %lu)\n", GetLastError()); } +#if 0 _ultow(PipeTimeout, szBuffer1, 10); lpErrorStrings[0] = szBuffer1; @@ -1444,6 +1450,8 @@ EVENTLOG_ERROR_TYPE, 1, lpErrorStrings); +#endif + DPRINT1("Log EVENT_READFILE_TIMEOUT by %S\n", Service->lpDisplayName); return ERROR_SERVICE_REQUEST_TIMEOUT; } @@ -1479,6 +1487,7 @@ if (dwProcessId != Service->lpImage->dwProcessId) { +#if 0 _ultow(Service->lpImage->dwProcessId, szBuffer1, 10); _ultow(dwProcessId, szBuffer2, 10); @@ -1490,6 +1499,9 @@ EVENTLOG_WARNING_TYPE, 3, lpErrorStrings); +#endif + + DPRINT1("Log EVENT_SERVICE_DIFFERENT_PID_CONNECTED by %S\n", Service->lpDisplayName); } DPRINT("ScmWaitForServiceConnect() done\n");

9 years, 11 months

[jgardou] 64468: [ADVAPI32_APITEST] - Add a few tests for RegEnumValueW

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 2 17:31:06 2014 New Revision: 64468 URL: http://svn.reactos.org/svn/reactos?rev=64468&view=rev Log: [ADVAPI32_APITEST] - Add a few tests for RegEnumValueW Added: trunk/rostests/apitests/advapi32/RegEnumValueW.c (with props) Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt trunk/rostests/apitests/advapi32/testlist.c Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] Thu Oct 2 17:31:06 2014 @@ -4,6 +4,7 @@ HKEY_CLASSES_ROOT.c LockDatabase.c QueryServiceConfig2.c + RegEnumValueW.c RtlEncryptMemory.c SaferIdentifyLevel.c testlist.c) Added: trunk/rostests/apitests/advapi32/RegEnumValueW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/RegEnum… ============================================================================== --- trunk/rostests/apitests/advapi32/RegEnumValueW.c (added) +++ trunk/rostests/apitests/advapi32/RegEnumValueW.c [iso-8859-1] Thu Oct 2 17:31:06 2014 @@ -0,0 +1,150 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for the RegGetvalueW API + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <winreg.h> + +START_TEST(RegEnumValueW) +{ + LONG ErrorCode; + HKEY TestKey; + ULONG Data; + DWORD NameLength, DataLength; + DWORD DataType; + WCHAR NameBuffer[7]; + + /* Create our Test Key */ + ErrorCode = RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\ReactOS_apitest", &TestKey ); + ok_dec(ErrorCode, ERROR_SUCCESS); + + /* All NULL is invalid */ + ErrorCode = RegEnumValueW(TestKey, 0, NULL, NULL, NULL, NULL, NULL, NULL); + ok_dec(ErrorCode, ERROR_INVALID_PARAMETER); + + /* Asking for the buffer length is not enough. */ + NameLength = 8; + ErrorCode = RegEnumValueW(TestKey, 0, NULL, &NameLength, NULL, NULL, NULL, NULL); + ok_dec(ErrorCode, ERROR_INVALID_PARAMETER); + + /* Or maybe it is, you just have to nicely ask */ + NameLength = 0; + ErrorCode = RegEnumValueW(TestKey, 0, NULL, &NameLength, NULL, NULL, NULL, NULL); + ok_dec(ErrorCode, ERROR_INVALID_PARAMETER); + + /* Name buffer alone is also prohibited */ + ErrorCode = RegEnumValueW(TestKey, 0, NameBuffer, NULL, NULL, NULL, NULL, NULL); + ok_dec(ErrorCode, ERROR_INVALID_PARAMETER); + + /* You need to ask for both a minima */ + ErrorCode = RegEnumValueW(TestKey, 0, NameBuffer, &NameLength, NULL, NULL, NULL, NULL); + ok_dec(ErrorCode, ERROR_NO_MORE_ITEMS); + + /* What if I only want to know the value type ? */ + ErrorCode = RegEnumValueW(TestKey, 0, NULL, NULL, &DataType, NULL, NULL, NULL); + ok_dec(ErrorCode, ERROR_INVALID_PARAMETER); + + /* Set a value */ + Data = 0xF00DF00D; + ErrorCode = RegSetValueExW(TestKey, L"Value1", 0, REG_BINARY, (LPBYTE)&Data, sizeof(Data)); + ok_dec(ErrorCode, ERROR_SUCCESS); + + /* Try various combinations of Arguments */ + NameLength = 7; + ErrorCode = RegEnumValueW(TestKey, 0, NULL, &NameLength, NULL, NULL, NULL, NULL); + ok_dec(ErrorCode, ERROR_INVALID_PARAMETER); + /* Provide a buffer this time */ + ErrorCode = RegEnumValueW(TestKey, 0, NameBuffer, &NameLength, NULL, NULL, NULL, NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + /* This doesn't include the NULL terminator */ + ok_dec(NameLength, 6); + /* But the string is NULL terminated */ + ok_hex(NameBuffer[6], L'\0'); + ok(wcscmp(NameBuffer, L"Value1") == 0, "%S\n", NameBuffer); + + /* See if skipping the NULL value is a problem */ + NameLength = 6; + memset(NameBuffer, 0xBA, sizeof(NameBuffer)); + ErrorCode = RegEnumValueW(TestKey, 0, NameBuffer, &NameLength, NULL, NULL, NULL, NULL); + ok_dec(ErrorCode, ERROR_MORE_DATA); + /* In fact, this is unchanged */ + ok_dec(NameLength, 6); + /* And the string is untouched */ + ok_hex(NameBuffer[6], 0xBABA); + ok_hex(NameBuffer[5], 0xBABA); + ok_hex(NameBuffer[4], 0xBABA); + ok_hex(NameBuffer[3], 0xBABA); + ok_hex(NameBuffer[2], 0xBABA); + ok_hex(NameBuffer[1], 0xBABA); + ok_hex(NameBuffer[0], 0xBABA); + + /* Of course, anything smaller is an outrage */ + NameLength = 5; + memset(NameBuffer, 0xBA, sizeof(NameBuffer)); + ErrorCode = RegEnumValueW(TestKey, 0, NameBuffer, &NameLength, NULL, NULL, NULL, NULL); + ok_dec(ErrorCode, ERROR_MORE_DATA); + /* Untouched... */ + ok_dec(NameLength, 5); + /* And the string is untouched */ + ok_hex(NameBuffer[6], 0xBABA); + ok_hex(NameBuffer[5], 0xBABA); + ok_hex(NameBuffer[4], 0xBABA); + ok_hex(NameBuffer[3], 0xBABA); + ok_hex(NameBuffer[2], 0xBABA); + ok_hex(NameBuffer[1], 0xBABA); + ok_hex(NameBuffer[0], 0xBABA); + + /* Of course, asking for data without caring for the name would be strange... */ + DataLength = 0; + ErrorCode = RegEnumValueW(TestKey, 0, NULL, NULL, NULL, NULL, NULL, &DataLength); + ok_dec(ErrorCode, ERROR_INVALID_PARAMETER); + + DataLength = 0; + NameLength = 7; + ErrorCode = RegEnumValueW(TestKey, 0, NameBuffer, &NameLength, NULL, &DataType, NULL, &DataLength); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok_dec(DataLength, sizeof(Data)); + ok_hex(DataType, REG_BINARY); + + /* Same, but this time with NULL data buffer and non-zero data size */ + DataLength = 2; + NameLength = 7; + DataType = 0x01234567; + ErrorCode = RegEnumValueW(TestKey, 0, NameBuffer, &NameLength, NULL, &DataType, NULL, &DataLength); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok_dec(DataLength, sizeof(Data)); + ok_hex(DataType, REG_BINARY); + + /* Same, but this time with data buffer and shrunk data size */ + DataLength = 2; + Data = 0; + DataType = 0x01234567; + NameLength = 7; + ErrorCode = RegEnumValueW(TestKey, 0, NameBuffer, &NameLength, NULL, &DataType, (LPBYTE)&Data, &DataLength); + ok_dec(ErrorCode, ERROR_MORE_DATA); + ok_dec(DataLength, sizeof(Data)); + ok_hex(Data, 0); + ok_hex(DataType, REG_BINARY); + + /* Put the right parameters */ + DataLength = sizeof(Data); + NameLength = 7; + Data = 0; + DataType = 0x01234567; + ErrorCode = RegEnumValueW(TestKey, 0, NameBuffer, &NameLength, NULL, &DataType, (LPBYTE)&Data, &DataLength); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok_dec(DataLength, sizeof(Data)); + ok_hex(Data, 0xF00DF00D); + ok_hex(DataType, REG_BINARY); + + /* Delete the key */ + ErrorCode = RegDeleteKeyW(TestKey, L""); + ok_dec(ErrorCode, ERROR_SUCCESS); + RegCloseKey(TestKey); +} + Propchange: trunk/rostests/apitests/advapi32/RegEnumValueW.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/apitests/advapi32/RegEnumValueW.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/advapi32/RegEnumValueW.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rostests/apitests/advapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/testlis… ============================================================================== --- trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] Thu Oct 2 17:31:06 2014 @@ -7,6 +7,7 @@ extern void func_HKEY_CLASSES_ROOT(void); extern void func_LockDatabase(void); extern void func_QueryServiceConfig2(void); +extern void func_RegEnumValueW(void); extern void func_RtlEncryptMemory(void); extern void func_SaferIdentifyLevel(void); @@ -16,6 +17,7 @@ { "HKEY_CLASSES_ROOT", func_HKEY_CLASSES_ROOT }, { "LockDatabase" , func_LockDatabase }, { "QueryServiceConfig2", func_QueryServiceConfig2 }, + { "RegEnumValueW", func_RegEnumValueW}, { "RtlEncryptMemory", func_RtlEncryptMemory }, { "SaferIdentifyLevel", func_SaferIdentifyLevel },

9 years, 11 months

[ekohl] 64467: [SERVICES] EVENT_READFILE_TIMEOUT uses one string.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Oct 2 17:27:18 2014 New Revision: 64467 URL: http://svn.reactos.org/svn/reactos?rev=64467&view=rev Log: [SERVICES] EVENT_READFILE_TIMEOUT uses one string. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Thu Oct 2 17:27:18 2014 @@ -1442,7 +1442,7 @@ ScmLogEvent(EVENT_READFILE_TIMEOUT, EVENTLOG_ERROR_TYPE, - 2, + 1, lpErrorStrings); return ERROR_SERVICE_REQUEST_TIMEOUT;

9 years, 11 months

[ekohl] 64466: [SERVICES] Add missing stdlib.h include.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Oct 2 16:28:18 2014 New Revision: 64466 URL: http://svn.reactos.org/svn/reactos?rev=64466&view=rev Log: [SERVICES] Add missing stdlib.h include. Modified: trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Thu Oct 2 16:28:18 2014 @@ -6,6 +6,7 @@ #define _SERVICES_H #include <stdio.h> +#include <stdlib.h> #define WIN32_NO_STATUS #define _INC_WINDOWS

9 years, 11 months

[ekohl] 64465: [SERVICES] ScmWaitForServiceConnect: Log some more warnings and errors.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Oct 2 16:20:42 2014 New Revision: 64465 URL: http://svn.reactos.org/svn/reactos?rev=64465&view=rev Log: [SERVICES] ScmWaitForServiceConnect: Log some more warnings and errors. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Thu Oct 2 16:20:42 2014 @@ -1339,6 +1339,9 @@ #ifdef USE_ASYNCHRONOUS_IO OVERLAPPED Overlapped = {0}; #endif + LPCWSTR lpErrorStrings[3]; + WCHAR szBuffer1[20]; + WCHAR szBuffer2[20]; DPRINT("ScmWaitForServiceConnect()\n"); @@ -1369,6 +1372,15 @@ { DPRINT1("CancelIo() failed (Error: %lu)\n", GetLastError()); } + + _ultow(PipeTimeout, szBuffer1, 10); + lpErrorStrings[0] = Service->lpDisplayName; + lpErrorStrings[1] = szBuffer1; + + ScmLogEvent(EVENT_CONNECTION_TIMEOUT, + EVENTLOG_ERROR_TYPE, + 2, + lpErrorStrings); return ERROR_SERVICE_REQUEST_TIMEOUT; } @@ -1425,6 +1437,14 @@ DPRINT1("CancelIo() failed (Error: %lu)\n", GetLastError()); } + _ultow(PipeTimeout, szBuffer1, 10); + lpErrorStrings[0] = szBuffer1; + + ScmLogEvent(EVENT_READFILE_TIMEOUT, + EVENTLOG_ERROR_TYPE, + 2, + lpErrorStrings); + return ERROR_SERVICE_REQUEST_TIMEOUT; } else if (dwError == WAIT_OBJECT_0) @@ -1456,18 +1476,20 @@ return dwError; } } - else - { - if (dwProcessId != Service->lpImage->dwProcessId) - { -/* - LPWSTR Strings[3] - - ScmLogError(EVENT_SERVICE_DIFFERENT_PID_CONNECTED, - 3, - lpStrings); -*/ - } + + if (dwProcessId != Service->lpImage->dwProcessId) + { + _ultow(Service->lpImage->dwProcessId, szBuffer1, 10); + _ultow(dwProcessId, szBuffer2, 10); + + lpErrorStrings[0] = Service->lpDisplayName; + lpErrorStrings[1] = szBuffer1; + lpErrorStrings[2] = szBuffer2; + + ScmLogEvent(EVENT_SERVICE_DIFFERENT_PID_CONNECTED, + EVENTLOG_WARNING_TYPE, + 3, + lpErrorStrings); } DPRINT("ScmWaitForServiceConnect() done\n");

9 years, 11 months

[akhaldi] 64464: [MSTASK_WINETEST] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Oct 2 10:32:26 2014 New Revision: 64464 URL: http://svn.reactos.org/svn/reactos?rev=64464&view=rev Log: [MSTASK_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/mstask/task_scheduler.c Modified: trunk/rostests/winetests/mstask/task_scheduler.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/task_sch… ============================================================================== --- trunk/rostests/winetests/mstask/task_scheduler.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mstask/task_scheduler.c [iso-8859-1] Thu Oct 2 10:32:26 2014 @@ -182,7 +182,7 @@ hres, wine_dbgstr_w(name), wine_dbgstr_w(buffer)); CoTaskMemFree(name); - /* the two backslash are optional */ + /* the two backslashes are optional */ hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname + 2); ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres);

9 years, 11 months

[akhaldi] 64463: [MSRLE32_WINETEST] * Import from Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Oct 2 10:27:09 2014 New Revision: 64463 URL: http://svn.reactos.org/svn/reactos?rev=64463&view=rev Log: [MSRLE32_WINETEST] * Import from Wine 1.7.27. CORE-8540 Added: trunk/rostests/winetests/msrle32/ (with props) trunk/rostests/winetests/msrle32/CMakeLists.txt (with props) trunk/rostests/winetests/msrle32/msrle.c (with props) trunk/rostests/winetests/msrle32/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Thu Oct 2 10:27:09 2014 @@ -55,6 +55,7 @@ add_subdirectory(msctf) add_subdirectory(mshtml) add_subdirectory(msi) +add_subdirectory(msrle32) add_subdirectory(mstask) add_subdirectory(msvcrt) add_subdirectory(msvcrtd) Propchange: trunk/rostests/winetests/msrle32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Oct 2 10:27:09 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/winetests/msrle32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/winetests/msrle32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/rostests/winetests/msrle32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msrle32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msrle32/CMakeLists.txt (added) +++ trunk/rostests/winetests/msrle32/CMakeLists.txt [iso-8859-1] Thu Oct 2 10:27:09 2014 @@ -0,0 +1,6 @@ + +add_definitions(-DUSE_WINE_TODOS) +add_executable(msrle32_winetest msrle.c testlist.c) +set_module_type(msrle32_winetest win32cui) +add_importlibs(msrle32_winetest msvfw32 msvcrt kernel32) +add_cd_file(TARGET msrle32_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/msrle32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/msrle32/msrle.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msrle32/msrle.c… ============================================================================== --- trunk/rostests/winetests/msrle32/msrle.c (added) +++ trunk/rostests/winetests/msrle32/msrle.c [iso-8859-1] Thu Oct 2 10:27:09 2014 @@ -0,0 +1,105 @@ +/* + * Copyright 2013 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <vfw.h> +#include <aviriff.h> +#include <stdio.h> + +#include <wine/test.h> + +static void test_output(const BYTE *output, int out_size, const BYTE *expect, int size) +{ + char buf[512], *ptr; + int i; + + i = out_size == size && !memcmp(output, expect, size); + ok(i, "Unexpected output\n"); + if(i) + return; + + for(i=0, ptr=buf; i<out_size; i++) + ptr += sprintf(ptr, "%x ", output[i]); + trace("Got: %s\n", buf); + for(i=0, ptr=buf; i<size; i++) + ptr += sprintf(ptr, "%x ", expect[i]); + trace("Exp: %s\n", buf); +} + +static void test_encode(void) +{ + BITMAPINFOHEADER *output_header; + DWORD output_size, flags, quality; + BYTE buf[64]; + ICINFO info; + HIC hic; + LRESULT res; + + struct { BITMAPINFOHEADER header; RGBQUAD map[256]; } + input_header = { {sizeof(BITMAPINFOHEADER), 32, 1, 1, 8, 0, 32*8, 0, 0, 256, 256}, + {{255,0,0}, {0,255,0}, {0,0,255}, {255,255,255}}}; + + static BYTE input1[32] = {1,2,3,3,3,3,2,3,1}; + static const BYTE output1[] = {1,1,1,2,4,3,0,3,2,3,1,0,23,0,0,0,0,1}; + + hic = ICOpen(FCC('V','I','D','C'), FCC('m','r','l','e'), ICMODE_COMPRESS); + ok(hic != NULL, "ICOpen failed\n"); + + res = ICGetInfo(hic, &info, sizeof(info)); + ok(res == sizeof(info), "res = %ld\n", res); + ok(info.dwSize == sizeof(info), "dwSize = %d\n", info.dwSize); + ok(info.fccHandler == FCC('M','R','L','E'), "fccHandler = %x\n", info.fccHandler); + todo_wine ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); + ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %d\n", info.dwVersionICM); + + quality = 0xdeadbeef; + res = ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD_PTR)&quality, 0); + ok(res == ICERR_OK, "ICSendMessage(ICM_GETDEFAULTQUALITY) failed: %ld\n", res); + ok(quality == 8500, "quality = %d\n", quality); + + quality = 0xdeadbeef; + res = ICSendMessage(hic, ICM_GETQUALITY, (DWORD_PTR)&quality, 0); + ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_GETQUALITY) failed: %ld\n", res); + ok(quality == 0xdeadbeef, "quality = %d\n", quality); + + quality = ICQUALITY_HIGH; + res = ICSendMessage(hic, ICM_SETQUALITY, (DWORD_PTR)&quality, 0); + ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_SETQUALITY) failed: %ld\n", res); + + output_size = ICCompressGetFormatSize(hic, &input_header.header); + ok(output_size == 1064, "output_size = %d\n", output_size); + + output_header = HeapAlloc(GetProcessHeap(), 0, output_size); + ICCompressGetFormat(hic, &input_header.header, output_header); + + flags = 0; + res = ICCompress(hic, ICCOMPRESS_KEYFRAME, output_header, buf, &input_header.header, input1, 0, &flags, 0, 0, 0, NULL, NULL); + ok(res == ICERR_OK, "ICCompress failed: %ld\n", res); + test_output(buf, output_header->biSizeImage, output1, sizeof(output1)); + ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %x\n", flags); + + HeapFree(GetProcessHeap(), 0, output_header); + + ICClose(hic); +} + +START_TEST(msrle) +{ + test_encode(); +} Propchange: trunk/rostests/winetests/msrle32/msrle.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/msrle32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msrle32/testlis… ============================================================================== --- trunk/rostests/winetests/msrle32/testlist.c (added) +++ trunk/rostests/winetests/msrle32/testlist.c [iso-8859-1] Thu Oct 2 10:27:09 2014 @@ -0,0 +1,12 @@ +/* Automatically generated by make depend; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_msrle(void); + +const struct test winetest_testlist[] = +{ + { "msrle", func_msrle }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/msrle32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 11 months

[akhaldi] 64462: [MSRLE32] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Oct 2 10:26:21 2014 New Revision: 64462 URL: http://svn.reactos.org/svn/reactos?rev=64462&view=rev Log: [MSRLE32] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/msrle32/lang/msrle_Da.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Ro.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msrle32/lang/msrle_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/lang/msr… ============================================================================== --- trunk/reactos/dll/win32/msrle32/lang/msrle_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/lang/msrle_Da.rc [iso-8859-1] Thu Oct 2 10:26:21 2014 @@ -26,5 +26,5 @@ { IDS_NAME "WINE-MS-RLE" IDS_DESCRIPTION "Wine MS-RLE videokodeks" - IDS_ABOUT "Wine MS-RLE videokodeks\nOphavsret 2002 tilhører Michael Günnewig" + IDS_ABOUT "Wine MS-RLE videokodeks\nOphavsret 2002 tilhører Michael Günnewig" } Modified: trunk/reactos/dll/win32/msrle32/lang/msrle_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/lang/msr… ============================================================================== --- trunk/reactos/dll/win32/msrle32/lang/msrle_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/lang/msrle_Ro.rc [iso-8859-1] Thu Oct 2 10:26:21 2014 @@ -25,7 +25,7 @@ STRINGTABLE { - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Codecul video Wine MS-RLE" - IDS_ABOUT "Codecul video Wine MS-RLE\nCopyright 2002 by Michael GÃ¼nnewig" + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Codecul video Wine MS-RLE" + IDS_ABOUT "Codecul video Wine MS-RLE\nCopyright 2002 by Michael GÃ¼nnewig" } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Oct 2 10:26:21 2014 @@ -130,7 +130,7 @@ reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.17 reactos/dll/win32/msnet32 # Synced to Wine-1.7.17 reactos/dll/win32/mspatcha # Synced to Wine-1.7.27 -reactos/dll/win32/msrle32 # Synced to Wine-1.7.17 +reactos/dll/win32/msrle32 # Synced to Wine-1.7.27 reactos/dll/win32/mssign32 # Synced to Wine-1.7.17 reactos/dll/win32/mssip32 # Synced to Wine-1.7.17 reactos/dll/win32/mstask # Synced to Wine-1.7.17

9 years, 11 months

[akhaldi] 64461: [MSISIP] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Oct 2 10:14:19 2014 New Revision: 64461 URL: http://svn.reactos.org/svn/reactos?rev=64461&view=rev Log: [MSISIP] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/msisip/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msisip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msisip/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisip/main.c [iso-8859-1] Thu Oct 2 10:14:19 2014 @@ -85,6 +85,7 @@ prov.pwszVerifyFuncName = verifyIndirectData; prov.pwszRemoveFuncName = removeSignedDataMsg; prov.pwszIsFunctionNameFmt2 = isMyTypeOfFile; + prov.pwszGetCapFuncName = NULL; return CryptSIPAddProvider(&prov) ? S_OK : S_FALSE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Oct 2 10:14:19 2014 @@ -126,7 +126,7 @@ reactos/dll/win32/msi # Synced to Wine-1.7.27 reactos/dll/win32/msimg32 # Synced to Wine-1.7.27 reactos/dll/win32/msimtf # Synced to Wine-1.7.17 -reactos/dll/win32/msisip # Synced to Wine-1.7.17 +reactos/dll/win32/msisip # Synced to Wine-1.7.27 reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.17 reactos/dll/win32/msnet32 # Synced to Wine-1.7.17 reactos/dll/win32/mspatcha # Synced to Wine-1.7.27

9 years, 11 months

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 October 2014