January 2014 - Wine-Commits

Austin English : dinput: Consistently use GetCurrentTime().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 9d44303a2963bdcd4a2c6ae107e248f2fdfef9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d44303a2963bdcd4a2c6ae10… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 10 16:45:28 2013 -0800 dinput: Consistently use GetCurrentTime(). (cherry picked from commit bfafb1ffc5a102966025b5b9f3acb81fea5435d1) --- dlls/dinput/joystick_linux.c | 3 +-- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/keyboard.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index d973a84..dc6e9e3 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -689,8 +689,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) } } if (inst_id >= 0) - queue_event(iface, inst_id, - value, jse.time, This->generic.base.dinput->evsequence++); + queue_event(iface, inst_id, value, GetCurrentTime(), This->generic.base.dinput->evsequence++); } } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 5d1cacc..23d8d45 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -873,7 +873,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) } if (inst_id >= 0) queue_event(iface, inst_id, - value, ie.time.tv_usec, This->generic.base.dinput->evsequence++); + value, GetCurrentTime(), This->generic.base.dinput->evsequence++); } } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index e8e7515..a5967d7 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -126,7 +126,7 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM EnterCriticalSection(&This->base.crit); queue_event(iface, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON, - new_diks, hook->time, This->base.dinput->evsequence++); + new_diks, GetCurrentTime(), This->base.dinput->evsequence++); LeaveCriticalSection(&This->base.crit); return ret;

1 0

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

Jan. 10, 2014

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

Austin English : apphelp: Add a stub for ShimFlushCache.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

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 Jan. 10, 2014

Jan. 10, 2014

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

Nikolay Sivov : qmgr: Implement IBackgroundCopyManager::GetJob().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 85d317bf195f6d470076fc7ad9dd7209390a7888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d317bf195f6d470076fc7ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 25 10:43:29 2013 +0400 qmgr: Implement IBackgroundCopyManager::GetJob(). (cherry picked from commit 421a26a9a855b36f1f92bd30db892afcffced048) --- dlls/qmgr/qmgr.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index bb66410..adbc94b 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -74,10 +74,34 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob(IBackgroundCopyManag } static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob(IBackgroundCopyManager *iface, - REFGUID jobID, IBackgroundCopyJob **ppJob) + REFGUID jobID, IBackgroundCopyJob **job) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyManagerImpl *qmgr = &globalMgr; + HRESULT hr = BG_E_NOT_FOUND; + BackgroundCopyJobImpl *cur; + + TRACE("(%s %p)\n", debugstr_guid(jobID), job); + + if (!job || !jobID) return E_INVALIDARG; + + *job = NULL; + + EnterCriticalSection(&qmgr->cs); + + LIST_FOR_EACH_ENTRY(cur, &qmgr->jobs, BackgroundCopyJobImpl, entryFromQmgr) + { + if (IsEqualGUID(&cur->jobId, jobID)) + { + *job = (IBackgroundCopyJob*)&cur->IBackgroundCopyJob2_iface; + IBackgroundCopyJob2_AddRef(&cur->IBackgroundCopyJob2_iface); + hr = S_OK; + break; + } + } + + LeaveCriticalSection(&qmgr->cs); + + return hr; } static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs(IBackgroundCopyManager *iface,

1 0

Hans Leidekker : msi: Don't add text to the scrollable text control twice.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 788ba3345e98f82352c02ce67c04508923dd55bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=788ba3345e98f82352c02ce67… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 19 13:36:10 2013 +0100 msi: Don't add text to the scrollable text control twice. (cherry picked from commit f222582af6806bdd0aaab954bc87457b297647db) --- dlls/msi/dialog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5347005..d78b721 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -739,12 +739,13 @@ static msi_control *msi_dialog_add_control( msi_dialog *dialog, MSIRECORD *rec, LPCWSTR szCls, DWORD style ) { DWORD attributes; - LPCWSTR text, name; + const WCHAR *text = NULL, *name, *control_type; DWORD exstyle = 0; name = MSI_RecordGetString( rec, 2 ); + control_type = MSI_RecordGetString( rec, 3 ); attributes = MSI_RecordGetInteger( rec, 8 ); - text = MSI_RecordGetString( rec, 10 ); + if (strcmpW( control_type, szScrollableText )) text = MSI_RecordGetString( rec, 10 ); TRACE("%s, %s, %08x, %s, %08x\n", debugstr_w(szCls), debugstr_w(name), attributes, debugstr_w(text), style);

1 0

Detlef Riekenberg : tools: make_authors is no longer used.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 76ee2bdec72f7546fbac3e3dbbed121600490e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ee2bdec72f7546fbac3e3db… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 19 16:39:44 2013 +0100 tools: make_authors is no longer used. (cherry picked from commit b87b9f04d7b07be6d5715c58ace47b699c5ac30d) --- tools/make_authors | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/tools/make_authors b/tools/make_authors deleted file mode 100755 index eeaba02..0000000 --- a/tools/make_authors +++ /dev/null @@ -1,51 +0,0 @@ -#! /usr/bin/perl -w -# -# Generate AUTHORS -# -# Copyright 1998 Alexandre Julliard -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -# -use strict; - -my @authors; -open(AUTHORS,"<AUTHORS") or die "Can't open AUTHORS"; -open(NEWAUTHORS,">AUTHORS.new") or die "Can't open AUTHORS.new"; -while(<AUTHORS>) - { - print NEWAUTHORS; - last if /^$/; - } -while(<AUTHORS>) - { - chop; - push @authors, $_; - } - -# Sort them -sub cmpnames() - { - my @anames = split(" ",$a); - my @bnames = split(" ",$b); - my $ret; - $ret = $anames[-1] cmp $bnames[-1]; - $ret = $anames[0] cmp $bnames[0] unless $ret; - return $ret; - } -(a)authors = sort cmpnames @authors; - -# Print authors -print NEWAUTHORS (join "\n", @authors) . "\n"; -print "Created AUTHORS.new\n";

1 0

Nikolay Sivov : server: Return key name info for KeyNameInformation class.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 7a41c9890d0dceb83008129d568fcbbba357492a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a41c9890d0dceb83008129d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 19 08:40:49 2013 +0400 server: Return key name info for KeyNameInformation class. (cherry picked from commit 56aa5d8a5f805fb21c9d91a0cc945351a8b78acf) --- server/registry.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/registry.c b/server/registry.c index fb9c06d..1436bfe 100644 --- a/server/registry.c +++ b/server/registry.c @@ -886,6 +886,7 @@ static void enum_key( const struct key *key, int index, int info_class, switch(info_class) { case KeyBasicInformation: + case KeyNameInformation: classlen = 0; /* only return the name */ /* fall through */ case KeyNodeInformation:

1 0

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

Jan. 10, 2014

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

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

Jan. 10, 2014

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