Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[jimtabor] 28418: Implemented an easy API, XLATEOBJ_piVector. Just leave them in stubs for now.
by jimtabor＠svn.reactos.org 19 Aug '07

19 Aug '07

Author: jimtabor Date: Sun Aug 19 13:16:38 2007 New Revision: 28418 URL: http://svn.reactos.org/svn/reactos?rev=28418&view=rev Log: Implemented an easy API, XLATEOBJ_piVector. Just leave them in stubs for now. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Aug 19 13:16:38 2007 @@ -3371,9 +3371,7 @@ ULONG * STDCALL XLATEOBJ_piVector(XLATEOBJ *XlateObj) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return XlateObj->pulXlate; } /*

1 0

[jimtabor] 28417: Implemented a handfull of easy Eng APIs. Just leave them in stubs for now.
by jimtabor＠svn.reactos.org 19 Aug '07

19 Aug '07

Author: jimtabor Date: Sun Aug 19 12:16:01 2007 New Revision: 28417 URL: http://svn.reactos.org/svn/reactos?rev=28417&view=rev Log: Implemented a handfull of easy Eng APIs. Just leave them in stubs for now. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Aug 19 12:16:01 2007 @@ -2766,11 +2766,26 @@ * @unimplemented */ PVOID STDCALL -EngFindResource(HANDLE h,int iName,int iType,PULONG pulSize) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +EngFindResource(HANDLE h, + int iName, + int iType, + PULONG pulSize) +{ + HRSRC HRSrc; + DWORD Size; + HGLOBAL Hg; + LPVOID Lock; + + if (!(HRSrc = FindResourceW( (HMODULE) h, + MAKEINTRESOURCEW(iName), + MAKEINTRESOURCEW(iType) + ))) + return NULL; + if (!(Size = SizeofResource( (HMODULE) h, HRSrc ))) return NULL; + if (!(Hg = LoadResource( (HMODULE) h, HRSrc ))) return NULL; + Lock = LockResource( Hg ); + pulSize = (PULONG) Size; + return (PVOID) Lock; } /* @@ -2779,8 +2794,7 @@ VOID STDCALL EngFreeModule(HANDLE h) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + LdrUnloadDll(h); } /* @@ -2790,8 +2804,8 @@ EngGetCurrentCodePage(OUT PUSHORT OemCodePage, OUT PUSHORT AnsiCodePage) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + OemCodePage = (PUSHORT) GetOEMCP(); + AnsiCodePage = (PUSHORT) GetACP(); } /* @@ -2852,9 +2866,7 @@ HANDLE STDCALL EngLoadModule(LPWSTR pwsz) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return LoadLibraryExW ( pwsz, NULL, LOAD_LIBRARY_AS_DATAFILE); }

1 0

