June 2016 - Wine-Commits - list.winehq.org

Huw Davies : gdi32: If the WMF was created by GetWinMetaFileBits() then return the original EMF.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: 19d1416ceff5ebd47a7a41196cf5629d9925fee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d1416ceff5ebd47a7a41196… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 8 11:00:46 2016 +0100 gdi32: If the WMF was created by GetWinMetaFileBits() then return the original EMF. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 21 +++++++++++++++++ dlls/gdi32/metafile.c | 22 +----------------- dlls/gdi32/tests/metafile.c | 22 +++++++++++++++--- 4 files changed, 97 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 17ccd1f..c251b4e 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2686,6 +2686,59 @@ UINT WINAPI GetEnhMetaFilePaletteEntries( HENHMETAFILE hEmf, return infoForCallBack.cEntries; } +/****************************************************************** + * extract_emf_from_comment + * + * If the WMF was created by GetWinMetaFileBits, then extract the + * original EMF that is stored in MFCOMMENT chunks. + */ +static HENHMETAFILE extract_emf_from_comment( const BYTE *buf, UINT mf_size ) +{ + METAHEADER *mh = (METAHEADER *)buf; + METARECORD *mr; + emf_in_wmf_comment *chunk; + WORD checksum = 0; + DWORD size = 0, remaining, chunks; + BYTE *emf_bits = NULL, *ptr; + UINT offset; + HENHMETAFILE emf = NULL; + + if (mf_size < sizeof(*mh)) return NULL; + + for (offset = mh->mtHeaderSize * 2; offset < mf_size; offset += (mr->rdSize * 2)) + { + mr = (METARECORD *)((char *)mh + offset); + chunk = (emf_in_wmf_comment *)(mr->rdParm + 2); + + if (mr->rdFunction != META_ESCAPE || mr->rdParm[0] != MFCOMMENT) goto done; + if (chunk->magic != WMFC_MAGIC) goto done; + + if (!emf_bits) + { + size = remaining = chunk->emf_size; + chunks = chunk->num_chunks; + emf_bits = ptr = HeapAlloc( GetProcessHeap(), 0, size ); + if (!emf_bits) goto done; + } + if (chunk->chunk_size > remaining) goto done; + remaining -= chunk->chunk_size; + if (chunk->remaining_size != remaining) goto done; + memcpy( ptr, chunk->emf_data, chunk->chunk_size ); + ptr += chunk->chunk_size; + if (--chunks == 0) break; + } + + for (offset = 0; offset < mf_size / 2; offset++) + checksum += *((WORD *)buf + offset); + if (checksum) goto done; + + emf = SetEnhMetaFileBits( size, emf_bits ); + +done: + HeapFree( GetProcessHeap(), 0, emf_bits ); + return emf; +} + typedef struct gdi_mf_comment { DWORD ident; @@ -2722,6 +2775,9 @@ HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, const BYTE *lpbBuffer, HDC return NULL; } + ret = extract_emf_from_comment( lpbBuffer, cbBuffer ); + if (ret) return ret; + if(!hdcRef) hdcRef = hdcdisp = CreateDCW(szDisplayW, NULL, NULL, NULL); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index cde9867..08a5d3b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -311,6 +311,27 @@ extern void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; extern METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mr, LPCVOID filename, BOOL unicode ) DECLSPEC_HIDDEN; +/* Format of comment record added by GetWinMetaFileBits */ +#include <pshpack2.h> +typedef struct +{ + DWORD magic; /* WMFC */ + WORD unk04; /* 1 */ + WORD unk06; /* 0 */ + WORD unk08; /* 0 */ + WORD unk0a; /* 1 */ + WORD checksum; + DWORD unk0e; /* 0 */ + DWORD num_chunks; + DWORD chunk_size; + DWORD remaining_size; + DWORD emf_size; + BYTE emf_data[1]; +} emf_in_wmf_comment; +#include <poppack.h> + +#define WMFC_MAGIC 0x43464d57 + /* path.c */ extern void free_gdi_path( struct gdi_path *path ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 925d648..c7e25a7 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1114,26 +1114,6 @@ UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) return mfSize; } -#include <pshpack2.h> -typedef struct -{ - DWORD magic; /* WMFC */ - WORD unk04; /* 1 */ - WORD unk06; /* 0 */ - WORD unk08; /* 0 */ - WORD unk0a; /* 1 */ - WORD checksum; - DWORD unk0e; /* 0 */ - DWORD num_chunks; - DWORD chunk_size; - DWORD remaining_size; - DWORD emf_size; - BYTE emf_data[1]; -} emf_in_wmf_comment; -#include <poppack.h> - -static const DWORD wmfc_magic = 0x43464d57; - /****************************************************************** * add_mf_comment * @@ -1158,7 +1138,7 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) chunk = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(emf_in_wmf_comment, emf_data[max_chunk_size])); if(!chunk) goto end; - chunk->magic = wmfc_magic; + chunk->magic = WMFC_MAGIC; chunk->unk04 = 1; chunk->unk06 = 0; chunk->unk08 = 0; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 9a5c1a5..79f072b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3249,16 +3249,17 @@ static BOOL near_match(int x, int y) static void getwinmetafilebits(UINT mode, int scale, RECT *rc) { - HENHMETAFILE emf; + HENHMETAFILE emf, emf2; HDC display_dc, emf_dc; - ENHMETAHEADER *enh_header; - UINT size, emf_size, i; + ENHMETAHEADER *enh_header, *enh2_header; + UINT size, emf_size, i, emf2_size; WORD check = 0; DWORD rec_num = 0; METAHEADER *mh = NULL; METARECORD *rec; INT horz_res, vert_res, horz_size, vert_size; INT curve_caps, line_caps, poly_caps; + METAFILEPICT mfp; display_dc = GetDC(NULL); ok(display_dc != NULL, "display_dc is NULL\n"); @@ -3401,6 +3402,21 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) rec = (METARECORD*)((WORD*)rec + rec->rdSize); } + /* Show that we get the original back when we do the reverse conversion. + mfp is ignored in this case. */ + mfp.mm = MM_ISOTROPIC; + mfp.xExt = 0xcafe; + mfp.yExt = 0xbeef; + emf2 = SetWinMetaFileBits( size, (BYTE*)mh, NULL, &mfp ); + ok( !!emf2, "got NULL\n" ); + emf2_size = GetEnhMetaFileBits( emf2, 0, NULL ); + enh2_header = HeapAlloc( GetProcessHeap(), 0, emf2_size ); + emf2_size = GetEnhMetaFileBits( emf2, emf2_size, (BYTE*)enh2_header ); + ok( emf_size == emf2_size, "%d %d\n", emf_size, emf2_size ); + ok( !memcmp( enh_header, enh2_header, emf_size ), "mismatch\n" ); + HeapFree( GetProcessHeap(), 0, enh2_header ); + DeleteEnhMetaFile( emf2 ); + end: HeapFree(GetProcessHeap(), 0, mh); HeapFree(GetProcessHeap(), 0, enh_header);

