Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 62204: [ws2_32] merge startup version checks from ws2_32_new/src/startup.c [ws2_32_new] fix typo
by cwittich＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: cwittich Date: Sun Feb 16 08:02:38 2014 New Revision: 62204 URL: http://svn.reactos.org/svn/reactos?rev=62204&view=rev Log: [ws2_32] merge startup version checks from ws2_32_new/src/startup.c [ws2_32_new] fix typo Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c trunk/reactos/dll/win32/ws2_32_new/src/startup.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Sun Feb 16 08:02:38 2014 @@ -55,7 +55,8 @@ WSAStartup(IN WORD wVersionRequested, OUT LPWSADATA lpWSAData) { - BYTE Low, High; + WORD VersionReturned = 0; + DWORD ErrorCode = ERROR_SUCCESS; WS_DbgPrint(MAX_TRACE, ("WSAStartup of ws2_32.dll\n")); @@ -65,48 +66,56 @@ if (lpWSAData == NULL) return WSAEFAULT; - Low = LOBYTE(wVersionRequested); - High = HIBYTE(wVersionRequested); - - if (Low < 1) - { - WS_DbgPrint(MAX_TRACE, ("Bad winsock version requested, %d,%d", Low, High)); - return WSAVERNOTSUPPORTED; - } - - if (Low == 1) - { - if (High == 0) - { - lpWSAData->wVersion = wVersionRequested; - } - else - { - lpWSAData->wVersion = MAKEWORD(1, 1); - } - } - else if (Low == 2) - { - if (High <= 2) - { - lpWSAData->wVersion = MAKEWORD(2, High); - } - else - { - lpWSAData->wVersion = MAKEWORD(2, 2); - } - } - else - { - lpWSAData->wVersion = MAKEWORD(2, 2); - } - - lpWSAData->wVersion = wVersionRequested; + /* Check which version is being requested */ + switch (LOBYTE(wVersionRequested)) + { + case 0: + + /* We don't support this unknown version */ + ErrorCode = WSAVERNOTSUPPORTED; + break; + + case 1: + /* We support only 1.0 and 1.1 */ + if (HIBYTE(wVersionRequested) == 0) + { + /* Caller wants 1.0, return it */ + VersionReturned = wVersionRequested; + } + else + { + /* The only other version we support is 1.1 */ + VersionReturned = MAKEWORD(1, 1); + } + break; + + case 2: + /* We support only 2.0, 2.1 and 2.2 */ + if (HIBYTE(wVersionRequested) <= 2) + { + /* Caller wants 2.0-2.2, return it */ + VersionReturned = MAKEWORD(2, HIBYTE(wVersionRequested)); + } + else + { + /* The highest version we support is 2.2 */ + VersionReturned = MAKEWORD(2, 2); + } + break; + + default: + + /* Return 2.2 */ + VersionReturned = MAKEWORD(2, 2);; + break; + } + + /* Return the Version Requested, unless error */ + lpWSAData->wVersion = VersionReturned; + lpWSAData->wHighVersion = MAKEWORD(2,2); lstrcpyA(lpWSAData->szDescription, "WinSock 2.0"); lstrcpyA(lpWSAData->szSystemStatus, "Running"); - lpWSAData->iMaxSockets = 0; - lpWSAData->iMaxUdpDg = 0; lpWSAData->lpVendorInfo = NULL; if (LOBYTE(wVersionRequested) == 1) @@ -124,7 +133,7 @@ WSASETINITIALIZED; - return NO_ERROR; + return ErrorCode; } Modified: trunk/reactos/dll/win32/ws2_32_new/src/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] Sun Feb 16 08:02:38 2014 @@ -160,7 +160,7 @@ break; } - /* Return the Version Requsted, unless error */ + /* Return the Version Requested, unless error */ lpWSAData->wVersion = VersionReturned; /* We support Winsock 2.2 */

1 0

