October 2010 - Wine-commits

Jacek Caban : mshtml: Get rid of no longer needed parse_post_data.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 8d11858e37dda056c3984ef2bb91d6223b86502b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d11858e37dda056c3984ef2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 27 23:19:10 2010 +0200 mshtml: Get rid of no longer needed parse_post_data. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/navigate.c | 97 +++--------------------------------------- dlls/mshtml/nsio.c | 2 - 3 files changed, 6 insertions(+), 94 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0526f5f..cf0404d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -470,7 +470,6 @@ typedef struct { nsWineURI *uri; nsIInputStream *post_data_stream; - BOOL parse_stream; nsILoadGroup *load_group; nsIInterfaceRequestor *notif_callback; nsISupports *owner; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fc13a3e..f21ca6d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -706,77 +706,6 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, HGLOBAL *post_data, return S_OK; } -static void parse_post_data(nsIInputStream *post_data_stream, LPWSTR *headers_ret, - HGLOBAL *post_data_ret, ULONG *post_data_len_ret) -{ - ULONG post_data_len; - HGLOBAL post_data = NULL; - LPWSTR headers = NULL; - DWORD headers_len = 0, len; - const char *ptr, *ptr2, *post_data_end; - HRESULT hres; - - hres = read_post_data_stream(post_data_stream, &post_data, &post_data_len); - if(FAILED(hres)) { - FIXME("read_post_data_stream failed: %08x\n", hres); - return; - } - - ptr = ptr2 = post_data; - post_data_end = (const char*)post_data+post_data_len; - - while(ptr < post_data_end && (*ptr != '\r' || ptr[1] != '\n')) { - while(ptr < post_data_end && (*ptr != '\r' || ptr[1] != '\n')) - ptr++; - - if(!*ptr) { - FIXME("*ptr = 0\n"); - return; - } - - ptr += 2; - - if(ptr-ptr2 >= sizeof(CONTENT_LENGTH) - && CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - CONTENT_LENGTH, sizeof(CONTENT_LENGTH)-1, - ptr2, sizeof(CONTENT_LENGTH)-1) == CSTR_EQUAL) { - ptr2 = ptr; - continue; - } - - len = MultiByteToWideChar(CP_ACP, 0, ptr2, ptr-ptr2, NULL, 0); - - if(headers) - headers = heap_realloc(headers,(headers_len+len+1)*sizeof(WCHAR)); - else - headers = heap_alloc((len+1)*sizeof(WCHAR)); - - len = MultiByteToWideChar(CP_ACP, 0, ptr2, ptr-ptr2, headers+headers_len, len); - headers_len += len; - - ptr2 = ptr; - } - - headers[headers_len] = 0; - *headers_ret = headers; - - if(ptr >= post_data_end-2) { - GlobalFree(post_data); - return; - } - - ptr += 2; - - if(headers_len) { - post_data_len -= ptr-(const char*)post_data; - memmove(post_data, ptr, post_data_len); - post_data = GlobalReAlloc(post_data, post_data_len+1, 0); - } - - *post_data_ret = post_data; - *post_data_len_ret = post_data_len; -} - HRESULT start_binding(HTMLWindow *window, HTMLDocumentNode *doc, BSCallback *bscallback, IBindCtx *bctx) { IStream *str = NULL; @@ -1129,22 +1058,10 @@ static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) HRESULT hres; if(This->nschannel && This->nschannel->post_data_stream) { - if(This->nschannel->parse_stream) { - WCHAR *headers; - - parse_post_data(This->nschannel->post_data_stream, &headers, - &This->bsc.post_data, &This->bsc.post_data_len); - - hres = parse_headers(headers, &This->nschannel->request_headers); - heap_free(headers); - if(FAILED(hres)) - return hres; - }else { - hres = read_post_data_stream(This->nschannel->post_data_stream, - &This->bsc.post_data, &This->bsc.post_data_len); - if(FAILED(hres)) - return hres; - } + hres = read_post_data_stream(This->nschannel->post_data_stream, + &This->bsc.post_data, &This->bsc.post_data_len); + if(FAILED(hres)) + return hres; TRACE("post_data = %s\n", debugstr_an(This->bsc.post_data, This->bsc.post_data_len)); } @@ -1491,10 +1408,8 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, } if(post_data_stream) { - parse_post_data(post_data_stream, &callback->bsc.headers, &callback->bsc.post_data, - &callback->bsc.post_data_len); - TRACE("headers = %s post_data = %s\n", debugstr_w(callback->bsc.headers), - debugstr_an(callback->bsc.post_data, callback->bsc.post_data_len)); + read_post_data_stream(post_data_stream, &callback->bsc.post_data, &callback->bsc.post_data_len); + TRACE("post_data = %s\n", debugstr_an(callback->bsc.post_data, callback->bsc.post_data_len)); } hres = CreateAsyncBindCtx(0, STATUSCLB(&callback->bsc), NULL, &bindctx); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 80d5649..18526a5 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1353,7 +1353,6 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, TRACE("(%p)->(%p %s %d)\n", This, aStream, debugstr_nsacstr(aContentType), aContentLength); - This->parse_stream = TRUE; if(aContentType) { nsACString_GetData(aContentType, &content_type); if(*content_type) { @@ -1366,7 +1365,6 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, set_http_header(&This->request_headers, content_typeW, sizeof(content_typeW)/sizeof(WCHAR), ct, strlenW(ct)); heap_free(ct); - This->parse_stream = FALSE; } }

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLObjectElement object .
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 73a15436acde28b59ca72137a4dbb74cda84b04d URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a15436acde28b59ca72137a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 27 23:19:30 2010 +0200 mshtml: Added IDispatchEx support to HTMLObjectElement object. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlobject.c | 14 +++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 64356f5..0f113a3 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -101,6 +101,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLInputElement, &DIID_DispHTMLLocation, &DIID_DispHTMLNavigator, + &DIID_DispHTMLObjectElement, &DIID_DispHTMLOptionElement, &DIID_DispHTMLScreen, &DIID_DispHTMLScriptElement, @@ -145,6 +146,7 @@ static REFIID tid_ids[] = { &IID_IHTMLImgElement, &IID_IHTMLInputElement, &IID_IHTMLLocation, + &IID_IHTMLObjectElement, &IID_IHTMLOptionElement, &IID_IHTMLRect, &IID_IHTMLScreen, diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index fb5ef58..09890cb 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -415,6 +415,18 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = { HTMLObjectElement_destructor }; +static const tid_t HTMLObjectElement_iface_tids[] = { + HTMLELEMENT_TIDS, + IHTMLObjectElement_tid, + 0 +}; +static dispex_static_data_t HTMLObjectElement_dispex = { + NULL, + DispHTMLObjectElement_tid, + NULL, + HTMLObjectElement_iface_tids +}; + HTMLElement *HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) { HTMLObjectElement *ret = heap_alloc_zero(sizeof(*ret)); @@ -422,6 +434,6 @@ HTMLElement *HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement * ret->lpIHTMLObjectElementVtbl = &HTMLObjectElementVtbl; ret->element.node.vtbl = &HTMLObjectElementImplVtbl; - HTMLElement_Init(&ret->element, doc, nselem, NULL); + HTMLElement_Init(&ret->element, doc, nselem, &HTMLObjectElement_dispex); return &ret->element; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cf0404d..89777e8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -83,6 +83,7 @@ typedef enum { DispHTMLInputElement_tid, DispHTMLLocation_tid, DispHTMLNavigator_tid, + DispHTMLObjectElement_tid, DispHTMLOptionElement_tid, DispHTMLScreen_tid, DispHTMLScriptElement_tid, @@ -127,6 +128,7 @@ typedef enum { IHTMLImgElement_tid, IHTMLInputElement_tid, IHTMLLocation_tid, + IHTMLObjectElement_tid, IHTMLOptionElement_tid, IHTMLRect_tid, IHTMLScreen_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ad7e224..94e3fcc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -435,7 +435,7 @@ static const elem_type_info_t elem_type_infos[] = { {"IFRAME", iframe_iids, &DIID_DispHTMLIFrame}, {"FORM", form_iids, &DIID_DispHTMLFormElement}, {"FRAME", frame_iids, &DIID_DispHTMLFrameElement}, - {"OBJECT", object_iids, NULL} + {"OBJECT", object_iids, &DIID_DispHTMLObjectElement} }; static const char *dbgstr_guid(REFIID riid)

1 0

Jacek Caban : mshtml.idl: Added IHTMLEmbedElement and DispHTMLEmbedElement declarations.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: cb9f12e566c5c015be50910daeaa932aa5010327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9f12e566c5c015be50910da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 27 23:19:46 2010 +0200 mshtml.idl: Added IHTMLEmbedElement and DispHTMLEmbedElement declarations. --- include/mshtmdid.h | 14 ++++++ include/mshtml.idl | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 9031358..8d66633 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -946,6 +946,20 @@ #define DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID DISPID_OMDOCUMENT+105 #define DISPID_IHTMLDOCUMENT6_UPDATESETTINGS DISPID_OMDOCUMENT+106 +/* IHTMLEmbedElement */ +#define DISPID_IHTMLEMBEDELEMENT_HIDDEN DISPID_OBJECT+10 +#define DISPID_IHTMLEMBEDELEMENT_PALETTE DISPID_OBJECT+4 +#define DISPID_IHTMLEMBEDELEMENT_PLUGINSPAGE DISPID_OBJECT+5 +#define DISPID_IHTMLEMBEDELEMENT_SRC DISPID_OBJECT+6 +#define DISPID_IHTMLEMBEDELEMENT_UNITS DISPID_OBJECT+8 +#define DISPID_IHTMLEMBEDELEMENT_NAME STDPROPID_XOBJ_NAME +#define DISPID_IHTMLEMBEDELEMENT_WIDTH STDPROPID_XOBJ_WIDTH +#define DISPID_IHTMLEMBEDELEMENT_HEIGHT STDPROPID_XOBJ_HEIGHT + +/* IHTMLEmbedElement2 */ +#define DISPID_IHTMLEMBEDELEMENT2_IE8_SRC DISPID_IE8_EMBED +#define DISPID_IHTMLEMBEDELEMENT2_IE8_PLUGINSPAGE DISPID_IE8_EMBED+1 + /* IHTMLElementCollection */ #define DISPID_IHTMLELEMENTCOLLECTION_LENGTH DISPID_COLLECTION #define DISPID_IHTMLELEMENTCOLLECTION_TOSTRING (DISPID_COLLECTION+1) diff --git a/include/mshtml.idl b/include/mshtml.idl index 414f639..d76f20c 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -13094,6 +13094,125 @@ coclass HTMLDocument } /***************************************************************************** + * IHTMLEmbedElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f25f-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLEmbedElement : IDispatch +{ + [propput, id(DISPID_IHTMLEMBEDELEMENT_HIDDEN)] + HRESULT hidden([in] BSTR v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_HIDDEN)] + HRESULT hidden([retval, out] BSTR *p); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_PALETTE)] + HRESULT palette([retval, out] BSTR *p); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_PLUGINSPAGE)] + HRESULT pluginspage([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLEMBEDELEMENT_SRC)] + HRESULT src([in] BSTR v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_SRC)] + HRESULT src([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLEMBEDELEMENT_UNITS)] + HRESULT units([in] BSTR v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_UNITS)] + HRESULT units([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLEMBEDELEMENT_NAME), displaybind, bindable] + HRESULT name([in] BSTR v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_NAME), displaybind, bindable] + HRESULT name([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLEMBEDELEMENT_WIDTH)] + HRESULT width([in] VARIANT v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_WIDTH)] + HRESULT width([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLEMBEDELEMENT_HEIGHT)] + HRESULT height([in] VARIANT v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_HEIGHT)] + HRESULT height([retval, out] VARIANT *p); +} + +/***************************************************************************** + * DispHTMLEmbedElement dispinterface + */ +[ + hidden, + uuid(3050f52e-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLEmbed +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLEMBEDELEMENT_HIDDEN)] + void hidden(BSTR v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_HIDDEN)] + BSTR hidden(); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_PALETTE)] + BSTR palette(); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_PLUGINSPAGE)] + BSTR pluginspage(); + + [propput, id(DISPID_IHTMLEMBEDELEMENT_SRC)] + void src(BSTR v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_SRC)] + BSTR src(); + + [propput, id(DISPID_IHTMLEMBEDELEMENT_UNITS)] + void units(BSTR v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_UNITS)] + BSTR units(); + + [propput, id(DISPID_IHTMLEMBEDELEMENT_NAME), displaybind, bindable] + void name(BSTR v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_NAME), displaybind, bindable] + BSTR name(); + + [propput, id(DISPID_IHTMLEMBEDELEMENT_WIDTH)] + void width(VARIANT v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_WIDTH)] + VARIANT width(); + + [propput, id(DISPID_IHTMLEMBEDELEMENT_HEIGHT)] + void height(VARIANT v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT_HEIGHT)] + VARIANT height(); + + [propput, id(DISPID_IHTMLEMBEDELEMENT2_IE8_SRC)] + void ie8_src(BSTR v); + + [propget, id(DISPID_IHTMLEMBEDELEMENT2_IE8_SRC)] + BSTR ie8_src(); + + [propget, id(DISPID_IHTMLEMBEDELEMENT2_IE8_PLUGINSPAGE)] + BSTR ie8_pluginspage(); +} + +/***************************************************************************** * IHTMLCommentElement interface */ [

1 0

Rico Schüller : include: Move D3D_RESOURCE_RETURN_TYPE to d3dcommon.h.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 5f5b6a3dc2c60ab0545b56fde1e9e8116411f124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5b6a3dc2c60ab0545b56fde… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Oct 27 21:33:22 2010 +0200 include: Move D3D_RESOURCE_RETURN_TYPE to d3dcommon.h. --- include/d3d10shader.h | 12 ++---------- include/d3d11shader.h | 2 ++ include/d3dcommon.idl | 26 ++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index d8a9c5f..0863a3c 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -114,21 +114,13 @@ typedef D3D_CBUFFER_TYPE *LPD3D10_CBUFFER_TYPE; typedef D3D_REGISTER_COMPONENT_TYPE D3D10_REGISTER_COMPONENT_TYPE; +typedef D3D_RESOURCE_RETURN_TYPE D3D10_RESOURCE_RETURN_TYPE; + typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE; typedef ID3DInclude ID3D10Include; typedef ID3DInclude *LPD3D10INCLUDE; #define IID_ID3D10Include IID_ID3DInclude -typedef enum D3D10_RESOURCE_RETURN_TYPE -{ - D3D10_RETURN_TYPE_UNORM = 1, - D3D10_RETURN_TYPE_SNORM = 2, - D3D10_RETURN_TYPE_SINT = 3, - D3D10_RETURN_TYPE_UINT = 4, - D3D10_RETURN_TYPE_FLOAT = 5, - D3D10_RETURN_TYPE_MIXED = 6 -} D3D10_RESOURCE_RETURN_TYPE; - typedef struct _D3D10_SHADER_INPUT_BIND_DESC { LPCSTR Name; diff --git a/include/d3d11shader.h b/include/d3d11shader.h index f94d2b4..f6d4b31 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -23,4 +23,6 @@ typedef D3D_CBUFFER_TYPE D3D11_CBUFFER_TYPE; +typedef D3D_RESOURCE_RETURN_TYPE D3D11_RESOURCE_RETURN_TYPE; + #endif diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index d343120..dbd683c 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -163,3 +163,29 @@ typedef enum D3D_REGISTER_COMPONENT_TYPE D3D10_REGISTER_COMPONENT_SINT32, D3D10_REGISTER_COMPONENT_FLOAT32, } D3D_REGISTER_COMPONENT_TYPE; + +typedef enum D3D_RESOURCE_RETURN_TYPE +{ + D3D_RETURN_TYPE_UNORM = 1, + D3D_RETURN_TYPE_SNORM, + D3D_RETURN_TYPE_SINT, + D3D_RETURN_TYPE_UINT, + D3D_RETURN_TYPE_FLOAT, + D3D_RETURN_TYPE_MIXED, + D3D_RETURN_TYPE_DOUBLE, + D3D_RETURN_TYPE_CONTINUED, + D3D10_RETURN_TYPE_UNORM = 1, + D3D10_RETURN_TYPE_SNORM, + D3D10_RETURN_TYPE_SINT, + D3D10_RETURN_TYPE_UINT, + D3D10_RETURN_TYPE_FLOAT, + D3D10_RETURN_TYPE_MIXED, + D3D11_RETURN_TYPE_UNORM = 1, + D3D11_RETURN_TYPE_SNORM, + D3D11_RETURN_TYPE_SINT, + D3D11_RETURN_TYPE_UINT, + D3D11_RETURN_TYPE_FLOAT, + D3D11_RETURN_TYPE_MIXED, + D3D11_RETURN_TYPE_DOUBLE, + D3D11_RETURN_TYPE_CONTINUED, +} D3D_RESOURCE_RETURN_TYPE;

1 0

Rico Schüller : include: Move D3D_NAME to d3dcommon.h.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 84143c8ff5dd633743e462c62f49b90081cbbb4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=84143c8ff5dd633743e462c62… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Oct 27 21:33:30 2010 +0200 include: Move D3D_NAME to d3dcommon.h. --- include/d3d10shader.h | 19 ++----------------- include/d3dcommon.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 17 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 0863a3c..cfae6ae 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -85,23 +85,6 @@ typedef enum _D3D10_SHADER_INPUT_TYPE D3D10_SIT_SAMPLER = 3 } D3D10_SHADER_INPUT_TYPE, *LPD3D10_SHADER_INPUT_TYPE; -typedef enum D3D10_NAME -{ - D3D10_NAME_UNDEFINED = 0, - D3D10_NAME_POSITION = 1, - D3D10_NAME_CLIP_DISTANCE = 2, - D3D10_NAME_CULL_DISTANCE = 3, - D3D10_NAME_RENDER_TARGET_ARRAY_INDEX = 4, - D3D10_NAME_VIEWPORT_ARRAY_INDEX = 5, - D3D10_NAME_VERTEX_ID = 6, - D3D10_NAME_PRIMITIVE_ID = 7, - D3D10_NAME_INSTANCE_ID = 8, - D3D10_NAME_IS_FRONT_FACE = 9, - D3D10_NAME_SAMPLE_INDEX = 10, - D3D10_NAME_TARGET = 64, - D3D10_NAME_DEPTH = 65, -} D3D10_NAME; - /* These are defined as version-neutral in d3dcommon.h */ typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO; typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO; @@ -116,6 +99,8 @@ typedef D3D_REGISTER_COMPONENT_TYPE D3D10_REGISTER_COMPONENT_TYPE; typedef D3D_RESOURCE_RETURN_TYPE D3D10_RESOURCE_RETURN_TYPE; +typedef D3D_NAME D3D10_NAME; + typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE; typedef ID3DInclude ID3D10Include; typedef ID3DInclude *LPD3D10INCLUDE; diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index dbd683c..f5ea54e 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -189,3 +189,51 @@ typedef enum D3D_RESOURCE_RETURN_TYPE D3D11_RETURN_TYPE_DOUBLE, D3D11_RETURN_TYPE_CONTINUED, } D3D_RESOURCE_RETURN_TYPE; + +typedef enum D3D_NAME +{ + D3D_NAME_UNDEFINED, + D3D_NAME_POSITION, + D3D_NAME_CLIP_DISTANCE, + D3D_NAME_CULL_DISTANCE, + D3D_NAME_RENDER_TARGET_ARRAY_INDEX, + D3D_NAME_VIEWPORT_ARRAY_INDEX, + D3D_NAME_VERTEX_ID, + D3D_NAME_PRIMITIVE_ID, + D3D_NAME_INSTANCE_ID, + D3D_NAME_IS_FRONT_FACE, + D3D_NAME_SAMPLE_INDEX, + D3D_NAME_FINAL_QUAD_EDGE_TESSFACTOR, + D3D_NAME_FINAL_QUAD_INSIDE_TESSFACTOR, + D3D_NAME_FINAL_TRI_EDGE_TESSFACTOR, + D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR, + D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR, + D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR, + D3D_NAME_TARGET = 64, + D3D_NAME_DEPTH, + D3D_NAME_COVERAGE, + D3D_NAME_DEPTH_GREATER_EQUAL, + D3D_NAME_DEPTH_LESS_EQUAL, + D3D10_NAME_UNDEFINED = 0, + D3D10_NAME_POSITION, + D3D10_NAME_CLIP_DISTANCE, + D3D10_NAME_CULL_DISTANCE, + D3D10_NAME_RENDER_TARGET_ARRAY_INDEX, + D3D10_NAME_VIEWPORT_ARRAY_INDEX, + D3D10_NAME_VERTEX_ID, + D3D10_NAME_PRIMITIVE_ID, + D3D10_NAME_INSTANCE_ID, + D3D10_NAME_IS_FRONT_FACE, + D3D10_NAME_SAMPLE_INDEX, + D3D11_NAME_FINAL_QUAD_EDGE_TESSFACTOR, + D3D11_NAME_FINAL_QUAD_INSIDE_TESSFACTOR, + D3D11_NAME_FINAL_TRI_EDGE_TESSFACTOR, + D3D11_NAME_FINAL_TRI_INSIDE_TESSFACTOR, + D3D11_NAME_FINAL_LINE_DETAIL_TESSFACTOR, + D3D11_NAME_FINAL_LINE_DENSITY_TESSFACTOR, + D3D10_NAME_TARGET = 64, + D3D10_NAME_DEPTH, + D3D10_NAME_COVERAGE, + D3D11_NAME_DEPTH_GREATER_EQUAL, + D3D11_NAME_DEPTH_LESS_EQUAL, +} D3D_NAME;

1 0

Rico Schüller : include: Move D3D_SHADER_INPUT_TYPE to d3dcommon.h.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 7b034edf847850472a8ed44011eaddf70a2277de URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b034edf847850472a8ed4401… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Oct 27 21:33:33 2010 +0200 include: Move D3D_SHADER_INPUT_TYPE to d3dcommon.h. --- include/d3d10shader.h | 11 +++-------- include/d3dcommon.idl | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index cfae6ae..b18b75e 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -77,14 +77,6 @@ typedef enum _D3D10_SHADER_VARIABLE_TYPE D3D10_SVT_FORCE_DWORD = 0x7fffffff } D3D10_SHADER_VARIABLE_TYPE, *LPD3D10_SHADER_VARIABLE_TYPE; -typedef enum _D3D10_SHADER_INPUT_TYPE -{ - D3D10_SIT_CBUFFER = 0, - D3D10_SIT_TBUFFER = 1, - D3D10_SIT_TEXTURE = 2, - D3D10_SIT_SAMPLER = 3 -} D3D10_SHADER_INPUT_TYPE, *LPD3D10_SHADER_INPUT_TYPE; - /* These are defined as version-neutral in d3dcommon.h */ typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO; typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO; @@ -101,6 +93,9 @@ typedef D3D_RESOURCE_RETURN_TYPE D3D10_RESOURCE_RETURN_TYPE; typedef D3D_NAME D3D10_NAME; +typedef D3D_SHADER_INPUT_TYPE D3D10_SHADER_INPUT_TYPE; +typedef D3D_SHADER_INPUT_TYPE *LPD3D10_SHADER_INPUT_TYPE; + typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE; typedef ID3DInclude ID3D10Include; typedef ID3DInclude *LPD3D10INCLUDE; diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index f5ea54e..cbd0cb6 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -237,3 +237,31 @@ typedef enum D3D_NAME D3D11_NAME_DEPTH_GREATER_EQUAL, D3D11_NAME_DEPTH_LESS_EQUAL, } D3D_NAME; + +typedef enum _D3D_SHADER_INPUT_TYPE +{ + D3D_SIT_CBUFFER, + D3D_SIT_TBUFFER, + D3D_SIT_TEXTURE, + D3D_SIT_SAMPLER, + D3D_SIT_UAV_RWTYPED, + D3D_SIT_STRUCTURED, + D3D_SIT_UAV_RWSTRUCTURED, + D3D_SIT_BYTEADDRESS, + D3D_SIT_UAV_RWBYTEADDRESS, + D3D_SIT_UAV_APPEND_STRUCTURED, + D3D_SIT_UAV_CONSUME_STRUCTURED, + D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER, + D3D10_SIT_CBUFFER = 0, + D3D10_SIT_TBUFFER, + D3D10_SIT_TEXTURE, + D3D10_SIT_SAMPLER, + D3D11_SIT_UAV_RWTYPED, + D3D11_SIT_STRUCTURED, + D3D11_SIT_UAV_RWSTRUCTURED, + D3D11_SIT_BYTEADDRESS, + D3D11_SIT_UAV_RWBYTEADDRESS, + D3D11_SIT_UAV_APPEND_STRUCTURED, + D3D11_SIT_UAV_CONSUME_STRUCTURED, + D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER, +} D3D_SHADER_INPUT_TYPE;

