Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[cgutman] 41736: - Don't cancel already completed requests - Fix potential NULL pointer access - Actually disassociate the address file and connection in DispTdiDisassociateAddress - Insert new requests at the end of the list not the beginning
by cgutman＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: cgutman Date: Thu Jul 2 10:51:34 2009 New Revision: 41736 URL: http://svn.reactos.org/svn/reactos?rev=41736&view=rev Log: - Don't cancel already completed requests - Fix potential NULL pointer access - Actually disassociate the address file and connection in DispTdiDisassociateAddress - Insert new requests at the end of the list not the beginning Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Thu Jul 2 10:51:34 2009 @@ -85,15 +85,6 @@ IoAcquireCancelSpinLock(&OldIrql); (void)IoSetCancelRoutine(Irp, NULL); - - if (Irp->Cancel || TranContext->CancelIrps) { - /* The IRP has been cancelled */ - - TI_DbgPrint(DEBUG_IRP, ("IRP is cancelled.\n")); - - Status = STATUS_CANCELLED; - Count = 0; - } IoReleaseCancelSpinLock(OldIrql); @@ -463,6 +454,12 @@ TI_DbgPrint(MID_TRACE, ("No address file is asscociated.\n")); return STATUS_INVALID_PARAMETER; } + + /* Remove this connection from the address file */ + Connection->AddressFile->Connection = NULL; + + /* Remove the address file from this connection */ + Connection->AddressFile = NULL; return STATUS_SUCCESS; } Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Thu Jul 2 10:51:34 2009 @@ -149,7 +149,7 @@ Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; IoMarkIrpPending((PIRP)Context); - InsertHeadList( &Listener->ListenRequest, &Bucket->Entry ); + InsertTailList( &Listener->ListenRequest, &Bucket->Entry ); } else Status = STATUS_NO_MEMORY; } Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Thu Jul 2 10:51:34 2009 @@ -588,6 +588,11 @@ &RemoteAddress, &RemotePort); + if (!NT_SUCCESS(Status)) { + TI_DbgPrint(DEBUG_TCP, ("Could not AddrBuildAddress in TCPConnect\n")); + return Status; + } + if (!(NCE = RouteGetRouteToDestination(&RemoteAddress))) { return STATUS_NETWORK_UNREACHABLE; @@ -606,12 +611,6 @@ ("Connecting to address %x:%x\n", RemoteAddress.Address.IPv4Address, RemotePort)); - - if (!NT_SUCCESS(Status)) { - TI_DbgPrint(DEBUG_TCP, ("Could not AddrBuildAddress in TCPConnect\n")); - TcpipRecursiveMutexLeave( &TCPLock ); - return Status; - } AddressToConnect.sin_family = AF_INET; AddressToBind = AddressToConnect; @@ -645,7 +644,7 @@ IoMarkIrpPending((PIRP)Context); - InsertHeadList( &Connection->ConnectRequest, &Bucket->Entry ); + InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); } }

1 0

[jimtabor] 41735: - wine sync dde.c and dde_private.h to 1.1.24.
by jimtabor＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: jimtabor Date: Thu Jul 2 09:07:12 2009 New Revision: 41735 URL: http://svn.reactos.org/svn/reactos?rev=41735&view=rev Log: - wine sync dde.c and dde_private.h to 1.1.24. Modified: trunk/reactos/dll/win32/user32/include/dde_private.h trunk/reactos/dll/win32/user32/misc/dde.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/include/dde_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/d… ============================================================================== --- trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] Thu Jul 2 09:07:12 2009 @@ -157,7 +157,6 @@ BOOL monitor; /* have these two as full Booleans cos they'll be tested frequently */ BOOL clientOnly; /* bit wasteful of space but it will be faster */ BOOL unicode; /* Flag to indicate Win32 API used to initialise */ - BOOL win16; /* flag to indicate Win16 API used to initialize */ HSZNode* nodeList; /* for cleaning upon exit */ PFNCALLBACK callback; DWORD CBFflags; @@ -191,9 +190,6 @@ extern HDDEDATA WDML_InvokeCallback(WDML_INSTANCE* pInst, UINT uType, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, ULONG_PTR dwData1, ULONG_PTR dwData2); -extern HDDEDATA WDML_InvokeCallback16(PFNCALLBACK pfn, UINT uType, UINT uFmt, HCONV hConv, - HSZ hsz1, HSZ hsz2, HDDEDATA hdata, - DWORD dwData1, DWORD dwData2); extern WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); extern void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); extern WDML_SERVER* WDML_FindServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); @@ -203,7 +199,7 @@ HDDEDATA WDML_ClientHandle(WDML_CONV *pConv, WDML_XACT *pXAct, DWORD dwTimeout, LPDWORD pdwResult) DECLSPEC_HIDDEN; /* called both in DdeClientTransaction and server side. */ extern UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes, BOOL bUnicode, BOOL b16); + DWORD afCmd, DWORD ulRes, BOOL bUnicode); extern WDML_CONV* WDML_AddConv(WDML_INSTANCE* pInstance, WDML_SIDE side, HSZ hszService, HSZ hszTopic, HWND hwndClient, HWND hwndServer); extern void WDML_RemoveConv(WDML_CONV* pConv, WDML_SIDE side); Modified: trunk/reactos/dll/win32/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] Thu Jul 2 09:07:12 2009 @@ -329,7 +329,7 @@ * */ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes, BOOL bUnicode, BOOL b16) + DWORD afCmd, DWORD ulRes, BOOL bUnicode) { WDML_INSTANCE* pInstance; WDML_INSTANCE* reference_inst; @@ -365,7 +365,6 @@ pInstance->threadID = GetCurrentThreadId(); pInstance->callback = *pfnCallback; pInstance->unicode = bUnicode; - pInstance->win16 = b16; pInstance->nodeList = NULL; /* node will be added later */ pInstance->monitorFlags = afCmd & MF_MASK; pInstance->wStatus = 0; @@ -579,7 +578,7 @@ UINT WINAPI DdeInitializeA(LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes) { - return WDML_Initialize(pidInst, pfnCallback, afCmd, ulRes, FALSE, FALSE); + return WDML_Initialize(pidInst, pfnCallback, afCmd, ulRes, FALSE); } /****************************************************************************** @@ -599,7 +598,7 @@ UINT WINAPI DdeInitializeW(LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes) { - return WDML_Initialize(pidInst, pfnCallback, afCmd, ulRes, TRUE, FALSE); + return WDML_Initialize(pidInst, pfnCallback, afCmd, ulRes, TRUE); } /***************************************************************** @@ -716,12 +715,10 @@ if (pInstance == NULL) return NULL; - TRACE("invoking CB%d[%p] (%x %x %p %p %p %p %lx %lx)\n", - pInstance->win16 ? 16 : 32, pInstance->callback, uType, uFmt, + TRACE("invoking CB[%p] (%x %x %p %p %p %p %lx %lx)\n", + pInstance->callback, uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2); - ret = pInstance->callback(uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2); - TRACE("done => %p\n", ret); return ret; } @@ -1629,7 +1626,7 @@ */ WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) { - static const WCHAR fmtW[] = {'%','s','(','0','x','%','0','8','l','x',')',0}; + static const WCHAR fmtW[] = {'%','s','(','0','x','%','*','x',')',0}; WDML_SERVER* pServer; WCHAR buf1[256]; WCHAR buf2[256]; 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 Jul 2 09:07:12 2009 @@ -231,7 +231,9 @@ reactos/dll/win32/user32/controls/scrollbar.c # Forked reactos/dll/win32/user32/controls/static.c # Synced to Wine-1_1_22 - reactos/dll/win32/user32/misc/dde.c # Synced to wine 1.1.17 (dde_misc.c) + reactos/dll/win32/user32/include/dde_private.h # Synced to wine 1.1.24 + + reactos/dll/win32/user32/misc/dde.c # Synced to wine 1.1.24 (dde_misc.c) reactos/dll/win32/user32/misc/ddeclient.c # Synced to Wine-1_1_23 reactos/dll/win32/user32/misc/ddeserver.c # Synced to Wine-1_1_23 reactos/dll/win32/user32/misc/exticon.c # Synced to Wine-1_1_22

1 0

