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
August 2019
----- 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
2 participants
703 discussions
Start a n
N
ew thread
Jacek Caban : jscript: Allow 0x strings with explicit radix 16 in parseInt.
by Alexandre Julliard
09 Aug '19
09 Aug '19
Module: wine Branch: master Commit: 9dd50eae0669417e9f3c16cd4604f337e76db850 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=9dd50eae0669417e9f3c16cd…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 8 15:26:06 2019 +0200 jscript: Allow 0x strings with explicit radix 16 in parseInt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/global.c | 2 ++ dlls/jscript/tests/api.js | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 100cf40..33e6415 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -336,6 +336,8 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, }else { radix = 10; } + }else if(radix == 16 && *ptr == '0' && (ptr[1] == 'x' || ptr[1] == 'X')) { + ptr += 2; } i = char_to_int(*ptr++); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 40a1b2d..58a0cd3 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -156,6 +156,12 @@ i = parseInt("1", 37); ok(isNaN(i), "parseInt('1', 37) = " + i); i = parseInt("1", 36); ok(i === 1, "parseInt('1', 36) = " + i); +i = parseInt("0x1f", 16); +ok(i === 31, "parseInt('0xf', 16) = " + i); +i = parseInt("0x", 16); +ok(isNaN(i), "parseInt('0x', 16) = " + i); +i = parseInt("0x1f", 17); +ok(i === 0, "parseInt('0xf', 16) = " + i); tmp = encodeURI("abc"); ok(tmp === "abc", "encodeURI('abc') = " + tmp);
1
0
0
0
Jacek Caban : jscript: Support VT_UI1 and VT_I1 types.
by Alexandre Julliard
09 Aug '19
09 Aug '19
Module: wine Branch: master Commit: 58dd9c2b9968164a4f6b6fb618cd513d2b9bb5c3 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=58dd9c2b9968164a4f6b6fb6…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 8 15:25:56 2019 +0200 jscript: Support VT_UI1 and VT_I1 types. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 6 ++++++ dlls/jscript/tests/run.c | 14 +++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index ee949ff..79971f7 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -292,6 +292,12 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) *r = jsval_disp(V_DISPATCH(var)); return S_OK; } + case VT_I1: + *r = jsval_number(V_I1(var)); + return S_OK; + case VT_UI1: + *r = jsval_number(V_UI1(var)); + return S_OK; case VT_I2: *r = jsval_number(V_I2(var)); return S_OK; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index e48f748..a7eaf08 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1448,7 +1448,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[8], v; + VARIANT args[10], v; DISPPARAMS dp = {args, NULL, ARRAY_SIZE(args), 0}; HRESULT hres; @@ -1491,7 +1491,11 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(args+6) = VT_R4; V_R4(args+6) = 0.5; V_VT(args+7) = VT_UI2; - V_R4(args+7) = 3; + V_UI2(args+7) = 3; + V_VT(args+8) = VT_UI1; + V_UI1(args+8) = 4; + V_VT(args+9) = VT_I1; + V_I1(args+9) = 5; V_VT(&v) = VT_I4; V_I4(&v) = 2; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); @@ -2924,7 +2928,7 @@ static BOOL run_tests(void) SET_EXPECT(global_testargtypes_i); parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp," - "function(ui2,r4,i4ref,ui4,nullunk,d,i,s) {" + "function(i1,ui1,ui2,r4,i4ref,ui4,nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" @@ -2937,6 +2941,10 @@ static BOOL run_tests(void) " ok(r4 === 0.5, 'r4 = ' + r4);" " ok(getVT(r4) === 'VT_R8', 'getVT(r4) = ' + getVT(r4));" " ok(getVT(ui2) === 'VT_I4', 'getVT(ui2) = ' + getVT(ui2));" + " ok(getVT(ui1) === 'VT_I4', 'getVT(ui1) = ' + getVT(ui1));" + " ok(ui1 === 4, 'ui1 = ' + ui1);" + " ok(getVT(i1) === 'VT_I4', 'getVT(i1) = ' + getVT(i1));" + " ok(i1 === 5, 'i1 = ' + i1);" "});"); CHECK_CALLED(global_testargtypes_i);
1
0
0
0
Alexandre Julliard : kernel32: Move fiber functions to kernelbase.
by Alexandre Julliard
09 Aug '19
09 Aug '19
Module: wine Branch: master Commit: c168fd066d3ef8f909090eca8056d63f5f410485 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c168fd066d3ef8f909090eca…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 8 14:32:20 2019 +0200 kernel32: Move fiber functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/fiber.c | 438 ---------------------------------------- dlls/kernel32/kernel32.spec | 24 +-- dlls/kernelbase/kernelbase.spec | 24 +-- dlls/kernelbase/thread.c | 419 +++++++++++++++++++++++++++++++++++++- 5 files changed, 442 insertions(+), 464 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=c168fd066d3ef8f90909…
1
0
0
0
Alexandre Julliard : kernel32: Move thread pool functions to kernelbase.
by Alexandre Julliard
09 Aug '19
09 Aug '19
Module: wine Branch: master Commit: 296da1fbb1f691f917fd6f228c84992d92006fa9 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=296da1fbb1f691f917fd6f22…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 8 14:25:58 2019 +0200 kernel32: Move thread pool functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 18 ++--- dlls/kernel32/thread.c | 174 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 14 ++-- dlls/kernelbase/thread.c | 89 ++++++++++++++++++++ 4 files changed, 105 insertions(+), 190 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=296da1fbb1f691f917fd…
1
0
0
0
Alexandre Julliard : kernel32: Move thread functions to kernelbase.
by Alexandre Julliard
09 Aug '19
09 Aug '19
Module: wine Branch: master Commit: 0116660dd80b38da8201e2156adade67fc2ae823 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0116660dd80b38da8201e215…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 8 14:25:50 2019 +0200 kernel32: Move thread functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 60 ++-- dlls/kernel32/sync.c | 9 - dlls/kernel32/thread.c | 664 ---------------------------------------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 64 ++-- dlls/kernelbase/thread.c | 495 ++++++++++++++++++++++++++++++ 6 files changed, 558 insertions(+), 735 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=0116660dd80b38da8201…
1
0
0
0
Alexandre Julliard : kernel32: Reimplement fiber switching in assembly.
by Alexandre Julliard
09 Aug '19
09 Aug '19
Module: wine Branch: master Commit: adac42bad659c3c1234b9f5eec6496058a1b50d0 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=adac42bad659c3c1234b9f5e…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 8 12:09:34 2019 +0200 kernel32: Reimplement fiber switching in assembly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/fiber.c | 186 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 152 insertions(+), 34 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=adac42bad659c3c1234b…
1
0
0
0
Józef Kucia : winevulkan: Pull in bitmask dependencies for function parameters.
by Alexandre Julliard
09 Aug '19
09 Aug '19
Module: wine Branch: master Commit: 3b1bf387eb9ab2aa32164e494dfcb51f6ac52969 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3b1bf387eb9ab2aa32164e49…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 8 11:51:37 2019 +0200 winevulkan: Pull in bitmask dependencies for function parameters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 ++ include/wine/vulkan.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2d872e2..4f1c03c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2608,6 +2608,8 @@ class VkRegistry(object): if type_info["category"] == "struct": struct = type_info["data"] mark_struct_dependencies(struct, self.types) + elif type_info["category"] == "bitmask": + mark_bitmask_dependencies(type_info["data"], self.types) if func.is_alias(): func.alias.required = True diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 407b7ef..66cbd99 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -754,6 +754,12 @@ typedef enum VkCommandBufferLevel VK_COMMAND_BUFFER_LEVEL_MAX_ENUM = 0x7fffffff, } VkCommandBufferLevel; +typedef enum VkCommandBufferResetFlagBits +{ + VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT = 0x00000001, + VK_COMMAND_BUFFER_RESET_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkCommandBufferResetFlagBits; + typedef enum VkCommandBufferUsageFlagBits { VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT = 0x00000001, @@ -770,6 +776,12 @@ typedef enum VkCommandPoolCreateFlagBits VK_COMMAND_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkCommandPoolCreateFlagBits; +typedef enum VkCommandPoolResetFlagBits +{ + VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT = 0x00000001, + VK_COMMAND_POOL_RESET_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkCommandPoolResetFlagBits; + typedef enum VkCompareOp { VK_COMPARE_OP_NEVER = 0, @@ -1670,6 +1682,15 @@ typedef enum VkQueryPipelineStatisticFlagBits VK_QUERY_PIPELINE_STATISTIC_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkQueryPipelineStatisticFlagBits; +typedef enum VkQueryResultFlagBits +{ + VK_QUERY_RESULT_64_BIT = 0x00000001, + VK_QUERY_RESULT_WAIT_BIT = 0x00000002, + VK_QUERY_RESULT_WITH_AVAILABILITY_BIT = 0x00000004, + VK_QUERY_RESULT_PARTIAL_BIT = 0x00000008, + VK_QUERY_RESULT_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkQueryResultFlagBits; + typedef enum VkQueryType { VK_QUERY_TYPE_OCCLUSION = 0, @@ -1900,6 +1921,14 @@ typedef enum VkSparseMemoryBindFlagBits VK_SPARSE_MEMORY_BIND_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkSparseMemoryBindFlagBits; +typedef enum VkStencilFaceFlagBits +{ + VK_STENCIL_FACE_FRONT_BIT = 0x00000001, + VK_STENCIL_FACE_BACK_BIT = 0x00000002, + VK_STENCIL_FRONT_AND_BACK = 0x00000003, + VK_STENCIL_FACE_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkStencilFaceFlagBits; + typedef enum VkStencilOp { VK_STENCIL_OP_KEEP = 0,
1
0
0
0
Zebediah Figura : ntoskrnl.exe: Set the IRP output buffer unless the status has both high bits set.
by Alexandre Julliard
09 Aug '19
09 Aug '19
Module: wine Branch: master Commit: b9919c2e7f7ac92417cb2d8ed10414b318f03f1e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=b9919c2e7f7ac92417cb2d8e…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 7 21:10:12 2019 -0500 ntoskrnl.exe: Set the IRP output buffer unless the status has both high bits set. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6488e52..ccc5fce 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -439,7 +439,7 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, req->handle = wine_server_obj_handle( irp_handle ); req->status = irp->IoStatus.u.Status; req->size = irp->IoStatus.Information; - if (irp->IoStatus.u.Status >= 0) + if (!NT_ERROR(irp->IoStatus.u.Status)) { if (out_buff) wine_server_add_data( req, out_buff, irp->IoStatus.Information ); } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index e7a8cc9..86dce75 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -444,7 +444,7 @@ static void test_return_status(void) sizeof(status), buffer, sizeof(buffer), &ret_size, NULL); ok(!ret, "ioctl succeeded\n"); ok(GetLastError() == ERROR_MR_MID_NOT_FOUND, "got error %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "ghidef"), "got buffer %s\n", buffer); + ok(!strcmp(buffer, "ghidef"), "got buffer %s\n", buffer); ok(ret_size == 3, "got size %u\n", ret_size); strcpy(buffer, "abcdef");
1
0
0
0
Zebediah Figura : include: Add NTSTATUS severity macros.
by Alexandre Julliard
09 Aug '19
09 Aug '19
Module: wine Branch: master Commit: a28736df1fad6c64995afb9e7432b4d741adeed0 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=a28736df1fad6c64995afb9e…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 7 21:10:11 2019 -0500 include: Add NTSTATUS severity macros. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sec.c | 6 ++---- include/ntdef.h | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 02fc77d..464104d 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); -#define NT_SUCCESS(status) (status == STATUS_SUCCESS) - #define SELF_RELATIVE_FIELD(sd,field) ((BYTE *)(sd) + ((SECURITY_DESCRIPTOR_RELATIVE *)(sd))->field) /* helper function to retrieve active length of an ACL */ @@ -1521,7 +1519,7 @@ RtlAdjustPrivilege(ULONG Privilege, &TokenHandle); } - if (!NT_SUCCESS(Status)) + if (Status) { WARN("Retrieving token handle failed (Status %x)\n", Status); return Status; @@ -1546,7 +1544,7 @@ RtlAdjustPrivilege(ULONG Privilege, TRACE("Failed to assign all privileges\n"); return STATUS_PRIVILEGE_NOT_HELD; } - if (!NT_SUCCESS(Status)) + if (Status) { WARN("NtAdjustPrivilegesToken() failed (Status %x)\n", Status); return Status; diff --git a/include/ntdef.h b/include/ntdef.h index 83ecffd..014102a 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -43,4 +43,9 @@ typedef enum _WAIT_TYPE { } #endif +#define NT_SUCCESS(status) (((NTSTATUS)(status)) >= 0) +#define NT_INFORMATION(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0x40000000) +#define NT_WARNING(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0x80000000) +#define NT_ERROR(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0xc0000000) + #endif /* _NTDEF_ */
1
0
0
0
Henri Verbeet : wined3d: Download buffer ranges through buffer ops.
by Alexandre Julliard
09 Aug '19
09 Aug '19
Module: wine Branch: master Commit: e1448751ead1259e3868658b76283540be2234a9 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=e1448751ead1259e3868658b…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 8 03:35:08 2019 +0430 wined3d: Download buffer ranges through buffer ops. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 33 ++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a2908bf..65eff21 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -628,9 +628,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct wined3d_map_range range; TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); @@ -664,10 +662,10 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - wined3d_buffer_gl_bind(buffer_gl, context_gl); - GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, 0, buffer->resource.size, - buffer->resource.heap_memory)); - checkGLcall("buffer download"); + range.offset = 0; + range.size = buffer->resource.size; + buffer->buffer_ops->buffer_download_ranges(buffer, context, + buffer->resource.heap_memory, 0, 1, &range); break; case WINED3D_LOCATION_BUFFER: @@ -1463,9 +1461,30 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc checkGLcall("buffer upload"); } +/* Context activation is done by the caller. */ +static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, + void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + const struct wined3d_map_range *range; + + wined3d_buffer_gl_bind(buffer_gl, context_gl); + + while (range_count--) + { + range = &ranges[range_count]; + GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, + range->offset, range->size, (BYTE *)data + range->offset - data_offset)); + } + checkGLcall("buffer download"); +} + static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { wined3d_buffer_gl_upload_ranges, + wined3d_buffer_gl_download_ranges, }; HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8dbf255..173f169 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4047,6 +4047,8 @@ struct wined3d_buffer_ops { void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); + void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); }; struct wined3d_buffer
1
0
0
0
← Newer
1
...
51
52
53
54
55
56
57
...
71
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
62
63
64
65
66
67
68
69
70
71
Results per page:
10
25
50
100
200