November 2010 - Wine-Commits

Alexander Morozov : crypt32/tests: Add tests for decoding enveloped messages.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 5328687fb5c1ce874004b2c0e5e7ca15da3ba76b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5328687fb5c1ce874004b2c0e… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Nov 2 15:54:15 2010 +0300 crypt32/tests: Add tests for decoding enveloped messages. --- dlls/crypt32/tests/msg.c | 245 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 245 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5328687fb5c1ce874004b…

1 0

Jacek Caban : shdocvw: Added missing IID_IOleWindow handing to IOleInPlaceFrame:: QueryInterface implementation.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: f38cc9318bb287a40ab7ae77c1964259339cac99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38cc9318bb287a40ab7ae77c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 2 14:45:10 2010 +0100 shdocvw: Added missing IID_IOleWindow handing to IOleInPlaceFrame::QueryInterface implementation. --- dlls/shdocvw/frame.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/frame.c b/dlls/shdocvw/frame.c index 150ca93..2f089c1 100644 --- a/dlls/shdocvw/frame.c +++ b/dlls/shdocvw/frame.c @@ -33,6 +33,9 @@ static HRESULT WINAPI InPlaceFrame_QueryInterface(IOleInPlaceFrame *iface, if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = INPLACEFRAME(This); + }else if(IsEqualGUID(&IID_IOleWindow, riid)) { + TRACE("(%p)->(IID_IOleWindow %p)\n", This, ppv); + *ppv = INPLACEFRAME(This); }else if(IsEqualGUID(&IID_IOleInPlaceUIWindow, riid)) { TRACE("(%p)->(IID_IOleInPlaceUIWindow %p)\n", This, ppv); *ppv = INPLACEFRAME(This);

1 0

Eryk Wieliczko : comdlg32: GetSaveFileName: Don't append .* extension.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: bd0fe7d26bafebc2e51ec54d354bf1e41bc3892e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd0fe7d26bafebc2e51ec54d3… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Mon Nov 1 12:35:43 2010 +0100 comdlg32: GetSaveFileName: Don't append .* extension. --- dlls/comdlg32/filedlg.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 2687029..f36d3a5 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2474,14 +2474,11 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) /* if no extension is specified with file name, then */ /* attach the extension from file filter or default one */ - WCHAR *filterExt = NULL; + const WCHAR *filterExt = NULL; LPWSTR lpstrFilter = NULL; static const WCHAR szwDot[] = {'.',0}; int PathLength = lstrlenW(lpstrPathAndFile); - /* Attach the dot*/ - lstrcatW(lpstrPathAndFile, szwDot); - /*Get the file extension from file type filter*/ lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->ofnInfos->nFilterIndex-1); @@ -2490,9 +2487,18 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) filterExt = PathFindExtensionW(lpstrFilter); if ( filterExt && *filterExt ) /* attach the file extension from file type filter*/ - lstrcatW(lpstrPathAndFile, filterExt + 1); + filterExt = filterExt + 1; else if ( fodInfos->defext ) /* attach the default file extension*/ - lstrcatW(lpstrPathAndFile, fodInfos->defext); + filterExt = fodInfos->defext; + + /* If extension is .*, ignore it */ + if (filterExt[0] != '*') + { + /* Attach the dot*/ + lstrcatW(lpstrPathAndFile, szwDot); + /* Attach the extension */ + lstrcatW(lpstrPathAndFile, filterExt ); + } /* In Open dialog: if file does not exist try without extension */ if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile))

1 0