[cfinck] 41734: - Simplify ERROR_* return values, don't make a difference between "Shutdown for some reason" and "Failed somehow". This should also fix a bug about the entire testing process being canceled when Kdbg is hit. As a consequence, the crash counter was renamed to a "retry counter" and the value for "maxretries" was increased, since the shutdowns in 1st and 2nd stage count as retries now. - Detect whether the same line appears over and over again and reboot the VM in this case to conti
by cfinck＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: cfinck Date: Thu Jul 2 03:30:15 2009 New Revision: 41734 URL: http://svn.reactos.org/svn/reactos?rev=41734&view=rev Log: - Simplify ERROR_* return values, don't make a difference between "Shutdown for some reason" and "Failed somehow". This should also fix a bug about the entire testing process being canceled when Kdbg is hit. As a consequence, the crash counter was renamed to a "retry counter" and the value for "maxretries" was increased, since the shutdowns in 1st and 2nd stage count as retries now. - Detect whether the same line appears over and over again and reboot the VM in this case to continue with the next test. This is done using a line cache and a configurable value of 50 allowed cache hits before we cancel the process. - Simplify some code by leaving out a block for the STDIN_FILENO fd. - Fix return values in case of early failures in ProcessDebugData. - Use "unsigned int" instead of "int" where appropriate. - Add missing license header after talking with Christoph. Modified: trunk/tools/sysreg2/console.c trunk/tools/sysreg2/options.c trunk/tools/sysreg2/raddr2line.c trunk/tools/sysreg2/sysreg.h trunk/tools/sysreg2/sysreg.xml trunk/tools/sysreg2/utils.c trunk/tools/sysreg2/virt.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=41734&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Thu Jul 2 03:30:15 2009 @@ -1,28 +1,43 @@ +/* + * PROJECT: ReactOS System Regression Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Processing the incoming debugging data + * COPYRIGHT: Copyright 2008-2009 Christoph von Wittich <christoph_vw(a)reactos.org> + * Copyright 2009 Colin Finck <colin(a)reactos.org> + */ + #include "sysreg.h" +#define BUFFER_SIZE 512 int ProcessDebugData(const char* tty, int timeout, int stage ) { - char buf[512]; - char rbuf[512]; + char Buffer[BUFFER_SIZE]; + char CacheBuffer[BUFFER_SIZE]; + char Raddr2LineBuffer[BUFFER_SIZE]; char* bp; int got; - int ttyfd, i; + int Ret = EXIT_DONT_CONTINUE; + int ttyfd; struct termios ttyattr, rawattr; - int Ret = EXIT_NONCONTINUABLE_ERROR; - int KdbgHit = 0; + unsigned int CacheHits = 0; + unsigned int i; + unsigned int KdbgHit = 0; + + /* Initialize CacheBuffer with an empty string */ + *CacheBuffer = 0; /* ttyfd is the file descriptor of the virtual COM port */ if ((ttyfd = open(tty, O_NOCTTY | O_RDWR)) < 0) { SysregPrintf("error opening tty\n"); - return false; + return Ret; } /* We also monitor STDIN_FILENO, so a user can cancel the process with ESC */ if (tcgetattr(STDIN_FILENO, &ttyattr) < 0) { SysregPrintf("tcgetattr failed with error %d\n", errno); - return false; + return Ret; } rawattr = ttyattr; @@ -36,10 +51,10 @@ if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &rawattr) < 0) { SysregPrintf("tcsetattr failed with error %d\n", errno); - return false; - } - - while (1) + return Ret; + } + + for(;;) { struct pollfd fds[] = { { STDIN_FILENO, POLLIN, 0 }, @@ -60,7 +75,7 @@ { /* timeout */ SysregPrintf("timeout\n"); - Ret = EXIT_ERROR; + Ret = EXIT_CONTINUE; goto cleanup; } @@ -70,10 +85,10 @@ if (!(fds[i].revents & POLLIN)) continue; - bp = buf; + bp = Buffer; /* Read one line or a maximum of 511 bytes into a buffer (leave space for the null character) */ - while (bp - buf < sizeof(buf) - 1) + while (bp - Buffer < (BUFFER_SIZE - 1)) { got = read(fds[i].fd, bp, 1); @@ -87,10 +102,6 @@ /* No more data */ break; } - - /* Also break on newlines */ - if(*bp == '\n') - break; if (fds[i].fd == STDIN_FILENO) { @@ -100,67 +111,94 @@ } else { + /* Also break on newlines */ + if(*bp == '\n') + break; + /* KDBG doesn't send a newline */ - if ((strstr(buf, "kdb:>")) || - (strstr(buf, "--- Press q"))) + if ((strstr(Buffer, "kdb:>")) || + (strstr(Buffer, "--- Press q"))) break; } ++bp; } - if (bp == buf) - { - /* This usually means the machine shut down (like in 1st or 2nd stage) */ - Ret = EXIT_SHUTDOWN; + /* The rest of this logic is just about processing the serial output */ + if(fds[i].fd == STDIN_FILENO) + continue; + + /* Check whether the message is of zero length */ + if (bp == Buffer) + { + /* This can happen when the machine shut down (like after 1st or 2nd stage) + or after we got a Kdbg backtrace. */ + Ret = EXIT_CONTINUE; goto cleanup; } + /* Null-terminate the line */ *(++bp) = 0; - /* Now check the output */ - if (fds[i].fd != STDIN_FILENO) - { - /* Check for "magic" sequences */ - if (strstr(buf, "kdb:>")) - { - ++KdbgHit; - - if (KdbgHit == 1) - { - /* We hit Kdbg for the first time, get a backtrace for the log */ - safewrite(ttyfd, "bt\r", 3); - continue; - } - else - { - /* We hit it yet another time, give up here */ - Ret = EXIT_ERROR; - goto cleanup; - } - } - else if (strstr(buf, "--- Press q")) - { - /* Send Return to get more data from Kdbg */ - safewrite(ttyfd, "\r", 1); + /* Detect whether the same line appears over and over again. + If that is the case, cancel this test after a specified number of repetitions. */ + if(!strcmp(Buffer, CacheBuffer)) + { + ++CacheHits; + + if(CacheHits > AppSettings.MaxCacheHits) + { + SysregPrintf("Test seems to be stuck in an endless loop, canceled!\n"); + Ret = EXIT_CONTINUE; + goto cleanup; + } + } + else + { + CacheHits = 0; + memcpy(CacheBuffer, Buffer, bp - Buffer); + } + + /* Output the line, raddr2line the included addresses if necessary */ + if (ResolveAddressFromFile(Raddr2LineBuffer, BUFFER_SIZE, Buffer)) + printf("%s", Raddr2LineBuffer); + else + printf("%s", Buffer); + + /* Check for "magic" sequences */ + if (strstr(Buffer, "kdb:>")) + { + ++KdbgHit; + + if (KdbgHit == 1) + { + /* We hit Kdbg for the first time, get a backtrace for the log */ + safewrite(ttyfd, "bt\r", 3); continue; } - else if (strstr(buf, "SYSREG_ROSAUTOTEST_FAILURE")) - { - /* rosautotest itself has problems, so there's no reason to continue */ + else + { + /* We hit it yet another time, give up here */ + Ret = EXIT_CONTINUE; goto cleanup; } - else if (*AppSettings.Stage[stage].Checkpoint && strstr(buf, AppSettings.Stage[stage].Checkpoint)) - { - /* We reached a checkpoint, so return success */ - Ret = EXIT_CHECKPOINT_REACHED; - goto cleanup; - } - - if (ResolveAddressFromFile(rbuf, sizeof(rbuf), buf)) - printf("%s", rbuf); - else - printf("%s", buf); + } + else if (strstr(Buffer, "--- Press q")) + { + /* Send Return to get more data from Kdbg */ + safewrite(ttyfd, "\r", 1); + continue; + } + else if (strstr(Buffer, "SYSREG_ROSAUTOTEST_FAILURE")) + { + /* rosautotest itself has problems, so there's no reason to continue */ + goto cleanup; + } + else if (*AppSettings.Stage[stage].Checkpoint && strstr(Buffer, AppSettings.Stage[stage].Checkpoint)) + { + /* We reached a checkpoint, so return success */ + Ret = EXIT_CHECKPOINT_REACHED; + goto cleanup; } } } @@ -172,4 +210,3 @@ return Ret; } - Modified: trunk/tools/sysreg2/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/options.c?rev=41734&… ============================================================================== --- trunk/tools/sysreg2/options.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/options.c [iso-8859-1] Thu Jul 2 03:30:15 2009 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS System Regression Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Loading the utility settings + * COPYRIGHT: Copyright 2008-2009 Christoph von Wittich <christoph_vw(a)reactos.org> + * Copyright 2009 Colin Finck <colin(a)reactos.org> + */ + #include "sysreg.h" bool LoadSettings(const char* XmlConfig) @@ -51,10 +59,18 @@ if (obj) xmlXPathFreeObject(obj); - obj = xmlXPathEval(BAD_CAST"number(/settings/general/maxcrashes/@value)",ctxt); + obj = xmlXPathEval(BAD_CAST"number(/settings/general/maxcachehits/@value)",ctxt); if ((obj != NULL) && (obj->type == XPATH_NUMBER)) { - AppSettings.MaxCrashes = (int)obj->floatval; + AppSettings.MaxCacheHits = (unsigned int)obj->floatval; + } + if (obj) + xmlXPathFreeObject(obj); + + obj = xmlXPathEval(BAD_CAST"number(/settings/general/maxretries/@value)",ctxt); + if ((obj != NULL) && (obj->type == XPATH_NUMBER)) + { + AppSettings.MaxRetries = (unsigned int)obj->floatval; } if (obj) xmlXPathFreeObject(obj); Modified: trunk/tools/sysreg2/raddr2line.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/raddr2line.c?rev=417… ============================================================================== --- trunk/tools/sysreg2/raddr2line.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/raddr2line.c [iso-8859-1] Thu Jul 2 03:30:15 2009 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS System Regression Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Integrated raddr2line tool for getting source references from addresses + * COPYRIGHT: Copyright 2008-2009 Christoph von Wittich <christoph_vw(a)reactos.org> + * Copyright 2009 Colin Finck <colin(a)reactos.org> + */ + #include "sysreg.h" bool GetPackagePath(char* Buffer, int BuffSize, char* Module) Modified: trunk/tools/sysreg2/sysreg.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.h?rev=41734&r… ============================================================================== --- trunk/tools/sysreg2/sysreg.h [iso-8859-1] (original) +++ trunk/tools/sysreg2/sysreg.h [iso-8859-1] Thu Jul 2 03:30:15 2009 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS System Regression Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Shared header + * COPYRIGHT: Copyright 2008-2009 Christoph von Wittich <christoph_vw(a)reactos.org> + * Copyright 2009 Colin Finck <colin(a)reactos.org> + */ + #include <fcntl.h> #include <libvirt.h> #include <poll.h> @@ -16,9 +24,8 @@ #include <sys/sysinfo.h> #define EXIT_CHECKPOINT_REACHED 0 -#define EXIT_SHUTDOWN 1 -#define EXIT_ERROR 2 -#define EXIT_NONCONTINUABLE_ERROR 3 +#define EXIT_CONTINUE 1 +#define EXIT_DONT_CONTINUE 2 #define NUM_STAGES 3 typedef struct { @@ -27,13 +34,14 @@ } stage; typedef struct { - int MaxCrashes; int Timeout; char Filename[255]; char Name[80]; char HardDiskImage[255]; int ImageSize; stage Stage[3]; + unsigned int MaxCacheHits; + unsigned int MaxRetries; } Settings; Settings AppSettings; Modified: trunk/tools/sysreg2/sysreg.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.xml?rev=41734… ============================================================================== --- trunk/tools/sysreg2/sysreg.xml [iso-8859-1] (original) +++ trunk/tools/sysreg2/sysreg.xml [iso-8859-1] Thu Jul 2 03:30:15 2009 @@ -6,8 +6,13 @@  <hdd size="512"/> -  - <maxcrashes value="10" /> +  + <maxcachehits value="50" /> + +  + <maxretries value="15" /> </general> <firststage bootdevice="cdrom"> </firststage> Modified: trunk/tools/sysreg2/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/utils.c?rev=41734&r1… ============================================================================== --- trunk/tools/sysreg2/utils.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/utils.c [iso-8859-1] Thu Jul 2 03:30:15 2009 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS System Regression Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Various auxiliary functions + * COPYRIGHT: Copyright 2008-2009 Christoph von Wittich <christoph_vw(a)reactos.org> + * Copyright 2009 Colin Finck <colin(a)reactos.org> + */ + #include "sysreg.h" ssize_t safewrite(int fd, const void *buf, size_t count) Modified: trunk/tools/sysreg2/virt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=41734&r1=… ============================================================================== --- trunk/tools/sysreg2/virt.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Thu Jul 2 03:30:15 2009 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS System Regression Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Main entry point and controlling the virtual machine + * COPYRIGHT: Copyright 2008-2009 Christoph von Wittich <christoph_vw(a)reactos.org> + * Copyright 2009 Colin Finck <colin(a)reactos.org> + */ + #include "sysreg.h" bool GetConsole(virDomainPtr vDomPtr, char* console) @@ -145,13 +153,13 @@ virConnectPtr vConn = NULL; virDomainPtr vDom; virDomainInfo info; - int Crashes; - int Stage; char qemu_img_cmdline[300]; FILE* file; char config[255]; - int Ret = EXIT_NONCONTINUABLE_ERROR; + int Ret = EXIT_DONT_CONTINUE; char console[50]; + unsigned int Retries; + unsigned int Stage; if (argc == 2) strcpy(config, argv[1]); @@ -193,7 +201,7 @@ for(Stage = 0; Stage < NUM_STAGES; Stage++) { - for(Crashes = 0; Crashes < AppSettings.MaxCrashes; Crashes++) + for(Retries = 0; Retries < AppSettings.MaxRetries; Retries++) { vDom = LaunchVirtualMachine(vConn, AppSettings.Filename, AppSettings.Stage[Stage].BootDevice); @@ -223,19 +231,19 @@ /* If we have a checkpoint to reach for success, assume that the application used for running the tests (probably "rosautotest") continues with the next test after a VM restart. */ - if (Ret == EXIT_ERROR && *AppSettings.Stage[Stage].Checkpoint) - SysregPrintf("Crash %d encountered, resuming the testing process\n", Crashes); + if (Ret == EXIT_CONTINUE && *AppSettings.Stage[Stage].Checkpoint) + SysregPrintf("Rebooting VM (retry %d)\n", Retries + 1); else break; } - if (Crashes == AppSettings.MaxCrashes) - { - SysregPrintf("Maximum number of allowed crashes exceeded, aborting!\n"); - break; - } - - if (Ret == EXIT_ERROR || Ret == EXIT_NONCONTINUABLE_ERROR) + if (Retries == AppSettings.MaxRetries) + { + SysregPrintf("Maximum number of allowed retries exceeded, aborting!\n"); + break; + } + + if (Ret == EXIT_CONTINUE || Ret == EXIT_DONT_CONTINUE) break; } @@ -250,15 +258,11 @@ SysregPrintf("Status: Reached the checkpoint!\n"); break; - case EXIT_SHUTDOWN: - SysregPrintf("Status: Machine shut down, but did not reach the checkpoint!\n"); - break; - - case EXIT_ERROR: + case EXIT_CONTINUE: SysregPrintf("Status: Failed to reach the checkpoint!\n"); break; - case EXIT_NONCONTINUABLE_ERROR: + case EXIT_DONT_CONTINUE: SysregPrintf("Status: Testing process aborted!\n"); break; }

1 0

