June 2014 - Wine-Commits - list.winehq.org

Tag wine-1.7.21 : Alexandre Julliard : Release 1.7.21
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: refs/tags/wine-1.7.21 Tag: f4dd56db4d8c140b2c5b7646cf882ad6018b0f2a URL: http://source.winehq.org/git/wine.git/?a=tag;h=f4dd56db4d8c140b2c5b7646cf88… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 20:10:11 2014 +0200 Release 1.7.21

1 0

Alexandre Julliard : Release 1.7.21.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 991575c2370debd29f53ab90689a8889b54a7d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991575c2370debd29f53ab906… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 20:10:11 2014 +0200 Release 1.7.21. --- ANNOUNCE | 674 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 318 insertions(+), 377 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=991575c2370debd29f53a…

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 1d84e74a953f009720d1661cfc2bc3afaf5995b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d84e74a953f009720d1661cf… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 27 13:33:16 2014 +0200 po: Update German translation. --- po/de.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index 8c8cb59..2d9fb28 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-05-26 01:33+0200\n" +"PO-Revision-Date: 2014-06-27 13:29+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -6597,10 +6597,8 @@ msgid "This network connection does not exist.\n" msgstr "Diese Netzwerkverbindung existiert nicht.\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Verbindung abgelehnt.\n" +msgstr "Verbindung von Gegenstelle zurückgesetzt.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Jacek Caban : shdocvw: Added InstallReg_RunDLL stub.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: d404ff9ce82da66932db1b4885540b29beab0f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d404ff9ce82da66932db1b488… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 27 11:40:20 2014 +0200 shdocvw: Added InstallReg_RunDLL stub. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 96bc44b..81e18df 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -121,7 +121,7 @@ @ stub IEAboutBox @ stub IEWriteErrorLog @ stdcall ImportPrivacySettings(wstr ptr ptr) -@ stub InstallReg_RunDLL +@ stdcall InstallReg_RunDLL(long long str long) @ stdcall OpenURL(long long str long) ieframe.OpenURL @ stub SHGetIDispatchForFolder @ stdcall SetQueryNetSessionCount(long) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 57945b0..3ce5df1 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -542,3 +542,11 @@ HRESULT WINAPI ResetProfileSharing(HWND hwnd) FIXME("(%p) stub\n", hwnd); return E_NOTIMPL; } + +/****************************************************************** + * InstallReg_RunDLL (SHDOCVW.@) + */ +void WINAPI InstallReg_RunDLL(HWND hwnd, HINSTANCE handle, LPCSTR cmdline, INT show) +{ + FIXME("(%p %p %s %x)\n", hwnd, handle, debugstr_a(cmdline), show); +}

1 0