[cwittich] 62203: [ws2_32] always return "WinSock 2.0" as windows does merge winsock 1 init code from ws2_32_new
by cwittich＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: cwittich Date: Sun Feb 16 07:05:23 2014 New Revision: 62203 URL: http://svn.reactos.org/svn/reactos?rev=62203&view=rev Log: [ws2_32] always return "WinSock 2.0" as windows does merge winsock 1 init code from ws2_32_new Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Sun Feb 16 07:05:23 2014 @@ -103,12 +103,23 @@ lpWSAData->wVersion = wVersionRequested; lpWSAData->wHighVersion = MAKEWORD(2,2); - lstrcpyA(lpWSAData->szDescription, "WinSock 2.2"); + lstrcpyA(lpWSAData->szDescription, "WinSock 2.0"); lstrcpyA(lpWSAData->szSystemStatus, "Running"); lpWSAData->iMaxSockets = 0; lpWSAData->iMaxUdpDg = 0; lpWSAData->lpVendorInfo = NULL; + if (LOBYTE(wVersionRequested) == 1) + { + lpWSAData->iMaxSockets = 32767; + lpWSAData->iMaxUdpDg = 65467; + } + else + { + lpWSAData->iMaxSockets = 0; + lpWSAData->iMaxUdpDg = 0; + } + /*FIXME: increment internal counter */ WSASETINITIALIZED;

1 0

[cwittich] 62202: [crt] fix swscanf winetest
by cwittich＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: cwittich Date: Sun Feb 16 05:42:42 2014 New Revision: 62202 URL: http://svn.reactos.org/svn/reactos?rev=62202&view=rev Log: [crt] fix swscanf winetest Modified: trunk/reactos/lib/sdk/crt/string/scanf.h Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Sun Feb 16 05:42:42 2014 @@ -26,7 +26,7 @@ #ifdef WIDE_SCANF #define _CHAR_ wchar_t #define _EOF_ WEOF -#define _EOF_RET WEOF +#define _EOF_RET (short)WEOF #define _ISSPACE_(c) iswspace(c) #define _ISDIGIT_(c) iswdigit(c) #define _WIDE2SUPPORTED_(c) c /* No conversion needed (wide to wide) */ @@ -88,8 +88,11 @@ #endif /* STRING */ #endif /* CONSOLE */ #endif /* WIDE_SCANF */ + nch = _GETC_(file); - if (nch == _EOF_) return _EOF_RET; + if (nch == _EOF_) { + return _EOF_RET; + } while (*format) { /* a whitespace character in the format string causes scanf to read, @@ -248,11 +251,12 @@ /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); - /* get sign. */ + + /* get sign. */ if (nch == '-' || nch == '+') { - negative = (nch=='-'); - if (width>0) width--; - if (width==0) break; + negative = (nch=='-'); + if (width>0) width--; + if (width==0) break; nch = _GETC_(file); } /* get first digit. */ @@ -274,12 +278,12 @@ if (width!=0 && nch == '.') { long double dec = 1; nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { dec /= 10; cur += dec * (nch - '0'); nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } } /* handle exponent */ @@ -287,19 +291,19 @@ int exponent = 0, negexp = 0; double expcnt, shift; nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; /* possible sign on the exponent */ if (width!=0 && (nch=='+' || nch=='-')) { negexp = (nch=='-'); nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } /* exponent digits */ while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { exponent *= 10; exponent += (nch - '0'); nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } /* update 'cur' with this exponent. */ expcnt = 10; @@ -315,9 +319,9 @@ st = 1; if (!suppress) { if (L_prefix) _SET_NUMBER_(long double); - else if (l_prefix) _SET_NUMBER_(double); - else _SET_NUMBER_(float); - } + else if (l_prefix) _SET_NUMBER_(double); + else _SET_NUMBER_(float); + } } break; /* According to msdn, @@ -494,9 +498,9 @@ /* terminate */ if (!suppress) *sptr = 0; #ifdef _LIBCNT_ - RtlFreeHeap(RtlGetProcessHeap(), 0, Mask); + RtlFreeHeap(RtlGetProcessHeap(), 0, Mask); #else - HeapFree(GetProcessHeap(), 0, Mask); + HeapFree(GetProcessHeap(), 0, Mask); #endif } break;

1 0

