May 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : ole32: Delete the transacted storage scratch file on release.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 7efe6d98950d0ecba69a7da87e3600d166ceb9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7efe6d98950d0ecba69a7da87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:27:41 2011 +0200 ole32: Delete the transacted storage scratch file on release. --- dlls/ole32/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fa9c06f..44adaed 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5062,7 +5062,7 @@ static HRESULT TransactedSnapshotImpl_Construct(StorageBaseImpl *parentStorage, (*result)->base.openFlags = parentStorage->openFlags; /* Create a new temporary storage to act as the scratch file. */ - hr = StgCreateDocfile(NULL, STGM_READWRITE|STGM_SHARE_EXCLUSIVE|STGM_CREATE, + hr = StgCreateDocfile(NULL, STGM_READWRITE|STGM_SHARE_EXCLUSIVE|STGM_CREATE|STGM_DELETEONRELEASE, 0, (IStorage**)&(*result)->scratch); if (SUCCEEDED(hr))

1 0

Alexandre Julliard : shdocvw: Delete the temporary storage file on release.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 2e1736d0eb38e60e76a68e50d96ddabc29a308b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1736d0eb38e60e76a68e50d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:27:55 2011 +0200 shdocvw: Delete the temporary storage file on release. --- dlls/shdocvw/intshcut.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index 4a2dd6a..f83aa52 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -816,7 +816,8 @@ static InternetShortcut *create_shortcut(void) newshortcut->IPersistFile_iface.lpVtbl = &persistFileVtbl; newshortcut->IPropertySetStorage_iface.lpVtbl = &propertySetStorageVtbl; newshortcut->refCount = 0; - hr = StgCreateStorageEx(NULL, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, STGFMT_STORAGE, 0, NULL, NULL, &IID_IPropertySetStorage, (void **) &newshortcut->property_set_storage); + hr = StgCreateStorageEx(NULL, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, + STGFMT_STORAGE, 0, NULL, NULL, &IID_IPropertySetStorage, (void **) &newshortcut->property_set_storage); if FAILED(hr) { TRACE("Failed to create the storage object needed for the shortcut.\n");

1 0

Alexandre Julliard : msi: Remove the temp files after the storage files are closed.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: b79fde445edfc568d3abc777f7c51025e54f0205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79fde445edfc568d3abc777f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:28:27 2011 +0200 msi: Remove the temp files after the storage files are closed. --- dlls/msi/package.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 9d7ab73..c421805 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -159,8 +159,6 @@ static void free_package_structures( MSIPACKAGE *package ) TRACE("Freeing package action data\n"); - remove_tracked_tempfiles(package); - LIST_FOR_EACH_SAFE( item, cursor, &package->features ) { MSIFEATURE *feature = LIST_ENTRY( item, MSIFEATURE, entry ); @@ -339,6 +337,8 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free( package->LastAction ); msi_free( package->langids ); + remove_tracked_tempfiles(package); + /* cleanup control event subscriptions */ ControlEvent_CleanupSubscriptions( package ); }

1 0

Alexandre Julliard : kernel32: Fix a couple of handle leaks.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 6dc906208667e7e42892c47f1a5f4411985a12bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc906208667e7e42892c47f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:28:46 2011 +0200 kernel32: Fix a couple of handle leaks. --- dlls/kernel32/resource.c | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 81f600e..b9a93c4 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -903,7 +903,6 @@ struct resource_size_info { struct mapping_info { HANDLE file; - HANDLE mapping; void *base; DWORD size; BOOL read_write; @@ -1062,6 +1061,7 @@ static BOOL read_mapped_resources( QUEUEDUPDATES *updates, void *base, DWORD map static BOOL map_file_into_memory( struct mapping_info *mi ) { DWORD page_attr, perm; + HANDLE mapping; if (mi->read_write) { @@ -1074,15 +1074,13 @@ static BOOL map_file_into_memory( struct mapping_info *mi ) perm = FILE_MAP_READ; } - mi->mapping = CreateFileMappingW( mi->file, NULL, page_attr, 0, 0, NULL ); - if (!mi->mapping) - return FALSE; + mapping = CreateFileMappingW( mi->file, NULL, page_attr, 0, 0, NULL ); + if (!mapping) return FALSE; - mi->base = MapViewOfFile( mi->mapping, perm, 0, 0, mi->size ); - if (!mi->base) - return FALSE; + mi->base = MapViewOfFile( mapping, perm, 0, 0, mi->size ); + CloseHandle( mapping ); - return TRUE; + return mi->base != NULL; } static BOOL unmap_file_from_memory( struct mapping_info *mi ) @@ -1090,9 +1088,6 @@ static BOOL unmap_file_from_memory( struct mapping_info *mi ) if (mi->base) UnmapViewOfFile( mi->base ); mi->base = NULL; - if (mi->mapping) - CloseHandle( mi->mapping ); - mi->mapping = NULL; return TRUE; } @@ -1126,10 +1121,7 @@ static struct mapping_info *create_mapping( LPCWSTR name, BOOL rw ) if (map_file_into_memory( mi )) return mi; } - - unmap_file_from_memory( mi ); - HeapFree( GetProcessHeap(), 0, mi ); - + destroy_mapping( mi ); return NULL; }

1 0

Alexandre Julliard : kernel32/tests: Delete some temporary files.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: d4b7888dbf49417cf9cd0a8947269821285fd0bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b7888dbf49417cf9cd0a894… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:28:55 2011 +0200 kernel32/tests: Delete some temporary files. --- dlls/kernel32/tests/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4e8136a..90b90e8 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3013,6 +3013,7 @@ static void test_ReplaceFileA(void) ok(!ret && (GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_ACCESS_DENIED), "ReplaceFileA: unexpected error %d\n", GetLastError()); + DeleteFileA( replacement ); /* * if the first round (w/ backup) worked then as long as there is no @@ -3107,6 +3108,7 @@ static void test_ReplaceFileW(void) ok(!ret && (GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_ACCESS_DENIED), "ReplaceFileW: unexpected error %d\n", GetLastError()); + DeleteFileW( replacement ); if (removeBackup) {

1 0

Marcus Meissner : wininet: Mark internal symbols with hidden visibility.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: c0ad2d4a9235c14806c24c98d073d062b137f984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ad2d4a9235c14806c24c98d… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 25 19:09:51 2011 +0200 wininet: Mark internal symbols with hidden visibility. --- dlls/wininet/internet.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index aedb265..a7af629 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -47,7 +47,7 @@ #define ioctlsocket ioctl #endif /* __MINGW32__ */ -extern HMODULE WININET_hModule; +extern HMODULE WININET_hModule DECLSPEC_HIDDEN; #ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 @@ -67,9 +67,9 @@ typedef struct { struct list conn_pool; } server_t; -void server_addref(server_t*); -void server_release(server_t*); -BOOL collect_connections(BOOL); +void server_addref(server_t*) DECLSPEC_HIDDEN; +void server_release(server_t*) DECLSPEC_HIDDEN; +BOOL collect_connections(BOOL) DECLSPEC_HIDDEN; /* used for netconnection.c stuff */ typedef struct

1 0

Marcus Meissner : wmiutils: Mark internal symbols with hidden visibility.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: ba66ceea2a218d40ee5b6f50b009418ef7f79d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba66ceea2a218d40ee5b6f50b… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 25 19:09:55 2011 +0200 wmiutils: Mark internal symbols with hidden visibility. --- dlls/wmiutils/wmiutils_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index 23082ce..58b4764 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -16,4 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *); +HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Rico Schüller : d3dx9: Pass objects to functions instead of using the base effect in the parameter .
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 7f426a51d120c5ea790ba330c31db0043fd3e59b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f426a51d120c5ea790ba330c… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 25 10:55:13 2011 +0200 d3dx9: Pass objects to functions instead of using the base effect in the parameter. --- dlls/d3dx9_36/effect.c | 67 +++++++++++++++++------------------------------ 1 files changed, 24 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f426a51d120c5ea790ba…

1 0

Gerald Pfeifer : imm32: Simplify CopyCompClauseIMEtoClient and callees by shedding an unused parameter .
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 619f6dccbd62c97e81470c3cc191065668aab8e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619f6dccbd62c97e81470c3cc… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 22 20:54:04 2011 +0200 imm32: Simplify CopyCompClauseIMEtoClient and callees by shedding an unused parameter. --- dlls/imm32/imm.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 28f482c..3122115 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1154,7 +1154,7 @@ static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT sl return rc; } -static INT CopyCompClauseIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, INT sslen, +static INT CopyCompClauseIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, LPBYTE target, INT tlen, BOOL unicode ) { INT rc; @@ -1265,13 +1265,13 @@ static LONG ImmGetCompositionStringT( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, case GCS_COMPCLAUSE: TRACE("GCS_COMPCLAUSE\n"); rc = CopyCompClauseIMEtoClient(data, compdata + compstr->dwCompClauseOffset,compstr->dwCompClauseLen, - compdata + compstr->dwCompStrOffset, compstr->dwCompStrLen, + compdata + compstr->dwCompStrOffset, lpBuf, dwBufLen, unicode); break; case GCS_RESULTCLAUSE: TRACE("GCS_RESULTCLAUSE\n"); rc = CopyCompClauseIMEtoClient(data, compdata + compstr->dwResultClauseOffset,compstr->dwResultClauseLen, - compdata + compstr->dwResultStrOffset, compstr->dwResultStrLen, + compdata + compstr->dwResultStrOffset, lpBuf, dwBufLen, unicode); break; case GCS_RESULTREADSTR: @@ -1281,7 +1281,7 @@ static LONG ImmGetCompositionStringT( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, case GCS_RESULTREADCLAUSE: TRACE("GCS_RESULTREADCLAUSE\n"); rc = CopyCompClauseIMEtoClient(data, compdata + compstr->dwResultReadClauseOffset,compstr->dwResultReadClauseLen, - compdata + compstr->dwResultStrOffset, compstr->dwResultStrLen, + compdata + compstr->dwResultStrOffset, lpBuf, dwBufLen, unicode); break; case GCS_COMPREADSTR: @@ -1297,7 +1297,7 @@ static LONG ImmGetCompositionStringT( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, case GCS_COMPREADCLAUSE: TRACE("GCS_COMPREADCLAUSE\n"); rc = CopyCompClauseIMEtoClient(data, compdata + compstr->dwCompReadClauseOffset,compstr->dwCompReadClauseLen, - compdata + compstr->dwCompStrOffset, compstr->dwCompStrLen, + compdata + compstr->dwCompStrOffset, lpBuf, dwBufLen, unicode); break; case GCS_CURSORPOS:

1 0

Gerald Pfeifer : inetmib1: Remove unused parameter pPduType from mapStructEntryToValue.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: eb087ae86039cb9aa6d0726003c86f53640d2bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb087ae86039cb9aa6d072600… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 22 20:54:16 2011 +0200 inetmib1: Remove unused parameter pPduType from mapStructEntryToValue. --- dlls/inetmib1/main.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 9aef4d5..76741f3 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -59,7 +59,7 @@ struct structToAsnValue }; static AsnInteger32 mapStructEntryToValue(struct structToAsnValue *map, - UINT mapLen, void *record, UINT id, BYTE bPduType, SnmpVarBind *pVarBind) + UINT mapLen, void *record, UINT id, SnmpVarBind *pVarBind) { /* OIDs are 1-based */ if (!id) @@ -640,7 +640,7 @@ static BOOL mib2IfEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, { *pErrorStatus = mapStructEntryToValue(mib2IfEntryMap, DEFINE_SIZEOF(mib2IfEntryMap), - &ifTable->table[tableIndex - 1], item, bPduType, + &ifTable->table[tableIndex - 1], item, pVarBind); if (bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndInteger(&pVarBind->name, @@ -713,7 +713,7 @@ static BOOL mib2IpStatsQuery(BYTE bPduType, SnmpVarBind *pVarBind, if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2IpMap, - DEFINE_SIZEOF(mib2IpMap), &ipStats, item, bPduType, pVarBind); + DEFINE_SIZEOF(mib2IpMap), &ipStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); } @@ -798,7 +798,7 @@ static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, assert(item); *pErrorStatus = mapStructEntryToValue(mib2IpAddrMap, DEFINE_SIZEOF(mib2IpAddrMap), - &ipAddrTable->table[tableIndex - 1], item, bPduType, pVarBind); + &ipAddrTable->table[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, ipAddrTable->table[tableIndex - 1].dwAddr); @@ -891,7 +891,7 @@ static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, assert(item); *pErrorStatus = mapStructEntryToValue(mib2IpRouteMap, DEFINE_SIZEOF(mib2IpRouteMap), - &ipRouteTable->table[tableIndex - 1], item, bPduType, pVarBind); + &ipRouteTable->table[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, ipRouteTable->table[tableIndex - 1].dwForwardDest); @@ -978,7 +978,7 @@ static BOOL mib2IpNetQuery(BYTE bPduType, SnmpVarBind *pVarBind, { *pErrorStatus = mapStructEntryToValue(mib2IpNetMap, DEFINE_SIZEOF(mib2IpNetMap), - &ipNetTable[tableIndex - 1], item, bPduType, pVarBind); + &ipNetTable[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndInteger(&pVarBind->name, &myOid, item, tableIndex); @@ -1053,7 +1053,7 @@ static BOOL mib2IcmpQuery(BYTE bPduType, SnmpVarBind *pVarBind, if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2IcmpMap, - DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item, bPduType, + DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); @@ -1115,7 +1115,7 @@ static BOOL mib2TcpQuery(BYTE bPduType, SnmpVarBind *pVarBind, if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2TcpMap, - DEFINE_SIZEOF(mib2TcpMap), &tcpStats, item, bPduType, pVarBind); + DEFINE_SIZEOF(mib2TcpMap), &tcpStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); } @@ -1165,7 +1165,7 @@ static BOOL mib2UdpQuery(BYTE bPduType, SnmpVarBind *pVarBind, if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2UdpMap, - DEFINE_SIZEOF(mib2UdpMap), &udpStats, item, bPduType, pVarBind); + DEFINE_SIZEOF(mib2UdpMap), &udpStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); } @@ -1258,7 +1258,7 @@ static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, assert(item); *pErrorStatus = mapStructEntryToValue(mib2UdpEntryMap, DEFINE_SIZEOF(mib2UdpEntryMap), - &udpTable->table[tableIndex - 1], item, bPduType, pVarBind); + &udpTable->table[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) { AsnObjectIdentifier oid;

1 0