March 2018 - Wine-devel - list.winehq.org

GSOC
by Dushyant Pratap Singh 03 Mar '18

03 Mar '18

Hello Wine community, My name is Dushyant and I am interested in Gsoc at Wine .I am pursuing Integrated B.Tech (Computer Science) and M.Tech (software engineering) from Gautam Buddha University, India. Currently I am in 4th year of the programme. I have experience in Competitive Programming (primary language C++) and have won and participated in many of the Algorithmic & Data Structures competitions. Here is my Linkedin: https://www.linkedin.com/in/dushyant-pratap-singh-044658128/ Project that i am interested in are 1) Implement Calculator App :- I can code the Calculator in C ,i need some pointers how to connect it with wine. 2)Make explorer.exe more useful :- I need some pointers on how to build a patch for this. Regards Dushyant Pratap Singh

1 0

[PATCH 1/2 v3] kernel32: Support MOVEFILE_WRITE_THROUGH / CopyFileExW progress
by Tom Watson 03 Mar '18

03 Mar '18

Signed-off-by: Tom Watson <coder(a)tommywatson.com> --- v3 C99 build issues

1 0

[PATCH 2/2 v2] kernel32: Support MOVEFILE_WRITE_THROUGH / CopyFileExW progress
by Tom Watson 03 Mar '18

03 Mar '18

Signed-off-by: Tom Watson <coder(a)tommywatson.com> --- v2 patch format failed

2 1

[PATCH 1/2 v2] kernel32: Support MOVEFILE_WRITE_THROUGH / CopyFileExW progress
by Tom Watson 03 Mar '18

03 Mar '18

Signed-off-by: Tom Watson <coder(a)tommywatson.com> --- v2 patch format failed

1 0

[PATCH 2/2] kernel32/tests: MOVEFILE_WRITE_THROUGH / CopyFileExW progress
by Tom Watson 03 Mar '18

03 Mar '18

