diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2009-11-25 17:58:16 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2009-11-25 17:58:16 +0000 |
| commit | 574a03b1e1dcdcb4253fd9f1de47afa44b7dbda5 (patch) | |
| tree | 75dc8e49e1aa03dc24d9a448bfc1970cdcc922c4 | |
| parent | 6145dd2967a2ea274b8d3bf7cb62d10177b45717 (diff) | |
Fixed the problem which was causing wonky IR behavior in windows - use memmov() instead :) - re-enabled optimizations in wiiuse
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4611 8ced0084-cf51-0410-be5f-012b33b47a6e
| -rw-r--r-- | Externals/WiiUse/Win32/wiiuse.dll | bin | 35840 -> 27136 bytes | |||
| -rw-r--r-- | Externals/WiiUse/Win32/wiiuse.lib | bin | 8610 -> 8610 bytes | |||
| -rw-r--r-- | Externals/WiiUse/X64/wiiuse.dll | bin | 44032 -> 31744 bytes | |||
| -rw-r--r-- | Externals/WiiUse/X64/wiiuse.lib | bin | 8462 -> 8462 bytes | |||
| -rw-r--r-- | Externals/WiiUseSrc/Src/io_win.c | 8 | ||||
| -rw-r--r-- | Externals/WiiUseSrc/wiiuse.vcproj | 4 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Externals/WiiUse/Win32/wiiuse.dll b/Externals/WiiUse/Win32/wiiuse.dll Binary files differindex 512b53b83f..43c39f115f 100644 --- a/Externals/WiiUse/Win32/wiiuse.dll +++ b/Externals/WiiUse/Win32/wiiuse.dll diff --git a/Externals/WiiUse/Win32/wiiuse.lib b/Externals/WiiUse/Win32/wiiuse.lib Binary files differindex 75c45ef4a7..ba9196a109 100644 --- a/Externals/WiiUse/Win32/wiiuse.lib +++ b/Externals/WiiUse/Win32/wiiuse.lib diff --git a/Externals/WiiUse/X64/wiiuse.dll b/Externals/WiiUse/X64/wiiuse.dll Binary files differindex 46f146e382..f8e28edd22 100644 --- a/Externals/WiiUse/X64/wiiuse.dll +++ b/Externals/WiiUse/X64/wiiuse.dll diff --git a/Externals/WiiUse/X64/wiiuse.lib b/Externals/WiiUse/X64/wiiuse.lib Binary files differindex 196bd6b19f..40e8c29877 100644 --- a/Externals/WiiUse/X64/wiiuse.lib +++ b/Externals/WiiUse/X64/wiiuse.lib diff --git a/Externals/WiiUseSrc/Src/io_win.c b/Externals/WiiUseSrc/Src/io_win.c index 0d345c7ab3..f64f256fb2 100644 --- a/Externals/WiiUseSrc/Src/io_win.c +++ b/Externals/WiiUseSrc/Src/io_win.c @@ -205,8 +205,8 @@ int wiiuse_io_read(struct wiimote_t* wm) { // This needs to be done even if ReadFile fails, essential during init // Move the data over one, so we can add back in 0xa2 - memcpy(wm->event_buf + 1, wm->event_buf, sizeof(wm->event_buf) - 1); - wm->event_buf[0] = 0xa2; // Put back in the crazy Data that Windows strips out + memmove(wm->event_buf + 1, wm->event_buf, sizeof(wm->event_buf) - 1); + wm->event_buf[0] = 0xa2; ResetEvent(wm->hid_overlap.hEvent); return 1; @@ -224,7 +224,7 @@ int wiiuse_io_write(struct wiimote_t* wm, byte* buf, int len) { case WIIUSE_STACK_UNKNOWN: { /* try to auto-detect the stack type */ - if (i = WriteFile(wm->dev_handle, buf + 1, 22, &bytes, &wm->hid_overlap)) { + if (i = WriteFile(wm->dev_handle, buf + 1, len - 1, &bytes, &wm->hid_overlap)) { /* bluesoleil will always return 1 here, even if it's not connected */ wm->stack = WIIUSE_STACK_BLUESOLEIL; return i; @@ -243,7 +243,7 @@ int wiiuse_io_write(struct wiimote_t* wm, byte* buf, int len) { return HidD_SetOutputReport(wm->dev_handle, buf + 1, len - 1); case WIIUSE_STACK_BLUESOLEIL: - return WriteFile(wm->dev_handle, buf + 1, 22, &bytes, &wm->hid_overlap); + return WriteFile(wm->dev_handle, buf + 1, len - 1, &bytes, &wm->hid_overlap); } return 0; diff --git a/Externals/WiiUseSrc/wiiuse.vcproj b/Externals/WiiUseSrc/wiiuse.vcproj index 1bfa3a0ede..369a261e30 100644 --- a/Externals/WiiUseSrc/wiiuse.vcproj +++ b/Externals/WiiUseSrc/wiiuse.vcproj @@ -51,7 +51,7 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WIIUSE_EXPORTS"
@@ -147,7 +147,7 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WIIUSE_EXPORTS;_WIN64"
|