November 2007 - Wine-commits

Rob Shearman : mapi32: Add a stub for DllGetClassObject.
by Alexandre Julliard 16 Nov '07

16 Nov '07

Module: wine Branch: master Commit: c835703ff7c2bf205e3f603c35b2bae8ddedcc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c835703ff7c2bf205e3f603c3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 15 18:50:19 2007 +0000 mapi32: Add a stub for DllGetClassObject. --- dlls/mapi32/mapi32.spec | 2 +- dlls/mapi32/mapi32_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 7292e52..bf97415 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -16,7 +16,7 @@ 24 stub PRProviderInit 25 stub LAUNCHWIZARD 26 stub LaunchWizard(a)20 - 27 stub DllGetClassObject + 27 stdcall -private DllGetClassObject(ptr ptr ptr) 28 stdcall -private DllCanUnloadNow() 29 stub MAPIOpenFormMgr 30 stub MAPIOpenFormMgr(a)8 diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index a985ac6..edfa326 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -53,6 +53,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) } /*********************************************************************** + * DllGetClassObject (MAPI32.27) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + *ppv = NULL; + FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** * DllCanUnloadNow (MAPI32.28) * * Determine if this dll can be unloaded from the callers address space.

1 0

Stefan Dösinger : wined3d: Do not call PreLoad in surface_download_data.
by Alexandre Julliard 16 Nov '07

16 Nov '07

Module: wine Branch: master Commit: f13bb40671baba8a4938d926da821701a7b71841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13bb40671baba8a4938d926d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 15 14:38:34 2007 +0100 wined3d: Do not call PreLoad in surface_download_data. --- dlls/wined3d/surface.c | 27 ++++++++++++++++++++++++++- dlls/wined3d/surface_base.c | 5 +++++ dlls/wined3d/surface_gdi.c | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_interface.h | 2 ++ 5 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dadb7a0..df617dd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -57,7 +57,7 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { checkGLcall("glActiveTextureARB"); } IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); - IWineD3DSurface_PreLoad((IWineD3DSurface *) This); + IWineD3DSurface_BindTexture((IWineD3DSurface *) This); if (This->resource.format == WINED3DFMT_DXT1 || This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || @@ -2186,6 +2186,30 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO return WINED3D_OK; } +static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface) { + /* TODO: check for locks */ + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + IWineD3DBaseTexture *baseTexture = NULL; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + + TRACE("(%p)Checking to see if the container is a base texture\n", This); + if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) { + TRACE("Passing to container\n"); + IWineD3DBaseTexture_BindTexture(baseTexture); + IWineD3DBaseTexture_Release(baseTexture); + } else { + TRACE("(%p) : Binding surface\n", This); + + if(!device->isInDraw) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + } + ENTER_GL(); + glBindTexture(This->glDescription.target, This->glDescription.textureName); + LEAVE_GL(); + } + return; +} + #include <errno.h> #include <stdio.h> HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const char* filename) { @@ -3845,6 +3869,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = /* Internal use: */ IWineD3DSurfaceImpl_AddDirtyRect, IWineD3DSurfaceImpl_LoadTexture, + IWineD3DSurfaceImpl_BindTexture, IWineD3DSurfaceImpl_SaveSnapshot, IWineD3DBaseSurfaceImpl_SetContainer, IWineD3DSurfaceImpl_SetGlTextureDesc, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 11a3d0b..f57b9f4 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1628,3 +1628,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DL return WINED3D_OK; } + +void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface) { + ERR("Should not be called on base texture\n"); + return; +} diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 03852f8..5f569a1 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -805,6 +805,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = /* Internal use: */ IWineGDISurfaceImpl_AddDirtyRect, IWineGDISurfaceImpl_LoadTexture, + IWineD3DBaseSurfaceImpl_BindTexture, IWineGDISurfaceImpl_SaveSnapshot, IWineD3DBaseSurfaceImpl_SetContainer, IWineGDISurfaceImpl_SetGlTextureDesc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9a3a9ba..428b8df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1159,6 +1159,7 @@ HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface); HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter); HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty, IWineD3DSurface *Source, RECT *rsrc, DWORD trans); HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags); +void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface); const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index d77a18f..6335eb9 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1134,6 +1134,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) /* Internally used methods */ STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; STDMETHOD(LoadTexture)(THIS, BOOL srgb_mode) PURE; + STDMETHOD_(void, BindTexture)(THIS) PURE; STDMETHOD(SaveSnapshot)(THIS_ const char *filename) PURE; STDMETHOD(SetContainer)(THIS_ IWineD3DBase *container) PURE; STDMETHOD_(void,SetGlTextureDesc)(THIS_ UINT textureName, int target) PURE; @@ -1191,6 +1192,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a) #define IWineD3DSurface_LoadTexture(p,a) (p)->lpVtbl->LoadTexture(p,a) +#define IWineD3DSurface_BindTexture(p) (p)->lpVtbl->BindTexture(p) #define IWineD3DSurface_SaveSnapshot(p,a) (p)->lpVtbl->SaveSnapshot(p,a) #define IWineD3DSurface_SetContainer(p,a) (p)->lpVtbl->SetContainer(p,a) #define IWineD3DSurface_SetGlTextureDesc(p,a,b) (p)->lpVtbl->SetGlTextureDesc(p,a,b)

