November 2005 - Wine-Commits

wine/tools wine.inf
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21290 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 12:18:27 Modified files: tools : wine.inf Log message: Mike McCormack <mike(a)codeweavers.com> Add timezone information to the registry. Patch: http://cvs.winehq.org/patch.py?id=21290 Old revision New revision Changes Path 1.48 1.49 +289 -1 wine/tools/wine.inf

1 0

wine/dlls/wininet utility.c internet.h http.c ...
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21289 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 12:16:55 Modified files: dlls/wininet : utility.c internet.h http.c ftp.c Log message: Robert Shearman <rob(a)codeweavers.com> We shouldn't pass the struct hostent returned from gethostbyname as it's not thread-safe and isn't needed anyway. Patch: http://cvs.winehq.org/patch.py?id=21289 Old revision New revision Changes Path 1.28 1.29 +6 -5 wine/dlls/wininet/utility.c 1.40 1.41 +1 -3 wine/dlls/wininet/internet.h 1.109 1.110 +3 -3 wine/dlls/wininet/http.c 1.57 1.58 +1 -3 wine/dlls/wininet/ftp.c Index: wine/dlls/wininet/utility.c diff -u -p wine/dlls/wininet/utility.c:1.28 wine/dlls/wininet/utility.c:1.29 --- wine/dlls/wininet/utility.c:1.28 15 Nov 2005 18:16:55 -0000 +++ wine/dlls/wininet/utility.c 15 Nov 2005 18:16:55 -0000 @@ -127,11 +127,12 @@ time_t ConvertTimeString(LPCWSTR asctime BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, - struct hostent **phe, struct sockaddr_in *psa) + struct sockaddr_in *psa) { WCHAR *found; char *name; int len, sz; + struct hostent *phe; TRACE("%s\n", debugstr_w(lpszServerName)); @@ -150,18 +151,18 @@ BOOL GetAddress(LPCWSTR lpszServerName, name = HeapAlloc(GetProcessHeap(), 0, sz+1); WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, name, sz, NULL, NULL ); name[sz] = 0; - *phe = gethostbyname(name); + phe = gethostbyname(name); HeapFree( GetProcessHeap(), 0, name ); - if (NULL == *phe) + if (NULL == phe) { TRACE("Failed to get hostname: (%s)\n", debugstr_w(lpszServerName) ); return FALSE; } memset(psa,0,sizeof(struct sockaddr_in)); - memcpy((char *)&psa->sin_addr, (*phe)->h_addr, (*phe)->h_length); - psa->sin_family = (*phe)->h_addrtype; + memcpy((char *)&psa->sin_addr, phe->h_addr, phe->h_length); + psa->sin_family = phe->h_addrtype; psa->sin_port = htons((u_short)nServerPort); return TRUE; Index: wine/dlls/wininet/internet.h diff -u -p wine/dlls/wininet/internet.h:1.40 wine/dlls/wininet/internet.h:1.41 --- wine/dlls/wininet/internet.h:1.40 15 Nov 2005 18:16:55 -0000 +++ wine/dlls/wininet/internet.h 15 Nov 2005 18:16:55 -0000 @@ -168,7 +168,6 @@ typedef struct LPWSTR lpszUserName; INTERNET_PORT nServerPort; struct sockaddr_in socketAddress; - struct hostent *phostent; } WININETHTTPSESSIONW, *LPWININETHTTPSESSIONW; #define HDR_ISREQUEST 0x0001 @@ -214,7 +213,6 @@ typedef struct LPWININETFILE download_in_progress; struct sockaddr_in socketAddress; struct sockaddr_in lstnSocketAddress; - struct hostent *phostent; LPWSTR lpszPassword; LPWSTR lpszUserName; } WININETFTPSESSIONW, *LPWININETFTPSESSIONW; @@ -420,7 +418,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW DWORD dwInternalFlags); BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, - struct hostent **phe, struct sockaddr_in *psa); + struct sockaddr_in *psa); void INTERNET_SetLastError(DWORD dwError); DWORD INTERNET_GetLastError(void); Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.109 wine/dlls/wininet/http.c:1.110 --- wine/dlls/wininet/http.c:1.109 15 Nov 2005 18:16:55 -0000 +++ wine/dlls/wininet/http.c 15 Nov 2005 18:16:55 -0000 @@ -813,7 +813,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L strlenW(lpwhs->lpszServerName)+1); if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort, - &lpwhs->phostent, &lpwhs->socketAddress)) + &lpwhs->socketAddress)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); InternetCloseHandle( handle ); @@ -1397,7 +1397,7 @@ static BOOL HTTP_HandleRedirect(LPWININE strlenW(lpwhs->lpszServerName)+1); if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort, - &lpwhs->phostent, &lpwhs->socketAddress)) + &lpwhs->socketAddress)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); return FALSE; @@ -1917,7 +1917,7 @@ static BOOL HTTP_OpenConnection(LPWININE &(lpwhs->socketAddress), sizeof(struct sockaddr_in)); - if (!NETCON_create(&lpwhr->netConnection, lpwhs->phostent->h_addrtype, + if (!NETCON_create(&lpwhr->netConnection, lpwhs->socketAddress.sin_family, SOCK_STREAM, 0)) { WARN("Socket creation failed\n"); Index: wine/dlls/wininet/ftp.c diff -u -p wine/dlls/wininet/ftp.c:1.57 wine/dlls/wininet/ftp.c:1.58 --- wine/dlls/wininet/ftp.c:1.57 15 Nov 2005 18:16:55 -0000 +++ wine/dlls/wininet/ftp.c 15 Nov 2005 18:16:55 -0000 @@ -1656,7 +1656,6 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW static const WCHAR szDefaultUsername[] = {'a','n','o','n','y','m','o','u','s','\0'}; static const WCHAR szDefaultPassword[] = {'u','s','e','r','@','s','e','r','v','e','r','\0'}; struct sockaddr_in socketAddr; - struct hostent *phe = NULL; INT nsocket = -1; UINT sock_namelen; BOOL bSuccess = FALSE; @@ -1734,7 +1733,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_RESOLVING_NAME, (LPWSTR) lpszServerName, strlenW(lpszServerName)); - if (!GetAddress(lpszServerName, nServerPort, &phe, &socketAddr)) + if (!GetAddress(lpszServerName, nServerPort, &socketAddr)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); goto lerror; @@ -1767,7 +1766,6 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW sock_namelen = sizeof(lpwfs->socketAddress); getsockname(nsocket, (struct sockaddr *) &lpwfs->socketAddress, &sock_namelen); - lpwfs->phostent = phe; if (FTP_ConnectToHost(lpwfs)) {

1 0

wine/dlls/ntdll signal_i386.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21288 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 12:15:56 Modified files: dlls/ntdll : signal_i386.c Log message: Ken Thomases <ken(a)codeweavers.com> Updated context definitions for the latest Darwin/x86. Patch: http://cvs.winehq.org/patch.py?id=21288 Old revision New revision Changes Path 1.104 1.105 +20 -20 wine/dlls/ntdll/signal_i386.c Index: wine/dlls/ntdll/signal_i386.c diff -u -p wine/dlls/ntdll/signal_i386.c:1.104 wine/dlls/ntdll/signal_i386.c:1.105 --- wine/dlls/ntdll/signal_i386.c:1.104 15 Nov 2005 18:15:56 -0000 +++ wine/dlls/ntdll/signal_i386.c 15 Nov 2005 18:15:56 -0000 @@ -298,29 +298,32 @@ typedef struct typedef ucontext_t SIGCONTEXT; -#define EAX_sig(context) ((context)->uc_mcontext->sc.sc_eax) -#define EBX_sig(context) ((context)->uc_mcontext->sc.sc_ebx) -#define ECX_sig(context) ((context)->uc_mcontext->sc.sc_ecx) -#define EDX_sig(context) ((context)->uc_mcontext->sc.sc_edx) -#define ESI_sig(context) ((context)->uc_mcontext->sc.sc_esi) -#define EDI_sig(context) ((context)->uc_mcontext->sc.sc_edi) -#define EBP_sig(context) ((context)->uc_mcontext->sc.sc_ebp) - -#define CS_sig(context) ((context)->uc_mcontext->sc.sc_cs) -#define DS_sig(context) ((context)->uc_mcontext->sc.sc_ds) -#define ES_sig(context) ((context)->uc_mcontext->sc.sc_es) -#define FS_sig(context) ((context)->uc_mcontext->sc.sc_fs) -#define GS_sig(context) ((context)->uc_mcontext->sc.sc_gs) -#define SS_sig(context) ((context)->uc_mcontext->sc.sc_ss) +#define EAX_sig(context) ((context)->uc_mcontext->ss.eax) +#define EBX_sig(context) ((context)->uc_mcontext->ss.ebx) +#define ECX_sig(context) ((context)->uc_mcontext->ss.ecx) +#define EDX_sig(context) ((context)->uc_mcontext->ss.edx) +#define ESI_sig(context) ((context)->uc_mcontext->ss.esi) +#define EDI_sig(context) ((context)->uc_mcontext->ss.edi) +#define EBP_sig(context) ((context)->uc_mcontext->ss.ebp) + +#define CS_sig(context) ((context)->uc_mcontext->ss.cs) +#define DS_sig(context) ((context)->uc_mcontext->ss.ds) +#define ES_sig(context) ((context)->uc_mcontext->ss.es) +#define FS_sig(context) ((context)->uc_mcontext->ss.fs) +#define GS_sig(context) ((context)->uc_mcontext->ss.gs) +#define SS_sig(context) ((context)->uc_mcontext->ss.ss) -#define EFL_sig(context) ((context)->uc_mcontext->sc.sc_eflags) +#define EFL_sig(context) ((context)->uc_mcontext->ss.eflags) -#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->sc.sc_eip)) -#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->sc.sc_esp)) +#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->ss.eip)) +#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->ss.esp)) #define HANDLER_DEF(name) void name( int __signal, siginfo_t *__siginfo, SIGCONTEXT *__context ) #define HANDLER_CONTEXT (__context) +#define TRAP_sig(context) ((context)->uc_mcontext->es.trapno) +#define ERROR_sig(context) ((context)->uc_mcontext->es.err) + #define FAULT_ADDRESS (__siginfo->si_addr) #endif /* __APPLE__ */ @@ -1300,9 +1303,6 @@ BOOL SIGNAL_Init(void) ss.ss_sp = get_signal_stack(); ss.ss_size = signal_stack_size; ss.ss_flags = 0; -#ifdef __APPLE__ /* work around MacOS bug */ - ss.ss_sp = (char *)ss.ss_sp + ss.ss_size; -#endif if (!sigaltstack(&ss, NULL)) have_sigaltstack = 1; #ifdef linux /* sigaltstack may fail because the kernel is too old, or

