January 2011 - Wine-Commits

Nikolay Sivov : msvcrt: Implemented _sopen_s.
by Alexandre Julliard Jan. 26, 2011

Jan. 26, 2011

Module: wine Branch: master Commit: 2a6060f4c41e780844b8c3a667a5735ba38788d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a6060f4c41e780844b8c3a66… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 26 03:59:13 2011 +0300 msvcrt: Implemented _sopen_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 21 +++++++++++++++ dlls/msvcrt/file.c | 57 +++++++++++++++++++++++++++++------------ dlls/msvcrt/msvcrt.spec | 2 +- 6 files changed, 65 insertions(+), 21 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1c720dc..9b4cecd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1106,7 +1106,7 @@ @ stub _snwscanf_s @ stub _snwscanf_s_l @ varargs _sopen(str long long) msvcrt._sopen -@ stub _sopen_s +@ cdecl _sopen_s(ptr str long long long) msvcrt._sopen_s @ varargs _spawnl(long str str) msvcrt._spawnl @ varargs _spawnle(long str str) msvcrt._spawnle @ varargs _spawnlp(long str str) msvcrt._spawnlp diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f4bde1a..4eaed92 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -960,7 +960,7 @@ @ stub _snwscanf_s @ stub _snwscanf_s_l @ varargs _sopen(str long long) msvcrt._sopen -@ stub _sopen_s +@ cdecl _sopen_s(ptr str long long long) msvcrt._sopen_s @ varargs _spawnl(long str str) msvcrt._spawnl @ varargs _spawnle(long str str) msvcrt._spawnle @ varargs _spawnlp(long str str) msvcrt._spawnlp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 01ebec7..a2b8359 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -946,7 +946,7 @@ @ stub _snwscanf_s @ stub _snwscanf_s_l @ varargs _sopen(str long long) msvcrt._sopen -@ stub _sopen_s +@ cdecl _sopen_s(ptr str long long long) msvcrt._sopen_s @ varargs _spawnl(long str str) msvcrt._spawnl @ varargs _spawnle(long str str) msvcrt._spawnle @ varargs _spawnlp(long str str) msvcrt._spawnlp diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index dcf893d..35995f4 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -20,6 +20,9 @@ #include <stdlib.h> #include <stdio.h> #include <math.h> +#include <fcntl.h> +#include <share.h> +#include <sys/stat.h> #include <windef.h> #include <winbase.h> @@ -70,6 +73,7 @@ static void (__cdecl *p_qsort_s)(void *, size_t, size_t, int (__cdecl *)(void *, static int (__cdecl *p_controlfp_s)(unsigned int *, unsigned int, unsigned int); static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); +static int (__cdecl *p_sopen_s)(int*, const char*, int, int, int); static void* (WINAPI *pEncodePointer)(void *); @@ -705,6 +709,21 @@ static void test__set_abort_behavior(void) p_set_abort_behavior(_WRITE_ABORT_MSG | _CALL_REPORTFAULT, 0xffffffff); } +static void test_sopen_s(void) +{ + int ret, fd; + + SET_EXPECT(invalid_parameter_handler); + ret = p_sopen_s(NULL, "test", _O_RDONLY, _SH_DENYNO, _S_IREAD); + ok(ret == EINVAL, "got %d, expected EINVAL\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + fd = 0xdead; + ret = p_sopen_s(&fd, "test", _O_RDONLY, _SH_DENYNO, _S_IREAD); + ok(ret == ENOENT, "got %d, expected ENOENT\n", ret); + ok(fd == -1, "got %d\n", fd); +} + START_TEST(msvcr90) { HMODULE hcrt; @@ -738,6 +757,7 @@ START_TEST(msvcr90) p_controlfp_s = (void *) GetProcAddress(hcrt, "_controlfp_s"); p_atoflt = (void* )GetProcAddress(hcrt, "_atoflt"); p_set_abort_behavior = (void *) GetProcAddress(hcrt, "_set_abort_behavior"); + p_sopen_s = (void*) GetProcAddress(hcrt, "_sopen_s"); hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer"); @@ -752,4 +772,5 @@ START_TEST(msvcr90) test_controlfp_s(); test__atoflt(); test__set_abort_behavior(); + test_sopen_s(); } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 3847f84..d56700b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1513,22 +1513,27 @@ int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode) } /********************************************************************* - * _sopen (MSVCRT.@) + * _sopen_s (MSVCRT.@) */ -int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) +int CDECL MSVCRT__sopen_s( int *fd, const char *path, int oflags, int shflags, int pmode ) { - __ms_va_list ap; - int pmode; DWORD access = 0, creation = 0, attrib; DWORD sharing; - int wxflag = 0, fd; + int wxflag; HANDLE hand; SECURITY_ATTRIBUTES sa; + TRACE("fd*: %p file: (%s) oflags: 0x%04x shflags: 0x%04x pmode: 0x%04x\n", + fd, path, oflags, shflags, pmode); - TRACE(":file (%s) oflags: 0x%04x shflags: 0x%04x\n", - path, oflags, shflags); + if (!fd) + { + MSVCRT_INVALID_PMT("null out fd pointer"); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + *fd = -1; wxflag = split_oflags(oflags); switch (oflags & (MSVCRT__O_RDONLY | MSVCRT__O_WRONLY | MSVCRT__O_RDWR)) { @@ -1539,10 +1544,6 @@ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) if (oflags & MSVCRT__O_CREAT) { - __ms_va_start(ap, shflags); - pmode = va_arg(ap, int); - __ms_va_end(ap); - if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) FIXME(": pmode 0x%04x ignored\n", pmode); else @@ -1579,7 +1580,7 @@ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) break; default: ERR( "Unhandled shflags 0x%x\n", shflags ); - return -1; + return MSVCRT_EINVAL; } attrib = FILE_ATTRIBUTE_NORMAL; @@ -1595,16 +1596,38 @@ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) sa.bInheritHandle = (oflags & MSVCRT__O_NOINHERIT) ? FALSE : TRUE; hand = CreateFileA(path, access, sharing, &sa, creation, attrib, 0); - if (hand == INVALID_HANDLE_VALUE) { - WARN(":failed-last error (%d)\n",GetLastError()); + WARN(":failed-last error (%d)\n", GetLastError()); msvcrt_set_errno(GetLastError()); - return -1; + return *MSVCRT__errno(); } - fd = msvcrt_alloc_fd(hand, wxflag); + *fd = msvcrt_alloc_fd(hand, wxflag); - TRACE(":fd (%d) handle (%p)\n",fd, hand); + TRACE(":fd (%d) handle (%p)\n", *fd, hand); + return 0; +} + +/********************************************************************* + * _sopen (MSVCRT.@) + */ +int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) +{ + int pmode; + int fd; + + if (oflags & MSVCRT__O_CREAT) + { + __ms_va_list ap; + + __ms_va_start(ap, shflags); + pmode = va_arg(ap, int); + __ms_va_end(ap); + } + else + pmode = 0; + + MSVCRT__sopen_s(&fd, path, oflags, shflags, pmode); return fd; } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 50a0b21..7fd3dfa 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -887,7 +887,7 @@ # stub _snwscanf_s # stub _snwscanf_s_l @ varargs _sopen(str long long) MSVCRT__sopen -# stub _sopen_s +@ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s @ varargs _spawnl(long str str) @ varargs _spawnle(long str str) @ varargs _spawnlp(long str str)

