Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 22066: add some function definitions I've had floating about in my headers for a while.
by gedmurphy＠svn.reactos.org 27 May '06

27 May '06

Author: gedmurphy Date: Sat May 27 13:01:39 2006 New Revision: 22066 URL: http://svn.reactos.ru/svn/reactos?rev=22066&view=rev Log: add some function definitions I've had floating about in my headers for a while. Modified: trunk/reactos/include/winbase.h trunk/reactos/include/winnt.h Modified: trunk/reactos/include/winbase.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/winbase.h?rev=22066… ============================================================================== --- trunk/reactos/include/winbase.h (original) +++ trunk/reactos/include/winbase.h Sat May 27 13:01:39 2006 @@ -1091,11 +1091,16 @@ #if (_WIN32_WINNT >= 0x0500) BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); BOOL WINAPI AddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID); +BOOL WINAPI AddAccessAllowedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID); +BOOL WINAPI AddAccessDeniedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID); #endif BOOL WINAPI AddAce(PACL,DWORD,DWORD,PVOID,DWORD); ATOM WINAPI AddAtomA(LPCSTR); ATOM WINAPI AddAtomW(LPCWSTR); BOOL WINAPI AddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); +#if (_WIN32_WINNT >= 0x0500) +BOOL WINAPI AddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID,BOOL,BOOL); +#endif #if (_WIN32_WINNT >= 0x0501) void WINAPI AddRefActCtx(HANDLE); #endif @@ -1767,7 +1772,7 @@ void WINAPI OutputDebugStringA(LPCSTR); void WINAPI OutputDebugStringW(LPCWSTR); BOOL WINAPI PeekNamedPipe(HANDLE,PVOID,DWORD,PDWORD,PDWORD,PDWORD); -BOOL WINAPI PostQueuedCompletionStatus(HANDLE,DWORD,DWORD,LPOVERLAPPED); +BOOL WINAPI PostQueuedCompletionStatus(HANDLE,DWORD,ULONG_PTR,LPOVERLAPPED); DWORD WINAPI PrepareTape(HANDLE,DWORD,BOOL); BOOL WINAPI PrivilegeCheck (HANDLE,PPRIVILEGE_SET,PBOOL); BOOL WINAPI PrivilegedServiceAuditAlarmA(LPCSTR,LPCSTR,HANDLE,PPRIVILEGE_SET,BOOL); @@ -1788,7 +1793,7 @@ BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER); BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER); DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,DWORD); -void WINAPI RaiseException(DWORD,DWORD,DWORD,const DWORD*); +void WINAPI RaiseException(DWORD,DWORD,DWORD,const ULONG_PTR*); BOOL WINAPI ReadDirectoryChangesW(HANDLE,PVOID,DWORD,BOOL,DWORD,PDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); BOOL WINAPI ReadEventLogA(HANDLE,DWORD,DWORD,PVOID,DWORD,DWORD *,DWORD *); BOOL WINAPI ReadEventLogW(HANDLE,DWORD,DWORD,PVOID,DWORD,DWORD *,DWORD *); Modified: trunk/reactos/include/winnt.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/winnt.h?rev=22066&r… ============================================================================== --- trunk/reactos/include/winnt.h (original) +++ trunk/reactos/include/winnt.h Sat May 27 13:01:39 2006 @@ -2224,7 +2224,7 @@ struct _EXCEPTION_RECORD *ExceptionRecord; PVOID ExceptionAddress; DWORD NumberParameters; - DWORD ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; + ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; } EXCEPTION_RECORD,*PEXCEPTION_RECORD,*LPEXCEPTION_RECORD; typedef struct _EXCEPTION_POINTERS { PEXCEPTION_RECORD ExceptionRecord;

1 0

[gedmurphy] 22065: [AUDIT] cat isn't a windows tool
by gedmurphy＠svn.reactos.org 27 May '06

27 May '06

Author: gedmurphy Date: Sat May 27 12:33:58 2006 New Revision: 22065 URL: http://svn.reactos.ru/svn/reactos?rev=22065&view=rev Log: [AUDIT] cat isn't a windows tool Modified: trunk/reactos/base/applications/utils/cat/cat.c (props changed) Propchange: trunk/reactos/base/applications/utils/cat/cat.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 22064: [AUDIT] after looking through code no signs of reverse engineering were found.
by greatlrd＠svn.reactos.org 26 May '06

