January 2015 - Wine-Commits

Michael Stefaniuc : oleaut32: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: 54aaa16d8ffe0ca37b37be291a3c496f2885fa84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54aaa16d8ffe0ca37b37be291… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 11:59:34 2015 +0100 oleaut32: Remove an unused assignment (PVS-Studio). --- dlls/oleaut32/tmarshal.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index b812215..89dc894 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -198,8 +198,6 @@ _marshal_interface(marshal_state *buf, REFIID riid, LPUNKNOWN pUnk) { return xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize)); } - hres = E_FAIL; - TRACE("...%s...\n",debugstr_guid(riid)); hres = CreateStreamOnHGlobal(0,TRUE,&pStm);

1 0

André Hentschel : user32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: 0b811eeabf0a02cde3a1200f5af5f3c0f4d00a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b811eeabf0a02cde3a1200f5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 20 23:56:46 2015 +0100 user32/tests: Don't test function directly when reporting GetLastError(). --- dlls/user32/tests/msg.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b243a74..66f054a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4533,6 +4533,7 @@ static void test_messages(void) MSG msg; LRESULT res; POINT pos; + BOOL ret; flush_sequence(); @@ -4819,7 +4820,8 @@ static void test_messages(void) flush_events(); flush_sequence(); - ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); + ret = DrawMenuBar(hwnd); + ok(ret, "DrawMenuBar failed: %d\n", GetLastError()); flush_events(); ok_sequence(WmDrawMenuBarSeq, "DrawMenuBar", FALSE); ok(SetCursorPos(pos.x, pos.y), "SetCursorPos failed\n"); @@ -4831,7 +4833,8 @@ static void test_messages(void) ok(hwnd != 0, "Failed to create custom dialog window\n"); flush_events(); flush_sequence(); - ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); + ret = DrawMenuBar(hwnd); + ok(ret, "DrawMenuBar failed: %d\n", GetLastError()); flush_events(); ok_sequence(WmEmptySeq, "DrawMenuBar for a child window", FALSE);

1 0

Hans Leidekker : wbemprox: Implement Win32_ComputerSystemProduct.IdentifyingNumber.
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: f40830b45d2f8653e39cc2fe1acede72d92955bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40830b45d2f8653e39cc2fe1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 21 13:25:50 2015 +0100 wbemprox: Implement Win32_ComputerSystemProduct.IdentifyingNumber. --- dlls/wbemprox/builtin.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5f61f4a..ecbdec5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -176,6 +176,8 @@ static const WCHAR prop_idW[] = {'I','D',0}; static const WCHAR prop_identificationcodeW[] = {'I','d','e','n','t','i','f','i','c','a','t','i','o','n','C','o','d','e',0}; +static const WCHAR prop_identifyingnumberW[] = + {'I','d','e','n','t','i','f','y','i','n','g','N','u','m','b','e','r',0}; static const WCHAR prop_indexW[] = {'I','n','d','e','x',0}; static const WCHAR prop_installdateW[] = @@ -338,7 +340,8 @@ static const struct column col_compsys[] = }; static const struct column col_compsysproduct[] = { - { prop_uuidW, CIM_STRING } + { prop_identifyingnumberW, CIM_STRING|COL_FLAG_KEY }, + { prop_uuidW, CIM_STRING } }; static const struct column col_datafile[] = { @@ -571,6 +574,8 @@ static const WCHAR compsys_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; +static const WCHAR compsysproduct_identifyingnumberW[] = + {'0',0}; static const WCHAR compsysproduct_uuidW[] = {'0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-', '0','0','0','0','0','0','0','0','0','0','0','0',0}; @@ -662,6 +667,7 @@ struct record_computersystem }; struct record_computersystemproduct { + const WCHAR *identifyingnumber; const WCHAR *uuid; }; struct record_datafile @@ -872,7 +878,7 @@ static const struct record_bios data_bios[] = }; static const struct record_computersystemproduct data_compsysproduct[] = { - { compsysproduct_uuidW } + { compsysproduct_identifyingnumberW, compsysproduct_uuidW } }; static const struct record_param data_param[] = {

1 0

Hans Leidekker : winhttp/tests: Keep the connection alive in a couple of tests.
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: 142ac824908635a5458eda311aeb6fbee9ad316a URL: http://source.winehq.org/git/wine.git/?a=commit;h=142ac824908635a5458eda311… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 21 13:24:52 2015 +0100 winhttp/tests: Keep the connection alive in a couple of tests. --- dlls/winhttp/tests/winhttp.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2eff8b3..384df23 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -31,7 +31,6 @@ #include "wine/test.h" -static HANDLE wait_event; static const WCHAR test_useragent[] = {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; @@ -1830,7 +1829,7 @@ struct server_info static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; - int r, c, i, on; + int r, c = -1, i, on; SOCKET s; struct sockaddr_in sa; char buffer[0x100]; @@ -1859,7 +1858,7 @@ static DWORD CALLBACK server_thread(LPVOID param) SetEvent(si->event); do { - c = accept(s, NULL, NULL); + if (c == -1) c = accept(s, NULL, NULL); memset(buffer, 0, sizeof buffer); for(i = 0; i < sizeof buffer - 1; i++) @@ -1898,11 +1897,12 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "GET /no_content")) { send(c, nocontentmsg, sizeof nocontentmsg - 1, 0); + continue; } if (strstr(buffer, "GET /not_modified")) { send(c, notmodified, sizeof notmodified - 1, 0); - WaitForSingleObject(wait_event, 5000); + continue; } if (strstr(buffer, "GET /quit")) { @@ -1912,6 +1912,7 @@ static DWORD CALLBACK server_thread(LPVOID param) } shutdown(c, 2); closesocket(c); + c = -1; } while (!last_request); @@ -2250,8 +2251,6 @@ static void test_not_modified(int port) ret = WinHttpReceiveResponse(request, NULL); ok(ret, "WinHttpReceiveResponse failed: %u\n", GetLastError()); - SetEvent(wait_event); - size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); @@ -3275,8 +3274,6 @@ START_TEST (winhttp) if (ret != WAIT_OBJECT_0) return; - wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); - test_connection_info(si.port); test_basic_request(si.port, NULL, basicW); test_no_headers(si.port); @@ -3289,7 +3286,5 @@ START_TEST (winhttp) /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW); - CloseHandle(wait_event); - WaitForSingleObject(thread, 3000); }

1 0

Hans Leidekker : kernel32: Retrieve the system affinity mask from ntdll.
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: b51476ad42827e830bf38e561847bda6fe11a4c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51476ad42827e830bf38e561… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 21 13:23:36 2015 +0100 kernel32: Retrieve the system affinity mask from ntdll. --- dlls/kernel32/process.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 396b7d4..8204dd9 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3259,13 +3259,21 @@ BOOL WINAPI GetProcessAffinityMask( HANDLE hProcess, PDWORD_PTR process_mask, PD { NTSTATUS status = STATUS_SUCCESS; - if (system_mask) *system_mask = (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; if (process_mask) { if ((status = NtQueryInformationProcess( hProcess, ProcessAffinityMask, process_mask, sizeof(*process_mask), NULL ))) SetLastError( RtlNtStatusToDosError(status) ); } + if (system_mask && status == STATUS_SUCCESS) + { + SYSTEM_BASIC_INFORMATION info; + + if ((status = NtQuerySystemInformation( SystemBasicInformation, &info, sizeof(info), NULL ))) + SetLastError( RtlNtStatusToDosError(status) ); + else + *system_mask = info.ActiveProcessorsAffinityMask; + } return !status; }

1 0

André Hentschel : kernel32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: ae1251596e95de283bcf53e7c0199ce9a4b772bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1251596e95de283bcf53e7c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 20 23:56:41 2015 +0100 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/kernel32/tests/pipe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 056f95b..3570676 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -89,7 +89,7 @@ static BOOL RpcReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD { struct rpcThreadArgs rpcargs; HANDLE thread; - DWORD threadId; + DWORD threadId, ret; rpcargs.returnValue = 0; rpcargs.lastError = GetLastError(); @@ -102,7 +102,8 @@ static BOOL RpcReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD thread = CreateThread(NULL, 0, rpcThreadMain, (void *)&rpcargs, 0, &threadId); ok(thread != NULL, "CreateThread failed. %d\n", GetLastError()); - ok(WaitForSingleObject(thread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed with %d.\n", GetLastError()); + ret = WaitForSingleObject(thread, INFINITE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed with %d.\n", GetLastError()); CloseHandle(thread); SetLastError(rpcargs.lastError);

1 0

Michael Stefaniuc : quartz: Remove some unused assignments (PVS-Studio).
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: 33136293baca8f82535ed13386b2a9112ffc4727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33136293baca8f82535ed1338… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 12:01:34 2015 +0100 quartz: Remove some unused assignments (PVS-Studio). --- dlls/quartz/avisplit.c | 5 ++--- dlls/quartz/mpegsplit.c | 3 +-- dlls/quartz/pin.c | 1 - dlls/quartz/waveparser.c | 6 +++--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index ee03e08..ccb4cec 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -260,8 +260,7 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe if (rtSampleStart != rtSampleStop) { - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); hr = IAsyncReader_Request(pin->pReader, sample, streamnumber); if (FAILED(hr)) @@ -338,7 +337,7 @@ static HRESULT AVISplitter_Receive(AVISplitterImpl *This, IMediaSample *sample, } rtstart = (double)(start - pin->pin.pin.tStart) / pin->pin.pin.dRate; rtstop = (double)(stop - pin->pin.pin.tStart) / pin->pin.pin.dRate; - hr = IMediaSample_SetMediaTime(sample, &start, &stop); + IMediaSample_SetMediaTime(sample, &start, &stop); IMediaSample_SetTime(sample, &rtstart, &rtstop); IMediaSample_SetMediaTime(sample, &start, &stop); diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 6f09822..1ed352b 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -708,8 +708,7 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); IMediaSample_SetPreroll(sample, FALSE); IMediaSample_SetDiscontinuity(sample, TRUE); IMediaSample_SetSyncPoint(sample, 1); diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 73b6306..78b6fa2 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -75,7 +75,6 @@ static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPi hr = IPin_QueryInternalConnections( from, NULL, &amount ); if (hr != E_NOTIMPL && amount) FIXME("Use QueryInternalConnections!\n"); - hr = S_OK; pin_info.pFilter = NULL; hr = IPin_QueryPinInfo( from, &pin_info ); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 113a461..2ceb0fd 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -117,7 +117,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - hr = IMediaSample_SetTime(newsample, &rtSampleStart, &rtSampleStop); + IMediaSample_SetTime(newsample, &rtSampleStart, &rtSampleStop); pin->rtCurrent = pin->rtNext; pin->rtNext = rtSampleStop; @@ -290,7 +290,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, amt.cbFormat = chunk.cb; amt.pbFormat = CoTaskMemAlloc(amt.cbFormat); amt.pUnk = NULL; - hr = IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); + IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); amt.subtype = MEDIATYPE_Audio; amt.subtype.Data1 = ((WAVEFORMATEX*)amt.pbFormat)->wFormatTag; @@ -376,7 +376,7 @@ static HRESULT WAVEParser_first_request(LPVOID iface) if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); pin->rtCurrent = pin->rtNext; pin->rtNext = rtSampleStop;

1 0

Michael Stefaniuc : scrrun/tests: Actually test the return values ( PVS-Studio).
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: f0d7765236af265aa1fc8fa20c8e012b7472fee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d7765236af265aa1fc8fa20… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 12:02:19 2015 +0100 scrrun/tests: Actually test the return values (PVS-Studio). --- dlls/scrrun/tests/filesystem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 54cf4e3..b3f3bee 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1578,6 +1578,7 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); str = SysAllocString(aW); hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); ITextStream_Release(stream); @@ -1730,6 +1731,7 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); str = SysAllocString(aW); hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); ITextStream_Release(stream);

1 0

Michael Stefaniuc : schedsvc/tests: Actually test a return value ( PVS-Studio).
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: 4d01e6f3fcecdc69fe72c01244b482896ffa81f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d01e6f3fcecdc69fe72c0124… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 12:04:52 2015 +0100 schedsvc/tests: Actually test a return value (PVS-Studio). --- dlls/schedsvc/tests/rpcapi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index b3007f7..cb83ac5 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -113,6 +113,7 @@ START_TEST(rpcapi) version = 0; hr = SchRpcHighestVersion(&version); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(version == 0x10002 /* vista */ || version == 0x10003 /* win7 */ || version == 0x10004 /* win8 */, "wrong version %#x\n", version);

1 0

Michael Stefaniuc : qedit: Remove an unused and wrong assignment ( PVS-Studio).
by Alexandre Julliard Jan. 21, 2015

Jan. 21, 2015

Module: wine Branch: master Commit: 552037c92599d0212875410b33811effe0a4255d URL: http://source.winehq.org/git/wine.git/?a=commit;h=552037c92599d0212875410b3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 12:01:05 2015 +0100 qedit: Remove an unused and wrong assignment (PVS-Studio). --- dlls/qedit/mediadet.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 3d79107..9098223 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -658,7 +658,6 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { obj->cur_pin = NULL; obj->num_streams = -1; obj->cur_stream = 0; - *ppv = obj; if (pUnkOuter) obj->outer_unk = pUnkOuter;

1 0