October 2011 - Wine-Commits

Francois Gouget : wineconsole: Give a name to the curses backend critical section.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: fc2b645d296cd5d3559e17e1977a2f7169c8be30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2b645d296cd5d3559e17e19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 27 12:36:27 2011 +0200 wineconsole: Give a name to the curses backend critical section. --- programs/wineconsole/curses.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 013a062..1f68d8d 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -985,6 +985,7 @@ static void WCCURSES_DeleteBackend(struct inner_data* data) WaitForSingleObject( PRIVATE(data)->input_thread, INFINITE ); CloseHandle( PRIVATE(data)->input_thread ); } + PRIVATE(data)->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&PRIVATE(data)->lock); delwin(PRIVATE(data)->pad); @@ -1103,6 +1104,7 @@ enum init_return WCCURSES_InitBackend(struct inner_data* data) } #endif InitializeCriticalSection(&PRIVATE(data)->lock); + PRIVATE(data)->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": curses"); return init_success; }

1 0

Jacek Caban : mshtml: Reimplement nsIURL:: GetFileExtension on top of IUri API.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: d1e49da2f5e99ccbdf87e4992b14c47ea07ad70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e49da2f5e99ccbdf87e4992… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 27 13:08:11 2011 +0200 mshtml: Reimplement nsIURL::GetFileExtension on top of IUri API. --- dlls/mshtml/nsio.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0571659..f127bbc 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2492,11 +2492,7 @@ static nsresult NSAPI nsURL_GetFileExtension(nsIURL *iface, nsACString *aFileExt TRACE("(%p)->(%p)\n", This, aFileExtension); - if(This->nsurl) - return nsIURL_GetFileExtension(This->nsurl, aFileExtension); - - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return get_uri_string(This, Uri_PROPERTY_EXTENSION, aFileExtension); } static nsresult NSAPI nsURL_SetFileExtension(nsIURL *iface, const nsACString *aFileExtension)

1 0

