wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Gerald Pfeifer : dbghelp: Avoid unconditional use of NT_GNU_BUILD_ID.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 6cb7cd1983496216092d011fe00b2fb80db79bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb7cd1983496216092d011fe… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jun 3 15:27:52 2012 +0400 dbghelp: Avoid unconditional use of NT_GNU_BUILD_ID. --- dlls/dbghelp/elf_module.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 80352bc..52060e0 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -56,6 +56,10 @@ #define ELF_INFO_MODULE 0x0002 #define ELF_INFO_NAME 0x0004 +#ifndef NT_GNU_BUILD_ID +#define NT_GNU_BUILD_ID 3 +#endif + WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); struct elf_info

1 0

André Hentschel : ntdll: Get the unix tid on DragonFly BSD.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 4c44e151bee80973bd3bf20de78da756528e4b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c44e151bee80973bd3bf20de… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 2 18:55:04 2012 +0200 ntdll: Get the unix tid on DragonFly BSD. --- dlls/ntdll/server.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 8a01d22..392668d 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -955,6 +955,8 @@ static int get_unix_tid(void) long lwpid; thr_self( &lwpid ); ret = lwpid; +#elif defined(__DragonFly__) + ret = lwp_gettid(); #endif return ret; }

1 0

André Hentschel : ntdll: Change default COM device for FreeBSD 8.0.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 1b1af341733cda0430b38f21b3360bb2787ee25a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1af341733cda0430b38f21b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 2 18:54:49 2012 +0200 ntdll: Change default COM device for FreeBSD 8.0. --- dlls/ntdll/directory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 1b60fbe..329e063 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -314,10 +314,10 @@ static char *get_default_com_device( int num ) ret[strlen(ret) - 1] = '0' + num - 1; } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuad0") ); + ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuau0") ); if (ret) { - strcpy( ret, "/dev/cuad0" ); + strcpy( ret, "/dev/cuau0" ); ret[strlen(ret) - 1] = '0' + num - 1; } #elif defined(__DragonFly__)

1 0

André Hentschel : ntdll: Add default COM device for DragonFly BSD.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 1748f0de4ed44beac8a80079c67c2bc2b8c80e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1748f0de4ed44beac8a80079c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 2 18:54:10 2012 +0200 ntdll: Add default COM device for DragonFly BSD. --- dlls/ntdll/directory.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index a048e1d..1b60fbe 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -320,6 +320,13 @@ static char *get_default_com_device( int num ) strcpy( ret, "/dev/cuad0" ); ret[strlen(ret) - 1] = '0' + num - 1; } +#elif defined(__DragonFly__) + ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuaa0") ); + if (ret) + { + strcpy( ret, "/dev/cuaa0" ); + ret[strlen(ret) - 1] = '0' + num - 1; + } #else FIXME( "no known default for device com%d\n", num ); #endif

1 0