[jimtabor] 62201: - Fix crash reported in CORE-6734.
by jimtabor＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: jimtabor Date: Sun Feb 16 01:05:04 2014 New Revision: 62201 URL: http://svn.reactos.org/svn/reactos?rev=62201&view=rev Log: - Fix crash reported in CORE-6734. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sun Feb 16 01:05:04 2014 @@ -1775,6 +1775,7 @@ if (IsListEmpty(CurrentEntry)) break; if (!CurrentMessage) break; CurrentEntry = CurrentMessage->ListEntry.Flink; + if (!CurrentEntry) break; //// Fix CORE-6734 reported crash. /* MSDN: 1: any window that belongs to the current thread, and any messages on the current thread's message queue whose hwnd value is NULL.

1 0

[aandrejevic] 62200: [BASESRV] Move the VDM states and binary types to a public header file. Implement GetNextDosSesId. Continue implementing BaseSrvCheckVDM.
by aandrejevic＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: aandrejevic Date: Sun Feb 16 00:09:27 2014 New Revision: 62200 URL: http://svn.reactos.org/svn/reactos?rev=62200&view=rev Log: [BASESRV] Move the VDM states and binary types to a public header file. Implement GetNextDosSesId. Continue implementing BaseSrvCheckVDM. Added: branches/ntvdm/include/reactos/subsys/win/vdm.h (with props) Modified: branches/ntvdm/dll/win32/kernel32/include/vdm.h branches/ntvdm/dll/win32/kernel32/k32.h branches/ntvdm/subsystems/win/basesrv/vdm.c branches/ntvdm/subsystems/win/basesrv/vdm.h Modified: branches/ntvdm/dll/win32/kernel32/include/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/includ… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/include/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/include/vdm.h [iso-8859-1] Sun Feb 16 00:09:27 2014 @@ -24,24 +24,6 @@ #define VDM_UNDO_FULL 0x02 #define VDM_UNDO_REUSE 0x04 #define VDM_UNDO_COMPLETED 0x08 - -// -// Binary Types to share with VDM -// -#define BINARY_TYPE_EXE 0x01 -#define BINARY_TYPE_COM 0x02 -#define BINARY_TYPE_PIF 0x03 -#define BINARY_TYPE_DOS 0x10 -#define BINARY_TYPE_SEPARATE_WOW 0x20 -#define BINARY_TYPE_WOW 0x40 -#define BINARY_TYPE_WOW_EX 0x80 - -// -// VDM States -// -#define VDM_NOT_LOADED 0x01 -#define VDM_NOT_READY 0x02 -#define VDM_READY 0x04 /* STRUCTURES *****************************************************************/ Modified: branches/ntvdm/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/k32.h?… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/k32.h [iso-8859-1] Sun Feb 16 00:09:27 2014 @@ -46,6 +46,7 @@ #include <win/basemsg.h> #include <win/console.h> #include <win/conmsg.h> +#include <win/vdm.h> /* DDK Driver Headers */ #include <mountmgr.h> Added: branches/ntvdm/include/reactos/subsys/win/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/subsys/wi… ============================================================================== --- branches/ntvdm/include/reactos/subsys/win/vdm.h (added) +++ branches/ntvdm/include/reactos/subsys/win/vdm.h [iso-8859-1] Sun Feb 16 00:09:27 2014 @@ -0,0 +1,35 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Base API Server DLL + * FILE: include/reactos/subsys/win/vdm.h + * PURPOSE: Public definitions for the Virtual Dos Machine + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +#ifndef _VDM_H +#define _VDM_H + +#pragma once + +// +// Binary Types to share with VDM +// +#define BINARY_TYPE_EXE 0x01 +#define BINARY_TYPE_COM 0x02 +#define BINARY_TYPE_PIF 0x03 +#define BINARY_TYPE_DOS 0x10 +#define BINARY_TYPE_SEPARATE_WOW 0x20 +#define BINARY_TYPE_WOW 0x40 +#define BINARY_TYPE_WOW_EX 0x80 + +// +// VDM States +// +#define VDM_NOT_LOADED 0x01 +#define VDM_NOT_READY 0x02 +#define VDM_READY 0x04 + +#endif // _VDM_H + +/* EOF */ Propchange: branches/ntvdm/include/reactos/subsys/win/vdm.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Sun Feb 16 00:09:27 2014 @@ -20,6 +20,7 @@ BOOLEAN FirstVDM = TRUE; LIST_ENTRY VDMConsoleListHead; RTL_CRITICAL_SECTION DosCriticalSection; +RTL_CRITICAL_SECTION WowCriticalSection; /* FUNCTIONS ******************************************************************/ @@ -39,6 +40,35 @@ return CurrentRecord ? STATUS_SUCCESS : STATUS_NOT_FOUND; } +ULONG NTAPI GetNextDosSesId(VOID) +{ + ULONG SessionId; + PLIST_ENTRY i; + PVDM_CONSOLE_RECORD CurrentRecord = NULL; + BOOLEAN Found; + + /* Search for an available session ID */ + for (SessionId = 1; SessionId != 0; SessionId++) + { + Found = FALSE; + + /* Check if the ID is already in use */ + for (i = VDMConsoleListHead.Flink; i != &VDMConsoleListHead; i = i->Flink) + { + CurrentRecord = CONTAINING_RECORD(i, VDM_CONSOLE_RECORD, Entry); + if (CurrentRecord->SessionId == SessionId) Found = TRUE; + } + + /* If not, we found one */ + if (!Found) break; + } + + ASSERT(SessionId != 0); + + /* Return the session ID */ + return SessionId; +} + VOID NTAPI BaseInitializeVDM(VOID) { /* Initialize the list head */ @@ -46,13 +76,17 @@ /* Initialize the critical section */ RtlInitializeCriticalSection(&DosCriticalSection); + RtlInitializeCriticalSection(&WowCriticalSection); } /* PUBLIC SERVER APIS *********************************************************/ CSR_API(BaseSrvCheckVDM) { + NTSTATUS Status; PBASE_CHECK_VDM CheckVdmRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.CheckVDMRequest; + PRTL_CRITICAL_SECTION CriticalSection = NULL; + PVDM_CONSOLE_RECORD ConsoleRecord = NULL; /* Validate the message buffers */ if (!CsrValidateMessageBuffer(ApiMessage, @@ -87,8 +121,59 @@ return STATUS_INVALID_PARAMETER; } - // TODO: NOT IMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + CriticalSection = (CheckVdmRequest->BinaryType != BINARY_TYPE_SEPARATE_WOW) + ? &DosCriticalSection + : &WowCriticalSection; + + /* Enter the critical section */ + RtlEnterCriticalSection(CriticalSection); + + /* Check if this is a DOS or WOW VDM */ + if (CheckVdmRequest->BinaryType != BINARY_TYPE_SEPARATE_WOW) + { + /* Get the console record */ + Status = BaseSrvGetConsoleRecord(CheckVdmRequest->ConsoleHandle, + &ConsoleRecord); + + if (!NT_SUCCESS(Status)) + { + /* Allocate a new console record */ + ConsoleRecord = (PVDM_CONSOLE_RECORD)RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + sizeof(VDM_CONSOLE_RECORD)); + if (ConsoleRecord == NULL) + { + Status = STATUS_NO_MEMORY; + goto Cleanup; + } + + /* Initialize the console record */ + ConsoleRecord->ConsoleHandle = CheckVdmRequest->ConsoleHandle; + ConsoleRecord->CurrentDirs = NULL; + ConsoleRecord->CurDirsLength = 0; + ConsoleRecord->SessionId = GetNextDosSesId(); + InitializeListHead(&ConsoleRecord->DosListHead); + + /* Add the console record */ + InsertTailList(&VDMConsoleListHead, &ConsoleRecord->Entry); + } + + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + else + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + +Cleanup: + /* Leave the critical section */ + RtlLeaveCriticalSection(CriticalSection); + + return Status; } CSR_API(BaseSrvUpdateVDMEntry) Modified: branches/ntvdm/subsystems/win/basesrv/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] Sun Feb 16 00:09:27 2014 @@ -9,6 +9,8 @@ #ifndef __VDM_H__ #define __VDM_H__ +#include <win/vdm.h> + /* DEFINITIONS ****************************************************************/ typedef struct _VDM_CONSOLE_RECORD @@ -17,6 +19,7 @@ HANDLE ConsoleHandle; PCHAR CurrentDirs; ULONG CurDirsLength; + ULONG SessionId; LIST_ENTRY DosListHead; // TODO: Structure incomplete!!! } VDM_CONSOLE_RECORD, *PVDM_CONSOLE_RECORD;

