January 2006 - Wine-commits

James Hawkins : advpack: Fix the documentation for FileSaveMarkNotExist.
by Alexandre Julliard 21 Jan '06

21 Jan '06

Module: wine Branch: refs/heads/master Commit: 1142a1f2af521f9ba448168af2e644508020faa2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1142a1f2af521f9ba448168… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 21 19:21:07 2006 +0100 advpack: Fix the documentation for FileSaveMarkNotExist. --- dlls/advpack/files.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index f69343a..f5be6b3 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -594,7 +594,7 @@ done: * PARAMS * pszFileList [I] NULL-separated list of filenames. * pszDir [I] Path of the backup directory. - * pszBaseName [I] Basename of the backup files. + * pszBaseName [I] Basename of the INI file. * * RETURNS * Success: S_OK.

1 0

James Hawkins : advpack: Forward FileSaveMarkNotExist to AddDelBackupEntry.
by Alexandre Julliard 21 Jan '06

21 Jan '06

Module: wine Branch: refs/heads/master Commit: c664353452d765e5c29bba1667aca25a41fa76dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c664353452d765e5c29bba1… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 21 19:19:41 2006 +0100 advpack: Forward FileSaveMarkNotExist to AddDelBackupEntry. --- dlls/advpack/files.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 91c561b..f69343a 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -599,15 +599,12 @@ done: * RETURNS * Success: S_OK. * Failure: E_FAIL. - * - * BUGS - * Unimplemented. */ HRESULT WINAPI FileSaveMarkNotExist(LPSTR pszFileList, LPSTR pszDir, LPSTR pszBaseName) { - FIXME("(%p, %p, %p) stub\n", pszFileList, pszDir, pszBaseName); + TRACE("(%p, %p, %p)\n", pszFileList, pszDir, pszBaseName); - return E_FAIL; + return AddDelBackupEntry(pszFileList, pszDir, pszBaseName, AADBE_DEL_ENTRY); } /***********************************************************************

1 0

James Hawkins : advpack: Implement DelNodeRunDLL32.
by Alexandre Julliard 21 Jan '06

21 Jan '06

Module: wine Branch: refs/heads/master Commit: 5fa132c61662db74c325f2d729bc6fa8c6109747 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5fa132c61662db74c325f2d… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 21 19:18:40 2006 +0100 advpack: Implement DelNodeRunDLL32. --- dlls/advpack/files.c | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 99741b9..91c561b 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -289,6 +290,31 @@ HRESULT WINAPI DelNode( LPCSTR pszFileOr return ret; } +/* returns the parameter at dwIndex in a list of parameters + * separated by the cSeparator character + */ +static LPSTR get_parameter(LPSTR szParameters, CHAR cSeparator, DWORD dwIndex) +{ + LPSTR szParam = NULL; + DWORD i = 0; + + while (*szParameters && i < dwIndex) + { + if (*szParameters == cSeparator) + i++; + + szParameters++; + } + + if (!*szParameters) + return NULL; + + szParam = HeapAlloc(GetProcessHeap(), 0, lstrlenA(szParameters)); + lstrcpyA(szParam, szParameters); + + return szParam; +} + /*********************************************************************** * DelNodeRunDLL32 (ADVPACK.@) * @@ -303,14 +329,27 @@ HRESULT WINAPI DelNode( LPCSTR pszFileOr * RETURNS * Success: S_OK. * Failure: E_FAIL. - * - * BUGS - * Unimplemented */ HRESULT WINAPI DelNodeRunDLL32( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) { - FIXME("(%s): stub\n", debugstr_a(cmdline)); - return E_FAIL; + LPSTR szFilename, szFlags; + DWORD dwFlags; + HRESULT res; + + TRACE("(%s)\n", debugstr_a(cmdline)); + + /* get the parameters at indexes 0 and 1 respectively */ + szFilename = get_parameter(cmdline, ',', 0); + szFlags = get_parameter(cmdline, ',', 1); + + dwFlags = atol(szFlags); + + res = DelNode(szFilename, dwFlags); + + HeapFree(GetProcessHeap(), 0, szFilename); + HeapFree(GetProcessHeap(), 0, szFlags); + + return res; } /* The following defintions were copied from dlls/cabinet/cabinet.h */

1 0

James Hawkins : advpack: Add stubs for the user stub wrapper functions.
by Alexandre Julliard 21 Jan '06

21 Jan '06

