April 2013 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Add a performance warning for mapping a dynamic surface without WINED3D_MAP_DISCARD .
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 0e32c9a247d11c432a7360a185ce0734bfd6a08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e32c9a247d11c432a7360a18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:11 2013 +0200 wined3d: Add a performance warning for mapping a dynamic surface without WINED3D_MAP_DISCARD. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f7e99ab..e9c0b52 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -894,6 +894,9 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD } else { + if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) + WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); + /* surface_load_location() does not check if the rectangle specifies * the full surface. Most callers don't need that, so do it here. */ if (rect && !rect->top && !rect->left

1 0

Henri Verbeet : wined3d: Properly check if a format has a conversion function in wined3d_check_device_format ().
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: ff48c3ba588c8133265b5bdbe99462f03e0da95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff48c3ba588c8133265b5bdbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:12 2013 +0200 wined3d: Properly check if a format has a conversion function in wined3d_check_device_format(). --- dlls/wined3d/directx.c | 45 +++++++++++---------------------------------- 1 files changed, 11 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3a97ae2..bb76fa6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3959,47 +3959,24 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad * it would be a big performance hit. Unless we hit an application * needing one of those formats, don't advertize them to avoid * leading applications into temptation. The windows drivers don't - * support most of those formats on volumes anyway, except for - * WINED3DFMT_R32_FLOAT. */ - switch (check_format_id) + * support most of those formats on volumes anyway. */ + if (format->convert) { - case WINED3DFMT_P8_UINT: - case WINED3DFMT_L4A4_UNORM: - case WINED3DFMT_R32_FLOAT: - case WINED3DFMT_R16_FLOAT: - case WINED3DFMT_R8G8_SNORM_L8X8_UNORM: - case WINED3DFMT_R5G5_SNORM_L6_UNORM: - case WINED3DFMT_R16G16_UNORM: - TRACE("[FAILED] - No converted formats on volumes.\n"); - return WINED3DERR_NOTAVAILABLE; - - case WINED3DFMT_R8G8B8A8_SNORM: - case WINED3DFMT_R16G16_SNORM: - if (!gl_info->supported[NV_TEXTURE_SHADER]) - { - TRACE("[FAILED] - No converted formats on volumes.\n"); - return WINED3DERR_NOTAVAILABLE; - } - break; - - case WINED3DFMT_R8G8_SNORM: - if (!gl_info->supported[NV_TEXTURE_SHADER]) - { - TRACE("[FAILED] - No converted formats on volumes.\n"); - return WINED3DERR_NOTAVAILABLE; - } - break; + TRACE("[FAILED] - No converted formats on volumes.\n"); + return WINED3DERR_NOTAVAILABLE; + } + /* The GL_EXT_texture_compression_s3tc spec requires that loading + * an s3tc compressed texture results in an error. While the D3D + * refrast does support s3tc volumes, at least the nvidia Windows + * driver does not, so we're free not to support this format. */ + switch (check_format_id) + { case WINED3DFMT_DXT1: case WINED3DFMT_DXT2: case WINED3DFMT_DXT3: case WINED3DFMT_DXT4: case WINED3DFMT_DXT5: - /* The GL_EXT_texture_compression_s3tc spec requires that - * loading an s3tc compressed texture results in an error. - * While the D3D refrast does support s3tc volumes, at - * least the nvidia windows driver does not, so we're free - * not to support this format. */ TRACE("[FAILED] - DXTn does not support 3D textures.\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Henri Verbeet : wined3d: Simplify wined3d_check_device_format().
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 3004baeb62b576aab6580ad8c13b949169e52e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3004baeb62b576aab6580ad8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:13 2013 +0200 wined3d: Simplify wined3d_check_device_format(). --- dlls/wined3d/directx.c | 461 +++++++++++------------------------------------- 1 files changed, 102 insertions(+), 359 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3004baeb62b576aab6580…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMDEVICE2.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 00393fd804f2a1afddcca9aeb1f3987ab35b29ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=00393fd804f2a1afddcca9aeb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:14 2013 +0200 d3drm: Avoid LPDIRECT3DRMDEVICE2. --- dlls/d3drm/d3drm.c | 10 ++++------ include/d3drm.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 4356041..719a438 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -606,14 +606,12 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMaterial(IDirect3DRM2* iface, D3DVA return IDirect3DRM3_CreateMaterial(&This->IDirect3DRM3_iface, power, (LPDIRECT3DRMMATERIAL2*)material); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateDevice(IDirect3DRM2* iface, DWORD width, DWORD height, - LPDIRECT3DRMDEVICE2 * ppDevice) +static HRESULT WINAPI IDirect3DRM2Impl_CreateDevice(IDirect3DRM2 *iface, + DWORD width, DWORD height, IDirect3DRMDevice2 **device) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%u,%u,%p): partial stub\n", iface, This, width, height, ppDevice); + FIXME("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); - return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice); + return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown **)device); } static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromSurface(IDirect3DRM2 *iface, GUID *pGUID, diff --git a/include/d3drm.h b/include/d3drm.h index b5e6815..b140efb 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -204,7 +204,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE; - STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE2 *) PURE; + STDMETHOD(CreateDevice)(THIS_ DWORD width, DWORD height, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device,

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMDEVICE3.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 2c557b9b5f8bab5b50479ebd33383787a8cac2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c557b9b5f8bab5b50479ebd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:15 2013 +0200 d3drm: Avoid LPDIRECT3DRMDEVICE3. --- dlls/d3drm/d3drm.c | 25 +++++++++---------------- dlls/d3drm/viewport.c | 19 ++++++------------- include/d3drm.h | 6 +++--- include/d3drmobj.h | 6 +++--- 4 files changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 719a438..94628b1 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1040,14 +1040,12 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMaterial(IDirect3DRM3* iface, D3DVA return ret; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateDevice(IDirect3DRM3* iface, DWORD width, DWORD height, - LPDIRECT3DRMDEVICE3* device) +static HRESULT WINAPI IDirect3DRM3Impl_CreateDevice(IDirect3DRM3 *iface, + DWORD width, DWORD height, IDirect3DRMDevice3 **device) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%d,%d,%p): partial stub\n", iface, This, width, height, device); + FIXME("iface %p, width %u, height %u, device %p partial stub!\n", iface, width, height, device); - return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); + return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown **)device); } static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromSurface(IDirect3DRM3 *iface, GUID *pGUID, @@ -1106,18 +1104,13 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateTextureFromSurface(IDirect3DRM3 *if return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateViewport(IDirect3DRM3* iface, - LPDIRECT3DRMDEVICE3 Device, - LPDIRECT3DRMFRAME3 frame, DWORD xpos, - DWORD ypos, DWORD width, DWORD height, - LPDIRECT3DRMVIEWPORT2* viewport) +static HRESULT WINAPI IDirect3DRM3Impl_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevice3 *device, + IDirect3DRMFrame3 *camera, DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport2 **viewport) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p,%p,%d,%d,%d,%d,%p): stub\n", iface, This, Device, frame, xpos, ypos, width, - height, viewport); + FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p partial stub!\n", + iface, device, camera, x, y, width, height, viewport); - return Direct3DRMViewport_create(&IID_IDirect3DRMViewport2, (IUnknown**)viewport); + return Direct3DRMViewport_create(&IID_IDirect3DRMViewport2, (IUnknown **)viewport); } static HRESULT WINAPI IDirect3DRM3Impl_CreateWrap(IDirect3DRM3* iface, D3DRMWRAPTYPE type, diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 007fd07..859edcc 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -607,15 +607,11 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_GetClassName(IDirect3DRMViewport2 } /*** IDirect3DRMViewport methods ***/ -static HRESULT WINAPI IDirect3DRMViewport2Impl_Init(IDirect3DRMViewport2* iface, - LPDIRECT3DRMDEVICE3 dev, LPDIRECT3DRMFRAME3 camera, - DWORD xpos, DWORD ypos, - DWORD width, DWORD height) +static HRESULT WINAPI IDirect3DRMViewport2Impl_Init(IDirect3DRMViewport2 *iface, IDirect3DRMDevice3 *device, + IDirect3DRMFrame3 *camera, DWORD x, DWORD y, DWORD width, DWORD height) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - - FIXME("(%p/%p)->(%p, %p, %u, %u, %u, %u): stub\n", iface, This, dev, camera, - xpos, ypos, width, height); + FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u stub!\n", + iface, device, camera, x, y, width, height); return E_NOTIMPL; } @@ -764,12 +760,9 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_GetCamera(IDirect3DRMViewport2* i return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDevice(IDirect3DRMViewport2* iface, - LPDIRECT3DRMDEVICE3 * device) +static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDevice(IDirect3DRMViewport2 *iface, IDirect3DRMDevice3 **device) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, device); + FIXME("iface %p, device %p stub!\n", iface, device); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index b140efb..da88dab 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -343,7 +343,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL2 *) PURE; - STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(CreateDevice)(THIS_ DWORD width, DWORD height, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, @@ -354,8 +354,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) IDirect3DRMTexture3 **texture) PURE; STDMETHOD(CreateShadow)(THIS_ LPUNKNOWN, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMSHADOW2 *) PURE; - STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DRMDEVICE3, LPDIRECT3DRMFRAME3, DWORD, DWORD, DWORD, DWORD, - LPDIRECT3DRMVIEWPORT2 *) PURE; + STDMETHOD(CreateViewport)(THIS_ IDirect3DRMDevice3 *device, IDirect3DRMFrame3 *camera, + DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport2 **viewport) PURE; STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE, LPDIRECT3DRMFRAME3, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, LPDIRECT3DRMWRAP *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index a3676d3..fa3559e 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -948,8 +948,8 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMViewport2 methods ***/ - STDMETHOD(Init) (THIS_ LPDIRECT3DRMDEVICE3 dev, LPDIRECT3DRMFRAME3 camera, DWORD xpos, DWORD ypos, - DWORD width, DWORD height) PURE; + STDMETHOD(Init) (THIS_ IDirect3DRMDevice3 *device, struct IDirect3DRMFrame3 *camera, + DWORD x, DWORD y, DWORD width, DWORD height) PURE; STDMETHOD(Clear)(THIS_ DWORD flags) PURE; STDMETHOD(Render)(THIS_ LPDIRECT3DRMFRAME3) PURE; STDMETHOD(SetFront)(THIS_ D3DVALUE) PURE; @@ -964,7 +964,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD(ForceUpdate)(THIS_ DWORD x1, DWORD y1, DWORD x2, DWORD y2) PURE; STDMETHOD(SetPlane)(THIS_ D3DVALUE left, D3DVALUE right, D3DVALUE bottom, D3DVALUE top) PURE; STDMETHOD(GetCamera)(THIS_ LPDIRECT3DRMFRAME3 *) PURE; - STDMETHOD(GetDevice)(THIS_ LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(GetDevice)(THIS_ IDirect3DRMDevice3 **device) PURE; STDMETHOD(GetPlane)(THIS_ D3DVALUE *left, D3DVALUE *right, D3DVALUE *bottom, D3DVALUE *top) PURE; STDMETHOD(Pick)(THIS_ LONG x, LONG y, LPDIRECT3DRMPICKEDARRAY *return_visuals) PURE; STDMETHOD_(BOOL, GetUniformScaling)(THIS) PURE;

1 0

Dmitry Timoshkov : mountmgr.sys: Add a missing entry for DEVICE_DVD to match mountmgr.h enumeration types.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: aa96c58db5628c6da93a05b4d796a4e64cccf5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa96c58db5628c6da93a05b4d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 18 12:39:11 2013 +0900 mountmgr.sys: Add a missing entry for DEVICE_DVD to match mountmgr.h enumeration types. --- dlls/mountmgr.sys/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 8367cba..005ec5e 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -48,6 +48,7 @@ static const WCHAR drive_types[][8] = {'h','d',0}, /* DEVICE_HARDDISK_VOL */ {'f','l','o','p','p','y',0}, /* DEVICE_FLOPPY */ {'c','d','r','o','m',0}, /* DEVICE_CDROM */ + {'c','d','r','o','m',0}, /* DEVICE_DVD */ {'n','e','t','w','o','r','k',0}, /* DEVICE_NETWORK */ {'r','a','m','d','i','s','k',0} /* DEVICE_RAMDISK */ };