1 0

[cwittich] 62199: [crt] partial sync of with wine 1.7.11
by cwittich＠svn.reactos.org 15 Feb '14

15 Feb '14

Author: cwittich Date: Sat Feb 15 19:12:07 2014 New Revision: 62199 URL: http://svn.reactos.org/svn/reactos?rev=62199&view=rev Log: [crt] partial sync of with wine 1.7.11 Modified: trunk/reactos/lib/sdk/crt/string/scanf.h Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Sat Feb 15 19:12:07 2014 @@ -131,8 +131,14 @@ /* read prefix (if any) */ while (!prefix_finished) { switch(*format) { - case 'h': h_prefix = 1; break; - case 'l': l_prefix = 1; break; + case 'h': h_prefix++; break; + case 'l': + if(*(format+1) == 'l') { + I64_prefix = 1; + format++; + } + l_prefix = 1; + break; case 'w': w_prefix = 1; break; case 'L': L_prefix = 1; break; case 'I': @@ -227,15 +233,15 @@ #define _SET_NUMBER_(type) *va_arg(ap, type*) = (type)(negative ? -cur : cur) if (I64_prefix) _SET_NUMBER_(LONGLONG); else if (l_prefix) _SET_NUMBER_(LONG); - else if (h_prefix) _SET_NUMBER_(short int); + else if (h_prefix == 1) _SET_NUMBER_(short int); else _SET_NUMBER_(int); } } break; - case 'e': - case 'E': - case 'f': - case 'g': + case 'e': + case 'E': + case 'f': + case 'g': case 'G': { /* read a float */ long double cur = 0; int negative = 0; @@ -527,6 +533,7 @@ if (nch!=_EOF_) { _UNGETC_(nch, file); } + TRACE("returning %d\n", rd); return rd; }