Module: wine Branch: refs/heads/master Commit: 0584b9de8025ca979d0cd68b9a33baa4d053767a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0584b9de8025ca979d0cd68… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 21 19:19:31 2006 +0100 advpack: Add stubs for the user stub wrapper functions. --- dlls/advpack/advpack.c | 22 ++++++++++++++++++++++ dlls/advpack/advpack.spec | 4 ++-- include/advpub.h | 2 ++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index d07df8c..b828455 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -507,3 +507,25 @@ HRESULT WINAPI TranslateInfStringEx(HINF return E_FAIL; } + +/*********************************************************************** + * UserInstStubWrapper (ADVPACK.@) + */ +HRESULT WINAPI UserInstStubWrapper(HWND hWnd, HINSTANCE hInstance, + PSTR pszParms, INT nShow) +{ + FIXME("(%p, %p, %p, %i) stub\n", hWnd, hInstance, pszParms, nShow); + + return E_FAIL; +} + +/*********************************************************************** + * UserUnInstStubWrapper (ADVPACK.@) + */ +HRESULT WINAPI UserUnInstStubWrapper(HWND hWnd, HINSTANCE hInstance, + PSTR pszParms, INT nShow) +{ + FIXME("(%p, %p, %p, %i) stub\n", hWnd, hInstance, pszParms, nShow); + + return E_FAIL; +} diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index bb8487f..c3c4388 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -28,5 +28,5 @@ @ stub SetPerUserSecValues @ stdcall TranslateInfString(str str str str ptr long ptr ptr) @ stdcall TranslateInfStringEx(long str str str str long ptr ptr) -@ stub UserInstStubWrapper -@ stub UserUnInstStubWrapper +@ stdcall UserInstStubWrapper(long long str long) +@ stdcall UserUnInstStubWrapper(long long str long) diff --git a/include/advpub.h b/include/advpub.h index aef373b..2924f97 100644 --- a/include/advpub.h +++ b/include/advpub.h @@ -143,6 +143,8 @@ HRESULT WINAPI TranslateInfString(PCSTR HRESULT WINAPI TranslateInfStringEx(HINF hInf, PCSTR pszInfFilename, PCSTR pszTranslateSection, PCSTR pszTranslateKey, PSTR pszBuffer, DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved); +HRESULT WINAPI UserInstStubWrapper(HWND hWnd, HINSTANCE hInstance, PSTR pszParms, INT nShow); +HRESULT WINAPI UserUnInstStubWrapper(HWND hWnd, HINSTANCE hInstance, PSTR pszParms, INT nShow); #ifdef __cplusplus }

1 0

James Hawkins : advpack: Implement IsNTAdmin.
by Alexandre Julliard 21 Jan '06

21 Jan '06

Module: wine Branch: refs/heads/master Commit: 93cb78f37a182817a790ff6c6e271d824bc499b9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93cb78f37a182817a790ff6… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 21 19:18:32 2006 +0100 advpack: Implement IsNTAdmin. --- dlls/advpack/Makefile.in | 2 + dlls/advpack/advpack.c | 62 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/advpack/Makefile.in b/dlls/advpack/Makefile.in index a14468d..4538083 100644 --- a/dlls/advpack/Makefile.in +++ b/dlls/advpack/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = advpack.dll IMPORTLIB = libadvpack.$(IMPLIBEXT) -IMPORTS = setupapi version user32 kernel32 ntdll +IMPORTS = setupapi version user32 advapi32 kernel32 ntdll EXTRALIBS = $(LIBUNICODE) C_SRCS = \ diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 4fcae96..d07df8c 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -221,14 +221,66 @@ HRESULT WINAPI DoInfInstall(const SETUPC * * RETURNS * TRUE if user has admin rights, FALSE otherwise. - * - * BUGS - * Unimplemented. */ BOOL WINAPI IsNTAdmin( DWORD reserved, LPDWORD pReserved ) { - FIXME("(0x%08lx, %p): stub\n", reserved, pReserved); - return TRUE; + SID_IDENTIFIER_AUTHORITY SidAuthority = {SECURITY_NT_AUTHORITY}; + PTOKEN_GROUPS pTokenGroups; + BOOL bSidFound = FALSE; + DWORD dwSize, i; + HANDLE hToken; + PSID pSid; + + TRACE("(0x%08lx, %p)\n", reserved, pReserved); + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + return FALSE; + + if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + CloseHandle(hToken); + return FALSE; + } + } + + pTokenGroups = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!pTokenGroups) + { + CloseHandle(hToken); + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, pTokenGroups, dwSize, &dwSize)) + { + HeapFree(GetProcessHeap(), 0, pTokenGroups); + CloseHandle(hToken); + return FALSE; + } + + CloseHandle(hToken); + + if (!AllocateAndInitializeSid(&SidAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &pSid)) + { + HeapFree(GetProcessHeap(), 0, pTokenGroups); + return FALSE; + } + + for (i = 0; i < pTokenGroups->GroupCount; i++) + { + if (EqualSid(pSid, pTokenGroups->Groups[i].Sid)) + { + bSidFound = TRUE; + break; + } + } + + HeapFree(GetProcessHeap(), 0, pTokenGroups); + FreeSid(pSid); + + return bSidFound; } /***********************************************************************

1 0

Huw Davies : shell: Fix incorrect usage of the return value of StrRetToStrNW.
by Alexandre Julliard 20 Jan '06

20 Jan '06

Module: wine Branch: refs/heads/master Commit: 51fd75070798484ca37b9e623dc9108cefaa7c94 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=51fd75070798484ca37b9e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 20 20:17:07 2006 +0100 shell: Fix incorrect usage of the return value of StrRetToStrNW. --- dlls/shell32/brsfolder.c | 7 +------ dlls/shell32/pidl.c | 6 ++++-- dlls/shell32/shlfolder.c | 3 ++- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index f4c0876..aba8e23 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -227,12 +227,7 @@ static BOOL GetName(LPSHELLFOLDER lpsf, TRACE("%p %p %lx %p\n", lpsf, lpi, dwFlags, lpFriendlyName); if (SUCCEEDED(IShellFolder_GetDisplayNameOf(lpsf, lpi, dwFlags, &str))) - { - if (FAILED(StrRetToStrNW(lpFriendlyName, MAX_PATH, &str, lpi))) - { - bSuccess = FALSE; - } - } + bSuccess = StrRetToStrNW(lpFriendlyName, MAX_PATH, &str, lpi); else bSuccess = FALSE; diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index fb85949..c4e54e0 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -133,7 +133,8 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLF ret = IShellFolder_GetDisplayNameOf(lsf, pidl, flag, &strret); if (SUCCEEDED(ret)) { - ret = StrRetToStrNW(path, MAX_PATH, &strret, pidl); + if(!StrRetToStrNW(path, MAX_PATH, &strret, pidl)) + ret = E_FAIL; } } else @@ -144,7 +145,8 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLF ret = IShellFolder_GetDisplayNameOf(psfParent, pidllast, flag, &strret); if (SUCCEEDED(ret)) { - ret = StrRetToStrNW(path, MAX_PATH, &strret, pidllast); + if(!StrRetToStrNW(path, MAX_PATH, &strret, pidllast)) + ret = E_FAIL; } IShellFolder_Release(psfParent); } diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 09e46f1..29fd408 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -350,7 +350,8 @@ HRESULT SHELL32_GetDisplayNameOfChild (I hr = IShellFolder_GetDisplayNameOf (psfChild, pidlNext, dwFlags, &strTemp); if (SUCCEEDED (hr)) { - hr = StrRetToStrNW (szOut, dwOutLen, &strTemp, pidlNext); + if(!StrRetToStrNW (szOut, dwOutLen, &strTemp, pidlNext)) + hr = E_FAIL; } IShellFolder_Release (psfChild); }

1 0

Aric Stewart : wininet: INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT work.
by Alexandre Julliard 20 Jan '06

20 Jan '06

Module: wine Branch: refs/heads/master Commit: 8b0883576ee7c691cc57d68af6f5050fea981827 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b0883576ee7c691cc57d68… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 20 20:16:56 2006 +0100 wininet: INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT work. Beginning of framework to implement handling of InternetQueryOption for INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT. --- dlls/wininet/Makefile.in | 1 + dlls/wininet/internet.c | 36 ++++++++++++++++++++++++++++++ dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 5b33c13..e3ff75e 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -6,6 +6,7 @@ VPATH = @srcdir@ MODULE = wininet.dll IMPORTLIB = libwininet.$(IMPLIBEXT) IMPORTS = mpr shlwapi shell32 user32 advapi32 kernel32 ntdll +DELAYIMPORTS = crypt32 EXTRALIBS = $(LIBUNICODE) @SOCKETLIBS@ C_SRCS = \ diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index dcc6f91..abb0825 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -66,6 +66,7 @@ #include "resource.h" #include "wine/unicode.h" +#include "wincrypt.h" WINE_DEFAULT_DEBUG_CHANNEL(wininet); @@ -2242,6 +2243,41 @@ static BOOL INET_QueryOptionHelper(BOOL FIXME("INTERNET_OPTION_SECURITY_FLAGS: Stub\n"); break; + case INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT: + if (*lpdwBufferLength < sizeof(INTERNET_CERTIFICATE_INFOW)) + { + *lpdwBufferLength = sizeof(INTERNET_CERTIFICATE_INFOW); + INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + else if (lpwhh->htype == WH_HHTTPREQ) + { + LPWININETHTTPREQW lpwhr; + PCCERT_CONTEXT context; + + lpwhr = (LPWININETHTTPREQW)lpwhh; + context = (PCCERT_CONTEXT)NETCON_GetCert(&(lpwhr->netConnection)); + if (context) + { + LPINTERNET_CERTIFICATE_INFOW info = (LPINTERNET_CERTIFICATE_INFOW)lpBuffer; + memset(info,0,sizeof(INTERNET_CERTIFICATE_INFOW)); + info->ftExpiry = context->pCertInfo->NotAfter; + info->ftStart = context->pCertInfo->NotBefore; + /* + * CertNameToStr implement requred for + * lpszSubjectInfo + * lpszIssuerInfo + * + * also need to set: + * lpszProtocolName + * lpszSignatureAlgName + * lpszEncryptionAlgName + * dwKeySize + */ + CertFreeCertificateContext(context); + bSuccess = TRUE; + } + } + break; default: FIXME("Stub! %ld\n", dwOption); break; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index ab03236..6df7e31 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -480,6 +480,7 @@ BOOL NETCON_send(WININET_NETCONNECTION * BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, int *recvd /* out */); BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer); +LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection); extern void URLCacheContainers_CreateDefaults(void); extern void URLCacheContainers_DeleteAll(void); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index f488d69..97608b6 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -52,6 +52,7 @@ #include "wine/debug.h" #include "internet.h" +#include "wincrypt.h" #define RESPONSE_TIMEOUT 30 /* FROM internet.c */ @@ -100,6 +101,7 @@ MAKE_FUNCPTR(SSL_get_peer_certificate); MAKE_FUNCPTR(SSL_CTX_get_timeout); MAKE_FUNCPTR(SSL_CTX_set_timeout); MAKE_FUNCPTR(SSL_CTX_set_default_verify_paths); +MAKE_FUNCPTR(i2d_X509); /* OpenSSL's libcrypto functions that we use */ MAKE_FUNCPTR(BIO_new_fp); @@ -162,6 +164,7 @@ void NETCON_init(WININET_NETCONNECTION * DYNSSL(SSL_CTX_get_timeout); DYNSSL(SSL_CTX_set_timeout); DYNSSL(SSL_CTX_set_default_verify_paths); + DYNSSL(i2d_X509); #undef DYNSSL #define DYNCRYPTO(x) \ @@ -658,3 +661,51 @@ BOOL NETCON_getNextLine(WININET_NETCONNE #endif } } + + +LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) +{ + +#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H + X509* cert; + unsigned char* buffer,*p; + INT len; + BOOL malloced = FALSE; + LPCVOID r = NULL; + + if (!connection->useSSL) + return NULL; + + cert = pSSL_get_peer_certificate(connection->ssl_s); + p = NULL; + len = pi2d_X509(cert,&p); + /* + * SSL 0.9.7 and above malloc the buffer if it is null. + * however earlier version do not and so we would need to alloc the buffer. + * + * see the i2d_X509 man page for more details. + */ + if (!p) + { + buffer = HeapAlloc(GetProcessHeap(),0,len); + p = buffer; + len = pi2d_X509(cert,&p); + } + else + { + buffer = p; + malloced = TRUE; + } + + r = CertCreateCertificateContext(X509_ASN_ENCODING,buffer,len); + + if (malloced) + free(buffer); + else + HeapFree(GetProcessHeap(),0,buffer); + + return r; +#else + return NULL; +#endif +}

