diff options
author | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-23 22:43:05 +0200 |
---|---|---|
committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-23 22:43:05 +0200 |
commit | 942d72ec36aa0e8be1d1aac35ab679463741b2d1 (patch) | |
tree | 02f84efaf0effaccc11e48c161a45f6693ec61c5 /indra/media_plugins/winmmshim/forwarding_api.cpp | |
parent | 2eb07a7080a85e9a63a6f5aff49907b386b865d2 (diff) | |
parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) |
Merge
Diffstat (limited to 'indra/media_plugins/winmmshim/forwarding_api.cpp')
-rwxr-xr-x | indra/media_plugins/winmmshim/forwarding_api.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/media_plugins/winmmshim/forwarding_api.cpp b/indra/media_plugins/winmmshim/forwarding_api.cpp index 495e08942b..33f0675028 100755 --- a/indra/media_plugins/winmmshim/forwarding_api.cpp +++ b/indra/media_plugins/winmmshim/forwarding_api.cpp @@ -1338,7 +1338,7 @@ extern "C" { return joySetThreshold_orig( uJoyID, uThreshold); } - BOOL WINAPI mciDriverNotify(HWND hwndCallback, UINT uDeviceID, UINT uStatus) + BOOL WINAPI mciDriverNotify(HANDLE hwndCallback, MCIDEVICEID uDeviceID, UINT uStatus) { ll_winmm_shim_initialize(); //OutputDebugString(L"mciDriverNotify\n"); @@ -1610,7 +1610,7 @@ extern "C" { return mciGetYieldProc_orig( mciId, pdwYieldData); } - UINT WINAPI mciLoadCommandResource(HINSTANCE hInstance, LPCWSTR lpResName, UINT uType) + UINT WINAPI mciLoadCommandResource(HANDLE hInstance, LPCWSTR lpResName, UINT uType) { ll_winmm_shim_initialize(); //OutputDebugString(L"mciLoadCommandResource"); |