October 2007 - Wine-commits

Chris Wulff : kernel32: Added a stub for FindVolumeMountPointClose.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 8cf7cb32c5bd57126397766c14621b27a3a92559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf7cb32c5bd57126397766c1… Author: Chris Wulff <crwulff(a)rochester.rr.com> Date: Tue Oct 30 20:02:26 2007 -0400 kernel32: Added a stub for FindVolumeMountPointClose. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/volume.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1032b01..fe98670 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -387,7 +387,7 @@ @ stdcall FindResourceExW(long wstr wstr long) @ stdcall FindResourceW(long wstr wstr) @ stub FindVolumeClose -@ stub FindVolumeMountPointClose +@ stdcall FindVolumeMountPointClose(ptr) @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 0f4c5da..8d3251e 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1406,3 +1406,12 @@ HANDLE WINAPI FindFirstVolumeMountPointW(LPCWSTR root, LPWSTR mount_point, DWORD SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return INVALID_HANDLE_VALUE; } + +/*********************************************************************** + * FindVolumeMountPointClose (KERNEL32.@) + */ +BOOL WINAPI FindVolumeMountPointClose(HANDLE h) +{ + FIXME("(%p), stub!\n", h); + return FALSE; +}

1 0

Chris Wulff : hal: Added stubs for KfAquireSpinLock, KfReleaseSpinLock, KfLowerIrql, KfRaiseIrql.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: d230fd611946b6c1c735a6751cd75b27ba768d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d230fd611946b6c1c735a6751… Author: Chris Wulff <crwulff(a)rochester.rr.com> Date: Tue Oct 30 20:02:00 2007 -0400 hal: Added stubs for KfAquireSpinLock, KfReleaseSpinLock, KfLowerIrql, KfRaiseIrql. --- dlls/hal/Makefile.in | 3 + dlls/hal/hal.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/hal/hal.spec | 8 ++-- 3 files changed, 108 insertions(+), 4 deletions(-) diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in index b382cff..4f3cf1c 100644 --- a/dlls/hal/Makefile.in +++ b/dlls/hal/Makefile.in @@ -5,6 +5,9 @@ VPATH = @srcdir@ MODULE = hal.dll IMPORTS = kernel32 ntdll +C_SRCS = \ + hal.c + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c new file mode 100644 index 0000000..10c695b --- /dev/null +++ b/dlls/hal/hal.c @@ -0,0 +1,101 @@ +/* + * hal.dll implementation + * + * Copyright (C) 2007 Chris Wulff + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "excpt.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); + +#ifdef __i386__ +#define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ + __ASM_GLOBAL_FUNC( name, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name ) +#define DEFINE_FASTCALL2_ENTRYPOINT( name ) \ + __ASM_GLOBAL_FUNC( name, \ + "popl %eax\n\t" \ + "pushl %edx\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name ) +#endif + + +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( KfAcquireSpinLock ) +KIRQL WINAPI __regs_KfAcquireSpinLock(PKSPIN_LOCK SpinLock) +#else +KIRQL WINAPI KfAcquireSpinLock(PKSPIN_LOCK SpinLock) +#endif +{ + FIXME( "(%p) stub!\n", SpinLock ); + + return (KIRQL)0; +} + + +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( KfLowerIrql ) +VOID WINAPI __regs_KfLowerIrql(KIRQL NewIrql) +#else +VOID WINAPI KfLowerIrql(KIRQL NewIrql) +#endif +{ + FIXME( "(%u) stub!\n", NewIrql ); +} + + +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( KfRaiseIrql ) +KIRQL WINAPI __regs_KfRaiseIrql(KIRQL NewIrql) +#else +KIRQL WINAPI KfRaiseIrql(KIRQL NewIrql) +#endif +{ + FIXME( "(%u) stub!\n", NewIrql ); + + return (KIRQL)0; +} + + +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) +VOID WINAPI __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) +#else +VOID WINAPI KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) +#endif +{ + FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 5c5fc5f..298dc8e 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -13,10 +13,10 @@ @ stub KeReleaseQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLockRaiseToSynch -@ stub KfAcquireSpinLock -@ stub KfLowerIrql -@ stub KfRaiseIrql -@ stub KfReleaseSpinLock +@ stdcall -norelay KfAcquireSpinLock(ptr) +@ stdcall -norelay KfLowerIrql(long) +@ stdcall -norelay KfRaiseIrql() +@ stdcall -norelay KfReleaseSpinLock(ptr long) @ stub HalAcquireDisplayOwnership @ stub HalAdjustResourceList @ stub HalAllProcessorsStarted

1 0

Alexandre Julliard : msvcrt: Silence FIXME about an unknown parameter that isn't used.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 3bb04c88b7bbb262e7dcc77c2c031a2df037be6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb04c88b7bbb262e7dcc77c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 12:41:49 2007 +0100 msvcrt: Silence FIXME about an unknown parameter that isn't used. --- dlls/msvcrt/cpp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 045bab2..8328497 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1103,13 +1103,13 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, TRACE("obj: %p unknown: %d src: %p %s dst: %p %s do_throw: %d)\n", cppobj, unknown, src, dbgstr_type_info(src), dst, dbgstr_type_info(dst), do_throw); - if (unknown) FIXME("Unknown parameter is non-zero: please report\n"); - /* To cast an object at runtime: * 1.Find out the true type of the object from the typeinfo at vtable[-1] * 2.Search for the destination type in the class hierarchy * 3.If destination type is found, return base object address + dest offset * Otherwise, fail the cast + * + * FIXME: the unknown parameter doesn't seem to be used for anything */ __TRY {

1 0

Hans Leidekker : pdh: Remove or fix tests that fail on Windows.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: fcb8e3b1974ee6841a688a882571af03103e7e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb8e3b1974ee6841a688a882… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Oct 22 14:03:34 2007 +0200 pdh: Remove or fix tests that fail on Windows. --- dlls/pdh/tests/pdh.c | 39 ++++----------------------------------- 1 files changed, 4 insertions(+), 35 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index f0a33fa..51a2b5f 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -478,7 +478,7 @@ static void test_PdhGetCounterInfoA( void ) ok(ret == ERROR_SUCCESS, "PdhAddCounterA failed 0x%08x\n", ret); ret = PdhGetCounterInfoA( NULL, 0, NULL, NULL ); - ok(ret == PDH_INVALID_HANDLE, "PdhGetCounterInfoA failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_HANDLE || ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoA failed 0x%08x\n", ret); ret = PdhGetCounterInfoA( counter, 0, NULL, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoA failed 0x%08x\n", ret); @@ -532,7 +532,7 @@ static void test_PdhGetCounterInfoW( void ) ok(ret == ERROR_SUCCESS, "PdhAddCounterW failed 0x%08x\n", ret); ret = PdhGetCounterInfoW( NULL, 0, NULL, NULL ); - ok(ret == PDH_INVALID_HANDLE, "PdhGetCounterInfoW failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_HANDLE || ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoW failed 0x%08x\n", ret); ret = PdhGetCounterInfoW( counter, 0, NULL, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoW failed 0x%08x\n", ret); @@ -634,20 +634,9 @@ static void test_PdhLookupPerfNameByIndexA( void ) ret = PdhLookupPerfNameByIndexA( NULL, 0, NULL, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); - size = 1; - ret = PdhLookupPerfNameByIndexA( NULL, 0, NULL, &size ); - ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); - ok(size == 1, "PdhLookupPerfNameByIndexA failed %d\n", size); - - size = sizeof(buffer); - ret = PdhLookupPerfNameByIndexA( NULL, 0, buffer, &size ); - ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); - ok(!strcmp(buffer, "!!"), "PdhLookupPerfNameByIndexA failed %s\n", buffer); - size = 0; ret = PdhLookupPerfNameByIndexA( NULL, 6, buffer, &size ); - ok(ret == PDH_MORE_DATA, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); - ok(size == sizeof("% Processor Time"), "PdhLookupPerfNameByIndexA failed %d\n", size); + ok(ret == PDH_MORE_DATA || ret == PDH_INSUFFICIENT_BUFFER, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); size = sizeof(buffer); ret = PdhLookupPerfNameByIndexA( NULL, 6, buffer, &size ); @@ -656,11 +645,6 @@ static void test_PdhLookupPerfNameByIndexA( void ) "PdhLookupPerfNameByIndexA failed, got %s expected \'%% Processor Time\'\n", buffer); ok(size == sizeof("% Processor Time"), "PdhLookupPerfNameByIndexA failed %d\n", size); - size = 0; - ret = PdhLookupPerfNameByIndexA( NULL, 674, NULL, &size ); - ok(ret == PDH_MORE_DATA, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); - ok(size == sizeof("System Up Time"), "PdhLookupPerfNameByIndexA failed %d\n", size); - size = sizeof(buffer); ret = PdhLookupPerfNameByIndexA( NULL, 674, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); @@ -678,30 +662,15 @@ static void test_PdhLookupPerfNameByIndexW( void ) ret = PdhLookupPerfNameByIndexW( NULL, 0, NULL, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = 1; - ret = PdhLookupPerfNameByIndexW( NULL, 0, NULL, &size ); - ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == 1, "PdhLookupPerfNameByIndexW failed %d\n", size); - - size = sizeof(buffer) / sizeof(WCHAR); - ret = PdhLookupPerfNameByIndexW( NULL, 0, buffer, &size ); - ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = 0; ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); - ok(ret == PDH_MORE_DATA, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(processor_time) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); + ok(ret == PDH_MORE_DATA || ret == PDH_INSUFFICIENT_BUFFER, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); size = sizeof(buffer) / sizeof(WCHAR); ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); ok(size == sizeof(processor_time) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); - size = 0; - ret = PdhLookupPerfNameByIndexW( NULL, 674, NULL, &size ); - ok(ret == PDH_MORE_DATA, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(uptime) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); - size = sizeof(buffer) / sizeof(WCHAR); ret = PdhLookupPerfNameByIndexW( NULL, 674, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret);

