- Silence some debug messages
- Modify base address of iphlpapi so it doesn't get relocated
- Implemented SetTaskmanWindow and SetProgmanWindow

Modified: trunk/reactos/baseaddress.xml
Modified: trunk/reactos/lib/user32/windows/window.c
Modified: trunk/reactos/subsys/csrss/win32csr/conio.c
Modified: trunk/reactos/subsys/win32k/ntuser/misc.c

--- trunk/reactos/baseaddress.xml	2005-07-31 05:46:42 UTC (rev 16912)
+++ trunk/reactos/baseaddress.xml	2005-07-31 06:22:05 UTC (rev 16913)
@@ -61,8 +61,8 @@

 <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" />
 <property name="BASEADDRESS_FMIFS" value="0x76df0000" />
 <property name="BASEADDRESS_SHELL32" value="0x77260000" />

-<property name="BASEADDRESS_IPHLPAPI" value="0x77300000" />
-<property name="BASEADDRESS_MMDRV" value="0x77500000" />

+<property name="BASEADDRESS_IPHLPAPI" value="0x77400000" />
+<property name="BASEADDRESS_MMDRV" value="0x77530000" />

 <property name="BASEADDRESS_CRTDLL" value="0x77630000" />
 <property name="BASEADDRESS_CFGMGR32" value="0x77700000" />
 <property name="BASEADDRESS_MSAFD" value="0x777a0000" />

--- trunk/reactos/lib/user32/windows/window.c	2005-07-31 05:46:42 UTC (rev 16912)
+++ trunk/reactos/lib/user32/windows/window.c	2005-07-31 06:22:05 UTC (rev 16913)
@@ -1467,25 +1467,23 @@

 }
 
 /*

- * @unimplemented

+ * @implemented

  */
 HWND
 STDCALL

-SetTaskmanWindow(HWND x)

+SetTaskmanWindow(HWND hWnd)

 {

-  UNIMPLEMENTED;
-  return FALSE;

+    return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW);

 }
 
 /*

- * @unimplemented

+ * @implemented

  */
 HWND
 STDCALL

-SetProgmanWindow(HWND x)

+SetProgmanWindow(HWND hWnd)

 {

-  UNIMPLEMENTED;
-  return FALSE;

+    return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW);

 }
 
 /*

--- trunk/reactos/subsys/csrss/win32csr/conio.c	2005-07-31 05:46:42 UTC (rev 16912)
+++ trunk/reactos/subsys/csrss/win32csr/conio.c	2005-07-31 06:22:05 UTC (rev 16913)
@@ -226,7 +226,7 @@

     PCSRSS_CONSOLE Console;
     NTSTATUS Status;
 

-    DPRINT1("CsrAllocConsole\n");

+    DPRINT("CsrAllocConsole\n");

 
     Request->Header.MessageSize = sizeof(CSR_API_MESSAGE);
     Request->Header.DataSize = sizeof(CSR_API_MESSAGE) - LPC_MESSAGE_BASE_SIZE;
@@ -250,7 +250,7 @@

     /* If we don't need a console, then get out of here */
     if (!Request->Data.AllocConsoleRequest.ConsoleNeeded)
     {

-        DPRINT1("No console needed\n");

+        DPRINT("No console needed\n");

         return STATUS_SUCCESS;
     }
 
@@ -336,7 +336,7 @@

 
     /* Set the Ctrl Dispatcher */
     ProcessData->CtrlDispatcher = Request->Data.AllocConsoleRequest.CtrlDispatcher;

-    DPRINT1("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher);

+    DPRINT("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher);

 
     /* Insert into the list */
     InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ProcessEntry);

--- trunk/reactos/subsys/win32k/ntuser/misc.c	2005-07-31 05:46:42 UTC (rev 16912)
+++ trunk/reactos/subsys/win32k/ntuser/misc.c	2005-07-31 06:22:05 UTC (rev 16913)
@@ -11,7 +11,7 @@

 
 #include <w32k.h>
 

-#define DEBUG

+#define NDEBUG

 #include <debug.h>
 
 /* registered Logon process */
@@ -716,6 +716,9 @@

    return Ret;
 }
 

+/*
+ * @unimplemented
+ */

 HWND
 STDCALL
 NtUserCallHwndOpt(
@@ -725,15 +728,23 @@

    switch (Routine)
    {
       case HWNDOPT_ROUTINE_SETPROGMANWINDOW:

-         /* FIXME */

+         /* 
+          * FIXME 
+          * Nothing too hard...validate the hWnd and save it in the Desktop Info
+          */
+         DPRINT1("HWNDOPT_ROUTINE_SETPROGMANWINDOW UNIMPLEMENTED\n");

          break;
 
       case HWNDOPT_ROUTINE_SETTASKMANWINDOW:

-         /* FIXME */

+         /* 
+          * FIXME 
+          * Nothing too hard...validate the hWnd and save it in the Desktop Info
+          */
+         DPRINT1("HWNDOPT_ROUTINE_SETTASKMANWINDOW UNIMPLEMENTED\n");

          break;
    }
 

-   return 0;

+   return Param;

 }
 
 /*