August 2010 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Moved setting HTTP header to separated function.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 6ae84b0b911659196c1eb84045332e7c3716c000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae84b0b911659196c1eb8404… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:38:37 2010 +0200 mshtml: Moved setting HTTP header to separated function. --- dlls/mshtml/mshtml_private.h | 4 +++- dlls/mshtml/navigate.c | 40 +++++++++------------------------------- dlls/mshtml/nsio.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5067b66..d1d0d05 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -467,12 +467,14 @@ typedef struct { UINT url_scheme; } nsChannel; -typedef struct ResponseHeader { +typedef struct { struct list entry; WCHAR *header; WCHAR *data; } http_header_t; +HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int); + typedef struct { HRESULT (*qi)(HTMLDOMNode*,REFIID,void**); void (*destructor)(HTMLDOMNode*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e477989..935a3b9 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1104,6 +1104,7 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, LPCWSTR response_headers) { nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + HRESULT hres; This->nschannel->response_status = response_code; @@ -1112,9 +1113,7 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, hdr_start = strchrW(response_headers, '\r'); while(hdr_start) { - const WCHAR *colon; - struct ResponseHeader *new_header; - int len; + const WCHAR *colon, *value; hdr_start += 2; hdr_end = strchrW(hdr_start, '\r'); @@ -1132,35 +1131,14 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, continue; } - new_header = heap_alloc(sizeof(struct ResponseHeader)); - if(!new_header) - return E_OUTOFMEMORY; - - len = colon - hdr_start; - new_header->header = heap_alloc((len + 1) * sizeof(WCHAR)); - if(!new_header->header) { - heap_free(new_header); - return E_OUTOFMEMORY; - } - memcpy(new_header->header, hdr_start, len * sizeof(WCHAR)); - new_header->header[len] = 0; - - colon++; - while(*colon == ' ') - colon++; - - len = hdr_end - colon; - new_header->data = heap_alloc((len + 1) * sizeof(WCHAR)); - if(!new_header->data) { - heap_free(new_header->header); - heap_free(new_header); - return E_OUTOFMEMORY; - } - memcpy(new_header->data, colon, len * sizeof(WCHAR)); - new_header->data[len] = 0; + value = colon+1; + while(*value == ' ') + value++; - list_add_head(&This->nschannel->response_headers, &new_header->entry); - TRACE("Adding header to list: (%s):(%s)\n", wine_dbgstr_w(new_header->header), wine_dbgstr_w(new_header->data)); + hres = set_http_header(&This->nschannel->response_headers, hdr_start, colon-hdr_start, + value, hdr_end-value); + if(FAILED(hres)) + return hres; hdr_start = strchrW(hdr_start, '\r'); } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fa0aa8d..9bef7f0 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -350,6 +350,43 @@ static nsresult get_channel_http_header(struct list *headers, const nsACString * return NS_OK; } +HRESULT set_http_header(struct list *headers, const WCHAR *name, int name_len, + const WCHAR *value, int value_len) +{ + http_header_t *header; + + TRACE("%s: %s\n", debugstr_wn(name, name_len), debugstr_wn(value, value_len)); + + header = find_http_header(headers, name, name_len); + if(header) { + WCHAR *new_data; + + new_data = heap_strndupW(value, value_len); + if(!new_data) + return E_OUTOFMEMORY; + + heap_free(header->data); + header->data = new_data; + }else { + header = heap_alloc(sizeof(http_header_t)); + if(!header) + return E_OUTOFMEMORY; + + header->header = heap_strndupW(name, name_len); + header->data = heap_strndupW(value, value_len); + if(!header->header || !header->data) { + heap_free(header->header); + heap_free(header->data); + heap_free(header); + return E_OUTOFMEMORY; + } + + list_add_tail(headers, &header->entry); + } + + return S_OK; +} + static void free_http_headers(struct list *list) { http_header_t *iter, *iter_next;

1 0

Jacek Caban : mshtml: Moved headers parsing to separated function.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 8ca78fa171b0d57b9d7fb9d710939529c2831c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca78fa171b0d57b9d7fb9d71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:38:53 2010 +0200 mshtml: Moved headers parsing to separated function. --- dlls/mshtml/navigate.c | 73 +++++++++++++++++++++++++++-------------------- 1 files changed, 42 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 935a3b9..3f83456 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -638,6 +638,39 @@ static void call_docview_84(HTMLDocumentObj *doc) FIXME("handle result\n"); } +static HRESULT parse_headers(const WCHAR *headers, struct list *headers_list) +{ + const WCHAR *header, *header_end, *colon, *value; + HRESULT hres; + + header = headers; + while(*header) { + if(header[0] == '\r' && header[1] == '\n' && !header[2]) + break; + for(colon = header; *colon && *colon != ':' && *colon != '\r'; colon++); + if(*colon != ':') + return E_FAIL; + + value = colon+1; + while(*value == ' ') + value++; + if(!*value) + return E_FAIL; + + for(header_end = value+1; *header_end && *header_end != '\r'; header_end++); + + hres = set_http_header(headers_list, header, colon-header, value, header_end-value); + if(FAILED(hres)) + return hres; + + header = header_end; + if(header[0] == '\r' && header[1] == '\n') + header += 2; + } + + return S_OK; +} + static void parse_post_data(nsIInputStream *post_data_stream, LPWSTR *headers_ret, HGLOBAL *post_data_ret, ULONG *post_data_len_ret) { @@ -1109,38 +1142,16 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, This->nschannel->response_status = response_code; if(response_headers) { - const WCHAR *hdr_start, *hdr_end; - - hdr_start = strchrW(response_headers, '\r'); - while(hdr_start) { - const WCHAR *colon, *value; - - hdr_start += 2; - hdr_end = strchrW(hdr_start, '\r'); - if(!hdr_end) { - WARN("Header doesn't end with CRLF: %s\n", wine_dbgstr_w(hdr_start)); - break; - } - if(hdr_end == hdr_start) - break; - - for(colon = hdr_start; *colon != ':' && colon != hdr_end; ++colon); - if(*colon != ':') { - WARN("Header missing colon: %s\n", wine_dbgstr_w(hdr_start)); - hdr_start = strchrW(hdr_start, '\r'); - continue; - } - - value = colon+1; - while(*value == ' ') - value++; - - hres = set_http_header(&This->nschannel->response_headers, hdr_start, colon-hdr_start, - value, hdr_end-value); - if(FAILED(hres)) + const WCHAR *headers; + + headers = strchrW(response_headers, '\r'); + if(headers && headers[1] == '\n') { + headers += 2; + hres = parse_headers(headers, &This->nschannel->response_headers); + if(FAILED(hres)) { + WARN("parsing headers failed: %08x\n", hres); return hres; - - hdr_start = strchrW(hdr_start, '\r'); + } } }

1 0

Jacek Caban : mshtml: Allow customization of BeginningTransaction.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 508aec93c103f0e02eb5105707dfa3dcd98eb8a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508aec93c103f0e02eb510570… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:39:04 2010 +0200 mshtml: Allow customization of BeginningTransaction. --- dlls/mshtml/navigate.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3f83456..fc37f4d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -63,6 +63,7 @@ typedef struct { HRESULT (*read_data)(BSCallback*,IStream*); HRESULT (*on_progress)(BSCallback*,ULONG,LPCWSTR); HRESULT (*on_response)(BSCallback*,DWORD,LPCWSTR); + HRESULT (*beginning_transaction)(BSCallback*,WCHAR**); } BSCallbackVtbl; struct BSCallback { @@ -468,19 +469,26 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) { BSCallback *This = HTTPNEG_THIS(iface); - DWORD size; + HRESULT hres; TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, pszAdditionalHeaders); - if(!This->headers) { - *pszAdditionalHeaders = NULL; - return S_OK; - } + *pszAdditionalHeaders = NULL; - size = (strlenW(This->headers)+1)*sizeof(WCHAR); - *pszAdditionalHeaders = CoTaskMemAlloc(size); - memcpy(*pszAdditionalHeaders, This->headers, size); + hres = This->vtbl->beginning_transaction(This, pszAdditionalHeaders); + if(hres != S_FALSE) + return hres; + + if(This->headers) { + DWORD size; + + size = (strlenW(This->headers)+1)*sizeof(WCHAR); + *pszAdditionalHeaders = CoTaskMemAlloc(size); + if(!*pszAdditionalHeaders) + return E_OUTOFMEMORY; + memcpy(*pszAdditionalHeaders, This->headers, size); + } return S_OK; } @@ -864,6 +872,11 @@ static HRESULT BufferBSC_on_response(BSCallback *bsc, DWORD response_code, return S_OK; } +static HRESULT BufferBSC_beginning_transaction(BSCallback *bsc, WCHAR **additional_headers) +{ + return S_FALSE; +} + #undef BUFFERBSC_THIS static const BSCallbackVtbl BufferBSCVtbl = { @@ -873,7 +886,8 @@ static const BSCallbackVtbl BufferBSCVtbl = { BufferBSC_stop_binding, BufferBSC_read_data, BufferBSC_on_progress, - BufferBSC_on_response + BufferBSC_on_response, + BufferBSC_beginning_transaction }; @@ -1158,6 +1172,11 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, return S_OK; } +static HRESULT nsChannelBSC_beginning_transaction(BSCallback *bsc, WCHAR **additional_headers) +{ + return S_FALSE; +} + #undef NSCHANNELBSC_THIS static const BSCallbackVtbl nsChannelBSCVtbl = { @@ -1167,7 +1186,8 @@ static const BSCallbackVtbl nsChannelBSCVtbl = { nsChannelBSC_stop_binding, nsChannelBSC_read_data, nsChannelBSC_on_progress, - nsChannelBSC_on_response + nsChannelBSC_on_response, + nsChannelBSC_beginning_transaction }; HRESULT create_channelbsc(IMoniker *mon, WCHAR *headers, BYTE *post_data, DWORD post_data_size, nsChannelBSC **retval)

1 0

Matteo Bruni : include: Add some d3dcompiler-related definitions.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 392804b1c813b591b631c7c1038181898f0e550d URL: http://source.winehq.org/git/wine.git/?a=commit;h=392804b1c813b591b631c7c10… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 3 18:44:25 2010 +0200 include: Add some d3dcompiler-related definitions. --- include/d3dcommon.idl | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index b9cdf0e..6cba9d2 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -19,6 +19,14 @@ import "oaidl.idl"; import "ocidl.idl"; +typedef struct _D3D_SHADER_MACRO +{ + LPCSTR Name; + LPCSTR Definition; +} D3D_SHADER_MACRO; + +typedef struct _D3D_SHADER_MACRO* LPD3D_SHADER_MACRO; + [ object, local, @@ -33,3 +41,28 @@ interface ID3D10Blob : IUnknown typedef ID3D10Blob* LPD3D10BLOB; typedef ID3D10Blob ID3DBlob; typedef ID3DBlob* LPD3DBLOB; + +typedef enum _D3D_INCLUDE_TYPE +{ + D3D_INCLUDE_LOCAL = 0, + D3D_INCLUDE_SYSTEM, + D3D10_INCLUDE_LOCAL = D3D_INCLUDE_LOCAL, + D3D10_INCLUDE_SYSTEM = D3D_INCLUDE_SYSTEM, + D3D_INCLUDE_FORCE_DWORD = 0x7fffffff +} D3D_INCLUDE_TYPE; + +[ + object, + local, +] +interface ID3DInclude +{ + HRESULT Open(D3D_INCLUDE_TYPE include_type, + const char *filename, + const void *parent_data, + const void **data, + UINT *bytes); + HRESULT Close(const void *data); +} + +typedef ID3DInclude* LPD3DINCLUDE;

1 0

Matteo Bruni : include: Fix some d3d10shader.h defines.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: a9e792d6d342c8a68f8802b549fd50de11f77153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e792d6d342c8a68f8802b54… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 3 18:44:25 2010 +0200 include: Fix some d3d10shader.h defines. --- include/d3d10shader.h | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 7885bbd..592dd18 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -32,10 +32,16 @@ #define D3D10_SHADER_FORCE_PS_SOFTWARE_NO_OPT 0x0080 #define D3D10_SHADER_NO_PRESHADER 0x0100 #define D3D10_SHADER_AVOID_FLOW_CONTROL 0x0200 -#define D3D10_SHADER_PREFER_FLOW_CONTROL 0x0300 -#define D3D10_SHADER_ENABLE_STRICTNESS 0x0400 -#define D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY 0x0800 -#define D3D10_SHADER_IEEE_STRICTNESS 0x1000 +#define D3D10_SHADER_PREFER_FLOW_CONTROL 0x0400 +#define D3D10_SHADER_ENABLE_STRICTNESS 0x0800 +#define D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY 0x1000 +#define D3D10_SHADER_IEEE_STRICTNESS 0x2000 +#define D3D10_SHADER_WARNINGS_ARE_ERRORS 0x40000 + +#define D3D10_SHADER_OPTIMIZATION_LEVEL0 0x4000 +#define D3D10_SHADER_OPTIMIZATION_LEVEL1 0x0000 +#define D3D10_SHADER_OPTIMIZATION_LEVEL2 0xC000 +#define D3D10_SHADER_OPTIMIZATION_LEVEL3 0x8000 typedef enum _D3D10_SHADER_VARIABLE_CLASS {

1 0

Matteo Bruni : include: Stub d3dcompiler.h, d3d11shader.h.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 2d14335f6f1aaf493c357a403c3352916ba9f484 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d14335f6f1aaf493c357a403… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 3 18:44:25 2010 +0200 include: Stub d3dcompiler.h, d3d11shader.h. --- include/Makefile.in | 2 ++ include/d3d11shader.h | 24 ++++++++++++++++++++++++ include/d3dcompiler.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 153272d..e6215e3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -156,6 +156,7 @@ SRCDIR_INCLUDES = \ d3d10effect.h \ d3d10misc.h \ d3d10shader.h \ + d3d11shader.h \ d3d8.h \ d3d8caps.h \ d3d8types.h \ @@ -163,6 +164,7 @@ SRCDIR_INCLUDES = \ d3d9caps.h \ d3d9types.h \ d3dcaps.h \ + d3dcompiler.h \ d3dhal.h \ d3drm.h \ d3drmdef.h \ diff --git a/include/d3d11shader.h b/include/d3d11shader.h new file mode 100644 index 0000000..2ccb51a --- /dev/null +++ b/include/d3d11shader.h @@ -0,0 +1,24 @@ +/* + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __D3D11SHADER_H__ +#define __D3D11SHADER_H__ + +#include "d3dcommon.h" + +#endif diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h new file mode 100644 index 0000000..27ed290 --- /dev/null +++ b/include/d3dcompiler.h @@ -0,0 +1,44 @@ +/* + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __D3DCOMPILER_H__ +#define __D3DCOMPILER_H__ + +#include "d3d11shader.h" + +#define D3DCOMPILE_DEBUG 0x0001 +#define D3DCOMPILE_SKIP_VALIDATION 0x0002 +#define D3DCOMPILE_SKIP_OPTIMIZATION 0x0004 +#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x0008 +#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x0010 +#define D3DCOMPILE_PARTIAL_PRECISION 0x0020 +#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x0040 +#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x0080 +#define D3DCOMPILE_NO_PRESHADER 0x0100 +#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x0200 +#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x0400 +#define D3DCOMPILE_ENABLE_STRICTNESS 0x0800 +#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x1000 +#define D3DCOMPILE_IEEE_STRICTNESS 0x2000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x4000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x0000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0xC000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x8000 +#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x40000 + +#endif

1 0

Matteo Bruni : d3dcompiler_42: Stub dll.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: fe050706433f6fcd8ff09c735368c1ee7f57d2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe050706433f6fcd8ff09c735… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 3 18:44:25 2010 +0200 d3dcompiler_42: Stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_42/Makefile.in | 13 ++++++++ dlls/d3dcompiler_42/d3dcompiler_42.spec | 13 ++++++++ dlls/d3dcompiler_42/d3dcompiler_42_main.c | 44 +++++++++++++++++++++++++++++ dlls/d3dcompiler_42/version.rc | 27 +++++++++++++++++ 6 files changed, 99 insertions(+), 0 deletions(-) diff --git a/configure b/configure index bc1196c..4f95d20 100755 --- a/configure +++ b/configure @@ -14429,6 +14429,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 d3dcompiler wine_fn_config_dll d3dim enable_d3dim d3dim wine_fn_config_dll d3drm enable_d3drm d3drm diff --git a/configure.ac b/configure.ac index b5430bd..dd90186 100644 --- a/configure.ac +++ b/configure.ac @@ -2285,6 +2285,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[d3dcompiler]) WINE_CONFIG_DLL(d3dim,,[d3dim]) WINE_CONFIG_DLL(d3drm,,[d3drm]) diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in new file mode 100644 index 0000000..5d0a4a2 --- /dev/null +++ b/dlls/d3dcompiler_42/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_42.dll +IMPORTS = kernel32 + +C_SRCS = \ + d3dcompiler_42_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_42/d3dcompiler_42.spec b/dlls/d3dcompiler_42/d3dcompiler_42.spec new file mode 100644 index 0000000..84adee3 --- /dev/null +++ b/dlls/d3dcompiler_42/d3dcompiler_42.spec @@ -0,0 +1,13 @@ +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble +@ stub DebugSetMute +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub D3DReturnFailure1 +@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader diff --git a/dlls/d3dcompiler_42/d3dcompiler_42_main.c b/dlls/d3dcompiler_42/d3dcompiler_42_main.c new file mode 100644 index 0000000..c4745ee --- /dev/null +++ b/dlls/d3dcompiler_42/d3dcompiler_42_main.c @@ -0,0 +1,44 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_42/version.rc b/dlls/d3dcompiler_42/version.rc new file mode 100644 index 0000000..3ed7088 --- /dev/null +++ b/dlls/d3dcompiler_42/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_42.dll" +#define WINE_FILEVERSION 9,27,952,3022 +#define WINE_FILEVERSION_STR "9.27.952.3022" +#define WINE_PRODUCTVERSION 9,27,952,3022 +#define WINE_PRODUCTVERSION_STR "9.27.952.3022" + +#include "wine/wine_common_ver.rc"

1 0

Matteo Bruni : d3dcompiler_41: Stub dll.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 79c1bc42c00f42d85f0206b64d67af6870d4d89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c1bc42c00f42d85f0206b64… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 3 18:44:25 2010 +0200 d3dcompiler_41: Stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_41/Makefile.in | 13 ++++++++ dlls/d3dcompiler_41/d3dcompiler_41.spec | 13 ++++++++ dlls/d3dcompiler_41/d3dcompiler_41_main.c | 44 +++++++++++++++++++++++++++++ dlls/d3dcompiler_41/version.rc | 27 +++++++++++++++++ 6 files changed, 99 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4f95d20..9b94f09 100755 --- a/configure +++ b/configure @@ -14429,6 +14429,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_41 enable_d3dcompiler_41 wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 d3dcompiler wine_fn_config_dll d3dim enable_d3dim d3dim diff --git a/configure.ac b/configure.ac index dd90186..30f04ac 100644 --- a/configure.ac +++ b/configure.ac @@ -2285,6 +2285,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_41) WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[d3dcompiler]) WINE_CONFIG_DLL(d3dim,,[d3dim]) diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in new file mode 100644 index 0000000..bbdd6af --- /dev/null +++ b/dlls/d3dcompiler_41/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_41.dll +IMPORTS = kernel32 + +C_SRCS = \ + d3dcompiler_41_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_41/d3dcompiler_41.spec b/dlls/d3dcompiler_41/d3dcompiler_41.spec new file mode 100644 index 0000000..84adee3 --- /dev/null +++ b/dlls/d3dcompiler_41/d3dcompiler_41.spec @@ -0,0 +1,13 @@ +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble +@ stub DebugSetMute +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub D3DReturnFailure1 +@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader diff --git a/dlls/d3dcompiler_41/d3dcompiler_41_main.c b/dlls/d3dcompiler_41/d3dcompiler_41_main.c new file mode 100644 index 0000000..c4745ee --- /dev/null +++ b/dlls/d3dcompiler_41/d3dcompiler_41_main.c @@ -0,0 +1,44 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_41/version.rc b/dlls/d3dcompiler_41/version.rc new file mode 100644 index 0000000..8e21730 --- /dev/null +++ b/dlls/d3dcompiler_41/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_41.dll" +#define WINE_FILEVERSION 9,26,952,2844 +#define WINE_FILEVERSION_STR "9.26.952.2844" +#define WINE_PRODUCTVERSION 9,26,952,2844 +#define WINE_PRODUCTVERSION_STR "9.26.952.2844" + +#include "wine/wine_common_ver.rc"

1 0

André Hentschel : ntdll: Add SXS error codes.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 38ca35fe573c6d79cec49a580c1544fd992f498e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38ca35fe573c6d79cec49a580… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 3 20:14:20 2010 +0200 ntdll: Add SXS error codes. --- dlls/ntdll/error.c | 35 ++++++++++++++++++++++++---- dlls/ntdll/tests/error.c | 27 ++++++++++++++++++++++ include/ntstatus.h | 18 ++++++++++++++ include/winerror.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38ca35fe573c6d79cec49…

1 0

Andrew Nguyen : mpr: Initialize the output enumeration handle to NULL in WNetOpenEnumA/ W with no providers available.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 80b1c5e072cb26edd7046ed5a4b9a5bd53793c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b1c5e072cb26edd7046ed5a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Aug 3 13:19:30 2010 -0500 mpr: Initialize the output enumeration handle to NULL in WNetOpenEnumA/W with no providers available. --- dlls/mpr/wnet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 66d165f..2c57aaa 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -638,7 +638,7 @@ DWORD WINAPI WNetOpenEnumA( DWORD dwScope, DWORD dwType, DWORD dwUsage, ret = WN_BAD_POINTER; else if (!providerTable || providerTable->numProviders == 0) { - lphEnum = NULL; + *lphEnum = NULL; ret = WN_NO_NETWORK; } else @@ -730,7 +730,7 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, ret = WN_BAD_POINTER; else if (!providerTable || providerTable->numProviders == 0) { - lphEnum = NULL; + *lphEnum = NULL; ret = WN_NO_NETWORK; } else

1 0