1 0

wine/dlls/wininet internet.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21287 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 12:12:42 Modified files: dlls/wininet : internet.c Log message: Robert Shearman <rob(a)codeweavers.com> Correct the size of a callback parameter. Fix the declaration of INTERNET_WorkerThreadFunc. Patch: http://cvs.winehq.org/patch.py?id=21287 Old revision New revision Changes Path 1.140 1.141 +3 -3 wine/dlls/wininet/internet.c Index: wine/dlls/wininet/internet.c diff -u -p wine/dlls/wininet/internet.c:1.140 wine/dlls/wininet/internet.c:1.141 --- wine/dlls/wininet/internet.c:1.140 15 Nov 2005 18:12:42 -0000 +++ wine/dlls/wininet/internet.c 15 Nov 2005 18:12:42 -0000 @@ -1017,7 +1017,7 @@ BOOL WINAPI InternetCloseHandle(HINTERNE SendAsyncCallback(lpwh, lpwh->dwContext, INTERNET_STATUS_HANDLE_CLOSING, &hInternet, - sizeof(HINTERNET*)); + sizeof(HINTERNET)); if( lpwh->lpwhparent ) WININET_Release( lpwh->lpwhparent ); @@ -2912,7 +2912,7 @@ DWORD INTERNET_GetLastError(void) * RETURNS * */ -static DWORD INTERNET_WorkerThreadFunc(LPVOID *lpvParam) +static DWORD CALLBACK INTERNET_WorkerThreadFunc(LPVOID lpvParam) { DWORD dwWaitRes; @@ -3040,7 +3040,7 @@ BOOL INTERNET_AsyncCall(LPWORKREQUEST lp if (InterlockedIncrement(&dwNumThreads) > MAX_WORKER_THREADS || !(hThread = CreateThread(NULL, 0, - (LPTHREAD_START_ROUTINE)INTERNET_WorkerThreadFunc, NULL, 0, &dwTID))) + INTERNET_WorkerThreadFunc, NULL, 0, &dwTID))) { InterlockedDecrement(&dwNumThreads); INTERNET_SetLastError(ERROR_INTERNET_ASYNC_THREAD_FAILED);

1 0

