Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 42060: - Add libX11 placeholder.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 20:59:02 2009 New Revision: 42060 URL: http://svn.reactos.org/svn/reactos?rev=42060&view=rev Log: - Add libX11 placeholder. Added: branches/arwinss/reactos/lib/3rdparty/libX11/ (with props) branches/arwinss/reactos/lib/3rdparty/libX11/libX11.rbuild (with props) Modified: branches/arwinss/reactos/lib/3rdparty/3rdparty.rbuild Modified: branches/arwinss/reactos/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/3rdparty/3r… ============================================================================== --- branches/arwinss/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] Sat Jul 18 20:59:02 2009 @@ -22,6 +22,9 @@ <directory name="libwine"> <xi:include href="libwine/libwine.rbuild" /> </directory> + <directory name="libX11"> + <xi:include href="libX11/libX11.rbuild" /> + </directory> <directory name="libxml2"> <xi:include href="libxml2/libxml2.rbuild" /> </directory> Propchange: branches/arwinss/reactos/lib/3rdparty/libX11/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Jul 18 20:59:02 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/arwinss/reactos/lib/3rdparty/libX11/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/arwinss/reactos/lib/3rdparty/libX11/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/arwinss/reactos/lib/3rdparty/libX11/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/arwinss/reactos/lib/3rdparty/libX11/libX11.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/3rdparty/li… ============================================================================== --- branches/arwinss/reactos/lib/3rdparty/libX11/libX11.rbuild (added) +++ branches/arwinss/reactos/lib/3rdparty/libX11/libX11.rbuild [iso-8859-1] Sat Jul 18 20:59:02 2009 @@ -1,0 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<group> +<module name="libX11" type="staticlibrary"> +</module> +</group> Propchange: branches/arwinss/reactos/lib/3rdparty/libX11/libX11.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 42059: - Bring atan2 implementation from crt. Please excuse me for this hack, but gdi32 can't link to msvcrt, and ntdll doesn't export atan2. Static linkage to crt doesn't work either. - Remove advapi32 from the list of included DLLs, gdi32 must NOT link to advapi32, otherwise a circular dependency happens. - Remove ASSERT macro definition. - gdi32 builds without any errors or warnings.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 20:53:05 2009 New Revision: 42059 URL: http://svn.reactos.org/svn/reactos?rev=42059&view=rev Log: - Bring atan2 implementation from crt. Please excuse me for this hack, but gdi32 can't link to msvcrt, and ntdll doesn't export atan2. Static linkage to crt doesn't work either. - Remove advapi32 from the list of included DLLs, gdi32 must NOT link to advapi32, otherwise a circular dependency happens. - Remove ASSERT macro definition. - gdi32 builds without any errors or warnings. Added: branches/arwinss/reactos/dll/win32/gdi32/atan2.c - copied unchanged from r42002, branches/arwinss/reactos/lib/sdk/crt/math/i386/atan2.c Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Sat Jul 18 20:53:05 2009 @@ -12,11 +12,11 @@ <library>ntdll</library> <library>user32</library> <library>kernel32</library> - <library>advapi32</library> <library>win32ksys</library> <library>pseh</library> <library>dxguid</library> + <file>atan2.c</file> <file>bidi.c</file> <file>bitblt.c</file> <file>bitmap.c</file> Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h [iso-8859-1] Sat Jul 18 20:53:05 2009 @@ -531,8 +531,4 @@ #endif #define assert(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } -#ifndef ASSERT -#define ASSERT(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } -#endif - #endif /* __WINE_GDI_PRIVATE_H */

1 0

[dchapyshev] 42058: - Sync SHDefExtractIconW with Wine. Fixes crash at shelllink test
by dchapyshev＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: dchapyshev Date: Sat Jul 18 20:47:40 2009 New Revision: 42058 URL: http://svn.reactos.org/svn/reactos?rev=42058&view=rev Log: - Sync SHDefExtractIconW with Wine. Fixes crash at shelllink test Modified: trunk/reactos/dll/win32/shell32/iconcache.c Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] Sat Jul 18 20:47:40 2009 @@ -884,8 +884,14 @@ if (ret == 0xFFFFFFFF) return E_FAIL; if (ret > 0) { - *phiconLarge = hIcons[0]; - *phiconSmall = hIcons[1]; + if (phiconLarge) + *phiconLarge = hIcons[0]; + else + DestroyIcon(hIcons[0]); + if (phiconSmall) + *phiconSmall = hIcons[1]; + else + DestroyIcon(hIcons[1]); return S_OK; } return S_FALSE;

