August 2019 - Wine-commits - list.winehq.org

Zebediah Figura : devenum: Return S_FALSE from CreateClassEnumerator() if no devices exist.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: d63079f2c71306743a7ca924916ac37e57e274c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63079f2c71306743a7ca924… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 5 19:41:13 2019 -0500 devenum: Return S_FALSE from CreateClassEnumerator() if no devices exist. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46316 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e0da0b777a293059c32a7c846dff16ef0738b2de) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/createdevenum.c | 18 +++++++++++++++++- dlls/devenum/tests/devenum.c | 6 ++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 8a3160c..65c1ccd 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -862,7 +862,23 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( else if (IsEqualGUID(class, &CLSID_VideoInputDeviceCategory)) register_avicap_devices(); - return create_EnumMoniker(class, out); + if (SUCCEEDED(hr = create_EnumMoniker(class, out))) + { + IMoniker *mon; + hr = IEnumMoniker_Next(*out, 1, &mon, NULL); + if (hr == S_OK) + { + IMoniker_Release(mon); + IEnumMoniker_Reset(*out); + } + else + { + IEnumMoniker_Release(*out); + *out = NULL; + } + } + + return hr; } /********************************************************************** diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index e31f65c..1ce0d04 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -68,6 +68,7 @@ static void test_devenum(IBindCtx *bind_ctx) WCHAR *displayname; VARIANT var; HRESULT hr; + int count; hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); @@ -104,6 +105,8 @@ static void test_devenum(IBindCtx *bind_ctx) if (hr == S_OK) { + count = 0; + while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) { hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &displayname); @@ -134,8 +137,11 @@ static void test_devenum(IBindCtx *bind_ctx) CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); + count++; } IEnumMoniker_Release(enum_moniker); + + ok(count > 0, "CreateClassEnumerator() returned S_OK but no devices were enumerated.\n"); } }

1 0

Zebediah Figura : d3d9/tests: Add more tests for reset state after DrawIndexedPrimitiveUP().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 2497c5e781020cdb9ec56fde9358d170970767e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2497c5e781020cdb9ec56fde… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 23:06:10 2019 -0600 d3d9/tests: Add more tests for reset state after DrawIndexedPrimitiveUP(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ca86c2ed84a6e59f21d3d66e25643de15712ef3b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/device.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bc8d708..1cd548f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2874,6 +2874,7 @@ static void test_draw_primitive(void) IDirect3DVertexBuffer9 *vertex_buffer, *current_vb; IDirect3DIndexBuffer9 *index_buffer, *current_ib; IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DStateBlock9 *stateblock; IDirect3DDevice9 *device; UINT offset, stride; IDirect3D9 *d3d9; @@ -2998,16 +2999,81 @@ static void test_draw_primitive(void) 0 /* MinIndex */, 4 /* NumVerts */, 0 /* StartIndex */, 2 /*PrimCount */); ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetIndices(device, &current_ib); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); + IDirect3DIndexBuffer9_Release(current_ib); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetIndices(device, &current_ib); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); + + /* Resetting of stream source and index buffer is not recorded in stateblocks. */ + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vertex_buffer, 0, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetIndices(device, index_buffer); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginStateBlock(device); + ok(SUCCEEDED(hr), "BeginStateBlock failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "BeginStateBlock failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); +todo_wine + ok(!current_vb, "Unexpected vb %p.\n", current_vb); + ok(!offset, "Unexpected offset %u.\n", offset); +todo_wine + ok(!stride, "Unexpected stride %u.\n", stride); + if (current_vb) + IDirect3DVertexBuffer9_Release(current_vb); + hr = IDirect3DDevice9_GetIndices(device, &current_ib); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); +todo_wine + ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); + if (current_ib) + IDirect3DIndexBuffer9_Release(current_ib); + + hr = IDirect3DStateBlock9_Capture(stateblock); + ok(SUCCEEDED(hr), "Capture failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vertex_buffer, 0, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetIndices(device, index_buffer); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + + hr = IDirect3DStateBlock9_Apply(stateblock); + ok(SUCCEEDED(hr), "Capture failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); + ok(current_vb == vertex_buffer, "Unexpected vb %p.\n", current_vb); + ok(!offset, "Unexpected offset %u.\n", offset); + ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); + IDirect3DVertexBuffer9_Release(current_vb); + hr = IDirect3DDevice9_GetIndices(device, &current_ib); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); + IDirect3DIndexBuffer9_Release(current_ib); + hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + IDirect3DStateBlock9_Release(stateblock); IDirect3DVertexBuffer9_Release(vertex_buffer); IDirect3DIndexBuffer9_Release(index_buffer); IDirect3DVertexDeclaration9_Release(vertex_declaration);

