February 2009 - Wine-Devel - list.winehq.org

Re: urlmon: Corrected tests (resend)
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Hi, > > Changelog: > urlmon: Corrected tests Please write a better description. "Corrected tests" applies to every test commit. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: gdi32: Fixed a couple of Win64 pointer cast compiler warnings
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Eddie Leung <eddie.leung.2009(a)anderson.ucla.edu> writes: > diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c > index c8a3c4c..44a9a6f 100644 > --- a/dlls/gdi32/dc.c > +++ b/dlls/gdi32/dc.c > @@ -1433,7 +1433,7 @@ static BOOL WINAPI call_dc_hook16( HDC hdc, WORD code, DWORD_PTR data, LPARAM lP > args[2] = LOWORD(data); > args[1] = HIWORD(lParam); > args[0] = LOWORD(lParam); > - WOWCallback16Ex( (DWORD)dc->hookProc, WCB16_PASCAL, sizeof(args), args, &ret ); > + WOWCallback16Ex( (DWORD_PTR)dc->hookProc, WCB16_PASCAL, sizeof(args), args, &ret ); The correct fix for these things is to move them to a 16-bit file that doesn't get compiled at all for Win64. It doesn't make sense to call WOWCallback16 in 64-bit mode. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: lz32: Fix several test failures on Windows 9x systems
by Alexandre Julliard Feb. 13, 2009

Feb. 13, 2009

Juan Lang <juan.lang(a)gmail.com> writes: > @@ -231,7 +231,9 @@ static void test_LZOpenFileA_existing_compressed(void) > file = LZOpenFileA(_terminated, &test, OF_EXIST); > ok(file >= 0, "LZOpenFileA failed on switching to a compressed file name\n"); > ok(test.cBytes == sizeof(OFSTRUCT) || > - broken(test.cBytes == 40), /* win95 */ > + broken(test.cBytes == 34) /* winME */ || > + broken(test.cBytes == 40) /* win95 */ || > + broken(test.cBytes == 48), /* some win95 */ My guess is that this depends on the length of the filename, not on the platform. -- Alexandre Julliard julliard(a)winehq.org

1 0

Problem with compiling ole32 crosstest
by Vitaly Perov Feb. 13, 2009

Feb. 13, 2009

Hi! Does anybody have a problem compilling the crosstest of ole32? Or maybe it's only my fault? I have: usrmarshal.cross.o: In function `func_usrmarshal': /srv/vitperov/Projects/wine-dev/dlls/ole32/tests/usrmarshal.c:445: undefined reference to `_WdtpInterfacePointer_UserSize(a)20' /srv/vitperov/Projects/wine-dev/dlls/ole32/tests/usrmarshal.c:448: undefined reference to `_WdtpInterfacePointer_UserMarshal(a)20' ... -- Best wishes, Vitaly Perov Russia, Saint-Petersburg. www.etersoft.ru

2 2

Re: wintrust(2/3): Remove a couple tests that fail on a variety of systems (try 2)
by Paul Vriens Feb. 13, 2009

Feb. 13, 2009

Juan Lang wrote: > This removes the unused variables in the last version. > --Juan > > > ------------------------------------------------------------------------ > > I think that these failures are also because of "not enough rights" (people running winetest as a normal user). So just removing them is probably not the best approach? -- Cheers, Paul.

4 8

Re: [5/5] fusion: Implement IAssemblyCache::QueryAssemblyInfo.
by James Hawkins Feb. 13, 2009

Feb. 13, 2009

It would be a lot easier if you just took over my patches that implement this properly: [PATCH 1/3] fusion: Implement the IAssemblyEnum interface. [try4] http://winehq.org/pipermail/wine-patches/2009-January/066994.html [PATCH 2/3] fusion: Add tests for the IAssemblyEnum interface. [try4] http://winehq.org/pipermail/wine-patches/2009-January/066995.html [PATCH 3/3] fusion: Add initial implementation of IAssemblyCache::QueryAssemblyInfo. [try4] http://winehq.org/pipermail/wine-patches/2009-January/066996.html The tests need to be fixed in a couple places to take directory ordering (or lack-thereof) into account. http://winehq.org/pipermail/wine-devel/2009-January/071727.html -- James Hawkins On Fri, Feb 13, 2009 at 12:14 AM, Hans Leidekker <hans(a)meelstraat.net> wrote: > > diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c > index 73756b3..2ce1995 100644 > --- a/dlls/fusion/asmcache.c > +++ b/dlls/fusion/asmcache.c > @@ -41,6 +41,9 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(fusion); > > +static const WCHAR ext_exe[] = {'.','e','x','e',0}; > +static const WCHAR ext_dll[] = {'.','d','l','l',0}; > + > static BOOL create_full_path(LPCWSTR path) > { > LPWSTR new_path; > @@ -167,15 +170,102 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface > return E_NOTIMPL; > } > > +static BOOL get_file_size(const WCHAR *filename, LARGE_INTEGER *size) > +{ > + HANDLE file; > + > + size->QuadPart = 0; > + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, > + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); > + if (file == INVALID_HANDLE_VALUE) return FALSE; > + GetFileSizeEx(file, size); > + CloseHandle(file); > + return TRUE; > +} > + > +#define TOKEN_LEN 16 > +#define CULTURE_LEN 17 > +#define NAME_LEN 100 > + > static HRESULT WINAPI IAssemblyCacheImpl_QueryAssemblyInfo(IAssemblyCache *iface, > DWORD dwFlags, > LPCWSTR pszAssemblyName, > ASSEMBLY_INFO *pAsmInfo) > { > - FIXME("(%p, %d, %s, %p) stub!\n", iface, dwFlags, > - debugstr_w(pszAssemblyName), pAsmInfo); > + static const WCHAR fmt[] = > + {'%','s','\\','%','s','\\','%','u','.','%','u','.','%','u', > + '.','%','u','_','%','s','_','%','s','\\','%','s','%','s',0}; > > - return E_NOTIMPL; > + HRESULT hr; > + IAssemblyName *asmname; > + WCHAR asmdir[MAX_PATH], path[MAX_PATH]; > + WCHAR name[NAME_LEN + 1], culture[CULTURE_LEN + 1], token[TOKEN_LEN + 1]; > + WORD major, minor, build, revision; > + BYTE buf[8]; > + DWORD size; > + LARGE_INTEGER filesize; > + BOOL installed; > + > + TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, debugstr_w(pszAssemblyName), pAsmInfo); > + > + hr = CreateAssemblyNameObject(&asmname, pszAssemblyName, CANOF_PARSE_DISPLAY_NAME, NULL); > + if (FAILED(hr)) > + return hr; > + > + size = sizeof(name); > + IAssemblyName_GetProperty(asmname, ASM_NAME_NAME, name, &size); > + > + size = sizeof(buf); > + memset(buf, 0, sizeof(buf)); > + IAssemblyName_GetProperty(asmname, ASM_NAME_PUBLIC_KEY_TOKEN, buf, &size); > + > + token_to_str(buf, token); > + > + size = sizeof(major); > + IAssemblyName_GetProperty(asmname, ASM_NAME_MAJOR_VERSION, &major, &size); > + > + size = sizeof(minor); > + IAssemblyName_GetProperty(asmname, ASM_NAME_MINOR_VERSION, &minor, &size); > + > + size = sizeof(build); > + IAssemblyName_GetProperty(asmname, ASM_NAME_BUILD_NUMBER, &build, &size); > + > + size = sizeof(revision); > + IAssemblyName_GetProperty(asmname, ASM_NAME_REVISION_NUMBER, &revision, &size); > + > + size = sizeof(culture); > + IAssemblyName_GetProperty(asmname, ASM_NAME_CULTURE, &culture, &size); > + > + get_assembly_directory(asmdir, MAX_PATH); > + > + sprintfW(path, fmt, asmdir, > + name, major, minor, build, revision, culture, token, name, ext_dll); > + > + /* FIXME: there can be more than one file */ > + if (!(installed = get_file_size(path, &filesize))) > + { > + strcpyW(strrchrW(path, '.'), ext_exe); > + if (!(installed = get_file_size(path, &filesize))) > + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); > + } > + > + if (pAsmInfo) > + { > + pAsmInfo->uliAssemblySizeInKB.QuadPart = filesize.QuadPart; > + pAsmInfo->dwAssemblyFlags = 0; > + if (installed) > + { > + pAsmInfo->cbAssemblyInfo = sizeof(ASSEMBLY_INFO); > + pAsmInfo->dwAssemblyFlags = ASSEMBLYINFO_FLAG_INSTALLED; > + pAsmInfo->pszCurrentAssemblyPathBuf = strdupW(path); > + pAsmInfo->cchBuf = strlenW(pAsmInfo->pszCurrentAssemblyPathBuf) + 1; > + } > + } > + > + if (dwFlags & QUERYASMINFO_FLAG_VALIDATE) FIXME("not validating assembly\n"); > + > + IAssemblyName_Release(asmname); > + return hr; > } > > static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyCacheItem(IAssemblyCache *iface, > @@ -216,9 +306,6 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, > LPWSTR ext; > HRESULT hr; > > - static const WCHAR ext_exe[] = {'.','e','x','e',0}; > - static const WCHAR ext_dll[] = {'.','d','l','l',0}; > - > TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, > debugstr_w(pszManifestFilePath), pRefData); > > diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c > index 049bf15..a7b09c8 100644 > --- a/dlls/fusion/assembly.c > +++ b/dlls/fusion/assembly.c > @@ -818,25 +818,6 @@ static BYTE *assembly_get_blob(ASSEMBLY *assembly, WORD index, ULONG *size) > return GetData(&assembly->blobs[index], size); > } > > -static void bytes_to_str(BYTE *bytes, DWORD len, LPWSTR str) > -{ > - DWORD i; > - > - static const WCHAR hexval[16] = { > - '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' > - }; > - > - for(i = 0; i < len; i++) > - { > - str[i * 2] = hexval[((bytes[i] >> 4) & 0xF)]; > - str[i * 2 + 1] = hexval[(bytes[i]) & 0x0F]; > - } > -} > - > -#define BYTES_PER_TOKEN 8 > -#define CHARS_PER_BYTE 2 > -#define TOKEN_LENGTH (BYTES_PER_TOKEN * CHARS_PER_BYTE + 1) > - > HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) > { > ASSEMBLYTABLE *asmtbl; > @@ -896,8 +877,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) > goto done; > } > > - bytes_to_str(tokbytes, BYTES_PER_TOKEN, tok); > - tok[TOKEN_LENGTH - 1] = '\0'; > + token_to_str(tokbytes, tok); > > *token = tok; > hr = S_OK; > diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h > index 405133b..6dec11b 100644 > --- a/dlls/fusion/fusionpriv.h > +++ b/dlls/fusion/fusionpriv.h > @@ -445,4 +445,24 @@ static inline WCHAR *strdupW(const WCHAR *src) > return dst; > } > > +#define BYTES_PER_TOKEN 8 > +#define CHARS_PER_BYTE 2 > +#define TOKEN_LENGTH (BYTES_PER_TOKEN * CHARS_PER_BYTE + 1) > + > +static inline void token_to_str(BYTE *bytes, LPWSTR str) > +{ > + DWORD i; > + > + static const WCHAR hexval[16] = { > + '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' > + }; > + > + for(i = 0; i < BYTES_PER_TOKEN; i++) > + { > + str[i * 2] = hexval[((bytes[i] >> 4) & 0xF)]; > + str[i * 2 + 1] = hexval[(bytes[i]) & 0x0F]; > + } > + str[i * 2] = 0; > +} > + > #endif /* __WINE_FUSION_PRIVATE__ */ > diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c > index fe2b466..42d8cba 100644 > --- a/dlls/fusion/tests/asmcache.c > +++ b/dlls/fusion/tests/asmcache.c > @@ -1020,11 +1020,8 @@ static void test_QueryAssemblyInfo(void) > /* assembly not installed yet */ > INIT_ASM_INFO(); > hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, wine, &info); > - todo_wine > - { > - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), > - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); > - } > + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), > + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); > ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), > "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); > ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); > @@ -1043,10 +1040,7 @@ static void test_QueryAssemblyInfo(void) > INIT_ASM_INFO(); > hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_VALIDATE, > NULL, &info); > - todo_wine > - { > - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); > - } > + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); > ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), > "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); > ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); > @@ -1062,10 +1056,7 @@ static void test_QueryAssemblyInfo(void) > INIT_ASM_INFO(); > hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_VALIDATE, > empty, &info); > - todo_wine > - { > - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); > - } > + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); > ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), > "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); > ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); > @@ -1100,11 +1091,8 @@ static void test_QueryAssemblyInfo(void) > /* pwzCachePath is full filename */ > INIT_ASM_INFO(); > hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, winedll, &info); > - todo_wine > - { > - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), > - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); > - } > + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), > + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); > ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), > "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); > ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); > @@ -1332,11 +1320,8 @@ static void test_QueryAssemblyInfo(void) > lstrcatW(name, badver); > hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, > name, &info); > - todo_wine > - { > - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), > - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); > - } > + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), > + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); > ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), > "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); > ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); > @@ -1379,11 +1364,8 @@ static void test_QueryAssemblyInfo(void) > lstrcatW(name, badculture); > hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, > name, &info); > - todo_wine > - { > - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), > - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); > - } > + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), > + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); > ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), > "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); > ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); > @@ -1426,11 +1408,8 @@ static void test_QueryAssemblyInfo(void) > lstrcatW(name, badpubkey); > hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, > name, &info); > - todo_wine > - { > - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), > - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); > - } > + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), > + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); > ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), > "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); > ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); > @@ -1466,6 +1445,31 @@ static void test_QueryAssemblyInfo(void) > "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); > } > > + /* fully qualified display name */ > + INIT_ASM_INFO(); > + lstrcpyW(name, wine); > + lstrcatW(name, commasep); > + lstrcatW(name, ver); > + lstrcatW(name, commasep); > + lstrcatW(name, culture); > + lstrcatW(name, commasep); > + lstrcatW(name, pubkey); > + hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, > + name, &info); > + ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), > + "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); > + ok(info.uliAssemblySizeInKB.u.HighPart == 0, > + "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); > + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); > + ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, > + "Expected ASSEMBLYINFO_FLAG_INSTALLED, got %08x\n", info.dwAssemblyFlags); > + ok(info.uliAssemblySizeInKB.u.LowPart == sizeof(ASSEMBLY), > + "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); > + ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), > + "Wrong assembly path returned\n"); > + ok(info.cchBuf == lstrlenW(asmpath) + 1, > + "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); > + > /* uninstall the assembly from the GAC */ > disp = 0xf00dbad; > hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); > > >

2 2

Re: [3/5] fusion: Assembly version numbers are WORDs.
by James Hawkins Feb. 13, 2009

Feb. 13, 2009

This definitely needs a test. -- James Hawkins On Fri, Feb 13, 2009 at 12:14 AM, Hans Leidekker <hans(a)meelstraat.net> wrote: > > diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c > index acf0411..ebf76af 100644 > --- a/dlls/fusion/asmname.c > +++ b/dlls/fusion/asmname.c > @@ -45,7 +45,7 @@ typedef struct { > LPWSTR name; > LPWSTR culture; > > - BYTE version[4]; > + WORD version[4]; > DWORD versize; > > BYTE pubkey[8]; > @@ -145,28 +145,28 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, > > case ASM_NAME_MAJOR_VERSION: > *pcbProperty = 0; > - *((LPDWORD)pvProperty) = name->version[0]; > + *((WORD *)pvProperty) = name->version[0]; > if (name->versize >= 1) > *pcbProperty = sizeof(WORD); > break; > > case ASM_NAME_MINOR_VERSION: > *pcbProperty = 0; > - *((LPDWORD)pvProperty) = name->version[1]; > + *((WORD *)pvProperty) = name->version[1]; > if (name->versize >= 2) > *pcbProperty = sizeof(WORD); > break; > > case ASM_NAME_BUILD_NUMBER: > *pcbProperty = 0; > - *((LPDWORD)pvProperty) = name->version[2]; > + *((WORD *)pvProperty) = name->version[2]; > if (name->versize >= 3) > *pcbProperty = sizeof(WORD); > break; > > case ASM_NAME_REVISION_NUMBER: > *pcbProperty = 0; > - *((LPDWORD)pvProperty) = name->version[3]; > + *((WORD *)pvProperty) = name->version[3]; > if (name->versize >= 4) > *pcbProperty = sizeof(WORD); > break; > > >

2 1

Re: [1/5] fusion: Assembly version must be taken from the metadata, not the file version.
by James Hawkins Feb. 13, 2009

Feb. 13, 2009

On Fri, Feb 13, 2009 at 12:12 AM, Hans Leidekker <hans(a)meelstraat.net> wrote: > > Office 2007 SP1 installer depends on this. > Please write a test case. -- James Hawkins

2 2

Re: msi: Fix case of assembly field names.
by James Hawkins Feb. 13, 2009

Feb. 13, 2009

Fix how? Both cases should be accepted... -- James Hawkins 2009/2/13 Hans Leidekker <hans(a)meelstraat.net>: > > diff --git a/dlls/msi/action.c b/dlls/msi/action.c > index fd38f7a..38d2484 100644 > --- a/dlls/msi/action.c > +++ b/dlls/msi/action.c > @@ -5870,11 +5870,11 @@ static UINT parse_assembly_name(MSIRECORD *rec, LPVOID param) > LPCWSTR name = MSI_RecordGetString(rec, 2); > LPWSTR val = msi_dup_record_field(rec, 3); > > - static const WCHAR Name[] = {'N','a','m','e',0}; > - static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; > - static const WCHAR Culture[] = {'C','u','l','t','u','r','e',0}; > + static const WCHAR Name[] = {'n','a','m','e',0}; > + static const WCHAR Version[] = {'v','e','r','s','i','o','n',0}; > + static const WCHAR Culture[] = {'c','u','l','t','u','r','e',0}; > static const WCHAR PublicKeyToken[] = { > - 'P','u','b','l','i','c','K','e','y','T','o','k','e','n',0}; > + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n',0}; > > if (!lstrcmpW(name, Name)) > asmname->name = val; > > >

1 0

Re: [sane.ds 1/3] Get resolution from sane, instead of hard coding -1.
by Jeremy White Feb. 12, 2009

Feb. 12, 2009

I'm sorry; I failed to do a git-add options.c prior to this commit. Please use this patch instead. Cheers, Jeremy

1 0

Re: gdiplus: in GdipDrawString only NULL terminate if we have room in the buffer.
by Nikolay Sivov Feb. 12, 2009

Feb. 12, 2009

Aric Stewart wrote: > --- > dlls/gdiplus/graphics.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c > index 2673042..c276a43 100644 > --- a/dlls/gdiplus/graphics.c > +++ b/dlls/gdiplus/graphics.c > @@ -1901,7 +1901,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string > j++; > } > > - stringdup[j] = 0; > + if (j < length) > + stringdup[j] = 0; > length = j; > > while(sum < length){ > Hm, maybe I don't follow something, but I think 'j < length' is always true after that: --- for(i = 0, j = 0; i < length; i++){ if(!isprintW(string[i]) && (string[i] != '\n')) continue; stringdup[j] = string[i]; j++; } stringdup[j] = 0; length = j; --- Or you thought about zero length case? It should be handled earlier, on stringdup allocation or before...

2 1

Re: [2/2] tools/winemaker.man.in: update man-page
by Nikolay Sivov Feb. 12, 2009

Feb. 12, 2009

André Hentschel wrote: > sorry, had the wrong mail-account last time. > updating the man-page of winemaker. > there were such old things, there was dust on it! > > > > No attachment here...

1 0

Re: mshtml: Implement IHTMLStyle get/put minHeight (resend)
by Jacek Caban Feb. 12, 2009

Feb. 12, 2009

Hi Alistair, Alistair Leslie-Hughes wrote: > Hi, > > Changelog: > mshtml: Implement IHTMLStyle get/put minHeight > [get|set]_nsstyle_attr_var functions were introduces to avoid the code duplication like you do. You should use them (and probably implement VT_I4 handling in set_nsstyle_attr_var). Jacek

1 0

Is the test.winehq.org front page too pessimistic?
by Juan Lang Feb. 12, 2009

Feb. 12, 2009

The front page of test.winehq.org shows statistics about failed tests, but it doesn't seem to take into account the number of individual tests that passed and failed, rather the number of files that had any failures. So, for example, about a week ago I got a fix committed for some failing mapi32 tests. Looking at the machines with test failures, before the fix was committed, 139 tests were run, with 134 of them failing, whereas after the fix was committed, the same number of tests were run, with only 6 of them failing. Nonetheless, the 4th of February shows a higher failure rate (14.6%) than the 3rd of February (12.4%). I know other tests could have started failing in the interim, but it seems like we've been putting a fair amount of effort into reducing test failures lately, while the percent of failed tests isn't going down, at least not on the main page. If you look at a particular day's results, the numbers look a bit better over time. I'm not sending a patch, because there may be different opinions on this. That is, perhaps some people like to see a statistic on the number of files with failing tests on any machine, which the front page appears to show, while others may like to see the number of failures in a particular file, which a day's results show. My own opinion is that it's hard to get motivated to fix something without some sort of positive feedback for it, so changing the front page would be better. My own feeling is that there are far fewer failing tests now than there used to be, and I'd sure like to see that reflected somewhere at a quick glance. Thoughts? --Juan

8 11

Re: mshtml: Implement IHTMLStyle_put_textDecorationUnderline (resend)
by Jacek Caban Feb. 12, 2009

Feb. 12, 2009

Alistair Leslie-Hughes wrote: > Hi, > > Changelog: > mshtml: Implement IHTMLStyle_put_textDecorationUnderline + + return set_style_attr(This, STYLEID_TEXT_DECORATION, v == VARIANT_TRUE ? valUnderline : emptyW, 0); You shouldn't compare v to VARIANT_TRUE. The correct way to deal with bool values is 'v ? valUnderline : emptyW'. Jacek

1 0

ntdll: Avoid Potential Infinite Loop
by Paul Bryan Roberts Feb. 12, 2009

Feb. 12, 2009

Hi, I expect this patch will be accepted due to precedent - a few months ago I submitted the same patch for the same problem in a different routine in a different compilation unit of ntdll. Yes, I guess the infinite loop does not occur in practice (someone would have noticed) and I guess it has been there a very long time. But it isn't exactly hard to spot - I was speed reading the code looking for something else. I've seen a lot of chatter recently about something called Coverity. I looked it up on Wikipedia (after checking the spelling). Apart from it's obvious use as a conversation piece, is it proving useful to the project ? Is there a feedback policy ? Something like "We think your product is superlative .... but someone may wonder if your code not finding this bug in our code might be a bug in your code." Security :); false sense of security :( Paul Bryan Roberts >From dd2f31b0176e795edf5b1eb081410de7ed5ed03d Mon Sep 17 00:00:00 2001 From: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Thu, 12 Feb 2009 08:09:17 +0000 Subject: ntdll: avoid potential infinite loop --- dlls/ntdll/nt.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 879a324..dc81648 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -293,17 +293,20 @@ NTSTATUS WINAPI NtQueryInformationToken( char stack_buffer[256]; unsigned int server_buf_len = sizeof(stack_buffer); void *buffer = stack_buffer; - BOOLEAN need_more_memory = FALSE; + BOOLEAN need_more_memory; /* we cannot work out the size of the server buffer required for the * input size, since there are two factors affecting how much can be * stored in the buffer - number of groups and lengths of sids */ do { + need_more_memory = FALSE; + SERVER_START_REQ( get_token_groups ) { TOKEN_GROUPS *groups = tokeninfo; + req->handle = wine_server_obj_handle( token ); wine_server_set_reply( req, buffer, server_buf_len ); status = wine_server_call( req ); -- 1.5.4.3

2 1

Re: gdi32/tests: Use the ANSI text metrics so the tests work on win9x.
by Paul Vriens Feb. 12, 2009

Feb. 12, 2009

Huw Davies wrote: > --- > dlls/gdi32/tests/font.c | 20 ++++++++++---------- > 1 files changed, 10 insertions(+), 10 deletions(-) > > > ------------------------------------------------------------------------ > > Looks a lot like: http://www.winehq.org/pipermail/wine-patches/2009-February/069297.html Maybe we should use yours as it has less changes to the code. -- Cheers, Paul.

2 1

Download page requires too much scrolling...
by Dan Kegel Feb. 12, 2009

Feb. 12, 2009

While I was generating screenshots for my presentation, I noticed that http://www.winehq.org/download/ has too much clutter at the top. I don't mind the Codeweavers ad, but it's not good that users have to scroll down to see the useful part of the page...

2 1

Wine64 : Trying to load PE image for unsupported architecture (I386)
by Erik de Castro Lopo Feb. 12, 2009

Feb. 12, 2009

Hi all, I build Wine64 using the instructions here: http://wiki.winehq.org/Wine64 While I expected it to not work with my Win64 program I was a little surprised that when running a WIn32 program I got: Trying to load PE image for unsupported architecture (I386) I realise that the Win64 stuff is experimental but I'm curions, in the longer term is it expected that one executable will be able to run both Win32 and Win64 executables? Cheers, Erik -- ----------------------------------------------------------------- Erik de Castro Lopo ----------------------------------------------------------------- J. Headley: "God, root, what is difference ?" G. Haverland: "God can change the byte order on the CPU, root can't."

6 7

Fwd: Need Your Help about "dll" on linux
by Jigar Joshi Feb. 11, 2009

Feb. 11, 2009

---------- Forwarded message ---------- From: Jigar Joshi <jigarjm(a)gmail.com> Date: Mon, Feb 9, 2009 at 6:53 PM Subject: Need Your Help about "dll" on linux To: wine-devel(a)winehq.org Respected sir, i refered your post at http://www.winehq.org/pipermail/wine-devel/2007-April/055855.html i want to know have you completed successfully that project? (using dll on linux) please reply soon . actually i have dlls derived from c , i dont have c code and i need to use those dlls on linus using java (JNI), first i tried to convert dll to ".so" bt i couldn't. . . read your post and got some moral support please reply soon . . . Regards Jigar

1 0

Error on CVS server: no space left on device
by Paul Chitescu Feb. 11, 2009

Feb. 11, 2009

Hi! The CVS server cvs.winehq.org is out of disk space: $ cvs -z3 -q up -APd can't create temporary directory /tmp/cvs-serv29410 No space left on device Message is received from remote server. Anyone able to fix it? Regards, Paul Chitescu

3 2

Re: itss: Replace malloc() with HeapAlloc()
by Nikolay Sivov Feb. 11, 2009

Feb. 11, 2009

Andrew Talbot wrote: > Changelog: > itss: Replace malloc() with HeapAlloc(). > > diff --git a/dlls/itss/lzx.c b/dlls/itss/lzx.c > index b5fdfc7..0ffeeb6 100644 > --- a/dlls/itss/lzx.c > +++ b/dlls/itss/lzx.c > @@ -36,15 +36,17 @@ > ***************************************************************************/ > > #include "lzx.h" > +#include <stdarg.h> > #include <stdio.h> > #include <stdlib.h> > #include <string.h> > > +#include "windef.h" > +#include "winbase.h" > + > /* sized types */ > typedef unsigned char UBYTE; /* 8 bits exactly */ > typedef unsigned short UWORD; /* 16 bits (or more) */ > -typedef unsigned int ULONG; /* 32 bits (or more) */ > -typedef signed int LONG; /* 32 bits (or more) */ > > /* some constants defined by the LZX specification */ > #define LZX_MIN_MATCH (2) > @@ -178,8 +180,8 @@ struct LZXstate *LZXinit(int window) > if (window < 15 || window > 21) return NULL; > > /* allocate state and associated window */ > - pState = malloc(sizeof(struct LZXstate)); > - if (!(pState->window = malloc(wndsize))) > + pState = HeapAlloc(GetProcessHeap(), 0, sizeof(struct LZXstate)); > + if (!(pState->window = HeapAlloc(GetProcessHeap(), 0, wndsize))) > { > free(pState); > return NULL; > Why didn't you replace corresponding free() calls?

4 5

An idea for the appdb
by Luke Benstead Feb. 11, 2009

Feb. 11, 2009

Hi all, I was thinking earlier it would be quite nice if when I double clicked a Windows app in GNOME it would display a nice dialog saying something like "This Windows application may not run correctly as it is currently rated Silver. Please report any bugs to the Wine project. Continue | Cancel". Obviously this kind of functionality is not a job for Wine, but for the distro. Still, it got me thinking how this kind of functionality might be achieved. My idea is that the appdb should allow for people to associate a list of checksums with an application version. For example, WoW might have the checksum for the setup program and the game's executable, associated with the appdb entry. The other extension to the appdb would be to allow a way to programmatically retrieve information on an application's rating etc. by going to a certain address (e.g. http://appdb.winehq.org/getAppInfoFromChecksum.php?checksum=ac2b3f5928cba...) which would return the info in XML or some other format. So what do you guys think? Perhaps some of this functionality exists and I don't know about it :) Luke.

4 7

Re: An idea for the appdb
by James Mckenzie Feb. 11, 2009

Feb. 11, 2009

-----Original Message----- >From: alex(a)centroidcafe.com >Sent: Feb 11, 2009 10:59 AM >To: wine-devel(a)winehq.org >Subject: Re: An idea for the appdb > >Sorry .. forgot to reply all. > >Automatic submission of test data could be a very handy tool. Scenario: >User A tries to run an application, it crashes due to bugs in Wine. User A >elects to submit data. Sometime in the future, User B tries to run the same >application under a similar configuration. It crashes also, but User B >being a sly user figures out what DLL overrides, patches, etc. allow this >app to progress past the original crash point. Wine detects this and >collects the information. Now when User C tries to run this app, Wine >displays a message like: "This application has been known to fail under the >current configuration. However, workarounds have been discovered that may >yield greater success. <link to AppDB>" > This would be great, but as previously discussed, who would maintain this information and verify it is correct and proper? Although some features would be 'neet to have' it is best to leave them on the drawing board for now and work on the various bugs that require workarounds. This is because of two limited resources: People and Time. If you have the skills to implement this feature, go ahead and try on a limited database on your home system. You would quickly see that we have about 10,000 applications in the AppDB and there are many versions of Wine. This gives you some starting point of the size of this task. Supporting a few applications would lead to the 'why isn't my wiz-bang application there' and a great deal of discussion, wasting more resources. Of course, if you could produce something that would emulate the "Report to ...." functionality that is in popular use, that would help keep the AppDB and Bugzilla up to date as long as a search capability were added to sweep these systems for pre-existing entries related to the current problem. Just my opinion, but this project is not worth attempting at this point. James McKenzie

5 4

Re: winedos: Replace [c]alloc() with HeapAlloc()
by Andrew Talbot Feb. 11, 2009

Feb. 11, 2009

Andrew Talbot wrote: Sorry, title should be: winedos: Replace [m|c]alloc() with HeapAlloc() -- Andy.

1 0