December 2019 - Wine-Commits

Hans Leidekker : msado15: Implement _Recordset_get_BOF and _Recordset_get_EOF.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 55020bf23962d537535eaacb20b218406af023bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=55020bf23962d537535eaacb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 13 15:52:26 2019 +0100 msado15: Implement _Recordset_get_BOF and _Recordset_get_EOF. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 0f0cb24759..e7c7cdc409 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -772,8 +772,12 @@ static HRESULT WINAPI recordset_get_ActiveConnection( _Recordset *iface, VARIANT static HRESULT WINAPI recordset_get_BOF( _Recordset *iface, VARIANT_BOOL *bof ) { - FIXME( "%p, %p\n", iface, bof ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", recordset, bof ); + + *bof = (recordset->index < 0) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI recordset_get_Bookmark( _Recordset *iface, VARIANT *bookmark ) @@ -814,8 +818,12 @@ static HRESULT WINAPI recordset_put_CursorType( _Recordset *iface, CursorTypeEnu static HRESULT WINAPI recordset_get_EOF( _Recordset *iface, VARIANT_BOOL *eof ) { - FIXME( "%p, %p\n", iface, eof ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", recordset, eof ); + + *eof = (!recordset->count || recordset->index >= recordset->count) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI recordset_get_Fields( _Recordset *iface, Fields **obj ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index b0ca9cf2a5..bac1c34a46 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -25,6 +25,20 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +static BOOL is_bof( _Recordset *recordset ) +{ + VARIANT_BOOL bof = VARIANT_FALSE; + _Recordset_get_BOF( recordset, &bof ); + return bof == VARIANT_TRUE; +} + +static BOOL is_eof( _Recordset *recordset ) +{ + VARIANT_BOOL eof = VARIANT_FALSE; + _Recordset_get_EOF( recordset, &eof ); + return eof == VARIANT_TRUE; +} + static LONG get_refs_field( Field *field ) { Field_AddRef( field ); @@ -122,6 +136,8 @@ static void test_Recordset(void) hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); ok( hr == S_OK, "got %08x\n", hr ); + ok( is_eof( recordset ), "not eof\n" ); + ok( is_bof( recordset ), "not bof\n" ); state = -1; hr = _Recordset_get_State( recordset, &state ); @@ -130,6 +146,8 @@ static void test_Recordset(void) hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == S_OK, "got %08x\n", hr ); + ok( !is_eof( recordset ), "eof\n" ); + ok( !is_bof( recordset ), "bof\n" ); hr = _Recordset_Close( recordset ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Hans Leidekker : msado15: Implement _Recordset_get_RecordCount.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 6f1a4fa8e2315c3d60706967db7a3399a6817724 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f1a4fa8e2315c3d60706967… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 13 15:52:27 2019 +0100 msado15: Implement _Recordset_get_RecordCount. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 8 ++++++-- dlls/msado15/tests/msado15.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e7c7cdc409..bb089cfded 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -873,8 +873,12 @@ static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, LONG max_reco static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, LONG *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", recordset, count ); + + *count = recordset->count; + return S_OK; } static HRESULT WINAPI recordset_putref_Source( _Recordset *iface, IDispatch *source ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index bac1c34a46..04ca338dd8 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -144,11 +144,21 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateOpen, "got %d\n", state ); + count = -1; + hr = _Recordset_get_RecordCount( recordset, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %d\n", count ); + hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == S_OK, "got %08x\n", hr ); ok( !is_eof( recordset ), "eof\n" ); ok( !is_bof( recordset ), "bof\n" ); + count = -1; + hr = _Recordset_get_RecordCount( recordset, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 1, "got %d\n", count ); + hr = _Recordset_Close( recordset ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Hans Leidekker : msado15: Implement _Recordset_MoveNext and _Recordset_MovePrevious.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 6e5c2bee067f071a2f08ba52d95d0f24688ecade URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e5c2bee067f071a2f08ba52… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 13 15:52:28 2019 +0100 msado15: Implement _Recordset_MoveNext and _Recordset_MovePrevious. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index bb089cfded..b2bc93bb9c 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -967,14 +967,22 @@ static HRESULT WINAPI recordset_Move( _Recordset *iface, LONG num_records, VARIA static HRESULT WINAPI recordset_MoveNext( _Recordset *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p\n", recordset ); + + if (recordset->index < recordset->count) recordset->index++; + return S_OK; } static HRESULT WINAPI recordset_MovePrevious( _Recordset *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p\n", recordset ); + + if (recordset->index >= 0) recordset->index--; + return S_OK; } static HRESULT WINAPI recordset_MoveFirst( _Recordset *iface )

1 0

Francois Gouget : shell32: Tweak / fix the MS-DOS name in a comment.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 013949fc0bf1d225b1c420648bbc5c5058383430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=013949fc0bf1d225b1c42064… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 13 00:15:02 2019 +0100 shell32: Tweak / fix the MS-DOS name in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 44422ab4ff..d1be5408fb 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -876,7 +876,7 @@ HICON WINAPI ExtractAssociatedIconW(HINSTANCE hInst, LPWSTR lpIconPath, LPWORD l } if( hIcon == (HICON)1 ) - *lpiIcon = 2; /* MSDOS icon - we found .exe but no icons in it */ + *lpiIcon = 2; /* MS-DOS icon - we found .exe but no icons in it */ else *lpiIcon = 6; /* generic icon - found nothing */

1 0

Chip Davis : iphlpapi: Implement some more IpStatistics on BSD.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 87dafc3c8782c9d7694787ec23c94b97486e6748 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87dafc3c8782c9d7694787ec… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Thu Dec 12 17:06:49 2019 -0600 iphlpapi: Implement some more IpStatistics on BSD. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index df25d6468d..dd6a57015f 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -951,21 +951,26 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) /* ip.forwarding is 0 or 1 on BSD */ stats->u.dwForwarding = ip_forwarding+1; stats->dwDefaultTTL = ip_ttl; - stats->dwInDelivers = ip_stat.ips_delivered; - stats->dwInHdrErrors = ip_stat.ips_badhlen + ip_stat.ips_badsum + ip_stat.ips_tooshort + ip_stat.ips_badlen; - stats->dwInAddrErrors = ip_stat.ips_cantforward; stats->dwInReceives = ip_stat.ips_total; + stats->dwInHdrErrors = ip_stat.ips_badhlen + ip_stat.ips_badsum + ip_stat.ips_tooshort + ip_stat.ips_badlen + + ip_stat.ips_badvers + ip_stat.ips_badoptions; + /* ips_badaddr also includes outgoing packets with a bad address, but we can't account for that right now */ + stats->dwInAddrErrors = ip_stat.ips_cantforward + ip_stat.ips_badaddr + ip_stat.ips_notmember; stats->dwForwDatagrams = ip_stat.ips_forward; stats->dwInUnknownProtos = ip_stat.ips_noproto; stats->dwInDiscards = ip_stat.ips_fragdropped; + stats->dwInDelivers = ip_stat.ips_delivered; + stats->dwOutRequests = ip_stat.ips_localout; + /*stats->dwRoutingDiscards = 0;*/ /* FIXME */ stats->dwOutDiscards = ip_stat.ips_odropped; + stats->dwOutNoRoutes = ip_stat.ips_noroute; + stats->dwReasmTimeout = ip_stat.ips_fragtimeout; + stats->dwReasmReqds = ip_stat.ips_fragments; stats->dwReasmOks = ip_stat.ips_reassembled; + stats->dwReasmFails = ip_stat.ips_fragments - ip_stat.ips_reassembled; stats->dwFragOks = ip_stat.ips_fragmented; stats->dwFragFails = ip_stat.ips_cantfrag; - stats->dwReasmTimeout = ip_stat.ips_fragtimeout; - stats->dwOutNoRoutes = ip_stat.ips_noroute; - stats->dwOutRequests = ip_stat.ips_localout; - stats->dwReasmReqds = ip_stat.ips_fragments; + stats->dwFragCreates = ip_stat.ips_ofragments; ret = NO_ERROR; } #else

