wine-commits June 2008

wine-commits@winehq.org

3 participants
944 discussions

H. Verbeet : wined3d: Move setting a palette up a couple of lines in BltOverride().
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 8d6dc9daa75b6eda0e82d33be2fa01b80a04f570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6dc9daa75b6eda0e82d33be… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jun 29 22:49:22 2008 +0200 wined3d: Move setting a palette up a couple of lines in BltOverride(). This prevents a few failures in the ddraw tests when using FBOs due to using P8 surfaces without a palette set. --- dlls/wined3d/surface.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4b91d1f..48e13fe 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3276,6 +3276,17 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * SourceRectangle.top = 0; SourceRectangle.bottom = Src->currentDesc.Height; } + + /* When blitting from an offscreen surface to a rendertarget, the source + * surface is not required to have a palette. Our rendering / conversion + * code further down the road retrieves the palette from the surface, so + * it must have a palette set. */ + if((Src->resource.format == WINED3DFMT_P8) && (Src->palette == NULL)) { + paletteOverride = TRUE; + TRACE("Source surface (%p) lacks palette, overriding palette with palette %p of destination surface (%p)\n", Src, This->palette, This); + Src->palette = This->palette; + } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) && (Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) == 0) { TRACE("Using stretch_rect_fbo\n"); @@ -3284,6 +3295,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * */ stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, (WINED3DRECT *) &SourceRectangle, (IWineD3DSurface *)This, &rect, Filter, FALSE); + + /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */ + if(paletteOverride) + Src->palette = NULL; return WINED3D_OK; } @@ -3313,16 +3328,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * Src->CKeyFlags &= ~WINEDDSD_CKSRCBLT; } - /* When blitting from an offscreen surface to a rendertarget, the source - * surface is not required to have a palette. Our rendering / conversion - * code further down the road retrieves the palette from the surface, so - * it must have a palette set. */ - if((Src->resource.format == WINED3DFMT_P8) && (Src->palette == NULL)) { - paletteOverride = TRUE; - TRACE("Source surface (%p) lacks palette, overriding palette with palette %p of destination surface (%p)\n", Src, This->palette, This); - Src->palette = This->palette; - } - /* Now load the surface */ IWineD3DSurface_PreLoad((IWineD3DSurface *) Src);

1 0

H. Verbeet : wined3d: Invert "upsidedown" in fb_copy_to_texture_direct() and fb_copy_to_texture_hwstretch() rather than BltOverride().
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 469e791f0058921790b8619c5443384721685f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=469e791f0058921790b8619c5… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jun 29 22:49:05 2008 +0200 wined3d: Invert "upsidedown" in fb_copy_to_texture_direct() and fb_copy_to_texture_hwstretch() rather than BltOverride(). This inversion is specific to the blit implementation being used, stretch_rect_fbo() doesn't need it. --- dlls/wined3d/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d892031..4b91d1f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2680,6 +2680,8 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D glBindTexture(This->glDescription.target, This->glDescription.textureName); checkGLcall("glBindTexture"); if(!swapchain) { + TRACE("Reading from an offscreen target\n"); + upsidedown = !upsidedown; glReadBuffer(myDevice->offscreenBuffer); } else { GLenum buffer = surface_get_gl_buffer(SrcSurface, (IWineD3DSwapChain *)swapchain); @@ -2808,6 +2810,8 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine if(swapchain) { glReadBuffer(surface_get_gl_buffer(SrcSurface, (IWineD3DSwapChain *)swapchain)); } else { + TRACE("Reading from an offscreen target\n"); + upsidedown = !upsidedown; glReadBuffer(myDevice->offscreenBuffer); } @@ -3192,10 +3196,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * rect.x1 = tmp; upsideDown = !upsideDown; } - if(!srcSwapchain) { - TRACE("Reading from an offscreen target\n"); - upsideDown = !upsideDown; - } if(rect.x2 - rect.x1 != srect.x2 - srect.x1) { stretchx = TRUE;

1 0

