wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Henri Verbeet : wined3d: Get rid of the WINED3DSAMPLERSTATETYPE typedef.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 08545dc739026c9dbb7ccd6045301a19ec413976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08545dc739026c9dbb7ccd604… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 8 21:14:59 2012 +0100 wined3d: Get rid of the WINED3DSAMPLERSTATETYPE typedef. --- dlls/d3d8/device.c | 20 +++++++------- dlls/ddraw/device.c | 44 ++++++++++++++++---------------- dlls/wined3d/device.c | 18 ++++++------ dlls/wined3d/state.c | 4 +- dlls/wined3d/stateblock.c | 52 +++++++++++++++++++------------------- dlls/wined3d/texture.c | 54 ++++++++++++++++++++-------------------- dlls/wined3d/utils.c | 28 ++++++++++---------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 39 ++++++++++++++-------------- 9 files changed, 130 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08545dc739026c9dbb7cc…

1 0

Henri Verbeet : wined3d: Only flip SFLAG_DIBSECTION once in flip_surface().
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: f1e2c5df93689837d9b1971ee59a462a8e347d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1e2c5df93689837d9b1971ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 8 21:14:58 2012 +0100 wined3d: Only flip SFLAG_DIBSECTION once in flip_surface(). We already swap all flags at a later point in flip_surface(). --- dlls/wined3d/surface.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fdc72ca..c92e122 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4740,16 +4740,9 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) /* Flip the DIBsection */ { - HBITMAP tmp; - BOOL hasDib = front->flags & SFLAG_DIBSECTION; - tmp = front->dib.DIBsection; + HBITMAP tmp = front->dib.DIBsection; front->dib.DIBsection = back->dib.DIBsection; back->dib.DIBsection = tmp; - - if (back->flags & SFLAG_DIBSECTION) front->flags |= SFLAG_DIBSECTION; - else front->flags &= ~SFLAG_DIBSECTION; - if (hasDib) back->flags |= SFLAG_DIBSECTION; - else back->flags &= ~SFLAG_DIBSECTION; } /* Flip the surface data */

1 0

Henri Verbeet : ddraw: Don' t leak the window region if we have an extra clip rect in ddraw_clipper_GetClipList ().
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 01992d7fb52e4276bb121a7d91d9615c93f97b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01992d7fb52e4276bb121a7d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 8 21:14:57 2012 +0100 ddraw: Don't leak the window region if we have an extra clip rect in ddraw_clipper_GetClipList(). --- dlls/ddraw/clipper.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 5c605d8..fb5c022 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -194,6 +194,8 @@ static HRESULT WINAPI ddraw_clipper_GetClipList(IDirectDrawClipper *iface, RECT return E_FAIL; } + if (clipper->window) + DeleteObject(region); region = clip_region; }

1 0

