February 2009 - Wine-Commits

Hans Leidekker : fusion: Assembly version numbers are WORDs.
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: a01b18fab19312fada5f6363d70e444a3b55716f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01b18fab19312fada5f6363d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 19 14:04:22 2009 +0100 fusion: Assembly version numbers are WORDs. --- dlls/fusion/asmname.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 490de21..e90dff1 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -44,7 +44,7 @@ typedef struct { LPWSTR name; LPWSTR culture; - BYTE version[4]; + WORD version[4]; DWORD versize; BYTE pubkey[8]; @@ -144,28 +144,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;

1 0

Hans Leidekker : fusion: Allow spaces between attribute-value pairs in an assembly name.
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: f6bfbfb6dfe7f786f9e9d3262131e66856d23822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bfbfb6dfe7f786f9e9d3262… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 19 14:04:41 2009 +0100 fusion: Allow spaces between attribute-value pairs in an assembly name. --- dlls/fusion/asmname.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index e90dff1..b028baa 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -454,6 +454,8 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam *ptr2 = '\0'; + while (*str == ' ') str++; + if (!lstrcmpW(str, version)) hr = parse_version(name, ptr); else if (!lstrcmpW(str, culture))

1 0

Hans Leidekker : fusion: Uninstall assembly used to check for presence of . NET runtime.
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: a76c15356bf2359336a8e7a4b89182157bd13953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76c15356bf2359336a8e7a4b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 19 14:03:43 2009 +0100 fusion: Uninstall assembly used to check for presence of .NET runtime. --- dlls/fusion/tests/asmcache.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index db4856a..295a2c4 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -840,6 +840,7 @@ static BOOL check_dotnet20(void) IAssemblyCache *cache; HRESULT hr; BOOL ret = FALSE; + ULONG disp; static const WCHAR winedll[] = {'w','i','n','e','.','d','l','l',0}; @@ -859,6 +860,7 @@ static BOOL check_dotnet20(void) ok(0, "Expected S_OK, got %08x\n", hr); DeleteFileA("wine.dll"); + IAssemblyCache_UninstallAssembly(cache, 0, winedll, NULL, &disp); IAssemblyCache_Release(cache); return ret; }

1 0

Hans Leidekker : fusion: Assembly version must be taken from the metadata, not the file version.
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: fdfeb33f37db5e2dd035aaab5da6842bb890a856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdfeb33f37db5e2dd035aaab5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 19 14:03:22 2009 +0100 fusion: Assembly version must be taken from the metadata, not the file version. Office 2007 SP1 installer depends on this. I will supply a test as soon as I figure out how to create a variation of the test assembly in dlls/fusion/tests/asmcache.c. --- dlls/fusion/assembly.c | 46 ++++++++++++++-------------------------------- 1 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 7be541c..2373d0f 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -793,45 +793,27 @@ HRESULT assembly_get_path(ASSEMBLY *assembly, LPSTR *path) HRESULT assembly_get_version(ASSEMBLY *assembly, LPSTR *version) { - LPSTR verdata; - VS_FIXEDFILEINFO *ffi; - HRESULT hr = S_OK; - DWORD size; + ASSEMBLYTABLE *asmtbl; + LONG offset; - size = GetFileVersionInfoSizeA(assembly->path, NULL); - if (!size) - return HRESULT_FROM_WIN32(GetLastError()); + *version = NULL; - verdata = HeapAlloc(GetProcessHeap(), 0, size); - if (!verdata) - return E_OUTOFMEMORY; - - if (!GetFileVersionInfoA(assembly->path, 0, size, verdata)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto done; - } + offset = assembly->tables[TableFromToken(mdtAssembly)].offset; + if (offset == -1) + return E_FAIL; - if (!VerQueryValueA(verdata, "\\", (LPVOID *)&ffi, &size)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto done; - } + asmtbl = assembly_data_offset(assembly, offset); + if (!asmtbl) + return E_FAIL; - *version = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); + *version = HeapAlloc(GetProcessHeap(), 0, sizeof("%u.%u.%u.%u") + 4 * strlen("65535")); if (!*version) - { - hr = E_OUTOFMEMORY; - goto done; - } + return E_OUTOFMEMORY; - sprintf(*version, "%d.%d.%d.%d", HIWORD(ffi->dwFileVersionMS), - LOWORD(ffi->dwFileVersionMS), HIWORD(ffi->dwFileVersionLS), - LOWORD(ffi->dwFileVersionLS)); + sprintf(*version, "%u.%u.%u.%u", asmtbl->MajorVersion, asmtbl->MinorVersion, + asmtbl->BuildNumber, asmtbl->RevisionNumber); -done: - HeapFree(GetProcessHeap(), 0, verdata); - return hr; + return S_OK; } HRESULT assembly_get_architecture(ASSEMBLY *assembly, DWORD fixme)

1 0

James Hawkins : fusion: Implement the IAssemblyEnum interface.
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: 34eccc80b93fab59aec8ee1cf3c47bf31ce7c1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34eccc80b93fab59aec8ee1cf… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Feb 19 12:04:09 2009 +0100 fusion: Implement the IAssemblyEnum interface. --- dlls/fusion/Makefile.in | 1 + dlls/fusion/asmcache.c | 83 ---------- dlls/fusion/asmenum.c | 384 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/fusion/asmname.c | 15 +-- dlls/fusion/fusion.c | 12 -- dlls/fusion/fusionpriv.h | 15 ++ 6 files changed, 401 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34eccc80b93fab59aec8e…

1 0