1 0

Alex Villacís Lasso : riched20: Allow for Win98 behavior for return value of EM_REPLACESEL.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 38234fabeb41448e54b92ac31ae3888f86e174aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=38234fabeb41448e54b92ac31… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Oct 29 10:25:31 2007 -0500 riched20: Allow for Win98 behavior for return value of EM_REPLACESEL. --- dlls/riched20/tests/editor.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 3dfa28e..670096e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1778,9 +1778,17 @@ static void test_EM_REPLACESEL(void) ok(strcmp(buffer, "RichEdit1\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); + /* Win98's riched20 and WinXP's riched20 disagree on what to return from + EM_REPLACESEL. The general rule seems to be that Win98's riched20 + returns the number of characters *inserted* into the control (after + required conversions), but WinXP's riched20 returns the number of + characters interpreted from the original lParam. Wine's builtin riched20 + implements the WinXP behavior. + */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "RichEdit1\r\n"); - ok(11 == r, "EM_REPLACESEL returned %d, expected 11\n", r); + ok(11 == r /* WinXP */ || 10 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 11 or 10\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); @@ -1806,7 +1814,8 @@ static void test_EM_REPLACESEL(void) /* The following tests show that richedit should handle the special \r\r\n sequence by turning it into a single space on insertion. However, - EM_REPLACESEL returns the number of characters in the original string. + EM_REPLACESEL on WinXP returns the number of characters in the original + string. */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); @@ -1829,7 +1838,8 @@ static void test_EM_REPLACESEL(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\r\r\n"); - ok(3 == r, "EM_REPLACESEL returned %d, expected 3\n", r); + ok(3 == r /* WinXP */ || 1 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 3 or 1\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 1, "EM_EXGETSEL returned cpMin=%d, expected 1\n", cr.cpMin); @@ -1847,7 +1857,8 @@ static void test_EM_REPLACESEL(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\r\r\r\r\r\n\r\r\r"); - ok(9 == r, "EM_REPLACESEL returned %d, expected 9\n", r); + ok(9 == r /* WinXP */ || 7 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 9 or 7\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 7, "EM_EXGETSEL returned cpMin=%d, expected 7\n", cr.cpMin); @@ -1865,7 +1876,8 @@ static void test_EM_REPLACESEL(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\r\r\n\r\n"); - ok(5 == r, "EM_REPLACESEL returned %d, expected 5\n", r); + ok(5 == r /* WinXP */ || 2 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 5 or 2\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 2, "EM_EXGETSEL returned cpMin=%d, expected 2\n", cr.cpMin); @@ -1883,7 +1895,8 @@ static void test_EM_REPLACESEL(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\r\r\n\r\r"); - ok(5 == r, "EM_REPLACESEL returned %d, expected 5\n", r); + ok(5 == r /* WinXP */ || 3 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 5 or 3\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 3, "EM_EXGETSEL returned cpMin=%d, expected 3\n", cr.cpMin); @@ -1901,7 +1914,8 @@ static void test_EM_REPLACESEL(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\rX\r\n\r\r"); - ok(6 == r, "EM_REPLACESEL returned %d, expected 5\n", r); + ok(6 == r /* WinXP */ || 5 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 6 or 5\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 5, "EM_EXGETSEL returned cpMin=%d, expected 5\n", cr.cpMin); @@ -1937,7 +1951,8 @@ static void test_EM_REPLACESEL(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\n\n\n\n\r\r\r\r\n"); - ok(9 == r, "EM_REPLACESEL returned %d, expected 9\n", r); + ok(9 == r /* WinXP */ || 7 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 9 or 7\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 7, "EM_EXGETSEL returned cpMin=%d, expected 7\n", cr.cpMin);

1 0

Michael Stefaniuc : pdh: Fix two missing LeaveCriticalSection() on error paths.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 9056049882b41bbc399673794f842113ddf8a61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9056049882b41bbc399673794… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 30 21:10:09 2007 +0100 pdh: Fix two missing LeaveCriticalSection() on error paths. --- dlls/pdh/pdh_main.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 37613ed..69c12df 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -407,7 +407,11 @@ PDH_STATUS WINAPI PdhCloseQuery( PDH_HQUERY handle ) WaitForSingleObject( thread, INFINITE ); EnterCriticalSection( &pdh_handle_cs ); - if (query->magic != PDH_MAGIC_QUERY) return ERROR_SUCCESS; + if (query->magic != PDH_MAGIC_QUERY) + { + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; + } CloseHandle( query->stop ); CloseHandle( query->thread ); query->thread = NULL; @@ -530,7 +534,11 @@ PDH_STATUS WINAPI PdhCollectQueryDataEx( PDH_HQUERY handle, DWORD interval, HAND WaitForSingleObject( thread, INFINITE ); EnterCriticalSection( &pdh_handle_cs ); - if (query->magic != PDH_MAGIC_QUERY) return PDH_INVALID_HANDLE; + if (query->magic != PDH_MAGIC_QUERY) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } CloseHandle( query->thread ); query->thread = NULL; }

1 0

Tim Schwartz : netapi32: Add stub for NetUseEnum().
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: db994bf6ed82a7cf048e17091477ed35540e6e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db994bf6ed82a7cf048e17091… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Tue Oct 30 15:34:48 2007 -0500 netapi32: Add stub for NetUseEnum(). --- dlls/netapi32/netapi32.c | 8 ++++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index d095647..8847e24 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -157,3 +157,11 @@ DWORD WINAPI NetpNetBiosStatusToApiStatus(DWORD nrc) } return ret; } + +NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWORD prefmaxsize, + LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) +{ + FIXME("stub (%p, %d, %p, %d, %p, %p, %p)\n", server, level, bufptr, prefmaxsize, + entriesread, totalentries, resumehandle); + return ERROR_NOT_SUPPORTED; +} diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index e546151..2750497 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -199,7 +199,7 @@ @ stdcall NetStatisticsGet(wstr wstr long long ptr) @ stdcall NetUseAdd(wstr long ptr ptr) @ stub NetUseDel -@ stub NetUseEnum +@ stdcall NetUseEnum(wstr long ptr long ptr ptr ptr) @ stub NetUseGetInfo @ stdcall NetUserAdd(wstr long ptr ptr) @ stdcall NetUserChangePassword(wstr wstr wstr wstr)