1 0

Rico Schüller : include: Move D3D_SHADER_VARIABLE_TYPE to d3dcommon.h.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: f5f6bd7c3f22d3fe7569444ddf9d1a68ee8d6933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f6bd7c3f22d3fe7569444dd… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Oct 27 21:33:36 2010 +0200 include: Move D3D_SHADER_VARIABLE_TYPE to d3dcommon.h. --- include/d3d10shader.h | 37 +--------------- include/d3dcommon.idl | 109 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 34 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index b18b75e..2566d42 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -43,40 +43,6 @@ #define D3D10_SHADER_OPTIMIZATION_LEVEL2 0xC000 #define D3D10_SHADER_OPTIMIZATION_LEVEL3 0x8000 -typedef enum _D3D10_SHADER_VARIABLE_TYPE -{ - D3D10_SVT_VOID = 0, - D3D10_SVT_BOOL = 1, - D3D10_SVT_INT = 2, - D3D10_SVT_FLOAT = 3, - D3D10_SVT_STRING = 4, - D3D10_SVT_TEXTURE = 5, - D3D10_SVT_TEXTURE1D = 6, - D3D10_SVT_TEXTURE2D = 7, - D3D10_SVT_TEXTURE3D = 8, - D3D10_SVT_TEXTURECUBE = 9, - D3D10_SVT_SAMPLER = 10, - D3D10_SVT_PIXELSHADER = 15, - D3D10_SVT_VERTEXSHADER = 16, - D3D10_SVT_UINT = 19, - D3D10_SVT_UINT8 = 20, - D3D10_SVT_GEOMETRYSHADER = 21, - D3D10_SVT_RASTERIZER = 22, - D3D10_SVT_DEPTHSTENCIL = 23, - D3D10_SVT_BLEND = 24, - D3D10_SVT_BUFFER = 25, - D3D10_SVT_CBUFFER = 26, - D3D10_SVT_TBUFFER = 27, - D3D10_SVT_TEXTURE1DARRAY = 28, - D3D10_SVT_TEXTURE2DARRAY = 29, - D3D10_SVT_RENDERTARGETVIEW = 30, - D3D10_SVT_DEPTHSTENCILVIEW = 31, - D3D10_SVT_TEXTURE2DMS = 32, - D3D10_SVT_TEXTURE2DMSARRAY = 33, - D3D10_SVT_TEXTURECUBEARRAY = 34, - D3D10_SVT_FORCE_DWORD = 0x7fffffff -} D3D10_SHADER_VARIABLE_TYPE, *LPD3D10_SHADER_VARIABLE_TYPE; - /* These are defined as version-neutral in d3dcommon.h */ typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO; typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO; @@ -96,6 +62,9 @@ typedef D3D_NAME D3D10_NAME; typedef D3D_SHADER_INPUT_TYPE D3D10_SHADER_INPUT_TYPE; typedef D3D_SHADER_INPUT_TYPE *LPD3D10_SHADER_INPUT_TYPE; +typedef D3D_SHADER_VARIABLE_TYPE D3D10_SHADER_VARIABLE_TYPE; +typedef D3D_SHADER_VARIABLE_TYPE *LPD3D10_SHADER_VARIABLE_TYPE; + typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE; typedef ID3DInclude ID3D10Include; typedef ID3DInclude *LPD3D10INCLUDE; diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index cbd0cb6..7ecb3a2 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -89,6 +89,115 @@ typedef enum _D3D_SHADER_VARIABLE_CLASS D3D_SVC_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_CLASS; +typedef enum _D3D_SHADER_VARIABLE_TYPE +{ + D3D_SVT_VOID, + D3D_SVT_BOOL, + D3D_SVT_INT, + D3D_SVT_FLOAT, + D3D_SVT_STRING, + D3D_SVT_TEXTURE, + D3D_SVT_TEXTURE1D, + D3D_SVT_TEXTURE2D, + D3D_SVT_TEXTURE3D, + D3D_SVT_TEXTURECUBE, + D3D_SVT_SAMPLER, + D3D_SVT_SAMPLER1D, + D3D_SVT_SAMPLER2D, + D3D_SVT_SAMPLER3D, + D3D_SVT_SAMPLERCUBE, + D3D_SVT_PIXELSHADER, + D3D_SVT_VERTEXSHADER, + D3D_SVT_PIXELFRAGMENT, + D3D_SVT_VERTEXFRAGMENT, + D3D_SVT_UINT, + D3D_SVT_UINT8, + D3D_SVT_GEOMETRYSHADER, + D3D_SVT_RASTERIZER, + D3D_SVT_DEPTHSTENCIL, + D3D_SVT_BLEND, + D3D_SVT_BUFFER, + D3D_SVT_CBUFFER, + D3D_SVT_TBUFFER, + D3D_SVT_TEXTURE1DARRAY, + D3D_SVT_TEXTURE2DARRAY, + D3D_SVT_RENDERTARGETVIEW, + D3D_SVT_DEPTHSTENCILVIEW, + D3D_SVT_TEXTURE2DMS, + D3D_SVT_TEXTURE2DMSARRAY, + D3D_SVT_TEXTURECUBEARRAY, + D3D_SVT_HULLSHADER, + D3D_SVT_DOMAINSHADER, + D3D_SVT_INTERFACE_POINTER, + D3D_SVT_COMPUTESHADER, + D3D_SVT_DOUBLE, + D3D_SVT_RWTEXTURE1D, + D3D_SVT_RWTEXTURE1DARRAY, + D3D_SVT_RWTEXTURE2D, + D3D_SVT_RWTEXTURE2DARRAY, + D3D_SVT_RWTEXTURE3D, + D3D_SVT_RWBUFFER, + D3D_SVT_BYTEADDRESS_BUFFER, + D3D_SVT_RWBYTEADDRESS_BUFFER, + D3D_SVT_STRUCTURED_BUFFER, + D3D_SVT_RWSTRUCTURED_BUFFER, + D3D_SVT_APPEND_STRUCTURED_BUFFER, + D3D_SVT_CONSUME_STRUCTURED_BUFFER, + D3D10_SVT_VOID = 0, + D3D10_SVT_BOOL, + D3D10_SVT_INT, + D3D10_SVT_FLOAT, + D3D10_SVT_STRING, + D3D10_SVT_TEXTURE, + D3D10_SVT_TEXTURE1D, + D3D10_SVT_TEXTURE2D, + D3D10_SVT_TEXTURE3D, + D3D10_SVT_TEXTURECUBE, + D3D10_SVT_SAMPLER, + D3D10_SVT_SAMPLER1D, + D3D10_SVT_SAMPLER2D, + D3D10_SVT_SAMPLER3D, + D3D10_SVT_SAMPLERCUBE, + D3D10_SVT_PIXELSHADER, + D3D10_SVT_VERTEXSHADER, + D3D10_SVT_PIXELFRAGMENT, + D3D10_SVT_VERTEXFRAGMENT, + D3D10_SVT_UINT, + D3D10_SVT_UINT8, + D3D10_SVT_GEOMETRYSHADER, + D3D10_SVT_RASTERIZER, + D3D10_SVT_DEPTHSTENCIL, + D3D10_SVT_BLEND, + D3D10_SVT_BUFFER, + D3D10_SVT_CBUFFER, + D3D10_SVT_TBUFFER, + D3D10_SVT_TEXTURE1DARRAY, + D3D10_SVT_TEXTURE2DARRAY, + D3D10_SVT_RENDERTARGETVIEW, + D3D10_SVT_DEPTHSTENCILVIEW, + D3D10_SVT_TEXTURE2DMS, + D3D10_SVT_TEXTURE2DMSARRAY, + D3D10_SVT_TEXTURECUBEARRAY, + D3D11_SVT_HULLSHADER, + D3D11_SVT_DOMAINSHADER, + D3D11_SVT_INTERFACE_POINTER, + D3D11_SVT_COMPUTESHADER, + D3D11_SVT_DOUBLE, + D3D11_SVT_RWTEXTURE1D, + D3D11_SVT_RWTEXTURE1DARRAY, + D3D11_SVT_RWTEXTURE2D, + D3D11_SVT_RWTEXTURE2DARRAY, + D3D11_SVT_RWTEXTURE3D, + D3D11_SVT_RWBUFFER, + D3D11_SVT_BYTEADDRESS_BUFFER, + D3D11_SVT_RWBYTEADDRESS_BUFFER, + D3D11_SVT_STRUCTURED_BUFFER, + D3D11_SVT_RWSTRUCTURED_BUFFER, + D3D11_SVT_APPEND_STRUCTURED_BUFFER, + D3D11_SVT_CONSUME_STRUCTURED_BUFFER, + D3D_SVT_FORCE_DWORD = 0x7fffffff, +} D3D_SHADER_VARIABLE_TYPE; + typedef enum D3D_CBUFFER_TYPE { D3D_CT_CBUFFER,

