8 modified files
reactos/include/win32k
diff -u -r1.139 -r1.140
--- ntuser.h 16 Nov 2004 16:27:48 -0000 1.139
+++ ntuser.h 6 Dec 2004 02:23:05 -0000 1.140
@@ -1677,11 +1677,11 @@
DWORD Unknown7,
DWORD Unknown8);
-DWORD
+BOOL
STDCALL
NtUserUpdatePerUserSystemParameters(
- DWORD Unknown0,
- DWORD Unknown1);
+ DWORD dwReserved,
+ BOOL bEnable);
DWORD
STDCALL
reactos/lib/user32/misc
diff -u -r1.9 -r1.10
--- misc.c 20 Nov 2004 15:51:14 -0000 1.9
+++ misc.c 6 Dec 2004 02:23:05 -0000 1.10
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: misc.c,v 1.9 2004/11/20 15:51:14 ekohl Exp $
+/* $Id: misc.c,v 1.10 2004/12/06 02:23:05 navaraf Exp $
*
* PROJECT: ReactOS user32.dll
* FILE: lib/user32/misc/misc.c
@@ -106,12 +106,12 @@
}
/*
- * @unimplemented
+ * @implemented
*/
BOOL WINAPI
-UpdatePerUserSystemParameters(DWORD dwUnknown,
- BOOL bEnable)
+UpdatePerUserSystemParameters(
+ DWORD dwReserved,
+ BOOL bEnable)
{
-
- return TRUE;
+ return NtUserUpdatePerUserSystemParameters(dwUnknown, dwReserved);
}
reactos/subsys/system/winlogon
diff -u -r1.4 -r1.5
--- winlogon.h 12 Jul 2004 20:09:35 -0000 1.4
+++ winlogon.h 6 Dec 2004 02:23:05 -0000 1.5
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: winlogon.h,v 1.4 2004/07/12 20:09:35 gvg Exp $
+/* $Id: winlogon.h,v 1.5 2004/12/06 02:23:05 navaraf Exp $
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS winlogon
* FILE: subsys/system/winlogon/winlogon.h
@@ -163,6 +163,11 @@
#define DisplaySASNotice(Session) \
Session->MsGina.Functions.WlxDisplaySASNotice(Session->MsGina.Context);
+/* user32 */
+BOOL WINAPI
+UpdatePerUserSystemParameters(DWORD dwUnknown,
+ DWORD dwReserved);
+
#endif /* __WINLOGON_MAIN_H__ */
/* EOF */
reactos/subsys/win32k/include
diff -u -r1.9 -r1.10
--- desktop.h 20 Nov 2004 16:46:05 -0000 1.9
+++ desktop.h 6 Dec 2004 02:23:05 -0000 1.10
@@ -12,6 +12,7 @@
extern HDESK InputDesktopHandle;
extern PWNDCLASS_OBJECT DesktopWindowClass;
extern HDC ScreenDeviceContext;
+extern BOOL g_PaintDesktopVersion;
NTSTATUS FASTCALL
InitDesktopImpl(VOID);
reactos/subsys/win32k/ntuser
diff -u -r1.25 -r1.26
--- desktop.c 5 Dec 2004 00:20:41 -0000 1.25
+++ desktop.c 6 Dec 2004 02:23:05 -0000 1.26
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: desktop.c,v 1.25 2004/12/05 00:20:41 navaraf Exp $
+ * $Id: desktop.c,v 1.26 2004/12/06 02:23:05 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -50,6 +50,8 @@
HDESK InputDesktopHandle = NULL;
HDC ScreenDeviceContext = NULL;
+BOOL g_PaintDesktopVersion = FALSE;
+
/* INITALIZATION FUNCTIONS ****************************************************/
NTSTATUS FASTCALL
@@ -880,20 +882,6 @@
return len;
}
-static NTSTATUS STDCALL PaintDesktopVersionCallback(
- IN PWSTR ValueName, IN ULONG ValueType,
- IN PVOID ValueData, IN ULONG ValueLength,
- IN PVOID Context, IN PVOID EntryContext
-)
-{
- DPRINT("PaintDesktopVersionCallback ValueType=%d ValueLength=%d\n", ValueType, ValueLength);
-
- if (ValueType==REG_DWORD && ValueLength==sizeof(DWORD))
- *((DWORD*)EntryContext) = *(DWORD*)ValueData;
-
- return STATUS_SUCCESS;
-}
-
/*
* NtUserPaintDesktop
*
@@ -916,10 +904,6 @@
HBRUSH DesktopBrush, PreviousBrush;
HWND hWndDesktop;
BOOL doPatBlt = TRUE;
-
- RTL_QUERY_REGISTRY_TABLE queryTable[2];
- DWORD displayVersion;
- NTSTATUS status;
int len;
PWINSTATION_OBJECT WinSta = PsGetWin32Thread()->Desktop->WindowStation;
@@ -984,22 +968,7 @@
* Display system version on the desktop background
*/
- RtlZeroMemory(queryTable, sizeof(queryTable));
-
- queryTable[0].QueryRoutine = PaintDesktopVersionCallback;
- queryTable[0].Name = L"PaintDesktopVersion";
- queryTable[0].EntryContext = &displayVersion;
-
- /* query the "PaintDesktopVersion" flag in the "Control Panel\Desktop" key */
- status = RtlQueryRegistryValues(RTL_REGISTRY_USER, L"Control Panel\\Desktop", queryTable, NULL, NULL);
-
- if (!NT_SUCCESS(status)) {
- DPRINT1("RtlQueryRegistryValues failed for PaintDesktopVersion: status=%x\n", status);
- displayVersion = 0;
- }
- DPRINT("PaintDesktopVersion=%d\n", displayVersion);
-
- if (displayVersion) {
+ if (g_PaintDesktopVersion) {
static WCHAR s_wszVersion[256] = {0};
RECT rect;
reactos/subsys/win32k/ntuser
diff -u -r1.88 -r1.89
--- misc.c 20 Nov 2004 16:46:06 -0000 1.88
+++ misc.c 6 Dec 2004 02:23:05 -0000 1.89
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.88 2004/11/20 16:46:06 weiden Exp $
+/* $Id: misc.c,v 1.89 2004/12/06 02:23:05 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -1330,4 +1330,44 @@
}
}
+
+BOOL STDCALL
+NtUserUpdatePerUserSystemParameters(
+ DWORD dwUnknown,
+ BOOL bEnable)
+{
+ if (bEnable)
+ {
+ RTL_QUERY_REGISTRY_TABLE QueryTable[2];
+ NTSTATUS Status;
+
+ RtlZeroMemory(QueryTable, sizeof(QueryTable));
+
+ QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT;
+ QueryTable[0].Name = L"PaintDesktopVersion";
+ QueryTable[0].EntryContext = &g_PaintDesktopVersion;
+
+ /* Query the "PaintDesktopVersion" flag in the "Control Panel\Desktop" key */
+ Status = RtlQueryRegistryValues(RTL_REGISTRY_USER,
+ L"Control Panel\\Desktop",
+ QueryTable, NULL, NULL);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("RtlQueryRegistryValues failed for PaintDesktopVersion (%x)\n",
+ Status);
+ g_PaintDesktopVersion = FALSE;
+ return FALSE;
+ }
+
+ DPRINT1("PaintDesktopVersion = %d\n", g_PaintDesktopVersion);
+
+ return TRUE;
+ }
+ else
+ {
+ g_PaintDesktopVersion = FALSE;
+ return TRUE;
+ }
+}
+
/* EOF */
reactos/subsys/win32k/ntuser
diff -u -r1.47 -r1.48
--- stubs.c 16 Nov 2004 16:27:49 -0000 1.47
+++ stubs.c 6 Dec 2004 02:23:05 -0000 1.48
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.47 2004/11/16 16:27:49 blight Exp $
+/* $Id: stubs.c,v 1.48 2004/12/06 02:23:05 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -690,17 +690,6 @@
DWORD
STDCALL
-NtUserUpdatePerUserSystemParameters(
- DWORD Unknown0,
- DWORD Unknown1)
-{
- UNIMPLEMENTED
-
- return 0;
-}
-
-DWORD
-STDCALL
NtUserUserHandleGrantAccess(
DWORD Unknown0,
DWORD Unknown1,
reactos/w32api/include
diff -u -r1.11 -r1.12
--- winuser.h 2 Dec 2004 19:38:49 -0000 1.11
+++ winuser.h 6 Dec 2004 02:23:05 -0000 1.12
@@ -3841,7 +3841,6 @@
BOOL WINAPI UnregisterClassA(LPCSTR,HINSTANCE);
BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE);
BOOL WINAPI UnregisterHotKey(HWND,int);
-BOOL WINAPI UpdatePerUserSystemParameters(DWORD,BOOL);
BOOL WINAPI UpdateWindow(HWND);
#if (_WIN32_WINNT >= 0x0500)
BOOL WINAPI UserHandleGrantAccess(HANDLE,HANDLE,BOOL);
CVSspam 0.2.8