1 0

Stefan Leichter : d3dx8: Fix number of parameter of functions D3DXVec4Cross and D3DXVec?CatmullRom.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: b84a7844b6736edf21af167817dcbd5d45890d41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84a7844b6736edf21af16781… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Oct 30 22:56:03 2007 +0100 d3dx8: Fix number of parameter of functions D3DXVec4Cross and D3DXVec?CatmullRom. --- dlls/d3dx8/d3dx8.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 2b7eedd..07d6235 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -1,23 +1,23 @@ @ stdcall D3DXVec2Normalize(ptr ptr) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr long) -@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr long) +@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr long long) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec2Transform(ptr ptr ptr) @ stdcall D3DXVec2TransformCoord(ptr ptr ptr) @ stdcall D3DXVec2TransformNormal(ptr ptr ptr) @ stdcall D3DXVec3Normalize(ptr ptr) @ stdcall D3DXVec3Hermite(ptr ptr ptr ptr ptr long) -@ stdcall D3DXVec3CatmullRom(ptr ptr ptr ptr long) +@ stdcall D3DXVec3CatmullRom(ptr ptr ptr ptr long long) @ stdcall D3DXVec3BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec3Transform(ptr ptr ptr) @ stdcall D3DXVec3TransformCoord(ptr ptr ptr) @ stdcall D3DXVec3TransformNormal(ptr ptr ptr) @ stub D3DXVec3Project @ stub D3DXVec3Unproject -@ stdcall D3DXVec4Cross(ptr ptr ptr) +@ stdcall D3DXVec4Cross(ptr ptr ptr ptr) @ stdcall D3DXVec4Normalize(ptr ptr) @ stdcall D3DXVec4Hermite(ptr ptr ptr ptr ptr long) -@ stdcall D3DXVec4CatmullRom(ptr ptr ptr ptr long) +@ stdcall D3DXVec4CatmullRom(ptr ptr ptr ptr long long) @ stdcall D3DXVec4BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec4Transform(ptr ptr ptr) @ stdcall D3DXMatrixfDeterminant(ptr)

