September 2013 - Wine-Commits

Jacek Caban : dxgiformat.h: Added missing formats.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 81d90ba06d3fda8e84deef88ace4ff4a524c75c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d90ba06d3fda8e84deef88a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 11 12:10:05 2013 +0200 dxgiformat.h: Added missing formats. --- include/dxgiformat.h | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/include/dxgiformat.h b/include/dxgiformat.h index 5c7ad62..6bb9d00 100644 --- a/include/dxgiformat.h +++ b/include/dxgiformat.h @@ -111,6 +111,33 @@ typedef enum DXGI_FORMAT { DXGI_FORMAT_B5G5R5A1_UNORM = 86, DXGI_FORMAT_B8G8R8A8_UNORM = 87, DXGI_FORMAT_B8G8R8X8_UNORM = 88, + DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 89, + DXGI_FORMAT_B8G8R8A8_TYPELESS = 90, + DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91, + DXGI_FORMAT_B8G8R8X8_TYPELESS = 92, + DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93, + DXGI_FORMAT_BC6H_TYPELESS = 94, + DXGI_FORMAT_BC6H_UF16 = 95, + DXGI_FORMAT_BC6H_SF16 = 96, + DXGI_FORMAT_BC7_TYPELESS = 97, + DXGI_FORMAT_BC7_UNORM = 98, + DXGI_FORMAT_BC7_UNORM_SRGB = 99, + DXGI_FORMAT_AYUV = 100, + DXGI_FORMAT_Y410 = 101, + DXGI_FORMAT_Y416 = 102, + DXGI_FORMAT_NV12 = 103, + DXGI_FORMAT_P010 = 104, + DXGI_FORMAT_P016 = 105, + DXGI_FORMAT_420_OPAQUE = 106, + DXGI_FORMAT_YUY2 = 107, + DXGI_FORMAT_Y210 = 108, + DXGI_FORMAT_Y216 = 109, + DXGI_FORMAT_NV11 = 110, + DXGI_FORMAT_AI44 = 111, + DXGI_FORMAT_IA44 = 112, + DXGI_FORMAT_P8 = 113, + DXGI_FORMAT_A8P8 = 114, + DXGI_FORMAT_B4G4R4A4_UNORM = 115, DXGI_FORMAT_FORCE_UINT = 0xffffffff } DXGI_FORMAT;

1 0