Henri Verbeet : wined3d: Allow 10-bpc formats as render targets.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: de807eb21ccdd30dfc897986150dcf5d70d38001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de807eb21ccdd30dfc8979861… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 8 21:14:56 2012 +0100 wined3d: Allow 10-bpc formats as render targets. --- dlls/wined3d/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2b00765..77a6152 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -715,7 +715,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R10G10B10A2_UNORM, GL_RGB10_A2, GL_RGB10_A2, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R8G8B8A8_UNORM, GL_RGBA8, GL_RGBA8, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, @@ -731,7 +731,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, convert_r16g16}, {WINED3DFMT_B10G10R10A2_UNORM, GL_RGB10_A2, GL_RGB10_A2, 0, GL_BGRA, GL_UNSIGNED_INT_2_10_10_10_REV, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R16G16B16A16_UNORM, GL_RGBA16, GL_RGBA16, 0, GL_RGBA, GL_UNSIGNED_SHORT, 0,

1 0

Alexandre Julliard : user32: Return the cursor position in send_hardware_message and use it to update the driver 's position.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 02442b52a4db3333cbf9d50d717ac66a10dba02c URL: http://source.winehq.org/git/wine.git/?a=commit;h=02442b52a4db3333cbf9d50d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 7 20:29:29 2012 +0100 user32: Return the cursor position in send_hardware_message and use it to update the driver's position. --- dlls/user32/input.c | 14 +------------- dlls/user32/message.c | 12 +++++++++++- include/wine/server_protocol.h | 8 ++++++-- server/protocol.def | 4 ++++ server/queue.c | 6 ++++++ server/request.h | 6 +++++- server/trace.c | 4 ++++ 7 files changed, 37 insertions(+), 17 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index d9fb7c0..905bda1 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -180,19 +180,7 @@ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) /* we need to update the coordinates to what the server expects */ INPUT input = inputs[i]; update_mouse_coords( &input ); - if (!(status = send_hardware_message( 0, &input, SEND_HWMSG_INJECTED ))) - { - if ((input.u.mi.dwFlags & MOUSEEVENTF_MOVE) && - ((input.u.mi.dwFlags & MOUSEEVENTF_ABSOLUTE) || input.u.mi.dx || input.u.mi.dy)) - { - /* we have to actually move the cursor */ - POINT pt; - GetCursorPos( &pt ); - if (!(input.u.mi.dwFlags & MOUSEEVENTF_ABSOLUTE) || - pt.x != input.u.mi.dx || pt.y != input.u.mi.dy) - USER_Driver->pSetCursorPos( pt.x, pt.y ); - } - } + status = send_hardware_message( 0, &input, SEND_HWMSG_INJECTED ); } else status = send_hardware_message( 0, &inputs[i], SEND_HWMSG_INJECTED ); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a38d77b..4972bb8 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3114,6 +3114,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) { struct user_thread_info *thread_info = get_user_thread_info(); struct send_message_info info; + int prev_x, prev_y, new_x, new_y; NTSTATUS ret; BOOL wait; @@ -3153,10 +3154,19 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) if (thread_info->key_state) wine_server_set_reply( req, thread_info->key_state, 256 ); ret = wine_server_call( req ); wait = reply->wait; + prev_x = reply->prev_x; + prev_y = reply->prev_y; + new_x = reply->new_x; + new_y = reply->new_y; } SERVER_END_REQ; - if (!ret && thread_info->key_state) thread_info->key_state_time = GetTickCount(); + if (!ret) + { + if (thread_info->key_state) thread_info->key_state_time = GetTickCount(); + if ((flags & SEND_HWMSG_INJECTED) && (prev_x != new_x || prev_y != new_y)) + USER_Driver->pSetCursorPos( new_x, new_y ); + } if (wait) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5880b47..fc51291 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2796,8 +2796,12 @@ struct send_hardware_message_reply { struct reply_header __header; int wait; + int prev_x; + int prev_y; + int new_x; + int new_y; /* VARARG(keystate,bytes); */ - char __pad_12[4]; + char __pad_28[4]; }; #define SEND_HWMSG_INJECTED 0x01 @@ -5640,6 +5644,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 429 +#define SERVER_PROTOCOL_VERSION 430 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 91a59b2..73f2d8e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2032,6 +2032,10 @@ enum message_type unsigned int flags; /* flags (see below) */ @REPLY int wait; /* do we need to wait for a reply? */ + int prev_x; /* previous cursor position */ + int prev_y; + int new_x; /* new cursor position */ + int new_y; VARARG(keystate,bytes); /* global state array for all the keys */ @END #define SEND_HWMSG_INJECTED 0x01 diff --git a/server/queue.c b/server/queue.c index 20d3e41..2cd82b4 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2204,6 +2204,9 @@ DECL_HANDLER(send_hardware_message) } } + reply->prev_x = desktop->cursor.x; + reply->prev_y = desktop->cursor.y; + switch (req->input.type) { case INPUT_MOUSE: @@ -2219,6 +2222,9 @@ DECL_HANDLER(send_hardware_message) set_error( STATUS_INVALID_PARAMETER ); } if (thread) release_object( thread ); + + reply->new_x = desktop->cursor.x; + reply->new_y = desktop->cursor.y; set_reply_data( desktop->keystate, size ); release_object( desktop ); } diff --git a/server/request.h b/server/request.h index ac69461..c1cca4c 100644 --- a/server/request.h +++ b/server/request.h @@ -1391,7 +1391,11 @@ C_ASSERT( FIELD_OFFSET(struct send_hardware_message_request, input) == 16 ); C_ASSERT( FIELD_OFFSET(struct send_hardware_message_request, flags) == 48 ); C_ASSERT( sizeof(struct send_hardware_message_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct send_hardware_message_reply, wait) == 8 ); -C_ASSERT( sizeof(struct send_hardware_message_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct send_hardware_message_reply, prev_x) == 12 ); +C_ASSERT( FIELD_OFFSET(struct send_hardware_message_reply, prev_y) == 16 ); +C_ASSERT( FIELD_OFFSET(struct send_hardware_message_reply, new_x) == 20 ); +C_ASSERT( FIELD_OFFSET(struct send_hardware_message_reply, new_y) == 24 ); +C_ASSERT( sizeof(struct send_hardware_message_reply) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_message_request, flags) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_message_request, get_win) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_message_request, get_first) == 20 ); diff --git a/server/trace.c b/server/trace.c index 4a50232..b8dc316 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2452,6 +2452,10 @@ static void dump_send_hardware_message_request( const struct send_hardware_messa static void dump_send_hardware_message_reply( const struct send_hardware_message_reply *req ) { fprintf( stderr, " wait=%d", req->wait ); + fprintf( stderr, ", prev_x=%d", req->prev_x ); + fprintf( stderr, ", prev_y=%d", req->prev_y ); + fprintf( stderr, ", new_x=%d", req->new_x ); + fprintf( stderr, ", new_y=%d", req->new_y ); dump_varargs_bytes( ", keystate=", cur_size ); }

