diff options
| author | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-03-12 12:17:43 +0000 |
|---|---|---|
| committer | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-03-12 12:17:43 +0000 |
| commit | 5aca7788f891521104f8bed712672af236465cc1 (patch) | |
| tree | 9ea8115598e2d73f563e2503d0544af62f0d782c /plugins/wbOSD/src | |
| parent | d8d1baa7d5c286c907d18d278738331debc0aabd (diff) | |
SetWindowLongPtr() and GetWindowLongPtr() multiple fixes for x64
git-svn-id: http://svn.miranda-ng.org/main/trunk@8571 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/wbOSD/src')
| -rw-r--r-- | plugins/wbOSD/src/options.cpp | 2 | ||||
| -rw-r--r-- | plugins/wbOSD/src/wbOSD.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp index abd3bfd4ff..12b7738a9b 100644 --- a/plugins/wbOSD/src/options.cpp +++ b/plugins/wbOSD/src/options.cpp @@ -224,7 +224,7 @@ INT_PTR CALLBACK OptDlgProc(HWND hDlg,UINT msg,WPARAM wparam,LPARAM lparam) ps=(plgsettings*)malloc(sizeof(plgsettings)*2);
loadDBSettings(&ps[0]);
ps[1]=ps[0];
- SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG)ps);
+ SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ps);
SetWindowLongPtr(hwnd, GWL_STYLE, WS_POPUP | WS_SIZEBOX);
SetWindowPos(hwnd, 0, 0, 0, 0, 0, SWP_NOZORDER|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED);
diff --git a/plugins/wbOSD/src/wbOSD.cpp b/plugins/wbOSD/src/wbOSD.cpp index ce379a86d5..da5b031aad 100644 --- a/plugins/wbOSD/src/wbOSD.cpp +++ b/plugins/wbOSD/src/wbOSD.cpp @@ -116,7 +116,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM switch (message) {
case WM_CREATE:
logmsg("WindowProcedure::CREATE");
- SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG)&defstr);
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)&defstr);
return 0;
case WM_DESTROY:
@@ -201,7 +201,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM memcpy(ms, (osdmsg*)wParam, sizeof(osdmsg));
ms->text = mir_tstrdup( ms->text );
- SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG)ms);
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)ms);
SetTimer(hwnd, (UINT)ms, (int)ms->timeout, 0);
InvalidateRect(hwnd, 0, TRUE);
SendMessage(hwnd, WM_USER+2, 0, 0);
|