winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2018
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
602 discussions
Start a n
N
ew thread
Marcus Meissner : dxgi: Fixed typo in width/height (Coverity).
by Alexandre Julliard
02 Oct '18
02 Oct '18
Module: wine Branch: master Commit: 442fd828ffa800c1510c932e79223bb073146bd1 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=442fd828ffa800c1510c932e…
Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 29 20:22:49 2018 +0200 dxgi: Fixed typo in width/height (Coverity). CID 1439782 Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index d1908ac..f2bc9ed 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4392,7 +4392,7 @@ static void test_swapchain_window_messages(void) expect_messages = resize_target_messages; memset(&mode_desc, 0, sizeof(mode_desc)); mode_desc.Width = 800; - mode_desc.Width = 600; + mode_desc.Height = 600; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); flush_events(); @@ -4401,7 +4401,7 @@ static void test_swapchain_window_messages(void) expect_messages = resize_target_messages; memset(&mode_desc, 0, sizeof(mode_desc)); mode_desc.Width = 400; - mode_desc.Width = 200; + mode_desc.Height = 200; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); flush_events();
1
0
0
0
Piotr Caban : msvcr120: Added creal implementation.
by Alexandre Julliard
02 Oct '18
02 Oct '18
Module: wine Branch: master Commit: 83a0c2085f55bbe789f7aabf1d494c24c8d6ab37 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=83a0c2085f55bbe789f7aabf…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 19:50:45 2018 +0200 msvcr120: Added creal implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 3 ++- dlls/msvcr120/msvcr120.spec | 3 ++- dlls/msvcr120/tests/msvcr120.c | 7 +++++++ dlls/msvcr120_app/msvcr120_app.spec | 3 ++- dlls/msvcrt/math.c | 5 +++++ dlls/ucrtbase/ucrtbase.spec | 3 ++- 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index ec85a53..e7f3c98 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -202,7 +202,8 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ stub creal +@ cdecl -arch=i386 creal(double double) ucrtbase.creal +@ cdecl -arch=arm,x86_64,arm64 creal(ptr) ucrtbase.creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f3ab39a..fe4e2bd 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2103,7 +2103,8 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ stub creal +@ cdecl -arch=i386 creal(double double) MSVCR120_creal +@ cdecl -arch=arm,x86_64,arm64 creal(ptr) MSVCR120_creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 37957d5..79b667e 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -191,6 +191,7 @@ static void (__cdecl *p_free_locale)(_locale_t); static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); +static double (__cdecl *p_creal)(_Dcomplex); /* make sure we use the correct errno */ #undef errno @@ -250,6 +251,7 @@ static BOOL init(void) SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); + SET(p_creal, "creal"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QEAA@XZ"); @@ -946,15 +948,20 @@ static void test_vsscanf(void) static void test__Cbuild(void) { _Dcomplex c; + double d; memset(&c, 0, sizeof(c)); p__Cbuild(&c, 1.0, 2.0); ok(c.r == 1.0, "c.r = %lf\n", c.r); ok(c.i == 2.0, "c.i = %lf\n", c.i); + d = p_creal(c); + ok(d == 1.0, "creal returned %lf\n", d); p__Cbuild(&c, 3.0, NAN); ok(c.r == 3.0, "c.r = %lf\n", c.r); ok(_isnan(c.i), "c.i = %lf\n", c.i); + d = p_creal(c); + ok(d == 3.0, "creal returned %lf\n", d); } START_TEST(msvcr120) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 1076ddf..4429a0c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1769,7 +1769,8 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ stub creal +@ cdecl -arch=i386 creal(double double) msvcr120.creal +@ cdecl -arch=arm,x86_64,arm64 creal(ptr) msvcr120.creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b920251..d4785d3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3390,4 +3390,9 @@ _Dcomplex* CDECL MSVCR120__Cbuild(_Dcomplex *ret, double r, double i) return ret; } +double CDECL MSVCR120_creal(_Dcomplex z) +{ + return z.x; +} + #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3d0de47..084bea8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2246,7 +2246,8 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ stub creal +@ cdecl -arch=i386 creal(double double) MSVCR120_creal +@ cdecl -arch=arm,x86_64,arm64 creal(ptr) MSVCR120_creal @ stub crealf @ stub creall @ stub csin
1
0
0
0
Piotr Caban : msvcr120: Added _Cbuild implementation.
by Alexandre Julliard
02 Oct '18
02 Oct '18
Module: wine Branch: master Commit: 84f5d8a619c599dbacff499989500e653abec0fa URL:
https://source.winehq.org/git/wine.git/?a=commit;h=84f5d8a619c599dbacff4999…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 19:50:39 2018 +0200 msvcr120: Added _Cbuild implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 23 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 7 +++++++ dlls/msvcrt/msvcrt.h | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 7bae4ff..ec85a53 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl -arch=i386 _CIsqrt() ucrtbase._CIsqrt @ cdecl -arch=i386 _CItan() ucrtbase._CItan @ cdecl -arch=i386 _CItanh() ucrtbase._CItanh -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) ucrtbase._Cbuild @ stub _Cmulcc @ stub _Cmulcr @ stub _FCbuild diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 44f728b..f3ab39a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -824,7 +824,7 @@ @ cdecl -arch=i386 _CItanh() @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) MSVCR120__Cbuild @ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 85e83a6..37957d5 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -163,6 +163,12 @@ typedef struct unsigned int status; } fenv_t; +typedef struct +{ + double r; + double i; +} _Dcomplex; + static char* (CDECL *p_setlocale)(int category, const char* locale); static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); @@ -184,6 +190,7 @@ static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); +static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); /* make sure we use the correct errno */ #undef errno @@ -242,6 +249,7 @@ static BOOL init(void) SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); + SET(p__Cbuild, "_Cbuild"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QEAA@XZ"); @@ -935,6 +943,20 @@ static void test_vsscanf(void) ok(v == 10, "got %d.\n", v); } +static void test__Cbuild(void) +{ + _Dcomplex c; + + memset(&c, 0, sizeof(c)); + p__Cbuild(&c, 1.0, 2.0); + ok(c.r == 1.0, "c.r = %lf\n", c.r); + ok(c.i == 2.0, "c.i = %lf\n", c.i); + + p__Cbuild(&c, 3.0, NAN); + ok(c.r == 3.0, "c.r = %lf\n", c.r); + ok(_isnan(c.i), "c.i = %lf\n", c.i); +} + START_TEST(msvcr120) { if (!init()) return; @@ -953,4 +975,5 @@ START_TEST(msvcr120) test__Condition_variable(); test_wctype(); test_vsscanf(); + test__Cbuild(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 935de2b..1076ddf 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -818,7 +818,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcr120._CIsqrt @ cdecl -arch=i386 _CItan() msvcr120._CItan @ cdecl -arch=i386 _CItanh() msvcr120._CItanh -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) msvcr120._Cbuild @ cdecl _CreateFrameInfo(ptr ptr) msvcr120._CreateFrameInfo @ stdcall _CxxThrowException(ptr ptr) msvcr120._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcr120._EH_prolog diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index dbfaa24..b920251 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3383,4 +3383,11 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, return res; } +_Dcomplex* CDECL MSVCR120__Cbuild(_Dcomplex *ret, double r, double i) +{ + ret->x = r; + ret->y = i; + return ret; +} + #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4e24ec0..37e820a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -458,6 +458,7 @@ struct MSVCRT__complex { double x; /* Real part */ double y; /* Imaginary part */ }; +typedef struct MSVCRT__complex _Dcomplex; typedef struct MSVCRT__div_t { int quot; /* quotient */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1ced9ca..3d0de47 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -14,7 +14,7 @@ @ cdecl -arch=i386 _CIsqrt() @ cdecl -arch=i386 _CItan() @ cdecl -arch=i386 _CItanh() -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) MSVCR120__Cbuild @ stub _Cmulcc @ stub _Cmulcr @ cdecl _CreateFrameInfo(ptr ptr)
1
0
0
0
Hans Leidekker : msi: Add support for control event DirectoryListNew.
by Alexandre Julliard
02 Oct '18
02 Oct '18
Module: wine Branch: master Commit: 97a7a4ff0c8895c3ef1979eeee988c4c121d9839 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=97a7a4ff0c8895c3ef1979ee…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 1 17:01:49 2018 +0200 msi: Add support for control event DirectoryListNew. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=25687
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 164 +++++++++++++++++++++++++++----------- dlls/msi/msi.rc | 1 + dlls/msi/resource.h | 2 + po/ar.po | 218 +++++++++++++++++++++++++-------------------------- po/bg.po | 218 +++++++++++++++++++++++++-------------------------- po/ca.po | 218 +++++++++++++++++++++++++-------------------------- po/cs.po | 218 +++++++++++++++++++++++++-------------------------- po/da.po | 218 +++++++++++++++++++++++++-------------------------- po/de.po | 218 +++++++++++++++++++++++++-------------------------- po/el.po | 218 +++++++++++++++++++++++++-------------------------- po/en.po | 218 +++++++++++++++++++++++++-------------------------- po/en_US.po | 218 +++++++++++++++++++++++++-------------------------- po/eo.po | 218 +++++++++++++++++++++++++-------------------------- po/es.po | 218 +++++++++++++++++++++++++-------------------------- po/fa.po | 218 +++++++++++++++++++++++++-------------------------- po/fi.po | 218 +++++++++++++++++++++++++-------------------------- po/fr.po | 218 +++++++++++++++++++++++++-------------------------- po/he.po | 218 +++++++++++++++++++++++++-------------------------- po/hi.po | 218 +++++++++++++++++++++++++-------------------------- po/hr.po | 218 +++++++++++++++++++++++++-------------------------- po/hu.po | 218 +++++++++++++++++++++++++-------------------------- po/it.po | 218 +++++++++++++++++++++++++-------------------------- po/ja.po | 218 +++++++++++++++++++++++++-------------------------- po/ko.po | 218 +++++++++++++++++++++++++-------------------------- po/lt.po | 218 +++++++++++++++++++++++++-------------------------- po/ml.po | 218 +++++++++++++++++++++++++-------------------------- po/nb_NO.po | 218 +++++++++++++++++++++++++-------------------------- po/nl.po | 218 +++++++++++++++++++++++++-------------------------- po/or.po | 218 +++++++++++++++++++++++++-------------------------- po/pa.po | 218 +++++++++++++++++++++++++-------------------------- po/pl.po | 218 +++++++++++++++++++++++++-------------------------- po/pt_BR.po | 218 +++++++++++++++++++++++++-------------------------- po/pt_PT.po | 218 +++++++++++++++++++++++++-------------------------- po/rm.po | 218 +++++++++++++++++++++++++-------------------------- po/ro.po | 218 +++++++++++++++++++++++++-------------------------- po/ru.po | 218 +++++++++++++++++++++++++-------------------------- po/sk.po | 218 +++++++++++++++++++++++++-------------------------- po/sl.po | 218 +++++++++++++++++++++++++-------------------------- po/sr_RS(a)cyrillic.po | 218 +++++++++++++++++++++++++-------------------------- po/sr_RS(a)latin.po | 218 +++++++++++++++++++++++++-------------------------- po/sv.po | 218 +++++++++++++++++++++++++-------------------------- po/te.po | 218 +++++++++++++++++++++++++-------------------------- po/th.po | 218 +++++++++++++++++++++++++-------------------------- po/tr.po | 218 +++++++++++++++++++++++++-------------------------- po/uk.po | 218 +++++++++++++++++++++++++-------------------------- po/wa.po | 218 +++++++++++++++++++++++++-------------------------- po/wine.pot | 218 +++++++++++++++++++++++++-------------------------- po/zh_CN.po | 218 +++++++++++++++++++++++++-------------------------- po/zh_TW.po | 218 +++++++++++++++++++++++++-------------------------- 49 files changed, 5137 insertions(+), 5058 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=97a7a4ff0c8895c3ef19…
1
0
0
0
Hans Leidekker : msi: Fix a couple of memory leaks (Valgrind).
by Alexandre Julliard
02 Oct '18
02 Oct '18
Module: wine Branch: master Commit: 1cb43677632ded6aba8ba0b91937ded934c0c690 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=1cb43677632ded6aba8ba0b9…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 1 17:01:48 2018 +0200 msi: Fix a couple of memory leaks (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/install.c | 7 ++++--- dlls/msi/package.c | 4 ++++ dlls/msi/streams.c | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index ce36bd3..2cdebd2 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -411,8 +411,7 @@ WCHAR *msi_resolve_source_folder( MSIPACKAGE *package, const WCHAR *name, MSIFOL UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DWORD *sz) { MSIPACKAGE *package; - const WCHAR *path; - WCHAR *folderW; + WCHAR *path, *folderW; UINT r; TRACE("%s %p %p\n", debugstr_a(folder), buf, sz); @@ -459,6 +458,7 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW else r = ERROR_DIRECTORY; + heap_free(path); heap_free(folderW); msiobj_release(&package->hdr); return r; @@ -470,7 +470,7 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW UINT WINAPI MsiGetSourcePathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf, DWORD *sz) { MSIPACKAGE *package; - const WCHAR *path; + WCHAR *path; UINT r; TRACE("%s %p %p\n", debugstr_w(folder), buf, sz); @@ -510,6 +510,7 @@ UINT WINAPI MsiGetSourcePathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf, else r = ERROR_DIRECTORY; + heap_free(path); msiobj_release(&package->hdr); return r; } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 8e9ae6d..39a0a93 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2125,6 +2125,7 @@ INT WINAPI MsiProcessMessage( MSIHANDLE hInstall, INSTALLMESSAGE eMessageType, ret = MSI_ProcessMessage( package, eMessageType, record ); + msiobj_release( &record->hdr ); msiobj_release( &package->hdr ); return ret; } @@ -2689,7 +2690,10 @@ UINT __cdecl s_remote_FormatRecord(MSIHANDLE hinst, struct wire_record *remote_r { *value = midl_user_allocate(++size * sizeof(WCHAR)); if (!*value) + { + MsiCloseHandle(rec); return ERROR_OUTOFMEMORY; + } r = MsiFormatRecordW(hinst, rec, *value, &size); } diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 7f9582c..74ef899 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -141,9 +141,9 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U old = sv->db->streams[row].stream; hr = IStream_QueryInterface( new, &IID_IStream, (void **)&sv->db->streams[row].stream ); + IStream_Release( new ); if (FAILED( hr )) { - IStream_Release( new ); return ERROR_FUNCTION_FAILED; } if (old) IStream_Release( old );
1
0
0
0
Dmitry Timoshkov : user32: Fix the pointer to custom dialog control data.
by Alexandre Julliard
02 Oct '18
02 Oct '18
Module: wine Branch: master Commit: 5277aa8f64ae614c75fb32e3db135a49f3f83b3a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=5277aa8f64ae614c75fb32e3…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 1 14:47:45 2018 +0800 user32: Fix the pointer to custom dialog control data. Suggested by vendor2013(a)herdsoft.com. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 2 +- dlls/user32/tests/dialog.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 7b91819..c5c646e 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -197,7 +197,7 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, TRACE("\n"); TRACE(" END\n" ); } - info->data = p + 1; + info->data = p; p += GET_WORD(p) / sizeof(WORD); } else info->data = NULL; diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b75759b..631f3d3 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -553,7 +553,6 @@ static LRESULT CALLBACK test_control_procA(HWND hwnd, UINT msg, WPARAM wparam, L static const short sample[] = { 10,1,2,3,4,5 }; CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; short *data = cs->lpCreateParams; -todo_wine ok(!memcmp(data, sample, sizeof(sample)), "data mismatch: %d,%d,%d,%d,%d\n", data[0], data[1], data[2], data[3], data[4]); } return 0;
1
0
0
0
Dmitry Timoshkov : wrc: Fix generation of custom dialog control data.
by Alexandre Julliard
02 Oct '18
02 Oct '18
Module: wine Branch: master Commit: d8607c57b09341291b150afbb2998f3dc9267f6b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d8607c57b09341291b150afb…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 1 14:47:42 2018 +0800 wrc: Fix generation of custom dialog control data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 8c2f280..939d265 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -726,8 +726,7 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) put_word(res, 0); if(ctrl->extra) { - put_word(res, ctrl->extra->size+2); - put_pad(res); + put_word(res, ctrl->extra->size); put_raw_data(res, ctrl->extra, 0); } else
1
0
0
0
Dmitry Timoshkov : user32/tests: Add a test for custom dialog control data.
by Alexandre Julliard
02 Oct '18
02 Oct '18
Module: wine Branch: master Commit: 606b0272776ec2a4e6146aa29a993fc88e98214b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=606b0272776ec2a4e6146aa2…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 1 14:47:37 2018 +0800 user32/tests: Add a test for custom dialog control data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 9 +++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 0604423..b75759b 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -544,6 +544,27 @@ static LRESULT CALLBACK testDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, return DefDlgProcA (hwnd, uiMsg, wParam, lParam); } +static LRESULT CALLBACK test_control_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch(msg) + { + case WM_CREATE: + { + static const short sample[] = { 10,1,2,3,4,5 }; + CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; + short *data = cs->lpCreateParams; +todo_wine + ok(!memcmp(data, sample, sizeof(sample)), "data mismatch: %d,%d,%d,%d,%d\n", data[0], data[1], data[2], data[3], data[4]); + } + return 0; + + default: + break; + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA cls; @@ -563,7 +584,10 @@ static BOOL RegisterWindowClasses (void) cls.lpfnWndProc = main_window_procA; cls.lpszClassName = "IsDialogMessageWindowClass"; + if (!RegisterClassA (&cls)) return FALSE; + cls.lpfnWndProc = test_control_procA; + cls.lpszClassName = "TESTCONTROL"; if (!RegisterClassA (&cls)) return FALSE; GetClassInfoA(0, "#32770", &cls); @@ -2048,12 +2072,26 @@ static void test_MessageBox(void) UnhookWindowsHookEx(hook); } +static INT_PTR CALLBACK custom_test_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if (msg == WM_INITDIALOG) + EndDialog(hdlg, 0); + + return FALSE; +} + +static void test_dialog_custom_data(void) +{ + DialogBoxA(g_hinst, "CUSTOM_TEST_DIALOG", NULL, custom_test_dialog_proc); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); if (!RegisterWindowClasses()) assert(0); + test_dialog_custom_data(); test_GetNextDlgItem(); test_IsDialogMessage(); test_WM_NEXTDLGCTL(); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 756e38f..a9e45e9 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -206,6 +206,15 @@ FONT 8, "MS Shell Dlg" EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_READONLY } +CUSTOM_TEST_DIALOG DIALOGEX 6, 15, 207, 111 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Custom Test Dialog" +FONT 8, "MS Sans Serif" +{ + CONTROL "evenlengthtext", -1, "TESTCONTROL", WS_CHILD|WS_VISIBLE|WS_BORDER|WS_TABSTOP, 10,10,100,50 { 1,2,3,4,5 } + CONTROL "oddlengthtext", -1, "TESTCONTROL", WS_CHILD|WS_VISIBLE|WS_BORDER|WS_TABSTOP, 10,60,100,50 { 1,2,3,4,5 } +} + /* @makedep: test_mono.bmp */ 100 BITMAP test_mono.bmp
1
0
0
0
Zebediah Figura : kernel32: Implement GetQueuedCompletionStatusEx().
by Alexandre Julliard
02 Oct '18
02 Oct '18
Module: wine Branch: master Commit: b79fd400c05547457bb10e74776b8f312bacae8c URL:
https://source.winehq.org/git/wine.git/?a=commit;h=b79fd400c05547457bb10e74…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 30 16:59:49 2018 -0500 kernel32: Implement GetQueuedCompletionStatusEx(). Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=43878
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-io-l1-1-0.spec | 2 +- .../api-ms-win-core-io-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 19 +++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-io-l1-1-0/api-ms-win-core-io-l1-1-0.spec b/dlls/api-ms-win-core-io-l1-1-0/api-ms-win-core-io-l1-1-0.spec index f73e427..ea0fd94 100644 --- a/dlls/api-ms-win-core-io-l1-1-0/api-ms-win-core-io-l1-1-0.spec +++ b/dlls/api-ms-win-core-io-l1-1-0/api-ms-win-core-io-l1-1-0.spec @@ -3,5 +3,5 @@ @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) kernel32.DeviceIoControl @ stdcall GetOverlappedResult(long ptr ptr long) kernel32.GetOverlappedResult @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) kernel32.GetQueuedCompletionStatus -@ stub GetQueuedCompletionStatusEx +@ stdcall GetQueuedCompletionStatusEx(ptr ptr long ptr long long) kernel32.GetQueuedCompletionStatusEx @ stdcall PostQueuedCompletionStatus(long long ptr ptr) kernel32.PostQueuedCompletionStatus diff --git a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec index 73aae1a..907c0b4 100644 --- a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec +++ b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec @@ -6,5 +6,5 @@ @ stdcall GetOverlappedResult(long ptr ptr long) kernel32.GetOverlappedResult @ stub GetOverlappedResultEx @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) kernel32.GetQueuedCompletionStatus -@ stub GetQueuedCompletionStatusEx +@ stdcall GetQueuedCompletionStatusEx(ptr ptr long ptr long long) kernel32.GetQueuedCompletionStatusEx @ stdcall PostQueuedCompletionStatus(long long ptr ptr) kernel32.PostQueuedCompletionStatus diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9db7d98..e17ee97 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -804,7 +804,7 @@ @ stdcall GetProfileStringA(str str str ptr long) @ stdcall GetProfileStringW(wstr wstr wstr ptr long) @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) -# @ stub GetQueuedCompletionStatusEx +@ stdcall GetQueuedCompletionStatusEx(ptr ptr long ptr long long) @ stub -i386 GetSLCallbackTarget @ stub -i386 GetSLCallbackTemplate @ stdcall GetShortPathNameA(str ptr long) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index a855e95..b05cfda 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2377,6 +2377,25 @@ BOOL WINAPI GetQueuedCompletionStatus( HANDLE CompletionPort, LPDWORD lpNumberOf return FALSE; } +/****************************************************************************** + * GetQueuedCompletionStatusEx (KERNEL32.@) + */ +BOOL WINAPI GetQueuedCompletionStatusEx( HANDLE port, OVERLAPPED_ENTRY *entries, ULONG count, + ULONG *written, DWORD timeout, BOOL alertable ) +{ + LARGE_INTEGER time; + NTSTATUS ret; + + TRACE("%p %p %u %p %u %u\n", port, entries, count, written, timeout, alertable); + + ret = NtRemoveIoCompletionEx( port, (FILE_IO_COMPLETION_INFORMATION *)entries, count, + written, get_nt_timeout( &time, timeout ), alertable ); + if (ret == STATUS_SUCCESS) return TRUE; + else if (ret == STATUS_TIMEOUT) SetLastError( WAIT_TIMEOUT ); + else if (ret == STATUS_USER_APC) SetLastError( WAIT_IO_COMPLETION ); + else SetLastError( RtlNtStatusToDosError(ret) ); + return FALSE; +} /****************************************************************************** * PostQueuedCompletionStatus (KERNEL32.@) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 2980576..7fa8c1d 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -645,7 +645,7 @@ # @ stub GetPublisherCacheFolder # @ stub GetPublisherRootFolder @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) kernel32.GetQueuedCompletionStatus -@ stub GetQueuedCompletionStatusEx +@ stdcall GetQueuedCompletionStatusEx(ptr ptr long ptr long long) kernel32.GetQueuedCompletionStatusEx # @ stub GetRegistryExtensionFlags # @ stub GetRoamingLastObservedChangeTime @ stdcall GetSecurityDescriptorControl(ptr ptr ptr) advapi32.GetSecurityDescriptorControl diff --git a/include/winbase.h b/include/winbase.h index de52e5a..ea450e1 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2205,6 +2205,7 @@ WINBASEAPI INT WINAPI GetProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT) WINBASEAPI INT WINAPI GetProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT); #define GetProfileString WINELIB_NAME_AW(GetProfileString) WINBASEAPI BOOL WINAPI GetQueuedCompletionStatus(HANDLE,LPDWORD,PULONG_PTR,LPOVERLAPPED*,DWORD); +WINBASEAPI BOOL WINAPI GetQueuedCompletionStatusEx(HANDLE,OVERLAPPED_ENTRY*,ULONG,ULONG*,DWORD,BOOL); WINADVAPI BOOL WINAPI GetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR_CONTROL,LPDWORD); WINADVAPI BOOL WINAPI GetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,LPBOOL,PACL *,LPBOOL); WINADVAPI BOOL WINAPI GetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR,PSID *,LPBOOL);
1
0
0
0
Zebediah Figura : kernel32/tests: Add some tests for completion ports.
by Alexandre Julliard
02 Oct '18
02 Oct '18
Module: wine Branch: master Commit: a2c11943c8e372ddb1a81e9a822e08df4f2f6f8a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=a2c11943c8e372ddb1a81e9a…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 30 16:59:48 2018 -0500 kernel32/tests: Add some tests for completion ports. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 111 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33cae4b..eb27d55 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -60,6 +60,7 @@ static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR*); static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, void*, DWORD); +static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, ULONG, ULONG*, DWORD, BOOL); static const char filename[] = "testfile.xxx"; static const char sillytext[] = @@ -105,6 +106,7 @@ static void InitFunctionPointers(void) pGetFinalPathNameByHandleA = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleA"); pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); + pGetQueuedCompletionStatusEx = (void *) GetProcAddress(hkernel32, "GetQueuedCompletionStatusEx"); } static void test__hread( void ) @@ -4988,6 +4990,114 @@ static void test_GetFileAttributesExW(void) ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); } +static void test_post_completion(void) +{ + OVERLAPPED ovl, ovl2, *povl; + OVERLAPPED_ENTRY entries[2]; + ULONG_PTR key; + HANDLE port; + ULONG count; + DWORD size; + BOOL ret; + + port = CreateIoCompletionPort( INVALID_HANDLE_VALUE, NULL, 999, 0 ); + ok(port != NULL, "CreateIoCompletionPort failed: %u\n", GetLastError()); + + ret = GetQueuedCompletionStatus( port, &size, &key, &povl, 0 ); + ok(!ret, "GetQueuedCompletionStatus succeeded\n"); + ok(GetLastError() == WAIT_TIMEOUT, "wrong error %u\n", GetLastError()); + + ret = PostQueuedCompletionStatus( port, 123, 456, &ovl ); + ok(ret, "PostQueuedCompletionStatus failed: %u\n", GetLastError()); + + ret = GetQueuedCompletionStatus( port, &size, &key, &povl, 0 ); + ok(ret, "GetQueuedCompletionStatus failed: %u\n", GetLastError()); + ok(size == 123, "wrong size %u\n", size); + ok(key == 456, "wrong key %lu\n", key); + ok(povl == &ovl, "wrong ovl %p\n", povl); + + ret = GetQueuedCompletionStatus( port, &size, &key, &povl, 0 ); + ok(!ret, "GetQueuedCompletionStatus succeeded\n"); + ok(GetLastError() == WAIT_TIMEOUT, "wrong error %u\n", GetLastError()); + + if (!pGetQueuedCompletionStatusEx) + { + skip("GetQueuedCompletionStatusEx not available\n"); + CloseHandle( port ); + return; + } + + count = 0xdeadbeef; + ret = pGetQueuedCompletionStatusEx( port, entries, 2, &count, 0, FALSE ); + ok(!ret, "GetQueuedCompletionStatusEx succeeded\n"); + ok(GetLastError() == WAIT_TIMEOUT, "wrong error %u\n", GetLastError()); + ok(count == 1, "wrong count %u\n", count); + + ret = PostQueuedCompletionStatus( port, 123, 456, &ovl ); + ok(ret, "PostQueuedCompletionStatus failed: %u\n", GetLastError()); + + count = 0xdeadbeef; + memset( entries, 0xcc, sizeof(entries) ); + ret = pGetQueuedCompletionStatusEx( port, entries, 2, &count, 0, FALSE ); + ok(ret, "GetQueuedCompletionStatusEx failed\n"); + ok(count == 1, "wrong count %u\n", count); + ok(entries[0].lpCompletionKey == 456, "wrong key %lu\n", entries[0].lpCompletionKey); + ok(entries[0].lpOverlapped == &ovl, "wrong ovl %p\n", entries[0].lpOverlapped); + ok(!(ULONG)entries[0].Internal, "wrong internal %#x\n", (ULONG)entries[0].Internal); + ok(entries[0].dwNumberOfBytesTransferred == 123, "wrong size %u\n", entries[0].dwNumberOfBytesTransferred); + + ret = PostQueuedCompletionStatus( port, 123, 456, &ovl ); + ok(ret, "PostQueuedCompletionStatus failed: %u\n", GetLastError()); + + ret = PostQueuedCompletionStatus( port, 654, 321, &ovl2 ); + ok(ret, "PostQueuedCompletionStatus failed: %u\n", GetLastError()); + + count = 0xdeadbeef; + memset( entries, 0xcc, sizeof(entries) ); + ret = pGetQueuedCompletionStatusEx( port, entries, 2, &count, 0, FALSE ); + ok(ret, "GetQueuedCompletionStatusEx failed\n"); + ok(count == 2, "wrong count %u\n", count); + ok(entries[0].lpCompletionKey == 456, "wrong key %lu\n", entries[0].lpCompletionKey); + ok(entries[0].lpOverlapped == &ovl, "wrong ovl %p\n", entries[0].lpOverlapped); + ok(!(ULONG)entries[0].Internal, "wrong internal %#x\n", (ULONG)entries[0].Internal); + ok(entries[0].dwNumberOfBytesTransferred == 123, "wrong size %u\n", entries[0].dwNumberOfBytesTransferred); + ok(entries[1].lpCompletionKey == 321, "wrong key %lu\n", entries[1].lpCompletionKey); + ok(entries[1].lpOverlapped == &ovl2, "wrong ovl %p\n", entries[1].lpOverlapped); + ok(!(ULONG)entries[1].Internal, "wrong internal %#x\n", (ULONG)entries[1].Internal); + ok(entries[1].dwNumberOfBytesTransferred == 654, "wrong size %u\n", entries[1].dwNumberOfBytesTransferred); + + user_apc_ran = FALSE; + QueueUserAPC( user_apc, GetCurrentThread(), 0 ); + + ret = pGetQueuedCompletionStatusEx( port, entries, 2, &count, 0, FALSE ); + ok(!ret, "GetQueuedCompletionStatusEx succeeded\n"); + ok(GetLastError() == WAIT_TIMEOUT, "wrong error %u\n", GetLastError()); + ok(count == 1, "wrong count %u\n", count); + ok(!user_apc_ran, "user APC should not have run\n"); + + ret = pGetQueuedCompletionStatusEx( port, entries, 2, &count, 0, TRUE ); + ok(!ret || broken(ret) /* Vista */, "GetQueuedCompletionStatusEx succeeded\n"); + if (!ret) + ok(GetLastError() == WAIT_IO_COMPLETION, "wrong error %u\n", GetLastError()); + ok(count == 1, "wrong count %u\n", count); + ok(user_apc_ran, "user APC should have run\n"); + + user_apc_ran = FALSE; + QueueUserAPC( user_apc, GetCurrentThread(), 0 ); + + ret = PostQueuedCompletionStatus( port, 123, 456, &ovl ); + ok(ret, "PostQueuedCompletionStatus failed: %u\n", GetLastError()); + + ret = pGetQueuedCompletionStatusEx( port, entries, 2, &count, 0, TRUE ); + ok(ret, "GetQueuedCompletionStatusEx failed\n"); + ok(count == 1, "wrong count %u\n", count); + ok(!user_apc_ran, "user APC should not have run\n"); + + SleepEx(0, TRUE); + + CloseHandle( port ); +} + START_TEST(file) { InitFunctionPointers(); @@ -5046,4 +5156,5 @@ START_TEST(file) test_GetFinalPathNameByHandleW(); test_SetFileInformationByHandle(); test_GetFileAttributesExW(); + test_post_completion(); }
1
0
0
0
← Newer
1
...
55
56
57
58
59
60
61
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
Results per page:
10
25
50
100
200