August 2007 - Wine-commits - list.winehq.org

Francois Gouget : ntdll: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: cd1c07b4d8fd9150fc6684a184f9142c7c7d67bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd1c07b4d8fd9150fc6684a18… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 15 14:52:06 2007 +0200 ntdll: Better match the PSDK types and fix the winapi_check warnings. --- dlls/ntdll/actctx.c | 2 +- tools/winapi/win32.api | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 5d13afd..4f0901b 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2277,7 +2277,7 @@ void WINAPI RtlReleaseActivationContext( HANDLE handle ) /****************************************************************** * RtlActivateActivationContext (NTDLL.@) */ -NTSTATUS WINAPI RtlActivateActivationContext( ULONG unknown, HANDLE handle, ULONG_PTR *cookie ) +NTSTATUS WINAPI RtlActivateActivationContext( ULONG unknown, HANDLE handle, PULONG_PTR cookie ) { RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame; diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 7c6d1e3..2d8d82b 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2999,11 +2999,13 @@ BYTE CCHAR CHAR DWORD +EVENT_INFORMATION_CLASS FILE_INFORMATION_CLASS FS_INFORMATION_CLASS HANDLE HMODULE INT +IO_COMPLETION_INFORMATION_CLASS KEY_INFORMATION_CLASS KEY_VALUE_INFORMATION_CLASS KPROFILE_SOURCE

1 0

Francois Gouget : ntoskrnel.exe: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: f20cd498e0781165788a119d94df0ef28a313fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20cd498e0781165788a119d9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 15 14:52:23 2007 +0200 ntoskrnel.exe: Better match the PSDK types and fix the winapi_check warnings. --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- include/ddk/wdm.h | 4 ++-- tools/winapi/win32.api | 29 +++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d793d1a..4b16c39 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -461,7 +461,7 @@ ULONG WINAPI KeQueryTimeIncrement(void) /*********************************************************************** * MmAllocateNonCachedMemory (NTOSKRNL.EXE.@) */ -LPVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size ) +PVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size ) { TRACE( "%lu\n", size ); return VirtualAlloc( NULL, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE|PAGE_NOCACHE ); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 8aabf79..f9e2a5f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -886,7 +886,7 @@ void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); -LPVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); +PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); #define PsGetCurrentProcess() IoGetCurrentProcess() @@ -956,7 +956,7 @@ NTSTATUS WINAPI ZwQueryEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOLEAN,PVOID NTSTATUS WINAPI ZwQueryFullAttributesFile(const OBJECT_ATTRIBUTES*,FILE_NETWORK_OPEN_INFORMATION*); NTSTATUS WINAPI ZwQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,LONG,FILE_INFORMATION_CLASS); NTSTATUS WINAPI ZwQueryInformationThread(HANDLE,THREADINFOCLASS,PVOID,ULONG,PULONG); -NTSTATUS WINAPI ZwQueryInformationToken(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); +NTSTATUS WINAPI ZwQueryInformationToken(HANDLE,DWORD,PVOID,DWORD,LPDWORD); NTSTATUS WINAPI ZwQueryInstallUILanguage(LANGID*); NTSTATUS WINAPI ZwQueryKey(HANDLE,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *); NTSTATUS WINAPI ZwQueryObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 2d8d82b..36ded2d 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3238,6 +3238,35 @@ LPSTR LPCWSTR LPWSTR +%%ntoskrnl.exe + +%long + +BOOLEAN +DEVICE_TYPE +HANDLE +NTSTATUS +POOL_TYPE +SIZE_T +ULONG + +%ptr + +DEVICE_OBJECT * +DEVICE_OBJECT ** +DRIVER_OBJECT * +LARGE_INTEGER * +PCREATE_PROCESS_NOTIFY_ROUTINE +PKTIMER +PVOID +ULONG * +UNICODE_STRING * +void * + +%void + +void + %%odbc32.dll %long

1 0

Francois Gouget : ntprint: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: ee3b2632ef579ff43c71dcc562a16b554eb27081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3b2632ef579ff43c71dcc56… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 15 14:52:29 2007 +0200 ntprint: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 36ded2d..781573f 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3267,6 +3267,27 @@ void * void +%%ntprint.dll + +%long + +BOOL +DWORD +HANDLE + +%ptr + +LPDWORD +LPVOID + +%wstr + +LPWSTR + +%void + +VOID + %%odbc32.dll %long

1 0

Francois Gouget : printui: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: ce26e78c23a544db17fef661e462766de4749f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce26e78c23a544db17fef661e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 15 14:52:34 2007 +0200 printui: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 781573f..c26f348 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3864,6 +3864,22 @@ PWRSCHEMESENUMPROC LPWSTR +%%printui.dll + +%long + +DWORD +HINSTANCE +HWND + +%wstr + +LPCWSTR + +%void + +void + %%psapi.dll %long