26 May '06

Author: greatlrd Date: Sat May 27 02:48:25 2006 New Revision: 22064 URL: http://svn.reactos.ru/svn/reactos?rev=22064&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. Modified: trunk/reactos/dll/win32/crtdll/crtdll.def (props changed) trunk/reactos/dll/win32/crtdll/crtdll.rc (props changed) trunk/reactos/dll/win32/crtdll/dllmain.c (props changed) trunk/reactos/dll/win32/crtdll/precomp.h (props changed) Propchange: trunk/reactos/dll/win32/crtdll/crtdll.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/crtdll/crtdll.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/crtdll/dllmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/crtdll/precomp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[frik85] 22063: I changed the window title bar gradient back to the ReactOS 0.2.9 gradient style. <Fireball - 20:07 GMT> I prefer to keep release the win2k-theme until we have a proper support for theming
by frik85＠svn.reactos.org 26 May '06

26 May '06

Author: frik85 Date: Sat May 27 00:22:46 2006 New Revision: 22063 URL: http://svn.reactos.ru/svn/reactos?rev=22063&view=rev Log: I changed the window title bar gradient back to the ReactOS 0.2.9 gradient style. <Fireball - 20:07 GMT> I prefer to keep release the win2k-theme until we have a proper support for theming Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c Sat May 27 00:22:46 2006 @@ -1149,8 +1149,8 @@ { if (uFlags & DC_GRADIENT) { - static GRADIENT_RECT gcap [] = {{0, 1}, {2, 3}}; - TRIVERTEX vert[4]; + static GRADIENT_RECT gcap = {0, 1}; + TRIVERTEX vert[2]; COLORREF Colors[2]; LONG xx; @@ -1178,33 +1178,19 @@ vert[0].x = r.left; vert[0].y = 0; - vert[0].Red = GetRValue(Colors[1]) << 8; - vert[0].Green = GetGValue(Colors[1]) << 8; - vert[0].Blue = GetBValue(Colors[1]) << 8; + vert[0].Red = GetRValue(Colors[0]) << 8; + vert[0].Green = GetGValue(Colors[0]) << 8; + vert[0].Blue = GetBValue(Colors[0]) << 8; vert[0].Alpha = 0; vert[1].x = r.right; - vert[1].y = (lprc->bottom - lprc->top) >> 1; - vert[1].Red = GetRValue(Colors[0]) << 8; - vert[1].Green = GetGValue(Colors[0]) << 8; - vert[1].Blue = GetBValue(Colors[0]) << 8; + vert[1].y = lprc->bottom - lprc->top; + vert[1].Red = GetRValue(Colors[1]) << 8; + vert[1].Green = GetGValue(Colors[1]) << 8; + vert[1].Blue = GetBValue(Colors[1]) << 8; vert[1].Alpha = 0; - vert[2].x = r.left; - vert[2].y = (lprc->bottom - lprc->top) >> 1; - vert[2].Red = GetRValue(Colors[0]) << 8; - vert[2].Green = GetGValue(Colors[0]) << 8; - vert[2].Blue = GetBValue(Colors[0]) << 8; - vert[2].Alpha = 0; - - vert[3].x = r.right; - vert[3].y = (lprc->bottom - lprc->top); - vert[3].Red = GetRValue(Colors[1]) << 8; - vert[3].Green = GetGValue(Colors[1]) << 8; - vert[3].Blue = GetBValue(Colors[1]) << 8; - vert[3].Alpha = 0; - - GdiGradientFill(MemDC, vert, 4, &gcap, 2, GRADIENT_FILL_RECT_V); + GdiGradientFill(MemDC, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_H); if ((uFlags & DC_ICON) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP)) {

1 0

[greatlrd] 22062: replace djgpp hell bugs fcvtbuf with project http://www.jbox.dk/sanos/source/lib/fcvt.c.html with small modification's to match ReactOS arch. Floating point to string conversion routines Copyright (C) 2002 Michael Ringgaard. All rights reserved. Make wine test for fcvt shut up we are failing 64 of wine test in msvrt printf, but we pass all fcvt test. before we did fail 75 test in wine test of msvrt printf test. Before we did fail almost all test case for fcvt in wine test
by greatlrd＠svn.reactos.org 26 May '06

