September 2006 - Wine-commits

Byeong-Sik Jeon : gdi32: Fix init_system_links() for non-localized font name.
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: 6a55b52ec1ceefd347554af644ddf9d906cae1e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a55b52ec1ceefd347554af… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Wed Sep 13 06:41:50 2006 +0900 gdi32: Fix init_system_links() for non-localized font name. --- dlls/gdi/freetype.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index ee51519..10f3f28 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -1025,6 +1025,7 @@ static BOOL init_system_links(void) FONTSIGNATURE fs; Family *family; Face *face; + FontSubst *psub; if(RegOpenKeyW(HKEY_LOCAL_MACHINE, system_link, &hkey) == ERROR_SUCCESS) { @@ -1040,7 +1041,8 @@ static BOOL init_system_links(void) memset(&fs, 0, sizeof(fs)); font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_link)); - font_link->font_name = strdupW(value); + psub = get_font_subst(&font_subst_list, value, -1); + font_link->font_name = (psub)? strdupW(psub->to.name) : strdupW(value); list_init(&font_link->links); for(entry = data; (char*)entry < (char*)data + data_len && *entry != 0; entry = next) { @@ -1057,6 +1059,10 @@ static BOOL init_system_links(void) *face_name++ = 0; while(isspaceW(*face_name)) face_name++; + + psub = get_font_subst(&font_subst_list, face_name, -1); + if(psub) + face_name = psub->to.name; } face = find_face_from_filename(entry, face_name); if(!face)

1 0

Byeong-Sik Jeon : gdi32: Fix wrong break statement use.
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: 09228971645e4eafc3dd3bcec317494f663c2fea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=09228971645e4eafc3dd3bc… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Wed Sep 13 06:41:43 2006 +0900 gdi32: Fix wrong break statement use. --- dlls/gdi/freetype.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index a664db9..ee51519 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -451,7 +451,6 @@ static Face *find_face_from_filename(con const char *file; DWORD len = WideCharToMultiByte(CP_UNIXCP, 0, file_name, -1, NULL, 0, NULL, NULL); char *file_nameA = HeapAlloc(GetProcessHeap(), 0, len); - Face *ret = NULL; WideCharToMultiByte(CP_UNIXCP, 0, file_name, -1, file_nameA, len, NULL, NULL); TRACE("looking for file %s name %s\n", debugstr_a(file_nameA), debugstr_w(face_name)); @@ -467,13 +466,15 @@ static Face *find_face_from_filename(con file = face->file; else file++; - if(!strcmp(file, file_nameA)) - ret = face; - break; + if(!strcasecmp(file, file_nameA)) + { + HeapFree(GetProcessHeap(), 0, file_nameA); + return face; + } } } HeapFree(GetProcessHeap(), 0, file_nameA); - return ret; + return NULL; } static Family *find_family_from_name(const WCHAR *name)

1 0

