January 2014 - Wine-commits

Akihiro Sagawa : gdi32: Fix DBCS mask value in GetFontLanguageInfo.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 142a0f7af0585223251d533f4b5b061831c85a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142a0f7af0585223251d533f4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jan 9 21:07:43 2014 +0900 gdi32: Fix DBCS mask value in GetFontLanguageInfo. --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fcb024b..0dfd5b1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3023,7 +3023,7 @@ BOOL WINAPI TranslateCharsetInfo( DWORD WINAPI GetFontLanguageInfo(HDC hdc) { FONTSIGNATURE fontsig; - static const DWORD GCP_DBCS_MASK=FS_THAI|FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB, + static const DWORD GCP_DBCS_MASK=FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB, GCP_DIACRITIC_MASK=0x00000000, FLI_GLYPHS_MASK=0x00000000, GCP_GLYPHSHAPE_MASK=FS_ARABIC,

1 0

Akihiro Sagawa : gdi32: Relax vertical face requirements.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: ebccff822576cbff2b4401c74d83912d637a7026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebccff822576cbff2b4401c74… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jan 9 21:07:45 2014 +0900 gdi32: Relax vertical face requirements. --- dlls/gdi32/freetype.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fda54aa..4be2978 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2148,6 +2148,9 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ #endif /* HAVE_CARBON_CARBON_H */ do { + const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB; + FONTSIGNATURE fs; + ft_face = new_ft_face( file, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ); if (!ft_face) return 0; @@ -2161,7 +2164,8 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags); ++ret; - if (FT_HAS_VERTICAL(ft_face)) + get_fontsig(ft_face, &fs); + if (fs.fsCsb[0] & FS_DBCS_MASK) { AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags | ADDFONT_VERTICAL_FONT);

1 0

Alexandre Julliard : ntdll/tests: Fix a test that fails on Win2k.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 406587898f4bc077d4e2e353ab73998bf2baadaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=406587898f4bc077d4e2e353a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 9 16:01:59 2014 +0100 ntdll/tests: Fix a test that fails on Win2k. --- dlls/ntdll/tests/string.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 7b56691..56b7584 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1281,12 +1281,15 @@ static void test__snprintf(void) int res; res = p__snprintf(NULL, 0, teststring); - ok(res == lstrlenA(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); - - res = p__snprintf(NULL, 1, teststring); - ok(res == lstrlenA(teststring) /* WinXP */ || res < 0 /* Vista and greater */, - "_snprintf returned %d, expected %d or < 0.\n", res, lstrlenA(teststring)); + ok(res == lstrlenA(teststring) || broken(res == -1) /* <= w2k */, + "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); + if (res != -1) + { + res = p__snprintf(NULL, 1, teststring); + ok(res == lstrlenA(teststring) /* WinXP */ || res < 0 /* Vista and greater */, + "_snprintf returned %d, expected %d or < 0.\n", res, lstrlenA(teststring)); + } res = p__snprintf(buffer, strlen(teststring) - 1, teststring); ok(res < 0, "_snprintf returned %d, expected < 0.\n", res);

1 0

Alexandre Julliard : gdi32/tests: Don't test unreliable palette entries.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: eba26475fb49fc59f05562bbe4993097c70cd8d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba26475fb49fc59f05562bbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 9 16:02:14 2014 +0100 gdi32/tests: Don't test unreliable palette entries. --- dlls/gdi32/tests/palette.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 71da6f9..f95c0d3 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -162,10 +162,10 @@ static void test_halftone_palette(void) ok( count == 256 || broken(count <= 20), /* nt 4 */ "wrong size %u\n", count ); - /* first and last 10 match the default palette */ + /* first and last 8 match the default palette */ if (count >= 20) { - for (i = 0; i < 10; i++) + for (i = 0; i < 8; i++) { ok( entries[i].peRed == defpal[i].peRed && entries[i].peGreen == defpal[i].peGreen && @@ -175,7 +175,7 @@ static void test_halftone_palette(void) entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue ); } - for (i = count - 10; i < count; i++) + for (i = count - 8; i < count; i++) { int idx = i - count + 20; ok( entries[i].peRed == defpal[idx].peRed &&

1 0

Alexandre Julliard : gdi32/tests: Run all DIB tests with a hardcoded palette.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: d1463cc44b79df3242c6bff9ee00a280c1eba43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1463cc44b79df3242c6bff9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 9 17:05:20 2014 +0100 gdi32/tests: Run all DIB tests with a hardcoded palette. --- dlls/gdi32/tests/dib.c | 213 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 172 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1463cc44b79df3242c6b…

1 0

Stefan Dösinger : wined3d: Remove SFLAG_USERPTR.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: db6d3c500ca5d69f49756b69777f09190e6bc498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6d3c500ca5d69f49756b697… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 9 13:43:20 2014 +0100 wined3d: Remove SFLAG_USERPTR. --- dlls/wined3d/surface.c | 14 +++++--------- dlls/wined3d/wined3d_private.h | 22 ++++++++++------------ 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 60539c0..f3bb04c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -604,7 +604,8 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { - if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE)) + if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE) + || surface->user_memory) return; wined3d_resource_free_sysmem(&surface->resource); @@ -2715,7 +2716,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, create_dib = TRUE; } - surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_USERPTR); + surface->flags &= ~SFLAG_LOCATIONS; surface->resource.allocatedMemory = NULL; wined3d_resource_free_sysmem(&surface->resource); @@ -2741,13 +2742,8 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, else surface->flags &= ~SFLAG_NONPOW2; - if (mem) - { - surface->user_memory = mem; - surface->flags |= SFLAG_USERPTR; - } + surface->user_memory = mem; surface->pitch = pitch; - surface->resource.format = format; surface->resource.multisample_type = multisample_type; surface->resource.multisample_quality = multisample_quality; @@ -3220,7 +3216,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) return WINED3DERR_INVALIDCALL; /* Use the DIB section from now on if we are not using a PBO or user memory. */ - if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM | SFLAG_USERPTR))) + if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM) || surface->user_memory)) { wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f8109bc..c10f120 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2294,17 +2294,16 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ #define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ -#define SFLAG_USERPTR 0x00000800 /* The application allocated the memory for this surface. */ -#define SFLAG_ALLOCATED 0x00001000 /* A GL texture is allocated for this surface. */ -#define SFLAG_SRGBALLOCATED 0x00002000 /* A sRGB GL texture is allocated for this surface. */ -#define SFLAG_PBO 0x00004000 /* The surface has a PBO. */ -#define SFLAG_INSYSMEM 0x00008000 /* The system memory copy is current. */ -#define SFLAG_INTEXTURE 0x00010000 /* The GL texture is current. */ -#define SFLAG_INSRGBTEX 0x00020000 /* The GL sRGB texture is current. */ -#define SFLAG_INDRAWABLE 0x00040000 /* The GL drawable is current. */ -#define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ -#define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ -#define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_ALLOCATED 0x00000800 /* A GL texture is allocated for this surface. */ +#define SFLAG_SRGBALLOCATED 0x00001000 /* A sRGB GL texture is allocated for this surface. */ +#define SFLAG_PBO 0x00002000 /* The surface has a PBO. */ +#define SFLAG_INSYSMEM 0x00004000 /* The system memory copy is current. */ +#define SFLAG_INTEXTURE 0x00008000 /* The GL texture is current. */ +#define SFLAG_INSRGBTEX 0x00010000 /* The GL sRGB texture is current. */ +#define SFLAG_INDRAWABLE 0x00020000 /* The GL drawable is current. */ +#define SFLAG_INRB_MULTISAMPLE 0x00040000 /* The multisample renderbuffer is current. */ +#define SFLAG_INRB_RESOLVED 0x00080000 /* The resolved renderbuffer is current. */ +#define SFLAG_DISCARDED 0x00100000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long @@ -2317,7 +2316,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D SFLAG_DYNLOCK | \ SFLAG_CLIENT | \ SFLAG_DIBSECTION | \ - SFLAG_USERPTR | \ SFLAG_PBO | \ SFLAG_PIN_SYSMEM)

1 0

Stefan Dösinger : wined3d: Mark the system location up to date in the DIB recreation codepath.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 441d8ffeb2dc409462e15f12b1fc8043a27196f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441d8ffeb2dc409462e15f12b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 9 13:43:21 2014 +0100 wined3d: Mark the system location up to date in the DIB recreation codepath. --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f3bb04c..a7c9d5c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2760,6 +2760,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, return hr; } surface->resource.allocatedMemory = surface->dib.bitmap_data; + surface->flags |= SFLAG_INSYSMEM; } else if (!surface_init_sysmem(surface)) return E_OUTOFMEMORY;

