wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Henri Verbeet : wined3d: Get rid of vs_selected_mode / ps_selected_mode from struct wined3d_device.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: e73aa3e83de5ba0abbe71be9fa45c6352e7e172a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73aa3e83de5ba0abbe71be9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 18 12:05:25 2013 +0100 wined3d: Get rid of vs_selected_mode / ps_selected_mode from struct wined3d_device. These are only used by wined3d_shader_create_vs() / wined3d_shader_create_ps(), but they're redundant there since the "none" shader backend doesn't support any shader version. --- dlls/wined3d/device.c | 1 - dlls/wined3d/shader.c | 6 ------ dlls/wined3d/wined3d_private.h | 3 --- 3 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 40ffe66..984fa3b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5652,7 +5652,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, for (i = 0; i < PATCHMAP_SIZE; ++i) list_init(&device->patches[i]); - select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode); device->shader_backend = adapter->shader_backend; device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); device->vs_version = shader_caps.vs_version; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d05615b..abbf837 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2341,9 +2341,6 @@ HRESULT CDECL wined3d_shader_create_ps(struct wined3d_device *device, const DWOR TRACE("device %p, byte_code %p, output_signature %p, parent %p, parent_ops %p, shader %p.\n", device, byte_code, output_signature, parent, parent_ops, shader); - if (device->ps_selected_mode == SHADER_NONE) - return WINED3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -2375,9 +2372,6 @@ HRESULT CDECL wined3d_shader_create_vs(struct wined3d_device *device, const DWOR TRACE("device %p, byte_code %p, output_signature %p, parent %p, parent_ops %p, shader %p.\n", device, byte_code, output_signature, parent, parent_ops, shader); - if (device->vs_selected_mode == SHADER_NONE) - return WINED3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index af5ad2f..8fbd16e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1705,9 +1705,6 @@ struct wined3d_device /* X and GL Information */ GLenum offscreenBuffer; - /* Selected capabilities */ - int vs_selected_mode; - int ps_selected_mode; const struct wined3d_shader_backend_ops *shader_backend; void *shader_priv; void *fragment_priv;

1 0

Henri Verbeet : wined3d: Replace InitAdapters() with a function to initialize a single adapter.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: c10c9fba76468148662c553b76c8bdedc70f6377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c10c9fba76468148662c553b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 18 12:05:24 2013 +0100 wined3d: Replace InitAdapters() with a function to initialize a single adapter. --- dlls/wined3d/directx.c | 124 +++++++++++++++++++++-------------------------- 1 files changed, 55 insertions(+), 69 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fb886da..7b388af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5502,18 +5502,17 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc } /* Do not call while under the GL lock. */ -static BOOL InitAdapters(struct wined3d *wined3d) +static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) { - struct wined3d_adapter *adapter = &wined3d->adapters[0]; struct wined3d_gl_info *gl_info = &adapter->gl_info; - BOOL ret; - int ps_selected_mode, vs_selected_mode; + struct wined3d_fake_gl_ctx fake_gl_ctx = {0}; + DISPLAY_DEVICEW display_device; - /* No need to hold any lock. The calling library makes sure only one thread calls - * wined3d simultaneously - */ + TRACE("adapter %p, ordinal %u.\n", adapter, ordinal); - TRACE("Initializing adapters\n"); + adapter->ordinal = ordinal; + adapter->monitorPoint.x = -1; + adapter->monitorPoint.y = -1; /* Dynamically load all GL core functions */ #ifdef USE_WIN32_OPENGL @@ -5539,74 +5538,58 @@ static BOOL InitAdapters(struct wined3d *wined3d) glEnableWINE = gl_info->gl_ops.gl.p_glEnable; glDisableWINE = gl_info->gl_ops.gl.p_glDisable; - /* For now only one default adapter */ + if (!AllocateLocallyUniqueId(&adapter->luid)) { - struct wined3d_fake_gl_ctx fake_gl_ctx = {0}; - DISPLAY_DEVICEW DisplayDevice; - - TRACE("Initializing default adapter\n"); - adapter->ordinal = 0; - adapter->monitorPoint.x = -1; - adapter->monitorPoint.y = -1; - - if (!AllocateLocallyUniqueId(&adapter->luid)) - { - DWORD err = GetLastError(); - ERR("Failed to set adapter LUID (%#x).\n", err); - return FALSE; - } - TRACE("Allocated LUID %08x:%08x for adapter.\n", - adapter->luid.HighPart, adapter->luid.LowPart); + ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); + return FALSE; + } + TRACE("Allocated LUID %08x:%08x for adapter %p.\n", + adapter->luid.HighPart, adapter->luid.LowPart, adapter); - if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx)) - { - ERR("Failed to get a gl context for default adapter\n"); - return FALSE; - } + if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx)) + { + ERR("Failed to get a GL context for adapter %p.\n", adapter); + return FALSE; + } - ret = wined3d_adapter_init_gl_caps(adapter); - if(!ret) { - ERR("Failed to initialize gl caps for default adapter\n"); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - return FALSE; - } + if (!wined3d_adapter_init_gl_caps(adapter)) + { + ERR("Failed to initialize GL caps for adapter %p.\n", adapter); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + return FALSE; + } - wined3d_adapter_init_fb_cfgs(adapter, fake_gl_ctx.dc); - /* We haven't found any suitable formats. This should only happen in - * case of GDI software rendering, which is pretty useless anyway. */ - if (!adapter->cfg_count) - { - ERR("Disabling Direct3D because no hardware accelerated pixel formats have been found!\n"); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - HeapFree(GetProcessHeap(), 0, adapter->cfgs); - return FALSE; - } + wined3d_adapter_init_fb_cfgs(adapter, fake_gl_ctx.dc); + /* We haven't found any suitable formats. This should only happen in + * case of GDI software rendering, which is pretty useless anyway. */ + if (!adapter->cfg_count) + { + WARN("No suitable pixel formats found.\n"); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + HeapFree(GetProcessHeap(), 0, adapter->cfgs); + return FALSE; + } - ret = initPixelFormats(&adapter->gl_info, adapter->driver_info.vendor); - if(!ret) { - ERR("Failed to init gl formats\n"); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - HeapFree(GetProcessHeap(), 0, adapter->cfgs); - return FALSE; - } + if (!initPixelFormats(&adapter->gl_info, adapter->driver_info.vendor)) + { + ERR("Failed to initialize GL format info.\n"); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + HeapFree(GetProcessHeap(), 0, adapter->cfgs); + return FALSE; + } - adapter->TextureRam = adapter->driver_info.vidmem; - adapter->UsedTextureRam = 0; - TRACE("Emulating %dMB of texture ram\n", adapter->TextureRam/(1024*1024)); + adapter->TextureRam = adapter->driver_info.vidmem; + adapter->UsedTextureRam = 0; + TRACE("Emulating %u MB of texture ram.\n", adapter->TextureRam / (1024 * 1024)); - /* Initialize the Adapter's DeviceName which is required for ChangeDisplaySettings and friends */ - DisplayDevice.cb = sizeof(DisplayDevice); - EnumDisplayDevicesW(NULL, 0 /* Adapter 0 = iDevNum 0 */, &DisplayDevice, 0); - TRACE("DeviceName: %s\n", debugstr_w(DisplayDevice.DeviceName)); - strcpyW(adapter->DeviceName, DisplayDevice.DeviceName); + display_device.cb = sizeof(display_device); + EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); + TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); + strcpyW(adapter->DeviceName, display_device.DeviceName); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - fillGLAttribFuncs(&adapter->gl_info); - } - wined3d->adapter_count = 1; - TRACE("%u adapters successfully initialized.\n", wined3d->adapter_count); + fillGLAttribFuncs(&adapter->gl_info); return TRUE; } @@ -5646,6 +5629,8 @@ HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) wined3d->ref = 1; wined3d->flags = flags; + TRACE("Initializing adapters.\n"); + if (flags & WINED3D_NO3D) { wined3d_adapter_init_nogl(&wined3d->adapters[0], 0); @@ -5653,11 +5638,12 @@ HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) return WINED3D_OK; } - if (!InitAdapters(wined3d)) + if (!wined3d_adapter_init(&wined3d->adapters[0], 0)) { - WARN("Failed to initialize adapters.\n"); + WARN("Failed to initialize adapter.\n"); return E_FAIL; } + wined3d->adapter_count = 1; return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Introduce a separate function for intializing the adapter' s framebuffer configs.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: d183f118cfee34b6ebac67e5d704fb354b6802ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d183f118cfee34b6ebac67e5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 18 12:05:23 2013 +0100 wined3d: Introduce a separate function for intializing the adapter's framebuffer configs. --- dlls/wined3d/directx.c | 276 ++++++++++++++++++++++++------------------------ 1 files changed, 140 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d183f118cfee34b6ebac6…

1 0

Henri Verbeet : ddraw: Avoid LPD3DEXECUTEDATA.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: f3e4cdb31a078ff71bc883f52c4438e92d0fe66b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e4cdb31a078ff71bc883f52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 18 12:05:22 2013 +0100 ddraw: Avoid LPD3DEXECUTEDATA. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 5db816b..692220a 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -889,8 +889,8 @@ DECLARE_INTERFACE_(IDirect3DExecuteBuffer,IUnknown) STDMETHOD(Initialize)(THIS_ struct IDirect3DDevice *device, D3DEXECUTEBUFFERDESC *desc) PURE; STDMETHOD(Lock)(THIS_ D3DEXECUTEBUFFERDESC *desc) PURE; STDMETHOD(Unlock)(THIS) PURE; - STDMETHOD(SetExecuteData)(THIS_ LPD3DEXECUTEDATA lpData) PURE; - STDMETHOD(GetExecuteData)(THIS_ LPD3DEXECUTEDATA lpData) PURE; + STDMETHOD(SetExecuteData)(THIS_ D3DEXECUTEDATA *data) PURE; + STDMETHOD(GetExecuteData)(THIS_ D3DEXECUTEDATA *data) PURE; STDMETHOD(Validate)(THIS_ LPDWORD lpdwOffset, LPD3DVALIDATECALLBACK lpFunc, LPVOID lpUserArg, DWORD dwReserved) PURE; STDMETHOD(Optimize)(THIS_ DWORD dwDummy) PURE; };

