February 2021 - Wine-commits

Zebediah Figura : winegstreamer: Store the wg_parser_stream pointers also in struct wg_parser.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: a03f7350b309ca7025783be1d2478c305d20dbf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a03f7350b309ca7025783be1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 4 20:53:38 2021 -0600 winegstreamer: Store the wg_parser_stream pointers also in struct wg_parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 31f0a07d93f..d9cc072a8c7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -48,6 +48,9 @@ static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x00 struct wg_parser { + struct wg_parser_stream **streams; + unsigned int stream_count; + GstElement *container; GstBus *bus; GstPad *my_src, *their_sink; @@ -2505,14 +2508,20 @@ static const struct strmbase_source_ops source_ops = static struct parser_source *create_pin(struct parser *filter, const WCHAR *name) { - struct parser_source *pin, **new_array; + struct wg_parser *parser = filter->wg_parser; struct wg_parser_stream *stream; + struct parser_source *pin; char pad_name[19]; + void *new_array; - if (!(new_array = heap_realloc(filter->sources, (filter->source_count + 1) * sizeof(*new_array)))) + if (!(new_array = heap_realloc(filter->sources, (filter->source_count + 1) * sizeof(*filter->sources)))) return NULL; filter->sources = new_array; + if (!(new_array = realloc(parser->streams, (parser->stream_count + 1) * sizeof(*parser->streams)))) + return NULL; + parser->streams = new_array; + if (!(pin = heap_alloc_zero(sizeof(*pin)))) return NULL; @@ -2544,6 +2553,7 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name gst_pad_set_query_function(stream->my_sink, query_sink_wrapper); filter->sources[filter->source_count++] = pin; + parser->streams[parser->stream_count++] = stream; return pin; } @@ -2589,6 +2599,9 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) This->source_count = 0; heap_free(This->sources); This->sources = NULL; + parser->stream_count = 0; + free(parser->streams); + parser->streams = NULL; gst_element_set_bus(parser->container, NULL); gst_object_unref(parser->container); parser->container = NULL;

1 0

Zebediah Figura : winegstreamer: Store the stream duration also in the wg_parser_stream structure.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 42dc1e93b214bb41e6524d49196e6413b5ffc735 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42dc1e93b214bb41e6524d49… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 4 20:53:39 2021 -0600 winegstreamer: Store the stream duration also in the wg_parser_stream structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d9cc072a8c7..a63e91c9a65 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -110,6 +110,8 @@ struct wg_parser_stream struct wg_parser_event event; bool flushing, eos, enabled; + + uint64_t duration; }; struct parser @@ -1638,7 +1640,8 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) struct parser_source *pin = This->sources[i]; struct wg_parser_stream *stream = pin->wg_stream; - pin->seek.llDuration = pin->seek.llStop = query_duration(stream->their_src); + stream->duration = query_duration(stream->their_src); + pin->seek.llDuration = pin->seek.llStop = stream->duration; pin->seek.llCurrent = 0; while (!stream->caps && !parser->error) pthread_cond_wait(&parser->init_cond, &parser->mutex);

1 0