1 0

[fireball] 42057: - Import winex11.drv from Wine.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 20:38:55 2009 New Revision: 42057 URL: http://svn.reactos.org/svn/reactos?rev=42057&view=rev Log: - Import winex11.drv from Wine. Added: branches/arwinss/reactos/dll/win32/winex11.drv/ - copied from r41998, vendor/wine/dlls/winex11.drv/current/

1 0

[fireball] 42056: - Bring back an accidentally removed function stub.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 20:35:56 2009 New Revision: 42056 URL: http://svn.reactos.org/svn/reactos?rev=42056&view=rev Log: - Bring back an accidentally removed function stub. Modified: branches/arwinss/reactos/dll/win32/user32/misc.c branches/arwinss/reactos/dll/win32/user32/user32.spec Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Sat Jul 18 20:35:56 2009 @@ -706,3 +706,14 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } + +/********************************************************************** + * DisableProcessWindowsGhosting [USER32.@] + * + */ +VOID WINAPI DisableProcessWindowsGhosting(VOID) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return; +} Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] Sat Jul 18 20:35:56 2009 @@ -163,7 +163,7 @@ @ stdcall DialogBoxIndirectParamW(long ptr long ptr long) @ stdcall DialogBoxParamA(long str long ptr long) @ stdcall DialogBoxParamW(long wstr long ptr long) -@ stub DisableProcessWindowsGhosting +@ stdcall DisableProcessWindowsGhosting() @ stdcall DispatchMessageA(ptr) @ stdcall DispatchMessageW(ptr) @ stub DisplayExitWindowsWarnings

1 0

