April 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : makefiles: Don't link against libport in the tests.
by Alexandre Julliard April 9, 2013

April 9, 2013

Module: wine Branch: master Commit: c8ada1fc0663f77f3790babc51c3872ed7d7a4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ada1fc0663f77f3790babc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 15:25:56 2013 +0200 makefiles: Don't link against libport in the tests. --- Maketest.rules.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Maketest.rules.in b/Maketest.rules.in index 828c375..4ee50a0 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -30,10 +30,10 @@ MAKEDEPFLAGS = -xo -xcross.o all: $(TESTPROGRAM) $(WINETEST_RES) $(MODULE) $(MODULE).so: $(OBJS) Makefile.in - $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(LIBPORT) $(ALL_LIBS) + $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(WINETEST_EXE): $(OBJS) Makefile.in - $(WINEGCC) -s -Wb,-F,$(MODULE) $(APPMODE) $(OBJS) -o $@ $(LIBPORT) $(ALL_LIBS) + $(WINEGCC) -s -Wb,-F,$(MODULE) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(WINETEST_RES): $(WINETEST_EXE) echo "$(MODULE) TESTRES \"$(WINETEST_EXE)\"" | $(LDPATH) $(WRC) $(RCFLAGS) -o $@

1 0

Kim Jung Eon : wbemprox: Implement some properties of Win32_ComputerSystem and Win32_DiskPartition.
by Alexandre Julliard April 9, 2013

April 9, 2013

