October 2012 - Wine-commits

Alexandre Julliard : winex11: Refuse to set the pixel format for HWND_MESSAGE windows.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 53806917a3fc32460201a40a9edd6d8d24983c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53806917a3fc32460201a40a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 18:14:15 2012 +0200 winex11: Refuse to set the pixel format for HWND_MESSAGE windows. --- dlls/winex11.drv/opengl.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 6945bd1..96954cc 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1196,6 +1196,7 @@ static void free_gl_drawable( struct gl_drawable *gl ) */ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) { + HWND parent = GetAncestor( hwnd, GA_PARENT ); XSetWindowAttributes attrib; struct gl_drawable *gl, *prev; int format; @@ -1215,9 +1216,9 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) gl->rect.right = min( max( 1, gl->rect.right ), 65535 ); gl->rect.bottom = min( max( 1, gl->rect.bottom ), 65535 ); - if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ + if (parent == GetDesktopWindow()) /* top-level window */ { - Window parent = X11DRV_get_whole_window( hwnd ); + Window xparent = X11DRV_get_whole_window( hwnd ); gl->type = DC_GL_WINDOW; gl->colormap = XCreateColormap( gdi_display, root_window, gl->visual->visual, @@ -1230,8 +1231,8 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) attrib.backing_store = NotUseful; /* put the initial rect outside of the window, it will be moved into place by SetWindowPos */ OffsetRect( &gl->rect, gl->rect.right, gl->rect.bottom ); - if (parent) - gl->drawable = XCreateWindow( gdi_display, parent, gl->rect.left, gl->rect.top, + if (xparent) + gl->drawable = XCreateWindow( gdi_display, xparent, gl->rect.left, gl->rect.top, gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, 0, default_visual.depth, InputOutput, gl->visual->visual, CWBitGravity | CWWinGravity | CWBackingStore | CWColormap, @@ -1241,6 +1242,10 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) else XFreeColormap( gdi_display, gl->colormap ); } + else if (!GetAncestor( parent, GA_PARENT )) + { + FIXME( "can't set format of HWND_MESSAGE window %p\n", hwnd ); + } #ifdef SONAME_LIBXCOMPOSITE else if(usexcomposite) {

1 0

Alexandre Julliard : user32: Don' t redraw anything when WS_VISIBLE is toggled manually.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: b30e84d58012a9a1ead70a8e32739765c31f2468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30e84d58012a9a1ead70a8e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 19:52:31 2012 +0200 user32: Don't redraw anything when WS_VISIBLE is toggled manually. --- dlls/user32/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 023af02..0f487f7 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -769,7 +769,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) RECT window_rect, client_rect; WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_SHOWWINDOW, &window_rect, &client_rect, NULL ); } @@ -2492,7 +2492,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B RECT window_rect, client_rect; WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_SHOWWINDOW, &window_rect, &client_rect, NULL ); } SendMessageW( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style );

1 0

