June 2006 - Wine-commits - list.winehq.org

lostwages/ news/2006061901.xml wwn/wn20060619_ ...
by WineHQ 19 Jun '06

19 Jun '06

ChangeSet ID: 25837 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/06/19 14:56:38 Added files: news : 2006061901.xml wwn : wn20060619_317.xml Log message: WWN #317 Patch: http://cvs.winehq.org/patch.py?id=25837 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006061901.xml Added 1.1 +0 -0 lostwages/wwn/wn20060619_317.xml

1 0

Ge van Geldorp : dbghelp: Fix compilation for x86_64.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 5f299d6fe53fc11e8c56d21ba571d36ec16eb4f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f299d6fe53fc11e8c56d21… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Jun 19 20:03:37 2006 +0200 dbghelp: Fix compilation for x86_64. --- dlls/dbghelp/minidump.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 6572248..e8c0c39 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -166,18 +166,21 @@ #ifdef __i386__ mdThd->Stack.StartOfMemoryRange = (ctx->Esp - 4); else mdThd->Stack.StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; - mdThd->Stack.Memory.DataSize = (ULONG_PTR)tib.StackBase - - mdThd->Stack.StartOfMemoryRange; #elif defined(__powerpc__) if (ctx->Iar) mdThd->Stack.StartOfMemoryRange = ctx->Iar - 4; else mdThd->Stack.StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; - mdThd->Stack.Memory.DataSize = (ULONG_PTR)tib.StackBase - - mdThd->Stack.StartOfMemoryRange; +#elif defined(__x86_64__) + if (ctx->Rsp) + mdThd->Stack.StartOfMemoryRange = (ctx->Rsp - 8); + else + mdThd->Stack.StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; #else -#error unsupported CPU +#error unsupported CPU #endif + mdThd->Stack.Memory.DataSize = (ULONG_PTR)tib.StackBase - + mdThd->Stack.StartOfMemoryRange; } ResumeThread(hThread); }

1 0

