April 2018 - Wine-commits - list.winehq.org

Huw Davies : user32: Avoid using the comma operator in a while condition.
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: da943f2c089a0dd32fb727ed1d09e7e00680c6ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=da943f2c089a0dd32fb727ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 4 19:32:15 2018 +0100 user32: Avoid using the comma operator in a while condition. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 7d1f6b3..6f23c74 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1582,9 +1582,9 @@ HWND WINAPI GetNextDlgGroupItem( HWND hwndDlg, HWND hwndCtrl, BOOL fPrevious ) */ retvalue = hwndCtrl; hwnd = hwndCtrl; - while (hwndNext = GetWindow (hwnd, GW_HWNDNEXT), - 1) + while (1) { + hwndNext = GetWindow (hwnd, GW_HWNDNEXT); while (!hwndNext) { /* Climb out until there is a next sibling of the ancestor or we

1 0

André Hentschel : hlink/tests: Fix save data test on newer Windows 10.
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: 93aabab60daa5abaa99a5934086e62aa1ad16d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93aabab60daa5abaa99a5934… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 29 19:29:10 2018 +0200 hlink/tests: Fix save data test on newer Windows 10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 3525c44..265dea3 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -417,7 +417,8 @@ static void test_persist_save_data(const char *testname, IHlink *lnk, (expected_data_alt == expected_hlink_data3_ie7 && i == 109) /* Win10 */ || (expected_data_alt == expected_hlink_data5_ie7 && i == 107) /* Win10 */) { - ok(data[i] == 0 || broken(data[i] == 1), "Expected 0 or 1, got %d\n", data[i]); + ok(data[i] == 0 || broken(data[i] == 1) || broken(data[i] == 3), + "Expected 0 or 1, got %d\n", data[i]); continue; } if ((expected_data_alt[i] != data[i]) &&

1 0

Alistair Leslie-Hughes : wininet: Add support for FormatMessage.
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: bb41feacd4d645295e9e6390b9dd49ac68f4d73b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb41feacd4d645295e9e6390… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 29 09:30:08 2018 +0000 wininet: Add support for FormatMessage. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/Makefile.in | 3 ++ dlls/wininet/tests/internet.c | 60 ++++++++++++++++++++++++++++++++ dlls/wininet/winineterror.mc | 80 +++++++++++++++++++++++++++++++++++++++++++ po/ar.po | 66 +++++++++++++++++++++++++++++++++++ po/bg.po | 57 ++++++++++++++++++++++++++++++ po/ca.po | 66 +++++++++++++++++++++++++++++++++++ po/cs.po | 66 +++++++++++++++++++++++++++++++++++ po/da.po | 66 +++++++++++++++++++++++++++++++++++ po/de.po | 66 +++++++++++++++++++++++++++++++++++ po/el.po | 54 +++++++++++++++++++++++++++++ po/en.po | 56 ++++++++++++++++++++++++++++++ po/en_US.po | 56 ++++++++++++++++++++++++++++++ po/eo.po | 60 ++++++++++++++++++++++++++++++++ po/es.po | 66 +++++++++++++++++++++++++++++++++++ po/fa.po | 54 +++++++++++++++++++++++++++++ po/fi.po | 66 +++++++++++++++++++++++++++++++++++ po/fr.po | 66 +++++++++++++++++++++++++++++++++++ po/he.po | 60 ++++++++++++++++++++++++++++++++ po/hi.po | 52 ++++++++++++++++++++++++++++ po/hr.po | 66 +++++++++++++++++++++++++++++++++++ po/hu.po | 66 +++++++++++++++++++++++++++++++++++ po/it.po | 66 +++++++++++++++++++++++++++++++++++ po/ja.po | 66 +++++++++++++++++++++++++++++++++++ po/ko.po | 66 +++++++++++++++++++++++++++++++++++ po/lt.po | 66 +++++++++++++++++++++++++++++++++++ po/ml.po | 52 ++++++++++++++++++++++++++++ po/nb_NO.po | 66 +++++++++++++++++++++++++++++++++++ po/nl.po | 66 +++++++++++++++++++++++++++++++++++ po/or.po | 52 ++++++++++++++++++++++++++++ po/pa.po | 52 ++++++++++++++++++++++++++++ po/pl.po | 66 +++++++++++++++++++++++++++++++++++ po/pt_BR.po | 66 +++++++++++++++++++++++++++++++++++ po/pt_PT.po | 66 +++++++++++++++++++++++++++++++++++ po/rm.po | 52 ++++++++++++++++++++++++++++ po/ro.po | 64 ++++++++++++++++++++++++++++++++++ po/ru.po | 66 +++++++++++++++++++++++++++++++++++ po/sk.po | 54 +++++++++++++++++++++++++++++ po/sl.po | 66 +++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 59 +++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 59 +++++++++++++++++++++++++++++++ po/sv.po | 66 +++++++++++++++++++++++++++++++++++ po/te.po | 52 ++++++++++++++++++++++++++++ po/th.po | 56 ++++++++++++++++++++++++++++++ po/tr.po | 66 +++++++++++++++++++++++++++++++++++ po/uk.po | 64 ++++++++++++++++++++++++++++++++++ po/wa.po | 54 +++++++++++++++++++++++++++++ po/wine.pot | 52 ++++++++++++++++++++++++++++ po/zh_CN.po | 66 +++++++++++++++++++++++++++++++++++ po/zh_TW.po | 66 +++++++++++++++++++++++++++++++++++ 49 files changed, 2964 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb41feacd4d645295e9e…

1 0

Alex Henrie : ping: Distinguish between timeouts and other failures.
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: d3dc6f900a4002b19a1fc06de7a9e02811ff79f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3dc6f900a4002b19a1fc06d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Mar 7 22:02:13 2018 -0700 ping: Distinguish between timeouts and other failures. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ping/ping_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/ping/ping_main.c b/programs/ping/ping_main.c index 74a1c71..9c4f239 100644 --- a/programs/ping/ping_main.c +++ b/programs/ping/ping_main.c @@ -157,6 +157,7 @@ int main(int argc, char** argv) printf("Pinging %s [%s] with %d bytes of data:\n", hostname, ip, l); for (;;) { + SetLastError(0); retval = IcmpSendEcho(icmp_file, ipaddr, send_data, l, NULL, reply_buffer, reply_size, w); if (retval != 0) @@ -177,7 +178,10 @@ int main(int argc, char** argv) } else { - printf("Request timed out.\n"); + if (GetLastError() == IP_REQ_TIMED_OUT) + puts("Request timed out."); + else + puts("PING: transmit failed. General failure."); lost++; } i++;

1 0

Alistair Leslie-Hughes : fltmgr.sys: Add FltStartFiltering stub.
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: f3a2bb1b10adb8577a2f753ab3d39e7c358d3f85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3a2bb1b10adb8577a2f753a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 22 03:48:12 2018 +0000 fltmgr.sys: Add FltStartFiltering stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index 000368f..0a3b1c6 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -150,7 +150,7 @@ @ stub FltSetStreamHandleContext @ stub FltSetVolumeContext @ stub FltSetVolumeInformation -@ stub FltStartFiltering +@ stdcall FltStartFiltering(ptr) @ stub FltSupportsFileContexts @ stub FltSupportsStreamContexts @ stub FltSupportsStreamHandleContexts diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index d690a29..26fc9a9 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -52,3 +52,10 @@ NTSTATUS WINAPI FltRegisterFilter( PDRIVER_OBJECT driver, const FLT_REGISTRATION return STATUS_SUCCESS; } + +NTSTATUS WINAPI FltStartFiltering( PFLT_FILTER filter ) +{ + FIXME( "(%p): stub\n", filter ); + + return STATUS_SUCCESS; +}

1 0

Alistair Leslie-Hughes : fltmgr.sys: Add FltRegisterFilter stub.
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: b2ebe2834fb5a87df095008c66ef713a5bf2b2f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2ebe2834fb5a87df095008c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 22 03:48:11 2018 +0000 fltmgr.sys: Add FltRegisterFilter stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index ea84d81..000368f 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -128,7 +128,7 @@ @ stub FltReadFile @ stub FltReferenceContext @ stub FltReferenceFileNameInformation -@ stub FltRegisterFilter +@ stdcall FltRegisterFilter(ptr ptr ptr) @ stub FltReissueSynchronousIo @ stub FltReleaseContext @ stub FltReleaseContexts diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 09c89a1..d690a29 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -42,3 +42,13 @@ void WINAPI FltInitializePushLock( EX_PUSH_LOCK *lock ) { FIXME( "(%p): stub\n", lock ); } + +NTSTATUS WINAPI FltRegisterFilter( PDRIVER_OBJECT driver, const FLT_REGISTRATION *reg, PFLT_FILTER *filter ) +{ + FIXME( "(%p,%p,%p): stub\n", driver, reg, filter ); + + if(filter) + *filter = UlongToHandle(0xdeadbeaf); + + return STATUS_SUCCESS; +}

1 0

Alistair Leslie-Hughes : include/ddk: Add fltkernel.h.
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: 0bbb1c32a99245e1bd8d978894a4b918843df90e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bbb1c32a99245e1bd8d9788… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 22 03:48:10 2018 +0000 include/ddk: Add fltkernel.h. This also updates fltmgr.sys to make use of this new file. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/main.c | 5 +- include/Makefile.in | 1 + include/ddk/fltkernel.h | 665 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 668 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bbb1c32a99245e1bd8d…

1 0

Alistair Leslie-Hughes : fltmgr.sys: Add FltUnregisterFilter stub.
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: c248b6cfb124258145d318ff4dcefa39e62e6a14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c248b6cfb124258145d318ff… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 22 03:48:13 2018 +0000 fltmgr.sys: Add FltUnregisterFilter stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index 0a3b1c6..c217ad3 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -158,6 +158,6 @@ @ stub FltUninitializeFileLock @ stub FltUninitializeOplock @ stub FltUnloadFilter -@ stub FltUnregisterFilter +@ stdcall FltUnregisterFilter(ptr) @ stub FltUntagFile @ stub FltWriteFile diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 26fc9a9..2ffde97 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -59,3 +59,8 @@ NTSTATUS WINAPI FltStartFiltering( PFLT_FILTER filter ) return STATUS_SUCCESS; } + +void WINAPI FltUnregisterFilter( PFLT_FILTER filter ) +{ + FIXME( "(%p): stub\n", filter ); +}

1 0

Louis Lenders : msctf: Return S_OK in TextStoreACPSink_OnSelectionChange.
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: 08b077296cd7ab620646b5ab4fb48af38bb8716d URL: https://source.winehq.org/git/wine.git/?a=commit;h=08b077296cd7ab620646b5ab… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Apr 4 11:48:00 2018 +0200 msctf: Return S_OK in TextStoreACPSink_OnSelectionChange. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 70b06e2..d52884d 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -765,7 +765,7 @@ static HRESULT WINAPI TextStoreACPSink_OnSelectionChange(ITextStoreACPSink *ifac { Context *This = impl_from_ITextStoreACPSink(iface); FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI TextStoreACPSink_OnLayoutChange(ITextStoreACPSink *iface,

1 0

Louis Lenders : msctf: Return S_OK in TextStoreACPSink_OnTextChange.
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: a78d411b3892f86c081ab48781f6711a4382c49b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a78d411b3892f86c081ab487… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Apr 4 11:47:59 2018 +0200 msctf: Return S_OK in TextStoreACPSink_OnTextChange. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 54052f6..70b06e2 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -758,7 +758,7 @@ static HRESULT WINAPI TextStoreACPSink_OnTextChange(ITextStoreACPSink *iface, { Context *This = impl_from_ITextStoreACPSink(iface); FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI TextStoreACPSink_OnSelectionChange(ITextStoreACPSink *iface)

1 0