1 0

Matteo Bruni : d3d9: Validate vertex stride in Draw[Indexed]PrimitiveUP().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 865563e0655e80aa69cc9aa8b0df09ed626d3cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=865563e0655e80aa69cc9aa8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 12 21:25:09 2019 +0100 d3d9: Validate vertex stride in Draw[Indexed]PrimitiveUP(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46713 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 758cdfa02dce6d8facf9e6a0a7f09bcbb9cacb1b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/device.c | 12 +++++++++++- dlls/d3d9/tests/device.c | 12 ++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 067ea2b..6185a5a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2893,9 +2893,14 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); + if (!stride) + { + WARN("stride is 0, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } if (!primitive_count) { - WARN("primitive_count is 0, returning D3D_OK\n"); + WARN("primitive_count is 0, returning D3D_OK.\n"); return D3D_OK; } @@ -3004,6 +3009,11 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa iface, primitive_type, min_vertex_idx, vertex_count, primitive_count, index_data, index_format, vertex_data, vertex_stride); + if (!vertex_stride) + { + WARN("vertex_stride is 0, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } if (!primitive_count) { WARN("primitive_count is 0, returning D3D_OK.\n"); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 1cd548f..e105b25 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2976,6 +2976,11 @@ static void test_draw_primitive(void) hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); @@ -3005,6 +3010,13 @@ static void test_draw_primitive(void) IDirect3DIndexBuffer9_Release(current_ib); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 0, + indices, D3DFMT_INDEX16, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr);

1 0