Alexandre Julliard : winebuild: Get rid of the data16 prefix, it shouldn' t be needed anymore and causes warnings.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: d489a0a312a8bc527c51b8ec1aa56b6c16e8223e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d489a0a312a8bc527c51b8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 19 21:16:50 2006 +0200 winebuild: Get rid of the data16 prefix, it shouldn't be needed anymore and causes warnings. --- tools/winebuild/build.h | 2 +- tools/winebuild/main.c | 3 --- tools/winebuild/relay.c | 19 +++++++------------ 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index ef7be19..74e6713 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -115,7 +115,7 @@ enum target_cpu enum target_platform { - PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SVR4, PLATFORM_WINDOWS + PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_WINDOWS }; extern enum target_cpu target_cpu; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index b510c3a..ed9d4b3 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -65,8 +65,6 @@ #endif #ifdef __APPLE__ enum target_platform target_platform = PLATFORM_APPLE; -#elif defined(__svr4__) -enum target_platform target_platform = PLATFORM_SVR4; #elif defined(_WINDOWS) enum target_platform target_platform = PLATFORM_WINDOWS; #else @@ -126,7 +124,6 @@ static const struct { { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, - { "sunos", PLATFORM_SVR4 }, { "windows", PLATFORM_WINDOWS }, { "winnt", PLATFORM_WINDOWS } }; diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 50794ba..2196a88 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -58,11 +58,6 @@ static void function_header( FILE *outfi } -static inline const char *data16_prefix(void) -{ - return (target_platform == PLATFORM_SVR4) ? "\tdata16\n" : ""; -} - /******************************************************************* * BuildCallFrom16Core * @@ -160,8 +155,8 @@ static void BuildCallFrom16Core( FILE *o fprintf( outfile, "\t.byte 0x2e\n\tmovl %s,%%edx\n", asm_name("CallTo16_DataSelector") ); /* Load 32-bit segment registers */ - fprintf( outfile, "%s\tmovw %%dx, %%ds\n", data16_prefix() ); - fprintf( outfile, "%s\tmovw %%dx, %%es\n", data16_prefix() ); + fprintf( outfile, "\tmovw %%dx, %%ds\n" ); + fprintf( outfile, "\tmovw %%dx, %%es\n" ); if ( UsePIC ) fprintf( outfile, "\tmovw %s-1b(%%ecx), %%fs\n", asm_name("CallTo16_TebSelector") ); @@ -192,7 +187,7 @@ static void BuildCallFrom16Core( FILE *o fprintf( outfile, "\tpushl %%ebp\n" ); /* Switch stacks */ - fprintf( outfile, "%s\t.byte 0x64\n\tmovw %%ss, (%d)\n", data16_prefix(), STACKOFFSET + 2 ); + fprintf( outfile, "\t.byte 0x64\n\tmovw %%ss, (%d)\n", STACKOFFSET + 2 ); fprintf( outfile, "\t.byte 0x64\n\tmovw %%sp, (%d)\n", STACKOFFSET ); fprintf( outfile, "\tpushl %%ds\n" ); fprintf( outfile, "\tpopl %%ss\n" ); @@ -475,7 +470,7 @@ static void BuildCallTo16Core( FILE *out /* Switch to the 16-bit stack */ fprintf( outfile, "\tmovl %%esp,%%edx\n" ); - fprintf( outfile, "%s\t.byte 0x64\n\tmovw (%d),%%ss\n", data16_prefix(), STACKOFFSET + 2); + fprintf( outfile, "\t.byte 0x64\n\tmovw (%d),%%ss\n", STACKOFFSET + 2); fprintf( outfile, "\t.byte 0x64\n\tmovw (%d),%%sp\n", STACKOFFSET ); fprintf( outfile, "\t.byte 0x64\n\tmovl %%edx,(%d)\n", STACKOFFSET ); @@ -554,8 +549,8 @@ static void BuildRet16Func( FILE *outfil fprintf( outfile, "\t.byte 0x2e\n\tmovl %s", asm_name("CallTo16_DataSelector") ); fprintf( outfile, "-%s,%%edi\n", asm_name("__wine_call16_start") ); - fprintf( outfile, "%s\tmovw %%di,%%ds\n", data16_prefix() ); - fprintf( outfile, "%s\tmovw %%di,%%es\n", data16_prefix() ); + fprintf( outfile, "\tmovw %%di,%%ds\n" ); + fprintf( outfile, "\tmovw %%di,%%es\n" ); fprintf( outfile, "\t.byte 0x2e\n\tmov %s", asm_name("CallTo16_TebSelector") ); fprintf( outfile, "-%s,%%fs\n", asm_name("__wine_call16_start") ); @@ -564,7 +559,7 @@ static void BuildRet16Func( FILE *outfil /* Restore the 32-bit stack */ - fprintf( outfile, "%s\tmovw %%di,%%ss\n", data16_prefix() ); + fprintf( outfile, "\tmovw %%di,%%ss\n" ); fprintf( outfile, "\t.byte 0x64\n\tmovl (%d),%%esp\n", STACKOFFSET ); /* Return to caller */

1 0

Thomas Weidenmueller : include: Fix definition of SECURITY_INTEGER.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 5fb24924fb3a52c127defa2fd43b74259b73abb7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5fb24924fb3a52c127defa2… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Mon Jun 19 12:09:56 2006 +0200 include: Fix definition of SECURITY_INTEGER. --- dlls/secur32/schannel.c | 5 ++++- include/sspi.h | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 0fa449c..b6dc58e 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -126,7 +126,10 @@ static SECURITY_STATUS schan_AcquireCred phCredential->dwUpper = fCredentialUse; /* According to MSDN, all versions prior to XP do this */ if (ptsExpiry) - ptsExpiry->QuadPart = 0; + { + ptsExpiry->LowPart = 0; + ptsExpiry->HighPart = 0; + } ret = SEC_E_OK; } return ret; diff --git a/include/sspi.h b/include/sspi.h index 6c2f8f5..1644718 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -66,7 +66,11 @@ typedef PSecHandle PCredHandle; typedef SecHandle CtxtHandle; typedef PSecHandle PCtxtHandle; -typedef LARGE_INTEGER SECURITY_INTEGER, *PSECURITY_INTEGER; +typedef struct _SECURITY_INTEGER +{ + unsigned long LowPart; + long HighPart; +} SECURITY_INTEGER, *PSECURITY_INTEGER; typedef SECURITY_INTEGER TimeStamp, *PTimeStamp; typedef struct _SecPkgInfoA