Signed-off-by: Tom Watson <coder(a)tommywatson.com> --- dlls/kernel32/tests/file.c | 107 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 410c3f0591..43b9143322 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4964,6 +4964,112 @@ static void test_GetFileAttributesExW(void) ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); } +// constant defined in path.c, CopyFileExW() +#define MFWP_CopyFileExW_BufferLength 65536 +#define MFWP_MB 128 // 128 MB file +#define MFWP_Kilo 1024 +#define MFWP_ExpectedChunks ((MFWP_MB*MFWP_Kilo*MFWP_Kilo)/MFWP_CopyFileExW_BufferLength) +static int test_MFWPChunks = 0; +static int test_MFWPFailTest = 0; +DWORD CALLBACK test_MoveFileWithProgressWCB(LARGE_INTEGER TotalFileSize, + LARGE_INTEGER TotalBytesTransferred, + LARGE_INTEGER StreamSize, + LARGE_INTEGER StreamBytesTransferred, + DWORD dwStreamNumber, DWORD dwCallbackReason, + HANDLE hSourceFile,HANDLE hDestinationFile, + LPVOID lpData ) +{ + int rval = 0; + ++test_MFWPChunks; + if(test_MFWPFailTest) + { + if (test_MFWPChunks > MFWP_ExpectedChunks/2) + { + rval=test_MFWPFailTest; + //trace("Exit %d at %d\n",rval,test_MFWPChunks); + } + } + //trace("Chunk %d %d\n",test_MFWPChunks,TotalBytesTransferred.QuadPart); + if(TotalBytesTransferred.QuadPart == TotalFileSize.QuadPart ) { + //trace("Chunks %d == %d\n",test_MFWPChunks,MFWP_ExpectedChunks); + ok(MFWP_ExpectedChunks == test_MFWPChunks,"Invalid move? %d chunks",test_MFWPChunks); + } + return rval; +} + +static void test_MoveFileWithProgressW(void) +{ + char temp_path[MAX_PATH],tmpl[MAX_PATH]; + char source[MAX_PATH], dest[MAX_PATH]; + WCHAR wsrc[MAX_PATH],wdst[MAX_PATH]; + static const char prefix[] = {'p','f','x',0}; + char temp[2] = { 0, 0 }; + char buffer[1024]; + HANDLE handle; + DWORD ret; + + trace("Running MoveFileWithProgressW() tests..."); + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret != 0, "GetTempPathA error %d\n", GetLastError()); + ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); + + ret = GetTempFileNameA(temp_path, prefix, 0, tmpl); + ok(ret != 0, "GetTempFileNameW error %d\n", GetLastError()); + MultiByteToWideChar(CP_ACP,0,tmpl,-1,wdst,MAX_PATH); + ok(TRUE == DeleteFileW(wdst), "Failed to remove file %s\n",dest); + + // create dummy data + snprintf(source,MAX_PATH,"%s.0",tmpl); + handle=CreateFileA(source, GENERIC_WRITE, 0, NULL, CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, 0); + ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + for(int megs=0; megs<MFWP_MB; ++megs) + { + for(int kilos=0; kilos<MFWP_Kilo; ++kilos) + { + ok(TRUE == WriteFile(handle, buffer, sizeof(buffer), NULL, NULL), + "Write file error %d\n", GetLastError()); + } + } + ok(CloseHandle(handle) == TRUE, "Cannot close file %d\n",GetLastError()); + // move the file a few times + for(int i=0;i<10;) + { + *temp='0'+i++; + snprintf(source,MAX_PATH,"%s.%s",tmpl,temp); + *temp='0'+i%10; + snprintf(dest,MAX_PATH,"%s.%s",tmpl,temp); + //trace("%s -> %s\n",source,dest); + MultiByteToWideChar(CP_ACP,0,source,-1,wsrc,MAX_PATH); + MultiByteToWideChar(CP_ACP,0,dest,-1,wdst,MAX_PATH); + test_MFWPChunks=0; + ok(TRUE == MoveFileWithProgressW(wsrc,wdst,test_MoveFileWithProgressWCB, + 0,MOVEFILE_WRITE_THROUGH), + "Failed to move file %s to %s\n",source,dest); + } + // fail to move the file + // stop will leave the 1/2 copied file in the directory + test_MFWPFailTest=PROGRESS_STOP; + test_MFWPChunks=0; + ok(FALSE == MoveFileWithProgressW(wdst,wsrc,test_MoveFileWithProgressWCB, + 0,MOVEFILE_WRITE_THROUGH), + "Moved file %s to %s????\n",source,dest); + ok(TRUE == DeleteFileW(wsrc), "File should exist %s\n",source); + + // fail to move the file + // Cancel will delete the requested file + test_MFWPFailTest=PROGRESS_CANCEL; + test_MFWPChunks=0; + ok(FALSE == MoveFileWithProgressW(wdst,wsrc,test_MoveFileWithProgressWCB, + 0,MOVEFILE_WRITE_THROUGH), + "Moved file %s to %s????\n",source,dest); + ok(FALSE == DeleteFileW(wsrc), "Copy failed to clean up file %s\n",source); + // clean up + ok(TRUE == DeleteFileW(wdst), "Failed to remove file %s\n",dest); + +} + + START_TEST(file) { InitFunctionPointers(); @@ -4989,6 +5095,7 @@ START_TEST(file) test_DeleteFileW(); test_MoveFileA(); test_MoveFileW(); + test_MoveFileWithProgressW(); test_FindFirstFileA(); test_FindNextFileA(); test_FindFirstFile_wildcards(); -- 2.14.1

2 1

[PATCH 1/2] kernel32: Support MOVEFILE_WRITE_THROUGH / CopyFileExW progress
by Tom Watson 03 Mar '18

03 Mar '18