[mkupfer] 41733: Mikhail Denisenko <denisenkom AT gmail DOT com> - Add symbols to system menu by using marlett font. - See issue #4450 for details.
by mkupfer＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: mkupfer Date: Thu Jul 2 01:56:44 2009 New Revision: 41733 URL: http://svn.reactos.org/svn/reactos?rev=41733&view=rev Log: Mikhail Denisenko <denisenkom AT gmail DOT com> - Add symbols to system menu by using marlett font. - See issue #4450 for details. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Thu Jul 2 01:56:44 2009 @@ -42,7 +42,6 @@ #define IS_SYSTEM_POPUP(MenuInfo) \ (0 != ((MenuInfo)->Flags & MF_POPUP) && 0 != ((MenuInfo)->Flags & MF_SYSMENU)) -#define IS_MAGIC_ITEM(Bmp) ((int) Bmp <12) #define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1)) #define MENU_ITEM_HBMP_SPACE (5) @@ -307,7 +306,7 @@ Size->cx = Size->cy = 0; /* check if there is a magic menu item associated with this item */ - if (0 != Bmp && IS_MAGIC_ITEM((INT)(Bmp))) + if (IS_MAGIC_BITMAP(Bmp)) { switch((INT_PTR) Bmp) { @@ -339,18 +338,15 @@ case (INT_PTR) HBMMENU_MBAR_CLOSE: case (INT_PTR) HBMMENU_MBAR_MINIMIZE_D: case (INT_PTR) HBMMENU_MBAR_CLOSE_D: + case (INT_PTR) HBMMENU_POPUP_CLOSE: + case (INT_PTR) HBMMENU_POPUP_RESTORE: + case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: + case (INT_PTR) HBMMENU_POPUP_MINIMIZE: /* FIXME: Why we need to subtract these magic values? */ /* to make them smaller than the menu bar? */ Size->cx = GetSystemMetrics(SM_CXSIZE) - 2; Size->cy = GetSystemMetrics(SM_CYSIZE) - 4; return; - case (INT_PTR) HBMMENU_POPUP_CLOSE: - case (INT_PTR) HBMMENU_POPUP_RESTORE: - case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: - case (INT_PTR) HBMMENU_POPUP_MINIMIZE: - default: - FIXME("Magic menu bitmap not implemented\n"); - return; } } @@ -359,6 +355,70 @@ Size->cx = Bm.bmWidth; Size->cy = Bm.bmHeight; } +} + +/*********************************************************************** + * MenuDrawPopupGlyph + * + * Draws popup magic glyphs (can be found in system menu). + */ +static void FASTCALL +MenuDrawPopupGlyph(HDC dc, LPRECT r, INT_PTR popupMagic, BOOL inactive, BOOL hilite) +{ + LOGFONTW lf; + HFONT hFont, hOldFont; + COLORREF clrsave; + INT bkmode; + TCHAR symbol; + switch (popupMagic) + { + case (INT_PTR) HBMMENU_POPUP_RESTORE: + symbol = '2'; + break; + case (INT_PTR) HBMMENU_POPUP_MINIMIZE: + symbol = '0'; + break; + case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: + symbol = '1'; + break; + case (INT_PTR) HBMMENU_POPUP_CLOSE: + symbol = 'r'; + break; + default: + ERR("Invalid popup magic bitmap %d\n", (int)popupMagic); + return; + } + ZeroMemory(&lf, sizeof(LOGFONTW)); + InflateRect(r, -2, -2); + lf.lfHeight = r->bottom - r->top; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + lstrcpy(lf.lfFaceName, TEXT("Marlett")); + hFont = CreateFontIndirect(&lf); + /* save font and text color */ + hOldFont = SelectObject(dc, hFont); + clrsave = GetTextColor(dc); + bkmode = GetBkMode(dc); + /* set color and drawing mode */ + SetBkMode(dc, TRANSPARENT); + if (inactive) + { + /* draw shadow */ + if (!hilite) + { + SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + TextOut(dc, r->left + 1, r->top + 1, &symbol, 1); + } + } + SetTextColor(dc, GetSysColor(inactive ? COLOR_GRAYTEXT : (hilite ? COLOR_HIGHLIGHTTEXT : COLOR_MENUTEXT))); + /* draw selected symbol */ + TextOut(dc, r->left, r->top, &symbol, 1); + /* restore previous settings */ + SetTextColor(dc, clrsave); + SelectObject(dc, hOldFont); + SetBkMode(dc, bkmode); + DeleteObject(hFont); } /*********************************************************************** @@ -382,7 +442,7 @@ Bmp = hbmpToDraw; /* Check if there is a magic menu item associated with this item */ - if (IS_MAGIC_ITEM(hbmpToDraw)) + if (IS_MAGIC_BITMAP(hbmpToDraw)) { UINT Flags = 0; RECT r; @@ -459,8 +519,7 @@ case (INT_PTR) HBMMENU_POPUP_RESTORE: case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: case (INT_PTR) HBMMENU_POPUP_MINIMIZE: - default: - FIXME("Magic menu bitmap not implemented\n"); + MenuDrawPopupGlyph(Dc, &r, (INT_PTR)hbmpToDraw, Item->fState & MF_GRAYED, Item->fState & MF_HILITE); return; } InflateRect(&r, -1, -1); @@ -736,9 +795,17 @@ checked = TRUE; } } - if ((Item->hbmpItem)&& !( checked && (MenuInfo->dwStyle & MNS_CHECKORBMP))) + if (Item->hbmpItem) { - MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); + RECT bmpRect; + CopyRect(&bmpRect, &Rect); + if (!(MenuInfo->dwStyle & MNS_CHECKORBMP) && !(MenuInfo->dwStyle & MNS_NOCHECK)) + bmpRect.left += CheckBitmapWidth + 2; + if (!(checked && (MenuInfo->dwStyle & MNS_CHECKORBMP))) + { + bmpRect.right = bmpRect.left + MenuInfo->maxBmpSize.cx; + MenuDrawBitmapItem(Dc, Item, &bmpRect, MenuInfo->Self, WndOwner, Action, MenuBar); + } } /* Draw the popup-menu arrow */ if (0 != (Item->fType & MF_POPUP)) @@ -767,7 +834,9 @@ UINT uFormat = MenuBar ? DT_CENTER | DT_VCENTER | DT_SINGLELINE : DT_LEFT | DT_VCENTER | DT_SINGLELINE; - if( !(MenuInfo->dwStyle & MNS_CHECKORBMP)) + if(MenuInfo->dwStyle & MNS_CHECKORBMP) + Rect.left += max(0, MenuInfo->maxBmpSize.cx - GetSystemMetrics(SM_CXMENUCHECK)); + else Rect.left += MenuInfo->maxBmpSize.cx; if (0 != (Item->fState & MFS_DEFAULT)) @@ -779,11 +848,6 @@ { Rect.left += MENU_BAR_ITEMS_SPACE / 2; Rect.right -= MENU_BAR_ITEMS_SPACE / 2; - } - if (Item->hbmpItem == HBMMENU_CALLBACK || MenuInfo->maxBmpSize.cx != 0 ) - { - Rect.left += MenuInfo->maxBmpSize.cx; - Rect.right -= MenuInfo->maxBmpSize.cx; } Text = (PWCHAR) Item->dwTypeData; @@ -1103,8 +1167,30 @@ NTSTATUS WINAPI User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG ArgumentLength) { - LRESULT Result; - Result = (LRESULT)LoadMenuW(User32Instance, L"SYSMENU"); + HMENU hmenu = LoadMenuW(User32Instance, L"SYSMENU"); + LRESULT Result = (LRESULT)hmenu; + + // removing space for checkboxes from menu + MENUINFO menuinfo = {0}; + menuinfo.cbSize = sizeof(menuinfo); + menuinfo.fMask = MIM_STYLE; + GetMenuInfo(hmenu, &menuinfo); + menuinfo.dwStyle |= MNS_NOCHECK; + SetMenuInfo(hmenu, &menuinfo); + + // adding bitmaps to menu items + MENUITEMINFOW info = {0}; + info.cbSize = sizeof(info); + info.fMask |= MIIM_BITMAP; + info.hbmpItem = HBMMENU_POPUP_MINIMIZE; + SetMenuItemInfoW(hmenu, SC_MINIMIZE, FALSE, &info); + info.hbmpItem = HBMMENU_POPUP_RESTORE; + SetMenuItemInfoW(hmenu, SC_RESTORE, FALSE, &info); + info.hbmpItem = HBMMENU_POPUP_MAXIMIZE; + SetMenuItemInfoW(hmenu, SC_MAXIMIZE, FALSE, &info); + info.hbmpItem = HBMMENU_POPUP_CLOSE; + SetMenuItemInfoW(hmenu, SC_CLOSE, FALSE, &info); + return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); } @@ -1247,7 +1333,6 @@ MenuInfo->maxBmpSize.cy = abs(Size.cy); } MenuSetRosMenuInfo(MenuInfo); - ItemInfo->Rect.right += Size.cx + 2; itemheight = Size.cy + 2; if( !(MenuInfo->dwStyle & MNS_NOCHECK))

1 0

[cwittich] 41732: fix msvc build
by cwittich＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: cwittich Date: Thu Jul 2 01:31:13 2009 New Revision: 41732 URL: http://svn.reactos.org/svn/reactos?rev=41732&view=rev Log: fix msvc build Modified: trunk/reactos/base/applications/paint/main.c Modified: trunk/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma… ============================================================================== --- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Thu Jul 2 01:31:13 2009 @@ -132,6 +132,7 @@ TCHAR ofnFilename[1000]; TCHAR ofnFiletitle[256]; TCHAR ofnFilter[1000]; + TCHAR miniaturetitle[100]; int custColors[16] = {0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff}; @@ -219,9 +220,7 @@ LoadString(hThisInstance, IDS_DEFAULTFILENAME, filename, SIZEOF(filename)); LoadString(hThisInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(progtitle, resstr, filename); - TCHAR miniaturetitle[100]; LoadString(hThisInstance, IDS_MINIATURETITLE, miniaturetitle, SIZEOF(miniaturetitle)); - /* create main window */ hwnd = CreateWindowEx (0, _T("WindowsApp"), progtitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 544, 375, HWND_DESKTOP, NULL, hThisInstance, NULL);

1 0

