October 2011 - Wine-commits

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

27 Oct '11

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

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

27 Oct '11

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

Henri Verbeet : wined3d: Recognize Sumo/Llano in select_card_amd_mesa().
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 2f74d5052ac9d1fef226c57c70caf61d86c20e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f74d5052ac9d1fef226c57c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 26 20:04:59 2011 +0200 wined3d: Recognize Sumo/Llano in select_card_amd_mesa(). --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f6228eb..6d282d9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1181,6 +1181,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5900, "ATI Radeon HD 5900 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6300, "AMD Radeon HD 6300 series Graphics", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6400, "AMD Radeon HD 6400 Series", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6410D, "AMD Radeon HD 6410D", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6550D, "AMD Radeon HD 6550D", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, @@ -1857,6 +1859,8 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info {"CAYMAN", CARD_AMD_RADEON_HD6900}, {"BARTS", CARD_AMD_RADEON_HD6800}, {"TURKS", CARD_AMD_RADEON_HD6600}, + {"SUMO2", CARD_AMD_RADEON_HD6410D}, /* SUMO2 first, because we do a strstr(). */ + {"SUMO", CARD_AMD_RADEON_HD6550D}, {"CAICOS", CARD_AMD_RADEON_HD6400}, {"PALM", CARD_AMD_RADEON_HD6300}, /* Evergreen */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9b510c4..e3eeb6b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1344,6 +1344,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD5900 = 0x689c, CARD_AMD_RADEON_HD6300 = 0x9803, CARD_AMD_RADEON_HD6400 = 0x6770, + CARD_AMD_RADEON_HD6410D = 0x9644, + CARD_AMD_RADEON_HD6550D = 0x9640, CARD_AMD_RADEON_HD6600 = 0x6758, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719,

1 0

Henri Verbeet : secur32: Print the ntlm_auth diagnostic message to the winediag channel.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 0dd54eb0fdab5bec147dd03bfa756353d46172d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd54eb0fdab5bec147dd03bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 26 20:05:00 2011 +0200 secur32: Print the ntlm_auth diagnostic message to the winediag channel. --- dlls/secur32/ntlm.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index c842a12..f865158 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -34,6 +34,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ntlm); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #define NTLM_MAX_BUF 1904 #define MIN_NTLM_AUTH_MAJOR_VERSION 3 @@ -2051,14 +2052,13 @@ void SECUR32_initNTLMSP(void) } else { - ERR("%s was not found or is outdated. " - "Make sure that ntlm_auth >= %d.%d.%d is in your path.\n", - ntlm_auth, - MIN_NTLM_AUTH_MAJOR_VERSION, - MIN_NTLM_AUTH_MINOR_VERSION, - MIN_NTLM_AUTH_MICRO_VERSION); - ERR("Usually, you can find it in the winbind package of your " - "distribution.\n"); + ERR_(winediag)("%s was not found or is outdated. " + "Make sure that ntlm_auth >= %d.%d.%d is in your path. " + "Usually, you can find it in the winbind package of your distribution.\n", + ntlm_auth, + MIN_NTLM_AUTH_MAJOR_VERSION, + MIN_NTLM_AUTH_MINOR_VERSION, + MIN_NTLM_AUTH_MICRO_VERSION); } cleanup_helper(helper);

1 0

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

27 Oct '11

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

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

27 Oct '11

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

Henri Verbeet : wined3d: Make the device parameter to surface_blt_fbo() const.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 22d2d26ffc14821349f8b1fcacab2b144bd2d6a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d2d26ffc14821349f8b1fca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 26 20:05:03 2011 +0200 wined3d: Make the device parameter to surface_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 9e742ab..0bee46d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1171,7 +1171,7 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s /* Blit between surface locations. Onscreen on different swapchains is not supported. * Depth / stencil is not supported. */ -static void surface_blt_fbo(struct wined3d_device *device, const WINED3DTEXTUREFILTERTYPE filter, +static void surface_blt_fbo(const struct wined3d_device *device, const WINED3DTEXTUREFILTERTYPE filter, struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect_in, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect_in) {

1 0

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

27 Oct '11

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

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

27 Oct '11

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: Make "long" numeric constants LP64/ LLP64 proof (d3d9caps.h).
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: ee30e087e1d0e233d81b86ec591f52239d1210a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee30e087e1d0e233d81b86ec5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 26 23:47:59 2011 +0200 include: Make "long" numeric constants LP64/LLP64 proof (d3d9caps.h). --- include/d3d9caps.h | 182 ++++++++++++++++++++++++++-------------------------- 1 files changed, 91 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee30e087e1d0e233d81b8…

1 0