1 0

Juan Lang : iphlpapi: Don' t allocate gobs of memory when the ARP table is empty.
by Alexandre Julliard 16 Nov '07

16 Nov '07

Module: wine Branch: master Commit: 72a59de299c307359599d9a26c6dd265c4623b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a59de299c307359599d9a26… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 15 11:03:25 2007 -0800 iphlpapi: Don't allocate gobs of memory when the ARP table is empty. --- dlls/iphlpapi/iphlpapi_main.c | 10 ++++++---- dlls/iphlpapi/ipstats.c | 7 +++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9ba742b..92df631 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1289,9 +1289,10 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr ret = ERROR_INVALID_PARAMETER; else { DWORD numEntries = getNumArpEntries(); - ULONG size = sizeof(MIB_IPNETTABLE) + (numEntries - 1) * - sizeof(MIB_IPNETROW); + ULONG size = sizeof(MIB_IPNETTABLE); + if (numEntries > 1) + size += (numEntries - 1) * sizeof(MIB_IPNETROW); if (!pIpNetTable || *pdwSize < size) { *pdwSize = size; ret = ERROR_INSUFFICIENT_BUFFER; @@ -1301,8 +1302,9 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr ret = getArpTable(&table, GetProcessHeap(), 0); if (!ret) { - size = sizeof(MIB_IPNETTABLE) + (table->dwNumEntries - 1) * - sizeof(MIB_IPNETROW); + size = sizeof(MIB_IPNETTABLE); + if (table->dwNumEntries > 1) + size += (table->dwNumEntries - 1) * sizeof(MIB_IPNETROW); if (*pdwSize < size) { *pdwSize = size; ret = ERROR_INSUFFICIENT_BUFFER; diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index b17b0da..3605d64 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1009,9 +1009,12 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpNetTable, HANDLE heap, DWORD flags) ret = ERROR_INVALID_PARAMETER; else { DWORD numEntries = getNumArpEntries(); - PMIB_IPNETTABLE table = HeapAlloc(heap, flags, - sizeof(MIB_IPNETTABLE) + (numEntries - 1) * sizeof(MIB_IPNETROW)); + DWORD size = sizeof(MIB_IPNETTABLE); + PMIB_IPNETTABLE table; + if (numEntries > 1) + size += (numEntries - 1) * sizeof(MIB_IPNETROW); + table = HeapAlloc(heap, flags, size); if (table) { FILE *fp;

1 0