Jacek Caban : d3d10_1.idl: Added D3D10_1_SHADER_*_VERSION constants.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 044d7e82bf915d36c2921b29f129aae303355af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=044d7e82bf915d36c2921b29f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 11 12:09:54 2013 +0200 d3d10_1.idl: Added D3D10_1_SHADER_*_VERSION constants. --- include/d3d10_1.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl index 11c52b4..3b6e624 100644 --- a/include/d3d10_1.idl +++ b/include/d3d10_1.idl @@ -22,6 +22,8 @@ import "ocidl.idl"; import "d3d10.idl"; cpp_quote("#include <d3d10_1shader.h>") +const UINT D3D10_1_SHADER_MAJOR_VERSION = 4; +const UINT D3D10_1_SHADER_MINOR_VERSION = 1; typedef enum D3D10_FEATURE_LEVEL1 {

1 0

Jacek Caban : d3d11.idl: Added some missing declarations.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 4de32753a2b5d2b145fc57a34e0b4d195c6a4f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de32753a2b5d2b145fc57a34… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 11 14:44:43 2013 +0200 d3d11.idl: Added some missing declarations. --- include/d3d11.idl | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 132 insertions(+), 0 deletions(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index 105f707..3e2c5ed 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -49,9 +49,22 @@ const UINT D3D11_DEFAULT_VIEWPORT_TOPLEFTX = 0; const UINT D3D11_DEFAULT_VIEWPORT_TOPLEFTY = 0; const UINT D3D11_DEFAULT_VIEWPORT_WIDTH = 0; +cpp_quote("#define D3D11_FLOAT32_MAX (3.402823466e+38f)") + const unsigned int D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; const UINT D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION = 16384; +const UINT D3D11_MAX_MAXANISOTROPY = 16; +const UINT D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT = 32; +const UINT D3D11_VIEWPORT_BOUNDS_MAX = 32767; +const INT D3D11_VIEWPORT_BOUNDS_MIN = -32768; +const UINT D3D11_SHADER_MAJOR_VERSION = 5; +const UINT D3D11_SHADER_MAX_INSTANCES = 65535; +const UINT D3D11_SHADER_MAX_INTERFACES = 253; +const UINT D3D11_SHADER_MAX_INTERFACE_CALL_SITES = 4096; +const UINT D3D11_SHADER_MAX_TYPES = 65535; +const UINT D3D11_SHADER_MINOR_VERSION = 0; +const UINT D3D11_VS_OUTPUT_REGISTER_COUNT = 32; cpp_quote("#if !defined(D3D11_NO_HELPERS) && defined(__cplusplus)") cpp_quote("struct CD3D11_DEFAULT {};") @@ -235,6 +248,47 @@ typedef enum D3D11_FILL_MODE D3D11_FILL_SOLID } D3D11_FILL_MODE; +typedef enum D3D11_FILTER_TYPE +{ + D3D11_FILTER_TYPE_POINT = 0, + D3D11_FILTER_TYPE_LINEAR = 1 +} D3D11_FILTER_TYPE; + +const UINT D3D11_MIN_FILTER_SHIFT = 4; +const UINT D3D11_MAG_FILTER_SHIFT = 2; +const UINT D3D11_MIP_FILTER_SHIFT = 0; +const UINT D3D11_FILTER_TYPE_MASK = 0x00000003; +const UINT D3D11_COMPARISON_FILTERING_BIT = 0x00000080; +const UINT D3D11_ANISOTROPIC_FILTERING_BIT = 0x00000040; + +cpp_quote("#define D3D11_ENCODE_BASIC_FILTER(min, mag, mip, bComparison) \\") +cpp_quote(" ((D3D11_FILTER)(((bComparison) ? D3D11_COMPARISON_FILTERING_BIT : 0 ) | \\") +cpp_quote(" (((min)&D3D11_FILTER_TYPE_MASK) << D3D11_MIN_FILTER_SHIFT) | \\") +cpp_quote(" (((mag)&D3D11_FILTER_TYPE_MASK) << D3D11_MAG_FILTER_SHIFT) | \\") +cpp_quote(" (((mip)&D3D11_FILTER_TYPE_MASK) << D3D11_MIP_FILTER_SHIFT)))") + +cpp_quote("#define D3D11_ENCODE_ANISOTROPIC_FILTER(bComparison) \\") +cpp_quote(" ((D3D11_FILTER)(D3D11_ANISOTROPIC_FILTERING_BIT | \\" ) +cpp_quote(" D3D11_ENCODE_BASIC_FILTER(D3D11_FILTER_TYPE_LINEAR,D3D11_FILTER_TYPE_LINEAR, \\" ) +cpp_quote(" D3D11_FILTER_TYPE_LINEAR,bComparison)))" ) + +cpp_quote("#define D3D11_DECODE_MIN_FILTER(d3d11Filter) \\") +cpp_quote(" ((D3D11_FILTER_TYPE)(((d3d11Filter) >> D3D11_MIN_FILTER_SHIFT) & D3D11_FILTER_TYPE_MASK))") + +cpp_quote("#define D3D11_DECODE_MAG_FILTER(d3d11Filter) \\") +cpp_quote(" ((D3D11_FILTER_TYPE)(((d3d11Filter) >> D3D11_MAG_FILTER_SHIFT) & D3D11_FILTER_TYPE_MASK))") + +cpp_quote("#define D3D11_DECODE_MIP_FILTER(d3d11Filter) \\") +cpp_quote(" ((D3D11_FILTER_TYPE)(((d3d11Filter) >> D3D11_MIP_FILTER_SHIFT) & D3D11_FILTER_TYPE_MASK))") + +cpp_quote("#define D3D11_DECODE_IS_COMPARISON_FILTER(d3d11Filter) ((d3d11Filter) & D3D11_COMPARISON_FILTERING_BIT)") + +cpp_quote("#define D3D11_DECODE_IS_ANISOTROPIC_FILTER(d3d11Filter) \\") +cpp_quote(" (((d3d11Filter) & D3D11_ANISOTROPIC_FILTERING_BIT ) \\" ) +cpp_quote(" && (D3D11_FILTER_TYPE_LINEAR == D3D11_DECODE_MIN_FILTER(d3d11Filter)) \\" ) +cpp_quote(" && (D3D11_FILTER_TYPE_LINEAR == D3D11_DECODE_MAG_FILTER(d3d11Filter)) \\" ) +cpp_quote(" && (D3D11_FILTER_TYPE_LINEAR == D3D11_DECODE_MIP_FILTER(d3d11Filter)))") + typedef enum D3D11_FILTER { D3D11_FILTER_MIN_MAG_MIP_POINT = 0x00, @@ -316,6 +370,29 @@ typedef enum D3D11_QUERY D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3, } D3D11_QUERY; +typedef enum D3D11_ASYNC_GETDATA_FLAG +{ + D3D11_ASYNC_GETDATA_DONOTFLUSH = 0x0001, +} D3D11_ASYNC_GETDATA_FLAG; + +typedef enum D3D11_RESOURCE_MISC_FLAG +{ + D3D11_RESOURCE_MISC_GENERATE_MIPS = 0x00000001L, + D3D11_RESOURCE_MISC_SHARED = 0x00000002L, + D3D11_RESOURCE_MISC_TEXTURECUBE = 0x00000004L, + D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS = 0x00000010L, + D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS = 0x00000020L, + D3D11_RESOURCE_MISC_BUFFER_STRUCTURED = 0x00000040L, + D3D11_RESOURCE_MISC_RESOURCE_CLAMP = 0x00000080L, + D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX = 0x00000100L, + D3D11_RESOURCE_MISC_GDI_COMPATIBLE = 0x00000200L, + D3D11_RESOURCE_MISC_SHARED_NTHANDLE = 0x00000800L, + D3D11_RESOURCE_MISC_RESTRICTED_CONTENT = 0x00001000L, + D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE = 0x00002000L, + D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER = 0x00004000L, + D3D11_RESOURCE_MISC_GUARDED = 0x00008000L +} D3D11_RESOURCE_MISC_FLAG; + typedef struct D3D11_QUERY_DESC { D3D11_QUERY Query; @@ -415,6 +492,14 @@ typedef enum D3D11_STENCIL_OP D3D11_STENCIL_OP_DECR } D3D11_STENCIL_OP; +cpp_quote("#if !defined(D3D11_NO_HELPERS) && defined(__cplusplus)") +cpp_quote("}") +cpp_quote("inline UINT D3D11CalcSubresource(UINT MipSlice, UINT ArraySlice, UINT MipLevels) {") +cpp_quote(" return MipSlice + ArraySlice * MipLevels;") +cpp_quote("}") +cpp_quote("extern \"C\"{") +cpp_quote("#endif") + typedef struct D3D11_SUBRESOURCE_DATA { const void *pSysMem; @@ -673,6 +758,43 @@ typedef enum D3D11_COLOR_WRITE_ENABLE (D3D11_COLOR_WRITE_ENABLE_RED|D3D11_COLOR_WRITE_ENABLE_GREEN|D3D11_COLOR_WRITE_ENABLE_BLUE|D3D11_COLOR_WRITE_ENABLE_ALPHA) } D3D11_COLOR_WRITE_ENABLE; +typedef enum D3D11_FORMAT_SUPPORT +{ + D3D11_FORMAT_SUPPORT_BUFFER = 0x00000001, + D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER = 0x00000002, + D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER = 0x00000004, + D3D11_FORMAT_SUPPORT_SO_BUFFER = 0x00000008, + D3D11_FORMAT_SUPPORT_TEXTURE1D = 0x00000010, + D3D11_FORMAT_SUPPORT_TEXTURE2D = 0x00000020, + D3D11_FORMAT_SUPPORT_TEXTURE3D = 0x00000040, + D3D11_FORMAT_SUPPORT_TEXTURECUBE = 0x00000080, + D3D11_FORMAT_SUPPORT_SHADER_LOAD = 0x00000100, + D3D11_FORMAT_SUPPORT_SHADER_SAMPLE = 0x00000200, + D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON = 0x00000400, + D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_MONO_TEXT = 0x00000800, + D3D11_FORMAT_SUPPORT_MIP = 0x00001000, + D3D11_FORMAT_SUPPORT_MIP_AUTOGEN = 0x00002000, + D3D11_FORMAT_SUPPORT_RENDER_TARGET = 0x00004000, + D3D11_FORMAT_SUPPORT_BLENDABLE = 0x00008000, + D3D11_FORMAT_SUPPORT_DEPTH_STENCIL = 0x00010000, + D3D11_FORMAT_SUPPORT_CPU_LOCKABLE = 0x00020000, + D3D11_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE = 0x00040000, + D3D11_FORMAT_SUPPORT_DISPLAY = 0x00080000, + D3D11_FORMAT_SUPPORT_CAST_WITHIN_BIT_LAYOUT = 0x00100000, + D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET = 0x00200000, + D3D11_FORMAT_SUPPORT_MULTISAMPLE_LOAD = 0x00400000, + D3D11_FORMAT_SUPPORT_SHADER_GATHER = 0x00800000, + D3D11_FORMAT_SUPPORT_BACK_BUFFER_CAST = 0x01000000, + D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW = 0x02000000, + D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON = 0x04000000 +} D3D11_FORMAT_SUPPORT; + +typedef enum D3D11_CLEAR_FLAG +{ + D3D11_CLEAR_DEPTH = 0x0001L, + D3D11_CLEAR_STENCIL = 0x0002L +} D3D11_CLEAR_FLAG; + typedef struct D3D11_RENDER_TARGET_BLEND_DESC { BOOL BlendEnable; @@ -1867,3 +1989,13 @@ cpp_quote("#include <d3d10misc.h>") cpp_quote("#include <d3d10shader.h>") cpp_quote("#include <d3d10effect.h>") cpp_quote("#include <d3d10_1shader.h>") + +cpp_quote("typedef HRESULT (WINAPI* PFN_D3D11_CREATE_DEVICE)(IDXGIAdapter*,D3D_DRIVER_TYPE,HMODULE,UINT,") +cpp_quote(" const D3D_FEATURE_LEVEL*,UINT,UINT,ID3D11Device**,D3D_FEATURE_LEVEL*,ID3D11DeviceContext**);") + +cpp_quote("HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter*,D3D_DRIVER_TYPE,HMODULE,UINT,const D3D_FEATURE_LEVEL*," ) +cpp_quote(" UINT,UINT,ID3D11Device**,D3D_FEATURE_LEVEL*,ID3D11DeviceContext**);") + +cpp_quote("typedef HRESULT (WINAPI *PFN_D3D11_CREATE_DEVICE_AND_SWAP_CHAIN)(IDXGIAdapter*,D3D_DRIVER_TYPE,HMODULE,UINT,") +cpp_quote(" const D3D_FEATURE_LEVEL*,UINT,UINT,const DXGI_SWAP_CHAIN_DESC*,IDXGISwapChain**,ID3D11Device**,") +cpp_quote(" D3D_FEATURE_LEVEL*,ID3D11DeviceContext**);")

1 0

Jacek Caban : d3d11: Use proper D3D11CreateDevice argument types.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 0e5d64cc44ed0442aa119794a7a764c850ce1cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5d64cc44ed0442aa119794a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 11 12:09:04 2013 +0200 d3d11: Use proper D3D11CreateDevice argument types. --- dlls/d3d11/d3d11.spec | 2 +- dlls/d3d11/d3d11_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index ffe0712..52d7bcb 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -2,7 +2,7 @@ @ stub D3D11CoreCreateLayeredDevice @ stub D3D11CoreGetLayeredDeviceSize @ stub D3D11CoreRegisterLayers -@ stdcall D3D11CreateDevice(ptr long ptr long long long long ptr ptr ptr) +@ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stub D3D11CreateDeviceAndSwapChain @ stub D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index b5bf8cd..87bdf4ef 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -46,10 +46,10 @@ static const char *debug_d3d_driver_type(D3D_DRIVER_TYPE driver_type) } HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, - const D3D_FEATURE_LEVEL feature_levels, UINT levels, UINT sdk_version, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device, D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **context) { - FIXME("stub: adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %d, levels %#x, sdk_version %d, " + FIXME("stub: adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %d, " "device %p, feature_level %p, context %p\n", adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version, device, feature_level, context); return E_OUTOFMEMORY;

1 0

Piotr Caban : msvcr110: Add forwards to type_info::before function.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: d548877f6e00580a6bcd9838c2252c05ee0983ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d548877f6e00580a6bcd9838c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 11 11:52:19 2013 +0200 msvcr110: Add forwards to type_info::before function. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 3 ++- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b4f020e..efb9dcd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -455,7 +455,7 @@ @ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH(a)Z(wstr long long) msvcrt._wopen @ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH(a)Z(wstr long long long) msvcrt._wsopen @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH(a)Z(wstr long long long) msvcrt._wsopen -@ thiscall -arch=win32 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z @ stub -arch=win32 ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QBEJXZ @ stub -arch=win64 ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QEBAJXZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 41cb8f6..9237669 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -738,9 +738,9 @@ @ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH(a)Z(wstr long long) msvcrt._wopen @ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH(a)Z(wstr long long long) msvcrt._wsopen @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH(a)Z(wstr long long long) msvcrt._wsopen -@ stub -arch=arm ?before(a)type_info@@QBA_NABV1@@Z -@ stub -arch=i386 ?before(a)type_info@@QBE_NABV1@@Z -@ stub -arch=win64 ?before(a)type_info@@QEBA_NAEBV1@@Z +@ cdecl -arch=arm ?before(a)type_info@@QBA_NABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBA_NABV1@@Z +@ thiscall -arch=i386 ?before(a)type_info@@QBE_NABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z +@ cdecl -arch=win64 ?before(a)type_info@@QEBA_NAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z @ stub ?current(a)location@Concurrency@@SA?AV12(a)XZ @ stub ?from_numa_node(a)location@Concurrency@@SA?AV12(a)G@Z @ stub -arch=arm ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QBAJXZ diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index dc6dc03..49b2dff 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -77,7 +77,7 @@ @ cdecl ?_set_new_mode@@YAHH(a)Z(long) msvcrt.?_set_new_mode@@YAHH(a)Z @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z -@ thiscall -arch=win32 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z @ thiscall -arch=win32 ?name(a)type_info@@QBEPBDXZ(ptr) msvcrt.?name(a)type_info@@QBEPBDXZ @ cdecl -arch=win64 ?name(a)type_info@@QEBAPEBDXZ(ptr) msvcrt.?name(a)type_info@@QEBAPEBDXZ diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 3e3cf6f..b0602b8 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -67,7 +67,7 @@ @ cdecl ?_set_new_mode@@YAHH(a)Z(long) msvcrt.?_set_new_mode@@YAHH(a)Z @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z -@ thiscall -arch=win32 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z @ thiscall -arch=win32 ?name(a)type_info@@QBEPBDXZ(ptr) msvcrt.?name(a)type_info@@QBEPBDXZ @ cdecl -arch=win64 ?name(a)type_info@@QEBAPEBDXZ(ptr) msvcrt.?name(a)type_info@@QEBAPEBDXZ diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6eeb602..328d2dc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -111,7 +111,7 @@ @ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH(a)Z(wstr long long) msvcrt._wopen @ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH(a)Z(wstr long long long) msvcrt._wsopen @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH(a)Z(wstr long long long) msvcrt._wsopen -@ thiscall -arch=win32 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z @ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const @ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 04fa199..5e77362 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -111,7 +111,7 @@ @ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH(a)Z(wstr long long) msvcrt._wopen @ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH(a)Z(wstr long long long) msvcrt._wsopen @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH(a)Z(wstr long long long) msvcrt._wsopen -@ thiscall -arch=win32 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z @ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const @ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d0d7679..a8578bd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -107,7 +107,8 @@ @ cdecl ?_set_new_mode@@YAHH(a)Z(long) MSVCRT__set_new_mode @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) MSVCRT__set_se_translator @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) MSVCRT__set_se_translator -@ thiscall -arch=win32 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) MSVCRT_type_info_before +@ cdecl -arch=arm ?before(a)type_info@@QBA_NABV1@@Z(ptr ptr) MSVCRT_type_info_before +@ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) MSVCRT_type_info_before @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) MSVCRT_type_info_before @ thiscall -arch=win32 ?name(a)type_info@@QBEPBDXZ(ptr) MSVCRT_type_info_name @ cdecl -arch=win64 ?name(a)type_info@@QEBAPEBDXZ(ptr) MSVCRT_type_info_name diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index c4200f5..5053253 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -466,7 +466,7 @@ @ stub -arch=win32 ?base(a)streambuf@@IBEPADXZ @ stub -arch=win64 ?base(a)streambuf@@IEBAPEADXZ # @ extern ?basefield(a)ios@@2JB -@ thiscall -arch=win32 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z # @ extern ?binary(a)filebuf@@2HB @ stub ?bitalloc(a)ios@@SAJXZ diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 2f57ff2..1076a9d 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -67,7 +67,7 @@ @ cdecl ?_set_new_mode@@YAHH(a)Z(long) msvcrt.?_set_new_mode@@YAHH(a)Z @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z -@ thiscall -arch=win32 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z @ thiscall -arch=win32 ?name(a)type_info@@QBEPBDXZ(ptr) msvcrt.?name(a)type_info@@QBEPBDXZ @ cdecl -arch=win64 ?name(a)type_info@@QEBAPEBDXZ(ptr) msvcrt.?name(a)type_info@@QEBAPEBDXZ

1 0

Henri Verbeet : wined3d: Properly check if the swapchain format is WINED3DFMT_P8_UINT in primary_render_target_is_p8 ().
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 1453baf64b95789792a9bf3a0c341d3629de9083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1453baf64b95789792a9bf3a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 11 08:47:49 2013 +0200 wined3d: Properly check if the swapchain format is WINED3DFMT_P8_UINT in primary_render_target_is_p8(). --- dlls/wined3d/surface.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 87ae02d..f1a3683 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1292,14 +1292,7 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined /* This function checks if the primary render target uses the 8bit paletted format. */ static BOOL primary_render_target_is_p8(const struct wined3d_device *device) { - if (device->fb.render_targets && device->fb.render_targets[0]) - { - const struct wined3d_surface *render_target = device->fb.render_targets[0]; - if ((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) - && (render_target->resource.format->id == WINED3DFMT_P8_UINT)) - return TRUE; - } - return FALSE; + return device->swapchains[0]->desc.backbuffer_format == WINED3DFMT_P8_UINT; } static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface,

1 0

Henri Verbeet : ddraw: Avoid LPVOID.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 87ef65ab7b8e3a65ab13e490f07578376aca513f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ef65ab7b8e3a65ab13e490f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 11 08:47:51 2013 +0200 ddraw: Avoid LPVOID. --- dlls/ddraw/main.c | 57 ++++++++++----------------------- dlls/ddraw/tests/d3d.c | 3 +- dlls/ddraw/tests/ddrawmodes.c | 43 ++++++++++++------------- dlls/ddraw/tests/dsurface.c | 2 +- dlls/ddraw/tests/overlay.c | 3 +- dlls/ddraw/tests/refcount.c | 3 +- dlls/ddraw/tests/visual.c | 3 +- include/d3d.h | 56 ++++++++++++++++++-------------- include/d3dcaps.h | 2 +- include/d3dtypes.h | 13 ++++--- include/ddraw.h | 70 +++++++++++++++++++++-------------------- 11 files changed, 123 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87ef65ab7b8e3a65ab13e…