Piotr Caban : msvcrt: Don' t touch _bufsiz value while initializing FILE structure.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 60eb44d8209e9829f21edb159408b8930b68107e URL: http://source.winehq.org/git/wine.git/?a=commit;h=60eb44d8209e9829f21edb159… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 27 10:17:52 2014 +0200 msvcrt: Don't touch _bufsiz value while initializing FILE structure. --- dlls/msvcrt/file.c | 4 +++- dlls/msvcrt/tests/file.c | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 77ec853..44e9339 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -458,9 +458,11 @@ static int msvcrt_init_fp(MSVCRT_FILE* file, int fd, unsigned stream_flags) *MSVCRT__errno() = MSVCRT_EBADF; return -1; } - memset(file, 0, sizeof(*file)); + file->_ptr = file->_base = NULL; + file->_cnt = 0; file->_file = fd; file->_flag = stream_flags; + file->_tmpfname = NULL; TRACE(":got FILE* (%p)\n",file); return 0; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 2fd46f2..c253f88 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1628,7 +1628,7 @@ static void test_fopen_s( void ) const char name[] = "empty1"; char buff[16]; unsigned char *ubuff = (unsigned char*)buff; - FILE *file; + FILE *file, *file2; int ret; int len; @@ -1719,6 +1719,22 @@ static void test_fopen_s( void ) ubuff[0], ubuff[1], ubuff[2]); fclose(file); + /* test initial FILE values */ + memset(file, 0xfe, sizeof(*file)); + file->_flag = 0; + ret = p_fopen_s(&file2, name, "r"); + ok(!ret, "fopen_s failed with %d\n", ret); + ok(file == file2, "file != file2 %p %p\n", file, file2); + ok(!file->_ptr, "file->_ptr != NULL\n"); + ok(!file->_cnt, "file->_cnt != 0\n"); + ok(!file->_base, "file->_base != NULL\n"); + ok(file->_flag == 1, "file->_flag = %x\n", file->_flag); + ok(file->_file, "file->_file == 0\n"); + ok(file->_charbuf == 0xfefefefe, "file->_charbuf = %x\n", file->_charbuf); + ok(file->_bufsiz == 0xfefefefe, "file->_bufsiz = %x\n", file->_bufsiz); + ok(!file->_tmpfname, "file->_tmpfname != NULL\n"); + fclose(file2); + ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); } @@ -2273,7 +2289,6 @@ static void test_write_flush(void) file = fopen(tempf, "wb+"); ok(file != NULL, "unable to create test file\n"); iobuf[0] = 0; - fwrite(iobuf, 1, 1, file); /* needed for wine to init _bufsiz */ ok(file->_bufsiz == 4096, "incorrect default buffer size: %d\n", file->_bufsiz); test_write_flush_size(file, file->_bufsiz); setvbuf(file, iobuf, _IOFBF, sizeof(iobuf));

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 4b594361f91df8b09c187ec83e5fa5139bc5dd9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b594361f91df8b09c187ec83… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jun 26 23:41:43 2014 +0300 po: Update Finnish translation. --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index e9893e5..e82349f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6582,10 +6582,8 @@ msgid "This network connection does not exist.\n" msgstr "Tätä verkkoyhteyttä ei ole.\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Yhteys estetty.\n" +msgstr "Vastapuoli nollasi yhteyden.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Piotr Caban : msvcrt: Use file-> _flag to check if file buffering is enabled.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: fffbc8e570e024558ddd21e2aab5fabf8b2056a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffbc8e570e024558ddd21e2a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 27 10:17:24 2014 +0200 msvcrt: Use file->_flag to check if file buffering is enabled. --- dlls/msvcrt/file.c | 66 +++++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 465a417..77ec853 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -588,7 +588,7 @@ void msvcrt_init_io(void) /* INTERNAL: Flush stdio file buffer */ static int msvcrt_flush_buffer(MSVCRT_FILE* file) { - if(file->_bufsiz) { + if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { int cnt=file->_ptr-file->_base; if(cnt>0 && MSVCRT__write(file->_file, file->_base, cnt) != cnt) { file->_flag |= MSVCRT__IOERR; @@ -627,8 +627,8 @@ static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file) file->_flag |= MSVCRT__IOMYBUF; } else { file->_base = (char*)(&file->_charbuf); - /* put here 2 ??? */ - file->_bufsiz = sizeof(file->_charbuf); + file->_bufsiz = 2; + file->_flag |= MSVCRT__IONBF; } file->_ptr = file->_base; file->_cnt = 0; @@ -641,11 +641,13 @@ static BOOL add_std_buffer(MSVCRT_FILE *file) static char buffers[2][MSVCRT_BUFSIZ]; if((file->_file!=MSVCRT_STDOUT_FILENO && file->_file!=MSVCRT_STDERR_FILENO) - || !MSVCRT__isatty(file->_file) || file->_bufsiz) + || (file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF)) + || !MSVCRT__isatty(file->_file)) return FALSE; file->_ptr = file->_base = buffers[file->_file == MSVCRT_STDOUT_FILENO ? 0 : 1]; file->_bufsiz = file->_cnt = MSVCRT_BUFSIZ; + file->_flag |= MSVCRT__USERBUF; return TRUE; } @@ -656,6 +658,7 @@ static void remove_std_buffer(MSVCRT_FILE *file) msvcrt_flush_buffer(file); file->_ptr = file->_base = NULL; file->_bufsiz = file->_cnt = 0; + file->_flag &= ~MSVCRT__USERBUF; } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ @@ -3413,7 +3416,7 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) } /* Allocate buffer if needed */ - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) + if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) msvcrt_alloc_buffer(file); if(!(file->_flag & MSVCRT__IOREAD)) { @@ -3425,7 +3428,7 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) } } - if(file->_flag & MSVCRT__IONBF) { + 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; @@ -3647,7 +3650,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) { /* Flush output buffer */ - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { + if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { msvcrt_alloc_buffer(file); } if(!(file->_flag & MSVCRT__IOWRT)) { @@ -3656,7 +3659,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) else return MSVCRT_EOF; } - if(file->_bufsiz && !(file->_flag&MSVCRT__IONBF)) { + if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { int res = 0; if(file->_cnt <= 0) { @@ -3706,22 +3709,21 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si written += pcnt; wrcnt -= pcnt; ptr = (const char*)ptr + pcnt; - } else if(!file->_bufsiz && (file->_flag & MSVCRT__IONBF)) { - if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) - file->_flag |= MSVCRT__IOWRT; - else - break; - } + } else if((file->_flag & MSVCRT__IONBF) + || ((file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) && wrcnt >= file->_bufsiz) + || (!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) && wrcnt >= MSVCRT_INTERNAL_BUFSIZ)) { + MSVCRT_size_t pcnt; + int bufsiz; + + if(file->_flag & MSVCRT__IONBF) + bufsiz = 1; + else if(!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) + bufsiz = MSVCRT_INTERNAL_BUFSIZ; + else + bufsiz = file->_bufsiz; + + pcnt = (wrcnt / bufsiz) * bufsiz; - if(MSVCRT__write(file->_file, ptr, wrcnt) <= 0) { - file->_flag |= MSVCRT__IOERR; - break; - } - written += wrcnt; - wrcnt = 0; - } else if(file->_bufsiz && wrcnt >= file->_bufsiz) { - MSVCRT_size_t pcnt=(wrcnt / file->_bufsiz) * file->_bufsiz; if(msvcrt_flush_buffer(file) == MSVCRT_EOF) break; @@ -3939,7 +3941,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm { MSVCRT_size_t rcnt=size * nmemb; MSVCRT_size_t read=0; - int pread=0; + MSVCRT_size_t pread=0; if(!rcnt) return 0; @@ -3963,11 +3965,14 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm return 0; } } + + if(rcnt>0 && !(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) + msvcrt_alloc_buffer(file); + while(rcnt>0) { int i; - if (!file->_cnt && rcnt<MSVCRT_BUFSIZ && !(file->_flag & MSVCRT__IONBF) - && (file->_bufsiz != 0 || msvcrt_alloc_buffer(file))) { + if (!file->_cnt && rcnt<MSVCRT_BUFSIZ && (file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz); file->_ptr = file->_base; i = (file->_cnt<rcnt) ? file->_cnt : rcnt; @@ -3981,8 +3986,8 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm file->_cnt -= i; file->_ptr += i; } - } else if (rcnt > UINT_MAX) { - i = MSVCRT__read(file->_file, ptr, UINT_MAX); + } else if (rcnt > INT_MAX) { + i = MSVCRT__read(file->_file, ptr, INT_MAX); } else if (rcnt < MSVCRT_BUFSIZ) { i = MSVCRT__read(file->_file, ptr, rcnt); } else { @@ -4190,7 +4195,7 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) MSVCRT__unlock_file(file); return -1; } - if(file->_bufsiz) { + if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { if(file->_flag & MSVCRT__IOWRT) { pos += file->_ptr - file->_base; @@ -4879,7 +4884,8 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) return MSVCRT_EOF; MSVCRT__lock_file(file); - if((!file->_bufsiz && msvcrt_alloc_buffer(file)) + if((!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF)) + && msvcrt_alloc_buffer(file)) || (!file->_cnt && file->_ptr==file->_base)) file->_ptr++;

1 0

Christoph von Wittich : shlwapi: Avoid buffer overflow in PathCombineA.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: f26874c523e56c59fd23f002e0d7cae9c4ab840c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26874c523e56c59fd23f002e… Author: Christoph von Wittich <Christoph(a)ApiViewer.de> Date: Thu Jun 26 20:31:35 2014 +0200 shlwapi: Avoid buffer overflow in PathCombineA. --- dlls/shlwapi/path.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 01e3ae7..5c7a88a 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -155,20 +155,21 @@ LPSTR WINAPI PathCombineA(LPSTR lpszDest, LPCSTR lpszDir, LPCSTR lpszFile) if (!lpszDest) return NULL; if (!lpszDir && !lpszFile) - { - lpszDest[0] = 0; - return NULL; - } + goto fail; if (lpszDir) - MultiByteToWideChar(CP_ACP,0,lpszDir,-1,szDir,MAX_PATH); + if (!MultiByteToWideChar(CP_ACP,0,lpszDir,-1,szDir,MAX_PATH)) + goto fail; + if (lpszFile) - MultiByteToWideChar(CP_ACP,0,lpszFile,-1,szFile,MAX_PATH); + if (!MultiByteToWideChar(CP_ACP,0,lpszFile,-1,szFile,MAX_PATH)) + goto fail; if (PathCombineW(szDest, lpszDir ? szDir : NULL, lpszFile ? szFile : NULL)) if (WideCharToMultiByte(CP_ACP,0,szDest,-1,lpszDest,MAX_PATH,0,0)) return lpszDest; +fail: lpszDest[0] = 0; return NULL; }