Juan Lang : iphlpapi: Don' t allocate gobs of memory if the UDP table is empty.
by Alexandre Julliard 16 Nov '07

16 Nov '07

Module: wine Branch: master Commit: 7e584b4340c0a6c1224ce8be9d51c77da1cc1790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e584b4340c0a6c1224ce8be9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 15 11:04:12 2007 -0800 iphlpapi: Don't allocate gobs of memory if the UDP table is empty. --- dlls/iphlpapi/iphlpapi_main.c | 9 ++++++--- dlls/iphlpapi/ipstats.c | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 92df631..db14d74 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1665,8 +1665,10 @@ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) ret = ERROR_INVALID_PARAMETER; else { DWORD numEntries = getNumUdpEntries(); - DWORD size = sizeof(MIB_UDPTABLE) + (numEntries - 1) * sizeof(MIB_UDPROW); + DWORD size = sizeof(MIB_UDPTABLE); + if (numEntries > 1) + size += (numEntries - 1) * sizeof(MIB_UDPROW); if (!pUdpTable || *pdwSize < size) { *pdwSize = size; ret = ERROR_INSUFFICIENT_BUFFER; @@ -1676,8 +1678,9 @@ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) ret = getUdpTable(&table, GetProcessHeap(), 0); if (!ret) { - size = sizeof(MIB_UDPTABLE) + (table->dwNumEntries - 1) * - sizeof(MIB_UDPROW); + size = sizeof(MIB_UDPTABLE); + if (table->dwNumEntries > 1) + size += (table->dwNumEntries - 1) * sizeof(MIB_UDPROW); if (*pdwSize < size) { *pdwSize = size; ret = ERROR_INSUFFICIENT_BUFFER; diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 3605d64..a7fd40d 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1112,9 +1112,12 @@ DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags) ret = ERROR_INVALID_PARAMETER; else { DWORD numEntries = getNumUdpEntries(); - PMIB_UDPTABLE table = HeapAlloc(heap, flags, - sizeof(MIB_UDPTABLE) + (numEntries - 1) * sizeof(MIB_UDPROW)); + DWORD size = sizeof(MIB_UDPTABLE); + PMIB_UDPTABLE table; + if (numEntries > 1) + size += (numEntries - 1) * sizeof(MIB_UDPROW); + table = HeapAlloc(heap, flags, size); if (table) { FILE *fp;

1 0

Juan Lang : iphlpapi: Don' t allocate gobs of memory if interface table is empty.
by Alexandre Julliard 16 Nov '07

16 Nov '07

