Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 31352: - Implement bin-files creation (as opposed to inlining resource data, which is incompatible with MSVC). Result matches 1:1 with mc.exe output on the same input file. - This patch was submitted to Wine, but it needs to be reworked.
by fireball＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: fireball Date: Thu Dec 20 16:11:30 2007 New Revision: 31352 URL: http://svn.reactos.org/svn/reactos?rev=31352&view=rev Log: - Implement bin-files creation (as opposed to inlining resource data, which is incompatible with MSVC). Result matches 1:1 with mc.exe output on the same input file. - This patch was submitted to Wine, but it needs to be reworked. Modified: trunk/reactos/tools/wmc/utils.c trunk/reactos/tools/wmc/utils.h trunk/reactos/tools/wmc/wmc.c trunk/reactos/tools/wmc/write.c trunk/reactos/tools/wmc/write.h Modified: trunk/reactos/tools/wmc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/utils.c?rev=3135… ============================================================================== --- trunk/reactos/tools/wmc/utils.c (original) +++ trunk/reactos/tools/wmc/utils.c Thu Dec 20 16:11:30 2007 @@ -131,6 +131,20 @@ base[namelen - extlen] = '\0'; } return base; +} + +void get_rcbasedir(char *basedir, const char *name) +{ + char *slash; + slash = strrchr(name, '/'); + + if (!slash) + slash = strrchr(name, '\\'); + + basedir[0] = 0; + + strncpy(basedir, name, slash - name + 1); + basedir[slash-name + 1] = '\0'; } void *xmalloc(size_t size) Modified: trunk/reactos/tools/wmc/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/utils.h?rev=3135… ============================================================================== --- trunk/reactos/tools/wmc/utils.h (original) +++ trunk/reactos/tools/wmc/utils.h Thu Dec 20 16:11:30 2007 @@ -41,6 +41,7 @@ void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); char *dup_basename(const char *name, const char *ext); +void get_rcbasedir(char *basedir, const char *name); WCHAR *xunistrdup(const WCHAR * str); WCHAR *unistrcpy(WCHAR *dst, const WCHAR *src); Modified: trunk/reactos/tools/wmc/wmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.c?rev=31352&… ============================================================================== --- trunk/reactos/tools/wmc/wmc.c (original) +++ trunk/reactos/tools/wmc/wmc.c Thu Dec 20 16:11:30 2007 @@ -138,6 +138,7 @@ int ret; int i; int cmdlen; + char rcbasedir[MAX_PATH]; atexit( cleanup_files ); signal(SIGSEGV, segvhandler); @@ -265,6 +266,8 @@ strcat(header_name, ".h"); } + get_rcbasedir(rcbasedir, output_name); + if(input_name) { if(!(yyin = fopen(input_name, "rb"))) @@ -287,7 +290,7 @@ write_h_file(header_name); write_rc_file(output_name); if(!rcinline) - write_bin_files(); + write_bin_files(rcbasedir); output_name = NULL; header_name = NULL; return 0; Modified: trunk/reactos/tools/wmc/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/write.c?rev=3135… ============================================================================== --- trunk/reactos/tools/wmc/write.c (original) +++ trunk/reactos/tools/wmc/write.c Thu Dec 20 16:11:30 2007 @@ -509,7 +509,110 @@ fclose(fp); } -void write_bin_files(void) -{ - assert(rcinline == 0); -} +static void write_bin_file(const char *fname, lan_blk_t *lbp) +{ + FILE *fp; + unsigned int offs; + unsigned short buf; + int i, j, k; + + fp = fopen(fname, "wb"); + + fwrite(&lbp->nblk, sizeof(int), 1, fp); + + offs = 4 * (lbp->nblk * 3 + 1); + for(i = 0; i < lbp->nblk; i++) + { + fwrite(&lbp->blks[i].idlo, sizeof(unsigned), 2, fp); + fwrite(&offs, sizeof(int), 1, fp); + + offs += lbp->blks[i].size; + } + + for(i = 0; i < lbp->nblk; i++) + { + block_t *blk = &lbp->blks[i]; + for(j = 0; j < blk->nmsg; j++) + { + char *cptr; + int len = blk->msgs[j]->len; + short aligned_size = (unicodeout ? (len*2+3)&~3 : (len+3)&~3) + 4; + + fwrite(&aligned_size, sizeof(short), 1, fp); + + buf = unicodeout ? 1 : 0; + fwrite(&buf, sizeof(buf), 1, fp); + + // no need to count these 4 bytes when calculating alignment + aligned_size -= 4; + + if (unicodeout) + { + fwrite(blk->msgs[j]->msg, sizeof(WCHAR), len, fp); + + // fill with nulls so it matches aligned_len + for (k=0; k<(aligned_size-(len*sizeof(WCHAR))); k++) + fputc(0, fp); + } + else + { + WCHAR *uc; + char *tmp; + int mlen, len; + const union cptable *cpdef = find_codepage(blk->msgs[j]->cp); + uc = blk->msgs[j]->msg; + + assert(cpdef != NULL); + mlen = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); + tmp = xmalloc(mlen); + if((i = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, tmp, mlen, NULL, NULL)) < 0) + internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i); + + len = strlen(tmp); + fwrite(tmp, sizeof(char), len, fp); + + // fill with nulls so it matches aligned_len + for (k=0; k<(aligned_size-len); k++) + fputc(0, fp); + + free(tmp); + } + + free(cptr); + } + } + + fclose(fp); +} + +void write_bin_files(const char *basedir) +{ + lan_blk_t *lbp; + token_t *ttab; + char fname[MAX_PATH]; + int ntab; + int i; + + get_tokentable(&ttab, &ntab); + + for(lbp = lanblockhead; lbp; lbp = lbp->next) + { + char *cptr = NULL; + for(i = 0; i < ntab; i++) + { + if(ttab[i].type == tok_language && ttab[i].token == lbp->lan) + { + if(ttab[i].alias) + cptr = dup_u2c(WMC_DEFAULT_CODEPAGE, ttab[i].alias); + break; + } + } + if(!cptr) + internal_error(__FILE__, __LINE__, "Filename vanished for language 0x%0x\n", lbp->lan); + + sprintf(fname, "%s%s.bin", basedir, cptr); + write_bin_file(fname, lbp); + + free(cptr); + } +} Modified: trunk/reactos/tools/wmc/write.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/write.h?rev=3135… ============================================================================== --- trunk/reactos/tools/wmc/write.h (original) +++ trunk/reactos/tools/wmc/write.h Thu Dec 20 16:11:30 2007 @@ -22,6 +22,6 @@ void write_h_file(const char *fname); void write_rc_file(const char *fname); -void write_bin_files(void); +void write_bin_files(const char *basedir); #endif

