January 2009 - Wine-Commits

Alistair Leslie-Hughes : msxml3: Register missing SAXXMLReader Components.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: ceed55a46acfe4cfdb407c849b3ad74dbae56651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceed55a46acfe4cfdb407c849… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 21 16:19:26 2009 +1100 msxml3: Register missing SAXXMLReader Components. --- dlls/msxml3/regsvr.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index a6ed0ee..9ca8afe 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -564,6 +564,14 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.SAXXMLReader", "3.0" }, + { &CLSID_SAXXMLReader30, + "SAX XML Reader 3.0", + NULL, + "msxml3.dll", + "Both", + "Msxml2.SAXXMLReader", + "3.0" + }, { NULL } /* list terminator */ }; @@ -653,6 +661,16 @@ static struct progid const progid_list[] = { &CLSID_XMLSchemaCache30, NULL }, + { "Msxml2.SAXXMLReader", + "SAX XML Reader", + &CLSID_SAXXMLReader, + "Msxml2.SAXXMLReader.3.0" + }, + { "Msxml2.SAXXMLReader.3.0", + "SAX XML Reader 3.0", + &CLSID_SAXXMLReader30, + NULL + }, { NULL } /* list terminator */ };

1 0

Jeff Latimer : user32: Check the instance id on DdeCreateDataHandle and retire a couple of todos.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: c5bc4b2c9a8ce8aa6e95d3800bf1d9d5021417e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bc4b2c9a8ce8aa6e95d3800… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Jan 22 23:35:27 2009 +1100 user32: Check the instance id on DdeCreateDataHandle and retire a couple of todos. --- dlls/user32/dde_misc.c | 30 +++++++++++++++++++++++++++++- dlls/user32/tests/dde.c | 30 ++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 9 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 89a6bb0..2b7fb81 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -817,6 +817,25 @@ UINT WINAPI DdeGetLastError(DWORD idInst) return error_code; } +/****************************************************************** + * WDML_SetAllLastError + * + * + */ +static void WDML_SetAllLastError(DWORD lastError) +{ + DWORD threadID; + WDML_INSTANCE* pInstance; + threadID = GetCurrentThreadId(); + pInstance = WDML_InstanceList; + while (pInstance) + { + if (pInstance->threadID == threadID) + pInstance->lastError = lastError; + pInstance = pInstance->next; + } +} + /* ================================================================ * * String management @@ -1267,15 +1286,24 @@ INT WINAPI DdeCmpStringHandles(HSZ hsz1, HSZ hsz2) HDDEDATA WINAPI DdeCreateDataHandle(DWORD idInst, LPBYTE pSrc, DWORD cb, DWORD cbOff, HSZ hszItem, UINT wFmt, UINT afCmd) { - /* For now, we ignore idInst, hszItem. + + /* Other than check for validity we will ignore for now idInst, hszItem. * The purpose of these arguments still need to be investigated. */ + WDML_INSTANCE* pInstance; HGLOBAL hMem; LPBYTE pByte; DDE_DATAHANDLE_HEAD* pDdh; WCHAR psz[MAX_BUFFER_LEN]; + pInstance = WDML_GetInstance(idInst); + if (pInstance == NULL) + { + WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); + return NULL; + } + if (!GetAtomNameW(HSZ2ATOM(hszItem), psz, MAX_BUFFER_LEN)) { psz[0] = HSZ2ATOM(hszItem); diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 1d14df6..eaea63c 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1544,7 +1544,7 @@ static void test_DdeCreateStringHandleW(DWORD dde_inst, int codepage) static void test_DdeCreateDataHandle(void) { HDDEDATA hdata; - DWORD dde_inst; + DWORD dde_inst, dde_inst2; DWORD size; UINT res, err; BOOL ret; @@ -1552,27 +1552,41 @@ static void test_DdeCreateDataHandle(void) LPBYTE ptr; dde_inst = 0; + dde_inst2 = 0; res = DdeInitializeA(&dde_inst, client_ddeml_callback, APPCMD_CLIENTONLY, 0); ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + res = DdeInitializeA(&dde_inst2, client_ddeml_callback, APPCMD_CLIENTONLY, 0); + ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + item = DdeCreateStringHandleA(dde_inst, "item", CP_WINANSI); ok(item != NULL, "Expected non-NULL hsz\n"); + item = DdeCreateStringHandleA(dde_inst2, "item", CP_WINANSI); + ok(item != NULL, "Expected non-NULL hsz\n"); if (0) { /* do not test with an invalid instance id: that crashes on win9x */ hdata = DdeCreateDataHandle(0xdeadbeef, (LPBYTE)"data", MAX_PATH, 0, item, CF_TEXT, 0); } - /* 0 instance id */ + /* 0 instance id + * This block tests an invalid instance Id. The correct behaviour is that if the instance Id + * is invalid then the lastError of all instances is set to the error. There are two instances + * created, lastError is cleared, an error is generated and then both instances are checked to + * ensure that they both have the same error set + */ DdeGetLastError(dde_inst); + DdeGetLastError(dde_inst2); hdata = DdeCreateDataHandle(0, (LPBYTE)"data", MAX_PATH, 0, item, CF_TEXT, 0); err = DdeGetLastError(dde_inst); - todo_wine - { - ok(hdata == NULL, "Expected NULL, got %p\n", hdata); - ok(err == DMLERR_INVALIDPARAMETER, - "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); - } + ok(hdata == NULL, "Expected NULL, got %p\n", hdata); + ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); + err = DdeGetLastError(dde_inst2); + ok(err == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); + + ret = DdeUninitialize(dde_inst2); + ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + /* NULL pSrc */ DdeGetLastError(dde_inst);

1 0

Huw Davies : comdlg32: Rename pagesetup data type to reflect upcoming unicode/ansi merge.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: 10dfcfb9a007474ff923642e54f06f95cc5dce0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=10dfcfb9a007474ff923642e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 22 12:24:07 2009 +0000 comdlg32: Rename pagesetup data type to reflect upcoming unicode/ansi merge. --- dlls/comdlg32/printdlg.c | 349 +++++++++++++++++++++++----------------------- 1 files changed, 177 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10dfcfb9a007474ff9236…

1 0

Nikolay Sivov : kernel32: Make GetOverlappedResult crash on NULL args as native does.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: 32cc4011ee04046d41a41549d5a6a6233647f756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32cc4011ee04046d41a41549d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 22 15:00:33 2009 +0300 kernel32: Make GetOverlappedResult crash on NULL args as native does. --- dlls/kernel32/file.c | 8 +------- dlls/kernel32/tests/file.c | 6 ++++++ dlls/ole32/rpc.c | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 92dbedf..e757205 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -603,12 +603,6 @@ BOOL WINAPI GetOverlappedResult(HANDLE hFile, LPOVERLAPPED lpOverlapped, TRACE( "(%p %p %p %x)\n", hFile, lpOverlapped, lpTransferred, bWait ); - if ( lpOverlapped == NULL ) - { - ERR("lpOverlapped was null\n"); - return FALSE; - } - status = lpOverlapped->Internal; if (status == STATUS_PENDING) { @@ -624,7 +618,7 @@ BOOL WINAPI GetOverlappedResult(HANDLE hFile, LPOVERLAPPED lpOverlapped, status = lpOverlapped->Internal; } - if (lpTransferred) *lpTransferred = lpOverlapped->InternalHigh; + *lpTransferred = lpOverlapped->InternalHigh; if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ed893fc..1196d7a 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2022,6 +2022,12 @@ static void test_overlapped(void) DWORD r, result; /* GetOverlappedResult crashes if the 2nd or 3rd param are NULL */ + if (0) /* tested: WinXP */ + { + GetOverlappedResult(0, NULL, &result, FALSE); + GetOverlappedResult(0, &ov, NULL, FALSE); + GetOverlappedResult(0, NULL, NULL, FALSE); + } memset( &ov, 0, sizeof ov ); result = 1; diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index caad344..caf5b6a 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1861,6 +1861,7 @@ static DWORD WINAPI local_server_thread(LPVOID param) BOOL multi_use = lsp->multi_use; OVERLAPPED ovl; HANDLE pipe_event; + DWORD bytes; TRACE("Starting threader for %s.\n",debugstr_guid(&lsp->clsid)); @@ -1929,7 +1930,7 @@ static DWORD WINAPI local_server_thread(LPVOID param) } WriteFile(hPipe,buffer,buflen,&res,&ovl); - GetOverlappedResult(hPipe, &ovl, NULL, TRUE); + GetOverlappedResult(hPipe, &ovl, &bytes, TRUE); HeapFree(GetProcessHeap(),0,buffer); FlushFileBuffers(hPipe);

1 0

Austin English : iphplapi: Include <sys/timeout.h> for OpenBSD/NetBSD.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: 8b1959134ea954584b56e1098d48d137e16e0e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1959134ea954584b56e1098… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 21 21:59:11 2009 -0600 iphplapi: Include <sys/timeout.h> for OpenBSD/NetBSD. --- configure | 2 ++ configure.ac | 1 + dlls/iphlpapi/ipstats.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 9 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 8f4a3d8..f327766 100755 --- a/configure +++ b/configure @@ -7505,6 +7505,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7609,6 +7610,7 @@ for ac_header in \ sys/strtio.h \ sys/syscall.h \ sys/time.h \ + sys/timeout.h \ sys/times.h \ sys/uio.h \ sys/un.h \ diff --git a/configure.ac b/configure.ac index 25e78e8..1a2828d 100644 --- a/configure.ac +++ b/configure.ac @@ -354,6 +354,7 @@ AC_CHECK_HEADERS(\ sys/strtio.h \ sys/syscall.h \ sys/time.h \ + sys/timeout.h \ sys/times.h \ sys/uio.h \ sys/un.h \ diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 5c11c21..5d0be71 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -37,6 +37,9 @@ #ifdef HAVE_SYS_SOCKETVAR_H #include <sys/socketvar.h> #endif +#ifdef HAVE_SYS_TIMEOUT_H +#include <sys/timeout.h> +#endif #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif diff --git a/include/config.h.in b/include/config.h.in index bb43b61..db83db0 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -900,6 +900,9 @@ /* Define to 1 if you have the <sys/thr.h> header file. */ #undef HAVE_SYS_THR_H +/* Define to 1 if you have the <sys/timeout.h> header file. */ +#undef HAVE_SYS_TIMEOUT_H + /* Define to 1 if you have the <sys/times.h> header file. */ #undef HAVE_SYS_TIMES_H

1 0

Austin English : iphplapi: Reorder includes for NetBSD.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: 0b98f45bf09128f130288fbf0920ece7021b5124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b98f45bf09128f130288fbf0… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 21 06:38:17 2009 -0600 iphplapi: Reorder includes for NetBSD. --- dlls/iphlpapi/ipstats.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index f939200..5c11c21 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -67,6 +67,9 @@ #ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> #endif +#ifdef HAVE_NETINET_IP_VAR_H +#include <netinet/ip_var.h> +#endif #ifdef HAVE_NETINET_TCP_FSM_H #include <netinet/tcp_fsm.h> #endif @@ -88,9 +91,6 @@ #ifdef HAVE_NETINET_ICMP_VAR_H #include <netinet/icmp_var.h> #endif -#ifdef HAVE_NETINET_IP_VAR_H -#include <netinet/ip_var.h> -#endif #ifdef HAVE_NETINET_UDP_H #include <netinet/udp.h> #endif

1 0

Juan Lang : quartz: Only test for the presence or absence of a single filter in a loop. Testing for more than one depends on the order of enumeration, which isn' t guaranteed.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: 669ced3a674df73928bc5bc5d4d57093f807d878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=669ced3a674df73928bc5bc5d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 21 10:38:55 2009 -0800 quartz: Only test for the presence or absence of a single filter in a loop. Testing for more than one depends on the order of enumeration, which isn't guaranteed. --- dlls/quartz/tests/filtermapper.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index f7d47ab..e8d3678 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -142,6 +142,16 @@ static void test_fm2_enummatchingfilters(void) { found = enum_find_filter(wszFilterName1, pEnum); ok(found, "EnumMatchingFilters failed to return the test filter 1\n"); + } + + if (pEnum) IEnumMoniker_Release(pEnum); + pEnum = NULL; + + hr = IFilterMapper2_EnumMatchingFilters(pMapper, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, + 0, NULL, NULL, &GUID_NULL, FALSE, FALSE, 0, NULL, NULL, &GUID_NULL); + ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); + if (SUCCEEDED(hr) && pEnum) + { found = enum_find_filter(wszFilterName2, pEnum); ok(found, "EnumMatchingFilters failed to return the test filter 2\n"); } @@ -159,6 +169,17 @@ static void test_fm2_enummatchingfilters(void) { found = enum_find_filter(wszFilterName1, pEnum); ok(found, "EnumMatchingFilters failed to return the test filter 1\n"); + } + + if (pEnum) IEnumMoniker_Release(pEnum); + pEnum = NULL; + + hr = IFilterMapper2_EnumMatchingFilters(pMapper, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, + 0, NULL, NULL, &GUID_NULL, TRUE, FALSE, 0, NULL, NULL, &GUID_NULL); + ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); + + if (SUCCEEDED(hr) && pEnum) + { found = enum_find_filter(wszFilterName2, pEnum); ok(!found, "EnumMatchingFilters should not return the test filter 2\n"); }

1 0

Juan Lang : rpcrt4: Use pseudo-random numbers to generate UUIDs rather than using the (old, deprecated) MAC-address-and-time generation algorithm.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: 5e5b53666c852fd4f29a893cef3f0aeb53690a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5b53666c852fd4f29a893ce… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 21 10:39:46 2009 -0800 rpcrt4: Use pseudo-random numbers to generate UUIDs rather than using the (old, deprecated) MAC-address-and-time generation algorithm. --- dlls/rpcrt4/Makefile.in | 2 +- dlls/rpcrt4/rpcrt4_main.c | 152 +++++---------------------------------------- dlls/rpcrt4/tests/rpc.c | 2 - 3 files changed, 16 insertions(+), 140 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 14ee4a3..b44bfb0 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rpcrt4.dll IMPORTLIB = rpcrt4 -IMPORTS = uuid iphlpapi advapi32 kernel32 ntdll +IMPORTS = uuid advapi32 kernel32 ntdll DELAYIMPORTS = secur32 user32 C_SRCS = \ diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 1a6b61d..f1a966f 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -43,8 +43,7 @@ #include "winuser.h" #include "winnt.h" #include "winternl.h" -#include "iptypes.h" -#include "iphlpapi.h" +#include "ntsecapi.h" #include "wine/unicode.h" #include "rpc.h" @@ -60,15 +59,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(rpc); static UUID uuid_nil; -static CRITICAL_SECTION uuid_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &uuid_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": uuid_cs") } -}; -static CRITICAL_SECTION uuid_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; - static CRITICAL_SECTION threaddata_cs; static CRITICAL_SECTION_DEBUG threaddata_cs_debug = { @@ -280,61 +270,6 @@ RPC_STATUS WINAPI UuidCreateNil(UUID *Uuid) return RPC_S_OK; } -/* Number of 100ns ticks per clock tick. To be safe, assume that the clock - resolution is at least 1000 * 100 * (1/1000000) = 1/10 of a second */ -#define TICKS_PER_CLOCK_TICK 1000 -#define SECSPERDAY 86400 -#define TICKSPERSEC 10000000 -/* UUID system time starts at October 15, 1582 */ -#define SECS_15_OCT_1582_TO_1601 ((17 + 30 + 31 + 365 * 18 + 5) * SECSPERDAY) -#define TICKS_15_OCT_1582_TO_1601 ((ULONGLONG)SECS_15_OCT_1582_TO_1601 * TICKSPERSEC) - -static void RPC_UuidGetSystemTime(ULONGLONG *time) -{ - FILETIME ft; - - GetSystemTimeAsFileTime(&ft); - - *time = ((ULONGLONG)ft.dwHighDateTime << 32) | ft.dwLowDateTime; - *time += TICKS_15_OCT_1582_TO_1601; -} - -/* Assume that a hardware address is at least 6 bytes long */ -#define ADDRESS_BYTES_NEEDED 6 - -static RPC_STATUS RPC_UuidGetNodeAddress(BYTE *address) -{ - int i; - DWORD status = RPC_S_OK; - - ULONG buflen = sizeof(IP_ADAPTER_INFO); - PIP_ADAPTER_INFO adapter = HeapAlloc(GetProcessHeap(), 0, buflen); - - if (GetAdaptersInfo(adapter, &buflen) == ERROR_BUFFER_OVERFLOW) { - HeapFree(GetProcessHeap(), 0, adapter); - adapter = HeapAlloc(GetProcessHeap(), 0, buflen); - } - - if (GetAdaptersInfo(adapter, &buflen) == NO_ERROR) { - for (i = 0; i < ADDRESS_BYTES_NEEDED; i++) { - address[i] = adapter->Address[i]; - } - } - /* We can't get a hardware address, just use random numbers. - Set the multicast bit to prevent conflicts with real cards. */ - else { - for (i = 0; i < ADDRESS_BYTES_NEEDED; i++) { - address[i] = rand() & 0xff; - } - - address[0] |= 0x01; - status = RPC_S_UUID_LOCAL_ONLY; - } - - HeapFree(GetProcessHeap(), 0, adapter); - return status; -} - /************************************************************************* * UuidCreate [RPCRT4.@] * @@ -345,83 +280,26 @@ static RPC_STATUS RPC_UuidGetNodeAddress(BYTE *address) * RPC_S_OK if successful. * RPC_S_UUID_LOCAL_ONLY if UUID is only locally unique. * - * FIXME: No compensation for changes across reloading - * this dll or across reboots (e.g. clock going - * backwards and swapped network cards). The RFC - * suggests using NVRAM for storing persistent - * values. + * NOTES + * + * Follows RFC 4122, section 4.4 (Algorithms for Creating a UUID from + * Truly Random or Pseudo-Random Numbers) */ RPC_STATUS WINAPI UuidCreate(UUID *Uuid) { - static int initialised, count; - - ULONGLONG time; - static ULONGLONG timelast; - static WORD sequence; - - static DWORD status; - static BYTE address[MAX_ADAPTER_ADDRESS_LENGTH]; - - EnterCriticalSection(&uuid_cs); - - if (!initialised) { - RPC_UuidGetSystemTime(&timelast); - count = TICKS_PER_CLOCK_TICK; - - sequence = ((rand() & 0xff) << 8) + (rand() & 0xff); - sequence &= 0x1fff; - - status = RPC_UuidGetNodeAddress(address); - initialised = 1; - } - - /* Generate time element of the UUID. Account for going faster - than our clock as well as the clock going backwards. */ - while (1) { - RPC_UuidGetSystemTime(&time); - if (time > timelast) { - count = 0; - break; - } - if (time < timelast) { - sequence = (sequence + 1) & 0x1fff; - count = 0; - break; - } - if (count < TICKS_PER_CLOCK_TICK) { - count++; - break; - } - } - - timelast = time; - time += count; - - /* Pack the information into the UUID structure. */ - - Uuid->Data1 = (unsigned long)(time & 0xffffffff); - Uuid->Data2 = (unsigned short)((time >> 32) & 0xffff); - Uuid->Data3 = (unsigned short)((time >> 48) & 0x0fff); - - /* This is a version 1 UUID */ - Uuid->Data3 |= (1 << 12); - - Uuid->Data4[0] = sequence & 0xff; - Uuid->Data4[1] = (sequence & 0x3f00) >> 8; - Uuid->Data4[1] |= 0x80; - - Uuid->Data4[2] = address[0]; - Uuid->Data4[3] = address[1]; - Uuid->Data4[4] = address[2]; - Uuid->Data4[5] = address[3]; - Uuid->Data4[6] = address[4]; - Uuid->Data4[7] = address[5]; - - LeaveCriticalSection(&uuid_cs); + RtlGenRandom(Uuid, sizeof(*Uuid)); + /* Clear the version bits and set the version (4) */ + Uuid->Data3 &= 0x0fff; + Uuid->Data3 |= (4 << 12); + /* Set the topmost bits of Data4 (clock_seq_hi_and_reserved) as + * specified in RFC 4122, section 4.4. + */ + Uuid->Data4[0] &= 0x3f; + Uuid->Data4[0] |= 0x80; TRACE("%s\n", debugstr_guid(Uuid)); - return status; + return RPC_S_OK; } /************************************************************************* diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 9ac6d27..e50dcdc 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -780,7 +780,6 @@ static void test_UuidCreate(void) UuidCreate(&guid); version = (guid.Data3 & 0xf000) >> 12; - todo_wine ok(version == 4 || broken(version == 1), "unexpected version %d\n", version); if (version == 4) @@ -826,7 +825,6 @@ static void test_UuidCreate(void) * present. Just check that Data4[0]'s most significant bits are * set as expected. */ - todo_wine ok((guid.Data4[0] & 0xc0) == 0x80, "unexpected value in Data4[0]: %02x\n", guid.Data4[0] & 0xc0); }

1 0

Jacek Caban : wininet: Set dwError to 0 in first INTERNET_STATUS_REQUEST_COMPLETE notification.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: e13781a3158e776f8263127ce82fcbbeccfd6225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13781a3158e776f8263127ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 22 13:48:23 2009 +0100 wininet: Set dwError to 0 in first INTERNET_STATUS_REQUEST_COMPLETE notification. --- dlls/wininet/http.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0dd68fa..ac42f96 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1636,20 +1636,22 @@ static DWORD HTTPREQ_SetOption(WININETHANDLEHEADER *hdr, DWORD option, void *buf return ERROR_INTERNET_INVALID_OPTION; } -static void HTTP_ReceiveRequestData(WININETHTTPREQW *req) +static void HTTP_ReceiveRequestData(WININETHTTPREQW *req, BOOL first_notif) { INTERNET_ASYNC_RESULT iar; BYTE buffer[4096]; + int available; BOOL res; TRACE("%p\n", req); res = NETCON_recv(&req->netConnection, buffer, min(sizeof(buffer), req->dwContentLength - req->dwContentRead), - MSG_PEEK, (int *)&iar.dwError); + MSG_PEEK, &available); if(res) { iar.dwResult = (DWORD_PTR)req->hdr.hInternet; + iar.dwError = first_notif ? 0 : available; }else { iar.dwResult = 0; iar.dwError = INTERNET_GetLastError(); @@ -1936,7 +1938,7 @@ static void HTTPREQ_AsyncQueryDataAvailableProc(WORKREQUEST *workRequest) { WININETHTTPREQW *req = (WININETHTTPREQW*)workRequest->hdr; - HTTP_ReceiveRequestData(req); + HTTP_ReceiveRequestData(req, FALSE); } static DWORD HTTPREQ_QueryDataAvailable(WININETHANDLEHEADER *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) @@ -3552,7 +3554,7 @@ lend: if(lpwhr->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { if(bSuccess) { - HTTP_ReceiveRequestData(lpwhr); + HTTP_ReceiveRequestData(lpwhr, TRUE); }else { iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; iar.dwError = INTERNET_GetLastError();

1 0

Jacek Caban : jscript: Fixed Math.round with no argument.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: 7bd79152a5cb27a5a4b7f49a6043cb0fcc4d11a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd79152a5cb27a5a4b7f49a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 22 13:47:13 2009 +0100 jscript: Fixed Math.round with no argument. --- dlls/jscript/math.c | 4 ++-- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 9c1a56b..4f6c049 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -381,8 +381,8 @@ static HRESULT Math_round(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS TRACE("\n"); if(!arg_cnt(dp)) { - FIXME("arg_cnt = 0\n"); - return E_NOTIMPL; + num_set_nan(retv); + return S_OK; } hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7fd20a6..f370098 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -519,6 +519,9 @@ ok(tmp === 1, "Math.round(true) = " + tmp); tmp = Math.round(1.1, 3, 4); ok(tmp === 1, "Math.round(1.1, 3, 4) = " + tmp); +tmp = Math.round(); +ok(isNaN(tmp), "Math.round() is not NaN"); + tmp = Math.ceil(0.5); ok(tmp === 1, "Math.ceil(0.5) = " + tmp);

1 0