1 0

Henri Verbeet : ddraw: Avoid LPD3DSTATS.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 4f58e3ec48dc23eee76fd7abd5b35a9bb4fa5c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f58e3ec48dc23eee76fd7abd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 18 12:05:21 2013 +0100 ddraw: Avoid LPD3DSTATS. --- include/d3d.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index b3d765d..5db816b 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -941,7 +941,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture *tex1, IDirect3DTexture *tex2) PURE; STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, IDirect3DExecuteBuffer **buffer, IUnknown *outer) PURE; - STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; + STDMETHOD(GetStats)(THIS_ D3DSTATS *stats) PURE; STDMETHOD(Execute)(THIS_ IDirect3DExecuteBuffer *buffer, IDirect3DViewport *viewport, DWORD flags) PURE; STDMETHOD(AddViewport)(THIS_ IDirect3DViewport *viewport) PURE; @@ -1028,7 +1028,7 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) /*** IDirect3DDevice2 methods ***/ STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc) PURE; STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture2 *tex1, IDirect3DTexture2 *tex2) PURE; - STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; + STDMETHOD(GetStats)(THIS_ D3DSTATS *stats) PURE; STDMETHOD(AddViewport)(THIS_ IDirect3DViewport2 *viewport) PURE; STDMETHOD(DeleteViewport)(THIS_ IDirect3DViewport2 *viewport) PURE; STDMETHOD(NextViewport)(THIS_ IDirect3DViewport2 *ref, @@ -1147,7 +1147,7 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice3 methods ***/ STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc) PURE; - STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; + STDMETHOD(GetStats)(THIS_ D3DSTATS *stats) PURE; STDMETHOD(AddViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; STDMETHOD(DeleteViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; STDMETHOD(NextViewport)(THIS_ IDirect3DViewport3 *ref,

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 52814a80b44586def9a1ea4f4299fd2e6172d750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52814a80b44586def9a1ea4f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 18 11:43:22 2013 +0100 msvcp: Sync implementations. --- dlls/msvcp60/msvcp60.spec | 324 ++++++++++---------- dlls/msvcp70/msvcp70.spec | 168 +++++----- dlls/msvcp71/math.c | 744 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp.h | 13 + dlls/msvcp71/msvcp71.spec | 456 ++++++++++++++-------------- dlls/msvcp80/msvcp80.spec | 456 ++++++++++++++-------------- 6 files changed, 1459 insertions(+), 702 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52814a80b44586def9a1e…

1 0

Charles Davis : kernel32: Make CopyFile(Ex)() succeed even if the source file is delete-locked.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 5a3ff7ccc17e3d6a5651761dd89c6989ea5471eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3ff7ccc17e3d6a5651761dd… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 17 13:28:44 2013 -0700 kernel32: Make CopyFile(Ex)() succeed even if the source file is delete-locked. --- dlls/kernel32/path.c | 3 ++- dlls/kernel32/tests/file.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index e42b05b..1cfd850 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -957,7 +957,8 @@ BOOL WINAPI CopyFileExW(LPCWSTR source, LPCWSTR dest, TRACE("%s -> %s, %x\n", debugstr_w(source), debugstr_w(dest), flags); - if ((h1 = CreateFileW(source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + if ((h1 = CreateFileW(source, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) { WARN("Unable to open source %s\n", debugstr_w(source)); diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ce25cb9..3216fa5 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -652,11 +652,11 @@ static void test_CopyFileA(void) "copying from an r+w opened and r shared file failed (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile); - /* copying from a delete-locked source is unreliable */ + /* copying from a delete-locked source mostly succeeds */ hfile = CreateFileA(source, DELETE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError()); retok = CopyFileA(source, dest, FALSE); - ok((!retok && GetLastError() == ERROR_SHARING_VIOLATION) || broken(retok) /* 98, Vista, 2k8, 7 */, + ok(retok || broken(!retok && GetLastError() == ERROR_SHARING_VIOLATION) /* NT, 2000, XP */, "copying from a delete-locked file failed (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile);

1 0

Charles Davis : kernel32: Make CopyFile() call CopyFileEx() instead of the other way around.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: e21c805fbeefae5224ea8faf8e9ce4b94cabaeb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21c805fbeefae5224ea8faf8… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 17 13:28:43 2013 -0700 kernel32: Make CopyFile() call CopyFileEx() instead of the other way around. --- dlls/kernel32/path.c | 72 +++++++++++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 39 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a326058..e42b05b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -907,6 +907,36 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) */ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) { + return CopyFileExW( source, dest, NULL, NULL, NULL, + fail_if_exists ? COPY_FILE_FAIL_IF_EXISTS : 0 ); +} + + +/************************************************************************** + * CopyFileA (KERNEL32.@) + */ +BOOL WINAPI CopyFileA( LPCSTR source, LPCSTR dest, BOOL fail_if_exists) +{ + WCHAR *sourceW, *destW; + BOOL ret; + + if (!(sourceW = FILE_name_AtoW( source, FALSE ))) return FALSE; + if (!(destW = FILE_name_AtoW( dest, TRUE ))) return FALSE; + + ret = CopyFileW( sourceW, destW, fail_if_exists ); + + HeapFree( GetProcessHeap(), 0, destW ); + return ret; +} + + +/************************************************************************** + * CopyFileExW (KERNEL32.@) + */ +BOOL WINAPI CopyFileExW(LPCWSTR source, LPCWSTR dest, + LPPROGRESS_ROUTINE progress, LPVOID param, + LPBOOL cancel_ptr, DWORD flags) +{ static const int buffer_size = 65536; HANDLE h1, h2; BY_HANDLE_FILE_INFORMATION info; @@ -925,7 +955,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) return FALSE; } - TRACE("%s -> %s, %d\n", debugstr_w(source), debugstr_w(dest), fail_if_exists); + TRACE("%s -> %s, %x\n", debugstr_w(source), debugstr_w(dest), flags); if ((h1 = CreateFileW(source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) @@ -943,7 +973,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) return FALSE; } - if (!fail_if_exists) + if (!(flags & COPY_FILE_FAIL_IF_EXISTS)) { BOOL same_file = FALSE; h2 = CreateFileW( dest, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, @@ -963,7 +993,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) } if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, - fail_if_exists ? CREATE_NEW : CREATE_ALWAYS, + (flags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS, info.dwFileAttributes, h1 )) == INVALID_HANDLE_VALUE) { WARN("Unable to open dest %s\n", debugstr_w(dest)); @@ -995,42 +1025,6 @@ done: /************************************************************************** - * CopyFileA (KERNEL32.@) - */ -BOOL WINAPI CopyFileA( LPCSTR source, LPCSTR dest, BOOL fail_if_exists) -{ - WCHAR *sourceW, *destW; - BOOL ret; - - if (!(sourceW = FILE_name_AtoW( source, FALSE ))) return FALSE; - if (!(destW = FILE_name_AtoW( dest, TRUE ))) return FALSE; - - ret = CopyFileW( sourceW, destW, fail_if_exists ); - - HeapFree( GetProcessHeap(), 0, destW ); - return ret; -} - - -/************************************************************************** - * CopyFileExW (KERNEL32.@) - * - * This implementation ignores most of the extra parameters passed-in into - * the "ex" version of the method and calls the CopyFile method. - * It will have to be fixed eventually. - */ -BOOL WINAPI CopyFileExW(LPCWSTR sourceFilename, LPCWSTR destFilename, - LPPROGRESS_ROUTINE progressRoutine, LPVOID appData, - LPBOOL cancelFlagPointer, DWORD copyFlags) -{ - /* - * Interpret the only flag that CopyFile can interpret. - */ - return CopyFileW(sourceFilename, destFilename, (copyFlags & COPY_FILE_FAIL_IF_EXISTS) != 0); -} - - -/************************************************************************** * CopyFileExA (KERNEL32.@) */ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename,

1 0

Austin English : shell32: Add a stub for SHGetSetFolderCustomSettings.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 605f2f941e52e2f641ef38eabc0465add4ac6a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605f2f941e52e2f641ef38eab… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 17 14:34:46 2013 -0800 shell32: Add a stub for SHGetSetFolderCustomSettings. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shlfolder.c | 11 +++++++++++ include/shlobj.h | 23 +++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index dc09187..790cc9f 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -259,7 +259,7 @@ 701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) 704 stdcall -noname GUIDFromStringW(wstr ptr) - + 709 stdcall SHGetSetFolderCustomSettings(ptr str long) 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall -noname RestartDialogEx(long wstr long long) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index c4066b9..4d9f036 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -592,3 +592,14 @@ HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT ci FIXME("%p %u %p 0x%x: stub\n", pidlFolder, cidl, apidl, flags); return E_NOTIMPL; } + +/*********************************************************************** + * SHGetSetFolderCustomSettings + * + * Only in XP (up to SP2) and Server 2003 + */ +HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, LPCSTR path, DWORD flag ) +{ + FIXME("%p %s 0x%x: stub\n", fcs, path, flag); + return E_NOTIMPL; +} diff --git a/include/shlobj.h b/include/shlobj.h index 4502187..450aba0 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1430,6 +1430,29 @@ int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); #define SHCreateDirectoryEx WINELIB_NAME_AW(SHCreateDirectoryEx) /**************************************************************************** +* SHGetSetFolderCustomSettings API +*/ +typedef struct { + DWORD dwSize; + DWORD dwMask; + SHELLVIEWID *pvid; + LPWSTR pszWebViewTemplate; + DWORD cchWebViewTemplate; + LPWSTR pszWebViewTemplateVersion; + LPWSTR pszInfoTip; + DWORD cchInfoTip; + CLSID *pclsid; + DWORD dwFlags; + LPWSTR pszIconFile; + DWORD cchIconFile; + int iIconIndex; + LPWSTR pszLogo; + DWORD cchLogo; +} SHFOLDERCUSTOMSETTINGS, *LPSHFOLDERCUSTOMSETTINGS; + +HRESULT WINAPI SHGetSetFolderCustomSettings(LPSHFOLDERCUSTOMSETTINGS pfcs, LPCSTR pszPath, DWORD dwReadWrite); + +/**************************************************************************** * SHGetSpecialFolderLocation API */ HRESULT WINAPI SHGetSpecialFolderLocation(HWND hwndOwner, int nFolder, LPITEMIDLIST * ppidl);

1 0

Bruno Jesus : ws2_32/tests: Add SO_ERROR [set|get]sockopt tests.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 02c199beed2ae6a0c2925235ce319844771753b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c199beed2ae6a0c2925235c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 17 22:33:05 2013 -0200 ws2_32/tests: Add SO_ERROR [set|get]sockopt tests. --- dlls/ws2_32/tests/sock.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8860448..56a64bc 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1192,6 +1192,34 @@ static void test_set_getsockopt(void) "got %d with %d (expected SOCKET_ERROR with WSAEINVAL)\n", err, WSAGetLastError()); + /* Test SO_ERROR set/get */ + SetLastError(0xdeadbeef); + i = 1234; + err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size); +todo_wine + ok( !err && !WSAGetLastError(), + "got %d with %d (expected 0 with 0)\n", + err, WSAGetLastError()); + + SetLastError(0xdeadbeef); + i = 4321; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); +todo_wine + ok( !err && !WSAGetLastError(), + "got %d with %d (expected 0 with 0)\n", + err, WSAGetLastError()); +todo_wine + ok (i == 1234, "got %d (expected 1234)\n", i); + + /* Test invalid optlen */ + SetLastError(0xdeadbeef); + size = 1; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); +todo_wine + ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEFAULT), + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", + err, WSAGetLastError()); + closesocket(s); }

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013