November 2007 - Wine-commits

Rob Shearman : ole32: Store the InterfaceList object in the IEnumMoniker object.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 2c1ba188d67b23d528ada061bcdfe5a873fb90b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1ba188d67b23d528ada061b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 10 16:05:23 2007 +0000 ole32: Store the InterfaceList object in the IEnumMoniker object. This is because the IEnumMoniker object is supposed to free the memory passed to it, but the array of InterfaceData pointers is inside the InterfaceList memory block. --- dlls/ole32/moniker.c | 54 +++++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 53070c8..c704a50 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -94,15 +94,14 @@ typedef struct EnumMonikerImpl const IEnumMonikerVtbl *lpVtbl; LONG ref; - InterfaceData **monikers; - ULONG moniker_count; + InterfaceList *moniker_list; ULONG pos; } EnumMonikerImpl; /* IEnumMoniker Local functions*/ -static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceData **monikers, - ULONG moniker_count, ULONG pos, IEnumMoniker **ppenumMoniker); +static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, + ULONG pos, IEnumMoniker **ppenumMoniker); static IrotHandle get_irot_handle(void) { @@ -934,8 +933,7 @@ RunningObjectTableImpl_EnumRunning(IRunningObjectTable* iface, } if (SUCCEEDED(hr)) - hr = EnumMonikerImpl_CreateEnumROTMoniker(interface_list->interfaces, - interface_list->size, + hr = EnumMonikerImpl_CreateEnumROTMoniker(interface_list, 0, ppenumMoniker); return hr; @@ -1320,9 +1318,9 @@ static ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface) TRACE("(%p) Deleting\n",This); - for (i = 0; i < This->moniker_count; i++) - HeapFree(GetProcessHeap(), 0, This->monikers[i]); - HeapFree(GetProcessHeap(), 0, This->monikers); + for (i = 0; i < This->moniker_list->size; i++) + HeapFree(GetProcessHeap(), 0, This->moniker_list->interfaces[i]); + HeapFree(GetProcessHeap(), 0, This->moniker_list); HeapFree(GetProcessHeap(), 0, This); } @@ -1337,13 +1335,13 @@ static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker* iface, ULONG celt, IM EnumMonikerImpl *This = (EnumMonikerImpl *)iface; HRESULT hr = S_OK; - TRACE("(%p) TabCurrentPos %d Tablastindx %d\n", This, This->pos, This->moniker_count); + TRACE("(%p) TabCurrentPos %d Tablastindx %d\n", This, This->pos, This->moniker_list->size); /* retrieve the requested number of moniker from the current position */ - for(i = 0; (This->pos < This->moniker_count) && (i < celt); i++) + for(i = 0; (This->pos < This->moniker_list->size) && (i < celt); i++) { IStream *stream; - hr = create_stream_on_mip_ro(This->monikers[This->pos++], &stream); + hr = create_stream_on_mip_ro(This->moniker_list->interfaces[This->pos++], &stream); if (hr != S_OK) break; hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&rgelt[i]); IStream_Release(stream); @@ -1372,7 +1370,7 @@ static HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker* iface, ULONG celt) TRACE("(%p)\n",This); - if (This->pos + celt >= This->moniker_count) + if (This->pos + celt >= This->moniker_list->size) return S_FALSE; This->pos += celt; @@ -1400,35 +1398,35 @@ static HRESULT WINAPI EnumMonikerImpl_Reset(IEnumMoniker* iface) static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker ** ppenum) { EnumMonikerImpl *This = (EnumMonikerImpl *)iface; - InterfaceData **monikers; + InterfaceList *moniker_list; ULONG i; TRACE("(%p)\n",This); *ppenum = NULL; - monikers = HeapAlloc(GetProcessHeap(), 0, sizeof(*monikers)*This->moniker_count); - if (!monikers) + moniker_list = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceList, interfaces[This->moniker_list->size])); + if (!moniker_list) return E_OUTOFMEMORY; - for (i = 0; i < This->moniker_count; i++) + moniker_list->size = This->moniker_list->size; + for (i = 0; i < This->moniker_list->size; i++) { - SIZE_T size = FIELD_OFFSET(InterfaceData, abData[This->monikers[i]->ulCntData]); - monikers[i] = HeapAlloc(GetProcessHeap(), 0, size); - if (!monikers[i]) + SIZE_T size = FIELD_OFFSET(InterfaceData, abData[This->moniker_list->interfaces[i]->ulCntData]); + moniker_list->interfaces[i] = HeapAlloc(GetProcessHeap(), 0, size); + if (!moniker_list->interfaces[i]) { ULONG end = i; for (i = 0; i < end; i++) - HeapFree(GetProcessHeap(), 0, monikers[i]); - HeapFree(GetProcessHeap(), 0, monikers); + HeapFree(GetProcessHeap(), 0, moniker_list->interfaces[i]); + HeapFree(GetProcessHeap(), 0, moniker_list); return E_OUTOFMEMORY; } - memcpy(monikers[i], This->monikers[i], size); + memcpy(moniker_list->interfaces[i], This->moniker_list->interfaces[i], size); } /* copy the enum structure */ - return EnumMonikerImpl_CreateEnumROTMoniker(monikers, This->moniker_count, - This->pos, ppenum); + return EnumMonikerImpl_CreateEnumROTMoniker(moniker_list, This->pos, ppenum); } /* Virtual function table for the IEnumMoniker class. */ @@ -1448,8 +1446,7 @@ static const IEnumMonikerVtbl VT_EnumMonikerImpl = * Used by EnumRunning to create the structure and EnumClone * to copy the structure */ -static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceData **monikers, - ULONG moniker_count, +static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, ULONG current_pos, IEnumMoniker **ppenumMoniker) { @@ -1469,8 +1466,7 @@ static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceData **monik /* the initial reference is set to "1" */ This->ref = 1; /* set the ref count to one */ This->pos = current_pos; /* Set the list start posn */ - This->moniker_count = moniker_count; /* Need the same size table as ROT */ - This->monikers = monikers; + This->moniker_list = moniker_list; *ppenumMoniker = (IEnumMoniker*)This;

1 0

Rob Shearman : ole32: Add a missing IMoniker_Release to test_MkParseDisplayName.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: e8b9a427be460f2c7aa8cf6eb622d5d7229255a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b9a427be460f2c7aa8cf6eb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 10 16:04:51 2007 +0000 ole32: Add a missing IMoniker_Release to test_MkParseDisplayName. --- dlls/ole32/tests/moniker.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 14f5018..3ebdc52 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -878,6 +878,7 @@ static void test_MkParseDisplayName(void) ok_ole_success(hr, IMoniker_BindToObject); IUnknown_Release(object); + IMoniker_Release(pmk); } IBindCtx_Release(pbc);