Juan Lang : cryptdlg: Implement DllRegisterServer/DllUnregisterServer.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 60bb8bd808c7c501a3ff24382edbd47fd8b25a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60bb8bd808c7c501a3ff24382… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jun 28 09:45:04 2008 -0700 cryptdlg: Implement DllRegisterServer/DllUnregisterServer. --- dlls/cryptdlg/Makefile.in | 2 +- dlls/cryptdlg/cryptdlg.spec | 4 +- dlls/cryptdlg/main.c | 56 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index 612a90d..bb06a0b 100644 --- a/dlls/cryptdlg/Makefile.in +++ b/dlls/cryptdlg/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cryptdlg.dll -IMPORTS = crypt32 kernel32 +IMPORTS = crypt32 wintrust kernel32 C_SRCS = \ main.c diff --git a/dlls/cryptdlg/cryptdlg.spec b/dlls/cryptdlg/cryptdlg.spec index 135f803..6556944 100644 --- a/dlls/cryptdlg/cryptdlg.spec +++ b/dlls/cryptdlg/cryptdlg.spec @@ -15,7 +15,7 @@ 15 stub CertSelectCertificateW 16 stub CertViewPropertiesA 17 stub CertViewPropertiesW -18 stub DllRegisterServer -19 stub DllUnregisterServer +18 stdcall -private DllRegisterServer() +19 stdcall -private DllUnregisterServer() 20 stdcall GetFriendlyNameOfCertA(ptr ptr long) 21 stdcall GetFriendlyNameOfCertW(ptr ptr long) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index 624a3cd..316d83e 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -104,3 +104,59 @@ HRESULT WINAPI CertTrustFinalPolicy(CRYPT_PROVIDER_DATA *pProvData) FIXME("(%p)\n", pProvData); return E_NOTIMPL; } + +/*********************************************************************** + * DllRegisterServer (CRYPTDLG.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + static WCHAR cryptdlg[] = { 'c','r','y','p','t','d','l','g','.', + 'd','l','l',0 }; + static WCHAR wintrust[] = { 'w','i','n','t','r','u','s','t','.', + 'd','l','l',0 }; + static WCHAR certTrustInit[] = { 'C','e','r','t','T','r','u','s','t', + 'I','n','i','t',0 }; + static WCHAR wintrustCertificateTrust[] = { 'W','i','n','t','r','u','s','t', + 'C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t',0 }; + static WCHAR certTrustCertPolicy[] = { 'C','e','r','t','T','r','u','s','t', + 'C','e','r','t','P','o','l','i','c','y',0 }; + static WCHAR certTrustFinalPolicy[] = { 'C','e','r','t','T','r','u','s','t', + 'F','i','n','a','l','P','o','l','i','c','y',0 }; + static WCHAR certTrustCleanup[] = { 'C','e','r','t','T','r','u','s','t', + 'C','l','e','a','n','u','p',0 }; + CRYPT_REGISTER_ACTIONID reg; + GUID guid = CERT_CERTIFICATE_ACTION_VERIFY; + HRESULT hr = S_OK; + + memset(&reg, 0, sizeof(reg)); + reg.cbStruct = sizeof(reg); + reg.sInitProvider.cbStruct = sizeof(CRYPT_TRUST_REG_ENTRY); + reg.sInitProvider.pwszDLLName = cryptdlg; + reg.sInitProvider.pwszFunctionName = certTrustInit; + reg.sCertificateProvider.cbStruct = sizeof(CRYPT_TRUST_REG_ENTRY); + reg.sCertificateProvider.pwszDLLName = wintrust; + reg.sCertificateProvider.pwszFunctionName = wintrustCertificateTrust; + reg.sCertificatePolicyProvider.cbStruct = sizeof(CRYPT_TRUST_REG_ENTRY); + reg.sCertificatePolicyProvider.pwszDLLName = cryptdlg; + reg.sCertificatePolicyProvider.pwszFunctionName = certTrustCertPolicy; + reg.sFinalPolicyProvider.cbStruct = sizeof(CRYPT_TRUST_REG_ENTRY); + reg.sFinalPolicyProvider.pwszDLLName = cryptdlg; + reg.sFinalPolicyProvider.pwszFunctionName = certTrustFinalPolicy; + reg.sCleanupProvider.cbStruct = sizeof(CRYPT_TRUST_REG_ENTRY); + reg.sCleanupProvider.pwszDLLName = cryptdlg; + reg.sCleanupProvider.pwszFunctionName = certTrustCleanup; + if (!WintrustAddActionID(&guid, WT_ADD_ACTION_ID_RET_RESULT_FLAG, &reg)) + hr = GetLastError(); + return hr; +} + +/*********************************************************************** + * DllUnregisterServer (CRYPTDLG.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + GUID guid = CERT_CERTIFICATE_ACTION_VERIFY; + + WintrustRemoveActionID(&guid); + return S_OK; +}

1 0

Juan Lang : cryptdlg: Include cryptdlg.h.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 35ce6318f5725c5da6f3d4506488fcc5b968be01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ce6318f5725c5da6f3d4506… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jun 28 09:43:44 2008 -0700 cryptdlg: Include cryptdlg.h. --- dlls/cryptdlg/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index 9d3eb4e..624a3cd 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -24,6 +24,8 @@ #include "winbase.h" #include "wincrypt.h" #include "wintrust.h" +#include "winuser.h" +#include "cryptdlg.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cryptdlg);

1 0

Juan Lang : cryptdlg: Add header.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 71e7a2925258af7899f0f21d0dd60f46203420dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e7a2925258af7899f0f21d0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jun 28 09:43:11 2008 -0700 cryptdlg: Add header. --- include/Makefile.in | 1 + include/cryptdlg.h | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 314 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71e7a2925258af7899f0f…

1 0

Juan Lang : cryptui: Add header.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 183f27b0c4fbfa8c6a3840e4f318a3e277b9b5a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=183f27b0c4fbfa8c6a3840e4f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jun 28 09:38:14 2008 -0700 cryptui: Add header. --- include/Makefile.in | 1 + include/cryptuiapi.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 54747a6..144091a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -106,6 +106,7 @@ SRCDIR_INCLUDES = \ cor.h \ corerror.h \ cpl.h \ + cryptuiapi.h \ custcntl.h \ cvconst.h \ d3d.h \ diff --git a/include/cryptuiapi.h b/include/cryptuiapi.h new file mode 100644 index 0000000..1065d08 --- /dev/null +++ b/include/cryptuiapi.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2008 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __CRYPTUIAPI_H__ +#define __CRYPTUIAPI_H__ + +#include <wintrust.h> +#include <wincrypt.h> +#include <prsht.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#include <pshpack8.h> + +BOOL WINAPI CryptUIDlgViewContext(DWORD dwContextType, LPVOID pvContext, + HWND hwnd, LPCWSTR pwszTitle, DWORD dwFlags, LPVOID pvReserved); + +/* Values for dwDontUseColumn */ +#define CRYPTUI_SELECT_ISSUEDTO_COLUMN 0x00000001 +#define CRYPTUI_SELECT_ISSUEDBY_COLUMN 0x00000002 +#define CRYPTUI_SELECT_INTENDEDUSE_COLUMN 0x00000004 +#define CRYPTUI_SELECT_FRIENDLYNAME_COLUMN 0x00000008 +#define CRYPTUI_SELECT_LOCATION_COLUMN 0x00000010 +#define CRYPTUI_SELECT_EXPIRATION_COLUMN 0x00000020 + +PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore( + HCERTSTORE hCertStore, HWND hwnd, LPCWSTR pwszTitle, LPCWSTR pwszDisplayString, + DWORD dwDontUseColumn, DWORD dwFlags, LPVOID pvReserved); + +#include <poppack.h> + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Juan Lang : inetmib1: Free memory when DLL is unloaded.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 4b45b24d9d1c1d62a90d13aed763fe699bdb5b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b45b24d9d1c1d62a90d13aed… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jun 28 09:23:02 2008 -0700 inetmib1: Free memory when DLL is unloaded. --- dlls/inetmib1/main.c | 96 +++++++++++++++++++++++++++++++++++-------------- 1 files changed, 68 insertions(+), 28 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index f14b78c..09b408c 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -29,24 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetmib1); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - default: - break; - } - - return TRUE; -} - /** * Utility functions */ @@ -113,6 +95,7 @@ struct mibImplementation AsnObjectIdentifier name; void (*init)(void); varqueryfunc query; + void (*cleanup)(void); }; static UINT mib2IfNumber[] = { 1,3,6,1,2,1,2,1 }; @@ -130,6 +113,11 @@ static void mib2IfNumberInit(void) } } +static void mib2IfNumberCleanup(void) +{ + HeapFree(GetProcessHeap(), 0, ifTable); +} + static BOOL mib2IfNumberQuery(BYTE bPduType, SnmpVarBind *pVarBind, AsnInteger32 *pErrorStatus) { @@ -651,6 +639,11 @@ static void mib2IpAddrInit(void) } } +static void mib2IpAddrCleanup(void) +{ + HeapFree(GetProcessHeap(), 0, ipAddrTable); +} + static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) { MIB_IPADDRROW *row = dst; @@ -734,6 +727,11 @@ static void mib2IpRouteInit(void) } } +static void mib2IpRouteCleanup(void) +{ + HeapFree(GetProcessHeap(), 0, ipRouteTable); +} + static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) { MIB_IPFORWARDROW *row = dst; @@ -809,6 +807,11 @@ static void mib2IpNetInit(void) } } +static void mib2IpNetCleanup(void) +{ + HeapFree(GetProcessHeap(), 0, ipNetTable); +} + static BOOL mib2IpNetQuery(BYTE bPduType, SnmpVarBind *pVarBind, AsnInteger32 *pErrorStatus) { @@ -1050,6 +1053,11 @@ static void mib2UdpEntryInit(void) } } +static void mib2UdpEntryCleanup(void) +{ + HeapFree(GetProcessHeap(), 0, udpTable); +} + static struct structToAsnValue mib2UdpEntryMap[] = { { FIELD_OFFSET(MIB_UDPROW, dwLocalAddr), copyIpAddr }, { FIELD_OFFSET(MIB_UDPROW, dwLocalPort), copyInt }, @@ -1129,16 +1137,20 @@ static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, /* This list MUST BE lexicographically sorted */ static struct mibImplementation supportedIDs[] = { - { DEFINE_OID(mib2IfNumber), mib2IfNumberInit, mib2IfNumberQuery }, - { DEFINE_OID(mib2IfEntry), NULL, mib2IfEntryQuery }, - { DEFINE_OID(mib2Ip), mib2IpStatsInit, mib2IpStatsQuery }, - { DEFINE_OID(mib2IpAddr), mib2IpAddrInit, mib2IpAddrQuery }, - { DEFINE_OID(mib2IpRoute), mib2IpRouteInit, mib2IpRouteQuery }, - { DEFINE_OID(mib2IpNet), mib2IpNetInit, mib2IpNetQuery }, - { DEFINE_OID(mib2Icmp), mib2IcmpInit, mib2IcmpQuery }, - { DEFINE_OID(mib2Tcp), mib2TcpInit, mib2TcpQuery }, - { DEFINE_OID(mib2Udp), mib2UdpInit, mib2UdpQuery }, - { DEFINE_OID(mib2UdpEntry), mib2UdpEntryInit, mib2UdpEntryQuery }, + { DEFINE_OID(mib2IfNumber), mib2IfNumberInit, mib2IfNumberQuery, + mib2IfNumberCleanup }, + { DEFINE_OID(mib2IfEntry), NULL, mib2IfEntryQuery, NULL }, + { DEFINE_OID(mib2Ip), mib2IpStatsInit, mib2IpStatsQuery, NULL }, + { DEFINE_OID(mib2IpAddr), mib2IpAddrInit, mib2IpAddrQuery, + mib2IpAddrCleanup }, + { DEFINE_OID(mib2IpRoute), mib2IpRouteInit, mib2IpRouteQuery, + mib2IpRouteCleanup }, + { DEFINE_OID(mib2IpNet), mib2IpNetInit, mib2IpNetQuery, mib2IpNetCleanup }, + { DEFINE_OID(mib2Icmp), mib2IcmpInit, mib2IcmpQuery, NULL }, + { DEFINE_OID(mib2Tcp), mib2TcpInit, mib2TcpQuery, NULL }, + { DEFINE_OID(mib2Udp), mib2UdpInit, mib2UdpQuery, NULL }, + { DEFINE_OID(mib2UdpEntry), mib2UdpEntryInit, mib2UdpEntryQuery, + mib2UdpEntryCleanup }, }; static UINT minSupportedIDLength; @@ -1164,6 +1176,15 @@ BOOL WINAPI SnmpExtensionInit(DWORD dwUptimeReference, return TRUE; } +static void cleanup(void) +{ + UINT i; + + for (i = 0; i < sizeof(supportedIDs) / sizeof(supportedIDs[0]); i++) + if (supportedIDs[i].cleanup) + supportedIDs[i].cleanup(); +} + static struct mibImplementation *findSupportedQuery(UINT *ids, UINT idLength, UINT *matchingIndex) { @@ -1260,3 +1281,22 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList, *pErrorIndex = errorIndex; return TRUE; } + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + cleanup(); + break; + default: + break; + } + + return TRUE; +}

