ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wordpad: Enable compilation with long types. 

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-02-07 08:41:38 +01:00 committed by Alexandre Julliard
parent a513e0673f
commit e7dda902a0
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
programs/wordpad/Makefile.in
View File

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = wordpad.exe MODULE = wordpad.exe
IMPORTS = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32 IMPORTS = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32

8
programs/wordpad/olecallback.c
View File

@ -107,7 +107,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryInsertObject(
LPSTORAGE lpstg, LPSTORAGE lpstg,
LONG cp) LONG cp)
{ {
WINE_TRACE("(%p, %p, %p, %d)\n", This, lpclsid, lpstg, cp); WINE_TRACE("(%p, %p, %p, %ld)\n", This, lpclsid, lpstg, cp);
return S_OK; return S_OK;
} }
@ -127,7 +127,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryAcceptData(
BOOL fReally, BOOL fReally,
HGLOBAL hMetaPict) HGLOBAL hMetaPict)
{ {
WINE_TRACE("(%p, %p, %p, %x, %d, %p)\n", WINE_TRACE("(%p, %p, %p, %lx, %d, %p)\n",
This, lpdataobj, lpcfFormat, reco, fReally, hMetaPict); This, lpdataobj, lpcfFormat, reco, fReally, hMetaPict);
return S_OK; return S_OK;
} }
@ -146,7 +146,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetClipboardData(
DWORD reco, DWORD reco,
LPDATAOBJECT *lplpdataobj) LPDATAOBJECT *lplpdataobj)
{ {
WINE_TRACE("(%p, %p, %x, %p)\n", This, lpchrg, reco, lplpdataobj); WINE_TRACE("(%p, %p, %lx, %p)\n", This, lpchrg, reco, lplpdataobj);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -156,7 +156,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetDragDropEffect(
DWORD grfKeyState, DWORD grfKeyState,
LPDWORD pdwEffect) LPDWORD pdwEffect)
{ {
WINE_TRACE("(%p, %d, %x, %p)\n", This, fDrag, grfKeyState, pdwEffect); WINE_TRACE("(%p, %d, %lx, %p)\n", This, fDrag, grfKeyState, pdwEffect);
if (pdwEffect) if (pdwEffect)
*pdwEffect = DROPEFFECT_COPY; *pdwEffect = DROPEFFECT_COPY;
return S_OK; return S_OK;

6
programs/wordpad/wordpad.c
View File

@ -2023,7 +2023,7 @@ static LRESULT OnCreate( HWND hWnd )
if (!hEditorWnd) if (!hEditorWnd)
{ {
fprintf(stderr, "Error code %u\n", GetLastError()); fprintf(stderr, "Error code %lu\n", GetLastError());
return -1; return -1;
} }
assert(hEditorWnd); assert(hEditorWnd);
@ -2164,7 +2164,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam)
update_font_list(); update_font_list();
sprintf( buf,"selection = %d..%d, line count=%ld", sprintf( buf,"selection = %ld..%ld, line count=%Id",
pSC->chrg.cpMin, pSC->chrg.cpMax, pSC->chrg.cpMin, pSC->chrg.cpMax,
SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0)); SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0));
SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf);
@ -2451,7 +2451,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
SendMessageW(hwndEditor, EM_EXGETSEL, 0, (LPARAM)&range); SendMessageW(hwndEditor, EM_EXGETSEL, 0, (LPARAM)&range);
data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * (range.cpMax-range.cpMin+1)); data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * (range.cpMax-range.cpMin+1));
SendMessageW(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data); SendMessageW(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data);
sprintf(buf, "Start = %d, End = %d", range.cpMin, range.cpMax); sprintf(buf, "Start = %ld, End = %ld", range.cpMin, range.cpMax);
MessageBoxA(hWnd, buf, "Editor", MB_OK); MessageBoxA(hWnd, buf, "Editor", MB_OK);
MessageBoxW(hWnd, data, wszAppTitle, MB_OK); MessageBoxW(hWnd, data, wszAppTitle, MB_OK);
HeapFree( GetProcessHeap(), 0, data); HeapFree( GetProcessHeap(), 0, data);