26 May '06

Author: greatlrd Date: Fri May 26 23:23:34 2006 New Revision: 22062 URL: http://svn.reactos.ru/svn/reactos?rev=22062&view=rev Log: replace djgpp hell bugs fcvtbuf with project http://www.jbox.dk/sanos/source/lib/fcvt.c.html with small modification's to match ReactOS arch. Floating point to string conversion routines Copyright (C) 2002 Michael Ringgaard. All rights reserved. Make wine test for fcvt shut up we are failing 64 of wine test in msvrt printf, but we pass all fcvt test. before we did fail 75 test in wine test of msvrt printf test. Before we did fail almost all test case for fcvt in wine test Modified: trunk/reactos/lib/crt/stdlib/fcvtbuf.c Modified: trunk/reactos/lib/crt/stdlib/fcvtbuf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/fcvtbuf.c?re… ============================================================================== --- trunk/reactos/lib/crt/stdlib/fcvtbuf.c (original) +++ trunk/reactos/lib/crt/stdlib/fcvtbuf.c Fri May 26 23:23:34 2006 @@ -1,61 +1,127 @@ -/* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ #include <stdlib.h> #include <stdio.h> #include <string.h> #include <float.h> +#include <math.h> #include <malloc.h> // #include <msvcrt/locale.h> -void __ecvround (char *, char *, const char *, int *); -char *ecvtbuf (double, int, int *, int *, char *); +// replace fjgpp fcvtbuf from project http://www.jbox.dk/sanos/source/lib/fcvt.c.html +// with small modification's to match ReactOS arch -char * -fcvtbuf (double value, int ndigits, int *decpt, int *sign, char *buf) +// Floating point to string conversion routines +// +// Copyright (C) 2002 Michael Ringgaard. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// 3. Neither the name of the project nor the names of its contributors +// may be used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +// SUCH DAMAGE. +// + + +//#include <math.h> +#define CVTBUFSIZE 2 * DBL_MAX_10_EXP + 10 +static char *cvt(double arg, int ndigits, int *decpt, int *sign, char *buf, int eflag) { - static char INFINITY[] = "Infinity"; - char decimal = '.' /* localeconv()->decimal_point[0] */; - int digits = ndigits >= 0 ? ndigits : 0; - char *cvtbuf = (char *)_alloca (2*DBL_MAX_10_EXP + 16); - char *s = cvtbuf; - char *dot; + int r2; + double fi, fj; + char *p, *p1; - sprintf (cvtbuf, "%-+#.*f", DBL_MAX_10_EXP + digits + 1, value); + if (ndigits < 0) ndigits = 0; + if (ndigits >= CVTBUFSIZE - 1) ndigits = CVTBUFSIZE - 2; + r2 = 0; + *sign = 0; + p = &buf[0]; + if (arg < 0) + { + *sign = 1; + arg = -arg; + } + arg = modf(arg, &fi); + p1 = &buf[CVTBUFSIZE]; - /* The sign. */ - if (*s++ == '-') - *sign = 1; - else - *sign = 0; + if (fi != 0) + { + p1 = &buf[CVTBUFSIZE]; + while (fi != 0) + { + fj = modf(fi / 10, &fi); + *--p1 = (int)((fj + .03) * 10) + '0'; + r2++; + } + while (p1 < &buf[CVTBUFSIZE]) *p++ = *p1++; + } + else if (arg > 0) + { + while ((fj = arg * 10) < 1) + { + arg = fj; + r2--; + } + } + p1 = &buf[ndigits]; + if (eflag == 0) p1 += r2; + *decpt = r2; + if (p1 < &buf[0]) + { + buf[0] = '\0'; + return buf; + } + while (p <= p1 && p < &buf[CVTBUFSIZE]) + { + arg *= 10; + arg = modf(arg, &fj); + *p++ = (int) fj + '0'; + } + if (p1 >= &buf[CVTBUFSIZE]) + { + buf[CVTBUFSIZE - 1] = '\0'; + return buf; + } + p = p1; + *p1 += 5; + while (*p1 > '9') + { + *p1 = '0'; + if (p1 > buf) + ++*--p1; + else + { + *p1 = '1'; + (*decpt)++; + if (eflag == 0) + { + if (p > buf) *p = '0'; + p++; + } + } + } + *p = '\0'; + return buf; +} - /* Where's the decimal point? */ - dot = strchr (s, decimal); - *decpt = dot ? dot - s : (int)strlen (s); - - /* SunOS docs says if NDIGITS is 8 or more, produce "Infinity" - instead of "Inf". */ - if (strncmp (s, "Inf", 3) == 0) - { - memcpy (buf, INFINITY, ndigits >= 8 ? 9 : 3); - if (ndigits < 8) - buf[3] = '\0'; - return buf; - } - else if (ndigits < 0) - return ecvtbuf (value, *decpt + ndigits, decpt, sign, buf); - else if (*s == '0' && value != 0.0) - return ecvtbuf (value, ndigits, decpt, sign, buf); - else - { - memcpy (buf, s, *decpt); - if (s[*decpt] == decimal) - { - memcpy (buf + *decpt, s + *decpt + 1, ndigits); - buf[*decpt + ndigits] = '\0'; - } - else - buf[*decpt] = '\0'; - __ecvround (buf, buf + *decpt + ndigits - 1, - s + *decpt + ndigits + 1, decpt); - return buf; - } +char *fcvtbuf(double arg, int ndigits, int *decpt, int *sign, char *buf) +{ + return cvt(arg, ndigits, decpt, sign, buf, 0); }