[cfinck] 41731: Merge 41694, 41702, 41715, 41729
by cfinck＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: cfinck Date: Thu Jul 2 01:01:11 2009 New Revision: 41731 URL: http://svn.reactos.org/svn/reactos?rev=41731&view=rev Log: Merge 41694, 41702, 41715, 41729 Modified: branches/ros-branch-0_3_10/reactos/ (props changed) branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml branches/ros-branch-0_3_10/reactos/modules/directory.rbuild branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h (contents, props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c (props changed) Propchange: branches/ros-branch-0_3_10/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 2 01:01:11 2009 @@ -1,1 +1,1 @@ -/trunk/reactos:41447,41526,41666,41676,41684 +/trunk/reactos:41447,41526,41666,41676,41684,41694-41695,41702,41715,41729 Modified: branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Thu Jul 2 01:01:11 2009 @@ -8,11 +8,11 @@ <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32…</location> </application> <application name="Firefox 3.0"> - <regname>Mozilla Firefox (3.0.9)</regname> + <regname>Mozilla Firefox (3.0.11)</regname> <licence>MPL/GPL/LGPL</licence> - <version>3.0.9</version> + <version>3.0.11</version> <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/en…</location> + <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.11/win32/e…</location> </application> <application name="Opera"> <regname>Opera</regname> @@ -21,6 +21,13 @@ <description>The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.</description> <location>http://ftp.opera.com/pub/opera/win/963/en/Opera_963_classic_Setup.exe</location> </application> + <application name="Abyss Web server X1 2.6"> + <regname>AbyssX1 2.6</regname> + <licence>Freeware</licence> + <version>2.6</version> + <description>Abyss Web Server enables you to host your Web sites on your computer. It supports secure SSL/TLS connections (HTTPS) as well as a wide range of Web technologies. It can also run advanced PHP, Perl, Python, ASP, ASP.NET, and Ruby on Rails Web applications, which can be backed by databases such as MySQL, SQLite, MS SQL Server, MS Access, or Oracle</description> + <location>http://www.aprelium.com/data/abwsx1.exe</location> + </application> <application name="Thunderbird 2.0"> <regname>Mozilla Thunderbird (2.0.0.19)</regname> <licence>MPL/GPL/LGPL</licence> @@ -71,6 +78,20 @@ <description>Word processor.</description> <location>http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.…</location> </application> + <application name="SoftMaker Office 2008"> + <regname>SoftMakerOff08</regname> + <version>2008</version> + <licence>Shareware</licence> + <description>SoftMaker Office 2008 comes with the following applications: TextMaker 2008: Reads and writes all Microsoft Word files without a hitch. PlanMaker 2008, the fully Excel-compatible spreadsheet. SoftMaker Presentations 2008, fully compatible with Microsoft PowerPoint.</description> + <location>http://www.softmaker.net/down/ofw08ev.exe</location> + </application> + <application name="TextMaker Viewer 2009"> + <regname>TextMaker Viewer 2009</regname> + <version>TMViewer09</version> + <licence>Freeware</licence> + <description>A light viewer which lets you open, view, and print documents created with Microsoft Word 6.0 to 2007, TextMaker as well as OpenDocument and other common office file formats.</description> + <location>http://www.softmaker.net/down/TMViewerSetup.exe</location> + </application> <application name="OpenOffice 2.4"> <regname>OpenOffice.org 2.4.2</regname> <version>2.4.2</version> @@ -122,42 +143,36 @@ <description>MFC 4 is needed by some applications</description> <location>http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe</location> </application> - <application name="Visual Basic 5 Runtime"> <regname>vb5run</regname> <version>5.0</version> <description>Visual Basic 5 Runtime</description> <location>http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm…</location> </application> - <application name="Visual Basic 6 Runtime"> <regname>vb6run</regname> <version>6.0</version> <description>Visual Basic 6 Runtime</description> <location>http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbru…</location> </application> - <application name="Visual Studio 6 Runtime"> <regname>vc6run</regname> <version>6.0</version> <description>Visual Studio 6 Runtime</description> <location>http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6red…</location> </application> - <application name="Visual Studio 2005 Runtime"> <regname>vc2005run</regname> <version>7.0</version> <description>Visual Studio 2005 Runtime</description> <location>http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-517486…</location> </application> - <application name="Visual Studio 2005 Runtime SP1"> <regname>vc2005sp1run</regname> <version>7.1</version> <description>Visual Studio 2005 Runtime SP1</description> <location>http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906…</location> </application> - <application name="Visual Studio 2008 Runtime"> <regname>vc2008run</regname> <version>8.0</version> @@ -172,19 +187,33 @@ <description>SMPlayer</description> <location>http://dfn.dl.sourceforge.net/sourceforge/smplayer/smplayer_0.6.7_setup.exe</location> </application> + <application name="VLC Media Player 0.8.0"> + <regname>vlc0.8.0</regname> + <licence>GPL</licence> + <version>0.8.0</version> + <description>VLC media player is a highly portable multimedia player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols.</description> + <location>http://download.videolan.org/pub/videolan/vlc/0.8.0/win32/vlc-0.8.0-win32.e…</location> + </application> </category> <category name="Development" icon="5"> <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 1.2</regname> - <version>1.2</version> + <regname>ReactOS Build Environment 1.4.4</regname> + <version>1.4.4</version> <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.2.exe</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.4.4.exe</location> </application> <application name="MinGW"> <regname>MinGW 5.1.3</regname> <version>5.1.3</version> <description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> + </application> + <application name="SciTE 1.78"> + <regname>SciTE 1.78</regname> + <version>1.78</version> + <licence>GPL</licence> + <description>SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs.</description> + <location>http://fastbull.dl.sourceforge.net/sourceforge/scintilla/Sc178.exe</location> </application> <application name="FreeBASIC"> <regname>FreeBASIC 0.18.4b</regname> Modified: branches/ros-branch-0_3_10/reactos/modules/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/modul… ============================================================================== --- branches/ros-branch-0_3_10/reactos/modules/directory.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/modules/directory.rbuild [iso-8859-1] Thu Jul 2 01:01:11 2009 @@ -22,11 +22,4 @@ </xi:fallback> </xi:include> </directory> - <directory name="windows"> - <xi:include href="windows/directory.rbuild"> - <xi:fallback> - <xi:include href="empty.rbuild" /> - </xi:fallback> - </xi:include> - </directory> </group> Modified: branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/subsy… ============================================================================== --- branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] Thu Jul 2 01:01:11 2009 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * + /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Internal Objects Propchange: branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 2 01:01:11 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:40095 -/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:41447,41526,41666,41676,41684 +/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:41447,41526,41666,41676,41684,41694-41695,41702,41715,41729 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 2 01:01:11 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.c:41447,41526,41666,41676,41684 +/trunk/reactos/tools/rsym/rsym.c:41447,41526,41666,41676,41684,41694-41695,41702,41715,41729 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 2 01:01:11 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.h:41447,41526,41666,41676,41684 +/trunk/reactos/tools/rsym/rsym.h:41447,41526,41666,41676,41684,41694-41695,41702,41715,41729 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 2 01:01:11 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.mak:41447,41526,41666,41676,41684 +/trunk/reactos/tools/rsym/rsym.mak:41447,41526,41666,41676,41684,41694-41695,41702,41715,41729 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 2 01:01:11 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym_common.c:41447,41526,41666,41676,41684 +/trunk/reactos/tools/rsym/rsym_common.c:41447,41526,41666,41676,41684,41694-41695,41702,41715,41729

1 0

[mkupfer] 41730: change to LOGFONTW, because it's unicode
by mkupfer＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: mkupfer Date: Thu Jul 2 00:54:40 2009 New Revision: 41730 URL: http://svn.reactos.org/svn/reactos?rev=41730&view=rev Log: change to LOGFONTW, because it's unicode Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Thu Jul 2 00:54:40 2009 @@ -702,7 +702,7 @@ static BOOL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL Radio) { RECT rc; - LOGFONT lf; + LOGFONTW lf; HFONT hFont, hOldFont; int SmallDiam, i; TCHAR OutRight, OutLeft, InRight, InLeft, Center; @@ -725,7 +725,7 @@ SmallDiam = UITOOLS_MakeSquareRect(r, &rc); - ZeroMemory(&lf, sizeof(LOGFONT)); + ZeroMemory(&lf, sizeof(LOGFONTW)); lf.lfHeight = SmallDiam; lf.lfWidth = 0; lf.lfWeight = FW_NORMAL; @@ -818,7 +818,7 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags) { - LOGFONT lf; + LOGFONTW lf; HFONT hFont, hOldFont; COLORREF clrsave; RECT myr; @@ -845,7 +845,7 @@ return FALSE; } IntDrawRectEdge(dc,r,(uFlags&DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, BF_RECT | BF_MIDDLE | BF_SOFT); - ZeroMemory(&lf, sizeof(LOGFONT)); + ZeroMemory(&lf, sizeof(LOGFONTW)); UITOOLS_MakeSquareRect(r, &myr); myr.left += 1; myr.top += 1; @@ -884,7 +884,7 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) { - LOGFONT lf; + LOGFONTW lf; HFONT hFont, hOldFont; COLORREF clrsave; RECT myr; @@ -911,7 +911,7 @@ case DFCS_SCROLLSIZEGRIP: case DFCS_SCROLLSIZEGRIPRIGHT: - ZeroMemory(&lf, sizeof(LOGFONT)); + ZeroMemory(&lf, sizeof(LOGFONTW)); UITOOLS_MakeSquareRect(r, &myr); lf.lfHeight = myr.bottom - myr.top; lf.lfWidth = 0; @@ -947,7 +947,7 @@ return FALSE; } IntDrawRectEdge(dc, r, (uFlags & DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, (uFlags&DFCS_FLAT) | BF_MIDDLE | BF_RECT); - ZeroMemory(&lf, sizeof(LOGFONT)); + ZeroMemory(&lf, sizeof(LOGFONTW)); UITOOLS_MakeSquareRect(r, &myr); myr.left += 1; myr.top += 1; @@ -986,7 +986,7 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) { - LOGFONT lf; + LOGFONTW lf; HFONT hFont, hOldFont; TCHAR Symbol; switch(uFlags & 0xff) @@ -1014,7 +1014,7 @@ return FALSE; } /* acquire ressources only if valid menu */ - ZeroMemory(&lf, sizeof(LOGFONT)); + ZeroMemory(&lf, sizeof(LOGFONTW)); lf.lfHeight = r->bottom - r->top; lf.lfWidth = 0; lf.lfWeight = FW_NORMAL;

1 0

[cfinck] 41729: Add some more working apps to the Downloader list, update the RosBE link. Based on a patch by Victor Martinez
by cfinck＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: cfinck Date: Wed Jul 1 23:49:45 2009 New Revision: 41729 URL: http://svn.reactos.org/svn/reactos?rev=41729&view=rev Log: Add some more working apps to the Downloader list, update the RosBE link. Based on a patch by Victor Martinez Modified: trunk/reactos/base/applications/downloader/downloader.xml Modified: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Wed Jul 1 23:49:45 2009 @@ -21,6 +21,13 @@ <description>The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.</description> <location>http://ftp.opera.com/pub/opera/win/963/en/Opera_963_classic_Setup.exe</location> </application> + <application name="Abyss Web server X1 2.6"> + <regname>AbyssX1 2.6</regname> + <licence>Freeware</licence> + <version>2.6</version> + <description>Abyss Web Server enables you to host your Web sites on your computer. It supports secure SSL/TLS connections (HTTPS) as well as a wide range of Web technologies. It can also run advanced PHP, Perl, Python, ASP, ASP.NET, and Ruby on Rails Web applications, which can be backed by databases such as MySQL, SQLite, MS SQL Server, MS Access, or Oracle</description> + <location>http://www.aprelium.com/data/abwsx1.exe</location> + </application> <application name="Thunderbird 2.0"> <regname>Mozilla Thunderbird (2.0.0.19)</regname> <licence>MPL/GPL/LGPL</licence> @@ -71,6 +78,20 @@ <description>Word processor.</description> <location>http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.…</location> </application> + <application name="SoftMaker Office 2008"> + <regname>SoftMakerOff08</regname> + <version>2008</version> + <licence>Shareware</licence> + <description>SoftMaker Office 2008 comes with the following applications: TextMaker 2008: Reads and writes all Microsoft Word files without a hitch. PlanMaker 2008, the fully Excel-compatible spreadsheet. SoftMaker Presentations 2008, fully compatible with Microsoft PowerPoint.</description> + <location>http://www.softmaker.net/down/ofw08ev.exe</location> + </application> + <application name="TextMaker Viewer 2009"> + <regname>TextMaker Viewer 2009</regname> + <version>TMViewer09</version> + <licence>Freeware</licence> + <description>A light viewer which lets you open, view, and print documents created with Microsoft Word 6.0 to 2007, TextMaker as well as OpenDocument and other common office file formats.</description> + <location>http://www.softmaker.net/down/TMViewerSetup.exe</location> + </application> <application name="OpenOffice 2.4"> <regname>OpenOffice.org 2.4.2</regname> <version>2.4.2</version> @@ -122,42 +143,36 @@ <description>MFC 4 is needed by some applications</description> <location>http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe</location> </application> - <application name="Visual Basic 5 Runtime"> <regname>vb5run</regname> <version>5.0</version> <description>Visual Basic 5 Runtime</description> <location>http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm…</location> </application> - <application name="Visual Basic 6 Runtime"> <regname>vb6run</regname> <version>6.0</version> <description>Visual Basic 6 Runtime</description> <location>http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbru…</location> </application> - <application name="Visual Studio 6 Runtime"> <regname>vc6run</regname> <version>6.0</version> <description>Visual Studio 6 Runtime</description> <location>http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6red…</location> </application> - <application name="Visual Studio 2005 Runtime"> <regname>vc2005run</regname> <version>7.0</version> <description>Visual Studio 2005 Runtime</description> <location>http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-517486…</location> </application> - <application name="Visual Studio 2005 Runtime SP1"> <regname>vc2005sp1run</regname> <version>7.1</version> <description>Visual Studio 2005 Runtime SP1</description> <location>http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906…</location> </application> - <application name="Visual Studio 2008 Runtime"> <regname>vc2008run</regname> <version>8.0</version> @@ -172,19 +187,33 @@ <description>SMPlayer</description> <location>http://dfn.dl.sourceforge.net/sourceforge/smplayer/smplayer_0.6.7_setup.exe</location> </application> + <application name="VLC Media Player 0.8.0"> + <regname>vlc0.8.0</regname> + <licence>GPL</licence> + <version>0.8.0</version> + <description>VLC media player is a highly portable multimedia player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols.</description> + <location>http://download.videolan.org/pub/videolan/vlc/0.8.0/win32/vlc-0.8.0-win32.e…</location> + </application> </category> <category name="Development" icon="5"> <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 1.2</regname> - <version>1.2</version> + <regname>ReactOS Build Environment 1.4.4</regname> + <version>1.4.4</version> <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.2.exe</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.4.4.exe</location> </application> <application name="MinGW"> <regname>MinGW 5.1.3</regname> <version>5.1.3</version> <description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> + </application> + <application name="SciTE 1.78"> + <regname>SciTE 1.78</regname> + <version>1.78</version> + <licence>GPL</licence> + <description>SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs.</description> + <location>http://fastbull.dl.sourceforge.net/sourceforge/scintilla/Sc178.exe</location> </application> <application name="FreeBASIC"> <regname>FreeBASIC 0.18.4b</regname>