[fireball] 42055: - Temporary comment out most of multilanguage resources. - Get rid of even more 16 bit crap in edit.c. - user32.dll now builds.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 19:58:06 2009 New Revision: 42055 URL: http://svn.reactos.org/svn/reactos?rev=42055&view=rev Log: - Temporary comment out most of multilanguage resources. - Get rid of even more 16 bit crap in edit.c. - user32.dll now builds. Modified: branches/arwinss/reactos/dll/win32/user32/edit.c branches/arwinss/reactos/dll/win32/user32/legacy.c branches/arwinss/reactos/dll/win32/user32/resources/user32.rc branches/arwinss/reactos/dll/win32/user32/sysparams.c branches/arwinss/reactos/dll/win32/user32/user32.rbuild branches/arwinss/reactos/dll/win32/user32/user32.spec branches/arwinss/reactos/dll/win32/user32/user_main.c branches/arwinss/reactos/dll/win32/user32/winproc.c Modified: branches/arwinss/reactos/dll/win32/user32/edit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/edit.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/edit.c [iso-8859-1] Sat Jul 18 19:58:06 2009 @@ -2387,7 +2387,7 @@ return hLocal; } - +#if 0 /********************************************************************* * * EM_GETHANDLE16 @@ -2455,7 +2455,7 @@ stack16->ds = oldDS; return es->hloc16; } - +#endif /********************************************************************* * @@ -2813,7 +2813,7 @@ EDIT_UpdateScrollInfo(es); } - +#if 0 /********************************************************************* * * EM_SETHANDLE16 @@ -2884,7 +2884,7 @@ /* force scroll info update */ EDIT_UpdateScrollInfo(es); } - +#endif /********************************************************************* * Modified: branches/arwinss/reactos/dll/win32/user32/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] Sat Jul 18 19:58:06 2009 @@ -117,6 +117,6 @@ PrivateCsrssInitialized(VOID) { /* Perform a reactos only CSRSS connection */ - RosUserConnectCsrss(); + //RosUserConnectCsrss(); } Modified: branches/arwinss/reactos/dll/win32/user32/resources/user32.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/resources/user32.rc [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/resources/user32.rc [iso-8859-1] Sat Jul 18 19:58:06 2009 @@ -62,18 +62,18 @@ #include "resources/user32_Ko.rc" #include "resources/user32_Lt.rc" #include "resources/user32_Nl.rc" -#include "resources/user32_No.rc" -#include "resources/user32_Pl.rc" -#include "resources/user32_Pt.rc" +//#include "resources/user32_No.rc" +//#include "resources/user32_Pl.rc" +//#include "resources/user32_Pt.rc" #include "resources/user32_Ro.rc" -#include "resources/user32_Ru.rc" +//#include "resources/user32_Ru.rc" #include "resources/user32_Si.rc" -#include "resources/user32_Sk.rc" -#include "resources/user32_Sv.rc" -#include "resources/user32_Tr.rc" -#include "resources/user32_Uk.rc" -#include "resources/user32_Wa.rc" -#include "resources/user32_Ja.rc" -#include "resources/user32_Zh.rc" +//#include "resources/user32_Sk.rc" +//#include "resources/user32_Sv.rc" +//#include "resources/user32_Tr.rc" +//#include "resources/user32_Uk.rc" +//#include "resources/user32_Wa.rc" +//#include "resources/user32_Ja.rc" +//#include "resources/user32_Zh.rc" //#include "resources/version.rc" Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] Sat Jul 18 19:58:06 2009 @@ -3279,10 +3279,10 @@ lpDevMode->dmDisplayFrequency = devmodeW.dmDisplayFrequency; lpDevMode->dmFields = devmodeW.dmFields; - lpDevMode->u1.dmPosition.x = devmodeW.u1.dmPosition.x; - lpDevMode->u1.dmPosition.y = devmodeW.u1.dmPosition.y; - lpDevMode->u1.dmDisplayOrientation = devmodeW.u1.dmDisplayOrientation; - lpDevMode->u1.dmDisplayFixedOutput = devmodeW.u1.dmDisplayFixedOutput; + lpDevMode->u1.s2.dmPosition.x = devmodeW.u1.s2.dmPosition.x; + lpDevMode->u1.s2.dmPosition.y = devmodeW.u1.s2.dmPosition.y; + lpDevMode->u1.s2.dmDisplayOrientation = devmodeW.u1.s2.dmDisplayOrientation; + lpDevMode->u1.s2.dmDisplayFixedOutput = devmodeW.u1.s2.dmDisplayFixedOutput; } if (lpszDeviceName) RtlFreeUnicodeString(&nameW); return ret; Modified: branches/arwinss/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Sat Jul 18 19:58:06 2009 @@ -6,7 +6,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="_DISABLE_TIDENTS" /> <define name="WINVER">0x0600</define> - <define name="_WIN32_WINNT">0x0501</define> + <define name="_WIN32_WINNT">0x0600</define> <define name="__WINESRC__" /> <library>wine</library> <library>ntdll</library> Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] Sat Jul 18 19:58:06 2009 @@ -163,7 +163,7 @@ @ stdcall DialogBoxIndirectParamW(long ptr long ptr long) @ stdcall DialogBoxParamA(long str long ptr long) @ stdcall DialogBoxParamW(long wstr long ptr long) -@ stdcall DisableProcessWindowsGhosting() +@ stub DisableProcessWindowsGhosting @ stdcall DispatchMessageA(ptr) @ stdcall DispatchMessageW(ptr) @ stub DisplayExitWindowsWarnings Modified: branches/arwinss/reactos/dll/win32/user32/user_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] Sat Jul 18 19:58:06 2009 @@ -409,7 +409,7 @@ } -BOOL ClientThreadSetup() +BOOL WINAPI ClientThreadSetup() { TRACE(": stub\n"); return TRUE; Modified: branches/arwinss/reactos/dll/win32/user32/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] Sat Jul 18 19:58:06 2009 @@ -277,6 +277,7 @@ #ifdef __i386__ +#define __ASM_CFI(str) "" /* Some window procedures modify register they shouldn't, or are not * properly declared stdcall; so we need a small assembly wrapper to * call them. */

1 0

