diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-03-16 09:49:57 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-03-16 09:49:57 -0700 |
| commit | 9ba10bf1f2ee16eb082f4cb29b0b9f7172e7ce8e (patch) | |
| tree | 9548ff32e0a1dc5b3f8a70b2a386827f72bf5284 /indra/media_plugins/winmmshim/forwarding_api.cpp | |
| parent | 184bf6a76fd3b52efa83c93f56164d2adce7ed3e (diff) | |
| parent | d4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff) | |
Merge lindenlab/viewer-tools-update
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"); |