1 0

[spetreolle] 62198: [VGAFONTEDIT] [IMAGESOFT] [GREEN] Bring up PCH support.
by spetreolle＠svn.reactos.org 15 Feb '14

15 Feb '14

Author: spetreolle Date: Sat Feb 15 16:10:57 2014 New Revision: 62198 URL: http://svn.reactos.org/svn/reactos?rev=62198&view=rev Log: [VGAFONTEDIT] [IMAGESOFT] [GREEN] Bring up PCH support. Modified: trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt trunk/rosapps/applications/imagesoft/CMakeLists.txt trunk/rosapps/drivers/green/CMakeLists.txt Modified: trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt [iso-8859-1] Sat Feb 15 16:10:57 2014 @@ -10,7 +10,7 @@ opensave.c vgafontedit.rc) -add_pch(vgafontedit precomp.h) +add_pch(vgafontedit precomp.h SOURCE) add_executable(vgafontedit ${SOURCE}) set_module_type(vgafontedit win32gui UNICODE) add_importlibs(vgafontedit user32 gdi32 comdlg32 msvcrt kernel32) Modified: trunk/rosapps/applications/imagesoft/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/CMa… ============================================================================== --- trunk/rosapps/applications/imagesoft/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/imagesoft/CMakeLists.txt [iso-8859-1] Sat Feb 15 16:10:57 2014 @@ -15,7 +15,7 @@ tooldock.c imagesoft.rc) -add_pch(imagesoft precomp.h) +add_pch(imagesoft precomp.h SOURCE) add_executable(imagesoft ${SOURCE}) set_module_type(imagesoft win32gui UNICODE) add_importlibs(imagesoft gdi32 user32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) Modified: trunk/rosapps/drivers/green/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/CMakeLists.t… ============================================================================== --- trunk/rosapps/drivers/green/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/drivers/green/CMakeLists.txt [iso-8859-1] Sat Feb 15 16:10:57 2014 @@ -1,5 +1,5 @@ -add_library(green SHARED +list(APPEND SOURCE createclose.c dispatch.c green.c @@ -10,7 +10,8 @@ screen.c green.rc) -add_pch(green green.h) +add_library(green SHARED ${SOURCE}) +add_pch(green green.h SOURCE) set_module_type(green kernelmodedriver) add_importlibs(green ntoskrnl hal) add_cd_file(TARGET green DESTINATION reactos/system32/drivers NO_CAB FOR all)

