Skip to content

W
wine-winehq
Commit 34031227 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winemac: Build without -DWINE_NO_LONG_TYPES.

parent e1de9220
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 48 deletions
dlls/winemac.drv/Makefile.in
View file @ 34031227
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = winemac.drv
UNIXLIB = winemac.so
IMPORTS = uuid rpcrt4 user32 gdi32 win32u
......
dlls/winemac.drv/dllmain.c
View file @ 34031227
......@@ -102,7 +102,7 @@ static void CALLBACK quit_callback(HWND hwnd, UINT msg, ULONG_PTR data, LRESULT
if (msg == WM_QUERYENDSESSION)
{
TRACE("got WM_QUERYENDSESSION result %ld from win %p (%u of %u done)\n", result,
TRACE("got WM_QUERYENDSESSION result %Id from win %p (%u of %u done)\n", result,
hwnd, qi->done, qi->count);
if (!result && !IsWindow(hwnd))
......@@ -132,12 +132,12 @@ static void CALLBACK quit_callback(HWND hwnd, UINT msg, ULONG_PTR data, LRESULT
qi->done = 0;
for (i = 0; i < qi->count; i++)
{
TRACE("sending WM_ENDSESSION to win %p result %d flags 0x%08x\n", qi->wins[i],
TRACE("sending WM_ENDSESSION to win %p result %d flags 0x%08lx\n", qi->wins[i],
qi->result, qi->flags);
if (!SendMessageCallbackW(qi->wins[i], WM_ENDSESSION, qi->result, qi->flags,
quit_callback, (ULONG_PTR)qi))
{
WARN("failed to send WM_ENDSESSION to win %p; error 0x%08x\n",
WARN("failed to send WM_ENDSESSION to win %p; error 0x%08lx\n",
qi->wins[i], RtlGetLastWin32Error());
quit_callback(qi->wins[i], WM_ENDSESSION, (ULONG_PTR)qi, 0);
}
......@@ -203,7 +203,7 @@ NTSTATUS WINAPI macdrv_app_quit_request(void *arg, ULONG size)
TRACE("failed to send WM_QUERYENDSESSION to win %p because it's invalid; assuming success\n",
qi->wins[i]);
else
WARN("failed to send WM_QUERYENDSESSION to win %p; error 0x%08x; assuming refusal\n",
WARN("failed to send WM_QUERYENDSESSION to win %p; error 0x%08lx; assuming refusal\n",
qi->wins[i], error);
quit_callback(qi->wins[i], WM_QUERYENDSESSION, (ULONG_PTR)qi, invalid);
}
......
dlls/winemac.drv/dragdrop.c
View file @ 34031227
......@@ -134,7 +134,7 @@ static ULONG WINAPI dddo_AddRef(IDataObject* iface)
DragDropDataObject *This = impl_from_IDataObject(iface);
ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%u)\n", This, refCount - 1);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1);
return refCount;
}
......@@ -145,7 +145,7 @@ static ULONG WINAPI dddo_Release(IDataObject* iface)
DragDropDataObject *This = impl_from_IDataObject(iface);
ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%u)\n", This, refCount + 1);
TRACE("(%p)->(count=%lu)\n", This, refCount + 1);
if (refCount)
return refCount;
......@@ -190,7 +190,7 @@ static HRESULT WINAPI dddo_QueryGetData(IDataObject* iface, FORMATETC* formatEtc
struct dnd_have_format_params params;
HRESULT hr = DV_E_FORMATETC;
TRACE("This %p formatEtc %p={.tymed=0x%x, .dwAspect=%d, .cfFormat=%s}\n",
TRACE("This %p formatEtc %p={.tymed=0x%lx, .dwAspect=%ld, .cfFormat=%s}\n",
This, formatEtc, formatEtc->tymed, formatEtc->dwAspect,
debugstr_format(formatEtc->cfFormat));
......@@ -210,7 +210,7 @@ static HRESULT WINAPI dddo_QueryGetData(IDataObject* iface, FORMATETC* formatEtc
if (MACDRV_CALL(dnd_have_format, &params))
hr = S_OK;
TRACE(" -> 0x%x\n", hr);
TRACE(" -> 0x%lx\n", hr);
return hr;
}
......@@ -220,7 +220,7 @@ static HRESULT WINAPI dddo_GetConicalFormatEtc(IDataObject* iface, FORMATETC* fo
{
DragDropDataObject *This = impl_from_IDataObject(iface);
TRACE("This %p formatEtc %p={.tymed=0x%x, .dwAspect=%d, .cfFormat=%s}\n",
TRACE("This %p formatEtc %p={.tymed=0x%lx, .dwAspect=%ld, .cfFormat=%s}\n",
This, formatEtc, formatEtc->tymed, formatEtc->dwAspect,
debugstr_format(formatEtc->cfFormat));
......@@ -235,7 +235,7 @@ static HRESULT WINAPI dddo_SetData(IDataObject* iface, FORMATETC* formatEtc,
{
DragDropDataObject *This = impl_from_IDataObject(iface);
TRACE("This %p formatEtc %p={.tymed=0x%x, .dwAspect=%d, .cfFormat=%s} medium %p fRelease %d\n",
TRACE("This %p formatEtc %p={.tymed=0x%lx, .dwAspect=%ld, .cfFormat=%s} medium %p fRelease %d\n",
This, formatEtc, formatEtc->tymed, formatEtc->dwAspect,
debugstr_format(formatEtc->cfFormat), medium, fRelease);
......@@ -251,7 +251,7 @@ static HRESULT WINAPI dddo_EnumFormatEtc(IDataObject* iface, DWORD direction,
UINT count;
HRESULT hr;
TRACE("This %p direction %u enumFormatEtc %p\n", This, direction, enumFormatEtc);
TRACE("This %p direction %lu enumFormatEtc %p\n", This, direction, enumFormatEtc);
if (direction != DATADIR_GET)
{
......@@ -286,7 +286,7 @@ static HRESULT WINAPI dddo_EnumFormatEtc(IDataObject* iface, DWORD direction,
else
hr = SHCreateStdEnumFmtEtc(0, NULL, enumFormatEtc);
TRACE(" -> 0x%x\n", hr);
TRACE(" -> 0x%lx\n", hr);
return hr;
}
......@@ -294,7 +294,7 @@ static HRESULT WINAPI dddo_EnumFormatEtc(IDataObject* iface, DWORD direction,
static HRESULT WINAPI dddo_DAdvise(IDataObject* iface, FORMATETC* formatEtc, DWORD advf,
IAdviseSink* pAdvSink, DWORD* pdwConnection)
{
FIXME("(%p, %p, %u, %p, %p): stub\n", iface, formatEtc, advf,
FIXME("(%p, %p, %lu, %p, %p): stub\n", iface, formatEtc, advf,
pAdvSink, pdwConnection);
return OLE_E_ADVISENOTSUPPORTED;
}
......@@ -302,7 +302,7 @@ static HRESULT WINAPI dddo_DAdvise(IDataObject* iface, FORMATETC* formatEtc, DWO
static HRESULT WINAPI dddo_DUnadvise(IDataObject* iface, DWORD dwConnection)
{
FIXME("(%p, %u): stub\n", iface, dwConnection);
FIXME("(%p, %lu): stub\n", iface, dwConnection);
return OLE_E_ADVISENOTSUPPORTED;
}
......@@ -449,7 +449,7 @@ NTSTATUS WINAPI macdrv_dnd_query_drop(void *arg, ULONG size)
pointl.x = pt.x;
pointl.y = pt.y;
TRACE("Drop hwnd %p droptarget %p pointl (%d,%d) effect 0x%08x\n", last_droptarget_hwnd,
TRACE("Drop hwnd %p droptarget %p pointl (%ld,%ld) effect 0x%08lx\n", last_droptarget_hwnd,
droptarget, pointl.x, pointl.y, effect);
hr = IDropTarget_Drop(droptarget, active_data_object, MK_LBUTTON, pointl, &effect);
if (SUCCEEDED(hr))
......@@ -463,7 +463,7 @@ NTSTATUS WINAPI macdrv_dnd_query_drop(void *arg, ULONG size)
TRACE("the application refused the drop\n");
}
else
WARN("drop failed, error 0x%08X\n", hr);
WARN("drop failed, error 0x%08lx\n", hr);
IDropTarget_Release(droptarget);
}
else
......@@ -524,7 +524,7 @@ NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size)
TRACE("DragLeave hwnd %p droptarget %p\n", last_droptarget_hwnd, droptarget);
hr = IDropTarget_DragLeave(droptarget);
if (FAILED(hr))
WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr);
WARN("IDropTarget_DragLeave failed, error 0x%08lx\n", hr);
IDropTarget_Release(droptarget);
}
......@@ -575,7 +575,7 @@ NTSTATUS WINAPI macdrv_dnd_query_drag(void *arg, ULONG size)
TRACE("DragLeave hwnd %p droptarget %p\n", last_droptarget_hwnd, old_droptarget);
hr = IDropTarget_DragLeave(old_droptarget);
if (FAILED(hr))
WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr);
WARN("IDropTarget_DragLeave failed, error 0x%08lx\n", hr);
IDropTarget_Release(old_droptarget);
}
}
......@@ -594,11 +594,11 @@ NTSTATUS WINAPI macdrv_dnd_query_drag(void *arg, ULONG size)
pointl, &effect);
if (SUCCEEDED(hr))
{
TRACE(" effect %d\n", effect);
TRACE(" effect %ld\n", effect);
ret = TRUE;
}
else
WARN("IDropTarget_DragEnter failed, error 0x%08X\n", hr);
WARN("IDropTarget_DragEnter failed, error 0x%08lx\n", hr);
IDropTarget_Release(droptarget);
}
}
......@@ -610,11 +610,11 @@ NTSTATUS WINAPI macdrv_dnd_query_drag(void *arg, ULONG size)
hr = IDropTarget_DragOver(droptarget, MK_LBUTTON, pointl, &effect);
if (SUCCEEDED(hr))
{
TRACE(" effect %d\n", effect);
TRACE(" effect %ld\n", effect);
ret = TRUE;
}
else
WARN("IDropTarget_DragOver failed, error 0x%08X\n", hr);
WARN("IDropTarget_DragOver failed, error 0x%08lx\n", hr);
IDropTarget_Release(droptarget);
}
......
dlls/winemac.drv/ime.c
View file @ 34031227
......@@ -149,7 +149,7 @@ static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len, DWORD *flags)
LPCOMPOSITIONSTRING lpcs = NULL;
INT current_offset = 0;
TRACE("%s, %i\n", debugstr_wn(compstr, len), len);
TRACE("%s, %li\n", debugstr_wn(compstr, len), len);
if (old == NULL && compstr == NULL && len == 0)
return NULL;
......@@ -297,7 +297,7 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len)
LPCOMPOSITIONSTRING lpcs = NULL;
INT current_offset = 0;
TRACE("%s, %i\n", debugstr_wn(resultstr, len), len);
TRACE("%s, %li\n", debugstr_wn(resultstr, len), len);
if (old == NULL && resultstr == NULL && len == 0)
return NULL;
......@@ -527,7 +527,7 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable)
BOOL WINAPI ImeConfigure(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData)
{
FIXME("(%p, %p, %d, %p): stub\n", hKL, hWnd, dwMode, lpData);
FIXME("(%p, %p, %ld, %p): stub\n", hKL, hWnd, dwMode, lpData);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
......@@ -536,7 +536,7 @@ DWORD WINAPI ImeConversionList(HIMC hIMC, LPCWSTR lpSource, LPCANDIDATELIST lpCa
DWORD dwBufLen, UINT uFlag)
{
FIXME("(%p, %s, %p, %d, %d): stub\n", hIMC, debugstr_w(lpSource), lpCandList,
FIXME("(%p, %s, %p, %ld, %d): stub\n", hIMC, debugstr_w(lpSource), lpCandList,
dwBufLen, uFlag);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
......@@ -562,7 +562,7 @@ BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, const LPBYTE lp
LPINPUTCONTEXT lpIMC;
BOOL inIME;
TRACE("hIMC %p vKey 0x%04x lKeyData 0x%08lx lpbKeyState %p\n", hIMC, vKey, lKeyData, lpbKeyState);
TRACE("hIMC %p vKey 0x%04x lKeyData 0x%08Ix lpbKeyState %p\n", hIMC, vKey, lKeyData, lpbKeyState);
switch (vKey)
{
......@@ -721,7 +721,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
BOOL bRet = FALSE;
LPINPUTCONTEXT lpIMC;
TRACE("%p %i %i %i\n", hIMC, dwAction, dwIndex, dwValue);
TRACE("%p %li %li %li\n", hIMC, dwAction, dwIndex, dwValue);
lpIMC = LockRealIMC(hIMC);
if (lpIMC == NULL)
......@@ -877,14 +877,14 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
BOOL WINAPI ImeRegisterWord(LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister)
{
FIXME("(%s, %d, %s): stub\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister));
FIXME("(%s, %ld, %s): stub\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister));
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
BOOL WINAPI ImeUnregisterWord(LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister)
{
FIXME("(%s, %d, %s): stub\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszUnregister));
FIXME("(%s, %ld, %s): stub\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszUnregister));
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
......@@ -899,7 +899,7 @@ UINT WINAPI ImeGetRegisterWordStyle(UINT nItem, LPSTYLEBUFW lpStyleBuf)
UINT WINAPI ImeEnumRegisterWord(REGISTERWORDENUMPROCW lpfnEnumProc, LPCWSTR lpszReading,
DWORD dwStyle, LPCWSTR lpszRegister, LPVOID lpData)
{
FIXME("(%p, %s, %d, %s, %p): stub\n", lpfnEnumProc, debugstr_w(lpszReading), dwStyle,
FIXME("(%p, %s, %ld, %s, %p): stub\n", lpfnEnumProc, debugstr_w(lpszReading), dwStyle,
debugstr_w(lpszRegister), lpData);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
......@@ -913,7 +913,7 @@ static BOOL IME_SetCompositionString(void* hIMC, DWORD dwIndex, LPCVOID lpComp,
LPIMEPRIVATE myPrivate;
BOOL sendMessage = TRUE;
TRACE("(%p, %d, %p, %d):\n", hIMC, dwIndex, lpComp, dwCompLen);
TRACE("(%p, %ld, %p, %ld):\n", hIMC, dwIndex, lpComp, dwCompLen);
/*
* Explanation:
......@@ -984,7 +984,7 @@ static BOOL IME_SetCompositionString(void* hIMC, DWORD dwIndex, LPCVOID lpComp,
BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen,
LPCVOID lpRead, DWORD dwReadLen)
{
TRACE("(%p, %d, %p, %d, %p, %d):\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen);
TRACE("(%p, %ld, %p, %ld, %p, %ld):\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen);
if (lpRead && dwReadLen)
FIXME("Reading string unimplemented\n");
......@@ -995,7 +995,7 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DW
DWORD WINAPI ImeGetImeMenuItems(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu,
LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize)
{
FIXME("(%p, %x %x %p %p %x): stub\n", hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize);
FIXME("(%p, %lx %lx %p %p %lx): stub\n", hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
......@@ -1140,7 +1140,7 @@ static void PaintDefaultIMEWnd(HIMC hIMC, HWND hwnd)
static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam)
{
TRACE("IME message WM_IME_COMPOSITION 0x%lx\n", lParam);
TRACE("IME message WM_IME_COMPOSITION 0x%Ix\n", lParam);
if (!(lParam & GCS_RESULTSTR))
UpdateDataInDefaultIMEWindow(hIMC, hwnd, TRUE);
}
......@@ -1203,7 +1203,7 @@ static LRESULT ImeHandleNotify(HIMC hIMC, HWND hwnd, UINT msg, WPARAM wParam, LP
FIXME("WM_IME_NOTIFY:IMN_SETSTATUSWINDOWPOS\n");
break;
default:
FIXME("WM_IME_NOTIFY:<Unknown 0x%lx>\n", wParam);
FIXME("WM_IME_NOTIFY:<Unknown 0x%Ix>\n", wParam);
break;
}
return 0;
......@@ -1214,7 +1214,7 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
LRESULT rc = 0;
HIMC hIMC;
TRACE("Incoming Message 0x%x (0x%08lx, 0x%08lx)\n", msg, wParam, lParam);
TRACE("Incoming Message 0x%x (0x%08Ix, 0x%08Ix)\n", msg, wParam, lParam);
/*
* Each UI window contains the current Input Context.
......@@ -1286,14 +1286,14 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
DefaultIMEStartComposition(hIMC, hwnd);
break;
case WM_IME_ENDCOMPOSITION:
TRACE("IME message %s, 0x%lx, 0x%lx\n", "WM_IME_ENDCOMPOSITION", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n", "WM_IME_ENDCOMPOSITION", wParam, lParam);
ShowWindow(hwnd, SW_HIDE);
break;
case WM_IME_SELECT:
TRACE("IME message %s, 0x%lx, 0x%lx\n", "WM_IME_SELECT", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n", "WM_IME_SELECT", wParam, lParam);
break;
case WM_IME_CONTROL:
TRACE("IME message %s, 0x%lx, 0x%lx\n", "WM_IME_CONTROL", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n", "WM_IME_CONTROL", wParam, lParam);
rc = 1;
break;
case WM_IME_NOTIFY:
......@@ -1305,32 +1305,32 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
/* check the MSIME messages */
if (msg == WM_MSIME_SERVICE)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n", "WM_MSIME_SERVICE", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n", "WM_MSIME_SERVICE", wParam, lParam);
rc = FALSE;
}
else if (msg == WM_MSIME_RECONVERTOPTIONS)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n", "WM_MSIME_RECONVERTOPTIONS", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n", "WM_MSIME_RECONVERTOPTIONS", wParam, lParam);
}
else if (msg == WM_MSIME_MOUSE)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n", "WM_MSIME_MOUSE", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n", "WM_MSIME_MOUSE", wParam, lParam);
}
else if (msg == WM_MSIME_RECONVERTREQUEST)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n", "WM_MSIME_RECONVERTREQUEST", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n", "WM_MSIME_RECONVERTREQUEST", wParam, lParam);
}
else if (msg == WM_MSIME_RECONVERT)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n", "WM_MSIME_RECONVERT", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n", "WM_MSIME_RECONVERT", wParam, lParam);
}
else if (msg == WM_MSIME_QUERYPOSITION)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n", "WM_MSIME_QUERYPOSITION", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n", "WM_MSIME_QUERYPOSITION", wParam, lParam);
}
else if (msg == WM_MSIME_DOCUMENTFEED)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n", "WM_MSIME_DOCUMENTFEED", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n", "WM_MSIME_DOCUMENTFEED", wParam, lParam);
}
/* DefWndProc if not an IME message */
if (!rc && !((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment