wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Michael Stefaniuc : mmdevapi: Don't check for IID_IDirectSoundCapture8, it is just a define (PVS-Studio).
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: a514fe7642c2fabdf93f6ab93f1c89b7a345680a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a514fe7642c2fabdf93f6ab93… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:09:19 2015 +0100 mmdevapi: Don't check for IID_IDirectSoundCapture8, it is just a define (PVS-Studio). --- dlls/mmdevapi/devenum.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index a78e03d..1a5bf00 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -645,8 +645,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls IDirectSound_Release((IDirectSound*)*ppv); } } - else if (IsEqualIID(riid, &IID_IDirectSoundCapture) - || IsEqualIID(riid, &IID_IDirectSoundCapture8)) + else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) { if (This->flow == eCapture) hr = CoCreateInstance(&CLSID_DirectSoundCapture8, NULL, clsctx, riid, ppv);

1 0

Michael Stefaniuc : msvcrt: Clarify comparison of the diff of two unsigneds with 0 (PVS-Studio).
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 278b70bdd0d765de2976922c3d73202f5eded5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=278b70bdd0d765de2976922c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:07:59 2015 +0100 msvcrt: Clarify comparison of the diff of two unsigneds with 0 (PVS-Studio). --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2e473a9..f803f5d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4254,7 +4254,7 @@ MSVCRT_size_t CDECL MSVCRT__fread_nolock_s(void *buf, MSVCRT_size_t buf_size, MS if(c == EOF) break; - if(!MSVCRT_CHECK_PMT_ERR(buf_size-buf_pos > 0, MSVCRT_ERANGE)) { + if(!MSVCRT_CHECK_PMT_ERR(buf_size != buf_pos, MSVCRT_ERANGE)) { memset(buf, 0, buf_size); return 0; }

1 0

Michael Stefaniuc : mshtml/tests: Remove an unused assignment (PVS-Studio) .
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 9dcb4004d942a3991e4315f0314bffb7c9ab45bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcb4004d942a3991e4315f03… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:03:00 2015 +0100 mshtml/tests: Remove an unused assignment (PVS-Studio). --- dlls/mshtml/tests/htmldoc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 33f4696..08c31ad 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5737,7 +5737,6 @@ static void test_download(DWORD flags) SET_EXPECT(CountEntries); SET_EXPECT(Exec_HTTPEQUIV_DONE); } - SET_EXPECT(SetStatusText); if(nav_url || support_wbapp) { SET_EXPECT(UpdateUI); SET_EXPECT(Exec_UPDATECOMMANDS);

1 0

Michael Stefaniuc : msctf/tests: Remove an unsused assignment (PVS-Studio) .
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 5c9d24702f0199ed3b73f151b478349ecfe8152d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9d24702f0199ed3b73f151b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:01:03 2015 +0100 msctf/tests: Remove an unsused assignment (PVS-Studio). --- dlls/msctf/tests/inputprocessor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index dfa8731..2cc172d 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2174,7 +2174,6 @@ static void test_AssociateFocus(void) test_PrevFocus = FOCUS_IGNORE; DestroyWindow(wnd1); DestroyWindow(wnd2); - test_OnSetFocus = SINK_UNEXPECTED; test_OnPopContext = SINK_OPTIONAL; /* Vista and greater */ test_OnSetFocus = SINK_OPTIONAL; /* Vista and greater */ ITfThreadMgr_GetFocus(g_tm, &test_PrevFocus);

1 0

Michael Stefaniuc : mmdevapi/tests: Remove an unused assignment ( PVS-Studio).
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 5f28bbcda3be5ecd6fb87c115cdcc6106338f241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f28bbcda3be5ecd6fb87c115… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 09:59:34 2015 +0100 mmdevapi/tests: Remove an unused assignment (PVS-Studio). --- dlls/mmdevapi/tests/render.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index c6b8e90..3a48c8d 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1063,7 +1063,6 @@ static void test_clock(int share) last = pos; Sleep(100); - slept += 100; hr = IAudioClock_GetPosition(acl, &pos, NULL); ok(hr == S_OK, "GetPosition failed: %08x\n", hr);

1 0

Michael Stefaniuc : gdi32: Remove double parentheses, not a misplaced pair (PVS-Studio).
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 8293cf33e0e237aeee9dacc8896f3816c6cf3e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8293cf33e0e237aeee9dacc88… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 09:58:11 2015 +0100 gdi32: Remove double parentheses, not a misplaced pair (PVS-Studio). --- dlls/gdi32/dibdrv/objects.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index bc8b60d..f954def 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1307,8 +1307,8 @@ static HRGN create_miter_region( dibdrv_physdev *pdev, const POINT *pt, pt_1 = face_1->start; pt_2 = face_2->end; - a = (double)((pt_2.x * face_2->dy - pt_2.y * face_2->dx)) / det; - b = (double)((pt_1.x * face_1->dy - pt_1.y * face_1->dx)) / det; + a = (double)(pt_2.x * face_2->dy - pt_2.y * face_2->dx) / det; + b = (double)(pt_1.x * face_1->dy - pt_1.y * face_1->dx) / det; x = a * face_1->dx - b * face_2->dx; y = a * face_1->dy - b * face_2->dy;

1 0

Alistair Leslie-Hughes : dpnet: Correct usage of memcpy in GetComponentByName.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 63c7fd2a63bbd8dde831d648f1dffc6686e3f2ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c7fd2a63bbd8dde831d648f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 6 09:05:56 2015 +1100 dpnet: Correct usage of memcpy in GetComponentByName. --- dlls/dpnet/address.c | 6 +++--- dlls/dpnet/tests/address.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index ba644a2..defd894 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -348,13 +348,13 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(IDirectPlay8Add memcpy(pvBuffer, &entry->data.guid, sizeof(GUID)); break; case DPNA_DATATYPE_STRING: - memcpy(pvBuffer, &entry->data.string, entry->size); + memcpy(pvBuffer, entry->data.string, entry->size); break; case DPNA_DATATYPE_STRING_ANSI: - memcpy(pvBuffer, &entry->data.ansi, entry->size); + memcpy(pvBuffer, entry->data.ansi, entry->size); break; case DPNA_DATATYPE_BINARY: - memcpy(pvBuffer, &entry->data.binary, entry->size); + memcpy(pvBuffer, entry->data.binary, entry->size); break; } diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index b557da2..077f99e 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -126,7 +126,7 @@ static void address_addcomponents(void) hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, buffer, &size, &type); ok(hr == S_OK, "got 0x%08x\n", hr); ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); - todo_wine ok(!lstrcmpW(buffer, localhost), "Invalid string: %s\n", wine_dbgstr_w(buffer)); + ok(!lstrcmpW(buffer, localhost), "Invalid string: %s\n", wine_dbgstr_w(buffer)); hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD)+2, DPNA_DATATYPE_DWORD); ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr);