1 0

Alexandre Julliard : gdi32: Stop forwarding object selection calls to x11drv.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 9c112996d01dd5af735d8a16710aac3fbd52023b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c112996d01dd5af735d8a167… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 12:14:20 2012 +0100 gdi32: Stop forwarding object selection calls to x11drv. --- dlls/gdi32/dibdrv/dc.c | 5 +---- dlls/gdi32/dibdrv/objects.c | 14 ++++---------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 6210ad0..3a9bbb3 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -348,7 +348,6 @@ static BOOL dibdrv_DeleteBitmap( HBITMAP bitmap ) */ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectBitmap ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); dib_info dib; @@ -365,7 +364,7 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) pdev->dib = dib; GDI_ReleaseObj( bitmap ); - return next->funcs->pSelectBitmap( next, bitmap ); + return bitmap; } /*********************************************************************** @@ -373,12 +372,10 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) */ static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDeviceClipping ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); TRACE("(%p, %p)\n", dev, rgn); pdev->clip = rgn; - return next->funcs->pSetDeviceClipping( next, rgn ); } /*********************************************************************** diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index de2339a..b6e50cb 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1703,13 +1703,12 @@ static inline int get_pen_device_width( dibdrv_physdev *pdev, int width ) */ COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDCPenColor ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); if (GetCurrentObject(dev->hdc, OBJ_PEN) == GetStockObject( DC_PEN )) pdev->pen_brush.colorref = color; - return next->funcs->pSetDCPenColor( next, color ); + return color; } /********************************************************************** @@ -2023,7 +2022,6 @@ static void select_brush( dib_brush *brush, const LOGBRUSH *logbrush, const stru */ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectBrush ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); LOGBRUSH logbrush; @@ -2035,8 +2033,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter logbrush.lbColor = GetDCBrushColor( dev->hdc ); select_brush( &pdev->brush, &logbrush, pattern ); - - return next->funcs->pSelectBrush( next, hbrush, pattern ); + return hbrush; } /*********************************************************************** @@ -2044,7 +2041,6 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter */ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectPen ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); LOGPEN logpen; LOGBRUSH logbrush; @@ -2139,8 +2135,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte pdev->pen_uses_region = (logpen.lopnStyle & PS_GEOMETRIC || pdev->pen_width > 1); pdev->pen_is_ext = (elp != NULL); HeapFree( GetProcessHeap(), 0, elp ); - - return next->funcs->pSelectPen( next, hpen, pattern ); + return hpen; } /*********************************************************************** @@ -2148,13 +2143,12 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte */ COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDCBrushColor ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); if (GetCurrentObject(dev->hdc, OBJ_BRUSH) == GetStockObject( DC_BRUSH )) pdev->brush.colorref = color; - return next->funcs->pSetDCBrushColor( next, color ); + return color; } BOOL brush_rect(dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip, INT rop)

1 0

Alexandre Julliard : gdi32: Get rid of the SetDIBColorTable driver entry point.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: dc1aeeb2f843e9a09c77f3433267c0e46cb1134e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1aeeb2f843e9a09c77f3433… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 7 13:27:08 2012 +0100 gdi32: Get rid of the SetDIBColorTable driver entry point. --- dlls/gdi32/dib.c | 11 ++++++++--- dlls/gdi32/dibdrv/dc.c | 19 ------------------- dlls/gdi32/driver.c | 6 ------ dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/dib.c | 34 ---------------------------------- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 3 +-- 11 files changed, 9 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc1aeeb2f843e9a09c77f…

1 0