1 0

Nikolay Sivov : iphlpapi/tests: Skipping test on access error.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 1017a027e7acc41a06cad24946dde4a79f33ac34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1017a027e7acc41a06cad2494… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 27 11:11:45 2014 +0400 iphlpapi/tests: Skipping test on access error. --- dlls/iphlpapi/tests/iphlpapi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 13a21c0..ce68a7b 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -858,6 +858,11 @@ static void testSetTcpEntry(void) } ret = pSetTcpEntry(&row); + if (ret == ERROR_NETWORK_ACCESS_DENIED) + { + win_skip("SetTcpEntry failed with access error. Skipping test.\n"); + return; + } todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); U(row).dwState = MIB_TCP_STATE_DELETE_TCB;

1 0

Henri Verbeet : ddraw/tests: Add some lost device tests.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 1b4c55df296d1cc2daa2bd13394b560caff9bd7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4c55df296d1cc2daa2bd133… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 27 08:26:58 2014 +0200 ddraw/tests: Add some lost device tests. --- dlls/ddraw/tests/ddraw1.c | 100 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 100 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 434 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b4c55df296d1cc2daa2b…

1 0

Henri Verbeet : d3d9/tests: Add some lost device tests.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 04acac207a7b51525255359956cd4335d1eca311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04acac207a7b5152525535995… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 27 08:26:56 2014 +0200 d3d9/tests: Add some lost device tests. --- dlls/d3d9/tests/d3d9ex.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 85 +++++++++++++++++++++++++++++ 2 files changed, 223 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04acac207a7b515252553…

1 0