André Hentschel : ntdll: Enhance FreeBSD checks to also check for DragonFly BSD when appropriate.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 1013d2e75c33d1c990e01d3fc9b03a3c1c6578e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1013d2e75c33d1c990e01d3fc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 2 18:53:57 2012 +0200 ntdll: Enhance FreeBSD checks to also check for DragonFly BSD when appropriate. --- dlls/ntdll/directory.c | 4 ++-- dlls/ntdll/file.c | 4 ++-- dlls/ntdll/nt.c | 2 +- dlls/ntdll/signal_i386.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 65c8b8f..a048e1d 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -486,7 +486,7 @@ static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) } #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include <fstab.h> static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) { @@ -587,7 +587,7 @@ static char *get_default_drive_device( const char *root ) } RtlLeaveCriticalSection( &dir_section ); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) || defined(__DragonFly__) char *device = NULL; int fd, res = -1; struct stat st; diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 8e48602..e54b42a 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2267,7 +2267,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC } -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) /* helper for FILE_GetDeviceInfo to hide some platform differences in fstatfs */ static inline void get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, const char *fstypename, unsigned int flags ) @@ -2388,7 +2388,7 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; break; } -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__APPLE__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) struct statfs stfs; if (fstatfs( fd, &stfs ) < 0) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3ed8038..b90672b 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1159,7 +1159,7 @@ void fill_cpu_info(void) fclose(f); } } -#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) { int ret, num; size_t len; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 3b07e77..4a83a70 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -420,7 +420,7 @@ extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context ); enum i386_trap_code { TRAP_x86_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */ -#if defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) TRAP_x86_DIVIDE = T_DIVIDE, /* Division by zero exception */ TRAP_x86_TRCTRAP = T_TRCTRAP, /* Single-step exception */ TRAP_x86_NMI = T_NMI, /* NMI interrupt */

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 1f6d078e1bb866f2bff35d98e255e6568b8a2304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6d078e1bb866f2bff35d98e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 2 10:35:21 2012 +0200 Assorted spelling fixes. --- dlls/d3dcompiler_43/hlsl.y | 2 +- dlls/d3drm/tests/d3drm.c | 4 ++-- dlls/shell32/dde.c | 4 ++-- dlls/shell32/shfldr_unixfs.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5691848..c9aa94c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -71,7 +71,7 @@ hlsl_prog: /* empty */ preproc_directive: PRE_LINE STRING { - TRACE("Updating line informations to file %s, line %u\n", debugstr_a($2), $1); + TRACE("Updating line information to file %s, line %u\n", debugstr_a($2), $1); hlsl_ctx.line_no = $1 - 1; d3dcompiler_free(hlsl_ctx.source_file); hlsl_ctx.source_file = $2; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 69aff86..0cc9c83 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -214,7 +214,7 @@ static void test_MeshBuilder(void) size = sizeof(name); hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); - ok(!strcmp(name, "Object"), "Retreived name '%s' instead of 'Object'\n", name); + ok(!strcmp(name, "Object"), "Retrieved name '%s' instead of 'Object'\n", name); size = strlen("Object"); /* No space for null character */ hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); ok(hr == E_INVALIDARG, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); @@ -229,7 +229,7 @@ static void test_MeshBuilder(void) size = sizeof(name); hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); - ok(!strcmp(name, ""), "Retreived name '%s' instead of ''\n", name); + ok(!strcmp(name, ""), "Retrieved name '%s' instead of ''\n", name); val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder); ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val); diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 144470b..c44f05d 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -86,8 +86,8 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, { static BYTE groups_data[] = "\r\n"; FIXME( "returning empty groups list\n" ); - /* this is an workaround for an app wich expect some data - * and cant handle NULL. */ + /* This is a workaround for an application which expects some data + * and cannot handle NULL. */ return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszProgmanService, uFmt, 0 ); } FIXME( "%u %p %s %s: stub\n", uFmt, hconv, debugstr_hsz(hszTopic), debugstr_hsz(hszItem) ); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index b90fdfa..3f9e57c 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -519,7 +519,7 @@ static char* UNIXFS_build_shitemid(char *pszUnixPath, BOOL bMustExist, WIN32_FIN FileStructW *pFileStructW; WORD uOffsetW, *pOffsetW; - TRACE("(pszUnixPath=%s, bMustExsist=%s, pFindData=%p, pIDL=%p)\n", + TRACE("(pszUnixPath=%s, bMustExist=%s, pFindData=%p, pIDL=%p)\n", debugstr_a(pszUnixPath), bMustExist ? "T" : "F", pFindData, pIDL); if (pFindData) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 9b94d7a..46ce23e 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -488,7 +488,7 @@ static DWORD WINAPI QTSplitter_loading_thread(LPVOID data) /* according to QA1469 a movie has to be fully loaded before we can reliably start the Extraction session. - If loaded earlier then we only get an extraction session for + If loaded earlier, then we only get an extraction session for the part of the movie that is loaded at that time. We are trying to load as much of the movie as we can before we

1 0

Francois Gouget : msvcp90: Add a trailing '\n' to a TRACE() message.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: fd84b7d0af2da4adce98b48f2c5349a3bab37004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd84b7d0af2da4adce98b48f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 2 10:35:35 2012 +0200 msvcp90: Add a trailing '\n' to a TRACE() message. --- dlls/msvcp90/ios.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a436abf..c903acf 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2418,7 +2418,7 @@ void __thiscall basic_ios_char_dtor(basic_ios_char *this) DEFINE_THISCALL_WRAPPER(MSVCP_basic_ios_char_vector_dtor, 8) basic_ios_char* __thiscall MSVCP_basic_ios_char_vector_dtor(basic_ios_char *this, unsigned int flags) { - TRACE("(%p %x)", this, flags); + TRACE("(%p %x)\n", this, flags); if(flags & 2) { /* we have an array, with the number of elements stored before the first object */ int i, *ptr = (int *)this-1;

1 0

Francois Gouget : wineqtdecoder: Fix the spelling of a QTSplitter_loading_thread() variable.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 457f7228697cf7a27d2866300012ddec5d3c3847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=457f7228697cf7a27d2866300… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 2 10:35:29 2012 +0200 wineqtdecoder: Fix the spelling of a QTSplitter_loading_thread() variable. --- dlls/wineqtdecoder/qtdatahandler.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index f09014c..be003c3 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -443,12 +443,12 @@ static pascal ComponentResult myDataHGetFileSizeAsync ( DataHandler dh, wide *fi Handle storage = GetComponentInstanceStorage(dh); DHData *data = (DHData*)*storage; LONGLONG total; - LONGLONG avaliable; + LONGLONG available; SInt64 total64; TRACE("%p\n",dh); - IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); + IAsyncReader_Length(data->dataRef.pReader,&total,&available); total64 = total; *fileSize = SInt64ToWide(total64);

1 0

Dmitry Timoshkov : gdi32: Fix parameters of some GDI stock fonts.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: cca41207c161250d709ae3f8e0b002ac5c794de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca41207c161250d709ae3f8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 4 12:05:25 2012 +0900 gdi32: Fix parameters of some GDI stock fonts. --- dlls/gdi32/gdiobj.c | 140 +++++++++++++++++++++++----------------------- dlls/gdi32/tests/font.c | 81 +++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cca41207c161250d709ae…

1 0

Daniel Jelinski : regedit: Adding new subkey to a key with no subkeys now works with native comctl32.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 1565def7b9ae5feacfd93de4d2456ecc39eb705c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1565def7b9ae5feacfd93de4d… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Jun 2 08:46:40 2012 +0200 regedit: Adding new subkey to a key with no subkeys now works with native comctl32. --- programs/regedit/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 7c5e76d..97a0bf2 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -483,7 +483,7 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name) if (!hItem) hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); if (!hItem) return FALSE; - if (SendMessageW(hwndTV, TVM_GETITEMSTATE, (WPARAM)hItem, TVIS_EXPANDEDONCE)) { + if (SendMessageW(hwndTV, TVM_GETITEMSTATE, (WPARAM)hItem, TVIS_EXPANDEDONCE) & TVIS_EXPANDEDONCE) { hNewItem = AddEntryToTree(hwndTV, hItem, name, 0, 0); } else { item.mask = TVIF_CHILDREN | TVIF_HANDLE;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012