1 0

Rob Shearman : ole32: Fix memory leak in ItemMonikerImpl_Save.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: a7bfdde975b6e1d75d076e15a5ef000604847ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7bfdde975b6e1d75d076e15a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 10 16:04:40 2007 +0000 ole32: Fix memory leak in ItemMonikerImpl_Save. --- dlls/ole32/itemmoniker.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 2a8ed22..239dfb6 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -355,6 +355,9 @@ HRESULT WINAPI ItemMonikerImpl_Save(IMoniker* iface, res=IStream_Write(pStm,&nameLength,sizeof(DWORD),NULL); res=IStream_Write(pStm,itemNameA,nameLength * sizeof(CHAR),NULL); + HeapFree(GetProcessHeap(), 0, itemNameA); + HeapFree(GetProcessHeap(), 0, itemDelimiterA); + return res; }

1 0

Rob Shearman : ole32: Add a missing IStream_Release to test_same_apartment_unmarshal_failure.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: b75a33a214449fc8a71656281316132011f2d292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75a33a214449fc8a71656281… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 10 16:04:30 2007 +0000 ole32: Add a missing IStream_Release to test_same_apartment_unmarshal_failure. --- dlls/ole32/tests/marshal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index d15b879..56c213e 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -434,6 +434,8 @@ static void test_same_apartment_unmarshal_failure(void) ok(hr == E_NOINTERFACE, "CoUnmarshalInterface should have returned E_NOINTERFACE instead of 0x%08x\n", hr); ok_no_locks(); + + IStream_Release(pStream); } /* tests success case of an interthread marshal */

1 0

