March 2007 - Wine-commits - list.winehq.org

Francois Gouget : dbghelp: Check file handles against INVALID_HANDLE_VALUE, not NULL.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: 7b89fb5e35e8ad24bbfc2fdced1691897c7cea2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b89fb5e35e8ad24bbfc2fdce… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 8 15:28:40 2007 +0100 dbghelp: Check file handles against INVALID_HANDLE_VALUE, not NULL. --- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index febebd4..00ba7c2 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2308,7 +2308,7 @@ BOOL pdb_fetch_file_info(struct pdb_lookup* pdb_lookup) if (image) UnmapViewOfFile(image); if (hMap) CloseHandle(hMap); - if (hFile) CloseHandle(hFile); + if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); return ret; } diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index be0443a..f8346d1 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -142,7 +142,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, if (dbg_mapping) UnmapViewOfFile(dbg_mapping); if (hMap) CloseHandle(hMap); - if (hFile != NULL) CloseHandle(hFile); + if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); return ret; }

1 0

Francois Gouget : rpcrt4: Fix a file handle leak in RPCRT4_RPCSSOnDemandCall().
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: d3245723ae9a54b6c3cd6210dd2847053701bc49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3245723ae9a54b6c3cd6210d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 8 15:29:50 2007 +0100 rpcrt4: Fix a file handle leak in RPCRT4_RPCSSOnDemandCall(). Also, RPCRT4_RpcssNPConnect() returns a file handle so treat it as such by checking it against INVALID_HANDLE_VALUE and not NULL. --- dlls/rpcrt4/rpcrt4_main.c | 13 ++++++++----- dlls/rpcrt4/rpcss_np_client.c | 6 ++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index e4191d8..513ff47 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -710,13 +710,14 @@ static BOOL RPCRT4_StartRPCSS(void) BOOL RPCRT4_RPCSSOnDemandCall(PRPCSS_NP_MESSAGE msg, char *vardata_payload, PRPCSS_NP_REPLY reply) { HANDLE client_handle; + BOOL ret; int i, j = 0; TRACE("(msg == %p, vardata_payload == %p, reply == %p)\n", msg, vardata_payload, reply); client_handle = RPCRT4_RpcssNPConnect(); - while (!client_handle) { + while (INVALID_HANDLE_VALUE == client_handle) { /* start the RPCSS process */ if (!RPCRT4_StartRPCSS()) { ERR("Unable to start RPCSS process.\n"); @@ -726,13 +727,13 @@ BOOL RPCRT4_RPCSSOnDemandCall(PRPCSS_NP_MESSAGE msg, char *vardata_payload, PRPC for (i = 0; i < 60; i++) { Sleep(200); client_handle = RPCRT4_RpcssNPConnect(); - if (client_handle) break; + if (INVALID_HANDLE_VALUE != client_handle) break; } /* we are only willing to try twice */ if (j++ >= 1) break; } - if (!client_handle) { + if (INVALID_HANDLE_VALUE == client_handle) { /* no dice! */ ERR("Unable to connect to RPCSS process!\n"); SetLastError(RPC_E_SERVER_DIED_DNE); @@ -740,12 +741,14 @@ BOOL RPCRT4_RPCSSOnDemandCall(PRPCSS_NP_MESSAGE msg, char *vardata_payload, PRPC } /* great, we're connected. now send the message */ + ret = TRUE; if (!RPCRT4_SendReceiveNPMsg(client_handle, msg, vardata_payload, reply)) { ERR("Something is amiss: RPC_SendReceive failed.\n"); - return FALSE; + ret = FALSE; } + CloseHandle(client_handle); - return TRUE; + return ret; } #define MAX_RPC_ERROR_TEXT 256 diff --git a/dlls/rpcrt4/rpcss_np_client.c b/dlls/rpcrt4/rpcss_np_client.c index 1c21323..dc57fd2 100644 --- a/dlls/rpcrt4/rpcss_np_client.c +++ b/dlls/rpcrt4/rpcss_np_client.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); HANDLE RPCRT4_RpcssNPConnect(void) { - HANDLE the_pipe = NULL; + HANDLE the_pipe; DWORD dwmode, wait_result; HANDLE master_mutex = RPCRT4_GetMasterMutex(); @@ -69,7 +69,6 @@ HANDLE RPCRT4_RpcssNPConnect(void) if (GetLastError() != ERROR_PIPE_BUSY) { WARN("Unable to open named pipe %s (assuming unavailable).\n", debugstr_a(NAME_RPCSS_NAMED_PIPE)); - the_pipe = NULL; break; } @@ -83,13 +82,12 @@ HANDLE RPCRT4_RpcssNPConnect(void) if (! WaitNamedPipeA(NAME_RPCSS_NAMED_PIPE, MASTER_MUTEX_WAITNAMEDPIPE_TIMEOUT)) { ERR("Named pipe unavailable after waiting. Something is probably wrong.\n"); - the_pipe = NULL; break; } } - if (the_pipe) { + if (the_pipe != INVALID_HANDLE_VALUE) { dwmode = PIPE_READMODE_MESSAGE; /* SetNamedPipeHandleState not implemented ATM, but still seems to work somehow. */ if (! SetNamedPipeHandleState(the_pipe, &dwmode, NULL, NULL))

1 0

Alexandre Julliard : advapi32: Fixed registry test that failed because of a buffer overflow.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: 7e2228f15aa7a6fc0d63fe36c34906035422e95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2228f15aa7a6fc0d63fe36c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 8 21:06:31 2007 +0100 advapi32: Fixed registry test that failed because of a buffer overflow. --- dlls/advapi32/tests/registry.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c016f6f..283da34 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -754,7 +754,6 @@ static void test_reg_query_value(void) LONG size, ret; static const WCHAR expected[] = {'d','a','t','a',0}; - static const WCHAR set[] = {'d','a','t','a'}; ret = RegCreateKeyA(hkey_main, "subkey", &subkey); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); @@ -845,19 +844,16 @@ static void test_reg_query_value(void) ok(size == sizeof(expected), "Got wrong size: %d\n", size); /* unicode - set the value without a NULL terminator */ - ret = RegSetValueW(subkey, NULL, REG_SZ, set, sizeof(set)); + ret = RegSetValueW(subkey, NULL, REG_SZ, expected, sizeof(expected)-sizeof(WCHAR)); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); /* unicode - read the unterminated value, value is terminated for us */ memset(valW, 'a', sizeof(valW)); size = sizeof(valW); ret = RegQueryValueW(subkey, NULL, valW, &size); - todo_wine - { - ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); - ok(!lstrcmpW(valW, expected), "Got wrong value\n"); - ok(size == sizeof(expected), "Got wrong size: %d\n", size); - } + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!lstrcmpW(valW, expected), "Got wrong value\n"); + ok(size == sizeof(expected), "Got wrong size: %d\n", size); RegDeleteKeyA(subkey, ""); }

1 0

Alexandre Julliard : kernel32: Fixed DosDateTimeToFileTime behavior when timegm() is missing.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: 849ee1c2bb56e027787fb651808ffe74f27dddbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=849ee1c2bb56e027787fb6518… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 8 21:06:41 2007 +0100 kernel32: Fixed DosDateTimeToFileTime behavior when timegm() is missing. The tm_isdst field needs to be initialized for mktime to do the right thing. --- dlls/kernel32/time.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index ba606bb..08002af 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -972,6 +972,7 @@ BOOL WINAPI DosDateTimeToFileTime( WORD fatdate, WORD fattime, LPFILETIME ft) newtm.tm_mday = (fatdate & 0x1f); newtm.tm_mon = ((fatdate >> 5) & 0x0f) - 1; newtm.tm_year = (fatdate >> 9) + 80; + newtm.tm_isdst = -1; #ifdef HAVE_TIMEGM RtlSecondsSince1970ToTime( timegm(&newtm), (LARGE_INTEGER *)ft ); #else

1 0

Tomas Carnecky : dsound: Update prototypes for IDirectSoundBuffer::Lock/ Unlock.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: 9b4f99782ef27239927a0c5d0ae8e788df17cb76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4f99782ef27239927a0c5d0… Author: Tomas Carnecky <tom(a)dbservice.com> Date: Thu Mar 8 14:48:45 2007 +0100 dsound: Update prototypes for IDirectSoundBuffer::Lock/Unlock. --- dlls/dsound/buffer.c | 6 +++--- dlls/dsound/primary.c | 2 +- dlls/quartz/dsoundrender.c | 2 +- dlls/winedos/soundblaster.c | 2 +- include/dsound.h | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index ec90164..45133d5 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -565,7 +565,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetFormat( } static HRESULT WINAPI IDirectSoundBufferImpl_Lock( - LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID lplpaudioptr1,LPDWORD audiobytes1,LPVOID lplpaudioptr2,LPDWORD audiobytes2,DWORD flags + LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID *lplpaudioptr1,LPDWORD audiobytes1,LPVOID *lplpaudioptr2,LPDWORD audiobytes2,DWORD flags ) { HRESULT hres = DS_OK; IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; @@ -1450,9 +1450,9 @@ static HRESULT WINAPI SecondaryBufferImpl_Lock( LPDIRECTSOUNDBUFFER8 iface, DWORD writecursor, DWORD writebytes, - LPVOID lplpaudioptr1, + LPVOID *lplpaudioptr1, LPDWORD audiobytes1, - LPVOID lplpaudioptr2, + LPVOID *lplpaudioptr2, LPDWORD audiobytes2, DWORD dwFlags) { diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index b9bbddb..9a3498d 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -663,7 +663,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat( } static HRESULT WINAPI PrimaryBufferImpl_Lock( - LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID lplpaudioptr1,LPDWORD audiobytes1,LPVOID lplpaudioptr2,LPDWORD audiobytes2,DWORD flags + LPDIRECTSOUNDBUFFER8 iface,DWORD writecursor,DWORD writebytes,LPVOID *lplpaudioptr1,LPDWORD audiobytes1,LPVOID *lplpaudioptr2,LPDWORD audiobytes2,DWORD flags ) { HRESULT hres; DirectSoundDevice *device = ((PrimaryBufferImpl *)iface)->device; diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 87a6f69..fe6152f 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -198,7 +198,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, } size2 = min(buf_free, size); - hr = IDirectSoundBuffer_Lock(This->dsbuffer, This->write_pos, size2, &lpbuf1, &dwsize1, &lpbuf2, &dwsize2, 0); + hr = IDirectSoundBuffer_Lock(This->dsbuffer, This->write_pos, size2, (LPVOID *)&lpbuf1, &dwsize1, (LPVOID *)&lpbuf2, &dwsize2, 0); if (hr != DS_OK) { ERR("Unable to lock sound buffer! (%x)\n", hr); break; diff --git a/dlls/winedos/soundblaster.c b/dlls/winedos/soundblaster.c index ff40c41..07fc72f 100644 --- a/dlls/winedos/soundblaster.c +++ b/dlls/winedos/soundblaster.c @@ -94,7 +94,7 @@ static DWORD CALLBACK SB_Poll( void *dummy ) } else continue; - result = IDirectSoundBuffer_Lock(lpdsbuf,buf_off,size,&lpbuf1,&dwsize1,&lpbuf2,&dwsize2,0); + result = IDirectSoundBuffer_Lock(lpdsbuf,buf_off,size,(LPVOID *)&lpbuf1,&dwsize1,(LPVOID *)&lpbuf2,&dwsize2,0); if (result != DS_OK) { ERR("Unable to lock sound buffer !\n"); continue; diff --git a/include/dsound.h b/include/dsound.h index 49cd3ef..fc1eeff 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -544,7 +544,7 @@ DECLARE_INTERFACE_(IDirectSoundBuffer,IUnknown) STDMETHOD(GetFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; STDMETHOD(GetStatus)(THIS_ LPDWORD lpdwStatus) PURE; STDMETHOD(Initialize)(THIS_ LPDIRECTSOUND lpDirectSound, LPCDSBUFFERDESC lpcDSBufferDesc) PURE; - STDMETHOD(Lock)(THIS_ DWORD dwWriteCursor, DWORD dwWriteBytes, LPVOID lplpvAudioPtr1, LPDWORD lpdwAudioBytes1, LPVOID lplpvAudioPtr2, LPDWORD lpdwAudioBytes2, DWORD dwFlags) PURE; + STDMETHOD(Lock)(THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1, LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE; STDMETHOD(Play)(THIS_ DWORD dwReserved1, DWORD dwReserved2, DWORD dwFlags) PURE; STDMETHOD(SetCurrentPosition)(THIS_ DWORD dwNewPosition) PURE; STDMETHOD(SetFormat)(THIS_ LPCWAVEFORMATEX lpcfxFormat) PURE; @@ -552,7 +552,7 @@ DECLARE_INTERFACE_(IDirectSoundBuffer,IUnknown) STDMETHOD(SetPan)(THIS_ LONG lPan) PURE; STDMETHOD(SetFrequency)(THIS_ DWORD dwFrequency) PURE; STDMETHOD(Stop)(THIS) PURE; - STDMETHOD(Unlock)(THIS_ LPVOID lpvAudioPtr1, DWORD dwAudioBytes1, LPVOID lpvAudioPtr2, DWORD dwAudioPtr2) PURE; + STDMETHOD(Unlock)(THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioPtr2) PURE; STDMETHOD(Restore)(THIS) PURE; }; #undef INTERFACE @@ -627,7 +627,7 @@ DECLARE_INTERFACE_(IDirectSoundBuffer8,IUnknown) STDMETHOD(GetFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; STDMETHOD(GetStatus)(THIS_ LPDWORD lpdwStatus) PURE; STDMETHOD(Initialize)(THIS_ LPDIRECTSOUND lpDirectSound, LPCDSBUFFERDESC lpcDSBufferDesc) PURE; - STDMETHOD(Lock)(THIS_ DWORD dwWriteCursor, DWORD dwWriteBytes, LPVOID lplpvAudioPtr1, LPDWORD lpdwAudioBytes1, LPVOID lplpvAudioPtr2, LPDWORD lpdwAudioBytes2, DWORD dwFlags) PURE; + STDMETHOD(Lock)(THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1, LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE; STDMETHOD(Play)(THIS_ DWORD dwReserved1, DWORD dwReserved2, DWORD dwFlags) PURE; STDMETHOD(SetCurrentPosition)(THIS_ DWORD dwNewPosition) PURE; STDMETHOD(SetFormat)(THIS_ LPCWAVEFORMATEX lpcfxFormat) PURE; @@ -635,7 +635,7 @@ DECLARE_INTERFACE_(IDirectSoundBuffer8,IUnknown) STDMETHOD(SetPan)(THIS_ LONG lPan) PURE; STDMETHOD(SetFrequency)(THIS_ DWORD dwFrequency) PURE; STDMETHOD(Stop)(THIS) PURE; - STDMETHOD(Unlock)(THIS_ LPVOID lpvAudioPtr1, DWORD dwAudioBytes1, LPVOID lpvAudioPtr2, DWORD dwAudioPtr2) PURE; + STDMETHOD(Unlock)(THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioPtr2) PURE; STDMETHOD(Restore)(THIS) PURE; STDMETHOD(SetFX)(THIS_ DWORD dwEffectsCount, LPDSEFFECTDESC pDSFXDesc, LPDWORD pdwResultCodes) PURE; STDMETHOD(AcquireResources)(THIS_ DWORD dwFlags, DWORD dwEffectsCount, LPDWORD pdwResultCodes) PURE;

1 0

tools/winetest gather summary.css
by Jeremy Newman 08 Mar '07

08 Mar '07

ChangeSet ID: 30944 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/03/08 14:06:22 Modified files: winetest : gather summary.css Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Visualize skip by using a border Patch: http://cvs.winehq.org/patch.py?id=30944 Old revision New revision Changes Path 1.18 1.19 +5 -16 tools/winetest/gather 1.6 1.7 +16 -0 tools/winetest/summary.css Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.18 tools/winetest/gather:1.19 --- tools/winetest/gather:1.18 8 Mar 2007 20: 6:22 -0000 +++ tools/winetest/gather 8 Mar 2007 20: 6:22 -0000 @@ -114,17 +114,6 @@ foreach my $file (glob "$datadir/$build/ } close TEST; - $testref->{visible} = 0; - (my $verfile = $file) =~ s|summary.txt$|version.txt|; - if (open VER, "<$verfile") { - while (<VER>) { - if (/^bRunningOnVisibleDesktop=(.*)$/ && $1 ne "0") { - $testref->{visible} = 1; - last; - } - } - close VER; - } push @{$group->{tests}}, $testref; } @@ -186,7 +175,7 @@ print OUT <<"EOF"; All tests pass in all reports Some tests fail in some reports Some tests fail in all reports - This border signals a test running on a visible desktop + This border signals that some tests are skipped <h1>Main summary for build <a href="$url">$build</a></h1> <table class="report"> @@ -208,10 +197,9 @@ EOF # Output a single cell of a test sub singletest { my ($test, $testname, $groupname) = @_; - my $vis = $test->{visible}?"vis_":""; if (!exists $test->{results}->{$testname}) { - print OUT " <td class=\"${vis}note\">.</td>\n"; + print OUT " <td class=\"note\">.</td>\n"; } else { my $file = "$test->{dir}/$testname.txt"; my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}}; @@ -219,11 +207,12 @@ sub singletest { my $msg = $todo eq "-"?"crash": $todo == 258?"timeout":"failed"; my $fail = -r "$datadir/$build/$file"?"<a href=\"$file\">$msg</a>":$msg; - print OUT " <td class=\"${vis}note\">$fail</td>\n"; + print OUT " <td class=\"note\">$fail</td>\n"; } else { my $class = $error?"fail":"pass"; + my $skip = $skipped?"skip_":""; print OUT <<"EOF"; - <td class="$vis$class"><a + <td class="$skip$class"><a href="$file" title="$count tests, $todo TODO, $error errors, $skipped skipped" onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error,$skipped);" Index: tools/winetest/summary.css diff -u -p tools/winetest/summary.css:1.6 tools/winetest/summary.css:1.7 --- tools/winetest/summary.css:1.6 8 Mar 2007 20: 6:22 -0000 +++ tools/winetest/summary.css 8 Mar 2007 20: 6:22 -0000 @@ -44,6 +44,22 @@ h3, p.legend { border-left-color: #ff5050; border-right-color: #0070ff; } +.skip_pass { + background-color: #60ff60; + border-right-style: solid; + border-left-style: solid; + border-width: thick; + border-left-color: #60ff60; + border-right-color: #0070ff; +} +.skip_fail { + background-color: #ff5050; + border-right-style: solid; + border-left-style: solid; + border-width: thick; + border-left-color: #ff5050; + border-right-color: #0070ff; +} td { text-align: center; }

1 0

Chris Robinson : quartz: Use proper alloc/free functions for COM objects.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: 045270605c4774c43f50c077ad3733c263eb6fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=045270605c4774c43f50c077a… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Mar 8 03:03:06 2007 -0800 quartz: Use proper alloc/free functions for COM objects. --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/filtergraph.c | 13 +++++++------ dlls/quartz/main.c | 4 ++-- dlls/quartz/memallocator.c | 4 ++-- dlls/quartz/parser.c | 12 ++++++------ dlls/quartz/systemclock.c | 16 ++++++++++------ dlls/quartz/transform.c | 2 +- dlls/quartz/videorenderer.c | 2 +- 8 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9c03443..87a6f69 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -411,7 +411,7 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) IPin_Release(This->ppPins[0]); - HeapFree(GetProcessHeap(), 0, This->ppPins); + CoTaskMemFree(This->ppPins); This->lpVtbl = NULL; This->IBasicAudio_vtbl = NULL; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 3a4db4f..4bbe879 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -72,7 +72,8 @@ static int EventsQueue_Init(EventsQueue* omr) omr->msg_tosave = 0; omr->msg_event = CreateEventW(NULL, TRUE, FALSE, NULL); omr->ring_buffer_size = EVENTS_RING_BUFFER_INCREMENT; - omr->messages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,omr->ring_buffer_size * sizeof(Event)); + omr->messages = CoTaskMemAlloc(omr->ring_buffer_size * sizeof(Event)); + ZeroMemory(omr->messages, omr->ring_buffer_size * sizeof(Event)); InitializeCriticalSection(&omr->msg_crst); return TRUE; @@ -81,7 +82,7 @@ static int EventsQueue_Init(EventsQueue* omr) static int EventsQueue_Destroy(EventsQueue* omr) { CloseHandle(omr->msg_event); - HeapFree(GetProcessHeap(),0,omr->messages); + CoTaskMemFree(omr->messages); DeleteCriticalSection(&omr->msg_crst); return TRUE; } @@ -268,9 +269,9 @@ static ULONG Filtergraph_Release(IFilterGraphImpl *This) { CloseHandle(This->hEventCompletion); EventsQueue_Destroy(&This->evqueue); DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This->ppFiltersInGraph); - HeapFree(GetProcessHeap(), 0, This->pFilterNames); - HeapFree(GetProcessHeap(), 0, This); + CoTaskMemFree(This->ppFiltersInGraph); + CoTaskMemFree(This->pFilterNames); + CoTaskMemFree(This); } return ref; } @@ -4487,7 +4488,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) if( pUnkOuter ) return CLASS_E_NOAGGREGATION; - fimpl = HeapAlloc(GetProcessHeap(), 0, sizeof(*fimpl)); + fimpl = CoTaskMemAlloc(sizeof(*fimpl)); fimpl->IGraphBuilder_vtbl = &IGraphBuilder_VTable; fimpl->IMediaControl_vtbl = &IMediaControl_VTable; fimpl->IMediaSeeking_vtbl = &IMediaSeeking_VTable; diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 559b791..4c3eb9d 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -105,7 +105,7 @@ static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + CoTaskMemFree(This); return ref; } @@ -185,7 +185,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } - factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); + factory = CoTaskMemAlloc(sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 9b4a0fb..4bb6bab 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -154,7 +154,7 @@ static ULONG WINAPI BaseMemAllocator_Release(IMemAllocator * iface) CloseHandle(This->hSemWaiting); if (This->bCommitted) This->fnFree(iface); - HeapFree(GetProcessHeap(), 0, This->pProps); + CoTaskMemFree(This->pProps); CoTaskMemFree(This); return 0; } @@ -179,7 +179,7 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO else { if (!This->pProps) - This->pProps = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->pProps)); + This->pProps = CoTaskMemAlloc(sizeof(*This->pProps)); if (!This->pProps) hr = E_OUTOFMEMORY; diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index edcb9c7..e9d0854 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -192,7 +192,7 @@ static ULONG WINAPI Parser_Release(IBaseFilter * iface) for (i = 0; i < This->cStreams + 1; i++) IPin_Release(This->ppPins[i]); - HeapFree(GetProcessHeap(), 0, This->ppPins); + CoTaskMemFree(This->ppPins); This->lpVtbl = NULL; TRACE("Destroying parser\n"); @@ -486,7 +486,7 @@ HRESULT Parser_AddPin(ParserImpl * This, PIN_INFO * piOutput, ALLOCATOR_PROPERTI ppOldPins = This->ppPins; - This->ppPins = HeapAlloc(GetProcessHeap(), 0, (This->cStreams + 2) * sizeof(IPin *)); + This->ppPins = CoTaskMemAlloc((This->cStreams + 2) * sizeof(IPin *)); memcpy(This->ppPins, ppOldPins, (This->cStreams + 1) * sizeof(IPin *)); hr = Parser_OutputPin_Construct(piOutput, props, NULL, Parser_OutputPin_QueryAccept, amt, fSamplesPerSec, &This->csFilter, This->ppPins + This->cStreams + 1); @@ -497,11 +497,11 @@ HRESULT Parser_AddPin(ParserImpl * This, PIN_INFO * piOutput, ALLOCATOR_PROPERTI ((Parser_OutputPin *)(This->ppPins[This->cStreams + 1]))->dwLength = dwLength; ((Parser_OutputPin *)(This->ppPins[This->cStreams + 1]))->pin.pin.pUserData = (LPVOID)This->ppPins[This->cStreams + 1]; This->cStreams++; - HeapFree(GetProcessHeap(), 0, ppOldPins); + CoTaskMemFree(ppOldPins); } else { - HeapFree(GetProcessHeap(), 0, This->ppPins); + CoTaskMemFree(This->ppPins); This->ppPins = ppOldPins; ERR("Failed with error %x\n", hr); } @@ -517,7 +517,7 @@ static HRESULT Parser_RemoveOutputPins(ParserImpl * This) IPin ** ppOldPins = This->ppPins; /* reduce the pin array down to 1 (just our input pin) */ - This->ppPins = HeapAlloc(GetProcessHeap(), 0, sizeof(IPin *) * 1); + This->ppPins = CoTaskMemAlloc(sizeof(IPin *) * 1); memcpy(This->ppPins, ppOldPins, sizeof(IPin *) * 1); for (i = 0; i < This->cStreams; i++) @@ -527,7 +527,7 @@ static HRESULT Parser_RemoveOutputPins(ParserImpl * This) } This->cStreams = 0; - HeapFree(GetProcessHeap(), 0, ppOldPins); + CoTaskMemFree(ppOldPins); return S_OK; } diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 50797cc..78374d8 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -117,7 +117,7 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { SetEvent((HANDLE) it->hEvent); /** ... and Release it */ QUARTZ_RemoveAviseEntryFromQueue(This, it); - HeapFree(GetProcessHeap(), 0, it); + CoTaskMemFree(it); } if (NULL != it) timeOut = (DWORD) ((it->rtBaseTime + it->rtIntervalTime) - curTime) / (REFERENCE_TIME)10000; @@ -225,7 +225,7 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { CloseHandle(This->adviseThread); } DeleteCriticalSection(&This->safe); - HeapFree(GetProcessHeap(), 0, This); + CoTaskMemFree(This); } return ref; } @@ -271,10 +271,11 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock* iface, REFEREN if (NULL == pdwAdviseCookie) { return E_POINTER; } - pEntry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SystemClockAdviseEntry)); + pEntry = CoTaskMemAlloc(sizeof(SystemClockAdviseEntry)); if (NULL == pEntry) { return E_OUTOFMEMORY; } + ZeroMemory(pEntry, sizeof(SystemClockAdviseEntry)); pEntry->hEvent = (HANDLE) hEvent; pEntry->rtBaseTime = rtBaseTime + rtStreamTime; @@ -306,10 +307,11 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REF if (NULL == pdwAdviseCookie) { return E_POINTER; } - pEntry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SystemClockAdviseEntry)); + pEntry = CoTaskMemAlloc(sizeof(SystemClockAdviseEntry)); if (NULL == pEntry) { return E_OUTOFMEMORY; } + ZeroMemory(pEntry, sizeof(SystemClockAdviseEntry)); pEntry->hEvent = (HANDLE) hSemaphore; pEntry->rtBaseTime = rtStartTime; @@ -345,7 +347,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock* iface, DWORD_PTR } QUARTZ_RemoveAviseEntryFromQueue(This, pEntry); - HeapFree(GetProcessHeap(), 0, pEntry); + CoTaskMemFree(pEntry); SystemClockPostMessageToAdviseThread(This, ADVISE_REMOVE); @@ -370,11 +372,13 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv) { TRACE("(%p,%p)\n", ppv, pUnkOuter); - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SystemClockImpl)); + obj = CoTaskMemAlloc(sizeof(SystemClockImpl)); if (NULL == obj) { *ppv = NULL; return E_OUTOFMEMORY; } + ZeroMemory(obj, sizeof(SystemClockImpl)); + obj->lpVtbl = &SystemClock_Vtbl; obj->ref = 0; /* will be inited by QueryInterface */ diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 59c2e3a..a610d43 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -282,7 +282,7 @@ static ULONG WINAPI TransformFilter_Release(IBaseFilter * iface) for (i = 0; i < 2; i++) IPin_Release(This->ppPins[i]); - HeapFree(GetProcessHeap(), 0, This->ppPins); + CoTaskMemFree(This->ppPins); This->lpVtbl = NULL; This->pFuncsTable->pfnCleanup(This); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 7adf59a..3ec283a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -532,7 +532,7 @@ static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) IPin_Release(This->ppPins[0]); - HeapFree(GetProcessHeap(), 0, This->ppPins); + CoTaskMemFree(This->ppPins); This->lpVtbl = NULL; TRACE("Destroying Video Renderer\n");

1 0

Kai Blin : secur32: Check for actual return value on invalid QuerySecurityPackageInfo call.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: df3a7a7b43841870f84f740c772febb36e40b16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3a7a7b43841870f84f740c7… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Mar 8 13:18:16 2007 +0100 secur32: Check for actual return value on invalid QuerySecurityPackageInfo call. --- dlls/secur32/tests/main.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c index f105eb0..a6daa28 100644 --- a/dlls/secur32/tests/main.c +++ b/dlls/secur32/tests/main.c @@ -223,8 +223,9 @@ static void testQuerySecurityPackageInfo(void) pkg_info = (void *)0xdeadbeef; sec_status = pQuerySecurityPackageInfoA(winetest, &pkg_info); - ok( sec_status != SEC_E_OK, - "Return value of QuerySecurityPackageInfo() should not be %s for a nonexistent package\n", getSecError(SEC_E_OK)); + ok( sec_status == SEC_E_SECPKG_NOT_FOUND, + "Return value of QuerySecurityPackageInfo() should be %s for a nonexistent package\n", + getSecError(SEC_E_SECPKG_NOT_FOUND)); ok(pkg_info == (void *)0xdeadbeef, "wrong pkg_info address %p\n", pkg_info);

1 0

Jacek Caban : mshtml: Release IOleCommandTarget in IPersistMoniker::Load.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: bf6d0f2272ae5c5e1cde2111d5ffa79d3e578c92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6d0f2272ae5c5e1cde2111d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 13:36:53 2007 +0100 mshtml: Release IOleCommandTarget in IPersistMoniker::Load. --- dlls/mshtml/persist.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 39c3a7e..2d61432 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -217,6 +217,8 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva V_VT(&var) = VT_I4; V_I4(&var) = 0; IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); + + IOleCommandTarget_Release(cmdtrg); } } @@ -532,7 +534,7 @@ static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM nsAString_Finish(&nsstr); - ERR("%s\n", debugstr_a(str)); + TRACE("%s\n", debugstr_a(str)); hres = IStream_Write(pStm, str, len, &written); if(FAILED(hres))

