May 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : mf/samplegrabber: Test shutdown state under the lock for methods that modify item queue.
by Alexandre Julliard May 15, 2020

May 15, 2020

Module: wine Branch: master Commit: 710cc2bcfb9d9e5a39de3612edcf4ef7ca4739b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=710cc2bcfb9d9e5a39de3612… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 18:32:55 2020 +0300 mf/samplegrabber: Test shutdown state under the lock for methods that modify item queue. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 24d9163d19..92330abc9f 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -407,12 +407,11 @@ static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, if (!sample) return S_OK; - if (grabber->is_shut_down) - return MF_E_STREAMSINK_REMOVED; - EnterCriticalSection(&grabber->cs); - if (grabber->state == SINK_STATE_RUNNING) + if (grabber->is_shut_down) + hr = MF_E_STREAMSINK_REMOVED; + else if (grabber->state == SINK_STATE_RUNNING) { hr = IMFSample_GetSampleTime(sample, &sampletime); @@ -479,12 +478,11 @@ static HRESULT WINAPI sample_grabber_stream_PlaceMarker(IMFStreamSink *iface, MF TRACE("%p, %d, %p, %p.\n", iface, marker_type, marker_value, context_value); - if (grabber->is_shut_down) - return MF_E_STREAMSINK_REMOVED; - EnterCriticalSection(&grabber->cs); - if (grabber->state == SINK_STATE_RUNNING) + if (grabber->is_shut_down) + hr = MF_E_STREAMSINK_REMOVED; + else if (grabber->state == SINK_STATE_RUNNING) hr = stream_place_marker(grabber, marker_type, context_value); LeaveCriticalSection(&grabber->cs);

1 0

Jacek Caban : configure: Check if --disable-stdcall-fixup is supported before using it.
by Alexandre Julliard May 15, 2020

May 15, 2020

Module: wine Branch: master Commit: cecd09ceb9f29cac39a2adb53220f3ed90e43cbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cecd09ceb9f29cac39a2adb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 15 19:22:55 2020 +0200 configure: Check if --disable-stdcall-fixup is supported before using it. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 +++++++++++++++++++++++++- configure.ac | 3 ++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f85e18b77f..7e4a153c20 100755 --- a/configure +++ b/configure @@ -8237,7 +8237,31 @@ fi LIBEXT="dll" DLLEXT="" case $host_cpu in - *i[3456]86*) LDDLLFLAGS="-Wl,--disable-stdcall-fixup" ;; + *i[3456]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--disable-stdcall-fixup" >&5 +$as_echo_n "checking whether the compiler supports -Wl,--disable-stdcall-fixup... " >&6; } +if ${ac_cv_cflags__Wl___disable_stdcall_fixup+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,--disable-stdcall-fixup" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl___disable_stdcall_fixup=yes +else + ac_cv_cflags__Wl___disable_stdcall_fixup=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___disable_stdcall_fixup" >&5 +$as_echo "$ac_cv_cflags__Wl___disable_stdcall_fixup" >&6; } +if test "x$ac_cv_cflags__Wl___disable_stdcall_fixup" = xyes; then : + LDDLLFLAGS="-Wl,--disable-stdcall-fixup" +fi ;; esac enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} diff --git a/configure.ac b/configure.ac index 0dbcb3d095..b7916fcca7 100644 --- a/configure.ac +++ b/configure.ac @@ -727,7 +727,8 @@ case $host_os in DLLEXT="" dnl Disable stdcall fixups to catch prototype mismatches case $host_cpu in - *i[[3456]]86*) LDDLLFLAGS="-Wl,--disable-stdcall-fixup" ;; + *i[[3456]]86*) WINE_TRY_CFLAGS([-Wl,--disable-stdcall-fixup], + [LDDLLFLAGS="-Wl,--disable-stdcall-fixup"]) ;; esac dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no}

1 0

Nikolay Sivov : quartz/dsoundrenderer: Remove dead method call.
by Alexandre Julliard May 15, 2020

May 15, 2020

Module: wine Branch: master Commit: 033713b0ae634ac0d68c3f17a27dd5e080901507 URL: https://source.winehq.org/git/wine.git/?a=commit;h=033713b0ae634ac0d68c3f17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 20:05:41 2020 +0300 quartz/dsoundrenderer: Remove dead method call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index badaffb99a..8e6379da8c 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -351,8 +351,6 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(struct strmbase_renderer *ifac tStart = tStop = -1; } - IMediaSample_IsDiscontinuity(pSample); - if (IMediaSample_IsPreroll(pSample) == S_OK) { TRACE("Preroll!\n");

1 0

Nikolay Sivov : mf/samplegrabber: Remove now unnecessary shutdown state check.
by Alexandre Julliard May 15, 2020

May 15, 2020

Module: wine Branch: master Commit: 7a44796de476efa0c2ce5776c06df589e063d87d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a44796de476efa0c2ce5776… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 18:32:54 2020 +0300 mf/samplegrabber: Remove now unnecessary shutdown state check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index eb116d81ed..24d9163d19 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -717,35 +717,32 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba EnterCriticalSection(&grabber->cs); - if (!grabber->is_shut_down) + LIST_FOR_EACH_ENTRY_SAFE(item, item2, &grabber->items, struct scheduled_item, entry) { - LIST_FOR_EACH_ENTRY_SAFE(item, item2, &grabber->items, struct scheduled_item, entry) + if (item->type == ITEM_TYPE_MARKER) + { + sample_grabber_stream_report_marker(grabber, &item->u.marker.context, S_OK); + stream_release_pending_item(item); + } + else if (item->type == ITEM_TYPE_SAMPLE) { - if (item->type == ITEM_TYPE_MARKER) + if (!sample_reported) { - sample_grabber_stream_report_marker(grabber, &item->u.marker.context, S_OK); + if (FAILED(hr = sample_grabber_report_sample(grabber, item->u.sample, &sample_delivered))) + WARN("Failed to report a sample, hr %#x.\n", hr); stream_release_pending_item(item); + sample_reported = TRUE; } - else if (item->type == ITEM_TYPE_SAMPLE) + else { - if (!sample_reported) - { - if (FAILED(hr = sample_grabber_report_sample(grabber, item->u.sample, &sample_delivered))) - WARN("Failed to report a sample, hr %#x.\n", hr); - stream_release_pending_item(item); - sample_reported = TRUE; - } - else - { - if (FAILED(hr = stream_schedule_sample(grabber, item))) - WARN("Failed to schedule a sample, hr %#x.\n", hr); - break; - } + if (FAILED(hr = stream_schedule_sample(grabber, item))) + WARN("Failed to schedule a sample, hr %#x.\n", hr); + break; } } - if (sample_delivered) - sample_grabber_stream_request_sample(grabber); } + if (sample_delivered) + sample_grabber_stream_request_sample(grabber); LeaveCriticalSection(&grabber->cs);

1 0

Nikolay Sivov : mf/samglegrabber: Dump pending items on shutdown.
by Alexandre Julliard May 15, 2020

May 15, 2020

Module: wine Branch: master Commit: 51dcfe4634da5b4ee3f96c330054807384082a6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=51dcfe4634da5b4ee3f96c33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 18:32:53 2020 +0300 mf/samglegrabber: Dump pending items on shutdown. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index adb4ded54f..eb116d81ed 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -802,11 +802,20 @@ static ULONG WINAPI sample_grabber_sink_AddRef(IMFMediaSink *iface) return refcount; } +static void sample_grabber_release_pending_items(struct sample_grabber *grabber) +{ + struct scheduled_item *item, *next_item; + + LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &grabber->items, struct scheduled_item, entry) + { + stream_release_pending_item(item); + } +} + static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) { struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); ULONG refcount = InterlockedDecrement(&grabber->refcount); - struct scheduled_item *item, *next_item; TRACE("%p, refcount %u.\n", iface, refcount); @@ -836,10 +845,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) } if (grabber->sample_attributes) IMFAttributes_Release(grabber->sample_attributes); - LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &grabber->items, struct scheduled_item, entry) - { - stream_release_pending_item(item); - } + sample_grabber_release_pending_items(grabber); DeleteCriticalSection(&grabber->cs); heap_free(grabber); } @@ -1031,6 +1037,7 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) EnterCriticalSection(&grabber->cs); grabber->is_shut_down = TRUE; + sample_grabber_release_pending_items(grabber); if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { sample_grabber_set_presentation_clock(grabber, NULL);

1 0

Derek Lesho : mf/samplegrabber: Attach markers to previously queued sample, not the next.
by Alexandre Julliard May 15, 2020

May 15, 2020

Module: wine Branch: master Commit: b9ec2719fc7cad070d51b05fd2c48293ee7b98ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9ec2719fc7cad070d51b05f… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri May 15 18:32:52 2020 +0300 mf/samplegrabber: Attach markers to previously queued sample, not the next. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 60 +++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 39 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 7d9fa78732..adb4ded54f 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -708,61 +708,43 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_GetParameters(IMFAsyn return E_NOTIMPL; } -static struct scheduled_item *stream_get_next_item(struct sample_grabber *grabber) -{ - struct scheduled_item *item = NULL; - struct list *e; - - if ((e = list_head(&grabber->items))) - item = LIST_ENTRY(e, struct scheduled_item, entry); - - return item; -} - static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct sample_grabber *grabber = impl_from_IMFAsyncCallback(iface); - struct scheduled_item *item; - BOOL sample_delivered; + BOOL sample_reported = FALSE, sample_delivered = FALSE; + struct scheduled_item *item, *item2; HRESULT hr; EnterCriticalSection(&grabber->cs); - /* Report and schedule next. */ - if (!grabber->is_shut_down && (item = stream_get_next_item(grabber))) + if (!grabber->is_shut_down) { - while (item) + LIST_FOR_EACH_ENTRY_SAFE(item, item2, &grabber->items, struct scheduled_item, entry) { - switch (item->type) + if (item->type == ITEM_TYPE_MARKER) + { + sample_grabber_stream_report_marker(grabber, &item->u.marker.context, S_OK); + stream_release_pending_item(item); + } + else if (item->type == ITEM_TYPE_SAMPLE) { - case ITEM_TYPE_SAMPLE: + if (!sample_reported) + { if (FAILED(hr = sample_grabber_report_sample(grabber, item->u.sample, &sample_delivered))) WARN("Failed to report a sample, hr %#x.\n", hr); stream_release_pending_item(item); - - /* Schedule next sample, skipping markers. */ - LIST_FOR_EACH_ENTRY(item, &grabber->items, struct scheduled_item, entry) - { - if (item->type == ITEM_TYPE_SAMPLE) - { - if (FAILED(hr = stream_schedule_sample(grabber, item))) - WARN("Failed to schedule a sample, hr %#x.\n", hr); - break; - } - } - - if (sample_delivered) - sample_grabber_stream_request_sample(grabber); - - item = NULL; - break; - case ITEM_TYPE_MARKER: - sample_grabber_stream_report_marker(grabber, &item->u.marker.context, S_OK); - stream_release_pending_item(item); - item = stream_get_next_item(grabber); + sample_reported = TRUE; + } + else + { + if (FAILED(hr = stream_schedule_sample(grabber, item))) + WARN("Failed to schedule a sample, hr %#x.\n", hr); break; + } } } + if (sample_delivered) + sample_grabber_stream_request_sample(grabber); } LeaveCriticalSection(&grabber->cs);

1 0

Vincent Povirk : gdiplus: Don't set a palette when loading non-indexed images.
by Alexandre Julliard May 15, 2020

May 15, 2020

Module: wine Branch: master Commit: ed2d0df4f78a7f73564fcc5cbf94a54e3475fe31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed2d0df4f78a7f73564fcc5c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 14 20:51:09 2020 -0500 gdiplus: Don't set a palette when loading non-indexed images. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4fd7d95a9c..17cccf2b42 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -58,11 +58,11 @@ static const struct { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 }, { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, - { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, - { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, - { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, - { &GUID_WICPixelFormat32bppBGRA, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedHalftone256 }, - { &GUID_WICPixelFormat32bppPBGRA, PixelFormat32bppPARGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, 0 }, + { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, 0 }, + { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, 0 }, + { &GUID_WICPixelFormat32bppBGRA, PixelFormat32bppARGB, 0 }, + { &GUID_WICPixelFormat32bppPBGRA, PixelFormat32bppPARGB, 0 }, { NULL } }; @@ -82,7 +82,7 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT hr = WINCODEC_ERR_PALETTEUNAVAILABLE; if (frame) hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette); - if (hr != S_OK) + if (hr != S_OK && palette_type != 0) { TRACE("using predefined palette %#x\n", palette_type); hr = IWICPalette_InitializePredefined(wic_palette, palette_type, FALSE);

1 0

Vladimir Panteleev : kernelbase: Don't return ERROR_INSUFFICIENT_BUFFER from GetEnvironmentVariableW.
by Alexandre Julliard May 15, 2020

May 15, 2020

Module: wine Branch: master Commit: 4c06599c1ff3767cc8d70d7de9269c424900c3a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c06599c1ff3767cc8d70d7d… Author: Vladimir Panteleev <git(a)vladimir.panteleev.md> Date: Thu May 14 23:12:25 2020 +0200 kernelbase: Don't return ERROR_INSUFFICIENT_BUFFER from GetEnvironmentVariableW. Windows doesn't do this (except XP, and then only for empty variables, where it returns ERROR_MORE_DATA). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48471 Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/environ.c | 6 ++++++ dlls/kernelbase/process.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 41d4095772..5de7980bca 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -106,9 +106,12 @@ static void test_GetSetEnvironmentVariableA(void) GetLastError()); /* Try to retrieve the environment variable we just set */ + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(name, NULL, 0); ok(ret_size == strlen(value) + 1, "should return length with terminating 0 ret_size=%d\n", ret_size); + ok(GetLastError() == 0xdeadbeef, + "should not fail with zero size but GetLastError=%d\n", GetLastError()); lstrcpyA(buf, "foo"); ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value)); @@ -208,10 +211,13 @@ static void test_GetSetEnvironmentVariableW(void) GetLastError()); /* Try to retrieve the environment variable we just set */ + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(name, NULL, 0); ok(ret_size == lstrlenW(value) + 1, "should return length with terminating 0 ret_size=%d\n", ret_size); + ok(GetLastError() == 0xdeadbeef, + "should not fail with zero size but GetLastError=%d\n", GetLastError()); lstrcpyW(buf, fooW); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value)); diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index b06706f11b..7cad3e6678 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1395,7 +1395,8 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetEnvironmentVariableW( LPCWSTR name, LPWSTR val status = RtlQueryEnvironmentVariable_U( NULL, &us_name, &us_value ); len = us_value.Length / sizeof(WCHAR); - if (!set_ntstatus( status )) return (status == STATUS_BUFFER_TOO_SMALL) ? len + 1 : 0; + if (status == STATUS_BUFFER_TOO_SMALL) return len + 1; + if (!set_ntstatus( status )) return 0; if (size) val[len] = 0; return len; }