1 0

Dmitry Timoshkov : kernel32: Add more process shutdown tests.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 3de89e8500ce753a06943846a2f4262b2ae0529e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de89e8500ce753a06943846a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 18 17:44:16 2013 +0900 kernel32: Add more process shutdown tests. --- dlls/kernel32/tests/loader.c | 134 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 133 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 458b836..ca33ef7 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1042,6 +1042,7 @@ nt4_is_broken: #define MAX_COUNT 10 static HANDLE attached_thread[MAX_COUNT], stop_event, event, mutex, semaphore; static DWORD attached_thread_count; +static LONG noop_thread_started; static int test_dll_phase; static DWORD WINAPI mutex_thread_proc(void *param) @@ -1082,6 +1083,14 @@ static DWORD WINAPI semaphore_thread_proc(void *param) return 196; } +static DWORD WINAPI noop_thread_proc(void *param) +{ + InterlockedIncrement(&noop_thread_started); + + trace("%04u: noop_thread_proc: exiting\n", GetCurrentThreadId()); + return 196; +} + static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) { DWORD ret; @@ -1098,6 +1107,11 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) case DLL_PROCESS_DETACH: { DWORD code, expected_code, i; + HANDLE handle, process; + void *addr; + SIZE_T size; + LARGE_INTEGER offset; + DEBUG_EVENT de; trace("dll: %p, DLL_PROCESS_DETACH, %p\n", hinst, param); @@ -1160,12 +1174,123 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); } + /* win7 doesn't allow to create a thread during process shutdown, + * earlier Windows versions allow it. + */ + noop_thread_started = 0; + SetLastError(0xdeadbeef); + handle = CreateThread(NULL, 0, noop_thread_proc, NULL, 0, &ret); + /* manual call to LdrShutdownProcess doesn't prevent thread creation */ + if (param && test_dll_phase != 4) + { +todo_wine + ok(!handle || broken(handle != 0) /* before win7 */, "CreateThread should fail\n"); + if (!handle) + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + else + CloseHandle(handle); + } + else + { + ok(handle != 0, "CreateThread error %d\n", GetLastError()); + ret = WaitForSingleObject(handle, 1000); + /* FIXME: remove once Wine is fixed */ + if (test_dll_phase == 4) todo_wine + { + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); + ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + } + else + { + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); + ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + } + CloseHandle(handle); + } + + SetLastError(0xdeadbeef); + process = OpenProcess(PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId()); + ok(process != NULL, "OpenProcess error %d\n", GetLastError()); + + noop_thread_started = 0; + SetLastError(0xdeadbeef); + handle = CreateRemoteThread(process, NULL, 0, noop_thread_proc, NULL, 0, &ret); + /* manual call to LdrShutdownProcess doesn't prevent thread creation */ + if (param && test_dll_phase != 4) + { +todo_wine + ok(!handle || broken(handle != 0) /* before win7 */, "CreateRemoteThread should fail\n"); + if (!handle) + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + else + CloseHandle(handle); + } + else + { + ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); + ret = WaitForSingleObject(handle, 1000); + /* FIXME: remove once Wine is fixed */ + if (test_dll_phase == 4) todo_wine + { + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); + ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + } + else + { + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); + ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + } + } + + SetLastError(0xdeadbeef); + handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, NULL); + ok(handle != 0, "CreateFileMapping error %d\n", GetLastError()); + + offset.u.LowPart = 0; + offset.u.HighPart = 0; + addr = NULL; + size = 0; + ret = pNtMapViewOfSection(handle, process, &addr, 0, 0, &offset, + &size, 1 /* ViewShare */, 0, PAGE_READONLY); + ok(ret == STATUS_SUCCESS, "NtMapViewOfSection error %#x\n", ret); + ret = pNtUnmapViewOfSection(process, addr); + ok(ret == STATUS_SUCCESS, "NtUnmapViewOfSection error %#x\n", ret); + + CloseHandle(handle); + CloseHandle(process); + + SetLastError(0xdeadbeef); + handle = GetModuleHandle("winver.exe"); + ok(!handle, "winver.exe shouldn't be loaded yet\n"); + handle = LoadLibrary("winver.exe"); + ok(handle != 0, "LoadLibrary error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = FreeLibrary(handle); + ok(ret, "LoadLibrary error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForDebugEvent(&de, 0); + ok(!ret, "WaitForDebugEvent should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DebugActiveProcess(GetCurrentProcessId()); + ok(!ret, "DebugActiveProcess should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForDebugEvent(&de, 0); + ok(!ret, "WaitForDebugEvent should fail\n"); + ok(GetLastError() == ERROR_SEM_TIMEOUT, "expected ERROR_SEM_TIMEOUT, got %d\n", GetLastError()); + if (test_dll_phase == 2) { trace("dll: call ExitProcess()\n"); *child_failures = winetest_get_failures(); ExitProcess(197); } + trace("dll: %p, DLL_PROCESS_DETACH, %p => DONE\n", hinst, param); break; } case DLL_THREAD_ATTACH: @@ -1185,7 +1310,14 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) trace("dll: %p, DLL_THREAD_DETACH, %p\n", hinst, param); ret = pRtlDllShutdownInProgress(); - ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + /* win7 doesn't allow to create a thread during process shutdown, + * earlier Windows versions allow it, and DLL_THREAD_DETACH is + * sent on thread exit, but DLL_THREAD_ATTACH is never received. + */ + if (noop_thread_started) + ok(ret, "RtlDllShutdownInProgress returned %d\n", ret); + else + ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); break; default:

1 0

Dmitry Timoshkov : kernel32: Count precise amount of child process failures .
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: b632f0966d5a51f85e791b990493ec46864972de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b632f0966d5a51f85e791b990… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 18 17:44:43 2013 +0900 kernel32: Count precise amount of child process failures. --- dlls/kernel32/tests/loader.c | 30 +++++++++++++++++++++++++----- include/wine/test.h | 7 +++++++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ca33ef7..20ae3ec 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1615,7 +1615,11 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); ok(ret == 195, "expected exit code 195, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -1628,7 +1632,11 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); ok(ret == 195, "expected exit code 195, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -1641,7 +1649,11 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); ok(ret == 197, "expected exit code 197, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -1654,7 +1666,11 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); ok(ret == 195, "expected exit code 195, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -1668,7 +1684,11 @@ static void test_ExitProcess(void) GetExitCodeProcess(pi.hProcess, &ret); todo_wine ok(ret == 0 || broken(ret == 195) /* before win7 */, "expected exit code 0, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); diff --git a/include/wine/test.h b/include/wine/test.h index 0bd4db5..373fe76 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -61,6 +61,7 @@ extern int winetest_loop_todo(void); extern void winetest_end_todo( const char* platform ); extern int winetest_get_mainargs( char*** pargv ); extern LONG winetest_get_failures(void); +extern void winetest_add_failures( LONG new_failures ); extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); @@ -434,6 +435,12 @@ LONG winetest_get_failures(void) return failures; } +void winetest_add_failures( LONG new_failures ) +{ + while (new_failures-- > 0) + InterlockedIncrement( &failures ); +} + void winetest_wait_child_process( HANDLE process ) { DWORD exit_code = 1;

1 0

Zhan Jianyu : vbscript: Fix a typo: jscript -> vbscript.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: a8e70fa8838433cd7cad10747fc984de54ff2ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e70fa8838433cd7cad10747… Author: Zhan Jianyu <nasa4836(a)gmail.com> Date: Wed Apr 17 21:46:13 2013 +0800 vbscript: Fix a typo: jscript -> vbscript. --- dlls/vbscript/regexp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/regexp.c b/dlls/vbscript/regexp.c index c74ded5..ede9364 100644 --- a/dlls/vbscript/regexp.c +++ b/dlls/vbscript/regexp.c @@ -38,7 +38,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(jscript); +WINE_DEFAULT_DEBUG_CHANNEL(vbscript); /* FIXME: Better error handling */ #define ReportRegExpError(a,b,c)

1 0

Austin English : kernel32: Fix a typo in a comment.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 758911a8da976e5f3c39f5dd67d08305e6a96446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=758911a8da976e5f3c39f5dd6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 17 14:54:42 2013 -0700 kernel32: Fix a typo in a comment. --- dlls/kernel32/path.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 1cfd850..63d977b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1641,8 +1641,8 @@ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) * GetSystemWow64DirectoryW (KERNEL32.@) * * As seen on MSDN - * - On Win32 we should returns ERROR_CALL_NOT_IMPLEMENTED - * - On Win64 we should returns the SysWow64 (system64) directory + * - On Win32 we should return ERROR_CALL_NOT_IMPLEMENTED + * - On Win64 we should return the SysWow64 (system64) directory */ UINT WINAPI GetSystemWow64DirectoryW( LPWSTR path, UINT count ) {

1 0