1 0

[greatlrd] 22061: fixing linux build
by greatlrd＠svn.reactos.org 26 May '06

26 May '06

Author: greatlrd Date: Fri May 26 23:10:33 2006 New Revision: 22061 URL: http://svn.reactos.ru/svn/reactos?rev=22061&view=rev Log: fixing linux build Modified: trunk/reactos/lib/crt/conio/cprintf.c Modified: trunk/reactos/lib/crt/conio/cprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/conio/cprintf.c?rev… ============================================================================== --- trunk/reactos/lib/crt/conio/cprintf.c (original) +++ trunk/reactos/lib/crt/conio/cprintf.c Fri May 26 23:10:33 2006 @@ -18,7 +18,7 @@ int written, resize = sizeof(buf), retval; va_list valist; - while ((written = vsnprintf( mem, resize, fmt, valist )) == -1 || + while ((written = _vsnprintf( mem, resize, fmt, valist )) == -1 || written > resize) { resize = (written == -1 ? resize * 2 : written + 1);

1 0

[greatlrd] 22060: [AUDIT] clean imported/ported from DJGPP, djgpp fcvt is bugs as hell, most case does not working, bug will come later
by greatlrd＠svn.reactos.org 26 May '06

26 May '06

Author: greatlrd Date: Fri May 26 22:51:58 2006 New Revision: 22060 URL: http://svn.reactos.ru/svn/reactos?rev=22060&view=rev Log: [AUDIT] clean imported/ported from DJGPP, djgpp fcvt is bugs as hell, most case does not working, bug will come later Modified: trunk/reactos/lib/crt/stdlib/fcvt.c (props changed) trunk/reactos/lib/crt/stdlib/fcvtbuf.c (props changed) Propchange: trunk/reactos/lib/crt/stdlib/fcvt.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/fcvtbuf.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[sedwards] 22059: sync lz32 winetest to 0.9.14
by sedwards＠svn.reactos.org 26 May '06

26 May '06

