August 2011 - Wine-commits - list.winehq.org

Grazvydas Ignotas : gdi32: Use correct name for elfFullName.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 4a463e06505af991f23b9c2ce47efedaf9738928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a463e06505af991f23b9c2ce… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue Aug 23 23:11:57 2011 +0300 gdi32: Use correct name for elfFullName. --- dlls/gdi32/freetype.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 426dc05..716a37f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4085,7 +4085,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFamilyName), LF_FACESIZE); lstrcpynW(pelf->elfFullName, - (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFaceName), + (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFullName), LF_FULLFACESIZE); lstrcpynW(pelf->elfStyle, (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpStyleName), @@ -4098,7 +4098,10 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, pntm->ntmTm.ntmSizeEM = pntm->ntmTm.tmHeight - pntm->ntmTm.tmInternalLeading; lstrcpynW(pelf->elfLogFont.lfFaceName, face->family->FamilyName, LF_FACESIZE); - lstrcpynW(pelf->elfFullName, face->family->FamilyName, LF_FULLFACESIZE); + if (face->FullName) + lstrcpynW(pelf->elfFullName, face->FullName, LF_FULLFACESIZE); + else + lstrcpynW(pelf->elfFullName, face->family->FamilyName, LF_FULLFACESIZE); lstrcpynW(pelf->elfStyle, face->StyleName, LF_FACESIZE); }

1 0

Grazvydas Ignotas : gdi32/tests: Check for exact fonts before doing fullname test.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 5c2976eebc93a67e07b3a431d6bcc27a388e617a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2976eebc93a67e07b3a431d… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue Aug 23 23:11:58 2011 +0300 gdi32/tests: Check for exact fonts before doing fullname test. --- dlls/gdi32/tests/font.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index aab371f..fcb0776 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3733,6 +3733,28 @@ static void test_EnumFonts(void) DeleteDC(hdc); } +static INT CALLBACK is_font_installed_fullname_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + const ENUMLOGFONT *elf = (const ENUMLOGFONT *)lf; + const char *fullname = (const char *)lParam; + + if (!strcmp((const char *)elf->elfFullName, fullname)) return 0; + + return 1; +} + +static BOOL is_font_installed_fullname(const char *family, const char *fullname) +{ + HDC hdc = GetDC(0); + BOOL ret = FALSE; + + if(!EnumFontFamiliesA(hdc, family, is_font_installed_fullname_proc, (LPARAM)fullname)) + ret = TRUE; + + ReleaseDC(0, hdc); + return ret; +} + static void test_fullname(void) { static const char *TestName[] = {"Lucida Sans Demibold Roman", "Lucida Sans Italic"}; @@ -3742,13 +3764,6 @@ static void test_fullname(void) HDC hdc; int i; - /* Lucida Sans comes with XP SP2 or later */ - if (!is_truetype_font_installed("Lucida Sans")) - { - skip("Lucida Sans is not installed\n"); - return; - } - hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -3763,6 +3778,12 @@ static void test_fullname(void) for (i = 0; i < sizeof(TestName) / sizeof(TestName[0]); i++) { + if (!is_font_installed_fullname("Lucida Sans", TestName[i])) + { + skip("%s is not installed\n", TestName[i]); + continue; + } + lstrcpyA(lf.lfFaceName, TestName[i]); hfont = CreateFontIndirectA(&lf); ok(hfont != 0, "CreateFontIndirectA failed\n");

1 0

Grazvydas Ignotas : gdi32/tests: Add additional font to fullnames test.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: bf235df2c6f81ac0d4b38397483a9cc19cd717f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf235df2c6f81ac0d4b383974… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue Aug 23 23:11:59 2011 +0300 gdi32/tests: Add additional font to fullnames test. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fcb0776..aa2d518 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3757,7 +3757,7 @@ static BOOL is_font_installed_fullname(const char *family, const char *fullname) static void test_fullname(void) { - static const char *TestName[] = {"Lucida Sans Demibold Roman", "Lucida Sans Italic"}; + static const char *TestName[] = {"Lucida Sans Demibold Roman", "Lucida Sans Italic", "Lucida Sans Regular"}; char buf[LF_FULLFACESIZE]; HFONT hfont, of; LOGFONTA lf;

1 0

Michael Stefaniuc : dsound: Remove pointless AddRef followed by a Release.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 4b54090a85af71585d049f067ee745ed0015a0a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b54090a85af71585d049f067… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 24 02:28:25 2011 +0200 dsound: Remove pointless AddRef followed by a Release. --- dlls/dsound/dsound.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 8c1b812..c565d98 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1685,11 +1685,8 @@ HRESULT DirectSoundDevice_DuplicateSoundBuffer( if (*ppdsb) { dsb->secondary = (SecondaryBufferImpl*)*ppdsb; IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)*ppdsb); - } else { + } else WARN("SecondaryBufferImpl_Create failed\n"); - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)dsb); - IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER8)dsb); - } } return hres;

