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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 C))3qP diff --git a/Externals/WiiUse/Win32/wiiuse.lib b/Externals/WiiUse/Win32/wiiuse.lib index 47ff73a1edf7bf9eb2dcd9765059b511a5ad5b37..8d5a76b2fd4f0af565ed824a4f93015e05c4a9ac 100644 GIT binary patch delta 996 zcmZ`$&ubG=5T5;!xY?g?-`1uiC5E(3ibA_aiAfOD3Z+O7;-Mf!jU|U-uO6hJ6)*Nw zql4ETdhj6Lgq%EjlWHiQ@(1{%UVG|6oafticMo0onA!QhnfJYU{aU})FBr{w*b2id z4eavq*Ui!<+W-)-cO;lg{{(MW!Z`%^k1dJ>cVEKq0SNF#iJ$@?;EyEO5zQgEs}f$D z<`JAp2|l2{!2|rJUwUIsU|DhTPo{(owT>)P#NWz1zEfuLxl+YYGx5Gs!8yv;)DCvF zIUH#vyrXfvoz3DW%D1&?(uK&hG9IW^e45SSp6V6m%jxf8J-Gm!)h9PM7{HEAE-CJM z0EZ617Ga;Z(DMNnIY1=<7*T#inpLW|NjFKF0dZ3RpnwV);E)3Y7?|M08OVYT9$4Ul z4FNc(@y4;>;}^Z9#qTrZ`H5B-x$m0GiUytO^<`55Fz}&S#1-R}ntOsjjk_W&!a$9ySuHMA{5q~q4DwDy_BGD7M&XD@;uJCfz)4ho3UOn=mt4qs7$-n@rHXAKfC2vLc76rFKRA$ z^;4J^X(lpv;HAvv@fwRJt*`_mcKDu+*}_IhHpJ5+Q)iGl7PdW}KJ$Vf%~Z9u4v^KHCM?v);VMx~i delta 995 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 delta 7506 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 aDwK1d&+T${6?M70q^^pt?xY3(E&LBp6kvG( diff --git a/Externals/WiiUse/X64/wiiuse.lib b/Externals/WiiUse/X64/wiiuse.lib index 419dceb614ea9a1c210d0b7f4339c96cab34d79e..fa0c8499a9ecf38548e88df5d8f343fadf63629c 100644 GIT binary patch delta 990 zcmZ{iziSg=7{|Z&qu0yj-uo3u(j=|X9ubPI*C-k@h=Zs|$R;Wdb_iXnlNkh&76+aD z`DE&#ql2P@(xG+m4+tTfOR3P+L3fM#T<+o}g&cf%Uf%Eb`El?2b}QY=i-KOO2Iqp{ z>@sbb*_XAsb*B!5n5z+X4;awm$cU|&21mx~M7TZ>;%PB^92s{r!rA7!jK!V-2OJr5 zKf-IXzkQoNs;B5{DoUCE+FUf+^$&}HQW?I^S4 zX<2&B@t$&wW|SrREzi+6*{7za(~fKxPL{{NkhDL0zDgOF;lO~4X=qSkBMl2CG7yt=eQ5afPMuMb zi|LDeE{KO;FICJYeMtE~*L(ZWTz`kvvd)>L+J>2< zH7D-#$hn#*;RHX1itLV58%*sEr*{gq7RA6B{8YXATM delta 1015 zcmZ{hKWGzC9LIn6*UQVj`xngBYm!DAPAJwUHQ1OzI*3Xr83du?phGB#j#(weK__YD z*Qwy_P|=~#p$O_Igbp(v>-B53 zC0y6@uNtKuUjaB`k5xY2E>{U(6j)y41kIa&~*UDbaoi*36=Kyq;HcpqW@U{5I_VCILM%Y2@DKS z;S6NJhAcQ>feyLTbS*aQ?#Sn)T4bQV_%xfEB=?=cp z?gdL#_pp!|B;oYls4+_pg0R3|gx-tTXIkw4#j2D3>sd<){0CTMGgM$2UuL^u;A|3j zI~_C^7I>%MOiqW~#iu+MDs#O4pP~mvJQ|xw1H-C#7H@Gk?TWJg;f>_9?6`Q>h_XI0 znu!wBn>Qonz*sy*xnZ7Aj(dD-p6Ky!oGou%O|q@)E6E?WFEMG1U)Fs>YB - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - 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 }