January 2007 - Wine-Commits

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

Jan. 22, 2007

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

Mike McCormack : kernel32: Forward EncodePointer and DecodePointer to their ntdll counterparts.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: 71a2f4d184505e396db87dd9a494d45c291a2a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a2f4d184505e396db87dd9a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 22 19:24:24 2007 +0900 kernel32: Forward EncodePointer and DecodePointer to their ntdll counterparts. --- dlls/kernel32/kernel32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 16d122c..aac1372 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -263,7 +263,7 @@ @ stdcall DebugBreak() @ stdcall DebugBreakProcess(long) @ stdcall DebugSetProcessKillOnExit(long) -# @ stub DecodePointer ( -> ntdll.RtlDecodePointer) +@ stdcall DecodePointer(ptr) ntdll.RtlDecodePointer # @ stub DecodeSystemPointer ( -> ntdll.RtlDecodeSystemPointer) @ stdcall DefineDosDeviceA(long str str) @ stdcall DefineDosDeviceW(long wstr wstr) @@ -288,7 +288,7 @@ # @ stub DosPathToSessionPathW @ stdcall DuplicateConsoleHandle(long long long long) @ stdcall DuplicateHandle(long long long ptr long long long) -# @ stub EncodePointer ( -> ntdll.RtlEncodePointer) +@ stdcall EncodePointer(ptr) ntdll.RtlEncodePointer # @ stub EncodeSystemPointer ( -> ntdll.RtlEncodeSystemPointer) @ stdcall EndUpdateResourceA(long long) @ stdcall EndUpdateResourceW(long long)

1 0

Mike McCormack : ntdll: Implement RtlDecodePointer and RtlEncodePointer.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: bcc717174c54017e0cb5dfdb8c0a8e4f521ea42a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc717174c54017e0cb5dfdb8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 22 19:24:14 2007 +0900 ntdll: Implement RtlDecodePointer and RtlEncodePointer. --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 803ed53..b3e3540 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -501,7 +501,7 @@ @ stub RtlDeactivateActivationContext @ stub RtlDeactivateActivationContextUnsafeFast @ stub RtlDebugPrintTimes -# @ stub RtlDecodePointer +@ stdcall RtlDecodePointer(ptr) # @ stub RtlDecodeSystemPointer @ stub RtlDecompressBuffer @ stub RtlDecompressFragment @@ -543,7 +543,7 @@ @ stdcall RtlDuplicateUnicodeString(long ptr ptr) @ stdcall RtlEmptyAtomTable(ptr long) # @ stub RtlEnableEarlyCriticalSectionEventCreation -# @ stub RtlEncodePointer +@ stdcall RtlEncodePointer(ptr) # @ stub RtlEncodeSystemPointer @ stdcall -ret64 RtlEnlargedIntegerMultiply(long long) @ stdcall RtlEnlargedUnsignedDivide(double long ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 8ddab6a..449e91a 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -886,3 +886,39 @@ NTSTATUS WINAPI RtlIpv4AddressToStringEx return STATUS_SUCCESS; } + +static DWORD_PTR get_pointer_obfuscator( void ) +{ + static DWORD_PTR pointer_obfuscator; + + if (!pointer_obfuscator) + { + ULONG seed = NtGetTickCount(); + ULONG_PTR rand; + + /* generate a random value for the obfuscator */ + rand = RtlUniform( &seed ); + + /* handle 64bit pointers */ + rand ^= RtlUniform( &seed ) << ((sizeof (DWORD_PTR) - sizeof (ULONG))*8); + + /* set the high bits so dereferencing obfuscated pointers will (usually) crash */ + rand |= 0xc0000000 << ((sizeof (DWORD_PTR) - sizeof (ULONG))*8); + + interlocked_cmpxchg_ptr( (void**) &pointer_obfuscator, (void*) rand, NULL ); + } + + return pointer_obfuscator; +} + +PVOID WINAPI RtlEncodePointer( PVOID ptr ) +{ + DWORD_PTR ptrval = (DWORD_PTR) ptr; + return (PVOID)(ptrval ^ get_pointer_obfuscator()); +} + +PVOID WINAPI RtlDecodePointer( PVOID ptr ) +{ + DWORD_PTR ptrval = (DWORD_PTR) ptr; + return (PVOID)(ptrval ^ get_pointer_obfuscator()); +}

1 0