Signed-off-by: Tom Watson <coder(a)tommywatson.com> --- dlls/kernel32/path.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 101 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a389743171..98891cde6d 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -43,6 +43,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); #define MAX_PATHNAME_LEN 1024 +/* struct to hold progress function callback for MoveFileWithProgressW */ +typedef struct { + LPPROGRESS_ROUTINE progress; + VOID *data; + BOOL status; /* flush successful */ +} MFWFData; + static int path_safe_mode = -1; /* path mode set by SetSearchPathMode */ /* check if a file name is for an executable file (.exe or .com) */ @@ -1159,10 +1166,14 @@ BOOL WINAPI CopyFileExW(LPCWSTR source, LPCWSTR dest, static const int buffer_size = 65536; HANDLE h1, h2; BY_HANDLE_FILE_INFORMATION info; + LARGE_INTEGER file_position,file_size; DWORD count; BOOL ret = FALSE; char *buffer; + DWORD progressExit = 0; + /* init file size/position */ + file_position.QuadPart=file_size.QuadPart=0; if (!source || !dest) { SetLastError(ERROR_INVALID_PARAMETER); @@ -1193,6 +1204,10 @@ BOOL WINAPI CopyFileExW(LPCWSTR source, LPCWSTR dest, return FALSE; } + /* update total size */ + file_size.LowPart = info.nFileSizeLow; + file_size.HighPart = info.nFileSizeHigh; + if (!(flags & COPY_FILE_FAIL_IF_EXISTS)) { BOOL same_file = FALSE; @@ -1231,6 +1246,32 @@ BOOL WINAPI CopyFileExW(LPCWSTR source, LPCWSTR dest, if (!WriteFile( h2, p, count, &res, NULL ) || !res) goto done; p += res; count -= res; + file_position.QuadPart += res; + } + /* Call progress function ? */ + if (progress != NULL) { + progressExit = progress(file_size, file_position, file_size, + file_position, 1, CALLBACK_CHUNK_FINISHED, h1, h2, param); + switch (progressExit) { + case PROGRESS_CONTINUE: + // keep at it + break; + case PROGRESS_QUIET: + // requested not to be called again + progress = NULL; + break; + case PROGRESS_CANCEL: + // cancel and clean up + CloseHandle( h2 ); + h2 = INVALID_HANDLE_VALUE; + DeleteFileW( dest ); + SetLastError( ERROR_REQUEST_ABORTED ); + goto done; + case PROGRESS_STOP: + // do nothing, allow for a restart (??) + SetLastError( ERROR_REQUEST_ABORTED ); + goto done; + } } } ret = TRUE; @@ -1239,7 +1280,10 @@ done: SetFileTime(h2, NULL, NULL, &info.ftLastWriteTime); HeapFree( GetProcessHeap(), 0, buffer ); CloseHandle( h1 ); - CloseHandle( h2 ); + if (h2 != INVALID_HANDLE_VALUE) + { + CloseHandle( h2 ); + } return ret; } @@ -1269,6 +1313,39 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename, } +/************************************************************************** + * moveFileWFlush + */ +DWORD CALLBACK moveFileWFlush(LARGE_INTEGER TotalFileSize, + LARGE_INTEGER TotalBytesTransferred, + LARGE_INTEGER StreamSize, + LARGE_INTEGER StreamBytesTransferred, + DWORD dwStreamNumber, DWORD dwCallbackReason, + HANDLE hSourceFile,HANDLE hDestinationFile, + LPVOID lpData ) +{ + MFWFData *data = (MFWFData *)lpData; + DWORD rval = 0; + + if ( data->progress != NULL) + { + rval = data->progress( TotalFileSize, TotalBytesTransferred, + StreamSize, StreamBytesTransferred, + dwStreamNumber, dwCallbackReason, + hSourceFile, hDestinationFile, data->data); + } + /* continue the copy? */ + if (rval == 0 ) { + /* completed the copy? */ + if (TotalFileSize.QuadPart == TotalBytesTransferred.QuadPart) + { + /* flush the data */ + data->status = FlushFileBuffers(hDestinationFile)?1:0; + } + } + return rval; +} + /************************************************************************** * MoveFileWithProgressW (KERNEL32.@) */ @@ -1293,9 +1370,6 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, if (!dest) return DeleteFileW( source ); - if (flag & MOVEFILE_WRITE_THROUGH) - FIXME("MOVEFILE_WRITE_THROUGH unimplemented\n"); - /* check if we are allowed to rename the source */ if (!RtlDosPathNameToNtPathName_U( source, &nt_name, NULL, NULL )) @@ -1369,8 +1443,30 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } /* now perform the rename */ + if ((flag & MOVEFILE_WRITE_THROUGH) && !(flag & MOVEFILE_DELAY_UNTIL_REBOOT)) + { + /* save the original progress function && param, set status to 0 */ + MFWFData data; + data.progress = fnProgress; + data.data = param; + data.status = 0; + /* try to copy the file, if it fails or the flush failed, set error */ + if (CopyFileExW( source, dest, moveFileWFlush, &data, NULL, 0) == 0 + || !data.status) { + /* failed, set error */ + FILE_SetDosError(); + goto error; + } - if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) + /* delete the source file */ + if (!DeleteFileW( source )) + { + /* failed, set error */ + FILE_SetDosError(); + goto error; + } + } + else if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) { if (errno == EXDEV && (flag & MOVEFILE_COPY_ALLOWED)) { -- 2.14.1

