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

Piotr Caban : riched20/tests: Add negative indentation display test.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: d11c758faf187e9ae52872526a7474ebd4a9795d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11c758faf187e9ae52872526… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 18 15:14:33 2016 +0200 riched20/tests: Add negative indentation display test. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c6444ff..5f4cc05 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -601,6 +601,7 @@ static void test_EM_POSFROMCHAR(void) POINTL pt; LOCALESIGNATURE sig; BOOL rtl; + PARAFORMAT2 fmt; static const char text[] = "aa\n" "this is a long line of text that should be longer than the " "control's width\n" @@ -727,6 +728,18 @@ static void test_EM_POSFROMCHAR(void) SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, -1); ok(pt.x == 1, "pt.x = %d\n", pt.x); + /* test negative indentation */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, + (LPARAM)"{\\rtf1\\pard\\fi-200\\li-200\\f1 TestSomeText\\par}"); + SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, 0); + todo_wine ok(pt.x == 1, "pt.x = %d\n", pt.x); + + fmt.cbSize = sizeof(fmt); + SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); + ok(fmt.dxStartIndent == -400, "got %d\n", fmt.dxStartIndent); + ok(fmt.dxOffset == 200, "got %d\n", fmt.dxOffset); + ok(fmt.wAlignment == PFA_LEFT, "got %d\n", fmt.wAlignment); + DestroyWindow(hwndRichEdit); }

1 0