Alexandre Julliard : ntoskrnl.exe: Add missing WINAPIs.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: b560c56f3f33d0048fc069a5b1938c2f2b0c7236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b560c56f3f33d0048fc069a5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 18:37:28 2012 +0200 ntoskrnl.exe: Add missing WINAPIs. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a127551..632cea5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1493,8 +1493,8 @@ PVOID WINAPI MmMapIoSpace( PHYSICAL_ADDRESS PhysicalAddress, DWORD NumberOfBytes /*********************************************************************** * MmMapLockedPagesSpecifyCache (NTOSKRNL.EXE.@) */ -PVOID MmMapLockedPagesSpecifyCache(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, MEMORY_CACHING_TYPE CacheType, - PVOID BaseAddress, ULONG BugCheckOnFailure, MM_PAGE_PRIORITY Priority) +PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, MEMORY_CACHING_TYPE CacheType, + PVOID BaseAddress, ULONG BugCheckOnFailure, MM_PAGE_PRIORITY Priority) { FIXME("(%p, %u, %u, %p, %u, %u): stub\n", MemoryDescriptorList, AccessMode, CacheType, BaseAddress, BugCheckOnFailure, Priority); @@ -1515,7 +1515,7 @@ PVOID WINAPI MmPageEntireDriver(PVOID AddrInSection) /*********************************************************************** * MmProbeAndLockPages (NTOSKRNL.EXE.@) */ -void MmProbeAndLockPages(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, LOCK_OPERATION Operation) +void WINAPI MmProbeAndLockPages(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, LOCK_OPERATION Operation) { FIXME("(%p, %u, %u): stub\n", MemoryDescriptorList, AccessMode, Operation); } @@ -1533,7 +1533,7 @@ void WINAPI MmResetDriverPaging(PVOID AddrInSection) /*********************************************************************** * MmUnlockPages (NTOSKRNL.EXE.@) */ -void MmUnlockPages(PMDLX MemoryDescriptorList) +void WINAPI MmUnlockPages(PMDLX MemoryDescriptorList) { FIXME("(%p): stub\n", MemoryDescriptorList); }

1 0

Alistair Leslie-Hughes : scrrun: Correct Invoke parameter.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: ea151639737f08ca76bcec0ae174296cacdc572c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea151639737f08ca76bcec0ae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 21 10:53:51 2012 +1000 scrrun: Correct Invoke parameter. --- dlls/scrrun/dictionary.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 7664af8..b75d23c 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -153,7 +153,7 @@ static HRESULT WINAPI dictionary_Invoke(IDictionary *iface, DISPID dispIdMember, hr = get_typeinfo(IDictionary_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &iface, dispIdMember, wFlags, + hr = ITypeInfo_Invoke(typeinfo, &This->IDictionary_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); }

1 0

Henri Verbeet : wined3d: wined3d_device_set_depth_stencil() never fails.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 6e5cf8c69885733c78135983cfaf39d791760160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5cf8c69885733c78135983c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:11 2012 +0200 wined3d: wined3d_device_set_depth_stencil() never fails. --- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 5 ++--- dlls/wined3d/device.c | 6 +++--- include/wine/wined3d.h | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 751ba05..4f6162c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1085,7 +1085,7 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, struct d3d8_surface *rt_impl = unsafe_impl_from_IDirect3DSurface8(render_target); struct d3d8_surface *ds_impl = unsafe_impl_from_IDirect3DSurface8(depth_stencil); struct wined3d_surface *original_ds = NULL; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, render_target %p, depth_stencil %p.\n", iface, render_target, depth_stencil); @@ -1123,8 +1123,8 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, } original_ds = wined3d_device_get_depth_stencil(device->wined3d_device); - hr = wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); - if (SUCCEEDED(hr) && render_target) + wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); + if (render_target) { hr = wined3d_device_set_render_target(device->wined3d_device, 0, rt_impl->wined3d_surface, TRUE); if (FAILED(hr)) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index af2a92f..4d5c762 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1224,15 +1224,14 @@ static HRESULT WINAPI d3d9_device_SetDepthStencilSurface(IDirect3DDevice9Ex *ifa { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *ds_impl = unsafe_impl_from_IDirect3DSurface9(depth_stencil); - HRESULT hr; TRACE("iface %p, depth_stencil %p.\n", iface, depth_stencil); wined3d_mutex_lock(); - hr = wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); + wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetDepthStencilSurface(IDirect3DDevice9Ex *iface, IDirect3DSurface9 **depth_stencil) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fa35105..f9ff67c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4568,7 +4568,7 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, struct wined3d_surface *depth_stencil) +void CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, struct wined3d_surface *depth_stencil) { struct wined3d_surface *prev = device->fb.depth_stencil; @@ -4578,7 +4578,7 @@ HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, st if (prev == depth_stencil) { TRACE("Trying to do a NOP SetRenderTarget operation.\n"); - return WINED3D_OK; + return; } if (prev) @@ -4617,7 +4617,7 @@ HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, st device_invalidate_state(device, STATE_FRAMEBUFFER); - return WINED3D_OK; + return; } HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d527949..bc3e17f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2195,7 +2195,7 @@ void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_surface *cursor_surface); -HRESULT __cdecl wined3d_device_set_depth_stencil(struct wined3d_device *device, struct wined3d_surface *depth_stencil); +void __cdecl wined3d_device_set_depth_stencil(struct wined3d_device *device, struct wined3d_surface *depth_stencil); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp);

1 0

Henri Verbeet : wined3d: wined3d_device_get_creation_parameters() never fails.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 2ad58089961aedd1c5e1d6bace503fcf56bae997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad58089961aedd1c5e1d6bac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:12 2012 +0200 wined3d: wined3d_device_get_creation_parameters() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/dxgi/device.c | 10 +--------- dlls/wined3d/device.c | 3 +-- include/wine/wined3d.h | 2 +- 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4f6162c..65070bb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -479,16 +479,15 @@ static HRESULT WINAPI d3d8_device_GetCreationParameters(IDirect3DDevice8 *iface, D3DDEVICE_CREATION_PARAMETERS *parameters) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, parameters %p.\n", iface, parameters); wined3d_mutex_lock(); - hr = wined3d_device_get_creation_parameters(device->wined3d_device, + wined3d_device_get_creation_parameters(device->wined3d_device, (struct wined3d_device_creation_parameters *)parameters); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4d5c762..fc543d9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -422,16 +422,15 @@ static HRESULT WINAPI d3d9_device_GetCreationParameters(IDirect3DDevice9Ex *ifac D3DDEVICE_CREATION_PARAMETERS *parameters) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, parameters %p.\n", iface, parameters); wined3d_mutex_lock(); - hr = wined3d_device_get_creation_parameters(device->wined3d_device, + wined3d_device_get_creation_parameters(device->wined3d_device, (struct wined3d_device_creation_parameters *)parameters); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetCursorProperties(IDirect3DDevice9Ex *iface, diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 7bbc5e0..b8e6692 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -141,19 +141,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IWineDXGIDevice *iface, { struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); struct wined3d_device_creation_parameters create_parameters; - HRESULT hr; TRACE("iface %p, adapter %p\n", iface, adapter); EnterCriticalSection(&dxgi_cs); - - hr = wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters); - if (FAILED(hr)) - { - LeaveCriticalSection(&dxgi_cs); - return hr; - } - + wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters); LeaveCriticalSection(&dxgi_cs); return IWineDXGIFactory_EnumAdapters(This->factory, create_parameters.adapter_idx, adapter); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f9ff67c..c03537d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5263,13 +5263,12 @@ HRESULT CDECL wined3d_device_set_dialog_box_mode(struct wined3d_device *device, } -HRESULT CDECL wined3d_device_get_creation_parameters(const struct wined3d_device *device, +void CDECL wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *parameters) { TRACE("device %p, parameters %p.\n", device, parameters); *parameters = device->create_parms; - return WINED3D_OK; } void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bc3e17f..a5465fb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2114,7 +2114,7 @@ HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *devic UINT plane_idx, struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, struct wined3d_clip_status *clip_status); -HRESULT __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, +void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); struct wined3d_surface * __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps);

