January 2007 - Wine-commits

Bang Jun-Young : msxml3: config.h police.
by Alexandre Julliard 22 Jan '07

22 Jan '07

Module: wine Branch: master Commit: 45e8e360cd6e90aecfac54a9a2453da2407fffeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e8e360cd6e90aecfac54a9a… Author: Bang Jun-Young <junyoung(a)mogua.com> Date: Sat Jan 20 17:19:55 2007 +0900 msxml3: config.h police. --- dlls/msxml3/factory.c | 2 ++ dlls/msxml3/msxml_private.h | 4 ++++ dlls/msxml3/parseerror.c | 2 ++ dlls/msxml3/regsvr.c | 2 ++ 4 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 53d59d1..f4dc2cc 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -21,6 +21,8 @@ #define COBJMACROS +#include "config.h" + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index e9a6da7..9fb96ca 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -21,6 +21,10 @@ #ifndef __MSXML_PRIVATE__ #define __MSXML_PRIVATE__ +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + #ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML_PARSER_H diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 0680103..f70ed52 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -21,6 +21,8 @@ #define COBJMACROS +#include "config.h" + #include <stdarg.h> #include <assert.h> #include "windef.h" diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 3686590..5648e1e 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include <string.h>

1 0

Bang Jun-Young : wineoss.drv: config.h police.
by Alexandre Julliard 22 Jan '07

22 Jan '07

Module: wine Branch: master Commit: 069e6c7063907866e7e2e0f8252e600295667cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=069e6c7063907866e7e2e0f82… Author: Bang Jun-Young <junyoung(a)mogua.com> Date: Sat Jan 20 17:29:40 2007 +0900 wineoss.drv: config.h police. --- dlls/wineoss.drv/audio.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/audio.h b/dlls/wineoss.drv/audio.h index a3d7a21..6fdb670 100644 --- a/dlls/wineoss.drv/audio.h +++ b/dlls/wineoss.drv/audio.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + #ifdef HAVE_OSS /* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */

1 0

Vitaliy Margolen : ntdll: Don't change granted access mask on error.
by Alexandre Julliard 22 Jan '07

22 Jan '07

Module: wine Branch: master Commit: 11b54bfe876907bf0eaaae7f7956ec201a00b95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b54bfe876907bf0eaaae7f7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 21 13:37:22 2007 -0700 ntdll: Don't change granted access mask on error. --- dlls/ntdll/sec.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index ba2b219..92b6b78 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1527,8 +1527,10 @@ NtAccessCheck( PrivilegeSet->PrivilegeCount = reply->privileges_len / sizeof(LUID_AND_ATTRIBUTES); if (status == STATUS_SUCCESS) + { *AccessStatus = reply->access_status; - *GrantedAccess = reply->access_granted; + *GrantedAccess = reply->access_granted; + } } SERVER_END_REQ;

1 0

Vitaliy Margolen : ntdll: Correct trace message stating NtAccessCheck is a stub.
by Alexandre Julliard 22 Jan '07

22 Jan '07