Author: sedwards Date: Fri May 26 22:14:28 2006 New Revision: 22059 URL: http://svn.reactos.ru/svn/reactos?rev=22059&view=rev Log: sync lz32 winetest to 0.9.14 Added: trunk/reactos/regtests/winetests/lz32/lz32.rbuild trunk/reactos/regtests/winetests/lz32/lzexpand_main.c trunk/reactos/regtests/winetests/lz32/testlist.c Modified: trunk/reactos/regtests/winetests/directory.rbuild Modified: trunk/reactos/regtests/winetests/directory.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/director… ============================================================================== --- trunk/reactos/regtests/winetests/directory.rbuild (original) +++ trunk/reactos/regtests/winetests/directory.rbuild Fri May 26 22:14:28 2006 @@ -13,6 +13,9 @@ </directory> <directory name="kernel32"> <xi:include href="kernel32/kernel32.rbuild" /> +</directory> +<directory name="lz32"> + <xi:include href="lz32/lz32.rbuild" /> </directory> <directory name="msvcrt"> <xi:include href="msvcrt/msvcrt.rbuild" /> Added: trunk/reactos/regtests/winetests/lz32/lz32.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/lz32/lz3… ============================================================================== --- trunk/reactos/regtests/winetests/lz32/lz32.rbuild (added) +++ trunk/reactos/regtests/winetests/lz32/lz32.rbuild Fri May 26 22:14:28 2006 @@ -1,0 +1,8 @@ +<module name="lz32_winetest" type="win32cui" installbase="bin" installname="lz32_winetest.exe" allowwarnings="true"> + <include base="lz32_winetest">.</include> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>lz32</library> + <file>testlist.c</file> + <file>lzexpand_main.c</file> +</module> Added: trunk/reactos/regtests/winetests/lz32/lzexpand_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/lz32/lze… ============================================================================== --- trunk/reactos/regtests/winetests/lz32/lzexpand_main.c (added) +++ trunk/reactos/regtests/winetests/lz32/lzexpand_main.c Fri May 26 22:14:28 2006 @@ -1,0 +1,208 @@ +/* + * Unit test suite for lz32 functions + * + * Copyright 2004 Evan Parry, Daniel Kegel + * + * 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 + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <stdlib.h> +#include <winerror.h> +#include <lzexpand.h> + +#include "wine/test.h" + +static char filename_[] = "testfile.xx_"; +#if 0 +static char filename[] = "testfile.xxx"; +#endif +static char filename2[] = "testfile.yyy"; + +/* This is the hex string representation of the file created by compressing + a simple text file with the contents "This is a test file." + + The file was created using COMPRESS.EXE from the Windows Server 2003 + Resource Kit from Microsoft. The resource kit was retrieved from the + following URL: + + http://www.microsoft.com/downloads/details.aspx?FamilyID=9d467a69-57ff-4ae7… + */ +static const unsigned char compressed_file[] = + {0x53,0x5A,0x44,0x44,0x88,0xF0,0x27,0x33,0x41, + 0x74,0x75,0x14,0x00,0x00,0xDF,0x54,0x68,0x69, + 0x73,0x20,0xF2,0xF0,0x61,0x20,0xFF,0x74,0x65, + 0x73,0x74,0x20,0x66,0x69,0x6C,0x03,0x65,0x2E}; +static const DWORD compressed_file_size = sizeof(compressed_file); + +static const char uncompressed_data[] = "This is a test file."; +static const DWORD uncompressed_data_size = sizeof(uncompressed_data) - 1; + +static char *buf; + +static void test_lzopenfile(void) +{ + OFSTRUCT test; + DWORD retval; + INT file; + + /* Check for nonexistent file. */ + file = LZOpenFile("badfilename_", &test, OF_READ); + ok(file == LZERROR_BADINHANDLE, + "LZOpenFile succeeded on nonexistent file\n"); + LZClose(file); + + /* Create an empty file. */ + file = LZOpenFile(filename_, &test, OF_CREATE); + ok(file >= 0, "LZOpenFile failed on creation\n"); + LZClose(file); + retval = GetFileAttributes(filename_); + ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributes: error %ld\n", + GetLastError()); + + /* Check various opening options. */ + file = LZOpenFile(filename_, &test, OF_READ); + ok(file >= 0, "LZOpenFile failed on read\n"); + LZClose(file); + file = LZOpenFile(filename_, &test, OF_WRITE); + ok(file >= 0, "LZOpenFile failed on write\n"); + LZClose(file); + file = LZOpenFile(filename_, &test, OF_READWRITE); + ok(file >= 0, "LZOpenFile failed on read/write\n"); + LZClose(file); + file = LZOpenFile(filename_, &test, OF_EXIST); + ok(file >= 0, "LZOpenFile failed on read/write\n"); + LZClose(file); + + + /* If the file "foo.xxx" does not exist, LZOpenFile should then + check for the file "foo.xx_" and open that -- at least on some + operating systems. Doesn't seem to on my copy of Win98. + The Wine testing guidelines say we should accept the behavior of + any valid version of Windows. Thus it seems we cannot check this?! + Revisit this at some point to see if this can be tested somehow. + */ +#if 0 + file = LZOpenFile(filename, &test, OF_EXIST); + ok(file != LZERROR_BADINHANDLE, + "LZOpenFile \"filename_\" check failed\n"); + LZClose(file); +#endif + + /* Delete the file then make sure it doesn't exist anymore. */ + file = LZOpenFile(filename_, &test, OF_DELETE); + ok(file >= 0, "LZOpenFile failed on delete\n"); + LZClose(file); + + retval = GetFileAttributes(filename_); + ok(retval == INVALID_FILE_ATTRIBUTES, + "GetFileAttributes succeeded on deleted file\n"); + +} + +static void test_lzread(void) +{ + HANDLE file; + DWORD ret; + int cfile; + OFSTRUCT test; + BOOL retok; + + /* Create the compressed file. */ + file = CreateFile(filename_, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Could not create test file\n"); + retok = WriteFile(file, compressed_file, compressed_file_size, &ret, 0); + ok( retok, "WriteFile: error %ld\n", GetLastError()); + ok(ret == compressed_file_size, "Wrote wrong number of bytes with WriteFile?\n"); + CloseHandle(file); + + cfile = LZOpenFile(filename_, &test, OF_READ); + ok(cfile > 0, "LZOpenFile failed\n"); + + ret = LZRead(cfile, buf, uncompressed_data_size); + ok(ret == uncompressed_data_size, "Read wrong number of bytes\n"); + + /* Compare what we read with what we think we should read. */ + ok(memcmp(buf, uncompressed_data, uncompressed_data_size) == 0, + "buffer contents mismatch\n"); + + todo_wine { + /* Wine returns the number of bytes actually read instead of an error */ + ret = LZRead(cfile, buf, uncompressed_data_size); + ok(ret == LZERROR_READ, "Expected read-past-EOF to return LZERROR_READ\n"); + } + + LZClose(cfile); + + ret = DeleteFile(filename_); + ok(ret, "DeleteFile: error %ld\n", GetLastError()); +} + +static void test_lzcopy(void) +{ + HANDLE file; + DWORD ret; + int source, dest; + OFSTRUCT stest, dtest; + BOOL retok; + + /* Create the compressed file. */ + file = CreateFile(filename_, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); + ok(file != INVALID_HANDLE_VALUE, + "CreateFile: error %ld\n", GetLastError()); + retok = WriteFile(file, compressed_file, compressed_file_size, &ret, 0); + ok( retok, "WriteFile error %ld\n", GetLastError()); + ok(ret == compressed_file_size, "Wrote wrong number of bytes\n"); + CloseHandle(file); + + source = LZOpenFile(filename_, &stest, OF_READ); + ok(source >= 0, "LZOpenFile failed on compressed file\n"); + dest = LZOpenFile(filename2, &dtest, OF_CREATE); + ok(dest >= 0, "LZOpenFile failed on creating new file %d\n", dest); + + ret = LZCopy(source, dest); + ok(ret > 0, "LZCopy error\n"); + + LZClose(source); + LZClose(dest); + + file = CreateFile(filename2, GENERIC_READ, 0, NULL, OPEN_EXISTING, + 0, 0); + ok(file != INVALID_HANDLE_VALUE, + "CreateFile: error %ld\n", GetLastError()); + + retok = ReadFile(file, buf, uncompressed_data_size*2, &ret, 0); + ok( retok && ret == uncompressed_data_size, "ReadFile: error %ld\n", GetLastError()); + /* Compare what we read with what we think we should read. */ + ok(!memcmp(buf, uncompressed_data, uncompressed_data_size), + "buffer contents mismatch\n"); + CloseHandle(file); + + ret = DeleteFile(filename_); + ok(ret, "DeleteFile: error %ld\n", GetLastError()); + ret = DeleteFile(filename2); + ok(ret, "DeleteFile: error %ld\n", GetLastError()); +} + +START_TEST(lzexpand_main) +{ + buf = malloc(uncompressed_data_size * 2); + test_lzopenfile(); + test_lzread(); + test_lzcopy(); + free(buf); +} Added: trunk/reactos/regtests/winetests/lz32/testlist.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/lz32/tes… ============================================================================== --- trunk/reactos/regtests/winetests/lz32/testlist.c (added) +++ trunk/reactos/regtests/winetests/lz32/testlist.c Fri May 26 22:14:28 2006 @@ -1,0 +1,15 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_lzexpand_main(void); + +const struct test winetest_testlist[] = +{ + { "lzexpand_main", func_lzexpand_main }, + { 0, 0 } +};

