September 2013 - Wine-Commits

Nikolay Sivov : include: Added a definition for CopyFile2.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 2785c83b702b8e0d08bf80b3b4102f1e169711b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2785c83b702b8e0d08bf80b3b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 12 10:06:11 2013 +0400 include: Added a definition for CopyFile2. --- include/winbase.h | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index cfdea58..5032595 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -913,6 +913,119 @@ typedef DWORD (CALLBACK *LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE typedef DWORD (WINAPI *APPLICATION_RECOVERY_CALLBACK)(PVOID); +typedef enum _COPYFILE2_MESSAGE_TYPE +{ + COPYFILE2_CALLBACK_NONE = 0, + COPYFILE2_CALLBACK_CHUNK_STARTED, + COPYFILE2_CALLBACK_CHUNK_FINISHED, + COPYFILE2_CALLBACK_STREAM_STARTED, + COPYFILE2_CALLBACK_STREAM_FINISHED, + COPYFILE2_CALLBACK_POLL_CONTINUE, + COPYFILE2_CALLBACK_ERROR, + COPYFILE2_CALLBACK_MAX, +} COPYFILE2_MESSAGE_TYPE; + +typedef enum _COPYFILE2_MESSAGE_ACTION +{ + COPYFILE2_PROGRESS_CONTINUE = 0, + COPYFILE2_PROGRESS_CANCEL, + COPYFILE2_PROGRESS_STOP, + COPYFILE2_PROGRESS_QUIET, + COPYFILE2_PROGRESS_PAUSE, +} COPYFILE2_MESSAGE_ACTION; + +typedef enum _COPYFILE2_COPY_PHASE +{ + COPYFILE2_PHASE_NONE = 0, + COPYFILE2_PHASE_PREPARE_SOURCE, + COPYFILE2_PHASE_PREPARE_DEST, + COPYFILE2_PHASE_READ_SOURCE, + COPYFILE2_PHASE_WRITE_DESTINATION, + COPYFILE2_PHASE_SERVER_COPY, + COPYFILE2_PHASE_NAMEGRAFT_COPY, + COPYFILE2_PHASE_MAX, +} COPYFILE2_COPY_PHASE; + +typedef struct COPYFILE2_MESSAGE +{ + COPYFILE2_MESSAGE_TYPE Type; + DWORD dwPadding; + union + { + struct + { + DWORD dwStreamNumber; + DWORD dwReserved; + HANDLE hSourceFile; + HANDLE hDestinationFile; + ULARGE_INTEGER uliChunkNumber; + ULARGE_INTEGER uliChunkSize; + ULARGE_INTEGER uliStreamSize; + ULARGE_INTEGER uliTotalFileSize; + } ChunkStarted; + struct + { + DWORD dwStreamNumber; + DWORD dwFlags; + HANDLE hSourceFile; + HANDLE hDestinationFile; + ULARGE_INTEGER uliChunkNumber; + ULARGE_INTEGER uliChunkSize; + ULARGE_INTEGER uliStreamSize; + ULARGE_INTEGER uliStreamBytesTransferred; + ULARGE_INTEGER uliTotalFileSize; + ULARGE_INTEGER uliTotalBytesTransferred; + } ChunkFinished; + struct + { + DWORD dwStreamNumber; + DWORD dwReserved; + HANDLE hSourceFile; + HANDLE hDestinationFile; + ULARGE_INTEGER uliStreamSize; + ULARGE_INTEGER uliTotalFileSize; + } StreamStarted; + struct + { + DWORD dwStreamNumber; + DWORD dwReserved; + HANDLE hSourceFile; + HANDLE hDestinationFile; + ULARGE_INTEGER uliStreamSize; + ULARGE_INTEGER uliStreamBytesTransferred; + ULARGE_INTEGER uliTotalFileSize; + ULARGE_INTEGER uliTotalBytesTransferred; + } StreamFinished; + struct + { + DWORD dwReserved; + } PollContinue; + struct + { + COPYFILE2_COPY_PHASE CopyPhase; + DWORD dwStreamNumber; + HRESULT hrFailure; + DWORD dwReserved; + ULARGE_INTEGER uliChunkNumber; + ULARGE_INTEGER uliStreamSize; + ULARGE_INTEGER uliStreamBytesTransferred; + ULARGE_INTEGER uliTotalFileSize; + ULARGE_INTEGER uliTotalBytesTransferred; + } Error; + } Info; +} COPYFILE2_MESSAGE; + +typedef COPYFILE2_MESSAGE_ACTION (CALLBACK *PCOPYFILE2_PROGRESS_ROUTINE)(const COPYFILE2_MESSAGE*,PVOID); + +typedef struct COPYFILE2_EXTENDED_PARAMETERS +{ + DWORD dwSize; + DWORD dwCopyFlags; + BOOL *pfCancel; + PCOPYFILE2_PROGRESS_ROUTINE pProgressRoutine; + PVOID pvCallbackContext; +} COPYFILE2_EXTENDED_PARAMETERS; + #define CREATE_EVENT_MANUAL_RESET 1 #define CREATE_EVENT_INITIAL_SET 2 @@ -1462,6 +1575,7 @@ WINBASEAPI HANDLE WINAPI ConvertToGlobalHandle(HANDLE hSrc); WINBASEAPI BOOL WINAPI CopyFileA(LPCSTR,LPCSTR,BOOL); WINBASEAPI BOOL WINAPI CopyFileW(LPCWSTR,LPCWSTR,BOOL); #define CopyFile WINELIB_NAME_AW(CopyFile) +WINBASEAPI HRESULT WINAPI CopyFile2(PCWSTR,PCWSTR,COPYFILE2_EXTENDED_PARAMETERS*); WINBASEAPI BOOL WINAPI CopyFileExA(LPCSTR, LPCSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL, DWORD); WINBASEAPI BOOL WINAPI CopyFileExW(LPCWSTR, LPCWSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL, DWORD); #define CopyFileEx WINELIB_NAME_AW(CopyFileEx)

1 0

Henri Verbeet : ddraw: Just set the render target to NULL in d3d_device_inner_Release().
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 3c6d11706fd5d71c1781f75f19ddab5e9f91d7cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6d11706fd5d71c1781f75f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 12 09:20:53 2013 +0200 ddraw: Just set the render target to NULL in d3d_device_inner_Release(). The wined3d front buffer is not a render target. --- dlls/ddraw/device.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2c02d65..c0332d9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -245,10 +245,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) if (This->vertex_buffer) wined3d_buffer_decref(This->vertex_buffer); - /* Set the device up to render to the front buffer since the back - * buffer will vanish soon. */ - wined3d_device_set_render_target(This->wined3d_device, 0, - This->ddraw->wined3d_frontbuffer, TRUE); + wined3d_device_set_render_target(This->wined3d_device, 0, NULL, FALSE); /* Release the wined3d device. This won't destroy it. */ if (!wined3d_device_decref(This->wined3d_device))

