wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Nikolay Sivov : dmscript: Implement GetClassID() for IDirectMusicTrack.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 52251ac6da29c261501029c8868368c37840a69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=52251ac6da29c261501029c88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:07:00 2015 +0300 dmscript: Implement GetClassID() for IDirectMusicTrack. --- dlls/dmscript/scripttrack.c | 12 ++++++++++-- dlls/dmscript/tests/dmscript.c | 8 ++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index ddae8b5..bc8e8ce 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -264,7 +264,15 @@ static ULONG WINAPI IPersistStreamImpl_Release(IPersistStream *iface) static HRESULT WINAPI IPersistStreamImpl_GetClassID(IPersistStream *iface, CLSID *pClassID) { - return E_NOTIMPL; + DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); + + TRACE("(%p, %p)\n", This, pClassID); + + if (!pClassID) + return E_POINTER; + + *pClassID = This->desc.guidClass; + return S_OK; } static HRESULT WINAPI IPersistStreamImpl_IsDirty(IPersistStream *iface) @@ -319,7 +327,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->IPersistStream_iface.lpVtbl = &persist_vtbl; track->desc.dwSize = sizeof(track->desc); - track->desc.dwValidData |= DMUS_OBJ_CLASS; + track->desc.dwValidData = DMUS_OBJ_CLASS; track->desc.guidClass = CLSID_DirectMusicScriptTrack; track->ref = 1; diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 59858d5..82e874c 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -217,9 +217,13 @@ static void test_scripttrack(void) /* IPersistStream */ hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + + hr = IPersistStream_GetClassID(ps, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); - todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicScriptTrack), + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicScriptTrack), "Expected class CLSID_DirectMusicScriptTrack got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */

1 0

Nikolay Sivov : dwrite: Add cluster metrics entry for inline objects too.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: b16432f2c293e6f122ebf83cc893152ca2e3714d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16432f2c293e6f122ebf83cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:05:52 2015 +0300 dwrite: Add cluster metrics entry for inline objects too. --- dlls/dwrite/layout.c | 172 +++++++++++++++++++++++++++++---------------- dlls/dwrite/tests/layout.c | 12 ++-- 2 files changed, 115 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b16432f2c293e6f122ebf…

1 0

Mark Harmstone : include: Add MUI constants to winnls.h.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 547fcead1ffce42ab4831510c4e3e4f9d5fa48b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547fcead1ffce42ab4831510c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Apr 3 12:12:02 2015 +0100 include: Add MUI constants to winnls.h. --- include/winnls.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index 3dacc09..b1ce0cd 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -574,6 +574,36 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define IDN_ALLOW_UNASSIGNED 0x1 #define IDN_USE_STD3_ASCII_RULES 0x2 +/* MUI defines. */ +#define MUI_LANGUAGE_ID 0x04 +#define MUI_LANGUAGE_NAME 0x08 +#define MUI_MERGE_SYSTEM_FALLBACK 0x10 +#define MUI_MERGE_USER_FALLBACK 0x20 +#define MUI_UI_FALLBACK MUI_MERGE_SYSTEM_FALLBACK | MUI_MERGE_USER_FALLBACK +#define MUI_THREAD_LANGUAGES 0x40 +#define MUI_CONSOLE_FILTER 0x100 +#define MUI_COMPLEX_SCRIPT_FILTER 0x200 +#define MUI_RESET_FILTERS 0x001 +#define MUI_USER_PREFERRED_UI_LANGUAGES 0x10 +#define MUI_USE_INSTALLED_LANGUAGES 0x20 +#define MUI_USE_SEARCH_ALL_LANGUAGES 0x40 +#define MUI_LANG_NEUTRAL_PE_FILE 0x100 +#define MUI_NON_LANG_NEUTRAL_FILE 0x200 +#define MUI_MACHINE_LANGUAGE_SETTINGS 0x400 +#define MUI_FILETYPE_NOT_LANGUAGE_NEUTRAL 0x001 +#define MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN 0x002 +#define MUI_FILETYPE_LANGUAGE_NEUTRAL_MUI 0x004 +#define MUI_QUERY_TYPE 0x001 +#define MUI_QUERY_CHECKSUM 0x002 +#define MUI_QUERY_LANGUAGE_NAME 0x004 +#define MUI_QUERY_RESOURCE_TYPES 0x008 +#define MUI_FILEINFO_VERSION 0x001 +#define MUI_FULL_LANGUAGE 0x01 +#define MUI_PARTIAL_LANGUAGE 0x02 +#define MUI_LIP_LANGUAGE 0x04 +#define MUI_LANGUAGE_INSTALLED 0x20 +#define MUI_LANGUAGE_LICENSED 0x40 + /* Types */

1 0

