January 2014 - Wine-commits

Tag wine-1.6.2 : Alexandre Julliard : Release 1.6.2
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: refs/tags/wine-1.6.2 Tag: 2a0860e5e2b30a7d40c3e721374ded8f054a3108 URL: http://source.winehq.org/git/wine.git/?a=tag;h=2a0860e5e2b30a7d40c3e721374d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 10 21:37:29 2014 +0100 Release 1.6.2

1 0

Hans Leidekker : msi: Fix handling of empty mask edit templates.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: d020cc02b37c50d45cd84664be7e82c65e2b3f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d020cc02b37c50d45cd84664b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 2 11:18:06 2013 +0100 msi: Fix handling of empty mask edit templates. (cherry picked from commit 3271b982632e7730d6cee373f4c9a4af37012036) --- dlls/msi/dialog.c | 59 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 80e2d68..5347005 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1781,24 +1781,33 @@ static void msi_mask_control_change( struct msi_maskedit_info *info ) val = msi_alloc( (info->num_chars+1)*sizeof(WCHAR) ); for( i=0, n=0; i<info->num_groups; i++ ) { - if( (info->group[i].len + n) > info->num_chars ) + if (info->group[i].len == ~0u) { - ERR("can't fit control %d text into template\n",i); - break; - } - if (!msi_mask_editable(info->group[i].type)) - { - for(r=0; r<info->group[i].len; r++) - val[n+r] = info->group[i].type; - val[n+r] = 0; + UINT len = SendMessageW( info->group[i].hwnd, WM_GETTEXTLENGTH, 0, 0 ); + val = msi_realloc( val, (len + 1) * sizeof(WCHAR) ); + GetWindowTextW( info->group[i].hwnd, val, len + 1 ); } else { - r = GetWindowTextW( info->group[i].hwnd, &val[n], info->group[i].len+1 ); - if( r != info->group[i].len ) + if (info->group[i].len + n > info->num_chars) + { + ERR("can't fit control %d text into template\n",i); break; + } + if (!msi_mask_editable(info->group[i].type)) + { + for(r=0; r<info->group[i].len; r++) + val[n+r] = info->group[i].type; + val[n+r] = 0; + } + else + { + r = GetWindowTextW( info->group[i].hwnd, &val[n], info->group[i].len+1 ); + if( r != info->group[i].len ) + break; + } + n += r; } - n += r; } TRACE("%d/%d controls were good\n", i, info->num_groups); @@ -1893,14 +1902,14 @@ msi_maskedit_set_text( struct msi_maskedit_info *info, LPCWSTR text ) static struct msi_maskedit_info * msi_dialog_parse_groups( LPCWSTR mask ) { - struct msi_maskedit_info * info = NULL; + struct msi_maskedit_info *info; int i = 0, n = 0, total = 0; LPCWSTR p; TRACE("masked control, template %s\n", debugstr_w(mask)); if( !mask ) - return info; + return NULL; info = msi_alloc_zero( sizeof *info ); if( !info ) @@ -1916,7 +1925,16 @@ static struct msi_maskedit_info * msi_dialog_parse_groups( LPCWSTR mask ) { /* stop at the end of the string */ if( p[0] == 0 || p[0] == '>' ) + { + if (!total) + { + /* create a group for the empty mask */ + info->group[0].type = '&'; + info->group[0].len = ~0u; + i = 1; + } break; + } /* count the number of the same identifier */ for( n=0; p[n] == p[0]; n++ ) @@ -1962,9 +1980,16 @@ msi_maskedit_create_children( struct msi_maskedit_info *info, LPCWSTR font ) { if (!msi_mask_editable( info->group[i].type )) continue; - wx = (info->group[i].ofs * width) / info->num_chars; - ww = (info->group[i].len * width) / info->num_chars; - + if (info->num_chars) + { + wx = (info->group[i].ofs * width) / info->num_chars; + ww = (info->group[i].len * width) / info->num_chars; + } + else + { + wx = 0; + ww = width; + } hwnd = CreateWindowW( szEdit, NULL, style, wx, 0, ww, height, info->hwnd, NULL, NULL, NULL ); if( !hwnd )

1 0

Ken Thomases : winemac: Include the OpenGL headers to fix building on OS X 10.9.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 1b431ea7dca4f0569c138ce10b09b34e935fdfc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b431ea7dca4f0569c138ce10… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 2 21:02:28 2013 -0600 winemac: Include the OpenGL headers to fix building on OS X 10.9. (cherry picked from commit f0c4354a6bd0eeab094124f76987fa7de299c978) --- dlls/winemac.drv/cocoa_opengl.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 45799db..6c2dbf2 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <OpenGL/gl.h> #import "cocoa_opengl.h" #include "macdrv_cocoa.h"

1 0

Huw Davies : ntdll: Don' t reduce the size of the local buffer when we come to read another batch of entries.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: ed2a34bf31616ade3f866fa38119f175008e0580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2a34bf31616ade3f866fa38… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 3 13:06:21 2013 +0000 ntdll: Don't reduce the size of the local buffer when we come to read another batch of entries. In the wildcard case, we can't know how much to reduce it by anyway. (cherry picked from commit fed9f67bc4e40cecf2fc560004b8d9cd0a4329e3) --- dlls/ntdll/directory.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index e6e1795..3e30129 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1848,9 +1848,6 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff continue; } if (size < initial_size) break; /* already restarted once, give up now */ - size = min( size, length - io->Information ); - /* if size is too small don't bother to continue */ - if (size < max_dir_info_size(class) && last_info) break; restart_last_info = last_info; restart_info_pos = io->Information; restart:

1 0

Huw Davies : kernel32: Give the non-wildcard case a chance of succeeding first time around.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 2d2d46b2f1dd2cb3dfd52d1557e1948a5a8bbf56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2d46b2f1dd2cb3dfd52d155… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 4 14:28:55 2013 +0000 kernel32: Give the non-wildcard case a chance of succeeding first time around. (cherry picked from commit 67545ed54c94e3541ae28f8c0e6dcf91dc87f4eb) --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 89e0fad..3239696 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1952,7 +1952,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, IO_STATUS_BLOCK io; BOOL has_wildcard = strpbrkW( info->mask.Buffer, wildcardsW ) != NULL; - info->data_size = has_wildcard ? 8192 : max_entry_size; + info->data_size = has_wildcard ? 8192 : max_entry_size * 2; while (info->data_size) {

1 0

Ken Thomases : ntdll: On Mac, store the dyld image info address in the PEB.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: f512cf479ae5b623c8cf2e1858b10a71e3b45501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f512cf479ae5b623c8cf2e185… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 4 16:07:55 2013 -0600 ntdll: On Mac, store the dyld image info address in the PEB. (cherry picked from commit 22cf68e1bc079c05ad4bf9397c48f6065019d5e3) --- dlls/ntdll/thread.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 703e83c..ca5c8f9 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -186,6 +186,23 @@ done: return status; } +#ifdef __APPLE__ +#include <mach/mach.h> +#include <mach/mach_error.h> + +static ULONG get_dyld_image_info_addr(void) +{ + ULONG ret = 0; +#ifdef TASK_DYLD_INFO + struct task_dyld_info dyld_info; + mach_msg_type_number_t size = TASK_DYLD_INFO_COUNT; + if (task_info(mach_task_self(), TASK_DYLD_INFO, (task_info_t)&dyld_info, &size) == KERN_SUCCESS) + ret = dyld_info.all_image_info_addr; +#endif + return ret; +} +#endif /* __APPLE__ */ + /*********************************************************************** * thread_init * @@ -245,6 +262,9 @@ HANDLE thread_init(void) InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); InitializeListHead( &tls_links ); +#ifdef __APPLE__ + peb->Reserved[0] = get_dyld_image_info_addr(); +#endif /* allocate and initialize the initial TEB */

1 0

Ken Thomases : dbghelp: For Mach-O, get the address of the process' s image info from its PEB.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: e5f7aeadf113bb080f1202c9f42953b23869a159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f7aeadf113bb080f1202c9f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 4 16:08:06 2013 -0600 dbghelp: For Mach-O, get the address of the process's image info from its PEB. (cherry picked from commit 1577fb6c3f5941a9b2ba1fec7e38e61cdfa2b757) --- dlls/dbghelp/macho_module.c | 57 +++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 1aaa7f1..e39e2ce 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -24,6 +24,8 @@ #include "config.h" #include "wine/port.h" +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "dbghelp_private.h" #ifdef HAVE_MACH_O_LOADER_H @@ -948,23 +950,52 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, */ if (macho_info->flags & MACHO_INFO_DEBUG_HEADER) { - static void* dyld_all_image_infos_addr; + PROCESS_BASIC_INFORMATION pbi; + NTSTATUS status; - /* This symbol should be in the same place in all processes. */ - if (!dyld_all_image_infos_addr) + ret = FALSE; + + /* Get address of PEB */ + status = NtQueryInformationProcess(pcs->handle, ProcessBasicInformation, + &pbi, sizeof(pbi), NULL); + if (status == STATUS_SUCCESS) { - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char*)"_dyld_all_image_infos"; - if (!nlist("/usr/lib/dyld", nl)) - dyld_all_image_infos_addr = (void*)nl[0].n_value; + ULONG dyld_image_info; + + /* Read dyld image info address from PEB */ + if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved, + &dyld_image_info, sizeof(dyld_image_info), NULL)) + { + TRACE("got dyld_image_info 0x%08x from PEB %p MacDyldImageInfo %p\n", + dyld_image_info, pbi.PebBaseAddress, &pbi.PebBaseAddress->Reserved); + macho_info->dbg_hdr_addr = dyld_image_info; + ret = TRUE; + } } - if (dyld_all_image_infos_addr) - macho_info->dbg_hdr_addr = (unsigned long)dyld_all_image_infos_addr; - else - ret = FALSE; - TRACE("dbg_hdr_addr = 0x%08lx\n", macho_info->dbg_hdr_addr); + if (!ret) + { + static void* dyld_all_image_infos_addr; + + /* Our next best guess is that dyld was loaded at its base address + and we can find the dyld image infos address by looking up its symbol. */ + if (!dyld_all_image_infos_addr) + { + struct nlist nl[2]; + memset(nl, 0, sizeof(nl)); + nl[0].n_un.n_name = (char*)"_dyld_all_image_infos"; + if (!nlist("/usr/lib/dyld", nl)) + dyld_all_image_infos_addr = (void*)nl[0].n_value; + } + + if (dyld_all_image_infos_addr) + { + TRACE("got dyld_image_info %p from /usr/lib/dyld symbol table\n", + dyld_all_image_infos_addr); + macho_info->dbg_hdr_addr = (unsigned long)dyld_all_image_infos_addr; + ret = TRUE; + } + } } if (macho_info->flags & MACHO_INFO_MODULE)

1 0

Huw Davies : wordpad: Pass the correct window to the font size list validator.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 44e153f9d45ee434bb2727a1d9cd7502cec7fa2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e153f9d45ee434bb2727a1d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 6 16:28:31 2013 +0000 wordpad: Pass the correct window to the font size list validator. (cherry picked from commit 39538f91f5d396cf4b721086ddddb08a38bc18d1) --- programs/wordpad/wordpad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8468148..1da6a27 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2016,7 +2016,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam) on_fontlist_modified(endEdit->szText); } else if (pHdr->hwndFrom == hwndSizeList) { - on_sizelist_modified(hwndFontList,endEdit->szText); + on_sizelist_modified(hwndSizeList,endEdit->szText); } } return 0;