wine/dlls/msi registry.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21286 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 12:12:21 Modified files: dlls/msi : registry.c Log message: Mike McCormack <mike(a)codeweavers.com> Convert MsiEnumComponentQualifiers to use msi_strcpy_to_awstring. Patch: http://cvs.winehq.org/patch.py?id=21286 Old revision New revision Changes Path 1.14 1.15 +99 -122 wine/dlls/msi/registry.c

1 0

wine/dlls/wininet urlcache.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21285 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 10:56:05 Modified files: dlls/wininet : urlcache.c Log message: Fixed Unicode buffer size bug in CreateUrlCacheEntryW. Patch: http://cvs.winehq.org/patch.py?id=21285 Old revision New revision Changes Path 1.32 1.33 +2 -2 wine/dlls/wininet/urlcache.c Index: wine/dlls/wininet/urlcache.c diff -u -p wine/dlls/wininet/urlcache.c:1.32 wine/dlls/wininet/urlcache.c:1.33 --- wine/dlls/wininet/urlcache.c:1.32 15 Nov 2005 16:56: 5 -0000 +++ wine/dlls/wininet/urlcache.c 15 Nov 2005 16:56: 5 -0000 @@ -1949,12 +1949,12 @@ BOOL WINAPI CreateUrlCacheEntryW( CacheDir = (BYTE)(rand() % pHeader->DirectoryCount); - lBufferSize = MAX_PATH * sizeof(CHAR); + lBufferSize = MAX_PATH * sizeof(WCHAR); URLCache_LocalFileNameToPathW(pContainer, pHeader, szFile, CacheDir, lpszFileName, &lBufferSize); URLCacheContainer_UnlockIndex(pContainer, pHeader); - for (lpszFileNameNoPath = lpszFileName + lBufferSize / sizeof(CHAR) - 2; + for (lpszFileNameNoPath = lpszFileName + lBufferSize / sizeof(WCHAR) - 2; lpszFileNameNoPath >= lpszFileName; --lpszFileNameNoPath) {

1 0

wine/ include/msi.h dlls/msi/registry.c dlls/m ...
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21284 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 10:55:04 Modified files: include : msi.h dlls/msi : registry.c msi.spec Log message: Mike McCormack <mike(a)codeweavers.com> Fix function prototype and spec file entry for MsiEnumComponentQualifiers. Patch: http://cvs.winehq.org/patch.py?id=21284 Old revision New revision Changes Path 1.35 1.36 +2 -2 wine/include/msi.h 1.13 1.14 +2 -2 wine/dlls/msi/registry.c 1.50 1.51 +2 -2 wine/dlls/msi/msi.spec Index: wine/include/msi.h diff -u -p wine/include/msi.h:1.35 wine/include/msi.h:1.36 --- wine/include/msi.h:1.35 15 Nov 2005 16:55: 5 -0000 +++ wine/include/msi.h 15 Nov 2005 16:55: 5 -0000 @@ -476,8 +476,8 @@ UINT WINAPI MsiProvideAssemblyA(LPCSTR, UINT WINAPI MsiProvideAssemblyW(LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD*); #define MsiProvideAssembly WINELIB_NAME_AW(MsiProvideAssembly) -UINT WINAPI MsiEnumComponentQualifiersA(LPSTR, DWORD, LPSTR, DWORD*, LPSTR, DWORD*); -UINT WINAPI MsiEnumComponentQualifiersW(LPWSTR, DWORD, LPWSTR, DWORD*, LPWSTR, DWORD*); +UINT WINAPI MsiEnumComponentQualifiersA(LPCSTR, DWORD, LPSTR, DWORD*, LPSTR, DWORD*); +UINT WINAPI MsiEnumComponentQualifiersW(LPCWSTR, DWORD, LPWSTR, DWORD*, LPWSTR, DWORD*); #define MsiEnumComponentQualifiers WINELIB_NAME_AW(MsiEnumComponentQualifiers) UINT WINAPI MsiGetFileVersionA(LPCSTR, LPSTR, DWORD*, LPSTR, DWORD*); Index: wine/dlls/msi/registry.c diff -u -p wine/dlls/msi/registry.c:1.13 wine/dlls/msi/registry.c:1.14 --- wine/dlls/msi/registry.c:1.13 15 Nov 2005 16:55: 5 -0000 +++ wine/dlls/msi/registry.c 15 Nov 2005 16:55: 5 -0000 @@ -773,7 +773,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szCo * MsiEnumComponentQualifiersA [MSI.@] * */ -UINT WINAPI MsiEnumComponentQualifiersA( LPSTR szComponent, DWORD iIndex, +UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex, LPSTR lpQualifierBuf, DWORD* pcchQualifierBuf, LPSTR lpApplicationDataBuf, DWORD* pcchApplicationDataBuf) { @@ -852,7 +852,7 @@ UINT WINAPI MsiEnumComponentQualifiersA( * MsiEnumComponentQualifiersW [MSI.@] * */ -UINT WINAPI MsiEnumComponentQualifiersW( LPWSTR szComponent, DWORD iIndex, +UINT WINAPI MsiEnumComponentQualifiersW( LPCWSTR szComponent, DWORD iIndex, LPWSTR lpQualifierBuf, DWORD* pcchQualifierBuf, LPWSTR lpApplicationDataBuf, DWORD* pcchApplicationDataBuf ) { Index: wine/dlls/msi/msi.spec diff -u -p wine/dlls/msi/msi.spec:1.50 wine/dlls/msi/msi.spec:1.51 --- wine/dlls/msi/msi.spec:1.50 15 Nov 2005 16:55: 5 -0000 +++ wine/dlls/msi/msi.spec 15 Nov 2005 16:55: 5 -0000 @@ -31,8 +31,8 @@ 35 stdcall MsiEnableUIPreview(long ptr) 36 stdcall MsiEnumClientsA(str long ptr) 37 stdcall MsiEnumClientsW(wstr long ptr) -38 stdcall MsiEnumComponentQualifiersA(str long str ptr str ptr) -39 stdcall MsiEnumComponentQualifiersW(wstr long wstr ptr wstr ptr) +38 stdcall MsiEnumComponentQualifiersA(str long ptr ptr ptr ptr) +39 stdcall MsiEnumComponentQualifiersW(wstr long ptr ptr ptr ptr) 40 stdcall MsiEnumComponentsA(long ptr) 41 stdcall MsiEnumComponentsW(long ptr) 42 stdcall MsiEnumFeaturesA(str long ptr ptr)