1 0

Henri Verbeet : wined3d: Recognize the SM4 dcl_constantBuffer opcode.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 6d948e1a8cdd8a9a5ae2b6124468275cbf13f2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d948e1a8cdd8a9a5ae2b6124… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:13 2012 +0200 wined3d: Recognize the SM4 dcl_constantBuffer opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 7 +++++++ dlls/wined3d/shader_sm4.c | 14 +++++++++++++- dlls/wined3d/wined3d_private.h | 7 +++++-- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a54a37f..4f5efe0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5101,6 +5101,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ shader_hw_nop, + /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_hw_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_hw_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index db04c6a..d344bfa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5120,6 +5120,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut, /* WINED3DSIH_DCL */ shader_glsl_nop, + /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 72f2fa6..d07809b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -50,6 +50,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CRS */ "crs", /* WINED3DSIH_CUT */ "cut", /* WINED3DSIH_DCL */ "dcl", + /* WINED3DSIH_DCL_CONSTANT_BUFFER */ "dcl_constantBuffer", /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ "dcl_outputTopology", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", @@ -1367,6 +1368,12 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe TRACE(" "); shader_dump_dst_param(&ins.declaration.semantic.reg, &shader_version); } + else if (ins.handler_idx == WINED3DSIH_DCL_CONSTANT_BUFFER) + { + TRACE("%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_src_param(&ins.declaration.src, &shader_version); + TRACE(", %s", ins.flags & WINED3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); + } else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PRIMITIVE || ins.handler_idx == WINED3DSIH_DCL_OUTPUT_TOPOLOGY) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f50fd76..cd93fb3 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -32,6 +32,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_PRIMITIVE_TYPE_SHIFT 11 #define WINED3D_SM4_PRIMITIVE_TYPE_MASK (0x7 << WINED3D_SM4_PRIMITIVE_TYPE_SHIFT) +#define WINED3D_SM4_INDEX_TYPE_SHIFT 11 +#define WINED3D_SM4_INDEX_TYPE_MASK (0x1 << WINED3D_SM4_INDEX_TYPE_SHIFT) + #define WINED3D_SM4_OPCODE_MASK 0xff #define WINED3D_SM4_REGISTER_MODIFIER (1 << 31) @@ -102,6 +105,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, + WINED3D_SM4_OP_DCL_CONSTANT_BUFFER = 0x59, WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY = 0x5c, WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, WINED3D_SM4_OP_DCL_VERTICES_OUT = 0x5e, @@ -222,6 +226,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, + {WINED3D_SM4_OP_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_CONSTANT_BUFFER, "", ""}, {WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, "", ""}, {WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PRIMITIVE, "", ""}, {WINED3D_SM4_OP_DCL_VERTICES_OUT, WINED3DSIH_DCL_VERTICES_OUT, "", ""}, @@ -592,7 +597,14 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi FIXME("Skipping modifier 0x%08x.\n", modifier); } - if (opcode == WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY) + if (opcode == WINED3D_SM4_OP_DCL_CONSTANT_BUFFER) + { + shader_sm4_read_src_param(priv, &p, WINED3D_DATA_FLOAT, + &ins->declaration.src, NULL); + if (opcode_token & WINED3D_SM4_INDEX_TYPE_MASK) + ins->flags |= WINED3DSI_INDEXED_DYNAMIC; + } + else if (opcode == WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY) { enum wined3d_sm4_output_primitive_type primitive_type; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6db495f..b14e85d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -374,8 +374,9 @@ enum wined3d_shader_dst_modifier }; /* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ -#define WINED3DSI_TEXLD_PROJECT 1 -#define WINED3DSI_TEXLD_BIAS 2 +#define WINED3DSI_TEXLD_PROJECT 0x1 +#define WINED3DSI_TEXLD_BIAS 0x2 +#define WINED3DSI_INDEXED_DYNAMIC 0x4 enum wined3d_shader_rel_op { @@ -439,6 +440,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CRS, WINED3DSIH_CUT, WINED3DSIH_DCL, + WINED3DSIH_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_VERTICES_OUT, @@ -670,6 +672,7 @@ struct wined3d_shader_instruction { struct wined3d_shader_semantic semantic; enum wined3d_primitive_type primitive_type; + struct wined3d_shader_src_param src; UINT count; } declaration; };

