From 1310052bd77a9c390712582494e4cb21903141a6 Mon Sep 17 00:00:00 2001 From: nakeee Date: Thu, 8 Apr 2010 13:50:20 +0000 Subject: [PATCH] Stable: wiimote fix and memarena fix from trunk git-svn-id: https://dolphin-emu.googlecode.com/svn/branches/stable@5295 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/MemArena.cpp | 2 +- Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp index f8a71e9c5c..878ca1f289 100644 --- a/Source/Core/Common/Src/MemArena.cpp +++ b/Source/Core/Common/Src/MemArena.cpp @@ -40,7 +40,7 @@ static const char* ram_temp_file = "/tmp/gc_mem.tmp"; void MemArena::GrabLowMemSpace(size_t size) { #ifdef _WIN32 - hMemoryMapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, (DWORD)(size), _T("All GC Memory")); + hMemoryMapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, (DWORD)(size), NULL); #else mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; fd = open(ram_temp_file, O_RDWR | O_CREAT, mode); diff --git a/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp b/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp index a2d757e4ce..000acf4c0a 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp @@ -720,6 +720,7 @@ int WiimotePairUp(void) } } while (BluetoothFindNextDevice(hFind, &btdi)); + BluetoothFindRadioClose(hFind); } SLEEP(10);