1 0

Michael Stefaniuc : dsound/tests: IDirectSoundBuffer and IDirectSoundBuffer8 use the same implementation.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: beac9a27e62ab58e6eb8c4fb3a652495e3109d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beac9a27e62ab58e6eb8c4fb3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 24 02:29:22 2011 +0200 dsound/tests: IDirectSoundBuffer and IDirectSoundBuffer8 use the same implementation. --- dlls/dsound/tests/dsound8.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 5561051..6406b47 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -356,6 +356,8 @@ static HRESULT test_dsound8(LPGUID lpGuid) &IID_IDirectSoundBuffer8, (void **)&buffer8); if (rc==DS_OK && buffer8!=NULL) { + ok(buffer8==(IDirectSoundBuffer8*)secondary, + "IDirectSoundBuffer8 iface different from IDirectSoundBuffer.\n"); ref=IDirectSoundBuffer8_AddRef(buffer8); ok(ref==3,"IDirectSoundBuffer8_AddRef() has %d references, " "should have 3\n",ref);

1 0

Michael Stefaniuc : dsound: Basic COM cleanup for the IDirectSoundBuffer8 iface.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 7da80d1f01bcb068138bd2c34ead2215b7411dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da80d1f01bcb068138bd2c34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 24 02:30:37 2011 +0200 dsound: Basic COM cleanup for the IDirectSoundBuffer8 iface. --- dlls/dsound/buffer.c | 218 +++++++++++++++++++++--------------------- dlls/dsound/dsound_private.h | 4 +- 2 files changed, 110 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7da80d1f01bcb068138bd…

1 0

Michael Stefaniuc : dsound: Kill SecondaryBufferImpl with extreme prejudice .
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 6b64e0090cb7b331dd212f0b8aba5595f013caf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b64e0090cb7b331dd212f0b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 24 02:32:13 2011 +0200 dsound: Kill SecondaryBufferImpl with extreme prejudice. --- dlls/dsound/buffer.c | 328 +----------------------------------------- dlls/dsound/dsound.c | 30 ++--- dlls/dsound/dsound_private.h | 16 -- dlls/dsound/sound3d.c | 2 - 4 files changed, 14 insertions(+), 362 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b64e0090cb7b331dd212…

1 0

Hans Leidekker : msi/tests: Accept one more estimated size.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 0dec906d6160d0faa05006c1a439f5091a18e23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dec906d6160d0faa05006c1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 24 10:22:00 2011 +0200 msi/tests: Accept one more estimated size. --- dlls/msi/tests/action.c | 48 ++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 3e06db7..aac601f 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2402,7 +2402,8 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin ok_(__FILE__, line)(val == expected, "Expected %d, got %d\n", expected, val); } -static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, DWORD line) +static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, + DWORD expected4, DWORD line) { DWORD val, size, type; LONG res; @@ -2416,12 +2417,12 @@ static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e return; } - ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3, - "Expected %d, %d or %d, got %d\n", expected1, expected2, expected3, val); + ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4, + "Expected %d, %d, %d or %d, got %d\n", expected1, expected2, expected3, expected4, val); } -static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, - DWORD expected4, DWORD line) +static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, + DWORD expected4, DWORD expected5, DWORD line) { DWORD val, size, type; LONG res; @@ -2435,8 +2436,9 @@ static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e return; } - ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4, - "Expected %d, %d or %d or %d, got %d\n", expected1, expected2, expected3, expected4, val); + ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4 || + val == expected5, + "Expected %d, %d, %d, %d or %d, got %d\n", expected1, expected2, expected3, expected4, expected5, val); } #define CHECK_REG_STR(prodkey, name, expected) \ @@ -2467,15 +2469,11 @@ static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ RegDeleteValueA(prodkey, name); -#define CHECK_REG_DWORD3(prodkey, name, expected1, expected2, expected3) \ - check_reg_dword3(prodkey, name, expected1, expected2, expected3, __LINE__); - -#define CHECK_DEL_REG_DWORD3(prodkey, name, expected1, expected2, expected3) \ - check_reg_dword3(prodkey, name, expected1, expected2, expected3, __LINE__); \ - RegDeleteValueA(prodkey, name); +#define CHECK_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ + check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); -#define CHECK_DEL_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ - check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); \ +#define CHECK_DEL_REG_DWORD5(prodkey, name, expected1, expected2, expected3, expected4 ,expected5) \ + check_reg_dword5(prodkey, name, expected1, expected2, expected3, expected4, expected5, __LINE__); \ RegDeleteValueA(prodkey, name); static void get_date_str(LPSTR date) @@ -2579,7 +2577,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD4(hkey, "EstimatedSize", 12, -12, 4, 10); + CHECK_DEL_REG_DWORD5(hkey, "EstimatedSize", 12, -12, 4, 10, 24); } delete_key(hkey, "", access); @@ -2621,7 +2619,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD4(props, "EstimatedSize", 12, -12, 4, 10); + CHECK_DEL_REG_DWORD5(props, "EstimatedSize", 12, -12, 4, 10, 24); } delete_key(props, "", access); @@ -2690,7 +2688,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD4(hkey, "EstimatedSize", 12, -12, 4, 10); + CHECK_DEL_REG_DWORD5(hkey, "EstimatedSize", 12, -12, 4, 10, 24); } delete_key(hkey, "", access); @@ -2732,7 +2730,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD4(props, "EstimatedSize", 12, -12, 4, 10); + CHECK_DEL_REG_DWORD5(props, "EstimatedSize", 12, -12, 4, 10, 24); } delete_key(props, "", access); @@ -3575,7 +3573,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); + CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); } RegCloseKey(prodkey); @@ -3657,7 +3655,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); + CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); } RegCloseKey(prodkey); @@ -3740,7 +3738,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); + CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); } RegCloseKey(prodkey); @@ -3800,7 +3798,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); + CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); } RegCloseKey(prodkey); @@ -3860,7 +3858,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -20, 10); + CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -20, 10, 24); } RegCloseKey(prodkey); @@ -3943,7 +3941,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); + CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); } RegCloseKey(prodkey);