1 0

[jgardou] 62197: [KERNEL32] - Sync CompareStringA to wine 1.7.12 .Fix pollution of LastError by CompareStringA in case of zero-length string. CORE-7911 #comment committed r62197. #resolve
by jgardou＠svn.reactos.org 15 Feb '14

15 Feb '14

Author: jgardou Date: Sat Feb 15 11:30:13 2014 New Revision: 62197 URL: http://svn.reactos.org/svn/reactos?rev=62197&view=rev Log: [KERNEL32] - Sync CompareStringA to wine 1.7.12 .Fix pollution of LastError by CompareStringA in case of zero-length string. CORE-7911 #comment committed r62197. #resolve Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Sat Feb 15 11:30:13 2014 @@ -1767,13 +1767,13 @@ * str1 is less than, equal to or greater than str2 respectively. * Failure: FALSE. Use GetLastError() to determine the cause. */ -INT WINAPI CompareStringA(LCID lcid, DWORD style, +INT WINAPI CompareStringA(LCID lcid, DWORD flags, LPCSTR str1, INT len1, LPCSTR str2, INT len2) { WCHAR *buf1W = NtCurrentTeb()->StaticUnicodeBuffer; WCHAR *buf2W = buf1W + 130; LPWSTR str1W, str2W; - INT len1W, len2W, ret; + INT len1W = 0, len2W = 0, ret; UINT locale_cp = CP_ACP; if (!str1 || !str2) @@ -1784,39 +1784,56 @@ if (len1 < 0) len1 = strlen(str1); if (len2 < 0) len2 = strlen(str2); - if (!(style & LOCALE_USE_CP_ACP)) locale_cp = get_lcid_codepage( lcid ); - - len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, buf1W, 130); - if (len1W) + if (!(flags & LOCALE_USE_CP_ACP)) locale_cp = get_lcid_codepage( lcid ); + + if (len1) + { + if (len1 <= 130) len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, buf1W, 130); + if (len1W) + str1W = buf1W; + else + { + len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, NULL, 0); + str1W = HeapAlloc(GetProcessHeap(), 0, len1W * sizeof(WCHAR)); + if (!str1W) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + MultiByteToWideChar(locale_cp, 0, str1, len1, str1W, len1W); + } + } + else + { + len1W = 0; str1W = buf1W; + } + + if (len2) + { + if (len2 <= 130) len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, buf2W, 130); + if (len2W) + str2W = buf2W; + else + { + len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, NULL, 0); + str2W = HeapAlloc(GetProcessHeap(), 0, len2W * sizeof(WCHAR)); + if (!str2W) + { + if (str1W != buf1W) HeapFree(GetProcessHeap(), 0, str1W); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + MultiByteToWideChar(locale_cp, 0, str2, len2, str2W, len2W); + } + } else { - len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, NULL, 0); - str1W = HeapAlloc(GetProcessHeap(), 0, len1W * sizeof(WCHAR)); - if (!str1W) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - MultiByteToWideChar(locale_cp, 0, str1, len1, str1W, len1W); - } - len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, buf2W, 130); - if (len2W) + len2W = 0; str2W = buf2W; - else - { - len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, NULL, 0); - str2W = HeapAlloc(GetProcessHeap(), 0, len2W * sizeof(WCHAR)); - if (!str2W) - { - if (str1W != buf1W) HeapFree(GetProcessHeap(), 0, str1W); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - MultiByteToWideChar(locale_cp, 0, str2, len2, str2W, len2W); - } - - ret = CompareStringW(lcid, style, str1W, len1W, str2W, len2W); + } + + ret = CompareStringW(lcid, flags, str1W, len1W, str2W, len2W); if (str1W != buf1W) HeapFree(GetProcessHeap(), 0, str1W); if (str2W != buf2W) HeapFree(GetProcessHeap(), 0, str2W);

1 0

[jimtabor] 62196: [Win32k] - Do not re-enter SetFocus, just call message handling to switch focus window. - Fix broken logic when searching for a non child ancestor to send messages/Set focus to. -...
by jimtabor＠svn.reactos.org 15 Feb '14