1 0

Henri Verbeet : wined3d: Allow the first render target to be set to NULL.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 1a78667862139fea1491453deddf285b52f85870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a78667862139fea1491453de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 12 09:20:52 2013 +0200 wined3d: Allow the first render target to be set to NULL. Note that it still isn't necessarily safe to render in this case, because there are places where we assume the first render target is always non-NULL in order to determine e.g. framebuffer dimensions. It's now the responsibility of the caller to ensure that doesn't happen. --- dlls/d3d9/device.c | 6 ++++++ dlls/ddraw/device.c | 11 ++++++++--- dlls/wined3d/device.c | 10 ++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 17664b1..a70832d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1226,6 +1226,12 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO return D3DERR_INVALIDCALL; } + if (!idx && !surface_impl) + { + WARN("Trying to set render target 0 to NULL.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); hr = wined3d_device_set_render_target(device->wined3d_device, idx, surface_impl ? surface_impl->wined3d_surface : NULL, TRUE); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 15145c0..2c02d65 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1827,10 +1827,15 @@ static HRESULT d3d_device_set_render_target(struct d3d_device *device, struct dd wined3d_mutex_unlock(); return D3D_OK; } + if (!target) + { + WARN("Trying to set render target to NULL.\n"); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } device->target = target; - hr = wined3d_device_set_render_target(device->wined3d_device, 0, - target ? target->wined3d_surface : NULL, FALSE); - if(hr != D3D_OK) + if (FAILED(hr = wined3d_device_set_render_target(device->wined3d_device, + 0, target->wined3d_surface, FALSE))) { wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b0137f..ef0ba9e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1350,7 +1350,8 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) TRACE("Setting rendertarget 0 to NULL\n"); device->fb.render_targets[0] = NULL; TRACE("Releasing the render target at %p\n", surface); - wined3d_surface_decref(surface); + if (surface) + wined3d_surface_decref(surface); context_release(context); @@ -4482,13 +4483,6 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - /* Render target 0 can't be set to NULL. */ - if (!render_target && !render_target_idx) - { - WARN("Trying to set render target 0 to NULL.\n"); - return WINED3DERR_INVALIDCALL; - } - if (render_target && !(render_target->resource.usage & WINED3DUSAGE_RENDERTARGET)) { FIXME("Surface %p doesn't have render target usage.\n", render_target);

1 0

Nikolay Sivov : kernel32: Support activation context in SearchPath().
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 41057a174dde0d7a881b11014c258023066a7e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41057a174dde0d7a881b11014… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 11 12:18:25 2013 +0400 kernel32: Support activation context in SearchPath(). --- dlls/kernel32/path.c | 160 ++++++++++++++++++++++++++++++++++++++++++-- dlls/kernel32/tests/path.c | 47 ++++++++++++-- 2 files changed, 195 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41057a174dde0d7a881b1…

1 0

Dmitry Timoshkov : kernel32/tests: Add a read/write test for a COM port.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: d15e08ae5e180eb1ac6570b9295390b7c297a61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15e08ae5e180eb1ac6570b92… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 11 14:42:54 2013 +0900 kernel32/tests: Add a read/write test for a COM port. --- dlls/kernel32/tests/comm.c | 226 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 226 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d15e08ae5e180eb1ac657…

1 0

Nikolay Sivov : ntdll: Try application manifest path when searching for dependent assemblies.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 37182e3f0ffdf462d48a098405089388aa7bc28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=37182e3f0ffdf462d48a09840… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 10 20:16:17 2013 +0400 ntdll: Try application manifest path when searching for dependent assemblies. --- dlls/kernel32/tests/actctx.c | 68 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/path.c | 1 - dlls/ntdll/actctx.c | 27 ++++++++++++---- 3 files changed, 88 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ae44fb4..631e2c0 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -28,6 +28,7 @@ #include "initguid.h" static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); +static HANDLE (WINAPI *pCreateActCtxA)(PCACTCTXA); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static BOOL (WINAPI *pFindActCtxSectionStringW)(DWORD,const GUID *,ULONG,LPCWSTR,PACTCTX_SECTION_KEYED_DATA); @@ -1964,12 +1965,78 @@ static void init_paths(void) lstrcpyW(app_manifest_path+lstrlenW(app_manifest_path), dot_manifest); } +static void write_manifest(const char *filename, const char *manifest) +{ + HANDLE file; + DWORD size; + CHAR path[MAX_PATH]; + + GetTempPathA(sizeof(path)/sizeof(CHAR), path); + strcat(path, filename); + + file = CreateFileA(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + WriteFile(file, manifest, strlen(manifest), &size, NULL); + CloseHandle(file); +} + +static void delete_manifest_file(const char *filename) +{ + CHAR path[MAX_PATH]; + + GetTempPathA(sizeof(path)/sizeof(CHAR), path); + strcat(path, filename); + DeleteFileA(path); +} + +static void test_CreateActCtx(void) +{ + CHAR path[MAX_PATH], dir[MAX_PATH]; + ACTCTXA actctx; + HANDLE handle; + + GetTempPathA(sizeof(path)/sizeof(CHAR), path); + strcat(path, "main_wndcls.manifest"); + + write_manifest("testdep1.manifest", manifest_wndcls1); + write_manifest("testdep2.manifest", manifest_wndcls2); + write_manifest("main_wndcls.manifest", manifest_wndcls_main); + + memset(&actctx, 0, sizeof(ACTCTXA)); + actctx.cbSize = sizeof(ACTCTXA); + actctx.lpSource = path; + + /* create using lpSource without specified directory */ + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "failed to generate context, error %u\n", GetLastError()); + pReleaseActCtx(handle); + + /* with specified directory, that doesn't contain dependent assembly */ + GetWindowsDirectoryA(dir, sizeof(dir)/sizeof(CHAR)); + + memset(&actctx, 0, sizeof(ACTCTXA)); + actctx.cbSize = sizeof(ACTCTXA); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpAssemblyDirectory = dir; + actctx.lpSource = path; + + handle = pCreateActCtxA(&actctx); +todo_wine + ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, + "got handle %p, supposed to fail\n", handle); + if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx(handle); + + delete_manifest_file("main.manifest"); + delete_manifest_file("testdep1.manifest"); +} + static BOOL init_funcs(void) { HMODULE hKernel32 = GetModuleHandle("kernel32"); #define X(f) if (!(p##f = (void*)GetProcAddress(hKernel32, #f))) return FALSE; X(ActivateActCtx); + X(CreateActCtxA); X(CreateActCtxW); X(DeactivateActCtx); X(FindActCtxSectionStringW); @@ -2003,5 +2070,6 @@ START_TEST(actctx) } test_actctx(); + test_CreateActCtx(); run_child_process(); } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index fd40547..601c2e5 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1621,7 +1621,6 @@ static HANDLE test_create(const char *file) actctx.lpSource = manifest_path; handle = pCreateActCtxW(&actctx); -todo_wine ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 259e395..795f7c6 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2767,6 +2767,7 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, NTSTATUS status; UNICODE_STRING nameW; HANDLE file; + DWORD len; TRACE( "looking for name=%s version=%s arch=%s\n", debugstr_w(ai->name), debugstr_version(&ai->version), debugstr_w(ai->arch) ); @@ -2775,9 +2776,12 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, /* FIXME: add support for language specific lookup */ + len = max(RtlGetFullPathName_U(acl->actctx->assemblies->manifest.info, 0, NULL, NULL) / sizeof(WCHAR), + strlenW(acl->actctx->appdir.info)); + nameW.Buffer = NULL; if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, - (strlenW(acl->actctx->appdir.info) + 2 * strlenW(ai->name) + 2) * sizeof(WCHAR) + sizeof(dotManifestW) ))) + (len + 2 * strlenW(ai->name) + 2) * sizeof(WCHAR) + sizeof(dotManifestW) ))) return STATUS_NO_MEMORY; if (!(directory = build_assembly_dir( ai ))) @@ -2786,16 +2790,25 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, return STATUS_NO_MEMORY; } - /* lookup in appdir\name.dll - * appdir\name.manifest - * appdir\name\name.dll - * appdir\name\name.manifest + /* Lookup in <dir>\name.dll + * <dir>\name.manifest + * <dir>\name\name.dll + * <dir>\name\name.manifest + * + * First 'appdir' is used as <dir>, if that failed + * it tries application manifest file path. */ strcpyW( buffer, acl->actctx->appdir.info ); p = buffer + strlenW(buffer); - for (i = 0; i < 2; i++) + for (i = 0; i < 4; i++) { - *p++ = '\\'; + if (i == 2) + { + struct assembly *assembly = acl->actctx->assemblies; + if (!RtlGetFullPathName_U(assembly->manifest.info, len * sizeof(WCHAR), buffer, &p)) break; + } + else *p++ = '\\'; + strcpyW( p, ai->name ); p += strlenW(p);

1 0

Austin English : msiexec: Add a fixme for administrative installs.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: e55aea83cdd94084fc819633ee4bdc4571746c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55aea83cdd94084fc819633e… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 10 13:46:57 2013 -0700 msiexec: Add a fixme for administrative installs. --- programs/msiexec/msiexec.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 0944955..1b688a5 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -630,6 +630,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; StringListAppend(&property_list, ActionAdmin); + WINE_FIXME("Administrative installs are not currently supported\n"); } else if(msi_option_prefix(argvW[i], "f")) {

1 0

Dmitry Timoshkov : ntdll: Add support to NtWriteFile for special offset -1.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: ea7f9737bd855287d72e78e0f598387989eb7342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7f9737bd855287d72e78e0f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 10 20:20:03 2013 +0900 ntdll: Add support to NtWriteFile for special offset -1. --- dlls/ntdll/file.c | 18 ++++++++++++++++-- dlls/ntdll/tests/file.c | 15 --------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9420df5..f7f80e6 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -969,8 +969,22 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) { + off_t off = offset->QuadPart; + + if (offset->QuadPart == (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */) + { + struct stat st; + + if (fstat( unix_handle, &st ) == -1) + { + status = FILE_GetNtStatus(); + goto done; + } + off = st.st_size; + } + /* async I/O doesn't make sense on regular files */ - while ((result = pwrite( unix_handle, buffer, length, offset->QuadPart )) == -1) + while ((result = pwrite( unix_handle, buffer, length, off )) == -1) { if (errno != EINTR) { @@ -982,7 +996,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) /* update file pointer position */ - lseek( unix_handle, offset->QuadPart + result, SEEK_SET ); + lseek( unix_handle, off + result, SEEK_SET ); total = result; status = STATUS_SUCCESS; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 86f8a77..0b2a764 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1976,25 +1976,10 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents + 7, sizeof(contents) - 7, &offset, NULL); -todo_wine ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); -todo_wine ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); -todo_wine ok(iob.Information == sizeof(contents) - 7, "expected sizeof(contents)-7, got %lu\n", iob.Information); - /* FIXME: Remove once Wine is fixed */ - if (status != STATUS_SUCCESS) - { - iob.Status = -1; - iob.Information = -1; - offset.QuadPart = 7; - status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents + 7, sizeof(contents) - 7, &offset, NULL); - ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); - ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); - ok(iob.Information == sizeof(contents) - 7, "expected sizeof(contents)-7, got %lu\n", iob.Information); - } - off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off);

1 0

Bruno Jesus : ws2_32: Fix WSADuplicateSocket implementation.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: d71bf64e878aba9a8be6a2dd8d8a60bfeaab78d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71bf64e878aba9a8be6a2dd8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Sep 11 10:05:18 2013 -0300 ws2_32: Fix WSADuplicateSocket implementation. --- dlls/ws2_32/socket.c | 31 +++++++-- dlls/ws2_32/tests/sock.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d71bf64e878aba9a8be6a…

1 0

Alexandre Julliard : taskmgr: Use definitions from winternl. h instead of duplicating them.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 31f889367834bea2f280319c9dda35b4f30a441b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f889367834bea2f280319c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 11 18:04:33 2013 +0200 taskmgr: Use definitions from winternl.h instead of duplicating them. --- include/winternl.h | 2 +- programs/taskmgr/perfdata.c | 141 ++++++++++----------- programs/taskmgr/perfdata.h | 285 +------------------------------------------ programs/taskmgr/taskmgr.c | 1 - 4 files changed, 72 insertions(+), 357 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31f889367834bea2f2803…

1 0