Module: wine Branch: master Commit: b03ada871a5fd870f7b581cadd265d45ed8c3a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03ada871a5fd870f7b581cad… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 21 13:37:05 2007 -0700 ntdll: Correct trace message stating NtAccessCheck is a stub. --- dlls/ntdll/sec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 92b6b78..b4e5773 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1479,7 +1479,7 @@ NtAccessCheck( { NTSTATUS status; - TRACE("(%p, %p, %08x, %p, %p, %p, %p, %p), stub\n", + TRACE("(%p, %p, %08x, %p, %p, %p, %p, %p)\n", SecurityDescriptor, ClientToken, DesiredAccess, GenericMapping, PrivilegeSet, ReturnLength, GrantedAccess, AccessStatus);

1 0

Louis Lenders : user32: Define RealChildWindowFromPoint as a real stub.
by Alexandre Julliard 22 Jan '07

22 Jan '07

Module: wine Branch: master Commit: 2a42f7ae2d38caf82b8b9fe4c69b07b0ae1d969f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a42f7ae2d38caf82b8b9fe4c… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Jan 21 11:26:05 2007 +0000 user32: Define RealChildWindowFromPoint as a real stub. --- dlls/user32/user32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index f857105..dcb1e6b 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -542,7 +542,7 @@ @ stdcall PtInRect(ptr double) @ stub QuerySendMessage # @ stub QueryUserCounters -# @ stub RealChildWindowFromPoint +@ stub RealChildWindowFromPoint @ stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA @ stdcall RealGetWindowClassA(long ptr long) @ stdcall RealGetWindowClassW(long ptr long)

1 0

Bang Jun-Young : advpack/tests: Fix typo.
by Alexandre Julliard 22 Jan '07

22 Jan '07

Module: wine Branch: master Commit: 657c84cba93e75bf3210e7c317a994a0b0d9d4fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=657c84cba93e75bf3210e7c31… Author: Bang Jun-Young <junyoung(a)mogua.com> Date: Sat Jan 20 12:29:09 2007 +0900 advpack/tests: Fix typo. --- dlls/advpack/tests/files.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index b5a5fa7..89f8ba9 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -433,7 +433,7 @@ static void test_ExtractFiles(void) "Expected %d, got %d\n", HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), hr); ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); - ok(!RemoveDirectoryA("dest\\testdir"), "Exepected dest\\testdir to not exist\n"); + ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n"); ok(!RemoveDirectoryA("dest"), "Expected dest to not exist\n"); /* extract all files in the cab to the destination directory */ @@ -444,7 +444,7 @@ static void test_ExtractFiles(void) ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); ok(DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to exist\n"); - ok(RemoveDirectoryA("dest\\testdir"), "Exepected dest\\testdir to exist\n"); + ok(RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to exist\n"); /* extract all files to a relative destination directory */ hr = pExtractFiles("extract.cab", "dest", 0, NULL, NULL, 0); @@ -453,14 +453,14 @@ static void test_ExtractFiles(void) ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); ok(DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to exist\n"); - ok(RemoveDirectoryA("dest\\testdir"), "Exepected dest\\testdir to exist\n"); + ok(RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to exist\n"); /* only extract two of the files from the cab */ hr = pExtractFiles("extract.cab", "dest", 0, "a.txt:testdir\\c.txt", NULL, 0); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); - ok(RemoveDirectoryA("dest\\testdir"), "Exepected dest\\testdir to exist\n"); + ok(RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to exist\n"); ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); @@ -469,7 +469,7 @@ static void test_ExtractFiles(void) ok(hr == S_OK, "Expected S_OK, got %d\n", hr); ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); - ok(RemoveDirectoryA("dest\\testdir"), "Exepected dest\\testdir to exist\n"); + ok(RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to exist\n"); ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); @@ -478,20 +478,20 @@ static void test_ExtractFiles(void) ok(hr == E_FAIL, "Expected E_FAIL, got %d\n", hr); ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); - ok(!RemoveDirectoryA("dest\\testdir"), "Exepected dest\\testdir to not exist\n"); + ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n"); /* try an empty file list */ hr = pExtractFiles("extract.cab", "dest", 0, "", NULL, 0); ok(hr == E_FAIL, "Expected E_FAIL, got %d\n", hr); ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); - ok(!RemoveDirectoryA("dest\\testdir"), "Exepected dest\\testdir to not exist\n"); + ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n"); /* try a nonexistent file in the file list */ hr = pExtractFiles("extract.cab", "dest", 0, "a.txt:idontexist:testdir\\c.txt", NULL, 0); ok(hr == E_FAIL, "Expected E_FAIL, got %d\n", hr); ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); - ok(!RemoveDirectoryA("dest\\testdir"), "Exepected dest\\testdir to not exist\n"); + ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n"); } static void test_AdvInstallFile(void)

1 0

Bang Jun-Young : objbase.h: Fix typo in comment.
by Alexandre Julliard 22 Jan '07

22 Jan '07