1 0

Stefan Dösinger : wined3d: GL_NV_vertex_program2_option supports relative offsets > 63.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: bffd5362138cd4963005d4fe008c321596a24587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffd5362138cd4963005d4fe0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 9 13:43:22 2014 +0100 wined3d: GL_NV_vertex_program2_option supports relative offsets > 63. The ARR codepath used if ctx->target_version >= NV2 does not account for the correction offset, but the indirect addressing reads do, which ultimately results in incorrect offsets. Since the limitation goes away as soon as we enable GL_NV_vertex_program_2_option ignoring the offset is the best thing to do. I don't set shader_data->rel_offset to zero in the pre-compilation analysis because enablding NV_vertex_program2 is in theory a decision that is taken later during code generation. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a1bb3e6..ff4345f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1119,7 +1119,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction if (!pshader && reg->idx[0].rel_addr) { const struct arb_vshader_private *shader_data = shader->backend_data; - UINT rel_offset = shader_data->rel_offset; + UINT rel_offset = ctx->target_version == ARB ? shader_data->rel_offset : 0; BOOL aL = FALSE; char rel_reg[50]; if (reg_maps->shader_version.major < 2) @@ -1849,7 +1849,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) const struct arb_vshader_private *shader_data = shader->backend_data; src0_param[0] = '\0'; - if (shader_data->rel_offset) + if (shader_data->rel_offset && ctx->target_version == ARB) { const char *offset = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_VS_REL_OFFSET); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_param);