1 0

[bfreisen] 41728: Paint: - Fixed new bug in palette drawing (replacing a + by a -) - Added "Show grid" and "Show miniature" functions - Therefore changed the menus -> please check translations
by bfreisen＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: bfreisen Date: Wed Jul 1 23:24:17 2009 New Revision: 41728 URL: http://svn.reactos.org/svn/reactos?rev=41728&view=rev Log: Paint: - Fixed new bug in palette drawing (replacing a + by a -) - Added "Show grid" and "Show miniature" functions - Therefore changed the menus -> please check translations Modified: trunk/reactos/base/applications/paint/definitions.h trunk/reactos/base/applications/paint/globalvar.h trunk/reactos/base/applications/paint/lang/cs-CZ.rc trunk/reactos/base/applications/paint/lang/de-DE.rc trunk/reactos/base/applications/paint/lang/en-GB.rc trunk/reactos/base/applications/paint/lang/en-US.rc trunk/reactos/base/applications/paint/lang/es-ES.rc trunk/reactos/base/applications/paint/lang/fr-FR.rc trunk/reactos/base/applications/paint/lang/it-IT.rc trunk/reactos/base/applications/paint/lang/nl-NL.rc trunk/reactos/base/applications/paint/lang/no-NO.rc trunk/reactos/base/applications/paint/lang/pl-PL.rc trunk/reactos/base/applications/paint/lang/pt-BR.rc trunk/reactos/base/applications/paint/lang/pt-PT.rc trunk/reactos/base/applications/paint/lang/ro-RO.rc trunk/reactos/base/applications/paint/lang/ru-RU.rc trunk/reactos/base/applications/paint/lang/sk-SK.rc trunk/reactos/base/applications/paint/lang/uk-UA.rc trunk/reactos/base/applications/paint/main.c trunk/reactos/base/applications/paint/palette.c trunk/reactos/base/applications/paint/rsrc.rc trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/de… ============================================================================== --- trunk/reactos/base/applications/paint/definitions.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/definitions.h [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -60,6 +60,8 @@ #define IDM_VIEWZOOM400 239 #define IDM_VIEWZOOM800 240 #define IDM_VIEWFULLSCREEN 241 +#define IDM_VIEWSHOWGRID 242 +#define IDM_VIEWSHOWMINIATURE 243 #define IDM_IMAGEROTATEMIRROR 250 #define IDM_IMAGECHANGESIZE 251 @@ -140,6 +142,7 @@ #define IDS_INFOTEXT 903 #define IDS_SAVEPROMPTTEXT 904 #define IDS_DEFAULTFILENAME 905 +#define IDS_MINIATURETITLE 906 #define IDS_TOOLTIP1 910 #define IDS_TOOLTIP2 911 #define IDS_TOOLTIP3 912 Modified: trunk/reactos/base/applications/paint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/gl… ============================================================================== --- trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -71,3 +71,8 @@ extern TCHAR filename[256]; extern TCHAR filepathname[1000]; extern BOOL isAFile; + +extern BOOL showGrid; +extern BOOL showMiniature; + +extern HWND hwndMiniature; Modified: trunk/reactos/base/applications/paint/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/cs-CZ.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "Lupa" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Celá obrazovka\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "ReactOS Malování je dostupné pod licencí GNU Lesser General Public License (LGPL) verze 3 (viz. www.gnu.org)" IDS_SAVEPROMPTTEXT, "Chcete uloit provedené zmìny v %s?" IDS_DEFAULTFILENAME, "Bez názvu.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Volný výbìr" IDS_TOOLTIP2, "Výbìr" IDS_TOOLTIP3, "Guma" Modified: trunk/reactos/base/applications/paint/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/de-DE.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "Zoom" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "Benutzerdefiniert" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Raster anzeigen", IDM_VIEWSHOWGRID + MENUITEM "Miniaturansicht anzeigen", IDM_VIEWSHOWMINIATURE END MENUITEM "Gesamtbild\tStrg+G", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "Paint für ReactOS steht unter der GNU Lesser General Public License (LGPL) Version 3. (siehe www.gnu.org)" IDS_SAVEPROMPTTEXT, "Möchten Sie die Änderungen an %s speichern?" IDS_DEFAULTFILENAME, "Unbenannt.bmp" + IDS_MINIATURETITLE, "Miniaturansicht" IDS_TOOLTIP1, "Freie Auswahl" IDS_TOOLTIP2, "Auswahl" IDS_TOOLTIP3, "Radierer" Modified: trunk/reactos/base/applications/paint/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/en-GB.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "Zoom" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Full screen\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" IDS_SAVEPROMPTTEXT, "Do you want to save the changes to %s?" IDS_DEFAULTFILENAME, "Unnamed.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Free selection" IDS_TOOLTIP2, "Selection" IDS_TOOLTIP3, "Rubber" Modified: trunk/reactos/base/applications/paint/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/en-US.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "Zoom" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Full screen\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" IDS_SAVEPROMPTTEXT, "Do you want to save the changes to %s?" IDS_DEFAULTFILENAME, "Unnamed.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Free selection" IDS_TOOLTIP2, "Selection" IDS_TOOLTIP3, "Rubber" Modified: trunk/reactos/base/applications/paint/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/es-ES.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "Zoom" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Ver en pantalla completa\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" IDS_SAVEPROMPTTEXT, "Do you want to save the changes to %s?" IDS_DEFAULTFILENAME, "Unnamed.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Free selection" IDS_TOOLTIP2, "Selection" IDS_TOOLTIP3, "Rubber" Modified: trunk/reactos/base/applications/paint/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/fr-FR.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "Zoom" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Plein écran\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "Paint pour ReactOS est mise à disposition sous la Licence publique générale limitée GNU (LGPL) version 3 (voir www.gnu.org)" IDS_SAVEPROMPTTEXT, "Voulez-vous enregistrer les modifications de %s?" IDS_DEFAULTFILENAME, "Sans titre.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Sélection libre" IDS_TOOLTIP2, "Sélection" IDS_TOOLTIP3, "Gomme" Modified: trunk/reactos/base/applications/paint/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/it-IT.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "Zoom" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Visualizza a schermo intero\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "Paint per ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" IDS_SAVEPROMPTTEXT, "Volete salvare le modifiche a %s?" IDS_DEFAULTFILENAME, "SenzaNome.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Selezione libera" IDS_TOOLTIP2, "Selezione" IDS_TOOLTIP3, "Gomma" Modified: trunk/reactos/base/applications/paint/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/nl-NL.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "In-/uitzoomen" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Volledig scherm\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" IDS_SAVEPROMPTTEXT, "Wilt u de wijzigingen die zijn aangebracht in %s opslaan?" IDS_DEFAULTFILENAME, "Naamloos.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Vrij selecteren" IDS_TOOLTIP2, "Selecteren" IDS_TOOLTIP3, "Gum" Modified: trunk/reactos/base/applications/paint/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/no-NO.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "Forstørre" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Full skjerm\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "Paint for ReactOS er nå tilgjengelig under GNU Lesser General Public License (LGPL) versjon 3 (se http://www.gnu.org/home.nb.html)" IDS_SAVEPROMPTTEXT, "Vil du lagre endringene til %s?" IDS_DEFAULTFILENAME, "Utennavn.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Frihåndmerking" IDS_TOOLTIP2, "Merk" IDS_TOOLTIP3, "Viskelær" Modified: trunk/reactos/base/applications/paint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "Powiêkszenie" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Pe³ny ekran\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "Paint dla ReactOS jest dostêpny na licencji GNU Lesser General Public License (LGPL) wersja 3 (www.gnu.org)" IDS_SAVEPROMPTTEXT, "Czy chcesz zapisaæ zmiany do %s?" IDS_DEFAULTFILENAME, "Nienazwany.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Zaznaczenie dowolne" IDS_TOOLTIP2, "Zaznaczenie" IDS_TOOLTIP3, "Gumka" Modified: trunk/reactos/base/applications/paint/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/pt-BR.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "&Zoom" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "E&xibir bitmap\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "Paint para ReactOS está disponível sob a licença GNU Lesser General Public License (LGPL) versão 3 (visite www.gnu.org)" IDS_SAVEPROMPTTEXT, "Salvar as alterações em %s?" IDS_DEFAULTFILENAME, "Imagem.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Selecionar forma livre" IDS_TOOLTIP2, "Selecionar" IDS_TOOLTIP3, "Apagador/Apagador de cor" Modified: trunk/reactos/base/applications/paint/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/pt-PT.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "&Zoom" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "&Ver mapa de bits\tCtrl+B", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "Paint para ReactOS está disponível sob a licença GNU Lesser General Public License (LGPL) versão 3 (visite www.gnu.org)" IDS_SAVEPROMPTTEXT, "Pretende guardar as alterações a %s?" IDS_DEFAULTFILENAME, "Imagem.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Selecionar forma livre" IDS_TOOLTIP2, "Selecionar" IDS_TOOLTIP3, "Borracha/Apagar cor" Modified: trunk/reactos/base/applications/paint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/ro-RO.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -46,13 +46,19 @@ MENUITEM SEPARATOR POPUP "Panoramare" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Pe tot ecranul\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -172,6 +178,7 @@ IDS_INFOTEXT, "Paint pentru ReactOS este disponibil sub licenþa GNU Lesser General Public versiunea 3 (vedeþi www.gnu.org)" IDS_SAVEPROMPTTEXT, "Vreþi sã salvaþi schimbãrile la %s?" IDS_DEFAULTFILENAME, "FãrãNume.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Golire selecþie" IDS_TOOLTIP2, "Selecþie" IDS_TOOLTIP3, "Radierã" Modified: trunk/reactos/base/applications/paint/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/ru-RU.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -41,13 +41,19 @@ MENUITEM SEPARATOR POPUP "Ìàñ&øòàá" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Ïîëíûé ýêðàí\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -167,6 +173,7 @@ IDS_INFOTEXT, "Paint äëÿ ReactOS ðàñïðîñòðàíÿåòñÿ ïîä ëèöåíçèåé GNU Lesser General Public License (LGPL) âåðñèè 3 (see www.gnu.org)" IDS_SAVEPROMPTTEXT, "Ñîõðàíèòü èçìåíåíèÿ â %s?" IDS_DEFAULTFILENAME, "Áåç_èìåíè.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Âûäåëåíèå ïðîèçâîëüíîé îáëàñòè" IDS_TOOLTIP2, "Âûäåëåíèå" IDS_TOOLTIP3, "Ëàñòèê" Modified: trunk/reactos/base/applications/paint/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/sk-SK.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -47,13 +47,19 @@ MENUITEM SEPARATOR POPUP "Lupa" //Zoom BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Celá obrazovka\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -173,6 +179,7 @@ IDS_INFOTEXT, "Skicár systému ReactOS je dostupný za podmienok GNU Lesser General Public License (LGPL) verzia 3 (viï www.gnu.org)" IDS_SAVEPROMPTTEXT, "Chcete uloi vykonané zmeny do %s?" IDS_DEFAULTFILENAME, "Bez názvu.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Vo¾ný výber" IDS_TOOLTIP2, "Výber" IDS_TOOLTIP3, "Guma" Modified: trunk/reactos/base/applications/paint/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -47,13 +47,19 @@ MENUITEM SEPARATOR POPUP "Ìàñøòàá" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 - MENUITEM "25%", IDM_VIEWZOOM25 - MENUITEM "50%", IDM_VIEWZOOM50 - MENUITEM "100%", IDM_VIEWZOOM100 - MENUITEM "200%", IDM_VIEWZOOM200 - MENUITEM "400%", IDM_VIEWZOOM400 - MENUITEM "800%", IDM_VIEWZOOM800 + POPUP "User defined" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Show grid", IDM_VIEWSHOWGRID + MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE END MENUITEM "Íà âåñü åêðàí\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -173,6 +179,7 @@ IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" IDS_SAVEPROMPTTEXT, "Çáåðåãòè çì³íè äî %s?" IDS_DEFAULTFILENAME, "Áåç_³ìåí³.bmp" + IDS_MINIATURETITLE, "Miniature" IDS_TOOLTIP1, "Âèä³ëåííÿ äîâ³ëüíî¿ îáëàñò³" IDS_TOOLTIP2, "Âèä³ëåííÿ" IDS_TOOLTIP3, "Ëàñòèê" Modified: trunk/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma… ============================================================================== --- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -101,6 +101,11 @@ TCHAR filename[256]; TCHAR filepathname[1000]; BOOL isAFile = FALSE; + +BOOL showGrid = FALSE; +BOOL showMiniature = FALSE; + +HWND hwndMiniature; int WINAPI _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument, int nFunsterStil) { @@ -214,12 +219,15 @@ LoadString(hThisInstance, IDS_DEFAULTFILENAME, filename, SIZEOF(filename)); LoadString(hThisInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(progtitle, resstr, filename); + TCHAR miniaturetitle[100]; + LoadString(hThisInstance, IDS_MINIATURETITLE, miniaturetitle, SIZEOF(miniaturetitle)); /* create main window */ hwnd = CreateWindowEx (0, _T("WindowsApp"), progtitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 544, 375, HWND_DESKTOP, NULL, hThisInstance, NULL); hMainWnd = hwnd; + hwndMiniature = CreateWindowEx(WS_EX_PALETTEWINDOW, _T("WindowsApp"), miniaturetitle, WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, 180, 200, 120, 100, hwnd, NULL, hThisInstance, NULL); /* loading and setting the window menu from resource */ menu = LoadMenu(hThisInstance, MAKEINTRESOURCE(ID_MENU)); Modified: trunk/reactos/base/applications/paint/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/pa… ============================================================================== --- trunk/reactos/base/applications/paint/palette.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/palette.c [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -57,7 +57,7 @@ DrawEdge(hDC, &rc, BDR_SUNKENOUTER, BF_RECT); oldPen = SelectObject(hDC, CreatePen(PS_NULL, 0, 0)); oldBrush = SelectObject(hDC, CreateSolidBrush(palColors[i])); - Rectangle(hDC, rc.left + 2,rc.top + 2,rc.right + 1, rc.bottom - 1); + Rectangle(hDC, rc.left + 2,rc.top + 2,rc.right - 1, rc.bottom - 1); DeleteObject(SelectObject(hDC, oldBrush)); DeleteObject(SelectObject(hDC, oldPen)); } Modified: trunk/reactos/base/applications/paint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/rs… ============================================================================== --- trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -33,7 +33,6 @@ #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" - // // SUPPORT FOR WINDOWS XP THEMES: // THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Wed Jul 1 23:24:17 2009 @@ -60,6 +60,12 @@ PostQuitMessage (0); /* send a WM_QUIT to the message queue */ break; case WM_CLOSE: + if (hwnd==hwndMiniature) + { + ShowWindow(hwndMiniature, SW_HIDE); + showMiniature = FALSE; + break; + } if (undoSteps>0) { TCHAR programname[20]; @@ -144,6 +150,44 @@ CheckMenuItem(GetMenu(hMainWnd), IDM_IMAGEDRAWOPAQUE, MF_UNCHECKED | MF_BYCOMMAND); break; } + if (showGrid) + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWGRID, MF_CHECKED | MF_BYCOMMAND); + else + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWGRID, MF_UNCHECKED | MF_BYCOMMAND); + if (showMiniature) + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWMINIATURE, MF_CHECKED | MF_BYCOMMAND); + else + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWMINIATURE, MF_UNCHECKED | MF_BYCOMMAND); + + if (zoom==125) + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM125, MF_CHECKED | MF_BYCOMMAND); + else + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM125, MF_UNCHECKED | MF_BYCOMMAND); + if (zoom==250) + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM25, MF_CHECKED | MF_BYCOMMAND); + else + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM25, MF_UNCHECKED | MF_BYCOMMAND); + if (zoom==500) + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM50, MF_CHECKED | MF_BYCOMMAND); + else + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM50, MF_UNCHECKED | MF_BYCOMMAND); + if (zoom==1000) + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM100, MF_CHECKED | MF_BYCOMMAND); + else + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM100, MF_UNCHECKED | MF_BYCOMMAND); + if (zoom==2000) + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM200, MF_CHECKED | MF_BYCOMMAND); + else + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM200, MF_UNCHECKED | MF_BYCOMMAND); + if (zoom==4000) + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM400, MF_CHECKED | MF_BYCOMMAND); + else + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM400, MF_UNCHECKED | MF_BYCOMMAND); + if (zoom==8000) + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM800, MF_CHECKED | MF_BYCOMMAND); + else + CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM800, MF_UNCHECKED | MF_BYCOMMAND); + break; case WM_SIZE: if (hwnd==hMainWnd) @@ -218,8 +262,34 @@ { HDC hdc = GetDC(hImageArea); StretchBlt(hdc, 0, 0, imgXRes*zoom/1000, imgYRes*zoom/1000, hDrawingDC, 0, 0, imgXRes, imgYRes, SRCCOPY); + if (showGrid && (zoom>=4000)) + { + HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, 0x00a0a0a0)); + int counter; + for (counter = 0; counter <= imgYRes; counter++) + { + MoveToEx(hdc, 0, counter*zoom/1000, NULL); + LineTo(hdc, imgXRes*zoom/1000, counter*zoom/1000); + } + for (counter = 0; counter <= imgXRes; counter++) + { + MoveToEx(hdc, counter*zoom/1000, 0, NULL); + LineTo(hdc, counter*zoom/1000, imgYRes*zoom/1000); + } + DeleteObject(SelectObject(hdc, oldPen)); + } ReleaseDC(hImageArea, hdc); SendMessage(hSelection, WM_PAINT, 0, 0); + SendMessage(hwndMiniature, WM_PAINT, 0, 0); + }else + if (hwnd==hwndMiniature) + { + long mclient[4]; + GetClientRect(hwndMiniature, (LPRECT)&mclient); + HDC hdc = GetDC(hwndMiniature); + BitBlt(hdc, 0, 0, imgXRes, imgYRes, hDrawingDC, min(imgXRes*GetScrollPos(hScrollbox, SB_HORZ)/10000, imgXRes-mclient[2]), + min(imgYRes*GetScrollPos(hScrollbox, SB_VERT)/10000, imgYRes-mclient[3]), SRCCOPY); + ReleaseDC(hwndMiniature, hdc); } break; @@ -546,6 +616,17 @@ insertReversible(CopyImage(hSelBm, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG)); updateCanvasAndScrollbars(); break; + + case IDM_VIEWSHOWGRID: + showGrid = !showGrid; + break; + case IDM_VIEWSHOWMINIATURE: + showMiniature = !showMiniature; + if (showMiniature) + ShowWindow(hwndMiniature, SW_SHOW); + else + ShowWindow(hwndMiniature, SW_HIDE); + break; case IDM_VIEWZOOM125: ZoomTo(125);