1 0

Marcus Meissner : ws2_32: Implemented SO_CONNECT_TIME stub.
by Alexandre Julliard Jan. 26, 2011

Jan. 26, 2011

Module: wine Branch: master Commit: 09e29486aebe758263365fc328aab8c6470b6bd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e29486aebe758263365fc32… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Jan 26 17:01:09 2011 +0100 ws2_32: Implemented SO_CONNECT_TIME stub. --- dlls/ws2_32/socket.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 774481d..f3a521c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2536,6 +2536,20 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return ret; } + case WS_SO_CONNECT_TIME: + { + static int pretendtime = 0; + + if (!pretendtime) FIXME("WS_SO_CONNECT_TIME - faking results\n"); + if (!optlen || *optlen < sizeof(DWORD) || !optval) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + *(DWORD*)optval = pretendtime++; + *optlen = sizeof(DWORD); + return ret; + } /* As mentioned in setsockopt, Windows ignores this, so we * always return true here */ case WS_SO_DONTROUTE:

1 0

Greg Geldorp : shell32/tests: Remove shlwapi dependency.
by Alexandre Julliard Jan. 26, 2011

Jan. 26, 2011

Module: wine Branch: master Commit: e5cc92f35be75a848c1197c3565d58c0e8e944c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5cc92f35be75a848c1197c35… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Wed Jan 26 11:52:42 2011 +0100 shell32/tests: Remove shlwapi dependency. --- dlls/shell32/tests/Makefile.in | 2 +- dlls/shell32/tests/shelldispatch.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index 53f33b1..3399532 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = shell32.dll -IMPORTS = shell32 ole32 oleaut32 shlwapi user32 advapi32 +IMPORTS = shell32 ole32 oleaut32 user32 advapi32 C_SRCS = \ appbar.c \ diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 9375d40..34dbdb5 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -118,7 +118,9 @@ static void test_namespace(void) r = pSHGetFolderPathW(NULL, CSIDL_PROGRAM_FILES, NULL, SHGFP_TYPE_CURRENT, path); ok(r == S_OK, "SHGetFolderPath failed: %08x\n", r); - p = PathFindFileNameW(path); + p = path + lstrlenW(path); + while (path < p && *(p - 1) != '\\') + p--; ok(!lstrcmpW(title, p), "expected %s, got %s\n", wine_dbgstr_w(p), wine_dbgstr_w(title)); }

