February 2019 - Wine-Devel - list.winehq.org

[PATCH] webservices: Delete duplicated return value checks
by Michael Stefaniuc Feb. 5, 2019

Feb. 5, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/webservices/tests/reader.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 2b0475fddf..afbc46b83e 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -5086,7 +5086,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BOOL, "got %u\n", text_node->text->textType ); bool_text = (WS_XML_BOOL_TEXT *)text_node->text; ok( !bool_text->value, "got %d\n", bool_text->value ); @@ -5096,7 +5095,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BOOL, "got %u\n", text_node->text->textType ); bool_text = (WS_XML_BOOL_TEXT *)text_node->text; ok( bool_text->value == TRUE, "got %d\n", bool_text->value ); @@ -5106,7 +5104,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); int32_text = (WS_XML_INT32_TEXT *)text_node->text; ok( int32_text->value == -1, "got %d\n", int32_text->value ); @@ -5116,7 +5113,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); int32_text = (WS_XML_INT32_TEXT *)text_node->text; ok( int32_text->value == -1, "got %d\n", int32_text->value ); @@ -5126,7 +5122,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); int32_text = (WS_XML_INT32_TEXT *)text_node->text; ok( int32_text->value == -1, "got %d\n", int32_text->value ); @@ -5136,7 +5131,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT64, "got %u\n", text_node->text->textType ); int64_text = (WS_XML_INT64_TEXT *)text_node->text; ok( int64_text->value == -1, "got %s\n", wine_dbgstr_longlong(int64_text->value) ); @@ -5146,7 +5140,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_DOUBLE, "got %u\n", text_node->text->textType ); double_text = (WS_XML_DOUBLE_TEXT *)text_node->text; ok( !double_text->value, "got %s\n", wine_dbgstr_longlong(double_text->value) ); @@ -5156,7 +5149,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_DATETIME, "got %u\n", text_node->text->textType ); datetime_text = (WS_XML_DATETIME_TEXT *)text_node->text; ok( !datetime_text->value.ticks, "got %s\n", wine_dbgstr_longlong(datetime_text->value.ticks) ); @@ -5167,7 +5159,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( utf8_text->value.length == 1, "got %u\n", utf8_text->value.length ); @@ -5178,7 +5169,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( utf8_text->value.length == 1, "got %u\n", utf8_text->value.length ); @@ -5189,7 +5179,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( utf8_text->value.length == 1, "got %u\n", utf8_text->value.length ); @@ -5200,7 +5189,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (WS_XML_BASE64_TEXT *)text_node->text; ok( base64_text->length == 1, "got %u\n", base64_text->length ); @@ -5211,7 +5199,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (WS_XML_BASE64_TEXT *)text_node->text; ok( base64_text->length == 1, "got %u\n", base64_text->length ); @@ -5222,7 +5209,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (WS_XML_BASE64_TEXT *)text_node->text; ok( base64_text->length == 1, "got %u\n", base64_text->length ); @@ -5233,7 +5219,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( !utf8_text->value.length, "got %u\n", utf8_text->value.length ); @@ -5244,7 +5229,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( utf8_text->value.length == 2, "got %u\n", utf8_text->value.length ); @@ -5256,7 +5240,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UNIQUE_ID, "got %u\n", text_node->text->textType ); unique_id_text = (WS_XML_UNIQUE_ID_TEXT *)text_node->text; ok( IsEqualGUID( &unique_id_text->value, &guid_null ), "wrong data\n" ); @@ -5266,7 +5249,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_GUID, "got %u\n", text_node->text->textType ); guid_text = (WS_XML_GUID_TEXT *)text_node->text; ok( IsEqualGUID( &guid_text->value, &guid_null ), "wrong data\n" ); @@ -5276,7 +5258,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UINT64, "got %u\n", text_node->text->textType ); uint64_text = (WS_XML_UINT64_TEXT *)text_node->text; ok( uint64_text->value == 1, "got %s\n", wine_dbgstr_longlong(uint64_text->value) ); -- 2.20.1

2 1

[PATCH] cryptdlg: Avoid calling strlen on constants.
by Isira Seneviratne Feb. 5, 2019

Feb. 5, 2019

1 0

[PATCH] advapi32: Avoid calling strlen on constants
by Alex Henrie Feb. 5, 2019