1 0

wine/dlls/comctl32 header.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21283 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 10:54:42 Modified files: dlls/comctl32 : header.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Implement implement header callback support (HDN_GETDISPINFO notification): - better factorisation - unicode fixes Patch: http://cvs.winehq.org/patch.py?id=21283 Old revision New revision Changes Path 1.87 1.88 +139 -17 wine/dlls/comctl32/header.c

1 0

wine/dlls/urlmon/tests url.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21282 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 10:54:13 Modified files: dlls/urlmon/tests: url.c Log message: Don't crash if BindToStorage fails. Patch: http://cvs.winehq.org/patch.py?id=21282 Old revision New revision Changes Path 1.13 1.14 +2 -0 wine/dlls/urlmon/tests/url.c Index: wine/dlls/urlmon/tests/url.c diff -u -p wine/dlls/urlmon/tests/url.c:1.13 wine/dlls/urlmon/tests/url.c:1.14 --- wine/dlls/urlmon/tests/url.c:1.13 15 Nov 2005 16:54:13 -0000 +++ wine/dlls/urlmon/tests/url.c 15 Nov 2005 16:54:13 -0000 @@ -633,6 +633,8 @@ static void test_BindToStorage(void) hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); ok(SUCCEEDED(hres), "IMoniker_BindToStorage failed: %08lx\n", hres); + if (!SUCCEEDED(hres)) return; + if(test_protocol == HTTP_TEST) { todo_wine { ok(unk == NULL, "istr should be NULL\n");

1 0

wine/dlls/msi install.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21281 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 10:53:47 Modified files: dlls/msi : install.c Log message: Mike McCormack <mike(a)codeweavers.com> Only return ERROR_MORE_DATA if there's a buffer to copy a result into. Patch: http://cvs.winehq.org/patch.py?id=21281 Old revision New revision Changes Path 1.19 1.20 +1 -1 wine/dlls/msi/install.c Index: wine/dlls/msi/install.c diff -u -p wine/dlls/msi/install.c:1.19 wine/dlls/msi/install.c:1.20 --- wine/dlls/msi/install.c:1.19 15 Nov 2005 16:53:47 -0000 +++ wine/dlls/msi/install.c 15 Nov 2005 16:53:47 -0000 @@ -142,7 +142,7 @@ UINT msi_strcpy_to_awstring( LPCWSTR str awbuf->str.a[*sz - 1] = 0; } - if (len >= *sz) + if (awbuf->str.w && len >= *sz) r = ERROR_MORE_DATA; *sz = len; return r;

1 0