1 0

[sedwards] 22058: added my own icmp test...this cannot possibly fail
by sedwards＠svn.reactos.org 26 May '06

26 May '06

Author: sedwards Date: Fri May 26 22:07:12 2006 New Revision: 22058 URL: http://svn.reactos.ru/svn/reactos?rev=22058&view=rev Log: added my own icmp test...this cannot possibly fail Added: trunk/reactos/regtests/winetests/icmp/icmp.rbuild trunk/reactos/regtests/winetests/icmp/testlist.c Modified: trunk/reactos/regtests/winetests/directory.rbuild Modified: trunk/reactos/regtests/winetests/directory.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/director… ============================================================================== --- trunk/reactos/regtests/winetests/directory.rbuild (original) +++ trunk/reactos/regtests/winetests/directory.rbuild Fri May 26 22:07:12 2006 @@ -7,6 +7,9 @@ </directory> <directory name="gdi32"> <xi:include href="gdi32/gdi32.rbuild" /> +</directory> +<directory name="icmp"> + <xi:include href="icmp/icmp.rbuild" /> </directory> <directory name="kernel32"> <xi:include href="kernel32/kernel32.rbuild" /> Added: trunk/reactos/regtests/winetests/icmp/icmp.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/icmp/icm… ============================================================================== --- trunk/reactos/regtests/winetests/icmp/icmp.rbuild (added) +++ trunk/reactos/regtests/winetests/icmp/icmp.rbuild Fri May 26 22:07:12 2006 @@ -1,0 +1,8 @@ +<module name="icmp_winetest" type="win32cui" installbase="bin" installname="icmp_winetest.exe" allowwarnings="true"> + <include base="icmp_winetest">.</include> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>icmp</library> + <file>icmp.c</file> + <file>testlist.c</file> +</module> Added: trunk/reactos/regtests/winetests/icmp/testlist.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/icmp/tes… ============================================================================== --- trunk/reactos/regtests/winetests/icmp/testlist.c (added) +++ trunk/reactos/regtests/winetests/icmp/testlist.c Fri May 26 22:07:12 2006 @@ -1,0 +1,15 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_icmp(void); + +const struct test winetest_testlist[] = +{ + { "icmp", func_icmp }, + { 0, 0 } +};