Alexandre Julliard : gdi32: Add a helper function to copy BITMAPINFO structures to avoid copying uninitialized data .
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: bb21ac85b33e21971899b1b4a9a0b8cd73daeb5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb21ac85b33e21971899b1b4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 27 14:19:44 2011 +0200 gdi32: Add a helper function to copy BITMAPINFO structures to avoid copying uninitialized data. --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/dib.c | 9 +++++---- dlls/gdi32/gdi_private.h | 7 +++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 486266a..cf5b359 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -245,7 +245,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err) return FALSE; dst_dev = GET_DC_PHYSDEV( dc_dst, pPutImage ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); if (err == ERROR_BAD_FORMAT) { @@ -288,7 +288,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err == ERROR_TRANSFORM_NOT_SUPPORTED && ((src->width != dst->width) || (src->height != dst->height))) { - memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( src_info, dst_info ); err = stretch_bits( src_info, src, dst_info, dst, &bits, GetStretchBltMode( dst_dev->hdc )); if (!err) err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); } @@ -316,7 +316,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err) goto done; dst_dev = GET_DC_PHYSDEV( dc_dst, pBlendImage ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); if (err == ERROR_BAD_FORMAT) { @@ -341,7 +341,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err == ERROR_TRANSFORM_NOT_SUPPORTED && ((src->width != dst->width) || (src->height != dst->height))) { - memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( src_info, dst_info ); err = stretch_bits( src_info, src, dst_info, dst, &bits, COLORONCOLOR ); if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 8eba236..7cc24a6 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -184,6 +184,7 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * { /* bitfields are always at bmiColors even in larger structures */ memcpy( dst->bmiColors, info->bmiColors, 3 * sizeof(DWORD) ); + dst->bmiHeader.biClrUsed = 0; } else if (colors) { @@ -497,7 +498,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (clip) OffsetRgn( clip, dst.x - src.x, dst.y - src.y ); dev = GET_DC_PHYSDEV( dc, pPutImage ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, rop ); if (err == ERROR_BAD_FORMAT) { @@ -523,7 +524,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (err == ERROR_TRANSFORM_NOT_SUPPORTED) { - memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( src_info, dst_info ); err = stretch_bits( src_info, &src, dst_info, &dst, &src_bits, GetStretchBltMode( dev->hdc ) ); if (!err) err = dev->funcs->pPutImage( dev, 0, NULL, dst_info, &src_bits, &src, &dst, rop ); } @@ -678,7 +679,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, dst.width = dst.visrect.right - dst.visrect.left; dst.height = dst.visrect.bottom - dst.visrect.top; - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); if (err == ERROR_BAD_FORMAT) @@ -809,7 +810,7 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR if (clip) OffsetRgn( clip, dst.x - src.x, dst.y - src.y ); dev = GET_DC_PHYSDEV( dc, pPutImage ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); if (err == ERROR_BAD_FORMAT) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 93842a5..cc8022d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -482,6 +482,13 @@ static inline int get_dib_num_of_colors( const BITMAPINFO *info ) return info->bmiHeader.biBitCount > 8 ? 0 : 1 << info->bmiHeader.biBitCount; } +static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) +{ + unsigned int size = FIELD_OFFSET( BITMAPINFO, bmiColors[get_dib_num_of_colors( src )] ); + if (src->bmiHeader.biCompression == BI_BITFIELDS) size += 3 * sizeof(DWORD); + memcpy( dst, src, size ); +} + static inline const struct gdi_dc_funcs *get_bitmap_funcs( const BITMAPOBJ *bitmap ) { if( bitmap->dib ) return &dib_driver;

1 0

Henri Verbeet : wined3d: Get rid of the unused palette9 wined3d_surface field.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 6a981239db5f1fda895681c99d6d81c48c287c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a981239db5f1fda895681c99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 26 20:05:01 2011 +0200 wined3d: Get rid of the unused palette9 wined3d_surface field. --- dlls/wined3d/surface.c | 2 -- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 63c9e33..8bf61a9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -117,8 +117,6 @@ static void surface_cleanup(struct wined3d_surface *surface) overlay->overlay_dest = NULL; } - HeapFree(GetProcessHeap(), 0, surface->palette9); - resource_cleanup(&surface->resource); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3eeb6b..a398e3b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2012,7 +2012,6 @@ struct wined3d_surface const struct wined3d_surface_ops *surface_ops; struct wined3d_subresource_container container; struct wined3d_palette *palette; /* D3D7 style palette handling */ - PALETTEENTRY *palette9; /* D3D8/9 style palette handling */ DWORD draw_binding; DWORD flags;

1 0

Alexandre Julliard : gdi32: Implement the ExtTextOut entry point in the path driver.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: c441d5745238c6982efd05b812d3c685a4bedf05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c441d5745238c6982efd05b81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 16:56:18 2011 +0200 gdi32: Implement the ExtTextOut entry point in the path driver. --- dlls/gdi32/font.c | 40 ++++++++++++---------------------------- dlls/gdi32/gdi_private.h | 9 --------- dlls/gdi32/path.c | 35 +++++++++++++++++------------------ 3 files changed, 29 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c441d5745238c6982efd0…

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_surface_depth_blt_fbo() const.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 54dc38718b0a01952dd3a43fa4c50c03997b590e URL: http://source.winehq.org/git/wine.git/?a=commit;h=54dc38718b0a01952dd3a43fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 26 20:05:02 2011 +0200 wined3d: Make the device parameter to wined3d_surface_depth_blt_fbo() const. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8bf61a9..9e742ab 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1075,7 +1075,7 @@ static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RE return TRUE; } -static void wined3d_surface_depth_blt_fbo(struct wined3d_device *device, struct wined3d_surface *src_surface, +static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect) { const struct wined3d_gl_info *gl_info;

1 0