1 0

Christian Gmeiner : setupapi: Implement SetupDiCreateDeviceInfoListExW.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 8f5d90b44d8ca5b7e730a142952f45ac29b7ded5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f5d90b44d8ca5b7e730a14… Author: Christian Gmeiner <christian.gmeiner(a)students.fhv.at> Date: Tue Jun 13 19:13:32 2006 +0200 setupapi: Implement SetupDiCreateDeviceInfoListExW. --- dlls/setupapi/Makefile.in | 2 dlls/setupapi/devinst.c | 269 +++++++++++---------------------------- dlls/setupapi/tests/.gitignore | 1 dlls/setupapi/tests/Makefile.in | 1 dlls/setupapi/tests/devinst.c | 69 ++++++++++ 5 files changed, 148 insertions(+), 194 deletions(-) create mode 100644 dlls/setupapi/tests/devinst.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8f5d90b44d8ca5b7e73…

1 0

Vitaly Lipatov : dnsapi: Fix conflicts nameser.h with winerror.h.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: fa823d2fb881a979efa65e09ae59a7b3a88ef87f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa823d2fb881a979efa65e0… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Mon Jun 19 19:33:40 2006 +0400 dnsapi: Fix conflicts nameser.h with winerror.h. --- dlls/dnsapi/name.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/name.c b/dlls/dnsapi/name.c index 28a5f79..4b9f8e1 100644 --- a/dlls/dnsapi/name.c +++ b/dlls/dnsapi/name.c @@ -31,6 +31,7 @@ # include <netinet/in.h> #endif #ifdef HAVE_ARPA_NAMESER_H # include <arpa/nameser.h> +# undef NOERROR #endif #ifdef HAVE_RESOLV_H # include <resolv.h>

1 0

Paul Vriens : uxtheme/tests: Change S_OK to the more appropriate ERROR_SUCCESS.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 682679b07cab0a08ddcc23185991b0d8e98fb98c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=682679b07cab0a08ddcc231… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Jun 19 17:49:36 2006 +0200 uxtheme/tests: Change S_OK to the more appropriate ERROR_SUCCESS. --- dlls/uxtheme/tests/system.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index fb0e9a2..5c5fa31 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -89,8 +89,8 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); bThemeActive = pIsThemeActive(); todo_wine - ok( GetLastError() == S_OK, - "Expected S_OK, got 0x%08lx\n", + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); /* All NULL */ @@ -117,8 +117,8 @@ static void test_OpenThemeData(void) { ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); todo_wine - ok( GetLastError() == S_OK, - "Expected S_OK, got 0x%08lx\n", + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); } else @@ -170,16 +170,16 @@ static void test_OpenThemeData(void) hTheme = pOpenThemeData(hWnd, szButtonClassList); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); todo_wine - ok( GetLastError() == S_OK, - "Expected S_OK, got 0x%08lx\n", + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); SetLastError(0xdeadbeef); hTheme = pOpenThemeData(hWnd, szClassList); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); todo_wine - ok( GetLastError() == S_OK, - "Expected S_OK, got 0x%08lx\n", + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); }

1 0

