mDNSResponder-107.6.tar.gz

[apple/mdnsresponder.git] / mDNSWindows / loclibrary.c

diff --git a/mDNSWindows/loclibrary.c b/mDNSWindows/loclibrary.c
index 78f16a48eb7a568f8f91e03993f063974e08cf71..2f5d46cd62a870ffc270fbc00eb701b3f8966802 100755 (executable)
--- a/mDNSWindows/loclibrary.c
+++ b/mDNSWindows/loclibrary.c
@@ -1,24 +1,18 @@
-/*
+/* -*- Mode: C; tab-width: 4 -*-
+ *
  * Copyright (c) 2002-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.
- * 
- * @APPLE_LICENSE_HEADER_END@
 
     Change History (most recent first):
 
@@ -31,6 +25,7 @@
  * ----------------------------------------------------------------------
  */
  
+#include "DebugServices.h"
 #include <windows.h>
 #include <stdio.h>
 #include "isocode.h"
@@ -40,6 +35,7 @@
 #include <sys/stat.h>
 #include <wchar.h>
 
+
 #ifdef __cplusplus
 extern "c" {
 #endif
@@ -70,7 +66,7 @@ static int _getISOCode(LANGID wLangID, char *isoLangCode, int codeLen) {
                int startIndex = i * MODULO_ISOCODES;
                
                langCode = (ISOCODES[startIndex] << 8);
-               langCode += ( (unsigned short) (ISOCODES[startIndex + 1]) );
+               langCode = langCode + ( (unsigned short) (ISOCODES[startIndex + 1]) );
 
                if (langCode == wLangID) {
                        char *langStr = (char *)&(ISOCODES[startIndex+2]);
@@ -109,25 +105,76 @@ static void _setLanguageIfNeeded(void) {
 
 static char appPathNameA[MAX_PATH] = "";
 
-int PathForResourceA ( HMODULE module, const char *name, char *locFile, int locFileLen) {
-       if (!strcmp(appPathNameA,"")) {
-               GetModuleFileNameA(module, appPathNameA, MAX_PATH);
+int PathForResourceA ( HMODULE module, const char *name, char *locFile, int locFileLen)
+{
+       int ret = 0;
+
+       if ( !strcmp( appPathNameA, "" ) )
+       {
+               char   folder[MAX_PATH];
+               char * ext;
+               char * app;
+
+               GetModuleFileNameA( module, folder, MAX_PATH );
+
+               // Get folder string
+               
+               app = strrchr( folder, '\\' );
+               require_action( app, exit, ret = 0 );
+               *app++ = '\0';
+
+               // Strip the extension
+
+               if ( ( ( ext = strstr( app, ".exe" ) ) != NULL ) || ( ( ext = strstr( app, ".dll" ) ) != NULL ) )
+               {
+                       *ext = '\0';
+               }
+
+               snprintf( appPathNameA, MAX_PATH, "%s\\%s", folder, app );
        }
 
-       return PathForResourceWithPathA (appPathNameA, name, locFile, locFileLen);
+       ret = PathForResourceWithPathA (appPathNameA, name, locFile, locFileLen);
 
+exit:
+
+       return ret;
 }
 
 static wchar_t appPathNameW[MAX_PATH] = L"";
 
-int PathForResourceW ( HMODULE module, const wchar_t *name, wchar_t *locFile, int locFileLen) {
-       if (!wcscmp(appPathNameW,L"")) {
-               GetModuleFileNameW( module, appPathNameW, MAX_PATH);
+int PathForResourceW ( HMODULE module, const wchar_t *name, wchar_t *locFile, int locFileLen)
+{
+       int ret = 0;
+
+       if ( !wcscmp( appPathNameW, L"" ) )
+       {
+               wchar_t   folder[MAX_PATH];
+               wchar_t * app;
+               wchar_t * ext;
+
+               GetModuleFileNameW( module, folder, MAX_PATH);
+
+               // Get folder string
+               
+               app = wcsrchr( folder, '\\' );
+               require_action( app, exit, ret = 0 );
+               *app++ = '\0';
+
+               // Strip the extension
+
+               if ( ( ( ext = wcsstr( app, L".exe" ) ) != NULL ) || ( ( ext = wcsstr( app, L".dll" ) ) != NULL ) )
+               {
+                       *ext = '\0';
+               }
+
+               swprintf( appPathNameW, MAX_PATH, L"%ls\\%ls", folder, app );
        }
 
-OutputDebugString( appPathNameW );
+       ret = PathForResourceWithPathW (appPathNameW, name, locFile, locFileLen);
+
+exit:
 
-       return PathForResourceWithPathW (appPathNameW, name, locFile, locFileLen);
+       return ret;
 }
 
 
@@ -204,7 +251,7 @@ int PathForResourceWithPathW (const wchar_t *path, const wchar_t *nm,
                }
 
                // fall back on DEFAULT_LANG_CODE if still no good
-               swprintf(tmpBuffer, TMP_BUF_SIZE, L"%ls.Resources\\%s.lproj\\%ls", 
+               swprintf(tmpBuffer, TMP_BUF_SIZE, L"%ls.Resources\\%S.lproj\\%ls", 
                        path, DEFAULT_LANG_CODE, nm);
 
                // we can't find the resource, so return 0