James Hawkins : fusion: Add initial implementation of IAssemblyCache:: QueryAssemblyInfo.
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: 9ae0e89999c8408880898de745a33649ecda246b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae0e89999c8408880898de74… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Feb 19 12:10:27 2009 +0100 fusion: Add initial implementation of IAssemblyCache::QueryAssemblyInfo. --- dlls/fusion/asmcache.c | 42 +++++++++++++- dlls/fusion/tests/asmcache.c | 130 ++++++++++++++++-------------------------- 2 files changed, 90 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ae0e89999c8408880898…

1 0

Huw Davies : gdi32/tests: Add tests for the 120 dpi bitmap fonts.
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: 5c8c151aa8359ad358ad97a1c36e5bc6035137b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8c151aa8359ad358ad97a1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 19 12:34:34 2009 +0000 gdi32/tests: Add tests for the 120 dpi bitmap fonts. --- dlls/gdi32/tests/font.c | 191 +++++++++++++++++++++++++++++----------------- 1 files changed, 120 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c8c151aa8359ad358ad9…

1 0

Alexandre Julliard : tests: When tracing is enabled, output the todo tests too.
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: d55bdc01d9b58d650089e0c66b21175b08ffdd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55bdc01d9b58d650089e0c66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 19 14:56:34 2009 +0100 tests: When tracing is enabled, output the todo tests too. --- include/wine/test.h | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index caa3f35..a8f6f03 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -258,29 +258,31 @@ int winetest_vok( int condition, const char *msg, va_list args ) { if (condition) { - fprintf( stdout, "%s:%d: Test succeeded inside todo block", + fprintf( stdout, "%s:%d: Test succeeded inside todo block: ", data->current_file, data->current_line ); - if (msg[0]) + vfprintf(stdout, msg, args); + InterlockedIncrement(&todo_failures); + return 0; + } + else + { + if (winetest_debug > 0) { - fprintf(stdout,": "); + fprintf( stdout, "%s:%d: Test marked todo: ", + data->current_file, data->current_line ); vfprintf(stdout, msg, args); } - InterlockedIncrement(&todo_failures); - return 0; + InterlockedIncrement(&todo_successes); + return 1; } - else InterlockedIncrement(&todo_successes); } else { if (!condition) { - fprintf( stdout, "%s:%d: Test failed", + fprintf( stdout, "%s:%d: Test failed: ", data->current_file, data->current_line ); - if (msg[0]) - { - fprintf( stdout,": "); - vfprintf(stdout, msg, args); - } + vfprintf(stdout, msg, args); InterlockedIncrement(&failures); return 0; } @@ -290,9 +292,9 @@ int winetest_vok( int condition, const char *msg, va_list args ) fprintf( stdout, "%s:%d: Test succeeded\n", data->current_file, data->current_line); InterlockedIncrement(&successes); + return 1; } } - return 1; } int winetest_ok( int condition, const char *msg, ... )

1 0

Huw Davies : gdi32: Set the font family as FF_MODERN if the panose marks it as monospaced.
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: 4f2572385303f20181dd1aa18d79b075b2218d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2572385303f20181dd1aa18… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 19 10:41:34 2009 +0000 gdi32: Set the font family as FF_MODERN if the panose marks it as monospaced. --- dlls/gdi32/freetype.c | 3 ++- dlls/gdi32/tests/font.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 57bb40b..711f259 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5463,7 +5463,8 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, case PAN_FAMILY_PICTORIAL: /* symbol fonts get treated as if they were text */ /* which is clearly not what the panose spec says. */ default: - if(TM.tmPitchAndFamily == 0) /* fixed */ + if(TM.tmPitchAndFamily == 0 || /* fixed */ + pOS2->panose[PAN_PROPORTION_INDEX] == PAN_PROP_MONOSPACED) TM.tmPitchAndFamily = FF_MODERN; else { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index badd572..5ceef85 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2387,7 +2387,8 @@ static void test_text_metrics(const LOGFONTA *lf) case PAN_FAMILY_TEXT_DISPLAY: case PAN_FAMILY_PICTORIAL: default: - if((tmA.tmPitchAndFamily & 1) == 0) /* fixed */ + if((tmA.tmPitchAndFamily & 1) == 0 || /* fixed */ + tt_os2.panose.bProportion == PAN_PROP_MONOSPACED) { expect_ff(&tmA, &tt_os2, FF_MODERN, font_name); break;

1 0

Huw Davies : gdi32/tests: Output the required font height if the test fails .
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: ee339afa3fac61e8f802e901e41078aca7315c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee339afa3fac61e8f802e901e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 18 22:44:44 2009 +0000 gdi32/tests: Output the required font height if the test fails. --- dlls/gdi32/tests/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b10aebe..2a10f80 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -270,8 +270,8 @@ if (0) /* these metrics are scaled too, but with rounding errors */ cx = tm.tmAveCharWidth / tm_orig->tmAveCharWidth; cy = tm.tmHeight / tm_orig->tmHeight; - ok(cx == scale_x && cy == scale_y, "expected scale_x %d, scale_y %d, got cx %d, cy %d\n", - scale_x, scale_y, cx, cy); + ok(cx == scale_x && cy == scale_y, "height %d: expected scale_x %d, scale_y %d, got cx %d, cy %d\n", + lfHeight, scale_x, scale_y, cx, cy); ok(tm.tmHeight == tm_orig->tmHeight * scale_y, "height %d != %d\n", tm.tmHeight, tm_orig->tmHeight * scale_y); ok(tm.tmAscent == tm_orig->tmAscent * scale_y, "ascent %d != %d\n", tm.tmAscent, tm_orig->tmAscent * scale_y); ok(tm.tmDescent == tm_orig->tmDescent * scale_y, "descent %d != %d\n", tm.tmDescent, tm_orig->tmDescent * scale_y);

1 0