1 0

Dmitry Timoshkov : cabarc: Fix printing of a not recognized compression type argument.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: dcc057c686dce5b1cc492825091bfbaddeff3f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc057c686dce5b1cc4928250… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 9 22:32:44 2014 +0900 cabarc: Fix printing of a not recognized compression type argument. --- programs/cabarc/cabarc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 032aab2..c49796d 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -666,7 +666,8 @@ int wmain( int argc, WCHAR *argv[] ) else if (!strcmpiW( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; else { - WINE_MESSAGE( "cabarc: Unknown compression type '%s'\n", optarg ); + char *arg = strdupWtoA( CP_ACP, argv[1] ); + WINE_MESSAGE( "cabarc: Unknown compression type '%s'\n", arg); return 1; } break;

1 0

Erich E. Hoover : ddraw: Make DirectDrawEnumerateEx only enumerate secondary display devices when requested.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 639f9335c2405832b9962a4bc5b95b053bf596a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639f9335c2405832b9962a4bc… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Jan 8 15:02:28 2014 -0700 ddraw: Make DirectDrawEnumerateEx only enumerate secondary display devices when requested. --- dlls/ddraw/main.c | 61 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e613126..2e61b0c 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -59,6 +59,36 @@ static HRESULT CALLBACK enum_callback(GUID *guid, char *description, char *drive return info->callback(guid, description, driver_name, info->context); } +static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMCALLBACKEXA callback, + void *context) +{ + static CHAR driver_desc[] = "DirectDraw HAL"; + struct wined3d_adapter_identifier adapter_id; + BOOL cont_enum = TRUE; + HRESULT hr = S_OK; + UINT adapter = 0; + + for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) + { + char DriverName[512] = ""; + + /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the + * Driver Name, so obtain the DeviceName and GUID from D3D. */ + memset(&adapter_id, 0x0, sizeof(adapter_id)); + adapter_id.device_name = DriverName; + adapter_id.device_name_size = sizeof(DriverName); + wined3d_mutex_lock(); + hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); + wined3d_mutex_unlock(); + if (SUCCEEDED(hr)) + { + TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); + cont_enum = callback(&adapter_id.device_identifier, driver_desc, adapter_id.device_name, + context, 0); + } + } +} + /* Handle table functions */ BOOL ddraw_handle_table_init(struct ddraw_handle_table *t, UINT initial_size) { @@ -373,8 +403,8 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex DDENUM_NONDISPLAYDEVICES)) return DDERR_INVALIDPARAMS; - if (flags) - FIXME("flags 0x%08x not handled\n", flags); + if (flags & ~DDENUM_ATTACHEDSECONDARYDEVICES) + FIXME("flags 0x%08x not handled\n", flags & ~DDENUM_ATTACHEDSECONDARYDEVICES); TRACE("Enumerating ddraw interfaces\n"); if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) @@ -393,33 +423,14 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex /* QuickTime expects the description "DirectDraw HAL" */ static CHAR driver_desc[] = "DirectDraw HAL", driver_name[] = "display"; - struct wined3d_adapter_identifier adapter_id; - HRESULT hr = S_OK; - UINT adapter = 0; BOOL cont_enum; - /* The Battle.net System Checker expects both a NULL device and a GUID-based device */ TRACE("Default interface: DirectDraw HAL\n"); cont_enum = callback(NULL, driver_desc, driver_name, context, 0); - for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) - { - char DriverName[512] = ""; - - /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the - * Driver Name, so obtain the DeviceName and GUID from D3D. */ - memset(&adapter_id, 0x0, sizeof(adapter_id)); - adapter_id.device_name = DriverName; - adapter_id.device_name_size = sizeof(DriverName); - wined3d_mutex_lock(); - hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); - wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); - cont_enum = callback(&adapter_id.device_identifier, driver_desc, - adapter_id.device_name, context, 0); - } - } + + /* The Battle.net System Checker expects both a NULL device and a GUID-based device */ + if (cont_enum && (flags & ~DDENUM_ATTACHEDSECONDARYDEVICES)) + ddraw_enumerate_secondary_devices(wined3d, callback, context); } __EXCEPT_PAGE_FAULT {

1 0