wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Paul Chitescu : qedit: In SampleGrabber ReceiveConnection check early the format type, return VFW_E_INVALIDMEDIATYPE like native.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 5650a9eb8b095fe2e170d5a6dec3f12c544fba3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5650a9eb8b095fe2e170d5a6d… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Mar 12 11:33:14 2010 +0200 qedit: In SampleGrabber ReceiveConnection check early the format type, return VFW_E_INVALIDMEDIATYPE like native. --- dlls/qedit/samplegrabber.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index d09d554..c766cfa 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -1048,6 +1048,10 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M debugstr_guid(&type->majortype), debugstr_guid(&type->subtype), type->lSampleSize, debugstr_guid(&type->formattype), type->cbFormat); + if (!IsEqualGUID(&type->formattype, &FORMAT_None) && + !IsEqualGUID(&type->formattype, &GUID_NULL) && + !type->pbFormat) + return VFW_E_INVALIDMEDIATYPE; if (!IsEqualGUID(&This->sg->mtype.majortype,&GUID_NULL) && !IsEqualGUID(&This->sg->mtype.majortype,&type->majortype)) return VFW_E_TYPE_NOT_ACCEPTED; @@ -1058,10 +1062,6 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M !IsEqualGUID(&This->sg->mtype.formattype,&FORMAT_None) && !IsEqualGUID(&This->sg->mtype.formattype,&type->formattype)) return VFW_E_TYPE_NOT_ACCEPTED; - if (!IsEqualGUID(&type->formattype, &FORMAT_None) && - !IsEqualGUID(&type->formattype, &GUID_NULL) && - !type->pbFormat) - return VFW_E_TYPE_NOT_ACCEPTED; if (This->sg->mtype.pbFormat) CoTaskMemFree(This->sg->mtype.pbFormat); This->sg->mtype = *type;

1 0

