November 2010 - Wine-commits

Henri Verbeet : d3d9/tests: Fix some failure messages.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 10ccba52e70a4f6898d030f7d3478a2b63c9ebc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ccba52e70a4f6898d030f7d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 17 12:38:58 2010 +0100 d3d9/tests: Fix some failure messages. --- dlls/d3d9/tests/visual.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 887f302..9e5b9a0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -346,14 +346,14 @@ static void lighting_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %08x\n", hr); } - color = getPixelColor(device, 160, 360); /* lower left quad - unlit without normals */ - ok(color == 0x00ff0000, "Unlit quad without normals has color %08x\n", color); - color = getPixelColor(device, 160, 120); /* upper left quad - lit without normals */ - ok(color == 0x00000000, "Lit quad without normals has color %08x\n", color); - color = getPixelColor(device, 480, 360); /* lower left quad - unlit with normals */ - ok(color == 0x000000ff, "Unlit quad with normals has color %08x\n", color); - color = getPixelColor(device, 480, 120); /* upper left quad - lit with normals */ - ok(color == 0x00000000, "Lit quad with normals has color %08x\n", color); + color = getPixelColor(device, 160, 360); /* Lower left quad - unlit without normals */ + ok(color == 0x00ff0000, "Unlit quad without normals has color 0x%08x, expected 0x00ff0000.\n", color); + color = getPixelColor(device, 160, 120); /* Upper left quad - lit without normals */ + ok(color == 0x00000000, "Lit quad without normals has color 0x%08x, expected 0x00000000.\n", color); + color = getPixelColor(device, 480, 360); /* Lower left quad - unlit with normals */ + ok(color == 0x000000ff, "Unlit quad with normals has color 0x%08x, expected 0x000000ff.\n", color); + color = getPixelColor(device, 480, 120); /* Upper left quad - lit with normals */ + ok(color == 0x00000000, "Lit quad with normals has color 0x%08x, expected 0x00000000.\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Henri Verbeet : d3d8/tests: Fix some failure messages.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: d2f23ff61ecf725566ae5cddc4ad827c4577d250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f23ff61ecf725566ae5cddc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 17 12:38:59 2010 +0100 d3d8/tests: Fix some failure messages. --- dlls/d3d8/tests/visual.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 6819134..a6a9c9b 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -275,14 +275,14 @@ static void lighting_test(IDirect3DDevice8 *device) ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed with %#08x\n", hr); } - color = getPixelColor(device, 160, 360); /* lower left quad - unlit without normals */ - ok(color == 0x00ff0000, "Unlit quad without normals has color %08x\n", color); - color = getPixelColor(device, 160, 120); /* upper left quad - lit without normals */ - ok(color == 0x00000000, "Lit quad without normals has color %08x\n", color); - color = getPixelColor(device, 480, 360); /* lower left quad - unlit width normals */ - ok(color == 0x000000ff, "Unlit quad width normals has color %08x\n", color); - color = getPixelColor(device, 480, 120); /* upper left quad - lit width normals */ - ok(color == 0x00000000, "Lit quad width normals has color %08x\n", color); + color = getPixelColor(device, 160, 360); /* Lower left quad - unlit without normals */ + ok(color == 0x00ff0000, "Unlit quad without normals has color 0x%08x, expected 0x00ff0000.\n", color); + color = getPixelColor(device, 160, 120); /* Upper left quad - lit without normals */ + ok(color == 0x00000000, "Lit quad without normals has color 0x%08x, expected 0x00000000.\n", color); + color = getPixelColor(device, 480, 360); /* Lower right quad - unlit with normals */ + ok(color == 0x000000ff, "Unlit quad with normals has color 0x%08x, expected 0x000000ff.\n", color); + color = getPixelColor(device, 480, 120); /* Upper right quad - lit with normals */ + ok(color == 0x00000000, "Lit quad with normals has color 0x%08x, expected 0x00000000.\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);

1 0

