Module: wine Branch: master Commit: 2c8476a078df489cd0446cfe7b9faf4c6de6b494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8476a078df489cd0446cfe7b...
Author: Dmitry Timoshkov dmitry@codeweavers.com Date: Wed Apr 9 21:24:27 2008 +0900
wordpad: Fix Win64 warnings.
---
programs/wordpad/print.c | 6 +++--- programs/wordpad/registry.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 2a44132..aa9ac71 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -85,7 +85,7 @@ void registry_read_pagemargins(HKEY hKey) } }
-static void AddTextButton(HWND hRebarWnd, int string, int command, int id) +static void AddTextButton(HWND hRebarWnd, UINT string, UINT command, UINT id) { REBARBANDINFOW rb; HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hRebarWnd, GWLP_HINSTANCE); @@ -95,7 +95,7 @@ static void AddTextButton(HWND hRebarWnd, int string, int command, int id) LoadStringW(hInstance, string, text, MAX_STRING_LEN); hButton = CreateWindowW(WC_BUTTONW, text, WS_VISIBLE | WS_CHILD, 5, 5, 100, 15, - hRebarWnd, (HMENU)command, hInstance, NULL); + hRebarWnd, (HMENU)ULongToHandle(command), hInstance, NULL);
rb.cbSize = sizeof(rb); rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID; @@ -702,7 +702,7 @@ LRESULT print_preview(HWND hMainWnd)
if(preview.hdc2) { - if((int)preview.hdc2 != -1) + if(preview.hdc2 != (HDC)-1) DeleteDC(preview.hdc2); preview.hdc2 = CreateCompatibleDC(hdc); } diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index aef152a..b8e5283 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -223,7 +223,7 @@ void registry_read_filelist(HWND hMainWnd) != ERROR_SUCCESS) break;
- mi.dwItemData = (DWORD)pFile[i]; + mi.dwItemData = (ULONG_PTR)pFile[i]; wsprintfW(itemText, numFormat, i+1);
lstrcpyW(buffer, pFile[i]);