1 0

[fireball] 31351: - Provide ntcfgx.dll a preferred baseaddress.
by fireball＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: fireball Date: Thu Dec 20 16:07:06 2007 New Revision: 31351 URL: http://svn.reactos.org/svn/reactos?rev=31351&view=rev Log: - Provide ntcfgx.dll a preferred baseaddress. Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=313… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Thu Dec 20 16:07:06 2007 @@ -95,6 +95,7 @@ <property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> <property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> <property name="BASEADDRESS_CABINET" value="0x75120000" /> + <property name="BASEADDRESS_NETCFGX" value="0x755F0000" /> <property name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> <property name="BASEADDRESS_MSGINA" value="0x75970000" /> <property name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild Thu Dec 20 16:07:06 2007 @@ -1,4 +1,4 @@ -<module name="netcfgx" type="win32dll" entrypoint="0" installbase="system32" installname="netcfgx.dll"> +<module name="netcfgx" type="win32dll" baseaddress="${BASEADDRESS_NETCFGX}" entrypoint="0" installbase="system32" installname="netcfgx.dll"> <importlibrary definition="netcfgx.def" /> <file>netcfgx.c</file> <library>ntdll</library>

1 0

[fireball] 31350: - Make VBEMP look like a legacy driver. - Reorganize VideoPortInitialize (firstly do all checks, then do Driver Object Extension related operations). - Fix the hack Magnus Olsen added for the "No PNP videocard" problem, by adding a real check Windows 2003 SP1 videoport driver is performing (information got by building "stub" miniports and trying to load them with a checked build of W2K3SP1's videoprt.sys). - Add stubbed handler for IRP_MJ_SYSTEM_CONTROL (for PnP miniports) and
by fireball＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: fireball Date: Thu Dec 20 15:31:39 2007 New Revision: 31350 URL: http://svn.reactos.org/svn/reactos?rev=31350&view=rev Log: - Make VBEMP look like a legacy driver. - Reorganize VideoPortInitialize (firstly do all checks, then do Driver Object Extension related operations). - Fix the hack Magnus Olsen added for the "No PNP videocard" problem, by adding a real check Windows 2003 SP1 videoport driver is performing (information got by building "stub" miniports and trying to load them with a checked build of W2K3SP1's videoprt.sys). - Add stubbed handler for IRP_MJ_SYSTEM_CONTROL (for PnP miniports) and IRP_MJ_INTERNAL_DEVICE_CONTROL. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c trunk/reactos/drivers/video/videoprt/dispatch.c trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/drivers/video/videoprt/videoprt.h Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c Thu Dec 20 15:31:39 2007 @@ -42,9 +42,9 @@ InitData.HwInitialize = VBEInitialize; InitData.HwStartIO = VBEStartIO; InitData.HwResetHw = VBEResetHw; - InitData.HwGetPowerState = VBEGetPowerState; - InitData.HwSetPowerState = VBESetPowerState; - InitData.HwGetVideoChildDescriptor = VBEGetVideoChildDescriptor; + //InitData.HwGetPowerState = VBEGetPowerState; + //InitData.HwSetPowerState = VBESetPowerState; + //InitData.HwGetVideoChildDescriptor = VBEGetVideoChildDescriptor; InitData.HwDeviceExtensionSize = sizeof(VBE_DEVICE_EXTENSION); return VideoPortInitialize(Context1, Context2, &InitData, NULL); Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c Thu Dec 20 15:31:39 2007 @@ -509,6 +509,14 @@ return STATUS_NOT_IMPLEMENTED; } +NTSTATUS NTAPI +IntVideoPortDispatchSystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return STATUS_NOT_IMPLEMENTED; +} + VOID NTAPI IntVideoPortUnload(PDRIVER_OBJECT DriverObject) { Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Thu Dec 20 15:31:39 2007 @@ -1,7 +1,7 @@ /* * VideoPort driver * - * Copyright (C) ReactOS Team + * Copyright (C) 2002-2004, 2007 ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -553,7 +553,7 @@ PUNICODE_STRING RegistryPath = Context2; NTSTATUS Status; PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; - BOOL LegacyDetection = FALSE; + BOOLEAN PnpDriver = FALSE, LegacyDetection = FALSE; DPRINT("VideoPortInitialize\n"); @@ -571,6 +571,63 @@ HwInitializationData->HwStartIO == NULL) { return STATUS_INVALID_PARAMETER; + } + + switch (HwInitializationData->HwInitDataSize) + { + /* + * NT4 drivers are special case, because we must use legacy method + * of detection instead of the Plug & Play one. + */ + + case SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA: + DPRINT("We were loaded by a Windows NT miniport driver.\n"); + break; + + case SIZE_OF_W2K_VIDEO_HW_INITIALIZATION_DATA: + DPRINT("We were loaded by a Windows 2000 miniport driver.\n"); + break; + + case sizeof(VIDEO_HW_INITIALIZATION_DATA): + DPRINT("We were loaded by a Windows XP or later miniport driver.\n"); + break; + + default: + DPRINT("Invalid HwInitializationData size.\n"); + return STATUS_UNSUCCESSFUL; + } + + /* Set dispatching routines */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = IntVideoPortDispatchOpen; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = IntVideoPortDispatchClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = + IntVideoPortDispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = + IntVideoPortDispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_WRITE] = + IntVideoPortDispatchWrite; // ReactOS-specific hack + DriverObject->DriverUnload = IntVideoPortUnload; + + /* Determine type of the miniport driver */ + if ((HwInitializationData->HwInitDataSize >= + FIELD_OFFSET(VIDEO_HW_INITIALIZATION_DATA, HwQueryInterface)) + && HwInitializationData->HwSetPowerState + && HwInitializationData->HwGetPowerState + && HwInitializationData->HwGetVideoChildDescriptor) + { + DPRINT("The miniport is a PnP miniport driver\n"); + PnpDriver = TRUE; + } + + /* Check if legacy detection should be applied */ + if (!PnpDriver || HwContext) + { + DPRINT("Legacy detection for adapter interface %d\n", + HwInitializationData->AdapterInterfaceType); + + /* FIXME: Move the code for legacy detection + to another function and call it here */ + LegacyDetection = TRUE; } /* @@ -643,45 +700,6 @@ } DriverExtension->HwContext = HwContext; - switch (HwInitializationData->HwInitDataSize) - { - /* - * NT4 drivers are special case, because we must use legacy method - * of detection instead of the Plug & Play one. - */ - - case SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA: - DPRINT("We were loaded by a Windows NT miniport driver.\n"); - LegacyDetection = TRUE; - break; - - case SIZE_OF_W2K_VIDEO_HW_INITIALIZATION_DATA: - DPRINT("We were loaded by a Windows 2000 miniport driver.\n"); - break; - - case sizeof(VIDEO_HW_INITIALIZATION_DATA): - DPRINT("We were loaded by a Windows XP or later miniport driver.\n"); - break; - - default: - DPRINT("Invalid HwInitializationData size.\n"); - return STATUS_UNSUCCESSFUL; - } - - /* We can't check HwInitializationData->AdapterInterfaceType to know if - * we have to use legacy detection, as MSDN states that this member is - * ignored by videoprt and should remain zero-initialized. - * Force legacy detection, so NT4 drivers will still work on ReactOS. - * WARNING: this will cause all Plug-and-Play IRPs to fail. - */ - LegacyDetection = TRUE; - - DriverObject->MajorFunction[IRP_MJ_CREATE] = IntVideoPortDispatchOpen; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = IntVideoPortDispatchClose; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = IntVideoPortDispatchDeviceControl; - DriverObject->MajorFunction[IRP_MJ_WRITE] = IntVideoPortDispatchWrite; - DriverObject->DriverUnload = IntVideoPortUnload; - /* * Plug & Play drivers registers the device in AddDevice routine. For * legacy drivers we must do it now. @@ -710,6 +728,7 @@ DriverObject->DriverExtension->AddDevice = IntVideoPortAddDevice; DriverObject->MajorFunction[IRP_MJ_PNP] = IntVideoPortDispatchPnp; DriverObject->MajorFunction[IRP_MJ_POWER] = IntVideoPortDispatchPower; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = IntVideoPortDispatchSystemControl; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h Thu Dec 20 15:31:39 2007 @@ -165,6 +165,11 @@ IN PIRP Irp); NTSTATUS NTAPI +IntVideoPortDispatchSystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS NTAPI IntVideoPortDispatchWrite( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp);

1 0

[jimtabor] 31349: Add a test to see which is the naughty handle type abusing the system. Free = 0 Window = 225 Menu = 116 CursorIcon = 1695 Hook = 2 CallProc = 6 Accel = 3 Monitor = 1
by jimtabor＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: jimtabor Date: Thu Dec 20 05:36:38 2007 New Revision: 31349 URL: http://svn.reactos.org/svn/reactos?rev=31349&view=rev Log: Add a test to see which is the naughty handle type abusing the system. Free = 0 Window = 225 Menu = 116 CursorIcon = 1695 Hook = 2 CallProc = 6 Accel = 3 Monitor = 1 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c Thu Dec 20 05:36:38 2007 @@ -68,7 +68,47 @@ if (ht->nb_handles >= ht->allocated_handles) /* need to grow the array */ { - DPRINT1("Out of user handles!\n"); +/**/ + int i, iFree = 0, iWindow = 0, iMenu = 0, iCursorIcon = 0, + iHook = 0, iCallProc = 0, iAccel = 0, iMonitor = 0; + /**/ + DPRINT1("Out of user handles! Used -> %i, NM_Handle -> %d\n", usedHandles, ht->nb_handles); +//#if 0 + for(i = 0; i < ht->nb_handles; i++) + { + switch (ht->handles[i].type) + { + case otFree: // Should be zero. + iFree++; + break; + case otWindow: + iWindow++; + break; + case otMenu: + iMenu++; + break; + case otCursorIcon: + iCursorIcon++; + break; + case otHook: + iHook++; + break; + case otCallProc: + iCallProc++; + break; + case otAccel: + iAccel++; + break; + case otMonitor: + iMonitor++; + break; + default: + break; + } + } + DPRINT1("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d\n", + iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor ); +//#endif return NULL; #if 0 PUSER_HANDLE_ENTRY new_handles;

1 0

[cfinck] 31348: Remove this deprecated wchar_t logic. We needed it, when host and target headers weren't fully separated, but this greatly improved now :-)
by cfinck＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: cfinck Date: Thu Dec 20 03:30:20 2007 New Revision: 31348 URL: http://svn.reactos.org/svn/reactos?rev=31348&view=rev Log: Remove this deprecated wchar_t logic. We needed it, when host and target headers weren't fully separated, but this greatly improved now :-) 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=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Thu Dec 20 03:30:20 2007 @@ -49,26 +49,8 @@ #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_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_ -#ifndef _WCHAR_T_DEFINED /* If you want to override the wchar_t setting, define this */ #ifndef __cplusplus - typedef unsigned short wchar_t; -#endif -#endif -#endif -#endif -#endif - -/* Set _WCHAR_T_DEFINED for the case that this is checked later */ -#ifndef _WCHAR_T_DEFINED -#define _WCHAR_T_DEFINED + typedef unsigned short wchar_t; #endif #include <ctype.h>

1 0

[cfinck] 31347: - Don't reinvent the wheel again: Use <host/typedefs.h> in winebuild instead of defining the types for the host manually again - Get rid of the "include/psdk" include directory in the winebuild makefile - Add a definition for UINT_PTR and PUINT_PTR to <host/typedefs.h>
by cfinck＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: cfinck Date: Thu Dec 20 03:20:01 2007 New Revision: 31347 URL: http://svn.reactos.org/svn/reactos?rev=31347&view=rev Log: - Don't reinvent the wheel again: Use <host/typedefs.h> in winebuild instead of defining the types for the host manually again - Get rid of the "include/psdk" include directory in the winebuild makefile - Add a definition for UINT_PTR and PUINT_PTR to <host/typedefs.h> Modified: trunk/reactos/include/host/typedefs.h trunk/reactos/tools/winebuild/winebuild.mak trunk/reactos/tools/winebuild/winglue.h Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h (original) +++ trunk/reactos/include/host/typedefs.h Thu Dec 20 03:20:01 2007 @@ -71,7 +71,7 @@ typedef long long LONGLONG; typedef unsigned long long ULONGLONG; typedef int INT; -typedef unsigned int UINT, *PUINT, *LPUINT; +typedef unsigned int UINT, *PUINT, *LPUINT, UINT_PTR, *PUINT_PTR; typedef UCHAR BOOLEAN, *PBOOLEAN; typedef int BOOL; typedef long int W64 LONG_PTR, *PLONG_PTR; Modified: trunk/reactos/tools/winebuild/winebuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… ============================================================================== --- trunk/reactos/tools/winebuild/winebuild.mak (original) +++ trunk/reactos/tools/winebuild/winebuild.mak Thu Dec 20 03:20:01 2007 @@ -35,7 +35,7 @@ $(addprefix $(INTERMEDIATE_), $(WINEBUILD_SOURCES:.c=.o)) WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API \ - -Iinclude/reactos/wine -Iinclude -Iinclude/reactos -Iinclude/psdk \ + -Iinclude/reactos/wine -Iinclude -Iinclude/reactos \ -I$(INTERMEDIATE_)include WINEBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?… ============================================================================== --- trunk/reactos/tools/winebuild/winglue.h (original) +++ trunk/reactos/tools/winebuild/winglue.h Thu Dec 20 03:20:01 2007 @@ -1,18 +1,7 @@ #ifndef _WINGLUE_H #define _WINGLUE_H -typedef unsigned char BYTE; -typedef unsigned short WORD; -typedef unsigned long DWORD; -typedef unsigned short WCHAR; -#if defined(_WIN64) -typedef unsigned __int64 UINT_PTR; -#else -typedef unsigned int UINT_PTR; -#endif - -#define LOBYTE(w) ((BYTE)(w)) -#define HIBYTE(w) ((BYTE)(((WORD)(w)>>8)&0xFF)) +#include <host/typedefs.h> #define DLL_PROCESS_ATTACH 1 #define DLL_PROCESS_DETACH 0

1 0

[cfinck] 31346: - Bump the version to 1.1-SVN - Add the list of changed components from 0.3.6 to 1.1 - Add "scut" to the build - Update svn:ignore for the "sources" directory
by cfinck＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: cfinck Date: Thu Dec 20 03:03:17 2007 New Revision: 31346 URL: http://svn.reactos.org/svn/reactos?rev=31346&view=rev Log: - Bump the version to 1.1-SVN - Add the list of changed components from 0.3.6 to 1.1 - Add "scut" to the build - Update svn:ignore for the "sources" directory Modified: trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/sources/ (props changed) Modified: trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/RosBE-Build… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh (original) +++ trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh Thu Dec 20 03:03:17 2007 @@ -7,8 +7,8 @@ # Released under GNU GPL v2 or any later version. # Constants -ROSBE_VERSION="0.3.7-SVN" -KNOWN_ROSBE_VERSIONS="0.3.6 0.3.7-SVN" +ROSBE_VERSION="1.1-SVN" +KNOWN_ROSBE_VERSIONS="0.3.6 1.1-SVN" DEFAULT_INSTALL_DIR="/usr/RosBE" NEEDED_TOOLS="bison flex gcc g++ grep makeinfo" # GNU Make has a special check @@ -274,6 +274,7 @@ process_make=false process_nasm=false process_buildtime=false + process_scut=false # Logic behind this update part: # - KNOWN_ROSBE_VERSIONS contains all versions from the oldest to the newest one (in this order!) @@ -289,8 +290,14 @@ if $setvalues; then case "$known_version" in "0.3.6") - # TODO: Define what has to be reprocessed, when updating from 0.3.6 to the next version + # Updated components from 0.3.6 to 1.1 process_cpucount=true + process_mingwruntime=true + process_w32api=true + process_binutils=true + process_gcc=true + process_nasm=true + process_scut=true ;; esac fi @@ -304,6 +311,7 @@ process_make=true process_nasm=true process_buildtime=true + process_scut=true # Create the directory if necessary if $createdir; then @@ -492,6 +500,12 @@ checkrun fi +if $process_scut; then + echo -n "Compiling scut..." + gcc -o "$installdir/bin/scut" "$SCRIPTDIR/tools/scut.c" + checkrun +fi + echo -n "Removing unneeded files... " rm -rf "$installdir/mingw32/sys-include" rm -rf "$installdir/info" Propchange: trunk/tools/RosBE/RosBE-Unix/sources/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Dec 20 03:03:17 2007 @@ -1,0 +1,1 @@ +*.tar.bz2

1 0

[jimtabor] 31345: Reorder code since it is a POWNED DC.
by jimtabor＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: jimtabor Date: Thu Dec 20 02:48:07 2007 New Revision: 31345 URL: http://svn.reactos.org/svn/reactos?rev=31345&view=rev Log: Reorder code since it is a POWNED DC. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Dec 20 02:48:07 2007 @@ -630,15 +630,11 @@ if (Window->Wnd->Class->Style & CS_CLASSDC || Window->Wnd->Style & CS_CLASSDC) /* Test Class first */ { - PWINDOW_OBJECT CurrentWindow; if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/ DceDeleteClipRgn(pDCE); - CurrentWindow = UserGetWindowObject(pDCE->hwndCurrent); - if (CurrentWindow) - { // Update and reset Vis Rgn and clear the dirty bit. - // Should release VisRgn than reset it to default. - DceUpdateVisRgn(pDCE, CurrentWindow, pDCE->DCXFlags); - } + // Update and reset Vis Rgn and clear the dirty bit. + // Should release VisRgn than reset it to default. + DceUpdateVisRgn(pDCE, Window, pDCE->DCXFlags); pDCE->DCXFlags = DCX_DCEEMPTY; pDCE->hwndCurrent = 0; }

1 0

[jimtabor] 31344: Fix a problem when freeing a window class with dirty bit set.
by jimtabor＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: jimtabor Date: Thu Dec 20 02:26:04 2007 New Revision: 31344 URL: http://svn.reactos.org/svn/reactos?rev=31344&view=rev Log: Fix a problem when freeing a window class with dirty bit set. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Dec 20 02:26:04 2007 @@ -557,11 +557,6 @@ if (Dce->DCXFlags & DCX_CACHE) { DPRINT("ENTER!!!!!! DCX_CACHE!!!!!! hDC-> %x\n", Dce->hDC); - if (Dce->pProcess) - { - DPRINT1("POWNED!\n"); - return NULL; // should assert here. - } // Need to set ownership so Sync dcattr will work. DC_SetOwnership( Dce->hDC, PsGetCurrentProcess()); DC_AllocateDcAttr( Dce->hDC ); // Allocate new dcattr @@ -635,8 +630,16 @@ if (Window->Wnd->Class->Style & CS_CLASSDC || Window->Wnd->Style & CS_CLASSDC) /* Test Class first */ { + PWINDOW_OBJECT CurrentWindow; if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/ DceDeleteClipRgn(pDCE); + CurrentWindow = UserGetWindowObject(pDCE->hwndCurrent); + if (CurrentWindow) + { // Update and reset Vis Rgn and clear the dirty bit. + // Should release VisRgn than reset it to default. + DceUpdateVisRgn(pDCE, CurrentWindow, pDCE->DCXFlags); + } + pDCE->DCXFlags = DCX_DCEEMPTY; pDCE->hwndCurrent = 0; } else if (Window->Wnd->Class->Style & CS_OWNDC || @@ -665,7 +668,6 @@ DPRINT1("[%p] GetDC() without ReleaseDC()!\n", Window->hSelf); DceReleaseDC(pDCE, FALSE); } - pDCE->DCXFlags |= DCX_DCEEMPTY; pDCE->hwndCurrent = 0; }

1 0

[cfinck] 31343: - Fix indentation I accidentally broke - Update svn:ignore for both affected directories
by cfinck＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: cfinck Date: Thu Dec 20 01:07:53 2007 New Revision: 31343 URL: http://svn.reactos.org/svn/reactos?rev=31343&view=rev Log: - Fix indentation I accidentally broke - Update svn:ignore for both affected directories Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ (props changed) trunk/tools/RosBE/Tools/ (props changed) trunk/tools/RosBE/Tools/scut.c Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Dec 20 01:07:53 2007 @@ -1,7 +1,1 @@ *.exe -*.sln -*.ncb -*.suo -*.user -Debug -Release Propchange: trunk/tools/RosBE/Tools/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Dec 20 01:07:53 2007 @@ -1,1 +1,7 @@ *.exe +*.sln +*.ncb +*.suo +*.user +Debug +Release Modified: trunk/tools/RosBE/Tools/scut.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/scut.c?rev=31343… ============================================================================== --- trunk/tools/RosBE/Tools/scut.c (original) +++ trunk/tools/RosBE/Tools/scut.c Thu Dec 20 01:07:53 2007 @@ -14,23 +14,23 @@ #include <string.h> #if defined(WIN32) -# include <direct.h> -# include <io.h> - -# define paccess(path, mode) _access(path, mode) -# define pchdir(path) _chdir(path) -# define pgetcwd(buffer, maxlen) _getcwd(buffer, maxlen) -# define pmkdir(path) _mkdir(path) -# define pstricmp(str1, str2) _stricmp(str1, str2) +# include <direct.h> +# include <io.h> + +# define paccess(path, mode) _access(path, mode) +# define pchdir(path) _chdir(path) +# define pgetcwd(buffer, maxlen) _getcwd(buffer, maxlen) +# define pmkdir(path) _mkdir(path) +# define pstricmp(str1, str2) _stricmp(str1, str2) #else -# include <sys/stat.h> -# include <unistd.h> - -# define paccess(path, mode) access(path, mode) -# define pchdir(path) chdir(path) -# define pgetcwd(buffer, maxlen) getcwd(buffer, maxlen) -# define pmkdir(path) mkdir(path, S_IRWXU | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) // chmod rights: 0755 -# define pstricmp(str1, str2) strcasecmp(str1, str2) +# include <sys/stat.h> +# include <unistd.h> + +# define paccess(path, mode) access(path, mode) +# define pchdir(path) chdir(path) +# define pgetcwd(buffer, maxlen) getcwd(buffer, maxlen) +# define pmkdir(path) mkdir(path, S_IRWXU | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) // chmod rights: 0755 +# define pstricmp(str1, str2) strcasecmp(str1, str2) #endif

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