1 0

Jacek Caban : mshtml: Call setup_nswindow on load event.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 865d92a6e416b94ed46b73182370b00889c7a5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=865d92a6e416b94ed46b73182… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 15 12:40:19 2007 +0200 mshtml: Call setup_nswindow on load event. --- dlls/mshtml/nsevents.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index f03b731..b61aec2 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -136,6 +136,8 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event if(!This->doc) return NS_OK; + setup_nswindow(This->doc->window); + if(This->editor_controller) { nsIController_Release(This->editor_controller); This->editor_controller = NULL;

1 0

Paul Vriens : secur32/tests: Run tests on win95 again.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 22e48388d563cb4ee3e66603982e9aa9c0a5ff4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e48388d563cb4ee3e666039… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 15 13:33:47 2007 +0200 secur32/tests: Run tests on win95 again. --- dlls/secur32/tests/schannel.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b71040a..785ad26 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -32,6 +32,8 @@ static SECURITY_STATUS (SEC_ENTRY * pAcquireCredentialsHandleA)(SEC_CHAR*, SEC_C ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp); static SECURITY_STATUS (SEC_ENTRY * pFreeCredentialsHandle)(PCredHandle); +static BOOL (WINAPI * pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD); + static const BYTE bigCert[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, 0x22, @@ -97,6 +99,8 @@ static const BYTE selfSignedCert[] = { static void InitFunctionPtrs(void) { + HMODULE advapi32dll = GetModuleHandleA("advapi32.dll"); + secdll = LoadLibraryA("secur32.dll"); if(!secdll) secdll = LoadLibraryA("security.dll"); @@ -105,6 +109,8 @@ static void InitFunctionPtrs(void) pAcquireCredentialsHandleA = (PVOID)GetProcAddress(secdll, "AcquireCredentialsHandleA"); pFreeCredentialsHandle = (PVOID)GetProcAddress(secdll, "FreeCredentialsHandle"); } + + pCryptAcquireContextW = (void *)GetProcAddress(advapi32dll, "CryptAcquireContextW"); } static void testAcquireSecurityContext(void) @@ -136,7 +142,7 @@ static void testAcquireSecurityContext(void) certs[1] = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert)); - CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET); st = pAcquireCredentialsHandleA(NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, @@ -253,7 +259,7 @@ static void testAcquireSecurityContext(void) ok(st == SEC_E_UNKNOWN_CREDENTIALS, "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); - ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + ret = pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET); ok(ret, "CryptAcquireContextW failed: %08x\n", GetLastError()); ret = CryptImportKey(csp, privKey, sizeof(privKey), 0, 0, &key); @@ -336,7 +342,7 @@ static void testAcquireSecurityContext(void) } CryptReleaseContext(csp, 0); - CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET); CertFreeCertificateContext(certs[0]); @@ -347,8 +353,10 @@ START_TEST(schannel) { InitFunctionPtrs(); - if (pAcquireCredentialsHandleA && pFreeCredentialsHandle) + if (pAcquireCredentialsHandleA && pFreeCredentialsHandle && pCryptAcquireContextW) testAcquireSecurityContext(); + else + skip("Needed functions are not available\n"); if(secdll) FreeLibrary(secdll);

1 0

Paul Vriens : user32/tests: Run tests on win95 again.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 5748f1582650ec7b06ad560c6736c3e056a6cf85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5748f1582650ec7b06ad560c6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 15 14:23:45 2007 +0200 user32/tests: Run tests on win95 again. --- dlls/user32/tests/input.c | 45 ++++++++++++++++++++++++----------- dlls/user32/tests/menu.c | 41 +++++++++++++++++++++++++------- dlls/user32/tests/monitor.c | 32 +++++++++++++++++++----- dlls/user32/tests/msg.c | 55 +++++++++++++++++++++++++++--------------- 4 files changed, 123 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5748f1582650ec7b06ad5…

1 0

tools/winetest gather
by Jeremy Newman 15 Aug '07

15 Aug '07

ChangeSet ID: 31328 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/15 15:02:36 Modified files: winetest : gather Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> onMouseOver should only contain JavaScript and is actually not needed at all Patch: http://cvs.winehq.org/patch.py?id=31328 Old revision New revision Changes Path 1.25 1.26 +0 -4 tools/winetest/gather Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.25 tools/winetest/gather:1.26 --- tools/winetest/gather:1.25 15 Aug 2007 20: 2:36 -0000 +++ tools/winetest/gather 15 Aug 2007 20: 2:36 -0000 @@ -249,28 +249,24 @@ sub singletest { print OUT <<"EOF"; <td class="skip_pass"><a title="No tests run as $dll.dll is not present on this system" - onMouseOver="No tests run as $dll.dll is not present on this system" >0</a></td> EOF } elsif ($count eq "winetest crash") { print OUT <<"EOF"; <td class="skip_fail"><a title="Test did not run as winetest crashed" - onMouseOver="Test did not run as winetest crashed"; >.</a></td> EOF } elsif ($count eq "file limit") { print OUT <<"EOF"; <td class="skip_fail"><a title="Test is missing because of a partial report file" - onMouseOver="Test is missing because of a partial report file"; >.</a></td> EOF } elsif ($count eq "test missing") { print OUT <<"EOF"; <td class="skip_fail"><a title="Test did not run for an unknown reason" - onMouseOver="Test did not run for an unknown reason"; >.</a></td> EOF } else {

1 0

Mikołaj Zalewski : kernel32: Return error code if WOWCallback16Ex of a real-mode function failed.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 7e79b5656e5fa88e224f118b69c534c3312c38be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e79b5656e5fa88e224f118b6… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Aug 14 11:47:56 2007 -0700 kernel32: Return error code if WOWCallback16Ex of a real-mode function failed. --- dlls/kernel32/wowthunk.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/wowthunk.c b/dlls/kernel32/wowthunk.c index 4f714ab..2ccfddf 100644 --- a/dlls/kernel32/wowthunk.c +++ b/dlls/kernel32/wowthunk.c @@ -23,6 +23,7 @@ #include <assert.h> #include <stdarg.h> +#include <errno.h> #include "wine/winbase16.h" #include "windef.h" @@ -587,9 +588,19 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, { EXCEPTION_REGISTRATION_RECORD frame; frame.Handler = vm86_handler; + errno = 0; __wine_push_frame( &frame ); __wine_enter_vm86( context ); __wine_pop_frame( &frame ); + if (errno != 0) /* enter_vm86 will fall with ENOSYS on x64 kernels */ + { + ERR("__wine_enter_vm86 failed (errno=%d)\n", errno); + if (errno == ENOSYS) + SetLastError(ERROR_NOT_SUPPORTED); + else + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } } else {

1 0

Evan Stade : gdiplus: Added GdipSetStringFormatLineAlign/ GdipGetStringFormatLineAlign.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: c8c77f9b48db84f4bf65f049cacfb6e29fb1d6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c77f9b48db84f4bf65f049c… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 19:01:15 2007 -0700 gdiplus: Added GdipSetStringFormatLineAlign/GdipGetStringFormatLineAlign. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/stringformat.c | 22 ++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 7380ef5..a93e822 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -390,7 +390,7 @@ @ stub GdipGetStringFormatDigitSubstitution @ stub GdipGetStringFormatFlags @ stdcall GdipGetStringFormatHotkeyPrefix(ptr ptr) -@ stub GdipGetStringFormatLineAlign +@ stdcall GdipGetStringFormatLineAlign(ptr ptr) @ stub GdipGetStringFormatMeasurableCharacterRangeCount @ stub GdipGetStringFormatTabStopCount @ stub GdipGetStringFormatTabStops @@ -589,7 +589,7 @@ @ stub GdipSetStringFormatDigitSubstitution @ stub GdipSetStringFormatFlags @ stdcall GdipSetStringFormatHotkeyPrefix(ptr long) -@ stub GdipSetStringFormatLineAlign +@ stdcall GdipSetStringFormatLineAlign(ptr long) @ stub GdipSetStringFormatMeasurableCharacterRanges @ stub GdipSetStringFormatTabStops @ stdcall GdipSetStringFormatTrimming(ptr long) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e8832e6..09ef83f 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -181,6 +181,7 @@ struct GpStringFormat{ StringAlignment align; StringTrimming trimming; HotkeyPrefix hkprefix; + StringAlignment vertalign; }; #endif diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 311c5ee..1be004d 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -66,6 +66,17 @@ GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat return Ok; } +GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat *format, + StringAlignment *align) +{ + if(!format || !align) + return InvalidParameter; + + *align = format->vertalign; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat *format, StringTrimming *trimming) { @@ -99,6 +110,17 @@ GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat *format, return Ok; } +GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat *format, + StringAlignment align) +{ + if(!format) + return InvalidParameter; + + format->vertalign = align; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format, StringTrimming trimming) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0b5ac3b..640f0fc 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -253,9 +253,11 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*); GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat*,INT*); +GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat*,StringAlignment*); GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*); GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment); GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat*,INT); +GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat*,StringAlignment); GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming); #ifdef __cplusplus

1 0