Zebediah Figura : winegstreamer: Use the "streams" array in wg_parser code.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 45ebc26dcf18aab4c8b56cd4e1d790bf69b0dc55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45ebc26dcf18aab4c8b56cd4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 4 20:53:40 2021 -0600 winegstreamer: Use the "streams" array in wg_parser code. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a63e91c9a65..fdc10f72802 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1228,14 +1228,15 @@ static DWORD CALLBACK read_thread(void *arg) static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) { struct parser *filter = user; + struct wg_parser *parser = filter->wg_parser; unsigned int i; char *name; GST_LOG("filter %p, bin %p, pad %p.", filter, bin, pad); - for (i = 0; i < filter->source_count; ++i) + for (i = 0; i < parser->stream_count; ++i) { - struct wg_parser_stream *stream = filter->sources[i]->wg_stream; + struct wg_parser_stream *stream = parser->streams[i]; if (stream->their_src == pad) { @@ -1785,14 +1786,12 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) parser->flushing = true; pthread_mutex_unlock(&parser->mutex); - for (i = 0; i < filter->source_count; ++i) + for (i = 0; i < parser->stream_count; ++i) { - struct parser_source *pin = filter->sources[i]; + struct wg_parser_stream *stream = parser->streams[i]; - if (!pin->pin.pin.peer) - continue; - - pthread_cond_signal(&pin->wg_stream->event_cond); + if (stream->enabled) + pthread_cond_signal(&stream->event_cond); } for (i = 0; i < filter->source_count; ++i) @@ -2573,10 +2572,10 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) /* Unblock all of our streams. */ pthread_mutex_lock(&parser->mutex); - for (i = 0; i < This->source_count; ++i) + for (i = 0; i < parser->stream_count; ++i) { - This->sources[i]->wg_stream->flushing = true; - pthread_cond_signal(&This->sources[i]->wg_stream->event_empty_cond); + parser->streams[i]->flushing = true; + pthread_cond_signal(&parser->streams[i]->event_empty_cond); } pthread_mutex_unlock(&parser->mutex);

1 0

Zebediah Figura : winegstreamer: Factor out free_stream().
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 41e53a122dc036db084817f56bdd52d3d252eb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e53a122dc036db084817f5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 4 20:53:41 2021 -0600 winegstreamer: Factor out free_stream(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index fdc10f72802..7b3a4fd48bd 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2456,17 +2456,8 @@ static void source_disconnect(struct strmbase_source *iface) stream->enabled = false; } -static void free_source_pin(struct parser_source *pin) +static void free_stream(struct wg_parser_stream *stream) { - struct wg_parser_stream *stream = pin->wg_stream; - - if (pin->pin.pin.peer) - { - if (SUCCEEDED(IMemAllocator_Decommit(pin->pin.pAllocator))) - IPin_Disconnect(pin->pin.pin.peer); - IPin_Disconnect(&pin->pin.pin.IPin_iface); - } - if (stream->their_src) { if (stream->post_sink) @@ -2488,6 +2479,18 @@ static void free_source_pin(struct parser_source *pin) pthread_cond_destroy(&stream->event_empty_cond); free(stream); +} + +static void free_source_pin(struct parser_source *pin) +{ + if (pin->pin.pin.peer) + { + if (SUCCEEDED(IMemAllocator_Decommit(pin->pin.pAllocator))) + IPin_Disconnect(pin->pin.pin.peer); + IPin_Disconnect(&pin->pin.pin.IPin_iface); + } + + free_stream(pin->wg_stream); pin->flushing_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pin->flushing_cs);

1 0

Sebastian Lackner : ntdll: Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 43de1407e92296882c9c04e095f141a5df968808 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43de1407e92296882c9c04e0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 4 18:05:00 2021 -0600 ntdll: Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 1 - dlls/ntdll/unix/file.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 2507437c8c3..839046a7488 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -171,7 +171,6 @@ static void create_file_test(void) U(io).Status = 0xdeadbeef; offset.QuadPart = 0; status = pNtReadFile( dir, NULL, NULL, NULL, &io, buf, sizeof(buf), &offset, NULL ); - todo_wine ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08x\n", status ); if (status == STATUS_PENDING) { diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c41d6bbfa6c..68ce40eb700 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -344,7 +344,7 @@ NTSTATUS errno_to_status( int err ) case EACCES: return STATUS_ACCESS_DENIED; case ENOTDIR: return STATUS_OBJECT_PATH_NOT_FOUND; case ENOENT: return STATUS_OBJECT_NAME_NOT_FOUND; - case EISDIR: return STATUS_FILE_IS_A_DIRECTORY; + case EISDIR: return STATUS_INVALID_DEVICE_REQUEST; case EMFILE: case ENFILE: return STATUS_TOO_MANY_OPENED_FILES; case EINVAL: return STATUS_INVALID_PARAMETER;

1 0

Nikolay Sivov : oleaut32/tests: Remove workarounds in VarFormat* tests.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: f1abfc6933b689de249deb90737abbed819e1cf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1abfc6933b689de249deb90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 5 10:30:45 2021 +0300 oleaut32/tests: Remove workarounds in VarFormat* tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 70 +++++++++++------------------------------ 1 file changed, 19 insertions(+), 51 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 9e4cc063f94..1bd1917d209 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -37,22 +37,9 @@ #include "wtypes.h" #include "oleauto.h" -static HMODULE hOleaut32; - -static HRESULT (WINAPI *pVarFormatNumber)(LPVARIANT,int,int,int,int,ULONG,BSTR*); -static HRESULT (WINAPI *pVarFormat)(LPVARIANT,LPOLESTR,int,int,ULONG,BSTR*); -static HRESULT (WINAPI *pVarWeekdayName)(int,int,int,ULONG,BSTR*); - -/* Has I8/UI8 data type? */ -static BOOL has_i8; - -/* Get a conversion function ptr, return if function not available */ -#define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ - if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; } - #define FMT_NUMBER(vt,val) \ VariantInit(&v); V_VT(&v) = vt; val(&v) = 1; \ - hres = pVarFormatNumber(&v,2,0,0,0,0,&str); \ + hres = VarFormatNumber(&v,2,0,0,0,0,&str); \ ok(hres == S_OK, "VarFormatNumber (vt %d): returned %8x\n", vt, hres); \ if (hres == S_OK) { \ ok(str && wcscmp(str,szResult1) == 0, \ @@ -71,8 +58,6 @@ static void test_VarFormatNumber(void) VARIANT v; BSTR str = NULL; - CHECKPTR(VarFormatNumber); - GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, ARRAY_SIZE(buff)); if (buff[0] != '.' || buff[1]) { @@ -86,11 +71,8 @@ static void test_VarFormatNumber(void) FMT_NUMBER(VT_UI2, V_UI2); FMT_NUMBER(VT_I4, V_I4); FMT_NUMBER(VT_UI4, V_UI4); - if (has_i8) - { - FMT_NUMBER(VT_I8, V_I8); - FMT_NUMBER(VT_UI8, V_UI8); - } + FMT_NUMBER(VT_I8, V_I8); + FMT_NUMBER(VT_UI8, V_UI8); FMT_NUMBER(VT_R4, V_R4); FMT_NUMBER(VT_R8, V_R8); FMT_NUMBER(VT_BOOL, V_BOOL); @@ -98,7 +80,7 @@ static void test_VarFormatNumber(void) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szSrc1); - hres = pVarFormatNumber(&v,2,0,0,0,0,&str); + hres = VarFormatNumber(&v,2,0,0,0,0,&str); ok(hres == S_OK, "VarFormatNumber (bstr): returned %8x\n", hres); if (hres == S_OK) ok(str && wcscmp(str, szResult1) == 0, "VarFormatNumber (bstr): string different\n"); @@ -106,7 +88,7 @@ static void test_VarFormatNumber(void) SysFreeString(str); V_BSTR(&v) = SysAllocString(szSrc2); - hres = pVarFormatNumber(&v,2,0,-1,0,0,&str); + hres = VarFormatNumber(&v,2,0,-1,0,0,&str); ok(hres == S_OK, "VarFormatNumber (bstr): returned %8x\n", hres); if (hres == S_OK) ok(str && wcscmp(str, szResult2) == 0, "VarFormatNumber (-bstr): string different\n"); @@ -121,7 +103,7 @@ static const char *szVarFmtFail = "VT %d|0x%04x Format %s: expected 0x%08x, '%s' out = NULL; \ V_VT(&in) = (vt); v(&in) = val; \ if (fmt) MultiByteToWideChar(CP_ACP, 0, fmt, -1, buffW, ARRAY_SIZE(buffW)); \ - hres = pVarFormat(&in,fmt ? buffW : NULL,fd,fw,flags,&out); \ + hres = VarFormat(&in,fmt ? buffW : NULL,fd,fw,flags,&out); \ if (SUCCEEDED(hres)) WideCharToMultiByte(CP_ACP, 0, out, -1, buff, sizeof(buff),0,0); \ else buff[0] = '\0'; \ ok(hres == ret && (FAILED(ret) || !strcmp(buff, str)), \ @@ -242,8 +224,6 @@ static void test_VarFormat(void) BSTR bstrin, out = NULL; HRESULT hres; - CHECKPTR(VarFormat); - if (PRIMARYLANGID(LANGIDFROMLCID(GetUserDefaultLCID())) != LANG_ENGLISH) { skip("Skipping VarFormat tests for non English language\n"); @@ -268,18 +248,12 @@ static void test_VarFormat(void) VNUMFMT(VT_I1,V_I1); VNUMFMT(VT_I2,V_I2); VNUMFMT(VT_I4,V_I4); - if (has_i8) - { - VNUMFMT(VT_I8,V_I8); - } + VNUMFMT(VT_I8,V_I8); VNUMFMT(VT_INT,V_INT); VNUMFMT(VT_UI1,V_UI1); VNUMFMT(VT_UI2,V_UI2); VNUMFMT(VT_UI4,V_UI4); - if (has_i8) - { - VNUMFMT(VT_UI8,V_UI8); - } + VNUMFMT(VT_UI8,V_UI8); VNUMFMT(VT_UINT,V_UINT); VNUMFMT(VT_R4,V_R4); VNUMFMT(VT_R8,V_R8); @@ -414,21 +388,21 @@ static void test_VarFormat(void) /* 'out' is not cleared */ out = (BSTR)0x1; - hres = pVarFormat(&in,NULL,fd,fw,flags,&out); /* Would crash if out is cleared */ + hres = VarFormat(&in,NULL,fd,fw,flags,&out); /* Would crash if out is cleared */ ok(hres == S_OK, "got %08x\n", hres); SysFreeString(out); out = NULL; /* VT_NULL */ V_VT(&in) = VT_NULL; - hres = pVarFormat(&in,NULL,fd,fw,0,&out); + hres = VarFormat(&in,NULL,fd,fw,0,&out); ok(hres == S_OK, "VarFormat failed with 0x%08x\n", hres); ok(out == NULL, "expected NULL formatted string\n"); /* Invalid args */ - hres = pVarFormat(&in,NULL,fd,fw,flags,NULL); + hres = VarFormat(&in,NULL,fd,fw,flags,NULL); ok(hres == E_INVALIDARG, "Null out: expected E_INVALIDARG, got 0x%08x\n", hres); - hres = pVarFormat(NULL,NULL,fd,fw,flags,&out); + hres = VarFormat(NULL,NULL,fd,fw,flags,&out); ok(hres == E_INVALIDARG, "Null in: expected E_INVALIDARG, got 0x%08x\n", hres); fd = -1; VARFMT(VT_BOOL,V_BOOL,VARIANT_TRUE,"",E_INVALIDARG,""); @@ -444,7 +418,7 @@ static const char *szVarWdnFail = "VarWeekdayName (%d, %d, %d, %d, %x): returned %8x, expected %8x\n"; #define VARWDN(iWeekday, fAbbrev, iFirstDay, dwFlags, ret, buff, out, freeOut) \ do { \ - hres = pVarWeekdayName(iWeekday, fAbbrev, iFirstDay, dwFlags, &out); \ + hres = VarWeekdayName(iWeekday, fAbbrev, iFirstDay, dwFlags, &out); \ if (SUCCEEDED(hres)) { \ WideCharToMultiByte(CP_ACP, 0, out, -1, buff, sizeof(buff), 0, 0); \ if (freeOut) SysFreeString(out); \ @@ -476,8 +450,6 @@ static void test_VarWeekdayName(void) int size; DWORD localeValue; - CHECKPTR(VarWeekdayName); - SetLastError(0xdeadbeef); GetLocaleInfoW(LOCALE_USER_DEFAULT, 0, NULL, 0); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -511,7 +483,7 @@ static void test_VarWeekdayName(void) VARWDN_F(4, 0, -1, 0, E_INVALIDARG); VARWDN_F(4, 0, 8, 0, E_INVALIDARG); - hres = pVarWeekdayName(1, 0, 0, 0, NULL); + hres = VarWeekdayName(1, 0, 0, 0, NULL); ok(E_INVALIDARG == hres, "Null pointer: expected E_INVALIDARG, got 0x%08x\n", hres); @@ -668,13 +640,9 @@ static void test_GetAltMonthNames(void) START_TEST(varformat) { - hOleaut32 = GetModuleHandleA("oleaut32.dll"); - - has_i8 = GetProcAddress(hOleaut32, "VarI8FromI1") != NULL; - - test_VarFormatNumber(); - test_VarFormat(); - test_VarWeekdayName(); - test_VarFormatFromTokens(); - test_GetAltMonthNames(); + test_VarFormatNumber(); + test_VarFormat(); + test_VarWeekdayName(); + test_VarFormatFromTokens(); + test_GetAltMonthNames(); }

1 0

Nikolay Sivov : oleaut32/tests: Use wide strings in VarFormat* tests.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: 74f63545dccf446594315c11d83443cd3bb4ff52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74f63545dccf446594315c11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 5 10:30:46 2021 +0300 oleaut32/tests: Use wide strings in VarFormat* tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 47 +++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 1bd1917d209..54fc8a1841f 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -49,10 +49,7 @@ static void test_VarFormatNumber(void) { - static const WCHAR szSrc1[] = { '1','\0' }; - static const WCHAR szResult1[] = { '1','.','0','0','\0' }; - static const WCHAR szSrc2[] = { '-','1','\0' }; - static const WCHAR szResult2[] = { '(','1','.','0','0',')','\0' }; + static const WCHAR szResult1[] = L"1.00"; char buff[8]; HRESULT hres; VARIANT v; @@ -78,7 +75,7 @@ static void test_VarFormatNumber(void) FMT_NUMBER(VT_BOOL, V_BOOL); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = SysAllocString(szSrc1); + V_BSTR(&v) = SysAllocString(L"1"); hres = VarFormatNumber(&v,2,0,0,0,0,&str); ok(hres == S_OK, "VarFormatNumber (bstr): returned %8x\n", hres); @@ -87,11 +84,11 @@ static void test_VarFormatNumber(void) SysFreeString(V_BSTR(&v)); SysFreeString(str); - V_BSTR(&v) = SysAllocString(szSrc2); + V_BSTR(&v) = SysAllocString(L"-1"); hres = VarFormatNumber(&v,2,0,-1,0,0,&str); ok(hres == S_OK, "VarFormatNumber (bstr): returned %8x\n", hres); if (hres == S_OK) - ok(str && wcscmp(str, szResult2) == 0, "VarFormatNumber (-bstr): string different\n"); + ok(str && wcscmp(str, L"(1.00)") == 0, "VarFormatNumber (-bstr): string different\n"); SysFreeString(V_BSTR(&v)); SysFreeString(str); } @@ -212,8 +209,6 @@ static const FMTDATERES VarFormat_namedtime_results[] = static void test_VarFormat(void) { - static const WCHAR szTesting[] = { 't','e','s','t','i','n','g','\0' }; - static const WCHAR szNum[] = { '3','9','6','9','7','.','1','1','\0' }; size_t i; WCHAR buffW[256]; char buff[256]; @@ -292,7 +287,7 @@ static void test_VarFormat(void) } /* Strings */ - bstrin = SysAllocString(szTesting); + bstrin = SysAllocString(L"testing"); VARFMT(VT_BSTR,V_BSTR,bstrin,"",S_OK,"testing"); VARFMT(VT_BSTR,V_BSTR,bstrin,"@",S_OK,"testing"); VARFMT(VT_BSTR,V_BSTR,bstrin,"&",S_OK,"testing"); @@ -308,7 +303,7 @@ static void test_VarFormat(void) VARFMT(VT_BSTR,V_BSTR,bstrin,"<&&",S_OK,"testing"); VARFMT(VT_BSTR,V_BSTR,bstrin,"<&>&",S_OK,"testing"); SysFreeString(bstrin); - bstrin = SysAllocString(szNum); + bstrin = SysAllocString(L"39697.11"); todo_wine VARFMT(VT_BSTR,V_BSTR,bstrin,"hh:mm",S_OK,"02:38"); todo_wine VARFMT(VT_BSTR,V_BSTR,bstrin,"mm-dd-yy",S_OK,"09-06-08"); SysFreeString(bstrin); @@ -522,17 +517,9 @@ static void test_VarWeekdayName(void) static void test_VarFormatFromTokens(void) { - static WCHAR number_fmt[] = {'#','#','#',',','#','#','0','.','0','0',0}; - static const WCHAR number[] = {'6',',','9','0',0}; - static const WCHAR number_us[] = {'6','9','0','.','0','0',0}; - - static WCHAR date_fmt[] = {'d','d','-','m','m',0}; - static const WCHAR date[] = {'1','2','-','1','1',0}; - static const WCHAR date_us[] = {'1','1','-','1','2',0}; - - static WCHAR string_fmt[] = {'@',0}; - static const WCHAR string_de[] = {'1',',','5',0}; - static const WCHAR string_us[] = {'1','.','5',0}; + static WCHAR number_fmt[] = L"###,##0.00"; + static WCHAR date_fmt[] = L"dd-mm"; + static WCHAR string_fmt[] = L"@"; BYTE buff[256]; LCID lcid; @@ -541,14 +528,14 @@ static void test_VarFormatFromTokens(void) HRESULT hres; V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(number); + V_BSTR(&var) = SysAllocString(L"6,90"); lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); hres = VarTokenizeFormatString(number_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, number_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!wcscmp(bstr, number_us), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, L"690.00"), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); @@ -556,20 +543,20 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, number_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!wcscmp(bstr, number), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, L"6,90"), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); VariantClear(&var); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(date); + V_BSTR(&var) = SysAllocString(L"12-11"); lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); hres = VarTokenizeFormatString(date_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, date_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!wcscmp(bstr, date_us), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, L"11-12"), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); @@ -577,7 +564,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, date_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!wcscmp(bstr, date), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, L"12-11"), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); VariantClear(&var); @@ -590,7 +577,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, string_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!wcscmp(bstr, string_us), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, L"1.5"), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); @@ -598,7 +585,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, string_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!wcscmp(bstr, string_de), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, L"1,5"), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); }