[cgutman] 42054: - Don't change the lock's OldIrql value until we actually have the lock because we need this value to unlock correctly - This should fix bug 4704
by cgutman＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: cgutman Date: Sat Jul 18 19:57:38 2009 New Revision: 42054 URL: http://svn.reactos.org/svn/reactos?rev=42054&view=rev Log: - Don't change the lock's OldIrql value until we actually have the lock because we need this value to unlock correctly - This should fix bug 4704 Modified: trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c Modified: trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/recm… ============================================================================== --- trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c [iso-8859-1] Sat Jul 18 19:57:38 2009 @@ -34,7 +34,6 @@ if( CurrentIrql <= APC_LEVEL ) { ExAcquireFastMutex( &RecMutex->Mutex ); - RecMutex->OldIrql = CurrentIrql; while( RecMutex->Locked ) { ExReleaseFastMutex( &RecMutex->Mutex ); Status = KeWaitForSingleObject( &RecMutex->StateLockedEvent, @@ -44,6 +43,7 @@ NULL ); ExAcquireFastMutex( &RecMutex->Mutex ); } + RecMutex->OldIrql = CurrentIrql; RecMutex->Locked = TRUE; RecMutex->Writer = ToWrite; RecMutex->CurrentThread = CurrentThread;

1 0