Henri Verbeet : wined3d: Do not use "lockedRect" unless the surface is locked in flush_to_framebuffer_drawpixels().
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 3f0d16c5bf9094897857c3366979b2b4a513aaa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0d16c5bf9094897857c3366… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 2 12:02:48 2010 +0100 wined3d: Do not use "lockedRect" unless the surface is locked in flush_to_framebuffer_drawpixels(). --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 20a656c..5ac4881 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1741,6 +1741,17 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, IWineD3DDeviceImpl *device = This->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; + RECT rect; + UINT w, h; + + if (This->Flags & SFLAG_LOCKED) + rect = This->lockedRect; + else + SetRect(&rect, 0, 0, This->currentDesc.Width, This->currentDesc.Height); + + mem += rect.top * pitch + rect.left * bpp; + w = rect.right - rect.left; + h = rect.bottom - rect.top; /* Activate the correct context for the render target */ context = context_acquire(device, This); @@ -1762,7 +1773,7 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, context_set_draw_buffer(context, device->offscreenBuffer); } - glRasterPos3i(This->lockedRect.left, This->lockedRect.top, 1); + glRasterPos3i(rect.left, rect.top, 1); checkGLcall("glRasterPos3i"); /* Some drivers(radeon dri, others?) don't like exceptions during @@ -1789,19 +1800,8 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, checkGLcall("glBindBufferARB"); } - /* When the surface is locked we only have to refresh the locked part else we need to update the whole image */ - if(This->Flags & SFLAG_LOCKED) { - glDrawPixels(This->lockedRect.right - This->lockedRect.left, - (This->lockedRect.bottom - This->lockedRect.top)-1, - fmt, type, - mem + bpp * This->lockedRect.left + pitch * This->lockedRect.top); - checkGLcall("glDrawPixels"); - } else { - glDrawPixels(This->currentDesc.Width, - This->currentDesc.Height, - fmt, type, mem); - checkGLcall("glDrawPixels"); - } + glDrawPixels(w, h, fmt, type, mem); + checkGLcall("glDrawPixels"); if(This->Flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0));

1 0