1 0

Andrew Talbot : shell32: Constify some variables.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: e7636c13e564d52d074b732b59e3999a89118c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7636c13e564d52d074b732b5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 30 23:07:38 2007 +0000 shell32: Constify some variables. --- dlls/shell32/shell.c | 2 +- dlls/shell32/shell32_main.h | 2 +- dlls/shell32/shlexec.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 26b6146..0078f57 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -584,7 +584,7 @@ DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len ) * SHELL_Execute16 [Internal] */ static UINT_PTR SHELL_Execute16(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, - LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) + const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out) { UINT ret; char sCmd[MAX_PATH]; diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index f5fcf37..367bbde 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -220,7 +220,7 @@ static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) #define HINSTANCE_16(h32) (LOWORD(h32)) typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, - LPSHELLEXECUTEINFOW sei, LPSHELLEXECUTEINFOW sei_out); + const SHELLEXECUTEINFOW *sei, LPSHELLEXECUTEINFOW sei_out); BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc); diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 69608df..743d495 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -298,7 +298,7 @@ static HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR psz * */ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, - LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) + const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out) { STARTUPINFOW startup; PROCESS_INFORMATION info; @@ -752,7 +752,7 @@ static HDDEDATA CALLBACK dde_cb(UINT uType, UINT uFmt, HCONV hConv, static unsigned dde_connect(WCHAR* key, const WCHAR* start, WCHAR* ddeexec, const WCHAR* lpFile, WCHAR *env, LPCWSTR szCommandline, LPITEMIDLIST pidl, SHELL_ExecuteW32 execfunc, - LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) + const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out) { static const WCHAR wApplication[] = {'\\','a','p','p','l','i','c','a','t','i','o','n',0}; static const WCHAR wTopic[] = {'\\','t','o','p','i','c',0}; @@ -1034,7 +1034,7 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR } /* FIXME: is this already implemented somewhere else? */ -static HKEY ShellExecute_GetClassKey( LPSHELLEXECUTEINFOW sei ) +static HKEY ShellExecute_GetClassKey( const SHELLEXECUTEINFOW *sei ) { LPCWSTR ext = NULL, lpClass = NULL; LPWSTR cls = NULL;

1 0

Dan Hipschman : widl: Add a --local-stubs option.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: ea7ab4da66c4eb96768fc210e34e1e2d14e284a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7ab4da66c4eb96768fc210e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Oct 30 19:07:36 2007 -0700 widl: Add a --local-stubs option. --- tools/widl/header.c | 75 ++++++++++++++++++++++++++++++++++++----------- tools/widl/header.h | 1 + tools/widl/parser.y | 2 + tools/widl/widl.c | 28 ++++++++++++++++++ tools/widl/widl.h | 2 + tools/widl/widl.man.in | 7 ++++- 6 files changed, 96 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea7ab4da66c4eb96768fc…

1 0