1 0

Gijs Vermeulen : advapi32: Set last error directly in GetUserName.
by Alexandre Julliard May 15, 2020

May 15, 2020

Module: wine Branch: master Commit: 3c1edaaae582a77ec6472f634e500748477c27e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c1edaaae582a77ec6472f63… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu May 14 23:12:23 2020 +0200 advapi32: Set last error directly in GetUserName. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index cfd79e02af..589405b59e 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -49,6 +49,7 @@ BOOL WINAPI GetUserNameA( LPSTR name, LPDWORD size ) if (!len) return FALSE; if ((ret = (len < *size))) len++; + else SetLastError( ERROR_INSUFFICIENT_BUFFER ); *size = len; return ret; } @@ -64,6 +65,7 @@ BOOL WINAPI GetUserNameW( LPWSTR name, LPDWORD size ) if (!len) return FALSE; if ((ret = (len < *size))) len++; + else SetLastError( ERROR_INSUFFICIENT_BUFFER ); *size = len; return ret; }

1 0

Dmitry Timoshkov : kernel32: On process entry store PEB address in %ebx.
by Alexandre Julliard May 15, 2020

May 15, 2020

Module: wine Branch: master Commit: 360820fb5830750b23543dc34188970aa9431835 URL: https://source.winehq.org/git/wine.git/?a=commit;h=360820fb5830750b23543dc3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 6 15:15:58 2020 +0800 kernel32: On process entry store PEB address in %ebx. 8k demo custom PE loader depends on this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42125 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 332e2c63f2..f628f96f36 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -94,12 +94,18 @@ __ASM_GLOBAL_FUNC( call_process_entry, __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "pushl 4(%ebp)\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") + "movl 8(%ebp),%ebx\n\t" + /* deliberately mis-align the stack by 8, Doom 3 needs this */ "pushl 4(%ebp)\n\t" /* Driller expects readable address at this offset */ "pushl 4(%ebp)\n\t" - "pushl 8(%ebp)\n\t" + "pushl %ebx\n\t" "call *12(%ebp)\n\t" - "leave\n\t" + "leal -4(%ebp),%esp\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") + "popl %ebp\n\t" __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" )

1 0