1 0

Alistair Leslie-Hughes : dpnet: Always update type since it might change.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: b779dee768f5523942843b8f0db8c735f6144d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b779dee768f5523942843b8f0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 19:53:03 2015 +1100 dpnet: Always update type since it might change. --- dlls/dpnet/address.c | 2 +- dlls/dpnet/tests/address.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 6c91f48..ba644a2 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -442,7 +442,6 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * /* Create a new one */ entry = heap_alloc(sizeof(struct component)); entry->name = heap_strdupW(pwszName); - entry->type = dwDataType; list_add_tail(&This->components, &entry->entry); } @@ -472,6 +471,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * break; } + entry->type = dwDataType; entry->size = dwDataSize; return DPN_OK; diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 53633c2..b557da2 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -125,7 +125,7 @@ static void address_addcomponents(void) size = sizeof(buffer); hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, buffer, &size, &type); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); + ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); todo_wine ok(!lstrcmpW(buffer, localhost), "Invalid string: %s\n", wine_dbgstr_w(buffer)); hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD)+2, DPNA_DATATYPE_DWORD);

1 0

Alistair Leslie-Hughes : dpnet: Free previous allocated data.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 4299da0d7c66d460e16ffa5f9bb03bc88627d99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4299da0d7c66d460e16ffa5f9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 3 08:43:55 2015 +1100 dpnet: Free previous allocated data. --- dlls/dpnet/address.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 5eea0cb..6c91f48 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -426,6 +426,13 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * TRACE("Found %s\n", debugstr_w(pwszName)); found = TRUE; + if(entry->type == DPNA_DATATYPE_STRING_ANSI) + heap_free(entry->data.ansi); + else if(entry->type == DPNA_DATATYPE_STRING) + heap_free(entry->data.string); + else if(entry->type == DPNA_DATATYPE_BINARY) + heap_free(entry->data.binary); + break; } } @@ -451,20 +458,14 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * TRACE("(%p, %u): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid(lpvData)); break; case DPNA_DATATYPE_STRING: - heap_free(entry->data.string); - entry->data.string = heap_strdupW((WCHAR*)lpvData); TRACE("(%p, %u): STRING Type -> %s\n", lpvData, dwDataSize, debugstr_w((WCHAR*)lpvData)); break; case DPNA_DATATYPE_STRING_ANSI: - heap_free(entry->data.ansi); - entry->data.ansi = heap_strdupA((CHAR*)lpvData); TRACE("(%p, %u): ANSI STRING Type -> %s\n", lpvData, dwDataSize, (const CHAR*) lpvData); break; case DPNA_DATATYPE_BINARY: - heap_free(entry->data.binary); - entry->data.binary = heap_alloc(dwDataSize); memcpy(entry->data.binary, lpvData, dwDataSize); TRACE("(%p, %u): BINARY Type\n", lpvData, dwDataSize);

1 0

Alistair Leslie-Hughes : dpnet: Add check for mismatched string lengths.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: a5d3125395bd92b1010b4df585327d4043d86651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d3125395bd92b1010b4df58… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 3 08:38:23 2015 +1100 dpnet: Add check for mismatched string lengths. --- dlls/dpnet/address.c | 40 +++++++++++++++++++++++++++++++++------- dlls/dpnet/tests/address.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 2062bc4..5eea0cb 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -382,11 +382,43 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * struct component *entry; BOOL found = FALSE; - TRACE("(%p, %s, %p, %u, %x): stub\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType); + TRACE("(%p, %s, %p, %u, %x)\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType); if (NULL == lpvData) return DPNERR_INVALIDPOINTER; + switch (dwDataType) + { + case DPNA_DATATYPE_DWORD: + if (sizeof(DWORD) != dwDataSize) + { + WARN("Invalid DWORD size, returning DPNERR_INVALIDPARAM\n"); + return DPNERR_INVALIDPARAM; + } + break; + case DPNA_DATATYPE_GUID: + if (sizeof(GUID) != dwDataSize) + { + WARN("Invalid GUID size, returning DPNERR_INVALIDPARAM\n"); + return DPNERR_INVALIDPARAM; + } + break; + case DPNA_DATATYPE_STRING: + if (((strlenW((WCHAR*)lpvData)+1)*sizeof(WCHAR)) != dwDataSize) + { + WARN("Invalid STRING size, returning DPNERR_INVALIDPARAM\n"); + return DPNERR_INVALIDPARAM; + } + break; + case DPNA_DATATYPE_STRING_ANSI: + if ((strlen((const CHAR*)lpvData)+1) != dwDataSize) + { + WARN("Invalid ASCII size, returning DPNERR_INVALIDPARAM\n"); + return DPNERR_INVALIDPARAM; + } + break; + } + LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) { if (lstrcmpW(pwszName, entry->name) == 0) @@ -411,16 +443,10 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * switch (dwDataType) { case DPNA_DATATYPE_DWORD: - if (sizeof(DWORD) != dwDataSize) - return DPNERR_INVALIDPARAM; - entry->data.value = *(DWORD*)lpvData; TRACE("(%p, %u): DWORD Type -> %u\n", lpvData, dwDataSize, *(const DWORD*) lpvData); break; case DPNA_DATATYPE_GUID: - if (sizeof(GUID) != dwDataSize) - return DPNERR_INVALIDPARAM; - entry->data.guid = *(GUID*)lpvData; TRACE("(%p, %u): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid(lpvData)); break; diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index bad4fa4..53633c2 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -71,6 +71,7 @@ static void address_addcomponents(void) { static const WCHAR UNKNOWN[] = { 'u','n','k','n','o','w','n',0 }; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + static const char testing[] = "testing"; HRESULT hr; IDirectPlay8Address *localaddr = NULL; @@ -85,6 +86,7 @@ static void address_addcomponents(void) DWORD namelen = 0; DWORD bufflen = 0; DWORD port = 8888; + WCHAR buffer[256]; /* We can add any Component to the Address interface not just the predefined ones. */ hr = IDirectPlay8Address_AddComponent(localaddr, UNKNOWN, &IID_Random, sizeof(GUID), DPNA_DATATYPE_GUID); @@ -93,9 +95,39 @@ static void address_addcomponents(void) hr = IDirectPlay8Address_AddComponent(localaddr, UNKNOWN, &IID_Random, sizeof(GUID)+1, DPNA_DATATYPE_GUID); ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost)+2, DPNA_DATATYPE_STRING); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost)/2, DPNA_DATATYPE_STRING); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, testing, sizeof(testing)+2, DPNA_DATATYPE_STRING_ANSI); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + + /* Show that on error, nothing is added. */ + size = sizeof(buffer); + hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, buffer, &size, &type); + ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, testing, sizeof(testing), DPNA_DATATYPE_STRING_ANSI); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD)+2, DPNA_DATATYPE_DWORD); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost), DPNA_DATATYPE_STRING); ok(hr == S_OK, "got 0x%08x\n", hr); + /* The information doesn't get removed when invalid parameters are used.*/ + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost)+2, DPNA_DATATYPE_STRING); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + + size = sizeof(buffer); + hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, buffer, &size, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); + todo_wine ok(!lstrcmpW(buffer, localhost), "Invalid string: %s\n", wine_dbgstr_w(buffer)); + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD)+2, DPNA_DATATYPE_DWORD); ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr);

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015