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

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