1 0

Michael Stefaniuc : d3d8: Pass an object instead of an iface to an internal function.
by Alexandre Julliard Jan. 26, 2011

Jan. 26, 2011

Module: wine Branch: master Commit: bb6ae095d4cd2abb15191d2b06654bc187bfb3b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6ae095d4cd2abb15191d2b0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 26 00:31:13 2011 +0100 d3d8: Pass an object instead of an iface to an internal function. --- dlls/d3d8/device.c | 48 ++++++++++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 67edb06..dcbeb9f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -808,17 +808,17 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateIndexBuffer(IDirect3DDevice8 *i return D3D_OK; } -static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, - D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface8 **ppSurface, - UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality) +static HRESULT IDirect3DDevice8Impl_CreateSurface(IDirect3DDevice8Impl *device, UINT Width, + UINT Height, D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, + IDirect3DSurface8 **ppSurface, UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, + DWORD MultisampleQuality) { - IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DSurface8Impl *object; HRESULT hr; - TRACE("iface %p, width %u, height %u, format %#x, lockable %#x, discard %#x, level %u, surface %p,\n" + TRACE("device %p, width %u, height %u, format %#x, lockable %#x, discard %#x, level %u, surface %p,\n" "\tusage %#x, pool %#x, multisample_type %#x, multisample_quality %u.\n", - iface, Width, Height, Format, Lockable, Discard, Level, ppSurface, + device, Width, Height, Format, Lockable, Discard, Level, ppSurface, Usage, Pool, MultiSample, MultisampleQuality); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface8Impl)); @@ -828,8 +828,8 @@ static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT return D3DERR_OUTOFVIDEOMEMORY; } - hr = surface_init(object, This, Width, Height, Format, Lockable, Discard, - Level, Usage, Pool, MultiSample, MultisampleQuality); + hr = surface_init(object, device, Width, Height, Format, Lockable, Discard, Level, Usage, + Pool, MultiSample, MultisampleQuality); if (FAILED(hr)) { WARN("Failed to initialize surface, hr %#x.\n", hr); @@ -843,41 +843,53 @@ static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT return D3D_OK; } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, BOOL Lockable, IDirect3DSurface8** ppSurface) { +static HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(IDirect3DDevice8 *iface, UINT Width, + UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, BOOL Lockable, + IDirect3DSurface8** ppSurface) +{ + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, lockable %#x, surface %p.\n", iface, Width, Height, Format, MultiSample, Lockable, ppSurface); - hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, Lockable, FALSE /* Discard */, - 0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, MultiSample, 0); + hr = IDirect3DDevice8Impl_CreateSurface(This, Width, Height, Format, Lockable, + FALSE /* Discard */, 0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, + MultiSample, 0); return hr; } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, IDirect3DSurface8** ppSurface) { +static HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(IDirect3DDevice8 *iface, + UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, + IDirect3DSurface8** ppSurface) +{ + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, surface %p.\n", iface, Width, Height, Format, MultiSample, ppSurface); /* TODO: Verify that Discard is false */ - hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, FALSE, + hr = IDirect3DDevice8Impl_CreateSurface(This, Width, Height, Format, TRUE /* Lockable */, FALSE, 0 /* Level */, ppSurface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, MultiSample, 0); return hr; } /* IDirect3DDevice8Impl::CreateImageSurface returns surface with pool type SYSTEMMEM */ -static HRESULT WINAPI IDirect3DDevice8Impl_CreateImageSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, IDirect3DSurface8** ppSurface) { +static HRESULT WINAPI IDirect3DDevice8Impl_CreateImageSurface(IDirect3DDevice8 *iface, UINT Width, + UINT Height, D3DFORMAT Format, IDirect3DSurface8** ppSurface) +{ + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; TRACE("iface %p, width %u, height %u, format %#x, surface %p.\n", iface, Width, Height, Format, ppSurface); - hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, FALSE /* Discard */, - 0 /* Level */, ppSurface, 0 /* Usage (undefined/none) */, D3DPOOL_SYSTEMMEM, D3DMULTISAMPLE_NONE, - 0 /* MultisampleQuality */); + hr = IDirect3DDevice8Impl_CreateSurface(This, Width, Height, Format, TRUE /* Lockable */, + FALSE /* Discard */, 0 /* Level */, ppSurface, 0 /* Usage (undefined/none) */, + D3DPOOL_SYSTEMMEM, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */); return hr; } @@ -2621,7 +2633,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParen if (pool == WINED3DPOOL_DEFAULT && !(usage & WINED3DUSAGE_DYNAMIC)) lockable = FALSE; - hr = IDirect3DDevice8Impl_CreateSurface((IDirect3DDevice8 *)This, width, height, + hr = IDirect3DDevice8Impl_CreateSurface(This, width, height, d3dformat_from_wined3dformat(format), lockable, FALSE /* Discard */, level, (IDirect3DSurface8 **)&d3d_surface, usage, pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */); if (FAILED(hr))

1 0

Henri Verbeet : wined3d: Do checks at the start of surface_init() (LLVM/ Clang).
by Alexandre Julliard Jan. 26, 2011

Jan. 26, 2011

Module: wine Branch: master Commit: 7438e42f1a5cb5c37e921c562d4b4d09334dfc64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7438e42f1a5cb5c37e921c562… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 25 19:26:26 2011 +0100 wined3d: Do checks at the start of surface_init() (LLVM/Clang). --- dlls/wined3d/surface.c | 80 ++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2300a68..841662f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -431,6 +431,46 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, multisample_quality = 0; } + /* Quick lockable sanity check. + * TODO: remove this after surfaces, usage and lockability have been debugged properly + * this function is too deep to need to care about things like this. + * Levels need to be checked too, since they all affect what can be done. */ + switch (pool) + { + case WINED3DPOOL_SCRATCH: + if(!lockable) + { + FIXME("Called with a pool of SCRATCH and a lockable of FALSE " + "which are mutually exclusive, setting lockable to TRUE.\n"); + lockable = TRUE; + } + break; + + case WINED3DPOOL_SYSTEMMEM: + if (!lockable) + FIXME("Called with a pool of SYSTEMMEM and a lockable of FALSE, this is acceptable but unexpected.\n"); + break; + + case WINED3DPOOL_MANAGED: + if (usage & WINED3DUSAGE_DYNAMIC) + FIXME("Called with a pool of MANAGED and a usage of DYNAMIC which are mutually exclusive.\n"); + break; + + case WINED3DPOOL_DEFAULT: + if (lockable && !(usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) + WARN("Creating a lockable surface with a POOL of DEFAULT, that doesn't specify DYNAMIC usage.\n"); + break; + + default: + FIXME("Unknown pool %#x.\n", pool); + break; + }; + + if (usage & WINED3DUSAGE_RENDERTARGET && pool != WINED3DPOOL_DEFAULT) + { + FIXME("Trying to create a render target that isn't in the default pool.\n"); + } + /* FIXME: Check that the format is supported by the device. */ resource_size = wined3d_format_calculate_size(format, alignment, width, height); @@ -477,46 +517,6 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, if (discard) surface->flags |= SFLAG_DISCARD; if (lockable || format_id == WINED3DFMT_D16_LOCKABLE) surface->flags |= SFLAG_LOCKABLE; - /* Quick lockable sanity check. - * TODO: remove this after surfaces, usage and lockability have been debugged properly - * this function is too deep to need to care about things like this. - * Levels need to be checked too, since they all affect what can be done. */ - switch (pool) - { - case WINED3DPOOL_SCRATCH: - if(!lockable) - { - FIXME("Called with a pool of SCRATCH and a lockable of FALSE " - "which are mutually exclusive, setting lockable to TRUE.\n"); - lockable = TRUE; - } - break; - - case WINED3DPOOL_SYSTEMMEM: - if (!lockable) - FIXME("Called with a pool of SYSTEMMEM and a lockable of FALSE, this is acceptable but unexpected.\n"); - break; - - case WINED3DPOOL_MANAGED: - if (usage & WINED3DUSAGE_DYNAMIC) - FIXME("Called with a pool of MANAGED and a usage of DYNAMIC which are mutually exclusive.\n"); - break; - - case WINED3DPOOL_DEFAULT: - if (lockable && !(usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) - WARN("Creating a lockable surface with a POOL of DEFAULT, that doesn't specify DYNAMIC usage.\n"); - break; - - default: - FIXME("Unknown pool %#x.\n", pool); - break; - }; - - if (usage & WINED3DUSAGE_RENDERTARGET && pool != WINED3DPOOL_DEFAULT) - { - FIXME("Trying to create a render target that isn't in the default pool.\n"); - } - /* Mark the texture as dirty so that it gets loaded first time around. */ surface_add_dirty_rect(surface, NULL); list_init(&surface->renderbuffers);

1 0

Henri Verbeet : d3d8: Remove a useless ERR (LLVM/Clang).
by Alexandre Julliard Jan. 26, 2011

Jan. 26, 2011

Module: wine Branch: master Commit: ccba04e58e122bb68d0ef87813cece48e96764c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccba04e58e122bb68d0ef8781… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 25 19:26:25 2011 +0100 d3d8: Remove a useless ERR (LLVM/Clang). --- dlls/d3d8/volume.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 545ba24..75fb07c 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -164,10 +164,6 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, if (!This->container) return E_NOINTERFACE; - if (!ppContainer) { - ERR("Called without a valid ppContainer.\n"); - } - res = IUnknown_QueryInterface(This->container, riid, ppContainer); TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Jan. 26, 2011

Jan. 26, 2011

Module: wine Branch: master Commit: 52bf96fdbc930e7e832fe49d00c2b62c27641b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52bf96fdbc930e7e832fe49d0… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jan 25 20:34:48 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index 85da3b7..88d277a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-01-14 21:21+0300\n" +"PO-Revision-Date: 2011-01-25 20:33+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)gmail.com>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2019,26 +2019,23 @@ msgstr "Parinktys" #: hhctrl.rc:70 msgid "S&ync" -msgstr "" +msgstr "S&inchronizuoti" #: hhctrl.rc:71 shdoclc.rc:38 winhlp32.rc:101 msgid "&Back" msgstr "&Atgal" #: hhctrl.rc:72 -#, fuzzy msgid "&Forward" -msgstr "Pirmyn" +msgstr "&Pirmyn" #: hhctrl.rc:73 -#, fuzzy msgid "&Home" -msgstr "Į pradžią" +msgstr "Į p&radžią" #: hhctrl.rc:74 -#, fuzzy msgid "&Stop" -msgstr "Stabdyti" +msgstr "&Stabdyti" #: hhctrl.rc:75 shdoclc.rc:56 msgid "&Refresh" @@ -2066,11 +2063,11 @@ msgstr "&Adresynas" #: hhctrl.rc:33 msgid "Hide &Tabs" -msgstr "" +msgstr "Slėpti &korteles" #: hhctrl.rc:34 msgid "Show &Tabs" -msgstr "" +msgstr "Rodyti &korteles" #: hhctrl.rc:39 msgid "Show"

1 0

Michael Stefaniuc : d3dcompiler_43/tests: COM cleanup for the ID3DInclude iface.
by Alexandre Julliard Jan. 26, 2011

Jan. 26, 2011

Module: wine Branch: master Commit: 629e853894199c6169e10f42c1223e8cea389fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=629e853894199c6169e10f42c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 26 00:29:58 2011 +0100 d3dcompiler_43/tests: COM cleanup for the ID3DInclude iface. --- dlls/d3dcompiler_43/tests/asm.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index af5ad62..5c01983 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define COBJMACROS +#define CONST_VTABLE #include "wine/test.h" #include <d3d9types.h> @@ -1480,7 +1481,7 @@ static const struct ID3DIncludeVtbl D3DInclude_Vtbl = }; struct D3DIncludeImpl { - const ID3DIncludeVtbl *lpVtbl; + ID3DInclude ID3DInclude_iface; }; static void assembleshader_test(void) { @@ -1542,10 +1543,9 @@ static void assembleshader_test(void) { /* D3DInclude test */ shader = NULL; messages = NULL; - include.lpVtbl = &D3DInclude_Vtbl; - hr = D3DAssemble(testshader, strlen(testshader), NULL, - NULL, (LPD3DINCLUDE)&include, D3DCOMPILE_SKIP_VALIDATION, - &shader, &messages); + include.ID3DInclude_iface.lpVtbl = &D3DInclude_Vtbl; + hr = D3DAssemble(testshader, strlen(testshader), NULL, NULL, &include.ID3DInclude_iface, + D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); ok(hr == S_OK, "D3DInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); if(messages) { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1634,9 +1634,9 @@ static void d3dpreprocess_test(void) /* pInclude test */ shader = NULL; messages = NULL; - include.lpVtbl = &D3DInclude_Vtbl; - hr = D3DPreprocess(testshader, strlen(testshader), NULL, - NULL, (ID3DInclude *)&include, &shader, &messages); + include.ID3DInclude_iface.lpVtbl = &D3DInclude_Vtbl; + hr = D3DPreprocess(testshader, strlen(testshader), NULL, NULL, &include.ID3DInclude_iface, + &shader, &messages); ok(hr == S_OK, "pInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); if (messages) { @@ -1648,8 +1648,8 @@ static void d3dpreprocess_test(void) /* recursive #include test */ shader = NULL; messages = NULL; - hr = D3DPreprocess(testshader2, strlen(testshader2), NULL, - NULL, (ID3DInclude *)&include, &shader, &messages); + hr = D3DPreprocess(testshader2, strlen(testshader2), NULL, NULL, &include.ID3DInclude_iface, + &shader, &messages); ok(hr == S_OK, "D3DPreprocess test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); if (messages) {

1 0

Michael Stefaniuc : d3dx9_36/tests: COM cleanup for the ID3DXInclude iface.
by Alexandre Julliard Jan. 26, 2011

Jan. 26, 2011

Module: wine Branch: master Commit: 134cb5bfef5a631824001d39eab0aa17e8e6e0c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134cb5bfef5a631824001d39e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 26 00:27:49 2011 +0100 d3dx9_36/tests: COM cleanup for the ID3DXInclude iface. --- dlls/d3dx9_36/tests/asm.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index f6a0cb2..72a2da9 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define COBJMACROS +#define CONST_VTABLE #include "wine/test.h" #include <d3dx9.h> @@ -87,7 +88,7 @@ static const struct ID3DXIncludeVtbl D3DXInclude_Vtbl = { }; struct D3DXIncludeImpl { - const ID3DXIncludeVtbl *lpVtbl; + ID3DXInclude ID3DXInclude_iface; }; static void assembleshader_test(void) { @@ -172,10 +173,9 @@ static void assembleshader_test(void) { /* pInclude test */ shader = NULL; messages = NULL; - include.lpVtbl = &D3DXInclude_Vtbl; - hr = D3DXAssembleShader(testshader, strlen(testshader), - NULL, (LPD3DXINCLUDE)&include, D3DXSHADER_SKIPVALIDATION, - &shader, &messages); + include.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; + hr = D3DXAssembleShader(testshader, strlen(testshader), NULL, &include.ID3DXInclude_iface, + D3DXSHADER_SKIPVALIDATION, &shader, &messages); ok(hr == D3D_OK, "pInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); if(messages) { trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); @@ -199,9 +199,8 @@ static void assembleshader_test(void) { /* recursive #include test */ shader = NULL; messages = NULL; - hr = D3DXAssembleShader(testshader2, strlen(testshader2), - NULL, (LPD3DXINCLUDE)&include, D3DXSHADER_SKIPVALIDATION, - &shader, &messages); + hr = D3DXAssembleShader(testshader2, strlen(testshader2), NULL, &include.ID3DXInclude_iface, + D3DXSHADER_SKIPVALIDATION, &shader, &messages); ok(hr == D3D_OK, "D3DXAssembleShader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); if(messages) { trace("recursive D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); @@ -229,9 +228,8 @@ static void assembleshader_test(void) { /* D3DXAssembleShaderFromFile + pInclude test */ shader = NULL; messages = NULL; - hr = D3DXAssembleShaderFromFileA("shader.vsh", - NULL, (LPD3DXINCLUDE)&include, D3DXSHADER_SKIPVALIDATION, - &shader, &messages); + hr = D3DXAssembleShaderFromFileA("shader.vsh", NULL, &include.ID3DXInclude_iface, + D3DXSHADER_SKIPVALIDATION, &shader, &messages); ok(hr == D3D_OK, "D3DXAssembleShaderFromFile + pInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); if(messages) { trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); @@ -351,7 +349,7 @@ static void d3dxpreprocess_test(void) { HRESULT hr; LPD3DXBUFFER shader, messages; HRESULT shader_vsh_res; - struct D3DXIncludeImpl include = {&D3DXInclude_Vtbl}; + struct D3DXIncludeImpl include = {{&D3DXInclude_Vtbl}}; shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader) - 1); if(SUCCEEDED(shader_vsh_res)) { @@ -391,8 +389,7 @@ static void d3dxpreprocess_test(void) { /* D3DXPreprocessShaderFromFile + pInclude test */ shader = NULL; messages = NULL; - hr = D3DXPreprocessShaderFromFileA("shader.vsh", - NULL, (LPD3DXINCLUDE)&include, + hr = D3DXPreprocessShaderFromFileA("shader.vsh", NULL, &include.ID3DXInclude_iface, &shader, &messages); ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile + pInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); if(messages) {

1 0

Henri Verbeet : d3d9: Remove some useless ERRs (LLVM/Clang).
by Alexandre Julliard Jan. 26, 2011

Jan. 26, 2011

Module: wine Branch: master Commit: 5c7c31fc874635364b36bdc7fbcf4cdc2328d101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7c31fc874635364b36bdc7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 25 19:26:24 2011 +0100 d3d9: Remove some useless ERRs (LLVM/Clang). --- dlls/d3d9/surface.c | 4 ---- dlls/d3d9/volume.c | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 6601530..4ec6104 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -232,10 +232,6 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 ifac if (!This->container) return E_NOINTERFACE; - if (!ppContainer) { - ERR("Called without a valid ppContainer\n"); - } - res = IUnknown_QueryInterface(This->container, riid, ppContainer); TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 5206187..643238a 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -169,10 +169,6 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, if (!This->container) return E_NOINTERFACE; - if (!ppContainer) { - ERR("Called without a valid ppContainer.\n"); - } - res = IUnknown_QueryInterface(This->container, riid, ppContainer); TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer);

1 0