Rico Schüller : include: Add ID3D11ShaderReflection interface.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: d37b3c8280f2eb78fda91b4b21d8aa1014ecedf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37b3c8280f2eb78fda91b4b2… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Nov 1 22:18:45 2010 +0100 include: Add ID3D11ShaderReflection interface. --- include/d3d11shader.h | 180 +++++++++++++++++++++++++++++++++++++++++++++++++ include/d3dcommon.idl | 50 ++++++++++++++ include/d3dx9effect.h | 1 + 3 files changed, 231 insertions(+), 0 deletions(-) diff --git a/include/d3d11shader.h b/include/d3d11shader.h index f6d4b31..6a0ee51 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -21,8 +21,188 @@ #include "d3dcommon.h" +/* These are defined as version-neutral in d3dcommon.h */ typedef D3D_CBUFFER_TYPE D3D11_CBUFFER_TYPE; typedef D3D_RESOURCE_RETURN_TYPE D3D11_RESOURCE_RETURN_TYPE; +typedef D3D_TESSELLATOR_DOMAIN D3D11_TESSELLATOR_DOMAIN; + +typedef D3D_TESSELLATOR_PARTITIONING D3D11_TESSELLATOR_PARTITIONING; + +typedef D3D_TESSELLATOR_OUTPUT_PRIMITIVE D3D11_TESSELLATOR_OUTPUT_PRIMITIVE; + +typedef struct _D3D11_SHADER_DESC +{ + UINT Version; + LPCSTR Creator; + UINT Flags; + UINT ConstantBuffers; + UINT BoundResources; + UINT InputParameters; + UINT OutputParameters; + UINT InstructionCount; + UINT TempRegisterCount; + UINT TempArrayCount; + UINT DefCount; + UINT DclCount; + UINT TextureNormalInstructions; + UINT TextureLoadInstructions; + UINT TextureCompInstructions; + UINT TextureBiasInstructions; + UINT TextureGradientInstructions; + UINT FloatInstructionCount; + UINT IntInstructionCount; + UINT UintInstructionCount; + UINT StaticFlowControlCount; + UINT DynamicFlowControlCount; + UINT MacroInstructionCount; + UINT ArrayInstructionCount; + UINT CutInstructionCount; + UINT EmitInstructionCount; + D3D_PRIMITIVE_TOPOLOGY GSOutputTopology; + UINT GSMaxOutputVertexCount; + D3D_PRIMITIVE InputPrimitive; + UINT PatchConstantParameters; + UINT cGSInstanceCount; + UINT cControlPoints; + D3D_TESSELLATOR_OUTPUT_PRIMITIVE HSOutputPrimitive; + D3D_TESSELLATOR_PARTITIONING HSPartitioning; + D3D_TESSELLATOR_DOMAIN TessellatorDomain; + UINT cBarrierInstructions; + UINT cInterlockedInstructions; + UINT cTextureStoreInstructions; +} D3D11_SHADER_DESC; + +typedef struct _D3D11_SHADER_VARIABLE_DESC +{ + LPCSTR Name; + UINT StartOffset; + UINT Size; + UINT uFlags; + LPVOID DefaultValue; + UINT StartTexture; + UINT TextureSize; + UINT StartSampler; + UINT SamplerSize; +} D3D11_SHADER_VARIABLE_DESC; + +typedef struct _D3D11_SHADER_TYPE_DESC +{ + D3D_SHADER_VARIABLE_CLASS Class; + D3D_SHADER_VARIABLE_TYPE Type; + UINT Rows; + UINT Columns; + UINT Elements; + UINT Members; + UINT Offset; + LPCSTR Name; +} D3D11_SHADER_TYPE_DESC; + +typedef struct _D3D11_SHADER_BUFFER_DESC +{ + LPCSTR Name; + D3D_CBUFFER_TYPE Type; + UINT Variables; + UINT Size; + UINT uFlags; +} D3D11_SHADER_BUFFER_DESC; + +typedef struct _D3D11_SHADER_INPUT_BIND_DESC +{ + LPCSTR Name; + D3D_SHADER_INPUT_TYPE Type; + UINT BindPoint; + UINT BindCount; + UINT uFlags; + D3D_RESOURCE_RETURN_TYPE ReturnType; + D3D_SRV_DIMENSION Dimension; + UINT NumSamples; +} D3D11_SHADER_INPUT_BIND_DESC; + +typedef struct _D3D11_SIGNATURE_PARAMETER_DESC +{ + LPCSTR SemanticName; + UINT SemanticIndex; + UINT Register; + D3D_NAME SystemValueType; + D3D_REGISTER_COMPONENT_TYPE ComponentType; + BYTE Mask; + BYTE ReadWriteMask; + UINT Stream; +} D3D11_SIGNATURE_PARAMETER_DESC; + +DEFINE_GUID(IID_ID3D11ShaderReflectionType, 0x6e6ffa6a, 0x9bae, 0x4613, 0xa5, 0x1e, 0x91, 0x65, 0x2d, 0x50, 0x8c, 0x21); + +#define INTERFACE ID3D11ShaderReflectionType +DECLARE_INTERFACE(ID3D11ShaderReflectionType) +{ + STDMETHOD(GetDesc)(THIS_ D3D11_SHADER_TYPE_DESC *desc) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetMemberTypeByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetMemberTypeByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ UINT index) PURE; + STDMETHOD(IsEqual)(THIS_ struct ID3D11ShaderReflectionType *type) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetSubType)(THIS) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetBaseClass)(THIS) PURE; + STDMETHOD_(UINT, GetNumInterfaces)(THIS) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetInterfaceByIndex)(THIS_ UINT index) PURE; + STDMETHOD(IsOfType)(THIS_ struct ID3D11ShaderReflectionType *type) PURE; + STDMETHOD(ImplementsInterface)(THIS_ ID3D11ShaderReflectionType *base) PURE; +}; +#undef INTERFACE + +DEFINE_GUID(IID_ID3D11ShaderReflectionVariable, 0x51f23923, 0xf3e5, 0x4bd1, 0x91, 0xcb, 0x60, 0x61, 0x77, 0xd8, 0xdb, 0x4c); + +#define INTERFACE ID3D11ShaderReflectionVariable +DECLARE_INTERFACE(ID3D11ShaderReflectionVariable) +{ + STDMETHOD(GetDesc)(THIS_ D3D11_SHADER_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetType)(THIS) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionConstantBuffer *, GetBuffer)(THIS) PURE; + STDMETHOD_(UINT, GetInterfaceSlot)(THIS_ UINT index) PURE; +}; +#undef INTERFACE + +DEFINE_GUID(IID_ID3D11ShaderReflectionConstantBuffer, 0xeb62d63d, 0x93dd, 0x4318, 0x8a, 0xe8, 0xc6, 0xf8, 0x3a, 0xd3, 0x71, 0xb8); + +#define INTERFACE ID3D11ShaderReflectionConstantBuffer +DECLARE_INTERFACE(ID3D11ShaderReflectionConstantBuffer) +{ + STDMETHOD(GetDesc)(THIS_ D3D11_SHADER_BUFFER_DESC *desc) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionVariable *, GetVariableByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE; +}; +#undef INTERFACE + +DEFINE_GUID(IID_ID3D11ShaderReflection, 0x0a233719, 0x3960, 0x4578, 0x9d, 0x7c, 0x20, 0x3b, 0x8b, 0x1d, 0x9c, 0xc1); + +#define INTERFACE ID3D11ShaderReflection +DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) +{ + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* ID3D11ShaderReflection methods */ + STDMETHOD(GetDesc)(THIS_ D3D11_SHADER_DESC *desc) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionConstantBuffer *, GetConstantBufferByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ LPCSTR name) PURE; + STDMETHOD(GetResourceBindingDesc)(THIS_ UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc) PURE; + STDMETHOD(GetInputParameterDesc)(THIS_ UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) PURE; + STDMETHOD(GetOutputParameterDesc)(THIS_ UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) PURE; + STDMETHOD(GetPatchConstantParameterDesc)(THIS_ UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE; + STDMETHOD(GetResourceBindingDescByName)(THIS_ LPCSTR name, D3D11_SHADER_INPUT_BIND_DESC *desc) PURE; + STDMETHOD_(UINT, GetMovInstructionCount)(THIS) PURE; + STDMETHOD_(UINT, GetMovcInstructionCount)(THIS) PURE; + STDMETHOD_(UINT, GetConversionInstructionCount)(THIS) PURE; + STDMETHOD_(UINT, GetBitwiseInstructionCount)(THIS) PURE; + STDMETHOD_(D3D_PRIMITIVE, GetGSInputPrimitive)(THIS) PURE; + STDMETHOD_(BOOL, IsSampleFrequencyShader)(THIS) PURE; + STDMETHOD_(UINT, GetNumInterfaceSlots)(THIS) PURE; + STDMETHOD(GetMinFeatureLevel)(THIS_ enum D3D_FEATURE_LEVEL *level) PURE; + STDMETHOD_(UINT, GetThreadGroupSize)(THIS_ UINT *sizex, UINT *sizey, UINT *sizez) PURE; +}; +#undef INTERFACE + #endif diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 24649a7..598abd5 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -68,6 +68,16 @@ interface ID3DInclude typedef ID3DInclude* LPD3DINCLUDE; +typedef enum D3D_FEATURE_LEVEL +{ + D3D_FEATURE_LEVEL_9_1 = 0x9100, + D3D_FEATURE_LEVEL_9_2 = 0x9200, + D3D_FEATURE_LEVEL_9_3 = 0x9300, + D3D_FEATURE_LEVEL_10_0 = 0xa000, + D3D_FEATURE_LEVEL_10_1 = 0xa100, + D3D_FEATURE_LEVEL_11_0 = 0xb000, +} D3D_FEATURE_LEVEL; + typedef enum _D3D_SHADER_VARIABLE_CLASS { D3D_SVC_SCALAR, @@ -382,6 +392,46 @@ typedef enum D3D_PRIMITIVE_TOPOLOGY D3D11_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST, } D3D_PRIMITIVE_TOPOLOGY; +typedef enum D3D_TESSELLATOR_DOMAIN +{ + D3D_TESSELLATOR_DOMAIN_UNDEFINED, + D3D_TESSELLATOR_DOMAIN_ISOLINE, + D3D_TESSELLATOR_DOMAIN_TRI, + D3D_TESSELLATOR_DOMAIN_QUAD, + D3D11_TESSELLATOR_DOMAIN_UNDEFINED = 0, + D3D11_TESSELLATOR_DOMAIN_ISOLINE, + D3D11_TESSELLATOR_DOMAIN_TRI, + D3D11_TESSELLATOR_DOMAIN_QUAD, +} D3D_TESSELLATOR_DOMAIN; + +typedef enum D3D_TESSELLATOR_PARTITIONING +{ + D3D_TESSELLATOR_PARTITIONING_UNDEFINED, + D3D_TESSELLATOR_PARTITIONING_INTEGER, + D3D_TESSELLATOR_PARTITIONING_POW2, + D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD, + D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN, + D3D11_TESSELLATOR_PARTITIONING_UNDEFINED = 0, + D3D11_TESSELLATOR_PARTITIONING_INTEGER, + D3D11_TESSELLATOR_PARTITIONING_POW2, + D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD, + D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN, +} D3D_TESSELLATOR_PARTITIONING; + +typedef enum D3D_TESSELLATOR_OUTPUT_PRIMITIVE +{ + D3D_TESSELLATOR_OUTPUT_UNDEFINED, + D3D_TESSELLATOR_OUTPUT_POINT, + D3D_TESSELLATOR_OUTPUT_LINE, + D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW, + D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW, + D3D11_TESSELLATOR_OUTPUT_UNDEFINED = 0, + D3D11_TESSELLATOR_OUTPUT_POINT, + D3D11_TESSELLATOR_OUTPUT_LINE, + D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CW, + D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CCW, +} D3D_TESSELLATOR_OUTPUT_PRIMITIVE; + typedef enum D3D_CBUFFER_TYPE { D3D_CT_CBUFFER, diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 3bb2878..79b635c 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -351,6 +351,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) STDMETHOD(CompileShader)(THIS_ D3DXHANDLE function, LPCSTR target, DWORD flags, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_msgs, LPD3DXCONSTANTTABLE* constant_table) PURE; }; +#undef INTERFACE #ifdef __cplusplus extern "C" {