Nikolay Sivov : wshom.ocx: Fix string length returned from Check returned BSTR length.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 901742c35a18a34875eb0e1da2def8d11a6db6a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=901742c35a18a34875eb0e1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 4 15:52:25 2019 +0300 wshom.ocx: Fix string length returned from Check returned BSTR length. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46754 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1866fd659a320c33790aa67fa9b66f032b8269a8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wshom.ocx/shell.c | 14 ++++++++------ dlls/wshom.ocx/tests/wshom.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index ca4f7ff..57f1746 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -455,14 +455,16 @@ static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, return E_POINTER; len = GetEnvironmentVariableW(name, NULL, 0); - *value = SysAllocStringLen(NULL, len); - if (!*value) - return E_OUTOFMEMORY; - if (len) - GetEnvironmentVariableW(name, *value, len+1); + { + *value = SysAllocStringLen(NULL, len - 1); + if (*value) + GetEnvironmentVariableW(name, *value, len); + } + else + *value = SysAllocStringLen(NULL, 0); - return S_OK; + return *value ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI WshEnvironment_put_Item(IWshEnvironment *iface, BSTR name, BSTR value) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index c1f9519..c00f7ab 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -56,6 +56,13 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) ITypeInfo_Release(ti); } +#define CHECK_BSTR_LENGTH(str) check_bstr_length(str, __LINE__) +static void check_bstr_length(BSTR str, int line) +{ + ok_(__FILE__, line)(SysStringLen(str) == lstrlenW(str), "Unexpected string length %u vs %u.\n", + SysStringLen(str), lstrlenW(str)); +} + static void test_wshshell(void) { static const WCHAR notepadW[] = {'n','o','t','e','p','a','d','.','e','x','e',0}; @@ -156,6 +163,7 @@ static void test_wshshell(void) hr = IWshCollection_Item(coll, &arg, &res); EXPECT_HR(hr, S_OK); ok(V_VT(&res) == VT_BSTR, "got res type %d\n", V_VT(&res)); + CHECK_BSTR_LENGTH(V_BSTR(&res)); SysFreeString(str); VariantClear(&res); @@ -211,6 +219,7 @@ static void test_wshshell(void) hr = IWshEnvironment_get_Item(env, str, &ret); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ret && *ret == 0, "got %s\n", wine_dbgstr_w(ret)); + CHECK_BSTR_LENGTH(ret); SysFreeString(ret); SysFreeString(str); @@ -219,6 +228,7 @@ static void test_wshshell(void) hr = IWshEnvironment_get_Item(env, str, &ret); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ret && *ret != 0, "got %s\n", wine_dbgstr_w(ret)); + CHECK_BSTR_LENGTH(ret); SysFreeString(ret); SysFreeString(str); @@ -304,6 +314,7 @@ static void test_wshshell(void) hr = IWshShell3_get_CurrentDirectory(sh3, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok(str && str[0] != 0, "got empty string\n"); + CHECK_BSTR_LENGTH(str); SysFreeString(str); hr = IWshShell3_put_CurrentDirectory(sh3, NULL); @@ -440,6 +451,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(!lstrcmpW(V_BSTR(&value), foobarW), "got %s\n", wine_dbgstr_w(V_BSTR(&value))); + CHECK_BSTR_LENGTH(V_BSTR(&value)); VariantClear(&value); SysFreeString(name); @@ -452,6 +464,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(SysStringLen(V_BSTR(&value)) == 6, "len %d\n", SysStringLen(V_BSTR(&value))); + CHECK_BSTR_LENGTH(V_BSTR(&value)); VariantClear(&value); SysFreeString(name); @@ -528,6 +541,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), fooW), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + CHECK_BSTR_LENGTH(V_BSTR(&v)); VariantClear(&v); VariantClear(&value);

1 0