James Hawkins : msi: Add more join tests.
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: bfc1b5c15f35237e4234fca29f98079d59c4d69c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bfc1b5c15f35237e4234fca… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Sep 12 14:00:06 2006 -0700 msi: Add more join tests. --- dlls/msi/tests/db.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 162 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 86d2389..44a2532 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1760,6 +1760,28 @@ static const struct join_res join_res_fo { "msvcp.dll.01234", "single.dll.31415" }, }; +static const struct join_res join_res_fifth[] = +{ + { "malar", "procerus" }, +}; + +static const struct join_res join_res_sixth[] = +{ + { "malar", "procerus" }, + { "malar", "procerus" }, + { "malar", "nasalis" }, + { "malar", "nasalis" }, + { "malar", "nasalis" }, + { "malar", "mentalis" }, +}; + +static const struct join_res join_res_seventh[] = +{ + { "malar", "nasalis" }, + { "malar", "nasalis" }, + { "malar", "nasalis" }, +}; + static void test_join(void) { MSIHANDLE hdb, hview, hrec; @@ -1989,6 +2011,146 @@ static void test_join(void) MsiViewClose(hview); MsiCloseHandle(hview); + + query = "SELECT `Component`.`ComponentId`, `FeatureComponents`.`Feature_` " + "FROM `Component`, `FeatureComponents` " + "WHERE `Component`.`Component` = 'zygomatic' " + "AND `FeatureComponents`.`Component_` = 'maxilla' " + "ORDER BY `Feature_`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + todo_wine + { + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + } + + r = MsiViewExecute(hview, 0); + todo_wine + { + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + } + + i = 0; + while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) + { + count = MsiRecordGetFieldCount( hrec ); + ok( count == 2, "Expected 2 record fields, got %d\n", count ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 1, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_fifth[i].one ), + "Expected '%s', got %s\n", join_res_fifth[i].one, buf ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 2, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_fifth[i].two ), + "Expected '%s', got %s\n", join_res_fifth[i].two, buf ); + + i++; + MsiCloseHandle(hrec); + } + + todo_wine + { + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); + } + + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT `Component`.`ComponentId`, `FeatureComponents`.`Feature_` " + "FROM `Component`, `FeatureComponents` " + "WHERE `Component` = 'zygomatic' " + "ORDER BY `Feature_`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + todo_wine + { + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + } + + r = MsiViewExecute(hview, 0); + todo_wine + { + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + } + + i = 0; + while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) + { + count = MsiRecordGetFieldCount( hrec ); + ok( count == 2, "Expected 2 record fields, got %d\n", count ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 1, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_sixth[i].one ), + "Expected '%s', got %s\n", join_res_sixth[i].one, buf ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 2, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_sixth[i].two ), + "Expected '%s', got %s\n", join_res_sixth[i].two, buf ); + + i++; + MsiCloseHandle(hrec); + } + + todo_wine + { + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); + } + + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT `Component`.`ComponentId`, `FeatureComponents`.`Feature_` " + "FROM `Component`, `FeatureComponents` " + "WHERE `Component` = 'zygomatic' " + "AND `Feature_` = 'nasalis' " + "ORDER BY `Feature_`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + todo_wine + { + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + } + + r = MsiViewExecute(hview, 0); + todo_wine + { + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + } + + i = 0; + while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) + { + count = MsiRecordGetFieldCount( hrec ); + ok( count == 2, "Expected 2 record fields, got %d\n", count ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 1, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_seventh[i].one ), + "Expected '%s', got %s\n", join_res_seventh[i].one, buf ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 2, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_seventh[i].two ), + "Expected '%s', got %s\n", join_res_seventh[i].two, buf ); + + i++; + MsiCloseHandle(hrec); + } + + todo_wine + { + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); + } + + MsiViewClose(hview); + MsiCloseHandle(hview); MsiCloseHandle(hdb); DeleteFile(msifile); }

1 0

Paul Chitescu : wined3d: Avoid crashing when renderer returns no name.
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: f2aee453f154ccf04788220c0ee1b17864738401 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f2aee453f154ccf04788220… Author: Paul Chitescu <pchitescu(a)voip.null.ro> Date: Tue Sep 12 22:21:14 2006 +0300 wined3d: Avoid crashing when renderer returns no name. --- dlls/wined3d/directx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8ded849..19e3172 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -308,6 +308,8 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *i TRACE_(d3d_caps)("(%p, %p)\n", gl_info, display); gl_string = (const char *) glGetString(GL_RENDERER); + if (NULL == gl_string) + gl_string = "None"; strcpy(gl_info->gl_renderer, gl_string); /* Fill in the GL info retrievable depending on the display */

1 0

Gerald Pfeifer : ole32: Silence a compiler warning about unused variable in StgStreamImpl_Write().
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: 24dc347134b5a01c3748f3ff96736209d569782d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24dc347134b5a01c3748f3f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Sep 12 23:37:14 2006 +0200 ole32: Silence a compiler warning about unused variable in StgStreamImpl_Write(). --- dlls/ole32/stg_stream.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index ce9454f..32061a1 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -440,9 +440,12 @@ static HRESULT WINAPI StgStreamImpl_Writ pcbWritten); } else + { /* this should never happen because the IStream_SetSize call above will * make sure a big or small block chain is created */ assert(FALSE); + res = 0; + } /* * Advance the position pointer for the number of positions written.

1 0

James Hawkins : msi: Show the available drives in the VolumeCostList control.
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: 75ee2262cc3f49e7718cb114ae159bf3eaf6d167 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75ee2262cc3f49e7718cb11… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Sep 12 13:20:26 2006 -0700 msi: Show the available drives in the VolumeCostList control. --- dlls/msi/dialog.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index aa0e2ae..0b63966 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2328,6 +2328,38 @@ static void msi_dialog_vcl_add_columns( } } +static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ) +{ + LPWSTR drives, ptr; + LVITEMW lvitem; + DWORD size; + int i = 0; + + size = GetLogicalDriveStringsW( 0, NULL ); + if ( !size ) return; + + drives = msi_alloc( (size + 1) * sizeof(WCHAR) ); + if ( !drives ) return; + + GetLogicalDriveStringsW( size, drives ); + + ptr = drives; + while (*ptr) + { + lvitem.mask = LVIF_TEXT; + lvitem.iItem = i; + lvitem.iSubItem = 0; + lvitem.pszText = ptr; + lvitem.cchTextMax = lstrlenW(ptr) + 1; + SendMessageW( control->hwnd, LVM_INSERTITEMW, 0, (LPARAM)&lvitem ); + + ptr += lstrlenW(ptr) + 1; + i++; + } + + msi_free( drives ); +} + static UINT msi_dialog_volumecost_list( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; @@ -2341,6 +2373,7 @@ static UINT msi_dialog_volumecost_list( return ERROR_FUNCTION_FAILED; msi_dialog_vcl_add_columns( dialog, control, rec ); + msi_dialog_vcl_add_drives( dialog, control ); return ERROR_SUCCESS; }

1 0

Louis. Lenders : mshtml: Add version resource.
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: 484ea285db650306cd465b6ea1ccfac8c967bfb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=484ea285db650306cd465b6… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Sep 12 21:15:59 2006 +0100 mshtml: Add version resource. --- dlls/mshtml/rsrc.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index 7837376..5e47ba9 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -22,6 +22,16 @@ #include "commctrl.h" #include "resource.h" +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine HTML Viewer" +#define WINE_FILENAME_STR "mshtml.dll" +#define WINE_FILEVERSION 6,0,2800,1106 +#define WINE_FILEVERSION_STR "6.0.2800.1106" +#define WINE_PRODUCTVERSION 6,0,2800,1106 +#define WINE_PRODUCTVERSION_STR "6.0.2800.1106" + +#include "wine/wine_common_ver.rc" + #include "Bg.rc" #include "De.rc" #include "En.rc"

1 0

Marcus Meissner : README: Update for kernel 2.6.
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: 4fe7ee8c1d75801aa686c7e70add8cbfe81e1ef9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4fe7ee8c1d75801aa686c7e… Author: Marcus Meissner <marcus(a)beiboot.franken.de> Date: Tue Sep 12 22:43:53 2006 +0200 README: Update for kernel 2.6. --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 2c4078f..029d09b 100644 --- a/README +++ b/README @@ -42,7 +42,7 @@ in the future. Linux info: While Linux 2.2.x should still work and Linux 2.0.x may still work (older 2.0.x versions had thread-related crashes), - it's best to have a current kernel such as 2.4.x. + it's best to have a current kernel such as 2.4.x or 2.6.x. FreeBSD info: Wine should build on FreeBSD 4.x and FreeBSD 5.x, but versions before

1 0

Stefan Leichter : dmstyle: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: bfa1937e311b58083f956bdab919905486386930 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bfa1937e311b58083f956bd… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Sep 12 22:49:20 2006 +0200 dmstyle: Print 64bit integers with wine_dbgstr_longlong. --- dlls/dmstyle/auditiontrack.c | 9 ++++++--- dlls/dmstyle/chordtrack.c | 9 ++++++--- dlls/dmstyle/commandtrack.c | 9 ++++++--- dlls/dmstyle/dmutils.c | 6 ++++-- dlls/dmstyle/motiftrack.c | 9 ++++++--- dlls/dmstyle/mutetrack.c | 9 ++++++--- dlls/dmstyle/styletrack.c | 9 ++++++--- 7 files changed, 40 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bfa1937e311b58083f9…

1 0

Alexandre Julliard : tests: Moved some compatibility defines to wine/test.h .
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: fc4cd637d9fc4b3074b033cafd45b83509aad8dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc4cd637d9fc4b3074b033c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 13 11:01:39 2006 +0200 tests: Moved some compatibility defines to wine/test.h. --- dlls/cabinet/tests/extract.c | 8 -------- dlls/msi/tests/package.c | 4 ---- dlls/shell32/tests/shlfileop.c | 4 ---- include/wine/test.h | 7 +++++++ 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index a9b71e6..8352f1b 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -23,14 +23,6 @@ #include <windows.h> #include "fci.h" #include "wine/test.h" -#ifndef INVALID_FILE_ATTRIBUTES -#define INVALID_FILE_ATTRIBUTES 0xffffffff -#endif - -#ifndef INVALID_SET_FILE_POINTER -#define INVALID_SET_FILE_POINTER 0xffffffff -#endif - /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 999999999 #define FOLDER_THRESHOLD 900000 diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 52430df..a9bc395 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -30,10 +30,6 @@ #include "wine/test.h" static const char msifile[] = "winetest.msi"; -#ifndef INVALID_FILE_ATTRIBUTES -#define INVALID_FILE_ATTRIBUTES 0xffffffff -#endif - static UINT run_query( MSIHANDLE hdb, const char *query ) { MSIHANDLE hview = 0; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 3a9caa3..433c9c0 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -28,10 +28,6 @@ #include "shlobj.h" #include "wine/test.h" -#ifndef INVALID_FILE_ATTRIBUTES -#define INVALID_FILE_ATTRIBUTES 0xffffffff -#endif - #ifndef FOF_NORECURSION #define FOF_NORECURSION 0x1000 #endif diff --git a/include/wine/test.h b/include/wine/test.h index f3793f3..8e2bc62 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -36,6 +36,13 @@ #ifdef __WINE_WINE_DEBUG_H #error wine/debug.h should not be used in Wine tests #endif +#ifndef INVALID_FILE_ATTRIBUTES +#define INVALID_FILE_ATTRIBUTES ((DWORD)~0UL) +#endif +#ifndef INVALID_SET_FILE_POINTER +#define INVALID_SET_FILE_POINTER ((DWORD)~0UL) +#endif + /* debug level */ extern int winetest_debug;

1 0