1 0

Alexandre Julliard : winebuild: Moved offset definitions to relay.c since they are only
by Alexandre Julliard 20 Jan '06

20 Jan '06

Module: wine Branch: refs/heads/master Commit: 76ece8530abe582b2963af7d9dba408585b0f8b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=76ece8530abe582b2963af7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 19:45:57 2006 +0100 winebuild: Moved offset definitions to relay.c since they are only needed there. Hardcoded a couple of TEB offsets to support cross-compilation. --- tools/winebuild/build.h | 16 ---------------- tools/winebuild/relay.c | 25 ++++++++++++++++++++----- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index ec4d9a9..a445be9 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -132,22 +132,6 @@ extern enum target_platform target_platf #define FLAG_FORWARD 0x80 /* function is a forwarded name */ #define FLAG_EXT_LINK 0x100 /* function links to an external symbol */ - /* Offset of a structure field relative to the start of the struct */ -#define STRUCTOFFSET(type,field) ((int)&((type *)0)->field) - - /* Offset of register relative to the start of the CONTEXT struct */ -#define CONTEXTOFFSET(reg) STRUCTOFFSET(CONTEXT86,reg) - - /* Offset of register relative to the start of the STACK16FRAME struct */ -#define STACK16OFFSET(reg) STRUCTOFFSET(STACK16FRAME,reg) - - /* Offset of register relative to the start of the STACK32FRAME struct */ -#define STACK32OFFSET(reg) STRUCTOFFSET(STACK32FRAME,reg) - - /* Offset of the stack pointer relative to %fs:(0) */ -#define STACKOFFSET (STRUCTOFFSET(TEB,WOW32Reserved)) - - #define MAX_ORDINALS 65535 /* global functions */ diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 5dbbe83..8d304d0 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -32,6 +32,21 @@ #include "build.h" +/* offset of a structure field relative to the start of the struct */ +#define STRUCTOFFSET(type,field) ((int)FIELD_OFFSET(type,field)) + +/* offset of register relative to the start of the CONTEXT struct */ +#define CONTEXTOFFSET(reg) STRUCTOFFSET(CONTEXT86,reg) + +/* offset of register relative to the start of the STACK16FRAME struct */ +#define STACK16OFFSET(reg) STRUCTOFFSET(STACK16FRAME,reg) + +/* offset of register relative to the start of the STACK32FRAME struct */ +#define STACK32OFFSET(reg) STRUCTOFFSET(STACK32FRAME,reg) + +/* offset of the stack pointer relative to %fs:(0) */ +#define STACKOFFSET 0xc0 /* STRUCTOFFSET(TEB,WOW32Reserved) */ + /* fix this if the ntdll_thread_regs structure is changed */ #define GS_OFFSET 0x1b0 /* STRUCTOFFSET(TEB,SpareBytes1) + STRUCTOFFSET(ntdll_thread_regs,gs) */ @@ -182,7 +197,7 @@ static void BuildCallFrom16Core( FILE *o fprintf( outfile, "\tpushl %%ds\n" ); fprintf( outfile, "\tpopl %%ss\n" ); fprintf( outfile, "\tmovl %%ebp, %%esp\n" ); - fprintf( outfile, "\taddl $%d, %%ebp\n", STRUCTOFFSET(STACK32FRAME, ebp) ); + fprintf( outfile, "\taddl $%d, %%ebp\n", STACK32OFFSET(ebp) ); /* At this point: @@ -294,7 +309,7 @@ static void BuildCallFrom16Core( FILE *o if ( reg_func ) { fprintf( outfile, "\tleal -%d(%%ebp), %%ebx\n", - sizeof(CONTEXT) + STRUCTOFFSET(STACK32FRAME, ebp) ); + sizeof(CONTEXT) + STACK32OFFSET(ebp) ); /* Switch stack back */ fprintf( outfile, "\t.byte 0x64\n\tmovw (%d), %%ss\n", STACKOFFSET+2 ); @@ -401,15 +416,15 @@ static void BuildCallTo16Core( FILE *out /* Setup exception frame */ fprintf( outfile, "\t.byte 0x64\n\tpushl (%d)\n", STACKOFFSET ); fprintf( outfile, "\tpushl 16(%%ebp)\n" ); /* handler */ - fprintf( outfile, "\t.byte 0x64\n\tpushl (%d)\n", STRUCTOFFSET(TEB,Tib.ExceptionList) ); - fprintf( outfile, "\t.byte 0x64\n\tmovl %%esp,(%d)\n", STRUCTOFFSET(TEB,Tib.ExceptionList) ); + fprintf( outfile, "\t.byte 0x64\n\tpushl (0)\n" ); + fprintf( outfile, "\t.byte 0x64\n\tmovl %%esp,(0)\n" ); /* Call the actual CallTo16 routine (simulate a lcall) */ fprintf( outfile, "\tpushl %%cs\n" ); fprintf( outfile, "\tcall .L%s\n", name ); /* Remove exception frame */ - fprintf( outfile, "\t.byte 0x64\n\tpopl (%d)\n", STRUCTOFFSET(TEB,Tib.ExceptionList) ); + fprintf( outfile, "\t.byte 0x64\n\tpopl (0)\n" ); fprintf( outfile, "\taddl $4, %%esp\n" ); fprintf( outfile, "\t.byte 0x64\n\tpopl (%d)\n", STACKOFFSET );