Andrew Talbot : user32: Constify some variables.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 5f4f0fa04de77ab5d7a18ce876c9a1ac3a3db12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4f0fa04de77ab5d7a18ce87… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Nov 11 12:37:36 2007 +0000 user32: Constify some variables. --- dlls/user32/comm16.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/comm16.c b/dlls/user32/comm16.c index 57b00d1..ef8e843 100644 --- a/dlls/user32/comm16.c +++ b/dlls/user32/comm16.c @@ -140,7 +140,7 @@ static struct DosDeviceStruct *GetDeviceStruct(int index) return NULL; } -static int GetCommPort_ov(LPOVERLAPPED ov, int write) +static int GetCommPort_ov(const OVERLAPPED *ov, int write) { int x; @@ -161,13 +161,13 @@ static int WinError(void) } } -static unsigned comm_inbuf(struct DosDeviceStruct *ptr) +static unsigned comm_inbuf(const struct DosDeviceStruct *ptr) { return ((ptr->ibuf_tail > ptr->ibuf_head) ? ptr->ibuf_size : 0) + ptr->ibuf_head - ptr->ibuf_tail; } -static unsigned comm_outbuf(struct DosDeviceStruct *ptr) +static unsigned comm_outbuf(const struct DosDeviceStruct *ptr) { return ((ptr->obuf_tail > ptr->obuf_head) ? ptr->obuf_size : 0) + ptr->obuf_head - ptr->obuf_tail; @@ -360,7 +360,7 @@ static void comm_waitwrite(struct DosDeviceStruct *ptr) /***************************************************************************** * COMM16_DCBtoDCB16 (Internal) */ -static INT16 COMM16_DCBtoDCB16(LPDCB lpdcb, LPDCB16 lpdcb16) +static INT16 COMM16_DCBtoDCB16(const DCB *lpdcb, LPDCB16 lpdcb16) { if(lpdcb->BaudRate<0x10000) lpdcb16->BaudRate = lpdcb->BaudRate;

1 0

Rob Shearman : ole32: Add a missing IStream_Release to test_CoMarshalInterThreadInterfaceInStream .
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 2e2383d5caf592a7bfd39147ab92df84fa973690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2383d5caf592a7bfd39147a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 10 13:55:06 2007 +0000 ole32: Add a missing IStream_Release to test_CoMarshalInterThreadInterfaceInStream. --- dlls/ole32/tests/compobj.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d7a88f7..89cf9b9 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -642,6 +642,7 @@ static void test_CoMarshalInterThreadInterfaceInStream(void) ok_ole_success(hr, "CoUnmarshalInterface"); IClassFactory_Release(pProxy); + IStream_Release(pStream); ok_no_locks();

1 0

Hans Leidekker : wininet: Fix two handle leaks in the test.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 864db96626f5a1f9cf813dc42bdc226bd13ef46c URL: http://source.winehq.org/git/wine.git/?a=commit;h=864db96626f5a1f9cf813dc42… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Nov 11 13:35:06 2007 +0100 wininet: Fix two handle leaks in the test. --- dlls/wininet/tests/http.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a8f989b..4a28db9 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -753,7 +753,7 @@ static void InternetOpenUrlA_test(void) SetLastError(0); myhttp = InternetOpenUrl(myhinternet, TEST_URL, 0, 0, INTERNET_FLAG_RELOAD|INTERNET_FLAG_NO_CACHE_WRITE|INTERNET_FLAG_TRANSFER_BINARY,0); - if (GetLastError() == 12007) + if (GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) return; /* WinXP returns this when not connected to the net */ ok((myhttp != 0),"InternetOpenUrl failed, error %u\n",GetLastError()); ret = InternetReadFile(myhttp, buffer,0x400,&readbytes); @@ -762,6 +762,9 @@ static void InternetOpenUrlA_test(void) while (readbytes && InternetReadFile(myhttp, buffer,0x400,&readbytes)) totalbytes += readbytes; trace("read 0x%08x bytes\n",totalbytes); + + InternetCloseHandle(myhttp); + InternetCloseHandle(myhinternet); } static void InternetTimeFromSystemTimeA_test(void)

1 0

Hans Leidekker : snmpapi: Make a test pass on Vista.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 42aa4e46b6dc4e9fd4f347d15a99cb7f5e9adae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42aa4e46b6dc4e9fd4f347d15… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Nov 11 13:34:45 2007 +0100 snmpapi: Make a test pass on Vista. --- dlls/snmpapi/tests/util.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index a358a1a..72bcdc8 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -352,11 +352,19 @@ static void test_SnmpUtilOidCmp(void) static void test_SnmpUtilOidAppend(void) { INT ret; - static UINT ids1[] = { 1, 2, 3 }; + UINT *ids1; static UINT ids2[] = { 4, 5, 6 }; - static AsnObjectIdentifier oid1 = { 3, ids1 }; + static AsnObjectIdentifier oid1; static AsnObjectIdentifier oid2 = { 3, ids2 }; + ids1 = HeapAlloc(GetProcessHeap(), 0, 3 * sizeof(UINT)); + ids1[0] = 1; + ids1[1] = 2; + ids1[2] = 3; + + oid1.idLength = 3; + oid1.ids = ids1; + ret = SnmpUtilOidAppend(NULL, NULL); ok(!ret, "SnmpUtilOidAppend succeeded\n"); @@ -371,6 +379,8 @@ static void test_SnmpUtilOidAppend(void) ok(oid1.idLength == 6, "SnmpUtilOidAppend failed\n"); ok(!memcmp(&oid1.ids[3], ids2, 3 * sizeof(UINT)), "SnmpUtilOidAppend failed\n"); + + HeapFree(GetProcessHeap(), 0, ids1); } static void test_SnmpUtilVarBindCpyFree(void)

1 0

Hans Leidekker : pdh: Make two tests pass on Vista.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 9a51ac72492c5e367b8fe13b8df89858cfe5416a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a51ac72492c5e367b8fe13b8… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Nov 11 13:34:28 2007 +0100 pdh: Make two tests pass on Vista. --- dlls/pdh/tests/pdh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 51a2b5f..f1b856d 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -488,7 +488,7 @@ static void test_PdhGetCounterInfoA( void ) size = sizeof(info) - 1; ret = PdhGetCounterInfoA( counter, 0, &size, NULL ); - ok(ret == PDH_MORE_DATA, "PdhGetCounterInfoA failed 0x%08x\n", ret); + ok(ret == PDH_MORE_DATA || ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoA failed 0x%08x\n", ret); size = sizeof(info); ret = PdhGetCounterInfoA( counter, 0, &size, &info ); @@ -542,7 +542,7 @@ static void test_PdhGetCounterInfoW( void ) size = sizeof(info) - 1; ret = PdhGetCounterInfoW( counter, 0, &size, NULL ); - ok(ret == PDH_MORE_DATA, "PdhGetCounterInfoW failed 0x%08x\n", ret); + ok(ret == PDH_MORE_DATA || ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoW failed 0x%08x\n", ret); size = sizeof(info); ret = PdhGetCounterInfoW( counter, 0, &size, &info );

1 0

Paul Vriens : dsound/tests: Fix tests after addition of 24/ 32 bits buffer tests.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: d66722db311ac261bcd7f8aeecbc023be5cacda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66722db311ac261bcd7f8aee… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Nov 10 14:55:47 2007 +0100 dsound/tests: Fix tests after addition of 24/32 bits buffer tests. --- dlls/dsound/tests/capture.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index d67672c..9f9b150 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -603,7 +603,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, trace(" Testing the capture buffer at %s\n", format_string(&wfx)); rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(((rc==DS_OK)&&(dscbo!=NULL))||(rc==DSERR_BADFORMAT)|| - ((rc==DSERR_NODRIVER))||(rc==DSERR_ALLOCATED)||(rc==E_INVALIDARG), + ((rc==DSERR_NODRIVER))||(rc==DSERR_ALLOCATED)||(rc==E_INVALIDARG)||(rc==E_FAIL), "IDirectSoundCapture_CreateCaptureBuffer() failed to create a " "%s capture buffer: %s\n",format_string(&wfx),DXGetErrorString8(rc)); if (rc==DS_OK) { @@ -641,6 +641,12 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, ok(ref==0,"IDirectSoundCaptureBuffer_Release() has %d " "references, should have 0\n",ref); } + } else if (rc==E_FAIL) { + /* WAVE_FORMAT_PCM only allows 8 and 16 bits per sample, so only + * report a failure if the bits per sample is 8 or 16 + */ + if (wfx.wBitsPerSample == 8 || wfx.wBitsPerSample == 16) + ok(FALSE,"Should not fail for 8 or 16 bits per sample\n"); } }

1 0