May 2022 - Wine-commits - list.winehq.org

Francois Gouget : testbot/orm: Add documentation to the database backend.
by Alexandre Julliard 30 May '22

30 May '22

Module: tools Branch: master Commit: 9aa433e3178d138cb9b4e0cbb74167292e5ca450 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9aa433e3178d138cb9b4e0c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 30 18:44:22 2022 +0200 testbot/orm: Add documentation to the database backend. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 107 ++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index dc527d4..94e4be6 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -63,6 +63,17 @@ sub GetDb($) return $self->{Db}; } +=pod +=over 12 + +=item C<ToDb()> + +Convert the property value to a format suitable for the database. +This is only needed for boolean and timestamp properties. + +=back +=cut + sub ToDb($$$) { my ($self, $Value, $PropertyDescriptor) = @_; @@ -101,6 +112,16 @@ sub ToDb($$$) return $Value; } +=pod +=over 12 + +=item C<FromDb()> + +Convert the database values to a format suitable for Perl. See ToDb(). + +=back +=cut + sub FromDb($$$) { my ($self, $Value, $PropertyDescriptor) = @_; @@ -132,6 +153,18 @@ sub FromDb($$$) return $Value; } +=pod +=over 12 + +=item C<BuildKeyWhere()> + +Augments the specified WHERE clause with statements to match the key columns. +It is up to the caller to then append the corresponding key components to the +query's data array. + +=back +=cut + sub BuildKeyWhere($$$) { my ($self, $PropertyDescriptors, $Where) = @_; @@ -154,6 +187,17 @@ sub BuildKeyWhere($$$) return $Where; } +=pod +=over 12 + +=item C<BuildFieldList()> + +Build the comma-separated SELECT list of columns to load from the database. +Note that only the non-master columns are loaded. + +=back +=cut + sub BuildFieldList($$) { my ($self, $PropertyDescriptors) = @_; @@ -277,6 +321,19 @@ sub GetFilterWhere($$$) die "unsupported '$Filter->{Type}' filter type"; } +=pod +=over 12 + +=item C<LoadCollection()> + +Loads the collection from the corresponding database table, filtering it on +both the master columns and the collection's filter if any. + +Note that only the non-master columns are loaded (see BuildFieldList()). + +=back +=cut + sub LoadCollection($$) { my ($self, $Collection) = @_; @@ -346,6 +403,8 @@ By design this method will not check if the Item is already present in the Collection scope. Such checks belong in the higher levels. This method will however put the Item in the Collection's scope. +Note that only the non-master columns are loaded (see BuildFieldList()). + =back =cut @@ -395,6 +454,17 @@ sub LoadItem($$$) return $Item; } +=pod +=over 12 + +=item C<BuildInsertStatement()> + +Builds the SQL statement for saving new Items to the database. +This can be reused multiple times when saving a collection. + +=back +=cut + sub BuildInsertStatement($$$$) { my ($self, $TableName, $PropertyDescriptors, $MasterColNames) = @_; @@ -432,6 +502,18 @@ sub BuildInsertStatement($$$$) return "INSERT INTO $TableName ($Fields) VALUES($PlaceHolders)"; } +=pod +=over 12 + +=item C<GetInsertData()> + +Builds a data array suitable for use with the SQL statement returned by +BuildInsertStatement() for the specified Item. This simply includes all +of the object's properties. + +=back +=cut + sub GetInsertData($$$) { my ($self, $MasterColValues, $Item) = @_; @@ -454,6 +536,17 @@ sub GetInsertData($$$) return \@Data; } +=pod +=over 12 + +=item C<BuildUpdateStatement()> + +Builds the SQL statement for saving *modified* Items to the database. +This can be reused multiple times when saving a collection. + +=back +=cut + sub BuildUpdateStatement($$$$) { my ($self, $TableName, $PropertyDescriptors, $MasterColNames) = @_; @@ -484,6 +577,20 @@ sub BuildUpdateStatement($$$$) return "UPDATE $TableName SET $Fields WHERE $Where"; } +=pod +=over 12 + +=item C<GetUpdateData()> + +Returns a data array suitable for use with the SQL statement returned by +BuildUpdateStatement() for the specified Item. It is composed of: +* The non-key properties for the SET part of the statement since only those + could have been modified. +* The key properties for the WHERE part of the statement. + +=back +=cut + sub GetUpdateData($$$) { my ($self, $MasterColValues, $Item) = @_;

1 0

Francois Gouget : testbot: Fix the type of inherited auto-increment columns.
by Alexandre Julliard 30 May '22

30 May '22

Module: tools Branch: master Commit: 0833f114a3db28343f89a03b27748ff2d9306ac9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0833f114a3db28343f89a03… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 30 18:44:40 2022 +0200 testbot: Fix the type of inherited auto-increment columns. Some objects, such as jobs, use a database-generated auto-increment integer as their primary key. However objects that 'inherit' such primary keys, such as Steps, do not. So the corresponding property descriptor should be a regular integer. Otherwise the DBIBackend will try to fetch a unique id that does not exist. Fortunately this issue has so far been masked by the 'master columns' mechanism. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Records.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index fd8e574..6002d1c 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -83,7 +83,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Value", "Value", !1, !1, "A", 64), ); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("RecordGroupId", "Group id", 1, 1, "S", 10), + CreateBasicPropertyDescriptor("RecordGroupId", "Group id", 1, 1, "N", 10), @PropertyDescriptors ); diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 0f65d63..860dc49 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -247,7 +247,7 @@ my @PropertyDescriptors = ( ); SetDetailrefKeyPrefix("Step", @PropertyDescriptors); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 10), + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), @PropertyDescriptors ); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5cc2cc6..50ce960 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -368,7 +368,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 10), + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), @PropertyDescriptors );

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateHullShader().
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 1a869de18772b630acea5b9143fcd3ccaa3ff659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a869de18772b630acea5b91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 15:02:24 2022 +0300 d3d11: Always initialize out shader pointer in CreateHullShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7b1c1b9bae0..286874af993 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3569,6 +3569,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device2 *if TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index eb3ac35b824..690f468e6cf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4825,6 +4825,7 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ID3D11GeometryShader *gs; ID3D11VertexShader *vs; ID3D11PixelShader *ps; + ID3D11HullShader *hs; HRESULT hr; device_desc.feature_level = &feature_level; @@ -5000,6 +5001,12 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ID3D11GeometryShader_Release(gs); } + /* Hull shader */ + hs = (void *)0xdeadbeef; + hr = ID3D11Device_CreateHullShader(device, gs_4_0, sizeof(gs_4_0), NULL, &hs); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!hs, "Unexpected pointer %p.\n", hs); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); }

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateDomainShader().
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 72046ad7c4103490ab205e5f40b19adaae64c19a URL: https://source.winehq.org/git/wine.git/?a=commit;h=72046ad7c4103490ab205e5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 15:07:31 2022 +0300 d3d11: Always initialize out shader pointer in CreateDomainShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 286874af993..b73df94b50c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3592,6 +3592,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device2 * TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 690f468e6cf..06cb2bc4273 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4824,6 +4824,7 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ID3D11Device *device, *tmp; ID3D11GeometryShader *gs; ID3D11VertexShader *vs; + ID3D11DomainShader *ds; ID3D11PixelShader *ps; ID3D11HullShader *hs; HRESULT hr; @@ -5007,6 +5008,12 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); ok(!hs, "Unexpected pointer %p.\n", hs); + /* Domain shader */ + ds = (void *)0xdeadbeef; + hr = ID3D11Device_CreateDomainShader(device, gs_4_0, sizeof(gs_4_0), NULL, &ds); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!ds, "Unexpected pointer %p.\n", ds); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); }

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateComputeShader().
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 7d7d16623393a9eefad0eb12ed5ad02376bc36bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d7d16623393a9eefad0eb12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 15:13:56 2022 +0300 d3d11: Always initialize out shader pointer in CreateComputeShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b73df94b50c..3f08ae5f4f0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3615,6 +3615,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device2 TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 06cb2bc4273..9a1bd88dc8b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4823,6 +4823,7 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) struct device_desc device_desc; ID3D11Device *device, *tmp; ID3D11GeometryShader *gs; + ID3D11ComputeShader *cs; ID3D11VertexShader *vs; ID3D11DomainShader *ds; ID3D11PixelShader *ps; @@ -5014,6 +5015,12 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); ok(!ds, "Unexpected pointer %p.\n", ds); + /* Compute shader */ + ds = (void *)0xdeadbeef; + hr = ID3D11Device_CreateComputeShader(device, gs_4_0, sizeof(gs_4_0), NULL, &cs); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!cs, "Unexpected pointer %p.\n", cs); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); }

