mDNSResponder-176.3.tar.gz

[apple/mdnsresponder.git] / Clients / PrinterSetupWizard / PrinterSetupWizardApp.cpp

diff --git a/Clients/PrinterSetupWizard/PrinterSetupWizardApp.cpp b/Clients/PrinterSetupWizard/PrinterSetupWizardApp.cpp
index 37b62289a04a0b988822cbc082b6b151a0e6b64a..e9e255f41080145e1d3ddbde06fd6e11e32184f2 100644 (file)
--- a/Clients/PrinterSetupWizard/PrinterSetupWizardApp.cpp
+++ b/Clients/PrinterSetupWizard/PrinterSetupWizardApp.cpp
@@ -1,28 +1,34 @@
-/*
+/* -*- Mode: C; tab-width: 4 -*-
+ *

  * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
  *
  * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at

  * 
  * 

- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ *     http://www.apache.org/licenses/LICENSE-2.0

  * 
  * 

- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and

  * limitations under the License.
  * limitations under the License.

- * 
- * @APPLE_LICENSE_HEADER_END@

 
     Change History (most recent first):
     
 $Log: PrinterSetupWizardApp.cpp,v $
 
     Change History (most recent first):
     
 $Log: PrinterSetupWizardApp.cpp,v $

+Revision 1.9  2006/08/14 23:24:09  cheshire
+Re-licensed mDNSResponder daemon source code under Apache License, Version 2.0
+
+Revision 1.8  2005/04/13 17:43:39  shersche
+<rdar://problem/4081448> Change "PrinterWizard.dll" to "PrinterWizardResources.dll"
+
+Revision 1.7  2005/02/15 07:50:09  shersche
+<rdar://problem/4007151> Update name
+
+Revision 1.6  2005/02/10 22:35:10  cheshire
+<rdar://problem/3727944> Update name
+

 Revision 1.5  2005/01/25 18:30:02  shersche
 Fix call to PathForResource() by passing in NULL as first parameter.
 
 Revision 1.5  2005/01/25 18:30:02  shersche
 Fix call to PathForResource() by passing in NULL as first parameter.
 


@@ -117,7 +123,7 @@ BOOL CPrinterSetupWizardApp::InitInstance()
 
        // Load Resources
 
 
        // Load Resources
 

-       res = PathForResource( NULL, L"RendezvousPrinterWizard.dll", resource, MAX_PATH );
+       res = PathForResource( NULL, L"PrinterWizardResources.dll", resource, MAX_PATH );

        err = translate_errno( res != 0, kUnknownErr, kUnknownErr );
        require_noerr( err, exit );
 
        err = translate_errno( res != 0, kUnknownErr, kUnknownErr );
        require_noerr( err, exit );
 


@@ -125,15 +131,15 @@ BOOL CPrinterSetupWizardApp::InitInstance()
        translate_errno( g_nonLocalizedResources, GetLastError(), kUnknownErr );
        require_noerr( err, exit );
 
        translate_errno( g_nonLocalizedResources, GetLastError(), kUnknownErr );
        require_noerr( err, exit );
 

-       res = PathForResource( NULL, L"RendezvousPrinterWizardLocalized.dll", resource, MAX_PATH );
+       res = PathForResource( NULL, L"PrinterWizardLocalized.dll", resource, MAX_PATH );

        err = translate_errno( res != 0, kUnknownErr, kUnknownErr );
        require_noerr( err, exit );
 
        g_localizedResources = LoadLibrary( resource );
        translate_errno( g_localizedResources, GetLastError(), kUnknownErr );
        err = translate_errno( res != 0, kUnknownErr, kUnknownErr );
        require_noerr( err, exit );
 
        g_localizedResources = LoadLibrary( resource );
        translate_errno( g_localizedResources, GetLastError(), kUnknownErr );

-       require_noerr( err, exit );\r
-               \r
-       AfxSetResourceHandle( g_localizedResources );\r
+       require_noerr( err, exit );
+
+       AfxSetResourceHandle( g_localizedResources );

 
        // InitCommonControls() is required on Windows XP if an application
        // manifest specifies use of ComCtl32.dll version 6 or later to enable
 
        // InitCommonControls() is required on Windows XP if an application
        // manifest specifies use of ComCtl32.dll version 6 or later to enable