[fireball] 42053: - Update headers. - Remove ROS HACK from windef16.h. - Add an empty placeholder header file rosuser.h.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 19:54:20 2009 New Revision: 42053 URL: http://svn.reactos.org/svn/reactos?rev=42053&view=rev Log: - Update headers. - Remove ROS HACK from windef16.h. - Add an empty placeholder header file rosuser.h. Added: branches/arwinss/reactos/include/reactos/win32k/rosuser.h (with props) Modified: branches/arwinss/reactos/include/psdk/winuser.h branches/arwinss/reactos/include/reactos/wine/winbase16.h branches/arwinss/reactos/include/reactos/wine/windef16.h Modified: branches/arwinss/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… ============================================================================== --- branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] Sat Jul 18 19:54:20 2009 @@ -525,6 +525,7 @@ #define DSS_NORMAL 0 #define DSS_UNION 16 #define DSS_DISABLED 32 +#define DSS_DEFAULT 64 #define DSS_MONO 128 #define DSS_HIDEPREFIX 0x0200 #define DSS_PREFIXONLY 0x0400 @@ -1142,6 +1143,7 @@ #define MSGF_NEXTWINDOW 6 #define MSGF_MAINLOOP 8 #define MSGF_USER 4096 +#define MSGF_MAX 8 #define MOUSEEVENTF_MOVE 1 #define MOUSEEVENTF_LEFTDOWN 2 #define MOUSEEVENTF_LEFTUP 4 @@ -1611,6 +1613,7 @@ #define WM_GETFONT 49 #define WM_SETHOTKEY 50 #define WM_GETHOTKEY 51 +#define WM_QUERYPARKICON 54 #define WM_QUERYDRAGICON 55 #define WM_COMPAREITEM 57 #if (WINVER >= 0x0500) @@ -2012,11 +2015,12 @@ #define SBM_ENABLE_ARROWS 228 #define SBM_GETPOS 225 #define SBM_GETRANGE 227 +#define SBM_SETSCROLLINFO 233 #define SBM_GETSCROLLINFO 234 +#define SBM_GETSCROLLBARINFO 235 #define SBM_SETPOS 224 #define SBM_SETRANGE 226 #define SBM_SETRANGEREDRAW 230 -#define SBM_SETSCROLLINFO 233 #define STM_GETICON 369 #define STM_GETIMAGE 371 #define STM_SETICON 368 @@ -3803,12 +3807,12 @@ BOOL WINAPI BringWindowToTop(HWND); long WINAPI BroadcastSystemMessage(DWORD,LPDWORD,UINT,WPARAM,LPARAM); #if (_WIN32_WINNT >= 0x0400) -long WINAPI BroadcastSystemMessageA(DWORD,LPDWORD,UINT,WPARAM,LPARAM); -long WINAPI BroadcastSystemMessageW(DWORD,LPDWORD,UINT,WPARAM,LPARAM); +LONG WINAPI BroadcastSystemMessageA(DWORD,LPDWORD,UINT,WPARAM,LPARAM); +LONG WINAPI BroadcastSystemMessageW(DWORD,LPDWORD,UINT,WPARAM,LPARAM); #endif /* (_WIN32_WINNT >= 0x0400) */ #if (_WIN32_WINNT >= 0x0501) -long WINAPI BroadcastSystemMessageExA(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO); -long WINAPI BroadcastSystemMessageExW(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO); +LONG WINAPI BroadcastSystemMessageExA(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO); +LONG WINAPI BroadcastSystemMessageExW(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO); #endif /* (_WIN32_WINNT >= 0x0501) */ void WINAPI CalcChildScroll(HWND, INT); BOOL WINAPI CallMsgFilterA(LPMSG,INT); @@ -3971,7 +3975,7 @@ BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM); BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM); BOOL WINAPI EnumDesktopWindows(HDESK,WNDENUMPROC,LPARAM); -BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM); +BOOL WINAPI EnumDisplayMonitors(HDC,LPRECT,MONITORENUMPROC,LPARAM); #if defined(_WINGDI_) && !defined(NOGDI) BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA); BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW); @@ -4114,8 +4118,8 @@ #define GetSysModalWindow() (NULL) HMENU WINAPI GetSystemMenu(HWND,BOOL); int WINAPI GetSystemMetrics(int); -DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,LPINT); -DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,LPINT); +DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,const INT *); +DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,const INT *); LONG WINAPI GetWindowLongA(HWND,int); LONG WINAPI GetWindowLongW(HWND,int); #ifdef _WIN64 @@ -4255,12 +4259,12 @@ int WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT); int WINAPI MessageBoxExA(HWND,LPCSTR,LPCSTR,UINT,WORD); int WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD); -int WINAPI MessageBoxIndirectA(CONST MSGBOXPARAMSA*); -int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*); +INT WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA); +INT WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW); BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR); BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR); HMONITOR WINAPI MonitorFromPoint(POINT,DWORD); -HMONITOR WINAPI MonitorFromRect(LPCRECT,DWORD); +HMONITOR WINAPI MonitorFromRect(LPRECT,DWORD); HMONITOR WINAPI MonitorFromWindow(HWND,DWORD); void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR); BOOL WINAPI MoveWindow(HWND,int,int,int,int,BOOL); @@ -4313,7 +4317,7 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD); #endif BOOL WINAPI RegisterHotKey(HWND,int,UINT,UINT); -BOOL WINAPI RegisterLogonProcess(DWORD,BOOL); +BOOL WINAPI RegisterLogonProcess(HANDLE,BOOL); #if (_WIN32_WINNT >= 0x0501) BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); #endif @@ -4439,8 +4443,8 @@ #endif /* (_WIN32_WINNT >= 0x0500) */ BOOL WINAPI SystemParametersInfoA(UINT,UINT,PVOID,UINT); BOOL WINAPI SystemParametersInfoW(UINT,UINT,PVOID,UINT); -LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,LPINT,int); -LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,LPINT,int); +LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,const INT *,int); +LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,const INT *,int); WORD WINAPI TileWindows(HWND,UINT,LPCRECT,UINT,const HWND *); int WINAPI ToAscii(UINT,UINT,const BYTE *,LPWORD,UINT); int WINAPI ToAsciiEx(UINT,UINT,const BYTE *,LPWORD,UINT,HKL); Added: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== (empty) Propchange: branches/arwinss/reactos/include/reactos/win32k/rosuser.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/include/reactos/wine/winbase16.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/winbase16.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/winbase16.h [iso-8859-1] Sat Jul 18 19:54:20 2009 @@ -164,58 +164,6 @@ DWORD dwAllocBreak; DWORD dwAllocCount; } WINDEBUGINFO16, *LPWINDEBUGINFO16; - -/* definitions specific to Wine 16-bit relaying support */ - -/* 32-bit stack layout after __wine_call_to_16() */ -typedef struct _STACK32FRAME -{ - DWORD restore_addr; /* 00 return address for restoring code selector */ - DWORD codeselector; /* 04 code selector to restore */ - EXCEPTION_REGISTRATION_RECORD frame; /* 08 Exception frame */ - SEGPTR frame16; /* 10 16-bit frame from last CallFrom16() */ - DWORD edi; /* 14 saved registers */ - DWORD esi; /* 18 */ - DWORD ebx; /* 1c */ - DWORD ebp; /* 20 saved 32-bit frame pointer */ - DWORD retaddr; /* 24 return address */ - DWORD target; /* 28 target address / CONTEXT86 pointer */ - DWORD nb_args; /* 2c number of 16-bit argument bytes */ -} STACK32FRAME; - -/* 16-bit stack layout after __wine_call_from_16() */ -typedef struct _STACK16FRAME -{ - STACK32FRAME *frame32; /* 00 32-bit frame from last CallTo16() */ - DWORD edx; /* 04 saved registers */ - DWORD ecx; /* 08 */ - DWORD ebp; /* 0c */ - WORD ds; /* 10 */ - WORD es; /* 12 */ - WORD fs; /* 14 */ - WORD gs; /* 16 */ - DWORD callfrom_ip; /* 18 callfrom tail IP */ - DWORD module_cs; /* 1c module code segment */ - DWORD relay; /* 20 relay function address */ - WORD entry_ip; /* 22 entry point IP */ - DWORD entry_point; /* 26 API entry point to call, reused as mutex count */ - WORD bp; /* 2a 16-bit stack frame chain */ - WORD ip; /* 2c return address */ - WORD cs; /* 2e */ -} STACK16FRAME; - -/* argument type flags for relay debugging */ -enum arg_types -{ - ARG_NONE = 0, /* indicates end of arg list */ - ARG_WORD, /* unsigned word */ - ARG_SWORD, /* signed word */ - ARG_LONG, /* long or segmented pointer */ - ARG_PTR, /* linear pointer */ - ARG_STR, /* linear pointer to null-terminated string */ - ARG_SEGSTR, /* segmented pointer to null-terminated string */ - ARG_VARARG /* start of varargs */ -}; #include <poppack.h> Modified: branches/arwinss/reactos/include/reactos/wine/windef16.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/windef16.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/windef16.h [iso-8859-1] Sat Jul 18 19:54:20 2009 @@ -28,7 +28,6 @@ #endif #include <windef.h> #include <winbase.h> -#include <exception.h> // ROS Hack /* Standard data types */ typedef unsigned short BOOL16;