Henri Verbeet : d3d9: Improve d3d9_device_TestCooperativeLevel().
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 09fda3b805b2defeb04f8df6ca7acbe25f2ae10d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09fda3b805b2defeb04f8df6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 27 08:26:59 2014 +0200 d3d9: Improve d3d9_device_TestCooperativeLevel(). --- dlls/d3d10core/device.c | 6 ++++++ dlls/d3d8/device.c | 6 ++++++ dlls/d3d9/d3d9_private.h | 9 ++++++++- dlls/d3d9/device.c | 40 +++++++++++++++++++++++++++++++++------- dlls/d3d9/tests/device.c | 4 ++-- dlls/ddraw/ddraw.c | 6 ++++++ dlls/wined3d/device.c | 4 ++++ include/wine/wined3d.h | 1 + 8 files changed, 66 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 722b5aa..db3f265 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1935,6 +1935,11 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic TRACE("device_parent %p.\n", device_parent); } +static void CDECL device_parent_activate(struct wined3d_device_parent *device_parent, BOOL activate) +{ + TRACE("device_parent %p, activate %#x.\n", device_parent, activate); +} + static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, void *container_parent, struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops) @@ -2033,6 +2038,7 @@ static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, + device_parent_activate, device_parent_surface_created, device_parent_volume_created, device_parent_create_swapchain_surface, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c83d16c..53a832e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2921,6 +2921,11 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic TRACE("device_parent %p.\n", device_parent); } +static void CDECL device_parent_activate(struct wined3d_device_parent *device_parent, BOOL activate) +{ + TRACE("device_parent %p, activate %#x.\n", device_parent, activate); +} + static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, void *container_parent, struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops) @@ -3034,6 +3039,7 @@ static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, + device_parent_activate, device_parent_surface_created, device_parent_volume_created, device_parent_create_swapchain_surface, diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 8d75f62..8c685e4 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -139,6 +139,13 @@ struct fvf_declaration DWORD fvf; }; +enum d3d9_device_state +{ + D3D9_DEVICE_STATE_OK, + D3D9_DEVICE_STATE_LOST, + D3D9_DEVICE_STATE_NOT_RESET, +}; + struct d3d9_device { IDirect3DDevice9Ex IDirect3DDevice9Ex_iface; @@ -157,8 +164,8 @@ struct d3d9_device UINT index_buffer_size; UINT index_buffer_pos; + LONG device_state; BOOL in_destruction; - BOOL not_reset; BOOL in_scene; }; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 263ac12..57ad1e7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -323,13 +323,21 @@ static HRESULT WINAPI d3d9_device_TestCooperativeLevel(IDirect3DDevice9Ex *iface TRACE("iface %p.\n", iface); - if (device->not_reset) + TRACE("device state: %#x.\n", device->device_state); + + if (device->d3d_parent->extended) + return D3D_OK; + + switch (device->device_state) { - TRACE("D3D9 device is marked not reset.\n"); - return D3DERR_DEVICENOTRESET; + default: + case D3D9_DEVICE_STATE_OK: + return D3D_OK; + case D3D9_DEVICE_STATE_LOST: + return D3DERR_DEVICELOST; + case D3D9_DEVICE_STATE_NOT_RESET: + return D3DERR_DEVICENOTRESET; } - - return D3D_OK; } static UINT WINAPI d3d9_device_GetAvailableTextureMem(IDirect3DDevice9Ex *iface) @@ -621,9 +629,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback, !device->d3d_parent->extended); if (FAILED(hr) && !device->d3d_parent->extended) - device->not_reset = TRUE; + device->device_state = D3D9_DEVICE_STATE_NOT_RESET; else - device->not_reset = FALSE; + device->device_state = D3D9_DEVICE_STATE_OK; wined3d_mutex_unlock(); return hr; @@ -3414,6 +3422,23 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic TRACE("device_parent %p.\n", device_parent); } +static void CDECL device_parent_activate(struct wined3d_device_parent *device_parent, BOOL activate) +{ + struct d3d9_device *device = device_from_device_parent(device_parent); + + TRACE("device_parent %p, activate %#x.\n", device_parent, activate); + + if (!device->d3d_parent) + return; + + if (!activate) + InterlockedCompareExchange(&device->device_state, D3D9_DEVICE_STATE_LOST, D3D9_DEVICE_STATE_OK); + else if (device->d3d_parent->extended) + InterlockedCompareExchange(&device->device_state, D3D9_DEVICE_STATE_OK, D3D9_DEVICE_STATE_LOST); + else + InterlockedCompareExchange(&device->device_state, D3D9_DEVICE_STATE_NOT_RESET, D3D9_DEVICE_STATE_LOST); +} + static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, void *container_parent, struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops) @@ -3531,6 +3556,7 @@ static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, + device_parent_activate, device_parent_surface_created, device_parent_volume_created, device_parent_create_swapchain_surface, diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bfd5e5a..edf3fa8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -8930,7 +8930,7 @@ static void test_lost_device(void) ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); hr = IDirect3DDevice9_TestCooperativeLevel(device); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); @@ -8939,7 +8939,7 @@ static void test_lost_device(void) ret = SetForegroundWindow(window); ok(ret, "Failed to set foreground window.\n"); hr = IDirect3DDevice9_TestCooperativeLevel(device); - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b62d5f6..617474b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4722,6 +4722,11 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic ERR("Failed to resize window.\n"); } +static void CDECL device_parent_activate(struct wined3d_device_parent *device_parent, BOOL activate) +{ + TRACE("device_parent %p, activate %#x.\n", device_parent, activate); +} + static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, void *container_parent, struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops) @@ -4846,6 +4851,7 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, + device_parent_activate, device_parent_surface_created, device_parent_volume_created, device_parent_create_swapchain_surface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4cd6342..65f4ad7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4775,6 +4775,10 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL { device->device_parent->ops->mode_changed(device->device_parent); } + else if (message == WM_ACTIVATEAPP) + { + device->device_parent->ops->activate(device->device_parent, wparam); + } if (unicode) return CallWindowProcW(proc, window, message, wparam, lparam); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 328b595..f21abaf 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1981,6 +1981,7 @@ struct wined3d_device_parent_ops { void (__cdecl *wined3d_device_created)(struct wined3d_device_parent *device_parent, struct wined3d_device *device); void (__cdecl *mode_changed)(struct wined3d_device_parent *device_parent); + void (__cdecl *activate)(struct wined3d_device_parent *device_parent, BOOL activate); HRESULT (__cdecl *surface_created)(struct wined3d_device_parent *device_parent, void *container_parent, struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops); HRESULT (__cdecl *volume_created)(struct wined3d_device_parent *device_parent, void *container_parent,

1 0

Henri Verbeet : d3d8/tests: Add some lost device tests.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: e6de1cbdc96c1ac0f41c0776dc97fbad60ab446d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6de1cbdc96c1ac0f41c0776d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 27 08:26:57 2014 +0200 d3d8/tests: Add some lost device tests. --- dlls/d3d8/tests/device.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e3197d2..376097e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6248,6 +6248,94 @@ static void test_writeonly_resource(void) DestroyWindow(window); } +static void test_lost_device(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + BOOL ret; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, FALSE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_TestCooperativeLevel(device); + if (hr == D3DERR_DEVICELOST) + { + win_skip("Broken TestCooperativeLevel(), skipping test.\n"); + IDirect3DDevice8_Release(device); + goto done; + } + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window.\n"); + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + + hr = reset_device(device, window, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = reset_device(device, window, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window.\n"); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = reset_device(device, window, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -6333,6 +6421,7 @@ START_TEST(device) test_resource_type(); test_mipmap_lock(); test_writeonly_resource(); + test_lost_device(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : d3d9: Check the device status in present calls.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: d50350886a3e15da29f29f7b3fb539e19a80d6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50350886a3e15da29f29f7b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 27 08:27:00 2014 +0200 d3d9: Check the device status in present calls. --- dlls/d3d9/device.c | 6 ++++++ dlls/d3d9/swapchain.c | 4 ++++ dlls/d3d9/tests/d3d9ex.c | 4 ++-- dlls/d3d9/tests/device.c | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 57ad1e7..2d9a192 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -646,6 +646,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex * TRACE("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p.\n", iface, src_rect, dst_rect, dst_window_override, dirty_region); + if (device->device_state != D3D9_DEVICE_STATE_OK) + return device->d3d_parent->extended ? S_PRESENT_OCCLUDED : D3DERR_DEVICELOST; + wined3d_mutex_lock(); hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, dst_window_override, dirty_region, 0); @@ -3085,6 +3088,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_PresentEx(IDirect3DDevice9Ex iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region, flags); + if (device->device_state != D3D9_DEVICE_STATE_OK) + return S_PRESENT_OCCLUDED; + wined3d_mutex_lock(); hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, dst_window_override, dirty_region, flags); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index d44b449..5cf56d2 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -115,12 +115,16 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai const RGNDATA *dirty_region, DWORD flags) { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(swapchain->parent_device); HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region, flags); + if (device->device_state != D3D9_DEVICE_STATE_OK) + return device->d3d_parent->extended ? S_PRESENT_OCCLUDED : D3DERR_DEVICELOST; + wined3d_mutex_lock(); hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, src_rect, dst_rect, dst_window_override, dirty_region, flags); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 07d1c06..89238c8 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1226,9 +1226,9 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_PresentEx(device, NULL, NULL, NULL, NULL, 0); - todo_wine ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); todo_wine ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index edf3fa8..b11771f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -8932,7 +8932,7 @@ static void test_lost_device(void) hr = IDirect3DDevice9_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); ret = ShowWindow(window, SW_RESTORE); ok(ret, "Failed to restore window.\n"); @@ -8941,7 +8941,7 @@ static void test_lost_device(void) hr = IDirect3DDevice9_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = reset_device(device, window, FALSE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : scrrun/tests: Run test on fixed drive.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: ffe16a567e056231265440b6dd682b1ab2cfb945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe16a567e056231265440b6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 27 10:06:01 2014 +0400 scrrun/tests: Run test on fixed drive. --- dlls/scrrun/tests/filesystem.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 9410732..6042241 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1795,7 +1795,6 @@ static void test_SerialNumber(void) IDriveCollection *drives; IEnumVARIANT *iter; IDrive *drive; - VARIANT var; LONG serial; HRESULT hr; BSTR name; @@ -1805,13 +1804,31 @@ static void test_SerialNumber(void) hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter); ok(hr == S_OK, "got 0x%08x\n", hr); + IDriveCollection_Release(drives); - hr = IEnumVARIANT_Next(iter, 1, &var, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + while (1) { + DriveTypeConst type; + VARIANT var; - hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); - ok(hr == S_OK, "got 0x%08x\n", hr); - VariantClear(&var); + hr = IEnumVARIANT_Next(iter, 1, &var, NULL); + if (hr == S_FALSE) { + skip("No fixed drive found, skipping test.\n"); + IEnumVARIANT_Release(iter); + return; + } + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); + + hr = IDrive_get_DriveType(drive, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (type == Fixed) + break; + + IDrive_Release(drive); + } hr = IDrive_get_SerialNumber(drive, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -1841,7 +1858,6 @@ static void test_SerialNumber(void) IDrive_Release(drive); IEnumVARIANT_Release(iter); - IDriveCollection_Release(drives); } START_TEST(filesystem)