Hans Leidekker : msi: Improve tracing in MsiQueryFeatureStateW.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 18c55dee3539663f963f82d70273d68704921f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c55dee3539663f963f82d70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 17 10:57:54 2010 +0100 msi: Improve tracing in MsiQueryFeatureStateW. --- dlls/msi/msi.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index b4a4142..ca8ed7d 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2709,17 +2709,17 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) msi_free(path); } - - TRACE("%s %s -> %d\n", debugstr_w(szProduct), debugstr_w(szFeature), r); msi_free(components); if (missing) - return INSTALLSTATE_ADVERTISED; - - if (source) - return INSTALLSTATE_SOURCE; + r = INSTALLSTATE_ADVERTISED; + else if (source) + r = INSTALLSTATE_SOURCE; + else + r = INSTALLSTATE_LOCAL; - return INSTALLSTATE_LOCAL; + TRACE("%s %s -> %d\n", debugstr_w(szProduct), debugstr_w(szFeature), r); + return r; } /******************************************************************

1 0

Hans Leidekker : msi: Add support for importing and exporting the special _ForceCodepage table.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: c3adb7282040944757957192d608bc4c41bbbfa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3adb7282040944757957192d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 17 10:58:10 2010 +0100 msi: Add support for importing and exporting the special _ForceCodepage table. --- dlls/msi/database.c | 21 ++++++++++++++++----- dlls/msi/msipriv.h | 2 ++ dlls/msi/string.c | 30 ++++++++++++++++++++++++++---- dlls/msi/tests/db.c | 25 ++++++++++++++++++++----- 4 files changed, 64 insertions(+), 14 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 2bf70c0..886a955 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #define COBJMACROS #define NONAMELESSUNION @@ -888,6 +889,8 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) static const WCHAR suminfo[] = {'_','S','u','m','m','a','r','y','I','n','f','o','r','m','a','t','i','o','n',0}; + static const WCHAR forcecodepage[] = + {'_','F','o','r','c','e','C','o','d','e','p','a','g','e',0}; TRACE("%p %s %s\n", db, debugstr_w(folder), debugstr_w(file) ); @@ -910,6 +913,13 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) msi_parse_line( &ptr, &types, &num_types ); msi_parse_line( &ptr, &labels, &num_labels ); + if (num_columns == 1 && !columns[0][0] && num_labels == 1 && !labels[0][0] && + num_types == 2 && !strcmpW( types[1], forcecodepage )) + { + r = msi_set_string_table_codepage( db->strings, atoiW( types[0] ) ); + goto done; + } + if (num_columns != num_types) { r = ERROR_FUNCTION_FAILED; @@ -1087,13 +1097,13 @@ static UINT msi_export_row( MSIRECORD *row, void *arg ) return msi_export_record( arg, row, 1 ); } -static UINT msi_export_forcecodepage( HANDLE handle ) +static UINT msi_export_forcecodepage( HANDLE handle, UINT codepage ) { + static const char fmt[] = "\r\n\r\n%u\t_ForceCodepage\r\n"; + char data[sizeof(fmt) + 10]; DWORD sz; - static const char data[] = "\r\n\r\n0\t_ForceCodepage\r\n"; - - FIXME("Read the codepage from the strings table!\n"); + sprintf( data, fmt, codepage ); sz = lstrlenA(data) + 1; if (!WriteFile(handle, data, sz, &sz, NULL)) @@ -1138,7 +1148,8 @@ static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, if (!strcmpW( table, forcecodepage )) { - r = msi_export_forcecodepage( handle ); + UINT codepage = msi_get_string_table_codepage( db->strings ); + r = msi_export_forcecodepage( handle, codepage ); goto done; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 986097f..bed321e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -704,6 +704,8 @@ extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ); extern HRESULT msi_init_string_table( IStorage *stg ); extern string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ); extern UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *bytes_per_strref ); +extern UINT msi_get_string_table_codepage( const string_table *st ); +extern UINT msi_set_string_table_codepage( string_table *st, UINT codepage ); extern BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ); extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ); diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 0c35fa4..4068033 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -58,15 +58,22 @@ struct string_table UINT *sorted; /* index */ }; +static BOOL validate_codepage( UINT codepage ) +{ + if (codepage != CP_ACP && !IsValidCodePage( codepage )) + { + WARN("invalid codepage %u\n", codepage); + return FALSE; + } + return TRUE; +} + static string_table *init_stringtable( int entries, UINT codepage ) { string_table *st; - if (codepage != CP_ACP && !IsValidCodePage(codepage)) - { - ERR("invalid codepage %d\n", codepage); + if (!validate_codepage( codepage )) return NULL; - } st = msi_alloc( sizeof (string_table) ); if( !st ) @@ -671,3 +678,18 @@ err: return ret; } + +UINT msi_get_string_table_codepage( const string_table *st ) +{ + return st->codepage; +} + +UINT msi_set_string_table_codepage( string_table *st, UINT codepage ) +{ + if (validate_codepage( codepage )) + { + st->codepage = codepage; + return ERROR_SUCCESS; + } + return ERROR_FUNCTION_FAILED; +} diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 4cd63c4..7ab4ff3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -6968,6 +6968,7 @@ static void test_forcecodepage(void) UINT r; DeleteFile(msifile); + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -7005,7 +7006,24 @@ static void test_forcecodepage(void) read_file_data("forcecodepage.idt", buffer); ok(!lstrcmpA(buffer, "\r\n\r\n0\t_ForceCodepage\r\n"), - "Expected \"\r\n\r\n0\t_ForceCodepage\r\n\", got \"%s\"", buffer); + "Expected \"\r\n\r\n0\t_ForceCodepage\r\n\", got \"%s\"\n", buffer); + + create_file_data("forcecodepage.idt", "\r\n\r\n850\t_ForceCodepage\r\n", 0); + + r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiDatabaseExport(hdb, "_ForceCodepage", CURR_DIR, "forcecodepage.idt"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + read_file_data("forcecodepage.idt", buffer); + ok(!lstrcmpA(buffer, "\r\n\r\n850\t_ForceCodepage\r\n"), + "Expected \"\r\n\r\n850\t_ForceCodepage\r\n\", got \"%s\"\n", buffer); + + create_file_data("forcecodepage.idt", "\r\n\r\n9999\t_ForceCodepage\r\n", 0); + + r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_SUCCESS, got %d\n", r); MsiCloseHandle(hdb); DeleteFileA(msifile); @@ -8159,10 +8177,7 @@ static void test_dbmerge(void) GetCurrentDirectoryA(MAX_PATH, buf); r = MsiDatabaseImportA(hdb, buf, "codepage.idt"); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); query = "DROP TABLE `One`"; r = run_query(hdb, 0, query);

1 0

Damjan Jovanovic : winemenubuilder: Generate icons for the fd.o "Open with" menu.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: b5416b0292266049d606755705aa87838f154f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5416b0292266049d60675570… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 17 12:12:08 2010 +0200 winemenubuilder: Generate icons for the fd.o "Open with" menu. --- programs/winemenubuilder/winemenubuilder.c | 53 +++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 8 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index bf40c89..55a2e2b 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1814,12 +1814,14 @@ static HKEY open_associations_reg_key(void) return NULL; } -static BOOL has_association_changed(LPCWSTR extensionW, LPCSTR mimeType, LPCWSTR progId, LPCSTR appName, LPCWSTR docName) +static BOOL has_association_changed(LPCWSTR extensionW, LPCSTR mimeType, LPCWSTR progId, + LPCSTR appName, LPCWSTR docName, LPCSTR openWithIcon) { static const WCHAR ProgIDW[] = {'P','r','o','g','I','D',0}; static const WCHAR DocNameW[] = {'D','o','c','N','a','m','e',0}; static const WCHAR MimeTypeW[] = {'M','i','m','e','T','y','p','e',0}; static const WCHAR AppNameW[] = {'A','p','p','N','a','m','e',0}; + static const WCHAR OpenWithIconW[] = {'O','p','e','n','W','i','t','h','I','c','o','n',0}; HKEY assocKey; BOOL ret; @@ -1850,6 +1852,13 @@ static BOOL has_association_changed(LPCWSTR extensionW, LPCSTR mimeType, LPCWSTR ret = TRUE; HeapFree(GetProcessHeap(), 0, value); + valueA = reg_get_val_utf8(assocKey, extensionW, OpenWithIconW); + if ((openWithIcon && !valueA) || + (!openWithIcon && valueA) || + (openWithIcon && valueA && lstrcmpA(valueA, openWithIcon))) + ret = TRUE; + HeapFree(GetProcessHeap(), 0, valueA); + RegCloseKey(assocKey); } else @@ -1860,18 +1869,21 @@ static BOOL has_association_changed(LPCWSTR extensionW, LPCSTR mimeType, LPCWSTR return ret; } -static void update_association(LPCWSTR extension, LPCSTR mimeType, LPCWSTR progId, LPCSTR appName, LPCWSTR docName, LPCSTR desktopFile) +static void update_association(LPCWSTR extension, LPCSTR mimeType, LPCWSTR progId, + LPCSTR appName, LPCWSTR docName, LPCSTR desktopFile, LPCSTR openWithIcon) { static const WCHAR ProgIDW[] = {'P','r','o','g','I','D',0}; static const WCHAR DocNameW[] = {'D','o','c','N','a','m','e',0}; static const WCHAR MimeTypeW[] = {'M','i','m','e','T','y','p','e',0}; static const WCHAR AppNameW[] = {'A','p','p','N','a','m','e',0}; static const WCHAR DesktopFileW[] = {'D','e','s','k','t','o','p','F','i','l','e',0}; + static const WCHAR OpenWithIconW[] = {'O','p','e','n','W','i','t','h','I','c','o','n',0}; HKEY assocKey = NULL; HKEY subkey = NULL; WCHAR *mimeTypeW = NULL; WCHAR *appNameW = NULL; WCHAR *desktopFileW = NULL; + WCHAR *openWithIconW = NULL; assocKey = open_associations_reg_key(); if (assocKey == NULL) @@ -1907,12 +1919,26 @@ static void update_association(LPCWSTR extension, LPCSTR mimeType, LPCWSTR progI goto done; } + if (openWithIcon) + { + openWithIconW = utf8_chars_to_wchars(openWithIcon); + if (openWithIconW == NULL) + { + WINE_ERR("out of memory\n"); + goto done; + } + } + RegSetValueExW(subkey, MimeTypeW, 0, REG_SZ, (const BYTE*) mimeTypeW, (lstrlenW(mimeTypeW) + 1) * sizeof(WCHAR)); RegSetValueExW(subkey, ProgIDW, 0, REG_SZ, (const BYTE*) progId, (lstrlenW(progId) + 1) * sizeof(WCHAR)); RegSetValueExW(subkey, AppNameW, 0, REG_SZ, (const BYTE*) appNameW, (lstrlenW(appNameW) + 1) * sizeof(WCHAR)); if (docName) RegSetValueExW(subkey, DocNameW, 0, REG_SZ, (const BYTE*) docName, (lstrlenW(docName) + 1) * sizeof(WCHAR)); RegSetValueExW(subkey, DesktopFileW, 0, REG_SZ, (const BYTE*) desktopFileW, (lstrlenW(desktopFileW) + 1) * sizeof(WCHAR)); + if (openWithIcon) + RegSetValueExW(subkey, OpenWithIconW, 0, REG_SZ, (const BYTE*) openWithIconW, (lstrlenW(openWithIconW) + 1) * sizeof(WCHAR)); + else + RegDeleteValueW(subkey, OpenWithIconW); done: RegCloseKey(assocKey); @@ -1920,6 +1946,7 @@ done: HeapFree(GetProcessHeap(), 0, mimeTypeW); HeapFree(GetProcessHeap(), 0, appNameW); HeapFree(GetProcessHeap(), 0, desktopFileW); + HeapFree(GetProcessHeap(), 0, openWithIconW); } static BOOL cleanup_associations(void) @@ -2052,14 +2079,14 @@ static const char* get_special_mime_type(LPCWSTR extension) static BOOL write_freedesktop_association_entry(const char *desktopPath, const char *dot_extension, const char *friendlyAppName, const char *mimeType, - const char *progId) + const char *progId, const char *openWithIcon) { BOOL ret = FALSE; FILE *desktop; - WINE_TRACE("writing association for file type %s, friendlyAppName=%s, MIME type %s, progID=%s, to file %s\n", + WINE_TRACE("writing association for file type %s, friendlyAppName=%s, MIME type %s, progID=%s, icon=%s to file %s\n", wine_dbgstr_a(dot_extension), wine_dbgstr_a(friendlyAppName), wine_dbgstr_a(mimeType), - wine_dbgstr_a(progId), wine_dbgstr_a(desktopPath)); + wine_dbgstr_a(progId), wine_dbgstr_a(openWithIcon), wine_dbgstr_a(desktopPath)); desktop = fopen(desktopPath, "w"); if (desktop) @@ -2071,6 +2098,8 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c fprintf(desktop, "Exec=wine start /ProgIDOpen %s %%f\n", progId); fprintf(desktop, "NoDisplay=true\n"); fprintf(desktop, "StartupNotify=true\n"); + if (openWithIcon) + fprintf(desktop, "Icon=%s\n", openWithIcon); ret = TRUE; fclose(desktop); } @@ -2116,6 +2145,8 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package { char *extensionA = NULL; WCHAR *commandW = NULL; + WCHAR *executableW = NULL; + char *openWithIconA = NULL; WCHAR *friendlyDocNameW = NULL; char *friendlyDocNameA = NULL; WCHAR *iconW = NULL; @@ -2200,6 +2231,10 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package /* no command => no application is associated */ goto end; + executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, openW); + if (executableW) + openWithIconA = extract_icon(executableW, 0, NULL, FALSE); + friendlyAppNameW = assoc_query(ASSOCSTR_FRIENDLYAPPNAME, extensionW, NULL); if (friendlyAppNameW) { @@ -2233,15 +2268,15 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package else goto end; /* no progID => not a file type association */ - if (has_association_changed(extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW)) + if (has_association_changed(extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW, openWithIconA)) { char *desktopPath = heap_printf("%s/wine-extension-%s.desktop", applications_dir, &extensionA[1]); if (desktopPath) { - if (write_freedesktop_association_entry(desktopPath, extensionA, friendlyAppNameA, mimeTypeA, progIdA)) + if (write_freedesktop_association_entry(desktopPath, extensionA, friendlyAppNameA, mimeTypeA, progIdA, openWithIconA)) { hasChanged = TRUE; - update_association(extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW, desktopPath); + update_association(extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW, desktopPath, openWithIconA); } HeapFree(GetProcessHeap(), 0, desktopPath); } @@ -2250,6 +2285,8 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package end: HeapFree(GetProcessHeap(), 0, extensionA); HeapFree(GetProcessHeap(), 0, commandW); + HeapFree(GetProcessHeap(), 0, executableW); + HeapFree(GetProcessHeap(), 0, openWithIconA); HeapFree(GetProcessHeap(), 0, friendlyDocNameW); HeapFree(GetProcessHeap(), 0, friendlyDocNameA); HeapFree(GetProcessHeap(), 0, iconW);

1 0

Nikolay Sivov : comctl32/treeview: Use a code set by dispinfo holder to convert data encoding after TVN_GETDISPINFO .
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 0517abf184cdc863b74b953b2acfecb1b331ed1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0517abf184cdc863b74b953b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 17 13:46:42 2010 +0300 comctl32/treeview: Use a code set by dispinfo holder to convert data encoding after TVN_GETDISPINFO. --- dlls/comctl32/tests/treeview.c | 29 ++++++++++++++++++++++++----- dlls/comctl32/treeview.c | 5 +++-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index dddaa9d..ffc0e3e 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -35,6 +35,11 @@ static const char *TEST_CALLBACK_TEXT = "callback_text"; +static TVITEMA g_item_expanding, g_item_expanded; +static BOOL g_get_from_expand; +static BOOL g_get_rect_in_expand; +static BOOL g_disp_A_to_W; + #define NUM_MSG_SEQUENCES 2 #define TREEVIEW_SEQ_INDEX 0 #define PARENT_SEQ_INDEX 1 @@ -338,12 +343,12 @@ static void test_callback(void) TVINSERTSTRUCTA ins; TVITEMA tvi; CHAR test_string[] = "Test_string"; + static const CHAR test2A[] = "TEST2"; CHAR buf[128]; LRESULT ret; HWND hTree; hTree = create_treeview_control(); - fill_tree(hTree); ret = TreeView_DeleteAllItems(hTree); ok(ret == TRUE, "ret\n"); @@ -396,6 +401,16 @@ static void test_callback(void) ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", tvi.pszText, TEST_CALLBACK_TEXT); + /* notification handler changed A->W */ + g_disp_A_to_W = TRUE; + tvi.hItem = hItem2; + memset(buf, 0, sizeof(buf)); + ret = TreeView_GetItem(hTree, &tvi); + ok(ret == TRUE, "got %ld\n", ret); + ok(strcmp(tvi.pszText, test2A) == 0, "got %s, expected %s\n", + tvi.pszText, test2A); + g_disp_A_to_W = FALSE; + DestroyWindow(hTree); } @@ -854,10 +869,6 @@ static void test_get_set_unicodeformat(void) DestroyWindow(hTree); } -static TVITEMA g_item_expanding, g_item_expanded; -static BOOL g_get_from_expand; -static BOOL g_get_rect_in_expand; - static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -913,6 +924,14 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, if (disp->item.mask & TVIF_TEXT) { lstrcpyn(disp->item.pszText, TEST_CALLBACK_TEXT, disp->item.cchTextMax); } + + if (g_disp_A_to_W && (disp->item.mask & TVIF_TEXT)) { + static const WCHAR testW[] = {'T','E','S','T','2',0}; + + disp->hdr.code = TVN_GETDISPINFOW; + memcpy(disp->item.pszText, testW, sizeof(testW)); + } + break; } case TVN_ENDLABELEDIT: return TRUE; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 1e80c19..f2568d3 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -728,6 +728,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, wineItem->textWidth = 0; TREEVIEW_SendRealNotify(infoPtr, callback.hdr.idFrom, (LPARAM)&callback); + TRACE("resulting code 0x%08x\n", callback.hdr.code); /* It may have changed due to a call to SetItem. */ mask &= wineItem->callbackMask; @@ -735,7 +736,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, if ((mask & TVIF_TEXT) && callback.item.pszText != wineItem->pszText) { /* Instead of copying text into our buffer user specified its own */ - if (!infoPtr->bNtfUnicode) { + if (!infoPtr->bNtfUnicode && (callback.hdr.code == TVN_GETDISPINFOA)) { LPWSTR newText; int buflen; int len = MultiByteToWideChar( CP_ACP, 0, @@ -776,7 +777,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, } else if (mask & TVIF_TEXT) { /* User put text into our buffer, that is ok unless A string */ - if (!infoPtr->bNtfUnicode) { + if (!infoPtr->bNtfUnicode && (callback.hdr.code == TVN_GETDISPINFOA)) { LPWSTR newText; LPWSTR oldText = NULL; int buflen;

1 0

Nikolay Sivov : comctl32/treeview: Remove some casts.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 3fc6e08f2a6b621c131566a88ff272cb4da8a152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc6e08f2a6b621c131566a88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 17 13:47:11 2010 +0300 comctl32/treeview: Remove some casts. --- dlls/comctl32/treeview.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index f2568d3..e3f9b1b 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -490,10 +490,10 @@ static INT get_notifycode(const TREEVIEW_INFO *infoPtr, INT code) } static inline BOOL -TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPNMHDR pnmh) { - TRACE("wParam=%ld, lParam=%ld\n", wParam, lParam); - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, wParam, lParam); + TRACE("wParam=%ld, lParam=%p\n", wParam, pnmh); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, wParam, (LPARAM)pnmh); } static BOOL @@ -507,7 +507,7 @@ TREEVIEW_SendSimpleNotify(const TREEVIEW_INFO *infoPtr, UINT code) nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmhdr.code = get_notifycode(infoPtr, code); - return TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, (LPARAM)&nmhdr); + return TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, &nmhdr); } static VOID @@ -570,7 +570,7 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action nmhdr.ptDrag.x = 0; nmhdr.ptDrag.y = 0; - ret = TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr); + ret = TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, &nmhdr.hdr); if (!infoPtr->bNtfUnicode) { Free(nmhdr.itemOld.pszText); @@ -600,7 +600,7 @@ TREEVIEW_SendTreeviewDnDNotify(const TREEVIEW_INFO *infoPtr, UINT code, nmhdr.ptDrag.x = pt.x; nmhdr.ptDrag.y = pt.y; - return TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr); + return TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, &nmhdr.hdr); } @@ -628,7 +628,7 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage, nmcdhdr.clrTextBk = infoPtr->clrBk; nmcdhdr.iLevel = 0; - return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)&nmcdhdr); + return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, &nmcdhdr.nmcd.hdr); } @@ -672,7 +672,7 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc, nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->uItemState, nmcd->lItemlParam); - return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)nmcdhdr); + return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, &nmcdhdr->nmcd.hdr); } static BOOL @@ -689,7 +689,7 @@ TREEVIEW_BeginLabelEditNotify(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *editI TREEVIEW_TVItemFromItem(infoPtr, TVIF_HANDLE | TVIF_STATE | TVIF_PARAM | TVIF_TEXT, &tvdi.item, editItem); - ret = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi); + ret = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, &tvdi.hdr); if (!infoPtr->bNtfUnicode) Free(tvdi.item.pszText); @@ -727,7 +727,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, if (mask & TVIF_TEXT) wineItem->textWidth = 0; - TREEVIEW_SendRealNotify(infoPtr, callback.hdr.idFrom, (LPARAM)&callback); + TREEVIEW_SendRealNotify(infoPtr, callback.hdr.idFrom, &callback.hdr); TRACE("resulting code 0x%08x\n", callback.hdr.code); /* It may have changed due to a call to SetItem. */ @@ -3929,7 +3929,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) tvdi.item.cchTextMax = 0; } - bCommit = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi); + bCommit = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, &tvdi.hdr); if (!bCancel && bCommit) /* Apply the changes */ { @@ -5498,7 +5498,7 @@ TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) nmmouse.pt.x = 0; nmmouse.pt.y = 0; nmmouse.dwHitInfo = lParam; - if (TREEVIEW_SendRealNotify(infoPtr, nmmouse.hdr.idFrom, (LPARAM)&nmmouse)) + if (TREEVIEW_SendRealNotify(infoPtr, nmmouse.hdr.idFrom, &nmmouse.hdr)) return 0; if (item && (infoPtr->dwStyle & TVS_TRACKSELECT))