1 0

Gabriel Ivăncescu : mshtml: Handle empty strings in heap_strndupWtoU.
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 239b5726d412958a5df42314574807f7c723d910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=239b5726d412958a5df42314… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:54:26 2022 +0300 mshtml: Handle empty strings in heap_strndupWtoU. The HTTP response header status text can be empty, so process_response_status_text would erroneously return E_OUTOFMEMORY. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 6 +++--- dlls/wininet/tests/http.c | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ad1fca091fa..0a7c3a2556e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1392,11 +1392,11 @@ static inline char *heap_strndupWtoU(LPCWSTR str, unsigned len) char *ret = NULL; DWORD size; - if(str && len) { - size = WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL); + if(str) { + size = len ? WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL) : 0; ret = heap_alloc(size + 1); if(ret) { - WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); + if(len) WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); ret[size] = '\0'; } } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ec576ae81e2..bc1b829fca2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4526,6 +4526,13 @@ static const http_status_test_t http_status_tests[] = { 200, "" }, + { + "HTTP/1.1 200 \r\n" + "Content-Length: 1\r\n" + "\r\nx", + 200, + "" + }, { "HTTP/1.1 410 \r\n" "Content-Length: 1\r\n"

1 0

Gabriel Ivăncescu : mshtml: Handle empty status text when processing the response.
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 0fd3b8ad3760120bb19c53fcd2991850960b9a1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd3b8ad3760120bb19c53fc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:54:27 2022 +0300 mshtml: Handle empty status text when processing the response. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e750ff28ee1..d5ec368e375 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1690,8 +1690,9 @@ static HRESULT process_response_status_text(const WCHAR *header, const WCHAR *he return E_FAIL; header = wcschr(header + 1, ' '); if(!header || header >= header_end) - return E_FAIL; - ++header; + header = header_end; + else + ++header; *status_text = heap_strndupWtoU(header, header_end - header);

1 0

Gabriel Ivăncescu : mshtml: Abort on a cancelled async request properly.
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 740d4ea14f23c1d10cc0a88c4cbd041e7af93eda URL: https://source.winehq.org/git/wine.git/?a=commit;h=740d4ea14f23c1d10cc0a88c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:54:28 2022 +0300 mshtml: Abort on a cancelled async request properly. Gecko can cancel an async request sometime between async_start_doc_binding registers it and on_start_nsrequest actually processes it. The latter should not attempt to continue in this case. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 1 + dlls/mshtml/navigate.c | 4 ++++ dlls/mshtml/nsio.c | 3 +++ 3 files changed, 8 insertions(+) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 26a337fe470..9a043864927 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -51,6 +51,7 @@ typedef struct { nsIURI *referrer; char *content_type; char *charset; + nsresult status; UINT32 response_status; char *response_status_text; REQUEST_METHOD request_method; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index d5ec368e375..e6f203535b7 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -981,6 +981,10 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) { nsresult nsres; + /* Async request can be cancelled before we got to it */ + if(NS_FAILED(This->nschannel->status)) + return E_ABORT; /* FIXME: map status to HRESULT */ + This->nschannel->binding = This; /* FIXME: it's needed for http connections from BindToObject. */ diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e0b8bedf79c..e1a1d6e3b53 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -610,6 +610,9 @@ static nsresult NSAPI nsChannel_Cancel(nsIHttpChannel *iface, nsresult aStatus) TRACE("(%p)->(%08lx)\n", This, aStatus); + if(NS_FAILED(aStatus)) + This->status = aStatus; + if(This->binding && This->binding->bsc.binding) IBinding_Abort(This->binding->bsc.binding); else

1 0

Gabriel Ivăncescu : mshtml: Return actual status in nsChannel_GetStatus.
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: c9c50cd4f1c5cf399c976c350524ada6d0748e38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9c50cd4f1c5cf399c976c35… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:54:29 2022 +0300 mshtml: Return actual status in nsChannel_GetStatus. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e1a1d6e3b53..f1859e2a383 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -599,9 +599,9 @@ static nsresult NSAPI nsChannel_GetStatus(nsIHttpChannel *iface, nsresult *aStat { nsChannel *This = impl_from_nsIHttpChannel(iface); - WARN("(%p)->(%p) returning NS_OK\n", This, aStatus); + TRACE("(%p)->(%p) returning %#lx\n", This, aStatus, This->status); - return *aStatus = NS_OK; + return *aStatus = This->status; } static nsresult NSAPI nsChannel_Cancel(nsIHttpChannel *iface, nsresult aStatus)

1 0

Nikolay Sivov : secur32: Simplify get_session_peer_certificate unixlib interface.
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: b255160168d0b8428fbe3f28a43a028bdc1c3aa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b255160168d0b8428fbe3f28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 10:35:42 2022 +0300 secur32: Simplify get_session_peer_certificate unixlib interface. Use single buffer for returned certificate blobs, instead of an array of CERT_BLOB that contains pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 18 +++++++++++------- dlls/secur32/schannel_gnutls.c | 14 +++++++------- dlls/secur32/secur32_priv.h | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 6ab5507becf..2e663872f71 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1026,7 +1026,6 @@ static SECURITY_STATUS ensure_remote_cert(struct schan_context *ctx) HCERTSTORE store; PCCERT_CONTEXT cert = NULL; SECURITY_STATUS status; - CERT_BLOB *certs; ULONG count, size = 0; struct get_session_peer_certificate_params params = { ctx->transport.session, NULL, &size, &count }; @@ -1036,28 +1035,33 @@ static SECURITY_STATUS ensure_remote_cert(struct schan_context *ctx) status = GNUTLS_CALL( get_session_peer_certificate, &params ); if (status != SEC_E_BUFFER_TOO_SMALL) goto done; - if (!(certs = malloc( size ))) + if (!(params.buffer = malloc( size ))) { status = SEC_E_INSUFFICIENT_MEMORY; goto done; } - params.certs = certs; status = GNUTLS_CALL( get_session_peer_certificate, &params ); if (status == SEC_E_OK) { unsigned int i; + ULONG *sizes; + BYTE *blob; + + sizes = (ULONG *)params.buffer; + blob = params.buffer + count * sizeof(*sizes); + for (i = 0; i < count; i++) { - if (!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, certs[i].pbData, - certs[i].cbData, CERT_STORE_ADD_REPLACE_EXISTING, - i ? NULL : &cert)) + if (!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, blob, sizes[i], + CERT_STORE_ADD_REPLACE_EXISTING, i ? NULL : &cert)) { if (i) CertFreeCertificateContext(cert); return GetLastError(); } + blob += sizes[i]; } } - free(certs); + free(params.buffer); done: ctx->cert = cert; CertCloseStore(store, 0); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 0145c59e0f0..7c6a0bc0cfc 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -792,28 +792,28 @@ static NTSTATUS schan_get_session_peer_certificate( void *args ) { const struct get_session_peer_certificate_params *params = args; gnutls_session_t s = (gnutls_session_t)params->session; - CERT_BLOB *certs = params->certs; const gnutls_datum_t *datum; unsigned int i, size; BYTE *ptr; unsigned int count; + ULONG *sizes; if (!(datum = pgnutls_certificate_get_peers(s, &count))) return SEC_E_INTERNAL_ERROR; - size = count * sizeof(certs[0]); + size = count * sizeof(*sizes); for (i = 0; i < count; i++) size += datum[i].size; - if (!certs || *params->bufsize < size) + if (!params->buffer || *params->bufsize < size) { *params->bufsize = size; return SEC_E_BUFFER_TOO_SMALL; } - ptr = (BYTE *)&certs[count]; + sizes = (ULONG *)params->buffer; + ptr = params->buffer + count * sizeof(*sizes); for (i = 0; i < count; i++) { - certs[i].cbData = datum[i].size; - certs[i].pbData = ptr; - memcpy(certs[i].pbData, datum[i].data, datum[i].size); + sizes[i] = datum[i].size; + memcpy(ptr, datum[i].data, datum[i].size); ptr += datum[i].size; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index be375618266..5c35e4244c8 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -145,7 +145,7 @@ struct get_connection_info_params struct get_session_peer_certificate_params { schan_session session; - CERT_BLOB *certs; + BYTE *buffer; /* Starts with array of ULONG sizes, followed by contiguous data blob. */ ULONG *bufsize; ULONG *retcount; };

1 0