1 0

Matteo Bruni : d3dx9: Correctly set parent_data for direct includes from the main file.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: d64ec66b416a9ee0ecff5a5a1387f67b1387fa7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64ec66b416a9ee0ecff5a5a1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 26 19:52:33 2014 +0200 d3dx9: Correctly set parent_data for direct includes from the main file. --- dlls/d3dx9_36/shader.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 68e7474..b36e7bb 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -219,6 +219,20 @@ HRESULT WINAPI D3DXAssembleShader(const char *data, UINT data_len, const D3DXMAC return hr; } +static const void *main_file_data; + +static CRITICAL_SECTION from_file_mutex; +static CRITICAL_SECTION_DEBUG from_file_mutex_debug = +{ + 0, 0, &from_file_mutex, + { + &from_file_mutex_debug.ProcessLocksList, + &from_file_mutex_debug.ProcessLocksList + }, + 0, 0, {(DWORD_PTR)(__FILE__ ": from_file_mutex")} +}; +static CRITICAL_SECTION from_file_mutex = {&from_file_mutex_debug, -1, 0, 0, 0, 0}; + /* D3DXInclude private implementation, used to implement * D3DXAssembleShaderFromFile() from D3DXAssembleShader(). */ /* To be able to correctly resolve include search paths we have to store the @@ -233,8 +247,15 @@ static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_T HANDLE file; UINT size; - if(parent_data != NULL) + if (parent_data) + { parent_name = *((const char **)parent_data - 1); + } + else + { + if (main_file_data) + parent_name = *((const char **)main_file_data - 1); + } TRACE("Looking up for include file %s, parent %s\n", debugstr_a(filename), debugstr_a(parent_name)); @@ -265,6 +286,8 @@ static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_T goto error; *data = buffer + 1; + if (!main_file_data) + main_file_data = *data; CloseHandle(file); return S_OK; @@ -280,6 +303,8 @@ static HRESULT WINAPI d3dincludefromfile_close(ID3DXInclude *iface, const void * { HeapFree(GetProcessHeap(), 0, *((char **)data - 1)); HeapFree(GetProcessHeap(), 0, (char **)data - 1); + if (main_file_data == data) + main_file_data = NULL; return S_OK; } @@ -339,9 +364,11 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR return E_OUTOFMEMORY; WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + EnterCriticalSection(&from_file_mutex); hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { + LeaveCriticalSection(&from_file_mutex); HeapFree(GetProcessHeap(), 0, filename_a); return D3DXERR_INVALIDDATA; } @@ -349,6 +376,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR hr = D3DXAssembleShader(buffer, len, defines, include, flags, shader, error_messages); ID3DXInclude_Close(include, buffer); + LeaveCriticalSection(&from_file_mutex); HeapFree(GetProcessHeap(), 0, filename_a); return hr; } @@ -471,9 +499,11 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO return E_OUTOFMEMORY; WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, filename_len, NULL, NULL); + EnterCriticalSection(&from_file_mutex); hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { + LeaveCriticalSection(&from_file_mutex); HeapFree(GetProcessHeap(), 0, filename_a); return D3DXERR_INVALIDDATA; } @@ -487,6 +517,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO constant_table); ID3DXInclude_Close(include, buffer); + LeaveCriticalSection(&from_file_mutex); HeapFree(GetProcessHeap(), 0, filename_a); return hr; } @@ -591,9 +622,11 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA return E_OUTOFMEMORY; WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + EnterCriticalSection(&from_file_mutex); hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { + LeaveCriticalSection(&from_file_mutex); HeapFree(GetProcessHeap(), 0, filename_a); return D3DXERR_INVALIDDATA; } @@ -604,6 +637,7 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA (ID3DBlob **)shader, (ID3DBlob **)error_messages); ID3DXInclude_Close(include, buffer); + LeaveCriticalSection(&from_file_mutex); HeapFree(GetProcessHeap(), 0, filename_a); return hr; }

1 0

Alexander Almaleh : gdi32: Fix XFORM.eM22 calculation in PlgBlt.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 8762842cd337a809a6504420da2aeeeb5d3618b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8762842cd337a809a6504420d… Author: Alexander Almaleh <sashoalm(a)gmail.com> Date: Thu Jun 26 14:56:49 2014 +0300 gdi32: Fix XFORM.eM22 calculation in PlgBlt. --- dlls/gdi32/bitblt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 4750d1b..762ca0f 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -1037,7 +1037,7 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, /* Y components */ xf.eM12 = (plg[1].y*(rect[2].y - rect[0].y) - plg[2].y*(rect[1].y - rect[0].y) - plg[0].y*(rect[2].y - rect[1].y)) / det; - xf.eM22 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; + xf.eM22 = (rect[1].x*(plg[2].y - plg[0].y) - rect[2].x*(plg[1].y - plg[0].y) - rect[0].x*(plg[2].y - plg[1].y)) / det; xf.eDy = (rect[0].x*(rect[1].y*plg[2].y - rect[2].y*plg[1].y) - rect[1].x*(rect[0].y*plg[2].y - rect[2].y*plg[0].y) + rect[2].x*(rect[0].y*plg[1].y - rect[1].y*plg[0].y)

1 0

Matteo Bruni : wpp: Correctly handle OOM in pop_buffer().
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: b5db97ac51cf3ec962d7f26c87130c1b5ac747b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5db97ac51cf3ec962d7f26c8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 26 19:52:32 2014 +0200 wpp: Correctly handle OOM in pop_buffer(). --- libs/wpp/ppl.l | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 0ce64c2..243049a 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1354,19 +1354,20 @@ static bufferstackentry_t *pop_buffer(void) if(ppp) { iep = pp_xmalloc(sizeof(includelogicentry_t)); - if(!iep) - return NULL; - - iep->ppp = ppp; - ppp->iep = iep; - iep->filename = bufferstack[bufferstackidx].include_filename; - iep->prev = NULL; - iep->next = pp_includelogiclist; - if(iep->next) - iep->next->prev = iep; - pp_includelogiclist = iep; - if(pp_status.debug) - fprintf(stderr, "pop_buffer: %s:%d: includelogic added, include_ppp='%s', file='%s'\n", bufferstack[bufferstackidx].filename, bufferstack[bufferstackidx].line_number, pp_incl_state.ppp, iep->filename); + if (iep) + { + iep->ppp = ppp; + ppp->iep = iep; + iep->filename = bufferstack[bufferstackidx].include_filename; + iep->prev = NULL; + iep->next = pp_includelogiclist; + if(iep->next) + iep->next->prev = iep; + pp_includelogiclist = iep; + if(pp_status.debug) + fprintf(stderr, "pop_buffer: %s:%d: includelogic added, include_ppp='%s', file='%s'\n", + bufferstack[bufferstackidx].filename, bufferstack[bufferstackidx].line_number, pp_incl_state.ppp, iep->filename); + } } } free(pp_incl_state.ppp);