Feb. 5, 2019

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/crypt.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index ab1e5982da..87aa8825d0 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -68,11 +68,11 @@ static inline PWSTR CRYPT_GetProvKeyName(PCWSTR pProvName) }; PWSTR keyname; - keyname = CRYPT_Alloc((strlenW(KEYSTR) + strlenW(pProvName) +1)*sizeof(WCHAR)); + keyname = CRYPT_Alloc((ARRAY_SIZE(KEYSTR) + strlenW(pProvName))*sizeof(WCHAR)); if (keyname) { strcpyW(keyname, KEYSTR); - strcpyW(keyname + strlenW(KEYSTR), pProvName); + strcpyW(keyname + ARRAY_SIZE(KEYSTR) - 1, pProvName); } else SetLastError(ERROR_NOT_ENOUGH_MEMORY); return keyname; @@ -94,14 +94,15 @@ static inline PWSTR CRYPT_GetTypeKeyName(DWORD dwType, BOOL user) 'C','r','y','p','t','o','g','r','a','p','h','y','\\', 'P','r','o','v','i','d','e','r',' ','T','y','p','e',' ','X','X','X',0 }; + SIZE_T keyname_size = user ? sizeof(USERSTR) : sizeof(MACHINESTR); PWSTR keyname; PWSTR ptr; - keyname = CRYPT_Alloc( ((user ? strlenW(USERSTR) : strlenW(MACHINESTR)) +1)*sizeof(WCHAR)); + keyname = CRYPT_Alloc(keyname_size); if (keyname) { user ? strcpyW(keyname, USERSTR) : strcpyW(keyname, MACHINESTR); - ptr = keyname + strlenW(keyname); + ptr = keyname + keyname_size/sizeof(WCHAR) - 1; *(--ptr) = (dwType % 10) + '0'; *(--ptr) = ((dwType / 10) % 10) + '0'; *(--ptr) = (dwType / 100) + '0'; @@ -312,7 +313,7 @@ static void CRYPT_CreateMachineGuid(void) uuid.Data4[6], uuid.Data4[7] ); RegSetValueExW(key, machineGuidW, 0, REG_SZ, (const BYTE *)buf, - (lstrlenW(buf)+1)*sizeof(WCHAR)); + sizeof(buf)); } } RegCloseKey(key); -- 2.20.1

1 4

[PATCH v2] d3dx9/tests: Actually test the return of the effect SetInt() call.
by Matteo Bruni Feb. 5, 2019

Feb. 5, 2019

From: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Add one more missing ok() call. dlls/d3dx9_36/tests/effect.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8f2f06b1de4..5efc93bbb19 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7182,11 +7182,12 @@ static void test_effect_unsupported_shader(void) hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == E_FAIL, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -7229,7 +7230,7 @@ static void test_effect_unsupported_shader(void) HeapFree(GetProcessHeap(), 0, byte_code); IDirect3DVertexShader9_Release(vshader); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->CommitChanges(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -7321,16 +7322,16 @@ static void test_effect_null_shader(void) hr = effect->lpVtbl->ValidateTechnique(effect, "tech0"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 2); + hr = effect->lpVtbl->SetInt(effect, "i", 2); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == E_FAIL, "Got result %#x.\n", hr); @@ -7938,7 +7939,7 @@ static void test_effect_find_next_valid_technique(void) ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); tech = (D3DXHANDLE)0xdeadbeef; @@ -7951,7 +7952,8 @@ static void test_effect_find_next_valid_technique(void) hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); ok(hr == S_FALSE, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); ok(hr == D3D_OK, "Got result %#x.\n", hr); -- 2.19.2

1 0

[PATCH] d3dx9/tests: Actually test the return of the effect SetInt() call
by Michael Stefaniuc Feb. 4, 2019

Feb. 4, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8f2f06b1de..d2031e365e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7182,11 +7182,12 @@ static void test_effect_unsupported_shader(void) hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == E_FAIL, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -7229,7 +7230,7 @@ static void test_effect_unsupported_shader(void) HeapFree(GetProcessHeap(), 0, byte_code); IDirect3DVertexShader9_Release(vshader); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->CommitChanges(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -7321,16 +7322,16 @@ static void test_effect_null_shader(void) hr = effect->lpVtbl->ValidateTechnique(effect, "tech0"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 2); + hr = effect->lpVtbl->SetInt(effect, "i", 2); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == E_FAIL, "Got result %#x.\n", hr); @@ -7938,7 +7939,7 @@ static void test_effect_find_next_valid_technique(void) ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); tech = (D3DXHANDLE)0xdeadbeef; @@ -7951,7 +7952,7 @@ static void test_effect_find_next_valid_technique(void) hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); ok(hr == S_FALSE, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); ok(hr == D3D_OK, "Got result %#x.\n", hr); -- 2.20.1

