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

Re: [1/5] fusion: Assembly version must be taken from the metadata, not the file version.

by James Hawkins

On Fri, Feb 13, 2009 at 12:34 AM, Hans Leidekker <hans(a)codeweavers.com> wrote: > On Friday 13 February 2009 09:22:31 James Hawkins wrote: > >> > Office 2007 SP1 installer depends on this. >> >> Please write a test case. > > Sure. Note that it's documented here http://support.microsoft.com/kb/556041 > No problem, just want to have it in the tests for our documentation and to keep from regressing. -- James Hawkins

Feb. 13, 2009

Re: [1/5] fusion: Assembly version must be taken from the metadata, not the file version.

by Hans Leidekker

On Friday 13 February 2009 09:22:31 James Hawkins wrote: > > Office 2007 SP1 installer depends on this. > > Please write a test case. Sure. Note that it's documented here http://support.microsoft.com/kb/556041 -Hans

Feb. 13, 2009

Re: msi: Fix case of assembly field names.

by James Hawkins

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; > > >

Feb. 13, 2009

Re: [5/5] fusion: Implement IAssemblyCache::QueryAssemblyInfo.

by James Hawkins

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); > > >

Feb. 13, 2009

Re: [3/5] fusion: Assembly version numbers are WORDs.

by James Hawkins

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; > > >

Feb. 13, 2009

Re: [1/5] fusion: Assembly version must be taken from the metadata, not the file version.

by James Hawkins

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

Feb. 13, 2009

Proposed goal for website: happily usable at 800x600?

by Dan Kegel

What with netbooks with small screens abounding, it might make sense to review our web site and make sure its most important parts are usable in an 800x600 screen (easy to simulate, just resize your browser until xwininfo says it's 800x550, those gnome top and bottom bars chew 25 pixels each). That's asking a lot, I suppose... - Dan

Feb. 13, 2009

Re: [sane.ds 1/3] Get resolution from sane, instead of hard coding -1.

by Jeremy White

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

Feb. 12, 2009

Re: gdiplus: in GdipDrawString only NULL terminate if we have room in the buffer.

by Aric Stewart

if we do this call with a string of "XX" and a length of 2. then we create a 2 WCHAR buffer to store the string in. then i == 0; j == 0 on the first look i++ and j++ so i == 1, j == 1 and length is 2. then we loop again and i++ and j++ so i == 2, j == 2 and length == 2. so then when we do the stringdup[j] = 0 we are writing one WCHAR off the end of the buffer. -aric Nikolay Sivov wrote: > 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... > >

Feb. 12, 2009

Re: [2/2] tools/winemaker.man.in: update man-page

by Nikolay Sivov

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...

Feb. 12, 2009