January 2018 - Wine-commits

Alex Henrie : ws2_32/tests: Initialize bytesReturned to 123456 before a failing test.
by Alexandre Julliard 04 Jan '18

04 Jan '18

Module: wine Branch: master Commit: 414260f3568ff7bdc06d5a7339b7ef10d1dad991 URL: https://source.winehq.org/git/wine.git/?a=commit;h=414260f3568ff7bdc06d5a73… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 22:33:31 2018 -0700 ws2_32/tests: Initialize bytesReturned to 123456 before a failing test. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 22b7331..96631ae 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8539,6 +8539,7 @@ todo_wine dwret = WaitForSingleObject(overlapped.hEvent, 1000); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + bytesReturned = 123456; bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned);

1 0

Andrey Gusev : ntdll/tests: Fix resource leak.
by Alexandre Julliard 04 Jan '18

04 Jan '18

Module: wine Branch: master Commit: c4dd0ff5ec93c5751669634fc0625d31e1e2486b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4dd0ff5ec93c5751669634f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jan 4 11:22:52 2018 +0200 ntdll/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/atom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 972a54e..a481758 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -179,6 +179,7 @@ static void test_NtAtom(void) testThread = CreateThread(NULL, 0, RtlAtomTestThread, &AtomTable, 0, NULL); WaitForSingleObject(testThread, INFINITE); + CloseHandle(testThread); Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, &RefCount, &PinCount, Name, &Len);

1 0

Stefan Leichter : include: Add RtlCompareMemory declaration to winnt.h.
by Alexandre Julliard 04 Jan '18

04 Jan '18

Module: wine Branch: master Commit: 3b4c6e6d99805e9494646e1410be0236caa457d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b4c6e6d99805e9494646e14… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Thu Jan 4 12:15:17 2018 +0100 include: Add RtlCompareMemory declaration to winnt.h. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index a2c14cd..1fb09b3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5501,7 +5501,7 @@ typedef enum _CM_ERROR_CONTROL_TYPE CriticalError = SERVICE_ERROR_CRITICAL } SERVICE_ERROR_TYPE; - +NTSYSAPI SIZE_T WINAPI RtlCompareMemory(const VOID*, const VOID*, SIZE_T); #define RtlEqualMemory(Destination, Source, Length) (!memcmp((Destination),(Source),(Length))) #define RtlMoveMemory(Destination, Source, Length) memmove((Destination),(Source),(Length))

1 0

Hans Leidekker : Revert "msi: Store the current script in the package."
by Alexandre Julliard 04 Jan '18

04 Jan '18

Module: wine Branch: master Commit: f25501db4b9f79b69a6c569ab418e6f5a4d8fc94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f25501db4b9f79b69a6c569a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 4 12:58:43 2018 +0100 Revert "msi: Store the current script in the package." Commit 036f007e241b95498964c53365300a3332a92c5a (which reverts 86bc556f9fd4a964cbaa66bc1fd67e4603ecd450) is not sufficient to fix the Office installers because MsiGetMode(MSIRUNMODE_SCHEDULED) no longer does the right thing after the revert. That is caused by "msi: Store the current script in the package.", which, in hindsight, should have been part of the first commit. This reverts e1e668d41fce1dbd0270cd9de0d880a236ddb869. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 25 ++++++++++--------------- dlls/msi/custom.c | 16 ++++++++++++++-- dlls/msi/dialog.c | 2 +- dlls/msi/install.c | 8 ++++---- dlls/msi/msi.c | 6 +++--- dlls/msi/msipriv.h | 8 +++++--- dlls/msi/package.c | 1 - 7 files changed, 37 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f25501db4b9f79b69a6c…

1 0

Nikolay Sivov : shell32: Make some strings static constants.
by Alexandre Julliard 04 Jan '18

04 Jan '18