Sebastian Lackner : kernel32: Fix calculation of returned buffer in get_registry_locale_info.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 51c21cca9848d65948d14bd70ddf37ca2e2faf83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c21cca9848d65948d14bd70… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 3 14:25:57 2015 +0200 kernel32: Fix calculation of returned buffer in get_registry_locale_info. Fixes a regression introduced by 8826ba1bc86fefa22c543608585ae8f3b4310a5f. --- dlls/kernel32/locale.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index afc5b9d..7798b91 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1177,6 +1177,17 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size ); + /* try again with a bigger buffer when we have to return the correct size */ + if (status == STATUS_BUFFER_OVERFLOW && !buffer && size > info_size) + { + KEY_VALUE_PARTIAL_INFORMATION *new_info; + if ((new_info = HeapReAlloc( GetProcessHeap(), 0, info, size ))) + { + info = new_info; + status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size ); + } + } + NtClose( hkey ); if (!status) @@ -1207,8 +1218,6 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS if (status == STATUS_BUFFER_OVERFLOW && !buffer) { ret = (size - info_size) / sizeof(WCHAR); - if (!ret || ((WCHAR *)&info->Data)[ret-1]) - ret++; } else if (status == STATUS_OBJECT_NAME_NOT_FOUND) {

1 0

Sebastian Lackner : include: Automatically detect if tests are running under Wine when WINETEST_PLATFORM is not specified.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 61b8a189c531ab1712039355267c45fca5b5d032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b8a189c531ab17120393552… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Nov 23 22:50:34 2014 +0100 include: Automatically detect if tests are running under Wine when WINETEST_PLATFORM is not specified. --- include/wine/test.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index f8b608f..567229a 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -618,6 +618,14 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) return EXCEPTION_EXECUTE_HANDLER; } +/* check if we're running under wine */ +static BOOL running_under_wine(void) +{ + HMODULE module = GetModuleHandleA( "ntdll.dll" ); + if (!module) return FALSE; + return (GetProcAddress( module, "wine_server_call" ) != NULL); +} + #ifdef __GNUC__ void _fpreset(void) {} /* override the mingw fpu init code */ #endif @@ -632,7 +640,11 @@ int main( int argc, char **argv ) winetest_argc = argc; winetest_argv = argv; - if (GetEnvironmentVariableA( "WINETEST_PLATFORM", p, sizeof(p) )) winetest_platform = strdup(p); + if (GetEnvironmentVariableA( "WINETEST_PLATFORM", p, sizeof(p) )) + winetest_platform = strdup(p); + else if (running_under_wine()) + winetest_platform = "wine"; + if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p);

1 0

Andrew Eikum : gdiplus: Avoid unnecessary pre-multiplied alpha conversions in GdipDrawImagePointsRect.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 1d5914b77784de4118f4df3f6de6c6792b104b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5914b77784de4118f4df3f6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 3 14:26:35 2015 -0500 gdiplus: Avoid unnecessary pre-multiplied alpha conversions in GdipDrawImagePointsRect. We can avoid doing a pre-multiplied alpha conversion by detecting whether we need to perform any graphics operations ahead of time. --- dlls/gdiplus/gdiplus_private.h | 20 +++++++++++++ dlls/gdiplus/graphics.c | 66 ++++++++++++++++++++++++++++-------------- 2 files changed, 65 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d5914b77784de4118f4d…

1 0

Alexandre Julliard : ws2_32: Include wsnwlink.h even without IPX support.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 125b079f6015686d23982ea3e58580758a393cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=125b079f6015686d23982ea3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 4 11:55:32 2015 +0900 ws2_32: Include wsnwlink.h even without IPX support. --- dlls/ws2_32/socket.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 09c8416..d8d724b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -146,6 +146,7 @@ #include "ws2tcpip.h" #include "ws2spi.h" #include "wsipx.h" +#include "wsnwlink.h" #include "wshisotp.h" #include "mstcpip.h" #include "af_irda.h" @@ -157,10 +158,6 @@ #include "wine/exception.h" #include "wine/unicode.h" -#ifdef HAS_IPX -# include "wsnwlink.h" -#endif - #if defined(linux) && !defined(IP_UNICAST_IF) #define IP_UNICAST_IF 50 #endif

1 0

Alexandre Julliard : Wine release 1.7.40
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: website Branch: master Commit: 5029e9d69eacc18b4de8ccd39b4790ef6f6c216f URL: http://source.winehq.org/git/website.git/?a=commit;h=5029e9d69eacc18b4de8cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 22:58:22 2015 +0900 Wine release 1.7.40 --- news/en/2015040301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2015040301.xml b/news/en/2015040301.xml new file mode 100644 index 0000000..036e32d --- /dev/null +++ b/news/en/2015040301.xml @@ -0,0 +1,18 @@ +<news> +<date>April 3, 2015</date> +<title>Wine 1.7.40 Released</title> +<body> + The Wine development release 1.7.40 is now available. + <a href="{$root}/announce/1.7.40">What's new</a> in this release: +<ul> + <li>Support for kernel job objects.</li> + <li>Various fixes to the ListView control.</li> + <li>Better support for OOB data in Windows Sockets.</li> + <li>Support for DIB images in the OLE data cache.</li> + <li>Improved support for MSI patches.</li> + <li>Some fixes for ACL file permissions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.40.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.40 : Alexandre Julliard : Release 1.7.40
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: wine Branch: refs/tags/wine-1.7.40 Tag: 63539596fdc3c7381b9856dde20c99f740b6d9ae URL: http://source.winehq.org/git/wine.git/?a=tag;h=63539596fdc3c7381b9856dde20c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 22:56:34 2015 +0900 Release 1.7.40

1 0

Alexandre Julliard : Release 1.7.40.
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: wine Branch: master Commit: 22b6a2c01d8551a8fb753bc41eb36ad370840176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b6a2c01d8551a8fb753bc41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 22:56:33 2015 +0900 Release 1.7.40. --- ANNOUNCE | 865 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 444 insertions(+), 445 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22b6a2c01d8551a8fb753…

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
46
Older →

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 April 2015