1 0

[janderwald] 42052: - Fix wait condition
by janderwald＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: janderwald Date: Sat Jul 18 17:20:53 2009 New Revision: 42052 URL: http://svn.reactos.org/svn/reactos?rev=42052&view=rev Log: - Fix wait condition Modified: trunk/reactos/base/system/winlogon/winlogon.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sat Jul 18 17:20:53 2009 @@ -86,7 +86,7 @@ Sleep(1000); - }while(Index < 20); + }while(Index++ < 20); CloseServiceHandle(hService); CloseServiceHandle(hSCManager);

1 0

[janderwald] 42051: [USERINIT] - Move code for playing logon sound to winlogon where it should belong [WINLOGON] - Create a thread for playing the logon sound - Query the status of sysaudio. If sysaudio isnt running yet, wait a second. - Wait for max 20 seconds to get sysaudio running - Finally logon sound should work
by janderwald＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: janderwald Date: Sat Jul 18 17:19:57 2009 New Revision: 42051 URL: http://svn.reactos.org/svn/reactos?rev=42051&view=rev Log: [USERINIT] - Move code for playing logon sound to winlogon where it should belong [WINLOGON] - Create a thread for playing the logon sound - Query the status of sysaudio. If sysaudio isnt running yet, wait a second. - Wait for max 20 seconds to get sysaudio running - Finally logon sound should work Modified: trunk/reactos/base/system/userinit/userinit.c trunk/reactos/base/system/winlogon/winlogon.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Sat Jul 18 17:19:57 2009 @@ -447,51 +447,6 @@ WARN("RegOpenKeyEx() failed with error %lu\n", rc); } -static VOID -PlayLogonSound() -{ - HKEY hKey; - WCHAR szBuffer[MAX_PATH] = {0}; - WCHAR szDest[MAX_PATH]; - DWORD dwSize = sizeof(szBuffer); - HMODULE hLibrary; - typedef BOOL WINAPI (*PLAYSOUNDW)(LPCWSTR,HMODULE,DWORD); - PLAYSOUNDW Play; - - if (RegOpenKeyExW(HKEY_CURRENT_USER, L"AppEvents\\Schemes\\Apps\\.Default\\WindowsLogon\\.Current", 0, KEY_READ, &hKey) != ERROR_SUCCESS) - { - return; - } - - if (RegQueryValueExW(hKey, NULL, NULL, NULL, (LPBYTE)szBuffer, &dwSize) != ERROR_SUCCESS) - { - RegCloseKey(hKey); - return; - } - - - RegCloseKey(hKey); - - if (!szBuffer[0]) - return; - - - szBuffer[MAX_PATH-1] = L'\0'; - if (ExpandEnvironmentStringsW(szBuffer, szDest, MAX_PATH)) - { - hLibrary = LoadLibraryW(L"winmm.dll"); - if (hLibrary) - { - Play = (PLAYSOUNDW)GetProcAddress(hLibrary, "PlaySoundW"); - if (Play) - { - Play(szDest, NULL, SND_FILENAME); - } - FreeLibrary(hLibrary); - } - } -} - static VOID SetUserSettings(VOID) { @@ -540,7 +495,6 @@ SetUserSettings(); StartShell(); NotifyLogon(); - PlayLogonSound(); return 0; } Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sat Jul 18 17:19:57 2009 @@ -22,6 +22,94 @@ PWLSESSION WLSession = NULL; /* FUNCTIONS *****************************************************************/ + +DWORD +WINAPI +PlayLogonSoundThread( + IN LPVOID lpParameter) +{ + HKEY hKey; + WCHAR szBuffer[MAX_PATH] = {0}; + WCHAR szDest[MAX_PATH]; + DWORD dwSize = sizeof(szBuffer); + HMODULE hLibrary; + SERVICE_STATUS_PROCESS Info; + typedef BOOL WINAPI (*PLAYSOUNDW)(LPCWSTR,HMODULE,DWORD); + PLAYSOUNDW Play; + ULONG Index = 0; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"AppEvents\\Schemes\\Apps\\.Default\\WindowsLogon\\.Current", 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + ExitThread(0); + } + + if (RegQueryValueExW(hKey, NULL, NULL, NULL, (LPBYTE)szBuffer, &dwSize) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + ExitThread(0); + } + + + RegCloseKey(hKey); + + if (!szBuffer[0]) + ExitThread(0); + + + szBuffer[MAX_PATH-1] = L'\0'; + if (ExpandEnvironmentStringsW(szBuffer, szDest, MAX_PATH)) + { + SC_HANDLE hSCManager, hService; + + hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); + if (!hSCManager) + ExitThread(0);; + + hService = OpenServiceW(hSCManager, L"sysaudio", GENERIC_READ); + if (!hService) + { + CloseServiceHandle(hSCManager); + TRACE("WL: failed to open sysaudio Status %x", GetLastError()); + ExitThread(0); + } + + do + { + if (!QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&Info, sizeof(SERVICE_STATUS_PROCESS), &dwSize)) + { + TRACE("WL: QueryServiceStatusEx failed %x\n", GetLastError()); + break; + } + + if (Info.dwCurrentState == SERVICE_RUNNING) + break; + + Sleep(1000); + + }while(Index < 20); + + CloseServiceHandle(hService); + CloseServiceHandle(hSCManager); + + if (Info.dwCurrentState != SERVICE_RUNNING) + ExitThread(0); + + + hLibrary = LoadLibraryW(L"winmm.dll"); + if (hLibrary) + { + Play = (PLAYSOUNDW)GetProcAddress(hLibrary, "PlaySoundW"); + if (Play) + { + Play(szDest, NULL, SND_FILENAME); + } + FreeLibrary(hLibrary); + } + } + ExitThread(0); +} + + static BOOL StartServicesManager(VOID) @@ -201,6 +289,7 @@ #endif ULONG HardErrorResponse; MSG Msg; + HANDLE hThread; UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(lpCmdLine); @@ -317,6 +406,13 @@ else PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_TIMEOUT, 0); + /* Play logon sound */ + hThread = CreateThread(NULL, 0, PlayLogonSoundThread, NULL, 0, NULL); + if (hThread) + { + CloseHandle(hThread); + } + /* Tell kernel that CurrentControlSet is good (needed * to support Last good known configuration boot) */ NtInitializeRegistry(CM_BOOT_FLAG_ACCEPTED);

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