Module: wine Branch: master Commit: 1ee9c2c60b5eb6e4ab36a2db5367739dfe6319d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ee9c2c60b5eb6e4ab36a2db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 4 15:02:48 2018 +0300 shell32: Make some strings static constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/control.c | 10 +++++----- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shlfileop.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index b393154..748b2d2 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -194,8 +194,8 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) static BOOL Control_CreateListView (CPanel *panel) { + static const WCHAR empty_string[] = {0}; RECT ws, sb; - WCHAR empty_string[] = {0}; WCHAR buf[MAX_STRING_LEN]; LVCOLUMNW lvc; @@ -431,8 +431,8 @@ static CPlItem* Control_GetCPlItem_From_ListView(CPanel *panel) static void Control_StartApplet(HWND hWnd, CPlItem *item) { - WCHAR verbOpen[] = {'c','p','l','o','p','e','n',0}; - WCHAR format[] = {'@','%','d',0}; + static const WCHAR verbOpen[] = {'c','p','l','o','p','e','n',0}; + static const WCHAR format[] = {'@','%','d',0}; WCHAR param[MAX_PATH]; /* execute the applet if item is valid */ @@ -610,11 +610,11 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) { + static const WCHAR className[] = {'S','h','e','l','l','_','C','o','n','t','r','o', + 'l','_','W','n','d','C','l','a','s','s',0}; WNDCLASSEXW wc; MSG msg; WCHAR appName[MAX_STRING_LEN]; - const WCHAR className[] = {'S','h','e','l','l','_','C','o','n','t','r','o', - 'l','_','W','n','d','C','l','a','s','s',0}; LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, sizeof(appName) / sizeof(appName[0])); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 1fb4f1b..0e52fc1 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1085,7 +1085,7 @@ ISFHelper_fnGetUniqueName (ISFHelper * iface, LPWSTR pwszName, UINT uLen) HRESULT hr; WCHAR wszText[MAX_PATH]; WCHAR wszNewFolder[25]; - const WCHAR wszFormat[] = {'%','s',' ','%','d',0 }; + static const WCHAR wszFormat[] = {'%','s',' ','%','d',0 }; TRACE ("(%p)(%p %u)\n", This, pwszName, uLen); diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 8d4160d..24f5e05 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1309,8 +1309,8 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE { if (flFrom->dwNumFiles > 1) { + static const WCHAR format[] = {'%','d',0}; WCHAR tmp[8]; - const WCHAR format[] = {'%','d',0}; wnsprintfW(tmp, sizeof(tmp)/sizeof(tmp[0]), format, flFrom->dwNumFiles); return SHELL_ConfirmDialogW(hWnd, (fTrash?ASK_TRASH_MULTIPLE_ITEM:ASK_DELETE_MULTIPLE_ITEM), tmp, NULL);

1 0

Francois Gouget : user32/tests: Make test_WS_VSCROLL() static.
by Alexandre Julliard 04 Jan '18

04 Jan '18

Module: wine Branch: master Commit: 2041e20a6908ef3a6c5e68d2c47e24532d8ae8cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2041e20a6908ef3a6c5e68d2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:54:46 2018 +0100 user32/tests: Make test_WS_VSCROLL() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 72e8777..6dbdafb 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -806,7 +806,7 @@ static void test_listbox_size(DWORD style) } } -void test_WS_VSCROLL(void) +static void test_WS_VSCROLL(void) { BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); HWND hCombo, hList;

1 0

Francois Gouget : comctl32/tests: Make run_test_() static.
by Alexandre Julliard 04 Jan '18

04 Jan '18

Module: wine Branch: master Commit: 276c4380ecf5f3233ebe20ca9ab2e755e5b1e4c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=276c4380ecf5f3233ebe20ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:58:09 2018 +0100 comctl32/tests: Make run_test_() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/taskdialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 1db9cda..f6093a0 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -134,7 +134,7 @@ static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct run_test_(info, expect_button, seq, context, \ sizeof(seq)/sizeof(seq[0]) - 1, __FILE__, __LINE__) -void run_test_(TASKDIALOGCONFIG *info, int expect_button, const struct message_info *test_messages, +static void run_test_(TASKDIALOGCONFIG *info, int expect_button, const struct message_info *test_messages, const char *context, int test_messages_len, const char *file, int line) { struct message *msg, *msg_start;

1 0

Francois Gouget : comctl32/tests: Make test_combo_WS_VSCROLL() static.
by Alexandre Julliard 04 Jan '18

04 Jan '18

Module: wine Branch: master Commit: a45f792a10eb67d974c59d77985e503645689fe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a45f792a10eb67d974c59d77… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:58:17 2018 +0100 comctl32/tests: Make test_combo_WS_VSCROLL() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index d2a812c..ef7c3f7 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1125,7 +1125,7 @@ static void test_combo_listbox_styles(DWORD cb_style) DestroyWindow(combo); } -void test_combo_WS_VSCROLL(void) +static void test_combo_WS_VSCROLL(void) { HWND hCombo, hList; COMBOBOXINFO info;

1 0

Francois Gouget : mlang/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 04 Jan '18

04 Jan '18

Module: wine Branch: master Commit: f81f7f474961b1c19163f3d6e645433a0b88bd30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f81f7f474961b1c19163f3d6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:58:40 2018 +0100 mlang/tests: Add a trailing '\n' to ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 9727b4f..bcb2fd0 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2683,12 +2683,12 @@ static void test_MapFont(IMLangFontLink *font_link, IMLangFontLink2 *font_link2) ok(ret == S_OK, "MapFont() failed, hr %#x.\n", ret); ret = IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &font2); ok(ret == S_OK, "MapFont() failed, hr %#x.\n", ret); - ok(font1 != NULL && font2 != NULL, "expected !NULL/!NULL, got %p/%p", font1, font2); - ok(font1 == font2, "expected equal, got not equal"); + ok(font1 != NULL && font2 != NULL, "expected !NULL/!NULL, got %p/%p\n", font1, font2); + ok(font1 == font2, "expected equal, got not equal\n"); IMLangFontLink_GetFontCodePages(font_link, hdc, font1, &font_codepages); ok((codepages & (~font_codepages)) != 0 && (codepages & font_codepages) != 0, - "code pages of font is incorrect"); + "code pages of font is incorrect\n"); IMLangFontLink_ResetFontMapping(font_link); IMLangFontLink2_ResetFontMapping(font_link2);

1 0

Francois Gouget : glu32: A couple of spelling fixes in comments.
by Alexandre Julliard 04 Jan '18

04 Jan '18

Module: wine Branch: master Commit: 4a4f7e3404f1f0472c532b058c82e946465afd6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a4f7e3404f1f0472c532b05… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 16:00:04 2018 +0100 glu32: A couple of spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/geom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/glu32/geom.c b/dlls/glu32/geom.c index f43cf28..64b4068 100644 --- a/dlls/glu32/geom.c +++ b/dlls/glu32/geom.c @@ -51,8 +51,8 @@ GLdouble __gl_edgeEval( GLUvertex *u, GLUvertex *v, GLUvertex *w ) { /* Given three vertices u,v,w such that VertLeq(u,v) && VertLeq(v,w), * evaluates the t-coord of the edge uw at the s-coord of the vertex v. - * Returns v->t - (uw)(v->s), ie. the signed distance from uw to v. - * If uw is vertical (and thus passes thru v), the result is zero. + * Returns v->t - (uw)(v->s), i.e. the signed distance from uw to v. + * If uw is vertical (and thus passes through v), the result is zero. * * The calculation is extremely accurate and stable, even when v * is very close to u or w. In particular if we set v->t = 0 and @@ -106,8 +106,8 @@ GLdouble __gl_transEval( GLUvertex *u, GLUvertex *v, GLUvertex *w ) { /* Given three vertices u,v,w such that TransLeq(u,v) && TransLeq(v,w), * evaluates the t-coord of the edge uw at the s-coord of the vertex v. - * Returns v->s - (uw)(v->t), ie. the signed distance from uw to v. - * If uw is vertical (and thus passes thru v), the result is zero. + * Returns v->s - (uw)(v->t), i.e. the signed distance from uw to v. + * If uw is vertical (and thus passes through v), the result is zero. * * The calculation is extremely accurate and stable, even when v * is very close to u or w. In particular if we set v->s = 0 and

1 0