June 2009 - Wine-Commits - list.winehq.org

Huw Davies : widl: Add support for the lcid parameter attribute.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 81b2c9eb85464bcdb77d333cfe224ac7b3e62378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b2c9eb85464bcdb77d333cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 5 15:48:24 2009 +0100 widl: Add support for the lcid parameter attribute. --- tools/widl/parser.y | 2 ++ tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 13 ++++++++++++- 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7fe373c..c2f1abc 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -509,6 +509,7 @@ attribute: { $$ = NULL; } | tINPUTSYNC { $$ = make_attr(ATTR_INPUTSYNC); } | tLENGTHIS '(' m_exprs ')' { $$ = make_attrp(ATTR_LENGTHIS, $3); } | tLCID '(' expr_int_const ')' { $$ = make_attrp(ATTR_LIBLCID, $3); } + | tLCID { $$ = make_attr(ATTR_PARAMLCID); } | tLOCAL { $$ = make_attr(ATTR_LOCAL); } | tNONBROWSABLE { $$ = make_attr(ATTR_NONBROWSABLE); } | tNONCREATABLE { $$ = make_attr(ATTR_NONCREATABLE); } @@ -1919,6 +1920,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_OLEAUTOMATION */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "oleautomation" }, /* ATTR_OPTIONAL */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optional" }, /* ATTR_OUT */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "out" }, + /* ATTR_PARAMLCID */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "lcid" }, /* ATTR_POINTERDEFAULT */ { 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "pointer_default" }, /* ATTR_POINTERTYPE */ { 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, "ref, unique or ptr" }, /* ATTR_PROPGET */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propget" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index f5466bf..c1c07ea 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -120,6 +120,7 @@ enum attr_type ATTR_OLEAUTOMATION, ATTR_OPTIONAL, ATTR_OUT, + ATTR_PARAMLCID, ATTR_POINTERDEFAULT, ATTR_POINTERTYPE, ATTR_PROPGET, diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index bff61fd..a22b8b3 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1267,6 +1267,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) unsigned int funckind, invokekind = 1 /* INVOKE_FUNC */; int help_context = 0, help_string_context = 0, help_string_offset = -1; int entry = -1, entry_is_ord = 0; + int lcid_retval_count = 0; chat("add_func_desc(%p,%d)\n", typeinfo, index); @@ -1497,9 +1498,13 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) case ATTR_OUT: paramflags |= 0x02; /* PARAMFLAG_FOUT */ break; + case ATTR_PARAMLCID: + paramflags |= 0x04; /* PARAMFLAG_LCID */ + lcid_retval_count++; + break; case ATTR_RETVAL: paramflags |= 0x08; /* PARAMFLAG_FRETVAL */ - typedata[4] |= 0x4000; + lcid_retval_count++; break; default: chat("unhandled param attr %d\n", attr->type); @@ -1509,6 +1514,12 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) paramdata[1] = -1; paramdata[2] = paramflags; typedata[3] += decoded_size << 16; + + if(lcid_retval_count == 1) + typedata[4] |= 0x4000; + else if(lcid_retval_count == 2) + typedata[4] |= 0x8000; + i++; } }

1 0

Vincent Povirk : include: Extend TVITEMEX and add NMTVDISPINFOEX.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 715928301182dfc8bc38a00201a463f45368043b URL: http://source.winehq.org/git/wine.git/?a=commit;h=715928301182dfc8bc38a0020… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 26 14:33:18 2009 -0500 include: Extend TVITEMEX and add NMTVDISPINFOEX. --- include/commctrl.h | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index e39f4a2..7d77faa 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2506,6 +2506,9 @@ typedef struct { INT cChildren; LPARAM lParam; INT iIntegral; + UINT uStateEx; /* _WIN32_IE >= 0x600 */ + HWND hwnd; /* _WIN32_IE >= 0x600 */ + INT iExpandedImage; /* _WIN32_IE >= 0x600 */ } TVITEMEXA, *LPTVITEMEXA; typedef struct { @@ -2520,6 +2523,9 @@ typedef struct { INT cChildren; LPARAM lParam; INT iIntegral; + UINT uStateEx; /* _WIN32_IE >= 0x600 */ + HWND hwnd; /* _WIN32_IE >= 0x600 */ + INT iExpandedImage; /* _WIN32_IE >= 0x600 */ } TVITEMEXW, *LPTVITEMEXW; #define TVITEMEX WINELIB_NAME_AW(TVITEMEX) @@ -2595,8 +2601,20 @@ typedef struct tagTVDISPINFOW { TVITEMW item; } NMTVDISPINFOW, *LPNMTVDISPINFOW; +typedef struct tagTVDISPINFOEXA { + NMHDR hdr; + TVITEMEXA item; +} NMTVDISPINFOEXA, *LPNMTVDISPINFOEXA; + +typedef struct tagTVDISPINFOEXW { + NMHDR hdr; + TVITEMEXW item; +} NMTVDISPINFOEXW, *LPNMTVDISPINFOEXW; + #define NMTVDISPINFO WINELIB_NAME_AW(NMTVDISPINFO) #define LPNMTVDISPINFO WINELIB_NAME_AW(LPNMTVDISPINFO) +#define NMTVDISPINFOEX WINELIB_NAME_AW(NMTVDISPINFOEX) +#define LPNMTVDISPINFOEX WINELIB_NAME_AW(LPNMTVDISPINFOEX) #define TV_DISPINFOA NMTVDISPINFOA #define TV_DISPINFOW NMTVDISPINFOW #define TV_DISPINFO NMTVDISPINFO