Juan Lang : iphlpapi: Implement GetAdaptersAddresses for IPv6 addresses.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: e3c0e30db10622ddd7093db0f499f6d453fa7e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c0e30db10622ddd7093db0f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 11 18:36:46 2010 -0800 iphlpapi: Implement GetAdaptersAddresses for IPv6 addresses. --- configure | 14 ++++++++ configure.ac | 2 + dlls/iphlpapi/ifenum.c | 75 +++++++++++++++++++++++++++++++++++++++++ dlls/iphlpapi/ifenum.h | 7 ++++ dlls/iphlpapi/iphlpapi_main.c | 50 ++++++++++++++++++++++++--- include/config.h.in | 3 ++ 6 files changed, 145 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 110c350..9247160 100755 --- a/configure +++ b/configure @@ -6064,6 +6064,20 @@ fi done +for ac_header in ifaddrs.h +do : + ac_fn_c_check_header_compile "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "#include <sys/types.h> +" +if test "x$ac_cv_header_ifaddrs_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_IFADDRS_H 1 +_ACEOF + +fi + +done + + for ac_header in ucontext.h do : ac_fn_c_check_header_compile "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "#include <signal.h> diff --git a/configure.ac b/configure.ac index b077e2d..3d2711e 100644 --- a/configure.ac +++ b/configure.ac @@ -556,6 +556,8 @@ AC_CHECK_HEADERS([resolv.h],,, # include <arpa/nameser.h> #endif]) +AC_CHECK_HEADERS([ifaddrs.h],,,[#include <sys/types.h>]) + AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>]) AC_CHECK_HEADERS([sys/thr.h],,, diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 02c6a9d..8653454 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -87,7 +87,12 @@ #include <net/if_types.h> #endif +#ifdef HAVE_IFADDRS_H +#include <ifaddrs.h> +#endif + #include "ifenum.h" +#include "ws2ipdef.h" #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN #define ifreq_len(ifr) \ @@ -788,6 +793,76 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) return ret; } +#ifdef HAVE_IFADDRS_H +ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs) +{ + struct ifaddrs *ifa; + ULONG ret; + + if (!getifaddrs(&ifa)) + { + struct ifaddrs *p; + ULONG n; + char name[IFNAMSIZ]; + + getInterfaceNameByIndex(index, name); + for (p = ifa, n = 0; p; p = p->ifa_next) + if (p->ifa_addr->sa_family == AF_INET6 && !strcmp(name, p->ifa_name)) + n++; + if (n) + { + *addrs = HeapAlloc(GetProcessHeap(), 0, n * (sizeof(SOCKET_ADDRESS) + + sizeof(struct WS_sockaddr_in6))); + if (*addrs) + { + struct WS_sockaddr_in6 *next_addr = (struct WS_sockaddr_in6 *)( + (BYTE *)*addrs + n * sizeof(SOCKET_ADDRESS)); + + for (p = ifa, n = 0; p; p = p->ifa_next) + { + if (p->ifa_addr->sa_family == AF_INET6 && !strcmp(name, p->ifa_name)) + { + struct sockaddr_in6 *addr = (struct sockaddr_in6 *)p->ifa_addr; + + next_addr->sin6_family = WS_AF_INET6; + next_addr->sin6_port = addr->sin6_port; + next_addr->sin6_flowinfo = addr->sin6_flowinfo; + memcpy(&next_addr->sin6_addr, &addr->sin6_addr, + sizeof(next_addr->sin6_addr)); + next_addr->sin6_scope_id = addr->sin6_scope_id; + (*addrs)[n].lpSockaddr = (LPSOCKADDR)next_addr; + (*addrs)[n].iSockaddrLength = sizeof(struct WS_sockaddr_in6); + next_addr++; + n++; + } + } + *num_addrs = n; + ret = ERROR_SUCCESS; + } + else + ret = ERROR_OUTOFMEMORY; + } + else + { + *addrs = NULL; + *num_addrs = 0; + ret = ERROR_SUCCESS; + } + freeifaddrs(ifa); + } + else + ret = ERROR_NO_DATA; + return ret; +} +#else +ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs) +{ + *addrs = NULL; + *num_addrs = 0; + return ERROR_SUCCESS; +} +#endif + char *toIPAddressString(unsigned int addr, char string[16]) { if (string) { diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index c348191..79e484b 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -38,6 +38,8 @@ #include "windef.h" #include "winbase.h" #include "iprtrmib.h" +#define USE_WS_PREFIX +#include "winsock2.h" #define MAX_INTERFACE_PHYSADDR 8 #define MAX_INTERFACE_DESCRIPTION 256 @@ -105,6 +107,11 @@ DWORD getNumIPAddresses(void); */ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags); +/* Returns the IPv6 addresses for a particular interface index. + * Returns NO_ERROR on success, something else on failure. + */ +ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs); + /* Converts the network-order bytes in addr to a printable string. Returns * string. */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6a0a8d9..8600849 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -49,6 +49,7 @@ #include "winreg.h" #define USE_WS_PREFIX #include "winsock2.h" +#include "ws2ipdef.h" #include "iphlpapi.h" #include "ifenum.h" #include "ipstats.h" @@ -634,22 +635,23 @@ static ULONG v4addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { - ULONG ret, i, num_v4addrs = 0, total_size; + ULONG ret, i, num_v4addrs = 0, num_v6addrs = 0, total_size; DWORD *v4addrs = NULL; + SOCKET_ADDRESS *v6addrs = NULL; if (family == AF_INET) ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + else if (family == AF_INET6) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); else if (family == AF_UNSPEC) { - WARN("no support for IPv6 addresses\n"); ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + if (!ret) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); } else { - if (family == AF_INET6) - FIXME("no support for IPv6 addresses\n"); - else - FIXME("address family %u unsupported\n", family); + FIXME("address family %u unsupported\n", family); ret = ERROR_NO_DATA; } if (ret) return ret; @@ -659,6 +661,10 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD total_size += IF_NAMESIZE * sizeof(WCHAR); total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; total_size += sizeof(struct sockaddr_in) * num_v4addrs; + total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v6addrs; + total_size += sizeof(SOCKET_ADDRESS) * num_v6addrs; + for (i = 0; i < num_v6addrs; i++) + total_size += v6addrs[i].iSockaddrLength; if (aa && *size >= total_size) { @@ -706,6 +712,37 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD } } } + if (num_v6addrs) + { + IP_ADAPTER_UNICAST_ADDRESS *ua; + struct WS_sockaddr_in6 *sa; + + if (aa->FirstUnicastAddress) + { + for (ua = aa->FirstUnicastAddress; ua->Next; ua = ua->Next) + ; + ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + } + else + ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + for (i = 0; i < num_v6addrs; i++) + { + memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); + ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); + ua->Address.iSockaddrLength = v6addrs[i].iSockaddrLength; + ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); + + sa = (struct WS_sockaddr_in6 *)ua->Address.lpSockaddr; + memcpy(sa, v6addrs[i].lpSockaddr, sizeof(*sa)); + + ptr += ua->u.s.Length + ua->Address.iSockaddrLength; + if (i < num_v6addrs - 1) + { + ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua = ua->Next; + } + } + } buflen = MAX_INTERFACE_PHYSADDR; getInterfacePhysicalByIndex(index, &buflen, aa->PhysicalAddress, &type); @@ -720,6 +757,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD else aa->OperStatus = IfOperStatusUnknown; } *size = total_size; + HeapFree(GetProcessHeap(), 0, v6addrs); HeapFree(GetProcessHeap(), 0, v4addrs); return ERROR_SUCCESS; } diff --git a/include/config.h.in b/include/config.h.in index fb8a79b..0cdfb3f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -255,6 +255,9 @@ /* Define to 1 if you have the <ieeefp.h> header file. */ #undef HAVE_IEEEFP_H +/* Define to 1 if you have the <ifaddrs.h> header file. */ +#undef HAVE_IFADDRS_H + /* Define to 1 if you have the <inet/mib2.h> header file. */ #undef HAVE_INET_MIB2_H

