October 2014 - Wine-Commits

Jeremy Newman : set open graph image based on news type
by Jeremy Newman Oct. 31, 2014

Oct. 31, 2014

Module: website Branch: master Commit: 5557aa9fcc6518811564acbb9f1921cf3f3ecb7a URL: http://source.winehq.org/git/website.git/?a=commit;h=5557aa9fcc6518811564ac… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 31 14:36:33 2014 -0500 set open graph image based on news type --- include/plugins/news.php | 9 +++++++++ templates/en/news.template | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index bc9deb7..b8c4da8 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -26,6 +26,15 @@ switch (true) // set open graph tags $html->meta_og['title'] = trim($vars['title']); + $ogmode = preg_replace('/^(.*)({\$root}\/)(wwn|announce)(\/)(.*)$/ms', '$3', $vars['body']); + switch ($ogmode) + { + case 'wwn': + $html->meta_og['image'] = "http://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-world-wine-…"; + break; + default: + $html->meta_og['image'] = "http://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announcemen…"; + } // add page title $html->page_title .= " - {$html->meta_og['title']}"; diff --git a/templates/en/news.template b/templates/en/news.template index 8ea824f..0443453 100644 --- a/templates/en/news.template +++ b/templates/en/news.template @@ -1,12 +1,11 @@   - <h1 class="title">News</h1>  -<hr /> +<hr> <div class="link-container"> <p><a href="{$root}/wwn/">World Wine News Archive</a></p>

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman Oct. 31, 2014

Oct. 31, 2014

Module: website Branch: master Commit: a441ed6f4ed5ef8839874d26ea8224b9e5d4aec8 URL: http://source.winehq.org/git/website.git/?a=commit;h=a441ed6f4ed5ef8839874d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 31 14:19:23 2014 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Jeremy Newman : use open graph image for news posts
by Jeremy Newman Oct. 31, 2014

Oct. 31, 2014

Module: website Branch: master Commit: 11334311207ec50da265a4146c7b101200033f1a URL: http://source.winehq.org/git/website.git/?a=commit;h=11334311207ec50da265a4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 31 14:18:50 2014 -0500 use open graph image for news posts --- templates/en/news.template | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/en/news.template b/templates/en/news.template index 38aabe1..8ea824f 100644 --- a/templates/en/news.template +++ b/templates/en/news.template @@ -1,5 +1,6 @@   + <h1 class="title">News</h1>

1 0

Alexandre Julliard : Wine release 1.7.30
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: website Branch: master Commit: cd3b53a5e627bb0581c4e25c5366ab30596edb1c URL: http://source.winehq.org/git/website.git/?a=commit;h=cd3b53a5e627bb0581c4e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 22:45:33 2014 +0900 Wine release 1.7.30 --- news/en/2014103101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014103101.xml b/news/en/2014103101.xml new file mode 100644 index 0000000..b9c923b --- /dev/null +++ b/news/en/2014103101.xml @@ -0,0 +1,16 @@ +<news> +<date>October 31, 2014</date> +<title>Wine 1.7.30 Released</title> +<body> +<p> The Wine development release 1.7.30 is now available.</p> +<p> <a href="{$root}/announce/1.7.30">What's new</a> in this release: +<ul> + <li>More support for fonts in DirectWrite.</li> + <li>Improved ATL thunk support.</li> + <li>A few more C runtime functions.</li> + <li>Regedit import/export fixes.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.30.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>. +</p></body></news>

1 0

Tag wine-1.7.30 : Alexandre Julliard : Release 1.7.30
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: refs/tags/wine-1.7.30 Tag: 3a37002eee767c5fd8371715f2753ced43988712 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3a37002eee767c5fd8371715f275… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 22:43:41 2014 +0900 Release 1.7.30

1 0

Alexandre Julliard : Release 1.7.30.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 288f1868b7e32b1dd4f35caaed2239e66c2bafd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288f1868b7e32b1dd4f35caae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 22:43:41 2014 +0900 Release 1.7.30. --- ANNOUNCE | 522 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +-- 3 files changed, 270 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=288f1868b7e32b1dd4f35…

1 0

Alexandre Julliard : crypt32: Add a root store path for Android.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 9640949cc38cb12086b29d352cda903974d3a3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9640949cc38cb12086b29d352… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 15:47:25 2014 +0900 crypt32: Add a root store path for Android. --- dlls/crypt32/rootstore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 641a2b7..5cee235 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -489,6 +489,7 @@ static const char * const CRYPT_knownLocations[] = { "/usr/share/ca-certificates/ca-bundle.crt", "/usr/local/share/certs/", "/etc/sfw/openssl/certs", + "/etc/security/cacerts", /* Android */ }; static const BYTE authenticode[] = {

1 0

Iván Matellanes : msvcrt: Added _fgetwc_nolock implementation.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 156684ba91e165dce614a8da94080a5c1f88d62d URL: http://source.winehq.org/git/wine.git/?a=commit;h=156684ba91e165dce614a8da9… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 28 14:43:47 2014 +0100 msvcrt: Added _fgetwc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 21 ++++++++++++++++----- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e33f5fe..80d5bc9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -802,7 +802,7 @@ @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar -@ stub _fgetwc_nolock +@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _filbuf(ptr) MSVCRT__filbuf @ cdecl _filelength(long) MSVCRT__filelength diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 88144a3..283f5fd 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1150,7 +1150,7 @@ @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar -@ stub _fgetwc_nolock +@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _filbuf(ptr) MSVCRT__filbuf @ cdecl _filelength(long) MSVCRT__filelength diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5c01600..a48e42b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -469,7 +469,7 @@ @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar -@ stub _fgetwc_nolock +@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _filbuf(ptr) MSVCRT__filbuf @ cdecl _filelength(long) MSVCRT__filelength diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d9d99f4..e9abf00 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -451,7 +451,7 @@ @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar -@ stub _fgetwc_nolock +@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _filbuf(ptr) MSVCRT__filbuf @ cdecl _filelength(long) MSVCRT__filelength diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index dbbbe78..fe3525c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3576,16 +3576,28 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { MSVCRT_wint_t ret; - int ch; MSVCRT__lock_file(file); + ret = MSVCRT__fgetwc_nolock(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fgetwc_nolock (MSVCRT.@) + */ +MSVCRT_wint_t CDECL MSVCRT__fgetwc_nolock(MSVCRT_FILE* file) +{ + MSVCRT_wint_t ret; + int ch; if((msvcrt_get_ioinfo(file->_file)->exflag & (EF_UTF8 | EF_UTF16)) || !(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { char *p; for(p=(char*)&ret; (MSVCRT_wint_t*)p<&ret+1; p++) { - ch = MSVCRT_fgetc(file); + ch = MSVCRT__fgetc_nolock(file); if(ch == MSVCRT_EOF) { ret = MSVCRT_WEOF; break; @@ -3596,11 +3608,11 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) char mbs[MSVCRT_MB_LEN_MAX]; int len = 0; - ch = MSVCRT_fgetc(file); + ch = MSVCRT__fgetc_nolock(file); if(ch != MSVCRT_EOF) { mbs[0] = (char)ch; if(MSVCRT_isleadbyte((unsigned char)mbs[0])) { - ch = MSVCRT_fgetc(file); + ch = MSVCRT__fgetc_nolock(file); if(ch != MSVCRT_EOF) { mbs[1] = (char)ch; len = 2; @@ -3614,7 +3626,6 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) ret = MSVCRT_WEOF; } - MSVCRT__unlock_file(file); return ret; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 137bec2..256a90c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -919,6 +919,7 @@ int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); int __cdecl MSVCRT__fgetc_nolock(MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); +MSVCRT_wint_t __cdecl MSVCRT__fgetwc_nolock(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); int __cdecl MSVCRT__fseeki64_nolock(MSVCRT_FILE*,__int64,int); __int64 __cdecl MSVCRT__ftelli64(MSVCRT_FILE* file); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 54c07fe..768b3a0 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -196,6 +196,7 @@ unsigned int __cdecl _set_output_format(void); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED +wint_t __cdecl _fgetwc_nolock(FILE*); wint_t __cdecl _fgetwchar(void); wint_t __cdecl _fputwchar(wint_t); wchar_t* __cdecl _getws(wchar_t*);

1 0

Bruno Jesus : atl: Remove dead assignment.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 08f3edccde763524e55e26a978da9a05d1219d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f3edccde763524e55e26a97… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:20:35 2014 -0200 atl: Remove dead assignment. --- dlls/atl/registrar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 90c5b5b..32e207e 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -184,7 +184,7 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf) static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOOL do_register) { - LPCOLESTR iter = *pstr; + LPCOLESTR iter; HRESULT hres; LONG lres; HKEY hkey = 0;

1 0

Bruno Jesus : advapi32/tests: Remove dead assignment (Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: d3b406ecce238e43e042bf90a2e02cfc2eae070f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b406ecce238e43e042bf90a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:13:04 2014 -0200 advapi32/tests: Remove dead assignment (Cppcheck). --- dlls/advapi32/tests/security.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b44496a..04a88ae 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -920,7 +920,6 @@ cleanup: rc &= ~(FILE_ATTRIBUTE_NOT_CONTENT_INDEXED|FILE_ATTRIBUTE_COMPRESSED); ok(rc == FILE_ATTRIBUTE_ARCHIVE, "expected FILE_ATTRIBUTE_ARCHIVE got %#x\n", rc); - retSize = 0xdeadbeef; rc = GetFileSecurityA(file, OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, NULL, 0, &sdSize); ok(!rc, "GetFileSecurity should fail\n");

1 0

Bruno Jesus : advapi32/tests: Fix copy & paste issue (Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: c7772a5d10c64c5ccf184c0ba5bb01f1609d916a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7772a5d10c64c5ccf184c0ba… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:04:22 2014 -0200 advapi32/tests: Fix copy & paste issue (Cppcheck). --- dlls/advapi32/tests/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 82391e1..1445f6f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1136,7 +1136,7 @@ static void test_reg_open_key(void) ok(error == ERROR_SUCCESS, "Expected RegSetKeySecurity to return success, got error %u\n", error); - bRet = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); + error = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); ok(error == ERROR_SUCCESS, "Expected RegSetKeySecurity to return success, got error %u\n", error);

1 0

Hans Leidekker : msvcrt: Implement _snprintf_l.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: ed79b3f9a52bcab2b748ceb417c06dd4c5cdc345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed79b3f9a52bcab2b748ceb41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 30 14:08:26 2014 +0100 msvcrt: Implement _snprintf_l. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d6c38f4..91805ee 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1289,7 +1289,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 02b6497..5de6965 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1647,7 +1647,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ce09f00..b7f0a86 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -969,7 +969,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e4302cf..a8ad25f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -944,7 +944,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f376db3..37046c3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -912,7 +912,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf # stub _snprintf_c(ptr long str) # stub _snprintf_c_l(ptr long str ptr) -# stub _snprintf_l(ptr long str ptr) +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s # stub _snprintf_s_l(ptr long long str ptr) @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4123d06..a6a4fe7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -818,6 +818,20 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) } /********************************************************************* + * _snprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__snprintf_l(char *str, unsigned int count, MSVCRT__locale_t locale, + const char *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = MSVCRT_vsnprintf_l(str, count, format, locale, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * _snprintf_s (MSVCRT.@) */ int CDECL MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count,

1 0

Iván Matellanes : msvcrt: Added _fgetc_nolock implementation.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 878b4a92803eeac38b218e55dc9f41a6d503deec URL: http://source.winehq.org/git/wine.git/?a=commit;h=878b4a92803eeac38b218e55d… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 28 14:43:43 2014 +0100 msvcrt: Added _fgetc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr110/msvcr110.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + dlls/msvcrt/file.c | 16 ++++++++++++++-- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 91805ee..e33f5fe 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -800,6 +800,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5de6965..88144a3 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1148,6 +1148,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b7f0a86..5c01600 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -467,6 +467,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a8ad25f..d9d99f4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -449,6 +449,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d191953..dbbbe78 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3503,10 +3503,23 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) */ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) { + int ret; + + MSVCRT__lock_file(file); + ret = MSVCRT__fgetc_nolock(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fgetc_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fgetc_nolock(MSVCRT_FILE* file) +{ unsigned char *i; unsigned int j; - MSVCRT__lock_file(file); if (file->_cnt>0) { file->_cnt--; i = (unsigned char *)file->_ptr++; @@ -3514,7 +3527,6 @@ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) } else j = MSVCRT__filbuf(file); - MSVCRT__unlock_file(file); return j; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9f00923..137bec2 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -916,6 +916,7 @@ int __cdecl MSVCRT__isleadbyte_l(int, MSVCRT__locale_t); void __cdecl MSVCRT__lock_file(MSVCRT_FILE*); void __cdecl MSVCRT__unlock_file(MSVCRT_FILE*); int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); +int __cdecl MSVCRT__fgetc_nolock(MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 305d251..54c07fe 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -131,6 +131,7 @@ size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); int __cdecl _fflush_nolock(FILE*); +int __cdecl _fgetc_nolock(FILE*); int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*);

1 0

Bruno Jesus : comctl32/tests: Remove a dead assignment from dpa.c ( Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 2c5f05b860d0f69b249746523374851d90ea5e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5f05b860d0f69b249746523… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 00:32:04 2014 -0200 comctl32/tests: Remove a dead assignment from dpa.c (Cppcheck). --- dlls/comctl32/tests/dpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 644f3aa..4eb32a4 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -271,7 +271,7 @@ static void test_dpa(void) ok(rc, "dw2=0x%x\n", dw2); /* Clone into an old DPA */ - p = NULL; SetLastError(ERROR_SUCCESS); + SetLastError(ERROR_SUCCESS); p = pDPA_Clone(dpa, dpa3); ok(p == dpa3, "p=%p\n", p); rc=CheckDPA(dpa3, 0x123456, &dw3);

1 0

Bruno Jesus : comctl32: Remove dead assignment in tooltips.c (Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: a54c187886353bd7c6bcc6d43b85e1101a0627f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54c187886353bd7c6bcc6d43… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 00:17:34 2014 -0200 comctl32: Remove dead assignment in tooltips.c (Cppcheck). --- dlls/comctl32/tooltips.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index f74ea65..7564c3f 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -234,7 +234,7 @@ TOOLTIPS_customdraw_fill(const TOOLTIPS_INFO *infoPtr, NMTTCUSTOMDRAW *lpnmttcd, static inline DWORD TOOLTIPS_notify_customdraw (DWORD dwDrawStage, NMTTCUSTOMDRAW *lpnmttcd) { - LRESULT result = CDRF_DODEFAULT; + LRESULT result; lpnmttcd->nmcd.dwDrawStage = dwDrawStage; TRACE("Notifying stage %d, flags %x, id %x\n", lpnmttcd->nmcd.dwDrawStage,

1 0

Bruno Jesus : comctl32: Remove a dead assignment in comctl32undoc.c ( Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 197ea35c5a0f140d4cedd24c754f9eb83afc1ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197ea35c5a0f140d4cedd24c7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:41:01 2014 -0200 comctl32: Remove a dead assignment in comctl32undoc.c (Cppcheck). --- dlls/comctl32/comctl32undoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index f20857c..97bbf1a 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -690,8 +690,8 @@ static HANDLE create_mru_list(LPWINEMRULIST mp) /* get values from key 'MRUList' */ if (newkey) { datasize = (mp->extview.uMax + 1) * sizeof(WCHAR); - if((err=RegQueryValueExW( newkey, strMRUList, 0, &type, - (LPBYTE)mp->realMRU, &datasize))) { + if (RegQueryValueExW( newkey, strMRUList, 0, &type, + (LPBYTE)mp->realMRU, &datasize)) { /* not present - set size to 1 (will become 0 later) */ datasize = 1; *mp->realMRU = 0;

1 0

Bruno Jesus : atl: Remove dead assignment.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 36c331f2e95d69499ee734523d85c285bf58ff33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c331f2e95d69499ee734523… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:22:55 2014 -0200 atl: Remove dead assignment. --- dlls/atl/registrar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 32e207e..96fcb0e 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -380,7 +380,7 @@ static HRESULT do_process_root_key(LPCOLESTR data, BOOL do_register) { LPCOLESTR iter = data; strbuf buf; - HRESULT hres = S_OK; + HRESULT hres; unsigned int i; strbuf_init(&buf);

1 0

Bruno Jesus : advpack/tests: Remove dead assignment (Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: c1b2fc3c4f89efd753abf17272600c9ae7c5fbe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b2fc3c4f89efd753abf1727… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:16:14 2014 -0200 advpack/tests: Remove dead assignment (Cppcheck). --- dlls/advpack/tests/advpack.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index f3e70d7..5b9ed42 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -187,7 +187,6 @@ static void delnode_test(void) CloseHandle(hn); hr = pDelNode(lstrcatA(currDir, "\\DelNodeTestDir"), 0); ok (hr == S_OK, "DelNode failed deleting a directory containing multiple files\n"); - currDir[currDirLen] = '\0'; } static void append_str(char **str, const char *data, ...)

1 0

Michael Stefaniuc : comdlg32: Use the proper macro to create an int atom ( PVS-Studio).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 50a877d69fbbd3fa1bf3ab76966fa47850868690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a877d69fbbd3fa1bf3ab769… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 23:39:44 2014 +0100 comdlg32: Use the proper macro to create an int atom (PVS-Studio). --- dlls/comdlg32/cdlg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index c437183..886804c 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -24,7 +24,7 @@ #include "dlgs.h" /* Common dialogs implementation globals */ -#define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ +#define COMDLG32_Atom MAKEINTATOM(0xa000) /* MS uses this one to identify props */ extern HINSTANCE COMDLG32_hInstance DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Format registry values before interpreting value type.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 7f57d8f19a195e5283fea75c86d25d4a4bc0b838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f57d8f19a195e5283fea75c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 30 14:09:06 2014 +0100 msi: Format registry values before interpreting value type. --- dlls/msi/action.c | 24 ++++++++++-------------- dlls/msi/tests/action.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e310ba3..66c2858 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2438,9 +2438,9 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) return MSI_SetFeatureStates(package); } -static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD *type, DWORD *size ) +static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD len, DWORD *type, DWORD *size ) { - BYTE *data = NULL; + BYTE *data; if (!value) { @@ -2529,19 +2529,18 @@ static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD *type, else { const WCHAR *ptr = value; - DWORD len; *type = REG_SZ; if (value[0] == '#') { - ptr++; + ptr++; len--; if (value[1] == '%') { - ptr++; + ptr++; len--; *type = REG_EXPAND_SZ; } } - len = deformat_string( package, ptr, (WCHAR **)&data ); + data = (BYTE *)msi_strdupW( ptr, len ); if (len > strlenW( (const WCHAR *)data )) *type = REG_MULTI_SZ; *size = (len + 1) * sizeof(WCHAR); } @@ -2872,14 +2871,11 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) msi_free(keypath); return ERROR_FUNCTION_FAILED; } - str = msi_record_get_string( row, 5, &len ); - if (str && len > strlenW( str )) - { - type = REG_MULTI_SZ; - new_size = (len + 1) * sizeof(WCHAR); - new_value = (BYTE *)msi_strdupW( str, len ); - } - else new_value = parse_value( package, str, &type, &new_size ); + str = msi_record_get_string( row, 5, NULL ); + len = deformat_string( package, str, &deformated ); + new_value = parse_value( package, deformated, len, &type, &new_size ); + + msi_free( deformated ); deformat_string(package, name, &deformated); if (!is_special_entry( name )) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 9f1651d..a8903d9 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -186,7 +186,8 @@ static const char property_dat[] = "SERVNAME2\tTestService2\n" "SERVDISP\tTestServiceDisp\n" "SERVDISP2\tTestServiceDisp2\n" - "MSIFASTINSTALL\t1\n"; + "MSIFASTINSTALL\t1\n" + "regdata15\t#x01\n"; static const char environment_dat[] = "Environment\tName\tValue\tComponent_\n" @@ -514,7 +515,11 @@ static const char wrv_registry_dat[] = "regdata8\t2\tSOFTWARE\\Wine\\msitest\tValue4\tone[~]two\taugustus\n" "regdata9\t2\tSOFTWARE\\Wine\\msitest\tValue5\t[~]one[~]two[~]three\taugustus\n" "regdata10\t2\tSOFTWARE\\Wine\\msitest\tValue6\t[~]\taugustus\n" - "regdata11\t2\tSOFTWARE\\Wine\\msitest\tValue7\t[~]two\taugustus\n"; + "regdata11\t2\tSOFTWARE\\Wine\\msitest\tValue7\t[~]two\taugustus\n" + "regdata12\t2\tSOFTWARE\\Wine\\msitest\tValue8\t#1\taugustus\n" + "regdata13\t2\tSOFTWARE\\Wine\\msitest\tValue9\t#x1\taugustus\n" + "regdata14\t2\tSOFTWARE\\Wine\\msitest\tValue10\t#x01\taugustus\n" + "regdata15\t2\tSOFTWARE\\Wine\\msitest\tValue11\t[regdata15]\taugustus\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -4923,6 +4928,7 @@ static void test_write_registry_values(void) HKEY hkey; DWORD type, size; CHAR path[MAX_PATH]; + BYTE buf[8]; if (is_process_limited()) { @@ -5055,6 +5061,42 @@ static void test_write_registry_values(void) ok(size == 5, "Expected 5, got %d\n", size); ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value8", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(*(DWORD *)buf == 1, "got %u\n", *(DWORD *)buf); + ok(size == 4, "got %u\n", size); + ok(type == REG_DWORD, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value9", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value10", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value11", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + RegDeleteValueA(hkey, "Value"); RegDeleteValueA(hkey, "Value1"); RegDeleteValueA(hkey, "Value2"); @@ -5063,6 +5105,10 @@ static void test_write_registry_values(void) RegDeleteValueA(hkey, "Value5"); RegDeleteValueA(hkey, "Value6"); RegDeleteValueA(hkey, "Value7"); + RegDeleteValueA(hkey, "Value8"); + RegDeleteValueA(hkey, "Value9"); + RegDeleteValueA(hkey, "Value10"); + RegDeleteValueA(hkey, "Value11"); RegCloseKey(hkey); RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest");

1 0

Iván Matellanes : msvcrt: _filbuf should not lock any file.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: f896cd3dc9fc16586dd7ada2e95b66c677aad1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f896cd3dc9fc16586dd7ada2e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 28 14:43:35 2014 +0100 msvcrt: _filbuf should not lock any file. --- dlls/msvcr90/tests/msvcr90.c | 7 +++++++ dlls/msvcrt/file.c | 13 ++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 9bb29da..184ce76 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -118,6 +118,7 @@ static int (__cdecl *p_fileno)(FILE*); static int (__cdecl *p_feof)(FILE*); static int (__cdecl *p_ferror)(FILE*); static int (__cdecl *p_flsbuf)(int, FILE*); +static int (__cdecl *p_filbuf)(FILE*); static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); static void** (__cdecl *p__pxcptinfoptrs)(void); static void* (__cdecl *p__AdjustPointer)(void*, const void*); @@ -377,6 +378,7 @@ static BOOL init(void) SET(p_feof, "feof"); SET(p_ferror, "ferror"); SET(p_flsbuf, "_flsbuf"); + SET(p_filbuf, "_filbuf"); SET(p_byteswap_ulong, "_byteswap_ulong"); SET(p__pxcptinfoptrs, "__pxcptinfoptrs"); SET(p__AdjustPointer, "__AdjustPointer"); @@ -1285,6 +1287,11 @@ static void test_nonblocking_file_access(void) ret = p_flsbuf('a', filew); ok(ret=='a', "_flsbuf(filew) returned %d\n", ret); + ret = p_filbuf(filer); + ok(ret==-1, "_filbuf(filer) returned %d\n", ret); + ret = p_filbuf(filew); + ok(ret==-1, "_filbuf(filew) returned %d\n", ret); + ret = p_fflush_nolock(filer); ok(ret==0, "_fflush_nolock(filer) returned %d\n", ret); ret = p_fflush_nolock(filew); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2e07342..d191953 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3460,12 +3460,9 @@ int CDECL MSVCRT_ferror(MSVCRT_FILE* file) int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) { unsigned char c; - MSVCRT__lock_file(file); - if(file->_flag & MSVCRT__IOSTRG) { - MSVCRT__unlock_file(file); + if(file->_flag & MSVCRT__IOSTRG) return MSVCRT_EOF; - } /* Allocate buffer if needed */ if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) @@ -3474,35 +3471,29 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) if(!(file->_flag & MSVCRT__IOREAD)) { if(file->_flag & MSVCRT__IORW) file->_flag |= MSVCRT__IOREAD; - else { - MSVCRT__unlock_file(file); + else return MSVCRT_EOF; - } } if(!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { int r; if ((r = read_i(file->_file,&c,1)) != 1) { file->_flag |= (r == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; - MSVCRT__unlock_file(file); return MSVCRT_EOF; } - MSVCRT__unlock_file(file); return c; } else { file->_cnt = read_i(file->_file, file->_base, file->_bufsiz); if(file->_cnt<=0) { file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; file->_cnt = 0; - MSVCRT__unlock_file(file); return MSVCRT_EOF; } file->_cnt--; file->_ptr = file->_base+1; c = *(unsigned char *)file->_base; - MSVCRT__unlock_file(file); return c; } }

1 0

Bruno Jesus : comctl32: Avoid magic numbers.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: f70167df587a4af9954d0733fdd3e8d0b24e0289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70167df587a4af9954d0733f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 00:12:23 2014 -0200 comctl32: Avoid magic numbers. --- dlls/comctl32/string.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index a9544fa..4c52f18 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -855,16 +855,15 @@ int WINAPI StrCSpnW(LPCWSTR lpszStr, LPCWSTR lpszMatch) BOOL WINAPI IntlStrEqWorkerA(BOOL bCase, LPCSTR lpszStr, LPCSTR lpszComp, int iLen) { - DWORD dwFlags = LOCALE_USE_CP_ACP; + DWORD dwFlags; int iRet; TRACE("(%d,%s,%s,%d)\n", bCase, debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); /* FIXME: This flag is undocumented and unknown by our CompareString. - * We need a define for it. */ - dwFlags = 0x10000000; + dwFlags = LOCALE_RETURN_GENITIVE_NAMES; if (!bCase) dwFlags |= NORM_IGNORECASE; iRet = CompareStringA(GetThreadLocale(), @@ -891,9 +890,8 @@ BOOL WINAPI IntlStrEqWorkerW(BOOL bCase, LPCWSTR lpszStr, LPCWSTR lpszComp, debugstr_w(lpszStr),debugstr_w(lpszComp), iLen); /* FIXME: This flag is undocumented and unknown by our CompareString. - * We need a define for it. */ - dwFlags = 0x10000000; + dwFlags = LOCALE_RETURN_GENITIVE_NAMES; if (!bCase) dwFlags |= NORM_IGNORECASE; iRet = CompareStringW(GetThreadLocale(),

1 0

Alistair Leslie-Hughes : dplayx: Fix some crashes and wine_todo's.
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 60db3a4a86ad3a19682dfb483a4c4f37dff1ea29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60db3a4a86ad3a19682dfb483… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 25 15:05:40 2014 +1000 dplayx: Fix some crashes and wine_todo's. --- dlls/dplayx/tests/dplayx.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 7b6c0c0..fb6646d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -685,7 +685,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W } hr = IDirectPlayX_InitializeConnection( pDP, pAddress, 0 ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); HeapFree( GetProcessHeap(), 0, pAddress ); @@ -743,7 +743,7 @@ static void test_DirectPlayCreate(void) if ( hr == DP_OK ) IDirectPlayX_Release( pDP ); hr = DirectPlayCreate( (LPGUID) &DPSPGUID_TCPIP, &pDP, NULL ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); if ( hr == DP_OK ) IDirectPlayX_Release( pDP ); @@ -915,9 +915,9 @@ static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP, if( IsEqualGUID(lpguidSP, &DPSPGUID_TCPIP) ) { hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 ); - todo_wine checkHR( DPERR_ALREADYINITIALIZED, hr ); + checkHR( DPERR_ALREADYINITIALIZED, hr ); } return TRUE; @@ -976,7 +976,7 @@ static void test_GetCaps(void) { hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); if ( hr == DP_OK ) @@ -1085,7 +1085,7 @@ static void test_Open(void) /* Uninitialized dpsd */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); - todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + checkHR( DPERR_INVALIDPARAMS, hr ); dpsd_server.dwSize = sizeof(DPSESSIONDESC2); @@ -1095,7 +1095,7 @@ static void test_Open(void) /* Regular operation */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); - todo_wine checkHR( DP_OK, hr ); + checkHR( DP_OK, hr ); /* Opening twice */ hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); @@ -1698,12 +1698,16 @@ static void test_SessionDesc(void) checkHR( DPERR_INVALIDPARAMS, hr ); hr = IDirectPlayX_GetSessionDesc( pDP[0], NULL, NULL ); checkHR( DPERR_INVALIDPARAM, hr ); +if(0) +{ + /* Crashes under Win7 */ hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); checkHR( DPERR_INVALIDPARAM, hr ); dwDataSize=-1; hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], &dwDataSize ); checkHR( DPERR_INVALIDPARAMS, hr ); check( -1, dwDataSize ); +} /* Get: Insufficient buffer size */ dwDataSize=0; @@ -2498,10 +2502,14 @@ static void test_PlayerName(void) checkHR( DPERR_INVALIDPLAYER, hr ); check( 1024, dwDataSize ); +if(0) +{ + /* Crashes under Win7 */ dwDataSize = -1; hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); checkHR( DPERR_INVALIDPARAMS, hr ); check( -1, dwDataSize ); +} hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, NULL ); checkHR( DPERR_INVALIDPARAMS, hr ); @@ -5789,6 +5797,9 @@ static void test_GetMessageQueue(void) check( -1, dwNumBytes ); /* - Remote players */ +if(0) +{ + /* Crash under Win7 */ dwNumMsgs = dwNumBytes = -1; hr = IDirectPlayX_GetMessageQueue( pDP[0], 0, dpid[3], DPMESSAGEQUEUE_RECEIVE, @@ -5796,6 +5807,7 @@ static void test_GetMessageQueue(void) checkHR( DPERR_INVALIDPLAYER, hr ); /* Player 3 is remote */ check( -1, dwNumMsgs ); check( -1, dwNumBytes ); +} dwNumMsgs = dwNumBytes = -1; hr = IDirectPlayX_GetMessageQueue( pDP[0], dpid[3], 0,

1 0

Michael Stefaniuc : wininet: Simplify while loop conditions (PVS-Studio).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 06afdda61777d43f6c7d5b78157b465172b0174b URL: http://source.winehq.org/git/wine.git/?a=commit;h=06afdda61777d43f6c7d5b781… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 23:38:20 2014 +0100 wininet: Simplify while loop conditions (PVS-Studio). --- dlls/wininet/http.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a98ed53..cb30b26 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -809,7 +809,7 @@ static void strip_spaces(LPWSTR start) LPWSTR str = start; LPWSTR end; - while (*str == ' ' && *str != '\0') + while (*str == ' ') str++; if (str != start) @@ -841,13 +841,13 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue, LPWSTR *pszRealm ) if (!token) return TRUE; realm = ptr; - while (*realm == ' ' && *realm != '\0') + while (*realm == ' ') realm++; if(!strncmpiW(realm, szRealm, ARRAYSIZE(szRealm)) && (realm[ARRAYSIZE(szRealm)] == ' ' || realm[ARRAYSIZE(szRealm)] == '=')) { token++; - while (*token == ' ' && *token != '\0') + while (*token == ' ') token++; if (*token == '\0') return TRUE;

1 0

Michael Stefaniuc : riched20: SUCCEEDED() is already a BOOL (PVS-Studio).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 7f295effbd20301a7a63dc4e8e95c54ceb6189eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f295effbd20301a7a63dc4e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 23:28:44 2014 +0100 riched20: SUCCEEDED() is already a BOOL (PVS-Studio). --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1e62fc1..8fdaa53 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2118,7 +2118,7 @@ static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) hr = OleSetClipboard(dataObj); IDataObject_Release(dataObj); } - return SUCCEEDED(hr) != 0; + return SUCCEEDED(hr); } /* helper to send a msg filter notification */

1 0

Bruno Jesus : comctl32/tests: Remove dead assignment in comboex.c ( Cppcheck).
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Module: wine Branch: master Commit: 2ccd55e56f9c0d8482ca8fe5d820b95f67647b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ccd55e56f9c0d8482ca8fe5d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 00:24:38 2014 -0200 comctl32/tests: Remove dead assignment in comboex.c (Cppcheck). --- dlls/comctl32/tests/comboex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index af01839..faa32a3 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -127,7 +127,7 @@ static HWND subclass_editbox(HWND hwndComboEx) static void test_comboboxex(void) { HWND myHwnd = 0; - LONG res = -1; + LONG res; COMBOBOXEXITEMA cbexItem; static const char *first_item = "First Item", *second_item = "Second Item",

1 0

Austin English : ndis.sys: Add a stub dll.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 779f7e527d1fd844f1c471f0ef40da69bf479a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=779f7e527d1fd844f1c471f0e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 29 12:30:39 2014 -0500 ndis.sys: Add a stub dll. --- configure | 2 + configure.ac | 1 + dlls/ndis.sys/Makefile.in | 4 + dlls/ndis.sys/main.c | 40 +++++++ dlls/ndis.sys/ndis.sys.spec | 276 ++++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 + 6 files changed, 325 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=779f7e527d1fd844f1c47…

1 0

Huw Davies : comctl32: Enable the appropriate wizard buttons before sending DM_SETDEFID.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 433df0d5d8763e24772e60168bb8f1a664bd9ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=433df0d5d8763e24772e60168… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 28 15:01:18 2014 +0000 comctl32: Enable the appropriate wizard buttons before sending DM_SETDEFID. --- dlls/comctl32/propsheet.c | 21 +++++---------------- dlls/comctl32/tests/propsheet.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 0dd1ca7..5de0deb 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2430,15 +2430,16 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) HWND hwndBack = GetDlgItem(hwndDlg, IDC_BACK_BUTTON); HWND hwndNext = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON); HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); + BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH); TRACE("%d\n", dwFlags); - EnableWindow(hwndBack, FALSE); - EnableWindow(hwndNext, FALSE); - EnableWindow(hwndFinish, FALSE); + EnableWindow(hwndBack, dwFlags & PSWIZB_BACK); + EnableWindow(hwndNext, dwFlags & PSWIZB_NEXT); + EnableWindow(hwndFinish, enable_finish); /* set the default pushbutton to an enabled button */ - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + if (enable_finish) SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); else if (dwFlags & PSWIZB_NEXT) SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); @@ -2447,13 +2448,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) else SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); - - if (dwFlags & PSWIZB_BACK) - EnableWindow(hwndBack, TRUE); - - if (dwFlags & PSWIZB_NEXT) - EnableWindow(hwndNext, TRUE); - if (!psInfo->hasFinish) { if ((dwFlags & PSWIZB_FINISH) || (dwFlags & PSWIZB_DISABLEDFINISH)) @@ -2463,9 +2457,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) /* Show the Finish button */ ShowWindow(hwndFinish, SW_SHOW); - - if (!(dwFlags & PSWIZB_DISABLEDFINISH)) - EnableWindow(hwndFinish, TRUE); } else { @@ -2475,8 +2466,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) ShowWindow(hwndNext, SW_SHOW); } } - else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) - EnableWindow(hwndFinish, TRUE); } /****************************************************************************** diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index d3112d5..2797e94 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -279,6 +279,37 @@ static INT_PTR CALLBACK nav_page_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM return FALSE; } +static WNDPROC old_nav_dialog_proc; + +static LRESULT CALLBACK new_nav_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case DM_SETDEFID: + ok( IsWindowEnabled( GetDlgItem(hwnd, wp) ), "button is not enabled\n" ); + break; + } + return CallWindowProcW( old_nav_dialog_proc, hwnd, msg, wp, lp ); +} + +static LRESULT CALLBACK hook_proc( int code, WPARAM wp, LPARAM lp ) +{ + static BOOL done; + if (code == HCBT_CREATEWND) + { + CBT_CREATEWNDW *c = (CBT_CREATEWNDW *)lp; + + /* The first dialog created will be the parent dialog */ + if (!done && c->lpcs->lpszClass == MAKEINTRESOURCEW(WC_DIALOG)) + { + old_nav_dialog_proc = (WNDPROC)SetWindowLongPtrW( (HWND)wp, GWLP_WNDPROC, (LONG_PTR)new_nav_dialog_proc ); + done = TRUE; + } + } + + return CallNextHookEx( NULL, code, wp, lp ); +} + static void test_wiznavigation(void) { HPROPSHEETPAGE hpsp[4]; @@ -291,6 +322,10 @@ static void test_wiznavigation(void) BOOL hwndtoindex_supported = TRUE; const INT nextID = 12324; const INT backID = 12323; + HHOOK hook; + + /* set up a hook proc in order to subclass the main dialog early on */ + hook = SetWindowsHookExW( WH_CBT, hook_proc, NULL, GetCurrentThreadId() ); /* create the property sheet pages */ memset(psp, 0, sizeof(PROPSHEETPAGEA) * 4); @@ -400,6 +435,7 @@ static void test_wiznavigation(void) ok(defidres == MAKELRESULT(nextID, DC_HASDEFID), "Expected default button ID to be %d, is %d\n", nextID, LOWORD(defidres)); DestroyWindow(hdlg); + UnhookWindowsHookEx( hook ); } static void test_buttons(void)

1 0

Nikolay Sivov : msxml3: Return S_FALSE in getNamedItem() of PI node.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 04305134486cadfb78643a8796ab6a13fec6c202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04305134486cadfb78643a879… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 30 11:06:27 2014 +0300 msxml3: Return S_FALSE in getNamedItem() of PI node. --- dlls/msxml3/pi.c | 4 +++- dlls/msxml3/tests/domdoc.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 6b8fc12..96fb118 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -685,7 +685,9 @@ static HRESULT dom_pi_get_qualified_item(const xmlNodePtr node, BSTR name, BSTR static HRESULT dom_pi_get_named_item(const xmlNodePtr node, BSTR name, IXMLDOMNode **item) { FIXME("(%p)->(%s %p): stub\n", node, debugstr_w(name), item ); - return E_NOTIMPL; + if (item) + *item = NULL; + return S_FALSE; } static HRESULT dom_pi_set_named_item(xmlNodePtr node, IXMLDOMNode *newItem, IXMLDOMNode **namedItem) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 038df04..b768260 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9152,6 +9152,11 @@ static void test_get_attributes(void) hr = IXMLDOMNode_get_attributes(node, &map); ok(hr == S_OK, "got %08x\n", hr); + node2 = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getNamedItem(map, _bstr_("attr"), &node2); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(node2 == NULL, "got %p\n", node2); + length = -1; hr = IXMLDOMNamedNodeMap_get_length(map, &length); EXPECT_HR(hr, S_OK);

1 0

Austin English : ntoskrnl.exe: Add ObQueryNameString stub.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 9c5f23121a4c93106142ec602da28698d128682e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c5f23121a4c93106142ec602… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 29 12:32:36 2014 -0500 ntoskrnl.exe: Add ObQueryNameString stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntifs.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7bb96fb..23379b8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1927,3 +1927,12 @@ VOID WINAPI IoStartNextPacket(PDEVICE_OBJECT deviceobject, BOOLEAN cancelable) { FIXME("(%p %d) stub\n", deviceobject, cancelable); } + +/***************************************************** + * ObQueryNameString (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObQueryNameString(PVOID object, POBJECT_NAME_INFORMATION name, ULONG maxlength, PULONG returnlength) +{ + FIXME("(%p %p %u %p) stub\n", object, name, maxlength, returnlength); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 11aaa2b..1512cf8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -807,7 +807,7 @@ @ stub ObMakeTemporaryObject @ stub ObOpenObjectByName @ stub ObOpenObjectByPointer -@ stub ObQueryNameString +@ stdcall ObQueryNameString(ptr ptr long ptr) @ stub ObQueryObjectAuditingByHandle @ stdcall ObReferenceObjectByHandle(long long ptr long ptr ptr) @ stdcall ObReferenceObjectByName(ptr long ptr long ptr long ptr ptr) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 37ec637..a8d90a1 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -28,4 +28,6 @@ typedef struct _KQUEUE LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; +NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); + #endif

1 0

Michael Stefaniuc : d3drm: Pass the correct pointer to IDirectXFileData_GetData (PVS-Studio).
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 0726542dedf481d3eb8c01825da038a71c5363c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0726542dedf481d3eb8c01825… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 11:24:20 2014 +0100 d3drm: Pass the correct pointer to IDirectXFileData_GetData (PVS-Studio). Also remove an uneeded initialization of "size" as that is purely an [OUT] parameter. --- dlls/d3drm/d3drm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 06850bc..92ac272 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1240,17 +1240,16 @@ static HRESULT load_data(IDirect3DRM3 *iface, IDirectXFileData *data_object, IID /* Cannot be requested */ if (parent_frame) { - D3DRMMATRIX4D matrix; + D3DRMMATRIX4D *matrix; DWORD size; TRACE("Load Frame Transform Matrix data\n"); - size = sizeof(matrix); - hr = IDirectXFileData_GetData(data_object, NULL, &size, (void**)matrix); + hr = IDirectXFileData_GetData(data_object, NULL, &size, (void**)&matrix); if ((hr != DXFILE_OK) || (size != sizeof(matrix))) goto end; - hr = IDirect3DRMFrame3_AddTransform(parent_frame, D3DRMCOMBINE_REPLACE, matrix); + hr = IDirect3DRMFrame3_AddTransform(parent_frame, D3DRMCOMBINE_REPLACE, *matrix); if (FAILED(hr)) goto end; }

1 0

Alexandre Julliard : wininet/tests: Fix a test failure on Windows.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: d883281806e4e54bbd2c36326005d5e8d9a7953c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d883281806e4e54bbd2c36326… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 30 13:16:42 2014 +0900 wininet/tests: Fix a test failure on Windows. --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ca5f4af..98c8d62 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4223,7 +4223,7 @@ static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) ok(!info.lpszSignatureAlgName, "lpszSignatureAlgName = %s\n", info.lpszSignatureAlgName); ok(!info.lpszEncryptionAlgName, "lpszEncryptionAlgName = %s\n", info.lpszEncryptionAlgName); ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName); - ok(info.dwKeySize == 128 || info.dwKeySize == 256, "dwKeySize = %u\n", info.dwKeySize); + ok(info.dwKeySize >= 128 && info.dwKeySize <= 256, "dwKeySize = %u\n", info.dwKeySize); release_cert_info(&info); }

1 0

Alexandre Julliard : cmd: Add a helper function to check if a path ends with a backslash.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 3d3c5ab4006de7a80af421ddfeb2cad699fb03f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3c5ab4006de7a80af421ddf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 30 13:11:27 2014 +0900 cmd: Add a helper function to check if a path ends with a backslash. --- programs/cmd/builtins.c | 6 +++--- programs/cmd/directory.c | 9 ++------- programs/cmd/wcmd.h | 5 +++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f7db4a9..6751d3e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -798,12 +798,12 @@ void WCMD_copy(WCHAR * args) { /* If parameter is a directory, ensure it ends in \ */ attributes = GetFileAttributesW(destname); - if ((destname[strlenW(destname) - 1] == '\\') || + if (ends_with_backslash( destname ) || ((attributes != INVALID_FILE_ATTRIBUTES) && (attributes & FILE_ATTRIBUTE_DIRECTORY))) { destisdirectory = TRUE; - if (!(destname[strlenW(destname) - 1] == '\\')) strcatW(destname, slashW); + if (!ends_with_backslash( destname )) strcatW(destname, slashW); WINE_TRACE("Directory, so full name is now '%s'\n", wine_dbgstr_w(destname)); } } @@ -880,7 +880,7 @@ void WCMD_copy(WCHAR * args) { /* If parameter is a directory, ensure it ends in \* */ attributes = GetFileAttributesW(srcpath); - if (srcpath[strlenW(srcpath) - 1] == '\\') { + if (ends_with_backslash( srcpath )) { /* We need to know where the filename part starts, so append * and recalculate the full resulting path */ diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 678e2a1..91142be 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -833,13 +833,8 @@ void WCMD_directory (WCHAR *args) if ((strchrW(path, '*') == NULL) && (strchrW(path, '%') == NULL)) { status = GetFileAttributesW(path); if ((status != INVALID_FILE_ATTRIBUTES) && (status & FILE_ATTRIBUTE_DIRECTORY)) { - if (path[strlenW(path)-1] == '\\') { - strcatW (path, starW); - } - else { - static const WCHAR slashStarW[] = {'\\','*','\0'}; - strcatW (path, slashStarW); - } + if (!ends_with_backslash( path )) strcatW( path, slashW ); + strcatW (path, starW); } } else { /* Special case wildcard search with no extension (ie parameters ending in '.') as diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index e5a0138..c135621 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -148,6 +148,11 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) return ret; } +static inline BOOL ends_with_backslash( const WCHAR *path ) +{ + return path[0] && path[strlenW(path) - 1] == '\\'; +} + /* Data structure to hold context when executing batch files */ typedef struct _BATCH_CONTEXT {

1 0

Matteo Bruni : wined3d: Check ARB_TEXTURE_COMPRESSION_RGTC for applying the correct fixup.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: dd923c3029fa4de25b5135c24edc6899c308b563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd923c3029fa4de25b5135c24… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 29 18:01:50 2014 +0100 wined3d: Check ARB_TEXTURE_COMPRESSION_RGTC for applying the correct fixup. --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e969fa7..b9d60de 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2018,7 +2018,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ */ } - if (gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) + if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) { idx = getFmtIdx(WINED3DFMT_ATI2N); gl_info->formats[idx].color_fixup = create_color_fixup_desc(

1 0

Jactry Zeng : riched20: Add IID_IRichEditOle and IID_ITextDocument support for ITextServices:: QueryInterface.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: a9491ec5d9f703e9a60e9effa4072d4d6908a2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9491ec5d9f703e9a60e9effa… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Oct 28 20:10:46 2014 +0800 riched20: Add IID_IRichEditOle and IID_ITextDocument support for ITextServices::QueryInterface. --- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 2 ++ dlls/riched20/richole.c | 33 ++++++++++++++------- dlls/riched20/tests/txtsrv.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/txtsrv.c | 11 ++++++- 5 files changed, 104 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 375b162..1e62fc1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2889,7 +2889,7 @@ void ME_DestroyEditor(ME_TextEditor *editor) ITextHost_Release(editor->texthost); if (editor->reOle) { - IRichEditOle_Release(editor->reOle); + DestroyIRichEditOle(editor->reOle); editor->reOle = NULL; } OleUninitialize(); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 255945e..d8abe4e 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -241,10 +241,12 @@ int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; +void DestroyIRichEditOle(IRichEditOle *iface) DECLSPEC_HIDDEN; void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, ME_Paragraph *para, BOOL selected) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) DECLSPEC_HIDDEN; void ME_DeleteReObject(REOBJECT* reo) DECLSPEC_HIDDEN; +void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; /* editor.c */ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 07ba279..0788125 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -143,17 +143,7 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface) TRACE ("%p ref=%u\n", This, ref); if (!ref) - { - ITextRangeImpl *txtRge; - TRACE ("Destroying %p\n", This); - This->txtSel->reOle = NULL; - This->editor->reOle = NULL; - ITextSelection_Release(&This->txtSel->ITextSelection_iface); - IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); - LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry) - txtRge->reOle = NULL; - heap_free(This); - } + DestroyIRichEditOle(&This->IRichEditOle_iface); return ref; } @@ -2375,6 +2365,21 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p return 1; } +void DestroyIRichEditOle(IRichEditOle *iface) +{ + IRichEditOleImpl *This = impl_from_IRichEditOle(iface); + ITextRangeImpl *txtRge; + + TRACE("Destroying %p\n", This); + This->txtSel->reOle = NULL; + This->editor->reOle = NULL; + ITextSelection_Release(&This->txtSel->ITextSelection_iface); + IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); + LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry) + txtRge->reOle = NULL; + heap_free(This); +} + static void convert_sizel(const ME_Context *c, const SIZEL* szl, SIZE* sz) { /* sizel is in .01 millimeters, sz in pixels */ @@ -2578,3 +2583,9 @@ void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) if (dst->pstg) IStorage_AddRef(dst->pstg); if (dst->polesite) IOleClientSite_AddRef(dst->polesite); } + +void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) +{ + IRichEditOleImpl *This = impl_from_IRichEditOle(iface); + *ppvObj = &This->ITextDocument_iface; +} diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 3401f8b..c154e2d 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -29,6 +29,8 @@ #include <winbase.h> #include <objbase.h> #include <richedit.h> +#include <tom.h> +#include <richole.h> #include <initguid.h> #include <imm.h> #include <textserv.h> @@ -862,6 +864,72 @@ static void test_COM(void) IUnknown_Release(unk_obj.inner_unk); } +static ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + +static void test_QueryInterface(void) +{ + HRESULT hres; + IRichEditOle *reole, *txtsrv_reole; + ITextDocument *txtdoc, *txtsrv_txtdoc; + ULONG refcount; + + if(!init_texthost()) + return; + + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); + + /* IID_IRichEditOle */ + hres = ITextServices_QueryInterface(txtserv, &IID_IRichEditOle, (void **)&txtsrv_reole); + ok(hres == S_OK, "ITextServices_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_reole); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + hres = IRichEditOle_QueryInterface(txtsrv_reole, &IID_ITextDocument, (void **)&txtdoc); + ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_reole); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + + ITextDocument_Release(txtdoc); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + IRichEditOle_Release(txtsrv_reole); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); + + /* IID_ITextDocument */ + hres = ITextServices_QueryInterface(txtserv, &IID_ITextDocument, (void **)&txtsrv_txtdoc); + ok(hres == S_OK, "ITextServices_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_txtdoc); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + hres = ITextDocument_QueryInterface(txtsrv_txtdoc, &IID_IRichEditOle, (void **)&reole); + ok(hres == S_OK, "ITextDocument_QueryInterface: 0x%08x\n", hres); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + refcount = get_refcount((IUnknown *)txtsrv_txtdoc); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); + + IRichEditOle_Release(reole); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + ITextDocument_Release(txtsrv_txtdoc); + refcount = get_refcount((IUnknown *)txtserv); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); + + free_texthost(); +} + START_TEST( txtsrv ) { setup_thiscall_wrappers(); @@ -887,6 +955,7 @@ START_TEST( txtsrv ) test_TxSetText(); test_TxGetNaturalSize(); test_TxDraw(); + test_QueryInterface(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 0ca1e1b..75bee6d 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "oleauto.h" #include "richole.h" +#include "tom.h" #include "imm.h" #include "textserv.h" #include "wine/debug.h" @@ -79,7 +80,15 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r *ppv = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_ITextServices)) *ppv = &This->ITextServices_iface; - else { + else if (IsEqualIID(riid, &IID_IRichEditOle) || IsEqualIID(riid, &IID_ITextDocument)) { + if (!This->editor->reOle) + if (!CreateIRichEditOle(This->outer_unk, This->editor, (void **)(&This->editor->reOle))) + return E_OUTOFMEMORY; + if (IsEqualIID(riid, &IID_ITextDocument)) + ME_GetITextDocumentInterface(This->editor->reOle, ppv); + else + *ppv = This->editor->reOle; + } else { *ppv = NULL; FIXME("Unknown interface: %s\n", debugstr_guid(riid)); return E_NOINTERFACE;

1 0

Michael Stefaniuc : wined3d: Remove no-op min() with magic number ( PVS_Studio).
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 00c25959d1fcd5718823620c5d742924cb56246e URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c25959d1fcd5718823620c5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 00:36:21 2014 +0100 wined3d: Remove no-op min() with magic number (PVS_Studio). --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bfbe09c..a7bc23d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4257,7 +4257,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, { int i; const char *one = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_ONE); - for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) + for(i = 0; i < MAX_REG_TEXCRD; i++) { if (reg_maps->texcoord_mask[i] && reg_maps->texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) shader_addline(buffer, "MOV result.texcoord[%u].w, %s\n", i, one);

1 0

Nikolay Sivov : dwrite: Store pixels per dip value for a render target.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: afea35f56abe3a3830e3d622816d6431718ad1e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afea35f56abe3a3830e3d6228… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 29 22:53:42 2014 +0300 dwrite: Store pixels per dip value for a render target. --- dlls/dwrite/gdiinterop.c | 16 ++++++++++++---- dlls/dwrite/tests/font.c | 17 +++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 0e2f902..b099e52 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -40,6 +40,7 @@ struct rendertarget { IDWriteBitmapRenderTarget IDWriteBitmapRenderTarget_iface; LONG ref; + FLOAT pixels_per_dip; DWRITE_MATRIX m; SIZE size; HDC hdc; @@ -140,15 +141,21 @@ static HDC WINAPI rendertarget_GetMemoryDC(IDWriteBitmapRenderTarget *iface) static FLOAT WINAPI rendertarget_GetPixelsPerDip(IDWriteBitmapRenderTarget *iface) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); - FIXME("(%p): stub\n", This); - return 1.0; + TRACE("(%p)\n", This); + return This->pixels_per_dip; } static HRESULT WINAPI rendertarget_SetPixelsPerDip(IDWriteBitmapRenderTarget *iface, FLOAT pixels_per_dip) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); - FIXME("(%p)->(%f): stub\n", This, pixels_per_dip); - return E_NOTIMPL; + + TRACE("(%p)->(%.2f)\n", This, pixels_per_dip); + + if (pixels_per_dip <= 0.0) + return E_INVALIDARG; + + This->pixels_per_dip = pixels_per_dip; + return S_OK; } static HRESULT WINAPI rendertarget_GetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX *transform) @@ -229,6 +236,7 @@ static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWrite target->m.m11 = target->m.m22 = 1.0; target->m.m12 = target->m.m21 = 0.0; target->m.dx = target->m.dy = 0.0; + target->pixels_per_dip = 1.0; *ret = &target->IDWriteBitmapRenderTarget_iface; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 29f3a39..e76dd6a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -379,6 +379,7 @@ static void test_CreateBitmapRenderTarget(void) DWRITE_MATRIX m; DIBSECTION ds; HRESULT hr; + FLOAT pdip; SIZE size; HDC hdc; int ret; @@ -511,6 +512,22 @@ if (0) /* crashes on native */ ok(m.m11 == 1.0 && m.m22 == 1.0 && m.m12 == 0.0 && m.m21 == 0.0, "got %.1f,%.1f,%.1f,%.1f\n", m.m11, m.m22, m.m12, m.m21); ok(m.dx == 0.0 && m.dy == 0.0, "got %.1f,%.1f\n", m.dx, m.dy); + /* pixels per dip */ + pdip = IDWriteBitmapRenderTarget_GetPixelsPerDip(target); + ok(pdip == 1.0, "got %.2f\n", pdip); + + hr = IDWriteBitmapRenderTarget_SetPixelsPerDip(target, 2.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteBitmapRenderTarget_SetPixelsPerDip(target, -1.0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteBitmapRenderTarget_SetPixelsPerDip(target, 0.0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + pdip = IDWriteBitmapRenderTarget_GetPixelsPerDip(target); + ok(pdip == 2.0, "got %.2f\n", pdip); + IDWriteBitmapRenderTarget_Release(target); IDWriteGdiInterop_Release(interop); IDWriteFactory_Release(factory);

1 0

Vincent Povirk : gdiplus: Fix error when drawing from a rectangle outside bitmap bounds.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 4361cbabd7c133184f487719232b3341e760b1f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4361cbabd7c133184f4877192… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 28 16:09:57 2014 -0500 gdiplus: Fix error when drawing from a rectangle outside bitmap bounds. --- dlls/gdiplus/graphics.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d192bf2..840d866 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -827,6 +827,10 @@ static void get_bitmap_sample_size(InterpolationMode interpolation, WrapMode wra right = bitmap->width-1; if (bottom >= bitmap->height) bottom = bitmap->height-1; + if (bottom < top || right < left) + /* entirely outside image, just sample a pixel so we don't have to + * special-case this later */ + left = top = right = bottom = 0; } else {

1 0

Jactry Zeng : riched20: Add COM aggregation support for IRichEditOle.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 234310e752620dbcc55b6ecd76b860bd8c97218f URL: http://source.winehq.org/git/wine.git/?a=commit;h=234310e752620dbcc55b6ecd7… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Oct 28 20:10:33 2014 +0800 riched20: Add COM aggregation support for IRichEditOle. --- dlls/riched20/editor.c | 4 +-- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 72 +++++++++++++++++++++++++++++++++++++------------ 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a277510..375b162 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1194,7 +1194,7 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm if (!info->lpRichEditOle) { - CreateIRichEditOle(info->editor, (VOID**)&info->lpRichEditOle); + CreateIRichEditOle(NULL, info->editor, (VOID**)&info->lpRichEditOle); } if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK && @@ -4474,7 +4474,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETOLEINTERFACE: { if (!editor->reOle) - if (!CreateIRichEditOle(editor, (LPVOID *)&editor->reOle)) + if (!CreateIRichEditOle(NULL, editor, (LPVOID *)&editor->reOle)) return 0; *(LPVOID *)lParam = editor->reOle; IRichEditOle_AddRef(editor->reOle); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 3987907..255945e 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -240,7 +240,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ -LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *) DECLSPEC_HIDDEN; +LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, ME_Paragraph *para, BOOL selected) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 9e7c123..07ba279 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -52,8 +52,10 @@ typedef struct IOleClientSiteImpl IOleClientSiteImpl; typedef struct ITextRangeImpl ITextRangeImpl; typedef struct IRichEditOleImpl { + IUnknown IUnknown_inner; IRichEditOle IRichEditOle_iface; ITextDocument ITextDocument_iface; + IUnknown *outer_unk; LONG ref; ME_TextEditor *editor; @@ -95,44 +97,47 @@ static inline IRichEditOleImpl *impl_from_ITextDocument(ITextDocument *iface) return CONTAINING_RECORD(iface, IRichEditOleImpl, ITextDocument_iface); } -static HRESULT WINAPI -IRichEditOle_fnQueryInterface(IRichEditOle *me, REFIID riid, LPVOID *ppvObj) +static inline IRichEditOleImpl *impl_from_IUnknown(IUnknown *iface) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); + return CONTAINING_RECORD(iface, IRichEditOleImpl, IUnknown_inner); +} - TRACE("%p %s\n", This, debugstr_guid(riid) ); +static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, REFIID riid, LPVOID *ppvObj) +{ + IRichEditOleImpl *This = impl_from_IUnknown(iface); + + TRACE("%p %s\n", This, debugstr_guid(riid)); *ppvObj = NULL; - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IRichEditOle)) + if (IsEqualGUID(riid, &IID_IUnknown)) + *ppvObj = &This->IUnknown_inner; + else if (IsEqualGUID(riid, &IID_IRichEditOle)) *ppvObj = &This->IRichEditOle_iface; else if (IsEqualGUID(riid, &IID_ITextDocument)) *ppvObj = &This->ITextDocument_iface; if (*ppvObj) { - IRichEditOle_AddRef(me); + IUnknown_AddRef((IUnknown *)*ppvObj); return S_OK; } - FIXME("%p: unhandled interface %s\n", This, debugstr_guid(riid) ); + FIXME("%p: unhandled interface %s\n", This, debugstr_guid(riid)); return E_NOINTERFACE; } -static ULONG WINAPI -IRichEditOle_fnAddRef(IRichEditOle *me) +static ULONG WINAPI IRichEditOleImpl_inner_fnAddRef(IUnknown *iface) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - ULONG ref = InterlockedIncrement( &This->ref ); + IRichEditOleImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p ref = %u\n", This, ref); return ref; } -static ULONG WINAPI -IRichEditOle_fnRelease(IRichEditOle *me) +static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); + IRichEditOleImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE ("%p ref=%u\n", This, ref); @@ -152,6 +157,34 @@ IRichEditOle_fnRelease(IRichEditOle *me) return ref; } +static const IUnknownVtbl reo_unk_vtbl = +{ + IRichEditOleImpl_inner_fnQueryInterface, + IRichEditOleImpl_inner_fnAddRef, + IRichEditOleImpl_inner_fnRelease +}; + +static HRESULT WINAPI +IRichEditOle_fnQueryInterface(IRichEditOle *me, REFIID riid, LPVOID *ppvObj) +{ + IRichEditOleImpl *This = impl_from_IRichEditOle(me); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); +} + +static ULONG WINAPI +IRichEditOle_fnAddRef(IRichEditOle *me) +{ + IRichEditOleImpl *This = impl_from_IRichEditOle(me); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI +IRichEditOle_fnRelease(IRichEditOle *me) +{ + IRichEditOleImpl *This = impl_from_IRichEditOle(me); + return IUnknown_Release(This->outer_unk); +} + static HRESULT WINAPI IRichEditOle_fnActivateAs(IRichEditOle *me, REFCLSID rclsid, REFCLSID rclsidAs) { @@ -2305,7 +2338,7 @@ CreateTextSelection(IRichEditOleImpl *reOle) return txtSel; } -LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) +LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) { IRichEditOleImpl *reo; @@ -2313,6 +2346,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) if (!reo) return 0; + reo->IUnknown_inner.lpVtbl = &reo_unk_vtbl; reo->IRichEditOle_iface.lpVtbl = &revt; reo->ITextDocument_iface.lpVtbl = &tdvt; reo->ref = 1; @@ -2331,8 +2365,12 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) return 0; } TRACE("Created %p\n",reo); - *ppObj = reo; list_init(&reo->rangelist); + if (outer_unk) + reo->outer_unk = outer_unk; + else + reo->outer_unk = &reo->IUnknown_inner; + *ppvObj = &reo->IRichEditOle_iface; return 1; }

1 0

Jactry Zeng : riched20: Fix a leak.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: ffb706ceb0ce59088f134012c185f6876436306b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb706ceb0ce59088f134012c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Oct 28 20:10:03 2014 +0800 riched20: Fix a leak. --- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 1 + dlls/riched20/txtsrv.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3c0d970..a277510 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2863,7 +2863,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) return ed; } -static void ME_DestroyEditor(ME_TextEditor *editor) +void ME_DestroyEditor(ME_TextEditor *editor) { ME_DisplayItem *pFirst = editor->pBuffer->pFirst; ME_DisplayItem *p = pFirst, *pNext = NULL; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index edbac8e..3987907 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -248,6 +248,7 @@ void ME_DeleteReObject(REOBJECT* reo) DECLSPEC_HIDDEN; /* editor.c */ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; +void ME_DestroyEditor(ME_TextEditor *editor) DECLSPEC_HIDDEN; LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode, HRESULT* phresult) DECLSPEC_HIDDEN; void ME_SendOldNotify(ME_TextEditor *editor, int nCode) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 636efff..0ca1e1b 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -108,7 +108,7 @@ static ULONG WINAPI ITextServicesImpl_Release(IUnknown *iface) if (!ref) { - ITextHost_Release(This->pMyHost); + ME_DestroyEditor(This->editor); This->csTxtSrv.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csTxtSrv); CoTaskMemFree(This);

1 0

Nikolay Sivov : dwrite: Implement system font collection as any other font collection.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: cae5d19338099f3ae8a57fcaf7c8bf46a2d79538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae5d19338099f3ae8a57fcaf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 29 22:41:47 2014 +0300 dwrite: Implement system font collection as any other font collection. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 631 +++++++++++++++---------------------------- dlls/dwrite/main.c | 2 +- dlls/dwrite/tests/font.c | 39 +-- 4 files changed, 225 insertions(+), 449 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cae5d19338099f3ae8a57…

1 0

Nikolay Sivov : dwrite: Properly null-terminate name string when converting to WCHAR.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 2bc984a5b1eafa23944fdee26526c342329da870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc984a5b1eafa23944fdee26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 29 22:39:55 2014 +0300 dwrite: Properly null-terminate name string when converting to WCHAR. --- dlls/dwrite/opentype.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 21b1cb2..6d48f90 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -793,8 +793,9 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA if (codepage) { DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0); - name_string = heap_alloc(sizeof(WCHAR) * len); + name_string = heap_alloc(sizeof(WCHAR) * (len+1)); MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, name_string, len); + name_string[len] = 0; } else { int i;

1 0

Bruno Jesus : regedit: Allow importing/exporting strings with '\r'.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 84d72396401f845969d2b9b55506e606d2419d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d72396401f845969d2b9b55… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Oct 29 23:55:08 2014 -0200 regedit: Allow importing/exporting strings with '\r'. --- programs/regedit/regproc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 9d96287..1adeddf 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -267,6 +267,9 @@ static int REGPROC_unescape_string(WCHAR* str) case 'n': str[val_idx] = '\n'; break; + case 'r': + str[val_idx] = '\r'; + break; case '0': str[val_idx] = '\0'; break; @@ -963,6 +966,13 @@ static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD (*line_buf)[pos++] = 'n'; break; + case '\r': + extra++; + REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + str_len + extra); + (*line_buf)[pos++] = '\\'; + (*line_buf)[pos++] = 'r'; + break; + case '\\': case '"': extra++;

1 0

Nikolay Sivov : dwrite: Turn fixme to trace in Analyze().
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 712692161573fc03fa7ef127e957088dc43a7b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=712692161573fc03fa7ef127e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 29 22:43:51 2014 +0300 dwrite: Turn fixme to trace in Analyze(). --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 622027c..8420fdc 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1792,7 +1792,7 @@ static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSup IDWriteFontFileStream *stream; HRESULT hr; - FIXME("(%p)->(%p, %p, %p, %p): Stub\n", This, isSupportedFontType, fontFileType, fontFaceType, numberOfFaces); + TRACE("(%p)->(%p, %p, %p, %p)\n", This, isSupportedFontType, fontFileType, fontFaceType, numberOfFaces); *isSupportedFontType = FALSE; *fontFileType = DWRITE_FONT_FILE_TYPE_UNKNOWN;

1 0

Jacek Caban : mshtml: Don' t call stop_binding in error cases in start_binding.
by Alexandre Julliard Oct. 30, 2014

Oct. 30, 2014

Module: wine Branch: master Commit: 0506a52266a0243a01338208830fa3da059f9358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0506a52266a0243a013382088… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 29 18:00:49 2014 +0100 mshtml: Don't call stop_binding in error cases in start_binding. --- dlls/mshtml/navigate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index a0174ea..0b3d5b5 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -801,7 +801,7 @@ HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBi } if(FAILED(hres)) { - bscallback->vtbl->stop_binding(bscallback, hres); + bscallback->window = NULL; return hres; } @@ -809,7 +809,7 @@ HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBi IBindCtx_Release(bctx); if(FAILED(hres)) { WARN("BindToStorage failed: %08x\n", hres); - bscallback->vtbl->stop_binding(bscallback, hres); + bscallback->window = NULL; return hres; }

1 0

Huw Davies : user32: Merge the blitting of the centred and non-centred cases.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 3cd145f63f0ba15726b32c6be800460e3aef84e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd145f63f0ba15726b32c6be… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 29 09:09:08 2014 +0000 user32: Merge the blitting of the centred and non-centred cases. --- dlls/user32/static.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index f4b5880..ff5c77c 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -775,19 +775,15 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) GetClientRect(hwnd, &rcClient); if (style & SS_CENTERIMAGE) { - INT x, y; - x = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; - y = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; FillRect( hdc, &rcClient, hbrush ); - BitBlt(hdc, x, y, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, - SRCCOPY); - } - else - { - StretchBlt(hdc, 0, 0, rcClient.right - rcClient.left, - rcClient.bottom - rcClient.top, hMemDC, - 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); + rcClient.left = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; + rcClient.top = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; + rcClient.right = rcClient.left + bm.bmWidth; + rcClient.bottom = rcClient.top + bm.bmHeight; } + StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, + rcClient.bottom - rcClient.top, hMemDC, + 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); SelectObject(hMemDC, oldbitmap); DeleteDC(hMemDC); }

1 0

Nikolay Sivov : dwrite: Use API-defined type for family count.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 6706ada9f845866e9ffe990c08083578b5558bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6706ada9f845866e9ffe990c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 14:48:46 2014 +0300 dwrite: Use API-defined type for family count. --- dlls/dwrite/font.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 50c3acb..b271e93 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -71,8 +71,8 @@ struct dwrite_fontcollection { int alloc; struct dwrite_fontfamily_data **family_data; - DWORD data_count; - int data_alloc; + UINT32 family_count; + UINT32 family_alloc; }; struct dwrite_fontfamily { @@ -1304,7 +1304,7 @@ static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) for (i = 0; i < This->count; i++) heap_free(This->families[i]); heap_free(This->families); - for (i = 0; i < This->data_count; i++) + for (i = 0; i < This->family_count; i++) _free_fontfamily_data(This->family_data[i]); heap_free(This->family_data); heap_free(This); @@ -1317,8 +1317,8 @@ static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollecti { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); TRACE("(%p)\n", This); - if (This->data_count) - return This->data_count; + if (This->family_count) + return This->family_count; return This->count; } @@ -1331,9 +1331,9 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection * TRACE("(%p)->(%u %p)\n", This, index, family); - if (This->data_count) + if (This->family_count) { - if (index >= This->data_count) + if (index >= This->family_count) { *family = NULL; return E_FAIL; @@ -1362,8 +1362,8 @@ static HRESULT collection_find_family(struct dwrite_fontcollection *collection, { UINT32 i; - if (collection->data_count) { - for (i = 0; i < collection->data_count; i++) { + if (collection->family_count) { + for (i = 0; i < collection->family_count; i++) { IDWriteLocalizedStrings *family_name = collection->family_data[i]->familyname; HRESULT hr; int j; @@ -1421,7 +1421,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec if (!face) return E_INVALIDARG; - for (i = 0; i < This->data_count; i++) { + for (i = 0; i < This->family_count; i++) { struct dwrite_fontfamily_data *family_data = This->family_data[i]; for (j = 0; j < family_data->font_count; j++) { if ((IDWriteFontFace*)family_data->fonts[j]->face == face) { @@ -1494,21 +1494,21 @@ static HRESULT fontfamily_add_font(struct dwrite_fontfamily_data *family_data, s static HRESULT fontcollection_add_family(struct dwrite_fontcollection *collection, struct dwrite_fontfamily_data *family) { - if (collection->data_alloc < collection->data_count + 1) { + if (collection->family_alloc < collection->family_count + 1) { struct dwrite_fontfamily_data **new_list; UINT32 new_alloc; - new_alloc = collection->data_alloc * 2; + new_alloc = collection->family_alloc * 2; new_list = heap_realloc(collection->family_data, sizeof(*new_list) * new_alloc); if (!new_list) return E_OUTOFMEMORY; - collection->data_alloc = new_alloc; + collection->family_alloc = new_alloc; collection->family_data = new_list; } - collection->family_data[collection->data_count] = family; - collection->data_count++; + collection->family_data[collection->family_count] = family; + collection->family_count++; return S_OK; } @@ -1517,8 +1517,8 @@ static HRESULT init_font_collection(struct dwrite_fontcollection *collection) { collection->IDWriteFontCollection_iface.lpVtbl = &fontcollectionvtbl; collection->ref = 1; - collection->data_count = 0; - collection->data_alloc = 2; + collection->family_count = 0; + collection->family_alloc = 2; collection->count = 0; collection->alloc = 0; collection->families = NULL; @@ -1739,8 +1739,8 @@ HRESULT get_system_fontcollection(IDWriteFontCollection **collection) heap_free(This); return E_OUTOFMEMORY; } - This->data_count = 0; - This->data_alloc = 2; + This->family_count = 0; + This->family_alloc = 2; This->family_data = heap_alloc(sizeof(*This->family_data)*2); if (!This->family_data) {

1 0

Michael Stefaniuc : oleaut32/tests: Remove always true ok conditions ( PVS-Studio).
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 53c54d922229210afcfbad697ed46caf013228ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c54d922229210afcfbad697… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 28 23:41:14 2014 +0100 oleaut32/tests: Remove always true ok conditions (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 224dad3..d00e577 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -7403,10 +7403,10 @@ static void test_VarPow(void) hres = pVarPow(&cy, &right, &result); if (hres == S_OK) { - ok(hres == S_OK && V_VT(&result) == VT_R8, + ok(V_VT(&result) == VT_R8, "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); - ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), + ok(EQ_DOUBLE(V_R8(&result), 4.0), "VARPOW: CY value %f, expected %f\n", V_R8(&result), 4.0); } else @@ -7440,10 +7440,10 @@ static void test_VarPow(void) hres = pVarPow(&dec, &right, &result); if (hres == S_OK) { - ok(hres == S_OK && V_VT(&result) == VT_R8, + ok(V_VT(&result) == VT_R8, "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); - ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), + ok(EQ_DOUBLE(V_R8(&result), 4.0), "VARPOW: DECIMAL value %f, expected %f\n", V_R8(&result), 4.0); } else

1 0

Vincent Povirk : msvcrt: Implement _wcsnicmp_l.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 1860efaa9e4f8143cebfd8e8eb63dca0c33ec3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1860efaa9e4f8143cebfd8e8e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 4 14:17:26 2014 -0500 msvcrt: Implement _wcsnicmp_l. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 10 +++++++++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2f2b0dc..d6c38f4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1497,7 +1497,7 @@ @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp -@ stub _wcsnicmp_l +@ cdecl _wcsnicmp_l(wstr wstr long ptr) MSVCRT__wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 282f5bc..02b6497 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1856,7 +1856,7 @@ @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp -@ stub _wcsnicmp_l +@ cdecl _wcsnicmp_l(wstr wstr long ptr) MSVCRT__wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5783f3e..ce09f00 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1176,7 +1176,7 @@ @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp -@ stub _wcsnicmp_l +@ cdecl _wcsnicmp_l(wstr wstr long ptr) MSVCRT__wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ec5d1e7..e4302cf 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1152,7 +1152,7 @@ @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp -@ stub _wcsnicmp_l +@ cdecl _wcsnicmp_l(wstr wstr long ptr) MSVCRT__wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 51c2d40..f376db3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1113,7 +1113,7 @@ @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp -# stub _wcsnicmp_l(wstr wstr long ptr) +@ cdecl _wcsnicmp_l(wstr wstr long ptr) MSVCRT__wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c2b8f58..4123d06 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -90,11 +90,19 @@ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str } /********************************************************************* + * _wcsnicmp_l (MSVCRT.@) + */ +INT CDECL MSVCRT__wcsnicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, INT n, MSVCRT__locale_t locale) +{ + return strncmpiW(str1, str2, n); +} + +/********************************************************************* * _wcsnicmp (MSVCRT.@) */ INT CDECL MSVCRT__wcsnicmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, INT n) { - return strncmpiW(str1, str2, n); + return MSVCRT__wcsnicmp_l(str1, str2, n, NULL); } /*********************************************************************

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Address GetComponentByName.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: a235e86316438a03a418de7cab975db4ada3d4d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a235e86316438a03a418de7ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 29 16:11:46 2014 +1000 dpnet: Implement IDirectPlay8Address GetComponentByName. --- dlls/dpnet/address.c | 53 ++++++++++++++++++++++++++++++++++++++++++---- dlls/dpnet/tests/address.c | 23 +++++++++++++++++--- 2 files changed, 69 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 7df7ad6..2062bc4 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -316,9 +316,53 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetNumComponents(IDirectPlay8Addre static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(IDirectPlay8Address *iface, const WCHAR *const pwszName, void *pvBuffer, DWORD *pdwBufferSize, DWORD *pdwDataType) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + struct component *entry; + + TRACE("(%p)->(%p %p %p %p)\n", This, pwszName, pvBuffer, pdwBufferSize, pdwDataType); + + if(!pwszName || !pdwBufferSize || !pdwDataType || (!pvBuffer && pdwBufferSize)) + return E_POINTER; + + LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) + { + if (lstrcmpW(pwszName, entry->name) == 0) + { + TRACE("Found %s\n", debugstr_w(pwszName)); + + if(*pdwBufferSize < entry->size) + { + *pdwBufferSize = entry->size; + return DPNERR_BUFFERTOOSMALL; + } + + *pdwBufferSize = entry->size; + *pdwDataType = entry->type; + + switch (entry->type) + { + case DPNA_DATATYPE_DWORD: + memcpy(pvBuffer, &entry->data.value, sizeof(DWORD)); + break; + case DPNA_DATATYPE_GUID: + memcpy(pvBuffer, &entry->data.guid, sizeof(GUID)); + break; + case DPNA_DATATYPE_STRING: + memcpy(pvBuffer, &entry->data.string, entry->size); + break; + case DPNA_DATATYPE_STRING_ANSI: + memcpy(pvBuffer, &entry->data.ansi, entry->size); + break; + case DPNA_DATATYPE_BINARY: + memcpy(pvBuffer, &entry->data.binary, entry->size); + break; + } + + return S_OK; + } + } + + return DPNERR_DOESNOTEXIST; } static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByIndex(IDirectPlay8Address *iface, @@ -364,7 +408,6 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * list_add_tail(&This->components, &entry->entry); } - entry->size = dwDataSize; switch (dwDataType) { case DPNA_DATATYPE_DWORD: @@ -402,6 +445,8 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * break; } + entry->size = dwDataSize; + return DPN_OK; } diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index ad35954..5908000 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -102,11 +102,28 @@ static void address_addcomponents(void) hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDirectPlay8Address_GetComponentByName(localaddr, NULL, &compguid, &size, &type); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, NULL, &size, &type); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, NULL, &type); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + size = sizeof(GUID)-1; + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, &type); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(size == sizeof(GUID), "got %d\n", size); + size = sizeof(GUID); hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, &type); - todo_wine ok(IsEqualGUID(&compguid, &IID_Random), "incorrect guid\n"); - ok(size == sizeof(GUID), "incorrect size\n"); - todo_wine ok(type == DPNA_DATATYPE_GUID, "incorrect type\n"); + ok(IsEqualGUID(&compguid, &IID_Random), "incorrect guid\n"); + ok(size == sizeof(GUID), "incorrect size got %d\n", size); + ok(type == DPNA_DATATYPE_GUID, "incorrect type\n"); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetNumComponents(localaddr, NULL);

1 0

Nikolay Sivov : dwrite: Set oblique simulation in GetFirstMatchingFont() when appropriate.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 1d2993940ae0d0c9a63141ea0e54061be356c4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d2993940ae0d0c9a63141ea0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 19:01:48 2014 +0300 dwrite: Set oblique simulation in GetFirstMatchingFont() when appropriate. --- dlls/dwrite/font.c | 27 +++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 20 +++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index dd46ee7..4ebe261 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1213,6 +1213,17 @@ static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, return clone_localizedstring(This->data->familyname, names); } +static inline BOOL is_matching_font_style(DWRITE_FONT_STYLE style, DWRITE_FONT_STYLE font_style) +{ + if (style == font_style) + return TRUE; + + if (((style == DWRITE_FONT_STYLE_ITALIC) || (style == DWRITE_FONT_STYLE_OBLIQUE)) && font_style == DWRITE_FONT_STYLE_NORMAL) + return TRUE; + + return FALSE; +} + static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STRETCH stretch, DWRITE_FONT_STYLE style, IDWriteFont **font) { @@ -1237,7 +1248,7 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i int found = -1, i; for (i = 0; i < This->data->font_count; i++) { - if (style == This->data->fonts[i]->style && stretch == This->data->fonts[i]->stretch) { + if (is_matching_font_style(style, This->data->fonts[i]->style) && stretch == This->data->fonts[i]->stretch) { DWRITE_FONT_WEIGHT font_weight = This->data->fonts[i]->weight; UINT32 weight_diff = abs(font_weight - weight); if (weight_diff < min_weight_diff) { @@ -1247,7 +1258,19 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i } } - return found != -1 ? create_font_from_data(This->data->fonts[found], iface, DWRITE_FONT_SIMULATIONS_NONE, font) : DWRITE_E_NOFONT; + if (found != -1) { + DWRITE_FONT_SIMULATIONS simulations = DWRITE_FONT_SIMULATIONS_NONE; + + if (((style == DWRITE_FONT_STYLE_ITALIC) || (style == DWRITE_FONT_STYLE_OBLIQUE)) && + This->data->fonts[found]->style == DWRITE_FONT_STYLE_ITALIC) { + simulations = DWRITE_FONT_SIMULATIONS_OBLIQUE; + } + return create_font_from_data(This->data->fonts[found], iface, simulations, font); + } + else { + *font = NULL; + return DWRITE_E_NOFONT; + } } } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9cad650..74aad58 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1475,10 +1475,13 @@ if (font3) static void test_GetFirstMatchingFont(void) { + DWRITE_FONT_SIMULATIONS simulations; IDWriteFontCollection *collection; IDWriteFont *font, *font2; IDWriteFontFamily *family; IDWriteFactory *factory; + UINT32 index; + BOOL exists; HRESULT hr; factory = create_factory(); @@ -1486,7 +1489,13 @@ static void test_GetFirstMatchingFont(void) hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontCollection_GetFontFamily(collection, 0, &family); + index = ~0; + exists = FALSE; + hr = IDWriteFontCollection_FindFamilyName(collection, tahomaW, &index, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists, "got %d\n", exists); + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, @@ -1497,6 +1506,15 @@ static void test_GetFirstMatchingFont(void) DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(font != font2, "got %p, %p\n", font, font2); + IDWriteFont_Release(font); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_ITALIC, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + simulations = IDWriteFont_GetSimulations(font); +todo_wine + ok(simulations == DWRITE_FONT_SIMULATIONS_OBLIQUE, "%d\n", simulations); IDWriteFont_Release(font); IDWriteFont_Release(font2);

1 0

Nikolay Sivov : dwrite: Store simulations flags at font instance level.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 901a65ae42d56f4b791534f6b22b46ff6356ac14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=901a65ae42d56f4b791534f6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 17:37:49 2014 +0300 dwrite: Store simulations flags at font instance level. --- dlls/dwrite/font.c | 24 +++++++++++-------- dlls/dwrite/tests/font.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5112d24..dd46ee7 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -37,7 +37,6 @@ struct dwrite_font_data { DWRITE_FONT_STYLE style; DWRITE_FONT_STRETCH stretch; DWRITE_FONT_WEIGHT weight; - DWRITE_FONT_SIMULATIONS simulations; DWRITE_FONT_METRICS metrics; IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME+1]; @@ -91,6 +90,7 @@ struct dwrite_font { BOOL is_system; IDWriteFontFamily *family; + DWRITE_FONT_SIMULATIONS simulations; struct dwrite_font_data *data; }; @@ -138,7 +138,7 @@ struct dwrite_fontfile { static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFontFamily **family); static HRESULT create_fontfamily_from_data(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family); static HRESULT create_font_base(IDWriteFont **font); -static HRESULT create_font_from_data(struct dwrite_font_data*,IDWriteFontFamily*,IDWriteFont**); +static HRESULT create_font_from_data(struct dwrite_font_data*,IDWriteFontFamily*,DWRITE_FONT_SIMULATIONS,IDWriteFont**); static inline struct dwrite_fontface *impl_from_IDWriteFontFace2(IDWriteFontFace2 *iface) { @@ -744,7 +744,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 hr = font->is_system ? create_system_fontface(font, &face) : IDWriteFactory_CreateFontFace(data->factory, data->face_type, 1, &data->file, - data->face_index, DWRITE_FONT_SIMULATIONS_NONE, &face); + data->face_index, font->simulations, &face); if (FAILED(hr)) return hr; @@ -765,7 +765,7 @@ static HRESULT create_font_base(IDWriteFont **font) data = heap_alloc_zero(sizeof(*data)); if (!data) return E_OUTOFMEMORY; - ret = create_font_from_data( data, NULL, font ); + ret = create_font_from_data( data, NULL, DWRITE_FONT_SIMULATIONS_NONE, font ); if (FAILED(ret)) heap_free( data ); return ret; } @@ -870,7 +870,7 @@ static HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **f This->is_system = TRUE; This->family = family; - This->data->simulations = DWRITE_FONT_SIMULATIONS_NONE; + This->simulations = DWRITE_FONT_SIMULATIONS_NONE; This->data->facename = heap_strdupW(logfont->lfFaceName); return S_OK; @@ -1016,7 +1016,7 @@ static DWRITE_FONT_SIMULATIONS WINAPI dwritefont_GetSimulations(IDWriteFont2 *if { struct dwrite_font *This = impl_from_IDWriteFont2(iface); TRACE("(%p)\n", This); - return This->data->simulations; + return This->simulations; } static void WINAPI dwritefont_GetMetrics(IDWriteFont2 *iface, DWRITE_FONT_METRICS *metrics) @@ -1201,7 +1201,7 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily *iface, UINT32 { if (index >= This->data->font_count) return E_INVALIDARG; - return create_font_from_data(This->data->fonts[index], iface, font); + return create_font_from_data(This->data->fonts[index], iface, DWRITE_FONT_SIMULATIONS_NONE, font); } else return E_NOTIMPL; @@ -1247,7 +1247,7 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i } } - return found != -1 ? create_font_from_data(This->data->fonts[found], iface, font) : DWRITE_E_NOFONT; + return found != -1 ? create_font_from_data(This->data->fonts[found], iface, DWRITE_FONT_SIMULATIONS_NONE, font) : DWRITE_E_NOFONT; } } @@ -1414,6 +1414,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); struct dwrite_fontfamily_data *found_family = NULL; struct dwrite_font_data *found_font = NULL; + DWRITE_FONT_SIMULATIONS simulations; IDWriteFontFamily *family; UINT32 i, j; HRESULT hr; @@ -1443,7 +1444,8 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec if (FAILED(hr)) return hr; - hr = create_font_from_data(found_font, family, font); + simulations = IDWriteFontFace_GetSimulations(face); + hr = create_font_from_data(found_font, family, simulations, font); IDWriteFontFamily_Release(family); return hr; } @@ -1819,7 +1821,8 @@ static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFon return ret; } -static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFontFamily *family, IDWriteFont **font) +static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFontFamily *family, DWRITE_FONT_SIMULATIONS simulations, + IDWriteFont **font) { struct dwrite_font *This; *font = NULL; @@ -1833,6 +1836,7 @@ static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFontF if (family) IDWriteFontFamily_AddRef(family); This->is_system = FALSE; + This->simulations = simulations; This->data = data; InterlockedIncrement(&This->data->ref); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d9e927f..9cad650 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1651,6 +1651,65 @@ static void test_CreateFontFaceFromHdc(void) IDWriteFactory_Release(factory); } +static void test_GetSimulations(void) +{ + DWRITE_FONT_SIMULATIONS simulations; + IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFont *font; + LOGFONTW logfont; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, tahomaW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + simulations = IDWriteFont_GetSimulations(font); +todo_wine + ok(simulations == DWRITE_FONT_SIMULATIONS_OBLIQUE, "got %d\n", simulations); + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + simulations = IDWriteFontFace_GetSimulations(fontface); +todo_wine + ok(simulations == DWRITE_FONT_SIMULATIONS_OBLIQUE, "got %d\n", simulations); + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 0; + lstrcpyW(logfont.lfFaceName, tahomaW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + simulations = IDWriteFont_GetSimulations(font); + ok(simulations == 0, "got %d\n", simulations); + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + simulations = IDWriteFontFace_GetSimulations(fontface); + ok(simulations == 0, "got %d\n", simulations); + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + + IDWriteGdiInterop_Release(interop); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -1678,6 +1737,7 @@ START_TEST(font) test_GetInformationalStrings(); test_GetGdiInterop(); test_CreateFontFaceFromHdc(); + test_GetSimulations(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Allow for a weight difference in GetFirstMatchingFont().
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 5a5a6bdd92aa83b73fd54db8dddaf8329a9df813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5a6bdd92aa83b73fd54db8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 14:53:59 2014 +0300 dwrite: Allow for a weight difference in GetFirstMatchingFont(). --- dlls/dwrite/font.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b271e93..5112d24 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1233,17 +1233,21 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i } else { - int i; - for (i = 0; i < This->data->font_count; i++) - { - if (style == This->data->fonts[i]->style && - weight == This->data->fonts[i]->weight && - stretch == This->data->fonts[i]->stretch) - { - return create_font_from_data(This->data->fonts[i], iface, font); + UINT32 min_weight_diff = ~0u; + int found = -1, i; + + for (i = 0; i < This->data->font_count; i++) { + if (style == This->data->fonts[i]->style && stretch == This->data->fonts[i]->stretch) { + DWRITE_FONT_WEIGHT font_weight = This->data->fonts[i]->weight; + UINT32 weight_diff = abs(font_weight - weight); + if (weight_diff < min_weight_diff) { + min_weight_diff = weight_diff; + found = i; + } } } - return DWRITE_E_NOFONT; + + return found != -1 ? create_font_from_data(This->data->fonts[found], iface, font) : DWRITE_E_NOFONT; } }

1 0

Nikolay Sivov : dwrite: Support Mac platform id and some of its encodings when reading 'name' table.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 6128e73f7734db4d03048e05c574ebcd90618e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6128e73f7734db4d03048e05c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 13:40:37 2014 +0300 dwrite: Support Mac platform id and some of its encodings when reading 'name' table. --- dlls/dwrite/opentype.c | 156 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 128 insertions(+), 28 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c6f7a52..21b1cb2 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -201,6 +201,15 @@ typedef struct { TT_NameRecord nameRecord[1]; } TT_NAME_V0; +enum OPENTYPE_PLATFORM_ID +{ + OPENTYPE_PLATFORM_UNICODE = 0, + OPENTYPE_PLATFORM_MAC, + OPENTYPE_PLATFORM_ISO, + OPENTYPE_PLATFORM_WIN, + OPENTYPE_PLATFORM_CUSTOM +}; + enum TT_NAME_WINDOWS_ENCODING_ID { TT_NAME_WINDOWS_ENCODING_SYMBOL = 0, @@ -216,6 +225,43 @@ enum TT_NAME_WINDOWS_ENCODING_ID TT_NAME_WINDOWS_ENCODING_UCS4 }; +enum TT_NAME_MAC_ENCODING_ID +{ + TT_NAME_MAC_ENCODING_ROMAN = 0, + TT_NAME_MAC_ENCODING_JAPANESE, + TT_NAME_MAC_ENCODING_TRAD_CHINESE, + TT_NAME_MAC_ENCODING_KOREAN, + TT_NAME_MAC_ENCODING_ARABIC, + TT_NAME_MAC_ENCODING_HEBREW, + TT_NAME_MAC_ENCODING_GREEK, + TT_NAME_MAC_ENCODING_RUSSIAN, + TT_NAME_MAC_ENCODING_RSYMBOL, + TT_NAME_MAC_ENCODING_DEVANAGARI, + TT_NAME_MAC_ENCODING_GURMUKHI, + TT_NAME_MAC_ENCODING_GUJARATI, + TT_NAME_MAC_ENCODING_ORIYA, + TT_NAME_MAC_ENCODING_BENGALI, + TT_NAME_MAC_ENCODING_TAMIL, + TT_NAME_MAC_ENCODING_TELUGU, + TT_NAME_MAC_ENCODING_KANNADA, + TT_NAME_MAC_ENCODING_MALAYALAM, + TT_NAME_MAC_ENCODING_SINHALESE, + TT_NAME_MAC_ENCODING_BURMESE, + TT_NAME_MAC_ENCODING_KHMER, + TT_NAME_MAC_ENCODING_THAI, + TT_NAME_MAC_ENCODING_LAOTIAN, + TT_NAME_MAC_ENCODING_GEORGIAN, + TT_NAME_MAC_ENCODING_ARMENIAN, + TT_NAME_MAC_ENCODING_SIMPL_CHINESE, + TT_NAME_MAC_ENCODING_TIBETAN, + TT_NAME_MAC_ENCODING_MONGOLIAN, + TT_NAME_MAC_ENCODING_GEEZ, + TT_NAME_MAC_ENCODING_SLAVIC, + TT_NAME_MAC_ENCODING_VIETNAMESE, + TT_NAME_MAC_ENCODING_SINDHI, + TT_NAME_MAC_ENCODING_UNINTERPRETED +}; + enum OPENTYPE_STRING_ID { OPENTYPE_STRING_COPYRIGHT_NOTICE = 0, @@ -615,6 +661,82 @@ VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_ME } } +static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT encoding) +{ + UINT codepage = 0; + + switch (platform) { + case OPENTYPE_PLATFORM_MAC: + switch (encoding) + { + case TT_NAME_MAC_ENCODING_ROMAN: + codepage = 10000; + break; + case TT_NAME_MAC_ENCODING_JAPANESE: + codepage = 10001; + break; + case TT_NAME_MAC_ENCODING_TRAD_CHINESE: + codepage = 10002; + break; + case TT_NAME_MAC_ENCODING_KOREAN: + codepage = 10003; + break; + case TT_NAME_MAC_ENCODING_ARABIC: + codepage = 10004; + break; + case TT_NAME_MAC_ENCODING_HEBREW: + codepage = 10005; + break; + case TT_NAME_MAC_ENCODING_GREEK: + codepage = 10006; + break; + case TT_NAME_MAC_ENCODING_RUSSIAN: + codepage = 10007; + break; + case TT_NAME_MAC_ENCODING_SIMPL_CHINESE: + codepage = 10008; + break; + case TT_NAME_MAC_ENCODING_THAI: + codepage = 10021; + break; + default: + FIXME("encoding %u not handled, platform %d.\n", encoding, platform); + break; + } + break; + case OPENTYPE_PLATFORM_WIN: + switch (encoding) + { + case TT_NAME_WINDOWS_ENCODING_SYMBOL: + case TT_NAME_WINDOWS_ENCODING_UCS2: + break; + case TT_NAME_WINDOWS_ENCODING_SJIS: + codepage = 932; + break; + case TT_NAME_WINDOWS_ENCODING_PRC: + codepage = 936; + break; + case TT_NAME_WINDOWS_ENCODING_BIG5: + codepage = 950; + break; + case TT_NAME_WINDOWS_ENCODING_WANSUNG: + codepage = 20949; + break; + case TT_NAME_WINDOWS_ENCODING_JOHAB: + codepage = 1361; + break; + default: + FIXME("encoding %u not handled, platform %d.\n", encoding, platform); + break; + } + break; + default: + FIXME("unknown platform %d\n", platform); + } + + return codepage; +} + HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) { const TT_NAME_V0 *header; @@ -649,7 +771,10 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA /* Right now only accept unicode and windows encoded fonts */ platform = GET_BE_WORD(record->platformID); - if (platform != 0 && platform != 3) { + if (platform != OPENTYPE_PLATFORM_UNICODE && + platform != OPENTYPE_PLATFORM_MAC && + platform != OPENTYPE_PLATFORM_WIN) + { FIXME("platform %i not supported\n", platform); continue; } @@ -662,34 +787,9 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA if (lang_id < 0x8000) { WCHAR locale[LOCALE_NAME_MAX_LENGTH]; WCHAR *name_string; - UINT codepage = 0; + UINT codepage; - if (platform == 3) - { - switch (encoding) - { - case TT_NAME_WINDOWS_ENCODING_SYMBOL: - case TT_NAME_WINDOWS_ENCODING_UCS2: - break; - case TT_NAME_WINDOWS_ENCODING_SJIS: - codepage = 932; - break; - case TT_NAME_WINDOWS_ENCODING_PRC: - codepage = 936; - break; - case TT_NAME_WINDOWS_ENCODING_BIG5: - codepage = 950; - break; - case TT_NAME_WINDOWS_ENCODING_WANSUNG: - codepage = 20949; - break; - case TT_NAME_WINDOWS_ENCODING_JOHAB: - codepage = 1361; - break; - default: - FIXME("encoding %d not handled.\n", encoding); - } - } + codepage = get_name_record_codepage(platform, encoding); if (codepage) { DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0);

1 0

Sebastian Lackner : kernel32/tests: Avoid test failures on systems where hardware DEP is not supported.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: edc259fdeb6651db57b6ba4c33076ad6bbad4b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edc259fdeb6651db57b6ba4c3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 28 23:37:26 2014 +0100 kernel32/tests: Avoid test failures on systems where hardware DEP is not supported. --- dlls/kernel32/tests/virtual.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 1e66ee1..0015f98 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1807,6 +1807,7 @@ static DWORD execute_fault_seh_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { ULONG flags = MEM_EXECUTE_OPTION_ENABLE; + DWORD err; trace( "exception: %08x flags:%x addr:%p info[0]:%ld info[1]:%p\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, @@ -1821,15 +1822,15 @@ static DWORD execute_fault_seh_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR if (rec->ExceptionCode == STATUS_GUARD_PAGE_VIOLATION) { - ok( rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT || - broken(!(flags & MEM_EXECUTE_OPTION_DISABLE) && rec->ExceptionInformation[0] == EXCEPTION_READ_FAULT), /* Windows 2000 */ - "ExceptionInformation[0] is %d instead of %d\n", (DWORD)rec->ExceptionInformation[0], EXCEPTION_EXECUTE_FAULT ); + err = IsProcessorFeaturePresent( PF_NX_ENABLED ) ? EXCEPTION_EXECUTE_FAULT : EXCEPTION_READ_FAULT; + ok( rec->ExceptionInformation[0] == err, "ExceptionInformation[0] is %d instead of %d\n", + (DWORD)rec->ExceptionInformation[0], err ); num_guard_page_calls++; } else if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION) { - DWORD err, old_prot; + DWORD old_prot; BOOL success; err = (flags & MEM_EXECUTE_OPTION_DISABLE) ? EXCEPTION_EXECUTE_FAULT : EXCEPTION_READ_FAULT; @@ -1941,11 +1942,11 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) static const char cls_name[] = "atl_thunk_class"; DWORD ret, size, old_prot; ULONG old_flags = MEM_EXECUTE_OPTION_ENABLE; + BOOL success, restore_flags = FALSE; void *results[64]; ULONG_PTR count; ULONG pagesize; WNDCLASSEXA wc; - BOOL success; char *base; HWND hWnd; @@ -1967,6 +1968,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) return; } ok( !ret, "NtSetInformationProcess failed with status %08x\n", ret ); + restore_flags = TRUE; } size = 0x1000; @@ -2047,8 +2049,17 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ret = send_message_excpt( hWnd, WM_USER, 0, 0 ); ok( ret == 42, "call returned wrong result, expected 42, got %d\n", ret ); ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); - if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) + if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && !IsProcessorFeaturePresent( PF_NX_ENABLED )) + { + trace( "DEP hardware support is not available\n" ); + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + dep_flags = MEM_EXECUTE_OPTION_ENABLE; + } + else if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) + { + trace( "DEP hardware support is available\n" ); ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + } else ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); @@ -2414,7 +2425,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) VirtualFree( base, 0, MEM_FREE ); out: - if (old_flags != dep_flags) + if (restore_flags) { ret = NtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &old_flags, sizeof(old_flags) ); ok( !ret, "NtSetInformationProcess failed with status %08x\n", ret );

1 0

Michael Stefaniuc : usp10: Removed unused variable (PVS-Studio).
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 75858599864211bce3a6bb96d216fbee0466e775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75858599864211bce3a6bb96d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 28 23:37:00 2014 +0100 usp10: Removed unused variable (PVS-Studio). --- dlls/usp10/opentype.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 166d823..dd9c8c4 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -924,10 +924,9 @@ static INT GSUB_apply_LigatureSubst(const OT_LookupTable *look, WORD *glyphs, IN static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int j; - BOOL done = FALSE; TRACE("Chaining Contextual Substitution Subtable\n"); - for (j = 0; j < GET_BE_WORD(look->SubTableCount) && !done; j++) + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { const GSUB_ChainContextSubstFormat1 *ccsf1; int offset;

1 0

Michael Stefaniuc : dmusic: Remove duplicated interface ID checks ( PVS-Studio).
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 3d77974f76d68decdaa00eb746e0e06f2556cca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d77974f76d68decdaa00eb74… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 28 23:33:48 2014 +0100 dmusic: Remove duplicated interface ID checks (PVS-Studio). --- dlls/dmusic/port.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index ad61ba5..f886d52 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -49,9 +49,7 @@ static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface(IDirec { TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument) || - IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument8)) + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument)) { IDirectMusicDownloadedInstrument_AddRef(iface); *ret_iface = iface; @@ -132,19 +130,15 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); - if (IsEqualIID (riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirectMusicPort) || - IsEqualGUID(riid, &IID_IDirectMusicPort8)) { + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort)) { *ret_iface = &This->IDirectMusicPort_iface; IDirectMusicPort_AddRef((LPDIRECTMUSICPORT)*ret_iface); return S_OK; - } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload) || - IsEqualGUID(riid, &IID_IDirectMusicPortDownload8)) { + } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload)) { *ret_iface = &This->IDirectMusicPortDownload_iface; IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ret_iface); return S_OK; - } else if (IsEqualGUID(riid, &IID_IDirectMusicThru) || - IsEqualGUID(riid, &IID_IDirectMusicThru8)) { + } else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) { *ret_iface = &This->IDirectMusicThru_iface; IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface); return S_OK;

1 0

Michael Stefaniuc : taskmgr: Fix messed up indentation of an if statement (PVS-Studio).
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 517a4957378295ffba4d6e286a326577a7dab43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=517a4957378295ffba4d6e286… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 28 23:32:43 2014 +0100 taskmgr: Fix messed up indentation of an if statement (PVS-Studio). --- programs/taskmgr/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 859624e..4098675 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -265,8 +265,8 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) * So first find out how many bars we can fit */ nBars = ((rcClient.bottom - rcClient.top) - 25) / 3; - if (CommitChargeLimit) - nBarsUsed = (nBars * (int)((CommitChargeTotal * 100) / CommitChargeLimit)) / 100; + if (CommitChargeLimit) + nBarsUsed = (nBars * (int)((CommitChargeTotal * 100) / CommitChargeLimit)) / 100; nBarsFree = nBars - nBarsUsed; if (nBarsUsed < 0) nBarsUsed = 0;

1 0

Michael Stefaniuc : msvfw32: IDC_ARROW is already an int resource ( PVS-Studio).
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 6b4bec8af507187897d94440caa346072eebba7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b4bec8af507187897d94440c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 28 23:31:51 2014 +0100 msvfw32: IDC_ARROW is already an int resource (PVS-Studio). --- dlls/msvfw32/mciwnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index bf23a63..e561b14 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -86,7 +86,7 @@ BOOL VFWAPIV MCIWndRegisterClass(void) wc.cbWndExtra = sizeof(MCIWndInfo*); wc.hInstance = MSVFW32_hModule; wc.hIcon = 0; - wc.hCursor = LoadCursorW(0, MAKEINTRESOURCEW(IDC_ARROW)); + wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wc.lpszMenuName = NULL; wc.lpszClassName = mciWndClassW;

1 0

Aric Stewart : imm32: Handle keyboard changes when processing input.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 836bd1fdaedb62d066271912bd4b37c7f82b33a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836bd1fdaedb62d066271912b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 28 13:03:33 2014 -0500 imm32: Handle keyboard changes when processing input. --- dlls/imm32/imm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 33a0d6da..1418fc8 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2882,6 +2882,22 @@ BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD else return FALSE; + /* Make sure we are inputting to the correct keyboard */ + if (data->immKbd->hkl != hKL) + { + ImmHkl *new_hkl = IMM_GetImmHkl(hKL); + if (new_hkl) + { + data->immKbd->pImeSelect(imc, FALSE); + data->immKbd->uSelected--; + data->immKbd = new_hkl; + data->immKbd->pImeSelect(imc, TRUE); + data->immKbd->uSelected++; + } + else + return FALSE; + } + if (!data->immKbd->hIME || !data->immKbd->pImeProcessKey) return FALSE;

1 0

Nikolay Sivov : dwrite: Reimplement ConvertFontFaceToLOGFONT().
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 6855740a5e2980f76f3c52b0dff02e38e376a9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6855740a5e2980f76f3c52b0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 28 08:13:51 2014 +0300 dwrite: Reimplement ConvertFontFaceToLOGFONT(). --- dlls/dwrite/font.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 3 +++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4ebe261..f8bff51 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -139,6 +139,7 @@ static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFon static HRESULT create_fontfamily_from_data(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family); static HRESULT create_font_base(IDWriteFont **font); static HRESULT create_font_from_data(struct dwrite_font_data*,IDWriteFontFamily*,DWRITE_FONT_SIMULATIONS,IDWriteFont**); +static HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**); static inline struct dwrite_fontface *impl_from_IDWriteFontFace2(IDWriteFontFace2 *iface) { @@ -723,11 +724,65 @@ static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace return S_OK; } +static void get_font_properties_from_stream(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE face_type, + UINT32 face_index, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, + DWRITE_FONT_STYLE *style) +{ + const void *tt_os2 = NULL, *tt_head = NULL, *tt_post = NULL; + void *os2_context, *head_context, *post_context; + + opentype_get_font_table(stream, face_type, face_index, MS_OS2_TAG, &tt_os2, &os2_context, NULL, NULL); + opentype_get_font_table(stream, face_type, face_index, MS_HEAD_TAG, &tt_head, &head_context, NULL, NULL); + opentype_get_font_table(stream, face_type, face_index, MS_POST_TAG, &tt_post, &post_context, NULL, NULL); + + get_font_properties(tt_os2, tt_head, tt_post, metrics, stretch, weight, style); + + if (tt_os2) + IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); + if (tt_head) + IDWriteFontFileStream_ReleaseFileFragment(stream, head_context); + if (tt_post) + IDWriteFontFileStream_ReleaseFileFragment(stream, post_context); +} + HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) { - struct dwrite_fontface *fontface = impl_from_IDWriteFontFace2((IDWriteFontFace2*)face); + DWRITE_FONT_SIMULATIONS simulations; + DWRITE_FONT_FACE_TYPE face_type; + IDWriteFontFileStream *stream; + DWRITE_FONT_METRICS metrics; + DWRITE_FONT_STRETCH stretch; + DWRITE_FONT_STYLE style; + DWRITE_FONT_WEIGHT weight; + IDWriteFontFile *file = NULL; + UINT32 index; + HRESULT hr; + + memset(logfont, 0, sizeof(*logfont)); + + index = 1; + hr = IDWriteFontFace_GetFiles(face, &index, &file); + if (FAILED(hr) || !file) + return hr; + + hr = get_filestream_from_file(file, &stream); + if (FAILED(hr)) { + IDWriteFontFile_Release(file); + return hr; + } + + index = IDWriteFontFace_GetIndex(face); + face_type = IDWriteFontFace_GetType(face); + get_font_properties_from_stream(stream, face_type, index, &metrics, &stretch, &weight, &style); + IDWriteFontFileStream_Release(stream); + + simulations = IDWriteFontFace_GetSimulations(face); - *logfont = fontface->logfont; + logfont->lfCharSet = DEFAULT_CHARSET; + logfont->lfWeight = weight; + logfont->lfItalic = style == DWRITE_FONT_STYLE_ITALIC || (simulations | DWRITE_FONT_SIMULATIONS_OBLIQUE); + logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; + /* TODO: set facename */ return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 74aad58..7debdda 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1013,11 +1013,14 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(logfont.lfHeight == 0, "got %d\n", logfont.lfHeight); ok(logfont.lfWidth == 0, "got %d\n", logfont.lfWidth); +todo_wine ok(logfont.lfWeight == FW_NORMAL, "got %d\n", logfont.lfWeight); ok(logfont.lfEscapement == 0, "got %d\n", logfont.lfEscapement); +todo_wine ok(logfont.lfItalic == 1, "got %d\n", logfont.lfItalic); ok(logfont.lfUnderline == 0, "got %d\n", logfont.lfUnderline); ok(logfont.lfStrikeOut == 0, "got %d\n", logfont.lfStrikeOut); +todo_wine ok(!lstrcmpW(logfont.lfFaceName, tahomaW), "got %s\n", wine_dbgstr_w(logfont.lfFaceName)); IDWriteGdiInterop_Release(interop);

1 0

Michael Stefaniuc : crypt32/tests: Don't compare the result to itself ( PVS-Studio).
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: d3c565f44b55cd66fb57227e3a74d3d4ff52acb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c565f44b55cd66fb57227e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 29 09:21:50 2014 +0100 crypt32/tests: Don't compare the result to itself (PVS-Studio). --- dlls/crypt32/tests/encode.c | 2 +- dlls/crypt32/tests/msg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 16b3532..9e1853f 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -3732,7 +3732,7 @@ static void compareAltNameEntry(const CERT_ALT_NAME_ENTRY *expected, case CERT_ALT_NAME_IP_ADDRESS: ok(U(*got).IPAddress.cbData == U(*expected).IPAddress.cbData, "Unexpected IP address length %d\n", U(*got).IPAddress.cbData); - ok(!memcmp(U(*got).IPAddress.pbData, U(*got).IPAddress.pbData, + ok(!memcmp(U(*got).IPAddress.pbData, U(*expected).IPAddress.pbData, U(*got).IPAddress.cbData), "Unexpected value\n"); break; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index b40302a..e9887b0 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2666,12 +2666,12 @@ static void compare_signer_info(const CMSG_SIGNER_INFO *got, ok(got->Issuer.cbData == expected->Issuer.cbData, "Expected issuer size %d, got %d\n", expected->Issuer.cbData, got->Issuer.cbData); - ok(!memcmp(got->Issuer.pbData, got->Issuer.pbData, got->Issuer.cbData), + ok(!memcmp(got->Issuer.pbData, expected->Issuer.pbData, got->Issuer.cbData), "Unexpected issuer\n"); ok(got->SerialNumber.cbData == expected->SerialNumber.cbData, "Expected serial number size %d, got %d\n", expected->SerialNumber.cbData, got->SerialNumber.cbData); - ok(!memcmp(got->SerialNumber.pbData, got->SerialNumber.pbData, + ok(!memcmp(got->SerialNumber.pbData, expected->SerialNumber.pbData, got->SerialNumber.cbData), "Unexpected serial number\n"); /* FIXME: check more things */ }

1 0

Bruno Jesus : regedit: Allow importing strings with escaped NULL.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: c35bca6561a0150425a1838d4677d202cad65da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35bca6561a0150425a1838d4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Oct 29 00:30:13 2014 -0200 regedit: Allow importing strings with escaped NULL. --- programs/regedit/regproc.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index d07fdc7..9d96287 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -255,7 +255,7 @@ static DWORD getDataType(LPWSTR *lpValue, DWORD* parse_type) /****************************************************************************** * Replaces escape sequences with the characters. */ -static void REGPROC_unescape_string(WCHAR* str) +static int REGPROC_unescape_string(WCHAR* str) { int str_idx = 0; /* current character under analysis */ int val_idx = 0; /* the last character of the unescaped string */ @@ -267,6 +267,9 @@ static void REGPROC_unescape_string(WCHAR* str) case 'n': str[val_idx] = '\n'; break; + case '0': + str[val_idx] = '\0'; + break; case '\\': case '"': str[val_idx] = str[str_idx]; @@ -282,6 +285,7 @@ static void REGPROC_unescape_string(WCHAR* str) } } str[val_idx] = '\0'; + return val_idx; } static BOOL parseKeyName(LPWSTR lpKeyName, HKEY *hKey, LPWSTR *lpKeyPath) @@ -364,19 +368,10 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) if (dwParseType == REG_SZ) /* no conversion for string */ { - REGPROC_unescape_string(val_data); - /* Compute dwLen after REGPROC_unescape_string because it may - * have changed the string length and we don't want to store - * the extra garbage in the registry. - */ - dwLen = lstrlenW(val_data); - if(val_data[dwLen-1] != '"') + dwLen = REGPROC_unescape_string(val_data); + if(!dwLen || val_data[dwLen-1] != '"') return ERROR_INVALID_DATA; - if (dwLen>0 && val_data[dwLen-1]=='"') - { - dwLen--; - val_data[dwLen]='\0'; - } + val_data[dwLen-1] = '\0'; /* remove last quotes */ lpbData = (BYTE*) val_data; dwLen++; /* include terminating null */ dwLen = dwLen * sizeof(WCHAR); /* size is in bytes */

1 0

Vincent Povirk : msvcrt: Implement _strtoul_l.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 5ba68bb966bf57fab33c6e55f8f9433489a85ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ba68bb966bf57fab33c6e55f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 2 10:42:33 2014 -0500 msvcrt: Implement _strtoul_l. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 14 +++++++++++--- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9b6de75..2f2b0dc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1362,7 +1362,7 @@ @ stub _strtol_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -@ stub _strtoul_l +@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l @ cdecl _strupr(str) MSVCRT__strupr @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cf7beb5..282f5bc 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1720,7 +1720,7 @@ @ stub _strtol_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -@ stub _strtoul_l +@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l @ cdecl _strupr(str) MSVCRT__strupr @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index bb26bcc..5783f3e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1042,7 +1042,7 @@ @ stub _strtol_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -@ stub _strtoul_l +@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l @ cdecl _strupr(str) MSVCRT__strupr @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 34a90e6..ec5d1e7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1017,7 +1017,7 @@ @ stub _strtol_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -@ stub _strtoul_l +@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l @ cdecl _strupr(str) MSVCRT__strupr @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 96bbecc..51c2d40 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -983,7 +983,7 @@ # stub _strtol_l(str ptr long ptr) @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -# stub _strtoul_l(str ptr long ptr) +@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l @ cdecl _strupr(str) MSVCRT__strupr @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index be65675..6f9280f 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -982,11 +982,11 @@ MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) } /****************************************************************** - * strtoul (MSVCRT.@) + * _strtoul_l (MSVCRT.@) */ -MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) +MSVCRT_ulong CDECL MSVCRT_strtoul_l(const char* nptr, char** end, int base, MSVCRT__locale_t locale) { - __int64 ret = MSVCRT_strtoi64_l(nptr, end, base, NULL); + __int64 ret = MSVCRT_strtoi64_l(nptr, end, base, locale); if(ret > MSVCRT_ULONG_MAX) { ret = MSVCRT_ULONG_MAX; @@ -999,6 +999,14 @@ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) return ret; } +/****************************************************************** + * strtoul (MSVCRT.@) + */ +MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) +{ + return MSVCRT_strtoul_l(nptr, end, base, NULL); +} + /********************************************************************* * _strtoui64_l (MSVCRT.@) *

1 0

Vincent Povirk : authz: Stub AuthzInstallSecurityEventSource.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: eb6790c1192028f0761d04385cb8eb1870ef8065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb6790c1192028f0761d04385… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 28 14:45:32 2014 -0500 authz: Stub AuthzInstallSecurityEventSource. --- dlls/authz/authz.c | 11 +++++++++++ dlls/authz/authz.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/authz/authz.c b/dlls/authz/authz.c index 2c1f3d1..08ca8c3 100644 --- a/dlls/authz/authz.c +++ b/dlls/authz/authz.c @@ -56,3 +56,14 @@ BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, LPVOID pfnAccessChecker, SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + + +/*********************************************************************** + * AuthzInstallSecurityEventSource (AUTHZ.@) + */ +BOOL WINAPI AuthzInstallSecurityEventSource(DWORD dwFlags, LPVOID pRegistration) +{ + FIXME("(0x%X,%p): stub\n", dwFlags, pRegistration); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/authz/authz.spec b/dlls/authz/authz.spec index 8ffd52b..acf3228 100644 --- a/dlls/authz/authz.spec +++ b/dlls/authz/authz.spec @@ -14,7 +14,7 @@ @ stub AuthzInitializeObjectAccessAuditEvent @ stub AuthzInitializeObjectAccessAuditEvent2 @ stdcall AuthzInitializeResourceManager(long ptr ptr ptr wstr ptr) -@ stub AuthzInstallSecurityEventSource +@ stdcall AuthzInstallSecurityEventSource(long ptr) @ stub AuthzOpenObjectAudit @ stub AuthzRegisterSecurityEventSource @ stub AuthzReportSecurityEvent

1 0

Piotr Caban : user32: Show that IME window class is one of builtin classes.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 43dcd40c0b6042cec4f072079be8c33e77a08b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43dcd40c0b6042cec4f072079… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 28 12:19:40 2014 +0100 user32: Show that IME window class is one of builtin classes. --- dlls/user32/tests/class.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 1d35832..2218e79 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1101,6 +1101,57 @@ static void test_comctl32_classes(void) } } +static void test_IME(void) +{ + static const WCHAR ime_classW[] = {'I','M','E',0}; + + char module_name[MAX_PATH], *ptr; + MEMORY_BASIC_INFORMATION mbi; + HMODULE imm32 = NULL; + WNDCLASSW wnd_classw; + WNDCLASSA wnd_class; + SIZE_T size; + BOOL ret; + + if (!GetProcAddress(GetModuleHandleA("user32.dll"), "BroadcastSystemMessageExA")) + { + skip("BroadcastSystemMessageExA not available, skipping IME class test\n"); + return; + } + + todo_wine ok(GetModuleHandleA("imm32") != 0, "imm32.dll is not loaded\n"); + if (!GetModuleHandleA("imm32")) + imm32 = LoadLibraryA("imm32"); + + ret = GetClassInfoA(NULL, "IME", &wnd_class); + ok(ret, "GetClassInfo failed: %d\n", GetLastError()); + + size = VirtualQuery(wnd_class.lpfnWndProc, &mbi, sizeof(mbi)); + todo_wine ok(size == sizeof(mbi), "VirtualQuery returned %ld\n", size); + if (size == sizeof(mbi)) { + size = GetModuleFileNameA(mbi.AllocationBase, module_name, sizeof(module_name)); + ok(size, "GetModuleFileName failed\n"); + for (ptr = module_name+size-1; ptr > module_name; ptr--) + if (*ptr == '\\' || *ptr == '/') break; + if (*ptr == '\\' || *ptr=='/') ptr++; + ok(!lstrcmpiA(ptr, "user32.dll") || !lstrcmpiA(ptr, "ntdll.dll"), "IME window proc implemented in %s\n", ptr); + } + + ret = GetClassInfoW(NULL, ime_classW, &wnd_classw); + ok(ret, "GetClassInfo failed: %d\n", GetLastError()); + + size = VirtualQuery(wnd_classw.lpfnWndProc, &mbi, sizeof(mbi)); + ok(size == sizeof(mbi), "VirtualQuery returned %ld\n", size); + size = GetModuleFileNameA(mbi.AllocationBase, module_name, sizeof(module_name)); + ok(size, "GetModuleFileName failed\n"); + for (ptr = module_name+size-1; ptr > module_name; ptr--) + if (*ptr == '\\' || *ptr == '/') break; + if (*ptr == '\\' || *ptr=='/') ptr++; + todo_wine ok(!lstrcmpiA(ptr, "user32.dll") || !lstrcmpiA(ptr, "ntdll.dll"), "IME window proc implemented in %s\n", ptr); + + if (imm32) FreeLibrary(imm32); +} + START_TEST(class) { char **argv; @@ -1113,6 +1164,7 @@ START_TEST(class) return; } + test_IME(); test_GetClassInfo(); test_extra_values();

1 0

Piotr Caban : imm32: Return FALSE on WM_MSIME_* messages in ImmIsUIMessage.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 3311684e6e0441923ab384ef945054dfc63123c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3311684e6e0441923ab384ef9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 28 12:19:24 2014 +0100 imm32: Return FALSE on WM_MSIME_* messages in ImmIsUIMessage. --- dlls/imm32/imm.c | 28 ++++++---------------------- dlls/imm32/tests/imm32.c | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2fa31ac..33a0d6da 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1945,28 +1945,20 @@ BOOL WINAPI ImmIsIME(HKL hKL) BOOL WINAPI ImmIsUIMessageA( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) { - BOOL rc = FALSE; - TRACE("(%p, %x, %ld, %ld)\n", hWndIME, msg, wParam, lParam); if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) || (msg == WM_IME_SETCONTEXT) || (msg == WM_IME_NOTIFY) || (msg == WM_IME_COMPOSITIONFULL) || (msg == WM_IME_SELECT) || - (msg == 0x287 /* FIXME: WM_IME_SYSTEM */) || - (msg == WM_MSIME_RECONVERTOPTIONS) || - (msg == WM_MSIME_MOUSE) || - (msg == WM_MSIME_RECONVERTREQUEST) || - (msg == WM_MSIME_RECONVERT) || - (msg == WM_MSIME_QUERYPOSITION) || - (msg == WM_MSIME_DOCUMENTFEED)) + (msg == 0x287 /* FIXME: WM_IME_SYSTEM */)) { if (hWndIME) SendMessageA(hWndIME, msg, wParam, lParam); - rc = TRUE; + return TRUE; } - return rc; + return FALSE; } /*********************************************************************** @@ -1975,28 +1967,20 @@ BOOL WINAPI ImmIsUIMessageA( BOOL WINAPI ImmIsUIMessageW( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) { - BOOL rc = FALSE; - TRACE("(%p, %x, %ld, %ld)\n", hWndIME, msg, wParam, lParam); if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) || (msg == WM_IME_SETCONTEXT) || (msg == WM_IME_NOTIFY) || (msg == WM_IME_COMPOSITIONFULL) || (msg == WM_IME_SELECT) || - (msg == 0x287 /* FIXME: WM_IME_SYSTEM */) || - (msg == WM_MSIME_RECONVERTOPTIONS) || - (msg == WM_MSIME_MOUSE) || - (msg == WM_MSIME_RECONVERTREQUEST) || - (msg == WM_MSIME_RECONVERT) || - (msg == WM_MSIME_QUERYPOSITION) || - (msg == WM_MSIME_DOCUMENTFEED)) + (msg == 0x287 /* FIXME: WM_IME_SYSTEM */)) { if (hWndIME) SendMessageW(hWndIME, msg, wParam, lParam); - rc = TRUE; + return TRUE; } - return rc; + return FALSE; } /*********************************************************************** diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 4c0a888..d434648 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -607,6 +607,14 @@ static void test_ImmIsUIMessage(void) { 0, FALSE } /* mark the end */ }; + UINT WM_MSIME_SERVICE = RegisterWindowMessageA("MSIMEService"); + UINT WM_MSIME_RECONVERTOPTIONS = RegisterWindowMessageA("MSIMEReconvertOptions"); + UINT WM_MSIME_MOUSE = RegisterWindowMessageA("MSIMEMouseOperation"); + UINT WM_MSIME_RECONVERTREQUEST = RegisterWindowMessageA("MSIMEReconvertRequest"); + UINT WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); + UINT WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); + UINT WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); + const struct test *test; BOOL ret; @@ -626,6 +634,21 @@ static void test_ImmIsUIMessage(void) else ok(!msg_spy_find_msg(test->msg), "Windows does not send 0x%x\n", test->msg); } + + ret = pImmIsUIMessageA(NULL, WM_MSIME_SERVICE, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_SERVICE\n"); + ret = pImmIsUIMessageA(NULL, WM_MSIME_RECONVERTOPTIONS, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_RECONVERTOPTIONS\n"); + ret = pImmIsUIMessageA(NULL, WM_MSIME_MOUSE, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_MOUSE\n"); + ret = pImmIsUIMessageA(NULL, WM_MSIME_RECONVERTREQUEST, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_RECONVERTREQUEST\n"); + ret = pImmIsUIMessageA(NULL, WM_MSIME_RECONVERT, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_RECONVERT\n"); + ret = pImmIsUIMessageA(NULL, WM_MSIME_QUERYPOSITION, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_QUERYPOSITION\n"); + ret = pImmIsUIMessageA(NULL, WM_MSIME_DOCUMENTFEED, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_DOCUMENTFEED\n"); } static void test_ImmGetContext(void)

1 0

Huw Davies : gdiplus: Blend in the background colour.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 6df5ce7c9ef947df265c389859dc11977ddcf46b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df5ce7c9ef947df265c38985… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 28 16:28:47 2014 +0000 gdiplus: Blend in the background colour. --- dlls/gdiplus/image.c | 23 ++++++++++++ dlls/gdiplus/tests/image.c | 91 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 113 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0564f33..eec76f6 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1483,6 +1483,18 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromResource(HINSTANCE hInstance, return stat; } +static inline DWORD blend_argb_no_bkgnd_alpha(DWORD src, DWORD bkgnd) +{ + BYTE b = (BYTE)src; + BYTE g = (BYTE)(src >> 8); + BYTE r = (BYTE)(src >> 16); + DWORD alpha = (BYTE)(src >> 24); + return ((b + ((BYTE)bkgnd * (255 - alpha) + 127) / 255) | + (g + ((BYTE)(bkgnd >> 8) * (255 - alpha) + 127) / 255) << 8 | + (r + ((BYTE)(bkgnd >> 16) * (255 - alpha) + 127) / 255) << 16 | + (alpha << 24)); +} + GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, HBITMAP* hbmReturn, ARGB background) { @@ -1523,6 +1535,17 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, if (stat == Ok) stat = GdipBitmapUnlockBits(bitmap, &lockeddata); + + if (stat == Ok && (background & 0xffffff)) + { + DWORD *ptr; + UINT i; + for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) + { + if ((*ptr & 0xff000000) == 0xff000000) continue; + *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); + } + } } else stat = GenericError; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b88238b..fe80bd6 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1695,6 +1695,10 @@ static void test_createhbitmap(void) stat = GdipDisposeImage((GpImage*)bitmap); expect(Ok, stat); + /* make (1,0) have no alpha and (2,0) a different blue value. */ + bits[7] = 0x00; + bits[8] = 0x40; + /* create alpha Bitmap */ stat = GdipCreateBitmapFromScan0(8, 20, 32, PixelFormat32bppARGB, bits, &bitmap); expect(Ok, stat); @@ -1720,21 +1724,106 @@ static void test_createhbitmap(void) { DWORD val = *(DWORD*)bm.bmBits; ok(val == 0x682a2a2a, "got %x, expected 0x682a2a2a\n", val); + val = *((DWORD*)bm.bmBits + (bm.bmHeight-1) * bm.bmWidthBytes/4 + 1); + ok(val == 0x0, "got %x, expected 0x682a2a2a\n", val); } hdc = CreateCompatibleDC(NULL); oldhbitmap = SelectObject(hdc, hbitmap); pixel = GetPixel(hdc, 5, 5); + expect(0x2a2a2a, pixel); + pixel = GetPixel(hdc, 1, 0); + expect(0x0, pixel); + SelectObject(hdc, oldhbitmap); DeleteDC(hdc); - expect(0x2a2a2a, pixel); DeleteObject(hbitmap); } + /* create HBITMAP with bkgnd colour */ + stat = GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0xff00ff); + expect(Ok, stat); + + if (stat == Ok) + { + ret = GetObjectA(hbitmap, sizeof(BITMAP), &bm); + expect(sizeof(BITMAP), ret); + + expect(0, bm.bmType); + expect(8, bm.bmWidth); + expect(20, bm.bmHeight); + expect(32, bm.bmWidthBytes); + expect(1, bm.bmPlanes); + expect(32, bm.bmBitsPixel); + ok(bm.bmBits != NULL, "got DDB, expected DIB\n"); + + if (bm.bmBits) + { + DWORD val = *(DWORD*)bm.bmBits; + ok(val == 0x68c12ac1, "got %x, expected 0x682a2a2a\n", val); + val = *((DWORD*)bm.bmBits + (bm.bmHeight-1) * bm.bmWidthBytes/4 + 1); + ok(val == 0xff00ff, "got %x, expected 0x682a2a2a\n", val); + } + + hdc = CreateCompatibleDC(NULL); + + oldhbitmap = SelectObject(hdc, hbitmap); + pixel = GetPixel(hdc, 5, 5); + expect(0xc12ac1, pixel); + pixel = GetPixel(hdc, 1, 0); + expect(0xff00ff, pixel); + pixel = GetPixel(hdc, 2, 0); + expect(0xb12ac1, pixel); + + SelectObject(hdc, oldhbitmap); + DeleteDC(hdc); + DeleteObject(hbitmap); + } + + /* create HBITMAP with bkgnd colour with alpha and show it behaves with no alpha. */ + stat = GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0x80ff00ff); + expect(Ok, stat); + + if (stat == Ok) + { + ret = GetObjectA(hbitmap, sizeof(BITMAP), &bm); + expect(sizeof(BITMAP), ret); + + expect(0, bm.bmType); + expect(8, bm.bmWidth); + expect(20, bm.bmHeight); + expect(32, bm.bmWidthBytes); + expect(1, bm.bmPlanes); + expect(32, bm.bmBitsPixel); + ok(bm.bmBits != NULL, "got DDB, expected DIB\n"); + + if (bm.bmBits) + { + DWORD val = *(DWORD*)bm.bmBits; + ok(val == 0x68c12ac1, "got %x, expected 0x682a2a2a\n", val); + val = *((DWORD*)bm.bmBits + (bm.bmHeight-1) * bm.bmWidthBytes/4 + 1); + ok(val == 0xff00ff, "got %x, expected 0x682a2a2a\n", val); + } + + hdc = CreateCompatibleDC(NULL); + + oldhbitmap = SelectObject(hdc, hbitmap); + pixel = GetPixel(hdc, 5, 5); + expect(0xc12ac1, pixel); + pixel = GetPixel(hdc, 1, 0); + expect(0xff00ff, pixel); + pixel = GetPixel(hdc, 2, 0); + expect(0xb12ac1, pixel); + + SelectObject(hdc, oldhbitmap); + DeleteDC(hdc); + DeleteObject(hbitmap); + } + stat = GdipDisposeImage((GpImage*)bitmap); expect(Ok, stat); }

1 0

YongHao Hu : msvcp90: Add ostream::operator<< complex implementation and tests.
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Module: wine Branch: master Commit: 24de8560451440821d81bfa10dc77710f9623ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24de8560451440821d81bfa10… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Oct 27 12:43:54 2014 +0800 msvcp90: Add ostream::operator<<complex implementation and tests. --- dlls/msvcp71/msvcp71.spec | 12 ++--- dlls/msvcp80/msvcp80.spec | 12 ++--- dlls/msvcp90/ios.c | 102 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++--- dlls/msvcp90/tests/ios.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 229 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24de8560451440821d81b…

1 0

Alexandre Julliard : kernel32/tests: Use a pointer instead of an array to make gcc happy.
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: 3e1c4908ef5d8ee12e349f760a70cab9758539c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e1c4908ef5d8ee12e349f760… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 28 15:59:55 2014 +0900 kernel32/tests: Use a pointer instead of an array to make gcc happy. --- dlls/kernel32/tests/actctx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ae9674a..1f5683f 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2055,7 +2055,6 @@ static void run_child_process(void) static void init_paths(void) { LPWSTR ptr; - WCHAR last; static const WCHAR dot_manifest[] = {'.','M','a','n','i','f','e','s','t',0}; static const WCHAR backslash[] = {'\\',0}; @@ -2067,8 +2066,8 @@ static void init_paths(void) ptr[1] = 0; GetCurrentDirectoryW(MAX_PATH, work_dir); - last = work_dir[lstrlenW(work_dir) - 1]; - if (last != '\\' && last != '/') + ptr = work_dir + lstrlenW( work_dir ) - 1; + if (*ptr != '\\' && *ptr != '/') lstrcatW(work_dir, backslash); lstrcpyW(work_dir_subdir, work_dir); lstrcatW(work_dir_subdir, subdir);

1 0

Ken Thomases : winemac: Don' t allow double-clicks in the content area to zoom the window.
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: d9ed0fb8e5028cb264c10f1e15c8bf2f3658ca41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ed0fb8e5028cb264c10f1e1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 27 22:54:29 2014 -0500 winemac: Don't allow double-clicks in the content area to zoom the window. On Yosemite, double-clicking a window's title bar zooms it. (This is to compensate for the fact that the zoom button has been replaced by a full-screen button.) Sometimes, double-clicking in the content area would count as double- clicking in the title bar. This is controlled, in part, by the -mouseDownCanMoveWindow method of the view that was hit in the window. The default implementation of that returns YES for non-opaque views, as the views are in the Mac driver. Overriding it to return NO prevents the problem. --- dlls/winemac.drv/cocoa_window.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 35222c1..b2238cb 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -374,6 +374,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif return [[self window] contentView] == self; } + - (BOOL) mouseDownCanMoveWindow + { + return NO; + } + - (void) completeText:(NSString*)text { macdrv_event* event;

1 0

André Hentschel : gdiplus: Adjust identical conditions (PVS-Studio).
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: f1ed09fdd961cd3bde36e2cfd96cadcdd56d1083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ed09fdd961cd3bde36e2cfd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 27 23:56:10 2014 +0100 gdiplus: Adjust identical conditions (PVS-Studio). --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 169d92c..d192bf2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1779,7 +1779,7 @@ static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * for(i = 1; i < count; i++){ if((types[i] & PathPointTypePathTypeMask) == PathPointTypeBezier){ if((i + 2 >= count) || !(types[i + 1] & PathPointTypeBezier) - || !(types[i + 1] & PathPointTypeBezier)){ + || !(types[i + 2] & PathPointTypeBezier)){ ERR("Bad bezier points\n"); goto end; }

1 0

Bruno Jesus : wininet: Fix InternetGetConnectedStateEx[A|W].
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: 5e13e7f809075f28c0a8fb9fe7d3aa6cf0f50e80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e13e7f809075f28c0a8fb9fe… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Oct 27 20:41:02 2014 -0200 wininet: Fix InternetGetConnectedStateEx[A|W]. --- dlls/wininet/internet.c | 12 ++++++++++-- dlls/wininet/tests/internet.c | 14 -------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 2a2876c..4847ca0 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1276,13 +1276,21 @@ BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnecti /* Must be zero */ if(dwReserved) - return FALSE; + return FALSE; if (lpdwStatus) { WARN("always returning LAN connection.\n"); *lpdwStatus = INTERNET_CONNECTION_LAN; } - return LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen) > 0; + + /* When the buffer size is zero LoadStringW fills the buffer with a pointer to + * the resource, avoid it as we must not change the buffer in this case */ + if(lpszConnectionName && dwNameLen) { + *lpszConnectionName = '\0'; + LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen); + } + + return TRUE; } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index fc965e2..1548615 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1525,19 +1525,16 @@ static void test_InternetGetConnectedStateExA(void) trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, buffer); res = pInternetGetConnectedStateExA(NULL, NULL, 0, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); flags = 0; res = pInternetGetConnectedStateExA(&flags, NULL, 0, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); buffer[0] = 0; flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, 0, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); ok(!buffer[0], "Buffer must not change, got %02X\n", buffer[0]); @@ -1558,7 +1555,6 @@ todo_wine flags = 0; res = pInternetGetConnectedStateExA(&flags, NULL, sizeof(buffer), 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); @@ -1580,7 +1576,6 @@ todo_wine buffer[0] = 0; flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); @@ -1595,10 +1590,8 @@ todo_wine flags = 0; buffer[0] = 0xDE; res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); -todo_wine ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); } @@ -1621,12 +1614,10 @@ static void test_InternetGetConnectedStateExW(void) trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, wine_dbgstr_w(buffer)); res = pInternetGetConnectedStateExW(NULL, NULL, 0, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); flags = 0; res = pInternetGetConnectedStateExW(&flags, NULL, 0, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); @@ -1635,7 +1626,6 @@ todo_wine res = pInternetGetConnectedStateExW(&flags, buffer, 0, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); -todo_wine ok(!buffer[0], "Buffer must not change, got %02X\n", buffer[0]); buffer[0] = 0; @@ -1654,7 +1644,6 @@ todo_wine flags = 0; res = pInternetGetConnectedStateExW(&flags, NULL, sizeof(buffer) / sizeof(buffer[0]), 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); @@ -1676,7 +1665,6 @@ todo_wine buffer[0] = 0; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); @@ -1691,10 +1679,8 @@ todo_wine buffer[0] = 0xDEAD; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); -todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); -todo_wine ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); }

1 0

Daniel Lehman : wininet: Remove custom port handling in HTTP_HandleRedirect.
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: f3455da6ffda6f1e7d70f82a4dbb7afcc200e053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3455da6ffda6f1e7d70f82a4… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Oct 24 07:43:00 2014 -0700 wininet: Remove custom port handling in HTTP_HandleRedirect. --- dlls/wininet/http.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 40f8d9a..a98ed53 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4173,20 +4173,9 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) heap_free(session->hostName); - if(custom_port) { - int len; - static const WCHAR fmt[] = {'%','s',':','%','u',0}; - len = lstrlenW(hostName); - len += 7; /* 5 for strlen("65535") + 1 for ":" + 1 for '\0' */ - session->hostName = heap_alloc(len*sizeof(WCHAR)); - sprintfW(session->hostName, fmt, hostName, urlComponents.nPort); - } - else - session->hostName = heap_strdupW(hostName); + session->hostName = heap_strdupW(hostName); session->hostPort = urlComponents.nPort; - HTTP_ProcessHeader(request, hostW, session->hostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); - heap_free(session->userName); session->userName = NULL; if (userName[0]) @@ -4201,6 +4190,11 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) server_release(request->server); request->server = new_server; } + + if (custom_port) + HTTP_ProcessHeader(request, hostW, request->server->host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); + else + HTTP_ProcessHeader(request, hostW, request->server->name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); } heap_free(request->path); request->path=NULL;

1 0

Alexandre Julliard : write: Always append a backslash to the system directory.
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: 1555f29fc63feef6b650f904ba1799c3733a4d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1555f29fc63feef6b650f904b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 28 15:47:42 2014 +0900 write: Always append a backslash to the system directory. --- programs/write/write.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/programs/write/write.c b/programs/write/write.c index 8012355..4039af4 100644 --- a/programs/write/write.c +++ b/programs/write/write.c @@ -25,8 +25,7 @@ #include <windows.h> #include "resources.h" -static const WCHAR SZ_BACKSLASH[] = {'\\',0}; -static const WCHAR SZ_WORDPAD[] = {'w','o','r','d','p','a','d','.','e','x','e',0}; +static const WCHAR SZ_WORDPAD[] = {'\\','w','o','r','d','p','a','d','.','e','x','e',0}; int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int res) { @@ -36,8 +35,6 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(SZ_WORDPAD))) goto failed; - if (path[lstrlenW(path) - 1] != '\\') - lstrcatW(path, SZ_BACKSLASH); lstrcatW(path, SZ_WORDPAD); stinf.cb = sizeof(STARTUPINFOW);

1 0

Alexandre Julliard : comdlg32: Use PathAddBackslash to avoid a compiler warning.
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: 2b40148e1e73165ac0c85fd122657661cc103b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b40148e1e73165ac0c85fd12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 28 14:33:17 2014 +0900 comdlg32: Use PathAddBackslash to avoid a compiler warning. --- dlls/comdlg32/filedlg.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index f76d01e..2738467 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1599,9 +1599,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* initdir does not have to be a directory. If a file is * specified, the dir part is taken */ if( PathIsDirectoryW(tmpBuf)) { - if (tmpBuf[lstrlenW(tmpBuf)-1] != '\\') { - lstrcatW(tmpBuf, szwSlash); - } + PathAddBackslashW( tmpBuf ); lstrcatW(tmpBuf, szwStar); } result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit);

1 0

André Hentschel : comdlg32: Remove duplicate code ( PVS-Studio).
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: c4747f46cfa83a69801f6e961a938ca91fbf80fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4747f46cfa83a69801f6e961… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 28 00:02:11 2014 +0100 comdlg32: Remove duplicate code (PVS-Studio). --- dlls/comdlg32/filedlg.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 0f1a144..f76d01e 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3270,7 +3270,6 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) int iIndentation; TEXTMETRICW tm; LPSFOLDER tmpFolder; - LookInInfos *liInfos = GetPropA(pDIStruct->hwndItem,LookInInfosStr); UINT shgfi_flags = SHGFI_PIDL | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME; UINT icon_width, icon_height; @@ -3293,16 +3292,8 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) shgfi_flags |= SHGFI_SMALLICON; } - if(pDIStruct->itemID == liInfos->uSelectedItem) - { - ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, &sfi, sizeof (sfi), shgfi_flags ); - } - else - { - ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, &sfi, sizeof (sfi), shgfi_flags ); - } + ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, + 0, &sfi, sizeof (sfi), shgfi_flags ); /* Is this item selected ? */ if(pDIStruct->itemState & ODS_SELECTED) @@ -3320,16 +3311,10 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) /* Do not indent item if drawing in the edit of the combo */ if(pDIStruct->itemState & ODS_COMBOBOXEDIT) - { iIndentation = 0; - ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, &sfi, sizeof (sfi), shgfi_flags ); - - } else - { iIndentation = tmpFolder->m_iIndent; - } + /* Draw text and icon */ /* Initialise the icon display area */

1 0

André Hentschel : wrc: Remove duplicate code ( PVS-Studio).
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: 9b810cd6e884facde7152a79a6474c3637b260ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b810cd6e884facde7152a79a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 28 00:02:09 2014 +0100 wrc: Remove duplicate code (PVS-Studio). --- tools/wrc/genres.c | 178 ++++++++++++++++++----------------------------------- 1 file changed, 61 insertions(+), 117 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 9cea432..8993a87 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -960,86 +960,48 @@ static res_t *cursorgroup2res(name_id_t *name, cursor_group_t *curg) res = new_res(); restag = put_res_header(res, WRC_RT_GROUP_CURSOR, NULL, name, curg->memopt, &(curg->lvc)); - if(win32) - { - put_word(res, 0); /* Reserved */ - /* FIXME: The ResType in the NEWHEADER structure should - * contain 14 according to the MS win32 doc. This is - * not the case with the BRC compiler and I really doubt - * the latter. Putting one here is compliant to win16 spec, - * but who knows the true value? - */ - put_word(res, 2); /* ResType */ - put_word(res, curg->ncursor); -#if 0 - for(cur = curg->cursorlist; cur; cur = cur->next) -#else - cur = curg->cursorlist; - while(cur->next) - cur = cur->next; - for(; cur; cur = cur->prev) -#endif - { - put_word(res, cur->width); - /* FIXME: The height of a cursor is half the size of - * the bitmap's height. BRC puts the height from the - * BITMAPINFOHEADER here instead of the cursorfile's - * height. MS doesn't seem to care... - */ - put_word(res, cur->height); - /* FIXME: The next two are reversed in BRC and I don't - * know why. Probably a bug. But, we can safely ignore - * it because win16 does not support color cursors. - * A warning should have been generated by the parser. - */ - put_word(res, cur->planes); - put_word(res, cur->bits); - /* FIXME: The +4 is the hotspot in the cursor resource. - * However, I could not find this in the documentation. - * The hotspot bytes must either be included or MS - * doesn't care. - */ - put_dword(res, cur->data->size +4); - put_word(res, cur->id); - } - } - else /* win16 */ - { - put_word(res, 0); /* Reserved */ - put_word(res, 2); /* ResType */ - put_word(res, curg->ncursor); + + put_word(res, 0); /* Reserved */ + /* FIXME: The ResType in the NEWHEADER structure should + * contain 14 according to the MS win32 doc. This is + * not the case with the BRC compiler and I really doubt + * the latter. Putting one here is compliant to win16 spec, + * but who knows the true value? + */ + put_word(res, 2); /* ResType */ + put_word(res, curg->ncursor); #if 0 - for(cur = curg->cursorlist; cur; cur = cur->next) + for(cur = curg->cursorlist; cur; cur = cur->next) #else - cur = curg->cursorlist; - while(cur->next) - cur = cur->next; - for(; cur; cur = cur->prev) + cur = curg->cursorlist; + while(cur->next) + cur = cur->next; + for(; cur; cur = cur->prev) #endif - { - put_word(res, cur->width); - /* FIXME: The height of a cursor is half the size of - * the bitmap's height. BRC puts the height from the - * BITMAPINFOHEADER here instead of the cursorfile's - * height. MS doesn't seem to care... - */ - put_word(res, cur->height); - /* FIXME: The next two are reversed in BRC and I don't - * know why. Probably a bug. But, we can safely ignore - * it because win16 does not support color cursors. - * A warning should have been generated by the parser. - */ - put_word(res, cur->planes); - put_word(res, cur->bits); - /* FIXME: The +4 is the hotspot in the cursor resource. - * However, I could not find this in the documentation. - * The hotspot bytes must either be included or MS - * doesn't care. - */ - put_dword(res, cur->data->size +4); - put_word(res, cur->id); - } - } + { + put_word(res, cur->width); + /* FIXME: The height of a cursor is half the size of + * the bitmap's height. BRC puts the height from the + * BITMAPINFOHEADER here instead of the cursorfile's + * height. MS doesn't seem to care... + */ + put_word(res, cur->height); + /* FIXME: The next two are reversed in BRC and I don't + * know why. Probably a bug. But, we can safely ignore + * it because win16 does not support color cursors. + * A warning should have been generated by the parser. + */ + put_word(res, cur->planes); + put_word(res, cur->bits); + /* FIXME: The +4 is the hotspot in the cursor resource. + * However, I could not find this in the documentation. + * The hotspot bytes must either be included or MS + * doesn't care. + */ + put_dword(res, cur->data->size +4); + put_word(res, cur->id); + } + SetResSize(res, restag); /* Set ResourceSize */ if(win32) put_pad(res); @@ -1103,46 +1065,28 @@ static res_t *icongroup2res(name_id_t *name, icon_group_t *icog) res = new_res(); restag = put_res_header(res, WRC_RT_GROUP_ICON, NULL, name, icog->memopt, &(icog->lvc)); - if(win32) - { - put_word(res, 0); /* Reserved */ - /* FIXME: The ResType in the NEWHEADER structure should - * contain 14 according to the MS win32 doc. This is - * not the case with the BRC compiler and I really doubt - * the latter. Putting one here is compliant to win16 spec, - * but who knows the true value? - */ - put_word(res, 1); /* ResType */ - put_word(res, icog->nicon); - for(ico = icog->iconlist; ico; ico = ico->next) - { - put_byte(res, ico->width); - put_byte(res, ico->height); - put_byte(res, ico->nclr); - put_byte(res, 0); /* Reserved */ - put_word(res, ico->planes); - put_word(res, ico->bits); - put_dword(res, ico->data->size); - put_word(res, ico->id); - } - } - else /* win16 */ - { - put_word(res, 0); /* Reserved */ - put_word(res, 1); /* ResType */ - put_word(res, icog->nicon); - for(ico = icog->iconlist; ico; ico = ico->next) - { - put_byte(res, ico->width); - put_byte(res, ico->height); - put_byte(res, ico->nclr); - put_byte(res, 0); /* Reserved */ - put_word(res, ico->planes); - put_word(res, ico->bits); - put_dword(res, ico->data->size); - put_word(res, ico->id); - } - } + + put_word(res, 0); /* Reserved */ + /* FIXME: The ResType in the NEWHEADER structure should + * contain 14 according to the MS win32 doc. This is + * not the case with the BRC compiler and I really doubt + * the latter. Putting one here is compliant to win16 spec, + * but who knows the true value? + */ + put_word(res, 1); /* ResType */ + put_word(res, icog->nicon); + for(ico = icog->iconlist; ico; ico = ico->next) + { + put_byte(res, ico->width); + put_byte(res, ico->height); + put_byte(res, ico->nclr); + put_byte(res, 0); /* Reserved */ + put_word(res, ico->planes); + put_word(res, ico->bits); + put_dword(res, ico->data->size); + put_word(res, ico->id); + } + SetResSize(res, restag); /* Set ResourceSize */ if(win32) put_pad(res);

1 0

Michael Stefaniuc : avifil32: Simplify comparing two unsigned ints ( PVS-Studio).
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: 2bf09a9d25dc9b29e8f96e36c71c8256645ec994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf09a9d25dc9b29e8f96e36c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 27 20:03:33 2014 +0100 avifil32: Simplify comparing two unsigned ints (PVS-Studio). --- dlls/avifil32/editstream.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 6d38725..3aa8637 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -169,10 +169,9 @@ static HRESULT AVIFILE_RemoveStream(IAVIEditStreamImpl* const This, DWORD nr) /* remove part nr */ IAVIStream_Release(This->pStreams[nr].pStream); This->nStreams--; - if (This->nStreams - nr > 0) { - memmove(This->pStreams + nr, This->pStreams + nr + 1, - (This->nStreams - nr) * sizeof(EditStreamTable)); - } + if (nr < This->nStreams) + memmove(&This->pStreams[nr], &This->pStreams[nr + 1], + (This->nStreams - nr) * sizeof(This->pStreams[0])); This->pStreams[This->nStreams].pStream = NULL; This->pStreams[This->nStreams].dwStart = 0; This->pStreams[This->nStreams].dwLength = 0;

1 0

Michael Stefaniuc : oleaut32: Clarify cast operation (PVS-Studio).
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: 39eede134ea938ff40cba4dab2340bf1a7843e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39eede134ea938ff40cba4dab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 27 20:01:37 2014 +0100 oleaut32: Clarify cast operation (PVS-Studio). --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 48b171b..00f5043 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9144,7 +9144,7 @@ static DWORD WMSFT_append_arraydesc(ARRAYDESC *desc, WMSFT_TLBFile *file) file->arraydesc_seg.data = heap_alloc(file->arraydesc_seg.len); else file->arraydesc_seg.data = heap_realloc(file->arraydesc_seg.data, file->arraydesc_seg.len); - encoded = (DWORD*)((char *)file->arraydesc_seg.data) + offs; + encoded = (DWORD*)((char *)file->arraydesc_seg.data + offs); encoded[0] = WMSFT_append_typedesc(&desc->tdescElem, file, NULL, NULL); encoded[1] = desc->cDims | ((desc->cDims * 2 * sizeof(DWORD)) << 16);

1 0

Bruno Jesus : regedit: Append exported strings using the correct size.
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: 01b0746906bf2f570e5faca68714076384d0f600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b0746906bf2f570e5faca68… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 22:01:02 2014 -0200 regedit: Append exported strings using the correct size. --- programs/regedit/regproc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 18b6e98..d07fdc7 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1180,10 +1180,7 @@ static void export_hkey(FILE *file, HKEY key, lstrcpyW(*line_buf + line_len, start); line_len += len; - /* At this point we know wstr is '\0'-terminated - * so we can subtract 1 from the size - */ - REGPROC_export_string(line_buf, line_buf_size, &line_len, wstr, val_size1 / sizeof(WCHAR) - 1); + REGPROC_export_string(line_buf, line_buf_size, &line_len, wstr, lstrlenW(wstr)); REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + lstrlenW(end)); lstrcpyW(*line_buf + line_len, end);

1 0

André Hentschel : gdi32: Fix typo in a condition ( PVS-Studio).
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: 88e8102570f46826c089415a72f6d9fb8feffce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e8102570f46826c089415a7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 28 00:02:07 2014 +0100 gdi32: Fix typo in a condition (PVS-Studio). --- dlls/gdi32/enhmetafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 99a2415..61f541f 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1416,7 +1416,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( if ((info->state.mode != MM_ISOTROPIC) && (info->state.mode != MM_ANISOTROPIC)) break; if (!lpScaleWindowExtEx->xNum || !lpScaleWindowExtEx->xDenom || - !lpScaleWindowExtEx->xNum || !lpScaleWindowExtEx->yDenom) + !lpScaleWindowExtEx->yNum || !lpScaleWindowExtEx->yDenom) break; info->state.wndExtX = MulDiv(info->state.wndExtX, lpScaleWindowExtEx->xNum, lpScaleWindowExtEx->xDenom);

1 0

André Hentschel : kernel32: Set COMPUTERNAME environment variable.
by Alexandre Julliard Oct. 28, 2014

Oct. 28, 2014

Module: wine Branch: master Commit: e404d7fea3f889ce273d74e5ec274efe8a45296c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e404d7fea3f889ce273d74e5e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 27 23:50:34 2014 +0100 kernel32: Set COMPUTERNAME environment variable. --- dlls/kernel32/process.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 138273b..0a087ab 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -512,13 +512,20 @@ static void set_additional_environment(void) 'P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR profiles_valueW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; static const WCHAR all_users_valueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; + static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; WCHAR *profile_dir = NULL, *all_users_dir = NULL; + WCHAR buf[MAX_COMPUTERNAME_LENGTH]; HANDLE hkey; DWORD len; + /* ComputerName */ + len = sizeof(buf) / sizeof(WCHAR); + if (GetComputerNameW( buf, &len )) + SetEnvironmentVariableW( computernameW, buf ); + /* set the ALLUSERSPROFILE variables */ attr.Length = sizeof(attr);

1 0

Jeremy Newman : set open graph images for announcements and wwn
by Jeremy Newman Oct. 27, 2014

Oct. 27, 2014

Module: website Branch: master Commit: 92be36f05cd1609f91e46fe9842cf1aa8255fe95 URL: http://source.winehq.org/git/website.git/?a=commit;h=92be36f05cd1609f91e46f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Oct 27 09:38:07 2014 -0500 set open graph images for announcements and wwn --- templates/en/announce.template | 1 + templates/en/wwn.template | 1 + 2 files changed, 2 insertions(+) diff --git a/templates/en/announce.template b/templates/en/announce.template index 0f82da6..cbe2efa 100644 --- a/templates/en/announce.template +++ b/templates/en/announce.template @@ -1,5 +1,6 @@   + <h1 class="title">Wine Announcement</h1> diff --git a/templates/en/wwn.template b/templates/en/wwn.template index 9135c58..a6a5ba3 100644 --- a/templates/en/wwn.template +++ b/templates/en/wwn.template @@ -1,5 +1,6 @@   + <h1 class="title">World Wine News</h1> <div style="font-size: x-small; margin-top: 0;">All the news that fits, we print.</div>

1 0

Nikolay Sivov : dwrite: Implement GetFontFromFontFace().
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 1ab456fde3bec9768ac4045e6fdf2263dad8a7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab456fde3bec9768ac4045e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:25:43 2014 +0300 dwrite: Implement GetFontFromFontFace(). --- dlls/dwrite/font.c | 50 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 708a6d8..50c3acb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -47,6 +47,8 @@ struct dwrite_font_data { IDWriteFontFile *file; UINT32 face_index; + IDWriteFontFace2 *face; + WCHAR *facename; }; @@ -88,7 +90,6 @@ struct dwrite_font { BOOL is_system; IDWriteFontFamily *family; - IDWriteFontFace2 *face; struct dwrite_font_data *data; }; @@ -220,6 +221,8 @@ static void release_font_data(struct dwrite_font_data *data) IDWriteFontFile_Release(data->file); if (data->factory) IDWriteFactory_Release(data->factory); + if (data->face) + IDWriteFontFace2_Release(data->face); heap_free(data->facename); heap_free(data); } @@ -735,7 +738,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 *fontface = NULL; - if (!font->face) { + if (!font->data->face) { struct dwrite_font_data *data = font->data; IDWriteFontFace *face; @@ -745,11 +748,11 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 if (FAILED(hr)) return hr; - hr = IDWriteFontFace_QueryInterface(face, &IID_IDWriteFontFace2, (void**)&font->face); + hr = IDWriteFontFace_QueryInterface(face, &IID_IDWriteFontFace2, (void**)&font->data->face); IDWriteFontFace_Release(face); } - *fontface = font->face; + *fontface = font->data->face; return hr; } @@ -909,7 +912,6 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont2 *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { - if (This->face) IDWriteFontFace2_Release(This->face); if (This->family) IDWriteFontFamily_Release(This->family); release_font_data(This->data); heap_free(This); @@ -1406,8 +1408,40 @@ static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollection *iface, IDWriteFontFace *face, IDWriteFont **font) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - FIXME("(%p)->(%p %p): stub\n", This, face, font); - return E_NOTIMPL; + struct dwrite_fontfamily_data *found_family = NULL; + struct dwrite_font_data *found_font = NULL; + IDWriteFontFamily *family; + UINT32 i, j; + HRESULT hr; + + TRACE("(%p)->(%p %p)\n", This, face, font); + + *font = NULL; + + if (!face) + return E_INVALIDARG; + + for (i = 0; i < This->data_count; i++) { + struct dwrite_fontfamily_data *family_data = This->family_data[i]; + for (j = 0; j < family_data->font_count; j++) { + if ((IDWriteFontFace*)family_data->fonts[j]->face == face) { + found_font = family_data->fonts[j]; + found_family = family_data; + break; + } + } + } + + if (!found_font) + return E_INVALIDARG; + + hr = create_fontfamily_from_data(found_family, iface, &family); + if (FAILED(hr)) + return hr; + + hr = create_font_from_data(found_font, family, font); + IDWriteFontFamily_Release(family); + return hr; } static const IDWriteFontCollectionVtbl fontcollectionvtbl = { @@ -1534,6 +1568,7 @@ static HRESULT init_font_data(IDWriteFactory *factory, IDWriteFontFile *file, UI data->factory = factory; data->file = file; + data->face = NULL; data->face_index = face_index; data->face_type = face_type; IDWriteFontFile_AddRef(file); @@ -1790,7 +1825,6 @@ static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFontF This->IDWriteFont2_iface.lpVtbl = &dwritefontvtbl; This->ref = 1; - This->face = NULL; This->family = family; if (family) IDWriteFontFamily_AddRef(family);

1 0

Stefan Dösinger : wined3d: Update Nvidia driver versions.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: a4443a97a7a8e89a91ccd7b8f4b426dd61f0780a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4443a97a7a8e89a91ccd7b8f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 24 11:28:56 2014 +0200 wined3d: Update Nvidia driver versions. --- dlls/wined3d/directx.c | 138 +++++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4443a97a7a8e89a91ccd…

1 0

Sebastian Lackner : kernel32/tests: Avoid crashing when exception info[0] contains wrong value.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: d4d8efad467ab593681f5dad300d9d5a750b42b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d8efad467ab593681f5dad3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 24 02:03:40 2014 +0200 kernel32/tests: Avoid crashing when exception info[0] contains wrong value. --- dlls/kernel32/tests/virtual.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 98ef703..1e66ee1 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2130,8 +2130,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) vectored_handler = pRtlAddVectoredExceptionHandler( TRUE, &execute_fault_vec_handler ); ok( vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n" ); - num_execute_fault_calls = 0; - ret = SendMessageA( hWnd, WM_USER, 0, 0 ); + ret = send_message_excpt( hWnd, WM_USER, 0, 0 ); pRtlRemoveVectoredExceptionHandler( vectored_handler );

1 0

Nikolay Sivov : dwrite: Allow null arguments in opentype_get_font_table().
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 34823028e17c3f34e1e7e23642ef4239841a1750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34823028e17c3f34e1e7e2364… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:26:22 2014 +0300 dwrite: Allow null arguments in opentype_get_font_table(). --- dlls/dwrite/opentype.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c007b35..c6f7a52 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -322,7 +322,8 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ int table_count, table_offset = 0; int i; - *found = FALSE; + if (found) *found = FALSE; + if (table_size) *table_size = 0; if (type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) { const TTC_Header_V1 *ttc_header; @@ -363,8 +364,8 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ int length = GET_BE_DWORD(table_record->length); IDWriteFontFileStream_ReleaseFileFragment(stream, table_record_context); - *found = TRUE; - *table_size = length; + if (found) *found = TRUE; + if (table_size) *table_size = length; hr = IDWriteFontFileStream_ReadFileFragment(stream, table_data, offset, length, table_context); }

1 0

Nikolay Sivov : dwrite: Initialize allocation size for a family before using it.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 340aa07f60a12e1dab74e779786ace4c4ad7d329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=340aa07f60a12e1dab74e7797… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:25:19 2014 +0300 dwrite: Initialize allocation size for a family before using it. --- dlls/dwrite/font.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d55e06d..708a6d8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -56,8 +56,8 @@ struct dwrite_fontfamily_data { IDWriteLocalizedStrings *familyname; struct dwrite_font_data **fonts; - UINT32 font_count; - UINT32 alloc; + UINT32 font_count; + UINT32 font_alloc; }; struct dwrite_fontcollection { @@ -1440,16 +1440,16 @@ static HRESULT add_family_syscollection(struct dwrite_fontcollection *collection static HRESULT fontfamily_add_font(struct dwrite_fontfamily_data *family_data, struct dwrite_font_data *font_data) { - if (family_data->font_count + 1 >= family_data->alloc) { + if (family_data->font_count + 1 >= family_data->font_alloc) { struct dwrite_font_data **new_list; UINT32 new_alloc; - new_alloc = family_data->alloc * 2; + new_alloc = family_data->font_alloc * 2; new_list = heap_realloc(family_data->fonts, sizeof(*family_data->fonts) * new_alloc); if (!new_list) return E_OUTOFMEMORY; family_data->fonts = new_list; - family_data->alloc = new_alloc; + family_data->font_alloc = new_alloc; } family_data->fonts[family_data->font_count] = font_data; @@ -1558,16 +1558,16 @@ static HRESULT init_font_data(IDWriteFactory *factory, IDWriteFontFile *file, UI static HRESULT init_fontfamily_data(IDWriteLocalizedStrings *familyname, struct dwrite_fontfamily_data *data) { - data->fonts = heap_alloc(sizeof(*data->fonts)*data->alloc); + data->ref = 1; + data->font_count = 0; + data->font_alloc = 2; + + data->fonts = heap_alloc(sizeof(*data->fonts)*data->font_alloc); if (!data->fonts) { heap_free(data); return E_OUTOFMEMORY; } - data->ref = 1; - data->font_count = 0; - data->alloc = 2; - data->familyname = familyname; IDWriteLocalizedStrings_AddRef(familyname); @@ -1761,7 +1761,7 @@ static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFon data->ref = 0; data->font_count = 0; - data->alloc = 2; + data->font_alloc = 2; data->fonts = heap_alloc(sizeof(*data->fonts) * 2); if (!data->fonts) {

1 0

Alexandre Julliard : xcopy: Avoid a potential out of bounds access.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 7711f494e39432984b177e0a18a204dd75bc4cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7711f494e39432984b177e0a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 27 17:46:38 2014 +0900 xcopy: Avoid a potential out of bounds access. --- programs/xcopy/xcopy.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 7ff751c..2134a5e 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -271,11 +271,9 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { EXCLUDELIST *thisEntry; int length = lstrlenW(buffer); - /* Strip CRLF */ - buffer[length-1] = 0x00; - /* If more than CRLF */ if (length > 1) { + buffer[length-1] = 0; /* strip CRLF */ thisEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCLUDELIST)); thisEntry->next = excludeList; excludeList = thisEntry;

1 0

Nikolay Sivov : dwrite: Block attempts of registering local file loader.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 5b10a69c3ad3ffd4f27b892ba37164ac76be20c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b10a69c3ad3ffd4f27b892ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:24:47 2014 +0300 dwrite: Block attempts of registering local file loader. --- dlls/dwrite/main.c | 6 ++++++ dlls/dwrite/tests/font.c | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 1e10431..05d853f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -813,6 +813,9 @@ static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface if (!loader) return E_INVALIDARG; + if ((IDWriteFontFileLoader*)This->localfontfileloader == loader) + return S_OK; + if (factory_get_file_loader(This, loader)) return DWRITE_E_ALREADYREGISTERED; @@ -838,6 +841,9 @@ static HRESULT WINAPI dwritefactory_UnregisterFontFileLoader(IDWriteFactory *ifa if (!loader) return E_INVALIDARG; + if ((IDWriteFontFileLoader*)This->localfontfileloader == loader) + return S_OK; + found = factory_get_file_loader(This, loader); if (!found) return E_INVALIDARG; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2b84ba1..d9e927f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -885,8 +885,7 @@ static void test_system_fontcollection(void) ok(coll2 == collection, "got %p, was %p\n", coll2, collection); IDWriteFontCollection_Release(coll2); - hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IDWriteFactory, (IUnknown**)&factory2); - ok(hr == S_OK, "got 0x%08x\n", hr); + factory2 = create_factory(); hr = IDWriteFactory_GetSystemFontCollection(factory2, &coll2, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); ok(coll2 != collection, "got %p, was %p\n", coll2, collection); @@ -943,6 +942,19 @@ if (file) { ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr); hr = IDWriteFactory_UnregisterFontFileLoader(factory, loader); ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr); + + /* try with a different factory */ + factory2 = create_factory(); + hr = IDWriteFactory_RegisterFontFileLoader(factory2, loader); + ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr); + hr = IDWriteFactory_RegisterFontFileLoader(factory2, loader); + ok(hr == DWRITE_E_ALREADYREGISTERED, "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory2, loader); + ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory2, loader); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + IDWriteFactory_Release(factory2); + IDWriteFontFileLoader_Release(loader); } ret = TRUE;

1 0

Nikolay Sivov : dwrite/tests: Fix recently inroduced test failure.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: be69977cd5abc1620be87e777dbf29630fe4e62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=be69977cd5abc1620be87e777… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 26 20:49:26 2014 +0300 dwrite/tests: Fix recently inroduced test failure. --- dlls/dwrite/tests/font.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3830bc9..2b84ba1 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1200,8 +1200,12 @@ static void test_CreateCustomFontFileReference(void) IDWriteFontFace_Release(face2); /* file was created with different factory */ + face2 = NULL; hr = IDWriteFactory_CreateFontFace(factory2, face_type, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &face2); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (face2) + IDWriteFontFace_Release(face2); file2 = NULL; hr = IDWriteFactory_CreateCustomFontFileReference(factory, &fontrsrc, sizeof(HRSRC), &rloader, &file2);

1 0

Iván Matellanes : msvcrt: Added _fflush_nolock implementation.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 4bb80afedcca6bdc510574488258ef1a16e4167f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb80afedcca6bdc510574488… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Oct 20 21:03:16 2014 +0200 msvcrt: Added _fflush_nolock implementation. Thanks to Piotr Caban for the test. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 20 ++++++++++++++++++++ dlls/msvcrt/file.c | 24 +++++++++++++++++++----- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 8 files changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6a36661..9b6de75 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -799,7 +799,7 @@ @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fflush_nolock +@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d6b1a18..cf7beb5 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1147,7 +1147,7 @@ @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fflush_nolock +@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 237539b..bb26bcc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -466,7 +466,7 @@ @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fflush_nolock +@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b810c5f..34a90e6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -448,7 +448,7 @@ @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fflush_nolock +@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0a81edc..9bb29da 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -121,6 +121,7 @@ static int (__cdecl *p_flsbuf)(int, FILE*); static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); static void** (__cdecl *p__pxcptinfoptrs)(void); static void* (__cdecl *p__AdjustPointer)(void*, const void*); +static int (__cdecl *p_fflush_nolock)(FILE*); /* make sure we use the correct errno */ #undef errno @@ -379,6 +380,7 @@ static BOOL init(void) SET(p_byteswap_ulong, "_byteswap_ulong"); SET(p__pxcptinfoptrs, "__pxcptinfoptrs"); SET(p__AdjustPointer, "__AdjustPointer"); + SET(p_fflush_nolock, "_fflush_nolock"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -1207,16 +1209,22 @@ struct block_file_arg FILE *write; HANDLE init; HANDLE finish; + int deadlock_test; }; static DWORD WINAPI block_file(void *arg) { struct block_file_arg *files = arg; + int deadlock_test; p_lock_file(files->read); p_lock_file(files->write); SetEvent(files->init); + WaitForSingleObject(files->finish, INFINITE); + Sleep(200); + deadlock_test = InterlockedIncrement(&files->deadlock_test); + ok(deadlock_test == 1, "deadlock_test = %d\n", deadlock_test); p_unlock_file(files->read); p_unlock_file(files->write); return 0; @@ -1250,6 +1258,7 @@ static void test_nonblocking_file_access(void) arg.write = filew; arg.init = CreateEventW(NULL, FALSE, FALSE, NULL); arg.finish = CreateEventW(NULL, FALSE, FALSE, NULL); + arg.deadlock_test = 0; ok(arg.init != NULL, "CreateEventW failed\n"); ok(arg.finish != NULL, "CreateEventW failed\n"); thread = CreateThread(NULL, 0, block_file, (void*)&arg, 0, NULL); @@ -1276,7 +1285,18 @@ static void test_nonblocking_file_access(void) ret = p_flsbuf('a', filew); ok(ret=='a', "_flsbuf(filew) returned %d\n", ret); + ret = p_fflush_nolock(filer); + ok(ret==0, "_fflush_nolock(filer) returned %d\n", ret); + ret = p_fflush_nolock(filew); + ok(ret==0, "_fflush_nolock(filew) returned %d\n", ret); + SetEvent(arg.finish); + + ret = p_fflush_nolock(NULL); + ok(ret==0, "_fflush_nolock(NULL) returned %d\n", ret); + ret = InterlockedIncrement(&arg.deadlock_test); + ok(ret==2, "InterlockedIncrement returned %d\n", ret); + WaitForSingleObject(thread, INFINITE); CloseHandle(arg.init); CloseHandle(arg.finish); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2dd4da5..2e07342 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -919,24 +919,38 @@ int CDECL MSVCRT__flushall(void) */ int CDECL MSVCRT_fflush(MSVCRT_FILE* file) { + int ret; + + if(!file) { + msvcrt_flush_all_buffers(MSVCRT__IOWRT); + ret = 0; + } else { + MSVCRT__lock_file(file); + ret = MSVCRT__fflush_nolock(file); + MSVCRT__unlock_file(file); + } + + return ret; +} + +/********************************************************************* + * _fflush_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fflush_nolock(MSVCRT_FILE* file) +{ if(!file) { msvcrt_flush_all_buffers(MSVCRT__IOWRT); } else if(file->_flag & MSVCRT__IOWRT) { int res; - MSVCRT__lock_file(file); res = msvcrt_flush_buffer(file); - if(!res && (file->_flag & MSVCRT__IOCOMMIT)) res = MSVCRT__commit(file->_file) ? MSVCRT_EOF : 0; - MSVCRT__unlock_file(file); return res; } else if(file->_flag & MSVCRT__IOREAD) { - MSVCRT__lock_file(file); file->_cnt = 0; file->_ptr = file->_base; - MSVCRT__unlock_file(file); return 0; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 85484bc..9f00923 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -931,6 +931,7 @@ MSVCRT_size_t __cdecl MSVCRT__fread_nolock(void*,MSVCRT_size_t,MSVCRT_size_t,MSV MSVCRT_size_t __cdecl MSVCRT__fwrite_nolock(const void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*); int __cdecl MSVCRT_fclose(MSVCRT_FILE*); int __cdecl MSVCRT__fclose_nolock(MSVCRT_FILE*); +int __cdecl MSVCRT__fflush_nolock(MSVCRT_FILE*); void __cdecl MSVCRT_terminate(void); MSVCRT_FILE* __cdecl MSVCRT__iob_func(void); MSVCRT_clock_t __cdecl MSVCRT_clock(void); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 1c154fc..305d251 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,6 +130,7 @@ int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); +int __cdecl _fflush_nolock(FILE*); int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*);

1 0

Stefan Dösinger : wined3d: Update AMD drivers.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: c35f0161c0803a4f16c963f4ba06cb2077202386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35f0161c0803a4f16c963f4b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 24 11:28:57 2014 +0200 wined3d: Update AMD drivers. --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a10d60e..d428d94 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1166,9 +1166,9 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_RAGE_128PRO, DRIVER_MODEL_NT5X, "ati2dvaa.dll", 13, 3279, 0}, {DRIVER_AMD_R100, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6614}, {DRIVER_AMD_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764}, - {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 8681}, + {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 17, 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, - {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, + {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280 }, /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp

1 0

Alexandre Julliard : msvcp90: Add inline wrappers for the memcpy_s/ memmove_s/mbstowcs_s functions.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 4b1aba754e5aab84fe74f595fb305f5293a29589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1aba754e5aab84fe74f595f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 27 17:47:03 2014 +0900 msvcp90: Add inline wrappers for the memcpy_s/memmove_s/mbstowcs_s functions. --- dlls/msvcp90/msvcp90.h | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 0a60d46..d7c0a31 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -562,8 +562,23 @@ typedef struct { } complex_double; #if _MSVCP_VER < 80 -#define memcpy_s( dst, size, src, count ) (memcpy( (dst), (src), (count) ), 0) -#define memmove_s( dst, size, src, count ) (memmove( (dst), (src), (count) ), 0) -#define mbstowcs_s( ret, wcs, size, mbs, count ) (mbstowcs( (wcs), (mbs), (count) ), 0) +static inline int memcpy_wrapper( void *dst, size_t size, const void *src, size_t count ) +{ + memcpy( dst, src, count ); + return 0; +} +static inline int memmove_wrapper( void *dst, size_t size, const void *src, size_t count ) +{ + memmove( dst, src, count ); + return 0; +} +static inline int mbstowcs_wrapper( size_t *ret, wchar_t *wcs, size_t size, const char *mbs, size_t count ) +{ + mbstowcs( wcs, mbs, count ); + return 0; +} +#define memcpy_s( dst, size, src, count ) memcpy_wrapper( dst, size, src, count ) +#define memmove_s( dst, size, src, count ) memmove_wrapper( dst, size, src, count ) +#define mbstowcs_s( ret, wcs, size, mbs, count ) mbstowcs_wrapper( ret, wcs, size, mbs, count ) #define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) )) #endif

1 0

Austin English : kernel32: Add a stub for CancelTimerQueueTimer.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 1ade676968244d17a03647e8c8d93bab66429100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ade676968244d17a03647e8c… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 25 01:03:01 2014 -0500 kernel32: Add a stub for CancelTimerQueueTimer. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d08f90c..2b01df1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -182,7 +182,7 @@ @ stub CancelDeviceWakeupRequest @ stdcall CancelIo(long) @ stdcall CancelIoEx(long ptr) -# @ stub CancelTimerQueueTimer +@ stdcall CancelTimerQueueTimer(ptr ptr) @ stdcall CancelWaitableTimer(long) @ stdcall ChangeTimerQueueTimer(ptr ptr long long) # @ stub CheckNameLegalDOS8Dot3A diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d399b82..04b3270 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1300,6 +1300,15 @@ BOOL WINAPI ChangeTimerQueueTimer( HANDLE TimerQueue, HANDLE Timer, } /*********************************************************************** + * CancelTimerQueueTimer (KERNEL32.@) + */ +BOOL WINAPI CancelTimerQueueTimer(HANDLE queue, HANDLE timer) +{ + FIXME("stub: %p %p\n", queue, timer); + return FALSE; +} + +/*********************************************************************** * DeleteTimerQueueTimer (KERNEL32.@) * * Cancels a timer-queue timer.

1 0

Bruno Jesus : advapi32/tests: Add a test for enumerating a registry key without setting it.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: cbc8d290b9860e047ba21f70fe8672be325393b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc8d290b9860e047ba21f70f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 21:38:03 2014 -0200 advapi32/tests: Add a test for enumerating a registry key without setting it. --- dlls/advapi32/tests/registry.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 85f50ce..82391e1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -517,6 +517,33 @@ static void test_enum_value(void) res = RegSetValueExA( test_key, "Test", 0, REG_BINARY, NULL, 0 ); ok( ERROR_SUCCESS == res || ERROR_INVALID_PARAMETER == res, "RegSetValueExA returned %d\n", res ); + /* test reading the value and data without setting them */ + val_count = 20; + data_count = 20; + type = 1234; + strcpy( value, "xxxxxxxxxx" ); + strcpy( data, "xxxxxxxxxx" ); + res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); + ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); + ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); + ok( data_count == 0, "data_count set to %d instead of 0\n", data_count ); + ok( type == REG_BINARY, "type %d is not REG_BINARY\n", type ); + ok( !strcmp( value, "Test" ), "value is '%s' instead of Test\n", value ); + ok( !strcmp( data, "xxxxxxxxxx" ), "data is '%s' instead of xxxxxxxxxx\n", data ); + + val_count = 20; + data_count = 20; + type = 1234; + memcpy( valueW, xxxW, sizeof(xxxW) ); + memcpy( dataW, xxxW, sizeof(xxxW) ); + res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); + ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); + ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); + ok( data_count == 0, "data_count set to %d instead of 0\n", data_count ); + ok( type == REG_BINARY, "type %d is not REG_BINARY\n", type ); + ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); + ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data is not 'xxxxxxxxxx'\n" ); + res = RegSetValueExA( test_key, "Test", 0, REG_SZ, (const BYTE *)"foobar", 7 ); ok( res == 0, "RegSetValueExA failed error %d\n", res );

1 0

Bruno Jesus : wininet: Add more tests to InternetGetConnectedStateEx.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 3beee00a99e7b9145239433b49cdabc9eb64fb82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3beee00a99e7b9145239433b4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 19:36:47 2014 -0200 wininet: Add more tests to InternetGetConnectedStateEx. --- dlls/wininet/tests/internet.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 688f786..fc965e2 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1556,6 +1556,12 @@ todo_wine sz = strlen(buffer); ok(sz > 0, "Expected a connection name\n"); + flags = 0; + res = pInternetGetConnectedStateExA(&flags, NULL, sizeof(buffer), 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + /* no space for complete string this time */ buffer[0] = 0; flags = 0; @@ -1566,11 +1572,34 @@ todo_wine buffer[0] = 0; flags = 0; + res = pInternetGetConnectedStateExA(&flags, buffer, sz / 2, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(sz / 2 - 1 == strlen(buffer), "Expected %u bytes, got %u\n", sz / 2 - 1, lstrlenA(buffer)); + + buffer[0] = 0; + flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); + + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExA(&flags, buffer, 2, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(strlen(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenA(buffer)); + + flags = 0; + buffer[0] = 0xDE; + res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); +todo_wine + ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); } static void test_InternetGetConnectedStateExW(void) @@ -1623,6 +1652,12 @@ todo_wine sz = lstrlenW(buffer); ok(sz > 0, "Expected a connection name\n"); + flags = 0; + res = pInternetGetConnectedStateExW(&flags, NULL, sizeof(buffer) / sizeof(buffer[0]), 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + /* no space for complete string this time */ buffer[0] = 0; flags = 0; @@ -1633,11 +1668,34 @@ todo_wine buffer[0] = 0; flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, sz / 2, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(sz / 2 - 1 == lstrlenW(buffer), "Expected %u bytes, got %u\n", sz / 2 - 1, lstrlenW(buffer)); + + buffer[0] = 0; + flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, 2, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(lstrlenW(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenW(buffer)); + + buffer[0] = 0xDEAD; + flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); +todo_wine + ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); } /* ############################### */

1 0

André Hentschel : winedump: Ensure function order in a printf (PVS-Studio).
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 86c249760d6da8bfc6d0e009fb3a7db50c102307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c249760d6da8bfc6d0e009f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 25 17:55:11 2014 +0200 winedump: Ensure function order in a printf (PVS-Studio). --- tools/winedump/tlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 26da2a4..df1ea4b 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -647,7 +647,8 @@ static BOOL dump_msft_custdata(seg_t *seg) break; default: printf(": %x ", n); - printf("\\%2.2x \\%2.2x\n", tlb_read_byte(), tlb_read_byte()); + printf("\\%2.2x ", tlb_read_byte()); + printf("\\%2.2x\n", tlb_read_byte()); } }

1 0

Alexandre Julliard : gdi32: Check the hatch masks instead of the rop masks for the null and mask optimization case.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 55f24da978c8ad6553a7b8fa874a60648dc61e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f24da978c8ad6553a7b8fa8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 27 14:55:48 2014 +0900 gdi32: Check the hatch masks instead of the rop masks for the null and mask optimization case. --- dlls/gdi32/dibdrv/objects.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 1f05ab0..bc8b60d 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1815,6 +1815,8 @@ static BOOL create_pattern_brush_bits( dib_brush *brush ) size -= 4; } + if (!rop_needs_and_mask( brush->rop )) brush->masks.and = NULL; /* ignore the and mask */ + return TRUE; } @@ -1861,6 +1863,9 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL brush->dib.funcs->create_rop_masks( &brush->dib, hatches[brush->hatch], &fg_mask, &bg_mask, &brush->masks ); + + if (!fg_mask.and && !bg_mask.and) brush->masks.and = NULL; /* ignore the and mask */ + return TRUE; } @@ -1878,6 +1883,9 @@ static BOOL create_dither_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOO rgb = make_rgb_colorref( pdev->dev.hdc, &pdev->dib, brush->colorref, &got_pixel, &pixel ); brush->dib.funcs->create_dither_masks( &brush->dib, brush->rop, rgb, &brush->masks ); + + if (!rop_needs_and_mask( brush->rop )) brush->masks.and = NULL; /* ignore the and mask */ + return TRUE; } @@ -2018,7 +2026,6 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, ERR("Unexpected brush style %d\n", brush->style); return FALSE; } - if (!rop_needs_and_mask( brush->rop )) brush->masks.and = NULL; /* ignore the and mask */ } GetBrushOrgEx(pdev->dev.hdc, &origin);

1 0

André Hentschel : urlmon/tests: Clarify ok() condition.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 2bb59197ace6776e03bbc014cabc8fd7b7360615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb59197ace6776e03bbc014c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 25 16:35:31 2014 +0200 urlmon/tests: Clarify ok() condition. --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 5861127..3d10323 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -764,7 +764,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, } IHttpNegotiate2_Release(http_negotiate2); ok(hres == E_FAIL, "GetRootSecurityId failed: %08x, expected E_FAIL\n", hres); - ok(size == no_callback ? 512 : 13, "size=%d\n", size); + ok(size == (no_callback ? 512 : 13), "size=%d\n", size); if(!no_callback) { SET_EXPECT(QueryService_IHttpSecurity);

1 0

Jonathan Vollebregt : reg/tests: Test key formats.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: f8445249a61f07c29a6089391b77bdb1a88178df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8445249a61f07c29a6089391… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Fri Oct 24 20:48:36 2014 +0200 reg/tests: Test key formats. --- programs/reg/tests/reg.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3ba1e3a..3de6f70 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -102,6 +102,29 @@ static void test_add(void) err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add \\\\HKCU\\" KEY_BASE "\\keytest1 /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + "got exit code %u\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3", 0, KEY_READ, &hkey); + ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); + RegCloseKey(hkey); + + run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4", 0, KEY_READ, &hkey); + ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); + RegCloseKey(hkey); + + err = RegDeleteTreeA(HKEY_CURRENT_USER, KEY_BASE); + ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Bruno Jesus : msi: Remove duplicate if condition.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 8f79f5f54b03bcc0bd3208fa6e7fdbc3b1c1f2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f79f5f54b03bcc0bd3208fa6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 15:09:27 2014 -0200 msi: Remove duplicate if condition. --- dlls/msi/msi.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 70a8134..433776d 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1762,10 +1762,6 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, datakey = patch; szProperty = szInstalled; } - else if (!strcmpW( szProperty, INSTALLPROPERTY_LOCALPACKAGEW )) - { - datakey = udpatch; - } else if (!strcmpW( szProperty, INSTALLPROPERTY_UNINSTALLABLEW ) || !strcmpW( szProperty, INSTALLPROPERTY_PATCHSTATEW ) || !strcmpW( szProperty, INSTALLPROPERTY_DISPLAYNAMEW ) ||

1 0

Mathew Hodson : patches: Prevent the green color of OK testbot jobs from being overridden.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: tools Branch: master Commit: 36a6dc3793d969cf9f515ddbc5de8dc01390d0e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=36a6dc3793d969cf9f515ddb… Author: Mathew Hodson <mathew.hodson(a)gmail.com> Date: Sun Oct 26 22:28:27 2014 -0400 patches: Prevent the green color of OK testbot jobs from being overridden. --- patches/patches.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/patches.css b/patches/patches.css index f988f11..745ec75 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -149,7 +149,6 @@ tr.odd { background-color: #f8e8e8; } .nil, .nil :link, .nil :visited { color: blue; font-weight: bold; } .pending, .pending :link, .pending :visited { color: blue; } .committed, .committed :link, .committed :visited { color: green; } -.testbot, .testbot :link, .testbot :visited { color: green; } .depend, .depend :link, .depend :visited { color: #e08000; } .superseded, .superseded :link, .superseded :visited { color: #e08000; } .sequence, .sequence :link, .sequence :visited { color: #e08000; } @@ -163,4 +162,5 @@ tr.odd { background-color: #f8e8e8; } .rejected, .rejected :link, .rejected :visited { color: red; } .split, .split :link, .split :visited { color: red; } .testfail, .testfail :link, .testfail :visited { color: red; } +.testbot, .testbot :link, .testbot :visited { color: green; } .botfail, .botfail :link, .botfail :visited { color: red; }

1 0

André Hentschel : Add WWN 378
by Jeremy Newman Oct. 25, 2014

Oct. 25, 2014

Module: website Branch: master Commit: a2bcdfadf492def2e3e6f45dc2c7ae2773c7616c URL: http://source.winehq.org/git/website.git/?a=commit;h=a2bcdfadf492def2e3e6f4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 25 00:13:06 2014 +0200 Add WWN 378 --- news/de/2014102401.xml | 10 + news/en/2014102401.xml | 10 + wwn/en/wn20141024_378.xml | 636 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 656 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=a2bcdfadf492def2e3…

1 0

Jeremy Newman : add some additional information
by Jeremy Newman Oct. 24, 2014

Oct. 24, 2014

Module: website Branch: master Commit: d177101c72ea74ced5a1a34380fc1f2c063351ea URL: http://source.winehq.org/git/website.git/?a=commit;h=d177101c72ea74ced5a1a3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 24 09:05:01 2014 -0500 add some additional information * font used in logo, and where the svg version of the logo is * the codebase needs php 5.3 or higher --- README | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/README b/README index 6419b54..6cb89bb 100644 --- a/README +++ b/README @@ -6,10 +6,10 @@ by Jeremy Newman <jnewman(a)codeweavers.com> Installation Requirements: * Apache 2.0 or higher * mod_rewrite enabled in Apache config - * PHP 5.0 or higher + * PHP 5.3 or higher -Setting Up. --------------- +Setting Up: +----------------------------------------------------------------------- 1. cp include/htaccess.sample .htaccess 2. edit .htaccess * change Rewritebase to the subdir path from the root of your website. @@ -21,8 +21,8 @@ Setting Up. 5. cp include/globals.conf.sample include/globals.conf 6. edit include/globals.conf -Templates. --------------- +Templates: +----------------------------------------------------------------------- For any path in your website, create a .template file in templates/en/ For example, http://www.example.com/winehq_org/new_page is templates/en/new_page.template @@ -39,3 +39,10 @@ You can also add global vars to include/globals.conf and they will be availbe as {$config_[key]} where [key] is the name you defined in globals.conf +Notes: +----------------------------------------------------------------------- + + * The font used in the WineHQ logo is: Ocean Sans Pro + * A SVG version of the logo is available at: + http://ftp.winehq.org/pub/wine/logos/wine_logo.svg +

1 0

Nikolay Sivov : dwrite/tests: Fix some test failures.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: fefb947516bbf8982842192270707191346db96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fefb947516bbf898284219227… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:39:16 2014 +0400 dwrite/tests: Fix some test failures. --- dlls/dwrite/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 77571f0..469be88 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -940,9 +940,9 @@ if (file) { /* local loader is not registered by default */ hr = IDWriteFactory_RegisterFontFileLoader(factory, loader); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr); hr = IDWriteFactory_UnregisterFontFileLoader(factory, loader); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr); IDWriteFontFileLoader_Release(loader); } ret = TRUE;

1 0

Hao Peng : mlang: Add gbk to Chinese Simplified codepage.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: be089ba2ee647fc5dce6adf1fa1ba44b43e170fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=be089ba2ee647fc5dce6adf1f… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Fri Oct 24 16:07:15 2014 +0800 mlang: Add gbk to Chinese Simplified codepage. --- dlls/mlang/mlang.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f4a689c..e44e862 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -122,7 +122,13 @@ static const MIME_CP_INFO chinese_simplified_cp[] = MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, - "gb2312", "gb2312", "gb2312" } + "gb2312", "gb2312", "gb2312" }, + { "Chinese Simplified (GBK)", + 936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | + MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | + MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | + MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, + "gbk", "gbk", "gbk" } }; static const MIME_CP_INFO chinese_traditional_cp[] = { @@ -953,7 +959,7 @@ HRESULT WINAPI ConvertINetMultiByteToUnicode( *pcDstSize = MultiByteToWideChar(dwEncoding, 0, pSrcStr, *pcSrcSize, NULL, 0); break; } - + if (!*pcDstSize) return E_FAIL; @@ -1344,7 +1350,7 @@ static HRESULT WINAPI MLANGCF_CreateInstance(IClassFactory *iface, IUnknown *pOu IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; - + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); *ppobj = NULL; @@ -2263,7 +2269,7 @@ static BOOL CALLBACK enum_locales_proc(LPWSTR locale) info->wszLocaleName[0] = 0; GetLocaleInfoW(info->lcid, LOCALE_SLANGUAGE, info->wszLocaleName, MAX_LOCALE_NAME); TRACE("ISO639: %s SLANGUAGE: %s\n", wine_dbgstr_w(info->wszRfc1766), wine_dbgstr_w(info->wszLocaleName)); - + data->total++; return TRUE; @@ -2869,7 +2875,7 @@ static HRESULT WINAPI fnIMultiLanguage3_ConvertStringToUnicodeEx( * * PARAMS * see ConvertStringToUnicode - * dwFlag + * dwFlag * lpFallBack if dwFlag contains MLCONVCHARF_USEDEFCHAR, lpFallBack string used * instead unconvertible characters. *

1 0

Bruno Jesus : iphlpapi: Fix a one counter for two loops error (PVS-Studio) .
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 794d52273efccf5ef6e5ed56783b3f4c7130cc4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=794d52273efccf5ef6e5ed567… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 01:47:02 2014 -0200 iphlpapi: Fix a one counter for two loops error (PVS-Studio). --- dlls/iphlpapi/iphlpapi_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 88db25a..4d18711 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -983,6 +983,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index struct WS_sockaddr_in6 *sa; const IN6_ADDR *addr, *mask; BOOL done = FALSE; + ULONG k; prefix->u.s.Length = sizeof(*prefix); prefix->u.s.Flags = 0; @@ -1000,11 +1001,11 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index sa->sin6_scope_id = 0; prefix->PrefixLength = 0; - for (i = 0; i < 8 && !done; i++) + for (k = 0; k < 8 && !done; k++) { for (j = 0; j < sizeof(WORD) * 8 && !done; j++) { - if (mask->u.Word[i] & 1 << j) prefix->PrefixLength++; + if (mask->u.Word[k] & 1 << j) prefix->PrefixLength++; else done = TRUE; } }

1 0

Bruno Jesus : winecfg: No need to cut a backslash if it does not exist.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: c5aacafeeaa2cf15612fc5318262140cbd92bd56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5aacafeeaa2cf15612fc5318… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 01:37:00 2014 -0200 winecfg: No need to cut a backslash if it does not exist. --- programs/winecfg/appdefaults.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 6106b23..7dd3900 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -377,19 +377,17 @@ static void on_remove_app_click(HWND dialog) { HWND listview = GetDlgItem(dialog, IDC_APP_LISTVIEW); int selection = get_listview_selection(listview); - char *section = keypath(""); /* AppDefaults\\whatever.exe\\ */ LVITEMW item; item.iItem = selection; item.iSubItem = 0; item.mask = LVIF_PARAM; - WINE_TRACE("selection=%d, section=%s\n", selection, section); - + WINE_TRACE("selection=%d\n", selection); + assert( selection != 0 ); /* user cannot click this button when "default settings" is selected */ - section[strlen(section)] = '\0'; /* remove last backslash */ - set_reg_key(config_key, section, NULL, NULL); /* delete the section */ + set_reg_key(config_key, keypath(""), NULL, NULL); /* delete the section */ SendMessageW(listview, LVM_GETITEMW, 0, (LPARAM) &item); HeapFree (GetProcessHeap(), 0, (void*)item.lParam); SendMessageW(listview, LVM_DELETEITEM, selection, 0);

1 0

Amine Khaldi : rpcrt4/tests: Remove unused if3_table and if4_table (Clang) .
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 19254eb4381f075dc4939d527cf9d306076f0355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19254eb4381f075dc4939d527… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Thu Oct 23 19:12:18 2014 +0100 rpcrt4/tests: Remove unused if3_table and if4_table (Clang). --- dlls/rpcrt4/tests/cstub.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index ad723de..de0c224 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -288,12 +288,6 @@ static const MIDL_SERVER_INFO if3_server_info = 0, 0}; - -static const PRPC_STUB_FUNCTION if3_table[] = -{ - if1_fn1_Stub -}; - static CInterfaceStubVtbl if3_stub_vtbl = { { @@ -338,15 +332,6 @@ static const MIDL_SERVER_INFO if4_server_info = 0, 0}; - -static const PRPC_STUB_FUNCTION if4_table[] = -{ - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, -}; - static CInterfaceStubVtbl if4_stub_vtbl = { {

1 0

Nikolay Sivov : dwrite: Implement custom font collections.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: fbf2557cd7f518977b30d0da338de6d37cb92642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf2557cd7f518977b30d0da3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:43:21 2014 +0400 dwrite: Implement custom font collections. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 346 +++++++++++++++++++++++++++++++++++-------- dlls/dwrite/main.c | 24 ++- 3 files changed, 311 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbf2557cd7f518977b30d…

1 0

Nikolay Sivov : dwrite: Pass raw NAME table pointer to table reading code.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 35e9b6d85d055b1ed195a2bde790c1a69a74d054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e9b6d85d055b1ed195a2bde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:42:35 2014 +0400 dwrite: Pass raw NAME table pointer to table reading code. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 21 +++++++++++++++++---- dlls/dwrite/main.c | 39 +++++++++++++++++++++------------------ dlls/dwrite/opentype.c | 15 +++------------ dlls/dwrite/tests/font.c | 6 ++---- 5 files changed, 44 insertions(+), 39 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 02601fb..faf1b0a 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -113,7 +113,7 @@ extern HRESULT opentype_get_font_table(IDWriteFontFileStream*,DWRITE_FONT_FACE_T extern void opentype_cmap_get_glyphindex(void*,UINT32,UINT16*) DECLSPEC_HIDDEN; extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN; extern VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_strings_from_id(IDWriteFontFace2*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLSPEC_HIDDEN; extern WCHAR bidi_get_mirrored_char(WCHAR) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fcdfdb5..217f772 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') #define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') +#define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') struct dwrite_fontface_data { LONG ref; @@ -986,14 +987,26 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont2 *iface, if (!data->info_strings[stringid]) { IDWriteFontFace2 *fontface; + const void *table_data; + BOOL table_exists; + void *context; + UINT32 size; hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) return hr; - hr = opentype_get_font_strings_from_id(fontface, stringid, &data->info_strings[stringid]); - if (FAILED(hr) || !data->info_strings[stringid]) - return hr; + table_exists = FALSE; + hr = IDWriteFontFace2_TryGetFontTable(fontface, MS_NAME_TAG, &table_data, &size, &context, &table_exists); + if (FAILED(hr) || !table_exists) + WARN("no NAME table found.\n"); + + if (table_exists) { + hr = opentype_get_font_strings_from_id(table_data, stringid, &data->info_strings[stringid]); + if (FAILED(hr) || !data->info_strings[stringid]) + return hr; + IDWriteFontFace2_ReleaseFontTable(fontface, context); + } } hr = clone_localizedstring(data->info_strings[stringid], strings); @@ -1001,7 +1014,7 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont2 *iface, return hr; *exists = TRUE; - return hr; + return S_OK; } static DWRITE_FONT_SIMULATIONS WINAPI dwritefont_GetSimulations(IDWriteFont2 *iface) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 4c549d6..d844e7f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -361,33 +361,36 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, return S_OK; } -HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) -{ - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - struct localizedstrings *New; +HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **ret) + { + struct localizedstrings *strings, *strings_clone; int i; - *strings = NULL; + *ret = NULL; + + if (!iface) + return S_FALSE; - New = heap_alloc(sizeof(struct localizedstrings)); - if (!New) return E_OUTOFMEMORY; + strings = impl_from_IDWriteLocalizedStrings(iface); + strings_clone = heap_alloc(sizeof(struct localizedstrings)); + if (!strings_clone) return E_OUTOFMEMORY; - New->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; - New->ref = 1; - New->count = This->count; - New->data = heap_alloc(sizeof(struct localizedpair) * New->count); - if (!New->data) { - heap_free(New); + strings_clone->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; + strings_clone->ref = 1; + strings_clone->count = strings->count; + strings_clone->data = heap_alloc(sizeof(struct localizedpair) * strings_clone->count); + if (!strings_clone->data) { + heap_free(strings_clone); return E_OUTOFMEMORY; } - for (i = 0; i < New->count; i++) + for (i = 0; i < strings_clone->count; i++) { - New->data[i].locale = heap_strdupW(This->data[i].locale); - New->data[i].string = heap_strdupW(This->data[i].string); + strings_clone->data[i].locale = heap_strdupW(strings->data[i].locale); + strings_clone->data[i].string = heap_strdupW(strings->data[i].string); } - New->alloc = New->count; + strings_clone->alloc = strings_clone->count; - *strings = &New->IDWriteLocalizedStrings_iface; + *ret = &strings_clone->IDWriteLocalizedStrings_iface; return S_OK; } diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index ed08899..c007b35 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -26,7 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_TTCF_TAG DWRITE_MAKE_OPENTYPE_TAG('t','t','c','f') #define MS_OTTO_TAG DWRITE_MAKE_OPENTYPE_TAG('O','T','T','O') -#define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -615,24 +614,18 @@ VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_ME } } -HRESULT opentype_get_font_strings_from_id(IDWriteFontFace2 *fontface, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) +HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) { - const void *table_data = NULL; - void *name_context = NULL; const TT_NAME_V0 *header; BYTE *storage_area = 0; - BOOL exists = FALSE; USHORT count = 0; UINT16 name_id; - UINT32 size; + BOOL exists; HRESULT hr; int i; - hr = IDWriteFontFace2_TryGetFontTable(fontface, MS_NAME_TAG, &table_data, &size, &name_context, &exists); - if (FAILED(hr) || !exists) { - FIXME("failed to get NAME table\n"); + if (!table_data) return E_FAIL; - } hr = create_localizedstrings(strings); if (FAILED(hr)) return hr; @@ -727,8 +720,6 @@ HRESULT opentype_get_font_strings_from_id(IDWriteFontFace2 *fontface, DWRITE_INF } } - IDWriteFontFace2_ReleaseFontTable(fontface, name_context); - if (!exists) { IDWriteLocalizedStrings_Release(*strings); *strings = NULL; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index baba6c2..3830bc9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1521,10 +1521,9 @@ static void test_GetInformationalStrings(void) exists = FALSE; strings = NULL; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings, &exists); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(exists == TRUE, "got %d\n", exists); -} + exists = TRUE; strings = NULL; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_NONE, &strings, &exists); @@ -1534,10 +1533,9 @@ todo_wine { /* strings instance is not reused */ strings2 = NULL; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings2, &exists); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine ok(strings2 != strings, "got %p, %p\n", strings2, strings); -} if (strings) IDWriteLocalizedStrings_Release(strings);

1 0

Nikolay Sivov : dwrite: Cache fontface instances at factory level.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 42882f7f75df1ac00ff721407e9a828c6dab121b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42882f7f75df1ac00ff721407… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:40:06 2014 +0400 dwrite: Cache fontface instances at factory level. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 124 ++++++++++++++++++++-------------------- dlls/dwrite/main.c | 132 ++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/font.c | 14 +++-- 4 files changed, 189 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42882f7f75df1ac00ff72…

1 0

Nikolay Sivov : dwrite: Use helpers to search through loaders lists.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 2300602586b8e1ff75a0c6d7773955b668437c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2300602586b8e1ff75a0c6d77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:41:46 2014 +0400 dwrite: Use helpers to search through loaders lists. --- dlls/dwrite/main.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 57e0038..4c549d6 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -495,6 +495,20 @@ static struct fileloader *factory_get_file_loader(struct dwritefactory *factory, return found; } +static struct collectionloader *factory_get_collection_loader(struct dwritefactory *factory, IDWriteFontCollectionLoader *loader) +{ + struct collectionloader *entry, *found = NULL; + + LIST_FOR_EACH_ENTRY(entry, &factory->collection_loaders, struct collectionloader, entry) { + if (entry->loader == loader) { + found = entry; + break; + } + } + + return found; +} + static HRESULT WINAPI dwritefactory_QueryInterface(IDWriteFactory *iface, REFIID riid, void **obj) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); @@ -575,10 +589,8 @@ static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory if (!loader) return E_INVALIDARG; - LIST_FOR_EACH_ENTRY(entry, &This->collection_loaders, struct collectionloader, entry) { - if (entry->loader == loader) - return DWRITE_E_ALREADYREGISTERED; - } + if (factory_get_collection_loader(This, loader)) + return DWRITE_E_ALREADYREGISTERED; entry = heap_alloc(sizeof(*entry)); if (!entry) @@ -595,20 +607,14 @@ static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactor IDWriteFontCollectionLoader *loader) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - struct collectionloader *entry, *found = NULL; + struct collectionloader *found; TRACE("(%p)->(%p)\n", This, loader); if (!loader) return E_INVALIDARG; - LIST_FOR_EACH_ENTRY(entry, &This->collection_loaders, struct collectionloader, entry) { - if (entry->loader == loader) { - found = entry; - break; - } - } - + found = factory_get_collection_loader(This, loader); if (!found) return E_INVALIDARG; @@ -784,10 +790,8 @@ static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface if (!loader) return E_INVALIDARG; - LIST_FOR_EACH_ENTRY(entry, &This->file_loaders, struct fileloader, entry) { - if (entry->loader == loader) - return DWRITE_E_ALREADYREGISTERED; - } + if (factory_get_file_loader(This, loader)) + return DWRITE_E_ALREADYREGISTERED; entry = heap_alloc(sizeof(*entry)); if (!entry)

1 0

Bruno Jesus : wsock32: Clarify cast operation (PVS-Studio).
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 2f38271fde329cbd7eeba09e3bd4e759d0871da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f38271fde329cbd7eeba09e3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 02:10:45 2014 -0200 wsock32: Clarify cast operation (PVS-Studio). --- dlls/wsock32/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index 416613a..16109e3 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -191,7 +191,7 @@ INT WINAPI EnumProtocolsW(LPINT protocols, LPVOID buffer, LPDWORD buflen) pi[i].dwMessageSize = wsabuf[i].dwMessageSize; memcpy((char *)buffer + string_offset, wsabuf[i].szProtocol, string_size); - pi[i].lpProtocol = (WCHAR *)(char *)buffer + string_offset; + pi[i].lpProtocol = (WCHAR *)((char *)buffer + string_offset); string_offset += string_size; } HeapFree(GetProcessHeap(), 0, wsabuf);

1 0

Alexandre Julliard : iphlpapi: Avoid an uninitialized variable warning.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: c7924e530d87e69ae48fbbe2c1582c934700eb89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7924e530d87e69ae48fbbe2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 24 13:42:37 2014 +0900 iphlpapi: Avoid an uninitialized variable warning. --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4d18711..4d66810 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1251,7 +1251,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P PIP_ADAPTER_ADDRESSES aa, PULONG buflen) { InterfaceIndexTable *table; - ULONG i, size, dns_server_size, dns_suffix_size, total_size, ret = ERROR_NO_DATA; + ULONG i, size, dns_server_size = 0, dns_suffix_size, total_size, ret = ERROR_NO_DATA; TRACE("(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, buflen); @@ -1308,7 +1308,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P size = bytes_left -= size; } } - if (!(flags & GAA_FLAG_SKIP_DNS_SERVER) && dns_server_size) + if (dns_server_size) { firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)first_aa + total_size - dns_server_size - dns_suffix_size); get_dns_server_addresses(firstDns, &dns_server_size);

1 0

Amine Khaldi : d3dxof: Remove unused IDirectXFileObject_Vtbl (Clang).
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: e67beed64db03eaeb98082d61bcb9fd6d7216ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67beed64db03eaeb98082d61… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Thu Oct 23 19:01:58 2014 +0100 d3dxof: Remove unused IDirectXFileObject_Vtbl (Clang). --- dlls/d3dxof/d3dxof.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 8ca5793..88647cf 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -39,7 +39,6 @@ static const struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl; static const struct IDirectXFileDataVtbl IDirectXFileData_Vtbl; static const struct IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl; static const struct IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl; -static const struct IDirectXFileObjectVtbl IDirectXFileObject_Vtbl; static const struct IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl; static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImpl** ppObj);

1 0

Jonathan Vollebregt : reg/tests: Add REG_DWORD_BIG_ENDIAN tests for reg add.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: d2e6e210ac23cba8e3f82af6cdb31c66d57ad2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e6e210ac23cba8e3f82af6c… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:53 2014 +0200 reg/tests: Add REG_DWORD_BIG_ENDIAN tests for reg add. --- programs/reg/tests/reg.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0e5be50..3ba1e3a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -246,6 +246,14 @@ static void test_add(void) dword = 456; verify_reg(hkey, "DWORD_LE", REG_DWORD_LITTLE_ENDIAN, &dword, sizeof(dword), 0); + /* REG_DWORD_BIG_ENDIAN */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE /t REG_DWORD_BIG_ENDIAN /d 456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + dword = 456; + verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), TODO_REG_SIZE); + /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like + * an ordinary REG_DWORD - that is little endian. GG */ + /* REG_MULTI_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);

1 0

Jonathan Vollebregt : reg/tests: Add negative DWORD tests.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: b2c99522a6927b0ce00a69e1650884a8b90320d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c99522a6927b0ce00a69e16… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:49 2014 +0200 reg/tests: Add negative DWORD tests. --- programs/reg/tests/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 5b79aed..f79c124 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -180,6 +180,11 @@ static void test_add(void) verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Jonathan Vollebregt : reg/tests: Add REG_EXPAND_SZ tests for reg add.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 655289382413a8e6050bc99f3b66d7e137abf013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=655289382413a8e6050bc99f3… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:50 2014 +0200 reg/tests: Add REG_EXPAND_SZ tests for reg add. --- programs/reg/tests/reg.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f79c124..3caf17f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -136,6 +136,27 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test3", REG_SZ, "", 1, 0); + /* REG_EXPAND_SZ */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand1 /t REG_EXpand_sz /d \"dead^%PATH^%beef\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "expand1", REG_EXPAND_SZ, "dead^%PATH^%beef", 17, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand2 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "expand2", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + + run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_EXPAND_SZ /d WineTEST /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "", REG_EXPAND_SZ, "WineTEST", 9, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand3 /f /d \"\"", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + /* REG_DWORD */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d 12345678", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),

1 0

Jonathan Vollebregt : reg/tests: Add REG_MULTI_SZ tests for reg add.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 53a5a837d2dc55c44a21db4b030bdafa8b152d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a5a837d2dc55c44a21db4b0… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:51 2014 +0200 reg/tests: Add REG_MULTI_SZ tests for reg add. --- programs/reg/tests/reg.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3caf17f..84046c8 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -91,6 +91,7 @@ static void test_add(void) HKEY hkey; LONG err; DWORD r, dword, type, size; + char buffer[22]; run_reg_exe("reg add", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -212,6 +213,46 @@ static void test_add(void) dword = 456; verify_reg(hkey, "DWORD_LE", REG_DWORD_LITTLE_ENDIAN, &dword, sizeof(dword), 0); + /* REG_MULTI_SZ */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + memcpy(buffer, "three\0little\0strings\0", 22); + verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi1 /s \"#\" /d \"three#little#strings\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi2 /d \"\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"threelittlestrings\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi5 /s \"#randomgibberish\" /d \"three#little#strings\" /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi6 /s \"\\0\" /d \"three\\0little\\0strings\" /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi7 /s \"\" /d \"three#little#strings\" /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi8 /s \"#\" /d \"##\" /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s \"#\" /d \"two##strings\" /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s \"#\" /d \"#a\" /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s \"#\" /d \"a#\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + buffer[0]='a'; buffer[1]=0; buffer[2]=0; + verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Jonathan Vollebregt : reg/tests: Add REG_BINARY tests for reg add.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 90dcfadf9a685ec95a26398cdeca171919f14d80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90dcfadf9a685ec95a26398cd… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:52 2014 +0200 reg/tests: Add REG_BINARY tests for reg add. --- programs/reg/tests/reg.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 84046c8..0e5be50 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -158,6 +158,39 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + /* REG_BINARY */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "bin0", REG_BINARY, buffer, 0, 0); + + run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_BINARY /d deadbeef /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + dword = 0xefbeadde; + verify_reg(hkey, "", REG_BINARY, &dword, sizeof(DWORD), TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin1 /f /d 0xDeAdBeEf", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin2 /f /d x01", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin3 /f /d 01x", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin4 /f /d DeAdBeEf0DD", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + /* Remaining nibble prefixed */ + buffer[0] = 0x0d; buffer[1] = 0xea; buffer[2] = 0xdb; + buffer[3] = 0xee; buffer[4] = 0xf0; buffer[5] = 0xdd; + /* Remaining nibble suffixed on winXP */ + buffer[6] = 0xde; buffer[7] = 0xad; buffer[8] = 0xbe; + buffer[9] = 0xef; buffer[10] = 0x0d; buffer[11] = 0xd0; + size = 6; + err = RegQueryValueExA(hkey, "bin4", NULL, &type, (void *) (buffer+12), &size); + ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); + ok(type == REG_BINARY, "got wrong type %u\n", type); + todo_wine ok(size == 6, "got wrong size %u\n", size); + todo_wine ok(memcmp(buffer, buffer+12, 6) == 0 || + broken(memcmp(buffer+6, buffer+12, 6) == 0 /* WinXP */), "got wrong data\n"); + /* REG_DWORD */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d 12345678", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),

1 0

Jeremy Newman : remove unused counter var
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: 696325e41ae5bfb86866f03aa64295126501c260 URL: http://source.winehq.org/git/website.git/?a=commit;h=696325e41ae5bfb86866f0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 14:07:52 2014 -0500 remove unused counter var --- include/plugins/announce.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index e14158a..6c61baa 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -21,7 +21,6 @@ $title = ""; if ($arr = file($announce)) { $in_header = 1; - $x = 0; while (list($c,$val) = each($arr)) { if ($c == 0) @@ -50,8 +49,6 @@ if ($arr = file($announce)) "\\1<a href=\"".$config->bug_system."\\2\">\\2</a>", $arr[$c]); } - - $x++; } $announce = join("",$arr);

1 0

Jeremy Newman : set title and mega og
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: 2a501a65e59894c68079ccbfea71d06cb9a21587 URL: http://source.winehq.org/git/website.git/?a=commit;h=2a501a65e59894c68079cc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 11:24:05 2014 -0500 set title and mega og --- include/plugins/wwn.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/plugins/wwn.php b/include/plugins/wwn.php index e42afcc..45fd48d 100644 --- a/include/plugins/wwn.php +++ b/include/plugins/wwn.php @@ -69,6 +69,9 @@ switch ($_PLUGIN['mode']) case preg_match("/^[0-9]+$/", PAGE_PARAMS): // display single WWN issue echo $wwn->view_issue(PAGE_PARAMS); + // page title + $html->page_title .= " - WWN Issue ".PAGE_PARAMS; + $html->meta_og['title'] = "WWN Issue ".PAGE_PARAMS; break; // end single issue

1 0

Jeremy Newman : set title and open graph
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: b6a5b8b769a84e5b3686d3c4d6e971016ef34b39 URL: http://source.winehq.org/git/website.git/?a=commit;h=b6a5b8b769a84e5b3686d3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 11:18:01 2014 -0500 set title and open graph --- include/plugins/announce.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index 5000fc5..e14158a 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -14,12 +14,19 @@ $ver = PAGE_PARAMS; $tag = ($ver == "latest") ? "master" : "wine-" . urlencode($ver); $announce = $config->git_tree . "/wine.git/" . $tag . ":ANNOUNCE"; +// announce title +$title = ""; + // load announce if ($arr = file($announce)) { $in_header = 1; + $x = 0; while (list($c,$val) = each($arr)) { + if ($c == 0) + $title = $html->encode(trim($arr[$c])); + $arr[$c] = $html->urlify($arr[$c]); if (preg_match("/^--------------------/", $arr[$c])) $in_header = 0; @@ -43,10 +50,14 @@ if ($arr = file($announce)) "\\1<a href=\"".$config->bug_system."\\2\">\\2</a>", $arr[$c]); } + + $x++; } $announce = join("",$arr); // display page + $html->meta_og['title'] = $title; + $html->page_title .= " - {$title}"; echo $html->pre($announce); } else

1 0

Jeremy Newman : set title and open graph
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: 0a206bbdb65e3dc794e7abf3e93df666247bb0eb URL: http://source.winehq.org/git/website.git/?a=commit;h=0a206bbdb65e3dc794e7ab… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 11:17:47 2014 -0500 set title and open graph --- include/plugins/news.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index ec44525..bc9deb7 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -15,6 +15,7 @@ switch (true) { // single issue view case (defined('PAGE_PARAMS') and preg_match("/[0-9]{10}/", PAGE_PARAMS)): + // get data from XML file $item = PAGE_PARAMS . '.xml'; $vars = array(); @@ -22,7 +23,13 @@ switch (true) $vars = get_xml_tags($config->news_xml_path.'/'.$html->lang.'/'.$item, array('date', 'title', 'link', 'body')); else $vars = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'link', 'body')); - + + // set open graph tags + $html->meta_og['title'] = trim($vars['title']); + + // add page title + $html->page_title .= " - {$html->meta_og['title']}"; + // if link defined, use it in title if ($vars['link']) { @@ -33,10 +40,10 @@ switch (true) { $vars['title'] = '<a href="'.$html->_web_root.'/news/'.basename($item, ".xml").'">'.$vars['title'].'</a>'; } - + // replace {$root} $vars['body'] = str_replace("{\$root}", $html->_web_root, $vars['body']); - + // add to news body echo $html->template('base', 'news_row', $vars); echo $html->p($html->ahref("<< Back", "{$html->_web_root}/news")); @@ -44,6 +51,7 @@ switch (true) // RSS view case (defined('PAGE_PARAMS') and PAGE_PARAMS == "rss"): + // get list of news items $news = get_files($config->news_xml_path."/".$config->lang, "xml"); $news = array_reverse ($news);

1 0

Jeremy Newman : home page is og type website
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: 1183320f5ee902ed8977ef1b02b897887d201e6f URL: http://source.winehq.org/git/website.git/?a=commit;h=1183320f5ee902ed8977ef… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 10:57:50 2014 -0500 home page is og type website --- templates/de/home.template | 3 ++- templates/en/home.template | 3 ++- templates/es/home.template | 3 ++- templates/fr/home.template | 3 ++- templates/he/home.template | 3 ++- templates/pl/home.template | 3 ++- templates/pt/home.template | 3 ++- templates/tr/home.template | 3 ++- templates/uk/home.template | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/templates/de/home.template b/templates/de/home.template index 668a41d..6593029 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/en/home.template b/templates/en/home.template index 97d910e..f9f860e 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/es/home.template b/templates/es/home.template index b8a86b6..c58f2fb 100644 --- a/templates/es/home.template +++ b/templates/es/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/fr/home.template b/templates/fr/home.template index fed103b..3615ec5 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/he/home.template b/templates/he/home.template index 1402c37..c758cfc 100644 --- a/templates/he/home.template +++ b/templates/he/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/pl/home.template b/templates/pl/home.template index e6faeb5..770e713 100644 --- a/templates/pl/home.template +++ b/templates/pl/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/pt/home.template b/templates/pt/home.template index 2c430f7..6bf6734 100644 --- a/templates/pt/home.template +++ b/templates/pt/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/tr/home.template b/templates/tr/home.template index 5d42b0f..c254a22 100644 --- a/templates/tr/home.template +++ b/templates/tr/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/uk/home.template b/templates/uk/home.template index 9e83925..54f131b 100644 --- a/templates/uk/home.template +++ b/templates/uk/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left">

1 0

Jeremy Newman : add support for open graph meta tags
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: d8b0a041f5a74da371be41035bd52ee72a34f322 URL: http://source.winehq.org/git/website.git/?a=commit;h=d8b0a041f5a74da371be41… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 10:56:54 2014 -0500 add support for open graph meta tags --- include/html.php | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/include/html.php b/include/html.php index be3c02d..a6de7e1 100644 --- a/include/html.php +++ b/include/html.php @@ -17,6 +17,7 @@ class html public $page_style; public $meta_keywords; public $meta_description; + public $meta_og = array(); public $rss_link; public $css_links = array('styles'); public $js_links = array('jquery','utils'); @@ -62,7 +63,7 @@ class html // 404 not found header if ($this->in404) header("HTTP/1.1 404 Not Found"); - + // set meta tags $meta_keywords = ""; $meta_description = ""; @@ -70,7 +71,42 @@ class html $meta_keywords = $this->meta("keywords", $this->meta_keywords); if ($this->meta_description) $meta_description = $this->meta("description", $this->meta_description); - + + // open graph tags + $meta_og = ""; + if (empty($this->in403) and empty($this->in404) and isset($this->meta_og) and is_array($this->meta_og)) + { + // defaults and fallbacks + if (empty($this->meta_og['title']) and !empty($this->page_title)) + $this->meta_og['title'] =& $this->page_title; + if (empty($this->mega_og['site_name'])) + $this->meta_og['site_name'] = $config->site_name; + if (empty($this->meta_og['description']) and !empty($this->meta_description)) + $this->meta_og['description'] = $this->meta_description; + if (empty($this->meta_og['type'])) + $this->meta_og['type'] = 'article'; + + // loop and build meta_og string + foreach ($this->meta_og as $og => $data) + { + if (is_array($data)) + { + foreach ($data as $in_data) + { + if (!empty($meta_og)) + $meta_og .= " "; + $meta_og .= "<meta property=\"og:{$og}\" content=\"{$in_data}\">\n"; + } + } + else + { + if (!empty($meta_og)) + $meta_og .= " "; + $meta_og .= "<meta property=\"og:{$og}\" content=\"{$data}\">\n"; + } + } + } + // rss link if ($this->rss_link) $rss_link = '<link rel="alternate" title="'.$title.'RSS" href="'.$this->rss_link.'" type="application/rss+xml">'; @@ -96,7 +132,7 @@ class html } unset($i); } - + // javascript links $js_links = ""; if (count($this->js_links)) @@ -126,7 +162,7 @@ class html $this->http_header("text/plain"); echo $this->page; break; - + // print view case "print": $this->http_header("text/html"); @@ -140,7 +176,7 @@ class html 1 ); break; - + // regular view default: $this->http_header("text/html"); @@ -152,6 +188,7 @@ class html 'page_blurb' => $this->page_blurb, 'meta_keywords' => &$meta_keywords, 'meta_description' => &$meta_description, + 'meta_og' => &$meta_og, 'css_links' => &$css_links, 'js_links' => &$js_links, 'rss_link' => &$rss_link, @@ -162,7 +199,7 @@ class html 1 ); } - + // cleanup unset($debug_log); } @@ -1409,6 +1446,25 @@ class html unset($arr); } + // set the meta og + if (preg_match('//', $orig)) + { + preg_match_all('//', $orig, $match); + for ($i = 0; $i < count($match[0]); $i++) + { + if ($match[1][$i] == "image") + { + if (empty($this->meta_og['image'])) + $this->meta_og['image'] = array(); + array_push($this->meta_og['image'], $match[2][$i]); + } + else + { + $this->meta_og[$match[1][$i]] = $match[2][$i]; + } + $in = str_replace('', "", $in); + } + } // load nested templates the template if (preg_match('//', $orig))

1 0

Jeremy Newman : include open graph header meta tags
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: 00320277dfdf9a57599e85dc47c67d49de52d018 URL: http://source.winehq.org/git/website.git/?a=commit;h=00320277dfdf9a57599e85… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 10:57:21 2014 -0500 include open graph header meta tags --- templates/de/global/themes/winehq/content.template | 1 + templates/de/global/themes/winehq/content_nobox.template | 1 + templates/en/global/themes/winehq/content.template | 1 + templates/en/global/themes/winehq/content_nobox.template | 1 + templates/fr/global/themes/winehq/content.template | 1 + templates/fr/global/themes/winehq/content_nobox.template | 1 + templates/he/global/themes/winehq/content.template | 1 + templates/he/global/themes/winehq/content_nobox.template | 1 + templates/tr/global/themes/winehq/content.template | 1 + templates/tr/global/themes/winehq/content_nobox.template | 1 + templates/uk/global/themes/winehq/content.template | 1 + templates/uk/global/themes/winehq/content_nobox.template | 1 + 12 files changed, 12 insertions(+) diff --git a/templates/de/global/themes/winehq/content.template b/templates/de/global/themes/winehq/content.template index 18b1d06..d6ad836 100644 --- a/templates/de/global/themes/winehq/content.template +++ b/templates/de/global/themes/winehq/content.template @@ -9,6 +9,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/de/global/themes/winehq/content_nobox.template b/templates/de/global/themes/winehq/content_nobox.template index 06e3f2f..6f14f25 100644 --- a/templates/de/global/themes/winehq/content_nobox.template +++ b/templates/de/global/themes/winehq/content_nobox.template @@ -9,6 +9,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/en/global/themes/winehq/content.template b/templates/en/global/themes/winehq/content.template index 7b9e475..ffdfef2 100644 --- a/templates/en/global/themes/winehq/content.template +++ b/templates/en/global/themes/winehq/content.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/en/global/themes/winehq/content_nobox.template b/templates/en/global/themes/winehq/content_nobox.template index caf82b7..94613c7 100644 --- a/templates/en/global/themes/winehq/content_nobox.template +++ b/templates/en/global/themes/winehq/content_nobox.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/fr/global/themes/winehq/content.template b/templates/fr/global/themes/winehq/content.template index 19e5cdd..f228a4a 100644 --- a/templates/fr/global/themes/winehq/content.template +++ b/templates/fr/global/themes/winehq/content.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/fr/global/themes/winehq/content_nobox.template b/templates/fr/global/themes/winehq/content_nobox.template index d4253eb..94b78a8 100644 --- a/templates/fr/global/themes/winehq/content_nobox.template +++ b/templates/fr/global/themes/winehq/content_nobox.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/he/global/themes/winehq/content.template b/templates/he/global/themes/winehq/content.template index 3f04773..3a4cea4 100644 --- a/templates/he/global/themes/winehq/content.template +++ b/templates/he/global/themes/winehq/content.template @@ -9,6 +9,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/he/global/themes/winehq/content_nobox.template b/templates/he/global/themes/winehq/content_nobox.template index d7461f6..d369604 100644 --- a/templates/he/global/themes/winehq/content_nobox.template +++ b/templates/he/global/themes/winehq/content_nobox.template @@ -9,6 +9,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/tr/global/themes/winehq/content.template b/templates/tr/global/themes/winehq/content.template index 19eea85..a1986f1 100644 --- a/templates/tr/global/themes/winehq/content.template +++ b/templates/tr/global/themes/winehq/content.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/tr/global/themes/winehq/content_nobox.template b/templates/tr/global/themes/winehq/content_nobox.template index dc75406..e4a91f2 100644 --- a/templates/tr/global/themes/winehq/content_nobox.template +++ b/templates/tr/global/themes/winehq/content_nobox.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/uk/global/themes/winehq/content.template b/templates/uk/global/themes/winehq/content.template index eb01060..bb83dd2 100644 --- a/templates/uk/global/themes/winehq/content.template +++ b/templates/uk/global/themes/winehq/content.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/uk/global/themes/winehq/content_nobox.template b/templates/uk/global/themes/winehq/content_nobox.template index 85c0adf..a5854da 100644 --- a/templates/uk/global/themes/winehq/content_nobox.template +++ b/templates/uk/global/themes/winehq/content_nobox.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links}

1 0

Nikolay Sivov : dwrite/tests: Some tests for local font file loader.
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Module: wine Branch: master Commit: 561ac1d8296a8af90b39565f2c14e34b5792b62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=561ac1d8296a8af90b39565f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 22 16:33:29 2014 +0400 dwrite/tests: Some tests for local font file loader. --- dlls/dwrite/tests/font.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e7827ef..77571f0 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -859,8 +859,13 @@ todo_wine static void test_system_fontcollection(void) { IDWriteFontCollection *collection, *coll2; + IDWriteLocalFontFileLoader *localloader; IDWriteFactory *factory, *factory2; + IDWriteFontFileLoader *loader; IDWriteFontFamily *family; + IDWriteFontFace *fontface; + IDWriteFontFile *file; + IDWriteFont *font; HRESULT hr; UINT32 i; BOOL ret; @@ -904,6 +909,42 @@ static void test_system_fontcollection(void) ok(ret, "got %d\n", ret); ok(i != (UINT32)-1, "got %u\n", i); + /* get back local file loader */ + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFamily_Release(family); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + i = 1; + file = NULL; + hr = IDWriteFontFace_GetFiles(fontface, &i, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(file != NULL, "got %p\n", file); + +if (file) { + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void**)&localloader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteLocalFontFileLoader_Release(localloader); + + /* local loader is not registered by default */ + hr = IDWriteFactory_RegisterFontFileLoader(factory, loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory, loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFileLoader_Release(loader); +} ret = TRUE; i = 0; hr = IDWriteFontCollection_FindFamilyName(collection, blahW, &i, &ret);

1 0

Stefan Dösinger : d3d9/tests: Skip unsupported resources in test_resource_type.
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Module: wine Branch: master Commit: 6334bf09b7850dc13dd197155a69659a9d2aa598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6334bf09b7850dc13dd197155… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 21:56:37 2014 +0200 d3d9/tests: Skip unsupported resources in test_resource_type. --- dlls/d3d9/tests/device.c | 144 ++++++++++++++++++++++++++--------------------- 1 file changed, 79 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6334bf09b7850dc13dd19…

1 0

Amine Khaldi : kernel32: Remove some unused variables (Clang).
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Module: wine Branch: master Commit: 810ed5c85a0bccfe35dc7d4c3c7621216e13c9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=810ed5c85a0bccfe35dc7d4c3… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Wed Oct 22 19:10:21 2014 +0100 kernel32: Remove some unused variables (Clang). --- dlls/kernel32/format_msg.c | 2 -- dlls/kernel32/locale.c | 11 ----------- 2 files changed, 13 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index cdbc944..5741713 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -68,8 +68,6 @@ struct format_args * Yes, ANSI strings in win32 resources. Go figure. */ -static const WCHAR FMTWSTR[] = { '%','s',0 }; - /********************************************************************** * load_message (internal) */ diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 730574b..171f14c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3456,17 +3456,6 @@ static BOOL NLS_GetLanguageGroupName(LGRPID lgrpid, LPWSTR szName, ULONG nameSiz return bRet; } -/* Registry keys for NLS related information */ - -static const WCHAR szCountryListName[] = { - 'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'T','e','l','e','p','h','o','n','y','\\', - 'C','o','u','n','t','r','y',' ','L','i','s','t','\0' -}; - - /* Callback function ptrs for EnumSystemLanguageGroupsA/W */ typedef struct {

1 0

Nikolay Sivov : dwrite/tests: Create separate isolated factory for each test.
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Module: wine Branch: master Commit: 272964666a9ab6decdc58fc6be4fc247504aad73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272964666a9ab6decdc58fc6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 22 15:42:30 2014 +0400 dwrite/tests: Create separate isolated factory for each test. --- dlls/dwrite/tests/font.c | 91 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 81 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=272964666a9ab6decdc58…

1 0

Stefan Dösinger : wined3d: Remove texture locations after downloading all subresources.
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Module: wine Branch: master Commit: aad1997dff990ceeba90ece0d535c7826044a5cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad1997dff990ceeba90ece0d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 21:56:38 2014 +0200 wined3d: Remove texture locations after downloading all subresources. --- dlls/wined3d/surface.c | 1 - dlls/wined3d/texture.c | 1 + dlls/wined3d/volume.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 75f48de..092cbe6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1207,7 +1207,6 @@ static void surface_unload(struct wined3d_resource *resource) surface_load_location(surface, surface->resource.map_binding); surface_invalidate_location(surface, ~surface->resource.map_binding); } - wined3d_texture_force_reload(surface->container); context = context_acquire(device, NULL); gl_info = context->gl_info; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4f962f1..6ecd414 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -979,6 +979,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) sub_resource->resource_ops->resource_unload(sub_resource); } + wined3d_texture_force_reload(texture); wined3d_texture_unload_gl_texture(texture); } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 0cbc7d4..58d7321 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -451,7 +451,6 @@ static void volume_unload(struct wined3d_resource *resource) } /* The texture name is managed by the container. */ - wined3d_texture_force_reload(volume->container); volume->flags &= ~WINED3D_VFLAG_CLIENT_STORAGE; resource_unload(resource);

1 0

Stefan Dösinger : d3d8/tests: Skip unsupported resources in test_resource_type.
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Module: wine Branch: master Commit: 86168c4e908807fc23a33bb99bdd7f59f1312249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86168c4e908807fc23a33bb99… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 21:56:36 2014 +0200 d3d8/tests: Skip unsupported resources in test_resource_type. --- dlls/d3d8/tests/device.c | 138 ++++++++++++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 62 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9ffac8b..5f8f52a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6070,6 +6070,7 @@ static void test_resource_type(void) ULONG refcount; HWND window; HRESULT hr; + D3DCAPS8 caps; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -6083,6 +6084,9 @@ static void test_resource_type(void) return; } + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateImageSurface(device, 4, 4, D3DFMT_X8R8G8B8, &surface); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); @@ -6130,68 +6134,78 @@ static void test_resource_type(void) IDirect3DSurface8_Release(surface); IDirect3DTexture8_Release(texture); - hr = IDirect3DDevice8_CreateCubeTexture(device, 1, 1, 0, D3DFMT_X8R8G8B8, - D3DPOOL_SYSTEMMEM, &cube_texture); - ok(SUCCEEDED(hr), "Failed to create cube texture, hr %#x.\n", hr); - type = IDirect3DCubeTexture8_GetType(cube_texture); - ok(type == D3DRTYPE_CUBETEXTURE, "Expected type D3DRTYPE_CUBETEXTURE, got %u.\n", type); - - hr = IDirect3DCubeTexture8_GetCubeMapSurface(cube_texture, - D3DCUBEMAP_FACE_NEGATIVE_X, 0, &surface); - ok(SUCCEEDED(hr), "Failed to get cube map surface, hr %#x.\n", hr); - hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); - ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", - surface_desc.Type); - hr = IDirect3DCubeTexture8_GetLevelDesc(cube_texture, 0, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); - ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", - surface_desc.Type); - IDirect3DSurface8_Release(surface); - IDirect3DCubeTexture8_Release(cube_texture); - - hr = IDirect3DDevice8_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, - D3DPOOL_SYSTEMMEM, &volume_texture); - type = IDirect3DVolumeTexture8_GetType(volume_texture); - ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); - - hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 0, &volume); - ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); - /* IDirect3DVolume8 is not an IDirect3DResource8 and has no GetType method. */ - hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); - ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); - ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", - volume_desc.Type); - ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); - ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); - ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); - hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 0, &volume_desc); - ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); - ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", - volume_desc.Type); - ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); - ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); - ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); - IDirect3DVolume8_Release(volume); - - hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 2, &volume); - ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); - hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); - ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); - ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", - volume_desc.Type); - ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); - ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); - ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); - hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 2, &volume_desc); - ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); - ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", - volume_desc.Type); - ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); - ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); - ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); - IDirect3DVolume8_Release(volume); - IDirect3DVolumeTexture8_Release(volume_texture); + if (caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) + { + hr = IDirect3DDevice8_CreateCubeTexture(device, 1, 1, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &cube_texture); + ok(SUCCEEDED(hr), "Failed to create cube texture, hr %#x.\n", hr); + type = IDirect3DCubeTexture8_GetType(cube_texture); + ok(type == D3DRTYPE_CUBETEXTURE, "Expected type D3DRTYPE_CUBETEXTURE, got %u.\n", type); + + hr = IDirect3DCubeTexture8_GetCubeMapSurface(cube_texture, + D3DCUBEMAP_FACE_NEGATIVE_X, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get cube map surface, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + hr = IDirect3DCubeTexture8_GetLevelDesc(cube_texture, 0, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + IDirect3DSurface8_Release(surface); + IDirect3DCubeTexture8_Release(cube_texture); + } + else + skip("Cube maps not supported.\n"); + + if (caps.TextureCaps & D3DPTEXTURECAPS_MIPVOLUMEMAP) + { + hr = IDirect3DDevice8_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture); + type = IDirect3DVolumeTexture8_GetType(volume_texture); + ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); + + hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 0, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + /* IDirect3DVolume8 is not an IDirect3DResource8 and has no GetType method. */ + hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 0, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + IDirect3DVolume8_Release(volume); + + hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 2, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 2, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + IDirect3DVolume8_Release(volume); + IDirect3DVolumeTexture8_Release(volume_texture); + } + else + skip("Mipmapped volume maps not supported.\n"); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Jactry Zeng : prntvpt: Add stub dll.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 16ab1bdd5f408e7dd4abe76ca841a89d70232d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ab1bdd5f408e7dd4abe76ca… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Oct 22 18:48:44 2014 +0800 prntvpt: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/prntvpt/Makefile.in | 4 ++++ dlls/prntvpt/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/prntvpt/prntvpt.spec | 27 +++++++++++++++++++++++++++ 5 files changed, 77 insertions(+) diff --git a/configure b/configure index a11c3d7..d2bada5 100755 --- a/configure +++ b/configure @@ -1180,6 +1180,7 @@ enable_photometadatahandler enable_pidgen enable_powrprof enable_printui +enable_prntvpt enable_propsys enable_psapi enable_pstorec @@ -17224,6 +17225,7 @@ wine_fn_config_dll photometadatahandler enable_photometadatahandler wine_fn_config_dll pidgen enable_pidgen wine_fn_config_dll powrprof enable_powrprof implib wine_fn_config_dll printui enable_printui +wine_fn_config_dll prntvpt enable_prntvpt wine_fn_config_dll propsys enable_propsys clean,implib wine_fn_config_test dlls/propsys/tests propsys_test wine_fn_config_dll psapi enable_psapi implib diff --git a/configure.ac b/configure.ac index 5ebc2c3..ea016b1 100644 --- a/configure.ac +++ b/configure.ac @@ -3108,6 +3108,7 @@ WINE_CONFIG_DLL(photometadatahandler) WINE_CONFIG_DLL(pidgen) WINE_CONFIG_DLL(powrprof,,[implib]) WINE_CONFIG_DLL(printui) +WINE_CONFIG_DLL(prntvpt) WINE_CONFIG_DLL(propsys,,[clean,implib]) WINE_CONFIG_TEST(dlls/propsys/tests) WINE_CONFIG_DLL(psapi,,[implib]) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in new file mode 100644 index 0000000..ce05f50 --- /dev/null +++ b/dlls/prntvpt/Makefile.in @@ -0,0 +1,4 @@ +MODULE = prntvpt.dll + +C_SRCS = \ + main.c diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c new file mode 100644 index 0000000..f5abde9 --- /dev/null +++ b/dlls/prntvpt/main.c @@ -0,0 +1,43 @@ +/* + * Print Ticket Services Module + * + * Copyright 2014 Jactry Zeng for CodeWeavers + * + * 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 + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + } + return TRUE; +} diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec new file mode 100644 index 0000000..3f5e329 --- /dev/null +++ b/dlls/prntvpt/prntvpt.spec @@ -0,0 +1,27 @@ +1 stub PTQuerySchemaVersionSupport +2 stub PTOpenProvider +3 stub PTOpenProviderEx +4 stub PTCloseProvider +5 stub BindPTProviderThunk +6 stub PTGetPrintCapabilities +7 stub PTMergeAndValidatePrintTicket +8 stub PTConvertPrintTicketToDevMode +9 stub PTConvertDevModeToPrintTicket +10 stub PTReleaseMemory +11 stub ConvertDevModeToPrintTicketThunk2 +12 stub ConvertDevModeToPrintTicketThunk +13 stub ConvertPrintTicketToDevModeThunk2 +14 stub ConvertPrintTicketToDevModeThunk +15 stub DllCanUnloadNow +16 stub DllGetClassObject +17 stdcall -private DllMain(long long ptr) +18 stub DllRegisterServer +19 stub DllUnregisterServer +20 stub GetDeviceDefaultPrintTicketThunk +21 stub GetDeviceNamespacesThunk +22 stub GetPrintCapabilitiesThunk2 +23 stub GetPrintCapabilitiesThunk +24 stub GetSchemaVersionThunk +25 stub MergeAndValidatePrintTicketThunk2 +26 stub MergeAndValidatePrintTicketThunk +27 stub UnbindPTProviderThunk

1 0

André Hentschel : d3dx9_30: Add stub for D3DXCpuOptimizations.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: b48e74749de682951320235f13eab4ffc52eb0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48e74749de682951320235f1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 21 23:23:34 2014 +0200 d3dx9_30: Add stub for D3DXCpuOptimizations. --- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_30/d3dx9_30_main.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index 107fad1..54234b2 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -30,7 +30,7 @@ @ stdcall D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXConcatenateMeshes @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToSingleStrip @ stdcall D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToStrips -@ stub D3DXCpuOptimizations(long) +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) d3dx9_36.D3DXCreateAnimationController @ stdcall D3DXCreateBox(ptr float float float ptr ptr) d3dx9_36.D3DXCreateBox @ stdcall D3DXCreateBuffer(long ptr) d3dx9_36.D3DXCreateBuffer diff --git a/dlls/d3dx9_30/d3dx9_30_main.c b/dlls/d3dx9_30/d3dx9_30_main.c index 25fd035..81e53f8 100644 --- a/dlls/d3dx9_30/d3dx9_30_main.c +++ b/dlls/d3dx9_30/d3dx9_30_main.c @@ -30,6 +30,9 @@ #include "winuser.h" #include "d3dx9.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /*********************************************************************** * DllMain. @@ -58,3 +61,17 @@ BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) else return FALSE; } + +typedef enum _D3DX_CPU_OPTIMIZATION +{ + D3DX_NOT_OPTIMIZED = 0, + D3DX_3DNOW_OPTIMIZED = 1, + D3DX_SSE2_OPTIMIZED = 2, + D3DX_SSE_OPTIMIZED = 3 +} D3DX_CPU_OPTIMIZATION; + +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) +{ + FIXME("%i - stub\n", enable); + return D3DX_NOT_OPTIMIZED; +}

1 0

Nikolay Sivov : dwrite: Some tests for reused fontface instances.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 42e5a32cc3ecb7064c1019d5212520ab2e6a33d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e5a32cc3ecb7064c1019d52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 22 11:06:15 2014 +0400 dwrite: Some tests for reused fontface instances. --- dlls/dwrite/tests/font.c | 184 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 131 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42e5a32cc3ecb7064c101…

1 0

Nikolay Sivov : dwrite: Remove unused parameter.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: b4dc4e257ce61b5c3d99eb55499ed5acec478470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4dc4e257ce61b5c3d99eb554… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 21 17:14:31 2014 +0400 dwrite: Remove unused parameter. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/main.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index fad7a21..5ac0852 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -105,7 +105,7 @@ extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDE extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; -extern HRESULT font_create_fontface(IDWriteFactory*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2 **) DECLSPEC_HIDDEN; +extern HRESULT font_create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2 **) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 783b035..2b67543 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -747,7 +747,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 if (!font->face) { HRESULT hr = font->is_system ? create_system_fontface(font, &font->face) : - font_create_fontface(NULL, font->data->face_data->type, font->data->face_data->file_count, font->data->face_data->files, + font_create_fontface(font->data->face_data->type, font->data->face_data->file_count, font->data->face_data->files, font->data->face_data->index, font->data->face_data->simulations, &font->face); if (FAILED(hr)) return hr; } @@ -1676,7 +1676,7 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke return S_OK; } -HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace2 **font_face) +HRESULT font_create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace2 **font_face) { int i; struct dwrite_fontface *This; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index bac0c78..3211ee3 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -629,7 +629,7 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, { struct dwritefactory *This = impl_from_IDWriteFactory(iface); TRACE("(%p)->(%d %u %p %u 0x%x %p)\n", This, facetype, files_number, font_files, index, sim_flags, font_face); - return font_create_fontface(iface, facetype, files_number, font_files, index, sim_flags, (IDWriteFontFace2**)font_face); + return font_create_fontface(facetype, files_number, font_files, index, sim_flags, (IDWriteFontFace2**)font_face); } static HRESULT WINAPI dwritefactory_CreateRenderingParams(IDWriteFactory *iface, IDWriteRenderingParams **params)

1 0

David Heidelberger : winedbg: List Dwarf2 GNU extensions as TODO to workaround spam in debug.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 4f18c053d3bce0ec88bbb337e1f0bae7909d90e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f18c053d3bce0ec88bbb337e… Author: David Heidelberger <david.heidelberger(a)ixit.cz> Date: Wed Oct 22 09:23:36 2014 +0200 winedbg: List Dwarf2 GNU extensions as TODO to workaround spam in debug. --- dlls/dbghelp/dwarf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a89cf11..f1bd6cb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1467,6 +1467,8 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_variable: case DW_TAG_imported_declaration: case DW_TAG_ptr_to_member_type: + case DW_TAG_GNU_template_parameter_pack: + case DW_TAG_GNU_formal_parameter_pack: /* FIXME: some C++ related stuff */ break; default: @@ -1967,6 +1969,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, case DW_TAG_template_type_param: case DW_TAG_template_value_param: case DW_TAG_GNU_call_site: + case DW_TAG_GNU_template_parameter_pack: + case DW_TAG_GNU_formal_parameter_pack: /* FIXME: no support in dbghelp's internals so far */ break; default:

1 0

Stefan Dösinger : d3d8/tests: Use create_device in test_swvp_buffer.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 94f20a6fff18876ef7c16b3b2c22251cb0ab9176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f20a6fff18876ef7c16b3b2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 00:22:07 2014 +0200 d3d8/tests: Use create_device in test_swvp_buffer. --- dlls/d3d8/tests/device.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6caf8b4..9ffac8b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -33,6 +33,7 @@ struct vec3 #define CREATE_DEVICE_FULLSCREEN 0x01 #define CREATE_DEVICE_FPU_PRESERVE 0x02 +#define CREATE_DEVICE_SWVP_ONLY 0x04 struct device_desc { @@ -110,6 +111,8 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons present_parameters.BackBufferHeight = desc->height; present_parameters.hDeviceWindow = desc->device_window; present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); + if (desc->flags & CREATE_DEVICE_SWVP_ONLY) + behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; if (desc->flags & CREATE_DEVICE_FPU_PRESERVE) behavior_flags |= D3DCREATE_FPU_PRESERVE; } @@ -123,6 +126,8 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons behavior_flags, &present_parameters, &device))) return device; + if (desc && desc->flags & CREATE_DEVICE_SWVP_ONLY) + return NULL; behavior_flags ^= (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING); if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, @@ -4758,7 +4763,7 @@ static void test_swvp_buffer(void) IDirect3DVertexBuffer8 *buffer; static const unsigned int bufsize = 1024; D3DVERTEXBUFFER_DESC desc; - D3DPRESENT_PARAMETERS present_parameters = {0}; + struct device_desc device_desc; struct { float x, y, z; @@ -4769,15 +4774,11 @@ static void test_swvp_buffer(void) d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = screen_width; - present_parameters.BackBufferHeight = screen_height; - present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; - present_parameters.EnableAutoDepthStencil = FALSE; - if (FAILED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = CREATE_DEVICE_SWVP_ONLY; + if (!(device = create_device(d3d8, window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); IDirect3D8_Release(d3d8);

1 0

André Hentschel : bcrypt: Add stub for BCryptGetProperty.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 574b30b685260278093e2f5d1032d78a04f64480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574b30b685260278093e2f5d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 21 22:53:49 2014 +0200 bcrypt: Add stub for BCryptGetProperty. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 7 +++++++ include/bcrypt.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 83cdbea..18d4d48 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -28,7 +28,7 @@ @ stub BCryptGenerateKeyPair @ stub BCryptGenerateSymmetricKey @ stdcall BCryptGetFipsAlgorithmMode(ptr) -@ stub BCryptGetProperty +@ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) @ stub BCryptHashData @ stub BCryptImportKey @ stub BCryptImportKeyPair diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 35a640a..4663e0f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -108,3 +108,10 @@ NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled) *enabled = FALSE; return STATUS_SUCCESS; } + +NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE obj, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags) +{ + FIXME("%p, %s, %p, %u, %p, %08x - stub\n", obj, wine_dbgstr_w(prop), buffer, count, res, flags); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/bcrypt.h b/include/bcrypt.h index e7e7a59..d9b8cc6 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -48,6 +48,7 @@ typedef struct _BCRYPT_ALGORITHM_IDENTIFIER } BCRYPT_ALGORITHM_IDENTIFIER; typedef PVOID BCRYPT_ALG_HANDLE; +typedef PVOID BCRYPT_HANDLE; #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 #define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002

1 0

Stefan Dösinger : d3d9/tests: Use create_device for test_swvp_buffer.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 8633f7f1233f40ea053d8623178e648b0c6db169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8633f7f1233f40ea053d86231… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 00:22:05 2014 +0200 d3d9/tests: Use create_device for test_swvp_buffer. --- dlls/d3d9/tests/device.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index acba77f..9690d41 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -34,6 +34,7 @@ struct vec3 #define CREATE_DEVICE_FULLSCREEN 0x01 #define CREATE_DEVICE_NOWINDOWCHANGES 0x02 #define CREATE_DEVICE_FPU_PRESERVE 0x04 +#define CREATE_DEVICE_SWVP_ONLY 0x08 struct device_desc { @@ -150,6 +151,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons present_parameters.BackBufferHeight = desc->height; present_parameters.hDeviceWindow = desc->device_window; present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); + if (desc->flags & CREATE_DEVICE_SWVP_ONLY) + behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; if (desc->flags & CREATE_DEVICE_NOWINDOWCHANGES) behavior_flags |= D3DCREATE_NOWINDOWCHANGES; if (desc->flags & CREATE_DEVICE_FPU_PRESERVE) @@ -165,6 +168,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons behavior_flags, &present_parameters, &device))) return device; + if (desc && desc->flags & CREATE_DEVICE_SWVP_ONLY) + return NULL; behavior_flags ^= (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING); if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, @@ -7239,7 +7244,7 @@ static void test_swvp_buffer(void) IDirect3DVertexBuffer9 *buffer; static const unsigned int bufsize = 1024; D3DVERTEXBUFFER_DESC desc; - D3DPRESENT_PARAMETERS present_parameters = {0}; + struct device_desc device_desc; struct { float x, y, z; @@ -7250,15 +7255,11 @@ static void test_swvp_buffer(void) d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = screen_width; - present_parameters.BackBufferHeight = screen_height; - present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; - present_parameters.EnableAutoDepthStencil = FALSE; - if (FAILED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = CREATE_DEVICE_SWVP_ONLY; + if (!(device = create_device(d3d9, window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); DestroyWindow(window);

1 0

Stefan Dösinger : d3d8/tests: Use create_device for test_fpu_setup.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 1ae02b92e099ff10d6f3eaa7c26438922b48c550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae02b92e099ff10d6f3eaa7c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 00:22:06 2014 +0200 d3d8/tests: Use create_device for test_fpu_setup. --- dlls/d3d8/tests/device.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2278c06..6caf8b4 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -32,6 +32,7 @@ struct vec3 }; #define CREATE_DEVICE_FULLSCREEN 0x01 +#define CREATE_DEVICE_FPU_PRESERVE 0x02 struct device_desc { @@ -92,6 +93,7 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice8 *device; + DWORD behavior_flags = D3DCREATE_HARDWARE_VERTEXPROCESSING; present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; @@ -108,17 +110,24 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons present_parameters.BackBufferHeight = desc->height; present_parameters.hDeviceWindow = desc->device_window; present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); + if (desc->flags & CREATE_DEVICE_FPU_PRESERVE) + behavior_flags |= D3DCREATE_FPU_PRESERVE; } if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + behavior_flags, &present_parameters, &device))) + return device; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + behavior_flags, &present_parameters, &device))) + return device; + + behavior_flags ^= (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING); if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + behavior_flags, &present_parameters, &device))) + return device; return NULL; } @@ -2578,7 +2587,7 @@ static inline WORD get_fpu_cw(void) static void test_fpu_setup(void) { #if defined(D3D8_TEST_SET_FPU_CW) && defined(D3D8_TEST_GET_FPU_CW) - D3DPRESENT_PARAMETERS present_parameters; + struct device_desc device_desc; IDirect3DDevice8 *device; D3DDISPLAYMODE d3ddm; IDirect3D8 *d3d8; @@ -2594,21 +2603,18 @@ static void test_fpu_setup(void) hr = IDirect3D8_GetAdapterDisplayMode(d3d8, D3DADAPTER_DEFAULT, &d3ddm); ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr); - memset(&present_parameters, 0, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferFormat = d3ddm.Format; + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; set_fpu_cw(0xf60); cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - if (FAILED(hr)) + if (!(device = create_device(d3d8, window, &device_desc))) { - skip("Failed to create a device, hr %#x.\n", hr); + skip("Failed to create a 3D device, skipping test.\n"); set_fpu_cw(0x37f); goto done; } @@ -2624,9 +2630,9 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &present_parameters, &device); - ok(SUCCEEDED(hr), "CreateDevice failed, hr %#x.\n", hr); + device_desc.flags = CREATE_DEVICE_FPU_PRESERVE; + device = create_device(d3d8, window, &device_desc); + ok(!!device, "CreateDevice failed.\n"); cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw);

1 0

Stefan Dösinger : d3d9/tests: Use create_device in test_fpu_setup (v2).
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: d5b2e8af394df3abfefd47c3574d9ce953cf3490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b2e8af394df3abfefd47c35… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 00:22:04 2014 +0200 d3d9/tests: Use create_device in test_fpu_setup (v2). --- dlls/d3d9/tests/device.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a86582b..acba77f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -33,6 +33,7 @@ struct vec3 #define CREATE_DEVICE_FULLSCREEN 0x01 #define CREATE_DEVICE_NOWINDOWCHANGES 0x02 +#define CREATE_DEVICE_FPU_PRESERVE 0x04 struct device_desc { @@ -151,6 +152,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); if (desc->flags & CREATE_DEVICE_NOWINDOWCHANGES) behavior_flags |= D3DCREATE_NOWINDOWCHANGES; + if (desc->flags & CREATE_DEVICE_FPU_PRESERVE) + behavior_flags |= D3DCREATE_FPU_PRESERVE; } if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, @@ -3586,11 +3589,10 @@ static inline WORD get_fpu_cw(void) static void test_fpu_setup(void) { #if defined(D3D9_TEST_SET_FPU_CW) && defined(D3D9_TEST_GET_FPU_CW) - D3DPRESENT_PARAMETERS present_parameters; + struct device_desc device_desc; IDirect3DDevice9 *device; HWND window = NULL; IDirect3D9 *d3d9; - HRESULT hr; WORD cw; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); @@ -3598,20 +3600,18 @@ static void test_fpu_setup(void) d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); - memset(&present_parameters, 0, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; set_fpu_cw(0xf60); cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - if (FAILED(hr)) + if (!(device = create_device(d3d9, window, &device_desc))) { - skip("Failed to create a device, hr %#x.\n", hr); + skip("Failed to create a 3D device, skipping test.\n"); set_fpu_cw(0x37f); goto done; } @@ -3627,9 +3627,9 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &present_parameters, &device); - ok(SUCCEEDED(hr), "CreateDevice failed, hr %#x.\n", hr); + device_desc.flags = CREATE_DEVICE_FPU_PRESERVE; + device = create_device(d3d9, window, &device_desc); + ok(device != NULL, "CreateDevice failed.\n"); cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw);

1 0

Austin English : advapi32: Add a stub for WmiOpenBlock.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: a60fadfad29bcbb564ed01afec8b585e627f9361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60fadfad29bcbb564ed01afe… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 20 11:14:00 2014 -0500 advapi32: Add a stub for WmiOpenBlock. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index f1cae1f..40ae014 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -806,7 +806,7 @@ # @ stub WmiMofEnumerateResourcesW # @ stub WmiNotificationRegistrationA # @ stub WmiNotificationRegistrationW -@ stub WmiOpenBlock +@ stdcall WmiOpenBlock(ptr long ptr) # @ stub WmiOpenTraceWithCursor # @ stub WmiParseTraceEvent # @ stub WmiQueryAllDataA diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index cc10935..988060f 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -997,3 +997,12 @@ ULONG WINAPI EnumerateTraceGuids(PTRACE_GUID_PROPERTIES *propertiesarray, FIXME("%p %d %p: stub\n", propertiesarray, arraycount, guidcount); return ERROR_INVALID_PARAMETER; } + +/****************************************************************************** + * WmiOpenBlock [ADVAPI32.@] + */ +NTSTATUS WINAPI WmiOpenBlock(GUID *guid, ULONG access, PVOID *datablock) +{ + FIXME("%s %d %p: stub\n", debugstr_guid(guid), access, datablock); + return ERROR_SUCCESS; +}

1 0

Catalin Patulea : kernel32: Handle win32 hresult in FormatMessage.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: a5005ed84a8b891b39731de3215e2eda8a1deb0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5005ed84a8b891b39731de32… Author: Catalin Patulea <catalinp(a)google.com> Date: Mon Oct 20 17:55:46 2014 -0400 kernel32: Handle win32 hresult in FormatMessage. --- dlls/kernel32/format_msg.c | 28 ++++++++++++++++++++-------- dlls/kernel32/tests/format_msg.c | 1 - 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index aee7d7a..cdbc944 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -104,6 +104,24 @@ static LPWSTR load_message( HMODULE module, UINT id, WORD lang ) return buffer; } +static LPWSTR search_message( DWORD flags, HMODULE module, UINT id, WORD lang ) +{ + LPWSTR from = NULL; + if (flags & FORMAT_MESSAGE_FROM_HMODULE) + from = load_message( module, id, lang ); + if (!from && (flags & FORMAT_MESSAGE_FROM_SYSTEM)) + { + /* Fold win32 hresult to its embedded error code. */ + if (HRESULT_SEVERITY(id) == SEVERITY_ERROR && + HRESULT_FACILITY(id) == FACILITY_WIN32) + { + id = HRESULT_CODE(id); + } + from = load_message( kernel32_handle, id, lang ); + } + return from; +} + /********************************************************************** * get_arg (internal) */ @@ -492,10 +510,7 @@ DWORD WINAPI FormatMessageA( } else if (dwFlags & (FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM)) { - if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId ); - if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) - from = load_message( kernel32_handle, dwMessageId, dwLanguageId ); + from = search_message( dwFlags, (HMODULE)lpSource, dwMessageId, dwLanguageId ); if (!from) return 0; } else @@ -592,10 +607,7 @@ DWORD WINAPI FormatMessageW( } else if (dwFlags & (FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM)) { - if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId ); - if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) - from = load_message( kernel32_handle, dwMessageId, dwLanguageId ); + from = search_message( dwFlags, (HMODULE)lpSource, dwMessageId, dwLanguageId ); if (!from) return 0; } else diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 3e8d96d..4a1ae7d 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1555,7 +1555,6 @@ static void test_message_from_hmodule(void) /* Test HRESULT. It's not documented but in practice _com_error::ErrorMessage relies on this. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 0x80070005 /* E_ACCESSDENIED */, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); - todo_wine ok(ret != 0, "FormatMessageA returned 0\n"); /* Test a message string with an insertion without passing any variadic arguments. */

1 0

Nikolay Sivov : dwrite: Implement GetInformationalStrings().
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 04a237fe18cb775bf7545472bea88d6a79e5344e URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a237fe18cb775bf7545472b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 21:45:57 2014 +0400 dwrite: Implement GetInformationalStrings(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 45 ++++++++-- dlls/dwrite/opentype.c | 204 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 6 +- 4 files changed, 244 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04a237fe18cb775bf7545…

1 0

Amine Khaldi : strmbase: Remove unused InputPin_Vtbl, OutputPin_Vtbl and impl_BaseInputPin_from_BasePin() (Clang).
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 381bca49e08397a07facbde6843c1cb357c13d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=381bca49e08397a07facbde68… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Oct 20 19:16:35 2014 +0100 strmbase: Remove unused InputPin_Vtbl, OutputPin_Vtbl and impl_BaseInputPin_from_BasePin() (Clang). --- dlls/strmbase/pin.c | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 958fbf8..a9c1928 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -31,8 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); -static const IPinVtbl InputPin_Vtbl; -static const IPinVtbl OutputPin_Vtbl; static const IMemInputPinVtbl MemInputPin_Vtbl; typedef HRESULT (*SendPinFunc)( IPin *to, LPVOID arg ); @@ -555,28 +553,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface) return E_UNEXPECTED; } -static const IPinVtbl OutputPin_Vtbl = -{ - BaseOutputPinImpl_QueryInterface, - BasePinImpl_AddRef, - BaseOutputPinImpl_Release, - BaseOutputPinImpl_Connect, - BaseOutputPinImpl_ReceiveConnection, - BaseOutputPinImpl_Disconnect, - BasePinImpl_ConnectedTo, - BasePinImpl_ConnectionMediaType, - BasePinImpl_QueryPinInfo, - BasePinImpl_QueryDirection, - BasePinImpl_QueryId, - BasePinImpl_QueryAccept, - BasePinImpl_EnumMediaTypes, - BasePinImpl_QueryInternalConnections, - BaseOutputPinImpl_EndOfStream, - BaseOutputPinImpl_BeginFlush, - BaseOutputPinImpl_EndFlush, - BasePinImpl_NewSegment -}; - HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags) { HRESULT hr; @@ -861,11 +837,6 @@ static inline BaseInputPin *impl_BaseInputPin_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, BaseInputPin, pin.IPin_iface); } -static inline BaseInputPin *impl_BaseInputPin_from_BasePin( BasePin *iface ) -{ - return CONTAINING_RECORD(iface, BaseInputPin, pin); -} - HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); @@ -1060,28 +1031,6 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, return SendFurther( iface, deliver_newsegment, &args, NULL ); } -static const IPinVtbl InputPin_Vtbl = -{ - BaseInputPinImpl_QueryInterface, - BasePinImpl_AddRef, - BaseInputPinImpl_Release, - BaseInputPinImpl_Connect, - BaseInputPinImpl_ReceiveConnection, - BasePinImpl_Disconnect, - BasePinImpl_ConnectedTo, - BasePinImpl_ConnectionMediaType, - BasePinImpl_QueryPinInfo, - BasePinImpl_QueryDirection, - BasePinImpl_QueryId, - BaseInputPinImpl_QueryAccept, - BasePinImpl_EnumMediaTypes, - BasePinImpl_QueryInternalConnections, - BaseInputPinImpl_EndOfStream, - BaseInputPinImpl_BeginFlush, - BaseInputPinImpl_EndFlush, - BaseInputPinImpl_NewSegment -}; - /*** IMemInputPin implementation ***/ static inline BaseInputPin *impl_from_IMemInputPin( IMemInputPin *iface )

1 0

Sebastian Lackner : kernel32/tests: Add test for GetProcessDEPPolicy.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 19927ee517977addd56a040dc7549976a3a0439b URL: http://source.winehq.org/git/wine.git/?a=commit;h=19927ee517977addd56a040dc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 21 07:43:12 2014 +0200 kernel32/tests: Add test for GetProcessDEPPolicy. --- dlls/kernel32/tests/virtual.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 3 +++ 2 files changed, 43 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 1592b87..40f45ef 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -46,6 +46,7 @@ static DWORD (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG, PVECTORED_EXCEPTION_HANDLER); static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); +static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); /* ############################### */ @@ -1972,6 +1973,44 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE ); ok( base != NULL, "VirtualAlloc failed %u\n", GetLastError() ); + /* Check result of GetProcessDEPPolicy */ + if (!pGetProcessDEPPolicy) + win_skip( "GetProcessDEPPolicy not supported\n" ); + else + { + BOOL (WINAPI *get_dep_policy)(HANDLE, LPDWORD, PBOOL) = (void *)base; + BOOL policy_permanent = 0xdeadbeef; + DWORD policy_flags = 0xdeadbeef; + + /* GetProcessDEPPolicy crashes on Windows when a NULL pointer is passed. + * Moreover this function has a bug on Windows 8, which has the effect that + * policy_permanent is set to the content of the CL register instead of 0, + * when the policy is not permanent. To detect that we use an assembler + * wrapper to call the function. */ + + memcpy( base, code_atl2, sizeof(code_atl2) ); + *(DWORD *)(base + 6) = (DWORD_PTR)pGetProcessDEPPolicy - (DWORD_PTR)(base + 10); + + success = VirtualProtect( base, size, PAGE_EXECUTE_READWRITE, &old_prot ); + ok( success, "VirtualProtect failed %u\n", GetLastError() ); + + success = get_dep_policy( GetCurrentProcess(), &policy_flags, &policy_permanent ); + todo_wine + ok( success, "GetProcessDEPPolicy failed %u\n", GetLastError() ); + + ret = 0; + if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) + ret |= PROCESS_DEP_ENABLE; + if (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) + ret |= PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION; + + todo_wine + ok( policy_flags == ret, "expected policy flags %d, got %d\n", ret, policy_flags ); + todo_wine + ok( !policy_permanent || broken(policy_permanent == 0x44), + "expected policy permanent FALSE, got %d\n", policy_permanent ); + } + memcpy( base, code_jmp, sizeof(code_jmp) ); *(DWORD *)(base + 1) = (DWORD_PTR)jmp_test_func - (DWORD_PTR)(base + 5); @@ -3424,6 +3463,7 @@ START_TEST(virtual) pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); pGetWriteWatch = (void *) GetProcAddress(hkernel32, "GetWriteWatch"); pResetWriteWatch = (void *) GetProcAddress(hkernel32, "ResetWriteWatch"); + pGetProcessDEPPolicy = (void *)GetProcAddress( hkernel32, "GetProcessDEPPolicy" ); pNtAreMappedFilesTheSame = (void *)GetProcAddress( hntdll, "NtAreMappedFilesTheSame" ); pNtMapViewOfSection = (void *)GetProcAddress( hntdll, "NtMapViewOfSection" ); pNtUnmapViewOfSection = (void *)GetProcAddress( hntdll, "NtUnmapViewOfSection" ); diff --git a/include/winbase.h b/include/winbase.h index edd6ad6..723da26 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1449,6 +1449,9 @@ typedef enum _DEP_SYSTEM_POLICY_TYPE { OptOut = 3 } DEP_SYSTEM_POLICY_TYPE; +#define PROCESS_DEP_ENABLE 1 +#define PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION 2 + /* Event Logging */ #define EVENTLOG_FULL_INFO 0

1 0

Sebastian Lackner : ntdll: Add support for ATL thunk 'POP ecx; POP eax; PUSH ecx; JMP 4(%eax)'.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 1c1e7ed016c129dacc52e5f6432587270c91f681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1e7ed016c129dacc52e5f64… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 21 06:03:57 2014 +0200 ntdll: Add support for ATL thunk 'POP ecx; POP eax; PUSH ecx; JMP 4(%eax)'. --- dlls/kernel32/tests/virtual.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/signal_i386.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index ae0ede5..1592b87 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1889,6 +1889,23 @@ static inline DWORD send_message_excpt( HWND hWnd, UINT uMsg, WPARAM wParam, LPA return ret; } +static inline DWORD call_proc_excpt( DWORD (CALLBACK *code)(void *), void *arg ) +{ + EXCEPTION_REGISTRATION_RECORD frame; + DWORD ret; + + frame.Handler = execute_fault_seh_handler; + frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = &frame; + + num_guard_page_calls = num_execute_fault_calls = 0; + ret = code( arg ); + + pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; + + return ret; +} + static LRESULT CALLBACK jmp_test_func( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (uMsg == WM_USER) @@ -1907,6 +1924,11 @@ static LRESULT CALLBACK atl_test_func( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR return 43; } +static DWORD CALLBACK atl5_test_func( void ) +{ + return 44; +} + static void test_atl_thunk_emulation( ULONG dep_flags ) { static const char code_jmp[] = {0xE9, 0x00, 0x00, 0x00, 0x00}; @@ -1914,6 +1936,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) static const char code_atl2[] = {0xB9, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; static const char code_atl3[] = {0xBA, 0x44, 0x33, 0x22, 0x11, 0xB9, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xE1}; static const char code_atl4[] = {0xB9, 0x44, 0x33, 0x22, 0x11, 0xB8, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xE0}; + static const char code_atl5[] = {0x59, 0x58, 0x51, 0xFF, 0x60, 0x04}; static const char cls_name[] = "atl_thunk_class"; DWORD ret, size, old_prot; ULONG old_flags = MEM_EXECUTE_OPTION_ENABLE; @@ -2133,6 +2156,24 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) else ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + memcpy( base, code_atl5, sizeof(code_atl5) ); + + success = VirtualProtect( base, size, PAGE_READWRITE, &old_prot ); + ok( success, "VirtualProtect failed %u\n", GetLastError() ); + + ret = (DWORD_PTR)atl5_test_func; + ret = call_proc_excpt( (void *)base, &ret - 1 ); + /* FIXME: We don't check the content of the registers EAX/ECX yet */ + ok( ret == 44, "call returned wrong result, expected 44, got %d\n", ret ); + ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); + if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) + ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) + ok( num_execute_fault_calls == 0 || broken(num_execute_fault_calls == 1) /* Windows XP */, + "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + /* Restore the JMP instruction, set to executable, and then destroy the Window */ memcpy( base, code_jmp, sizeof(code_jmp) ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b315e55..13df4bb 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1648,6 +1648,14 @@ union atl_thunk DWORD func; WORD jmp; /* jmp eax */ } t4; + struct + { + DWORD inst1; /* pop ecx + * pop eax + * push ecx + * jmp 4(%eax) */ + WORD inst2; + } t5; }; #include "poppack.h" @@ -1708,6 +1716,26 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) thunk, context->Eip, context->Eax, context->Ecx ); return TRUE; } + else if (thunk_len >= sizeof(thunk_copy.t5) && thunk_copy.t5.inst1 == 0xff515859 && + thunk_copy.t5.inst2 == 0x0460) + { + DWORD func, stack[2]; + if (virtual_uninterrupted_read_memory( (DWORD *)context->Esp, + stack, sizeof(stack) ) == sizeof(stack) && + virtual_uninterrupted_read_memory( (DWORD *)stack[1] + 1, + &func, sizeof(DWORD) ) == sizeof(DWORD) && + virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, + &stack[0], sizeof(stack[0]) ) == sizeof(stack[0])) + { + context->Ecx = stack[0]; + context->Eax = stack[1]; + context->Esp = context->Esp + sizeof(DWORD); + context->Eip = func; + TRACE( "emulating ATL thunk type 5 at %p, func=%08x eax=%08x ecx=%08x esp=%08x\n", + thunk, context->Eip, context->Eax, context->Ecx, context->Esp ); + return TRUE; + } + } return FALSE; }

1 0

Sebastian Lackner : ntdll: Add support for ATL thunk 'MOV this,ecx; MOV func,eax; JMP eax'.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: dcd2b0a36695d7b5f17b753f49f1032884677234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcd2b0a36695d7b5f17b753f4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 21 06:02:02 2014 +0200 ntdll: Add support for ATL thunk 'MOV this,ecx; MOV func,eax; JMP eax'. --- dlls/kernel32/tests/virtual.c | 19 +++++++++++++++++++ dlls/ntdll/signal_i386.c | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index a89f1e3..ae0ede5 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1913,6 +1913,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) static const char code_atl1[] = {0xC7, 0x44, 0x24, 0x04, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; static const char code_atl2[] = {0xB9, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; static const char code_atl3[] = {0xBA, 0x44, 0x33, 0x22, 0x11, 0xB9, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xE1}; + static const char code_atl4[] = {0xB9, 0x44, 0x33, 0x22, 0x11, 0xB8, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xE0}; static const char cls_name[] = "atl_thunk_class"; DWORD ret, size, old_prot; ULONG old_flags = MEM_EXECUTE_OPTION_ENABLE; @@ -2114,6 +2115,24 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) else ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + memcpy( base, code_atl4, sizeof(code_atl4) ); + *(DWORD *)(base + 6) = (DWORD_PTR)atl_test_func; + + success = VirtualProtect( base, size, PAGE_READWRITE, &old_prot ); + ok( success, "VirtualProtect failed %u\n", GetLastError() ); + + ret = send_message_excpt( hWnd, WM_USER + 1, 0, 0 ); + /* FIXME: We don't check the content of the registers EAX/ECX yet */ + ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); + ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); + if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) + ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) + ok( num_execute_fault_calls == 0 || broken(num_execute_fault_calls == 1) /* Windows XP */, + "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + /* Restore the JMP instruction, set to executable, and then destroy the Window */ memcpy( base, code_jmp, sizeof(code_jmp) ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index e8c6a77..b315e55 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1640,6 +1640,14 @@ union atl_thunk DWORD func; WORD jmp; /* jmp ecx */ } t3; + struct + { + BYTE movl1; /* movl this,ecx */ + DWORD this; + BYTE movl2; /* movl func,eax */ + DWORD func; + WORD jmp; /* jmp eax */ + } t4; }; #include "poppack.h" @@ -1689,6 +1697,17 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) thunk, context->Eip, context->Ecx, context->Edx ); return TRUE; } + else if (thunk_len >= sizeof(thunk_copy.t4) && thunk_copy.t4.movl1 == 0xb9 && + thunk_copy.t4.movl2 == 0xb8 && + thunk_copy.t4.jmp == 0xe0ff) + { + context->Ecx = thunk_copy.t4.this; + context->Eax = thunk_copy.t4.func; + context->Eip = thunk_copy.t4.func; + TRACE( "emulating ATL thunk type 4 at %p, func=%08x eax=%08x ecx=%08x\n", + thunk, context->Eip, context->Eax, context->Ecx ); + return TRUE; + } return FALSE; }

1 0

Sebastian Lackner : ntdll: Add support for ATL thunk 'MOV this,edx; MOV func,ecx; JMP ecx'.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 40472cd3a7e440386a125760a42ea175bed8176e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40472cd3a7e440386a125760a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 21 06:00:20 2014 +0200 ntdll: Add support for ATL thunk 'MOV this,edx; MOV func,ecx; JMP ecx'. --- dlls/kernel32/tests/virtual.c | 16 ++++++++++++++++ dlls/ntdll/signal_i386.c | 19 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 5f83ead..a89f1e3 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1912,6 +1912,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) static const char code_jmp[] = {0xE9, 0x00, 0x00, 0x00, 0x00}; static const char code_atl1[] = {0xC7, 0x44, 0x24, 0x04, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; static const char code_atl2[] = {0xB9, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; + static const char code_atl3[] = {0xBA, 0x44, 0x33, 0x22, 0x11, 0xB9, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xE1}; static const char cls_name[] = "atl_thunk_class"; DWORD ret, size, old_prot; ULONG old_flags = MEM_EXECUTE_OPTION_ENABLE; @@ -2098,6 +2099,21 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) else ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + memcpy( base, code_atl3, sizeof(code_atl3) ); + *(DWORD *)(base + 6) = (DWORD_PTR)atl_test_func; + + success = VirtualProtect( base, size, PAGE_READWRITE, &old_prot ); + ok( success, "VirtualProtect failed %u\n", GetLastError() ); + + ret = send_message_excpt( hWnd, WM_USER + 1, 0, 0 ); + /* FIXME: we don't check the content of the registers ECX/EDX yet */ + ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); + ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); + if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) + ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + /* Restore the JMP instruction, set to executable, and then destroy the Window */ memcpy( base, code_jmp, sizeof(code_jmp) ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index dde4e2d..e8c6a77 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1632,6 +1632,14 @@ union atl_thunk BYTE jmp; /* jmp func */ int func; } t2; + struct + { + BYTE movl1; /* movl this,edx */ + DWORD this; + BYTE movl2; /* movl func,ecx */ + DWORD func; + WORD jmp; /* jmp ecx */ + } t3; }; #include "poppack.h" @@ -1670,6 +1678,17 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) thunk, context->Eip, context->Ecx ); return TRUE; } + else if (thunk_len >= sizeof(thunk_copy.t3) && thunk_copy.t3.movl1 == 0xba && + thunk_copy.t3.movl2 == 0xb9 && + thunk_copy.t3.jmp == 0xe1ff) + { + context->Edx = thunk_copy.t3.this; + context->Ecx = thunk_copy.t3.func; + context->Eip = thunk_copy.t3.func; + TRACE( "emulating ATL thunk type 3 at %p, func=%08x ecx=%08x edx=%08x\n", + thunk, context->Eip, context->Ecx, context->Edx ); + return TRUE; + } return FALSE; }

1 0

Sebastian Lackner : ntdll: Add support for ATL thunk 'MOV this,ecx; JMP func'.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: aab0d25a49ab2c8d67d05e0c16ab6c02d041fd6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab0d25a49ab2c8d67d05e0c1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 21 05:55:27 2014 +0200 ntdll: Add support for ATL thunk 'MOV this,ecx; JMP func'. --- dlls/kernel32/tests/virtual.c | 31 +++++++++++++++++++++---- dlls/ntdll/signal_i386.c | 54 +++++++++++++++++++++++++++++-------------- 2 files changed, 63 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 73b753e..5f83ead 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1882,7 +1882,7 @@ static inline DWORD send_message_excpt( HWND hWnd, UINT uMsg, WPARAM wParam, LPA pNtCurrentTeb()->Tib.ExceptionList = &frame; num_guard_page_calls = num_execute_fault_calls = 0; - ret = SendMessageA( hWnd, WM_USER, 0, 0 ); + ret = SendMessageA( hWnd, uMsg, wParam, lParam ); pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; @@ -1900,14 +1900,18 @@ static LRESULT CALLBACK jmp_test_func( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR static LRESULT CALLBACK atl_test_func( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { DWORD arg = (DWORD)hWnd; - ok( arg == 0x11223344, "arg is 0x%08x instead of 0x11223344\n", arg ); + if (uMsg == WM_USER) + ok( arg == 0x11223344, "arg is 0x%08x instead of 0x11223344\n", arg ); + else + ok( arg != 0x11223344, "arg is unexpectedly 0x11223344\n" ); return 43; } static void test_atl_thunk_emulation( ULONG dep_flags ) { static const char code_jmp[] = {0xE9, 0x00, 0x00, 0x00, 0x00}; - static const char code_atl[] = {0xC7, 0x44, 0x24, 0x04, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; + static const char code_atl1[] = {0xC7, 0x44, 0x24, 0x04, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; + static const char code_atl2[] = {0xB9, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; static const char cls_name[] = "atl_thunk_class"; DWORD ret, size, old_prot; ULONG old_flags = MEM_EXECUTE_OPTION_ENABLE; @@ -2008,7 +2012,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) /* Now test with a proper ATL thunk instruction. */ - memcpy( base, code_atl, sizeof(code_atl) ); + memcpy( base, code_atl1, sizeof(code_atl1) ); *(DWORD *)(base + 9) = (DWORD_PTR)atl_test_func - (DWORD_PTR)(base + 13); success = VirtualProtect( base, size, PAGE_EXECUTE_READWRITE, &old_prot ); @@ -2077,6 +2081,23 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) win_skip( "RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler not found\n" ); } + /* Test alternative ATL thunk instructions. */ + + memcpy( base, code_atl2, sizeof(code_atl2) ); + *(DWORD *)(base + 6) = (DWORD_PTR)atl_test_func - (DWORD_PTR)(base + 10); + + success = VirtualProtect( base, size, PAGE_READWRITE, &old_prot ); + ok( success, "VirtualProtect failed %u\n", GetLastError() ); + + ret = send_message_excpt( hWnd, WM_USER + 1, 0, 0 ); + /* FIXME: we don't check the content of the register ECX yet */ + ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); + ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); + if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) + ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + /* Restore the JMP instruction, set to executable, and then destroy the Window */ memcpy( base, code_jmp, sizeof(code_jmp) ); @@ -2194,7 +2215,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) /* Now test with a proper ATL thunk instruction. */ - memcpy( base, code_atl, sizeof(code_atl) ); + memcpy( base, code_atl1, sizeof(code_atl1) ); *(DWORD *)(base + 9) = (DWORD_PTR)atl_test_func - (DWORD_PTR)(base + 13); count = 64; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f97799c..dde4e2d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1616,12 +1616,22 @@ static inline BOOL check_invalid_gs( CONTEXT *context ) #include "pshpack1.h" -struct atl_thunk +union atl_thunk { - DWORD movl; /* movl this,4(%esp) */ - DWORD this; - BYTE jmp; /* jmp func */ - int func; + struct + { + DWORD movl; /* movl this,4(%esp) */ + DWORD this; + BYTE jmp; /* jmp func */ + int func; + } t1; + struct + { + BYTE movl; /* movl this,ecx */ + DWORD this; + BYTE jmp; /* jmp func */ + int func; + } t2; }; #include "poppack.h" @@ -1632,26 +1642,36 @@ struct atl_thunk */ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) { - const struct atl_thunk *thunk = (const struct atl_thunk *)rec->ExceptionInformation[1]; - struct atl_thunk thunk_copy; - BOOL ret = FALSE; + const union atl_thunk *thunk = (const union atl_thunk *)rec->ExceptionInformation[1]; + union atl_thunk thunk_copy; + SIZE_T thunk_len; - if (virtual_uninterrupted_read_memory( thunk, &thunk_copy, sizeof(*thunk) ) != sizeof(*thunk)) - return FALSE; + thunk_len = virtual_uninterrupted_read_memory( thunk, &thunk_copy, sizeof(*thunk) ); + if (!thunk_len) return FALSE; - if (thunk_copy.movl == 0x042444c7 && thunk_copy.jmp == 0xe9) + if (thunk_len >= sizeof(thunk_copy.t1) && thunk_copy.t1.movl == 0x042444c7 && + thunk_copy.t1.jmp == 0xe9) { if (virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, - &thunk_copy.this, sizeof(DWORD) ) == sizeof(DWORD)) + &thunk_copy.t1.this, sizeof(DWORD) ) == sizeof(DWORD)) { - context->Eip = (DWORD_PTR)(&thunk->func + 1) + thunk_copy.func; - TRACE( "emulating ATL thunk at %p, func=%08x arg=%08x\n", - thunk, context->Eip, thunk_copy.this ); - ret = TRUE; + context->Eip = (DWORD_PTR)(&thunk->t1.func + 1) + thunk_copy.t1.func; + TRACE( "emulating ATL thunk type 1 at %p, func=%08x arg=%08x\n", + thunk, context->Eip, thunk_copy.t1.this ); + return TRUE; } } + else if (thunk_len >= sizeof(thunk_copy.t2) && thunk_copy.t2.movl == 0xb9 && + thunk_copy.t2.jmp == 0xe9) + { + context->Ecx = thunk_copy.t2.this; + context->Eip = (DWORD_PTR)(&thunk->t2.func + 1) + thunk_copy.t2.func; + TRACE( "emulating ATL thunk type 2 at %p, func=%08x ecx=%08x\n", + thunk, context->Eip, context->Ecx ); + return TRUE; + } - return ret; + return FALSE; }

1 0

Hans Leidekker : msi: Support more transform validation flags.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 1e3f15d88c1e878f5c459e642ff2079b05aa5c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3f15d88c1e878f5c459e642… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 21 11:29:08 2014 +0200 msi: Support more transform validation flags. --- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 2 +- dlls/msi/patch.c | 215 ++++++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 191 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e3f15d88c1e878f5c459…

1 0

Nikolay Sivov : dwrite: Store registered file loaders in a list.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 177f601889dac6e887564011035f93e7499da828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177f601889dac6e8875640110… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 12:53:21 2014 +0400 dwrite: Store registered file loaders in a list. --- dlls/dwrite/main.c | 115 ++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 59 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index cdd27c2..bac0c78 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -398,6 +398,12 @@ struct collectionloader IDWriteFontCollectionLoader *loader; }; +struct fileloader +{ + struct list entry; + IDWriteFontFileLoader *loader; +}; + struct dwritefactory { IDWriteFactory IDWriteFactory_iface; LONG ref; @@ -407,8 +413,7 @@ struct dwritefactory { IDWriteGdiInterop *gdiinterop; struct list collection_loaders; - IDWriteFontFileLoader **file_loaders; - LONG file_loader_count; + struct list file_loaders; }; static inline struct dwritefactory *impl_from_IDWriteFactory(IDWriteFactory *iface) @@ -418,8 +423,8 @@ static inline struct dwritefactory *impl_from_IDWriteFactory(IDWriteFactory *ifa static void release_dwritefactory(struct dwritefactory *factory) { + struct fileloader *fileloader, *fileloader2; struct collectionloader *loader, *loader2; - int i; if (factory->localfontfileloader) IDWriteLocalFontFileLoader_Release(factory->localfontfileloader); @@ -430,10 +435,12 @@ static void release_dwritefactory(struct dwritefactory *factory) heap_free(loader); } - for (i = 0; i < factory->file_loader_count; i++) - if (factory->file_loaders[i]) - IDWriteFontFileLoader_Release(factory->file_loaders[i]); - heap_free(factory->file_loaders); + LIST_FOR_EACH_ENTRY_SAFE(fileloader, fileloader2, &factory->file_loaders, struct fileloader, entry) { + list_remove(&fileloader->entry); + IDWriteFontFileLoader_Release(fileloader->loader); + heap_free(fileloader); + } + if (factory->system_collection) IDWriteFontCollection_Release(factory->system_collection); if (factory->gdiinterop) @@ -449,6 +456,20 @@ static void release_shared_factory(IDWriteFactory *iface) release_dwritefactory(factory); } +static struct fileloader *factory_get_file_loader(struct dwritefactory *factory, IDWriteFontFileLoader *loader) +{ + struct fileloader *entry, *found = NULL; + + LIST_FOR_EACH_ENTRY(entry, &factory->file_loaders, struct fileloader, entry) { + if (entry->loader == loader) { + found = entry; + break; + } + } + + return found; +} + static HRESULT WINAPI dwritefactory_QueryInterface(IDWriteFactory *iface, REFIID riid, void **obj) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); @@ -592,21 +613,14 @@ static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory *ifac static HRESULT WINAPI dwritefactory_CreateCustomFontFileReference(IDWriteFactory *iface, void const *reference_key, UINT32 key_size, IDWriteFontFileLoader *loader, IDWriteFontFile **font_file) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); - HRESULT hr; TRACE("(%p)->(%p %u %p %p)\n", This, reference_key, key_size, loader, font_file); - if (loader == NULL) + if (!loader || !factory_get_file_loader(This, loader)) return E_INVALIDARG; - for (i = 0; i < This->file_loader_count; i++) - if (This->file_loaders[i] == loader) break; - if (i == This->file_loader_count) - return E_INVALIDARG; - hr = create_font_file(loader, reference_key, key_size, font_file); - return hr; + return create_font_file(loader, reference_key, key_size, font_file); } static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, @@ -655,53 +669,47 @@ static HRESULT WINAPI dwritefactory_CreateCustomRenderingParams(IDWriteFactory * static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); + struct fileloader *entry; + TRACE("(%p)->(%p)\n", This, loader); if (!loader) return E_INVALIDARG; - for (i = 0; i < This->file_loader_count; i++) - if (This->file_loaders[i] == loader) + LIST_FOR_EACH_ENTRY(entry, &This->file_loaders, struct fileloader, entry) { + if (entry->loader == loader) return DWRITE_E_ALREADYREGISTERED; - else if (This->file_loaders[i] == NULL) - break; - - if (i == This->file_loader_count) - { - IDWriteFontFileLoader **new_list = NULL; - int new_count = 0; - - new_count = This->file_loader_count * 2; - new_list = heap_realloc_zero(This->file_loaders, new_count * sizeof(*This->file_loaders)); - - if (!new_list) - return E_OUTOFMEMORY; - else - { - This->file_loader_count = new_count; - This->file_loaders = new_list; - } } + + entry = heap_alloc(sizeof(*entry)); + if (!entry) + return E_OUTOFMEMORY; + + entry->loader = loader; IDWriteFontFileLoader_AddRef(loader); - This->file_loaders[i] = loader; + list_add_tail(&This->file_loaders, &entry->entry); return S_OK; } static HRESULT WINAPI dwritefactory_UnregisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); + struct fileloader *found; + TRACE("(%p)->(%p)\n", This, loader); - for (i = 0; i < This->file_loader_count; i++) - if (This->file_loaders[i] == loader) break; - if (i == This->file_loader_count) - return E_INVALIDARG; - IDWriteFontFileLoader_Release(This->file_loaders[i]); - This->file_loaders[i] = NULL; + if (!loader) + return E_INVALIDARG; + + found = factory_get_file_loader(This, loader); + if (!found) + return E_INVALIDARG; + + IDWriteFontFileLoader_Release(found->loader); + list_remove(&found->entry); + heap_free(found); return S_OK; } @@ -875,28 +883,21 @@ static const struct IDWriteFactoryVtbl shareddwritefactoryvtbl = { dwritefactory_CreateGlyphRunAnalysis }; -static HRESULT init_dwritefactory(struct dwritefactory *factory, const struct IDWriteFactoryVtbl *vtbl) +static void init_dwritefactory(struct dwritefactory *factory, const struct IDWriteFactoryVtbl *vtbl) { factory->IDWriteFactory_iface.lpVtbl = vtbl; factory->ref = 1; factory->localfontfileloader = NULL; - factory->file_loader_count = 2; - factory->file_loaders = heap_alloc_zero(sizeof(*factory->file_loaders) * 2); factory->system_collection = NULL; factory->gdiinterop = NULL; list_init(&factory->collection_loaders); - - if (!factory->file_loaders) - return E_OUTOFMEMORY; - - return S_OK; + list_init(&factory->file_loaders); } HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnknown **ret) { struct dwritefactory *factory; - HRESULT hr; TRACE("(%d, %s, %p)\n", type, debugstr_guid(riid), ret); @@ -913,11 +914,7 @@ HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnkno factory = heap_alloc(sizeof(struct dwritefactory)); if (!factory) return E_OUTOFMEMORY; - hr = init_dwritefactory(factory, type == DWRITE_FACTORY_TYPE_SHARED ? &shareddwritefactoryvtbl : &dwritefactoryvtbl); - if (FAILED(hr)) { - heap_free(factory); - return hr; - } + init_dwritefactory(factory, type == DWRITE_FACTORY_TYPE_SHARED ? &shareddwritefactoryvtbl : &dwritefactoryvtbl); if (type == DWRITE_FACTORY_TYPE_SHARED) if (InterlockedCompareExchangePointer((void**)&shared_factory, factory, NULL)) {

1 0

Catalin Patulea : kernel32/tests: Add test for FormatMessage with HRESULT.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: af5982356751a0ad8259d7f63cbbb89044fd233b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5982356751a0ad8259d7f63… Author: Catalin Patulea <catalinp(a)google.com> Date: Mon Oct 20 17:55:45 2014 -0400 kernel32/tests: Add test for FormatMessage with HRESULT. --- dlls/kernel32/tests/format_msg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index e98e083..3e8d96d 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1552,6 +1552,12 @@ static void test_message_from_hmodule(void) MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); ok(ret != 0, "FormatMessageA returned 0\n"); + /* Test HRESULT. It's not documented but in practice _com_error::ErrorMessage relies on this. */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 0x80070005 /* E_ACCESSDENIED */, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + todo_wine + ok(ret != 0, "FormatMessageA returned 0\n"); + /* Test a message string with an insertion without passing any variadic arguments. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 193 /* ERROR_BAD_EXE_FORMAT */, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL);

1 0

Sebastian Lackner : kernel32: Implement GetProcessDEPPolicy.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: d74c9e3ec20dc886ab83f924cd3f5444a52a4c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74c9e3ec20dc886ab83f924c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 21 07:46:10 2014 +0200 kernel32: Implement GetProcessDEPPolicy. --- dlls/kernel32/process.c | 28 +++++++++++++++++++++++++--- dlls/kernel32/tests/virtual.c | 3 --- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 301c64a..138273b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3942,9 +3942,31 @@ BOOL WINAPI GetNumaAvailableMemoryNode(UCHAR node, PULONGLONG available_bytes) */ BOOL WINAPI GetProcessDEPPolicy(HANDLE process, LPDWORD flags, PBOOL permanent) { - FIXME("(%p %p %p): stub\n", process, flags, permanent); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS status; + ULONG dep_flags; + + TRACE("(%p %p %p)\n", process, flags, permanent); + + status = NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, + &dep_flags, sizeof(dep_flags), NULL ); + if (!status) + { + + if (flags) + { + *flags = 0; + if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) + *flags |= PROCESS_DEP_ENABLE; + if (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) + *flags |= PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION; + } + + if (permanent) + *permanent = (dep_flags & MEM_EXECUTE_OPTION_PERMANENT) != 0; + + } + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } /********************************************************************** diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 40f45ef..98ef703 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1995,7 +1995,6 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ok( success, "VirtualProtect failed %u\n", GetLastError() ); success = get_dep_policy( GetCurrentProcess(), &policy_flags, &policy_permanent ); - todo_wine ok( success, "GetProcessDEPPolicy failed %u\n", GetLastError() ); ret = 0; @@ -2004,9 +2003,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) if (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) ret |= PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION; - todo_wine ok( policy_flags == ret, "expected policy flags %d, got %d\n", ret, policy_flags ); - todo_wine ok( !policy_permanent || broken(policy_permanent == 0x44), "expected policy permanent FALSE, got %d\n", policy_permanent ); }

1 0

Hans Leidekker : secur32/tests: Switch requested protocol from SSL3 to TLS1.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 5a6558b854bc320066d8dfbfa4a7a1d21dc88837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6558b854bc320066d8dfbfa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 21 11:28:44 2014 +0200 secur32/tests: Switch requested protocol from SSL3 to TLS1. --- dlls/secur32/tests/schannel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index e868b13..97fa0bc 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -533,7 +533,7 @@ static void init_cred(SCHANNEL_CRED *cred) cred->aphMappers = NULL; cred->cSupportedAlgs = 0; cred->palgSupportedAlgs = NULL; - cred->grbitEnabledProtocols = SP_PROT_SSL3_CLIENT; + cred->grbitEnabledProtocols = SP_PROT_TLS1_CLIENT; cred->dwMinimumCipherStrength = 0; cred->dwMaximumCipherStrength = 0; cred->dwSessionLifespan = 0; @@ -685,7 +685,7 @@ static void test_communication(void) ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", status); if (status != SEC_E_OK) return; - test_supported_protocols(&cred_handle, SP_PROT_SSL3_CLIENT); + test_supported_protocols(&cred_handle, SP_PROT_TLS1_CLIENT); /* Initialize the connection */ init_buffers(&buffers[0], 4, buf_size);

1 0

Stefan Dösinger : d3d8/tests: Update create_device to match d3d9.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: f33aacd4d0397e4a6cfdaef8237a9031334face0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33aacd4d0397e4a6cfdaef82… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 20 13:08:53 2014 +0200 d3d8/tests: Update create_device to match d3d9. --- dlls/d3d8/tests/device.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 02ec210..2278c06 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -31,12 +31,14 @@ struct vec3 float x, y, z; }; +#define CREATE_DEVICE_FULLSCREEN 0x01 + struct device_desc { HWND device_window; unsigned int width; unsigned int height; - BOOL windowed; + DWORD flags; }; #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) @@ -105,7 +107,7 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons present_parameters.BackBufferWidth = desc->width; present_parameters.BackBufferHeight = desc->height; present_parameters.hDeviceWindow = desc->device_window; - present_parameters.Windowed = desc->windowed; + present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); } if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, @@ -2265,7 +2267,7 @@ static void test_wndproc(void) device_desc.device_window = device_window; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -2408,7 +2410,7 @@ static void test_wndproc_windowed(void) device_desc.device_window = device_window; device_desc.width = 640; device_desc.height = 480; - device_desc.windowed = TRUE; + device_desc.flags = 0; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -2783,7 +2785,7 @@ static void test_window_style(void) device_desc.device_window = device_window; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -2988,7 +2990,7 @@ static void test_mode_change(void) device_desc.device_window = device_window; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -3086,7 +3088,7 @@ static void test_device_window_reset(void) device_desc.device_window = NULL; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -6353,7 +6355,7 @@ static void test_lost_device(void) device_desc.device_window = window; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d, window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n");

1 0

Nikolay Sivov : dwrite: Store registered collection loaders in a list.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 00e352992e75ad8e9962d273e7a72ee414f667aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e352992e75ad8e9962d273e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 12:50:27 2014 +0400 dwrite: Store registered collection loaders in a list. --- dlls/dwrite/main.c | 82 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 6ac3852..cdd27c2 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -30,6 +30,7 @@ #include "dwrite_private.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); @@ -391,6 +392,12 @@ HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedSt return S_OK; } +struct collectionloader +{ + struct list entry; + IDWriteFontCollectionLoader *loader; +}; + struct dwritefactory { IDWriteFactory IDWriteFactory_iface; LONG ref; @@ -399,8 +406,7 @@ struct dwritefactory { IDWriteFontCollection *system_collection; IDWriteGdiInterop *gdiinterop; - IDWriteFontCollectionLoader **loaders; - LONG loader_count; + struct list collection_loaders; IDWriteFontFileLoader **file_loaders; LONG file_loader_count; }; @@ -412,14 +418,18 @@ static inline struct dwritefactory *impl_from_IDWriteFactory(IDWriteFactory *ifa static void release_dwritefactory(struct dwritefactory *factory) { + struct collectionloader *loader, *loader2; int i; if (factory->localfontfileloader) IDWriteLocalFontFileLoader_Release(factory->localfontfileloader); - for (i = 0; i < factory->loader_count; i++) - if (factory->loaders[i]) - IDWriteFontCollectionLoader_Release(factory->loaders[i]); - heap_free(factory->loaders); + + LIST_FOR_EACH_ENTRY_SAFE(loader, loader2, &factory->collection_loaders, struct collectionloader, entry) { + list_remove(&loader->entry); + IDWriteFontCollectionLoader_Release(loader->loader); + heap_free(loader); + } + for (i = 0; i < factory->file_loader_count; i++) if (factory->file_loaders[i]) IDWriteFontFileLoader_Release(factory->file_loaders[i]); @@ -512,37 +522,25 @@ static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory IDWriteFontCollectionLoader *loader) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - int i; + struct collectionloader *entry; TRACE("(%p)->(%p)\n", This, loader); if (!loader) return E_INVALIDARG; - for (i = 0; i < This->loader_count; i++) - if (This->loaders[i] == loader) + LIST_FOR_EACH_ENTRY(entry, &This->collection_loaders, struct collectionloader, entry) { + if (entry->loader == loader) return DWRITE_E_ALREADYREGISTERED; - else if (This->loaders[i] == NULL) - break; - - if (i == This->loader_count) - { - IDWriteFontCollectionLoader **new_list = NULL; - int new_count = 0; + } - new_count = This->loader_count * 2; - new_list = heap_realloc_zero(This->loaders, new_count * sizeof(*This->loaders)); + entry = heap_alloc(sizeof(*entry)); + if (!entry) + return E_OUTOFMEMORY; - if (!new_list) - return E_OUTOFMEMORY; - else - { - This->loader_count = new_count; - This->loaders = new_list; - } - } + entry->loader = loader; IDWriteFontCollectionLoader_AddRef(loader); - This->loaders[i] = loader; + list_add_tail(&This->collection_loaders, &entry->entry); return S_OK; } @@ -551,19 +549,26 @@ static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactor IDWriteFontCollectionLoader *loader) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - int i; + struct collectionloader *entry, *found = NULL; TRACE("(%p)->(%p)\n", This, loader); if (!loader) return E_INVALIDARG; - for (i = 0; i < This->loader_count; i++) - if (This->loaders[i] == loader) break; - if (i == This->loader_count) - return E_INVALIDARG; - IDWriteFontCollectionLoader_Release(This->loaders[i]); - This->loaders[i] = NULL; + LIST_FOR_EACH_ENTRY(entry, &This->collection_loaders, struct collectionloader, entry) { + if (entry->loader == loader) { + found = entry; + break; + } + } + + if (!found) + return E_INVALIDARG; + + IDWriteFontCollectionLoader_Release(found->loader); + list_remove(&found->entry); + heap_free(found); return S_OK; } @@ -875,18 +880,15 @@ static HRESULT init_dwritefactory(struct dwritefactory *factory, const struct ID factory->IDWriteFactory_iface.lpVtbl = vtbl; factory->ref = 1; factory->localfontfileloader = NULL; - factory->loader_count = 2; - factory->loaders = heap_alloc_zero(sizeof(*factory->loaders) * 2); factory->file_loader_count = 2; factory->file_loaders = heap_alloc_zero(sizeof(*factory->file_loaders) * 2); factory->system_collection = NULL; factory->gdiinterop = NULL; - if (!factory->loaders || !factory->file_loaders) { - heap_free(factory->loaders); - heap_free(factory->file_loaders); + list_init(&factory->collection_loaders); + + if (!factory->file_loaders) return E_OUTOFMEMORY; - } return S_OK; }

1 0

Stefan Dösinger : d3d9/tests: Add style and size tests for D3DCREATE_NOWINDOWCHANGES.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: ee0733863ee6f754e7a68fa850ac9a46b7601747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee0733863ee6f754e7a68fa85… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 20 13:08:50 2014 +0200 d3d9/tests: Add style and size tests for D3DCREATE_NOWINDOWCHANGES. --- dlls/d3d9/tests/d3d9ex.c | 108 ++++++++++++++++---------- dlls/d3d9/tests/device.c | 198 ++++++++++++++++++++++++++++------------------- 2 files changed, 185 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee0733863ee6f754e7a68…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.29
by Jeremy Newman Oct. 20, 2014

Oct. 20, 2014

Module: website Branch: master Commit: 85c70956f0f4197c16083f5e09a7e364f0a86706 URL: http://source.winehq.org/git/website.git/?a=commit;h=85c70956f0f4197c16083f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 18 07:33:21 2014 +0200 Polish translation for release 1.7.29 --- news/pl/2014101701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2014101701.xml b/news/pl/2014101701.xml new file mode 100644 index 0000000..2f761f8 --- /dev/null +++ b/news/pl/2014101701.xml @@ -0,0 +1,15 @@ +<news> +<date>Październik 17, 2014</date> +<title>Wydano Wine 1.7.29</title> +<body> +<p> Wydanie rozwojowe Wine 1.7.29 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.7.29">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla kształtowania i odzwierciedlania BiDi w DirectWrite.</li> + <li>Kilka poprawek do obsługi błędów stronnicowania.</li> + <li>Kilka nowych funkcji biblioteki uruchomieniowej C.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +<p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.29.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>. +</p></body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.29
by Jeremy Newman Oct. 20, 2014

Oct. 20, 2014

Module: website Branch: master Commit: c934da6e6a3e5c191eaa73317498a4a2373acbc6 URL: http://source.winehq.org/git/website.git/?a=commit;h=c934da6e6a3e5c191eaa73… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Oct 19 08:36:41 2014 +0200 French translation for release 1.7.29 --- news/fr/2014101701.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014101701.xml b/news/fr/2014101701.xml new file mode 100644 index 0000000..fcbf019 --- /dev/null +++ b/news/fr/2014101701.xml @@ -0,0 +1,14 @@ +<news> +<date>17 octobre 2014</date> +<title>Sortie de Wine 1.7.29</title> +<body> +<p> La version de développement 1.7.29 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.7.29">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du façonnage de texte et de la réflexion BiDi dans DirectWrite.</li> + <li>Quelques correctifs dans la gestion des défauts de pages.</li> + <li>Plusieurs fonctions additionnelles dans le moteur d'exécution C.</li> + <li>Diverses corrections de bugs.</li> +</ul></p> +<p><p>Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.29.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Amine Khaldi : strmbase: Remove unused TransformFilter_Vtbl (Clang).
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: 9a26f0f0d992135d0d7ae77ee1bff8e3d227fa3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a26f0f0d992135d0d7ae77ee… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sat Oct 18 19:53:56 2014 +0100 strmbase: Remove unused TransformFilter_Vtbl (Clang). --- dlls/strmbase/transform.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 0fc7515..4d872be 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0}; -static const IBaseFilterVtbl TransformFilter_Vtbl; static const IPinVtbl TransformFilter_InputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl; static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl; @@ -439,25 +438,6 @@ HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin return E_NOTIMPL; } -static const IBaseFilterVtbl TransformFilter_Vtbl = -{ - TransformFilterImpl_QueryInterface, - BaseFilterImpl_AddRef, - TransformFilterImpl_Release, - BaseFilterImpl_GetClassID, - TransformFilterImpl_Stop, - TransformFilterImpl_Pause, - TransformFilterImpl_Run, - BaseFilterImpl_GetState, - BaseFilterImpl_SetSyncSource, - BaseFilterImpl_GetSyncSource, - BaseFilterImpl_EnumPins, - TransformFilterImpl_FindPin, - BaseFilterImpl_QueryFilterInfo, - BaseFilterImpl_JoinFilterGraph, - BaseFilterImpl_QueryVendorInfo -}; - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface);

1 0

Jacek Caban : mshtml: Return S_OK in IHTMLDocument3::recalc.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: 114f32c8b6000b6770d5f5aeb87bd9313fa9b630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114f32c8b6000b6770d5f5aeb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 17 16:58:39 2014 +0200 mshtml: Return S_OK in IHTMLDocument3::recalc. --- dlls/mshtml/htmldoc.c | 7 +++++-- dlls/mshtml/tests/dom.c | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c91298f..0324a6f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1820,8 +1820,11 @@ static HRESULT WINAPI HTMLDocument3_releaseCapture(IHTMLDocument3 *iface) static HRESULT WINAPI HTMLDocument3_recalc(IHTMLDocument3 *iface, VARIANT_BOOL fForce) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%x)\n", This, fForce); - return E_NOTIMPL; + + WARN("(%p)->(%x)\n", This, fForce); + + /* Doing nothing here should be fine for us. */ + return S_OK; } static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR text, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5dc9a8f..c1ca092 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7613,6 +7613,9 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); IHTMLElement_Release(elem); + hres = IHTMLDocument3_recalc(doc3, VARIANT_TRUE); + ok(hres == S_OK, "recalc failed: %08x\n", hres); + IHTMLDocument3_Release(doc3); elem = get_elem_by_id(doc, "s", TRUE);

1 0

Nikolay Sivov : dwrite: Implement CreateFontFromLOGFONT() on top of system font collection.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: a088f7d381b822eab7150f5c3f13285fa8dcd5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a088f7d381b822eab7150f5c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 00:25:26 2014 +0400 dwrite: Implement CreateFontFromLOGFONT() on top of system font collection. --- dlls/dwrite/dwrite_private.h | 1 - dlls/dwrite/font.c | 246 +++++++++++++++++++++---------------------- dlls/dwrite/gdiinterop.c | 38 ++++++- dlls/dwrite/tests/font.c | 20 ++-- 4 files changed, 167 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a088f7d381b822eab7150…

1 0

Nikolay Sivov : dwrite: Store factory pointer gdiinterop was created from.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: ea11f85a94a2aff57d6701e7990f77127ca062a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea11f85a94a2aff57d6701e79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 19 23:57:53 2014 +0400 dwrite: Store factory pointer gdiinterop was created from. --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/gdiinterop.c | 31 +++++----- dlls/dwrite/main.c | 19 +++++- dlls/dwrite/tests/font.c | 143 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 176 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea11f85a94a2aff57d670…

1 0

Piotr Caban : msvcp100: Fix basic_string class definition.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: 40ef9b2d78a7b02b258e8fe450bf5f175c01fa36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ef9b2d78a7b02b258e8fe45… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 17 12:07:29 2014 +0200 msvcp100: Fix basic_string class definition. --- dlls/msvcp90/memory.c | 4 ++-- dlls/msvcp90/msvcp90.h | 14 ++++++++++++-- dlls/msvcp90/string.c | 24 ++++++++++++++++-------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index c5cae50..5d43910 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -111,7 +111,7 @@ void __thiscall MSVCP_allocator_char_destroy(void *this, char *ptr) /* ?max_size@?$allocator(a)D@std@@QBEIXZ */ /* ?max_size@?$allocator(a)D@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4) -MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(void *this) +MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(const void *this) { return UINT_MAX/sizeof(char); } @@ -208,7 +208,7 @@ void __thiscall MSVCP_allocator_wchar_destroy(void *this, char *ptr) /* ?max_size@?$allocator(a)_W@std@@QBEIXZ */ /* ?max_size@?$allocator(a)_W@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_max_size, 4) -MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(void *this) +MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(const void *this) { return UINT_MAX/sizeof(wchar_t); } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 3fb6790..0a60d46 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -74,13 +74,18 @@ extern MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); #define BUF_SIZE_CHAR 16 typedef struct { +#if _MSVCP_VER <= 90 void *allocator; +#endif union { char buf[BUF_SIZE_CHAR]; char *ptr; } data; MSVCP_size_t size; MSVCP_size_t res; +#if _MSVCP_VER == 100 + char allocator; +#endif } basic_string_char; basic_string_char* __thiscall MSVCP_basic_string_char_ctor(basic_string_char*); @@ -97,13 +102,18 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign(basic_string_char*, #define BUF_SIZE_WCHAR 8 typedef struct { +#if _MSVCP_VER <= 90 void *allocator; +#endif union { wchar_t buf[BUF_SIZE_WCHAR]; wchar_t *ptr; } data; MSVCP_size_t size; MSVCP_size_t res; +#if _MSVCP_VER == 100 + char allocator; +#endif } basic_string_wchar; basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor(basic_string_wchar*); @@ -117,10 +127,10 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(const basic_string_wchar char* __thiscall MSVCP_allocator_char_allocate(void*, MSVCP_size_t); void __thiscall MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); -MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(void*); +MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(const void*); wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); void __thiscall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); -MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(void*); +MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(const void*); typedef struct { diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index ce05613..810fb5a 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -29,6 +29,14 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +#if _MSVCP_VER <= 90 +#define STRING_ALLOCATOR(this) ((this)->allocator) +#elif _MSVCP_VER == 100 +#define STRING_ALLOCATOR(this) (&(this)->allocator) +#else +#define STRING_ALLOCATOR(this) NULL +#endif + /* size_t_noverify structure */ typedef struct { MSVCP_size_t val; @@ -546,7 +554,7 @@ void __thiscall basic_string_char_tidy(basic_string_char *this, if(new_size > 0) MSVCP_char_traits_char__Copy_s(this->data.buf, BUF_SIZE_CHAR, ptr, new_size); - MSVCP_allocator_char_deallocate(this->allocator, ptr, this->res+1); + MSVCP_allocator_char_deallocate(STRING_ALLOCATOR(this), ptr, this->res+1); } this->res = BUF_SIZE_CHAR-1; @@ -577,9 +585,9 @@ MSVCP_bool __thiscall basic_string_char_grow( if(new_res/3 < this->res/2) new_res = this->res + this->res/2; - ptr = MSVCP_allocator_char_allocate(this->allocator, new_res+1); + ptr = MSVCP_allocator_char_allocate(STRING_ALLOCATOR(this), new_res+1); if(!ptr) - ptr = MSVCP_allocator_char_allocate(this->allocator, new_size+1); + ptr = MSVCP_allocator_char_allocate(STRING_ALLOCATOR(this), new_size+1); else new_size = new_res; if(!ptr) { @@ -988,7 +996,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_char_max_size, 4) MSVCP_size_t __thiscall basic_string_char_max_size(const basic_string_char *this) { TRACE("%p\n", this); - return MSVCP_allocator_char_max_size(this->allocator)-1; + return MSVCP_allocator_char_max_size(STRING_ALLOCATOR(this))-1; } /* ?empty@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE_NXZ */ @@ -2228,7 +2236,7 @@ void __thiscall basic_string_wchar_tidy(basic_string_wchar *this, if(new_size > 0) MSVCP_char_traits_wchar__Copy_s(this->data.buf, BUF_SIZE_WCHAR, ptr, new_size); - MSVCP_allocator_wchar_deallocate(this->allocator, ptr, this->res+1); + MSVCP_allocator_wchar_deallocate(STRING_ALLOCATOR(this), ptr, this->res+1); } this->res = BUF_SIZE_WCHAR-1; @@ -2252,9 +2260,9 @@ MSVCP_bool __thiscall basic_string_wchar_grow( if(new_res/3 < this->res/2) new_res = this->res + this->res/2; - ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_res+1); + ptr = MSVCP_allocator_wchar_allocate(STRING_ALLOCATOR(this), new_res+1); if(!ptr) - ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_size+1); + ptr = MSVCP_allocator_wchar_allocate(STRING_ALLOCATOR(this), new_size+1); else new_size = new_res; if(!ptr) { @@ -2733,7 +2741,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_wchar_max_size, 4) MSVCP_size_t __thiscall basic_string_wchar_max_size(const basic_string_wchar *this) { TRACE("%p\n", this); - return MSVCP_allocator_wchar_max_size(this->allocator)-1; + return MSVCP_allocator_wchar_max_size(STRING_ALLOCATOR(this))-1; } /* ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE_NXZ */

1 0

Piotr Caban : msvcp100: Add std::iostream_category() implementation.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: f92766951dabded6bbc9fe1a4857b854b9a6339d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92766951dabded6bbc9fe1a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 17 12:07:23 2014 +0200 msvcp100: Add std::iostream_category() implementation. --- dlls/msvcp100/msvcp100.spec | 4 +- dlls/msvcp90/misc.c | 115 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp_main.c | 1 + 4 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 6cb9b77..0055d79 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2045,8 +2045,8 @@ # extern ?intl@?$moneypunct(a)G$0A@@std@@2_NB # extern ?intl@?$moneypunct(a)_W$00(a)std@@2_NB # extern ?intl@?$moneypunct(a)_W$0A@@std@@2_NB -@ stub -arch=win32 ?iostream_category(a)std@@YAABVerror_category(a)1@XZ -@ stub -arch=win64 ?iostream_category(a)std@@YAAEBVerror_category(a)1@XZ +@ cdecl -arch=win32 ?iostream_category(a)std@@YAABVerror_category(a)1@XZ() std_iostream_category +@ cdecl -arch=win64 ?iostream_category(a)std@@YAAEBVerror_category(a)1@XZ() std_iostream_category @ thiscall -arch=win32 ?ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAE_N_N(a)Z(ptr long) basic_istream_char_ipfx @ cdecl -arch=win64 ?ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAA_N_N(a)Z(ptr long) basic_istream_char_ipfx @ thiscall -arch=win32 ?ipfx@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAE_N_N(a)Z(ptr long) basic_istream_wchar_ipfx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index abd53d7..61e43c3 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -478,3 +478,118 @@ critical_section* __cdecl _Mtx_getconcrtcs(_Mtx_t *mtx) return &(*mtx)->cs; } #endif + +#if _MSVCP_VER == 100 +typedef struct { + const vtable_ptr *vtable; +} error_category; + +typedef struct { + error_category base; + const char *type; +} custom_category; +static custom_category iostream_category; + +DEFINE_RTTI_DATA0(error_category, 0, ".?AVerror_category(a)std@@") +DEFINE_RTTI_DATA1(iostream_category, 0, &error_category_rtti_base_descriptor, ".?AV_Iostream_error_category(a)std@@") + +extern const vtable_ptr MSVCP_iostream_category_vtable; + +static void iostream_category_ctor(custom_category *this) +{ + this->base.vtable = &MSVCP_iostream_category_vtable; + this->type = "iostream"; +} + +DEFINE_THISCALL_WRAPPER(custom_category_vector_dtor, 8) +custom_category* __thiscall custom_category_vector_dtor(custom_category *this, unsigned int 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_PTR i, *ptr = (INT_PTR *)this-1; + + for(i=*ptr-1; i>=0; i--) + MSVCRT_operator_delete(ptr); + } else { + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +DEFINE_THISCALL_WRAPPER(custom_category_name, 4) +const char* __thiscall custom_category_name(const custom_category *this) +{ + return this->type; +} + +DEFINE_THISCALL_WRAPPER(custom_category_message, 12) +basic_string_char* __thiscall custom_category_message(const custom_category *this, + basic_string_char *ret, int err) +{ + if(err == 1) return MSVCP_basic_string_char_ctor_cstr(ret, "iostream error"); + return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); +} + +DEFINE_THISCALL_WRAPPER(custom_category_default_error_condition, 12) +/*error_condition*/void* __thiscall custom_category_default_error_condition( + custom_category *this, /*error_condition*/void *ret, int code) +{ + FIXME("(%p %p %x) stub\n", this, ret, code); + return NULL; +} + +DEFINE_THISCALL_WRAPPER(custom_category_equivalent, 12) +MSVCP_bool __thiscall custom_category_equivalent(const custom_category *this, + int code, const /*error_condition*/void *condition) +{ + FIXME("(%p %x %p) stub\n", this, code, condition); + return FALSE; +} + +DEFINE_THISCALL_WRAPPER(custom_category_equivalent_code, 12) +MSVCP_bool __thiscall custom_category_equivalent_code(custom_category *this, + const /*error_code*/void *code, int condition) +{ + FIXME("(%p %p %x) stub\n", this, code, condition); + return FALSE; +} + +/* ?iostream_category(a)std@@YAABVerror_category(a)1@XZ */ +/* ?iostream_category(a)std@@YAAEBVerror_category(a)1@XZ */ +const error_category* __cdecl std_iostream_category(void) +{ + TRACE("()\n"); + return &iostream_category.base; +} + +#ifndef __GNUC__ +void __asm_dummy_vtables(void) { +#endif + __ASM_VTABLE(iostream_category, + VTABLE_ADD_FUNC(custom_category_vector_dtor) + VTABLE_ADD_FUNC(custom_category_name) + VTABLE_ADD_FUNC(custom_category_message) + VTABLE_ADD_FUNC(custom_category_default_error_condition) + VTABLE_ADD_FUNC(custom_category_equivalent) + VTABLE_ADD_FUNC(custom_category_equivalent_code)); +#ifndef __GNUC__ +} +#endif +#endif + +void init_misc(void *base) +{ +#ifdef __x86_64__ +#if _MSVCP_VER == 100 + init_error_category_rtti(base); + init_iostream_category_rtti(base); +#endif +#endif + +#if _MSVCP_VER == 100 + iostream_category_ctor(&iostream_category); +#endif +} diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 5062bdc..3fb6790 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -536,6 +536,7 @@ void init_exception(void*); void init_locale(void*); void init_io(void*); void free_io(void); +void init_misc(void*); /* class complex<float> */ typedef struct { diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index edbdd50..13d3ff2 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -127,6 +127,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_exception(hinstDLL); init_locale(hinstDLL); init_io(hinstDLL); + init_misc(hinstDLL); break; case DLL_PROCESS_DETACH: if (lpvReserved) break;

1 0

Nikolay Sivov : dwrite: Implement CreateFontFaceFromHdc().
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: cd7c31fe089523ded67bbad2057b450fa54f21b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7c31fe089523ded67bbad20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 08:55:39 2014 +0400 dwrite: Implement CreateFontFaceFromHdc(). --- dlls/dwrite/gdiinterop.c | 24 ++++++++++++++++++++++-- dlls/dwrite/tests/Makefile.in | 2 +- dlls/dwrite/tests/font.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 43ab60f..0e2f902 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -334,8 +334,28 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, HDC hdc, IDWriteFontFace **fontface) { struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); - FIXME("(%p)->(%p %p): stub\n", This, hdc, fontface); - return E_NOTIMPL; + IDWriteFont *font; + LOGFONTW logfont; + HFONT hfont; + HRESULT hr; + + TRACE("(%p)->(%p %p)\n", This, hdc, fontface); + + *fontface = NULL; + + hfont = GetCurrentObject(hdc, OBJ_FONT); + if (!hfont) + return E_INVALIDARG; + GetObjectW(hfont, sizeof(logfont), &logfont); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(iface, &logfont, &font); + if (FAILED(hr)) + return hr; + + hr = IDWriteFont_CreateFontFace(font, fontface); + IDWriteFont_Release(font); + + return hr; } static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/tests/Makefile.in b/dlls/dwrite/tests/Makefile.in index f1287cd..7fbf9e3 100644 --- a/dlls/dwrite/tests/Makefile.in +++ b/dlls/dwrite/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dwrite.dll -IMPORTS = dwrite gdi32 +IMPORTS = dwrite gdi32 user32 C_SRCS = \ analyzer.c \ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 1e46b52..1bb7754 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1407,6 +1407,43 @@ static void test_GetGdiInterop(void) IDWriteGdiInterop_Release(interop); } +static void test_CreateFontFaceFromHdc(void) +{ + IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; + HFONT hfont, oldhfont; + LOGFONTW logfont; + HRESULT hr; + HDC hdc; + + interop = NULL; + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, NULL, &fontface); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, tahomaW); + + hfont = CreateFontIndirectW(&logfont); + hdc = CreateCompatibleDC(0); + oldhfont = SelectObject(hdc, hfont); + + fontface = NULL; + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, hdc, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFace_Release(fontface); + DeleteObject(SelectObject(hdc, oldhfont)); + DeleteDC(hdc); + + IDWriteGdiInterop_Release(interop); +} + START_TEST(font) { HRESULT hr; @@ -1436,6 +1473,7 @@ START_TEST(font) test_GetFirstMatchingFont(); test_GetInformationalStrings(); test_GetGdiInterop(); + test_CreateFontFaceFromHdc(); IDWriteFactory_Release(factory); }

1 0

Julian Rüger : German translation for release 1.7.29
by Jeremy Newman Oct. 17, 2014

Oct. 17, 2014

Module: website Branch: master Commit: fd43bde9ffd3be6e657927ac1d174f97e23192ee URL: http://source.winehq.org/git/website.git/?a=commit;h=fd43bde9ffd3be6e657927… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Oct 17 15:26:46 2014 +0200 German translation for release 1.7.29 --- news/de/2014101701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2014101701.xml b/news/de/2014101701.xml new file mode 100644 index 0000000..af315e9 --- /dev/null +++ b/news/de/2014101701.xml @@ -0,0 +1,15 @@ +<news> +<date>October 17, 2014</date> +<title>Wine 1.7.29 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.7.29 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.7.29">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Unterstützung von Shaping und BiDi-Mirroring in DirectWrite.</li> + <li>Korrekturen an der Behandlung von Page-faults.</li> + <li>Einige zusätzliche C-Laufzeitfunktionen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.29.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. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.7.29
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: website Branch: master Commit: 7573a1442d240adb87b829242a93b43b61184d01 URL: http://source.winehq.org/git/website.git/?a=commit;h=7573a1442d240adb87b829… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 21:04:28 2014 +0900 Wine release 1.7.29 --- news/en/2014101701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014101701.xml b/news/en/2014101701.xml new file mode 100644 index 0000000..ac3b780 --- /dev/null +++ b/news/en/2014101701.xml @@ -0,0 +1,15 @@ +<news> +<date>October 17, 2014</date> +<title>Wine 1.7.29 Released</title> +<body> +<p> The Wine development release 1.7.29 is now available.</p> +<p> <a href="{$root}/announce/1.7.29">What's new</a> in this release: +<ul> + <li>Support for shaping and BiDi mirroring in DirectWrite.</li> + <li>Some page fault handling fixes.</li> + <li>A few more C runtime functions.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.29.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>. +</p></body></news>

1 0

Tag wine-1.7.29 : Alexandre Julliard : Release 1.7.29
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: refs/tags/wine-1.7.29 Tag: 12a2a11dd8795463cc882df2a96e1e83e6e3041d URL: http://source.winehq.org/git/wine.git/?a=tag;h=12a2a11dd8795463cc882df2a96e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 21:01:42 2014 +0900 Release 1.7.29

1 0

Alexandre Julliard : Release 1.7.29.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 955582c8ce9a40d0a267e561d1af40b6c5805dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=955582c8ce9a40d0a267e561d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 21:01:42 2014 +0900 Release 1.7.29. --- ANNOUNCE | 463 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 266 insertions(+), 219 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=955582c8ce9a40d0a267e…

1 0

Piotr Caban : user32/tests: Add mouse SendInput tests when mouse events are captured.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 2235c820a954d82434533012a0bf6f6da368cf03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2235c820a954d82434533012a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:28:18 2014 +0200 user32/tests: Add mouse SendInput tests when mouse events are captured. --- dlls/user32/tests/input.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index e60ee27..f741e78 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1890,6 +1890,56 @@ static void test_Input_mouse(void) ok(!got_button_down, "unexpected WM_LBUTTONDOWN message\n"); ok(!got_button_up, "unexpected WM_LBUTTONUP message\n"); + /* click after SetCapture call */ + SetCapture(button_win); + got_button_down = got_button_up = FALSE; + simulate_click(FALSE, 50, 50); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_RBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_RBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_RBUTTONUP message\n"); + + /* click on child window after SetCapture call */ + hwnd = CreateWindowA("button", "button2", WS_VISIBLE | WS_CHILD, + 0, 0, 100, 100, button_win, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); + got_button_down = got_button_up = FALSE; + simulate_click(TRUE, 150, 150); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_LBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_LBUTTONUP message\n"); + DestroyWindow(hwnd); + ok(ReleaseCapture(), "ReleaseCapture failed\n"); + CloseHandle(thread_data.start_event); CloseHandle(thread_data.end_event); DestroyWindow(button_win);

1 0

Piotr Caban : user32: Don' t move mouse hardware messages to other threads queues.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: f747e5c8c982d76e160d67b8f5a1c784585e4c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f747e5c8c982d76e160d67b8f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:29:06 2014 +0200 user32: Don't move mouse hardware messages to other threads queues. --- dlls/user32/message.c | 15 +++++++-------- server/protocol.def | 1 - server/queue.c | 33 ++++----------------------------- 3 files changed, 11 insertions(+), 38 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index fd82498..b75c7e9 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2266,13 +2266,12 @@ static void send_parent_notify( HWND hwnd, WORD event, WORD idChild, POINT pt ) * Tell the server we have passed the message to the app * (even though we may end up dropping it later on) */ -static void accept_hardware_message( UINT hw_id, BOOL remove, HWND new_hwnd ) +static void accept_hardware_message( UINT hw_id, BOOL remove ) { SERVER_START_REQ( accept_hardware_message ) { req->hw_id = hw_id; req->remove = remove; - req->new_win = wine_server_user_handle( new_hwnd ); if (wine_server_call( req )) FIXME("Failed to reply to MSG_HARDWARE message. Message may not be removed from queue.\n"); } @@ -2460,10 +2459,10 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, { /* skip this message */ HOOK_CallHooks( WH_CBT, HCBT_KEYSKIPPED, LOWORD(msg->wParam), msg->lParam, TRUE ); - accept_hardware_message( hw_id, TRUE, 0 ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } - accept_hardware_message( hw_id, remove, 0 ); + accept_hardware_message( hw_id, remove ); if ( remove && msg->message == WM_KEYDOWN ) if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) @@ -2507,7 +2506,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd )) { - accept_hardware_message( hw_id, TRUE, msg->hwnd ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } @@ -2596,7 +2595,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H hook.wHitTestCode = hittest; hook.dwExtraInfo = extra_info; HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, TRUE ); - accept_hardware_message( hw_id, TRUE, 0 ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } @@ -2604,11 +2603,11 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H { SendMessageW( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd, MAKELONG( hittest, msg->message )); - accept_hardware_message( hw_id, TRUE, 0 ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } - accept_hardware_message( hw_id, remove, 0 ); + accept_hardware_message( hw_id, remove ); if (!remove || info.hwndCapture) { diff --git a/server/protocol.def b/server/protocol.def index c9270ea..4854e3d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2156,7 +2156,6 @@ enum message_type @REQ(accept_hardware_message) unsigned int hw_id; /* id of the hardware message */ int remove; /* should we remove the message? */ - user_handle_t new_win; /* new destination window for current message */ @END diff --git a/server/queue.c b/server/queue.c index 71dfc11..5f87203 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1281,7 +1281,7 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys /* release the hardware message currently being processed by the given thread */ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_id, - int remove, user_handle_t new_win ) + int remove ) { struct thread_input *input = queue->input; struct message *msg; @@ -1293,7 +1293,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i if (&msg->entry == &input->msg_list) return; /* not found */ /* clear the queue bit for that message */ - if (remove || new_win) + if (remove) { struct message *other; int clr_bit; @@ -1308,32 +1308,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i } } if (clr_bit) clear_queue_bits( queue, clr_bit ); - } - if (new_win) /* set the new window */ - { - struct thread *owner = get_window_thread( new_win ); - if (owner) - { - msg->win = new_win; - if (owner->queue->input != input) - { - list_remove( &msg->entry ); - if (merge_message( owner->queue->input, msg )) - { - free_message( msg ); - release_object( owner ); - return; - } - list_add_tail( &owner->queue->input->msg_list, &msg->entry ); - } - set_queue_bits( owner->queue, get_hardware_msg_bit( msg )); - remove = 0; - release_object( owner ); - } - } - if (remove) - { update_input_key_state( input->desktop, input->keystate, msg ); list_remove( &msg->entry ); free_message( msg ); @@ -1980,7 +1955,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); if (msg->msg == WM_INPUT && (flags & PM_REMOVE)) - release_hardware_message( current->queue, data->hw_id, 1, 0 ); + release_hardware_message( current->queue, data->hw_id, 1 ); return 1; } /* nothing found, clear the hardware queue bits */ @@ -2471,7 +2446,7 @@ DECL_HANDLER(reply_message) DECL_HANDLER(accept_hardware_message) { if (current->queue) - release_hardware_message( current->queue, req->hw_id, req->remove, req->new_win ); + release_hardware_message( current->queue, req->hw_id, req->remove ); else set_error( STATUS_ACCESS_DENIED ); }

1 0

Piotr Caban : server: Send mouse hardware messages to thread owning top-most window.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 3f1bbdcae35fe3841465106f71090445484bf274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1bbdcae35fe3841465106f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:28:47 2014 +0200 server: Send mouse hardware messages to thread owning top-most window. Also don't limit mouse message scope to top-most window when message comes from SendInput or window that generated the event is minimized/transparent. --- dlls/user32/tests/input.c | 4 ++-- dlls/user32/tests/win.c | 2 +- server/queue.c | 26 +++++++++++++++----------- server/user.h | 3 ++- server/window.c | 34 +++++++++++++++++++++++++++++----- 5 files changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f741e78..3ce0570 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1803,8 +1803,8 @@ static void test_Input_mouse(void) } } ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); - todo_wine ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); - todo_wine ok(got_button_up, "expected WM_RBUTTONUP message\n"); + ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_RBUTTONUP message\n"); DestroyWindow(static_win); /* click through HTTRANSPARENT top-level window */ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ad983df..cfc2a02 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7295,7 +7295,7 @@ static void window_from_point_proc(HWND parent) DispatchMessageA(&msg); } ok(got_hittest, "transparent window didn't get WM_NCHITTEST message\n"); - todo_wine ok(got_click, "button under static window didn't get WM_LBUTTONUP\n"); + ok(got_click, "button under static window didn't get WM_LBUTTONUP\n"); ret = WaitForSingleObject(end_event, 5000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); diff --git a/server/queue.c b/server/queue.c index 601629e..71dfc11 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1379,11 +1379,13 @@ found: /* find the window that should receive a given hardware message */ static user_handle_t find_hardware_message_window( struct desktop *desktop, struct thread_input *input, - struct message *msg, unsigned int *msg_code ) + struct message *msg, unsigned int *msg_code, + struct thread **thread ) { struct hardware_msg_data *data = msg->data; user_handle_t win = 0; + *thread = NULL; *msg_code = msg->msg; if (msg->msg == WM_INPUT) { @@ -1397,14 +1399,16 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru if (*msg_code < WM_SYSKEYDOWN) *msg_code += WM_SYSKEYDOWN - WM_KEYDOWN; } } - else /* mouse message */ + else if (!input || !(win = input->capture)) /* mouse message */ { - if (!input || !(win = input->capture)) - { - if (!(win = msg->win) || !is_window_visible( win ) || is_window_transparent( win )) - win = window_from_point( desktop, data->x, data->y ); - } + if (is_window_visible( msg->win ) && !is_window_transparent( msg->win )) win = msg->win; + else win = shallow_window_from_point( desktop, data->x, data->y ); + + *thread = window_thread_from_point( win, data->x, data->y ); } + + if (!*thread) + *thread = get_window_thread( win ); return win; } @@ -1491,8 +1495,8 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg } else input = desktop->foreground_input; - win = find_hardware_message_window( desktop, input, msg, &msg_code ); - if (!win || !(thread = get_window_thread(win))) + win = find_hardware_message_window( desktop, input, msg, &msg_code, &thread ); + if (!win || !thread) { if (input) update_input_key_state( input->desktop, input->keystate, msg ); free_message( msg ); @@ -1928,8 +1932,8 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user struct hardware_msg_data *data = msg->data; ptr = list_next( &input->msg_list, ptr ); - win = find_hardware_message_window( input->desktop, input, msg, &msg_code ); - if (!win || !(win_thread = get_window_thread( win ))) + win = find_hardware_message_window( input->desktop, input, msg, &msg_code, &win_thread ); + if (!win || !win_thread) { /* no window at all, remove it */ update_input_key_state( input->desktop, input->keystate, msg ); diff --git a/server/user.h b/server/user.h index 8535903..08d0959 100644 --- a/server/user.h +++ b/server/user.h @@ -157,7 +157,8 @@ extern int is_window_visible( user_handle_t window ); extern int is_window_transparent( user_handle_t window ); extern int make_window_active( user_handle_t window ); extern struct thread *get_window_thread( user_handle_t handle ); -extern user_handle_t window_from_point( struct desktop *desktop, int x, int y ); +extern user_handle_t shallow_window_from_point( struct desktop *desktop, int x, int y ); +extern struct thread *window_thread_from_point( user_handle_t scope, int x, int y ); extern user_handle_t find_window_to_repaint( user_handle_t parent, struct thread *thread ); extern struct window_class *get_window_class( user_handle_t window ); diff --git a/server/window.c b/server/window.c index 484cd22..9efdd69 100644 --- a/server/window.c +++ b/server/window.c @@ -727,14 +727,38 @@ static int get_window_children_from_point( struct window *parent, int x, int y, return 1; } -/* find window containing point (in absolute coords) */ -user_handle_t window_from_point( struct desktop *desktop, int x, int y ) +/* get handle of root of top-most window containing point */ +user_handle_t shallow_window_from_point( struct desktop *desktop, int x, int y ) { - struct window *ret; + struct window *ptr; if (!desktop->top_window) return 0; - ret = child_window_from_point( desktop->top_window, x, y ); - return ret->handle; + + LIST_FOR_EACH_ENTRY( ptr, &desktop->top_window->children, struct window, entry ) + { + if (!is_point_in_window( ptr, x, y )) continue; /* skip it */ + return ptr->handle; + } + return desktop->top_window->handle; +} + +/* return thread of top-most window containing point (in absolute coords) */ +struct thread *window_thread_from_point( user_handle_t scope, int x, int y ) +{ + struct window *win = get_user_object( scope, USER_WINDOW ); + struct window *ptr; + + if (!win) return NULL; + + for (ptr = win; ptr && !is_desktop_window(ptr); ptr = ptr->parent) + { + x -= ptr->client_rect.left; + y -= ptr->client_rect.top; + } + + ptr = child_window_from_point( win, x, y ); + if (!ptr->thread) return NULL; + return (struct thread *)grab_object( ptr->thread ); } /* return list of all windows containing point (in absolute coords) */

1 0

Piotr Caban : user32/tests: Add mouse SendInput tests.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 65b09537b34fc5b153057a37996c40b8b4f5d8ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b09537b34fc5b153057a379… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:28:12 2014 +0200 user32/tests: Add mouse SendInput tests. --- dlls/user32/tests/input.c | 253 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 253 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f24a4c..e60ee27 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1643,6 +1643,258 @@ static void test_key_names(void) ok( bufferW[0] == 0xcccc, "wrong string %s\n", wine_dbgstr_w(bufferW) ); } +static void simulate_click(BOOL left, int x, int y) +{ + INPUT input[2]; + UINT events_no; + + SetCursorPos(x, y); + memset(input, 0, sizeof(input)); + input[0].type = INPUT_MOUSE; + U(input[0]).mi.dx = x; + U(input[0]).mi.dy = y; + U(input[0]).mi.dwFlags = left ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_RIGHTDOWN; + input[1].type = INPUT_MOUSE; + U(input[1]).mi.dx = x; + U(input[1]).mi.dy = y; + U(input[1]).mi.dwFlags = left ? MOUSEEVENTF_LEFTUP : MOUSEEVENTF_RIGHTUP; + events_no = SendInput(2, input, sizeof(input[0])); + ok(events_no == 2, "SendInput returned %d\n", events_no); +} + +static BOOL wait_for_message( MSG *msg ) +{ + BOOL ret; + + for (;;) + { + ret = PeekMessageA(msg, 0, 0, 0, PM_REMOVE); + if (ret) + { + if (msg->message == WM_PAINT) DispatchMessageA(msg); + else break; + } + else if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) break; + } + if (!ret) msg->message = 0; + return ret; +} + +static BOOL wait_for_event(HANDLE event, int timeout) +{ + DWORD end_time = GetTickCount() + timeout; + MSG msg; + + do { + if(MsgWaitForMultipleObjects(1, &event, FALSE, timeout, QS_ALLINPUT) == WAIT_OBJECT_0) + return TRUE; + while(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + timeout = end_time - GetTickCount(); + }while(timeout > 0); + + return FALSE; +} + +static WNDPROC def_static_proc; +static DWORD hittest_no; +static LRESULT WINAPI static_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_NCHITTEST) + { + /* break infinite hittest loop */ + if(hittest_no > 50) return HTCLIENT; + hittest_no++; + } + + return def_static_proc(hwnd, msg, wp, lp); +} + +struct thread_data +{ + HANDLE start_event; + HANDLE end_event; + HWND win; +}; + +static DWORD WINAPI create_static_win(void *arg) +{ + struct thread_data *thread_data = arg; + HWND win; + + win = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + ok(win != 0, "CreateWindow failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(win, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + thread_data->win = win; + + SetEvent(thread_data->start_event); + wait_for_event(thread_data->end_event, 5000); + return 0; +} + +static void test_Input_mouse(void) +{ + BOOL got_button_down, got_button_up; + HWND hwnd, button_win, static_win; + struct thread_data thread_data; + HANDLE thread; + DWORD thread_id; + POINT pt; + MSG msg; + + button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + ok(button_win != 0, "CreateWindow failed\n"); + + pt.x = pt.y = 150; + hwnd = WindowFromPoint(pt); + if (hwnd != button_win) + { + skip("there's another window covering test window\n"); + DestroyWindow(button_win); + return; + } + + /* simple button click test */ + simulate_click(TRUE, 150, 150); + got_button_down = got_button_up = FALSE; + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + { + got_button_down = TRUE; + } + else if (msg.message == WM_LBUTTONUP) + { + got_button_up = TRUE; + break; + } + } + ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_LBUTTONUP message\n"); + + /* click through HTTRANSPARENT child window */ + static_win = CreateWindowA("static", "static", WS_VISIBLE | WS_CHILD, + 0, 0, 100, 100, button_win, NULL, NULL, NULL); + ok(static_win != 0, "CreateWindow failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(static_win, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + simulate_click(FALSE, 150, 150); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_RBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_RBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); + todo_wine ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); + todo_wine ok(got_button_up, "expected WM_RBUTTONUP message\n"); + DestroyWindow(static_win); + + /* click through HTTRANSPARENT top-level window */ + static_win = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + ok(static_win != 0, "CreateWindow failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(static_win, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + simulate_click(TRUE, 150, 150); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_LBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); + todo_wine ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + todo_wine ok(got_button_up, "expected WM_LBUTTONUP message\n"); + DestroyWindow(static_win); + + /* click on HTTRANSPARENT top-level window that belongs to other thread */ + thread_data.start_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(thread_data.start_event != NULL, "CreateEvent failed\n"); + thread_data.end_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(thread_data.end_event != NULL, "CreateEvent failed\n"); + thread = CreateThread(NULL, 0, create_static_win, &thread_data, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + WaitForSingleObject(thread_data.start_event, INFINITE); + simulate_click(FALSE, 150, 150); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_RBUTTONDOWN) + got_button_down = TRUE; + else if (msg.message == WM_RBUTTONUP) + got_button_up = TRUE; + } + SetEvent(thread_data.end_event); + WaitForSingleObject(thread, INFINITE); + ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); + ok(!got_button_down, "unexpected WM_RBUTTONDOWN message\n"); + ok(!got_button_up, "unexpected WM_RBUTTONUP message\n"); + + /* click on HTTRANSPARENT top-level window that belongs to ther thread, + * threads input queues are attached */ + thread = CreateThread(NULL, 0, create_static_win, &thread_data, 0, &thread_id); + ok(thread != NULL, "CreateThread failed\n"); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + WaitForSingleObject(thread_data.start_event, INFINITE); + ok(AttachThreadInput(thread_id, GetCurrentThreadId(), TRUE), + "AttachThreadInput failed\n"); + while (wait_for_message(&msg)) DispatchMessageA(&msg); + SetWindowPos(thread_data.win, button_win, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + simulate_click(TRUE, 150, 150); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + got_button_down = TRUE; + else if (msg.message == WM_LBUTTONUP) + got_button_up = TRUE; + } + SetEvent(thread_data.end_event); + WaitForSingleObject(thread, INFINITE); + todo_wine ok(hittest_no > 50, "expected loop with WM_NCHITTEST messages\n"); + ok(!got_button_down, "unexpected WM_LBUTTONDOWN message\n"); + ok(!got_button_up, "unexpected WM_LBUTTONUP message\n"); + + CloseHandle(thread_data.start_event); + CloseHandle(thread_data.end_event); + DestroyWindow(button_win); +} + START_TEST(input) { init_function_pointers(); @@ -1652,6 +1904,7 @@ START_TEST(input) test_Input_blackbox(); test_Input_whitebox(); test_Input_unicode(); + test_Input_mouse(); } else win_skip("SendInput is not available\n");

1 0

Stefan Dösinger : d3d9/tests: Port test_window_style to d3d9ex.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 80cbd276e016fedd609f1ece6e398f8f72ce2c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80cbd276e016fedd609f1ece6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 16 17:07:20 2014 +0200 d3d9/tests: Port test_window_style to d3d9ex. --- dlls/d3d9/tests/d3d9ex.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index a496584..11fe091 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2108,6 +2108,105 @@ done: UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_window_style(void) +{ + RECT focus_rect, fullscreen_rect, r; + LONG device_style, device_exstyle; + LONG focus_style, focus_exstyle; + struct device_desc device_desc; + LONG style; + IDirect3DDevice9Ex *device; + HRESULT hr; + ULONG ref; + static const LONG test_style_flags[] = + { + 0, + WS_VISIBLE + }; + unsigned int i; + + SetRect(&fullscreen_rect, 0, 0, startup_mode.dmPelsWidth, startup_mode.dmPelsHeight); + + for (i = 0; i < sizeof(test_style_flags) / sizeof(*test_style_flags); ++i) + { + focus_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | test_style_flags[i], + 0, 0, startup_mode.dmPelsWidth / 2, startup_mode.dmPelsHeight / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | test_style_flags[i], + 0, 0, startup_mode.dmPelsWidth / 2, startup_mode.dmPelsHeight / 2, 0, 0, 0, 0); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + device_exstyle = GetWindowLongA(device_window, GWL_EXSTYLE); + focus_style = GetWindowLongA(focus_window, GWL_STYLE); + focus_exstyle = GetWindowLongA(focus_window, GWL_EXSTYLE); + + GetWindowRect(focus_window, &focus_rect); + + device_desc.device_window = device_window; + device_desc.width = startup_mode.dmPelsWidth; + device_desc.height = startup_mode.dmPelsHeight; + device_desc.windowed = FALSE; + if (!(device = create_device(focus_window, &device_desc))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(device_window); + DestroyWindow(focus_window); + return; + } + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style, "Expected device window style %#x, got %#x.\n", + device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x.\n", + device_exstyle, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetClientRect(device_window, &r); + todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + GetWindowRect(focus_window, &r); + ok(EqualRect(&r, &focus_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, + r.left, r.top, r.right, r.bottom); + + hr = reset_device(device, device_window, TRUE); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + if (test_style_flags[i] & WS_VISIBLE) + ok(style == device_style, "Expected device window style %#x, got %#x.\n", + device_style, style); + else + todo_wine ok(style == device_style, "Expected device window style %#x, got %#x.\n", + device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x.\n", + device_exstyle, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + ref = IDirect3DDevice9Ex_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + + DestroyWindow(device_window); + DestroyWindow(focus_window); + } +} + START_TEST(d3d9ex) { d3d9_handle = LoadLibraryA("d3d9.dll"); @@ -2141,4 +2240,5 @@ START_TEST(d3d9ex) test_unsupported_shaders(); test_wndproc(); test_wndproc_windowed(); + test_window_style(); }

1 0

Stefan Dösinger : d3d9/tests: Port wndproc tests to d3d9ex.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 5c33ffaf6744475c97d45fb72abc06daeaf43bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c33ffaf6744475c97d45fb72… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 16 17:07:19 2014 +0200 d3d9/tests: Port wndproc tests to d3d9ex. --- dlls/d3d9/tests/d3d9ex.c | 466 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 466 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c33ffaf6744475c97d45…

1 0

Nikolay Sivov : dwrite: Return on first found glyph.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: e3c514f6d555a4772160b49f1d0e4ee49f92b8f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c514f6d555a4772160b49f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 11:59:55 2014 +0400 dwrite: Return on first found glyph. --- dlls/dwrite/opentype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a11b2fb..487f56b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -377,7 +377,7 @@ void opentype_cmap_get_glyphindex(void *data, UINT32 utf32c, UINT16 *pgi) table = (WORD*)(((BYTE*)CMAP_Table) + GET_BE_DWORD(CMAP_Table->tables[i].offset)); type = GET_BE_WORD(*table); TRACE("table type %i\n", type); - /* Break when we find a handled type */ + switch (type) { case OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING: @@ -389,6 +389,8 @@ void opentype_cmap_get_glyphindex(void *data, UINT32 utf32c, UINT16 *pgi) default: TRACE("table type %i unhandled.\n", type); } + + if (*pgi) return; } }

1 0

Nikolay Sivov : dwrite: Added a helper to get IDWriteFontFace from IDWriteFont.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 460363535e331a37c96fc285ee2c7573d7a4fe8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=460363535e331a37c96fc285e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 09:36:13 2014 +0400 dwrite: Added a helper to get IDWriteFontFace from IDWriteFont. --- dlls/dwrite/font.c | 54 ++++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0b287ff..9a2c636 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -736,6 +736,21 @@ HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) return S_OK; } +static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace **fontface) +{ + *fontface = NULL; + + if (!font->face) { + HRESULT hr = font->is_system ? create_system_fontface(font, &font->face) : + font_create_fontface(NULL, font->data->face_data->type, font->data->face_data->file_count, font->data->face_data->files, + font->data->face_data->index, font->data->face_data->simulations, &font->face); + if (FAILED(hr)) return hr; + } + + *fontface = font->face; + return S_OK; +} + static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont2 *iface, REFIID riid, void **obj) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); @@ -861,13 +876,12 @@ static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, *exists = FALSE; - hr = IDWriteFont2_CreateFontFace(iface, &fontface); + hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) return hr; index = 0; hr = IDWriteFontFace_GetGlyphIndices(fontface, &value, 1, &index); - IDWriteFontFace_Release(fontface); if (FAILED(hr)) return hr; @@ -878,37 +892,15 @@ static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont2 *iface, IDWriteFontFace **face) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); + HRESULT hr; - if (This->is_system) - { - TRACE("(%p)->(%p)\n", This, face); - - if (!This->face) - { - HRESULT hr = create_system_fontface(This, &This->face); - if (FAILED(hr)) return hr; - } - - *face = This->face; - IDWriteFontFace_AddRef(*face); - - return S_OK; - } - else - { - TRACE("(%p)->(%p)\n", This, face); + TRACE("(%p)->(%p)\n", This, face); - if (!This->face) - { - HRESULT hr = font_create_fontface(NULL, This->data->face_data->type, This->data->face_data->file_count, This->data->face_data->files, This->data->face_data->index, This->data->face_data->simulations, &This->face); - if (FAILED(hr)) return hr; - } - - *face = This->face; + hr = get_fontface_from_font(This, face); + if (hr == S_OK) IDWriteFontFace_AddRef(*face); - return S_OK; - } + return hr; } static void WINAPI dwritefont1_GetMetrics(IDWriteFont2 *iface, DWRITE_FONT_METRICS1 *metrics) @@ -932,13 +924,11 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont2 *iface, UINT32 m TRACE("(%p)->(%u %p %p)\n", This, max_count, ranges, count); - hr = IDWriteFont2_CreateFontFace(iface, &fontface); + hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) return hr; IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); - IDWriteFontFace_Release(fontface); - hr = IDWriteFontFace2_GetUnicodeRanges(fontface2, max_count, ranges, count); IDWriteFontFace2_Release(fontface2);

1 0

Nikolay Sivov : dwrite: Hide BiDi helpers.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 571307edc208ffde43933b6dd05125b6b8b8feb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571307edc208ffde43933b6dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 09:27:01 2014 +0400 dwrite: Hide BiDi helpers. --- dlls/dwrite/dwrite_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4c9aeef..4b54a35 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -112,8 +112,8 @@ extern void opentype_cmap_get_glyphindex(void*,UINT32,UINT16*) DECLSPEC_HIDDEN; extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN; extern VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style) DECLSPEC_HIDDEN; -extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*); -extern WCHAR bidi_get_mirrored_char(WCHAR); +extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLSPEC_HIDDEN; +extern WCHAR bidi_get_mirrored_char(WCHAR) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY

1 0

YongHao Hu : msvcp90/tests: Add istream::operator>>(float) and double test.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: b94fe44e7957e476962132ccfce9f1f954e725dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94fe44e7957e476962132ccf… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Tue Oct 14 18:05:01 2014 +0800 msvcp90/tests: Add istream::operator>>(float) and double test. --- dlls/msvcp90/tests/ios.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 470dc37..fd27ce5 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -442,6 +442,7 @@ static void (*__thiscall p_basic_fstream_wchar_vbase_dtor)(basic_fstream_wchar*) /* istream */ static basic_istream_char* (*__thiscall p_basic_istream_char_read_uint64)(basic_istream_char*, unsigned __int64*); +static basic_istream_char* (*__thiscall p_basic_istream_char_read_float)(basic_istream_char*, float*); static basic_istream_char* (*__thiscall p_basic_istream_char_read_double)(basic_istream_char*, double*); static int (*__thiscall p_basic_istream_char_get)(basic_istream_char*); static MSVCP_bool (*__thiscall p_basic_istream_char_ipfx)(basic_istream_char*, MSVCP_bool); @@ -648,6 +649,8 @@ static BOOL init(void) SET(p_basic_istream_char_read_uint64, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)AEA_K@Z"); + SET(p_basic_istream_char_read_float, + "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)AEAM@Z"); SET(p_basic_istream_char_read_double, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)AEAN@Z"); SET(p_basic_istream_char_get, @@ -765,6 +768,8 @@ static BOOL init(void) SET(p_basic_istream_char_read_uint64, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)AA_K@Z"); + SET(p_basic_istream_char_read_float, + "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)AAM@Z"); SET(p_basic_istream_char_read_double, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)AAN@Z"); SET(p_basic_istream_char_get, @@ -881,6 +886,8 @@ static BOOL init(void) SET(p_basic_istream_char_read_uint64, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)AA_K@Z"); + SET(p_basic_istream_char_read_float, + "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)AAM@Z"); SET(p_basic_istream_char_read_double, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)AAN@Z"); SET(p_basic_istream_char_get, @@ -2027,6 +2034,46 @@ static void test_ostream_wchar_print_double(void) call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); } +static void test_istream_read_float(void) +{ + basic_stringstream_char ss; + basic_string_char str; + const char *test_str; + float val, correct_val; + + test_str = "3.14159"; + call_func2(p_basic_string_char_ctor_cstr, &str, test_str); + call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_in, TRUE); + + val = 0; + call_func2(p_basic_istream_char_read_float, &ss.base.base1, &val); + correct_val = 3.14159; + ok(correct_val == val, "wrong val, expected = %g found %g\n", correct_val, val); + + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); + call_func1(p_basic_string_char_dtor, &str); +} + +static void test_istream_read_double(void) +{ + basic_stringstream_char ss; + basic_string_char str; + const char *test_str; + double val, correct_val; + + test_str = "3.14159"; + call_func2(p_basic_string_char_ctor_cstr, &str, test_str); + call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_in, TRUE); + + val = 0; + call_func2(p_basic_istream_char_read_double, &ss.base.base1, &val); + correct_val = 3.14159; + ok(correct_val == val, "wrong val, expected = %g found %g\n", correct_val, val); + + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); + call_func1(p_basic_string_char_dtor, &str); +} + START_TEST(ios) { if(!init()) @@ -2046,6 +2093,8 @@ START_TEST(ios) test_ostream_print_float(); test_ostream_print_double(); test_ostream_wchar_print_double(); + test_istream_read_float(); + test_istream_read_double(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Ken Thomases : wined3d: Fix subtraction of resource size from used adapter memory.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: bd460bca1ccade89400515fa004c5e3204e55d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd460bca1ccade89400515fa0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 16 22:03:22 2014 -0500 wined3d: Fix subtraction of resource size from used adapter memory. Properly negate an unsigned value while promoting it from 32- to 64-bit. --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index d40af56..0ab55dc 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -151,7 +151,7 @@ void resource_cleanup(struct wined3d_resource *resource) if (resource->pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) { TRACE("Decrementing device memory pool by %u.\n", resource->size); - adapter_adjust_memory(resource->device->adapter, 0 - resource->size); + adapter_adjust_memory(resource->device->adapter, (INT64)0 - resource->size); } wined3d_resource_free_sysmem(resource);

1 0

Nikolay Sivov : dwrite: Create IDWriteFontFace2 instance for IDWriteFont.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: d02d35a7b1ed3805390213a19fb5b83082cac1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02d35a7b1ed3805390213a19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 09:47:43 2014 +0400 dwrite: Create IDWriteFontFace2 instance for IDWriteFont. --- dlls/dwrite/analyzer.c | 2 -- dlls/dwrite/bidi.c | 1 - dlls/dwrite/dwrite_private.h | 4 +++- dlls/dwrite/font.c | 31 ++++++++++++------------------- dlls/dwrite/gdiinterop.c | 1 - dlls/dwrite/layout.c | 1 - dlls/dwrite/main.c | 4 +--- dlls/dwrite/opentype.c | 1 - dlls/dwrite/shape.c | 1 - 9 files changed, 16 insertions(+), 30 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 1a05335..46cf3b5 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -21,8 +21,6 @@ #define COBJMACROS -#include "dwrite.h" -#include "dwrite_2.h" #include "dwrite_private.h" #include "scripts.h" diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 8e8daf6..48a7a06 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -48,7 +48,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "dwrite_1.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(bidi); diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4b54a35..88ca127 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "dwrite_2.h" + #include "wine/debug.h" #include "wine/unicode.h" @@ -103,7 +105,7 @@ extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDE extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; -extern HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace **font_face) DECLSPEC_HIDDEN; +extern HRESULT font_create_fontface(IDWriteFactory*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2 **) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9a2c636..fc13941 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -20,8 +20,6 @@ #define COBJMACROS -#include "dwrite.h" -#include "dwrite_2.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); @@ -93,7 +91,7 @@ struct dwrite_font { BOOL is_system; IDWriteFontFamily *family; - IDWriteFontFace *face; + IDWriteFontFace2 *face; struct dwrite_font_data *data; }; @@ -689,7 +687,7 @@ static const IDWriteFontFace2Vtbl dwritefontfacevtbl = { dwritefontface2_GetRecommendedRenderingMode }; -static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace **face) +static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace2 **face) { struct dwrite_fontface *This; @@ -722,7 +720,7 @@ static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace This->logfont.lfWeight = font->data->weight; strcpyW(This->logfont.lfFaceName, font->data->facename); - *face = (IDWriteFontFace*)&This->IDWriteFontFace2_iface; + *face = &This->IDWriteFontFace2_iface; return S_OK; } @@ -736,7 +734,7 @@ HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) return S_OK; } -static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace **fontface) +static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 **fontface) { *fontface = NULL; @@ -788,7 +786,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont2 *iface) if (!ref) { - if (This->face) IDWriteFontFace_Release(This->face); + if (This->face) IDWriteFontFace2_Release(This->face); if (This->family) IDWriteFontFamily_Release(This->family); _free_font_data(This->data); heap_free(This); @@ -868,7 +866,7 @@ static void WINAPI dwritefont_GetMetrics(IDWriteFont2 *iface, DWRITE_FONT_METRIC static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, BOOL *exists) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - IDWriteFontFace *fontface; + IDWriteFontFace2 *fontface; UINT16 index; HRESULT hr; @@ -881,7 +879,7 @@ static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, return hr; index = 0; - hr = IDWriteFontFace_GetGlyphIndices(fontface, &value, 1, &index); + hr = IDWriteFontFace2_GetGlyphIndices(fontface, &value, 1, &index); if (FAILED(hr)) return hr; @@ -896,7 +894,7 @@ static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont2 *iface, IDWriteFont TRACE("(%p)->(%p)\n", This, face); - hr = get_fontface_from_font(This, face); + hr = get_fontface_from_font(This, (IDWriteFontFace2**)face); if (hr == S_OK) IDWriteFontFace_AddRef(*face); @@ -918,8 +916,7 @@ static void WINAPI dwritefont1_GetPanose(IDWriteFont2 *iface, DWRITE_PANOSE *pan static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont2 *iface, UINT32 max_count, DWRITE_UNICODE_RANGE *ranges, UINT32 *count) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - IDWriteFontFace2 *fontface2; - IDWriteFontFace *fontface; + IDWriteFontFace2 *fontface; HRESULT hr; TRACE("(%p)->(%u %p %p)\n", This, max_count, ranges, count); @@ -928,11 +925,7 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont2 *iface, UINT32 m if (FAILED(hr)) return hr; - IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); - hr = IDWriteFontFace2_GetUnicodeRanges(fontface2, max_count, ranges, count); - IDWriteFontFace2_Release(fontface2); - - return hr; + return IDWriteFontFace2_GetUnicodeRanges(fontface, max_count, ranges, count); } static HRESULT WINAPI dwritefont1_IsMonospacedFont(IDWriteFont2 *iface) @@ -1652,7 +1645,7 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke return S_OK; } -HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace **font_face) +HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace2 **font_face) { int i; struct dwrite_fontface *This; @@ -1706,7 +1699,7 @@ HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facety This->data->simulations = sim_flags; This->is_system = FALSE; - *font_face = (IDWriteFontFace*)&This->IDWriteFontFace2_iface; + *font_face = &This->IDWriteFontFace2_iface; return S_OK; } diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 7c20110..c3c2b11 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "dwrite_1.h" #include "dwrite_private.h" #include "wine/debug.h" diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0afd466..86ddf3c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "dwrite_2.h" #include "dwrite_private.h" #include "wine/list.h" diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 0e0f5c5..50ad539 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -27,8 +27,6 @@ #include "winuser.h" #include "initguid.h" -#include "dwrite.h" -#include "dwrite_2.h" #include "dwrite_private.h" #include "wine/debug.h" @@ -609,7 +607,7 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, { struct dwritefactory *This = impl_from_IDWriteFactory(iface); TRACE("(%p)->(%d %u %p %u 0x%x %p)\n", This, facetype, files_number, font_files, index, sim_flags, font_face); - return font_create_fontface(iface, facetype, files_number, font_files, index, sim_flags, font_face); + return font_create_fontface(iface, facetype, files_number, font_files, index, sim_flags, (IDWriteFontFace2**)font_face); } static HRESULT WINAPI dwritefactory_CreateRenderingParams(IDWriteFactory *iface, IDWriteRenderingParams **params) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b17e8ac..a11b2fb 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "dwrite_1.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index ba306c7..00c9548 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -21,7 +21,6 @@ #define COBJMACROS -#include "dwrite_1.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite);

1 0

Sebastian Lackner : server: Fix invalid memory access when copying KeyNameInformation data.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: add67b6f8d37122b329f83fa90094ef4a8adf883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=add67b6f8d37122b329f83fa9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 17 06:08:20 2014 +0200 server: Fix invalid memory access when copying KeyNameInformation data. --- server/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/registry.c b/server/registry.c index 4aaaf03..43527df 100644 --- a/server/registry.c +++ b/server/registry.c @@ -950,10 +950,10 @@ static void enum_key( const struct key *key, int index, int info_class, for (k = key; k != root_key; k = k->parent) { pos -= k->namelen; - if (pos < len) memcpy( data + namelen, k->name, + if (pos < len) memcpy( data + pos, k->name, min( k->namelen, len - pos ) ); pos -= sizeof(backslash); - if (pos < len) memcpy( data + namelen, backslash, + if (pos < len) memcpy( data + pos, backslash, min( sizeof(backslash), len - pos ) ); } memcpy( data, root_name, min( sizeof(root_name) - sizeof(backslash), len ) );

1 0

Nikolay Sivov : dwrite: Some tests for IDWriteFontColletion methods.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: bb23664ee98fd99b5e5c99fae973fcdbea9397de URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb23664ee98fd99b5e5c99fae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 17 08:39:41 2014 +0400 dwrite: Some tests for IDWriteFontColletion methods. --- dlls/dwrite/tests/font.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 411b249..3305cdb 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1189,6 +1189,93 @@ static void test_GetUnicodeRanges(void) IDWriteFontFace1_Release(fontface1); } +static void test_GetFontFromFontFace(void) +{ + IDWriteFontFace *fontface, *fontface2; + IDWriteFontCollection *collection; + IDWriteFont *font, *font2, *font3; + IDWriteFontFamily *family; + HRESULT hr; + + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_GetFontFamily(collection, 0, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + font2 = NULL; + hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font2); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(font2 != font, "got %p, %p\n", font2, font); + + font3 = NULL; + hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font3); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(font3 != font && font3 != font2, "got %p, %p, %p\n", font3, font2, font); +} + +if (font2) { + hr = IDWriteFont_CreateFontFace(font2, &fontface2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fontface2 == fontface, "got %p, %p\n", fontface2, fontface); + IDWriteFontFace_Release(fontface2); +} + +if (font3) { + hr = IDWriteFont_CreateFontFace(font3, &fontface2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fontface2 == fontface, "got %p, %p\n", fontface2, fontface); + IDWriteFontFace_Release(fontface2); +} + +if (font) + IDWriteFont_Release(font); +if (font2) + IDWriteFont_Release(font2); +if (font3) + IDWriteFont_Release(font3); + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + IDWriteFontCollection_Release(collection); +} + +static void test_GetFirstMatchingFont(void) +{ + IDWriteFontCollection *collection; + IDWriteFont *font, *font2; + IDWriteFontFamily *family; + HRESULT hr; + + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_GetFontFamily(collection, 0, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(font != font2, "got %p, %p\n", font, font2); + + IDWriteFont_Release(font); + IDWriteFont_Release(font2); + IDWriteFontFamily_Release(family); + IDWriteFontCollection_Release(collection); +} + START_TEST(font) { HRESULT hr; @@ -1214,6 +1301,8 @@ START_TEST(font) test_CreateFontFileReference(); test_shared_isolated(); test_GetUnicodeRanges(); + test_GetFontFromFontFace(); + test_GetFirstMatchingFont(); IDWriteFactory_Release(factory); }

1 0

Ken Thomases : configure: For Mac, link wineloader with -no_pie if it' s available.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 5ddaf34d69fe9608e45abb65a48854b22fa3610a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ddaf34d69fe9608e45abb65a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 16 22:03:11 2014 -0500 configure: For Mac, link wineloader with -no_pie if it's available. This is necessary for the specified image base and WINE_DOS and WINE_SHAREDHEAP segment addresses to be respected. The latter are necessary to reserve the correct ranges of the address space. --- configure | 28 +++++++++++++++++++++++++--- configure.ac | 5 ++--- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 2228ce3..f57c9ad 100755 --- a/configure +++ b/configure @@ -7719,9 +7719,31 @@ uninstall:: APPKIT_LIBS="-framework AppKit" LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" - case $host_os in - darwin11*) LDEXECFLAGS="-Wl,-macosx_version_min,10.6 $LDEXECFLAGS" ;; - esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_pie" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-no_pie... " >&6; } +if ${ac_cv_cflags__Wl__no_pie+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-no_pie" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl__no_pie=yes +else + ac_cv_cflags__Wl__no_pie=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__no_pie" >&5 +$as_echo "$ac_cv_cflags__Wl__no_pie" >&6; } +if test "x$ac_cv_cflags__Wl__no_pie" = xyes; then : + LDEXECFLAGS="-Wl,-no_pie $LDEXECFLAGS" +fi if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then DISKARBITRATION_LIBS="-framework DiskArbitration -framework CoreFoundation" diff --git a/configure.ac b/configure.ac index 240ce29..5ebc2c3 100644 --- a/configure.ac +++ b/configure.ac @@ -760,9 +760,8 @@ uninstall:: AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") AC_SUBST(APPKIT_LIBS,"-framework AppKit") LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" - case $host_os in - darwin11*) LDEXECFLAGS="-Wl,-macosx_version_min,10.6 $LDEXECFLAGS" ;; - esac + WINE_TRY_CFLAGS([-Wl,-no_pie], + [LDEXECFLAGS="-Wl,-no_pie $LDEXECFLAGS"]) if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found

1 0

Jacek Caban : winegecko.php: Added 2.34-beta2 release.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: tools Branch: master Commit: 7b83b6710b12bec98f550daca71ab9d49086d147 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7b83b6710b12bec98f550dac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 13:47:23 2014 +0200 winegecko.php: Added 2.34-beta2 release. --- winegecko.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/winegecko.php b/winegecko.php index a67f423..cba6bbf 100644 --- a/winegecko.php +++ b/winegecko.php @@ -80,7 +80,9 @@ $aFileSizes = array( '2.24-x86'=>22373888, '2.24-x86_64'=>23608320, '2.34-beta1-x86'=>28131328, - '2.34-beta1-x86_64'=>29696000 + '2.34-beta1-x86_64'=>29696000, + '2.34-beta2-x86'=>28270080, + '2.34-beta2-x86_64'=>29807616 ); // Exact size of the file:

1 0

Iván Matellanes : msvcrt: Added _fseek_nolock implementation.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: c53e0384a5676626a697d99a24e1331df227e940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c53e0384a5676626a697d99a2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 15 16:47:46 2014 +0200 msvcrt: Added _fseek_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 8 ++++++++ include/msvcrt/stdio.h | 1 + 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 280d188..6a36661 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -840,7 +840,7 @@ @ stub _freefls @ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l -@ stub _fseek_nolock +@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5b74e9c..d6b1a18 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1188,7 +1188,7 @@ @ stub _freefls @ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l -@ stub _fseek_nolock +@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9d695cd..237539b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -507,7 +507,7 @@ @ stub _freefls @ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l -@ stub _fseek_nolock +@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 45ea0f9..b810c5f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -489,7 +489,7 @@ @ stub _freefls @ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l -@ stub _fseek_nolock +@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9f7da57..2dd4da5 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1294,6 +1294,14 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, MSVCRT_long offset, int whence) } /********************************************************************* + * _fseek_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fseek_nolock(MSVCRT_FILE* file, MSVCRT_long offset, int whence) +{ + return MSVCRT__fseeki64_nolock( file, offset, whence ); +} + +/********************************************************************* * _chsize_s (MSVCRT.@) */ int CDECL MSVCRT__chsize_s(int fd, __int64 size) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 1e816ce..1c154fc 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,6 +130,7 @@ int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); +int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*); __int64 __cdecl _ftelli64_nolock(FILE*);

1 0

Iván Matellanes : msvcrt: Added _ftelli64_nolock implementation.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 7cf0c877b3a5ab33f3c28a20f58f6a2cbf257a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf0c877b3a5ab33f3c28a20f… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 15 16:46:01 2014 +0200 msvcrt: Added _ftelli64_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 24 ++++++++++++++++-------- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 406e9e7..2425f72 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -850,7 +850,7 @@ @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 -@ stub _ftelli64_nolock +@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 @ cdecl _ftime32_s(ptr) MSVCRT__ftime32_s @ cdecl _ftime64(ptr) MSVCRT__ftime64 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 0c62d69..9fa1ac4 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1198,7 +1198,7 @@ @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 -@ stub _ftelli64_nolock +@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 @ cdecl _ftime32_s(ptr) MSVCRT__ftime32_s @ cdecl _ftime64(ptr) MSVCRT__ftime64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7123a06..334921b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -517,7 +517,7 @@ @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 -@ stub _ftelli64_nolock +@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 @ cdecl _ftime32_s(ptr) MSVCRT__ftime32_s @ cdecl _ftime64(ptr) MSVCRT__ftime64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 41ce183..1cbb339 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -499,7 +499,7 @@ @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 -@ stub _ftelli64_nolock +@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 @ cdecl _ftime32_s(ptr) MSVCRT__ftime32_s @ cdecl _ftime64(ptr) MSVCRT__ftime64 diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9a0effd..43f8055 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4226,14 +4226,25 @@ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) */ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) { - __int64 pos; + __int64 ret; MSVCRT__lock_file(file); + ret = MSVCRT__ftelli64_nolock(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _ftelli64_nolock (MSVCRT.@) + */ +__int64 CDECL MSVCRT__ftelli64_nolock(MSVCRT_FILE* file) +{ + __int64 pos; + pos = _telli64(file->_file); - if(pos == -1) { - MSVCRT__unlock_file(file); + if(pos == -1) return -1; - } if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { if(file->_flag & MSVCRT__IOWRT) { pos += file->_ptr - file->_base; @@ -4258,10 +4269,8 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) } else { char *p; - if(MSVCRT__lseeki64(file->_file, pos, SEEK_SET) != pos) { - MSVCRT__unlock_file(file); + if(MSVCRT__lseeki64(file->_file, pos, SEEK_SET) != pos) return -1; - } pos -= file->_bufsiz; pos += file->_ptr - file->_base; @@ -4277,7 +4286,6 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) } } - MSVCRT__unlock_file(file); return pos; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index b5cf8b7..41f3632 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -920,6 +920,7 @@ int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); __int64 __cdecl MSVCRT__ftelli64(MSVCRT_FILE* file); +__int64 __cdecl MSVCRT__ftelli64_nolock(MSVCRT_FILE*); void __cdecl MSVCRT__exit(int); void __cdecl MSVCRT_abort(void); MSVCRT_ulong* __cdecl MSVCRT___doserrno(void); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 0170d2e..90fc3f7 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,6 +130,7 @@ int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); +__int64 __cdecl _ftelli64_nolock(FILE*); void __cdecl clearerr(FILE*); int __cdecl fclose(FILE*);

1 0

Nikolay Sivov : dwrite: Implement HasCharacter().
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 9b46e19aa43f4cab48329438051206e1013f961c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b46e19aa43f4cab483294380… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 07:30:40 2014 +0400 dwrite: Implement HasCharacter(). --- dlls/dwrite/font.c | 22 ++++++++++++++++++++-- dlls/dwrite/tests/font.c | 11 +++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a220501..69b7746 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -835,8 +835,26 @@ static void WINAPI dwritefont_GetMetrics(IDWriteFont2 *iface, DWRITE_FONT_METRIC static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, BOOL *exists) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - FIXME("(%p)->(0x%08x %p): stub\n", This, value, exists); - return E_NOTIMPL; + IDWriteFontFace *fontface; + UINT16 index; + HRESULT hr; + + TRACE("(%p)->(0x%08x %p)\n", This, value, exists); + + *exists = FALSE; + + hr = IDWriteFont2_CreateFontFace(iface, &fontface); + if (FAILED(hr)) + return hr; + + index = 0; + hr = IDWriteFontFace_GetGlyphIndices(fontface, &value, 1, &index); + IDWriteFontFace_Release(fontface); + if (FAILED(hr)) + return hr; + + *exists = index != 0; + return S_OK; } static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont2 *iface, IDWriteFontFace **face) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 33c47bd..5e269c3 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -218,6 +218,7 @@ static void test_CreateFontFromLOGFONT(void) BOOL ret; HDC hdc; HFONT hfont; + BOOL exists; int i; UINT r; @@ -251,6 +252,16 @@ if (0) DeleteDC(hdc); DeleteObject(hfont); + exists = TRUE; + hr = IDWriteFont_HasCharacter(font, 0xd800, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == FALSE, "got %d\n", exists); + + exists = FALSE; + hr = IDWriteFont_HasCharacter(font, 0x20, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == TRUE, "got %d\n", exists); + /* now check properties */ weight = IDWriteFont_GetWeight(font); ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight);

1 0

Nikolay Sivov : dwrite: Added one more test for system font collection.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 8f34bee25ac54f13538e5a6bf172c8b73dd58d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f34bee25ac54f13538e5a6bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 07:29:31 2014 +0400 dwrite: Added one more test for system font collection. --- dlls/dwrite/tests/font.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 65cd398..33c47bd 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -657,11 +657,13 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface == fontface2, "got %p, was %p\n", fontface2, fontface); /* the fontface refcount is increased here */ - IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFont, (void**)&font); + ok(hr == E_NOINTERFACE || broken(hr == E_NOTIMPL), "got 0x%08x\n", hr); IDWriteFontFace_Release(fontface); - IDWriteFont_Release(font); IDWriteGdiInterop_Release(interop); } @@ -726,6 +728,7 @@ static void test_system_fontcollection(void) { IDWriteFontCollection *collection, *coll2; IDWriteFontFamily *family; + IDWriteFactory *factory2; HRESULT hr; UINT32 i; BOOL ret; @@ -743,6 +746,14 @@ static void test_system_fontcollection(void) ok(coll2 == collection, "got %p, was %p\n", coll2, collection); IDWriteFontCollection_Release(coll2); + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IDWriteFactory, (IUnknown**)&factory2); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_GetSystemFontCollection(factory2, &coll2, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(coll2 != collection, "got %p, was %p\n", coll2, collection); + IDWriteFontCollection_Release(coll2); + IDWriteFactory_Release(factory2); + i = IDWriteFontCollection_GetFontFamilyCount(collection); ok(i, "got %u\n", i);

1 0

Matteo Bruni : wined3d: Don' t replicate shader limits values for each shader.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: e789fadd56c8624a5de48ea5b17946ee64d3983f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e789fadd56c8624a5de48ea5b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 16 01:32:20 2014 +0200 wined3d: Don't replicate shader limits values for each shader. --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/glsl_shader.c | 40 +++---- dlls/wined3d/shader.c | 242 +++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 94 insertions(+), 194 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e789fadd56c8624a5de48…

1 0

Matteo Bruni : d3d8/tests: Port the applicable parts of the new unsupported shaders tests to d3d8.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 291c4f3b65c8a0beb72c590a835285f15da22203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=291c4f3b65c8a0beb72c590a8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 16 01:32:19 2014 +0200 d3d8/tests: Port the applicable parts of the new unsupported shaders tests to d3d8. --- dlls/d3d8/tests/device.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a84166c..02ec210 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2855,6 +2855,7 @@ static void test_unsupported_shaders(void) DWORD vs, ps; HWND window; HRESULT hr; + D3DCAPS8 caps; static const DWORD vs_2_0[] = { @@ -2873,6 +2874,38 @@ static void test_unsupported_shaders(void) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff /* end */ }; +#if 0 + vs_1_1 + dcl_position v0 + def c255, 1.0, 1.0, 1.0, 1.0 + add r0, v0, c255 + mov oPos, r0 +#endif + static const DWORD vs_1_255[] = + { + 0xfffe0101, + 0x0000001f, 0x80000000, 0x900f0000, + 0x00000051, 0xa00f00ff, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x00000002, 0x800f0000, 0x90e40000, 0xa0e400ff, + 0x00000001, 0xc00f0000, 0x80e40000, + 0x0000ffff + }; +#if 0 + vs_1_1 + dcl_position v0 + def c256, 1.0, 1.0, 1.0, 1.0 + add r0, v0, c256 + mov oPos, r0 +#endif + static const DWORD vs_1_256[] = + { + 0xfffe0101, + 0x0000001f, 0x80000000, 0x900f0000, + 0x00000051, 0xa00f0100, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x00000002, 0x800f0000, 0x90e40000, 0xa0e40100, + 0x00000001, 0xc00f0000, 0x80e40000, + 0x0000ffff + }; static const DWORD decl[] = { @@ -2906,6 +2939,23 @@ static void test_unsupported_shaders(void) hr = IDirect3DDevice8_CreatePixelShader(device, ps_2_0, &ps); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreatePixelShader returned %#08x\n", hr); + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.MaxVertexShaderConst < 256) + { + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vs_1_255, &vs, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + else + { + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vs_1_255, &vs, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DeleteVertexShader(device, vs); + ok(hr == D3D_OK, "IDirect3DDevice8_DeleteVertexShader returned %#08x\n", hr); + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vs_1_256, &vs, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D8_Release(d3d);

1 0

Iván Matellanes : msvcrt: Added _ftell_nolock implementation.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 50574ccffa7bbc65e3afd0f7a6c8ccaeec064bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=50574ccffa7bbc65e3afd0f7a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 15 16:46:30 2014 +0200 msvcrt: Added _ftell_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 8 ++++++++ include/msvcrt/stdio.h | 1 + 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2425f72..50e2420 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -848,7 +848,7 @@ @ stub _fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ stub _ftell_nolock +@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9fa1ac4..f2d2f30 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1196,7 +1196,7 @@ @ stub _fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ stub _ftell_nolock +@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 334921b..77a03c4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -515,7 +515,7 @@ @ stub _fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ stub _ftell_nolock +@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1cbb339..59fba3d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -497,7 +497,7 @@ @ stub _fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ stub _ftell_nolock +@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 43f8055..49cb14d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4298,6 +4298,14 @@ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) } /********************************************************************* + * _ftell_nolock (MSVCRT.@) + */ +LONG CDECL MSVCRT__ftell_nolock(MSVCRT_FILE* file) +{ + return MSVCRT__ftelli64_nolock(file); +} + +/********************************************************************* * fgetpos (MSVCRT.@) */ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 90fc3f7..dbe9231 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,6 +130,7 @@ int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); +__msvcrt_long __cdecl _ftell_nolock(FILE*); __int64 __cdecl _ftelli64_nolock(FILE*); void __cdecl clearerr(FILE*);

1 0

Nikolay Sivov : dwrite: Implement GetUnicodeRanges().
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 4c0ec6700cb17022f3cbc7fddfff3d514d2d8278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0ec6700cb17022f3cbc7fdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 07:33:51 2014 +0400 dwrite: Implement GetUnicodeRanges(). --- dlls/dwrite/bidi.c | 2 +- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 66 +++++++++++++++++++++++-------- dlls/dwrite/gdiinterop.c | 2 +- dlls/dwrite/opentype.c | 94 +++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/shape.c | 2 +- dlls/dwrite/tests/font.c | 77 +++++++++++++++++++++++++++++++++++- 7 files changed, 222 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c0ec6700cb17022f3cbc…

1 0