wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Stefan Dösinger : d3d9: Add a LIT 0.0^0.0 test.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: c2cefe558434859d3d063b153f49a88b526ffe1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cefe558434859d3d063b153… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 17:41:53 2011 +0200 d3d9: Add a LIT 0.0^0.0 test. --- dlls/d3d9/tests/visual.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 772aa2e..1857e2e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11779,6 +11779,8 @@ static void fp_special_test(IDirect3DDevice9 *device) static const DWORD vs_rcp2[] = {0x02000006, 0x80010000, 0x91000001}; /* rcp r0.x, -v1.x */ static const DWORD vs_rsq1[] = {0x02000007, 0x80010000, 0x90000001}; /* rsq r0.x, v1.x */ static const DWORD vs_rsq2[] = {0x02000007, 0x80010000, 0x91000001}; /* rsq r0.x, -v1.x */ + static const DWORD vs_lit[] = {0x02000010, 0x800f0000, 0x90000001, /* lit r0, v1.xxxx */ + 0x02000001, 0x80010000, 0x80aa0000}; /* mov r0.x, v0.z */ static const DWORD vs_footer[] = { @@ -11830,6 +11832,7 @@ static void fp_special_test(IDirect3DDevice9 *device) {"rcp2", vs_rcp2, sizeof(vs_rcp2), 0x00000000, 0x00ff0000, 0x00ff7f00}, {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, + {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000}, }; static const DWORD ps_code[] =

1 0

Stefan Dösinger : wined3d: Make sure that lit doesn' t return NaN.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: ec0ac720bfc0a981f841bf917d94cac8a2919577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0ac720bfc0a981f841bf917… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 19:50:30 2011 +0200 wined3d: Make sure that lit doesn't return NaN. --- dlls/wined3d/glsl_shader.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 837b7d4..7e736d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2713,6 +2713,7 @@ static void shader_glsl_lit(const struct wined3d_shader_instruction *ins) * if(src.x > 0.0 && src.y > 0.0) dst.z = pow(src.y, power); * else dst.z = 0.0; * dst.w = 1.0; + * (where power = src.w clamped between -128 and 128) * * Obviously that has quite a few conditionals in it which we don't like. So the first step is this: * dst.x = 1.0 ... No further explanation needed @@ -2725,11 +2726,17 @@ static void shader_glsl_lit(const struct wined3d_shader_instruction *ins) * * step(0.0, x) will return 1 if src.x > 0.0, and 0 otherwise. So if y is 0 we get pow(0.0 * 1.0, power), * which sets dst.z to 0. If y > 0, but x = 0.0, we get pow(y * 0.0, power), which results in 0 too. - * if both x and y are > 0, we get pow(y * 1.0, power), as it is supposed to + * if both x and y are > 0, we get pow(y * 1.0, power), as it is supposed to. + * + * Unfortunately pow(0.0 ^ 0.0) returns NaN on most GPUs, but lit with src.y = 0 and src.w = 0 returns + * a non-NaN value in dst.z. What we return doesn't matter, as long as it is not NaN. Return 0, which is + * what all Windows HW drivers and GL_ARB_vertex_program's LIT do. */ shader_addline(ins->ctx->buffer, - "vec4(1.0, max(%s, 0.0), pow(max(0.0, %s) * step(0.0, %s), clamp(%s, -128.0, 128.0)), 1.0)%s);\n", - src0_param.param_str, src1_param.param_str, src0_param.param_str, src3_param.param_str, dst_mask); + "vec4(1.0, max(%s, 0.0), %s == 0.0 ? 0.0 : " + "pow(max(0.0, %s) * step(0.0, %s), clamp(%s, -128.0, 128.0)), 1.0)%s);\n", + src0_param.param_str, src3_param.param_str, src1_param.param_str, + src0_param.param_str, src3_param.param_str, dst_mask); } /** Process the WINED3DSIO_DST instruction in GLSL:

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_vs_consts_i() const.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: d7fa599974846415f2f7f6981e8a659a5c8cd5e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7fa599974846415f2f7f6981… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 11 22:25:42 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_vs_consts_i() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4caac23..fe0d5fe 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2765,7 +2765,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_vs_consts_i(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_vs_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count) { UINT count = min(vector4i_count, MAX_CONST_I - start_register); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 08b6462..5327beb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2270,7 +2270,7 @@ HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *devi UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_vs_consts_f(struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count); -HRESULT __cdecl wined3d_device_get_vs_consts_i(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); HRESULT __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_vs_consts_b() const.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 098d30946da16a1026ab68d98a4aee83ad056227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098d30946da16a1026ab68d98… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 11 22:25:41 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_vs_consts_b() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e1cb38f..4caac23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2722,7 +2722,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_vs_consts_b(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_vs_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count) { UINT count = min(bool_count, MAX_CONST_B - start_register); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ed03929..08b6462 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2266,7 +2266,7 @@ HRESULT __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_devic struct wined3d_vertex_declaration **declaration); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, WINED3DVIEWPORT *viewport); -HRESULT __cdecl wined3d_device_get_vs_consts_b(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_vs_consts_f(struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count);

1 0

Henri Verbeet : ddraw: Get the total amount of video memory from wined3d.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: b23809868a2dc06373cd9f9fcbc1e56a497301d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23809868a2dc06373cd9f9fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 11 22:25:40 2011 +0200 ddraw: Get the total amount of video memory from wined3d. Instead of hoping that what's available at ddraw_init() time is the total. --- dlls/ddraw/ddraw.c | 15 +++++++++------ dlls/ddraw/ddraw_private.h | 1 - 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e9aefd9..d48aa01 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1593,6 +1593,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C DWORD *free) { IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); + HRESULT hr = DD_OK; TRACE("iface %p, caps %p, total %p, free %p.\n", iface, Caps, total, free); @@ -1614,13 +1615,18 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C return DDERR_INVALIDPARAMS; } - if (total) - *total = This->total_vidmem; if (free) *free = wined3d_device_get_available_texture_mem(This->wined3d_device); + if (total) + { + WINED3DADAPTER_IDENTIFIER desc = {0}; + + hr = wined3d_get_adapter_identifier(This->wineD3D, WINED3DADAPTER_DEFAULT, 0, &desc); + *total = desc.video_memory; + } LeaveCriticalSection(&ddraw_cs); - return DD_OK; + return hr; } static HRESULT WINAPI ddraw4_GetAvailableVidMem(IDirectDraw4 *iface, @@ -5841,9 +5847,6 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) return hr; } - /* Get the amount of video memory */ - ddraw->total_vidmem = wined3d_device_get_available_texture_mem(ddraw->wined3d_device); - list_init(&ddraw->surface_list); return DD_OK; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 065ef8a..1daefbc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -89,7 +89,6 @@ struct IDirectDrawImpl BOOL d3d_initialized; /* Misc ddraw fields */ - UINT total_vidmem; DWORD cur_scanline; BOOL fake_vblank; BOOL initialized;

1 0

Henri Verbeet : ddraw: Remove the unused "depthstencil" field from IDirectDrawImpl.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: aa5590b06128521f7580bc38347ac983e3253580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa5590b06128521f7580bc383… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 11 22:25:39 2011 +0200 ddraw: Remove the unused "depthstencil" field from IDirectDrawImpl. --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 6 +----- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2c3ab8f..065ef8a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -113,7 +113,6 @@ struct IDirectDrawImpl /* Helpers for surface creation */ IDirectDrawSurfaceImpl *tex_root; - BOOL depthstencil; /* For the dll unload cleanup code */ struct list ddraw_list_entry; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d70e355..10d9dc4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5184,12 +5184,8 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr usage |= WINED3DUSAGE_OVERLAY; } - if (ddraw->depthstencil || (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) - { - /* The depth stencil creation callback sets this flag. Set the - * wined3d usage to let it know it's a depth/stencil surface. */ + if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) usage |= WINED3DUSAGE_DEPTHSTENCIL; - } if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) {

1 0

Henri Verbeet : ddraw: Initialize the swapchain presentation parameters in ddraw_create_swapchain ().
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: f3e1a9fa16a9d1c0a112f94531c7ce32fe62cc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e1a9fa16a9d1c0a112f9453… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 11 22:25:38 2011 +0200 ddraw: Initialize the swapchain presentation parameters in ddraw_create_swapchain(). --- dlls/ddraw/ddraw.c | 91 +++++++++++++++++++++------------------------------- 1 files changed, 37 insertions(+), 54 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 001a2be..e9aefd9 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2730,10 +2730,10 @@ CreateAdditionalSurfaces(IDirectDrawImpl *This, * DDERR_* otherwise * *****************************************************************************/ -static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *primary) +static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *primary, + WINED3DPRESENT_PARAMETERS *presentation_parameters) { - WINED3DPRESENT_PARAMETERS localParameters; - HWND window = ddraw->dest_window; + HWND window = presentation_parameters->hDeviceWindow; HRESULT hr; TRACE("ddraw %p, primary %p.\n", ddraw, primary); @@ -2751,6 +2751,8 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac ShowWindow(window, SW_HIDE); /* Just to be sure */ WARN("No window for the Direct3DDevice, created hidden window %p.\n", window); + + presentation_parameters->hDeviceWindow = window; } else { @@ -2761,23 +2763,10 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac /* Store the future Render Target surface */ ddraw->d3d_target = primary; - memset(&localParameters, 0, sizeof(localParameters)); - - /* Use the surface description for the device parameters, not the device - * settings. The application might render to an offscreen surface. */ - localParameters.BackBufferWidth = primary->surface_desc.dwWidth; - localParameters.BackBufferHeight = primary->surface_desc.dwHeight; - localParameters.BackBufferFormat = PixelFormat_DD2WineD3D(&primary->surface_desc.u4.ddpfPixelFormat); - localParameters.BackBufferCount = (primary->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) - ? primary->surface_desc.dwBackBufferCount : 0; - localParameters.SwapEffect = WINED3DSWAPEFFECT_COPY; - localParameters.hDeviceWindow = window; - localParameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); - /* Set this NOW, otherwise creating the depth stencil surface will cause a * recursive loop until ram or emulated video memory is full. */ ddraw->d3d_initialized = TRUE; - hr = wined3d_device_init_3d(ddraw->wined3d_device, &localParameters); + hr = wined3d_device_init_3d(ddraw->wined3d_device, presentation_parameters); if (FAILED(hr)) { ddraw->d3d_target = NULL; @@ -2800,29 +2789,13 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac return DD_OK; } -static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *primary) +static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *primary, + WINED3DPRESENT_PARAMETERS *presentation_parameters) { - WINED3DPRESENT_PARAMETERS presentation_parameters; - HWND window; HRESULT hr; - window = ddraw->dest_window; - - memset(&presentation_parameters, 0, sizeof(presentation_parameters)); - - /* Use the surface description for the device parameters, not the device - * settings. The application might render to an offscreen surface. */ - presentation_parameters.BackBufferWidth = primary->surface_desc.dwWidth; - presentation_parameters.BackBufferHeight = primary->surface_desc.dwHeight; - presentation_parameters.BackBufferFormat = PixelFormat_DD2WineD3D(&primary->surface_desc.u4.ddpfPixelFormat); - presentation_parameters.BackBufferCount = (primary->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) - ? primary->surface_desc.dwBackBufferCount : 0; - presentation_parameters.SwapEffect = WINED3DSWAPEFFECT_COPY; - presentation_parameters.hDeviceWindow = window; - presentation_parameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); - ddraw->d3d_target = primary; - hr = wined3d_device_init_gdi(ddraw->wined3d_device, &presentation_parameters); + hr = wined3d_device_init_gdi(ddraw->wined3d_device, presentation_parameters); ddraw->d3d_target = NULL; if (FAILED(hr)) { @@ -2835,7 +2808,33 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *surface) { + WINED3DPRESENT_PARAMETERS presentation_parameters; + IDirectDrawSurfaceImpl *target = surface; HRESULT hr = WINED3D_OK; + struct list *entry; + + /* Search for the primary to use as render target. */ + LIST_FOR_EACH(entry, &ddraw->surface_list) + { + IDirectDrawSurfaceImpl *primary = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); + if ((primary->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) + == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) + { + TRACE("Using primary %p as render target.\n", target); + target = primary; + break; + } + } + + memset(&presentation_parameters, 0, sizeof(presentation_parameters)); + presentation_parameters.BackBufferWidth = target->surface_desc.dwWidth; + presentation_parameters.BackBufferHeight = target->surface_desc.dwHeight; + presentation_parameters.BackBufferFormat = PixelFormat_DD2WineD3D(&target->surface_desc.u4.ddpfPixelFormat); + presentation_parameters.BackBufferCount = (target->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) + ? target->surface_desc.dwBackBufferCount : 0; + presentation_parameters.SwapEffect = WINED3DSWAPEFFECT_COPY; + presentation_parameters.hDeviceWindow = ddraw->dest_window; + presentation_parameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); /* If the implementation is OpenGL and there's no d3ddevice, attach a * d3ddevice. But attach the d3ddevice only if the currently created @@ -2846,28 +2845,12 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurface * target creation will cause the 3D init. */ if (DefaultSurfaceType == SURFACE_OPENGL) { - IDirectDrawSurfaceImpl *target = surface, *primary; - struct list *entry; - - /* Search for the primary to use as render target. */ - LIST_FOR_EACH(entry, &ddraw->surface_list) - { - primary = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); - if ((primary->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) - == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) - { - TRACE("Using primary %p as render target.\n", target); - target = primary; - break; - } - } - TRACE("Attaching a D3DDevice, rendertarget = %p.\n", target); - hr = ddraw_attach_d3d_device(ddraw, target); + hr = ddraw_attach_d3d_device(ddraw, target, &presentation_parameters); } else if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - hr = ddraw_create_gdi_swapchain(ddraw, surface); + hr = ddraw_create_gdi_swapchain(ddraw, target, &presentation_parameters); } return hr;