1 0

Henri Verbeet : wined3d: Get rid of the render target / overlay check in wined3d_surface_flip().
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: aea8d5c11ee42642a77911a76f119e2cd9488f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea8d5c11ee42642a77911a76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 11 08:47:48 2013 +0200 wined3d: Get rid of the render target / overlay check in wined3d_surface_flip(). The surface needs to be part of a swapchain to be flipped, but that doesn't have much to do with WINED3DUSAGE_RENDERTARGET. We can just remove the check here, because ddraw_surface7_Flip() already has the correct check. --- dlls/wined3d/surface.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dbf6fef..87ae02d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3706,13 +3706,6 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined return WINEDDERR_NOTFLIPPABLE; } - /* Flipping is only supported on render targets and overlays. */ - if (!(surface->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_OVERLAY))) - { - WARN("Tried to flip a non-render target, non-overlay surface.\n"); - return WINEDDERR_NOTFLIPPABLE; - } - flip_surface(surface, override); /* Update overlays if they're visible. */

1 0

Frédéric Delanoy : wineusr: Mention forums.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: docs Branch: master Commit: 891e03ecb915aecb34b7d797d3d013392c96d4fc URL: http://source.winehq.org/git/docs.git/?a=commit;h=891e03ecb915aecb34b7d797d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 11 10:29:58 2013 +0200 wineusr: Mention forums. --- en/wineusr-bugs.sgml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 931ed6e..e251bdd 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -179,8 +179,9 @@ </listitem> <listitem> <para> - Wine <ulink url="http://www.winehq.org/site/forums#ml">mailing - lists</ulink> may also help, especially <literal>wine-users</literal>. The + Wine <ulink url="http://forums.winehq.org/">forums</ulink> and <ulink + url="http://www.winehq.org/site/forums">mailing lists</ulink> may also help, + especially <literal>wine-users</literal>. The <literal>wine-devel</literal> list may be appropriate depending on the type of problem you are experiencing. If you post to <literal>wine-devel</literal> you should be prepared to do a little work to help diagnose the

