From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 20 Sep 2005 05:38:33 +0000 (+0000)
Subject: STABLE14-windows-icons-20050919
X-Git-Tag: openafs-stable-1_4_0-rc5~20
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=778c0a2cdfef0f84e3b0f27e942621782fed1aa4;p=packages%2Fo%2Fopenafs.git

STABLE14-windows-icons-20050919


Associate the OpenAFS icon with the Control Panel and Service and
the installers

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

Update icon to OpenAFS logo


(cherry picked from commit cc8cfd47bc506396501c9bd2225dd907567e36b7)
---

diff --git a/src/WINNT/afsd/OpenAFS.ico b/src/WINNT/afsd/OpenAFS.ico
new file mode 100644
index 000000000..40810ae09
Binary files /dev/null and b/src/WINNT/afsd/OpenAFS.ico differ
diff --git a/src/WINNT/afsd/afsd.rc b/src/WINNT/afsd/afsd.rc
index de954d0e1..58d567432 100644
--- a/src/WINNT/afsd/afsd.rc
+++ b/src/WINNT/afsd/afsd.rc
@@ -18,7 +18,7 @@ BEGIN
 	END
 END
 
-AFSDIcon	ICON	afsd.ico
+AFSDIcon	ICON	OpenAFS.ico
 /* Define VERSIONINFO resource */
 
 #define  AFS_VERINFO_FILE_DESCRIPTION "AFS Client Driver Application"
diff --git a/src/WINNT/afsd/afsd_service.rc b/src/WINNT/afsd/afsd_service.rc
index c9c8a065c..b2443e90f 100644
--- a/src/WINNT/afsd/afsd_service.rc
+++ b/src/WINNT/afsd/afsd_service.rc
@@ -16,5 +16,5 @@
 #include "AFS_component_version_number.h"
 #include "..\..\config\NTVersioninfo.rc"
 
-1       ICON    afsd.ico
+1       ICON    OpenAFS.ico
 
diff --git a/src/WINNT/client_config/OpenAFS.ico b/src/WINNT/client_config/OpenAFS.ico
new file mode 100644
index 000000000..40810ae09
Binary files /dev/null and b/src/WINNT/client_config/OpenAFS.ico differ
diff --git a/src/WINNT/client_config/afs_config_stub.rc b/src/WINNT/client_config/afs_config_stub.rc
index 14a5a5902..8e1d89e59 100644
--- a/src/WINNT/client_config/afs_config_stub.rc
+++ b/src/WINNT/client_config/afs_config_stub.rc
@@ -15,4 +15,4 @@
 #include "AFS_component_version_number.h"
 #include "..\..\config\NTVersioninfo.rc"
 
-IDI_MAIN                ICON    DISCARDABLE     "afs_config.ico"
+IDI_MAIN                ICON    DISCARDABLE     "OpenAFS.ico"
diff --git a/src/WINNT/client_cpa/OpenAFS.ico b/src/WINNT/client_cpa/OpenAFS.ico
new file mode 100644
index 000000000..40810ae09
Binary files /dev/null and b/src/WINNT/client_cpa/OpenAFS.ico differ
diff --git a/src/WINNT/client_cpa/afs_cpa_stub.rc b/src/WINNT/client_cpa/afs_cpa_stub.rc
index e8ca29bb6..a74552d5b 100644
--- a/src/WINNT/client_cpa/afs_cpa_stub.rc
+++ b/src/WINNT/client_cpa/afs_cpa_stub.rc
@@ -15,5 +15,5 @@
 #include "AFS_component_version_number.h"
 #include "..\..\config\NTVersioninfo.rc"
 
-IDI_AFSD                ICON    DISCARDABLE     "afs_conf.ico"
-IDI_CCENTER		        ICON	DISCARDABLE	    "afs_ccenter.ico"
+IDI_AFSD                ICON    DISCARDABLE     "OpenAFS.ico"
+IDI_CCENTER		ICON	DISCARDABLE	"afs_ccenter.ico"
diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index 00388e781..b3d0c5d0b 100644
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -71,8 +71,8 @@ VIAddVersionKey "PrivateBuild" "Checked/Debug"
 !endif
   SilentInstall normal
   SetCompressor /solid lzma
-  !define MUI_ICON "..\..\client_config\afs_config.ico"
-  !define MUI_UNICON "..\..\client_config\afs_config.ico"
+  !define MUI_ICON "..\..\client_config\OpenAFS.ico"
+  !define MUI_UNICON "..\..\client_config\OpenAFS.ico"
   !define AFS_COMPANY_NAME "OpenAFS"
   !define AFS_PRODUCT_NAME "OpenAFS"
   !define AFS_REGKEY_ROOT "Software\TransarcCorporation"
@@ -1293,6 +1293,8 @@ contInstall:
    StrCmp $R0 "rpcrt4.dll" contInstall2
    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncadg_ip_udp"
    StrCmp $R0 "rpcrt4.dll" contInstall2
+   ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_http"
+   StrCmp $R0 "rpcrt4.dll" contInstall2
    
    MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST "An error was detected with your Windows RPC installation. Please make sure Windows RPC is installed before installing OpenAFS."
    Abort
diff --git a/src/WINNT/install/wix/Icon/ico_OpenAFS.ico b/src/WINNT/install/wix/Icon/ico_OpenAFS.ico
index 3c434f1ea..40810ae09 100644
Binary files a/src/WINNT/install/wix/Icon/ico_OpenAFS.ico and b/src/WINNT/install/wix/Icon/ico_OpenAFS.ico differ