Module: wine Branch: master Commit: a9b2ce2c97411fe5e9d047957d674719333f480e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9b2ce2c97411fe5e9d047957… Author: Kim Jung Eon <admin(a)mog422.net> Date: Mon Apr 8 17:21:29 2013 +0900 wbemprox: Implement some properties of Win32_ComputerSystem and Win32_DiskPartition. --- dlls/wbemprox/builtin.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f48eaff..8b3e3c3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -85,6 +85,8 @@ static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_bootableW[] = {'B','o','o','t','a','b','l','e',0}; +static const WCHAR prop_bootpartitionW[] = + {'B','o','o','t','P','a','r','t','i','t','i','o','n',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR prop_classW[] = @@ -239,6 +241,7 @@ static const struct column col_compsys[] = { prop_domainroleW, CIM_UINT16 }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 } @@ -246,6 +249,7 @@ static const struct column col_compsys[] = static const struct column col_diskdrive[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, + { prop_indexW, CIM_UINT32, VT_I4 }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_serialnumberW, CIM_STRING } @@ -253,6 +257,7 @@ static const struct column col_diskdrive[] = static const struct column col_diskpartition[] = { { prop_bootableW, CIM_BOOLEAN }, + { prop_bootpartitionW, CIM_BOOLEAN }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_diskindexW, CIM_UINT32, VT_I4 }, { prop_indexW, CIM_UINT32, VT_I4 }, @@ -409,6 +414,8 @@ static const WCHAR diskdrive_modelW[] = {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; static const WCHAR diskdrive_manufacturerW[] = {'(','S','t','a','n','d','a','r','d',' ','d','i','s','k',' ','d','r','i','v','e','s',')',0}; +static const WCHAR diskdrive_serialW[] = + {'W','I','N','E','H','D','I','S','K',0}; static const WCHAR networkadapter_pnpdeviceidW[]= {'P','C','I','\\','V','E','N','_','8','0','8','6','&','D','E','V','_','1','0','0','E','&', 'S','U','B','S','Y','S','_','0','0','1','E','8','0','8','6','&','R','E','V','_','0','2','\\', @@ -456,6 +463,7 @@ struct record_computersystem UINT16 domainrole; const WCHAR *manufacturer; const WCHAR *model; + const WCHAR *name; UINT32 num_logical_processors; UINT32 num_processors; UINT64 total_physical_memory; @@ -463,6 +471,7 @@ struct record_computersystem struct record_diskdrive { const WCHAR *device_id; + UINT32 index; const WCHAR *manufacturer; const WCHAR *name; const WCHAR *serialnumber; @@ -470,6 +479,7 @@ struct record_diskdrive struct record_diskpartition { int bootable; + int bootpartition; const WCHAR *device_id; UINT32 diskindex; UINT32 index; @@ -600,7 +610,7 @@ static const struct record_bios data_bios[] = }; static const struct record_diskdrive data_diskdrive[] = { - { diskdrive_deviceidW, diskdrive_manufacturerW, diskdrive_modelW } + { diskdrive_deviceidW, 0, diskdrive_manufacturerW, diskdrive_modelW, diskdrive_serialW } }; static const struct record_param data_param[] = { @@ -726,6 +736,16 @@ static UINT64 get_total_physical_memory(void) return status.ullTotalPhys; } +static WCHAR *get_computername(void) +{ + WCHAR *ret; + DWORD size=MAX_COMPUTERNAME_LENGTH; + + if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) return NULL; + GetComputerNameW( ret, &size ); + return ret; +} + static void fill_compsys( struct table *table ) { struct record_computersystem *rec; @@ -738,6 +758,7 @@ static void fill_compsys( struct table *table ) rec->domainrole = 0; /* standalone workstation */ rec->manufacturer = compsys_manufacturerW; rec->model = compsys_modelW; + rec->name = get_computername(); rec->num_logical_processors = get_logical_processor_count(); rec->num_processors = get_processor_count(); rec->total_physical_memory = get_total_physical_memory(); @@ -807,6 +828,7 @@ static void fill_diskpartition( struct table *table ) } rec = (struct record_diskpartition *)(table->data + offset); rec->bootable = (i == 2) ? -1 : 0; + rec->bootpartition = (i == 2) ? -1 : 0; sprintfW( device_id, fmtW, index ); rec->device_id = heap_strdupW( device_id ); rec->diskindex = index;

1 0

Akihiro Sagawa : fonts: Add Japanese FixedSys font.
by Alexandre Julliard April 9, 2013

April 9, 2013

Module: wine Branch: master Commit: c4408e0b621b99115247386e7095231be7e1045d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4408e0b621b99115247386e7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 8 21:55:08 2013 +0900 fonts: Add Japanese FixedSys font. --- fonts/.gitignore | 1 + fonts/Makefile.in | 4 + fonts/fixedsys_jp.sfd | 2301 +++++++++++++++++++++++++++++++++++++++++++++++++ fonts/fixedsys_jp.ttf | Bin 0 -> 7704 bytes tools/sfnt2fnt.c | 6 +- 5 files changed, 2309 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4408e0b621b991152473…

1 0

Alexandre Julliard : libport: Rename spawnvp to _spawnvp to avoid the deprecated name.
by Alexandre Julliard April 9, 2013

April 9, 2013

Module: wine Branch: master Commit: 43ac582d7dd74acd5e1ac91ebecbe302611b298d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ac582d7dd74acd5e1ac91eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 13:50:40 2013 +0200 libport: Rename spawnvp to _spawnvp to avoid the deprecated name. --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 4 ++-- libs/port/spawn.c | 12 +++++------- programs/explorer/desktop.c | 2 +- programs/winebrowser/main.c | 2 +- programs/winemenubuilder/winemenubuilder.c | 4 ++-- programs/winevdm/winevdm.c | 2 +- tools/winebuild/utils.c | 2 +- tools/winegcc/utils.c | 2 +- 11 files changed, 14 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 6997375..8d6d227 100755 --- a/configure +++ b/configure @@ -13066,7 +13066,6 @@ for ac_func in \ sigaltstack \ sigprocmask \ snprintf \ - spawnvp \ statfs \ statvfs \ strcasecmp \ diff --git a/configure.ac b/configure.ac index 080e961..084a2d6 100644 --- a/configure.ac +++ b/configure.ac @@ -2011,7 +2011,6 @@ AC_CHECK_FUNCS(\ sigaltstack \ sigprocmask \ snprintf \ - spawnvp \ statfs \ statvfs \ strcasecmp \ diff --git a/include/config.h.in b/include/config.h.in index 2f30549..0a1d78a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -734,9 +734,6 @@ /* Define to 1 if you have the `socketpair' function. */ #undef HAVE_SOCKETPAIR -/* Define to 1 if you have the `spawnvp' function. */ -#undef HAVE_SPAWNVP - /* Define to 1 if the system has the type `ssize_t'. */ #undef HAVE_SSIZE_T diff --git a/include/wine/port.h b/include/wine/port.h index d6904c0..76a0b3e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -353,8 +353,8 @@ extern int mkstemps(char *template, int suffix_len); # define _P_NOWAITO 3 # define _P_DETACH 4 #endif -#ifndef HAVE_SPAWNVP -extern int spawnvp(int mode, const char *cmdname, const char * const argv[]); +#ifndef HAVE__SPAWNVP +extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); #endif /* Interlocked functions */ diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 0cdc08c..97364e7 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -21,6 +21,8 @@ #include "config.h" #include "wine/port.h" +#ifndef HAVE__SPAWNVP + #include <errno.h> #include <signal.h> #include <stdlib.h> @@ -32,10 +34,8 @@ # include <unistd.h> #endif -#ifndef HAVE_SPAWNVP -int spawnvp(int mode, const char *cmdname, const char *const argv[]) +int _spawnvp(int mode, const char *cmdname, const char *const argv[]) { -#ifndef HAVE__SPAWNVP int pid, status, wret; if (mode == _P_OVERLAY) @@ -93,8 +93,6 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) } return pid; -#else /* HAVE__SPAWNVP */ - return _spawnvp(mode, cmdname, argv); -#endif /* HAVE__SPAWNVP */ } -#endif /* HAVE_SPAWNVP */ + +#endif /* HAVE__SPAWNVP */ diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4c8e599..7cfa0d1 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -45,7 +45,7 @@ static BOOL start_screensaver( void ) if (using_root) { const char *argv[3] = { "xdg-screensaver", "activate", NULL }; - int pid = spawnvp( _P_DETACH, argv[0], argv ); + int pid = _spawnvp( _P_DETACH, argv[0], argv ); if (pid > 0) { WINE_TRACE( "started process %d\n", pid ); diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index ad46b20..22f3a93 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -90,7 +90,7 @@ static int launch_app( WCHAR *candidates, const WCHAR *argv1 ) argv_new[1] = cmdline; argv_new[2] = NULL; - spawnvp( _P_OVERLAY, app, argv_new ); /* only returns on error */ + _spawnvp( _P_OVERLAY, app, argv_new ); /* only returns on error */ app = strtok( NULL, "," ); /* grab the next app */ } WINE_ERR( "could not find a suitable app to run\n" ); diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index c931363..9c81ab8 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3371,11 +3371,11 @@ static void RefreshFileTypeAssociations(void) argv[0] = "update-mime-database"; argv[1] = mime_dir; argv[2] = NULL; - spawnvp( _P_DETACH, argv[0], argv ); + _spawnvp( _P_DETACH, argv[0], argv ); argv[0] = "update-desktop-database"; argv[1] = applications_dir; - spawnvp( _P_DETACH, argv[0], argv ); + _spawnvp( _P_DETACH, argv[0], argv ); } end: diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index d297551..b818d76 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -198,7 +198,7 @@ static void start_dosbox( const char *appname, const char *args ) args[1] = "-conf"; args[2] = config_file; args[3] = NULL; - ret = spawnvp( _P_WAIT, args[0], args ); + ret = _spawnvp( _P_WAIT, args[0], args ); } CloseHandle( file ); DeleteFileW( config ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 40a9afe..1c77e41 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -268,7 +268,7 @@ void spawn( struct strarray *args ) for (i = 0; args->str[i]; i++) fprintf( stderr, "%s%c", args->str[i], args->str[i+1] ? ' ' : '\n' ); - if ((status = spawnvp( _P_WAIT, args->str[0], args->str ))) + if ((status = _spawnvp( _P_WAIT, args->str[0], args->str ))) { if (status > 0) fatal_error( "%s failed with status %u\n", args->str[0], status ); else fatal_perror( "winebuild" ); diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 05b9a65..75fb20b 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -334,7 +334,7 @@ void spawn(const strarray* prefix, const strarray* args, int ignore_errors) printf("\n"); } - if ((status = spawnvp( _P_WAIT, argv[0], argv)) && !ignore_errors) + if ((status = _spawnvp( _P_WAIT, argv[0], argv)) && !ignore_errors) { if (status > 0) error("%s failed\n", argv[0]); else perror("winegcc");

1 0

Akihiro Sagawa : fonts: Add Fixedsys font.
by Alexandre Julliard April 9, 2013

April 9, 2013

Module: wine Branch: master Commit: 6eaa345261fad0e0a0e04f265ce6f731302ed674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eaa345261fad0e0a0e04f265… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 8 21:55:05 2013 +0900 fonts: Add Fixedsys font. --- fonts/.gitignore | 1 + fonts/Makefile.in | 4 + fonts/fixedsys.sfd | 2320 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fonts/fixedsys.ttf | Bin 0 -> 10852 bytes tools/sfnt2fnt.c | 3 + 5 files changed, 2328 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eaa345261fad0e0a0e04…

1 0

Michael Stefaniuc : dplayx: Forward directly to IDirectPlay4 QueryInterface .
by Alexandre Julliard April 9, 2013

April 9, 2013

Module: wine Branch: master Commit: 3147647b4492bbb1b9072bf979b17f0327d78384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3147647b4492bbb1b9072bf97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:20:24 2013 +0200 dplayx: Forward directly to IDirectPlay4 QueryInterface. --- dlls/dplayx/dplay.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index c276dba..67e3c18 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -604,7 +604,7 @@ static HRESULT WINAPI IDirectPlay2AImpl_QueryInterface( IDirectPlay2A *iface, RE void **ppv ) { IDirectPlayImpl *This = impl_from_IDirectPlay2A( iface ); - return IDirectPlayX_QueryInterface( &This->IDirectPlay4A_iface, riid, ppv ); + return IDirectPlayX_QueryInterface( &This->IDirectPlay4_iface, riid, ppv ); } static HRESULT WINAPI IDirectPlay2Impl_QueryInterface( IDirectPlay2 *iface, REFIID riid, @@ -5713,17 +5713,17 @@ HRESULT dplay_create( REFIID riid, void **ppv ) obj->ref2 = 0; obj->ref3A = 0; obj->ref3 = 0; - obj->ref4A = 1; - obj->ref4 = 0; + obj->ref4A = 0; + obj->ref4 = 1; InitializeCriticalSection( &obj->lock ); obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayImpl.lock"); if ( DP_CreateDirectPlay2( obj ) ) - hr = IDirectPlayX_QueryInterface( &obj->IDirectPlay4A_iface, riid, ppv ); + hr = IDirectPlayX_QueryInterface( &obj->IDirectPlay4_iface, riid, ppv ); else hr = DPERR_NOMEMORY; - IDirectPlayX_Release( &obj->IDirectPlay4A_iface ); + IDirectPlayX_Release( &obj->IDirectPlay4_iface ); return hr; }

1 0

Michael Stefaniuc : dplayx: IDirectPlay and IUnknown share a refcount.
by Alexandre Julliard April 9, 2013

April 9, 2013

Module: wine Branch: master Commit: 3b7f969a6bd22e062e388d716fb7f7d9d1dba959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7f969a6bd22e062e388d716… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:19:09 2013 +0200 dplayx: IDirectPlay and IUnknown share a refcount. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/tests/dplayx.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index ac39651..c276dba 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -643,7 +643,7 @@ static HRESULT WINAPI IDirectPlay4Impl_QueryInterface( IDirectPlay4 *iface, REFI if ( IsEqualGUID( &IID_IUnknown, riid ) ) { TRACE( "(%p)->(IID_IUnknown %p)\n", This, ppv ); - *ppv = &This->IDirectPlay4A_iface; + *ppv = &This->IDirectPlay_iface; } else if ( IsEqualGUID( &IID_IDirectPlay, riid ) ) { diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 619425d..0e7aafb 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6367,6 +6367,7 @@ static void test_host_migration(void) static void test_COM(void) { + IDirectPlay *dp; IDirectPlay2A *dp2A; IDirectPlay2 *dp2; IDirectPlay3A *dp3A; @@ -6426,14 +6427,22 @@ static void test_COM(void) ok(refcount == 2, "refcount == %u, expected 2\n", refcount); IDirectPlayX_Release(dp4A); + /* IDirectPlay and IUnknown share a refcount */ + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay, (void**)&dp); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay failed: %08x\n", hr); + refcount = IDirectPlayX_AddRef(dp); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay_Release(dp); + hr = IDirectPlayX_QueryInterface(dp4, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); - todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 3, "refcount == %u, expected 3\n", refcount); refcount = IUnknown_Release(unk); - todo_wine ok(refcount == 1, "refcount == %u, expected 1\n", refcount); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); IUnknown_Release(unk); + IDirectPlay_Release(dp); IDirectPlayX_Release(dp4A); IDirectPlay3_Release(dp3); IDirectPlay3_Release(dp3A);

1 0

Michael Stefaniuc : dplayx: Add a stub IDirectPlay iface.
by Alexandre Julliard April 9, 2013

April 9, 2013

Module: wine Branch: master Commit: de65abb20094f8ce2bce32ddc71a0b999c7fabeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=de65abb20094f8ce2bce32ddc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:17:36 2013 +0200 dplayx: Add a stub IDirectPlay iface. --- dlls/dplayx/dplay.c | 245 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dplayx/dplay_global.h | 3 +- 2 files changed, 247 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de65abb20094f8ce2bce3…

1 0

Ken Thomases : winemac: Handle failure to get clipboard format name; don' t use uninitialized buffer.
by Alexandre Julliard April 9, 2013

April 9, 2013

Module: wine Branch: master Commit: cba4bcb47fee29f993d9b722e1d133a85a019add URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba4bcb47fee29f993d9b722e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 8 15:43:13 2013 -0500 winemac: Handle failure to get clipboard format name; don't use uninitialized buffer. --- dlls/winemac.drv/clipboard.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 6dfb2a2..53b1448 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -292,7 +292,13 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) { WCHAR buffer[256]; - GetClipboardFormatNameW(format->format_id, buffer, 256); + if (!GetClipboardFormatNameW(format->format_id, buffer, sizeof(buffer) / sizeof(buffer[0]))) + { + WARN("failed to get name for format %s; error 0x%08x\n", debugstr_format(format->format_id), GetLastError()); + HeapFree(GetProcessHeap(), 0, format); + return NULL; + } + if (!strncmpW(buffer, mac_type_name_prefix, strlenW(mac_type_name_prefix))) { const WCHAR *p = buffer + strlenW(mac_type_name_prefix);

1 0

Michael Stefaniuc : dplayx/tests: Deal with broken COM aggregation handling on NT4.
by Alexandre Julliard April 9, 2013

April 9, 2013

Module: wine Branch: master Commit: df39c470ed613e7315c0749275c163be997c9b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df39c470ed613e7315c074927… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:16:26 2013 +0200 dplayx/tests: Deal with broken COM aggregation handling on NT4. --- dlls/dplayx/tests/dplayx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 31cddee..619425d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6380,9 +6380,9 @@ static void test_COM(void) /* COM aggregation */ hr = CoCreateInstance(&CLSID_DirectPlay, (IUnknown*)&dp4, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dp4); - ok(hr == CLASS_E_NOAGGREGATION, + ok(hr == CLASS_E_NOAGGREGATION || broken(hr == E_INVALIDARG), "DirectPlay create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); - ok(!dp4, "dp4 = %p\n", dp4); + ok(!dp4 || dp4 == (IDirectPlay4*)0xdeadbeef, "dp4 = %p\n", dp4); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayLobby,

1 0