Detlef Riekenberg : localspl: ConfigurePort is now in localui.dll.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d5b2a0c37e995c6cea519246accbb3a0a8697635
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d5b2a0c37e995c6cea519246ac...

Author: Detlef Riekenberg <wine.dev(a)web.de>
Date:   Thu Apr 19 22:59:56 2007 +0200

localspl: ConfigurePort is now in localui.dll.

---

 dlls/localspl/localmon.c         |   43 +-------------------------------------
 dlls/localspl/localspl_private.h |    2 -
 dlls/localspl/spl_De.rc          |    1 -
 dlls/localspl/spl_En.rc          |    1 -
 dlls/localspl/spl_Fr.rc          |    1 -
 dlls/localspl/spl_Ko.rc          |    1 -
 dlls/localspl/spl_No.rc          |    1 -
 dlls/localspl/spl_Pl.rc          |    1 -
 8 files changed, 1 insertions(+), 50 deletions(-)

diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c
index 384e1f1..0dc128c 100644
--- a/dlls/localspl/localmon.c
+++ b/dlls/localspl/localmon.c
@@ -109,23 +109,6 @@ static const WCHAR WinNT_CV_WindowsW[] = {'S','o','f','t','w','a','r','e','\\',
                                         'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
                                         'W','i','n','d','o','w','s',0};
 
-/******************************************************************
- * display the Dialog "Nothing to configure"
- * 
- */
-
-static void dlg_nothingtoconfig(HWND hWnd)
-{
-    WCHAR res_PortW[IDS_LOCALPORT_MAXLEN];
-    WCHAR res_nothingW[IDS_NOTHINGTOCONFIG_MAXLEN];
-
-    res_PortW[0] = '\0';
-    res_nothingW[0] = '\0';
-    LoadStringW(LOCALSPL_hInstance, IDS_LOCALPORT, res_PortW, IDS_LOCALPORT_MAXLEN);  
-    LoadStringW(LOCALSPL_hInstance, IDS_NOTHINGTOCONFIG, res_nothingW, IDS_NOTHINGTOCONFIG_MAXLEN);  
-
-    MessageBoxW(hWnd, res_nothingW, res_PortW, MB_OK | MB_ICONINFORMATION);
-}
 
 /******************************************************************
  * does_port_exist (internal)
@@ -318,30 +301,6 @@ static DWORD get_type_from_name(LPCWSTR name)
 }
 
 /*****************************************************
- *   localmon_ConfigurePortW [exported through MONITOREX]
- *
- * Display the Configuration-Dialog for a specific Port
- *
- * PARAMS
- *  pName     [I] Servername or NULL (local Computer)
- *  hWnd      [I] Handle to parent Window for the Dialog-Box
- *  pPortName [I] Name of the Port, that should be configured
- *
- * RETURNS
- *  Success: TRUE
- *  Failure: FALSE
- *
- */
-BOOL WINAPI localmon_ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName)
-{
-    TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName));
-    /* ToDo: Dialogs by Portname ("LPTx:", "COMx:") */
-
-    dlg_nothingtoconfig(hWnd);
-    return ROUTER_SUCCESS;
-}
-
-/*****************************************************
  *   localmon_EnumPortsW [exported through MONITOREX]
  *
  * Enumerate all local Ports
@@ -651,7 +610,7 @@ LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot)
             NULL,       /* localmon_ClosePortW */
             NULL,       /* localmon_AddPortW */
             NULL,       /* localmon_AddPortExW */
-            localmon_ConfigurePortW,
+            NULL,       /* Use ConfigurePortUI in localui.dll */
             NULL,       /* Use DeletePortUI in localui.dll */
             NULL,       /* localmon_GetPrinterDataFromPort */
             NULL,       /* localmon_SetPortTimeOuts */
diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h
index 7755858..461f50c 100644
--- a/dlls/localspl/localspl_private.h
+++ b/dlls/localspl/localspl_private.h
@@ -28,12 +28,10 @@ extern HINSTANCE LOCALSPL_hInstance;
 /* ## Resource-ID ## */
 #define IDS_LOCALPORT       500
 #define IDS_LOCALMONITOR    507
-#define IDS_NOTHINGTOCONFIG 508
 
 /* ## Reserved memorysize for the strings (in WCHAR) ## */
 #define IDS_LOCALMONITOR_MAXLEN 64
 #define IDS_LOCALPORT_MAXLEN 32
-#define IDS_NOTHINGTOCONFIG_MAXLEN 80
 
 /* ## Type of Ports ## */
 /* windows types */
diff --git a/dlls/localspl/spl_De.rc b/dlls/localspl/spl_De.rc
index acc4776..4c95e2b 100644
--- a/dlls/localspl/spl_De.rc
+++ b/dlls/localspl/spl_De.rc
@@ -25,5 +25,4 @@ STRINGTABLE DISCARDABLE
 {
     IDS_LOCALPORT "Lokaler Anschluss"
     IDS_LOCALMONITOR "Lokaler Monitor"
-    IDS_NOTHINGTOCONFIG "Dieser Anschluss hat keine Optionen zum Konfigurieren"
 }
diff --git a/dlls/localspl/spl_En.rc b/dlls/localspl/spl_En.rc
index 3e54f88..c9d12f4 100644
--- a/dlls/localspl/spl_En.rc
+++ b/dlls/localspl/spl_En.rc
@@ -25,5 +25,4 @@ STRINGTABLE DISCARDABLE
 {
     IDS_LOCALPORT "Local Port"
     IDS_LOCALMONITOR "Local Monitor"
-    IDS_NOTHINGTOCONFIG "This port has no options to configure"
 }
diff --git a/dlls/localspl/spl_Fr.rc b/dlls/localspl/spl_Fr.rc
index cafe232..9526972 100644
--- a/dlls/localspl/spl_Fr.rc
+++ b/dlls/localspl/spl_Fr.rc
@@ -24,5 +24,4 @@ STRINGTABLE DISCARDABLE
 {
     IDS_LOCALPORT "Port local"
     IDS_LOCALMONITOR "Moniteur local"
-    IDS_NOTHINGTOCONFIG "Ce port n'a pas d'option � configurer"
 }
diff --git a/dlls/localspl/spl_Ko.rc b/dlls/localspl/spl_Ko.rc
index 6a0f2d2..b46be3a 100644
--- a/dlls/localspl/spl_Ko.rc
+++ b/dlls/localspl/spl_Ko.rc
@@ -26,5 +26,4 @@ STRINGTABLE DISCARDABLE
 {
     IDS_LOCALPORT "���� ��Ʈ"
     IDS_LOCALMONITOR "���� �����"
-    IDS_NOTHINGTOCONFIG "This port has no options to configure"
 }
diff --git a/dlls/localspl/spl_No.rc b/dlls/localspl/spl_No.rc
index f4600f4..5efa563 100644
--- a/dlls/localspl/spl_No.rc
+++ b/dlls/localspl/spl_No.rc
@@ -24,5 +24,4 @@ STRINGTABLE DISCARDABLE
 {
     IDS_LOCALPORT "Lokal port"
     IDS_LOCALMONITOR "Lokal overv�ker"
-    IDS_NOTHINGTOCONFIG "Denne porten har ingen innstillinger"
 }
diff --git a/dlls/localspl/spl_Pl.rc b/dlls/localspl/spl_Pl.rc
index 9f63b69..a080208 100644
--- a/dlls/localspl/spl_Pl.rc
+++ b/dlls/localspl/spl_Pl.rc
@@ -26,5 +26,4 @@ STRINGTABLE DISCARDABLE
 {
     IDS_LOCALPORT "Port lokalny"
     IDS_LOCALMONITOR "Monitor lokalny"
-    IDS_NOTHINGTOCONFIG "Ten port nie ma opcji do skonfigurowania"
 }