1 0

Juan Lang : iphlpapi: Pass address family to adapterAddressesFromIndex.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 00fb356990b52691552748b89c5ae3c56455f994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00fb356990b52691552748b89… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 11 17:15:03 2010 -0800 iphlpapi: Pass address family to adapterAddressesFromIndex. --- dlls/iphlpapi/iphlpapi_main.c | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index aeecbc7..6a0a8d9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -632,12 +632,27 @@ static ULONG v4addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) return ERROR_SUCCESS; } -static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) +static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { - ULONG ret, i, num_v4addrs, total_size; - DWORD *v4addrs; + ULONG ret, i, num_v4addrs = 0, total_size; + DWORD *v4addrs = NULL; - if ((ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs))) return ret; + if (family == AF_INET) + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + else if (family == AF_UNSPEC) + { + WARN("no support for IPv6 addresses\n"); + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + } + else + { + if (family == AF_INET6) + FIXME("no support for IPv6 addresses\n"); + else + FIXME("address family %u unsupported\n", family); + ret = ERROR_NO_DATA; + } + if (ret) return ret; total_size = sizeof(IP_ADAPTER_ADDRESSES); total_size += IF_NAMESIZE; @@ -717,11 +732,6 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, if (!buflen) return ERROR_INVALID_PARAMETER; - if (family == AF_INET6 || family == AF_UNSPEC) - FIXME("no support for IPv6 addresses\n"); - - if (family != AF_INET && family != AF_UNSPEC) return ERROR_NO_DATA; - table = getInterfaceIndexTable(); if (!table || !table->numIndexes) { @@ -732,7 +742,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, for (i = 0; i < table->numIndexes; i++) { size = 0; - if ((ret = adapterAddressesFromIndex(table->indexes[i], NULL, &size))) + if ((ret = adapterAddressesFromIndex(family, table->indexes[i], NULL, &size))) { HeapFree(GetProcessHeap(), 0, table); return ret; @@ -744,7 +754,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, ULONG bytes_left = size = total_size; for (i = 0; i < table->numIndexes; i++) { - if ((ret = adapterAddressesFromIndex(table->indexes[i], aa, &size))) + if ((ret = adapterAddressesFromIndex(family, table->indexes[i], aa, &size))) { HeapFree(GetProcessHeap(), 0, table); return ret;

1 0

Juan Lang : iphlpapi: Rename a function and variables to make it clearer they' re related to IPv4 addresses.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 00f1c3d395e0612223c3c793cf2d6971c9f8184f URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f1c3d395e0612223c3c793c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 11 17:07:37 2010 -0800 iphlpapi: Rename a function and variables to make it clearer they're related to IPv4 addresses. --- dlls/iphlpapi/iphlpapi_main.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7edff9e..aeecbc7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -608,7 +608,7 @@ static DWORD typeFromMibType(DWORD mib_type) } } -static ULONG addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) +static ULONG v4addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) { ULONG ret, i, j; MIB_IPADDRTABLE *at; @@ -634,16 +634,16 @@ static ULONG addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { - ULONG ret, i, num_addrs, total_size; - DWORD *addrs; + ULONG ret, i, num_v4addrs, total_size; + DWORD *v4addrs; - if ((ret = addressesFromIndex(index, &addrs, &num_addrs))) return ret; + if ((ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs))) return ret; total_size = sizeof(IP_ADAPTER_ADDRESSES); total_size += IF_NAMESIZE; total_size += IF_NAMESIZE * sizeof(WCHAR); - total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_addrs; - total_size += sizeof(struct sockaddr_in) * num_addrs; + total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; + total_size += sizeof(struct sockaddr_in) * num_v4addrs; if (aa && *size >= total_size) { @@ -665,13 +665,13 @@ static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, UL *dst++ = 0; ptr = (char *)dst; - if (num_addrs) + if (num_v4addrs) { IP_ADAPTER_UNICAST_ADDRESS *ua; struct sockaddr_in *sa; ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; - for (i = 0; i < num_addrs; i++) + for (i = 0; i < num_v4addrs; i++) { memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); @@ -680,11 +680,11 @@ static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, UL sa = (struct sockaddr_in *)ua->Address.lpSockaddr; sa->sin_family = AF_INET; - sa->sin_addr.s_addr = addrs[i]; + sa->sin_addr.s_addr = v4addrs[i]; sa->sin_port = 0; ptr += ua->u.s.Length + ua->Address.iSockaddrLength; - if (i < num_addrs - 1) + if (i < num_v4addrs - 1) { ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; ua = ua->Next; @@ -705,7 +705,7 @@ static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, UL else aa->OperStatus = IfOperStatusUnknown; } *size = total_size; - HeapFree(GetProcessHeap(), 0, addrs); + HeapFree(GetProcessHeap(), 0, v4addrs); return ERROR_SUCCESS; }

1 0

Vincent Povirk : ole32: Allow storage files with a block size of 4096 to open.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 93c2256cfff643bdc2ca61dd1fdee9f4a45e859e URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c2256cfff643bdc2ca61dd1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 10 15:08:57 2010 -0600 ole32: Allow storage files with a block size of 4096 to open. --- 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 6ee60a1..f1706da 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3381,7 +3381,7 @@ static HRESULT StorageImpl_LoadFileHeader( * Right now, the code is making some assumptions about the size of the * blocks, just make sure they are what we're expecting. */ - if (This->bigBlockSize != DEF_BIG_BLOCK_SIZE || + if ((This->bigBlockSize != MIN_BIG_BLOCK_SIZE && This->bigBlockSize != MAX_BIG_BLOCK_SIZE) || This->smallBlockSize != DEF_SMALL_BLOCK_SIZE) { WARN("Broken OLE storage file\n");

1 0

Vincent Povirk : ole32: Remove knowledge of block sizes from the BigBlockFile object.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 5ceb003a24a95616e6018cd0b92b4781410ac1a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ceb003a24a95616e6018cd0b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 10 15:03:35 2010 -0600 ole32: Remove knowledge of block sizes from the BigBlockFile object. We can't determine the correct block size until we read the header, and we can't create the BigBlockFile until we know the correct block size. To solve this dilemma, have StorageImpl calculate the file size it needs instead of asking the BigBlockFile to "ensure a big block exists". --- dlls/ole32/stg_bigblockfile.c | 24 +++++------------------- dlls/ole32/storage32.c | 5 +++-- dlls/ole32/storage32.h | 3 +-- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index 4aa3026..77abbf6 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -93,7 +93,6 @@ struct BigBlockFile { BOOL fileBased; ULARGE_INTEGER filesize; - ULONG blocksize; HANDLE hfile; HANDLE hfilemap; DWORD flProtect; @@ -658,7 +657,7 @@ static HRESULT ImplBIGBLOCKFILE_WriteAt( * and the blocks in use list. */ BigBlockFile *BIGBLOCKFILE_Construct(HANDLE hFile, ILockBytes* pLkByt, DWORD openFlags, - ULONG blocksize, BOOL fileBased) + BOOL fileBased) { BigBlockFile *This; @@ -669,7 +668,6 @@ BigBlockFile *BIGBLOCKFILE_Construct(HANDLE hFile, ILockBytes* pLkByt, DWORD ope This->fileBased = fileBased; This->flProtect = BIGBLOCKFILE_GetProtectMode(openFlags); - This->blocksize = blocksize; This->maplist = NULL; This->victimhead = NULL; @@ -812,31 +810,19 @@ static HRESULT BIGBLOCKFILE_GetSize(BigBlockFile *This, ULARGE_INTEGER *size) } /****************************************************************************** - * BIGBLOCKFILE_EnsureExists + * BIGBLOCKFILE_Expand * - * Grows the file if necessary to make sure the block is valid. + * Grows the file to the specified size if necessary. */ -HRESULT BIGBLOCKFILE_EnsureExists(BigBlockFile *This, ULONG index) +HRESULT BIGBLOCKFILE_Expand(BigBlockFile *This, ULARGE_INTEGER newSize) { ULARGE_INTEGER size; HRESULT hr; - /* Block index starts at -1 translate to zero based index */ - if (index == 0xffffffff) - index = 0; - else - index++; - hr = BIGBLOCKFILE_GetSize(This, &size); if(FAILED(hr)) return hr; - /* make sure that the block physically exists */ - if ((This->blocksize * (index + 1)) > size.QuadPart) - { - ULARGE_INTEGER newSize; - - newSize.QuadPart = This->blocksize * (index + 1); + if (newSize.QuadPart > size.QuadPart) hr = BIGBLOCKFILE_SetSize(This, newSize); - } return hr; } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fefacb1..6ee60a1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2639,7 +2639,6 @@ static HRESULT StorageImpl_Construct( This->bigBlockFile = BIGBLOCKFILE_Construct(hFile, pLkbyt, openFlags, - This->bigBlockSize, fileBased); if (This->bigBlockFile == 0) @@ -2855,6 +2854,7 @@ static ULONG StorageImpl_GetNextFreeBigBlock( ULONG nextBlockIndex = BLOCK_SPECIAL; int depotIndex = 0; ULONG freeBlock = BLOCK_UNUSED; + ULARGE_INTEGER neededSize; depotIndex = This->prevFreeBlock / blocksPerDepot; depotBlockOffset = (This->prevFreeBlock % blocksPerDepot) * sizeof(ULONG); @@ -2968,7 +2968,8 @@ static ULONG StorageImpl_GetNextFreeBigBlock( /* * make sure that the block physically exists before using it */ - BIGBLOCKFILE_EnsureExists(This->bigBlockFile, freeBlock); + neededSize.QuadPart = StorageImpl_GetBigBlockOffset(This, freeBlock)+This->bigBlockSize; + BIGBLOCKFILE_Expand(This->bigBlockFile, neededSize); This->prevFreeBlock = freeBlock; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 9e57e30..fad5d77 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -161,10 +161,9 @@ typedef struct BigBlockFile BigBlockFile,*LPBIGBLOCKFILE; BigBlockFile* BIGBLOCKFILE_Construct(HANDLE hFile, ILockBytes* pLkByt, DWORD openFlags, - ULONG blocksize, BOOL fileBased); void BIGBLOCKFILE_Destructor(LPBIGBLOCKFILE This); -HRESULT BIGBLOCKFILE_EnsureExists(LPBIGBLOCKFILE This, ULONG index); +HRESULT BIGBLOCKFILE_Expand(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize); HRESULT BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize); HRESULT BIGBLOCKFILE_ReadAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset, void* buffer, ULONG size, ULONG* bytesRead);

1 0

Vincent Povirk : ole32: Remove the NUM_BLOCKS_PER_DEPOT_BLOCK define.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 926669741edfaba22a2a9925d8550aeeb10737db URL: http://source.winehq.org/git/wine.git/?a=commit;h=926669741edfaba22a2a9925d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 10 14:51:37 2010 -0600 ole32: Remove the NUM_BLOCKS_PER_DEPOT_BLOCK define. This should always be calculated based on the big block size. --- dlls/ole32/storage32.c | 6 ++++-- dlls/ole32/storage32.h | 8 +------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 6e3c849..fefacb1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3159,7 +3159,7 @@ static HRESULT StorageImpl_GetNextBlockInChain( BYTE depotBuffer[MAX_BIG_BLOCK_SIZE]; BOOL success; ULONG depotBlockIndexPos; - int index; + int index, num_blocks; *nextBlockIndex = BLOCK_SPECIAL; @@ -3194,7 +3194,9 @@ static HRESULT StorageImpl_GetNextBlockInChain( if (!success) return STG_E_READFAULT; - for (index = 0; index < NUM_BLOCKS_PER_DEPOT_BLOCK; index++) + num_blocks = This->bigBlockSize / 4; + + for (index = 0; index < num_blocks; index++) { StorageUtl_ReadDWord(depotBuffer, index*sizeof(ULONG), nextBlockIndex); This->blockDepotCached[index] = *nextBlockIndex; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 73d17b6..9e57e30 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -96,14 +96,8 @@ static const ULONG DIRENTRY_NULL = 0xFFFFFFFF; */ #define STGTY_ROOT 0x05 -/* - * These defines assume a hardcoded blocksize. The code will assert - * if the blocksize is different. Some changes will have to be done if it - * becomes the case. - */ #define COUNT_BBDEPOTINHEADER 109 #define LIMIT_TO_USE_SMALL_BLOCK 0x1000 -#define NUM_BLOCKS_PER_DEPOT_BLOCK 128 #define STGM_ACCESS_MODE(stgm) ((stgm)&0x0000f) #define STGM_SHARE_MODE(stgm) ((stgm)&0x000f0) @@ -363,7 +357,7 @@ struct StorageImpl ULONG extBigBlockDepotCount; ULONG bigBlockDepotStart[COUNT_BBDEPOTINHEADER]; - ULONG blockDepotCached[NUM_BLOCKS_PER_DEPOT_BLOCK]; + ULONG blockDepotCached[MAX_BIG_BLOCK_SIZE / 4]; ULONG indexBlockDepotCached; ULONG prevFreeBlock;

1 0

Vincent Povirk : ole32: Remove the BIG_BLOCK_SIZE define.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 7b431237629bea6f418c6c2dd9c40cbe41d67aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b431237629bea6f418c6c2dd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 10 14:46:53 2010 -0600 ole32: Remove the BIG_BLOCK_SIZE define. Big block sizes can be 512 or 4096, so we define arrays that are large enough in either case. --- dlls/ole32/storage32.c | 12 ++++++------ dlls/ole32/storage32.h | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3996a01..6e3c849 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2651,7 +2651,7 @@ static HRESULT StorageImpl_Construct( if (create) { ULARGE_INTEGER size; - BYTE bigBlockBuffer[BIG_BLOCK_SIZE]; + BYTE bigBlockBuffer[MAX_BIG_BLOCK_SIZE]; /* * Initialize all header variables: @@ -2848,7 +2848,7 @@ static ULONG StorageImpl_GetNextFreeBigBlock( StorageImpl* This) { ULONG depotBlockIndexPos; - BYTE depotBuffer[BIG_BLOCK_SIZE]; + BYTE depotBuffer[MAX_BIG_BLOCK_SIZE]; BOOL success; ULONG depotBlockOffset; ULONG blocksPerDepot = This->bigBlockSize / sizeof(ULONG); @@ -2983,7 +2983,7 @@ static ULONG StorageImpl_GetNextFreeBigBlock( */ static void Storage32Impl_AddBlockDepot(StorageImpl* This, ULONG blockIndex) { - BYTE blockBuffer[BIG_BLOCK_SIZE]; + BYTE blockBuffer[MAX_BIG_BLOCK_SIZE]; /* * Initialize blocks as free @@ -3066,7 +3066,7 @@ static ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This) { ULONG numExtBlocks = This->extBigBlockDepotCount; ULONG nextExtBlock = This->extBigBlockDepotStart; - BYTE depotBuffer[BIG_BLOCK_SIZE]; + BYTE depotBuffer[MAX_BIG_BLOCK_SIZE]; ULONG index = BLOCK_UNUSED; ULONG nextBlockOffset = This->bigBlockSize - sizeof(ULONG); ULONG blocksPerDepotBlock = This->bigBlockSize / sizeof(ULONG); @@ -3156,7 +3156,7 @@ static HRESULT StorageImpl_GetNextBlockInChain( ULONG offsetInDepot = blockIndex * sizeof (ULONG); ULONG depotBlockCount = offsetInDepot / This->bigBlockSize; ULONG depotBlockOffset = offsetInDepot % This->bigBlockSize; - BYTE depotBuffer[BIG_BLOCK_SIZE]; + BYTE depotBuffer[MAX_BIG_BLOCK_SIZE]; BOOL success; ULONG depotBlockIndexPos; int index; @@ -5745,7 +5745,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( ULONG sbdIndex = This->parentStorage->smallBlockDepotStart; ULONG nextBlock, newsbdIndex; - BYTE smallBlockDepot[BIG_BLOCK_SIZE]; + BYTE smallBlockDepot[MAX_BIG_BLOCK_SIZE]; nextBlock = sbdIndex; while (nextBlock != BLOCK_END_OF_CHAIN) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index b1c835b..73d17b6 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -81,6 +81,9 @@ static const ULONG DIRENTRY_NULL = 0xFFFFFFFF; #define HEADER_SIZE 512 +#define MIN_BIG_BLOCK_SIZE 0x200 +#define MAX_BIG_BLOCK_SIZE 0x1000 + /* * Type of child entry link */ @@ -98,7 +101,6 @@ static const ULONG DIRENTRY_NULL = 0xFFFFFFFF; * if the blocksize is different. Some changes will have to be done if it * becomes the case. */ -#define BIG_BLOCK_SIZE 0x200 #define COUNT_BBDEPOTINHEADER 109 #define LIMIT_TO_USE_SMALL_BLOCK 0x1000 #define NUM_BLOCKS_PER_DEPOT_BLOCK 128

1 0

Vincent Povirk : ole32: Remove the unused BlockBits structures from BigBlockFile objects.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: b90ab46a82e673a6a930ea1271c77d78bedecc77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90ab46a82e673a6a930ea127… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 10 16:36:54 2010 -0600 ole32: Remove the unused BlockBits structures from BigBlockFile objects. --- dlls/ole32/stg_bigblockfile.c | 51 ----------------------------------------- 1 files changed, 0 insertions(+), 51 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index 19151b9..4aa3026 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -63,19 +63,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); /* We map in PAGE_SIZE-sized chunks. Must be a multiple of 4096. */ #define PAGE_SIZE 131072 -#define BLOCKS_PER_PAGE (PAGE_SIZE / BIG_BLOCK_SIZE) - /* We keep a list of recently-discarded pages. This controls the * size of that list. */ #define MAX_VICTIM_PAGES 16 -/* This structure provides one bit for each block in a page. - * Use BIGBLOCKFILE_{Test,Set,Clear}Bit to manipulate it. */ -typedef struct -{ - unsigned int bits[BLOCKS_PER_PAGE / (CHAR_BIT * sizeof(unsigned int))]; -} BlockBits; - /*** * This structure identifies the paged that are mapped * from the file and their position in memory. It is @@ -96,9 +87,6 @@ struct MappedPage DWORD mapped_bytes; LPVOID lpBytes; LONG refcnt; - - BlockBits readable_blocks; - BlockBits writable_blocks; }; struct BigBlockFile @@ -123,39 +111,6 @@ struct BigBlockFile * pass expressions with side effects. */ #define ROUND_UP(a, b) ((((a) + (b) - 1)/(b))*(b)) -/*********************************************************** - * Blockbits functions. - */ -static inline BOOL BIGBLOCKFILE_TestBit(const BlockBits *bb, - unsigned int index) -{ - unsigned int array_index = index / (CHAR_BIT * sizeof(unsigned int)); - unsigned int bit_index = index % (CHAR_BIT * sizeof(unsigned int)); - - return bb->bits[array_index] & (1 << bit_index); -} - -static inline void BIGBLOCKFILE_SetBit(BlockBits *bb, unsigned int index) -{ - unsigned int array_index = index / (CHAR_BIT * sizeof(unsigned int)); - unsigned int bit_index = index % (CHAR_BIT * sizeof(unsigned int)); - - bb->bits[array_index] |= (1 << bit_index); -} - -static inline void BIGBLOCKFILE_ClearBit(BlockBits *bb, unsigned int index) -{ - unsigned int array_index = index / (CHAR_BIT * sizeof(unsigned int)); - unsigned int bit_index = index % (CHAR_BIT * sizeof(unsigned int)); - - bb->bits[array_index] &= ~(1 << bit_index); -} - -static inline void BIGBLOCKFILE_Zero(BlockBits *bb) -{ - memset(bb->bits, 0, sizeof(bb->bits)); -} - /****************************************************************************** * BIGBLOCKFILE_FileInit * @@ -302,9 +257,6 @@ static MappedPage *BIGBLOCKFILE_CreatePage(BigBlockFile *This, ULONG page_index) return NULL; } - BIGBLOCKFILE_Zero(&page->readable_blocks); - BIGBLOCKFILE_Zero(&page->writable_blocks); - return page; } @@ -328,9 +280,6 @@ static void * BIGBLOCKFILE_GetMappedView( if (page) { This->num_victim_pages--; - - BIGBLOCKFILE_Zero(&page->readable_blocks); - BIGBLOCKFILE_Zero(&page->writable_blocks); } }

1 0

Vincent Povirk : ole32: Fix the big block offset calculation.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 4b7e7bd77f08f7b14911462dc89ecc014d74aed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7e7bd77f08f7b14911462dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 10 14:03:12 2010 -0600 ole32: Fix the big block offset calculation. Use the actual big block size from the open storage file. Also, remove a special case that was only used for reading/writing the header. --- dlls/ole32/storage32.c | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9f43264..3996a01 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -269,14 +269,9 @@ static void IEnumSTATSTGImpl_Destroy(IEnumSTATSTGImpl* This); ** Block Functions */ -static ULONG BLOCK_GetBigBlockOffset(ULONG index) +static ULONG StorageImpl_GetBigBlockOffset(StorageImpl* This, ULONG index) { - if (index == 0xffffffff) - index = 0; - else - index ++; - - return index * BIG_BLOCK_SIZE; + return (index+1) * This->bigBlockSize; } /************************************************************************ @@ -3740,7 +3735,7 @@ static BOOL StorageImpl_ReadBigBlock( DWORD read; ulOffset.u.HighPart = 0; - ulOffset.u.LowPart = BLOCK_GetBigBlockOffset(blockIndex); + ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex); StorageImpl_ReadAt(This, ulOffset, buffer, This->bigBlockSize, &read); return (read == This->bigBlockSize); @@ -3757,7 +3752,7 @@ static BOOL StorageImpl_ReadDWordFromBigBlock( DWORD tmp; ulOffset.u.HighPart = 0; - ulOffset.u.LowPart = BLOCK_GetBigBlockOffset(blockIndex); + ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex); ulOffset.u.LowPart += offset; StorageImpl_ReadAt(This, ulOffset, &tmp, sizeof(DWORD), &read); @@ -3774,7 +3769,7 @@ static BOOL StorageImpl_WriteBigBlock( DWORD wrote; ulOffset.u.HighPart = 0; - ulOffset.u.LowPart = BLOCK_GetBigBlockOffset(blockIndex); + ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex); StorageImpl_WriteAt(This, ulOffset, buffer, This->bigBlockSize, &wrote); return (wrote == This->bigBlockSize); @@ -3790,7 +3785,7 @@ static BOOL StorageImpl_WriteDWordToBigBlock( DWORD wrote; ulOffset.u.HighPart = 0; - ulOffset.u.LowPart = BLOCK_GetBigBlockOffset(blockIndex); + ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex); ulOffset.u.LowPart += offset; value = htole32(value); @@ -5180,7 +5175,7 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, TRACE("block %i\n",blockIndex); ulOffset.u.HighPart = 0; - ulOffset.u.LowPart = BLOCK_GetBigBlockOffset(blockIndex) + + ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This->parentStorage, blockIndex) + offsetInBlock; StorageImpl_ReadAt(This->parentStorage, @@ -5276,7 +5271,7 @@ HRESULT BlockChainStream_WriteAt(BlockChainStream* This, TRACE("block %i\n",blockIndex); ulOffset.u.HighPart = 0; - ulOffset.u.LowPart = BLOCK_GetBigBlockOffset(blockIndex) + + ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This->parentStorage, blockIndex) + offsetInBlock; StorageImpl_WriteAt(This->parentStorage,

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
92
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 2010