Gijs Vermeulen : ntoskrnl.exe: Add MmBuildMdlForNonPagedPool stub.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: ddec4bd912074a8b6243368e7922552d905e3124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddec4bd912074a8b6243368e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 11 16:56:17 2019 +0100 ntoskrnl.exe: Add MmBuildMdlForNonPagedPool stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46761 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 199b5d2ca2f1452ce8b3d532a125dc15e96f20de) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c46418e..80321a9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2434,6 +2434,14 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS } /*********************************************************************** + * MmBuildMdlForNonPagedPool (NTOSKRNL.EXE.@) + */ +void WINAPI MmBuildMdlForNonPagedPool(MDL *mdl) +{ + FIXME("stub: %p\n", mdl); +} + +/*********************************************************************** * MmCreateSection (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI MmCreateSection( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7a58683..dec60fe6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -665,7 +665,7 @@ @ stub MmAllocateMappingAddress @ stdcall MmAllocateNonCachedMemory(long) @ stdcall MmAllocatePagesForMdl(int64 int64 int64 long) -@ stub MmBuildMdlForNonPagedPool +@ stdcall MmBuildMdlForNonPagedPool(ptr) @ stub MmCanFileBeTruncated @ stub MmCommitSessionMappedView @ stdcall MmCopyVirtualMemory(ptr ptr ptr ptr long long ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 077fec1..76a3e86 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1444,6 +1444,7 @@ NTSTATUS WINAPI KeWaitForSingleObject(void*,KWAIT_REASON,KPROCESSOR_MODE,BOOLEA PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T); +void WINAPI MmBuildMdlForNonPagedPool(MDL*); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); void * WINAPI MmGetSystemRoutineAddress(UNICODE_STRING*); PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG);

1 0

Zebediah Figura : vbscript: Handle carriage return in more places.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 2e94bb648f4d0131978b22f7ca63a164f9c32a53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e94bb648f4d0131978b22f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 4 17:14:55 2019 -0600 vbscript: Handle carriage return in more places. This fixes a regression introduced by 5800c9ed23a5c720843445d91c8547925493df8a. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46772 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1bd7dbfbc42af85ad5309759d6311427f2860de9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/lex.c | 9 ++++++--- dlls/vbscript/tests/run.c | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index fa467f0..739f3ac 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -225,7 +225,7 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) int len = 0; while(ctx->ptr < ctx->end) { - if(*ctx->ptr == '\n') { + if(*ctx->ptr == '\n' || *ctx->ptr == '\r') { FIXME("newline inside string literal\n"); return 0; } @@ -497,11 +497,14 @@ int parser_lex(void *lval, parser_ctx_t *ctx) ret = parse_next_token(lval, ctx); if(ret == '_') { skip_spaces(ctx); - if(*ctx->ptr != '\n') { + if(*ctx->ptr != '\n' && *ctx->ptr != '\r') { FIXME("'_' not followed by newline\n"); return 0; } - ctx->ptr++; + if(*ctx->ptr == '\r') + ctx->ptr++; + if(*ctx->ptr == '\n') + ctx->ptr++; continue; } if(ret != tNL || ctx->last_token != tNL) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 103082f..7f1fd4c 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2476,6 +2476,9 @@ static void run_tests(void) SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); parse_script_a("' comment\r" + "x = _\r3\r" + "x = _\n3\r" + "x = _\r\n3\r" "Sub testsub(arg)\r" "If arg = 1 Then\r\r" "Call reportSuccess()\n\n"

1 0

Zebediah Figura : hid: Fix length argument to GetOverlappedResult().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: c26d4c91cda8aae8226807a45f7be8dfbc0366ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=c26d4c91cda8aae8226807a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 29 16:18:31 2019 -0500 hid: Fix length argument to GetOverlappedResult(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a0a3b6b90e2d938200bbe86fd131e1ed320d2744) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hid/hidd.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 4b703ca..ca14c4f 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -38,15 +38,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); -static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len, DWORD *ret_len) +static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len) { OVERLAPPED ovl = {0}; + DWORD ret_len; BOOL ret; ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, ret_len, &ovl); + ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, &ret_len, &ovl); if (!ret && GetLastError() == ERROR_IO_PENDING) - ret = GetOverlappedResult(file, &ovl, ret_len, TRUE); + ret = GetOverlappedResult(file, &ovl, &ret_len, TRUE); CloseHandle(ovl.hEvent); return ret; } @@ -65,7 +66,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) TRACE("(%p %p)\n", HidDeviceObject, Attr); - ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL); + ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION)); if (ret) { @@ -79,7 +80,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength); } void WINAPI HidD_GetHidGuid(LPGUID guid) @@ -91,43 +92,43 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength); } BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength); } BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers) { TRACE("(%p %p)\n", HidDeviceObject, NumberBuffers); - return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL); + return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers)); } BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0); } BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) { TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); - return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength); } BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength); } BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) @@ -137,14 +138,12 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT TRACE("(%p %p)\n", HidDeviceObject, PreparsedData); - if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, - &info, sizeof(HID_COLLECTION_INFORMATION), NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(info))) return FALSE; if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; - if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, - data, info.DescriptorSize, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, data, info.DescriptorSize)) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; @@ -156,5 +155,5 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0); }

1 0

Alistair Leslie-Hughes : regedit: Grow the buffer when modifying a DWORD value.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: a5079be68f86b2991f94107e8484721a1d7e7726 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5079be68f86b2991f94107e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 20 21:53:19 2019 +0000 regedit: Grow the buffer when modifying a DWORD value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19098 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 75d8081dc6c6dda04f583c01c301e3c7b8087904) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regedit/edit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index a3cf17b..5f2cc52 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -283,7 +283,9 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) } } else if ( type == REG_DWORD ) { static const WCHAR x[] = {'%','x',0}; - wsprintfW(stringValueData, x, *((DWORD*)stringValueData)); + DWORD value = *((DWORD*)stringValueData); + stringValueData = heap_xrealloc(stringValueData, 64); + wsprintfW(stringValueData, x, value); if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { DWORD val; CHAR* valueA = GetMultiByteString(stringValueData);

1 0

Mark Jansen : imagehlp/tests: Add tests for ImageLoad, ImageUnload, GetImageUnusedHeaderBytes.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 52bcfdefdd6e8bd2d35401b09293c3ff2f74e532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52bcfdefdd6e8bd2d35401b0… Author: Mark Jansen <learn0more(a)gmail.com> Date: Sat Mar 23 02:20:53 2019 +0100 imagehlp/tests: Add tests for ImageLoad, ImageUnload, GetImageUnusedHeaderBytes. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3eca7c1f8e4c34f35c3f25dc107d15c4a3e86cce) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imagehlp/tests/image.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index c0a26c3..4bc7a90 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -33,6 +33,10 @@ static HMODULE hImageHlp; static BOOL (WINAPI *pImageGetDigestStream)(HANDLE, DWORD, DIGEST_FUNCTION, DIGEST_HANDLE); static BOOL (WINAPI *pBindImageEx)(DWORD Flags, const char *ImageName, const char *DllPath, const char *SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine); +static DWORD (WINAPI *pGetImageUnusedHeaderBytes)(PLOADED_IMAGE, LPDWORD); +static PLOADED_IMAGE (WINAPI *pImageLoad)(PCSTR, PCSTR); +static BOOL (WINAPI *pImageUnload)(PLOADED_IMAGE); + /* minimal PE file image */ #define VA_START 0x400000 @@ -425,6 +429,88 @@ static void test_bind_image_ex(void) DeleteFileA(temp_file); } +static void test_image_load(void) +{ + char temp_file[MAX_PATH]; + PLOADED_IMAGE img; + DWORD ret, count; + HANDLE file; + + if (!pImageLoad || !pImageUnload || !pGetImageUnusedHeaderBytes) + { + win_skip("ImageLoad functions are not available\n"); + return; + } + + file = create_temp_file(temp_file); + if (file == INVALID_HANDLE_VALUE) + { + skip("couldn't create temp file\n"); + return; + } + + WriteFile(file, &bin, sizeof(bin), &count, NULL); + CloseHandle(file); + + img = pImageLoad(temp_file, NULL); + ok(img != NULL, "ImageLoad unexpectedly failed\n"); + + if (img) + { + todo_wine ok(!strcmp(img->ModuleName, temp_file), + "unexpected ModuleName, got %s instead of %s\n", img->ModuleName, temp_file); + todo_wine ok(img->MappedAddress != NULL, "MappedAddress != NULL\n"); + if (img->MappedAddress) + { + ok(!memcmp(img->MappedAddress, &bin.dos_header, sizeof(bin.dos_header)), + "MappedAddress doesn't point to IMAGE_DOS_HEADER\n"); + } + ok(img->FileHeader != NULL, "FileHeader != NULL\n"); + if (img->FileHeader) + { + todo_wine ok(!memcmp(img->FileHeader, &bin.nt_headers, sizeof(bin.nt_headers)), + "FileHeader doesn't point to IMAGE_NT_HEADERS32\n"); + } + todo_wine ok(img->NumberOfSections == 3, + "unexpected NumberOfSections, got %d instead of 3\n", img->NumberOfSections); + if (img->NumberOfSections >= 3) + { + ok(!strcmp((const char *)img->Sections[0].Name, ".text"), + "unexpected name for section 0, expected .text, got %s\n", + (const char *)img->Sections[0].Name); + ok(!strcmp((const char *)img->Sections[1].Name, ".bss"), + "unexpected name for section 1, expected .bss, got %s\n", + (const char *)img->Sections[1].Name); + ok(!strcmp((const char *)img->Sections[2].Name, ".idata"), + "unexpected name for section 2, expected .idata, got %s\n", + (const char *)img->Sections[2].Name); + } + todo_wine ok(img->Characteristics == 0x102, + "unexpected Characteristics, got 0x%x instead of 0x102\n", img->Characteristics); + ok(img->fSystemImage == 0, + "unexpected fSystemImage, got %d instead of 0\n", img->fSystemImage); + ok(img->fDOSImage == 0, + "unexpected fDOSImage, got %d instead of 0\n", img->fDOSImage); + todo_wine ok(img->fReadOnly == 1 || broken(!img->fReadOnly) /* <= WinXP */, + "unexpected fReadOnly, got %d instead of 1\n", img->fReadOnly); + todo_wine ok(img->Version == 1 || broken(!img->Version) /* <= WinXP */, + "unexpected Version, got %d instead of 1\n", img->Version); + todo_wine ok(img->SizeOfImage == 0x600, + "unexpected SizeOfImage, got 0x%x instead of 0x600\n", img->SizeOfImage); + + count = 0xdeadbeef; + ret = pGetImageUnusedHeaderBytes(img, &count); + todo_wine + ok(ret == 448, "GetImageUnusedHeaderBytes returned %u instead of 448\n", ret); + todo_wine + ok(count == 64, "unexpected size for unused header bytes, got %u instead of 64\n", count); + + pImageUnload(img); + } + + DeleteFileA(temp_file); +} + START_TEST(image) { hImageHlp = LoadLibraryA("imagehlp.dll"); @@ -437,9 +523,13 @@ START_TEST(image) pImageGetDigestStream = (void *) GetProcAddress(hImageHlp, "ImageGetDigestStream"); pBindImageEx = (void *) GetProcAddress(hImageHlp, "BindImageEx"); + pGetImageUnusedHeaderBytes = (void *) GetProcAddress(hImageHlp, "GetImageUnusedHeaderBytes"); + pImageLoad = (void *) GetProcAddress(hImageHlp, "ImageLoad"); + pImageUnload = (void *) GetProcAddress(hImageHlp, "ImageUnload"); test_get_digest_stream(); test_bind_image_ex(); + test_image_load(); FreeLibrary(hImageHlp); }

