wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Alexandre Julliard : wow64win: Fix some prototype mismatches.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 0720b151227593f4c7b91c409ebbcd39f5faae4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0720b151227593f4c7b91c40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 26 11:49:14 2022 +0100 wow64win: Fix some prototype mismatches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64win/gdi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index 348c3259f2e..3abe6daeda4 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -252,7 +252,7 @@ NTSTATUS WINAPI wow64_NtGdiEqualRgn( UINT *args ) return NtGdiEqualRgn( hrgn1, hrgn2 ); } -INT WINAPI wow64_NtGdiGetRgnBox( UINT *args ) +NTSTATUS WINAPI wow64_NtGdiGetRgnBox( UINT *args ) { HRGN hrgn = get_handle( &args ); RECT *rect = get_ptr( &args ); @@ -260,7 +260,7 @@ INT WINAPI wow64_NtGdiGetRgnBox( UINT *args ) return NtGdiGetRgnBox( hrgn, rect ); } -BOOL WINAPI wow64_NtGdiSetRectRgn( UINT *args ) +NTSTATUS WINAPI wow64_NtGdiSetRectRgn( UINT *args ) { HRGN hrgn = get_handle( &args ); INT left = get_ulong( &args ); @@ -271,7 +271,7 @@ BOOL WINAPI wow64_NtGdiSetRectRgn( UINT *args ) return NtGdiSetRectRgn( hrgn, left, top, right, bottom ); } -INT WINAPI wow64_NtGdiOffsetRgn( UINT *args ) +NTSTATUS WINAPI wow64_NtGdiOffsetRgn( UINT *args ) { HRGN hrgn = get_handle( &args ); INT x = get_ulong( &args ); @@ -299,7 +299,7 @@ NTSTATUS WINAPI wow64_NtGdiPtInRegion( UINT *args ) return NtGdiPtInRegion( hrgn, x, y ); } -BOOL WINAPI wow64_NtGdiRectInRegion( UINT *args ) +NTSTATUS WINAPI wow64_NtGdiRectInRegion( UINT *args ) { HRGN hrgn = get_handle( &args ); const RECT *rect = get_ptr( &args ); @@ -321,7 +321,7 @@ NTSTATUS WINAPI wow64_NtGdiSaveDC( UINT *args ) return NtGdiSaveDC( hdc ); } -BOOL WINAPI wow64_NtGdiSetBrushOrg( UINT *args ) +NTSTATUS WINAPI wow64_NtGdiSetBrushOrg( UINT *args ) { HDC hdc = get_handle( &args ); INT x = get_ulong( &args ); @@ -331,7 +331,7 @@ BOOL WINAPI wow64_NtGdiSetBrushOrg( UINT *args ) return NtGdiSetBrushOrg( hdc, x, y, prev_org ); } -BOOL WINAPI wow64_NtGdiGetTransform( UINT *args ) +NTSTATUS WINAPI wow64_NtGdiGetTransform( UINT *args ) { HDC hdc = get_handle( &args ); DWORD which = get_ulong( &args );

1 0

Alexandre Julliard : winevulkan: Fix some prototype mismatches.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: ef9c0b3f691f6897f0acfd72af0a9ea020f0a0bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef9c0b3f691f6897f0acfd72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 26 11:21:14 2022 +0100 winevulkan: Fix some prototype mismatches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 638ca3a7a41..19cc999433b 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1022,7 +1022,7 @@ NTSTATUS wine_vkEnumerateInstanceVersion(void *args) return res; } -VkResult wine_vkEnumeratePhysicalDevices(void *args) +NTSTATUS wine_vkEnumeratePhysicalDevices(void *args) { struct vkEnumeratePhysicalDevices_params *params = args; VkInstance instance = params->instance; @@ -1418,7 +1418,7 @@ NTSTATUS wine_vkGetCalibratedTimestampsEXT(void *args) return res; } -VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(void *args) +NTSTATUS wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(void *args) { struct vkGetPhysicalDeviceCalibrateableTimeDomainsEXT_params *params = args; VkPhysicalDevice phys_dev = params->physicalDevice;

1 0

Alexandre Julliard : windows.globalization: Fix some prototype mismatches.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: e28d23de83604ec7bd9f976a941a784e881f3b35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e28d23de83604ec7bd9f976a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 26 11:21:05 2022 +0100 windows.globalization: Fix some prototype mismatches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.globalization/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 519d2b8bdac..e8fcd46ef63 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -126,7 +126,7 @@ static HRESULT STDMETHODCALLTYPE hstring_vector_GetTrustLevel(IVectorView_HSTRIN } static HRESULT STDMETHODCALLTYPE hstring_vector_GetAt(IVectorView_HSTRING *iface, - ULONG index, HSTRING *value) + UINT32 index, HSTRING *value) { struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); @@ -138,7 +138,7 @@ static HRESULT STDMETHODCALLTYPE hstring_vector_GetAt(IVectorView_HSTRING *iface } static HRESULT STDMETHODCALLTYPE hstring_vector_get_Size(IVectorView_HSTRING *iface, - ULONG *value) + UINT32 *value) { struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); @@ -149,7 +149,7 @@ static HRESULT STDMETHODCALLTYPE hstring_vector_get_Size(IVectorView_HSTRING *if } static HRESULT STDMETHODCALLTYPE hstring_vector_IndexOf(IVectorView_HSTRING *iface, - HSTRING element, ULONG *index, BOOLEAN *found) + HSTRING element, UINT32 *index, BOOLEAN *found) { struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); INT32 i, order; @@ -175,7 +175,7 @@ static HRESULT STDMETHODCALLTYPE hstring_vector_IndexOf(IVectorView_HSTRING *ifa } static HRESULT STDMETHODCALLTYPE hstring_vector_GetMany(IVectorView_HSTRING *iface, - ULONG start_index, ULONG items_size, HSTRING *items, UINT *count) + UINT32 start_index, UINT32 items_size, HSTRING *items, UINT *count) { struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); HRESULT hr = S_OK;

