[tfaber] 55058: [NETSHELL] - Fix MSVC build

Author: tfaber
Date: Sun Jan 22 00:39:44 2012
New Revision: 55058

URL: http://svn.reactos.org/svn/reactos?rev=55058&view=rev
Log:
[NETSHELL]
- Fix MSVC build

Modified:
    trunk/reactos/dll/win32/netshell/lanconnectui.cpp
    trunk/reactos/dll/win32/netshell/lanstatusui.cpp
    trunk/reactos/dll/win32/netshell/precomp.h
    trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp

Modified: trunk/reactos/dll/win32/netshell/lanconnectui.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconne...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lanconnectui.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lanconnectui.cpp [iso-8859-1] Sun Jan 22 00:39:44 2012
@@ -78,7 +78,7 @@
     memset(&ppage, 0x0, sizeof(PROPSHEETPAGEW));
     ppage.dwSize = sizeof(PROPSHEETPAGEW);
     ppage.dwFlags = PSP_DEFAULT;
-    ppage.u.pszTemplate = resname;
+    ppage.pszTemplate = resname;
     ppage.pfnDlgProc = dlgproc;
     ppage.lParam = lParam;
     ppage.hInstance = netshell_hInstance;

Modified: trunk/reactos/dll/win32/netshell/lanstatusui.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstatu...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lanstatusui.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lanstatusui.cpp [iso-8859-1] Sun Jan 22 00:39:44 2012
@@ -232,7 +232,7 @@
     nid.cbSize = sizeof(nid);
     nid.uID = pContext->uID;
     nid.hWnd = pContext->hwndStatusDlg;
-    nid.u.uVersion = 3;
+    nid.uVersion = 3;

if (pContext->pNet->GetProperties(&pProperties) == S_OK)
     {
@@ -859,7 +859,7 @@
     ZeroMemory(hppages, sizeof(hppages));
     pinfo.dwSize = sizeof(PROPSHEETHEADERW);
     pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW;
-    pinfo.u3.phpage = hppages;
+    pinfo.phpage = hppages;
     pinfo.hwndParent = hwndDlg;

if (pContext->pNet->GetProperties(&pProperties) == S_OK)
@@ -1035,7 +1035,7 @@
                 nid.cbSize = sizeof(nid);
                 nid.uID = Index++;
                 nid.uFlags = NIF_MESSAGE;
-                nid.u.uVersion = 3;
+                nid.uVersion = 3;
                 nid.uCallbackMessage = WM_SHOWSTATUSDLG;
                 nid.hWnd = hwndDlg;

Modified: trunk/reactos/dll/win32/netshell/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp....
==============================================================================
--- trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Sun Jan 22 00:39:44 2012
@@ -9,9 +9,6 @@
 #include <ctype.h>
 #include <malloc.h>

-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include <winsock2.h>
 #include <windows.h>

Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_n...
==============================================================================
--- trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp [iso-8859-1] Sun Jan 22 00:39:44 2012
@@ -498,7 +498,7 @@
     if (SUCCEEDED(hr))
     {
         strRet->uType = STRRET_WSTR;
-        strRet->u.pOleStr = pszName;
+        strRet->pOleStr = pszName;
     }
     else
     {
@@ -578,7 +578,7 @@
     {
         psd->str.uType = STRRET_WSTR;
         if (LoadStringW(netshell_hInstance, NetConnectSFHeader[iColumn].colnameid, buffer, MAX_PATH))
-            hr = SHStrDupW(buffer, &psd->str.u.pOleStr);
+            hr = SHStrDupW(buffer, &psd->str.pOleStr);

return hr;
     }
@@ -608,7 +608,7 @@
                 if (LoadStringW(netshell_hInstance, IDS_TYPE_ETHERNET, buffer, MAX_PATH))
                 {
                     psd->str.uType = STRRET_WSTR;
-                    hr = SHStrDupW(buffer, &psd->str.u.pOleStr);
+                    hr = SHStrDupW(buffer, &psd->str.pOleStr);
                 }
             }
             break;
@@ -629,7 +629,7 @@
             {
                 buffer[MAX_PATH-1] = L'\0';
                 psd->str.uType = STRRET_WSTR;
-                hr = SHStrDupW(buffer, &psd->str.u.pOleStr);
+                hr = SHStrDupW(buffer, &psd->str.pOleStr);
             }
             break;
         case COLUMN_DEVNAME:
@@ -638,17 +638,17 @@
                 wcscpy(buffer, pProperties->pszwDeviceName);
                 buffer[MAX_PATH-1] = L'\0';
                 psd->str.uType = STRRET_WSTR;
-                hr = SHStrDupW(buffer, &psd->str.u.pOleStr);
+                hr = SHStrDupW(buffer, &psd->str.pOleStr);
             }
             else
             {
-                psd->str.u.cStr[0] = '\0';
+                psd->str.cStr[0] = '\0';
                 psd->str.uType = STRRET_CSTR;
             }
             break;
         case COLUMN_PHONE:
         case COLUMN_OWNER:
-            psd->str.u.cStr[0] = '\0';
+            psd->str.cStr[0] = '\0';
             psd->str.uType = STRRET_CSTR;
             break;
     }
@@ -840,7 +840,7 @@

if (pinfo->nPages < MAX_PROPERTY_SHEET_PAGE)
     {
-        pinfo->u3.phpage[pinfo->nPages++] = hPage;
+        pinfo->phpage[pinfo->nPages++] = hPage;
         return TRUE;
     }
     return FALSE;
@@ -903,7 +903,7 @@
         ZeroMemory(hppages, sizeof(hppages));
         pinfo.dwSize = sizeof(PROPSHEETHEADERW);
         pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW;
-        pinfo.u3.phpage = hppages;
+        pinfo.phpage = hppages;
         pinfo.hwndParent = hwnd;

pinfo.pszCaption = pProperties->pszwName;