Alexandre Julliard : wine/list.h: Add list_count function. Make some parameters const.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: 4dc61069a611af7bd14a107f5e19112f5f5b7bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc61069a611af7bd14a107f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 12:16:17 2007 +0100 wine/list.h: Add list_count function. Make some parameters const. --- include/wine/list.h | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index a0b37cc..1b4f017 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -100,7 +100,7 @@ inline static void list_remove( struct l } /* get the next element */ -inline static struct list *list_next( struct list *list, struct list *elem ) +inline static struct list *list_next( const struct list *list, const struct list *elem ) { struct list *ret = elem->next; if (elem->next == list) ret = NULL; @@ -108,7 +108,7 @@ inline static struct list *list_next( st } /* get the previous element */ -inline static struct list *list_prev( struct list *list, struct list *elem ) +inline static struct list *list_prev( const struct list *list, const struct list *elem ) { struct list *ret = elem->prev; if (elem->prev == list) ret = NULL; @@ -116,19 +116,19 @@ inline static struct list *list_prev( st } /* get the first element */ -inline static struct list *list_head( struct list *list ) +inline static struct list *list_head( const struct list *list ) { return list_next( list, list ); } /* get the last element */ -inline static struct list *list_tail( struct list *list ) +inline static struct list *list_tail( const struct list *list ) { return list_prev( list, list ); } /* check if a list is empty */ -inline static int list_empty( struct list *list ) +inline static int list_empty( const struct list *list ) { return list->next == list; } @@ -139,6 +139,15 @@ inline static void list_init( struct lis list->next = list->prev = list; } +/* count the elements of a list */ +inline static unsigned int list_count( const struct list *list ) +{ + unsigned count = 0; + const struct list *ptr; + for (ptr = list->next; ptr != list; ptr = ptr->next) count++; + return count; +} + /* move all elements from src to the tail of dst */ inline static void list_move_tail( struct list *dst, struct list *src ) {

1 0

Alexandre Julliard : dinput: Undefine SW_MAX to avoid possible conflicts with winuser.h.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: 4ae5b9fd336e16eb3d5eda2bd4c31c1a9f8c5fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae5b9fd336e16eb3d5eda2bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 12:11:04 2007 +0100 dinput: Undefine SW_MAX to avoid possible conflicts with winuser.h. --- dlls/dinput/effect_linuxinput.c | 1 + dlls/dinput/joystick_linux.c | 1 + dlls/dinput/joystick_linuxinput.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 0ac1026..e9f5604 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -27,6 +27,7 @@ #include <string.h> #ifdef HAVE_LINUX_INPUT_H # include <linux/input.h> +# undef SW_MAX #endif #include <errno.h> #ifdef HAVE_UNISTD_H diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index ccaebf1..ba63d9c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -52,6 +52,7 @@ #endif #ifdef HAVE_LINUX_JOYSTICK_H # include <linux/joystick.h> +# undef SW_MAX #endif #ifdef HAVE_SYS_POLL_H # include <sys/poll.h> diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index a0ce49c..3815c22 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -44,6 +44,7 @@ #endif #ifdef HAVE_LINUX_INPUT_H # include <linux/input.h> +# undef SW_MAX # if defined(EVIOCGBIT) && defined(EV_ABS) && defined(BTN_PINKIE) # define HAVE_CORRECT_LINUXINPUT_H # endif

1 0

Alexandre Julliard : sfc: We need to import sfc_os for the forwards to work properly.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: 61b993437f5a878d360d52f19ffd9d764aea26f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b993437f5a878d360d52f19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 12:10:37 2007 +0100 sfc: We need to import sfc_os for the forwards to work properly. --- .gitignore | 1 + dlls/Makefile.in | 4 ++++ dlls/sfc/Makefile.in | 2 +- dlls/sfc_os/Makefile.in | 1 + 4 files changed, 7 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index d16985d..b8b8c6d 100644 --- a/.gitignore +++ b/.gitignore @@ -438,6 +438,7 @@ dlls/setupapi/tests/setupapi_crosstest.e dlls/setupapi/tests/testlist.c dlls/setupx.dll16 dlls/sfc/libsfc.def +dlls/sfc_os/libsfc_os.def dlls/shdoclc/rsrc.res dlls/shdocvw/libshdocvw.def dlls/shdocvw/shdocvw.res diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 46e5678..932e9f7 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -535,6 +535,7 @@ IMPORT_LIBS = \ serialui/libserialui.$(IMPLIBEXT) \ setupapi/libsetupapi.$(IMPLIBEXT) \ sfc/libsfc.$(IMPLIBEXT) \ + sfc_os/libsfc_os.$(IMPLIBEXT) \ shdocvw/libshdocvw.$(IMPLIBEXT) \ shell32/libshell32.$(IMPLIBEXT) \ shfolder/libshfolder.$(IMPLIBEXT) \ @@ -839,6 +840,9 @@ setupapi/libsetupapi.$(IMPLIBEXT): setup sfc/libsfc.$(IMPLIBEXT): sfc/sfc.spec $(WINEBUILD) @cd sfc && $(MAKE) libsfc.$(IMPLIBEXT) +sfc_os/libsfc_os.$(IMPLIBEXT): sfc_os/sfc_os.spec $(WINEBUILD) + @cd sfc_os && $(MAKE) libsfc_os.$(IMPLIBEXT) + shdocvw/libshdocvw.$(IMPLIBEXT): shdocvw/shdocvw.spec $(WINEBUILD) @cd shdocvw && $(MAKE) libshdocvw.$(IMPLIBEXT) diff --git a/dlls/sfc/Makefile.in b/dlls/sfc/Makefile.in index 29a7159..9c38408 100644 --- a/dlls/sfc/Makefile.in +++ b/dlls/sfc/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = sfc.dll IMPORTLIB = libsfc.$(IMPLIBEXT) -IMPORTS = kernel32 +IMPORTS = sfc_os kernel32 C_SRCS = sfc_main.c diff --git a/dlls/sfc_os/Makefile.in b/dlls/sfc_os/Makefile.in index 22a8ac7..9180f94 100644 --- a/dlls/sfc_os/Makefile.in +++ b/dlls/sfc_os/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = sfc_os.dll +IMPORTLIB = libsfc_os.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = sfc_os.c

1 0

Paul Vriens : ntdll: Extra check for ObjectAttributes (Coverity).
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: cbf9fde47ac9ac783aa17d477f87e89a058b9ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf9fde47ac9ac783aa17d477… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Jan 21 21:14:35 2007 +0100 ntdll: Extra check for ObjectAttributes (Coverity). --- dlls/ntdll/om.c | 2 +- dlls/ntdll/tests/om.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index cac8713..6057caa 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -562,7 +562,7 @@ NTSTATUS WINAPI NtCreateSymbolicLinkObje req->access = DesiredAccess; req->attributes = ObjectAttributes ? ObjectAttributes->Attributes : 0; req->rootdir = ObjectAttributes ? ObjectAttributes->RootDirectory : 0; - if (ObjectAttributes->ObjectName) + if (ObjectAttributes && ObjectAttributes->ObjectName) { req->name_len = ObjectAttributes->ObjectName->Length; wine_server_add_data(req, ObjectAttributes->ObjectName->Buffer, diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 557ee41..e7978a2 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -483,6 +483,13 @@ void test_symboliclink(void) ok(status == STATUS_INVALID_PARAMETER, "NtOpenSymbolicLinkObject should have failed with STATUS_INVALID_PARAMETER got(%08x)\n", status); + /* No attributes */ + pRtlCreateUnicodeStringFromAsciiz(&target, "\\DosDevices"); + status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, &target); + ok(status == STATUS_SUCCESS, "NtCreateSymbolicLinkObject failed(%08x)\n", status); + pRtlFreeUnicodeString(&target); + pNtClose(h); + InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); SYMLNK_TEST_CREATE_FAILURE(&link, STATUS_INVALID_PARAMETER) SYMLNK_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD)

1 0

Andrew Talbot : qcap: Fix a typo.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: 909b6c0dc0bfca1db494176774a6a2f7f77a06e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=909b6c0dc0bfca1db49417677… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 20 20:01:26 2007 +0000 qcap: Fix a typo. --- dlls/qcap/pin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/pin.c b/dlls/qcap/pin.c index 7e579b6..09c3c5d 100644 --- a/dlls/qcap/pin.c +++ b/dlls/qcap/pin.c @@ -132,7 +132,7 @@ HRESULT WINAPI IPinImpl_QueryId(IPin * i TRACE("(%p/%p)->(%p)\n", This, iface, Id); *Id = CoTaskMemAlloc((strlenW(This->pinInfo.achName) + 1) * sizeof(WCHAR)); - if (!Id) + if (!*Id) return E_OUTOFMEMORY; strcpyW(*Id, This->pinInfo.achName);

1 0

Andrew Talbot : dmime: Remove unused variable.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: e907b06b874ddbee5d2e228f896f69b5cfeef3f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e907b06b874ddbee5d2e228f8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 20 18:13:56 2007 +0000 dmime: Remove unused variable. --- dlls/dmime/performance.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index c4c00dd..5ecf7d0 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -71,7 +71,6 @@ static DWORD WINAPI ProcessMsgThread(LPV DWORD timeOut = INFINITE; MSG msg; HRESULT hr; - REFERENCE_TIME rtLastTime; REFERENCE_TIME rtCurTime; DMUS_PMSGItem* it = NULL; DMUS_PMSGItem* cur = NULL; @@ -84,7 +83,6 @@ static DWORD WINAPI ProcessMsgThread(LPV timeOut = INFINITE; EnterCriticalSection(&This->safe); - rtLastTime = rtCurTime; hr = IDirectMusicPerformance8_GetTime((IDirectMusicPerformance8*) This, &rtCurTime, NULL); if (FAILED(hr)) { goto outrefresh;

1 0

Andrew Talbot : oledlg: Declare a function static.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: 1308d09808041b473e340b4f2c255f411b87266b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1308d09808041b473e340b4f2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 20 16:52:22 2007 +0000 oledlg: Declare a function static. --- dlls/oledlg/insobjdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 8928b35..e945a07 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -57,7 +57,7 @@ typedef struct } InsertObjectDlgInfo; -INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +static INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam); static void UIINSERTOBJECTDLG_InitDialog(InsertObjectDlgInfo* pdlgInfo); static void UIINSERTOBJECTDLG_SelectCreateCtrl(InsertObjectDlgInfo* pdlgInfo);

1 0