[arty] 28416: (customize-variable 'indent-tabs-mode) ; nil
by arty＠svn.reactos.org 19 Aug '07

19 Aug '07

Author: arty Date: Sun Aug 19 09:11:54 2007 New Revision: 28416 URL: http://svn.reactos.org/svn/reactos?rev=28416&view=rev Log: (customize-variable 'indent-tabs-mode) ; nil Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Sun Aug 19 09:11:54 2007 @@ -331,8 +331,8 @@ /* Insert a new entry */ FreeEntry = ObpInsertHandleCount(ObjectHeader); if (!FreeEntry) return STATUS_INSUFFICIENT_RESOURCES; - ASSERT(!FreeEntry->Process); - ASSERT(!FreeEntry->HandleCount); + ASSERT(!FreeEntry->Process); + ASSERT(!FreeEntry->HandleCount); /* Fill it out */ FreeEntry->Process = Process; @@ -377,8 +377,8 @@ /* Allocate one */ FreeEntry = ObpInsertHandleCount(ObjectHeader); if (!FreeEntry) return STATUS_INSUFFICIENT_RESOURCES; - ASSERT(!FreeEntry->Process); - ASSERT(!FreeEntry->HandleCount); + ASSERT(!FreeEntry->Process); + ASSERT(!FreeEntry->HandleCount); } /* Fill out the entry */ @@ -537,7 +537,7 @@ { /* Found it, get the process handle count */ ProcessHandleCount = HandleEntry->HandleCount--; - break; + break; } /* Keep looping */

1 0

[arty] 28415: Fix part two of the bug: The actual problem was that we'd overrun the end of the handle count array when decrementing. This also led to a handle leak (observed). Stop correctly when we find the handle we want.
by arty＠svn.reactos.org 19 Aug '07

19 Aug '07

Author: arty Date: Sun Aug 19 09:02:31 2007 New Revision: 28415 URL: http://svn.reactos.org/svn/reactos?rev=28415&view=rev Log: Fix part two of the bug: The actual problem was that we'd overrun the end of the handle count array when decrementing. This also led to a handle leak (observed). Stop correctly when we find the handle we want. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Sun Aug 19 09:02:31 2007 @@ -331,6 +331,8 @@ /* Insert a new entry */ FreeEntry = ObpInsertHandleCount(ObjectHeader); if (!FreeEntry) return STATUS_INSUFFICIENT_RESOURCES; + ASSERT(!FreeEntry->Process); + ASSERT(!FreeEntry->HandleCount); /* Fill it out */ FreeEntry->Process = Process; @@ -375,6 +377,8 @@ /* Allocate one */ FreeEntry = ObpInsertHandleCount(ObjectHeader); if (!FreeEntry) return STATUS_INSUFFICIENT_RESOURCES; + ASSERT(!FreeEntry->Process); + ASSERT(!FreeEntry->HandleCount); } /* Fill out the entry */ @@ -533,6 +537,7 @@ { /* Found it, get the process handle count */ ProcessHandleCount = HandleEntry->HandleCount--; + break; } /* Keep looping */

1 0

[cfinck] 28414: Use host_gpp instead of host_gcc for building "ssprintf.cpp" and "tools.cpp". These are C++ files, so they should be built with g++ like it's done for the other tools. Usually they can also be built with gcc, but Collibri from IRC reported that broken gcc interfaces exist, which lead to problems with these files.
by cfinck＠svn.reactos.org 18 Aug '07

18 Aug '07

Author: cfinck Date: Sun Aug 19 02:06:00 2007 New Revision: 28414 URL: http://svn.reactos.org/svn/reactos?rev=28414&view=rev Log: Use host_gpp instead of host_gcc for building "ssprintf.cpp" and "tools.cpp". These are C++ files, so they should be built with g++ like it's done for the other tools. Usually they can also be built with gcc, but Collibri from IRC reported that broken gcc interfaces exist, which lead to problems with these files. Modified: trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=28414&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Sun Aug 19 02:06:00 2007 @@ -34,11 +34,11 @@ $(TOOLS_INT_)ssprintf.o: $(TOOLS_BASE_)ssprintf.cpp $(XML_SSPRINTF_HEADERS) | $(TOOLS_INT) $(ECHO_CC) - ${host_gcc} $(TOOLS_CPPFLAGS) -c $< -o $@ + ${host_gpp} $(TOOLS_CPPFLAGS) -c $< -o $@ $(TOOLS_INT_)xml.o: $(TOOLS_BASE_)xml.cpp $(XML_SSPRINTF_HEADERS) | $(TOOLS_INT) $(ECHO_CC) - ${host_gcc} $(TOOLS_CPPFLAGS) -c $< -o $@ + ${host_gpp} $(TOOLS_CPPFLAGS) -c $< -o $@ include tools/bin2c.mak include tools/bin2res/bin2res.mak

1 0

[cfinck] 28413: Always include "wrc.h" before including "ctype.h". wrc.h includes wrctypes.h, which includes windef.h, which includes winnt.h. And winnt.h contains our wchar_t check, which has to be done before including ctype.h to enable building on Mac OS X hosts.
by cfinck＠svn.reactos.org 18 Aug '07

18 Aug '07

Author: cfinck Date: Sun Aug 19 01:41:26 2007 New Revision: 28413 URL: http://svn.reactos.org/svn/reactos?rev=28413&view=rev Log: Always include "wrc.h" before including "ctype.h". wrc.h includes wrctypes.h, which includes windef.h, which includes winnt.h. And winnt.h contains our wchar_t check, which has to be done before including ctype.h to enable building on Mac OS X hosts. Modified: trunk/reactos/tools/wrc/dumpres.c trunk/reactos/tools/wrc/genres.c trunk/reactos/tools/wrc/lex.yy.c trunk/reactos/tools/wrc/newstruc.c trunk/reactos/tools/wrc/parser.l trunk/reactos/tools/wrc/parser.tab.c trunk/reactos/tools/wrc/parser.y trunk/reactos/tools/wrc/utils.c trunk/reactos/tools/wrc/wrc.c Modified: trunk/reactos/tools/wrc/dumpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/dumpres.c?rev=28… ============================================================================== --- trunk/reactos/tools/wrc/dumpres.c (original) +++ trunk/reactos/tools/wrc/dumpres.c Sun Aug 19 01:41:26 2007 @@ -18,11 +18,11 @@ #include "config.h" +#include "wrc.h" #include <assert.h> #include <stdio.h> #include <ctype.h> -#include "wrc.h" #include "dumpres.h" /* Modified: trunk/reactos/tools/wrc/genres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/genres.c?rev=284… ============================================================================== --- trunk/reactos/tools/wrc/genres.c (original) +++ trunk/reactos/tools/wrc/genres.c Sun Aug 19 01:41:26 2007 @@ -27,6 +27,7 @@ #include "config.h" +#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -34,7 +35,6 @@ #include <assert.h> #include <ctype.h> -#include "wrc.h" #include "genres.h" #include "utils.h" #include "windef.h" Modified: trunk/reactos/tools/wrc/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/lex.yy.c?rev=284… ============================================================================== --- trunk/reactos/tools/wrc/lex.yy.c (original) +++ trunk/reactos/tools/wrc/lex.yy.c Sun Aug 19 01:41:26 2007 @@ -720,6 +720,7 @@ /*#define LEX_DEBUG*/ +#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -727,7 +728,6 @@ #include <assert.h> #include "wine/unicode.h" -#include "wrc.h" #include "utils.h" #include "parser.h" #include "newstruc.h" Modified: trunk/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/newstruc.c?rev=2… ============================================================================== --- trunk/reactos/tools/wrc/newstruc.c (original) +++ trunk/reactos/tools/wrc/newstruc.c Sun Aug 19 01:41:26 2007 @@ -21,13 +21,13 @@ #include "config.h" +#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <assert.h> #include <ctype.h> -#include "wrc.h" #include "newstruc.h" #include "utils.h" #include "parser.h" Modified: trunk/reactos/tools/wrc/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.l?rev=284… ============================================================================== --- trunk/reactos/tools/wrc/parser.l (original) +++ trunk/reactos/tools/wrc/parser.l Sun Aug 19 01:41:26 2007 @@ -98,6 +98,7 @@ /*#define LEX_DEBUG*/ +#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -105,7 +106,6 @@ #include <assert.h> #include "wine/unicode.h" -#include "wrc.h" #include "utils.h" #include "parser.h" #include "newstruc.h" Modified: trunk/reactos/tools/wrc/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.tab.c?rev… ============================================================================== --- trunk/reactos/tools/wrc/parser.tab.c (original) +++ trunk/reactos/tools/wrc/parser.tab.c Sun Aug 19 01:41:26 2007 @@ -352,6 +352,7 @@ #include "config.h" #include "wine/port.h" +#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -362,7 +363,6 @@ #include <alloca.h> #endif -#include "wrc.h" #include "utils.h" #include "newstruc.h" #include "dumpres.h" Modified: trunk/reactos/tools/wrc/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.y?rev=284… ============================================================================== --- trunk/reactos/tools/wrc/parser.y (original) +++ trunk/reactos/tools/wrc/parser.y Sun Aug 19 01:41:26 2007 @@ -123,6 +123,7 @@ #include "config.h" #include "wine/port.h" +#include "wrc.h" #include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -133,7 +134,6 @@ #include <alloca.h> #endif -#include "wrc.h" #include "utils.h" #include "newstruc.h" #include "dumpres.h" Modified: trunk/reactos/tools/wrc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/utils.c?rev=2841… ============================================================================== --- trunk/reactos/tools/wrc/utils.c (original) +++ trunk/reactos/tools/wrc/utils.c Sun Aug 19 01:41:26 2007 @@ -20,6 +20,7 @@ #include "config.h" +#include "wrc.h" #include <assert.h> #include <stdio.h> #include <stdlib.h> @@ -29,7 +30,6 @@ #include <ctype.h> #include "wine/unicode.h" -#include "wrc.h" #include "utils.h" #include "parser.h" Modified: trunk/reactos/tools/wrc/wrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.c?rev=28413&… ============================================================================== --- trunk/reactos/tools/wrc/wrc.c (original) +++ trunk/reactos/tools/wrc/wrc.c Sun Aug 19 01:41:26 2007 @@ -21,6 +21,7 @@ #include "config.h" +#include "wrc.h" #include <stdio.h> #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -34,7 +35,6 @@ # include <getopt.h> #endif -#include "wrc.h" #include "utils.h" #include "readres.h" #include "dumpres.h"

1 0

[cfinck] 28412: Mac OS X already defines iswdigit, so don't define it again on this host OS.
by cfinck＠svn.reactos.org 18 Aug '07

18 Aug '07

Author: cfinck Date: Sun Aug 19 01:14:20 2007 New Revision: 28412 URL: http://svn.reactos.org/svn/reactos?rev=28412&view=rev Log: Mac OS X already defines iswdigit, so don't define it again on this host OS. Modified: trunk/reactos/tools/ssprintf.cpp Modified: trunk/reactos/tools/ssprintf.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ssprintf.cpp?rev=284… ============================================================================== --- trunk/reactos/tools/ssprintf.cpp (original) +++ trunk/reactos/tools/ssprintf.cpp Sun Aug 19 01:14:20 2007 @@ -28,10 +28,13 @@ #include <ctype.h> #define _finite __finite #define _isnan __isnan + +#ifndef __APPLE__ inline int iswdigit ( wchar_t c ) { return ( c >= L'0' && c <= L'9' ); } +#endif #endif//WIN32 #if defined(__FreeBSD__) || defined(__APPLE__)

1 0

[cfinck] 28411: Include windef.h, which then includes winnt.h, which uses our wchar_t check and reports the wchar_t definition back to the host. Then the host finally knows that it should not define wchar_t again.
by cfinck＠svn.reactos.org 18 Aug '07

18 Aug '07

Author: cfinck Date: Sun Aug 19 01:10:14 2007 New Revision: 28411 URL: http://svn.reactos.org/svn/reactos?rev=28411&view=rev Log: Include windef.h, which then includes winnt.h, which uses our wchar_t check and reports the wchar_t definition back to the host. Then the host finally knows that it should not define wchar_t again. Modified: trunk/reactos/tools/unicode/cptable.c Modified: trunk/reactos/tools/unicode/cptable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/cptable.c?re… ============================================================================== --- trunk/reactos/tools/unicode/cptable.c (original) +++ trunk/reactos/tools/unicode/cptable.c Sun Aug 19 01:10:14 2007 @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> #include <stdlib.h> #include "wine/unicode.h"

1 0

[cfinck] 28410: Fix the logic for the wchar_t checks. We don't only need to check if wchar_t has already been defined, but also report this to all known hosts and operating systems.
by cfinck＠svn.reactos.org 18 Aug '07

18 Aug '07

Author: cfinck Date: Sun Aug 19 00:30:12 2007 New Revision: 28410 URL: http://svn.reactos.org/svn/reactos?rev=28410&view=rev Log: Fix the logic for the wchar_t checks. We don't only need to check if wchar_t has already been defined, but also report this to all known hosts and operating systems. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sun Aug 19 00:30:12 2007 @@ -50,22 +50,38 @@ #include <basetsd.h> #include <guiddef.h> +/* wchar_t checks + * First check if wchar_t has already been defined by any host/OS */ +#ifndef _WCHAR_T_DEFINED +#ifndef _WCHAR_T_DECLARED /* for FreeBSD 5 and later */ +#ifndef _WCHAR_T /* for Mac OS X */ +#ifndef _WCHAR_T_ +#undef __need_wchar_t +#ifndef __cplusplus + typedef unsigned short wchar_t; +#endif +#endif +#endif +#endif +#endif + +/* Now report that it has been defined to all known hosts/operating systems */ #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED -#ifndef _WCHAR_T_DECLARED /* for FreeBSD 5 and later */ +#endif + +#ifndef _WCHAR_T_DECLARED #define _WCHAR_T_DECLARED -#ifndef _WCHAR_T /* for Mac OS X */ +#endif + +#ifndef _WCHAR_T #define _WCHAR_T +#endif + #ifndef _WCHAR_T_ #define _WCHAR_T_ -#undef __need_wchar_t -#ifndef __cplusplus -typedef unsigned short wchar_t; -#endif -#endif -#endif -#endif -#endif +#endif + #include <ctype.h> #include <winerror.h>

1 0

[cfinck] 28409: Move the wchar_t check above the "#include <ctype.h>" line (this is needed for Mac OS X host compatibility)
by cfinck＠svn.reactos.org 18 Aug '07

18 Aug '07

Author: cfinck Date: Sat Aug 18 23:49:53 2007 New Revision: 28409 URL: http://svn.reactos.org/svn/reactos?rev=28409&view=rev Log: Move the wchar_t check above the "#include <ctype.h>" line (this is needed for Mac OS X host compatibility) Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sat Aug 18 23:49:53 2007 @@ -49,6 +49,23 @@ #include <basetsd.h> #include <guiddef.h> + +#ifndef _WCHAR_T_DEFINED +#define _WCHAR_T_DEFINED +#ifndef _WCHAR_T_DECLARED /* for FreeBSD 5 and later */ +#define _WCHAR_T_DECLARED +#ifndef _WCHAR_T /* for Mac OS X */ +#define _WCHAR_T +#ifndef _WCHAR_T_ +#define _WCHAR_T_ +#undef __need_wchar_t +#ifndef __cplusplus +typedef unsigned short wchar_t; +#endif +#endif +#endif +#endif +#endif #include <ctype.h> #include <winerror.h> @@ -117,23 +134,6 @@ #define __ptr64 #endif typedef void* __ptr64 PVOID64; - -#ifndef _WCHAR_T_DEFINED -#define _WCHAR_T_DEFINED -#ifndef _WCHAR_T_DECLARED /* for FreeBSD 5 and later */ -#define _WCHAR_T_DECLARED -#ifndef _WCHAR_T /* for Mac OS X */ -#define _WCHAR_T -#ifndef _WCHAR_T_ -#define _WCHAR_T_ -#undef __need_wchar_t -#ifndef __cplusplus -typedef unsigned short wchar_t; -#endif -#endif -#endif -#endif -#endif #ifdef __cplusplus # define EXTERN_C extern "C"

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007