1 0

Alexandre Julliard : win32u: Fix some prototype mismatches.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 7e792b3bcad87bfa9a45b9754ca4f63aa961f965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e792b3bcad87bfa9a45b975… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 26 11:20:52 2022 +0100 win32u: Fix some prototype mismatches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/dibdrv/dibdrv.h | 2 +- dlls/win32u/dibdrv/graphics.c | 2 +- dlls/win32u/emfdrv.c | 2 +- dlls/win32u/painting.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/dibdrv/dibdrv.h b/dlls/win32u/dibdrv/dibdrv.h index b6f6bb41098..fe96c9d17f4 100644 --- a/dlls/win32u/dibdrv/dibdrv.h +++ b/dlls/win32u/dibdrv/dibdrv.h @@ -138,7 +138,7 @@ extern BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWO extern BOOL CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL dibdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD polygons ) DECLSPEC_HIDDEN; +extern BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, UINT polygons ) DECLSPEC_HIDDEN; extern BOOL CDECL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) DECLSPEC_HIDDEN; extern DWORD CDECL dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c index 410f29e8f19..32d98572801 100644 --- a/dlls/win32u/dibdrv/graphics.c +++ b/dlls/win32u/dibdrv/graphics.c @@ -1244,7 +1244,7 @@ BOOL CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) /*********************************************************************** * dibdrv_PolyPolygon */ -BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD polygons ) +BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, UINT polygons ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); diff --git a/dlls/win32u/emfdrv.c b/dlls/win32u/emfdrv.c index 8df666d81ba..f261a86e392 100644 --- a/dlls/win32u/emfdrv.c +++ b/dlls/win32u/emfdrv.c @@ -318,7 +318,7 @@ static BOOL CDECL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD coun } static BOOL CDECL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT *pt, - const DWORD *counts, UINT polys ) + const DWORD *counts, DWORD polys ) { /* FIXME: update bounding rect */ return TRUE; diff --git a/dlls/win32u/painting.c b/dlls/win32u/painting.c index 648630cf2c0..5a080bb5a0b 100644 --- a/dlls/win32u/painting.c +++ b/dlls/win32u/painting.c @@ -147,7 +147,7 @@ BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) pts[0] = dc->attr->cur_pos; memcpy( pts + 1, points, sizeof(POINT) * count ); count++; - ret = NtGdiPolyPolyDraw( dev->hdc, pts, &count, 1, NtGdiPolyBezier ); + ret = NtGdiPolyPolyDraw( dev->hdc, pts, (UINT *)&count, 1, NtGdiPolyBezier ); free( pts ); } return ret; @@ -550,7 +550,7 @@ BOOL WINAPI NtGdiInvertRgn( HDC hdc, HRGN hrgn ) * NtGdiPolyPolyDraw (win32u.@) */ ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts, - UINT count, UINT function ) + DWORD count, UINT function ) { PHYSDEV physdev; ULONG ret; @@ -572,7 +572,7 @@ ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts case NtGdiPolyPolyline: physdev = GET_DC_PHYSDEV( dc, pPolyPolyline ); - ret = physdev->funcs->pPolyPolyline( physdev, points, counts, count ); + ret = physdev->funcs->pPolyPolyline( physdev, points, (const DWORD *)counts, count ); break; case NtGdiPolyBezier:

1 0

Alexandre Julliard : mmsystem: Fix some prototype mismatches.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 2689b37e5fc54609def7a321fe1a7fb910ea1b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2689b37e5fc54609def7a321… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 26 11:20:22 2022 +0100 mmsystem: Fix some prototype mismatches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmsystem.dll16/message16.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index 32c51922fa1..90ef2ac5b57 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); /************************************************************************** * MMSYSTDRV_Mixer_Map16To32W [internal] */ -static MMSYSTEM_MapType MMSYSTDRV_Mixer_Map16To32W (UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) +static MMSYSTEM_MapType MMSYSTDRV_Mixer_Map16To32W (DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) { return MMSYSTEM_MAP_MSGERROR; } @@ -52,7 +52,7 @@ static MMSYSTEM_MapType MMSYSTDRV_Mixer_Map16To32W (UINT wMsg, DWORD_PTR* lpPa /************************************************************************** * MMSYSTDRV_Mixer_UnMap16To32W [internal] */ -static MMSYSTEM_MapType MMSYSTDRV_Mixer_UnMap16To32W(UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) +static MMSYSTEM_MapType MMSYSTDRV_Mixer_UnMap16To32W(DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) { #if 0 MIXERCAPSA micA; @@ -86,7 +86,7 @@ static void MMSYSTDRV_Mixer_MapCB(DWORD uMsg, DWORD_PTR* dwUser /************************************************************************** * MMSYSTDRV_MidiIn_Map16To32W [internal] */ -static MMSYSTEM_MapType MMSYSTDRV_MidiIn_Map16To32W (UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) +static MMSYSTEM_MapType MMSYSTDRV_MidiIn_Map16To32W (DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) { return MMSYSTEM_MAP_MSGERROR; } @@ -94,7 +94,7 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiIn_Map16To32W (UINT wMsg, DWORD_PTR* lpP /************************************************************************** * MMSYSTDRV_MidiIn_UnMap16To32W [internal] */ -static MMSYSTEM_MapType MMSYSTDRV_MidiIn_UnMap16To32W(UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) +static MMSYSTEM_MapType MMSYSTDRV_MidiIn_UnMap16To32W(DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) { return MMSYSTEM_MAP_MSGERROR; } @@ -102,7 +102,7 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiIn_UnMap16To32W(UINT wMsg, DWORD_PTR* lpP /************************************************************************** * MMSYSTDRV_MidiIn_MapCB [internal] */ -static void MMSYSTDRV_MidiIn_MapCB(UINT uMsg, DWORD_PTR* dwUser, DWORD_PTR* dwParam1, DWORD_PTR* dwParam2) +static void MMSYSTDRV_MidiIn_MapCB(DWORD uMsg, DWORD_PTR* dwUser, DWORD_PTR* dwParam1, DWORD_PTR* dwParam2) { switch (uMsg) { case MIM_OPEN: @@ -138,7 +138,7 @@ static void MMSYSTDRV_MidiIn_MapCB(UINT uMsg, DWORD_PTR* dwUser, DW /************************************************************************** * MMSYSTDRV_MidiOut_Map16To32W [internal] */ -static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) +static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) { MMSYSTEM_MapType ret = MMSYSTEM_MAP_MSGERROR; @@ -226,7 +226,7 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (UINT wMsg, DWORD_PTR* lpP /************************************************************************** * MMSYSTDRV_MidiOut_UnMap16To32W [internal] */ -static MMSYSTEM_MapType MMSYSTDRV_MidiOut_UnMap16To32W(UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) +static MMSYSTEM_MapType MMSYSTDRV_MidiOut_UnMap16To32W(DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) { MMSYSTEM_MapType ret = MMSYSTEM_MAP_MSGERROR; @@ -293,7 +293,7 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_UnMap16To32W(UINT wMsg, DWORD_PTR* lp /****************************************************************** * MMSYSTDRV_MidiOut_MapCB */ -static void MMSYSTDRV_MidiOut_MapCB(UINT uMsg, DWORD_PTR* dwUser, DWORD_PTR* dwParam1, DWORD_PTR* dwParam2) +static void MMSYSTDRV_MidiOut_MapCB(DWORD uMsg, DWORD_PTR* dwUser, DWORD_PTR* dwParam1, DWORD_PTR* dwParam2) { switch (uMsg) { case MOM_OPEN: @@ -327,7 +327,7 @@ static void MMSYSTDRV_MidiOut_MapCB(UINT uMsg, DWORD_PTR* dwUser, DWORD_PTR* dw /************************************************************************** * MMSYSTDRV_WaveIn_Map16To32W [internal] */ -static MMSYSTEM_MapType MMSYSTDRV_WaveIn_Map16To32W (UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) +static MMSYSTEM_MapType MMSYSTDRV_WaveIn_Map16To32W (DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) { MMSYSTEM_MapType ret = MMSYSTEM_MAP_MSGERROR; @@ -436,7 +436,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveIn_Map16To32W (UINT wMsg, DWORD_PTR* lpP /************************************************************************** * MMSYSTDRV_WaveIn_UnMap16To32W [internal] */ -static MMSYSTEM_MapType MMSYSTDRV_WaveIn_UnMap16To32W(UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) +static MMSYSTEM_MapType MMSYSTDRV_WaveIn_UnMap16To32W(DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) { MMSYSTEM_MapType ret = MMSYSTEM_MAP_MSGERROR; @@ -506,7 +506,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveIn_UnMap16To32W(UINT wMsg, DWORD_PTR* lpP /************************************************************************** * MMSYSTDRV_WaveIn_MapCB [internal] */ -static void MMSYSTDRV_WaveIn_MapCB(UINT uMsg, DWORD_PTR* dwUser, DWORD_PTR* dwParam1, DWORD_PTR* dwParam2) +static void MMSYSTDRV_WaveIn_MapCB(DWORD uMsg, DWORD_PTR* dwUser, DWORD_PTR* dwParam1, DWORD_PTR* dwParam2) { switch (uMsg) { case WIM_OPEN: @@ -537,7 +537,7 @@ static void MMSYSTDRV_WaveIn_MapCB(UINT uMsg, DWORD_PTR* dwUser, DWORD_PTR* /************************************************************************** * MMSYSTDRV_WaveOut_Map16To32W [internal] */ -static MMSYSTEM_MapType MMSYSTDRV_WaveOut_Map16To32W (UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) +static MMSYSTEM_MapType MMSYSTDRV_WaveOut_Map16To32W (DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) { MMSYSTEM_MapType ret = MMSYSTEM_MAP_MSGERROR; @@ -655,7 +655,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveOut_Map16To32W (UINT wMsg, DWORD_PTR* lp /************************************************************************** * MMSYSTDRV_WaveOut_UnMap16To32W [internal] */ -static MMSYSTEM_MapType MMSYSTDRV_WaveOut_UnMap16To32W(UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) +static MMSYSTEM_MapType MMSYSTDRV_WaveOut_UnMap16To32W(DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) { MMSYSTEM_MapType ret = MMSYSTEM_MAP_MSGERROR; @@ -735,7 +735,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveOut_UnMap16To32W(UINT wMsg, DWORD_PTR* lp /************************************************************************** * MMDRV_WaveOut_Callback [internal] */ -static void MMSYSTDRV_WaveOut_MapCB(UINT uMsg, DWORD_PTR* dwUser, DWORD_PTR* dwParam1, DWORD_PTR* dwParam2) +static void MMSYSTDRV_WaveOut_MapCB(DWORD uMsg, DWORD_PTR* dwUser, DWORD_PTR* dwParam1, DWORD_PTR* dwParam2) { switch (uMsg) { case WOM_OPEN: @@ -762,8 +762,8 @@ static void MMSYSTDRV_WaveOut_MapCB(UINT uMsg, DWORD_PTR* dwUser, DWORD_PTR* dw * # DRIVER THUNKING # * ################################################### */ -typedef MMSYSTEM_MapType (*MMSYSTDRV_MAPMSG)(UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2); -typedef MMSYSTEM_MapType (*MMSYSTDRV_UNMAPMSG)(UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT ret); +typedef MMSYSTEM_MapType (*MMSYSTDRV_MAPMSG)(DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2); +typedef MMSYSTEM_MapType (*MMSYSTDRV_UNMAPMSG)(DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT ret); typedef void (*MMSYSTDRV_MAPCB)(DWORD wMsg, DWORD_PTR* dwUser, DWORD_PTR* dwParam1, DWORD_PTR* dwParam2); #include <pshpack1.h>

1 0

Alexandre Julliard : d3dx10: Fix a prototype mismatch.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: c84ac0e416c95c174f96af9259d5f8e90548dd7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c84ac0e416c95c174f96af92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 26 11:19:57 2022 +0100 d3dx10: Fix a prototype mismatch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 1a95dbeca02..b59d2f9be4b 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -310,7 +310,7 @@ static INT WINAPI d3dx_font_DrawTextA(ID3DX10Font *iface, ID3DX10Sprite *sprite, } static INT WINAPI d3dx_font_DrawTextW(ID3DX10Font *iface, ID3DX10Sprite *sprite, - const WCHAR *string, INT count, RECT *rect, DWORD format, D3DXCOLOR color) + const WCHAR *string, INT count, RECT *rect, UINT format, D3DXCOLOR color) { FIXME("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color {%.8e,%.8e,%.8e,%.8e} stub!\n", iface, sprite, debugstr_wn(string, count), count, wine_dbgstr_rect(rect),

1 0

Alexandre Julliard : d3drm: Fix a prototype mismatch.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 6d3cbb5c703085c7eec1693bc275225424b6329c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d3cbb5c703085c7eec1693b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 26 11:19:44 2022 +0100 d3drm: Fix a prototype mismatch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 9b85c2d0d0b..401b5aac334 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2676,7 +2676,7 @@ static HRESULT WINAPI d3drm_mesh_SetGroupTexture(IDirect3DRMMesh *iface, return IDirect3DRMTexture3_QueryInterface(texture, &IID_IDirect3DRMTexture, (void **)&mesh->groups[id].texture); } -static DWORD WINAPI d3drm_mesh_GetGroupCount(IDirect3DRMMesh *iface) +static UINT WINAPI d3drm_mesh_GetGroupCount(IDirect3DRMMesh *iface) { struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface);

1 0

Alexandre Julliard : include: Add casts for types that may be defined as long.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 721bec64c2118bb711cdef1ee6b13a1880408801 URL: https://source.winehq.org/git/wine.git/?a=commit;h=721bec64c2118bb711cdef1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 26 14:42:04 2022 +0100 include: Add casts for types that may be defined as long. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 9730e85d97a..58f92754164 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -324,7 +324,7 @@ static inline const char *wine_dbgstr_guid( const GUID *id ) if (!id) return "(null)"; if (!((ULONG_PTR)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04hx>", (WORD)(ULONG_PTR)id ); return wine_dbg_sprintf( "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - id->Data1, id->Data2, id->Data3, + (unsigned int)id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); } @@ -332,14 +332,14 @@ static inline const char *wine_dbgstr_guid( const GUID *id ) static inline const char *wine_dbgstr_point( const POINT *pt ) { if (!pt) return "(null)"; - return wine_dbg_sprintf( "(%d,%d)", pt->x, pt->y ); + return wine_dbg_sprintf( "(%d,%d)", (int)pt->x, (int)pt->y ); } static inline const char *wine_dbgstr_rect( const RECT *rect ) { if (!rect) return "(null)"; - return wine_dbg_sprintf( "(%d,%d)-(%d,%d)", rect->left, rect->top, - rect->right, rect->bottom ); + return wine_dbg_sprintf( "(%d,%d)-(%d,%d)", (int)rect->left, (int)rect->top, + (int)rect->right, (int)rect->bottom ); } static inline const char *wine_dbgstr_longlong( ULONGLONG ll ) @@ -423,7 +423,7 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) case VT_I2: return wine_dbg_sprintf( "%p {VT_I2: %d}", v, V_I2(v) ); case VT_I4: - return wine_dbg_sprintf( "%p {VT_I4: %d}", v, V_I4(v) ); + return wine_dbg_sprintf( "%p {VT_I4: %d}", v, (int)V_I4(v) ); case VT_R4: return wine_dbg_sprintf( "%p {VT_R4: %f}", v, V_R4(v) ); case VT_R8: @@ -441,7 +441,7 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) case VT_DISPATCH: return wine_dbg_sprintf( "%p {VT_DISPATCH: %p}", v, V_DISPATCH(v) ); case VT_ERROR: - return wine_dbg_sprintf( "%p {VT_ERROR: %08x}", v, V_ERROR(v) ); + return wine_dbg_sprintf( "%p {VT_ERROR: %08x}", v, (int)V_ERROR(v) ); case VT_BOOL: return wine_dbg_sprintf( "%p {VT_BOOL: %x}", v, V_BOOL(v) ); case VT_UNKNOWN: @@ -453,7 +453,7 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) case VT_UI2: return wine_dbg_sprintf( "%p {VT_UI2: %u}", v, V_UI2(v) ); case VT_UI4: - return wine_dbg_sprintf( "%p {VT_UI4: %u}", v, V_UI4(v) ); + return wine_dbg_sprintf( "%p {VT_UI4: %u}", v, (unsigned int)V_UI4(v) ); case VT_I8: return wine_dbg_sprintf( "%p {VT_I8: %s}", v, wine_dbgstr_longlong(V_I8(v)) ); case VT_UI8:

1 0

Alexandre Julliard : include: Remove the wine_ prefix on rbtree functions.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 3527230c461b6baba9c29e69b575ada85bdbbc43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3527230c461b6baba9c29e69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 26 11:29:09 2022 +0100 include: Remove the wine_ prefix on rbtree functions. Add defines for frequently-used functions. For compatibility with vkd3d. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 8 +- dlls/riched20/wrap.c | 6 +- dlls/wined3d/device.c | 16 ++-- include/wine/rbtree.h | 236 ++++++++++++++++++++++++---------------------- 4 files changed, 138 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3527230c461b6baba9c2…

1 0

Eric Pouech : include: Fix signedness in wine_dbgstr_variant().
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: f253fbd62a58c01fa559b649a2e6daa76185dd02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f253fbd62a58c01fa559b649… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jan 25 10:53:16 2022 +0100 include: Fix signedness in wine_dbgstr_variant(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 6aac7fe82e8..9730e85d97a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -451,9 +451,9 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) case VT_UI1: return wine_dbg_sprintf( "%p {VT_UI1: %u}", v, V_UI1(v) ); case VT_UI2: - return wine_dbg_sprintf( "%p {VT_UI2: %d}", v, V_UI2(v) ); + return wine_dbg_sprintf( "%p {VT_UI2: %u}", v, V_UI2(v) ); case VT_UI4: - return wine_dbg_sprintf( "%p {VT_UI4: %d}", v, V_UI4(v) ); + return wine_dbg_sprintf( "%p {VT_UI4: %u}", v, V_UI4(v) ); case VT_I8: return wine_dbg_sprintf( "%p {VT_I8: %s}", v, wine_dbgstr_longlong(V_I8(v)) ); case VT_UI8:

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
73
Older →

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 January 2022