Browse Source

Projucer: Fixed a few live-build errors on Windows

tags/2021-05-28
ed 7 years ago
parent
commit
dec870f5eb
4 changed files with 6 additions and 6 deletions
  1. +1
    -1
      modules/juce_core/native/juce_win32_Files.cpp
  2. +1
    -1
      modules/juce_core/text/juce_CharacterFunctions.h
  3. +3
    -3
      modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
  4. +1
    -1
      modules/juce_gui_basics/native/juce_win32_Windowing.cpp

+ 1
- 1
modules/juce_core/native/juce_win32_Files.cpp View File

@@ -682,7 +682,7 @@ File File::getLinkedTarget() const
CloseHandle (h);
const StringRef prefix ("\\\\?\\");
const String path (buffer);
const String path (buffer.get());
// It turns out that GetFinalPathNameByHandleW prepends \\?\ to the path.
// This is not a bug, it's feature. See MSDN for more information.


+ 1
- 1
modules/juce_core/text/juce_CharacterFunctions.h View File

@@ -231,7 +231,7 @@ public:
*currentCharacter++ = '0';
}
#if JUCE_MSVC
#if JUCE_WINDOWS
static _locale_t locale = _create_locale (LC_ALL, "C");
return _strtod_l (&buffer[0], nullptr, locale);
#else


+ 3
- 3
modules/juce_gui_basics/native/juce_win32_FileChooser.cpp View File

@@ -202,7 +202,7 @@ void FileChooser::showPlatformDialog (Array<File>& results, const String& title_
if (info.returnedString.isNotEmpty())
{
results.add (File (String (files)).getSiblingFile (info.returnedString));
results.add (File (String (files.get())).getSiblingFile (info.returnedString));
return;
}
}
@@ -287,12 +287,12 @@ void FileChooser::showPlatformDialog (Array<File>& results, const String& title_
while (*filename != 0)
{
results.add (File (String (files)).getChildFile (String (filename)));
results.add (File (String (files.get())).getChildFile (String (filename)));
filename += wcslen (filename) + 1;
}
}
else if (files[0] != 0)
{
results.add (File (String (files)));
results.add (File (String (files.get())));
}
}

+ 1
- 1
modules/juce_gui_basics/native/juce_win32_Windowing.cpp View File

@@ -3449,7 +3449,7 @@ private:
HeapBlock<TCHAR> buffer;
buffer.calloc (stringSizeBytes / sizeof (TCHAR) + 1);
ImmGetCompositionString (hImc, type, buffer, (DWORD) stringSizeBytes);
return String (buffer);
return String (buffer.get());
}
return {};


Loading…
Cancel
Save