1 0

Rob Shearman : ole32: Fix BindCtxImpl_GetBindOptions to return the correct locale and to not fail if the input size is too large .
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: bdefb46d29a8d5a9cf9f3794648565c5dbfd7908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdefb46d29a8d5a9cf9f37946… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 8 11:00:21 2007 +0000 ole32: Fix BindCtxImpl_GetBindOptions to return the correct locale and to not fail if the input size is too large. --- dlls/ole32/bindctx.c | 11 +++++------ dlls/ole32/tests/moniker.c | 10 +--------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 9a7e4df..636cdca 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -20,14 +20,15 @@ #include <stdarg.h> #include <string.h> -#include <assert.h> #define COBJMACROS #include "winerror.h" #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "objbase.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -273,10 +274,8 @@ BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) return E_POINTER; if (pbindopts->cbStruct > sizeof(BIND_OPTS2)) - { - WARN("invalid size\n"); - return E_INVALIDARG; /* FIXME : not verified */ - } + pbindopts->cbStruct = sizeof(BIND_OPTS2); + memcpy(pbindopts, &This->bindOption2, pbindopts->cbStruct); return S_OK; } @@ -510,7 +509,7 @@ static HRESULT BindCtxImpl_Construct(BindCtxImpl* This) This->bindOption2.dwTrackFlags = 0; This->bindOption2.dwClassContext = CLSCTX_SERVER; - This->bindOption2.locale = 1033; + This->bindOption2.locale = GetThreadLocale(); This->bindOption2.pServerInfo = 0; /* Initialize the bindctx table */ diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e628aca..f084fbb 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1455,10 +1455,8 @@ static void test_bind_context(void) bind_opts.cbStruct = -1; hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); - todo_wine { ok_ole_success(hr, "IBindCtx_GetBindOptions"); ok(bind_opts.cbStruct == sizeof(bind_opts), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); - } bind_opts.cbStruct = sizeof(bind_opts); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); @@ -1470,13 +1468,7 @@ static void test_bind_context(void) ok(bind_opts.dwTrackFlags == 0, "bind_opts.dwTrackFlags was 0x%x instead of 0\n", bind_opts.dwTrackFlags); ok(bind_opts.dwClassContext == (CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER|CLSCTX_REMOTE_SERVER), "bind_opts.dwClassContext should have been 0x15 instead of 0x%x\n", bind_opts.dwClassContext); - if (bind_opts.locale != GetThreadLocale()) /* should be removed once wine is fixed */ - { - todo_wine - ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); - } - else - ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); + ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); ok(bind_opts.pServerInfo == NULL, "bind_opts.pServerInfo should have been NULL instead of %p\n", bind_opts.pServerInfo);

1 0