15 Feb '14

Author: jimtabor Date: Sat Feb 15 02:14:03 2014 New Revision: 62196 URL: http://svn.reactos.org/svn/reactos?rev=62196&view=rev Log: [Win32k] - Do not re-enter SetFocus, just call message handling to switch focus window. - Fix broken logic when searching for a non child ancestor to send messages/Set focus to. - See CORE-6452. Modified: trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Sat Feb 15 02:14:03 2014 @@ -734,14 +734,13 @@ if (bFocus && !(ThreadQueue->QF_flags & QF_FOCUSNULLSINCEACTIVE)) { /* Do not change focus if the window is no longer active */ - if (ThreadQueue->spwndActive == Wnd) - { - if (!ThreadQueue->spwndFocus || - !Wnd || - UserGetAncestor(ThreadQueue->spwndFocus, GA_ROOT) != Wnd) - { - co_UserSetFocus(Wnd); - } + if (pti->MessageQueue->spwndActive != IntGetNonChildAncestor(pti->MessageQueue->spwndFocus)) + { + PWND pWndSend = pti->MessageQueue->spwndActive; + // Clear focus if the active window is minimized. + if (pWndSend && pti->MessageQueue->spwndActive->style & WS_MINIMIZE) pWndSend = NULL; + // Send focus messages and if so, set the focus. + IntSendFocusMessages( pti, pWndSend); } } @@ -815,12 +814,13 @@ } /* Check if we can set the focus to this window */ - for (pwndTop = Window; pwndTop != NULL; pwndTop = pwndTop->spwndParent) + //// Fixes wine win test_SetParent both "todo" line 3710 and 3720... + for (pwndTop = Window; pwndTop; pwndTop = pwndTop->spwndParent) { if (pwndTop->style & (WS_MINIMIZED|WS_DISABLED)) return 0; if ((pwndTop->style & (WS_POPUP|WS_CHILD)) != WS_CHILD) break; } - + //// if (co_HOOK_CallHooks( WH_CBT, HCBT_SETFOCUS, (WPARAM)Window->head.h, (LPARAM)hWndPrev)) { ERR("SetFocus 1 WH_CBT Call Hook return!\n"); Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sat Feb 15 02:14:03 2014 @@ -1565,10 +1565,7 @@ if (pwndMsg != MessageQueue->spwndActive) { PWND pwndTop = pwndMsg; - while (pwndTop && ((pwndTop->style & (WS_POPUP|WS_CHILD)) == WS_CHILD)) - { - pwndTop = pwndTop->spwndParent; - } + pwndTop = IntGetNonChildAncestor(pwndTop); if (pwndTop && pwndTop != pwndDesktop) { Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sat Feb 15 02:14:03 2014 @@ -277,11 +277,8 @@ PWND FASTCALL IntGetNonChildAncestor(PWND pWnd) { - if (pWnd) - { - while(pWnd && ((pWnd->style & (WS_CHILD | WS_POPUP)) != WS_CHILD)) - pWnd = pWnd->spwndParent; - } + while(pWnd && (pWnd->style & (WS_CHILD | WS_POPUP)) == WS_CHILD) + pWnd = pWnd->spwndParent; return pWnd; }

1 0

[akhaldi] 62195: [WINTRUST_WINETEST] * Globally mark expected failures as todos. ROSTESTS-128
by akhaldi＠svn.reactos.org 14 Feb '14

14 Feb '14

Author: akhaldi Date: Fri Feb 14 23:47:59 2014 New Revision: 62195 URL: http://svn.reactos.org/svn/reactos?rev=62195&view=rev Log: [WINTRUST_WINETEST] * Globally mark expected failures as todos. ROSTESTS-128 Modified: trunk/rostests/winetests/wintrust/CMakeLists.txt Modified: trunk/rostests/winetests/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/CMakeL… ============================================================================== --- trunk/rostests/winetests/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/CMakeLists.txt [iso-8859-1] Fri Feb 14 23:47:59 2014 @@ -1,3 +1,5 @@ + +add_definitions(-DUSE_WINE_TODOS) list(APPEND SOURCE asn.c

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