1 0

Nikolay Sivov : shell32: Fix pidl leak (Valgrind).
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: ff090f749d735fb85651f5ff9ff9da576c3cace6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff090f749d735fb85651f5ff9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 11 19:23:00 2011 +0400 shell32: Fix pidl leak (Valgrind). --- dlls/shell32/shlview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index eee447e..3f18256 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -752,6 +752,7 @@ static LRESULT ShellView_OnCreate(IShellViewImpl *This) This->hNotify = SHChangeNotifyRegister(This->hWnd, SHCNRF_InterruptLevel, SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, 1, &ntreg); SHFree((LPITEMIDLIST)ntreg.pidl); + SHFree(computer_pidl); } IPersistFolder2_Release(ppf2); }

1 0

Frédéric Delanoy : cmd/tests: Segment CALL tests for an easier read.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: d029a334538d380269a13eeee754d23374685d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d029a334538d380269a13eeee… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 11 16:54:08 2011 +0200 cmd/tests: Segment CALL tests for an easier read. --- programs/cmd/tests/test_builtins.cmd | 9 +++++---- programs/cmd/tests/test_builtins.cmd.exp | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 9a5f786..c5f4bd9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1196,9 +1196,9 @@ set FOO= endlocal cd .. & rd /s/q foobar -echo ------------ Testing CALL -------------- +echo ------------ Testing CALL ------------ mkdir foobar & cd foobar -rem External script +echo ... external script ... echo echo foo %%1> foo.cmd call foo call foo.cmd 8 @@ -1210,7 +1210,8 @@ call foo.cmd "" bar call foo.cmd foo '' call foo.cmd '' bar del foo.cmd -rem Internal routines + +echo ... internal routines ... call :testRoutine :testRoutine goto :endTestRoutine :testRoutine @@ -1230,7 +1231,7 @@ echo %1 %2 goto :eof :endTestRoutineArgs -rem Should work for builtins... +echo ... with builtins ... call mkdir foo echo %ErrorLevel% if exist foo (echo foo created) else echo foo should exist! diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 90dfb45..7dd6207 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -696,7 +696,8 @@ footype=foo_opencmd footype=foo_opencmd ...resetting association @todo_wine@original value@or_broken@buggyXP@or_broken@!FOO! ------------- Testing CALL -------------- +------------ Testing CALL ------------ +... external script ... foo@space@ foo 8 foo@space@@space@ @@ -705,6 +706,7 @@ foo bar@space@ @todo_wine@"" bar@space@ foo ''@space@ '' bar@space@ +... internal routines ... bar :testRoutine foo@space@ foo bar @@ -712,6 +714,7 @@ foo bar @todo_wine@"" bar foo '' '' bar +... with builtins ... @todo_wine@0 @todo_wine@foo created @todo_wine@Should expand foobaz

1 0

Frédéric Delanoy : cmd: GOTO is a no-op and doesn 't output anything in interactive mode.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 6e506eaea90a21f41de7fd82a320e1c9ef7c7ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e506eaea90a21f41de7fd82a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 9 21:54:41 2011 +0200 cmd: GOTO is a no-op and doesn't output anything in interactive mode. --- programs/cmd/builtins.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7122301..dcbc73e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1377,14 +1377,15 @@ void WCMD_goto (CMD_LIST **cmdList) { /* Do not process any more parts of a processed multipart or multilines command */ if (cmdList) *cmdList = NULL; - if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); - return; - } if (context != NULL) { WCHAR *paramStart = param1, *str; static const WCHAR eofW[] = {':','e','o','f','\0'}; + if (param1[0] == 0x00) { + WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + return; + } + /* Handle special :EOF label */ if (lstrcmpiW (eofW, param1) == 0) { context -> skip_rest = TRUE;

1 0

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 September 2011