1 0

André Hentschel : winemaker: Add spec file dependency for dlls.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 189a5d0978c036032aed4f06362d6e1d1efa2677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189a5d0978c036032aed4f063… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 16 22:43:55 2010 +0100 winemaker: Add spec file dependency for dlls. --- tools/winemaker | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index bd46380..68483b8 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.7.4"; +my $version="0.7.5"; use Cwd; use File::Basename; @@ -2475,7 +2475,11 @@ sub generate_project_files($) my $canon=canonize("@$target[$T_NAME]"); $canon =~ s/_so$//; - print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS)\n"; + if (@$target[$T_TYPE] == $TT_DLL) { + print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS) \$(${canon}_MODULE:.dll=.spec)\n"; + } else { + print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS)\n"; + } if (@{@$target[$T_SOURCES_CXX]} > 0 or @{@$project_settings[$T_SOURCES_CXX]} > 0) { print FILEO "\t\$(CXX)"; } else {

1 0

Jörg Höhle : mciseq: Rework MCI notification system.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 896b74380b4d70cc88063165d865cc15b04a9715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896b74380b4d70cc88063165d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Dec 5 05:40:59 2009 +0100 mciseq: Rework MCI notification system. --- dlls/mciseq/mcimidi.c | 105 ++++++++++++++++++++++++++++-------------------- 1 files changed, 61 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=896b74380b4d70cc88063…

1 0

Jörg Höhle : mciseq: Bogus sizeof led to incorrect positioning.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 129778803ec4a72e05665acee761da0d0c461efa URL: http://source.winehq.org/git/wine.git/?a=commit;h=129778803ec4a72e05665acee… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 16 21:39:17 2010 +0100 mciseq: Bogus sizeof led to incorrect positioning. --- dlls/mciseq/mcimidi.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index aa351f3..6bf7f4d 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -952,7 +952,7 @@ static DWORD MIDI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) } if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wDevID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(LPMCI_PLAY_PARMS)); + return MCI_SendCommandAsync(wDevID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); } if (lpParms && (dwFlags & MCI_FROM)) { @@ -1191,8 +1191,6 @@ static DWORD MIDI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) midiOutReset((HMIDIOUT)wmm->hMidi); dwRet = midiOutClose((HMIDIOUT)wmm->hMidi); - /* to restart playing at beginning when it's over */ - wmm->dwPositionMS = 0; if (dwFlags & MCI_NOTIFY) oldcb = InterlockedExchangePointer(&wmm->hCallback, NULL);

1 0