1 0

Michael Stefaniuc : comctl32/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: 96185e23b4ed64d89a420eb5bc6ba49926dde201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96185e23b4ed64d89a420eb5b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 12:28:46 2016 +0200 comctl32/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/header.c | 4 ++-- dlls/comctl32/tests/progress.c | 12 ++++-------- dlls/comctl32/tests/rebar.c | 9 ++++----- dlls/comctl32/tests/status.c | 5 ++--- dlls/comctl32/tests/toolbar.c | 4 ++-- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index c828465..5c35b60 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1350,8 +1350,8 @@ static void test_hds_nosizing(HWND hParent) ok(nm->lItemlParam == lparam, "Invalid lItemlParam %d vs %ld\n", lparam, nm->lItemlParam); \ ok((nm->rc.top == _top && nm->rc.bottom == _bottom && nm->rc.left == _left && nm->rc.right == _right) || \ broken(draw_stage != CDDS_ITEMPREPAINT), /* comctl32 < 5.80 */ \ - "Invalid rect (%d,%d) (%d,%d) vs (%d,%d) (%d,%d)\n", _left, _top, _right, _bottom, \ - nm->rc.left, nm->rc.top, nm->rc.right, nm->rc.bottom); + "Invalid rect (%d,%d)-(%d,%d) vs %s\n", _left, _top, _right, _bottom, \ + wine_dbgstr_rect(&nm->rc)); static LRESULT customdraw_1(int n, NMCUSTOMDRAW *nm) { diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index f7ae328..7f69c35 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -206,10 +206,8 @@ static void test_redraw(void) SetRectEmpty(&last_paint_rect); SendMessageA(hProgressWnd, PBM_SETPOS, 10, 0); GetClientRect(hProgressWnd, &client_rect); - ok(EqualRect(&last_paint_rect, &client_rect), - "last_paint_rect was { %d, %d, %d, %d } instead of { %d, %d, %d, %d }\n", - last_paint_rect.left, last_paint_rect.top, last_paint_rect.right, last_paint_rect.bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + ok(EqualRect(&last_paint_rect, &client_rect), "last_paint_rect was %s instead of %s\n", + wine_dbgstr_rect(&last_paint_rect), wine_dbgstr_rect(&client_rect)); update_window(hProgressWnd); ok(!erased, "Progress bar shouldn't have erased the background\n"); @@ -218,10 +216,8 @@ static void test_redraw(void) SetRectEmpty(&last_paint_rect); SendMessageA(hProgressWnd, PBM_SETPOS, 0, 0); GetClientRect(hProgressWnd, &client_rect); - ok(EqualRect(&last_paint_rect, &client_rect), - "last_paint_rect was { %d, %d, %d, %d } instead of { %d, %d, %d, %d }\n", - last_paint_rect.left, last_paint_rect.top, last_paint_rect.right, last_paint_rect.bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + ok(EqualRect(&last_paint_rect, &client_rect), "last_paint_rect was %s instead of %s\n", + wine_dbgstr_rect(&last_paint_rect), wine_dbgstr_rect(&client_rect)); update_window(hProgressWnd); ok(erased, "Progress bar should have erased the background\n"); } diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 0c3e2dd..6430ba2 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -36,14 +36,13 @@ static int system_font_height; #define check_rect(name, val, exp) ok(EqualRect(&val, &exp), \ - "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d)\n", \ - val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom); + "invalid rect (" name ") %s - expected %s\n", wine_dbgstr_rect(&val), wine_dbgstr_rect(&exp)); #define check_rect_no_top(name, val, exp) { \ ok((val.bottom - val.top == exp.bottom - exp.top) && \ - val.left == exp.left && val.right == exp.right, "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d), ignoring top\n", \ - val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom); \ - } + val.left == exp.left && val.right == exp.right, \ + "invalid rect (" name ") %s - expected %s, ignoring top\n", \ + wine_dbgstr_rect(&val), wine_dbgstr_rect(&exp)); } #define compare(val, exp, format) ok((val) == (exp), #val " value " format " expected " format "\n", (val), (exp)); diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index f537fe0..fa0d970 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -30,9 +30,8 @@ RECT exp = {abs(got.left - _left), abs(got.top - _top), \ abs(got.right - _right), abs(got.bottom - _bottom)}; \ ok(exp.left <= 2 && exp.top <= 2 && exp.right <= 2 && exp.bottom <= 2, \ - "Expected rect {%d,%d, %d,%d}, got {%d,%d, %d,%d}\n", \ - _left, _top, _right, _bottom, \ - (got).left, (got).top, (got).right, (got).bottom); } while (0) + "Expected rect (%d,%d)-(%d,%d), got %s\n", _left, _top, _right, _bottom, \ + wine_dbgstr_rect(&(got))); } while (0) static HINSTANCE hinst; static WNDPROC g_status_wndproc; diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 01c4214..d825e18 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -109,8 +109,8 @@ static const struct message restore_parent_seq[] = { #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) #define check_rect(name, val, exp, ...) ok(EqualRect(&val, &exp), \ - "invalid rect (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d) - (" name ")\n", \ - val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom, __VA_ARGS__); + "invalid rect %s - expected %s - (" name ")\n", \ + wine_dbgstr_rect(&val), wine_dbgstr_rect(&exp), __VA_ARGS__); #define compare(val, exp, format) ok((val) == (exp), #val " value " format " expected " format "\n", (val), (exp));

1 0

Hugh McMaster : reg: Do not allow duplicate /d or /t switches.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: 31efcc634a9d3498d79dcad1f46bbf5f9848b4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=31efcc634a9d3498d79dcad1f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 8 10:47:56 2016 +0000 reg: Do not allow duplicate /d or /t switches. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 10 ++++++++-- programs/reg/tests/reg.c | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 84818da..28133de 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -941,10 +941,16 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashVAW)) value_all = TRUE; else if (!lstrcmpiW(argvW[i], slashTW)) - type = argvW[++i]; + { + if (type || !(type = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + } else if (!lstrcmpiW(argvW[i], slashDW)) { - if (!(data = argvW[++i])) + if (data || !(data = argvW[++i])) { output_message(STRING_INVALID_CMDLINE); return 1; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f7d8b11..2831e03 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -442,6 +442,14 @@ static void test_add(void) RegCloseKey(hkey); + /* Test duplicate switches */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dup1 /t REG_DWORD /d 123 /f /t REG_SZ", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + "got exit code %u, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dup2 /t REG_DWORD /d 123 /f /d 456", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "got %d\n", err); }

1 0

Huw Davies : gdi32: Rename the struct representing an embedded EMF in a WMF.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: 7be1c53d8297561c7616b4a3ba7698dea01ffd7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be1c53d8297561c7616b4a3b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 8 11:00:45 2016 +0100 gdi32: Rename the struct representing an embedded EMF in a WMF. Also, use an array rather than a pointer to represent the start of the data. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/metafile.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 0cb36af..925d648 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1128,8 +1128,8 @@ typedef struct DWORD chunk_size; DWORD remaining_size; DWORD emf_size; - BYTE *emf_data; -} mf_comment_chunk; + BYTE emf_data[1]; +} emf_in_wmf_comment; #include <poppack.h> static const DWORD wmfc_magic = 0x43464d57; @@ -1146,7 +1146,7 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) { DWORD size = GetEnhMetaFileBits(emf, 0, NULL), i; BYTE *bits, *chunk_data; - mf_comment_chunk *chunk = NULL; + emf_in_wmf_comment *chunk = NULL; BOOL ret = FALSE; static const DWORD max_chunk_size = 0x2000; @@ -1155,7 +1155,7 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) if(!bits) return FALSE; if(!GetEnhMetaFileBits(emf, size, bits)) goto end; - chunk = HeapAlloc(GetProcessHeap(), 0, max_chunk_size + FIELD_OFFSET(mf_comment_chunk, emf_data)); + chunk = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(emf_in_wmf_comment, emf_data[max_chunk_size])); if(!chunk) goto end; chunk->magic = wmfc_magic; @@ -1176,10 +1176,10 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) chunk->chunk_size = chunk->remaining_size; chunk->remaining_size -= chunk->chunk_size; - memcpy(&chunk->emf_data, chunk_data, chunk->chunk_size); + memcpy(chunk->emf_data, chunk_data, chunk->chunk_size); chunk_data += chunk->chunk_size; - if(!Escape(hdc, MFCOMMENT, chunk->chunk_size + FIELD_OFFSET(mf_comment_chunk, emf_data), (char*)chunk, NULL)) + if(!Escape(hdc, MFCOMMENT, FIELD_OFFSET(emf_in_wmf_comment, emf_data[chunk->chunk_size]), (char*)chunk, NULL)) goto end; } ret = TRUE;

1 0

Grazvydas Ignotas : wined3d: Add a fallback for Skylake.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: 6be3a8fb75085dcaa1f0ffa268c98f127cbd2103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be3a8fb75085dcaa1f0ffa26… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 8 00:27:55 2016 +0300 wined3d: Add a fallback for Skylake. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 45b3625..3656b8b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1999,6 +1999,8 @@ cards_amd_binary[] = }, cards_intel[] = { + /* Skylake */ + {"Skylake", CARD_INTEL_HD520}, /* Haswell */ {"Haswell Mobile", CARD_INTEL_HWM}, /* Ivybridge */

1 0

Henri Verbeet : usp10: Set the base embedding level for Script_Arabic_Numeric to 2.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: 21586466ac0f10a7c767f627aa8cd0f770a33f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21586466ac0f10a7c767f627a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 21:18:36 2016 +0200 usp10: Set the base embedding level for Script_Arabic_Numeric to 2. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 22 ++++++++-------------- dlls/usp10/usp10.c | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 996f30c..0a0ac2d 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -572,9 +572,9 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, /* Persian numerals and punctuation. */ static const WCHAR test57[] = {0x06f1, 0x06f2, 0x066c, 0x06f3, 0x06f4, 0x06f5, 0x066c, /* ۱۲٬۳۴۵٬ */ 0x06f6, 0x06f7, 0x06f8, 0x066b, 0x06f9, 0x06f0}; /* ۶۷۸٫۹۰ */ - static const itemTest t571[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,0,1,0,0}, 2,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,0,1,0,0},10,0,1,2,0,arab_tag,FALSE}, + static const itemTest t571[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,1,2,0,arab_tag,FALSE}, {{0,0,0,0,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; static const itemTest t572[] = {{{0,0,0,0,0,0}, 0,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, {{0,0,0,0,0,0}, 3,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, @@ -584,19 +584,13 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0}, 3,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0}, 6,0,0,0,1,arab_tag,FALSE}, {{0,0,0,0,0,0}, 7,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,0,0,1,arab_tag,FALSE}, {{0,0,0,0,0,0},11,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; - static const itemTest t574[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,0,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; /* Arabic numerals and punctuation. */ static const WCHAR test58[] = {0x0661, 0x0662, 0x066c, 0x0663, 0x0664, 0x0665, 0x066c, /* ١٢٬٣٤٥٬ */ 0x0666, 0x0667, 0x0668, 0x066b, 0x0669, 0x0660}; /* ٦٧٨٫٩٠ */ - static const itemTest t581[] = {{{0,0,0,1,0,0}, 0,0,1,2,0,arab_tag,FALSE}, + static const itemTest t581[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE}, {{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; static const itemTest t582[] = {{{0,0,1,1,0,1}, 0,0,0,0,1,arab_tag,FALSE}, {{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; - static const itemTest t583[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; @@ -801,8 +795,8 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); - test_items_ok(test57,13,&Control,&State,7,t574,FALSE,0); - test_items_ok(test58,13,&Control,&State,1,t583,FALSE,0); + test_items_ok(test57,13,&Control,&State,7,t571,FALSE,0); + test_items_ok(test58,13,&Control,&State,1,t581,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -859,8 +853,8 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); - test_items_ok(test57,13,&Control,&State,7,t574,FALSE,0); - test_items_ok(test58,13,&Control,&State,1,t583,FALSE,0); + test_items_ok(test57,13,&Control,&State,7,t571,FALSE,0); + test_items_ok(test58,13,&Control,&State,1,t581,FALSE,0); State.uBidiLevel = 0; Control.fMergeNeutralItems = FALSE; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index d654cc8..74250ea 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -330,7 +330,7 @@ const scriptData scriptInformation[] = { {LANG_ARABIC, 0, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 1, 1, 0}, MS_MAKE_TAG('a','r','a','b'), {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, - {{Script_Arabic_Numeric, 0, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, + {{Script_Arabic_Numeric, 0, 1, 0, 0, 0, 0, { 2,0,0,0,0,0,0,0,0,0,0}}, {LANG_ARABIC, 1, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('a','r','a','b'), {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}},

1 0

Henri Verbeet : usp10: Arabic numerals are written left-to-right.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: 2ce0f7e4a3204d3f91c3ba6ef0cfecb0c6fb78d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce0f7e4a3204d3f91c3ba6ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 21:18:35 2016 +0200 usp10: Arabic numerals are written left-to-right. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 10 +++++----- dlls/usp10/usp10.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index fe579d3..996f30c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -572,9 +572,9 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, /* Persian numerals and punctuation. */ static const WCHAR test57[] = {0x06f1, 0x06f2, 0x066c, 0x06f3, 0x06f4, 0x06f5, 0x066c, /* ۱۲٬۳۴۵٬ */ 0x06f6, 0x06f7, 0x06f8, 0x066b, 0x06f9, 0x06f0}; /* ۶۷۸٫۹۰ */ - static const itemTest t571[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 2,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0},10,0,1,2,0,arab_tag,FALSE}, + static const itemTest t571[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,0,1,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,0,1,0,0},10,0,1,2,0,arab_tag,FALSE}, {{0,0,0,0,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; static const itemTest t572[] = {{{0,0,0,0,0,0}, 0,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, {{0,0,0,0,0,0}, 3,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, @@ -591,9 +591,9 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, /* Arabic numerals and punctuation. */ static const WCHAR test58[] = {0x0661, 0x0662, 0x066c, 0x0663, 0x0664, 0x0665, 0x066c, /* ١٢٬٣٤٥٬ */ 0x0666, 0x0667, 0x0668, 0x066b, 0x0669, 0x0660}; /* ٦٧٨٫٩٠ */ - static const itemTest t581[] = {{{0,1,0,1,0,0}, 0,0,1,2,0,arab_tag,FALSE}, + static const itemTest t581[] = {{{0,0,0,1,0,0}, 0,0,1,2,0,arab_tag,FALSE}, {{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; - static const itemTest t582[] = {{{0,1,1,1,0,1}, 0,0,0,0,1,arab_tag,FALSE}, + static const itemTest t582[] = {{{0,0,1,1,0,1}, 0,0,0,0,1,arab_tag,FALSE}, {{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; static const itemTest t583[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE}, {{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index d686a68..d654cc8 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -330,7 +330,7 @@ const scriptData scriptInformation[] = { {LANG_ARABIC, 0, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 1, 1, 0}, MS_MAKE_TAG('a','r','a','b'), {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, - {{Script_Arabic_Numeric, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, + {{Script_Arabic_Numeric, 0, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, {LANG_ARABIC, 1, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('a','r','a','b'), {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}},

1 0

Alexandre Julliard : user32: Setup system menu even when used through TrackPopupMenu.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: 83ed0a636b334b9c5175ad897270eb8d990dba01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ed0a636b334b9c5175ad897… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 16:12:26 2016 +0900 user32: Setup system menu even when used through TrackPopupMenu. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index e42d8f7..52d09ce 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3479,6 +3479,10 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, if (!(wFlags & TPM_NONOTIFY)) SendMessageW( hWnd, WM_INITMENUPOPUP, (WPARAM)hMenu, 0); + if (menu->wFlags & MF_SYSMENU) + MENU_InitSysMenuPopup( hMenu, GetWindowLongW( hWnd, GWL_STYLE ), + GetClassLongW( hWnd, GCL_STYLE)); + if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, lpTpm ? &lpTpm->rcExclude : NULL );

1 0

Theodore Dubois : shell32/tests: Fix memory leaks.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: 2a7c4ea8753a42155231de9fc3fb3e4d03a4ba2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a7c4ea8753a42155231de9fc… Author: Theodore Dubois <tblodt(a)icloud.com> Date: Sun Jun 5 09:35:39 2016 -0700 shell32/tests: Fix memory leaks. Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index beebbdf..274c0fc 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -104,7 +104,7 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW { IQueryAssociations *assoc; HRESULT hr; - WCHAR *buffer; + WCHAR *buffer = NULL; DWORD len; hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); @@ -115,8 +115,11 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, NULL, &len); if (expected_string) { ok_(__FILE__, line)(hr == S_FALSE, "GetString returned 0x%x, expected S_FALSE\n", hr); - if (hr != S_FALSE) - return; /* don't try to allocate memory */ + if (hr != S_FALSE) { + /* don't try to allocate memory using unitialized len */ + IQueryAssociations_Release(assoc); + return; + } buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); @@ -128,6 +131,9 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW } else { ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); } + + IQueryAssociations_Release(assoc); + HeapFree(GetProcessHeap(), 0, buffer); } static void test_IQueryAssociations_GetString(void)

1 0

Theodore Dubois : shell32/tests: Fix out of memory errors and their underlying cause.
by Alexandre Julliard June 8, 2016

June 8, 2016

Module: wine Branch: master Commit: fbbac88519fc66d32e629ca82af557bfbe9cacce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbbac88519fc66d32e629ca82… Author: Theodore Dubois <tblodt(a)icloud.com> Date: Sun Jun 5 09:35:38 2016 -0700 shell32/tests: Fix out of memory errors and their underlying cause. The out of memory errors were happening because getstring_test was using len unitialized when GetString failed. The underlying cause was that deleting the keys would fail because RegDeleteKey does not work if the key has subkeys, and one of the keys has a subkey. The test fails when the keys are still there. The subkey is now deleted before the key that contains it. Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 67f7d32..beebbdf 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -113,21 +113,20 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW ok_(__FILE__, line)(hr == S_OK, "IQueryAssociations::Init failed, 0x%x\n", hr); hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, NULL, &len); - if (hr != S_FALSE) { - if (expected_string) { - ok_(__FILE__, line)(SUCCEEDED(hr), "GetString returned 0x%x, expected success\n", hr); - } else { - ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); - } - } + if (expected_string) { + ok_(__FILE__, line)(hr == S_FALSE, "GetString returned 0x%x, expected S_FALSE\n", hr); + if (hr != S_FALSE) + return; /* don't try to allocate memory */ - buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); - hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, buffer, &len); + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); + hr = IQueryAssociations_GetString(assoc, 0, str, NULL, buffer, &len); + ok_(__FILE__, line)(hr == S_OK, "GetString returned 0x%x, expected S_OK\n", hr); - if (expected_string) { ok_(__FILE__, line)(lstrcmpW(buffer, expected_string) == 0, "GetString returned %s, expected %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(expected_string)); + } else { + ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); } } @@ -176,8 +175,9 @@ static void test_IQueryAssociations_GetString(void) getstring_test(test_progidW, NULL, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); getstring_test(NULL, test_progid_key, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); - RegDeleteKeyW(HKEY_CLASSES_ROOT, test_extensionW); + RegDeleteKeyW(test_progid_key, DefaultIconW); RegDeleteKeyW(HKEY_CLASSES_ROOT, test_progidW); + RegDeleteKeyW(HKEY_CLASSES_ROOT, test_extensionW); hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok(hr == S_OK, "failed to create object, 0x%x\n", hr);

1 0