Module: wine Branch: master Commit: b7d0d059923587aaec6f570b53f2e3e09e6f2f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d0d059923587aaec6f570b5… Author: Bang Jun-Young <junyoung(a)mogua.com> Date: Sat Jan 20 15:38:19 2007 +0900 objbase.h: Fix typo in comment. --- include/objbase.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/objbase.h b/include/objbase.h index 63cfd97..f85fdcd 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -113,8 +113,8 @@ * }; * struct IDirect3DVtbl { * HRESULT (*QueryInterface)(IDirect3D* me, REFIID riid, LPVOID* ppvObj); - * ULONG (*QueryInterface)(IDirect3D* me); - * ULONG (*QueryInterface)(IDirect3D* me); + * ULONG (*AddRef)(IDirect3D* me); + * ULONG (*Release)(IDirect3D* me); * HRESULT (*Initialize)(IDirect3D* me, REFIID a); * HRESULT (*EnumDevices)(IDirect3D* me, LPD3DENUMDEVICESCALLBACK a, LPVOID b); * HRESULT (*CreateLight)(IDirect3D* me, LPDIRECT3DLIGHT* a, IUnknown* b);

1 0

Detlef Riekenberg : winspool: Make fixme for PRINTER_ENUM_CONNECTIONS more silent.
by Alexandre Julliard 22 Jan '07

22 Jan '07

Module: wine Branch: master Commit: bc85a34f506ad4a2711bd4396ed4a33f94d26a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc85a34f506ad4a2711bd4396… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 21 20:49:34 2007 +0100 winspool: Make fixme for PRINTER_ENUM_CONNECTIONS more silent. --- dlls/winspool.drv/info.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 79a9b94..2b96f45 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4047,9 +4047,15 @@ static BOOL WINSPOOL_EnumPrinters(DWORD return TRUE; if (dwType & PRINTER_ENUM_CONNECTIONS) { - FIXME("We don't handle PRINTER_ENUM_CONNECTIONS\n"); - dwType &= ~PRINTER_ENUM_CONNECTIONS; /* we don't handle that */ - if(!dwType) return TRUE; + TRACE("ignoring PRINTER_ENUM_CONNECTIONS\n"); + dwType &= ~PRINTER_ENUM_CONNECTIONS; /* we don't handle that */ + if (!dwType) { + FIXME("We don't handle PRINTER_ENUM_CONNECTIONS\n"); + *lpdwNeeded = 0; + *lpdwReturned = 0; + return TRUE; + } + } if (!((dwType & PRINTER_ENUM_LOCAL) || (dwType & PRINTER_ENUM_NAME))) {

1 0

Hans Leidekker : snmpapi: Implement SnmpUtilAsnAny{Cpy,Free}.
by Alexandre Julliard 22 Jan '07

22 Jan '07

Module: wine Branch: master Commit: 1928c7c4c0fd2f390a10a2219f8eee0e0dd7621f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1928c7c4c0fd2f390a10a2219… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 22 11:05:49 2007 +0100 snmpapi: Implement SnmpUtilAsnAny{Cpy,Free}. --- dlls/snmpapi/main.c | 187 +++++++++++++++++++++++++++------------------ dlls/snmpapi/snmpapi.spec | 4 +- 2 files changed, 115 insertions(+), 76 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 16d9b30..163477b 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -1,5 +1,5 @@ /* - * Stub implementation of SNMPAPI.DLL + * Implementation of SNMPAPI.DLL * * Copyright 2002 Patrik Stridvall * Copyright 2007 Hans Leidekker @@ -31,6 +31,85 @@ WINE_DEFAULT_DEBUG_CHANNEL(snmpapi); +static INT asn_any_copy(AsnAny *dst, AsnAny *src) +{ + memset(dst, 0, sizeof(AsnAny)); + switch (src->asnType) + { + case ASN_INTEGER32: dst->asnValue.number = src->asnValue.number; break; + case ASN_UNSIGNED32: dst->asnValue.unsigned32 = src->asnValue.unsigned32; break; + case ASN_COUNTER64: dst->asnValue.counter64 = src->asnValue.counter64; break; + case ASN_COUNTER32: dst->asnValue.counter = src->asnValue.counter; break; + case ASN_GAUGE32: dst->asnValue.gauge = src->asnValue.gauge; break; + case ASN_TIMETICKS: dst->asnValue.ticks = src->asnValue.ticks; break; + + case ASN_OCTETSTRING: + case ASN_BITS: + case ASN_SEQUENCE: + case ASN_IPADDRESS: + case ASN_OPAQUE: + { + BYTE *stream; + UINT length = src->asnValue.string.length; + + if (!(stream = HeapAlloc(GetProcessHeap(), 0, length))) return SNMPAPI_ERROR; + + dst->asnValue.string.stream = stream; + dst->asnValue.string.length = length; + dst->asnValue.string.dynamic = TRUE; + break; + } + case ASN_OBJECTIDENTIFIER: + { + UINT *ids, i, size = src->asnValue.object.idLength * sizeof(UINT); + + if (!(ids = HeapAlloc(GetProcessHeap(), 0, size))) return SNMPAPI_ERROR; + + dst->asnValue.object.ids = ids; + dst->asnValue.object.idLength = src->asnValue.object.idLength; + + for (i = 0; i < dst->asnValue.object.idLength; i++) + dst->asnValue.object.ids[i] = src->asnValue.object.ids[i]; + break; + } + default: + { + WARN("unknown ASN type: %d\n", src->asnType); + return SNMPAPI_ERROR; + } + } + dst->asnType = src->asnType; + return SNMPAPI_NOERROR; +} + +static void asn_any_free(AsnAny *any) +{ + switch (any->asnType) + { + case ASN_OCTETSTRING: + case ASN_BITS: + case ASN_SEQUENCE: + case ASN_IPADDRESS: + case ASN_OPAQUE: + { + if (any->asnValue.string.dynamic) + { + HeapFree(GetProcessHeap(), 0, any->asnValue.string.stream); + any->asnValue.string.stream = NULL; + } + break; + } + case ASN_OBJECTIDENTIFIER: + { + HeapFree(GetProcessHeap(), 0, any->asnValue.object.ids); + any->asnValue.object.ids = NULL; + break; + } + default: break; + } + any->asnType = ASN_NULL; +} + /*********************************************************************** * DllMain for SNMPAPI */ @@ -82,6 +161,24 @@ void WINAPI SnmpUtilMemFree(LPVOID mem) } /*********************************************************************** + * SnmpUtilAsnAnyCpy (SNMPAPI.@) + */ +INT WINAPI SnmpUtilAsnAnyCpy(AsnAny *dst, AsnAny *src) +{ + TRACE("(%p, %p)\n", dst, src); + return asn_any_copy(dst, src); +} + +/*********************************************************************** + * SnmpUtilAsnAnyFree (SNMPAPI.@) + */ +void WINAPI SnmpUtilAsnAnyFree(AsnAny *any) +{ + TRACE("(%p)\n", any); + asn_any_free(any); +} + +/*********************************************************************** * SnmpUtilOidCpy (SNMPAPI.@) */ INT WINAPI SnmpUtilOidCpy(AsnObjectIdentifier *dst, AsnObjectIdentifier *src) @@ -126,67 +223,25 @@ INT WINAPI SnmpUtilVarBindCpy(SnmpVarBin TRACE("(%p, %p)\n", dst, src); - if (!(dst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SnmpVarBind)))) - return SNMPAPI_ERROR; - - size = src->name.idLength * sizeof(UINT); - if (!(dst->name.ids = HeapAlloc(GetProcessHeap(), 0, size))) goto error; - for (i = 0; i < src->name.idLength; i++) dst->name.ids[i] = src->name.ids[i]; - dst->name.idLength = src->name.idLength; - - dst->value.asnType = src->value.asnType; - switch (dst->value.asnType) + if (!dst) return SNMPAPI_ERROR; + if (!src) { - case ASN_INTEGER32: dst->value.asnValue.number = src->value.asnValue.number; break; - case ASN_UNSIGNED32: dst->value.asnValue.unsigned32 = src->value.asnValue.unsigned32; break; - case ASN_COUNTER64: dst->value.asnValue.counter64 = src->value.asnValue.counter64; break; - case ASN_COUNTER32: dst->value.asnValue.counter = src->value.asnValue.counter; break; - case ASN_GAUGE32: dst->value.asnValue.gauge = src->value.asnValue.gauge; break; - case ASN_TIMETICKS: dst->value.asnValue.ticks = src->value.asnValue.ticks; break; - - case ASN_OCTETSTRING: - case ASN_BITS: - case ASN_SEQUENCE: - case ASN_IPADDRESS: - case ASN_OPAQUE: - { - BYTE *stream; - UINT length = src->value.asnValue.string.length; - - if (!(stream = HeapAlloc(GetProcessHeap(), 0, length))) - goto error; - - dst->value.asnValue.string.stream = stream; - dst->value.asnValue.string.length = length; - dst->value.asnValue.string.dynamic = TRUE; - break; + dst->value.asnType = ASN_NULL; + return SNMPAPI_NOERROR; } - case ASN_OBJECTIDENTIFIER: - { - UINT *ids, size = src->name.idLength * sizeof(UINT); - if (!(ids = HeapAlloc(GetProcessHeap(), 0, size))) - goto error; + size = src->name.idLength * sizeof(UINT); + if (!(dst->name.ids = HeapAlloc(GetProcessHeap(), 0, size))) return SNMPAPI_ERROR; - dst->value.asnValue.object.ids = ids; - dst->value.asnValue.object.idLength = src->value.asnValue.object.idLength; + for (i = 0; i < src->name.idLength; i++) dst->name.ids[i] = src->name.ids[i]; + dst->name.idLength = src->name.idLength; - for (i = 0; i < dst->value.asnValue.object.idLength; i++) - dst->value.asnValue.object.ids[i] = src->value.asnValue.object.ids[i]; - break; - } - default: + if (!asn_any_copy(&dst->value, &src->value)) { - WARN("unknown ASN type: %d\n", src->value.asnType); - break; - } + HeapFree(GetProcessHeap(), 0, dst->name.ids); + return SNMPAPI_ERROR; } return SNMPAPI_NOERROR; - -error: - HeapFree(GetProcessHeap(), 0, dst->name.ids); - HeapFree(GetProcessHeap(), 0, dst); - return SNMPAPI_ERROR; } /*********************************************************************** @@ -196,28 +251,12 @@ void WINAPI SnmpUtilVarBindFree(SnmpVarB { TRACE("(%p)\n", vb); - switch (vb->value.asnType) - { - case ASN_OCTETSTRING: - case ASN_BITS: - case ASN_SEQUENCE: - case ASN_IPADDRESS: - case ASN_OPAQUE: - { - if (vb->value.asnValue.string.dynamic) - HeapFree(GetProcessHeap(), 0, vb->value.asnValue.string.stream); - break; - } - case ASN_OBJECTIDENTIFIER: - { - HeapFree(GetProcessHeap(), 0, vb->value.asnValue.object.ids); - break; - } - default: break; - } + if (!vb) return; + asn_any_free(&vb->value); HeapFree(GetProcessHeap(), 0, vb->name.ids); - HeapFree(GetProcessHeap(), 0, vb); + vb->name.idLength = 0; + vb->name.ids = NULL; } /*********************************************************************** diff --git a/dlls/snmpapi/snmpapi.spec b/dlls/snmpapi/snmpapi.spec index e6a8084..006c8b3 100644 --- a/dlls/snmpapi/snmpapi.spec +++ b/dlls/snmpapi/snmpapi.spec @@ -18,8 +18,8 @@ @ stub SnmpSvcSetLogLevel @ stub SnmpSvcSetLogType @ stub SnmpUtilAnsiToUnicode -@ stub SnmpUtilAsnAnyCpy -@ stub SnmpUtilAsnAnyFree +@ stdcall SnmpUtilAsnAnyCpy(ptr ptr) +@ stdcall SnmpUtilAsnAnyFree(ptr) @ stub SnmpUtilDbgPrint @ stub SnmpUtilIdsToA @ stdcall SnmpUtilMemAlloc(long)

1 0

Hans Leidekker : snmpapi: Implement SnmpUtilOctets{Cmp, Cpy, Free, NCmp}.
by Alexandre Julliard 22 Jan '07

22 Jan '07

Module: wine Branch: master Commit: bca85b3da397366fe05cb3d148c1bcc496664235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca85b3da397366fe05cb3d14… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 22 11:06:13 2007 +0100 snmpapi: Implement SnmpUtilOctets{Cmp,Cpy,Free,NCmp}. --- dlls/snmpapi/main.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ dlls/snmpapi/snmpapi.spec | 8 ++-- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 163477b..8031162 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -179,6 +179,80 @@ void WINAPI SnmpUtilAsnAnyFree(AsnAny *a } /*********************************************************************** + * SnmpUtilOctetsCpy (SNMPAPI.@) + */ +INT WINAPI SnmpUtilOctetsCpy(AsnOctetString *dst, AsnOctetString *src) +{ + TRACE("(%p, %p)\n", dst, src); + + if (!dst) return SNMPAPI_ERROR; + if (!src) + { + dst->dynamic = FALSE; + dst->length = 0; + dst->stream = NULL; + return SNMPAPI_NOERROR; + } + if ((dst->stream = HeapAlloc(GetProcessHeap(), 0, src->length))) + { + unsigned int i; + + dst->dynamic = TRUE; + dst->length = src->length; + for (i = 0; i < dst->length; i++) dst->stream[i] = src->stream[i]; + return SNMPAPI_NOERROR; + } + return SNMPAPI_ERROR; +} + +/*********************************************************************** + * SnmpUtilOctetsFree (SNMPAPI.@) + */ +void WINAPI SnmpUtilOctetsFree(AsnOctetString *octets) +{ + TRACE("(%p)\n", octets); + + if (octets) + { + octets->length = 0; + if (octets->dynamic) HeapFree(GetProcessHeap(), 0, octets->stream); + octets->stream = NULL; + octets->dynamic = FALSE; + } +} + +/*********************************************************************** + * SnmpUtilOctetsNCmp (SNMPAPI.@) + */ +INT WINAPI SnmpUtilOctetsNCmp(AsnOctetString *octets1, AsnOctetString *octets2, UINT count) +{ + INT ret; + unsigned int i; + + TRACE("(%p, %p, %d)\n", octets1, octets2, count); + + if (!octets1 || !octets2) return 0; + + for (i = 0; i < count; i++) + if ((ret = octets1->stream[i] - octets2->stream[i])) return ret; + + return 0; +} + +/*********************************************************************** + * SnmpUtilOctetsCmp (SNMPAPI.@) + */ +INT WINAPI SnmpUtilOctetsCmp(AsnOctetString *octets1, AsnOctetString *octets2) +{ + TRACE("(%p, %p)\n", octets1, octets2); + + if (octets1->length < octets2->length) return -1; + if (octets1->length > octets2->length) return 1; + + return SnmpUtilOctetsNCmp(octets1, octets2, octets1->length); +} + +/*********************************************************************** * SnmpUtilOidCpy (SNMPAPI.@) */ INT WINAPI SnmpUtilOidCpy(AsnObjectIdentifier *dst, AsnObjectIdentifier *src) diff --git a/dlls/snmpapi/snmpapi.spec b/dlls/snmpapi/snmpapi.spec index 006c8b3..cd6dcd0 100644 --- a/dlls/snmpapi/snmpapi.spec +++ b/dlls/snmpapi/snmpapi.spec @@ -25,10 +25,10 @@ @ stdcall SnmpUtilMemAlloc(long) @ stdcall SnmpUtilMemFree(ptr) @ stdcall SnmpUtilMemReAlloc(ptr long) -@ stub SnmpUtilOctetsCmp -@ stub SnmpUtilOctetsCpy -@ stub SnmpUtilOctetsFree -@ stub SnmpUtilOctetsNCmp +@ stdcall SnmpUtilOctetsCmp(ptr ptr) +@ stdcall SnmpUtilOctetsCpy(ptr ptr) +@ stdcall SnmpUtilOctetsFree(ptr) +@ stdcall SnmpUtilOctetsNCmp(ptr ptr long) @ stub SnmpUtilOidAppend @ stub SnmpUtilOidCmp @ stdcall SnmpUtilOidCpy(ptr ptr)

1 0