1 0

Nikolay Sivov : oleaut32: Handle preformatted strings in VarFormatCurrency().
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: e26d6da8a944a45c0b7a38f1ef3ccc55355b8ad5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e26d6da8a944a45c0b7a38f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 5 10:30:47 2021 +0300 oleaut32: Handle preformatted strings in VarFormatCurrency(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46709 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 35 +++++++++++++++++++++++++++++++++++ dlls/oleaut32/varformat.c | 15 +++++++++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 54fc8a1841f..d1951b85a61 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -625,6 +625,40 @@ static void test_GetAltMonthNames(void) ok(str != NULL, "Got %p\n", str); } +static void test_VarFormatCurrency(void) +{ + HRESULT hr; + VARIANT in; + BSTR str, str2; + + V_CY(&in).int64 = 0; + V_VT(&in) = VT_CY; + hr = VarFormatCurrency(&in, 3, -2, -2, -2, 0, &str); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + V_VT(&in) = VT_BSTR; + V_BSTR(&in) = str; + hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(lstrcmpW(str, str2), "Expected different string.\n"); + SysFreeString(str2); + + V_VT(&in) = VT_BSTR | VT_BYREF; + V_BSTRREF(&in) = &str; + hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(lstrcmpW(str, str2), "Expected different string.\n"); + + SysFreeString(str); + SysFreeString(str2); + + V_VT(&in) = VT_BSTR; + V_BSTR(&in) = SysAllocString(L"test"); + hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); + ok(hr == DISP_E_TYPEMISMATCH, "Unexpected hr %#x.\n", hr); + VariantClear(&in); +} + START_TEST(varformat) { test_VarFormatNumber(); @@ -632,4 +666,5 @@ START_TEST(varformat) test_VarWeekdayName(); test_VarFormatFromTokens(); test_GetAltMonthNames(); + test_VarFormatCurrency(); } diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index e88bf0bc365..8ed8f790d14 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2401,6 +2401,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, { HRESULT hRet; VARIANT vStr; + CY cy; TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); @@ -2410,8 +2411,18 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, *pbstrOut = NULL; - V_VT(&vStr) = VT_EMPTY; - hRet = VariantCopyInd(&vStr, pVarIn); + if (V_VT(pVarIn) == VT_BSTR || V_VT(pVarIn) == (VT_BSTR | VT_BYREF)) + { + hRet = VarCyFromStr(V_ISBYREF(pVarIn) ? *V_BSTRREF(pVarIn) : V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &cy); + if (FAILED(hRet)) return hRet; + V_VT(&vStr) = VT_CY; + V_CY(&vStr) = cy; + } + else + { + V_VT(&vStr) = VT_EMPTY; + hRet = VariantCopyInd(&vStr, pVarIn); + } if (SUCCEEDED(hRet)) hRet = VariantChangeTypeEx(&vStr, &vStr, LOCALE_USER_DEFAULT, 0, VT_BSTR);