1 0

Nikolay Sivov : ole32: Use more appropriate type for codepage arguments.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 5aa9c433fc869ec8c336565b51d0602d8d35abab URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aa9c433fc869ec8c336565b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 13 13:06:53 2019 +0300 ole32: Use more appropriate type for codepage arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 84eaa2aac4..8421353155 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -130,7 +130,7 @@ static void PropertyStorage_DestroyDictionaries(PropertyStorage_impl *); * string using PropertyStorage_StringCopy. */ static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, - const PROPVARIANT *propvar, LCID targetCP, LCID srcCP); + const PROPVARIANT *propvar, UINT targetCP, UINT srcCP); /* Copies the string src, which is encoded using code page srcCP, and returns * it in *dst, in the code page specified by targetCP. The returned string is @@ -139,8 +139,8 @@ static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, * is CP_UNICODE, the returned string is in fact an LPWSTR. * Returns S_OK on success, something else on failure. */ -static HRESULT PropertyStorage_StringCopy(LPCSTR src, LCID srcCP, LPSTR *dst, - LCID targetCP); +static HRESULT PropertyStorage_StringCopy(LPCSTR src, UINT srcCP, LPSTR *dst, + UINT targetCP); static const IPropertyStorageVtbl IPropertyStorage_Vtbl; @@ -533,8 +533,7 @@ static HRESULT WINAPI IPropertyStorage_fnReadMultiple( return hr; } -static HRESULT PropertyStorage_StringCopy(LPCSTR src, LCID srcCP, LPSTR *dst, - LCID dstCP) +static HRESULT PropertyStorage_StringCopy(LPCSTR src, UINT srcCP, LPSTR *dst, UINT dstCP) { HRESULT hr = S_OK; int len; @@ -617,8 +616,8 @@ static HRESULT PropertyStorage_StringCopy(LPCSTR src, LCID srcCP, LPSTR *dst, return hr; } -static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, - const PROPVARIANT *propvar, LCID targetCP, LCID srcCP) +static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, const PROPVARIANT *propvar, + UINT targetCP, UINT srcCP) { HRESULT hr = S_OK; @@ -644,7 +643,7 @@ static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, * a version 1-only property. */ static HRESULT PropertyStorage_StorePropWithId(PropertyStorage_impl *This, - PROPID propid, const PROPVARIANT *propvar, LCID lcid) + PROPID propid, const PROPVARIANT *propvar, UINT cp) { HRESULT hr = S_OK; PROPVARIANT *prop = PropertyStorage_FindProperty(This, propid); @@ -665,8 +664,7 @@ static HRESULT PropertyStorage_StorePropWithId(PropertyStorage_impl *This, if (prop) { PropVariantClear(prop); - hr = PropertyStorage_PropVariantCopy(prop, propvar, This->codePage, - lcid); + hr = PropertyStorage_PropVariantCopy(prop, propvar, This->codePage, cp); } else { @@ -674,8 +672,7 @@ static HRESULT PropertyStorage_StorePropWithId(PropertyStorage_impl *This, sizeof(PROPVARIANT)); if (prop) { - hr = PropertyStorage_PropVariantCopy(prop, propvar, This->codePage, - lcid); + hr = PropertyStorage_PropVariantCopy(prop, propvar, This->codePage, cp); if (SUCCEEDED(hr)) { dictionary_insert(This->propid_to_prop, UlongToPtr(propid), prop); @@ -699,7 +696,7 @@ static HRESULT PropertyStorage_StorePropWithId(PropertyStorage_impl *This, * Doesn't validate id. */ static HRESULT PropertyStorage_StoreNameWithId(PropertyStorage_impl *This, - LPCSTR srcName, LCID cp, PROPID id) + LPCSTR srcName, UINT cp, PROPID id) { LPSTR name; HRESULT hr;

1 0

Francois Gouget : quartz: Fix the name of a type in a comment.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 79ab06b295729273487bfb1698b3d0052ca1a540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79ab06b295729273487bfb16… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 13 00:15:08 2019 +0100 quartz: Fix the name of a type in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index d5442e21fc..1ed41bdcec 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -176,7 +176,7 @@ typedef struct _IFilterGraphImpl { /* IFilterMapper2 */ /* IQueueCommand */ /* IRegisterServiceProvider */ - /* IResourceMananger */ + /* IResourceManager */ /* IServiceProvider */ /* IVideoFrameStep */

1 0

Hans Leidekker : msado15: Implement _Recordset_get_State.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 435d0924eb8099d85745c9c514cdb2fb838004ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=435d0924eb8099d85745c9c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 13 15:52:25 2019 +0100 msado15: Implement _Recordset_get_State. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 8 ++++++-- dlls/msado15/tests/msado15.c | 13 +++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index f1c864cdd9..0f0cb24759 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1075,8 +1075,12 @@ static HRESULT WINAPI recordset_get_Status( _Recordset *iface, LONG *status ) static HRESULT WINAPI recordset_get_State( _Recordset *iface, LONG *state ) { - FIXME( "%p, %p\n", iface, state ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", recordset, state ); + + *state = recordset->state; + return S_OK; } static HRESULT WINAPI recordset__xClone( _Recordset *iface, _Recordset **obj ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 3b1e953dc7..b0ca9cf2a5 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -100,8 +100,8 @@ static void test_Recordset(void) state = -1; hr = _Recordset_get_State( recordset, &state ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( state == adStateClosed, "got %d\n", state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateClosed, "got %d\n", state ); VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); @@ -125,8 +125,8 @@ static void test_Recordset(void) state = -1; hr = _Recordset_get_State( recordset, &state ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( state == adStateOpen, "got %d\n", state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateOpen, "got %d\n", state ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == S_OK, "got %08x\n", hr ); @@ -134,6 +134,11 @@ static void test_Recordset(void) hr = _Recordset_Close( recordset ); ok( hr == S_OK, "got %08x\n", hr ); + state = -1; + hr = _Recordset_get_State( recordset, &state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateClosed, "got %d\n", state ); + Fields_Release( fields ); _Recordset_Release( recordset ); }

1 0

Francois Gouget : user32: Fix the spelling of a comment.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: fe18edd6f8986afd27df66430bba92688d410fd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe18edd6f8986afd27df6643… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 13 00:13:44 2019 +0100 user32: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index b407b51811..2ff5b2f909 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2133,7 +2133,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, /* Tell it "disabled" */ if (lpAnimInfo && lpAnimInfo->cbSize == sizeof(ANIMATIONINFO)) { - lpAnimInfo->iMinAnimate = 0; /* Minimise and restore animation is disabled (nonzero == enabled) */ + lpAnimInfo->iMinAnimate = 0; /* Minimize and restore animation is disabled (nonzero == enabled) */ ret = TRUE; } break;

1 0

Ken Thomases : dbghelp: Fix reading the address of the target's dyld image info from its PEB.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 28a25b052d21a9e2e4fc3c7790711b290d44a488 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28a25b052d21a9e2e4fc3c77… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 12 19:43:18 2019 -0600 dbghelp: Fix reading the address of the target's dyld image info from its PEB. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 9d83b006b7..8eda11ab91 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1366,7 +1366,7 @@ static ULONG_PTR get_dyld_image_info_address(struct process* pcs) if (status == STATUS_SUCCESS) { /* Read dyld image info address from PEB */ - if (!pcs->is_64bit) + if (pcs->is_64bit) ret = ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], &dyld_image_info_address, sizeof(dyld_image_info_address), NULL); else

1 0