You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/10/18 22:51:10 UTC
cvs commit: xml-xerces/c/src/util/MsgLoaders/Win32 Win32MsgLoader.cpp
tng 01/10/18 13:51:10
Modified: c/src/util/MsgLoaders/Win32 Win32MsgLoader.cpp
Log:
[Bug 3666] Win32MsgLoader unable to retrieve error text if DLL is renamed. Patch from Jerry Carter.
Revision Changes Path
1.6 +39 -16 xml-xerces/c/src/util/MsgLoaders/Win32/Win32MsgLoader.cpp
Index: Win32MsgLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/MsgLoaders/Win32/Win32MsgLoader.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Win32MsgLoader.cpp 2000/07/25 22:28:54 1.5
+++ Win32MsgLoader.cpp 2001/10/18 20:51:10 1.6
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,7 +55,7 @@
*/
/*
- * $Id: Win32MsgLoader.cpp,v 1.5 2000/07/25 22:28:54 aruna1 Exp $
+ * $Id: Win32MsgLoader.cpp,v 1.6 2001/10/18 20:51:10 tng Exp $
*/
@@ -70,10 +70,33 @@
#include <windows.h>
#include "Win32MsgLoader.hpp"
-
// ---------------------------------------------------------------------------
// Public Constructors and Destructor
// ---------------------------------------------------------------------------
+HINSTANCE globalModuleHandle;
+
+BOOL APIENTRY DllMain(HINSTANCE hModule,
+ DWORD ul_reason_for_call,
+ LPVOID lpReserved)
+{
+ switch (ul_reason_for_call) {
+ case DLL_PROCESS_ATTACH:
+ globalModuleHandle = hModule;
+ break;
+ case DLL_THREAD_ATTACH:
+ break;
+ case DLL_THREAD_DETACH:
+ break;
+ case DLL_PROCESS_DETACH:
+ break;
+ }
+ return TRUE;
+}
+
+
+// ---------------------------------------------------------------------------
+// Global module handle
+// ---------------------------------------------------------------------------
Win32MsgLoader::Win32MsgLoader(const XMLCh* const msgDomain) :
fDomainOfs(0)
@@ -81,7 +104,7 @@
, fMsgDomain(0)
{
// Try to get the module handle
- fModHandle = ::GetModuleHandleA(Xerces_DLLName);
+ fModHandle = globalModuleHandle;
if (!fModHandle)
{
//
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org