January 2015 - Wine-commits

Austin English : kernel32: Add GetSystemFirmwareTable stub.
by Alexandre Julliard 26 Jan '15

26 Jan '15

Module: wine Branch: master Commit: fa804252423a4bbc309d38cf6ad50099bb15798f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa804252423a4bbc309d38cf6… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 22 22:49:59 2015 -0600 kernel32: Add GetSystemFirmwareTable stub. --- .../api-ms-win-core-sysinfo-l1-2-0.spec | 2 +- .../api-ms-win-core-sysinfo-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec index 47f4419..d3df6bd 100644 --- a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec +++ b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec @@ -9,7 +9,7 @@ @ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo @ stdcall GetSystemDirectoryA(ptr long) kernel32.GetSystemDirectoryA @ stdcall GetSystemDirectoryW(ptr long) kernel32.GetSystemDirectoryW -@ stub GetSystemFirmwareTable +@ stdcall GetSystemFirmwareTable(long long ptr long) kernel32.GetSystemFirmwareTable @ stdcall GetSystemInfo(ptr) kernel32.GetSystemInfo @ stdcall GetSystemTime(ptr) kernel32.GetSystemTime @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec index 79bfc60..29262c5 100644 --- a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec +++ b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec @@ -11,7 +11,7 @@ @ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo @ stdcall GetSystemDirectoryA(ptr long) kernel32.GetSystemDirectoryA @ stdcall GetSystemDirectoryW(ptr long) kernel32.GetSystemDirectoryW -@ stub GetSystemFirmwareTable +@ stdcall GetSystemFirmwareTable(long long ptr long) kernel32.GetSystemFirmwareTable @ stdcall GetSystemInfo(ptr) kernel32.GetSystemInfo @ stdcall GetSystemTime(ptr) kernel32.GetSystemTime @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bd6d644..71478dc 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -650,6 +650,7 @@ @ stdcall GetSystemDEPPolicy() @ stdcall GetSystemDirectoryA(ptr long) @ stdcall GetSystemDirectoryW(ptr long) +@ stdcall GetSystemFirmwareTable(long long ptr long) @ stdcall GetSystemInfo(ptr) @ stdcall GetSystemPowerStatus(ptr) @ stdcall GetSystemRegistryQuota(ptr ptr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8204dd9..b371e73 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4004,3 +4004,13 @@ HRESULT WINAPI UnregisterApplicationRestart(void) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return S_OK; } + +/*********************************************************************** + * GetSystemFirmwareTable (KERNEL32.@) + */ +UINT WINAPI GetSystemFirmwareTable(DWORD provider, DWORD id, PVOID buffer, DWORD size) +{ + FIXME("(%d %d %p %d):stub\n", provider, id, buffer, size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/include/winbase.h b/include/winbase.h index 3055d5f..561819d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2008,6 +2008,7 @@ WINBASEAPI HANDLE WINAPI GetStdHandle(DWORD); WINBASEAPI UINT WINAPI GetSystemDirectoryA(LPSTR,UINT); WINBASEAPI UINT WINAPI GetSystemDirectoryW(LPWSTR,UINT); #define GetSystemDirectory WINELIB_NAME_AW(GetSystemDirectory) +WINBASEAPI UINT WINAPI GetSystemFirmwareTable(DWORD,DWORD,PVOID,DWORD); WINBASEAPI VOID WINAPI GetSystemInfo(LPSYSTEM_INFO); WINBASEAPI BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS); WINBASEAPI BOOL WINAPI GetSystemRegistryQuota(PDWORD,PDWORD);

1 0

Nikolay Sivov : dwrite: Initial implementation of GetTypographicFeatures() .
by Alexandre Julliard 26 Jan '15

26 Jan '15

Module: wine Branch: master Commit: 6b0623fb2f13a83f6fb35aeab46686c6bf5e35ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0623fb2f13a83f6fb35aeab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 25 21:25:48 2015 +0300 dwrite: Initial implementation of GetTypographicFeatures(). --- dlls/dwrite/analyzer.c | 249 ++++++++++++++++++++++++------------------- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 131 +++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 4 +- 4 files changed, 274 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b0623fb2f13a83f6fb35…

1 0

Nikolay Sivov : dwrite: Make sure we don't have duplicates in locale/ value pairs for font names.
by Alexandre Julliard 26 Jan '15

26 Jan '15

Module: wine Branch: master Commit: 40d9a2b6d234e85d79d599df7dd8ae97e62fad0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d9a2b6d234e85d79d599df7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 26 13:39:18 2015 +0300 dwrite: Make sure we don't have duplicates in locale/value pairs for font names. --- dlls/dwrite/main.c | 20 +++++++++++++++++++- dlls/dwrite/opentype.c | 14 ++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 58273fe..5a2ce2c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -383,14 +383,32 @@ HRESULT create_localizedstrings(IDWriteLocalizedStrings **strings) HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, const WCHAR *string) { struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + UINT32 i; + + /* make sure there's no duplicates */ + for (i = 0; i < This->count; i++) + if (!strcmpW(This->data[i].locale, locale)) + return S_OK; if (This->count == This->alloc) { + void *ptr; + + ptr = heap_realloc(This->data, 2*This->alloc*sizeof(struct localizedpair)); + if (!ptr) + return E_OUTOFMEMORY; + This->alloc *= 2; - This->data = heap_realloc(This->data, This->alloc*sizeof(struct localizedpair)); + This->data = ptr; } This->data[This->count].locale = heap_strdupW(locale); This->data[This->count].string = heap_strdupW(string); + if (!This->data[This->count].locale || !This->data[This->count].string) { + heap_free(This->data[This->count].locale); + heap_free(This->data[This->count].string); + return E_OUTOFMEMORY; + } + This->count++; return S_OK; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8fa5a54..7b3fb1f 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1194,6 +1194,14 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA if (FAILED(hr)) return hr; header = table_data; + + switch (header->format) { + case 0: + break; + default: + FIXME("unsupported NAME format %d\n", header->format); + } + storage_area = (LPBYTE)table_data + GET_BE_WORD(header->stringOffset); count = GET_BE_WORD(header->count); @@ -1219,6 +1227,12 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA continue; } + /* Skip such entries for now, as it's not clear which locale is implied when + unicode platform is used. Also fonts tend to duplicate those strings as + WIN platform entries. */ + if (platform == OPENTYPE_PLATFORM_UNICODE) + continue; + lang_id = GET_BE_WORD(record->languageID); length = GET_BE_WORD(record->length); offset = GET_BE_WORD(record->offset);

1 0

Jacek Caban : mshtml: Added URI_ flags declaration and improved debug traces.
by Alexandre Julliard 26 Jan '15

26 Jan '15

Module: wine Branch: master Commit: e62612b2c37e8fc0eccf5920d6483953cc5bc4db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62612b2c37e8fc0eccf5920d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 26 16:13:31 2015 +0100 mshtml: Added URI_ flags declaration and improved debug traces. --- dlls/mshtml/nsiface.idl | 21 +++++++++++++++++++++ dlls/mshtml/nsio.c | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1d8e263..551406c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2731,6 +2731,27 @@ interface nsIDirectoryServiceProvider2 : nsIDirectoryServiceProvider ] interface nsIProtocolHandler : nsISupports { + const unsigned long URI_STD = 0; + const unsigned long URI_NORELATIVE = (1<<0); + const unsigned long URI_NOAUTH = (1<<1); + const unsigned long ALLOWS_PROXY = (1<<2); + const unsigned long ALLOWS_PROXY_HTTP = (1<<3); + const unsigned long URI_INHERITS_SECURITY_CONTEXT = (1<<4); + const unsigned long URI_FORBIDS_AUTOMATIC_DOCUMENT_REPLACEMENT = (1<<5); + const unsigned long URI_LOADABLE_BY_ANYONE = (1<<6); + const unsigned long URI_DANGEROUS_TO_LOAD = (1<<7); + const unsigned long URI_IS_UI_RESOURCE = (1<<8); + const unsigned long URI_IS_LOCAL_FILE = (1<<9); + const unsigned long URI_LOADABLE_BY_SUBSUMERS = (1<<10); + const unsigned long URI_DOES_NOT_RETURN_DATA = (1<<11); + const unsigned long URI_IS_LOCAL_RESOURCE = (1<<12); + const unsigned long URI_OPENING_EXECUTES_SCRIPT = (1<<13); + const unsigned long URI_NON_PERSISTABLE = (1<<14); + const unsigned long URI_FORBIDS_COOKIE_ACCESS = (1<<15); + const unsigned long URI_CROSS_ORIGIN_NEEDS_WEBAPPS_PERM = (1<<16); + const unsigned long URI_SYNC_LOAD_IS_OK = (1<<17); + const unsigned long URI_SAFE_TO_LOAD_IN_SECURE_CONTEXT = (1<<18); + nsresult GetScheme(nsACString *aScheme); nsresult GetDefaultPort(int32_t *aDefaultPort); nsresult GetProtocolFlags(uint32_t *aProtocolFlags); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d8e1712..44662b5 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3622,18 +3622,48 @@ static nsresult NSAPI nsNetUtil_ParseContentType(nsINetUtil *iface, const nsACSt return nsINetUtil_ParseContentType(net_util, aTypeHeader, aCharset, aHadCharset, aContentType); } +static const char *debugstr_protocol_flags(UINT32 flags) +{ + switch(flags) { +#define X(f) case f: return #f + X(URI_STD); + X(URI_NORELATIVE); + X(URI_NOAUTH); + X(ALLOWS_PROXY); + X(ALLOWS_PROXY_HTTP); + X(URI_INHERITS_SECURITY_CONTEXT); + X(URI_FORBIDS_AUTOMATIC_DOCUMENT_REPLACEMENT); + X(URI_LOADABLE_BY_ANYONE); + X(URI_DANGEROUS_TO_LOAD); + X(URI_IS_UI_RESOURCE); + X(URI_IS_LOCAL_FILE); + X(URI_LOADABLE_BY_SUBSUMERS); + X(URI_DOES_NOT_RETURN_DATA); + X(URI_IS_LOCAL_RESOURCE); + X(URI_OPENING_EXECUTES_SCRIPT); + X(URI_NON_PERSISTABLE); + X(URI_FORBIDS_COOKIE_ACCESS); + X(URI_CROSS_ORIGIN_NEEDS_WEBAPPS_PERM); + X(URI_SYNC_LOAD_IS_OK); + X(URI_SAFE_TO_LOAD_IN_SECURE_CONTEXT); +#undef X + default: + return wine_dbg_sprintf("%08x", flags); + } +} + static nsresult NSAPI nsNetUtil_ProtocolHasFlags(nsINetUtil *iface, nsIURI *aURI, UINT32 aFlags, cpp_bool *_retval) { - TRACE("()\n"); + TRACE("(%p %s %p)\n", aURI, debugstr_protocol_flags(aFlags), _retval); return nsINetUtil_ProtocolHasFlags(net_util, aURI, aFlags, _retval); } static nsresult NSAPI nsNetUtil_URIChainHasFlags(nsINetUtil *iface, nsIURI *aURI, UINT32 aFlags, cpp_bool *_retval) { - TRACE("(%p %08x %p)\n", aURI, aFlags, _retval); + TRACE("(%p %s %p)\n", aURI, debugstr_protocol_flags(aFlags), _retval); - if(aFlags == (1<<11)) { + if(aFlags == URI_DOES_NOT_RETURN_DATA) { *_retval = FALSE; return NS_OK; }

1 0

Josh DuBois : buildimage: Fix typo in conditional.
by Alexandre Julliard 26 Jan '15

26 Jan '15

Module: wine Branch: master Commit: 1042684ecdc196c6f774631f5eb10ce2d1350d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1042684ecdc196c6f774631f5… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Fri Jan 23 09:14:21 2015 -0600 buildimage: Fix typo in conditional. --- tools/buildimage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/buildimage b/tools/buildimage index 442bb3e..2216ad8 100755 --- a/tools/buildimage +++ b/tools/buildimage @@ -107,7 +107,7 @@ sub svg_element_start $width = $attr{'width'}; $height = $attr{'height'}; - if(defined($x) and defined($x)) { + if(defined($x) and defined($y)) { if($x =~ /\d*/ and $y =~ /\d*/) { shell $convert, $renderedSVGFileName, "-crop", "${width}x${height}+$x+$y", $pngFileName; }

1 0

Julian Rüger : German translation for release 1.7.35
by Jeremy Newman 26 Jan '15

26 Jan '15

Module: website Branch: master Commit: 51fa6c490c149c756edf263753eb757c0dcdd37f URL: http://source.winehq.org/git/website.git/?a=commit;h=51fa6c490c149c756edf26… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Jan 25 08:54:56 2015 +0100 German translation for release 1.7.35 --- news/de/2015012301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2015012301.xml b/news/de/2015012301.xml new file mode 100644 index 0000000..dc7d0d7 --- /dev/null +++ b/news/de/2015012301.xml @@ -0,0 +1,15 @@ +<news> +<date>23. Januar 2015</date> +<title>Wine 1.7.35 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.35 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.35">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Anfänge der Unterstützung für OpenGL Kern-Kontexte.</li> + <li>Anfängliche Unterstützung für Symbol-Platzierung in DirectWrite.</li> + <li>Einige zusätzliche WBEM-Objekte.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.35.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.35
by Jeremy Newman 26 Jan '15

26 Jan '15

Module: website Branch: master Commit: 789c35d26cdd1c8604a001b640902f0f31a96e5f URL: http://source.winehq.org/git/website.git/?a=commit;h=789c35d26cdd1c8604a001… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jan 24 07:39:39 2015 +0100 Polish translation for release 1.7.35 --- news/pl/2015012301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2015012301.xml b/news/pl/2015012301.xml new file mode 100644 index 0000000..4c7f09c --- /dev/null +++ b/news/pl/2015012301.xml @@ -0,0 +1,15 @@ +<news> +<date>Styczeń 23, 2015</date> +<title>Wydano Wine 1.7.35</title> +<body> + Wydanie rozwojowe Wine 1.7.35 jest już dostępne. + <a href="{$root}/announce/1.7.35">Co nowego</a> w tym wydaniu: +<ul> + <li>Początki wsparcia dla kontekstu jądra OpenGL.</li> + <li>Wstępne wsparcia dla umieszczania glifów w DirectWrite.</li> + <li>Kilka nowych obiektów WBEM.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.35.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.35
by Jeremy Newman 26 Jan '15

26 Jan '15

Module: website Branch: master Commit: 5259a3c99a2cd732256a114904c84dd2eed80988 URL: http://source.winehq.org/git/website.git/?a=commit;h=5259a3c99a2cd732256a11… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 23 23:20:03 2015 +0200 Ukrainian translation for release 1.7.35 --- news/uk/2015012301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/uk/2015012301.xml b/news/uk/2015012301.xml new file mode 100644 index 0000000..fb45c5f --- /dev/null +++ b/news/uk/2015012301.xml @@ -0,0 +1,15 @@ +<news> +<date>23 січня 2015</date> +<title>Випущено Wine 1.7.35</title> +<body> + Розробницький реліз Wine 1.7.35 наразі доступний. + <a href="{$root}/announce/1.7.35">Що нового</a> в цьому релізі: +<ul> + <li>Початкова підтримка для основних контекстів OpenGL.</li> + <li>Початкова підтримка для розміщення гліфів в DirectWrite.</li> + <li>Додано більше об'єктів WBEM.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.35.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.35
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: website Branch: master Commit: efcd290506136b349ce80f4177cb33f5273855e8 URL: http://source.winehq.org/git/website.git/?a=commit;h=efcd290506136b349ce80f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 23 21:12:39 2015 +0100 Wine release 1.7.35 --- news/en/2015012301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2015012301.xml b/news/en/2015012301.xml new file mode 100644 index 0000000..a10d965 --- /dev/null +++ b/news/en/2015012301.xml @@ -0,0 +1,15 @@ +<news> +<date>January 23, 2015</date> +<title>Wine 1.7.35 Released</title> +<body> + The Wine development release 1.7.35 is now available. + <a href="{$root}/announce/1.7.35">What's new</a> in this release: +<ul> + <li>Beginnings of support for OpenGL core contexts.</li> + <li>Initial support for glyph placement in DirectWrite.</li> + <li>Some more WBEM objects.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.35.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

Alexandre Julliard : Release 1.7.35.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 060b778fdef1e1efd428de8b93133cd1807bfdcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=060b778fdef1e1efd428de8b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 23 21:06:27 2015 +0100 Release 1.7.35. --- ANNOUNCE | 604 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 279 insertions(+), 346 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=060b778fdef1e1efd428d…

1 0