Ken Thomases : gdi32: Allow ~-based paths in HKCU\Software\Wine\Fonts:Path.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 14efc6eb2454988c595a91e946cc3a1cbb9c37ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=14efc6eb2454988c595a91e94… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 26 12:27:51 2011 -0500 gdi32: Allow ~-based paths in HKCU\Software\Wine\Fonts:Path. --- dlls/gdi32/freetype.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index dee97ad..c734ebf 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3115,9 +3115,19 @@ static void init_font_list(void) ptr = valueA; while (ptr) { + const char* home; LPSTR next = strchr( ptr, ':' ); if (next) *next++ = 0; - ReadFontDir( ptr, TRUE ); + if (ptr[0] == '~' && ptr[1] == '/' && (home = getenv( "HOME" )) && + (unixname = HeapAlloc( GetProcessHeap(), 0, strlen(ptr) + strlen(home) ))) + { + strcpy( unixname, home ); + strcat( unixname, ptr + 1 ); + ReadFontDir( unixname, TRUE ); + HeapFree( GetProcessHeap(), 0, unixname ); + } + else + ReadFontDir( ptr, TRUE ); ptr = next; } HeapFree( GetProcessHeap(), 0, valueA );

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (sql.h).
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 91c17c8399e48606599d3a23c63a595033c5e717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c17c8399e48606599d3a23c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 27 00:00:35 2011 +0200 include: Make "long" numeric constants LP64/LLP64 proof (sql.h). --- include/sql.h | 56 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/sql.h b/include/sql.h index 6b5218a..3140fcf 100644 --- a/include/sql.h +++ b/include/sql.h @@ -45,7 +45,7 @@ extern "C" { #define SQL_SUCCEEDED(rc) (((rc)&(~1))==0) #define SQL_NTS (-3) -#define SQL_NTSL (-3L) +#define SQL_NTSL (__MSABI_LONG(-3)) #define SQL_MAX_MESSAGE_LENGTH 512 @@ -240,7 +240,7 @@ extern "C" { #endif #if (ODBCVER >= 0x0300) -#define SQL_NULL_HANDLE 0L +#define SQL_NULL_HANDLE __MSABI_LONG(0) #endif #define SQL_SCOPE_CURROW 0 @@ -423,12 +423,12 @@ extern "C" { #endif #if (ODBCVER >= 0x0200) -#define SQL_AT_ADD_COLUMN 0x00000001L -#define SQL_AT_DROP_COLUMN 0x00000002L +#define SQL_AT_ADD_COLUMN __MSABI_LONG(0x00000001) +#define SQL_AT_DROP_COLUMN __MSABI_LONG(0x00000002) #endif #if (ODBCVER >= 0x0300) -#define SQL_AT_ADD_CONSTRAINT 0x00000008L +#define SQL_AT_ADD_CONSTRAINT __MSABI_LONG(0x00000008) #endif /* ODBCVER >= 0x0300 */ @@ -443,15 +443,15 @@ extern "C" { #define SQL_CB_CLOSE 1 #define SQL_CB_PRESERVE 2 -#define SQL_FD_FETCH_NEXT 0x00000001L -#define SQL_FD_FETCH_FIRST 0x00000002L -#define SQL_FD_FETCH_LAST 0x00000004L -#define SQL_FD_FETCH_PRIOR 0x00000008L -#define SQL_FD_FETCH_ABSOLUTE 0x00000010L -#define SQL_FD_FETCH_RELATIVE 0x00000020L +#define SQL_FD_FETCH_NEXT __MSABI_LONG(0x00000001) +#define SQL_FD_FETCH_FIRST __MSABI_LONG(0x00000002) +#define SQL_FD_FETCH_LAST __MSABI_LONG(0x00000004) +#define SQL_FD_FETCH_PRIOR __MSABI_LONG(0x00000008) +#define SQL_FD_FETCH_ABSOLUTE __MSABI_LONG(0x00000010) +#define SQL_FD_FETCH_RELATIVE __MSABI_LONG(0x00000020) -#define SQL_GD_ANY_COLUMN 0x00000001L -#define SQL_GD_ANY_ORDER 0x00000002L +#define SQL_GD_ANY_COLUMN __MSABI_LONG(0x00000001) +#define SQL_GD_ANY_ORDER __MSABI_LONG(0x00000002) #define SQL_IC_UPPER 1 #define SQL_IC_LOWER 2 @@ -459,19 +459,19 @@ extern "C" { #define SQL_IC_MIXED 4 #if (ODBCVER >= 0x0201) -#define SQL_OJ_LEFT 0x00000001L -#define SQL_OJ_RIGHT 0x00000002L -#define SQL_OJ_FULL 0x00000004L -#define SQL_OJ_NESTED 0x00000008L -#define SQL_OJ_NOT_ORDERED 0x00000010L -#define SQL_OJ_INNER 0x00000020L -#define SQL_OJ_ALL_COMPARISON_OPS 0x00000040L +#define SQL_OJ_LEFT __MSABI_LONG(0x00000001) +#define SQL_OJ_RIGHT __MSABI_LONG(0x00000002) +#define SQL_OJ_FULL __MSABI_LONG(0x00000004) +#define SQL_OJ_NESTED __MSABI_LONG(0x00000008) +#define SQL_OJ_NOT_ORDERED __MSABI_LONG(0x00000010) +#define SQL_OJ_INNER __MSABI_LONG(0x00000020) +#define SQL_OJ_ALL_COMPARISON_OPS __MSABI_LONG(0x00000040) #endif -#define SQL_SCCO_READ_ONLY 0x00000001L -#define SQL_SCCO_LOCK 0x00000002L -#define SQL_SCCO_OPT_ROWVER 0x00000004L -#define SQL_SCCO_OPT_VALUES 0x00000008L +#define SQL_SCCO_READ_ONLY __MSABI_LONG(0x00000001) +#define SQL_SCCO_LOCK __MSABI_LONG(0x00000002) +#define SQL_SCCO_OPT_ROWVER __MSABI_LONG(0x00000004) +#define SQL_SCCO_OPT_VALUES __MSABI_LONG(0x00000008) #define SQL_TC_NONE 0 #define SQL_TC_DML 1 @@ -479,13 +479,13 @@ extern "C" { #define SQL_TC_DDL_COMMIT 3 #define SQL_TC_DDL_IGNORE 4 -#define SQL_TXN_READ_UNCOMMITTED 0x00000001L +#define SQL_TXN_READ_UNCOMMITTED __MSABI_LONG(0x00000001) #define SQL_TRANSACTION_READ_UNCOMMITTED SQL_TXN_READ_UNCOMMITTED -#define SQL_TXN_READ_COMMITTED 0x00000002L +#define SQL_TXN_READ_COMMITTED __MSABI_LONG(0x00000002) #define SQL_TRANSACTION_READ_COMMITTED SQL_TXN_READ_COMMITTED -#define SQL_TXN_REPEATABLE_READ 0x00000004L +#define SQL_TXN_REPEATABLE_READ __MSABI_LONG(0x00000004) #define SQL_TRANSACTION_REPEATABLE_READ SQL_TXN_REPEATABLE_READ -#define SQL_TXN_SERIALIZABLE 0x00000008L +#define SQL_TXN_SERIALIZABLE __MSABI_LONG(0x00000008) #define SQL_TRANSACTION_SERIALIZABLE SQL_TXN_SERIALIZABLE #define SQL_NC_HIGH 0

1 0

Michael Stefaniuc : include: Add a macro to paper over LP64/ LLP64 differences for numeric constants.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 1b2f89e673e7866b1753496f5f7a3126fabdb134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2f89e673e7866b1753496f5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 26 23:45:45 2011 +0200 include: Add a macro to paper over LP64/LLP64 differences for numeric constants. Based on an idea by Kai Tietz. --- include/winnt.h | 173 +++++++++++++++++++++++++++++-------------------------- 1 files changed, 91 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b2f89e673e7866b17534…

1 0

Michael Stefaniuc : include: Drop the 'l' modifier from some numeric constants in winnt.h.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: c5441514bc337fa3daf831a8e3cd6f0ad1c95c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5441514bc337fa3daf831a8e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 26 23:43:22 2011 +0200 include: Drop the 'l' modifier from some numeric constants in winnt.h. --- include/winnt.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index f8adbcb..541d2d0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -861,9 +861,9 @@ typedef struct _CONTEXT #define CONTEXT_CONTROL (CONTEXT_i386 | 0x0001) /* SS:SP, CS:IP, FLAGS, BP */ #define CONTEXT_INTEGER (CONTEXT_i386 | 0x0002) /* AX, BX, CX, DX, SI, DI */ #define CONTEXT_SEGMENTS (CONTEXT_i386 | 0x0004) /* DS, ES, FS, GS */ -#define CONTEXT_FLOATING_POINT (CONTEXT_i386 | 0x0008L) /* 387 state */ -#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | 0x0010L) /* DB 0-3,6,7 */ -#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386 | 0x0020L) +#define CONTEXT_FLOATING_POINT (CONTEXT_i386 | 0x0008) /* 387 state */ +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | 0x0010) /* DB 0-3,6,7 */ +#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386 | 0x0020) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | \ CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | CONTEXT_EXTENDED_REGISTERS) @@ -907,8 +907,8 @@ typedef struct _LDT_ENTRY { #define CONTEXT_CONTROL (CONTEXT_AMD64 | 0x0001) #define CONTEXT_INTEGER (CONTEXT_AMD64 | 0x0002) #define CONTEXT_SEGMENTS (CONTEXT_AMD64 | 0x0004) -#define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | 0x0008L) -#define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x0010L) +#define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | 0x0008) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x0010) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) @@ -1436,9 +1436,9 @@ ULONGLONG WINAPI RtlVirtualUnwind(ULONGLONG,ULONGLONG,RUNTIME_FUNCTION*,CONTEXT* #define CONTEXT_ALPHA 0x00020000 -#define CONTEXT_CONTROL (CONTEXT_ALPHA | 0x00000001L) -#define CONTEXT_FLOATING_POINT (CONTEXT_ALPHA | 0x00000002L) -#define CONTEXT_INTEGER (CONTEXT_ALPHA | 0x00000004L) +#define CONTEXT_CONTROL (CONTEXT_ALPHA | 0x00000001) +#define CONTEXT_FLOATING_POINT (CONTEXT_ALPHA | 0x00000002) +#define CONTEXT_INTEGER (CONTEXT_ALPHA | 0x00000004) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) #define EXCEPTION_READ_FAULT 0 @@ -1536,8 +1536,8 @@ typedef struct _CONTEXT /* The following flags control the contents of the CONTEXT structure. */ #define CONTEXT_ARM 0x0000040 -#define CONTEXT_CONTROL (CONTEXT_ARM | 0x00000001L) -#define CONTEXT_INTEGER (CONTEXT_ARM | 0x00000002L) +#define CONTEXT_CONTROL (CONTEXT_ARM | 0x00000001) +#define CONTEXT_INTEGER (CONTEXT_ARM | 0x00000002) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) @@ -4738,9 +4738,9 @@ typedef struct _QUOTA_LIMITS_EX { #define DUPLICATE_SAME_ACCESS 0x00000002 /* File attribute flags */ -#define FILE_SHARE_READ 0x00000001L -#define FILE_SHARE_WRITE 0x00000002L -#define FILE_SHARE_DELETE 0x00000004L +#define FILE_SHARE_READ 0x00000001 +#define FILE_SHARE_WRITE 0x00000002 +#define FILE_SHARE_DELETE 0x00000004 #define FILE_ATTRIBUTE_READONLY 0x00000001 #define FILE_ATTRIBUTE_HIDDEN 0x00000002

1 0