Module: wine Branch: master Commit: 9ec6e33e32fa9f4c0353c1f59c01c5f2ff792d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec6e33e32fa9f4c0353c1f59… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 15 11:05:10 2007 -0800 iphlpapi: Don't allocate gobs of memory if interface table is empty. --- dlls/iphlpapi/ifenum.c | 6 ++++-- dlls/iphlpapi/iphlpapi_main.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 9590032..1ae70df 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -205,11 +205,13 @@ InterfaceIndexTable *getInterfaceIndexTable(void) if (indexes) { struct if_nameindex *p; + DWORD size = sizeof(InterfaceIndexTable); for (p = indexes, numInterfaces = 0; p && p->if_name; p++) numInterfaces++; - ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(InterfaceIndexTable) + (numInterfaces - 1) * sizeof(DWORD)); + if (numInterfaces > 1) + size += (numInterfaces - 1) * sizeof(DWORD); + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (ret) { for (p = indexes; p && p->if_name; p++) ret->indexes[ret->numIndexes++] = p->if_index; diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index db14d74..b65276c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1015,8 +1015,10 @@ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) ret = ERROR_INVALID_PARAMETER; else { DWORD numInterfaces = getNumInterfaces(); - ULONG size = sizeof(MIB_IFTABLE) + (numInterfaces - 1) * sizeof(MIB_IFROW); + ULONG size = sizeof(MIB_IFTABLE); + if (numInterfaces > 1) + size += (numInterfaces - 1) * sizeof(MIB_IFROW); if (!pIfTable || *pdwSize < size) { *pdwSize = size; ret = ERROR_INSUFFICIENT_BUFFER; @@ -1025,8 +1027,9 @@ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) InterfaceIndexTable *table = getInterfaceIndexTable(); if (table) { - size = sizeof(MIB_IFTABLE) + (table->numIndexes - 1) * - sizeof(MIB_IFROW); + size = sizeof(MIB_IFTABLE); + if (table->numIndexes > 1) + size += (table->numIndexes - 1) * sizeof(MIB_IFROW); if (*pdwSize < size) { *pdwSize = size; ret = ERROR_INSUFFICIENT_BUFFER; @@ -1082,9 +1085,10 @@ DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO pIfTable, PULONG dwOutBufLen) ret = ERROR_INVALID_PARAMETER; else { DWORD numInterfaces = getNumInterfaces(); - ULONG size = sizeof(IP_INTERFACE_INFO) + (numInterfaces - 1) * - sizeof(IP_ADAPTER_INDEX_MAP); + ULONG size = sizeof(IP_INTERFACE_INFO); + if (numInterfaces > 1) + size += (numInterfaces - 1) * sizeof(IP_ADAPTER_INDEX_MAP); if (!pIfTable || *dwOutBufLen < size) { *dwOutBufLen = size; ret = ERROR_INSUFFICIENT_BUFFER; @@ -1093,8 +1097,9 @@ DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO pIfTable, PULONG dwOutBufLen) InterfaceIndexTable *table = getInterfaceIndexTable(); if (table) { - size = sizeof(IP_INTERFACE_INFO) + (table->numIndexes - 1) * - sizeof(IP_ADAPTER_INDEX_MAP); + size = sizeof(IP_INTERFACE_INFO); + if (table->numIndexes > 1) + size += (table->numIndexes - 1) * sizeof(IP_ADAPTER_INDEX_MAP); if (*dwOutBufLen < size) { *dwOutBufLen = size; ret = ERROR_INSUFFICIENT_BUFFER;

1 0

Juan Lang : iphlpapi: Don' t allocate gobs of memory if the IP address table is empty.
by Alexandre Julliard 16 Nov '07

16 Nov '07

Module: wine Branch: master Commit: e1a836933f3ca25d8033cedb67a04df845d69750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a836933f3ca25d8033cedb6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 15 11:06:07 2007 -0800 iphlpapi: Don't allocate gobs of memory if the IP address table is empty. --- dlls/iphlpapi/ifenum.c | 7 +++++-- dlls/iphlpapi/iphlpapi_main.c | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 1ae70df..0a74ef6 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -746,8 +746,11 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) ret = enumIPAddresses(&numAddresses, &ifc); if (!ret) { - *ppIpAddrTable = HeapAlloc(heap, flags, sizeof(MIB_IPADDRTABLE) + - (numAddresses - 1) * sizeof(MIB_IPADDRROW)); + DWORD size = sizeof(MIB_IPADDRTABLE); + + if (numAddresses > 1) + size += (numAddresses - 1) * sizeof(MIB_IPADDRROW); + *ppIpAddrTable = HeapAlloc(heap, flags, size); if (*ppIpAddrTable) { DWORD i = 0, bcast; caddr_t ifPtr; diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b65276c..0de8858 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1172,17 +1172,17 @@ DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL ret = getIPAddrTable(&table, GetProcessHeap(), 0); if (ret == NO_ERROR) { - ULONG size = sizeof(MIB_IPADDRTABLE) + (table->dwNumEntries - 1) * - sizeof(MIB_IPADDRROW); + ULONG size = sizeof(MIB_IPADDRTABLE); + if (table->dwNumEntries > 1) + size += (table->dwNumEntries - 1) * sizeof(MIB_IPADDRROW); if (!pIpAddrTable || *pdwSize < size) { *pdwSize = size; ret = ERROR_INSUFFICIENT_BUFFER; } else { *pdwSize = size; - memcpy(pIpAddrTable, table, sizeof(MIB_IPADDRTABLE) + - (table->dwNumEntries - 1) * sizeof(MIB_IPADDRROW)); + memcpy(pIpAddrTable, table, size); if (bOrder) qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries, sizeof(MIB_IPADDRROW), IpAddrTableSorter);