1 0

Jacek Caban : wininet: Fixed gzip decoding on chunked stream.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: a76db21978fd5f9200aba3c8251f54424c24b329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76db21978fd5f9200aba3c82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 7 21:19:06 2009 +0200 wininet: Fixed gzip decoding on chunked stream. --- dlls/wininet/http.c | 216 +++++++++++++++++++++++++++------------------------ 1 files changed, 116 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a76db21978fd5f9200aba…

1 0

Damjan Jovanovic : winemenubuilder: Generate icons for Wine's MIME types.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 4540d74f490524082eea79819b954e12b7777da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4540d74f490524082eea79819… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Jun 7 18:32:07 2009 +0200 winemenubuilder: Generate icons for Wine's MIME types. --- programs/winemenubuilder/winemenubuilder.c | 68 +++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 145817e..fcdc356 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -50,7 +50,18 @@ * shared location for an "All Users" entry then do so. As a suggestion the * shared menu Wine base could be writable to the wine group, or a wineadm * group. - * + * Clean up fd.o menus when they are deleted in Windows. + * Generate icons for file open handlers to go into the "Open with..." + * list. What does Windows use, the default icon for the .EXE file? It's + * not in the registry. + * Associate applications under HKCR\Applications to open any MIME type + * (by associating with application/octet-stream, or how?). + * Clean up fd.o MIME types when they are deleted in Windows, their icons + * too. Very hard - once we associate them with fd.o, we can't tell whether + * they are ours or not, and the extension <-> MIME type mapping isn't + * one-to-one either. + * Wine's HKCR is broken - it doesn't merge HKCU\Software\Classes, so apps + * that write associations there won't associate (#17019). */ #include "config.h" @@ -1287,6 +1298,25 @@ static char* wchars_to_utf8_chars(LPCWSTR string) return ret; } +static char *slashes_to_minuses(const char *string) +{ + int i; + char *ret = HeapAlloc(GetProcessHeap(), 0, lstrlenA(string) + 1); + if (ret) + { + for (i = 0; string[i]; i++) + { + if (string[i] == '/') + ret[i] = '-'; + else + ret[i] = string[i]; + } + ret[i] = 0; + return ret; + } + return NULL; +} + static BOOL next_line(FILE *file, char **line, int *size) { int pos = 0; @@ -1814,6 +1844,8 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package WCHAR *commandW = NULL; WCHAR *friendlyDocNameW = NULL; char *friendlyDocNameA = NULL; + WCHAR *iconW = NULL; + char *iconA = NULL; WCHAR *contentTypeW = NULL; char *mimeTypeA = NULL; WCHAR *friendlyAppNameW = NULL; @@ -1839,6 +1871,19 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } } + iconW = assoc_query(ASSOCSTR_DEFAULTICON, extensionW, NULL); + if (iconW) + { + WCHAR *comma = strrchrW(iconW, ','); + int index = 0; + if (comma) + { + *comma = 0; + index = atoiW(comma + 1); + } + iconA = extract_icon(iconW, index, FALSE); + } + contentTypeW = assoc_query(ASSOCSTR_CONTENTTYPE, extensionW, NULL); if (!freedesktop_mime_type_for_extension(nativeMimeTypes, extensionA, extensionW, &mimeTypeA)) @@ -1853,6 +1898,25 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package if (mimeTypeA != NULL) { + /* Gnome seems to ignore the <icon> tag in MIME packages, + * and the default name is more intuitive anyway. + */ + if (iconA) + { + char *flattened_mime = slashes_to_minuses(mimeTypeA); + if (flattened_mime) + { + char *dstIconPath = heap_printf("%s/icons/%s%s", xdg_data_dir, + flattened_mime, strrchr(iconA, '.')); + if (dstIconPath) + { + rename(iconA, dstIconPath); + HeapFree(GetProcessHeap(), 0, dstIconPath); + } + HeapFree(GetProcessHeap(), 0, flattened_mime); + } + } + write_freedesktop_mime_type_entry(packages_dir, extensionA, mimeTypeA, friendlyDocNameA); hasChanged = TRUE; } @@ -1920,6 +1984,8 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package HeapFree(GetProcessHeap(), 0, commandW); HeapFree(GetProcessHeap(), 0, friendlyDocNameW); HeapFree(GetProcessHeap(), 0, friendlyDocNameA); + HeapFree(GetProcessHeap(), 0, iconW); + HeapFree(GetProcessHeap(), 0, iconA); HeapFree(GetProcessHeap(), 0, contentTypeW); HeapFree(GetProcessHeap(), 0, mimeTypeA); HeapFree(GetProcessHeap(), 0, friendlyAppNameW);

1 0

Guy Albertelli : kernel32/tests: Fix tests when GetVolumeNameForVolumeMountPoint fails.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 5632d2344eeb0d8267d2a645091578f5d71557e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5632d2344eeb0d8267d2a6450… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Sat Jun 6 20:55:23 2009 -0400 kernel32/tests: Fix tests when GetVolumeNameForVolumeMountPoint fails. --- dlls/kernel32/tests/file.c | 122 +++++++++++++++++++++++-------------------- 1 files changed, 65 insertions(+), 57 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4ad10eb..4cdeade 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -957,78 +957,86 @@ static void test_CreateFileA(void) strcpy(filename, "c:\\"); filename[0] = windowsdir[0]; ret = pGetVolumeNameForVolumeMountPointA( filename, Volume_1, MAX_PATH ); - ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n"); - ok(strlen(Volume_1) == 49, "GetVolumeNameForVolumeMountPointA returned wrong length name %s\n", Volume_1); - - /* test the result of opening a unique volume name (GUID) */ - /* with the trailing \ */ - /* this should error out */ - strcpy(filename, Volume_1); - hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, + ok(ret, "GetVolumeNameForVolumeMountPointA failed, for %s, last error=%d\n", filename, GetLastError()); + if (ret) + { + ok(strlen(Volume_1) == 49, "GetVolumeNameForVolumeMountPointA returned wrong length name <%s>\n", Volume_1); + + /* test the result of opening a unique volume name (GUID) + * with the trailing \ + * this should error out + */ + strcpy(filename, Volume_1); + hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL ); - todo_wine - ok(hFile == INVALID_HANDLE_VALUE, - "CreateFileA should not have opened %s, hFile %p\n", - filename, hFile); - todo_wine - ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND, - "CreateFileA should have returned ERROR_PATH_NOT_FOUND on %s, but got %u\n", - filename, GetLastError()); - if (hFile != INVALID_HANDLE_VALUE) - CloseHandle( hFile ); + todo_wine + ok(hFile == INVALID_HANDLE_VALUE, + "CreateFileA should not have opened %s, hFile %p\n", + filename, hFile); + todo_wine + ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND, + "CreateFileA should have returned ERROR_PATH_NOT_FOUND on %s, but got %u\n", + filename, GetLastError()); + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle( hFile ); - /* test the result of opening a unique volume name (GUID) */ - /* with the temp path string as dir */ - /* this should work */ - strcpy(filename, Volume_1); - strcat(filename, temp_path+3); - hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, + /* test the result of opening a unique volume name (GUID) + * with the temp path string as dir + * this should work + */ + strcpy(filename, Volume_1); + strcat(filename, temp_path+3); + hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); - todo_wine - ok(hFile != INVALID_HANDLE_VALUE, - "CreateFileA should have opened %s, but got %u\n", - filename, GetLastError()); - if (hFile != INVALID_HANDLE_VALUE) - CloseHandle( hFile ); + todo_wine + ok(hFile != INVALID_HANDLE_VALUE, + "CreateFileA should have opened %s, but got %u\n", + filename, GetLastError()); + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle( hFile ); - /* test the result of opening a unique volume name (GUID) */ - /* without the trailing \ and in device namespace */ - /* this should work */ - strcpy(filename, Volume_1); - filename[2] = '.'; - filename[48] = 0; - hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, + /* test the result of opening a unique volume name (GUID) + * without the trailing \ and in device namespace + * this should work + */ + strcpy(filename, Volume_1); + filename[2] = '.'; + filename[48] = 0; + hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL ); - if (hFile != INVALID_HANDLE_VALUE || GetLastError() != ERROR_ACCESS_DENIED) - { - /* if we have adm rights to volume, then try rest of tests */ - ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA did not open %s, last error=%u\n", - filename, GetLastError()); - if (hFile != INVALID_HANDLE_VALUE) + if (hFile != INVALID_HANDLE_VALUE || GetLastError() != ERROR_ACCESS_DENIED) { - /* if we opened the volume/device, try to read it. Since it */ - /* opened, we should be able to read it. We don't care about*/ - /* what the data is at this time. */ - len = 512; - ret = ReadFile( hFile, buffer, len, &len, NULL ); - todo_wine ok(ret, "Failed to read volume, last error %u, %u, for %s\n", - GetLastError(), ret, filename); - if (ret) + /* if we have adm rights to volume, then try rest of tests */ + ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA did not open %s, last error=%u\n", + filename, GetLastError()); + if (hFile != INVALID_HANDLE_VALUE) { - trace("buffer is\n"); - dumpmem(buffer, 64); - } - CloseHandle( hFile ); - } + /* if we opened the volume/device, try to read it. Since it */ + /* opened, we should be able to read it. We don't care about*/ + /* what the data is at this time. */ + len = 512; + ret = ReadFile( hFile, buffer, len, &len, NULL ); + todo_wine ok(ret, "Failed to read volume, last error %u, %u, for %s\n", + GetLastError(), ret, filename); + if (ret) + { + trace("buffer is\n"); + dumpmem(buffer, 64); + } + CloseHandle( hFile ); + } + } + else + skip("Do not have authority to access volumes. Tests skipped\n"); } else - skip("Do not have authority to access volumes. Tests skipped\n"); + win_skip("GetVolumeNameForVolumeMountPointA not functioning\n"); } else win_skip("GetVolumeNameForVolumeMountPointA not found\n");

1 0

Detlef Riekenberg : mlang/tests: Add tests for IMultiLanguage2_GetRfc1766Info.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 9dd58897ca57f0b2f9ae2899d88582d91a4daae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd58897ca57f0b2f9ae2899d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jun 6 16:19:39 2009 +0200 mlang/tests: Add tests for IMultiLanguage2_GetRfc1766Info. --- dlls/mlang/tests/mlang.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 129 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 47fcde4..08be7a8 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -102,6 +102,82 @@ static const lcid_table_entry lcid_table[] = { }; +#define TODO_NAME 1 + +typedef struct info_table_tag { + LCID lcid; + LANGID lang; + DWORD todo; + LPCSTR rfc1766; + LPCSTR localename; + LPCSTR broken_name; +} info_table_entry; + +static const CHAR fr_enus[] = {'A','n','g','l','a','i','s',' ', + '(',0xC3, 0x89, 't','a','t','s','-','U','n','i','s',')',0}; + +static const info_table_entry info_table[] = { + {MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), + 0, "en", "English"}, + {MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), + 0, "en-us", "English (United States)"}, + {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), + 0, "en-gb", "English (United Kingdom)"}, + {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), + 0, "en-us", "English (United States)"}, + {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_CAN), MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), + 0, "en-ca", "English (Canada)"}, + + {MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), + 0, "de", "German (Germany)"}, + {MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), + 0, "de", "German (Germany)"}, + {MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN_SWISS), MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), + 0, "de-ch", "German (Switzerland)"}, + {MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN), MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), + 0, "de-at", "German (Austria)"}, + + {MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), + TODO_NAME, "en", "Englisch"}, + {MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), + TODO_NAME, "en-us", "Englisch (USA)"}, + {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), + TODO_NAME, "en-gb", "Englisch (Großbritannien)", "Englisch (Vereinigtes Königreic" }, + {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), + TODO_NAME, "en-us", "Englisch (USA)"}, + {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_CAN), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), + TODO_NAME, "en-ca", "Englisch (Kanada)"}, + + {MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), + TODO_NAME, "de", "Deutsch (Deutschland)"}, + {MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), + TODO_NAME, "de", "Deutsch (Deutschland)"}, + {MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN_SWISS), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), + TODO_NAME, "de-ch", "Deutsch (Schweiz)"}, + {MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), + TODO_NAME, "de-at", "Deutsch (Österreich)"}, + + {MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), + TODO_NAME, "en", "Anglais"}, + {MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), + TODO_NAME, "en-us", fr_enus, "Anglais (U.S.)"}, + {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), + TODO_NAME, "en-gb", "Anglais (Royaume-Uni)"}, + {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), + TODO_NAME, "en-us", fr_enus, "Anglais (U.S.)"}, + {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_CAN), MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), + TODO_NAME, "en-ca", "Anglais (Canada)"}, + + {MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), + TODO_NAME, "de", "Allemand (Allemagne)", "Allemand (Standard)"}, + {MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), + TODO_NAME, "de", "Allemand (Allemagne)", "Allemand (Standard)"}, + {MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN_SWISS), MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), + TODO_NAME, "de-ch", "Allemand (Suisse)"}, + {MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN), MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), + TODO_NAME, "de-at", "Allemand (Autriche)"} + +}; static BOOL init_function_ptrs(void) { @@ -1063,6 +1139,58 @@ static void test_LcidToRfc1766(void) } +static void test_GetRfc1766Info(IMultiLanguage2 *iML2) +{ + CHAR rfc1766A[MAX_RFC1766_NAME + 1]; + CHAR localenameA[MAX_LOCALE_NAME * 3]; + BYTE buffer[sizeof(RFC1766INFO) + 4]; + PRFC1766INFO prfc = (RFC1766INFO *) buffer; + HRESULT ret; + DWORD i; + + for(i = 0; i < sizeof(info_table) / sizeof(info_table[0]); i++) { + memset(buffer, 'x', sizeof(RFC1766INFO) + 2); + buffer[sizeof(buffer) -1] = 0; + buffer[sizeof(buffer) -2] = 0; + + ret = IMultiLanguage2_GetRfc1766Info(iML2, info_table[i].lcid, info_table[i].lang, prfc); + WideCharToMultiByte(CP_ACP, 0, prfc->wszRfc1766, -1, rfc1766A, MAX_RFC1766_NAME, NULL, NULL); + WideCharToMultiByte(CP_UTF8, 0, prfc->wszLocaleName, -1, localenameA, MAX_LOCALE_NAME * 3, NULL, NULL); + ok(ret == S_OK, "#%02d: got 0x%x (expected S_OK)\n", i, ret); + ok(prfc->lcid == info_table[i].lcid, + "#%02d: got 0x%04x (expected 0x%04x)\n", i, prfc->lcid, info_table[i].lcid); + + ok(!lstrcmpA(rfc1766A, info_table[i].rfc1766), + "#%02d: got '%s' (expected '%s')\n", i, rfc1766A, info_table[i].rfc1766); + + if (info_table[i].todo & TODO_NAME) { + todo_wine + ok( (!lstrcmpA(localenameA, info_table[i].localename)) || + broken(!lstrcmpA(localenameA, info_table[i].broken_name)), /* IE < 6.0 */ + "#%02d: got '%s' (expected '%s')\n", i, localenameA, info_table[i].localename); + } + else + ok( (!lstrcmpA(localenameA, info_table[i].localename)) || + broken(!lstrcmpA(localenameA, info_table[i].broken_name)), /* IE < 6.0 */ + "#%02d: got '%s' (expected '%s')\n", i, localenameA, info_table[i].localename); + + } + + /* SUBLANG_NEUTRAL only allowed for english, arabic, chinese */ + ret = IMultiLanguage2_GetRfc1766Info(iML2, MAKELANGID(LANG_GERMAN, SUBLANG_NEUTRAL), LANG_ENGLISH, prfc); + ok(ret == E_FAIL, "got 0x%x (expected E_FAIL)\n", ret); + + ret = IMultiLanguage2_GetRfc1766Info(iML2, MAKELANGID(LANG_ITALIAN, SUBLANG_NEUTRAL), LANG_ENGLISH, prfc); + ok(ret == E_FAIL, "got 0x%x (expected E_FAIL)\n", ret); + + /* NULL not allowed */ + ret = IMultiLanguage2_GetRfc1766Info(iML2, 0, LANG_ENGLISH, prfc); + ok(ret == E_FAIL, "got 0x%x (expected E_FAIL)\n", ret); + + ret = IMultiLanguage2_GetRfc1766Info(iML2, LANG_ENGLISH, LANG_ENGLISH, NULL); + ok(ret == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", ret); +} + static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) { CHAR dest[MAX_PATH]; @@ -1634,6 +1762,7 @@ START_TEST(mlang) test_rfc1766(iML2); test_GetLcidFromRfc1766(iML2); test_GetRfc1766FromLcid(iML2); + test_GetRfc1766Info(iML2); test_EnumCodePages(iML2, 0); test_EnumCodePages(iML2, MIMECONTF_MIME_LATEST);

1 0

Detlef Riekenberg : mlang: Implement IMultiLanguage2_GetRfc1766Info.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: ec8bb185c61a2e9d9b66f229fefd8e1fe96fcca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8bb185c61a2e9d9b66f229f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jun 6 16:07:06 2009 +0200 mlang: Implement IMultiLanguage2_GetRfc1766Info. --- dlls/mlang/mlang.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 4d2f7be..6199da0 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2871,8 +2871,45 @@ static HRESULT WINAPI fnIMultiLanguage2_GetRfc1766Info( LANGID LangId, PRFC1766INFO pRfc1766Info) { - FIXME("\n"); - return E_NOTIMPL; + static LANGID last_lang = -1; + LCTYPE type = LOCALE_SLANGUAGE; + + TRACE("(%p, 0x%04x, 0x%04x, %p)\n", iface, Locale, LangId, pRfc1766Info); + + if (!pRfc1766Info) + return E_INVALIDARG; + + if ((PRIMARYLANGID(Locale) == LANG_ENGLISH) || + (PRIMARYLANGID(Locale) == LANG_CHINESE) || + (PRIMARYLANGID(Locale) == LANG_ARABIC)) { + + if (!SUBLANGID(Locale)) + type = LOCALE_SENGLANGUAGE; /* suppress country */ + } + else + { + if (!SUBLANGID(Locale)) { + TRACE("SUBLANGID missing in 0x%04x\n", Locale); + return E_FAIL; + } + } + + pRfc1766Info->lcid = Locale; + pRfc1766Info->wszRfc1766[0] = 0; + pRfc1766Info->wszLocaleName[0] = 0; + + if ((PRIMARYLANGID(LangId) != LANG_ENGLISH) && + (last_lang != LangId)) { + FIXME("Only english names supported (requested: 0x%04x)\n", LangId); + last_lang = LangId; + } + + if ((!lcid_to_rfc1766W(Locale, pRfc1766Info->wszRfc1766, MAX_RFC1766_NAME)) && + (GetLocaleInfoW(Locale, type, pRfc1766Info->wszLocaleName, MAX_LOCALE_NAME) > 0)) + return S_OK; + + /* Locale not supported */ + return E_INVALIDARG; } static HRESULT WINAPI fnIMultiLanguage2_CreateConvertCharset(

1 0

Stefan Stranz : c2man: Add xml documentation creation.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: c89c2dd4c59632e3658b980ddbb708e34d6d9d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89c2dd4c59632e3658b980dd… Author: Stefan Stranz <sfs1988(a)gmail.com> Date: Fri Jun 5 20:57:24 2009 -0600 c2man: Add xml documentation creation. --- Make.rules.in | 6 ++- Makefile.in | 5 +- dlls/Makedll.rules.in | 5 ++- documentation/Makefile.in | 9 ++- tools/c2man.pl | 132 ++++++++++++++++++++++++++++++++++++++++----- 5 files changed, 136 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c89c2dd4c59632e3658b9…

1 0

Nikolay Sivov : comctl32/listview: Use LV_VIEW_* constants instead of style .
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: e636998890bf903ac545c071e310ce17785308be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e636998890bf903ac545c071e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 7 15:25:16 2009 +0400 comctl32/listview: Use LV_VIEW_* constants instead of style. --- dlls/comctl32/listview.c | 53 +++++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 379c7ad..8fc89b6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3494,7 +3494,6 @@ static inline BOOL is_assignable_item(const LVITEMW *lpLVItem, LONG lStyle) */ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL isNew, BOOL isW, BOOL *bChanged) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; ITEM_INFO *lpItem; NMLISTVIEW nmlv; UINT uChanged = 0; @@ -3619,7 +3618,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL } infoPtr->nFocusedItem = lpLVItem->iItem; - LISTVIEW_EnsureVisible(infoPtr, lpLVItem->iItem, uView == LVS_LIST); + LISTVIEW_EnsureVisible(infoPtr, lpLVItem->iItem, infoPtr->uView == LV_VIEW_LIST); } else if (infoPtr->nFocusedItem == lpLVItem->iItem) { @@ -4800,7 +4799,6 @@ static BOOL LISTVIEW_DeleteColumn(LISTVIEW_INFO *infoPtr, INT nColumn) */ static void LISTVIEW_ScrollOnInsert(LISTVIEW_INFO *infoPtr, INT nItem, INT dir) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; INT nPerCol, nItemCol, nItemRow; RECT rcScroll; POINT Origin; @@ -4823,9 +4821,9 @@ static void LISTVIEW_ScrollOnInsert(LISTVIEW_INFO *infoPtr, INT nItem, INT dir) LISTVIEW_UpdateScroll(infoPtr); /* figure out the item's position */ - if (uView == LVS_REPORT) + if (infoPtr->uView == LV_VIEW_DETAILS) nPerCol = infoPtr->nItemCount + 1; - else if (uView == LVS_LIST) + else if (infoPtr->uView == LV_VIEW_LIST) nPerCol = LISTVIEW_GetCountPerColumn(infoPtr); else /* LV_VIEW_ICON, or LV_VIEW_SMALLICON */ return; @@ -4849,7 +4847,7 @@ static void LISTVIEW_ScrollOnInsert(LISTVIEW_INFO *infoPtr, INT nItem, INT dir) } /* report has only that column, so we're done */ - if (uView == LVS_REPORT) return; + if (infoPtr->uView == LV_VIEW_DETAILS) return; /* now for LISTs, we have to deal with the columns to the right */ rcScroll.left = (nItemCol + 1) * infoPtr->nItemWidth; @@ -5147,7 +5145,6 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) */ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *infoPtr, INT nItem, BOOL bPartial) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; INT nScrollPosHeight = 0; INT nScrollPosWidth = 0; INT nHorzAdjust = 0; @@ -5163,41 +5160,41 @@ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *infoPtr, INT nItem, BOOL bPart if (rcItem.left < infoPtr->rcList.left || rcItem.right > infoPtr->rcList.right) { - /* scroll left/right, but in LVS_REPORT mode */ - if (uView == LVS_LIST) + /* scroll left/right, but in LV_VIEW_DETAILS mode */ + if (infoPtr->uView == LV_VIEW_LIST) nScrollPosWidth = infoPtr->nItemWidth; - else if ((uView == LVS_SMALLICON) || (uView == LVS_ICON)) + else if ((infoPtr->uView == LV_VIEW_SMALLICON) || (infoPtr->uView == LV_VIEW_ICON)) nScrollPosWidth = 1; if (rcItem.left < infoPtr->rcList.left) { nHorzAdjust = -1; - if (uView != LVS_REPORT) nHorzDiff = rcItem.left - infoPtr->rcList.left; + if (infoPtr->uView != LV_VIEW_DETAILS) nHorzDiff = rcItem.left - infoPtr->rcList.left; } else { nHorzAdjust = 1; - if (uView != LVS_REPORT) nHorzDiff = rcItem.right - infoPtr->rcList.right; + if (infoPtr->uView != LV_VIEW_DETAILS) nHorzDiff = rcItem.right - infoPtr->rcList.right; } } if (rcItem.top < infoPtr->rcList.top || rcItem.bottom > infoPtr->rcList.bottom) { /* scroll up/down, but not in LVS_LIST mode */ - if (uView == LVS_REPORT) + if (infoPtr->uView == LV_VIEW_DETAILS) nScrollPosHeight = infoPtr->nItemHeight; - else if ((uView == LVS_ICON) || (uView == LVS_SMALLICON)) + else if ((infoPtr->uView == LV_VIEW_ICON) || (infoPtr->uView == LV_VIEW_SMALLICON)) nScrollPosHeight = 1; if (rcItem.top < infoPtr->rcList.top) { nVertAdjust = -1; - if (uView != LVS_LIST) nVertDiff = rcItem.top - infoPtr->rcList.top; + if (infoPtr->uView != LV_VIEW_LIST) nVertDiff = rcItem.top - infoPtr->rcList.top; } else { nVertAdjust = 1; - if (uView != LVS_LIST) nVertDiff = rcItem.bottom - infoPtr->rcList.bottom; + if (infoPtr->uView != LV_VIEW_LIST) nVertDiff = rcItem.bottom - infoPtr->rcList.bottom; } } @@ -6701,7 +6698,6 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, */ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL isW) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; INT nItem; HDPA hdpaSubItems; NMLISTVIEW nmlv; @@ -6788,7 +6784,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo; /* make room for the position, if we are in the right mode */ - if ((uView == LVS_SMALLICON) || (uView == LVS_ICON)) + if ((infoPtr->uView == LV_VIEW_SMALLICON) || (infoPtr->uView == LV_VIEW_ICON)) { if (DPA_InsertPtr(infoPtr->hdpaPosX, nItem, 0) == -1) goto undo; @@ -6808,7 +6804,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, return -1; /* align items (set position of each item) */ - if ((uView == LVS_SMALLICON || uView == LVS_ICON)) + if (infoPtr->uView == LV_VIEW_SMALLICON || infoPtr->uView == LV_VIEW_ICON) { POINT pt; @@ -8368,7 +8364,6 @@ fail: static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); - UINT uView = lpcs->style & LVS_TYPEMASK; TRACE("(lpcs=%p)\n", lpcs); @@ -8380,7 +8375,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) /* on error defaulting to ANSI notifications */ if (infoPtr->notifyFormat == 0) infoPtr->notifyFormat = NFR_ANSI; - if ((uView == LVS_REPORT) && (lpcs->style & WS_VISIBLE)) + if ((infoPtr->uView == LV_VIEW_DETAILS) && (lpcs->style & WS_VISIBLE)) { if (LISTVIEW_CreateHeader(infoPtr) < 0) return -1; } @@ -8390,7 +8385,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) /* init item size to avoid division by 0 */ LISTVIEW_UpdateItemSize (infoPtr); - if (uView == LVS_REPORT) + if (infoPtr->uView == LV_VIEW_DETAILS) { if (!(LVS_NOCOLUMNHEADER & lpcs->style) && (WS_VISIBLE & lpcs->style)) { @@ -8402,7 +8397,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) OpenThemeData(hwnd, themeClass); /* initialize the icon sizes */ - set_icon_size(&infoPtr->iconSize, infoPtr->himlNormal, uView != LVS_ICON); + set_icon_size(&infoPtr->iconSize, infoPtr->himlNormal, infoPtr->uView != LV_VIEW_ICON); set_icon_size(&infoPtr->iconStateSize, infoPtr->himlState, TRUE); return 0; } @@ -9748,13 +9743,11 @@ static LRESULT LISTVIEW_Size(LISTVIEW_INFO *infoPtr, int Width, int Height) */ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; - - TRACE("uView=%d, rcList(old)=%s\n", uView, wine_dbgstr_rect(&infoPtr->rcList)); + TRACE("uView=%d, rcList(old)=%s\n", infoPtr->uView, wine_dbgstr_rect(&infoPtr->rcList)); GetClientRect(infoPtr->hwndSelf, &infoPtr->rcList); - if (uView == LVS_LIST) + if (infoPtr->uView == LV_VIEW_LIST) { /* Apparently the "LIST" style is supposed to have the same * number of items in a column even if there is no scroll bar. @@ -9767,7 +9760,7 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) infoPtr->rcList.bottom -= GetSystemMetrics(SM_CYHSCROLL); infoPtr->rcList.bottom = max (infoPtr->rcList.bottom - 2, 0); } - else if (uView == LVS_REPORT) + else if (infoPtr->uView == LV_VIEW_DETAILS) { HDLAYOUT hl; WINDOWPOS wp; @@ -9945,10 +9938,8 @@ static INT LISTVIEW_StyleChanging(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, */ static LRESULT LISTVIEW_ShowWindow(LISTVIEW_INFO *infoPtr, BOOL bShown, INT iStatus) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; - /* header delayed creation */ - if ((uView == LVS_REPORT) && bShown) + if ((infoPtr->uView == LV_VIEW_DETAILS) && bShown) { LISTVIEW_CreateHeader(infoPtr);

1 0

Nikolay Sivov : comctl32/listview: Position edit box after notification.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: ae0d36304368556de2a9bc809174ef77dd8688d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0d36304368556de2a9bc809… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jun 6 07:54:43 2009 +0400 comctl32/listview: Position edit box after notification. --- dlls/comctl32/listview.c | 58 +++++++++++++++++++++------------------ dlls/comctl32/tests/listview.c | 1 + 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d302e38..e9593c0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -418,7 +418,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *, INT, const LVITEMW *); static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *, INT, INT, HWND); static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *, INT, INT, HWND); static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL); -static HWND CreateEditLabelT(LISTVIEW_INFO *, LPCWSTR, DWORD, INT, INT, INT, INT, BOOL); +static HWND CreateEditLabelT(LISTVIEW_INFO *, LPCWSTR, DWORD, BOOL); static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *, INT, HIMAGELIST); static INT LISTVIEW_HitTest(const LISTVIEW_INFO *, LPLVHITTESTINFO, BOOL, BOOL); @@ -5055,7 +5055,11 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) WCHAR szDispText[DISP_TEXT_SIZE] = { 0 }; NMLVDISPINFOW dispInfo; RECT rect; + SIZE sz; HWND hwndSelf = infoPtr->hwndSelf; + HDC hdc; + HFONT hOldFont = NULL; + TEXTMETRICW textMetric; TRACE("(nItem=%d, isW=%d)\n", nItem, isW); @@ -5088,8 +5092,7 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) dispInfo.item.cchTextMax = DISP_TEXT_SIZE; if (!LISTVIEW_GetItemT(infoPtr, &dispInfo.item, isW)) return 0; - infoPtr->hwndEdit = CreateEditLabelT(infoPtr, dispInfo.item.pszText, WS_VISIBLE, - rect.left-2, rect.top-1, 0, rect.bottom - rect.top+2, isW); + infoPtr->hwndEdit = CreateEditLabelT(infoPtr, dispInfo.item.pszText, WS_VISIBLE, isW); if (!infoPtr->hwndEdit) return 0; if (notify_dispinfoT(infoPtr, LVN_BEGINLABELEDITW, &dispInfo, isW)) @@ -5101,6 +5104,27 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) return 0; } + /* Now position and display edit box */ + hdc = GetDC(infoPtr->hwndSelf); + + /* Select the font to get appropriate metric dimensions */ + if(infoPtr->hFont != 0) + hOldFont = SelectObject(hdc, infoPtr->hFont); + + /* Get String Length in pixels */ + GetTextExtentPoint32W(hdc, dispInfo.item.pszText, lstrlenW(dispInfo.item.pszText), &sz); + + /* Add Extra spacing for the next character */ + GetTextMetricsW(hdc, &textMetric); + sz.cx += (textMetric.tmMaxCharWidth * 2); + + if(infoPtr->hFont != 0) + SelectObject(hdc, hOldFont); + + ReleaseDC(infoPtr->hwndSelf, hdc); + + MoveWindow(infoPtr->hwndEdit, rect.left - 2, rect.top - 1, sz.cx, + rect.bottom - rect.top + 2, FALSE); ShowWindow(infoPtr->hwndEdit, SW_NORMAL); SetFocus(infoPtr->hwndEdit); SendMessageW(infoPtr->hwndEdit, EM_SETSEL, 0, -1); @@ -10735,41 +10759,21 @@ static LRESULT CALLBACK EditLblWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPA * * RETURN: */ -static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, DWORD style, - INT x, INT y, INT width, INT height, BOOL isW) +static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, DWORD style, BOOL isW) { WCHAR editName[5] = { 'E', 'd', 'i', 't', '\0' }; HWND hedit; - SIZE sz; - HDC hdc; - HDC hOldFont=0; - TEXTMETRICW textMetric; HINSTANCE hinst = (HINSTANCE)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_HINSTANCE); TRACE("(text=%s, ..., isW=%d)\n", debugtext_t(text, isW), isW); style |= WS_CHILDWINDOW|WS_CLIPSIBLINGS|ES_LEFT|ES_AUTOHSCROLL|WS_BORDER; - hdc = GetDC(infoPtr->hwndSelf); - - /* Select the font to get appropriate metric dimensions */ - if(infoPtr->hFont != 0) - hOldFont = SelectObject(hdc, infoPtr->hFont); - /*Get String Length in pixels */ - GetTextExtentPoint32W(hdc, text, lstrlenW(text), &sz); - - /*Add Extra spacing for the next character */ - GetTextMetricsW(hdc, &textMetric); - sz.cx += (textMetric.tmMaxCharWidth * 2); - - if(infoPtr->hFont != 0) - SelectObject(hdc, hOldFont); - - ReleaseDC(infoPtr->hwndSelf, hdc); + /* Window will be resized and positioned after LVN_BEGINLABELEDIT */ if (isW) - hedit = CreateWindowW(editName, text, style, x, y, sz.cx, height, infoPtr->hwndSelf, 0, hinst, 0); + hedit = CreateWindowW(editName, text, style, 0, 0, 0, 0, infoPtr->hwndSelf, 0, hinst, 0); else - hedit = CreateWindowA("Edit", (LPCSTR)text, style, x, y, sz.cx, height, infoPtr->hwndSelf, 0, hinst, 0); + hedit = CreateWindowA("Edit", (LPCSTR)text, style, 0, 0, 0, 0, infoPtr->hwndSelf, 0, hinst, 0); if (!hedit) return 0; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e36697b..49c2f22 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -207,6 +207,7 @@ static const struct message editbox_create_pos[] = { { WM_WINDOWPOSCHANGED, sent }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc }, + /* the rest is todo */ { WM_WINDOWPOSCHANGING, sent }, { WM_WINDOWPOSCHANGED, sent }, { 0 }

1 0