1 0

Alexandre Julliard : configure: Remove the -mpreferred-stack-boundary option, this breaks MacOS.
by Alexandre Julliard 20 Jan '06

20 Jan '06

Module: wine Branch: refs/heads/master Commit: 1a08ae5b158d5f5d9c57fa8ea6d0f6ef3bfd63dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a08ae5b158d5f5d9c57fa8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 19:56:24 2006 +0100 configure: Remove the -mpreferred-stack-boundary option, this breaks MacOS. --- configure | 65 ---------------------------------------------------------- configure.ac | 13 ------------ 2 files changed, 0 insertions(+), 78 deletions(-) diff --git a/configure b/configure index 4de3c19..c95d335 100755 --- a/configure +++ b/configure @@ -11382,71 +11382,6 @@ _ACEOF fi - case $host_cpu in - *i[3456789]86*) - echo "$as_me:$LINENO: checking for gcc -mpreferred-stack-boundary=2 support" >&5 -echo $ECHO_N "checking for gcc -mpreferred-stack-boundary=2 support... $ECHO_C" >&6 -if test "${ac_cv_c_gcc_stack_boundary+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -mpreferred-stack-boundary=2" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_gcc_stack_boundary="yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_gcc_stack_boundary="no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -echo "$as_me:$LINENO: result: $ac_cv_c_gcc_stack_boundary" >&5 -echo "${ECHO_T}$ac_cv_c_gcc_stack_boundary" >&6 - if test "$ac_cv_c_gcc_stack_boundary" = "yes" - then - EXTRACFLAGS="$EXTRACFLAGS -mpreferred-stack-boundary=2" - fi - ;; - esac - echo "$as_me:$LINENO: checking for gcc -fno-strict-aliasing support" >&5 echo $ECHO_N "checking for gcc -fno-strict-aliasing support... $ECHO_C" >&6 if test "${ac_cv_c_gcc_no_strict_aliasing+set}" = set; then diff --git a/configure.ac b/configure.ac index b458d7d..ca5eb8a 100644 --- a/configure.ac +++ b/configure.ac @@ -810,19 +810,6 @@ int main(void) { AC_DEFINE(CC_FLAG_SHORT_WCHAR, "-fshort-wchar", [Specifies the compiler flag that forces a short wchar_t]) fi - dnl Check for -mpreferred-stack-boundary - case $host_cpu in - *i[[3456789]]86*) - AC_CACHE_CHECK([for gcc -mpreferred-stack-boundary=2 support], ac_cv_c_gcc_stack_boundary, - [WINE_TRY_CFLAGS([-mpreferred-stack-boundary=2], - ac_cv_c_gcc_stack_boundary="yes",ac_cv_c_gcc_stack_boundary="no")]) - if test "$ac_cv_c_gcc_stack_boundary" = "yes" - then - EXTRACFLAGS="$EXTRACFLAGS -mpreferred-stack-boundary=2" - fi - ;; - esac - dnl Check for -fno-strict-aliasing AC_CACHE_CHECK([for gcc -fno-strict-aliasing support], ac_cv_c_gcc_no_strict_aliasing, [WINE_TRY_CFLAGS([-fno-strict-aliasing],

1 0

Vitaliy Margolen : x11drv: Prevent NULL dereference in SelectionRequest handling.
by Alexandre Julliard 20 Jan '06

20 Jan '06

Module: wine Branch: refs/heads/master Commit: 6bc59056dc0e85ab985ca24e6129bff42b97683f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6bc59056dc0e85ab985ca24… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Jan 20 19:41:40 2006 +0100 x11drv: Prevent NULL dereference in SelectionRequest handling. --- dlls/x11drv/clipboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/clipboard.c b/dlls/x11drv/clipboard.c index 2d53a55..3821c2c 100644 --- a/dlls/x11drv/clipboard.c +++ b/dlls/x11drv/clipboard.c @@ -2795,7 +2795,7 @@ static Atom X11DRV_SelectionRequest_TARG */ cTargets = 1; /* Include TARGETS */ - lpData = ClipData; + if (!(lpData = ClipData)) return None; do {

1 0