1 0

Austin English : apphelp: Add a stub for ShimFlushCache.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: b278116f373bd2b2dbcf9915698a8d6636cad27f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b278116f373bd2b2dbcf99156… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 2 15:58:46 2013 -0800 apphelp: Add a stub for ShimFlushCache. (cherry picked from commit 58bb2608859488a618267a8ed904b61b182cbecb) --- dlls/apphelp/apphelp.c | 7 +++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index a82bc94..e8fce78 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -74,3 +74,10 @@ BOOL WINAPI ApphelpCheckShellObject( REFCLSID clsid, BOOL shim, ULONGLONG *flags if (flags) *flags = 0; return TRUE; } + +BOOL WINAPI ShimFlushCache( HWND hwnd, HINSTANCE instance, LPCSTR cmdline, int cmd ) +{ + FIXME("stub: %p %p %s %u\n", hwnd, instance, debugstr_a(cmdline), cmd); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return TRUE; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index 76af9ad..60d931c 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -164,4 +164,4 @@ @ stub SetPermLayers @ stub ShimDbgPrint @ stub ShimDumpCache -@ stub ShimFlushCache +@ stdcall ShimFlushCache(ptr ptr str long)

1 0

Stefan Leichter : dbghelp: Add a null check for optional output parameter for function SymFromAddr.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 1cfe8fb3b2dacdd2e051d5dfd68cc3a11b4b6b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfe8fb3b2dacdd2e051d5dfd… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Dec 1 22:07:20 2013 +0100 dbghelp: Add a null check for optional output parameter for function SymFromAddr. (cherry picked from commit 89832cde4eb2e8d2dc9570cf4840fcaff19b8429) --- dlls/dbghelp/symbol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index ebc4644..26a8bec 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1229,7 +1229,8 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, if ((sym = symt_find_nearest(pair.effective, Address)) == NULL) return FALSE; symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); - *Displacement = Address - Symbol->Address; + if (Displacement) + *Displacement = Address - Symbol->Address; return TRUE; }

1 0