1 0

[gedmurphy] 22057: [AUDIT] sndvol32. declared clean by Thomas Weidenmueller "It's not even functional" said Thomas. ; )
by gedmurphy＠svn.reactos.org 26 May '06

26 May '06

Author: gedmurphy Date: Fri May 26 22:02:20 2006 New Revision: 22057 URL: http://svn.reactos.ru/svn/reactos?rev=22057&view=rev Log: [AUDIT] sndvol32. declared clean by Thomas Weidenmueller "It's not even functional" said Thomas. ;) Modified: trunk/reactos/base/applications/sndvol32/misc.c (props changed) trunk/reactos/base/applications/sndvol32/mixer.c (props changed) trunk/reactos/base/applications/sndvol32/resources.h (contents, props changed) trunk/reactos/base/applications/sndvol32/resources/sndvol32.ico (contents, props changed) trunk/reactos/base/applications/sndvol32/sndvol32.c (props changed) trunk/reactos/base/applications/sndvol32/sndvol32.h (props changed) Propchange: trunk/reactos/base/applications/sndvol32/misc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sndvol32/mixer.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/base/applications/sndvol32/resources.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/sndvol32/… ============================================================================== --- trunk/reactos/base/applications/sndvol32/resources.h (original) +++ trunk/reactos/base/applications/sndvol32/resources.h Fri May 26 22:02:20 2006 @@ -3,7 +3,7 @@ #define IDM_MAINMENU 101 -#define IDI_MAINAPP 101 +#define IDI_MAINAPP 304 #define IDC_PROPERTIES 1001 #define IDC_ADVANCED_CONTROLS 1002 Propchange: trunk/reactos/base/applications/sndvol32/resources.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/base/applications/sndvol32/resources/sndvol32.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/sndvol32/… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/base/applications/sndvol32/resources/sndvol32.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sndvol32/sndvol32.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sndvol32/sndvol32.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

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