Mike McCormack : hlink: Add a stub implementation for HlinkNavigateToStringReference.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: d18dc2561af8c453eea58051b49c0c36973aeaaf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d18dc2561af8c453eea5805… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 19 16:58:22 2006 +0900 hlink: Add a stub implementation for HlinkNavigateToStringReference. --- dlls/hlink/hlink.spec | 2 +- dlls/hlink/hlink_main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink.spec b/dlls/hlink/hlink.spec index 98f73c6..0d9a2c9 100644 --- a/dlls/hlink/hlink.spec +++ b/dlls/hlink/hlink.spec @@ -3,7 +3,7 @@ 5 stdcall HlinkCreateFromData(ptr ptr long ptr ptr ptr) 6 stdcall HlinkCreateBrowseContext(ptr ptr ptr) 7 stub HlinkClone -8 stub HlinkNavigateToStringReference +8 stdcall HlinkNavigateToStringReference(wstr wstr ptr long ptr long ptr ptr ptr) 9 stdcall HlinkOnNavigate(ptr ptr long ptr wstr wstr ptr) 10 stdcall HlinkNavigate(ptr ptr long ptr ptr ptr) 11 stub HlinkUpdateStackItem diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index aeec28c..fa8fb84 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -234,6 +234,17 @@ HRESULT WINAPI HlinkCreateExtensionServi return E_NOTIMPL; } +HRESULT WINAPI HlinkNavigateToStringReference( LPCWSTR pwzTarget, + LPCWSTR pwzLocation, IHlinkSite *pihlsite, DWORD dwSiteData, + IHlinkFrame *pihlframe, DWORD grfHLNF, LPBC pibc, + IBindStatusCallback *pibsc, IHlinkBrowseContext *pihlbc) +{ + FIXME("%s %s %p %08lx %p %08lx %p %p %p\n", + debugstr_w(pwzTarget), debugstr_w(pwzLocation), pihlsite, + dwSiteData, pihlframe, grfHLNF, pibc, pibsc, pihlbc); + return E_NOTIMPL; +} + static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) {

1 0

Mike McCormack : ole32: Fix a typo.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: ccfa76d18ec9030f1d41311edf386368fd7f8cb1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccfa76d18ec9030f1d41311… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 20 02:19:31 2006 +0900 ole32: Fix a typo. --- dlls/ole32/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 9e318e7..1e890f9 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2699,7 +2699,7 @@ HRESULT WINAPI PropVariantCopy(PROPVARIA if (pvarSrc->u.pclipdata) { len = pvarSrc->u.pclipdata->cbSize - sizeof(pvarSrc->u.pclipdata->ulClipFmt); - CoTaskMemAlloc(len); + pvarDest->u.pclipdata->pClipData = CoTaskMemAlloc(len); CopyMemory(pvarDest->u.pclipdata->pClipData, pvarSrc->u.pclipdata->pClipData, len); } break;

1 0

Kai Blin : secur32: Remove unneeded function from the Negotiate provider.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: b432e11927be87498602b395a867557fa52da093 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b432e11927be87498602b39… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Jun 19 10:21:33 2006 +0000 secur32: Remove unneeded function from the Negotiate provider. --- dlls/secur32/negotiate.c | 32 ++++---------------------------- 1 files changed, 4 insertions(+), 28 deletions(-) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index b8531aa..586e559 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -93,28 +93,6 @@ static SECURITY_STATUS SEC_ENTRY nego_Qu return ret; } -static SECURITY_STATUS nego_AcquireCredentialsHandle(ULONG fCredentialsUse, - PCredHandle phCredential, PTimeStamp ptsExpiry) -{ - SECURITY_STATUS ret; - - if(fCredentialsUse == SECPKG_CRED_BOTH) - { - ret = SEC_E_NO_CREDENTIALS; - } - else - { - /* Ok, just store the direction like schannel does for now. - * FIXME: This should probably do something useful later on - */ - phCredential->dwUpper = fCredentialsUse; - /* Same here, shamelessly stolen from schannel.c */ - if (ptsExpiry) - ptsExpiry->QuadPart = 0; - ret = SEC_E_OK; - } - return ret; -} /*********************************************************************** * AcquireCredentialsHandleA @@ -124,11 +102,10 @@ static SECURITY_STATUS SEC_ENTRY nego_Ac PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", + TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p) stub\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return nego_AcquireCredentialsHandle(fCredentialUse, phCredential, - ptsExpiry); + return SEC_E_UNSUPPORTED_FUNCTION; } /*********************************************************************** @@ -139,11 +116,10 @@ static SECURITY_STATUS SEC_ENTRY nego_Ac PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", + TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p) stub\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return nego_AcquireCredentialsHandle(fCredentialUse, phCredential, - ptsExpiry); + return SEC_E_UNSUPPORTED_FUNCTION; } /***********************************************************************

1 0