1 0

Matteo Bruni : wpp: Free some filename strings after processing an include (Valgrind).
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 1b79df4e80c4135217ea56a20ab6c3dee5144b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b79df4e80c4135217ea56a20… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 26 19:52:31 2014 +0200 wpp: Free some filename strings after processing an include (Valgrind). --- libs/wpp/ppl.l | 16 +++++++++++----- libs/wpp/wpp.c | 8 ++++++-- libs/wpp/wpp_private.h | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 9655e34..0ce64c2 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -213,7 +213,7 @@ typedef struct bufferstackentry { pp_entry_t *define; /* Points to expanding define or NULL if handling includes */ int line_number; /* Line that we were handling */ int char_number; /* The current position on that line */ - const char *filename; /* Filename that we were handling */ + char *filename; /* Filename that we were handling */ int if_depth; /* How many #if:s deep to check matching #endif:s */ int ncontinuations; /* Remember the continuation state */ int should_pop; /* Set if we must pop the start-state on EOF */ @@ -1340,6 +1340,8 @@ static bufferstackentry_t *pop_buffer(void) bufferstack[bufferstackidx].define->expanding = 0; else { + includelogicentry_t *iep = NULL; + if(!bufferstack[bufferstackidx].should_pop) { wpp_callbacks->close(pp_status.file); @@ -1351,7 +1353,7 @@ static bufferstackentry_t *pop_buffer(void) pp_entry_t *ppp = pplookup(pp_incl_state.ppp); if(ppp) { - includelogicentry_t *iep = pp_xmalloc(sizeof(includelogicentry_t)); + iep = pp_xmalloc(sizeof(includelogicentry_t)); if(!iep) return NULL; @@ -1366,17 +1368,21 @@ static bufferstackentry_t *pop_buffer(void) if(pp_status.debug) fprintf(stderr, "pop_buffer: %s:%d: includelogic added, include_ppp='%s', file='%s'\n", bufferstack[bufferstackidx].filename, bufferstack[bufferstackidx].line_number, pp_incl_state.ppp, iep->filename); } - else - free(bufferstack[bufferstackidx].include_filename); } free(pp_incl_state.ppp); pp_incl_state = bufferstack[bufferstackidx].incl; } + if (bufferstack[bufferstackidx].include_filename) + { + free(pp_status.input); + pp_status.input = bufferstack[bufferstackidx].filename; + } pp_status.line_number = bufferstack[bufferstackidx].line_number; pp_status.char_number = bufferstack[bufferstackidx].char_number; - pp_status.input = bufferstack[bufferstackidx].filename; ncontinuations = bufferstack[bufferstackidx].ncontinuations; + if (!iep) + free(bufferstack[bufferstackidx].include_filename); } if(ppy_debug) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 66eb026..60b2d38 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -206,7 +206,7 @@ int wpp_parse( const char *input, FILE *output ) return 2; } - pp_status.input = input; + pp_status.input = input ? pp_xstrdup(input) : NULL; ppy_out = output; pp_writestring("# 1 \"%s\" 1\n", input ? input : ""); @@ -215,7 +215,11 @@ int wpp_parse( const char *input, FILE *output ) /* If there were errors during processing, return an error code */ if (!ret && pp_status.state) ret = pp_status.state; - if (input) wpp_callbacks->close(pp_status.file); + if (input) + { + wpp_callbacks->close(pp_status.file); + free(pp_status.input); + } /* Clean if_stack, it could remain dirty on errors */ while (pp_get_if_depth()) pp_pop_if(); del_special_defines(); diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index 4e2aa5b..caa52b9 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -228,7 +228,7 @@ void pp_internal_error(const char *file, int line, const char *s, ...) __attribu /* everything is in this structure to avoid polluting the global symbol space */ struct pp_status { - const char *input; /* current input file name */ + char *input; /* current input file name */ void *file; /* current input file descriptor */ int line_number; /* current line number */ int char_number; /* current char number in line */

1 0

Jacek Caban : ieframe: Use URL_APPLY_DEFAULT in UrlApplyScheme call.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 333fbba681ec2214d57bddb6c2ddf6b249090218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333fbba681ec2214d57bddb6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 26 11:58:57 2014 +0200 ieframe: Use URL_APPLY_DEFAULT in UrlApplyScheme call. --- dlls/ieframe/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 886fa01..f3e0d0d 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -667,7 +667,7 @@ static HRESULT create_moniker(LPCWSTR url, IMoniker **mon) return CreateURLMoniker(NULL, url, mon); size = sizeof(new_url)/sizeof(WCHAR); - hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE); + hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT); TRACE("was %s got %s\n", debugstr_w(url), debugstr_w(new_url)); if(FAILED(hres)) { WARN("UrlApplyScheme failed: %08x\n", hres);

1 0

Piotr Caban : msvcrt: Fix _flsbuf behavior on streams with MSVCRT__IONBF flag.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: f91f24f6e739db14950514db99bab614dd11fe50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91f24f6e739db14950514db9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 26 12:29:48 2014 +0200 msvcrt: Fix _flsbuf behavior on streams with MSVCRT__IONBF flag. --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b60e306..70b908a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3656,7 +3656,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) else return MSVCRT_EOF; } - if(file->_bufsiz) { + if(file->_bufsiz && !(file->_flag&MSVCRT__IONBF)) { int res = 0; if(file->_cnt <= 0) {

1 0

Piotr Caban : msvcr110: Add __crtInitializeCriticalSectionEx implementation.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 8715d89c4942bb19914243347d470248b4f8cfe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8715d89c4942bb19914243347… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 26 14:23:07 2014 +0200 msvcr110: Add __crtInitializeCriticalSectionEx implementation. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcrt/misc.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4127725..2f9ad70 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -921,7 +921,7 @@ @ cdecl __crtGetShowWindowMode() MSVCR110__crtGetShowWindowMode @ stub -arch=i386,win64 __crtGetTimeFormatEx @ stub -arch=i386,win64 __crtGetUserDefaultLocaleName -@ stub -arch=i386,win64 __crtInitializeCriticalSectionEx +@ cdecl -arch=i386,win64 __crtInitializeCriticalSectionEx(ptr long long) MSVCR110__crtInitializeCriticalSectionEx @ stub __crtIsPackagedApp @ stub -arch=i386,win64 __crtIsValidLocaleName @ cdecl __crtLCMapStringA(long long str long ptr long long long) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 4e67cba..d791699 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -480,3 +480,13 @@ int CDECL MSVCR110__crtGetShowWindowMode(void) TRACE("window=%d\n", si.wShowWindow); return si.wShowWindow; } + +/********************************************************************* + * __crtInitializeCriticalSectionEx (MSVCR110.@) + */ +BOOL CDECL MSVCR110__crtInitializeCriticalSectionEx( + CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags) +{ + TRACE("(%p %x %x)\n", cs, spin_count, flags); + return InitializeCriticalSectionEx(cs, spin_count, flags); +}

1 0

Piotr Caban : msvcp110: Add _Mtx_{destroy, getconcrtcs, init, lock, unlock, trylock} implementation.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 3fa2bb2dce9b52b24e512580241185888716fc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa2bb2dce9b52b24e5125802… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 26 13:46:09 2014 +0200 msvcp110: Add _Mtx_{destroy,getconcrtcs,init,lock,unlock,trylock} implementation. --- dlls/msvcp110/msvcp110.spec | 12 ++--- dlls/msvcp90/misc.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 25 +++++++++++ dlls/msvcp90/msvcp_main.c | 32 ++++++++++++++ dlls/msvcrt/lock.c | 1 + 5 files changed, 168 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 331df11..5fc5348 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3819,14 +3819,14 @@ @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner @ stub _Mtx_current_owns -@ stub _Mtx_destroy -@ stub _Mtx_getconcrtcs -@ stub _Mtx_init -@ stub _Mtx_lock +@ cdecl _Mtx_destroy(ptr) +@ cdecl _Mtx_getconcrtcs(ptr) +@ cdecl _Mtx_init(ptr long) +@ cdecl _Mtx_lock(ptr) @ stub _Mtx_reset_owner @ stub _Mtx_timedlock -@ stub _Mtx_trylock -@ stub _Mtx_unlock +@ cdecl _Mtx_trylock(ptr) +@ cdecl _Mtx_unlock(ptr) @ stub _Mtxdst @ stub _Mtxinit @ stub _Mtxlock diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 1c3bd2f..abd53d7 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -374,3 +374,107 @@ unsigned int __cdecl _Random_device(void) return ret; } #endif + +#if _MSVCP_VER >= 110 +#if defined(__i386__) && !defined(__arm__) + +#define THISCALL(func) __thiscall_ ## func +#define __thiscall __stdcall +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void THISCALL(func)(void); \ + __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) + +extern void *call_thiscall_func; +__ASM_GLOBAL_FUNC(call_thiscall_func, + "popl %eax\n\t" + "popl %edx\n\t" + "popl %ecx\n\t" + "pushl %eax\n\t" + "jmp *%edx\n\t") + +#define call_func1(func,this) ((void* (WINAPI*)(void*,void*))&call_thiscall_func)(func,this) + +#else /* __i386__ */ + +#define __thiscall __cdecl +#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ + +#define call_func1(func,this) func(this) + +#endif /* __i386__ */ + +#define MTX_MULTI_LOCK 0x100 +#define MTX_LOCKED 3 +typedef struct +{ + DWORD flags; + critical_section cs; + DWORD thread_id; + DWORD count; +} *_Mtx_t; + +int __cdecl _Mtx_init(_Mtx_t *mtx, int flags) +{ + if(flags & ~MTX_MULTI_LOCK) + FIXME("unknown flags ignorred: %x\n", flags); + + *mtx = MSVCRT_operator_new(sizeof(**mtx)); + (*mtx)->flags = flags; + call_func1(critical_section_ctor, &(*mtx)->cs); + (*mtx)->thread_id = -1; + (*mtx)->count = 0; + return 0; +} + +void __cdecl _Mtx_destroy(_Mtx_t *mtx) +{ + call_func1(critical_section_dtor, &(*mtx)->cs); + MSVCRT_operator_delete(*mtx); +} + +int __cdecl _Mtx_lock(_Mtx_t *mtx) +{ + if((*mtx)->thread_id != GetCurrentThreadId()) { + call_func1(critical_section_lock, &(*mtx)->cs); + (*mtx)->thread_id = GetCurrentThreadId(); + }else if(!((*mtx)->flags & MTX_MULTI_LOCK)) { + return MTX_LOCKED; + } + + (*mtx)->count++; + return 0; +} + +int __cdecl _Mtx_unlock(_Mtx_t *mtx) +{ + if(--(*mtx)->count) + return 0; + + (*mtx)->thread_id = -1; + call_func1(critical_section_unlock, &(*mtx)->cs); + return 0; +} + +int __cdecl _Mtx_trylock(_Mtx_t *mtx) +{ + if((*mtx)->thread_id != GetCurrentThreadId()) { + if(!call_func1(critical_section_trylock, &(*mtx)->cs)) + return MTX_LOCKED; + (*mtx)->thread_id = GetCurrentThreadId(); + }else if(!((*mtx)->flags & MTX_MULTI_LOCK)) { + return MTX_LOCKED; + } + + (*mtx)->count++; + return 0; +} + +critical_section* __cdecl _Mtx_getconcrtcs(_Mtx_t *mtx) +{ + return &(*mtx)->cs; +} +#endif diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 0d5e124..5062bdc 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -45,6 +45,31 @@ extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); extern void (__cdecl *MSVCRT_operator_delete)(void*); extern void* (__cdecl *MSVCRT_set_new_handler)(void*); +#if _MSVCP_VER >= 110 +/* keep in sync with msvcrt/lock.c */ +typedef struct cs_queue +{ + struct cs_queue *next; + BOOL free; + int unknown; +} cs_queue; + +typedef struct +{ + ULONG_PTR unk_thread_id; + cs_queue unk_active; + void *unknown[2]; + cs_queue *head; + void *tail; +} critical_section; + +extern critical_section* (__thiscall *critical_section_ctor)(critical_section*); +extern void (__thiscall *critical_section_dtor)(critical_section*); +extern void (__thiscall *critical_section_lock)(critical_section*); +extern void (__thiscall *critical_section_unlock)(critical_section*); +extern MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); +#endif + /* basic_string<char, char_traits<char>, allocator<char>> */ #define BUF_SIZE_CHAR 16 typedef struct diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 489aacb..edbdd50 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -60,6 +60,14 @@ void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*); +#if _MSVCP_VER >= 110 +critical_section* (__thiscall *critical_section_ctor)(critical_section*); +void (__thiscall *critical_section_dtor)(critical_section*); +void (__thiscall *critical_section_lock)(critical_section*); +void (__thiscall *critical_section_unlock)(critical_section*); +MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); +#endif + #define VERSION_STRING(ver) #ver #define MSVCRT_NAME(ver) "msvcr" VERSION_STRING(ver) ".dll" @@ -74,12 +82,36 @@ static void init_cxx_funcs(void) MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AH_K(a)ZP6AH0@Z(a)Z"); + +#if _MSVCP_VER >= 110 + critical_section_ctor = (void*)GetProcAddress(hmod, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); + critical_section_dtor = (void*)GetProcAddress(hmod, "??1critical_section(a)Concurrency@@QEAA(a)XZ"); + critical_section_lock = (void*)GetProcAddress(hmod, "?lock(a)critical_section@Concurrency@@QEAAXXZ"); + critical_section_unlock = (void*)GetProcAddress(hmod, "?unlock(a)critical_section@Concurrency@@QEAAXXZ"); + critical_section_trylock = (void*)GetProcAddress(hmod, "?try_lock(a)critical_section@Concurrency@@QEAA_NXZ"); +#endif } else { MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AHI(a)ZP6AHI@Z(a)Z"); + +#if _MSVCP_VER >= 110 +#ifdef __arm__ + critical_section_ctor = (void*)GetProcAddress(hmod, "??0critical_section(a)Concurrency@@QAA(a)XZ"); + critical_section_dtor = (void*)GetProcAddress(hmod, "??1critical_section(a)Concurrency@@QAA(a)XZ"); + critical_section_lock = (void*)GetProcAddress(hmod, "?lock(a)critical_section@Concurrency@@QAAXXZ"); + critical_section_unlock = (void*)GetProcAddress(hmod, "?unlock(a)critical_section@Concurrency@@QAAXXZ"); + critical_section_trylock = (void*)GetProcAddress(hmod, "?try_lock(a)critical_section@Concurrency@@QAA_NXZ"); +#else + critical_section_ctor = (void*)GetProcAddress(hmod, "??0critical_section(a)Concurrency@@QAE(a)XZ"); + critical_section_dtor = (void*)GetProcAddress(hmod, "??1critical_section(a)Concurrency@@QAE(a)XZ"); + critical_section_lock = (void*)GetProcAddress(hmod, "?lock(a)critical_section@Concurrency@@QAEXXZ"); + critical_section_unlock = (void*)GetProcAddress(hmod, "?unlock(a)critical_section@Concurrency@@QAEXXZ"); + critical_section_trylock = (void*)GetProcAddress(hmod, "?try_lock(a)critical_section@Concurrency@@QAE_NXZ"); +#endif +#endif /* _MSVCP_VER >= 110 */ } } diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index aee8d2b..328b5b5 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -287,6 +287,7 @@ MSVCRT_bool __thiscall SpinWait__SpinOnce(SpinWait *this) static HANDLE keyed_event; +/* keep in sync with msvcp90/msvcp90.h */ typedef struct cs_queue { struct cs_queue *next;

1 0

Piotr Caban : msvcrt: Fix ungetc on files with empty buffer.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 1ae475dae8ea927a659dca762cd3f51b6c894a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae475dae8ea927a659dca762… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 26 12:29:54 2014 +0200 msvcrt: Fix ungetc on files with empty buffer. --- dlls/msvcrt/file.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 70b908a..fe2d144 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4859,12 +4859,17 @@ int CDECL MSVCRT_printf_s(const char *format, ...) */ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) { - if (c == MSVCRT_EOF) + if(!MSVCRT_CHECK_PMT(file != NULL)) return MSVCRT_EOF; + + if (c == MSVCRT_EOF || !(file->_flag&MSVCRT__IOREAD || + (file->_flag&MSVCRT__IORW && !(file->_flag&MSVCRT__IOWRT)))) return MSVCRT_EOF; MSVCRT__lock_file(file); - if(file->_bufsiz == 0 && msvcrt_alloc_buffer(file)) + if((!file->_bufsiz && msvcrt_alloc_buffer(file)) + || (!file->_cnt && file->_ptr==file->_base)) file->_ptr++; + if(file->_ptr>file->_base) { file->_ptr--; if(file->_flag & MSVCRT__IOSTRG) { @@ -4878,6 +4883,7 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) } file->_cnt++; MSVCRT_clearerr(file); + file->_flag |= MSVCRT__IOREAD; MSVCRT__unlock_file(file); return c; }

1 0

Jacek Caban : shdocvw: Added ResetProfileSharing stub.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: bf2d38fbc1224f14674f58485d34eeff70a1b3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2d38fbc1224f14674f58485… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 26 11:35:30 2014 +0200 shdocvw: Added ResetProfileSharing stub. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 1cdeff4..96bc44b 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -46,7 +46,7 @@ 161 stub @ # CSearchAssistantOC::OnDraw 162 stub -noname CDDEAuto_Navigate 163 stub SHAddSubscribeFavorite -164 stub -noname ResetProfileSharing +164 stdcall -noname ResetProfileSharing(long) 165 stub -noname URLSubstitution 167 stub -noname IsIEDefaultBrowser 169 stdcall -noname ParseURLFromOutsideSourceA(str ptr ptr ptr) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 5095696..57945b0 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -533,3 +533,12 @@ BOOL WINAPI ImportPrivacySettings(LPCWSTR filename, BOOL *pGlobalPrefs, BOOL * p return TRUE; } + +/****************************************************************** + * ResetProfileSharing (SHDOCVW.164) + */ +HRESULT WINAPI ResetProfileSharing(HWND hwnd) +{ + FIXME("(%p) stub\n", hwnd); + return E_NOTIMPL; +}

1 0