1 0

(no subject)
by Rajitha Opanayaka 02 Mar '18

02 Mar '18

I'm a Computer Engineering student from University of Peradeniya, Sri Lanka and interested in the GSoC project idea on 'Implement calculator app' which is available at Wine GSoC ideas. I'm quite familiar with C and As it seems there are bugs in other calculator apps. are their specifications on the implement calculator app. Thanks Rajitha.

2 1

[v3 PATCH] d3dx9: Improve argument validation in CloneEffect()
by Nikolay Sivov 02 Mar '18

02 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 9 ++ dlls/d3dx9_36/tests/effect.c | 203 ++++++++++++++++++++++++++----------------- 2 files changed, 133 insertions(+), 79 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f8c480303c..a98495e555 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4367,6 +4367,15 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, FIXME("(%p)->(%p, %p): stub\n", This, device, effect); + if (!effect) + return D3DERR_INVALIDCALL; + + if (This->base_effect.flags & D3DXFX_NOT_CLONEABLE) + return E_FAIL; + + if (!device) + return D3DERR_INVALIDCALL; + return E_NOTIMPL; } diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 1900f3eac1..fda31237e1 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -149,6 +149,46 @@ static void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *in } } +static IDirect3DDevice9 *create_device(HWND *window) +{ + D3DPRESENT_PARAMETERS present_parameters = { 0 }; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + HRESULT hr; + HWND wnd; + + *window = NULL; + + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window.\n"); + return NULL; + } + + if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Couldn't create IDirect3D9 object.\n"); + DestroyWindow(wnd); + return NULL; + } + + present_parameters.Windowed = TRUE; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_HARDWARE_VERTEXPROCESSING, + &present_parameters, &device); + IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x.\n", hr); + DestroyWindow(wnd); + return NULL; + } + + *window = wnd; + return device; +} + static const char effect_desc[] = "Technique\n" "{\n" @@ -7063,40 +7103,18 @@ static const DWORD test_effect_unsupported_shader_blob[] = static void test_effect_unsupported_shader(void) { - D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DVertexShader9 *vshader; unsigned int passes_count; IDirect3DDevice9 *device; UINT byte_code_size; ID3DXEffect *effect; - IDirect3D9 *d3d; void *byte_code; ULONG refcount; HWND window; HRESULT hr; - if (!(window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, - 640, 480, NULL, NULL, NULL, NULL))) - { - skip("Couldn't create application window\n"); - return; - } - if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) - { - skip("Couldn't create IDirect3D9 object\n"); - DestroyWindow(window); + if (!(device = create_device(&window))) return; - } - present_parameters.Windowed = TRUE; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - if (FAILED(hr)) { - skip("Failed to create IDirect3DDevice9 object, hr %#x\n", hr); - IDirect3D9_Release(d3d); - DestroyWindow(window); - return; - } hr = D3DXCreateEffectEx(device, test_effect_unsupported_shader_blob, sizeof(test_effect_unsupported_shader_blob), NULL, NULL, NULL, 0, NULL, &effect, NULL); @@ -7168,7 +7186,6 @@ static void test_effect_unsupported_shader(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -7217,11 +7234,9 @@ static const DWORD test_effect_null_shader_blob[] = static void test_effect_null_shader(void) { - D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device; ID3DXEffect *effect; D3DXPASS_DESC desc; - IDirect3D9 *d3d; D3DXHANDLE pass; ULONG refcount; HWND window; @@ -7230,29 +7245,8 @@ static void test_effect_null_shader(void) /* Creating a fresh device because the existing device can have invalid * render states from previous tests. If IDirect3DDevice9_ValidateDevice() * returns certain error codes, native ValidateTechnique() fails. */ - if (!(window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, - 640, 480, NULL, NULL, NULL, NULL))) - { - skip("Failed to create window.\n"); + if (!(device = create_device(&window))) return; - } - if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) - { - skip("Failed to create IDirect3D9 object.\n"); - DestroyWindow(window); - return; - } - present_parameters.Windowed = TRUE; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - if (FAILED(hr)) - { - skip("Failed to create IDirect3DDevice9 object, hr %#x.\n", hr); - IDirect3D9_Release(d3d); - DestroyWindow(window); - return; - } hr = D3DXCreateEffectEx(device, test_effect_null_shader_blob, sizeof(test_effect_null_shader_blob), NULL, NULL, NULL, 0, NULL, &effect, NULL); @@ -7290,42 +7284,95 @@ static void test_effect_null_shader(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D9_Release(d3d); DestroyWindow(window); } -START_TEST(effect) +static void test_effect_clone(void) { - HWND wnd; - IDirect3D9 *d3d; - IDirect3DDevice9 *device; - D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device, *device2, *device3; + ID3DXEffect *effect, *cloned; + HWND window, window2; HRESULT hr; - ULONG refcount; - if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, - 640, 480, NULL, NULL, NULL, NULL))) - { - skip("Couldn't create application window\n"); + if (!(device = create_device(&window))) return; - } - if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) - { - skip("Couldn't create IDirect3D9 object\n"); - DestroyWindow(wnd); - return; - } - ZeroMemory(&d3dpp, sizeof(d3dpp)); - d3dpp.Windowed = TRUE; - d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); - if (FAILED(hr)) { - skip("Failed to create IDirect3DDevice9 object %#x\n", hr); - IDirect3D9_Release(d3d); - DestroyWindow(wnd); + /* D3DXFX_NOT_CLONEABLE */ + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, D3DXFX_NOT_CLONEABLE, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->CloneEffect(effect, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + cloned = (void *)0xdeadbeef; + hr = effect->lpVtbl->CloneEffect(effect, NULL, &cloned); + ok(hr == E_FAIL, "Got result %#x.\n", hr); + ok(cloned == (void *)0xdeadbeef, "Unexpected effect pointer.\n"); + + hr = effect->lpVtbl->CloneEffect(effect, device, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + cloned = (void *)0xdeadbeef; + hr = effect->lpVtbl->CloneEffect(effect, device, &cloned); + ok(hr == E_FAIL, "Got result %#x.\n", hr); + ok(cloned == (void *)0xdeadbeef, "Unexpected effect pointer.\n"); + + effect->lpVtbl->Release(effect); + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->CloneEffect(effect, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + cloned = (void *)0xdeadbeef; + hr = effect->lpVtbl->CloneEffect(effect, NULL, &cloned); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + ok(cloned == (void *)0xdeadbeef, "Unexpected effect pointer.\n"); + + hr = effect->lpVtbl->CloneEffect(effect, device, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->CloneEffect(effect, device, &cloned); +todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); +if (hr == D3D_OK) +{ + ok(cloned != effect, "Expected new effect instance.\n"); + cloned->lpVtbl->Release(cloned); +} + /* Try with different device. */ + device2 = create_device(&window2); + hr = effect->lpVtbl->CloneEffect(effect, device2, &cloned); +todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); +if (hr == D3D_OK) +{ + ok(cloned != effect, "Expected new effect instance.\n"); + + hr = cloned->lpVtbl->GetDevice(cloned, &device3); + ok(hr == S_OK, "Failed to get effect device.\n"); + ok(device3 == device2, "Unexpected device instance.\n"); + IDirect3DDevice9_Release(device3); + + cloned->lpVtbl->Release(cloned); +} + IDirect3DDevice9_Release(device2); + DestroyWindow(window2); + DestroyWindow(window); + + effect->lpVtbl->Release(effect); +} + +START_TEST(effect) +{ + IDirect3DDevice9 *device; + HWND wnd; + + if (!(device = create_device(&wnd))) return; - } test_create_effect_and_pool(device); test_create_effect_compiler(); @@ -7347,12 +7394,10 @@ START_TEST(effect) test_effect_get_pass_desc(device); test_effect_skip_constants(device); - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); - refcount = IDirect3D9_Release(d3d); - ok(!refcount, "D3D9 object has %u references left.\n", refcount); + IDirect3DDevice9_Release(device); DestroyWindow(wnd); test_effect_unsupported_shader(); test_effect_null_shader(); + test_effect_clone(); } -- 2.16.1

2 1

[PATCH 2/2] comctl32/tests: Add out of visible area item expand test
by Piotr Caban 02 Mar '18

02 Mar '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/tests/treeview.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)

1 0

[PATCH v4] msvcrt: Compile but show an error if Bessel functions aren't available
by Alex Henrie 02 Mar '18

02 Mar '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v4: - Matched style of surrounding code - Changed sqrt(-1) to NAN --- configure.ac | 8 +++++++- dlls/msvcrt/math.c | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 2e99320371..e198018427 100644 --- a/configure.ac +++ b/configure.ac @@ -2698,6 +2698,9 @@ AC_CHECK_FUNCS(\ exp2f \ expm1 \ expm1f \ + j0 \ + j1 \ + jn \ lgamma \ lgammaf \ llrint \ @@ -2722,7 +2725,10 @@ AC_CHECK_FUNCS(\ round \ roundf \ trunc \ - truncf + truncf \ + y0 \ + y1 \ + yn ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9b480117fc..a3af78a798 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1412,7 +1412,12 @@ INT CDECL MSVCRT__isnan(double num) double CDECL MSVCRT__j0(double num) { /* FIXME: errno handling */ +#ifdef HAVE_J0 return j0(num); +#else + FIXME("not implemented\n"); + return 0; +#endif } /********************************************************************* @@ -1421,7 +1426,12 @@ double CDECL MSVCRT__j0(double num) double CDECL MSVCRT__j1(double num) { /* FIXME: errno handling */ +#ifdef HAVE_J1 return j1(num); +#else + FIXME("not implemented\n"); + return 0; +#endif } /********************************************************************* @@ -1430,7 +1440,12 @@ double CDECL MSVCRT__j1(double num) double CDECL MSVCRT__jn(int n, double num) { /* FIXME: errno handling */ +#ifdef HAVE_JN return jn(n, num); +#else + FIXME("not implemented\n"); + return 0; +#endif } /********************************************************************* @@ -1440,12 +1455,17 @@ double CDECL MSVCRT__y0(double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_Y0 retval = y0(num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; - retval = sqrt(-1); + retval = NAN; } +#else + FIXME("not implemented\n"); + retval = 0; +#endif return retval; } @@ -1456,12 +1476,17 @@ double CDECL MSVCRT__y1(double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_Y1 retval = y1(num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; - retval = sqrt(-1); + retval = NAN; } +#else + FIXME("not implemented\n"); + retval = 0; +#endif return retval; } @@ -1472,12 +1497,17 @@ double CDECL MSVCRT__yn(int order, double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_YN retval = yn(order,num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; - retval = sqrt(-1); + retval = NAN; } +#else + FIXME("not implemented\n"); + retval = 0; +#endif return retval; } -- 2.16.2

2 1