January 2007 - Wine-Commits

Bang Jun-Young : winbase.h: Cosmetic changes.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: 2fb391b3dfb8994a34a807d90c29a13883efffb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb391b3dfb8994a34a807d90… Author: Bang Jun-Young <junyoung(a)mogua.com> Date: Sat Jan 20 16:44:02 2007 +0900 winbase.h: Cosmetic changes. --- include/winbase.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 600094a..8683976 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2089,6 +2089,10 @@ BOOL WINAPI ZombifyActCtx(HANDLE) LPSTR WINAPI lstrcatA(LPSTR,LPCSTR); LPWSTR WINAPI lstrcatW(LPWSTR,LPCWSTR); +INT WINAPI lstrcmpA(LPCSTR,LPCSTR); +INT WINAPI lstrcmpW(LPCWSTR,LPCWSTR); +INT WINAPI lstrcmpiA(LPCSTR,LPCSTR); +INT WINAPI lstrcmpiW(LPCWSTR,LPCWSTR); LPSTR WINAPI lstrcpyA(LPSTR,LPCSTR); LPWSTR WINAPI lstrcpyW(LPWSTR,LPCWSTR); LPSTR WINAPI lstrcpynA(LPSTR,LPCSTR,INT); @@ -2174,6 +2178,8 @@ extern inline LPSTR WINAPI lstrcatA( LPS #endif /* !defined(WINE_NO_INLINE_STRING) && defined(__WINESRC__) */ #define lstrcat WINELIB_NAME_AW(lstrcat) +#define lstrcmp WINELIB_NAME_AW(lstrcmp) +#define lstrcmpi WINELIB_NAME_AW(lstrcmpi) #define lstrcpy WINELIB_NAME_AW(lstrcpy) #define lstrcpyn WINELIB_NAME_AW(lstrcpyn) #define lstrlen WINELIB_NAME_AW(lstrlen) @@ -2186,12 +2192,6 @@ LONG WINAPI _llseek(HFILE,LONG,IN HFILE WINAPI _lopen(LPCSTR,INT); UINT WINAPI _lread(HFILE,LPVOID,UINT); UINT WINAPI _lwrite(HFILE,LPCSTR,UINT); -INT WINAPI lstrcmpA(LPCSTR,LPCSTR); -INT WINAPI lstrcmpW(LPCWSTR,LPCWSTR); -#define lstrcmp WINELIB_NAME_AW(lstrcmp) -INT WINAPI lstrcmpiA(LPCSTR,LPCSTR); -INT WINAPI lstrcmpiW(LPCWSTR,LPCWSTR); -#define lstrcmpi WINELIB_NAME_AW(lstrcmpi) /* compatibility macros */ #define FillMemory RtlFillMemory

1 0

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

Jan. 22, 2007

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

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

Jan. 22, 2007

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

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

Jan. 22, 2007

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

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

Jan. 22, 2007

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

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

Jan. 22, 2007

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

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

Jan. 22, 2007

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

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

Jan. 22, 2007

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 SnmpUtilOid{Append, Cmp, NCmp}. Fix SnmpUtilOid{Cpy, Free}.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: baaed37d6d425700921a8b57bcc8e6f3ad68b3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baaed37d6d425700921a8b57b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 22 11:06:38 2007 +0100 snmpapi: Implement SnmpUtilOid{Append, Cmp, NCmp}. Fix SnmpUtilOid{Cpy, Free}. --- dlls/snmpapi/main.c | 83 ++++++++++++++++++++++++++++++++++++++++----- dlls/snmpapi/snmpapi.spec | 6 ++-- 2 files changed, 77 insertions(+), 12 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 8031162..e385638 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -253,23 +253,53 @@ INT WINAPI SnmpUtilOctetsCmp(AsnOctetStr } /*********************************************************************** - * SnmpUtilOidCpy (SNMPAPI.@) + * SnmpUtilOidAppend (SNMPAPI.@) */ -INT WINAPI SnmpUtilOidCpy(AsnObjectIdentifier *dst, AsnObjectIdentifier *src) +INT WINAPI SnmpUtilOidAppend(AsnObjectIdentifier *dst, AsnObjectIdentifier *src) { - unsigned int i, size; + UINT *ids, i, size; TRACE("(%p, %p)\n", dst, src); - size = sizeof(AsnObjectIdentifier); - if ((dst = HeapAlloc(GetProcessHeap(), 0, size))) + if (!dst) return SNMPAPI_ERROR; + if (!src) return SNMPAPI_NOERROR; + + size = (src->idLength + dst->idLength) * sizeof(UINT); + if (!(ids = HeapReAlloc(GetProcessHeap(), 0, dst->ids, size))) { - size = src->idLength * sizeof(UINT); - if (!(dst->ids = HeapAlloc(GetProcessHeap(), 0, size))) + if (!(ids = HeapAlloc(GetProcessHeap(), 0, size))) { - HeapFree(GetProcessHeap(), 0, dst); + SetLastError(SNMP_MEM_ALLOC_ERROR); return SNMPAPI_ERROR; } + else memcpy(ids, dst->ids, dst->idLength * sizeof(UINT)); + } + + for (i = 0; i < src->idLength; i++) ids[i + dst->idLength] = src->ids[i]; + dst->idLength = dst->idLength + src->idLength; + dst->ids = ids; + + return SNMPAPI_NOERROR; +} + +/*********************************************************************** + * SnmpUtilOidCpy (SNMPAPI.@) + */ +INT WINAPI SnmpUtilOidCpy(AsnObjectIdentifier *dst, AsnObjectIdentifier *src) +{ + TRACE("(%p, %p)\n", dst, src); + + if (!dst) return SNMPAPI_ERROR; + if (!src) + { + dst->idLength = 0; + dst->ids = NULL; + return SNMPAPI_NOERROR; + } + if ((dst->ids = HeapAlloc(GetProcessHeap(), 0, src->idLength * sizeof(UINT)))) + { + unsigned int i; + dst->idLength = src->idLength; for (i = 0; i < dst->idLength; i++) dst->ids[i] = src->ids[i]; return SNMPAPI_NOERROR; @@ -284,8 +314,43 @@ void WINAPI SnmpUtilOidFree(AsnObjectIde { TRACE("(%p)\n", oid); + if (!oid) return; + + oid->idLength = 0; HeapFree(GetProcessHeap(), 0, oid->ids); - HeapFree(GetProcessHeap(), 0, oid); + oid->ids = NULL; +} + +/*********************************************************************** + * SnmpUtilOidNCmp (SNMPAPI.@) + */ +INT WINAPI SnmpUtilOidNCmp(AsnObjectIdentifier *oid1, AsnObjectIdentifier *oid2, UINT count) +{ + unsigned int i; + + TRACE("(%p, %p, %d)\n", oid1, oid2, count); + + if (!oid1 || !oid2) return 0; + + for (i = 0; i < count; i++) + { + if (oid1->ids[i] > oid2->ids[i]) return 1; + if (oid1->ids[i] < oid2->ids[i]) return -1; + } + return 0; +} + +/*********************************************************************** + * SnmpUtilOidCmp (SNMPAPI.@) + */ +INT WINAPI SnmpUtilOidCmp(AsnObjectIdentifier *oid1, AsnObjectIdentifier *oid2) +{ + TRACE("(%p, %p)\n", oid1, oid2); + + if (oid1->idLength < oid2->idLength) return -1; + if (oid1->idLength > oid2->idLength) return 1; + + return SnmpUtilOidNCmp(oid1, oid2, oid1->idLength); } /*********************************************************************** diff --git a/dlls/snmpapi/snmpapi.spec b/dlls/snmpapi/snmpapi.spec index cd6dcd0..b98d029 100644 --- a/dlls/snmpapi/snmpapi.spec +++ b/dlls/snmpapi/snmpapi.spec @@ -29,11 +29,11 @@ @ stdcall SnmpUtilOctetsCpy(ptr ptr) @ stdcall SnmpUtilOctetsFree(ptr) @ stdcall SnmpUtilOctetsNCmp(ptr ptr long) -@ stub SnmpUtilOidAppend -@ stub SnmpUtilOidCmp +@ stdcall SnmpUtilOidAppend(ptr ptr) +@ stdcall SnmpUtilOidCmp(ptr ptr) @ stdcall SnmpUtilOidCpy(ptr ptr) @ stdcall SnmpUtilOidFree(ptr) -@ stub SnmpUtilOidNCmp +@ stdcall SnmpUtilOidNCmp(ptr ptr long) @ stub SnmpUtilOidToA @ stub SnmpUtilPrintAsnAny @ stub SnmpUtilPrintOid

1 0

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

Jan. 22, 2007

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