1 0

Jason Edmeades : cmd: cmd.exe /c or / k should suppress copy overwrite prompts.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: b1dacc6c379ede878b5740a8ab5df635538b6e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1dacc6c379ede878b5740a8a… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Oct 1 22:37:17 2012 +0100 cmd: cmd.exe /c or /k should suppress copy overwrite prompts. --- programs/cmd/builtins.c | 3 +- programs/cmd/tests/test_builtins.cmd | 86 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 43 +++++++++++++++ programs/cmd/wcmdmain.c | 7 ++- 4 files changed, 137 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f6922ad..f1c356c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); extern int defaultColor; extern BOOL echo_mode; +extern BOOL interactive; struct env_stack *pushd_directories; const WCHAR dotW[] = {'.','\0'}; @@ -446,7 +447,7 @@ void WCMD_copy (void) { else { /* By default, we will force the overwrite in batch mode and ask for * confirmation in interactive mode. */ - force = !!context; + force = !interactive; /* If COPYCMD is set, then we force the overwrite with /Y and ask for * confirmation with /-Y. If COPYCMD is neither of those, then we use the diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d89721a..1c0f875 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1816,8 +1816,94 @@ goto :eof :endlocalfinished echo %var% +set var= +set var2= cd .. & rd /q/s foobar +echo ------------ cmd.exe command lines ------------ +mkdir foobar +cd foobar +echo file1 > file1 + +rem Basic test of command line. Note a section prefix per command +rem to resync, as wine does not output anything in these cases yet. +echo --- Test 1 +cmd.exe /c echo Line1 +echo --- Test 2 +cmd.exe /c echo Test quotes "&" work +echo --- Test 3 +cmd.exe /c echo "&" +echo --- Test 4 +cmd.exe /c echo "<" +echo --- Test 5 +cmd.exe /c echo ">" +echo --- Test 6 +cmd.exe /c echo "\" +echo --- Test 7 +cmd.exe /c echo "|" +echo --- Test 8 +cmd.exe /c echo "`" +echo --- Test 9 +cmd.exe /c echo """ +echo --- Test 10 +echo on > file3 +(a)type file3 +(a)echo off +echo --- Test 11 +cmd.exe /c echo on >file3 +(a)type file3 +(a)echo off +echo --- Test 12 +cmd.exe /c "echo passed1" +echo --- Test 13 +cmd.exe /c " echo passed2 " +echo --- Test 14 +cmd.exe /c "dir /ad ..\fooba* /b" +echo --- Test 15 + +rem Ensure no interactive prompting when cmd.exe /c or /k +echo file2 > file2 +cmd.exe /c copy file1 file2 >nul +echo No prompts or I would not get here1 +rem - Try cmd.exe /k as well +cmd.exe /k "copy file1 file2 >nul && exit" +echo No prompts or I would not get here2 + +rem Non existing variable expansion is as per command line, ie left as-is +cmd.exe /c echo %%hello1%% +cmd.exe /c echo %%hello2 +cmd.exe /c echo %%hello3^:h=t%% +cmd.exe /c echo %%hello4%%%% + +rem Cannot issue a call from cmd.exe /c +cmd.exe /c call :hello5 + +rem %1-9 has no meaning +cmd.exe /c echo one = %%1 + +rem for loop vars need expanding +cmd.exe /c for /L %%i in (1,1,5) do @echo %%i + +rem goto's are ineffective +cmd.exe /c goto :fred +cmd.exe /c goto eof + +rem - %var% is expanded at read time, not execute time +set var=11 +cmd.exe /c "set var=22 && setlocal && set var=33 && endlocal && echo var contents: %%var%%" + +rem - endlocal ineffective on cmd.exe /c lines +cmd.exe /c "set var=22 && setlocal && set var=33 && endlocal && set var" +set var=99 + +rem - Environment is inherited ok +cmd.exe /c ECHO %%VAR%% + +rem - Exit works +cmd.exe /c exit + +cd .. +rd foobar /s /q echo ------------ Testing Errorlevel ------------ rem WARNING: Do *not* add tests using ErrorLevel after this section should_not_exist 2> nul > nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4bab1ef..e817706 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -907,6 +907,49 @@ value1 2 1 1 +------------ cmd.exe command lines ------------ +--- Test 1 +Line1 +--- Test 2 +(a)todo_wine@Test quotes "&" work +--- Test 3 +(a)todo_wine@"&" +--- Test 4 +(a)todo_wine@"<" +--- Test 5 +(a)todo_wine@">" +--- Test 6 +(a)todo_wine@"\" +--- Test 7 +(a)todo_wine@"|" +--- Test 8 +(a)todo_wine@"`" +--- Test 9 +(a)todo_wine@""" +--- Test 10 +--- Test 11 +--- Test 12 +(a)todo_wine@passed1 +--- Test 13 +(a)todo_wine@passed2(a)space@ +--- Test 14 +(a)todo_wine@foobar +--- Test 15 +No prompts or I would not get here1 +No prompts or I would not get here2 +%hello1% +%hello2 +%hello3:h=t% +%hello4%% +one = %1 +1 +2 +3 +4 +5 +(a)todo_wine@var contents: 11 +var=33(a)space@ +99 ------------ Testing Errorlevel ------------ 9009 1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 02babea..0e7a197 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -39,6 +39,7 @@ extern struct env_stack *pushd_directories; BATCH_CONTEXT *context = NULL; DWORD errorlevel; WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; +BOOL interactive; int defaultColor = 7; BOOL echo_mode = TRUE; @@ -2366,6 +2367,9 @@ int wmain (int argc, WCHAR *argvW[]) WCMD_echo(eoff); } + /* Until we start to read from the keyboard, stay as non-interactive */ + interactive = FALSE; + if (opt_c || opt_k) { int len,qcount; WCHAR** arg; @@ -2625,7 +2629,8 @@ int wmain (int argc, WCHAR *argvW[]) */ SetEnvironmentVariableW(promptW, defaultpromptW); - WCMD_version (); + interactive = TRUE; + if (!opt_k) WCMD_version (); while (TRUE) { /* Read until EOF (which for std input is never, but if redirect

1 0

Jason Edmeades : cmd: Fix basic cmd.exe /c "echo hello" type syntax.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 88f14bb59045e1d8c8bb0a71abb50f505620c420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f14bb59045e1d8c8bb0a71a… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 2 00:35:47 2012 +0100 cmd: Fix basic cmd.exe /c "echo hello" type syntax. Add checks for existance of command to run in order to keep the new quote handling capabilities of cmd.exe /C or /K. If the command cannot be found, drop back to /S processing mode as per cmd.exe help. --- programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 7 ++- programs/cmd/wcmdmain.c | 71 +++++++++++++++++++++++++++++- 3 files changed, 74 insertions(+), 5 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1c0f875..3e064b9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1829,6 +1829,7 @@ rem Basic test of command line. Note a section prefix per command rem to resync, as wine does not output anything in these cases yet. echo --- Test 1 cmd.exe /c echo Line1 +cmd.exe /c echo "Line2" echo --- Test 2 cmd.exe /c echo Test quotes "&" work echo --- Test 3 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e817706..6483f1e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -910,6 +910,7 @@ value1 ------------ cmd.exe command lines ------------ --- Test 1 Line1 +(a)todo_wine@"Line2" --- Test 2 @todo_wine(a)Test quotes "&" work --- Test 3 @@ -929,11 +930,11 @@ Line1 --- Test 10 --- Test 11 --- Test 12 -(a)todo_wine@passed1 +passed1 --- Test 13 -(a)todo_wine@passed2(a)space@ +passed2(a)space@ --- Test 14 -(a)todo_wine@foobar +foobar --- Test 15 No prompts or I would not get here1 No prompts or I would not get here2 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0e7a197..675256b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2419,10 +2419,12 @@ int wmain (int argc, WCHAR *argvW[]) } } + /* If there is not exactly 2 quote characters, then /S (old behaviour) is enabled */ if (qcount!=2) opt_s = TRUE; - /* check argvW[0] for a space and invalid characters */ + /* check argvW[0] for a space and invalid characters. There must not be any invalid + * characters, but there must be one or more whitespace */ if (!opt_s) { opt_s = TRUE; p=*argvW; @@ -2432,7 +2434,7 @@ int wmain (int argc, WCHAR *argvW[]) opt_s = TRUE; break; } - if (*p==' ') + if (*p==' ' || *p=='\t') opt_s = FALSE; p++; } @@ -2507,6 +2509,71 @@ int wmain (int argc, WCHAR *argvW[]) WINE_TRACE("/c command line: '%s'\n", wine_dbgstr_w(cmd)); + /* Finally, we only stay in new mode IF the first parameter is quoted and + is a valid executable, ie must exist, otherwise drop back to old mode */ + if (!opt_s) { + WCHAR *thisArg = WCMD_parameter(cmd, 0, NULL, NULL, FALSE); + static const WCHAR extEXEW[] = {'.','e','x','e','\0'}; + static const WCHAR extCOMW[] = {'.','c','o','m','\0'}; + BOOL found = FALSE; + + /* If the supplied parameter has any directory information, look there */ + WINE_TRACE("First parameter is '%s'\n", wine_dbgstr_w(thisArg)); + if (strchrW(thisArg, '\\') != NULL) { + + GetFullPathNameW(thisArg, sizeof(string)/sizeof(WCHAR), string, NULL); + WINE_TRACE("Full path name '%s'\n", wine_dbgstr_w(string)); + p = string + strlenW(string); + + /* Does file exist with this name? */ + if (GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { + WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } else strcpyW(p, extEXEW); + + /* Does file exist with .exe appended */ + if (!found && GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { + WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } else strcpyW(p, extCOMW); + + /* Does file exist with .com appended */ + if (!found && GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { + WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + + /* Otherwise we now need to look in the path to see if we can find it */ + } else { + p = thisArg + strlenW(thisArg); + + /* Does file exist with this name? */ + if (SearchPathW(NULL, thisArg, NULL, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + + /* Does file exist plus an extension of .exe? */ + if (SearchPathW(NULL, thisArg, extEXEW, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + + /* Does file exist plus an extension of .com? */ + if (SearchPathW(NULL, thisArg, extCOMW, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + } + + /* If not found, drop back to old behaviour */ + if (!found) { + WINE_TRACE("Binary not found, dropping back to old behaviour\n"); + opt_s = TRUE; + } + + } + /* strip first and last quote characters if opt_s; check for invalid * executable is done later */ if (opt_s && *cmd=='\"')

1 0

Jacek Caban : vbscript: Added Trim() implementation.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 3ea9a170c0beb6c68cef50e3c81c2c883562efce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea9a170c0beb6c68cef50e3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 10:33:30 2012 +0200 vbscript: Added Trim() implementation. --- dlls/vbscript/global.c | 26 ++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index fa600ee..e6211b7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -864,8 +864,30 @@ static HRESULT Global_RTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_Trim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, conv_str = NULL; + WCHAR *begin_ptr, *end_ptr; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(V_VT(arg) == VT_BSTR) { + str = V_BSTR(arg); + }else { + hres = to_string(arg, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + for(begin_ptr = str; *begin_ptr && isspaceW(*begin_ptr); begin_ptr++); + for(end_ptr = str+SysStringLen(str); end_ptr-1 > begin_ptr && isspaceW(*(end_ptr-1)); end_ptr--); + + str = SysAllocStringLen(begin_ptr, end_ptr-begin_ptr); + SysFreeString(conv_str); + if(!str) + return E_OUTOFMEMORY; + + return return_bstr(res, str); } static HRESULT Global_Space(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 06122ef..7553d59 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -225,6 +225,18 @@ TestRight "test", 0, "" TestRight 123, 2, "23" if isEnglishLang then TestRight true, 2, "ue" +Sub TestTrim(str, exstr) + Call ok(Trim(str) = exstr, "Trim(" & str & ") = " & Trim(str)) +End Sub + +TestTrim " test ", "test" +TestTrim "test ", "test" +TestTrim " test", "test" +TestTrim "test", "test" +TestTrim "", "" +TestTrim 123, "123" +if isEnglishLang then TestTrim true, "True" + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))

1 0