1 0

[jimtabor] 41727: - Add more vista types. Added another window message type, based on winproc.c. Added two vista prototypes for ntuser. - Implemented new PostMessage and SendNotifyMessage, this is for bug 4646. I realize the need to update/sync dde code from wine. This relates to the new post and send functions and the use of MsgiKMToUMMessage. Trying to understand this mess. - CreateDesktop is used to create the HWND_MESSAGE for the desktop. This is a work in progress. The ntuser prototype is u
by jimtabor＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: jimtabor Date: Wed Jul 1 21:19:16 2009 New Revision: 41727 URL: http://svn.reactos.org/svn/reactos?rev=41727&view=rev Log: - Add more vista types. Added another window message type, based on winproc.c. Added two vista prototypes for ntuser. - Implemented new PostMessage and SendNotifyMessage, this is for bug 4646. I realize the need to update/sync dde code from wine. This relates to the new post and send functions and the use of MsgiKMToUMMessage. Trying to understand this mess. - CreateDesktop is used to create the HWND_MESSAGE for the desktop. This is a work in progress. The ntuser prototype is updated too. Now pass the correct data from user to kernel space. - Major update to event code and testing with user32 wine test msg. ATM, only two ntuser notifications are sent if the app has a event hook. Need to add more notifications at the correct points. - Code arranging in hooks. Testing with user32 cross test works, need to add more ntuser hook calls at the correct points. - Testing: More is required! User32 cross tests win and msg, win test hangs at flush_events. FF 1.5.x (Still has that funny minimize bug. Play with it and see. Missing one more check I think.) and AbiWord 2.4.1. Notepad lite is doing something very naughty inside it's hook call, with out the source, testing it will be imposable, so someone needs to find an open source program that does the same thing. - Reference: Drag and drop file into window: winproc.c WM_COPYGLOBALDATA http://wiki.winprog.org/wiki/Windows_messages Modified: trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/callback.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/hook.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -356,19 +356,35 @@ ACCESS_MASK dwDesiredAccess, LPSECURITY_ATTRIBUTES lpsa) { - UNICODE_STRING DesktopName; + OBJECT_ATTRIBUTES oas; + UNICODE_STRING DesktopName, DesktopDevice; HWINSTA hWinSta; HDESK hDesktop; - + ULONG Attributes = (OBJ_OPENIF|OBJ_CASE_INSENSITIVE); + + /* Retrive WinStation handle. */ hWinSta = NtUserGetProcessWindowStation(); + /* Initialize the strings. */ RtlInitUnicodeString(&DesktopName, lpszDesktop); - - hDesktop = NtUserCreateDesktop(&DesktopName, - dwFlags, - dwDesiredAccess, - lpsa, - hWinSta); + RtlInitUnicodeString(&DesktopDevice, lpszDevice); + + /* Check for process is inherited, set flag if set. */ + if (lpsa && lpsa->bInheritHandle) Attributes |= OBJ_INHERIT; + + /* Initialize the attributes for the desktop. */ + InitializeObjectAttributes( &oas, + &DesktopName, + Attributes, + hWinSta, + lpsa ? lpsa->lpSecurityDescriptor : NULL); + + /* Send the request and call to win32k. */ + hDesktop = NtUserCreateDesktop( &oas, + &DesktopDevice, + pDevmode, + dwFlags, + dwDesiredAccess); return(hDesktop); } Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -670,8 +670,9 @@ //#if 0 // if (ISITHOOKED(WH_CBT)) { - if (NtUserMessageCall( hwnd, WM_CBT, HCBT_MOVESIZE, (LPARAM)&sizingRect, 0, FNID_DEFWINDOWPROC, FALSE)) - moved = FALSE; + LRESULT lResult; + NtUserMessageCall( hwnd, WM_CBT, HCBT_MOVESIZE, (LPARAM)&sizingRect, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE); + if (lResult) moved = FALSE; } //#endif (void)NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, NULL); @@ -758,8 +759,9 @@ //#if 0 // if (ISITHOOKED(WH_CBT)) { - if (NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, 0, FNID_DEFWINDOWPROC, FALSE)) - return 0; + LRESULT lResult; + NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE); + if (lResult) return 0; } //#endif switch (wParam & 0xfff0) Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -219,13 +219,13 @@ { PCWPSTRUCT pCWP = (PCWPSTRUCT)lParam; - lResult = NtUserMessageCall( pCWP->hwnd, - pCWP->message, - pCWP->wParam, - pCWP->lParam, - 0, - FNID_CALLWNDPROC, - pHook->Ansi); + NtUserMessageCall( pCWP->hwnd, + pCWP->message, + pCWP->wParam, + pCWP->lParam, + (ULONG_PTR)&lResult, + FNID_CALLWNDPROC, + pHook->Ansi); } else { @@ -233,13 +233,13 @@ ClientInfo->dwHookData = pCWPR->lResult; - lResult = NtUserMessageCall( pCWPR->hwnd, - pCWPR->message, - pCWPR->wParam, - pCWPR->lParam, - 0, - FNID_CALLWNDPROCRET, - pHook->Ansi); + NtUserMessageCall( pCWPR->hwnd, + pCWPR->message, + pCWPR->wParam, + pCWPR->lParam, + (ULONG_PTR)&lResult, + FNID_CALLWNDPROCRET, + pHook->Ansi); } ClientInfo->CI_flags ^= ((ClientInfo->CI_flags ^ Flags) & CI_CURTHPRHOOK); ClientInfo->dwHookData = Save; @@ -429,8 +429,9 @@ Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Arguments; switch(Common->HookId) + { + case WH_CBT: { - case WH_CBT: switch(Common->Code) { case HCBT_CREATEWND: @@ -494,7 +495,6 @@ { ERR("Common = 0x%x, Proc = 0x%x\n",Common,Common->Proc); } - switch(Common->Code) { case HCBT_CREATEWND: @@ -502,6 +502,7 @@ break; } break; + } case WH_KEYBOARD_LL: KeyboardLlData = (PKBDLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) KeyboardLlData); @@ -536,7 +537,7 @@ break; default: return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); - } + } return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS); } @@ -547,15 +548,15 @@ PEVENTPROC_CALLBACK_ARGUMENTS Common; Common = (PEVENTPROC_CALLBACK_ARGUMENTS) Arguments; - + Common->Proc(Common->hook, - Common->event, + Common->event, Common->hwnd, - Common->idObject, - Common->idChild, - Common->dwEventThread, - Common->dwmsEventTime); - + Common->idObject, + Common->idChild, + Common->dwEventThread, + Common->dwmsEventTime); + return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS); } Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -1700,6 +1700,74 @@ return Result; } +BOOL +WINAPI +PostMessageWX( + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + LRESULT Ret; + + /* Check for combo box or a list box to send names. */ + if (Msg == CB_DIR || Msg == LB_DIR) + { + /* + Set DDL_POSTMSGS, so use the PostMessage function to send messages to the + combo/list box. Forces a call like DlgDirListComboBox. + */ + wParam |= DDL_POSTMSGS; + return NtUserPostMessage(hWnd, Msg, wParam, lParam); + } + + /* No drop files or current Process, just post message. */ + if ( (Msg != WM_DROPFILES) || + ( NtUserQueryWindow( hWnd, QUERY_WINDOW_UNIQUE_PROCESS_ID) == + PtrToUint(NtCurrentTeb()->ClientId.UniqueProcess) ) ) + { + return NtUserPostMessage(hWnd, Msg, wParam, lParam); + } + + /* We have drop files or this is not the same process for this window. */ + + /* Just incase, check wParam for Global memory handle and send size. */ + Ret = SendMessageW( hWnd, + WM_COPYGLOBALDATA, + (WPARAM)GlobalSize((HGLOBAL)wParam), // Zero if not a handle. + (LPARAM)wParam); // Send wParam as lParam. + + if ( Ret ) return NtUserPostMessage(hWnd, Msg, (WPARAM)Ret, lParam); + + return FALSE; +} +BOOL +WINAPI +PostMessageAX( + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + MSG AnsiMsg, UcMsg; + BOOL Ret; + + AnsiMsg.hwnd = hWnd; + AnsiMsg.message = Msg; + AnsiMsg.wParam = wParam; + AnsiMsg.lParam = lParam; + + if (!MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) + { + return FALSE; + } + + Ret = PostMessageWX( hWnd, UcMsg.message, UcMsg.wParam, UcMsg.lParam); + + MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); + + return Ret; +} /* * @implemented @@ -2113,6 +2181,43 @@ return Result; } +BOOL +WINAPI +SendNotifyMessageAX( + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + BOOL Ret; + MSG AnsiMsg, UcMsg; + + AnsiMsg.hwnd = hWnd; + AnsiMsg.message = Msg; + AnsiMsg.wParam = wParam; + AnsiMsg.lParam = lParam; + if (! MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) + { + return FALSE; + } + /* ATM, ReactOS does not support Ansi in win32k. */ + Ret = NtUserMessageCall(hWnd, UcMsg.message, UcMsg.wParam, UcMsg.lParam, 0, FNID_SENDNOTIFYMESSAGE, FALSE); + + MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); + + return Ret; +} + +BOOL +WINAPI +SendNotifyMessageWX( + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + return NtUserMessageCall(hWnd, Msg, wParam, lParam, 0, FNID_SENDNOTIFYMESSAGE, FALSE); +} /* * @implemented Modified: trunk/reactos/include/reactos/win32k/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/cal… ============================================================================== --- trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -61,9 +61,6 @@ DWORD dwEventThread; DWORD dwmsEventTime; WINEVENTPROC Proc; - BOOLEAN Ansi; - UINT ModuleNameLength; - WCHAR ModuleName[1]; } EVENTPROC_CALLBACK_ARGUMENTS, *PEVENTPROC_CALLBACK_ARGUMENTS; NTSTATUS WINAPI Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -268,6 +268,8 @@ #define FNID_IME 0x02A9 #define FNID_CALLWNDPROC 0x02AA #define FNID_CALLWNDPROCRET 0x02AB +#define FNID_HKINLPCWPEXSTRUCT 0x02AC +#define FNID_HKINLPCWPRETEXSTRUCT 0x02AD #define FNID_SENDMESSAGE 0x02B0 // Kernel has option to use TimeOut or normal msg send, based on type of msg. #define FNID_SENDMESSAGEWTOOPTION 0x02B1 @@ -308,8 +310,15 @@ #define ICLS_SWITCH 19 #define ICLS_ICONTITLE 20 #define ICLS_TOOLTIPS 21 +#if (_WIN32_WINNT <= 0x0501) #define ICLS_UNKNOWN 22 #define ICLS_NOTUSED 23 +#else +#define ICLS_SYSSHADOW 22 +#define ICLS_HWNDMESSAGE 23 +#define ICLS_UNKNOWN 24 +#define ICLS_NOTUSED 25 +#endif #define ICLS_END 31 #define COLOR_LAST COLOR_MENUBAR @@ -327,7 +336,7 @@ typedef struct tagMBSTRING { - WCHAR szName[15]; + WCHAR szName[16]; UINT uID; UINT uStr; } MBSTRING, *PMBSTRING; @@ -389,8 +398,8 @@ DWORD dwSRVIFlags; ULONG_PTR cHandleEntries; PFN_FNID mpFnidPfn[FNID_NUM]; -// WNDPROC aStoCidPfn[7]; -// USHORT mpFnid_serverCBWndProc[31]; + WNDPROC aStoCidPfn[7]; + USHORT mpFnid_serverCBWndProc[FNID_NUM]; PFNCLIENT apfnClientA; PFNCLIENT apfnClientW; PFNCLIENTWORKER apfnClientWorker; @@ -553,6 +562,7 @@ // // Non SDK Window Message types. // +#define WM_COPYGLOBALDATA 73 #define WM_SYSTIMER 280 #define WM_POPUPSYSTEMMENU 787 #define WM_CBT 1023 // ReactOS only. @@ -1072,6 +1082,18 @@ DWORD dwflags, LPVOID lParam); +BOOL +NTAPI +NtUserCheckDesktopByThreadId( + DWORD dwThreadId); + +BOOL +NTAPI +NtUserCheckWindowThreadDesktop( + HWND hwnd, + DWORD dwThreadId, + ULONG ReturnValue); + DWORD NTAPI NtUserCheckImeHotKey( @@ -1145,11 +1167,11 @@ HDESK NTAPI NtUserCreateDesktop( - PUNICODE_STRING lpszDesktopName, + POBJECT_ATTRIBUTES poa, + PUNICODE_STRING lpszDesktopDevice, + LPDEVMODEW lpdmw, DWORD dwFlags, - ACCESS_MASK dwDesiredAccess, - LPSECURITY_ATTRIBUTES lpSecurity, - HWINSTA hWindowStation); + ACCESS_MASK dwDesiredAccess); DWORD NTAPI @@ -1936,7 +1958,7 @@ UINT transType, DWORD keyboardId, HKL dwhkl ); -LRESULT +BOOL NTAPI NtUserMessageCall( HWND hWnd, Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -28,6 +28,7 @@ PWIN32HEAP pheapDesktop; PSECTION_OBJECT DesktopHeapSection; PDESKTOPINFO DesktopInfo; + HWND spwndMessage; } DESKTOP, *PDESKTOP; extern PDESKTOP InputDesktop; @@ -134,6 +135,7 @@ &(OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(d))->Name) : \ NULL +HWND FASTCALL IntGetMessageWindow(VOID); static __inline PVOID DesktopHeapAlloc(IN PDESKTOP Desktop, Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -36,8 +36,9 @@ DWORD idProcess; DWORD idThread; WINEVENTPROC Proc; /* Event function */ - BOOLEAN Ansi; /* Is it an Ansi event? */ ULONG Flags; /* Some internal flags */ + ULONG_PTR offPfn; + INT ihmod; UNICODE_STRING ModuleName; /* Module name for global events */ } EVENTHOOK, *PEVENTHOOK; Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -12,6 +12,8 @@ #include <include/dce.h> #include <include/prop.h> #include <include/scroll.h> + +extern ATOM AtomMessage; BOOL FASTCALL UserUpdateUiState(PWINDOW Wnd, WPARAM wParam); @@ -167,8 +169,9 @@ LRESULT FASTCALL IntDefWindowProc( PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL Ansi); -VOID FASTCALL IntNotifyWinEvent(DWORD, PWINDOW_OBJECT, LONG, LONG); +VOID FASTCALL IntNotifyWinEvent(DWORD, HWND, LONG, LONG); +HWND APIENTRY co_IntCreateWindowEx(DWORD,PUNICODE_STRING,PUNICODE_STRING,DWORD,LONG,LONG,LONG,LONG,HWND,HMENU,HINSTANCE,LPVOID,DWORD,BOOL); #endif /* _WIN32K_WINDOW_H */ /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -605,6 +605,9 @@ return Result; } +// +// Events are notifications w/o results. +// LRESULT APIENTRY co_IntCallEventProc(HWINEVENTHOOK hook, @@ -616,11 +619,11 @@ DWORD dwmsEventTime, WINEVENTPROC Proc) { - LRESULT Result; + LRESULT Result = 0; NTSTATUS Status; PEVENTPROC_CALLBACK_ARGUMENTS Common; ULONG ArgumentLength, ResultLength; - PVOID Argument, ResultPointer, pWnd; + PVOID Argument, ResultPointer; ArgumentLength = sizeof(EVENTPROC_CALLBACK_ARGUMENTS); @@ -643,8 +646,6 @@ ResultPointer = NULL; ResultLength = sizeof(LRESULT); - IntSetTebWndCallback (&hWnd, &pWnd); - UserLeaveCo(); Status = KeUserModeCallback(USER32_CALLBACK_EVENTPROC, @@ -653,12 +654,7 @@ &ResultPointer, &ResultLength); - /* Simulate old behaviour: copy into our local buffer */ - Result = *(LRESULT*)ResultPointer; - UserEnterCo(); - - IntRestoreTebWndCallback (hWnd, pWnd); IntCbFreeMemory(Argument); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -556,6 +556,17 @@ return UserGetWindowObject(pdo->DesktopWindow); } +HWND FASTCALL IntGetMessageWindow(VOID) +{ + PDESKTOP pdo = IntGetActiveDesktop(); + + if (!pdo) + { + DPRINT("No active desktop\n"); + return NULL; + } + return pdo->spwndMessage; +} HWND FASTCALL IntGetCurrentThreadDesktopWindow(VOID) { @@ -829,8 +840,14 @@ * Creates a new desktop. * * Parameters - * lpszDesktopName - * Name of the new desktop. + * poaAttribs + * Object Attributes. + * + * lpszDesktopDevice + * Name of the device. + * + * pDeviceMode + * Device Mode. * * dwFlags * Interaction flags. @@ -838,11 +855,6 @@ * dwDesiredAccess * Requested type of access. * - * lpSecurity - * Security descriptor. - * - * hWindowStation - * Handle to window station on which to create the desktop. * * Return Value * If the function succeeds, the return value is a handle to the newly @@ -857,17 +869,19 @@ HDESK APIENTRY NtUserCreateDesktop( - PUNICODE_STRING lpszDesktopName, + POBJECT_ATTRIBUTES poa, + PUNICODE_STRING lpszDesktopDevice, + LPDEVMODEW lpdmw, DWORD dwFlags, - ACCESS_MASK dwDesiredAccess, - LPSECURITY_ATTRIBUTES lpSecurity, - HWINSTA hWindowStation) + ACCESS_MASK dwDesiredAccess) { OBJECT_ATTRIBUTES ObjectAttributes; + PTHREADINFO W32Thread; +// HWND hwndMessage; PWINSTATION_OBJECT WinStaObject; PDESKTOP DesktopObject; UNICODE_STRING DesktopName; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; HDESK Desktop; CSR_API_MESSAGE Request; PVOID DesktopHeapSystemBase = NULL; @@ -875,11 +889,35 @@ UNICODE_STRING SafeDesktopName; ULONG DummyContext; ULONG_PTR HeapSize = 4 * 1024 * 1024; /* FIXME */ + HWINSTA hWindowStation = NULL ; + PUNICODE_STRING lpszDesktopName = NULL; +// UNICODE_STRING AtomName; DECLARE_RETURN(HDESK); - DPRINT("Enter NtUserCreateDesktop: %wZ\n", lpszDesktopName); UserEnterExclusive(); + + _SEH2_TRY + { + ProbeForRead( poa, + sizeof(OBJECT_ATTRIBUTES), + 1); + + hWindowStation = poa->RootDirectory; + lpszDesktopName = poa->ObjectName; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status =_SEH2_GetExceptionCode(); + } + _SEH2_END + + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed reading Object Attributes from user space.\n"); + SetLastNtError(Status); + RETURN( NULL); + } Status = IntValidateWindowStationHandle( hWindowStation, @@ -1037,6 +1075,52 @@ RETURN( NULL); } + W32Thread = PsGetCurrentThreadWin32Thread(); + + if (!W32Thread->Desktop) IntSetThreadDesktop(DesktopObject,FALSE); + +#if 0 + /* + Based on wine/server/window.c line 1804 in get_desktop_window. + We create an atom to be used for create desktop to create + the message window. + */ + // FIXME! + // ReactOS CreateWindow does not know how to correctly use Atom Classes. + // So we have this HAX! + { // Warning! HACK! Yes it is very wrong! + + // Normally, this would have been performed during the win32k init phase. + // AtomMessage = IntAddGlobalAtom(L"Message", TRUE); // <- correct, but should be in ntuser.c + + AtomMessage = + } + AtomName.Buffer = ((PWSTR)((ULONG_PTR)(WORD)(AtomMessage))); + AtomName.Length = 0; + + hwndMessage = co_IntCreateWindowEx( 0, + &AtomName, + NULL, + (WS_POPUP|WS_CLIPCHILDREN), + 0, + 0, + 100, + 100, + NULL, + NULL, + NULL,//hModuleWin, // pi->hModUser; ? no! + NULL, + 0, + TRUE); + if (!hwndMessage) + { + DPRINT1("Failed to create Message window handle\n"); + } + else + { + DesktopObject->spwndMessage = hwndMessage; + } +#endif RETURN( Desktop); CLEANUP: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -165,14 +165,14 @@ FASTCALL IntNotifyWinEvent( DWORD Event, - PWINDOW_OBJECT Window, + HWND hWnd, LONG idObject, LONG idChild) { PEVENTHOOK pEH; LRESULT Result; - if (!GlobalEvents->Counts) return; + if (!GlobalEvents || !GlobalEvents->Counts) return; pEH = (PEVENTHOOK)GlobalEvents->Events.Flink; @@ -187,7 +187,7 @@ if (!(pEH->idProcess) || !(pEH->idThread) || (NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess)) { - Result = IntCallLowLevelEvent(pEH, Event, Window->hSelf, idObject, idChild); + Result = IntCallLowLevelEvent(pEH, Event, hWnd, idObject, idChild); } }// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) && @@ -198,7 +198,7 @@ { Result = co_IntCallEventProc( pEH->Self, Event, - Window->hSelf, + hWnd, idObject, idChild, PtrToUint(NtCurrentTeb()->ClientId.UniqueThread), @@ -234,7 +234,7 @@ if (gpsi->dwInstalledEventHooks & GetMaskFromEvent(Event)) { UserRefObjectCo(Window, &Ref); - IntNotifyWinEvent( Event, Window, idObject, idChild); + IntNotifyWinEvent( Event, Window->hSelf, idObject, idChild); UserDerefObjectCo(Window); } UserLeave(); @@ -259,6 +259,8 @@ HANDLE Handle; PETHREAD Thread = NULL; + DPRINT("NtUserSetWinEventHook hmod 0x%x, pfn 0x%x\n",hmodWinEventProc, lpfnWinEventProc); + UserEnterExclusive(); if ( !GlobalEvents ) @@ -316,7 +318,6 @@ pEH->eventMax = eventMax; pEH->idProcess = idProcess; pEH->idThread = idThread; - pEH->Ansi = FALSE; pEH->Flags = dwflags; @@ -363,7 +364,9 @@ pEH->ModuleName.Length = ModuleName.Length; - pEH->Proc = (void *)((char *)lpfnWinEventProc - (char *)hmodWinEventProc); + pEH->offPfn = (ULONG_PTR)((char *)lpfnWinEventProc - (char *)hmodWinEventProc); + pEH->ihmod = (INT)hmodWinEventProc; + pEH->Proc = lpfnWinEventProc; } else pEH->Proc = lpfnWinEventProc; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -154,6 +154,10 @@ case WM_COPYDATA: Size = sizeof(COPYDATASTRUCT) + ((PCOPYDATASTRUCT)lParam)->cbData; + break; + + case WM_COPYGLOBALDATA: + Size = wParam; break; default: @@ -2023,7 +2027,7 @@ } -LRESULT APIENTRY +BOOL APIENTRY NtUserMessageCall( HWND hWnd, UINT Msg, @@ -2034,6 +2038,8 @@ BOOL Ansi) { LRESULT lResult = 0; + BOOL Ret = FALSE; + BOOL BadChk = FALSE; PWINDOW_OBJECT Window = NULL; USER_REFERENCE_ENTRY Ref; @@ -2043,21 +2049,23 @@ if (hWnd && (hWnd != INVALID_HANDLE_VALUE) && !(Window = UserGetWindowObject(hWnd))) { UserLeave(); - return 0; + return FALSE; } switch(dwType) { case FNID_DEFWINDOWPROC: UserRefObjectCo(Window, &Ref); lResult = IntDefWindowProc(Window, Msg, wParam, lParam, Ansi); + Ret = TRUE; UserDerefObjectCo(Window); break; + case FNID_SENDNOTIFYMESSAGE: + Ret = UserSendNotifyMessage(hWnd, Msg, wParam, lParam); + break; case FNID_BROADCASTSYSTEMMESSAGE: { PBROADCASTPARM parm; - BOOL BadChk = FALSE; DWORD_PTR RetVal = 0; - lResult = -1; if (ResultInfo) { @@ -2119,11 +2127,11 @@ } else if (parm->flags & BSF_POSTMESSAGE) { - lResult = UserPostMessage(HWND_BROADCAST, Msg, wParam, lParam); + Ret = UserPostMessage(HWND_BROADCAST, Msg, wParam, lParam); } else if ( parm->flags & BSF_SENDNOTIFYMESSAGE) { - lResult = UserSendNotifyMessage(HWND_BROADCAST, Msg, wParam, lParam); + Ret = UserSendNotifyMessage(HWND_BROADCAST, Msg, wParam, lParam); } } } @@ -2189,8 +2197,33 @@ } break; } + + switch(dwType) + { + case FNID_DEFWINDOWPROC: + case FNID_CALLWNDPROC: + case FNID_CALLWNDPROCRET: + if (ResultInfo) + { + _SEH2_TRY + { + ProbeForWrite((PVOID)ResultInfo, sizeof(LRESULT), 1); + RtlCopyMemory((PVOID)ResultInfo, &lResult, sizeof(LRESULT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_END; + } + break; + default: + break; + } + UserLeave(); - return lResult; + + return BadChk ? FALSE : Ret; } #define INFINITE 0xFFFFFFFF Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -34,6 +34,7 @@ #include <debug.h> ERESOURCE UserLock; +ATOM AtomMessage; // Window Message atom. BOOL gbInitialized; BOOL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Jul 1 21:19:16 2009 @@ -392,6 +392,8 @@ BelongsToThreadData = IntWndBelongsToThread(Window, ThreadData); IntDeRegisterShellHookWindow(Window->hSelf); + + IntNotifyWinEvent(EVENT_OBJECT_DESTROY, Window->hSelf, OBJID_WINDOW, 0); if(SendMessages) { @@ -1552,7 +1554,7 @@ RTL_ATOM ClassAtom; PWINDOW_OBJECT Window = NULL; PWINDOW_OBJECT ParentWindow = NULL, OwnerWindow; - HWND ParentWindowHandle; + HWND ParentWindowHandle = NULL; HWND OwnerWindowHandle; PMENU_OBJECT SystemMenu; HWND hWnd; @@ -1576,7 +1578,12 @@ PTHREADINFO pti; pti = PsGetCurrentThreadWin32Thread(); - ParentWindowHandle = pti->Desktop->DesktopWindow; + + if (pti->Desktop) + { + ParentWindowHandle = pti->Desktop->DesktopWindow; + } + OwnerWindowHandle = NULL; if (hWndParent == HWND_MESSAGE) @@ -1585,8 +1592,8 @@ * native ole32.OleInitialize uses HWND_MESSAGE to create the * message window (style: WS_POPUP|WS_DISABLED) */ - DPRINT("FIXME - Parent is HWND_MESSAGE\n"); - // ParentWindowHandle set already. + DPRINT1("FIXME - Parent is HWND_MESSAGE\n"); + // ParentWindowHandle = IntGetMessageWindow(); } else if (hWndParent) { @@ -1605,16 +1612,16 @@ RETURN( (HWND)0); /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } -// if (NULL != ParentWindowHandle) -// { - ParentWindow = UserGetWindowObject(ParentWindowHandle); - - if (ParentWindow) UserRefObjectCo(ParentWindow, &ParentRef); -// } -// else -// { -// ParentWindow = NULL; -// } + if (ParentWindowHandle) + { + ParentWindow = UserGetWindowObject(ParentWindowHandle); + + if (ParentWindow) UserRefObjectCo(ParentWindow, &ParentRef); + } + else + { + ParentWindow = NULL; + } /* FIXME: parent must belong to the current process */ @@ -2123,17 +2130,9 @@ IntUnlinkWindow(Window); RETURN((HWND)0); } -#if 0 - Result = IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window, OBJID_WINDOW, 0); - - if (Result == (LRESULT)-1) - { - /* FIXME: Cleanup. */ - DPRINT1("IntCreateWindowEx(): event CREATE hook failed. No cleanup performed!\n"); - IntUnlinkWindow(Window); - RETURN((HWND)0); - } -#endif + + IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window->hSelf, OBJID_WINDOW, 0); + /* Send move and size messages. */ if (!(Window->Flags & WINDOWOBJECT_NEED_SIZE)) { @@ -2417,6 +2416,12 @@ return FALSE; } + /* Call hooks */ + if (ISITHOOKED(WH_CBT)) + { + if (co_HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) hWnd, 0)) return FALSE; + } + /* Look whether the focus is within the tree of windows we will * be destroying. */ @@ -2436,11 +2441,6 @@ Window->MessageQueue->CaptureWindow = NULL; IntDereferenceMessageQueue(Window->MessageQueue); - /* Call hooks */ - if (ISITHOOKED(WH_CBT)) - { - if (co_HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) hWnd, 0)) return FALSE; - } IntEngWindowChanged(Window, WOC_DELETE); isChild = (0 != (Wnd->Style & WS_CHILD)); @@ -3224,6 +3224,18 @@ DPRINT("Enter NtUserSetParent\n"); UserEnterExclusive(); + + /* + Check Parent first from user space, set it here. + */ + if (!hWndNewParent) + { + hWndNewParent = IntGetDesktopWindow(); + } + else if (hWndNewParent == HWND_MESSAGE) + { + // hWndNewParent = IntGetMessageWindow(); + } RETURN( co_UserSetParent(hWndChild, hWndNewParent));

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 July 2009