1 0

Juan Lang : iphlpapi: Don' t allocate gobs of memory if there are no non-loopback interfaces.
by Alexandre Julliard 16 Nov '07

16 Nov '07

Module: wine Branch: master Commit: 0502de41ae463181620ebcb956fe7d15cec5d8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0502de41ae463181620ebcb95… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 15 11:06:50 2007 -0800 iphlpapi: Don't allocate gobs of memory if there are no non-loopback interfaces. --- dlls/iphlpapi/ifenum.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 0a74ef6..36c42fe 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -234,12 +234,14 @@ InterfaceIndexTable *getNonLoopbackInterfaceIndexTable(void) if (indexes) { struct if_nameindex *p; + DWORD size = sizeof(InterfaceIndexTable); for (p = indexes, numInterfaces = 0; p && p->if_name; p++) if (!isLoopbackInterface(fd, p->if_name)) numInterfaces++; - ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(InterfaceIndexTable) + (numInterfaces - 1) * sizeof(DWORD)); + if (numInterfaces > 1) + size += (numInterfaces - 1) * sizeof(DWORD); + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (ret) { for (p = indexes; p && p->if_name; p++) if (!isLoopbackInterface(fd, p->if_name))

1 0

Juan Lang : iphlpapi: Don' t allocate gobs of memory when the TCP entry table is empty.
by Alexandre Julliard 16 Nov '07

16 Nov '07

Module: wine Branch: master Commit: 5349c5e87b744820531516e3995c4d62f32d139a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5349c5e87b744820531516e39… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 15 11:01:13 2007 -0800 iphlpapi: Don't allocate gobs of memory when the TCP entry table is empty. --- dlls/iphlpapi/iphlpapi_main.c | 9 ++++++--- dlls/iphlpapi/ipstats.c | 8 +++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 55a6fa7..e3898c2 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1579,8 +1579,10 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) ret = ERROR_INVALID_PARAMETER; else { DWORD numEntries = getNumTcpEntries(); - DWORD size = sizeof(MIB_TCPTABLE) + (numEntries - 1) * sizeof(MIB_TCPROW); + DWORD size = sizeof(MIB_TCPTABLE); + if (numEntries > 1) + size += (numEntries - 1) * sizeof(MIB_TCPROW); if (!pTcpTable || *pdwSize < size) { *pdwSize = size; ret = ERROR_INSUFFICIENT_BUFFER; @@ -1588,8 +1590,9 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) else { ret = getTcpTable(&pTcpTable, numEntries, 0, 0); if (!ret) { - size = sizeof(MIB_TCPTABLE) + (pTcpTable->dwNumEntries - 1) * - sizeof(MIB_TCPROW); + size = sizeof(MIB_TCPTABLE); + if (numEntries > 1) + size += (numEntries - 1) * sizeof(MIB_TCPROW); *pdwSize = size; if (bOrder) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 1ba57b1..6642804 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1212,9 +1212,11 @@ DWORD getTcpTable(PMIB_TCPTABLE *ppTcpTable, DWORD maxEntries, HANDLE heap, if (!*ppTcpTable) { - *ppTcpTable = HeapAlloc (heap, flags, - sizeof (MIB_TCPTABLE) + - (numEntries - 1) * sizeof (MIB_TCPROW)); + DWORD size = sizeof(MIB_TCPTABLE); + + if (numEntries > 1) + size += (numEntries - 1) * sizeof (MIB_TCPROW); + *ppTcpTable = HeapAlloc (heap, flags, size); if (!*ppTcpTable) { ERR ("Out of memory!\n");