1 0

Henri Verbeet : wined3d: Set an A window proc on non-unicode windows.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: b66478dfbcc57e2f9cde12c1e0ae34ffcff12714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66478dfbcc57e2f9cde12c1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 2 12:02:47 2010 +0100 wined3d: Set an A window proc on non-unicode windows. --- dlls/wined3d/device.c | 12 +++++++++--- dlls/wined3d/wined3d_main.c | 26 ++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1416e59..6e78f04 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6916,14 +6916,17 @@ void get_drawable_size_backbuffer(struct wined3d_context *context, UINT *width, *height = swapchain->presentParms.BackBufferHeight; } -LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, +LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { if (device->filter_messages) { TRACE("Filtering message: window %p, message %#x, wparam %#lx, lparam %#lx.\n", window, message, wparam, lparam); - return DefWindowProcW(window, message, wparam, lparam); + if (unicode) + return DefWindowProcW(window, message, wparam, lparam); + else + return DefWindowProcA(window, message, wparam, lparam); } if (message == WM_DESTROY) @@ -6935,5 +6938,8 @@ LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, else ERR("Window %p is not the focus window for device %p.\n", window, device); } - return CallWindowProcW(proc, window, message, wparam, lparam); + if (unicode) + return CallWindowProcW(proc, window, message, wparam, lparam); + else + return CallWindowProcA(proc, window, message, wparam, lparam); } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 26945ef..0932351 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); struct wined3d_wndproc { HWND window; + BOOL unicode; WNDPROC proc; IWineD3DDeviceImpl *device; }; @@ -394,6 +395,7 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam { struct wined3d_wndproc *entry; IWineD3DDeviceImpl *device; + BOOL unicode; WNDPROC proc; wined3d_mutex_lock(); @@ -407,10 +409,11 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam } device = entry->device; + unicode = entry->unicode; proc = entry->proc; wined3d_mutex_unlock(); - return device_process_message(device, window, message, wparam, lparam, proc); + return device_process_message(device, window, unicode, message, wparam, lparam, proc); } BOOL wined3d_register_window(HWND window, IWineD3DDeviceImpl *device) @@ -440,7 +443,14 @@ BOOL wined3d_register_window(HWND window, IWineD3DDeviceImpl *device) entry = &wndproc_table.entries[wndproc_table.count++]; entry->window = window; - entry->proc = (WNDPROC)SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)wined3d_wndproc); + entry->unicode = IsWindowUnicode(window); + /* Set a window proc that matches the window. Some applications (e.g. NoX) + * replace the window proc after we've set ours, and expect to be able to + * call the previous one (ours) directly, without using CallWindowProc(). */ + if (entry->unicode) + entry->proc = (WNDPROC)SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)wined3d_wndproc); + else + entry->proc = (WNDPROC)SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)wined3d_wndproc); entry->device = device; wined3d_mutex_unlock(); @@ -460,8 +470,16 @@ void wined3d_unregister_window(HWND window) struct wined3d_wndproc *entry = &wndproc_table.entries[i]; struct wined3d_wndproc *last = &wndproc_table.entries[--wndproc_table.count]; - if (GetWindowLongPtrW(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) - SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + if (entry->unicode) + { + if (GetWindowLongPtrW(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) + SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + } + else + { + if (GetWindowLongPtrA(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) + SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + } if (entry != last) *entry = *last; wined3d_mutex_unlock(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 18da56a..f710d0a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1769,7 +1769,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, HWND focus_window, DWORD flags, IWineD3DDeviceParent *device_parent) DECLSPEC_HIDDEN; void device_preload_textures(IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; -LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, +LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN; void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Translate drawable coordinates in flush_to_framebuffer_drawpixels().
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 8e059205ba6aa3bad33ac3ef5252e50b9a9baddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e059205ba6aa3bad33ac3ef5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 2 12:02:49 2010 +0100 wined3d: Translate drawable coordinates in flush_to_framebuffer_drawpixels(). --- dlls/wined3d/surface.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5ac4881..428be78 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1765,12 +1765,17 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum buffer = surface_get_gl_buffer(This); TRACE("Unlocking %#x buffer.\n", buffer); context_set_draw_buffer(context, buffer); + + surface_translate_drawable_coords(This, context->win_handle, &rect); + glPixelZoom(1.0f, -1.0f); } else { /* Primary offscreen render target */ TRACE("Offscreen render target.\n"); context_set_draw_buffer(context, device->offscreenBuffer); + + glPixelZoom(1.0f, 1.0f); } glRasterPos3i(rect.left, rect.top, 1);

1 0

Rico Schüller : d3dcompiler: Add D3DReflect() stub.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 02264a7628c82042e33dce24e0ee5ed7ba8ab215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02264a7628c82042e33dce24e… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Nov 1 22:18:24 2010 +0100 d3dcompiler: Add D3DReflect() stub. --- dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 7 +++++++ include/d3dcompiler.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index bb9a13d..d7e0305 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -12,6 +12,6 @@ @ stdcall D3DGetInputSignatureBlob(ptr long ptr) @ stdcall D3DGetOutputSignatureBlob(ptr long ptr) @ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) -@ stub D3DReflect +@ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReturnFailure1 @ stdcall D3DStripShader(ptr long long ptr) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index 37937a6..9096036 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -123,3 +123,10 @@ HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID return d3dcompiler_strip_shader(data, data_size, flags, blob); } + +HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void **reflector) +{ + FIXME("data %p, data_size %lu, riid %s, blob %p stub!\n", data, data_size, debugstr_guid(riid), reflector); + + return E_NOTIMPL; +} diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index c3bdb53..43af264 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -77,6 +77,8 @@ HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3 HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); +HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void **reflector); + HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename,