Hans Leidekker : msi: Execute custom actions in the right script.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: b00e7039c5fcaa613b9776a38fe60bb697146b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b00e7039c5fcaa613b9776a38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 6 19:29:49 2012 +0100 msi: Execute custom actions in the right script. --- dlls/msi/action.c | 20 ++++++------ dlls/msi/custom.c | 86 ++++++++++++++++++++++++++++++++++----------------- dlls/msi/events.c | 2 +- dlls/msi/install.c | 2 +- dlls/msi/msi.c | 6 ++-- dlls/msi/msipriv.h | 16 +++++---- dlls/msi/package.c | 2 +- 7 files changed, 82 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b00e7039c5fcaa613b977…

1 0

Alexandre Julliard : msvcrt: Use the correct type for findnext64.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 446a6b3556be626c123fba1489e68cb42c222946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=446a6b3556be626c123fba148… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 21:57:30 2012 +0100 msvcrt: Use the correct type for findnext64. --- dlls/msvcrt/dir.c | 4 ++-- include/msvcrt/wchar.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 28f5314..8043cba 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -601,7 +601,7 @@ int CDECL MSVCRT__findnexti64(MSVCRT_intptr_t hand, struct MSVCRT__finddatai64_t * * 64-bit version of _findnext. */ -int CDECL MSVCRT__findnext64(long hand, struct MSVCRT__finddata64_t * ft) +int CDECL MSVCRT__findnext64(MSVCRT_intptr_t hand, struct MSVCRT__finddata64_t * ft) { WIN32_FIND_DATAA find_data; @@ -639,7 +639,7 @@ int CDECL MSVCRT__wfindnext64(MSVCRT_intptr_t hand, struct MSVCRT__wfinddata64_t * * 64-bit/32-bit version of _findnext. */ -int CDECL MSVCRT__findnext64i32(long hand, struct MSVCRT__finddata64i32_t * ft) +int CDECL MSVCRT__findnext64i32(MSVCRT_intptr_t hand, struct MSVCRT__finddata64i32_t * ft) { WIN32_FIND_DATAA find_data; diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 4c26624..028e2cb 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -266,10 +266,10 @@ int __cdecl _wrmdir(const wchar_t*); int __cdecl _waccess(const wchar_t*,int); int __cdecl _wchmod(const wchar_t*,int); int __cdecl _wcreat(const wchar_t*,int); -__msvcrt_long __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*); -__msvcrt_long __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); -int __cdecl _wfindnext(__msvcrt_long,struct _wfinddata_t*); -int __cdecl _wfindnexti64(__msvcrt_long, struct _wfinddatai64_t*); +intptr_t __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*); +intptr_t __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); +int __cdecl _wfindnext(intptr_t,struct _wfinddata_t*); +int __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*); wchar_t* __cdecl _wmktemp(wchar_t*); int __cdecl _wopen(const wchar_t*,int,...); int __cdecl _wrename(const wchar_t*,const wchar_t*);

1 0

Alexandre Julliard : msvcrt: Don't name a local variable 'errno'.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 2a1ce301fa59ba3cc25d8615b8e96a8313b54fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1ce301fa59ba3cc25d8615b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 21:48:42 2012 +0100 msvcrt: Don't name a local variable 'errno'. --- dlls/msvcrt/errno.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 6094eae..bf65f27 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -130,7 +130,7 @@ static MSVCRT_invalid_parameter_handler invalid_parameter_handler = NULL; /* INTERNAL: Set the crt and dos errno's from the OS error given. */ void msvcrt_set_errno(int err) { - int *errno = MSVCRT__errno(); + int *errno_ptr = MSVCRT__errno(); MSVCRT_ulong *doserrno = MSVCRT___doserrno(); *doserrno = err; @@ -138,7 +138,7 @@ void msvcrt_set_errno(int err) switch(err) { #define ERR_CASE(oserr) case oserr: -#define ERR_MAPS(oserr, crterr) case oserr: *errno = crterr; break +#define ERR_MAPS(oserr, crterr) case oserr: *errno_ptr = crterr; break ERR_CASE(ERROR_ACCESS_DENIED) ERR_CASE(ERROR_NETWORK_ACCESS_DENIED) ERR_CASE(ERROR_CANNOT_MAKE) @@ -184,7 +184,7 @@ void msvcrt_set_errno(int err) default: /* Remaining cases map to EINVAL */ /* FIXME: may be missing some errors above */ - *errno = MSVCRT_EINVAL; + *errno_ptr = MSVCRT_EINVAL; } }

1 0

← Newer
1
...
77
78
79
80
81
82
83
...
98
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 2012