1 0

Juan Lang : inetmib1: Don't prefer the native version, it doesn' t do much anyway.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 36468162478697f9ee38af36138f40b2c07f4e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36468162478697f9ee38af361… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jun 28 09:21:36 2008 -0700 inetmib1: Don't prefer the native version, it doesn't do much anyway. --- dlls/inetmib1/main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 56e52a2..f14b78c 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -35,8 +35,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break;

1 0

Juan Lang : inetmib1: Support the MIB2 UDP table.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 8f66c13e3512821f2f0e3b1bcccd61ed1366eaf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f66c13e3512821f2f0e3b1bc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jun 28 09:21:14 2008 -0700 inetmib1: Support the MIB2 UDP table. --- dlls/inetmib1/main.c | 93 ++++++++++++++++++++++++++++++++++++++++++++ dlls/inetmib1/tests/main.c | 63 +++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 2dba6cf..56e52a2 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -1037,6 +1037,98 @@ static BOOL mib2UdpQuery(BYTE bPduType, SnmpVarBind *pVarBind, return TRUE; } +static UINT mib2UdpEntry[] = { 1,3,6,1,2,1,7,5,1 }; +static PMIB_UDPTABLE udpTable; + +static void mib2UdpEntryInit(void) +{ + DWORD size = 0, ret = GetUdpTable(NULL, &size, TRUE); + + if (ret == ERROR_INSUFFICIENT_BUFFER) + { + udpTable = HeapAlloc(GetProcessHeap(), 0, size); + if (udpTable) + GetUdpTable(udpTable, &size, TRUE); + } +} + +static struct structToAsnValue mib2UdpEntryMap[] = { + { FIELD_OFFSET(MIB_UDPROW, dwLocalAddr), copyIpAddr }, + { FIELD_OFFSET(MIB_UDPROW, dwLocalPort), copyInt }, +}; + +static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) +{ + MIB_UDPROW *row = dst; + + assert(oid && oid->idLength >= 5); + row->dwLocalAddr = oidToIpAddr(oid); + row->dwLocalPort = oid->ids[4]; +} + +static int compareUdpRow(const void *a, const void *b) +{ + const MIB_UDPROW *key = a, *value = b; + int ret; + + ret = key->dwLocalAddr - value->dwLocalAddr; + if (ret == 0) + ret = key->dwLocalPort - value->dwLocalPort; + return ret; +} + +static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, + AsnInteger32 *pErrorStatus) +{ + AsnObjectIdentifier myOid = DEFINE_OID(mib2UdpEntry); + + TRACE("(0x%02x, %s, %p)\n", bPduType, SnmpUtilOidToA(&pVarBind->name), + pErrorStatus); + + switch (bPduType) + { + case SNMP_PDU_GET: + case SNMP_PDU_GETNEXT: + if (!udpTable) + *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; + else + { + UINT tableIndex = 0, item = 0; + + *pErrorStatus = getItemAndInstanceFromTable(&pVarBind->name, &myOid, + 5, bPduType, (struct GenericTable *)udpTable, + sizeof(MIB_UDPROW), oidToUdpRow, compareUdpRow, &item, + &tableIndex); + if (!*pErrorStatus) + { + assert(tableIndex); + assert(item); + *pErrorStatus = mapStructEntryToValue(mib2UdpEntryMap, + DEFINE_SIZEOF(mib2UdpEntryMap), + &udpTable->table[tableIndex - 1], item, bPduType, pVarBind); + if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) + { + AsnObjectIdentifier oid; + + setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, + udpTable->table[tableIndex - 1].dwLocalAddr); + oid.idLength = 1; + oid.ids = &udpTable->table[tableIndex - 1].dwLocalPort; + SnmpUtilOidAppend(&pVarBind->name, &oid); + } + } + } + break; + case SNMP_PDU_SET: + *pErrorStatus = SNMP_ERRORSTATUS_READONLY; + break; + default: + FIXME("0x%02x: unsupported PDU type\n", bPduType); + *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; + } + return TRUE; +} + /* This list MUST BE lexicographically sorted */ static struct mibImplementation supportedIDs[] = { { DEFINE_OID(mib2IfNumber), mib2IfNumberInit, mib2IfNumberQuery }, @@ -1048,6 +1140,7 @@ static struct mibImplementation supportedIDs[] = { { DEFINE_OID(mib2Icmp), mib2IcmpInit, mib2IcmpQuery }, { DEFINE_OID(mib2Tcp), mib2TcpInit, mib2TcpQuery }, { DEFINE_OID(mib2Udp), mib2UdpInit, mib2UdpQuery }, + { DEFINE_OID(mib2UdpEntry), mib2UdpEntryInit, mib2UdpEntryQuery }, }; static UINT minSupportedIDLength; diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index 012d6d2..e2e63f2 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -65,6 +65,7 @@ static void testQuery(void) UINT mib2IfOperStatus[] = { 1,3,6,1,2,1,2,2,1,8 }; UINT mib2IpAddr[] = { 1,3,6,1,2,1,4,20,1,1 }; UINT mib2IpRouteTable[] = { 1,3,6,1,2,1,4,21,1,1 }; + UINT mib2UdpTable[] = { 1,3,6,1,2,1,7,5,1,1 }; SnmpVarBind vars[3], vars2[3]; UINT entry; @@ -356,6 +357,68 @@ static void testQuery(void) } } while (moreData); SnmpUtilVarBindFree(&vars2[0]); + + /* Check the type and OIDs of the UDP table */ + vars[0].name.idLength = DEFINE_SIZEOF(mib2UdpTable); + vars[0].name.ids = mib2UdpTable; + SnmpUtilOidCpy(&vars2[0].name, &vars[0].name); + vars2[0].value.asnType = 0; + list.len = 1; + list.list = vars2; + moreData = TRUE; + do { + ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); + ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + /* FIXME: error and index aren't checked here because the UDP table is + * the last OID currently supported by Wine, so the last GetNext fails. + * todo_wine is also not effective because it will succeed for all but + * the last GetNext. Remove the if (0) if any later OID is supported + * by Wine. + */ + if (0) { + ok(error == SNMP_ERRORSTATUS_NOERROR, + "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); + ok(index == 0, "expected index 0, got %d\n", index); + } + if (!ret) + moreData = FALSE; + else if (error) + moreData = FALSE; + else if (SnmpUtilOidNCmp(&vars2[0].name, &vars[0].name, + vars[0].name.idLength)) + moreData = FALSE; + if (moreData) + { + /* Make sure the size of the OID is right. */ + ok(vars2[0].name.idLength == vars[0].name.idLength + 5, + "expected length %d, got %d\n", vars[0].name.idLength + 5, + vars2[0].name.idLength); + /* Make sure the type is right */ + ok(vars2[0].value.asnType == ASN_IPADDRESS, + "expected type ASN_IPADDRESS, got %02x\n", + vars2[0].value.asnType); + if (vars2[0].value.asnType == ASN_IPADDRESS) + { + UINT i; + + /* Again with the ugly: the base OID for the UDP table, + * 1.3.6.1.2.1.7.5.1, is appended with the local IP address and + * port number of the entry. So e.g. an entry for + * 192.168.1.1:4000 is identified in MIB2 as + * 1.3.6.1.2.1.7.5.1.192.168.1.1.4000 + */ + for (i = 0; i < vars2[0].value.asnValue.address.length; i++) + { + ok(vars2[0].value.asnValue.address.stream[i] == + vars2[0].name.ids[vars2[0].name.idLength - 5 + i], + "expected ident byte %d to be %d, got %d\n", i, + vars2[0].value.asnValue.address.stream[i], + vars2[0].name.ids[vars2[0].name.idLength - 5 + i]); + } + } + } + } while (moreData); + SnmpUtilVarBindFree(&vars2[0]); } START_TEST(main)

1 0

Juan Lang : inetmib1: Make table searching function into a generic helper.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: cf3d35cf15801a97d5e3026f557f3c89a9ae9b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3d35cf15801a97d5e3026f5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jun 28 08:33:01 2008 -0700 inetmib1: Make table searching function into a generic helper. --- dlls/inetmib1/main.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 20fc0b9..2dba6cf 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -352,18 +352,18 @@ static UINT findValueInTable(AsnObjectIdentifier *oid, } /* Given an OID and a base OID that it must begin with, finds the item and - * element of the table whose IP address matches the instance from the OID. - * E.g., given an OID foo.1.2.3.4.5 and a base OID foo, returns item 1 and the - * index of the entry in the table whose IP address is 2.3.4.5. + * element of the table whose value matches the instance from the OID. + * The OID is converted to a key with the function makeKey, and compared + * against entries in the table with the function compare. * If bPduType is not SNMP_PDU_GETNEXT and either the item or instance is * missing, returns SNMP_ERRORSTATUS_NOSUCHNAME. * If bPduType is SNMP_PDU_GETNEXT, returns the successor to the item and * instance, or item 1, instance 1 if either is missing. */ -static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid, - AsnObjectIdentifier *base, BYTE bPduType, struct GenericTable *table, - size_t tableEntrySize, oidToKeyFunc makeKey, compareFunc compare, - UINT *item, UINT *instance) +static AsnInteger32 getItemAndInstanceFromTable(AsnObjectIdentifier *oid, + AsnObjectIdentifier *base, UINT instanceLen, BYTE bPduType, + struct GenericTable *table, size_t tableEntrySize, oidToKeyFunc makeKey, + compareFunc compare, UINT *item, UINT *instance) { AsnInteger32 ret = SNMP_ERRORSTATUS_NOERROR; @@ -380,7 +380,7 @@ static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid, *instance = 1; } else if (!SnmpUtilOidNCmp(oid, base, base->idLength) && - oid->idLength < base->idLength + 5) + oid->idLength < base->idLength + instanceLen + 1) { /* Either the table or an item is specified, but the instance is * not. @@ -396,7 +396,7 @@ static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid, *item = 1; } else if (!SnmpUtilOidNCmp(oid, base, base->idLength) && - oid->idLength == base->idLength + 5) + oid->idLength == base->idLength + instanceLen + 1) { *item = oid->ids[base->idLength]; if (!*item) @@ -406,8 +406,8 @@ static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid, } else { - AsnObjectIdentifier ipOid = { 4, oid->ids + base->idLength + 1 - }; + AsnObjectIdentifier ipOid = { instanceLen, + oid->ids + base->idLength + 1 }; *instance = findValueInTable(&ipOid, table, tableEntrySize, makeKey, compare) + 1; @@ -420,15 +420,15 @@ static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid, break; default: if (!SnmpUtilOidNCmp(oid, base, base->idLength) && - oid->idLength == base->idLength + 5) + oid->idLength == base->idLength + instanceLen + 1) { *item = oid->ids[base->idLength]; if (!*item) ret = SNMP_ERRORSTATUS_NOSUCHNAME; else { - AsnObjectIdentifier ipOid = { 4, oid->ids + base->idLength + 1 - }; + AsnObjectIdentifier ipOid = { instanceLen, + oid->ids + base->idLength + 1 }; *instance = findValueInTable(&ipOid, table, tableEntrySize, makeKey, compare); @@ -680,8 +680,8 @@ static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, { case SNMP_PDU_GET: case SNMP_PDU_GETNEXT: - *pErrorStatus = getItemAndIpAddressInstanceFromOid(&pVarBind->name, - &myOid, bPduType, (struct GenericTable *)ipAddrTable, + *pErrorStatus = getItemAndInstanceFromTable(&pVarBind->name, + &myOid, 4, bPduType, (struct GenericTable *)ipAddrTable, sizeof(MIB_IPADDRROW), oidToIpAddrRow, compareIpAddrRow, &item, &tableIndex); if (!*pErrorStatus) @@ -763,8 +763,8 @@ static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, { case SNMP_PDU_GET: case SNMP_PDU_GETNEXT: - *pErrorStatus = getItemAndIpAddressInstanceFromOid(&pVarBind->name, - &myOid, bPduType, (struct GenericTable *)ipRouteTable, + *pErrorStatus = getItemAndInstanceFromTable(&pVarBind->name, + &myOid, 4, bPduType, (struct GenericTable *)ipRouteTable, sizeof(MIB_IPFORWARDROW), oidToIpForwardRow, compareIpForwardRow, &item, &tableIndex); if (!*pErrorStatus)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
95
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 June 2008