wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : wintab.dll16: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: c6c95e3b3ce2fafccc3e1dace2109c86d08cdd6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6c95e3b3ce2fafccc3e1dac… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:28 2022 +0100 wintab.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab.dll16/Makefile.in | 1 - dlls/wintab.dll16/wintab.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wintab.dll16/Makefile.in b/dlls/wintab.dll16/Makefile.in index 7e39fc2ba69..05479200a09 100644 --- a/dlls/wintab.dll16/Makefile.in +++ b/dlls/wintab.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wintab.dll16 EXTRADLLFLAGS = -m16 -Wb,--main-module,wintab32.dll diff --git a/dlls/wintab.dll16/wintab.c b/dlls/wintab.dll16/wintab.c index cd8bcf6b66f..ccf5127c823 100644 --- a/dlls/wintab.dll16/wintab.c +++ b/dlls/wintab.dll16/wintab.c @@ -500,7 +500,7 @@ BOOL16 WINAPI WTMgrCsrButtonMap16(HMGR16 hMgr, UINT16 wCursor, BOOL16 WINAPI WTMgrCsrPressureBtnMarks16(HMGR16 hMgr, UINT16 wCsr, DWORD dwNMarks, DWORD dwTMarks) { - FIXME("(0x%04hx, %hu, %u, %u): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); + FIXME("(0x%04hx, %hu, %lu, %lu): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); return FALSE; }

1 0

Eric Pouech : wintab32: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 2ec60930088a3af3d1c570a3a312714a8148353d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ec60930088a3af3d1c570a3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:22 2022 +0100 wintab32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/Makefile.in | 1 - dlls/wintab32/context.c | 22 +++++++++++----------- dlls/wintab32/manager.c | 6 +++--- dlls/wintab32/wintab32.c | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index 56cfd6c2f41..050c78b86d3 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wintab32.dll IMPORTLIB = wintab32 IMPORTS = user32 advapi32 diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 2da04621934..58ba6b49074 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -102,7 +102,7 @@ static const char* DUMPBITS(int x) static inline void DUMPPACKET(WTPACKET packet) { - TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%x pkChanged: 0x%x pkSerialNumber: 0x%x pkCursor : %i pkButtons: %x pkX: %i pkY: %i pkZ: %i pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", + TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%lx pkChanged: 0x%lx pkSerialNumber: 0x%x pkCursor : %i pkButtons: %lx pkX: %li pkY: %li pkZ: %li pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", packet.pkContext, packet.pkStatus, packet.pkTime, packet.pkChanged, packet.pkSerialNumber, packet.pkCursor, packet.pkButtons, packet.pkX, packet.pkY, packet.pkZ, packet.pkNormalPressure, packet.pkTangentPressure, @@ -115,19 +115,19 @@ static inline void DUMPCONTEXT(LOGCONTEXTW lc) TRACE("Name: %s, Options: %x, Status: %x, Locks: %x, MsgBase: %x, Device: %x\n", wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice); TRACE("PktRate %x\n", lc.lcPktRate); - TRACE("PktData 0x%04x %s\n", lc.lcPktData, DUMPBITS(lc.lcPktData)); - TRACE("PktMode 0x%04x %s\n", lc.lcPktMode, DUMPBITS(lc.lcPktMode)); - TRACE("MovMask 0x%04x %s\n", lc.lcMoveMask, DUMPBITS(lc.lcMoveMask)); - TRACE("BtnDnMask: %x, BtnUpMask: %x\n", lc.lcBtnDnMask, lc.lcBtnUpMask); - TRACE("InOrgX: %i, InOrgY: %i, InOrgZ: %i\n", lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ); - TRACE("InExtX: %i, InExtY: %i, InExtZ: %i\n", lc.lcInExtX, lc.lcInExtY, lc.lcInExtZ); - TRACE("OutOrgX: %i, OutOrgY: %i, OutOrgZ: %i\n", lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ); - TRACE("OutExtX: %i, OutExtY: %i, OutExtZ: %i\n", lc.lcOutExtX, lc.lcOutExtY, lc.lcOutExtZ); - TRACE("SensX: %i, SensY: %i, SensZ: %i\n", lc.lcSensX, lc.lcSensY, lc.lcSensZ); + TRACE("PktData 0x%04lx %s\n", lc.lcPktData, DUMPBITS(lc.lcPktData)); + TRACE("PktMode 0x%04lx %s\n", lc.lcPktMode, DUMPBITS(lc.lcPktMode)); + TRACE("MovMask 0x%04lx %s\n", lc.lcMoveMask, DUMPBITS(lc.lcMoveMask)); + TRACE("BtnDnMask: %lx, BtnUpMask: %lx\n", lc.lcBtnDnMask, lc.lcBtnUpMask); + TRACE("InOrgX: %li, InOrgY: %li, InOrgZ: %li\n", lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ); + TRACE("InExtX: %li, InExtY: %li, InExtZ: %li\n", lc.lcInExtX, lc.lcInExtY, lc.lcInExtZ); + TRACE("OutOrgX: %li, OutOrgY: %li, OutOrgZ: %li\n", lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ); + TRACE("OutExtX: %li, OutExtY: %li, OutExtZ: %li\n", lc.lcOutExtX, lc.lcOutExtY, lc.lcOutExtZ); + TRACE("SensX: %li, SensY: %li, SensZ: %li\n", lc.lcSensX, lc.lcSensY, lc.lcSensZ); TRACE("SysMode: %i\n", lc.lcSysMode); TRACE("SysOrgX: %i, SysOrgY: %i\n", lc.lcSysOrgX, lc.lcSysOrgY); TRACE("SysExtX: %i, SysExtY: %i\n", lc.lcSysExtX, lc.lcSysExtY); - TRACE("SysSensX: %i, SysSensY: %i\n", lc.lcSysSensX, lc.lcSysSensY); + TRACE("SysSensX: %li, SysSensY: %li\n", lc.lcSysSensX, lc.lcSysSensY); } diff --git a/dlls/wintab32/manager.c b/dlls/wintab32/manager.c index d8d69554582..1a059f55f88 100644 --- a/dlls/wintab32/manager.c +++ b/dlls/wintab32/manager.c @@ -59,7 +59,7 @@ BOOL WINAPI WTMgrClose(HMGR hMgr) */ BOOL WINAPI WTMgrContextEnum(HMGR hMgr, WTENUMPROC lpEnumFunc, LPARAM lParam) { - FIXME("(%p, %p, %ld): stub\n", hMgr, lpEnumFunc, lParam); + FIXME("(%p, %p, %Id): stub\n", hMgr, lpEnumFunc, lParam); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -190,7 +190,7 @@ BOOL WINAPI WTMgrPacketUnhook(HWTHOOK hHook) LRESULT WINAPI WTMgrPacketHookNext(HWTHOOK hHook, int nCode, WPARAM wParam, LPARAM lParam) { - FIXME("(%p, %d, %lu, %lu): stub\n", hHook, nCode, wParam, lParam); + FIXME("(%p, %d, %Iu, %Iu): stub\n", hHook, nCode, wParam, lParam); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -243,7 +243,7 @@ BOOL WINAPI WTMgrCsrButtonMap(HMGR hMgr, UINT wCursor, BOOL WINAPI WTMgrCsrPressureBtnMarks(HMGR hMgr, UINT wCsr, DWORD dwNMarks, DWORD dwTMarks) { - FIXME("(%p, %u, %u, %u): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); + FIXME("(%p, %u, %lu, %lu): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index d56706b4223..b13c0573454 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -95,7 +95,7 @@ static HMODULE load_graphics_driver(void) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { - TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); + TRACE("%p, %lx, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH:

1 0

Eric Pouech : winsta: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: eb7f1edc679791eb7ae16d4c1264b6e51a7986e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb7f1edc679791eb7ae16d4c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:16 2022 +0100 winsta: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winsta/Makefile.in | 1 - dlls/winsta/main.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winsta/Makefile.in b/dlls/winsta/Makefile.in index 19d7066367a..dcf29b6ccb1 100644 --- a/dlls/winsta/Makefile.in +++ b/dlls/winsta/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winsta.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 9ec4d64d0b6..8e054f14314 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsta); BOOLEAN WINAPI WinStationQueryInformationA( HANDLE server, ULONG logon_id, WINSTATIONINFOCLASS class, void *info, ULONG len, ULONG *ret_len ) { - FIXME( "%p %u %u %p %u %p\n", server, logon_id, class, info, len, ret_len ); + FIXME( "%p %lu %u %p %lu %p\n", server, logon_id, class, info, len, ret_len ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -38,14 +38,14 @@ BOOLEAN WINAPI WinStationQueryInformationA( HANDLE server, ULONG logon_id, WINST BOOLEAN WINAPI WinStationQueryInformationW( HANDLE server, ULONG logon_id, WINSTATIONINFOCLASS class, void *info, ULONG len, ULONG *ret_len ) { - FIXME( "%p %u %u %p %u %p\n", server, logon_id, class, info, len, ret_len ); + FIXME( "%p %lu %u %p %lu %p\n", server, logon_id, class, info, len, ret_len ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } BOOLEAN WINAPI WinStationRegisterConsoleNotification( HANDLE server, HWND hwnd, ULONG flags ) { - FIXME( "%p %p 0x%x\n", server, hwnd, flags ); + FIXME( "%p %p 0x%lx\n", server, hwnd, flags ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -60,7 +60,7 @@ BOOLEAN WINAPI WinStationUnRegisterConsoleNotification( HANDLE server, HWND hwnd BOOLEAN WINAPI WinStationGetAllProcesses( HANDLE server, ULONG level, ULONG *process_count, PTS_ALL_PROCESSES_INFO *info ) { - FIXME( "%p %u %p %p\n", server, level, process_count, info ); + FIXME( "%p %lu %p %p\n", server, level, process_count, info ); *process_count = 0; SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; @@ -69,7 +69,7 @@ BOOLEAN WINAPI WinStationGetAllProcesses( HANDLE server, ULONG level, BOOLEAN WINAPI WinStationGetProcessSid( HANDLE server, ULONG process_id, FILETIME *process_start_time, PVOID process_user_sid, PULONG sid_size ) { - FIXME( "(%p, %d, %p, %p, %p): stub\n", server, process_id, process_start_time, process_user_sid, sid_size); + FIXME( "(%p, %ld, %p, %p, %p): stub\n", server, process_id, process_start_time, process_user_sid, sid_size); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; }

1 0

Eric Pouech : winscard: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 2868116ca2fb68eee75bfdcde461f70e9acf542d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2868116ca2fb68eee75bfdcd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:10 2022 +0100 winscard: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winscard/Makefile.in | 1 - dlls/winscard/winscard.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winscard/Makefile.in b/dlls/winscard/Makefile.in index e162e6d3cda..89449698b66 100644 --- a/dlls/winscard/Makefile.in +++ b/dlls/winscard/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winscard.dll IMPORTLIB = winscard diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index d524483ffc3..accbaf75c3d 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -34,7 +34,7 @@ const SCARD_IO_REQUEST g_rgSCardRawPci = { SCARD_PROTOCOL_RAW, 8 }; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { @@ -84,14 +84,14 @@ LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT context, LPCWSTR reader, LPCWSTR LONG WINAPI SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, LPCVOID pvReserved2, LPSCARDCONTEXT phContext) { - FIXME("(%x,%p,%p,%p) stub\n", dwScope, pvReserved1, pvReserved2, phContext); + FIXME("(%lx,%p,%p,%p) stub\n", dwScope, pvReserved1, pvReserved2, phContext); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } LONG WINAPI SCardIsValidContext(SCARDCONTEXT context) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } @@ -105,21 +105,21 @@ LONG WINAPI SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, LPCGUID rgguid LONG WINAPI SCardReleaseContext(SCARDCONTEXT context) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } LONG WINAPI SCardStatusA(SCARDHANDLE context, LPSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } LONG WINAPI SCardStatusW(SCARDHANDLE context, LPWSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState,LPDWORD pdwProtocol,LPBYTE pbAtr,LPDWORD pcbArtLen) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } @@ -131,19 +131,19 @@ void WINAPI SCardReleaseStartedEvent(void) LONG WINAPI SCardListReadersA(SCARDCONTEXT context, const CHAR *groups, CHAR *readers, DWORD *buflen) { - FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); + FIXME("(%Ix, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); return SCARD_E_NO_READERS_AVAILABLE; } LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR *readers, DWORD *buflen) { - FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); + FIXME("(%Ix, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); return SCARD_E_NO_READERS_AVAILABLE; } LONG WINAPI SCardCancel(SCARDCONTEXT context) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; }

1 0

Eric Pouech : wininet: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 5151d1acbc0e4663ec158540e41631134336f7e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5151d1acbc0e4663ec158540… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:58 2022 +0100 wininet: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/Makefile.in | 1 - dlls/wininet/cookie.c | 28 ++++----- dlls/wininet/dialogs.c | 24 +++---- dlls/wininet/ftp.c | 34 +++++----- dlls/wininet/http.c | 104 +++++++++++++++--------------- dlls/wininet/internet.c | 146 +++++++++++++++++++++---------------------- dlls/wininet/netconnection.c | 28 ++++----- dlls/wininet/urlcache.c | 106 +++++++++++++++---------------- dlls/wininet/utility.c | 4 +- 9 files changed, 237 insertions(+), 238 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5151d1acbc0e4663ec15…

1 0

Eric Pouech : wing.dll16: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 6ac552ed89673909dd00627ff17fe0a7f4965ab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ac552ed89673909dd00627f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:52 2022 +0100 wing.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wing.dll16/Makefile.in | 1 - dlls/wing.dll16/wing.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wing.dll16/Makefile.in b/dlls/wing.dll16/Makefile.in index af007d4c641..d9b936ea98a 100644 --- a/dlls/wing.dll16/Makefile.in +++ b/dlls/wing.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wing.dll16 IMPORTS = gdi32 EXTRADLLFLAGS = -m16 diff --git a/dlls/wing.dll16/wing.c b/dlls/wing.dll16/wing.c index 98cee565405..44c2f40eb1c 100644 --- a/dlls/wing.dll16/wing.c +++ b/dlls/wing.dll16/wing.c @@ -173,7 +173,7 @@ HBITMAP16 WINAPI WinGCreateBitmap16(HDC16 hdc, BITMAPINFO *bmpi, SEGPTR *bits) LPVOID bits32; HBITMAP hbitmap; - TRACE("(%d,%p,%p): create %dx%dx%d bitmap\n", hdc, bmpi, bits, + TRACE("(%d,%p,%p): create %ldx%ldx%d bitmap\n", hdc, bmpi, bits, bmpi->bmiHeader.biWidth, bmpi->bmiHeader.biHeight, bmpi->bmiHeader.biPlanes); hbitmap = CreateDIBSection( HDC_32(hdc), bmpi, DIB_RGB_COLORS, &bits32, 0, 0 ); @@ -278,7 +278,7 @@ HPALETTE16 WINAPI WinGCreateHalfTonePalette16(void) HBRUSH16 WINAPI WinGCreateHalfToneBrush16(HDC16 winDC, COLORREF col, WING_DITHER_TYPE type) { - TRACE("(%d,%d,%d)\n", winDC, col, type); + TRACE("(%d,%ld,%d)\n", winDC, col, type); return HBRUSH_16( CreateSolidBrush( col )); }

1 0

Eric Pouech : windows.media.speech: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: f0f4e105f104e8e0634aec0b5449729bb6ad9f56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0f4e105f104e8e0634aec0b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:40 2022 +0100 windows.media.speech: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/Makefile.in | 1 - dlls/windows.media.speech/main.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in index fc01608d62c..9fbff8e132f 100644 --- a/dlls/windows.media.speech/Makefile.in +++ b/dlls/windows.media.speech/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.media.speech.dll IMPORTS = combase uuid diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index b607f9a8203..d14d06773f7 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE vector_view_voice_information_AddRef( { struct voice_information_vector *impl = impl_from_IVectorView_VoiceInformation(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -90,7 +90,7 @@ static ULONG STDMETHODCALLTYPE vector_view_voice_information_Release( { struct voice_information_vector *impl = impl_from_IVectorView_VoiceInformation(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -222,7 +222,7 @@ static ULONG STDMETHODCALLTYPE speech_synthesizer_AddRef( struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -233,7 +233,7 @@ static ULONG STDMETHODCALLTYPE speech_synthesizer_Release( struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) free(impl); @@ -326,7 +326,7 @@ static ULONG STDMETHODCALLTYPE closable_AddRef( struct speech_synthesizer *impl = impl_from_IClosable(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -337,7 +337,7 @@ static ULONG STDMETHODCALLTYPE closable_Release( struct speech_synthesizer *impl = impl_from_IClosable(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) free(impl); @@ -442,7 +442,7 @@ static ULONG STDMETHODCALLTYPE windows_media_speech_AddRef( { struct windows_media_speech *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -451,7 +451,7 @@ static ULONG STDMETHODCALLTYPE windows_media_speech_Release( { struct windows_media_speech *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; }

1 0

Eric Pouech : windows.globalization: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 05f0b754bc64fb787b7c9b44819888234c441e29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05f0b754bc64fb787b7c9b44… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:28 2022 +0100 windows.globalization: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.globalization/Makefile.in | 1 - dlls/windows.globalization/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/windows.globalization/Makefile.in b/dlls/windows.globalization/Makefile.in index 84e78eb2842..d29c44ea746 100644 --- a/dlls/windows.globalization/Makefile.in +++ b/dlls/windows.globalization/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.globalization.dll IMPORTS = combase uuid diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index e8fcd46ef63..3e5a59bde14 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -87,7 +87,7 @@ static ULONG STDMETHODCALLTYPE hstring_vector_AddRef(IVectorView_HSTRING *iface) { struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -95,7 +95,7 @@ static ULONG STDMETHODCALLTYPE hstring_vector_Release(IVectorView_HSTRING *iface { struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); if (ref == 0) { while (impl->count--) WindowsDeleteString(impl->values[impl->count]); @@ -275,7 +275,7 @@ static ULONG STDMETHODCALLTYPE windows_globalization_AddRef( { struct windows_globalization *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -284,7 +284,7 @@ static ULONG STDMETHODCALLTYPE windows_globalization_Release( { struct windows_globalization *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; }

1 0

Eric Pouech : windows.devices.enumeration: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: de20523464606b542a559cf92380f4d215e72104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de20523464606b542a559cf9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:22 2022 +0100 windows.devices.enumeration: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.devices.enumeration/Makefile.in | 1 - dlls/windows.devices.enumeration/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/windows.devices.enumeration/Makefile.in b/dlls/windows.devices.enumeration/Makefile.in index dcac3c204c7..a2058b3d002 100644 --- a/dlls/windows.devices.enumeration/Makefile.in +++ b/dlls/windows.devices.enumeration/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.devices.enumeration.dll IMPORTS = combase uuid diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c index a2a13861a88..0e44251de08 100644 --- a/dlls/windows.devices.enumeration/main.c +++ b/dlls/windows.devices.enumeration/main.c @@ -82,7 +82,7 @@ static ULONG STDMETHODCALLTYPE windows_devices_enumeration_AddRef( { struct windows_devices_enumeration *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -91,7 +91,7 @@ static ULONG STDMETHODCALLTYPE windows_devices_enumeration_Release( { struct windows_devices_enumeration *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; }

1 0

Eric Pouech : windows.media.devices: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: fe017525a8719b9af53adf76225703600afc84ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe017525a8719b9af53adf76… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:34 2022 +0100 windows.media.devices: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.devices/Makefile.in | 1 - dlls/windows.media.devices/main.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/windows.media.devices/Makefile.in b/dlls/windows.media.devices/Makefile.in index cbeb55cba42..b4cdb69900e 100644 --- a/dlls/windows.media.devices/Makefile.in +++ b/dlls/windows.media.devices/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.media.devices.dll IMPORTS = combase diff --git a/dlls/windows.media.devices/main.c b/dlls/windows.media.devices/main.c index c4b5b647877..0bec5f2ea46 100644 --- a/dlls/windows.media.devices/main.c +++ b/dlls/windows.media.devices/main.c @@ -109,7 +109,7 @@ static ULONG STDMETHODCALLTYPE windows_media_devices_AddRef( { struct windows_media_devices *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -118,7 +118,7 @@ static ULONG STDMETHODCALLTYPE windows_media_devices_Release( { struct windows_media_devices *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p, ref %lu.\n", iface, ref); return ref; } @@ -181,14 +181,14 @@ static HRESULT get_default_device_id(EDataFlow direction, AudioDeviceRole role, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&devenum); if (FAILED(hr)) { - WARN("Failed to create MMDeviceEnumerator: %08x\n", hr); + WARN("Failed to create MMDeviceEnumerator: %08lx\n", hr); return hr; } hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, direction, mmdev_role, &dev); if (FAILED(hr)) { - WARN("GetDefaultAudioEndpoint failed: %08x\n", hr); + WARN("GetDefaultAudioEndpoint failed: %08lx\n", hr); IMMDeviceEnumerator_Release(devenum); return hr; } @@ -196,7 +196,7 @@ static HRESULT get_default_device_id(EDataFlow direction, AudioDeviceRole role, hr = IMMDevice_GetId(dev, &devid); if (FAILED(hr)) { - WARN("GetId failed: %08x\n", hr); + WARN("GetId failed: %08lx\n", hr); IMMDevice_Release(dev); IMMDeviceEnumerator_Release(devenum); return hr; @@ -217,7 +217,7 @@ static HRESULT get_default_device_id(EDataFlow direction, AudioDeviceRole role, hr = WindowsCreateString(s, wcslen(s), device_id_hstr); if (FAILED(hr)) - WARN("WindowsCreateString failed: %08x\n", hr); + WARN("WindowsCreateString failed: %08lx\n", hr); heap_free(s);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022