Michael Stefaniuc : user32/tests: Use SetRect instead of open coding it.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 4ee81394878f5917f9484a4ce0952aa07f866c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee81394878f5917f9484a4ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 18 10:12:23 2016 +0200 user32/tests: Use SetRect instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 11 ++--------- dlls/user32/tests/sysparams.c | 5 +---- dlls/user32/tests/uitools.c | 3 +-- dlls/user32/tests/win.c | 6 +++--- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 6ff7225..c9e31f7 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -574,11 +574,7 @@ static HWND create_child_editcontrol (DWORD style, DWORD exstyle) HWND editWnd; RECT rect; BOOL b; - - rect.left = 0; - rect.top = 0; - rect.right = 300; - rect.bottom = 300; + SetRect(&rect, 0, 0, 300, 300); b = AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); ok(b, "AdjustWindowRect failed\n"); @@ -1468,10 +1464,7 @@ static void test_margins(void) the rectangle must not change */ SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); - old_rect.left = 1; - old_rect.right = 99; - old_rect.top = 1; - old_rect.bottom = 99; + SetRect(&old_rect, 1, 1, 99, 99); SendMessageA(hwEdit, EM_SETRECT, 0, (LPARAM)&old_rect); SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index cffc815..075a0c7 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1835,10 +1835,7 @@ static void test_SPI_SETWORKAREA( void ) /* 47 */ * Changing the work area by just one pixel should make this occurrence * reasonably unlikely. */ - curr_val.left = old_area.left; - curr_val.top = old_area.top; - curr_val.right = old_area.right-1; - curr_val.bottom = old_area.bottom-1; + SetRect(&curr_val, old_area.left, old_area.top, old_area.right - 1, old_area.bottom - 1); rc=SystemParametersInfoA( SPI_SETWORKAREA, 0, &curr_val, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); if (!test_error_msg(rc,"SPI_SETWORKAREA")) return; diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index 5f10b00..e1ddf2b 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -49,8 +49,7 @@ static void test_FillRect(void) /* select black brush */ old_brush = SelectObject(hdcmem, GetStockObject(BLACK_BRUSH)); - r.left = r.top = 0; - r.right = r.bottom = 5; + SetRect(&r, 0, 0, 5, 5); FillRect(hdcmem, &r, 0); SelectObject(hdcmem, old_brush); /* bitmap filled with last selected brush */ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index dd5f967..673b9b5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7578,7 +7578,7 @@ static void test_winregion(void) ok( ret == ERROR, "Expected ERROR, got %d\n", ret); ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError()); - r.left = r.top = r.right = r.bottom = 0; + SetRectEmpty(&r); ret = pGetWindowRgnBox(hwnd, &r); ok( ret == SIMPLEREGION, "Expected SIMPLEREGION, got %d\n", ret); ok( r.left == 2 && r.top == 3 && r.right == 10 && r.bottom == 15, @@ -7589,10 +7589,10 @@ static void test_winregion(void) hrgn = CreateRectRgn(2, 3, 10, 15); ret = pMirrorRgn( hwnd, hrgn ); ok( ret == TRUE, "MirrorRgn failed %u\n", ret ); - r.left = r.top = r.right = r.bottom = 0; + SetRectEmpty(&r); GetWindowRect( hwnd, &r ); width = r.right - r.left; - r.left = r.top = r.right = r.bottom = 0; + SetRectEmpty(&r); ret = GetRgnBox( hrgn, &r ); ok( ret == SIMPLEREGION, "GetRgnBox failed %u\n", ret ); ok( r.left == width - 10 && r.top == 3 && r.right == width - 2 && r.bottom == 15,

1 0

Piotr Caban : riched20: Don' t allow negative margins in ME_WrapTextParagraph.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 3dbd46716299883761be9c4c4173a5f0402b2f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbd46716299883761be9c4c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 18 15:14:39 2016 +0200 riched20: Don't allow negative margins in ME_WrapTextParagraph. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/wrap.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5f4cc05..ae9c0a5 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -732,7 +732,7 @@ static void test_EM_POSFROMCHAR(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"{\\rtf1\\pard\\fi-200\\li-200\\f1 TestSomeText\\par}"); SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, 0); - todo_wine ok(pt.x == 1, "pt.x = %d\n", pt.x); + ok(pt.x == 1, "pt.x = %d\n", pt.x); fmt.cbSize = sizeof(fmt); SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 49a62ce..b488bf1 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -879,6 +879,11 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { wc.nFirstMargin = ME_twips2pointsX(c, dxStartIndent); wc.nLeftMargin = wc.nFirstMargin + ME_twips2pointsX(c, pFmt->dxOffset); wc.nRightMargin = ME_twips2pointsX(c, pFmt->dxRightIndent); + + if (wc.nFirstMargin < 0) + wc.nFirstMargin = 0; + if (wc.nLeftMargin < 0) + wc.nLeftMargin = 0; } if (c->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE)

1 0

Sebastian Lackner : krnl386.exe16: Do not reassign default handles after they got closed.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 414c73feabb6d33be969f3927f8b3e8a8075bcd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=414c73feabb6d33be969f3927… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 18 11:29:29 2016 +0200 krnl386.exe16: Do not reassign default handles after they got closed. Based on a patch by Michael Müller. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/file.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index b66b753..4e7f7c4 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -113,8 +113,7 @@ HFILE WINAPI Win32HandleToDosFileHandle( HANDLE handle ) if (!handle || (handle == INVALID_HANDLE_VALUE)) return HFILE_ERROR; - FILE_InitProcessDosHandles(); - for (i = 0; i < DOS_TABLE_SIZE; i++) + for (i = 5; i < DOS_TABLE_SIZE; i++) if (!dos_handles[i]) { dos_handles[i] = handle;

1 0

Alistair Leslie-Hughes : mimeole.idl: Correct IMimePropertySchema interface.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 3a974b1c5e7effd3bd0d324a6d21c6f3181d5da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a974b1c5e7effd3bd0d324a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 15 07:50:59 2016 +0000 mimeole.idl: Correct IMimePropertySchema interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 65c0b42..dddfc26 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -469,6 +469,8 @@ library MIMEOLE ] interface IMimePropertySchema : IUnknown { + typedef [unique] IMimePropertySchema *LPMIMEPROPERTYSCHEMA; + typedef enum tagMIMEPROPFLAGS { MPF_INETCSET = 0x01, @@ -479,7 +481,30 @@ library MIMEOLE MPF_READONLY = 0x20 } MIMEPROPFLAGS; - /* FIXME: fill this in */ + HRESULT RegisterProperty( + [in] const char *name, + [in] DWORD flags, + [in] DWORD rownumber, + [in] VARTYPE vtdefault, + [out] DWORD *propid); + + HRESULT ModifyProperty( + [in] const char *name, + [in] DWORD flags, + [in] DWORD rownumber, + [in] VARTYPE vtdefault); + + HRESULT GetPropertyId( + [in] const char *name, + [out] DWORD *propid); + + HRESULT GetPropertyName( + [in] DWORD propid, + [out] char **name); + + HRESULT RegisterAddressType( + [in] const char *name, + [out] DWORD *adrtype); } [

1 0

Alistair Leslie-Hughes : mimeole.idl: Add missing Mime Property IDS.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 0e727d42640b59358560734bacf47cb92208a3eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e727d42640b59358560734ba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 15 07:50:20 2016 +0000 mimeole.idl: Add missing Mime Property IDS. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index ab1239f..c10d8e0 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -84,10 +84,56 @@ cpp_quote(" PID_HDR_PATH = 26,") cpp_quote(" PID_HDR_FOLLOWUPTO = 27,") cpp_quote(" PID_HDR_EXPIRES = 28,") cpp_quote(" PID_HDR_CC = 29,") - +cpp_quote(" PID_HDR_CONTROL = 30,") +cpp_quote(" PID_HDR_DISTRIB = 31,") +cpp_quote(" PID_HDR_KEYWORDS = 32,") +cpp_quote(" PID_HDR_SUMMARY = 33,") +cpp_quote(" PID_HDR_APPROVED = 34,") +cpp_quote(" PID_HDR_LINES = 35,") +cpp_quote(" PID_HDR_XREF = 36,") +cpp_quote(" PID_HDR_ORG = 37,") +cpp_quote(" PID_HDR_XNEWSRDR = 38,") +cpp_quote(" PID_HDR_XPRI = 39,") +cpp_quote(" PID_HDR_XMSPRI = 40,") +cpp_quote(" PID_PAR_FILENAME = 41,") +cpp_quote(" PID_PAR_BOUNDARY = 42,") +cpp_quote(" PID_PAR_CHARSET = 43,") +cpp_quote(" PID_PAR_NAME = 44,") +cpp_quote(" PID_ATT_FILENAME = 45,") +cpp_quote(" PID_ATT_GENFNAME = 46,") +cpp_quote(" PID_ATT_PRITYPE = 47,") +cpp_quote(" PID_ATT_SUBTYPE = 48,") +cpp_quote(" PID_ATT_NORMSUBJ = 49,") +cpp_quote(" PID_ATT_ILLEGAL = 50,") +cpp_quote(" PID_ATT_RENDERED = 51,") +cpp_quote(" PID_ATT_SENTTIME = 52,") +cpp_quote(" PID_ATT_RECVTIME = 53,") +cpp_quote(" PID_ATT_PRIORITY = 54,") +cpp_quote(" PID_HDR_COMMENT = 55,") +cpp_quote(" PID_HDR_ENCODING = 56,") +cpp_quote(" PID_HDR_ENCRYPTED = 57,") +cpp_quote(" PID_HDR_OFFSETS = 58,") +cpp_quote(" PID_HDR_XUNSENT = 59,") +cpp_quote(" PID_HDR_ARTICLEID = 60,") cpp_quote(" PID_HDR_SENDER = 61,") - -cpp_quote(" PID_HDR_INREPLYTO = 77,") +cpp_quote(" PID_ATT_SERVER = 62,") +cpp_quote(" PID_ATT_ACCOUNT = 63,") +cpp_quote(" PID_ATT_UIDL = 64,") +cpp_quote(" PID_ATT_STOREMSGID = 65,") +cpp_quote(" PID_ATT_USERNAME = 66,") +cpp_quote(" PID_ATT_FORWARDTO = 67,") +cpp_quote(" PID_ATT_STOREFOLDERID = 68,") +cpp_quote(" PID_ATT_GHOSTED = 69,") +cpp_quote(" PID_ATT_UNCACHEDSIZE = 70,") +cpp_quote(" PID_ATT_COMBINED = 71,") +cpp_quote(" PID_ATT_AUTOINLINED = 72,") +cpp_quote(" PID_HDR_DISP_NOTIFICATION_TO = 73,") +cpp_quote(" PID_PAR_REPLYTYPE = 74,") +cpp_quote(" PID_PAR_FORMAT = 75,") +cpp_quote(" PID_ATT_FORMAT = 76,") +cpp_quote(" PID_HDR_INREPLYTO = 77,") +cpp_quote(" PID_ATT_ACCOUNTNAME = 78,") +cpp_quote(" PID_LAST = 79,") cpp_quote("} MIMEPROPID;") cpp_quote("#define TYPEDID_MASK ((ULONG)0xffff)")

1 0

Alex Henrie : ole32: Fix memory leaks in CompositeMonikerImpl_Construct.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: dddfd4693465740e231d7c8289473bd591db011b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dddfd4693465740e231d7c828… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 13 22:56:49 2016 -0600 ole32: Fix memory leaks in CompositeMonikerImpl_Construct. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 82899f0..6c92771 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1755,6 +1755,7 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike IMoniker *tempMk; HRESULT res; CompositeMonikerImpl *This; + int i; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); @@ -1800,12 +1801,14 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike if (++This->tabLastIndex==This->tabSize){ - LPVOID tab_moniker = This->tabMoniker; + IMoniker **tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); if (This->tabMoniker==NULL){ + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(tab_moniker[i]); HeapFree(GetProcessHeap(), 0, tab_moniker); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; @@ -1848,18 +1851,25 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike IMoniker_Release(This->tabMoniker[This->tabLastIndex-1]); This->tabMoniker[This->tabLastIndex-1]=tempMk; - } else + } else{ + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(This->tabMoniker[i]); + HeapFree(GetProcessHeap(), 0, This->tabMoniker); + HeapFree(GetProcessHeap(), 0, This); return res; + } /* resize tabMoniker if needed */ if (This->tabLastIndex==This->tabSize){ - LPVOID tab_moniker = This->tabMoniker; + IMoniker **tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); if (This->tabMoniker==NULL){ + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(tab_moniker[i]); HeapFree(GetProcessHeap(), 0, tab_moniker); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; @@ -1896,13 +1906,15 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike } if (This->tabLastIndex==This->tabSize){ - LPVOID tab_moniker = This->tabMoniker; + IMoniker **tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); if (This->tabMoniker==NULL){ + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(tab_moniker[i]); HeapFree(GetProcessHeap(), 0, tab_moniker); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY;

1 0

Nikolay Sivov : comctl32/tests: Fix wrong use of HDM_GETITEM when getting item text.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 025508f75534eb9b6f60d5e2f3567a6d47d9a062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025508f75534eb9b6f60d5e2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 16 11:36:08 2016 +0300 comctl32/tests: Fix wrong use of HDM_GETITEM when getting item text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/header.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index f37b72b..8245711 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1078,10 +1078,7 @@ static void test_hdm_bitmapmarginMessages(HWND hParent) static void test_hdm_index_messages(HWND hParent) { HWND hChild; - int retVal; - int loopcnt; - int strcmpResult; - int iSize; + int retVal, i, iSize; static const int lpiarray[2] = {1, 0}; static int lpiarrayReceived[2]; static char firstHeaderItem[] = "Name"; @@ -1091,10 +1088,7 @@ static void test_hdm_index_messages(HWND hParent) static char *items[] = {firstHeaderItem, secondHeaderItem, thirdHeaderItem, fourthHeaderItem}; RECT rect; HDITEMA hdItem; - hdItem.mask = HDI_TEXT | HDI_WIDTH | HDI_FORMAT; - hdItem.fmt = HDF_LEFT; - hdItem.cxy = 80; - hdItem.cchTextMax = 260; + char buffA[32]; flush_sequences(sequences, NUM_MSG_SEQUENCES); hChild = create_custom_header_control(hParent, FALSE); @@ -1105,11 +1099,15 @@ static void test_hdm_index_messages(HWND hParent) ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); - for ( loopcnt = 0 ; loopcnt < 4 ; loopcnt++ ) + for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) { - hdItem.pszText = items[loopcnt]; - retVal = SendMessageA(hChild, HDM_INSERTITEMA, loopcnt, (LPARAM) &hdItem); - ok(retVal == loopcnt, "Adding item %d failed with return value %d\n", ( loopcnt + 1 ), retVal); + hdItem.mask = HDI_TEXT | HDI_WIDTH | HDI_FORMAT; + hdItem.pszText = items[i]; + hdItem.fmt = HDF_LEFT; + hdItem.cxy = 80; + + retVal = SendMessageA(hChild, HDM_INSERTITEMA, i, (LPARAM) &hdItem); + ok(retVal == i, "Adding item %d failed with return value %d\n", i, retVal); } ok_sequence(sequences, HEADER_SEQ_INDEX, insertItem_seq, "insertItem sequence testing", FALSE); @@ -1135,17 +1133,21 @@ static void test_hdm_index_messages(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); + hdItem.mask = HDI_WIDTH; retVal = SendMessageA(hChild, HDM_GETITEMA, 3, (LPARAM) &hdItem); ok(retVal == FALSE, "Getting already-deleted item should return FALSE, got %d\n", retVal); + hdItem.mask = HDI_TEXT | HDI_WIDTH; + hdItem.pszText = buffA; + hdItem.cchTextMax = sizeof(buffA)/sizeof(buffA[0]); retVal = SendMessageA(hChild, HDM_GETITEMA, 0, (LPARAM) &hdItem); ok(retVal == TRUE, "Getting the 1st header item should return TRUE, got %d\n", retVal); ok_sequence(sequences, HEADER_SEQ_INDEX, getItem_seq, "getItem sequence testing", FALSE); /* check if the item is the right one */ - strcmpResult = strcmp(hdItem.pszText, firstHeaderItem); - expect(0, strcmpResult); + ok(!strcmp(hdItem.pszText, firstHeaderItem), "got wrong item %s, expected %s\n", + hdItem.pszText, firstHeaderItem); expect(80, hdItem.cxy); iSize = SendMessageA(hChild, HDM_GETITEMCOUNT, 0, 0);

1 0

Francois Gouget : crypt32/tests: Fix a spelling error in a comment.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 7f9a3a9af11ad5d98040189e2c639044a5b43315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9a3a9af11ad5d98040189e2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 16 02:24:41 2016 +0200 crypt32/tests: Fix a spelling error in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index be2ec54..5635a15 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4670,7 +4670,7 @@ static void check_ssl_policy(void) CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, fooPolicyCheckWithoutMatchingName, &oct2007, &policyPara); /* The Battle.Net chain checks a certificate with a domain component - * containg a terminating NULL. + * containing a terminating NULL. */ sslPolicyPara.pwszServerName = battle_dot_net; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL,

1 0

Francois Gouget : windowscodecs: Fix spelling of a few private struct names.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: a2f285bf7e557c42badd41dd78cc1ef21adb2c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f285bf7e557c42badd41dd7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 15 14:25:54 2016 +0200 windowscodecs: Fix spelling of a few private struct names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/gifformat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 9ba29f5..ddff88b 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -249,7 +249,7 @@ static HRESULT load_GCE_metadata(IStream *stream, const GUID *vendor, DWORD opti MetadataItem **items, DWORD *count) { #include "pshpack1.h" - struct graphic_control_extenstion + struct graphic_control_extension { BYTE packed; /* reservred: 3; @@ -327,7 +327,7 @@ static HRESULT load_APE_metadata(IStream *stream, const GUID *vendor, DWORD opti MetadataItem **items, DWORD *count) { #include "pshpack1.h" - struct application_extenstion + struct application_extension { BYTE extension_introducer; BYTE extension_label; @@ -434,7 +434,7 @@ static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWO MetadataItem **items, DWORD *count) { #include "pshpack1.h" - struct gif_extenstion + struct gif_extension { BYTE extension_introducer; BYTE extension_label;

1 0