From 3c15605cf01b9f4c753f26097fd72a0f7ccd490d Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Fri, 27 Sep 2002 04:41:26 +0000 Subject: [PATCH] oops --- panda/src/audiotraits/milesAudioManager.cxx | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/panda/src/audiotraits/milesAudioManager.cxx b/panda/src/audiotraits/milesAudioManager.cxx index de8130eddf..8c02068b62 100644 --- a/panda/src/audiotraits/milesAudioManager.cxx +++ b/panda/src/audiotraits/milesAudioManager.cxx @@ -567,16 +567,10 @@ get_registry_entry(HKEY base, const char* subKeyName, void MilesAudioManager:: get_gm_file_path(string& result) { if(!get_registry_entry(HKEY_LOCAL_MACHINE,"SOFTWARE\\Microsoft\\DirectMusic", "GMFilePath", result)) { - const char *pDefaultGMLoc="%windir%\\system32\\drivers\\gm.dls"; - // Find the size of the expanded string: - DWORD destSize=ExpandEnvironmentStrings(pDefaultGMLoc, 0, 0); - // Get a destination buffer of that size: - char* dest = new char[destSize]; - // Do the expansion: - ExpandEnvironmentStrings(pDefaultGMLoc, dest, destSize); - // Propagate the result: - result=dest; - delete [] dest; + char sysdir[MAX_PATH+1]; + GetSystemDirectory(sysdir,MAX_PATH+1); + result = sysdir; + result.append("\\drivers\\gm.dls"); } audio_debug("MilesAudioManager::get_gm_file_path() result out=\""<