From 84152919dc88f74f4fded6dec9d1b84b4b59453c Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 18 Aug 2010 00:22:08 +0000 Subject: [PATCH] Wiiuse: Hopefully fix the Windows real wiimote connecting issues caused by r5940. An "index = 0;" line was accidentally removed.(uninitialized value being used) Hopefully this fixes issue 3067, issue 3058, issue 3057, issue 3054, issue 3012, and issue 2975. Some other minor cleanup to Wiiuse.(recreated the vcprog because it had hard coded include paths and it sucked) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6107 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/WiiUse/Src/definitions.h | 2 +- Externals/WiiUse/Src/io_win.c | 12 +- Externals/WiiUse/Src/ir.c | 2 +- Externals/WiiUse/Src/wiiuse.c | 6 +- Externals/WiiUse/Src/wiiuse.h | 2 +- Externals/WiiUse/Win32/wiiuse.dll | Bin 13312 -> 13312 bytes Externals/WiiUse/Win32/wiiuse.lib | Bin 5008 -> 5008 bytes Externals/WiiUse/X64/wiiuse.dll | Bin 15872 -> 16384 bytes Externals/WiiUse/X64/wiiuse.lib | Bin 4940 -> 4940 bytes Externals/WiiUse/wiiuse.sln | 18 +- Externals/WiiUse/wiiuse.vcproj | 494 ++++++++---------- .../Src/WiimoteReal/WiimoteReal.cpp | 13 +- 12 files changed, 252 insertions(+), 297 deletions(-) diff --git a/Externals/WiiUse/Src/definitions.h b/Externals/WiiUse/Src/definitions.h index 05519bd5d4..77e98a2b2a 100644 --- a/Externals/WiiUse/Src/definitions.h +++ b/Externals/WiiUse/Src/definitions.h @@ -34,7 +34,7 @@ #ifndef DEFINITIONS_H_INCLUDED #define DEFINITIONS_H_INCLUDED -#ifndef WIN32 +#ifndef _WIN32 #include "Log.h" // NOTICE_LEVEL is more appropriate for the uses of WIIUSE_INFO than INFO_LEVEL diff --git a/Externals/WiiUse/Src/io_win.c b/Externals/WiiUse/Src/io_win.c index 992da0213e..60b13479a2 100644 --- a/Externals/WiiUse/Src/io_win.c +++ b/Externals/WiiUse/Src/io_win.c @@ -31,7 +31,7 @@ * @brief Handles device I/O for Windows. */ -#ifdef WIN32 +#ifdef _WIN32 #include #include @@ -44,6 +44,8 @@ #include "definitions.h" #include "wiiuse_internal.h" +int wiiuse_remove(struct wiimote_t** wm, int wiimotes, int max_wiimotes); + int wiiuse_find(struct wiimote_t** wm, int max_wiimotes, int wiimotes) { GUID device_id; HANDLE dev; @@ -58,8 +60,8 @@ int wiiuse_find(struct wiimote_t** wm, int max_wiimotes, int wiimotes) { // todo: handle/remove (unexpected and forced) disconnected wiimotes here // removal of unneeded wiimotes and exiting when we got enough wiimotes connected - if(wiiuse_remove(wm, wiimotes, max_wiimotes)) - return wm; + if (wiiuse_remove(wm, wiimotes, max_wiimotes)) + return max_wiimotes; device_data.cbSize = sizeof(device_data); @@ -69,7 +71,7 @@ int wiiuse_find(struct wiimote_t** wm, int max_wiimotes, int wiimotes) { // get all hid devices connected device_info = SetupDiGetClassDevs(&device_id, NULL, NULL, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT)); - for (;wiimotes < max_wiimotes; ++index) { + for (index = 0; wiimotes < max_wiimotes; ++index) { if (detail_data) { free(detail_data); @@ -398,4 +400,4 @@ int wiiuse_remove(struct wiimote_t** wm, int wiimotes, int max_wiimotes) { } -#endif /* ifdef WIN32 */ +#endif /* ifdef _WIN32 */ diff --git a/Externals/WiiUse/Src/ir.c b/Externals/WiiUse/Src/ir.c index 2e815ae74b..9e9206bbbb 100644 --- a/Externals/WiiUse/Src/ir.c +++ b/Externals/WiiUse/Src/ir.c @@ -34,7 +34,7 @@ #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #endif diff --git a/Externals/WiiUse/Src/wiiuse.c b/Externals/WiiUse/Src/wiiuse.c index d76a196430..59cc15beda 100644 --- a/Externals/WiiUse/Src/wiiuse.c +++ b/Externals/WiiUse/Src/wiiuse.c @@ -38,7 +38,7 @@ #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #else #include @@ -352,7 +352,7 @@ int wiiuse_send(struct wiimote_t* wm, byte report_type, byte* msg, int len) { { int x = 2; printf("[DEBUG] (id %i) SEND: (%x) %.2x ", wm->unid, buf[0], buf[1]); - #ifndef WIN32 + #ifndef _WIN32 for (; x < len+2; ++x) #else for (; x < len+1; ++x) @@ -376,7 +376,7 @@ int wiiuse_send(struct wiimote_t* wm, byte report_type, byte* msg, int len) { * @param type The type of bluetooth stack to use. */ void wiiuse_set_bluetooth_stack(struct wiimote_t** wm, int wiimotes, enum win_bt_stack_t type) { - #ifdef WIN32 + #ifdef _WIN32 int i; if (!wm) return; diff --git a/Externals/WiiUse/Src/wiiuse.h b/Externals/WiiUse/Src/wiiuse.h index 5ab1e0f02e..ae8253c44f 100644 --- a/Externals/WiiUse/Src/wiiuse.h +++ b/Externals/WiiUse/Src/wiiuse.h @@ -220,7 +220,7 @@ WIIUSE_EXPORT extern int wiiuse_connect(struct wiimote_t** wm, int wiimotes); WIIUSE_EXPORT extern void wiiuse_disconnect(struct wiimote_t* wm); WIIUSE_EXPORT extern void wiiuse_set_timeout(struct wiimote_t** wm, int wiimotes, byte timeout); -#ifdef WIN32 +#ifdef _WIN32 WIIUSE_EXPORT extern int wiiuse_check_system_notification(unsigned int nMsg, WPARAM wParam, LPARAM lParam); WIIUSE_EXPORT extern int wiiuse_register_system_notification(HWND hwnd); #endif diff --git a/Externals/WiiUse/Win32/wiiuse.dll b/Externals/WiiUse/Win32/wiiuse.dll index 2edeb22052efe8eaeda1bb1413d8493ef2b0f81c..989e55f40abb923228b2f55d87d9c50184348646 100644 GIT binary patch delta 6088 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 delta 5844 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 DVMx~i delta 995 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 KI-R_MQ5XQEEkCmW delta 7506 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 L3%pSEYQky&s@3+7 diff --git a/Externals/WiiUse/wiiuse.sln b/Externals/WiiUse/wiiuse.sln index 005518bf33..acfb7eec48 100644 --- a/Externals/WiiUse/wiiuse.sln +++ b/Externals/WiiUse/wiiuse.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wiiuse", "wiiuse.vcproj", "{944EF6DE-471D-447E-A2FD-D37D58805169}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wiiuse", "wiiuse.vcproj", "{52F70249-373A-4401-A70A-FF22760EC1B8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,14 +11,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {944EF6DE-471D-447E-A2FD-D37D58805169}.Debug|Win32.ActiveCfg = Debug|Win32 - {944EF6DE-471D-447E-A2FD-D37D58805169}.Debug|Win32.Build.0 = Debug|Win32 - {944EF6DE-471D-447E-A2FD-D37D58805169}.Debug|x64.ActiveCfg = Debug|x64 - {944EF6DE-471D-447E-A2FD-D37D58805169}.Debug|x64.Build.0 = Debug|x64 - {944EF6DE-471D-447E-A2FD-D37D58805169}.Release|Win32.ActiveCfg = Release|Win32 - {944EF6DE-471D-447E-A2FD-D37D58805169}.Release|Win32.Build.0 = Release|Win32 - {944EF6DE-471D-447E-A2FD-D37D58805169}.Release|x64.ActiveCfg = Release|x64 - {944EF6DE-471D-447E-A2FD-D37D58805169}.Release|x64.Build.0 = Release|x64 + {52F70249-373A-4401-A70A-FF22760EC1B8}.Debug|Win32.ActiveCfg = Debug|Win32 + {52F70249-373A-4401-A70A-FF22760EC1B8}.Debug|Win32.Build.0 = Debug|Win32 + {52F70249-373A-4401-A70A-FF22760EC1B8}.Debug|x64.ActiveCfg = Debug|x64 + {52F70249-373A-4401-A70A-FF22760EC1B8}.Debug|x64.Build.0 = Debug|x64 + {52F70249-373A-4401-A70A-FF22760EC1B8}.Release|Win32.ActiveCfg = Release|Win32 + {52F70249-373A-4401-A70A-FF22760EC1B8}.Release|Win32.Build.0 = Release|Win32 + {52F70249-373A-4401-A70A-FF22760EC1B8}.Release|x64.ActiveCfg = Release|x64 + {52F70249-373A-4401-A70A-FF22760EC1B8}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Externals/WiiUse/wiiuse.vcproj b/Externals/WiiUse/wiiuse.vcproj index a18e08c208..ae2491cd2c 100644 --- a/Externals/WiiUse/wiiuse.vcproj +++ b/Externals/WiiUse/wiiuse.vcproj @@ -1,11 +1,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp index 1f0cae2568..53f857d4df 100644 --- a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp +++ b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp @@ -36,7 +36,7 @@ namespace WiimoteReal bool g_real_wiimotes_initialized = false; wiimote_t** g_wiimotes_from_wiiuse = NULL; unsigned int g_wiimotes_found = 0; -volatile unsigned int g_wiimotes_lastfound = 0; +// removed g_wiimotes_lastfound because Refresh() isn't taking advantage of it volatile bool g_run_wiimote_thread = false; Common::Thread *g_wiimote_threads[MAX_WIIMOTES] = {}; @@ -274,20 +274,19 @@ unsigned int Initialize() // initialized g_real_wiimotes_initialized = true; -#ifdef WIN32 +#ifdef _WIN32 // Alloc memory for wiimote structure only if we're starting fresh if(!g_wiimotes_from_wiiuse) g_wiimotes_from_wiiuse = wiiuse_init(MAX_WIIMOTES); // on windows wiiuse_find() expects as a 3rd parameter the amount of last connected wiimotes instead of the timeout, // a timeout parameter is useless on win32 here, since at this points we already have the wiimotes discovered and paired up, just not connected. - g_wiimotes_found = wiiuse_find(g_wiimotes_from_wiiuse, wanted_wiimotes, g_wiimotes_lastfound); + g_wiimotes_found = wiiuse_find(g_wiimotes_from_wiiuse, wanted_wiimotes, 0); #else g_wiimotes_from_wiiuse = wiiuse_init(MAX_WIIMOTES); g_wiimotes_found = wiiuse_find(g_wiimotes_from_wiiuse, wanted_wiimotes, 5); #endif - g_wiimotes_lastfound = g_wiimotes_found; - DEBUG_LOG(WIIMOTE, "Found %i Real Wiimotes, %i wanted and %i previously found", - g_wiimotes_found, wanted_wiimotes, g_wiimotes_lastfound); + DEBUG_LOG(WIIMOTE, "Found %i Real Wiimotes, %i wanted", + g_wiimotes_found, wanted_wiimotes); g_wiimotes_found = wiiuse_connect(g_wiimotes_from_wiiuse, g_wiimotes_found); @@ -327,7 +326,7 @@ void Shutdown(void) // Clean up wiiuse, win32: we cant just delete the struct on win32, since wiiuse_find() maintains it and // adds/removes wimotes directly to/from it to prevent problems, which would occur when using more than 1 wiimote if we create it from scratch everytime -#ifndef WIN32 +#ifndef _WIN32 wiiuse_cleanup(g_wiimotes_from_wiiuse, MAX_WIIMOTES); #endif }