1 0

Nikolay Sivov : oleaut32: Added ICreateTypeInfo2::DeleteFuncDesc().
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: e3ef9b5426900b21209bb14c3d18caaf52e57f60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3ef9b5426900b21209bb14c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 5 10:45:35 2021 +0300 oleaut32: Added ICreateTypeInfo2::DeleteFuncDesc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 78 +++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 52 +++++++++++++++++++++-------- 2 files changed, 116 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ff709ddef62..825851c948e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -8241,6 +8241,83 @@ static void test_DeleteImplType(void) DeleteFileW(filenameW); } +static void test_DeleteFuncDesc(void) +{ + OLECHAR interface1W[] = L"interface1"; + WCHAR filenameW[MAX_PATH], temp_path[MAX_PATH]; + ICreateTypeInfo2 *createti2; + ICreateTypeInfo *createti; + ICreateTypeLib2 *createtl; + FUNCDESC funcdesc; + TYPEATTR *typeattr; + ITypeInfo *ti; + ITypeLib *tl; + HRESULT hr; + + GetTempPathW(ARRAY_SIZE(temp_path), temp_path); + GetTempFileNameW(temp_path, L"tlb", 0, filenameW); + + hr = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + hr = ICreateTypeInfo_QueryInterface(createti, &IID_ICreateTypeInfo2, (void **)&createti2); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + ICreateTypeInfo_Release(createti); + + hr = ICreateTypeInfo2_QueryInterface(createti2, &IID_ITypeInfo, (void **)&ti); + ok(hr == S_OK, "Failed to get typeinfo, hr %#x.\n", hr); + + memset(&funcdesc, 0, sizeof(FUNCDESC)); + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_PROPERTYGET; + funcdesc.callconv = CC_STDCALL; + funcdesc.elemdescFunc.tdesc.vt = VT_BSTR; + U(funcdesc.elemdescFunc).idldesc.wIDLFlags = IDLFLAG_NONE; + + hr = ICreateTypeInfo2_AddFuncDesc(createti2, 0, &funcdesc); + ok(hr == S_OK, "Failed to add a funcdesc, hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(typeattr->cFuncs == 1, "Unexpected cFuncs %u.\n", typeattr->cFuncs); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + hr = ICreateTypeInfo2_DeleteFuncDesc(createti2, 1); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = ICreateTypeInfo2_DeleteFuncDesc(createti2, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(!typeattr->cFuncs, "Unexpected cFuncs %u.\n", typeattr->cFuncs); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + hr = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hr == S_OK, "Failed to save changes, hr %#x.\n", hr); + ICreateTypeLib2_Release(createtl); + ITypeInfo_Release(ti); + ICreateTypeInfo2_Release(createti2); + + /* Load and check typeinfo. */ + hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); + ok(hr == S_OK, "Failed to load typelib, hr %#x.\n", hr); + + hr = ITypeLib_GetTypeInfo(tl, 0, &ti); + ok(hr == S_OK, "Failed to get typeinfo, hr %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(!typeattr->cFuncs, "Unexpected cFuncs value.\n"); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + ITypeInfo_Release(ti); + + ITypeLib_Release(tl); + + DeleteFileW(filenameW); +} + START_TEST(typelib) { const WCHAR *filename; @@ -8282,4 +8359,5 @@ START_TEST(typelib) test_stub(); test_dep(); test_DeleteImplType(); + test_DeleteFuncDesc(); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 65d29734800..4669b03d5fc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5587,6 +5587,22 @@ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) return ref; } +static void typeinfo_release_funcdesc(TLBFuncDesc *func) +{ + unsigned int i; + + for (i = 0; i < func->funcdesc.cParams; ++i) + { + ELEMDESC *elemdesc = &func->funcdesc.lprgelemdescParam[i]; + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); + TLB_FreeCustData(&func->pParamDesc[i].custdata_list); + } + heap_free(func->funcdesc.lprgelemdescParam); + heap_free(func->pParamDesc); + TLB_FreeCustData(&func->custdata_list); +} + static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) { UINT i; @@ -5595,18 +5611,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) for (i = 0; i < This->typeattr.cFuncs; ++i) { - int j; - TLBFuncDesc *pFInfo = &This->funcdescs[i]; - for(j = 0; j < pFInfo->funcdesc.cParams; j++) - { - ELEMDESC *elemdesc = &pFInfo->funcdesc.lprgelemdescParam[j]; - if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) - VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); - TLB_FreeCustData(&pFInfo->pParamDesc[j].custdata_list); - } - heap_free(pFInfo->funcdesc.lprgelemdescParam); - heap_free(pFInfo->pParamDesc); - TLB_FreeCustData(&pFInfo->custdata_list); + typeinfo_release_funcdesc(&This->funcdescs[i]); } heap_free(This->funcdescs); @@ -11373,8 +11378,27 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDesc(ICreateTypeInfo2 *iface, UINT index) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u - stub\n", This, index); - return E_NOTIMPL; + unsigned int i; + + TRACE("%p %u\n", This, index); + + if (index >= This->typeattr.cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + typeinfo_release_funcdesc(&This->funcdescs[index]); + + --This->typeattr.cFuncs; + if (index != This->typeattr.cFuncs) + { + memmove(This->funcdescs + index, This->funcdescs + index + 1, + sizeof(*This->funcdescs) * (This->typeattr.cFuncs - index)); + for (i = index; i < This->typeattr.cFuncs; ++i) + TLB_relink_custdata(&This->funcdescs[i].custdata_list); + } + + This->needs_layout = TRUE; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDescByMemId(ICreateTypeInfo2 *iface,

1 0

Erich E. Hoover : mountmgr.sys: Have harddisk_ioctl return the same status as the IoStatus.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: wine Branch: master Commit: b13f2e11da0e35200285d27e9b7d945556cdcca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b13f2e11da0e35200285d27e… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Feb 4 22:52:43 2021 -0700 mountmgr.sys: Have harddisk_ioctl return the same status as the IoStatus. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index c4e30aa1f33..c9cee002bc0 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1752,23 +1752,22 @@ NTSTATUS query_unix_device( ULONGLONG unix_dev, enum device_type *type, return status; } -static void query_property( struct disk_device *device, IRP *irp ) +static NTSTATUS query_property( struct disk_device *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); STORAGE_PROPERTY_QUERY *query = irp->AssociatedIrp.SystemBuffer; + NTSTATUS status; if (!irp->AssociatedIrp.SystemBuffer || irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(STORAGE_PROPERTY_QUERY)) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - return; + return STATUS_INVALID_PARAMETER; } /* Try to persuade application not to check property */ if (query->QueryType == PropertyExistsQuery) { - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; - return; + return STATUS_NOT_SUPPORTED; } switch (query->PropertyId) @@ -1781,14 +1780,14 @@ static void query_property( struct disk_device *device, IRP *irp ) if (device->serial) len += strlen( device->serial ) + 1; if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DESCRIPTOR_HEADER)) - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + status = STATUS_INVALID_PARAMETER; else if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < len) { descriptor = irp->AssociatedIrp.SystemBuffer; descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR); descriptor->Size = len; irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); - irp->IoStatus.u.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; } else { @@ -1814,16 +1813,17 @@ static void query_property( struct disk_device *device, IRP *irp ) strcpy( (char *)descriptor + descriptor->SerialNumberOffset, device->serial ); } irp->IoStatus.Information = len; - irp->IoStatus.u.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; } break; } default: FIXME( "Unsupported property %#x\n", query->PropertyId ); - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + status = STATUS_NOT_SUPPORTED; break; } + return status; } /* handler for ioctls on the harddisk device */ @@ -1831,6 +1831,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct disk_device *dev = device->DeviceExtension; + NTSTATUS status; TRACE( "ioctl %x insize %u outsize %u\n", irpsp->Parameters.DeviceIoControl.IoControlCode, @@ -1853,7 +1854,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) info.BytesPerSector = 512; memcpy( irp->AssociatedIrp.SystemBuffer, &info, len ); irp->IoStatus.Information = len; - irp->IoStatus.u.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; break; } case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: @@ -1873,7 +1874,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) info.Data[0] = 0; memcpy( irp->AssociatedIrp.SystemBuffer, &info, len ); irp->IoStatus.Information = len; - irp->IoStatus.u.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; break; } case IOCTL_STORAGE_GET_DEVICE_NUMBER: @@ -1882,11 +1883,11 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) memcpy( irp->AssociatedIrp.SystemBuffer, &dev->devnum, len ); irp->IoStatus.Information = len; - irp->IoStatus.u.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; break; } case IOCTL_CDROM_READ_TOC: - irp->IoStatus.u.Status = STATUS_INVALID_DEVICE_REQUEST; + status = STATUS_INVALID_DEVICE_REQUEST; break; case IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS: { @@ -1895,25 +1896,26 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) FIXME( "returning zero-filled buffer for IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS\n" ); memset( irp->AssociatedIrp.SystemBuffer, 0, len ); irp->IoStatus.Information = len; - irp->IoStatus.u.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; break; } case IOCTL_STORAGE_QUERY_PROPERTY: - query_property( dev, irp ); + status = query_property( dev, irp ); break; default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + status = STATUS_NOT_SUPPORTED; break; } } + irp->IoStatus.u.Status = status; LeaveCriticalSection( &device_section ); IoCompleteRequest( irp, IO_NO_INCREMENT ); - return STATUS_SUCCESS; + return status; } /* driver entry point for the harddisk driver */

1 0