1 0

Francois Gouget : msxml3/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 3e331731c940c97bbd515da1f47f3156707750cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e331731c940c97bbd515da1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 11:44:19 2010 +0100 msxml3/tests: Add a trailing '\n' to ok() calls. --- dlls/msxml3/tests/schema.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 2ca657a..b457f0e 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -383,15 +383,15 @@ static void test_collection_refs(void) length = -1; ole_check(IXMLDOMSchemaCollection_get_length(cache1, &length)); - ok(length == 1, "expected length 1, got %i", length); + ok(length == 1, "expected length 1, got %i\n", length); length = -1; ole_check(IXMLDOMSchemaCollection_get_length(cache2, &length)); - ok(length == 2, "expected length 2, got %i", length); + ok(length == 2, "expected length 2, got %i\n", length); length = -1; ole_check(IXMLDOMSchemaCollection_get_length(cache3, &length)); - ok(length == 3, "expected length 3, got %i", length); + ok(length == 3, "expected length 3, got %i\n", length); /* merging collections does not affect the ref count */

1 0

Francois Gouget : msxml3: Add a trailing '\n' to a FIXME() calls.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: a034694ccd3a0e66aa0e92579ea2372235eed570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a034694ccd3a0e66aa0e92579… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 11:43:39 2010 +0100 msxml3: Add a trailing '\n' to a FIXME() calls. --- dlls/msxml3/xslpattern.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/xslpattern.l b/dlls/msxml3/xslpattern.l index a4b8aa9..ae06c7a 100644 --- a/dlls/msxml3/xslpattern.l +++ b/dlls/msxml3/xslpattern.l @@ -147,7 +147,7 @@ ANY (.) "!" { SYM('!'); } {NCName} { STR(TOK_NCName); } {Number} { STR(TOK_Number); } -{ANY} { FIXME("Unexpected character '%s'.",yytext); } +{ANY} { FIXME("Unexpected character '%s'.\n",yytext); } %%

1 0