1 0

Rico Schüller : include: Move D3D_PRIMITIVE_TOPOLOGY to d3dcommon.h.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: ccce1c946bcd212bcce54c43a8ac11d1807b8467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccce1c946bcd212bcce54c43a… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Oct 27 21:33:40 2010 +0200 include: Move D3D_PRIMITIVE_TOPOLOGY to d3dcommon.h. --- include/d3d10.idl | 13 +------ include/d3d11.idl | 2 + include/d3dcommon.idl | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+), 12 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index bd4e914..ddde923 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -751,18 +751,7 @@ typedef struct D3D10_QUERY_DESC { UINT MiscFlags; } D3D10_QUERY_DESC; -typedef enum D3D10_PRIMITIVE_TOPOLOGY { - D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, - D3D10_PRIMITIVE_TOPOLOGY_POINTLIST = 1, - D3D10_PRIMITIVE_TOPOLOGY_LINELIST = 2, - D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, - D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, - D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, - D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10, - D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ = 11, - D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12, - D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ = 13 -} D3D10_PRIMITIVE_TOPOLOGY; +typedef D3D_PRIMITIVE_TOPOLOGY D3D10_PRIMITIVE_TOPOLOGY; typedef RECT D3D10_RECT; diff --git a/include/d3d11.idl b/include/d3d11.idl index 35df359..f0c35a2 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -22,3 +22,5 @@ import "dxgi.idl"; import "d3dcommon.idl"; typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION; + +typedef D3D_PRIMITIVE_TOPOLOGY D3D11_PRIMITIVE_TOPOLOGY; diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 7ecb3a2..2232bde 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -198,6 +198,104 @@ typedef enum _D3D_SHADER_VARIABLE_TYPE D3D_SVT_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_TYPE; +typedef enum D3D_PRIMITIVE_TOPOLOGY +{ + D3D_PRIMITIVE_TOPOLOGY_UNDEFINED, + D3D_PRIMITIVE_TOPOLOGY_POINTLIST, + D3D_PRIMITIVE_TOPOLOGY_LINELIST, + D3D_PRIMITIVE_TOPOLOGY_LINESTRIP, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP, + D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10, + D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ, + D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST = 33, + D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST, + D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, + D3D10_PRIMITIVE_TOPOLOGY_POINTLIST, + D3D10_PRIMITIVE_TOPOLOGY_LINELIST, + D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP, + D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST, + D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP, + D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10, + D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ, + D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ, + D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ, + D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, + D3D11_PRIMITIVE_TOPOLOGY_POINTLIST, + D3D11_PRIMITIVE_TOPOLOGY_LINELIST, + D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP, + D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST, + D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP, + D3D11_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10, + D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ, + D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ, + D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ, + D3D11_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST = 33, + D3D11_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST, + D3D11_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST, +} D3D_PRIMITIVE_TOPOLOGY; + typedef enum D3D_CBUFFER_TYPE { D3D_CT_CBUFFER,

1 0

Rico Schüller : include: Move D3D_PRIMITIVE to d3dcommon.h.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: ae791289786d654b2d7e09b9dba8e321c3babfea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae791289786d654b2d7e09b9d… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Oct 27 21:33:44 2010 +0200 include: Move D3D_PRIMITIVE to d3dcommon.h. --- include/d3d10.idl | 2 + include/d3d11.idl | 2 + include/d3dcommon.idl | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 0 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index ddde923..57e8049 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -753,6 +753,8 @@ typedef struct D3D10_QUERY_DESC { typedef D3D_PRIMITIVE_TOPOLOGY D3D10_PRIMITIVE_TOPOLOGY; +typedef D3D_PRIMITIVE D3D10_PRIMITIVE; + typedef RECT D3D10_RECT; typedef struct D3D10_VIEWPORT { diff --git a/include/d3d11.idl b/include/d3d11.idl index f0c35a2..5959010 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -23,4 +23,6 @@ import "d3dcommon.idl"; typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION; +typedef D3D_PRIMITIVE D3D11_PRIMITIVE; + typedef D3D_PRIMITIVE_TOPOLOGY D3D11_PRIMITIVE_TOPOLOGY; diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 2232bde..24649a7 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -198,6 +198,92 @@ typedef enum _D3D_SHADER_VARIABLE_TYPE D3D_SVT_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_TYPE; +typedef enum D3D_PRIMITIVE +{ + D3D_PRIMITIVE_UNDEFINED, + D3D_PRIMITIVE_POINT, + D3D_PRIMITIVE_LINE, + D3D_PRIMITIVE_TRIANGLE, + D3D_PRIMITIVE_LINE_ADJ = 6, + D3D_PRIMITIVE_TRIANGLE_ADJ, + D3D_PRIMITIVE_1_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_2_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_3_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_4_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_5_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_6_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_7_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_8_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_9_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_10_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_11_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_12_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_13_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_14_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_15_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_16_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_17_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_18_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_19_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_20_CONTROL_POINT_PATCH = 28, + D3D_PRIMITIVE_21_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_22_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_23_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_24_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_25_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_26_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_27_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_28_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_29_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_30_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_31_CONTROL_POINT_PATCH, + D3D_PRIMITIVE_32_CONTROL_POINT_PATCH, + D3D10_PRIMITIVE_UNDEFINED = 0, + D3D10_PRIMITIVE_POINT, + D3D10_PRIMITIVE_LINE, + D3D10_PRIMITIVE_TRIANGLE, + D3D10_PRIMITIVE_LINE_ADJ = 6, + D3D10_PRIMITIVE_TRIANGLE_ADJ, + D3D11_PRIMITIVE_UNDEFINED = 0, + D3D11_PRIMITIVE_POINT, + D3D11_PRIMITIVE_LINE, + D3D11_PRIMITIVE_TRIANGLE, + D3D11_PRIMITIVE_LINE_ADJ = 6, + D3D11_PRIMITIVE_TRIANGLE_ADJ, + D3D11_PRIMITIVE_1_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_2_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_3_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_4_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_5_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_6_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_7_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_8_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_9_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_10_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_11_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_12_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_13_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_14_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_15_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_16_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH = 28, + D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_24_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_25_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_26_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_27_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_28_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_29_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_30_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_31_CONTROL_POINT_PATCH, + D3D11_PRIMITIVE_32_CONTROL_POINT_PATCH, +} D3D_PRIMITIVE; + typedef enum D3D_PRIMITIVE_TOPOLOGY { D3D_PRIMITIVE_TOPOLOGY_UNDEFINED,

1 0

Louis Lenders : ws2_32: Return SOCKET_ERROR in stubbed WSALookupServiceNext , to prevent apps from looping forever.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: cb65dbf3d84f64d8275d853bb75e17fbf64b23c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb65dbf3d84f64d8275d853bb… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Oct 27 23:02:46 2010 +0200 ws2_32: Return SOCKET_ERROR in stubbed WSALookupServiceNext, to prevent apps from looping forever. --- dlls/ws2_32/socket.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 66726a7..c51ac35 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6333,7 +6333,8 @@ INT WINAPI WSALookupServiceEnd( HANDLE lookup ) INT WINAPI WSALookupServiceNextA( HANDLE lookup, DWORD flags, LPDWORD len, LPWSAQUERYSETA results ) { FIXME( "(%p 0x%08x %p %p) Stub!\n", lookup, flags, len, results ); - return 0; + WSASetLastError(WSA_E_NO_MORE); + return SOCKET_ERROR; } /*********************************************************************** @@ -6342,7 +6343,8 @@ INT WINAPI WSALookupServiceNextA( HANDLE lookup, DWORD flags, LPDWORD len, LPWSA INT WINAPI WSALookupServiceNextW( HANDLE lookup, DWORD flags, LPDWORD len, LPWSAQUERYSETW results ) { FIXME( "(%p 0x%08x %p %p) Stub!\n", lookup, flags, len, results ); - return 0; + WSASetLastError(WSA_E_NO_MORE); + return SOCKET_ERROR; } /***********************************************************************

1 0