1 0

Hans Leidekker : msi/tests: Skip a test if the process is limited.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: d7952d8a2427e30e645a14e4631817aa440c7d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7952d8a2427e30e645a14e46… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 24 10:22:17 2011 +0200 msi/tests: Skip a test if the process is limited. --- dlls/msi/tests/action.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index aac601f..90832af 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -4721,6 +4721,12 @@ static void test_create_remove_folder(void) { UINT r; + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + CreateDirectoryA("msitest", NULL); CreateDirectoryA("msitest\\first", NULL); CreateDirectoryA("msitest\\second", NULL);

1 0

Hans Leidekker : msi: Resolve the target folder if necessary when building link filenames.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 9d68804379b7940b1500cdf802b52b03e0100765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d68804379b7940b1500cdf80… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 24 10:22:33 2011 +0200 msi: Resolve the target folder if necessary when building link filenames. --- dlls/msi/action.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d008777..fa92653 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3518,7 +3518,17 @@ static WCHAR *get_link_file( MSIPACKAGE *package, MSIRECORD *row ) directory = MSI_RecordGetString( row, 2 ); link_folder = msi_get_target_folder( package, directory ); - + if (!link_folder) + { + /* some installers use a separate root */ + MSIFOLDER *folder = msi_get_loaded_folder( package, directory ); + while (folder->Parent && strcmpW( folder->Parent, folder->Directory )) + { + folder = msi_get_loaded_folder( package, folder->Parent ); + } + msi_resolve_target_folder( package, folder->Directory, TRUE ); + link_folder = msi_get_target_folder( package, directory ); + } /* may be needed because of a bug somewhere else */ msi_create_full_path( link_folder );

1 0