1 0

Michael Müller : imagehlp: Implement ImageLoad and cleanup ImageUnload.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 0dd77b7c0764d4d8d770d50b5cace20bee8d731e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dd77b7c0764d4d8d770d50b… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Mar 23 02:20:54 2019 +0100 imagehlp: Implement ImageLoad and cleanup ImageUnload. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 55a62c739c02135d18aa5af6ede304465cb0e030) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imagehlp/access.c | 78 ++++++++++++++++++++++++--------------------- dlls/imagehlp/tests/image.c | 12 +++---- 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 6a33c0c..66c3036 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -33,8 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); /*********************************************************************** * Data */ - -static PLOADED_IMAGE IMAGEHLP_pFirstLoadedImage=NULL; +static LIST_ENTRY image_list = { &image_list, &image_list }; DECLSPEC_HIDDEN extern HANDLE IMAGEHLP_hHeap; @@ -69,57 +68,62 @@ DWORD WINAPI GetImageUnusedHeaderBytes( /*********************************************************************** * ImageLoad (IMAGEHLP.@) */ -PLOADED_IMAGE WINAPI ImageLoad(PCSTR DllName, PCSTR DllPath) +PLOADED_IMAGE WINAPI ImageLoad(PCSTR dll_name, PCSTR dll_path) { - PLOADED_IMAGE pLoadedImage; - - FIXME("(%s, %s): stub\n", DllName, DllPath); - - pLoadedImage = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(LOADED_IMAGE)); - if (pLoadedImage) - pLoadedImage->FileHeader = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(IMAGE_NT_HEADERS)); - - return pLoadedImage; + LOADED_IMAGE *image; + + TRACE("(%s, %s)\n", dll_name, dll_path); + + image = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(*image)); + if (!image) return NULL; + + if (!MapAndLoad(dll_name, dll_path, image, TRUE, TRUE)) + { + HeapFree(IMAGEHLP_hHeap, 0, image); + return NULL; + } + + image->Links.Flink = image_list.Flink; + image->Links.Blink = &image_list; + image_list.Flink->Blink = &image->Links; + image_list.Flink = &image->Links; + + return image; } /*********************************************************************** * ImageUnload (IMAGEHLP.@) */ -BOOL WINAPI ImageUnload(PLOADED_IMAGE pLoadedImage) +BOOL WINAPI ImageUnload(PLOADED_IMAGE loaded_image) { - LIST_ENTRY *pCurrent, *pFind; + LIST_ENTRY *entry, *mark; + PLOADED_IMAGE image; + + TRACE("(%p)\n", loaded_image); - TRACE("(%p)\n", pLoadedImage); - - if(!IMAGEHLP_pFirstLoadedImage || !pLoadedImage) + /* FIXME: do we really need to check this? */ + mark = &image_list; + for (entry = mark->Flink; entry != mark; entry = entry->Flink) { - /* No image loaded or null pointer */ - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + image = CONTAINING_RECORD(entry, LOADED_IMAGE, Links); + if (image == loaded_image) + break; } - pFind=&pLoadedImage->Links; - pCurrent=&IMAGEHLP_pFirstLoadedImage->Links; - while((pCurrent != pFind) && - (pCurrent != NULL)) - pCurrent = pCurrent->Flink; - if(!pCurrent) + if (entry == mark) { - /* Not found */ - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + /* Not found */ + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } - if(pCurrent->Blink) - pCurrent->Blink->Flink = pCurrent->Flink; - else - IMAGEHLP_pFirstLoadedImage = pCurrent->Flink?CONTAINING_RECORD( - pCurrent->Flink, LOADED_IMAGE, Links):NULL; + entry->Blink->Flink = entry->Flink; + entry->Flink->Blink = entry->Blink; - if(pCurrent->Flink) - pCurrent->Flink->Blink = pCurrent->Blink; + UnMapAndLoad(loaded_image); + HeapFree(IMAGEHLP_hHeap, 0, loaded_image); - return FALSE; + return TRUE; } /*********************************************************************** diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 4bc7a90..875d919 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -457,9 +457,9 @@ static void test_image_load(void) if (img) { - todo_wine ok(!strcmp(img->ModuleName, temp_file), + ok(!strcmp(img->ModuleName, temp_file), "unexpected ModuleName, got %s instead of %s\n", img->ModuleName, temp_file); - todo_wine ok(img->MappedAddress != NULL, "MappedAddress != NULL\n"); + ok(img->MappedAddress != NULL, "MappedAddress != NULL\n"); if (img->MappedAddress) { ok(!memcmp(img->MappedAddress, &bin.dos_header, sizeof(bin.dos_header)), @@ -468,10 +468,10 @@ static void test_image_load(void) ok(img->FileHeader != NULL, "FileHeader != NULL\n"); if (img->FileHeader) { - todo_wine ok(!memcmp(img->FileHeader, &bin.nt_headers, sizeof(bin.nt_headers)), + ok(!memcmp(img->FileHeader, &bin.nt_headers, sizeof(bin.nt_headers)), "FileHeader doesn't point to IMAGE_NT_HEADERS32\n"); } - todo_wine ok(img->NumberOfSections == 3, + ok(img->NumberOfSections == 3, "unexpected NumberOfSections, got %d instead of 3\n", img->NumberOfSections); if (img->NumberOfSections >= 3) { @@ -485,7 +485,7 @@ static void test_image_load(void) "unexpected name for section 2, expected .idata, got %s\n", (const char *)img->Sections[2].Name); } - todo_wine ok(img->Characteristics == 0x102, + ok(img->Characteristics == 0x102, "unexpected Characteristics, got 0x%x instead of 0x102\n", img->Characteristics); ok(img->fSystemImage == 0, "unexpected fSystemImage, got %d instead of 0\n", img->fSystemImage); @@ -495,7 +495,7 @@ static void test_image_load(void) "unexpected fReadOnly, got %d instead of 1\n", img->fReadOnly); todo_wine ok(img->Version == 1 || broken(!img->Version) /* <= WinXP */, "unexpected Version, got %d instead of 1\n", img->Version); - todo_wine ok(img->SizeOfImage == 0x600, + ok(img->SizeOfImage == 0x600, "unexpected SizeOfImage, got 0x%x instead of 0x600\n", img->SizeOfImage); count = 0xdeadbeef;

1 0