1 0

Juan Lang : iphlpapi: Don' t allocate gobs of memory when the route table is empty.
by Alexandre Julliard 16 Nov '07

16 Nov '07

Module: wine Branch: master Commit: 848e8de5a72135fa15a531d0f7cfefb76dd7f010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=848e8de5a72135fa15a531d0f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 15 11:02:22 2007 -0800 iphlpapi: Don't allocate gobs of memory when the route table is empty. --- dlls/iphlpapi/iphlpapi_main.c | 10 ++++++---- dlls/iphlpapi/ipstats.c | 7 +++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e3898c2..9ba742b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1222,9 +1222,10 @@ DWORD WINAPI GetIpForwardTable(PMIB_IPFORWARDTABLE pIpForwardTable, PULONG pdwSi ret = ERROR_INVALID_PARAMETER; else { DWORD numRoutes = getNumRoutes(); - ULONG sizeNeeded = sizeof(MIB_IPFORWARDTABLE) + (numRoutes - 1) * - sizeof(MIB_IPFORWARDROW); + ULONG sizeNeeded = sizeof(MIB_IPFORWARDTABLE); + if (numRoutes > 1) + sizeNeeded += (numRoutes - 1) * sizeof(MIB_IPFORWARDROW); if (!pIpForwardTable || *pdwSize < sizeNeeded) { *pdwSize = sizeNeeded; ret = ERROR_INSUFFICIENT_BUFFER; @@ -1234,8 +1235,9 @@ DWORD WINAPI GetIpForwardTable(PMIB_IPFORWARDTABLE pIpForwardTable, PULONG pdwSi ret = getRouteTable(&table, GetProcessHeap(), 0); if (!ret) { - sizeNeeded = sizeof(MIB_IPFORWARDTABLE) + (table->dwNumEntries - 1) * - sizeof(MIB_IPFORWARDROW); + sizeNeeded = sizeof(MIB_IPFORWARDTABLE); + if (table->dwNumEntries > 1) + sizeNeeded += (table->dwNumEntries - 1) * sizeof(MIB_IPFORWARDROW); if (*pdwSize < sizeNeeded) { *pdwSize = sizeNeeded; ret = ERROR_INSUFFICIENT_BUFFER; diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 6642804..b17b0da 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -777,9 +777,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE *ppIpForwardTable, HANDLE heap, ret = ERROR_INVALID_PARAMETER; else { DWORD numRoutes = getNumRoutes(); - PMIB_IPFORWARDTABLE table = HeapAlloc(heap, flags, - sizeof(MIB_IPFORWARDTABLE) + (numRoutes - 1) * sizeof(MIB_IPFORWARDROW)); + DWORD size = sizeof(MIB_IPFORWARDTABLE); + PMIB_IPFORWARDTABLE table; + if (numRoutes > 1) + size += (numRoutes - 1) * sizeof(MIB_IPFORWARDROW); + table = HeapAlloc(heap, flags, size); if (table) { #if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) int mib[6] = {CTL_NET, PF_ROUTE, 0, PF_INET, NET_RT_DUMP, 0};

1 0

Juan Lang : iphlpapi: Don't override return value from getTcpTable.
by Alexandre Julliard 16 Nov '07

16 Nov '07

Module: wine Branch: master Commit: 64f61ce0cd7e6b5aaf2e6233cd1a909b63fa4c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f61ce0cd7e6b5aaf2e6233c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 15 11:00:12 2007 -0800 iphlpapi: Don't override return value from getTcpTable. --- dlls/iphlpapi/iphlpapi_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 24307d6..55a6fa7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1597,8 +1597,6 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) sizeof(MIB_TCPROW), TcpTableSorter); ret = NO_ERROR; } - else - ret = ERROR_OUTOFMEMORY; } } TRACE("returning %d\n", ret);

1 0