1 0

Frédéric Delanoy : winedev: Assorted formatting & tagging fixes.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: docs Branch: master Commit: 63e1b7afe1d8b6ee4075cd0ccd908c9bcfd700e0 URL: http://source.winehq.org/git/docs.git/?a=commit;h=63e1b7afe1d8b6ee4075cd0cc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 11 10:29:56 2013 +0200 winedev: Assorted formatting & tagging fixes. --- en/winedev-debugging.sgml | 14 +++++++------- en/winedev-documentation.sgml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/en/winedev-debugging.sgml b/en/winedev-debugging.sgml index cd4d6e9..1dcc4d7 100644 --- a/en/winedev-debugging.sgml +++ b/en/winedev-debugging.sgml @@ -324,19 +324,19 @@ WINEDEBUG=trace+reg,warn-file <para> also, the pseudo-channel all is also supported and it has the intuitive semantics: - </para> <screen> -WINEDEBUG=+all -- enables all debug messages -WINEDEBUG=-all -- disables all debug messages -WINEDEBUG=<replaceable>yyy</replaceable>+all -- enables debug messages for class <replaceable>yyy</replaceable> on all channels. -WINEDEBUG=<replaceable>yyy</replaceable>-all -- disables debug messages for class <replaceable>yyy</replaceable> on all channels. +WINEDEBUG=+all <lineannotation>-- enables all debug messages</lineannotation> +WINEDEBUG=-all <lineannotation>-- disables all debug messages</lineannotation> +WINEDEBUG=<replaceable>yyy</replaceable>+all <lineannotation>-- enables debug messages for class <replaceable>yyy</replaceable> on all channels</lineannotation> +WINEDEBUG=<replaceable>yyy</replaceable>-all <lineannotation>-- disables debug messages for class <replaceable>yyy</replaceable> on all channels</lineannotation> </screen> + </para> <para> So, for example: - </para> <screen> -WINEDEBUG=warn-all -- disables all warning messages. +WINEDEBUG=warn-all <lineannotation>-- disables all warning messages</lineannotation> </screen> + </para> </listitem> </itemizedlist> diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index 51c6651..71ad92c 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -257,7 +257,7 @@ Parameters documented in the comment should be formatted as follows: </para> -<screen> +<programlisting> /************************************************************************* * PathRelativePathToW [SHLWAPI.@] * @@ -271,7 +271,7 @@ * dwAttrTo [I] File attributes of destination path * */ -</screen> +</programlisting> <para> The parameters section starts with <literal>PARAMS</literal> on its own line.

1 0