1 0

[PATCH] kernelbase: Avoid TRUE : FALSE conditional expressions
by Michael Stefaniuc Feb. 4, 2019

Feb. 4, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index bcd129cce9..dfcc825838 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -421,7 +421,7 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens next++; } - has_dot = extension[0] == '.' ? TRUE : FALSE; + has_dot = extension[0] == '.'; hr = PathCchFindExtension(path, size, &existing_extension); if (FAILED(hr)) return hr; @@ -863,5 +863,5 @@ BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server) result = path + 2; if (server) *server = result; - return result ? TRUE : FALSE; + return !!result; } -- 2.20.1

1 0

[PATCH] shcore: Don't return E_FAIL in IStream::SetSize() for read-only mode.
by Jactry Zeng Feb. 4, 2019

Feb. 4, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/shcore/main.c | 13 +++- dlls/shcore/tests/shcore.c | 119 +++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 3 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 973b7c7a03..ffa16cd5a7 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -913,14 +913,21 @@ static HRESULT WINAPI filestream_Seek(IStream *iface, LARGE_INTEGER move, DWORD static HRESULT WINAPI filestream_SetSize(IStream *iface, ULARGE_INTEGER size) { struct shstream *stream = impl_from_IStream(iface); + DWORD origin; TRACE("(%p, %s)\n", stream, wine_dbgstr_longlong(size.QuadPart)); - if (!SetFilePointer(stream->u.file.handle, size.QuadPart, NULL, FILE_BEGIN)) + origin = SetFilePointer(stream->u.file.handle, 0, NULL, FILE_CURRENT); + if (SetFilePointer(stream->u.file.handle, size.QuadPart, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) return E_FAIL; - if (!SetEndOfFile(stream->u.file.handle)) - return E_FAIL; + if (stream->u.file.mode != STGM_READ) + { + if (!SetEndOfFile(stream->u.file.handle)) + return E_FAIL; + if (SetFilePointer(stream->u.file.handle, origin, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + return E_FAIL; + } return S_OK; } diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index 0738659f7c..2a8ebcc468 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -41,6 +41,8 @@ static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY, const char *, const char *, SRRF, static DWORD (WINAPI *pSHQueryValueExA)(HKEY, const char *, DWORD *, DWORD *, void *buff, DWORD *buff_len); static DWORD (WINAPI *pSHRegGetPathA)(HKEY, const char *, const char *, char *, DWORD); static DWORD (WINAPI *pSHCopyKeyA)(HKEY, const char *, HKEY, DWORD); +static HRESULT (WINAPI *pSHCreateStreamOnFileA)(const char *path, DWORD mode, IStream **stream); +static HRESULT (WINAPI *pIStream_Size)(IStream *stream, ULARGE_INTEGER *size); /* Keys used for testing */ #define REG_TEST_KEY "Software\\Wine\\Test" @@ -73,6 +75,8 @@ static void init(HMODULE hshcore) X(SHQueryValueExA); X(SHRegGetPathA); X(SHCopyKeyA); + X(SHCreateStreamOnFileA); + X(IStream_Size); #undef X } @@ -671,6 +675,120 @@ static void test_SHCopyKey(void) delete_key( hkey, "Software\\Wine", "Test" ); } +#define CHECK_FILE_SIZE(filename,exp_size) _check_file_size(filename, exp_size, __LINE__) +static void _check_file_size(const CHAR *filename, LONG exp_size, int line) +{ + HANDLE handle; + DWORD file_size = 0xdeadbeef; + handle = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file_size = GetFileSize(handle, NULL); + ok_(__FILE__,line)(file_size == exp_size, "got wrong file size: %d.\n", file_size); + CloseHandle(handle); +} + +#define CHECK_STREAM_SIZE(obj,exp_size) _check_stream_size(obj, exp_size, __LINE__) +static void _check_stream_size(IStream *obj, LONG exp_size, int line) +{ + ULARGE_INTEGER stream_size; + STATSTG stat; + HRESULT hr; + stream_size.QuadPart = 0xdeadbeef; + hr = pIStream_Size(obj, &stream_size); + ok_(__FILE__,line)(hr == S_OK, "IStream_Size failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(stream_size.QuadPart == exp_size, "Size(): got wrong size of stream: %s.\n", + wine_dbgstr_longlong(stream_size.QuadPart)); + hr = IStream_Stat(obj, &stat, STATFLAG_NONAME); + ok_(__FILE__,line)(hr == S_OK, "IStream_Stat failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(stat.cbSize.QuadPart == exp_size, "Stat(): got wrong size of stream: %s.\n", + wine_dbgstr_longlong(stat.cbSize.QuadPart)); +} + +#define CHECK_STREAM_POS(obj,exp_pos) _check_stream_pos(obj, exp_pos, __LINE__) +static void _check_stream_pos(IStream *obj, LONG exp_pos, int line) +{ + LARGE_INTEGER move; + ULARGE_INTEGER pos; + HRESULT hr; + move.QuadPart = 0; + pos.QuadPart = 0xdeadbeef; + hr = IStream_Seek(obj, move, STREAM_SEEK_CUR, &pos); + ok_(__FILE__,line)(hr == S_OK, "IStream_Seek failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(pos.QuadPart == exp_pos, "got wrong position: %s.\n", + wine_dbgstr_longlong(pos.QuadPart)); +} + +static void test_stream_size(void) +{ + static const byte test_data[] = {0x1,0x2,0x3,0x4,0x5,0x6}; + static const CHAR filename[] = "test_file"; + IStream *stream, *stream2; + HANDLE handle; + DWORD written = 0; + ULARGE_INTEGER stream_size; + HRESULT hr; + + handle = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(handle, test_data, sizeof(test_data), &written, NULL); + ok(written == sizeof(test_data), "Failed to write data into file.\n"); + CloseHandle(handle); + + /* in read-only mode, SetSize() will success but it has no effect on Size() and the file */ + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_READ, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + stream_size.QuadPart = 0; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + CHECK_STREAM_POS(stream, 0); + stream_size.QuadPart = 100; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + CHECK_STREAM_POS(stream, 100); + IStream_Release(stream); + CHECK_FILE_SIZE(filename, sizeof(test_data)); + + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_READ, &stream2); + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + CHECK_STREAM_SIZE(stream2, sizeof(test_data)); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 0); + + stream_size.QuadPart = 0; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, 0); + CHECK_STREAM_SIZE(stream2, 0); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 0); + + stream_size.QuadPart = 100; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, 100); + CHECK_STREAM_SIZE(stream2, 100); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 0); + + stream_size.QuadPart = 90; + hr = IStream_SetSize(stream2, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, 100); + CHECK_STREAM_SIZE(stream2, 100); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 90); + IStream_Release(stream); + IStream_Release(stream2); + CHECK_FILE_SIZE(filename, 100); + + DeleteFileA(filename); +} + START_TEST(shcore) { HMODULE hshcore = LoadLibraryA("shcore.dll"); @@ -695,4 +813,5 @@ START_TEST(shcore) test_SHQueryValueEx(); test_SHRegGetPath(); test_SHCopyKey(); + test_stream_size(); } -- 2.20.1

2 1

[PATCH] ntoskrnl.exe: Properly export *SList functions on win64.
by Jacek Caban Feb. 4, 2019

Feb. 4, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45820 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 -------------------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 11 +++-- dlls/ntoskrnl.exe/sync.c | 63 +++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 61 deletions(-)

2 1

[PATCH] ntoskrnl.exe: Properly export *SList functions on win64.
by Jacek Caban Feb. 4, 2019

Feb. 4, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 -------------------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 11 +++-- dlls/ntoskrnl.exe/sync.c | 63 +++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 61 deletions(-)

2 1

[PATCH 1/6] comctl32/listbox: Handle Mouse Wheel scrolling for multi-column listboxes properly
by Gabriel Ivăncescu Feb. 4, 2019

Feb. 4, 2019

Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- These notes apply to all the patches in the series. Temporary variable has been used to get rid of many casts, as suggested. The calculation has been simplified to just integer arithmetic in all cases, since the division (the only operation with a fractional result) was immediately truncated to integer anyway. Note that the float doesn't help with overflow either. As you can see, it gets assigned to cLineScroll (which is integer) and then gets multiplied back by WHEEL_DELTA, so if the float were to help with overflow in the first place, it would overflow on the next line regardless. Anyway, overflow is probably impossible in practice since WHEEL_DELTA is just 120, but even if so, it was already overflowing with float, so there's no reason to have that cast... dlls/comctl32/listbox.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cb645b4..9f56a2f 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2012,9 +2012,11 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines; + UINT tmp = 3; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &tmp, 0); + pulScrollLines = tmp; /* if scrolling changes direction, ignore left overs */ if ((delta < 0 && descr->wheel_remain < 0) || @@ -2025,10 +2027,21 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { - int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min((UINT)descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1U, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min((UINT)descr->page_size, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; -- 2.19.1

2 6