June 2016 - Wine-Commits - list.winehq.org

Aaryaman Vasishta : d3drm: Rearrange version 2 functions after version 3 for IDirect3DRMFrame*.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: ad1d0f4f15c943eac763eca47c4c40f525309852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1d0f4f15c943eac763eca47… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Jun 19 04:17:07 2016 +0530 d3drm: Rearrange version 2 functions after version 3 for IDirect3DRMFrame*. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/frame.c | 1464 ++++++++++++++++++++++++++-------------------------- 1 file changed, 733 insertions(+), 731 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad1d0f4f15c943eac763e…

1 0

Marcus Meissner : cmd: Avoid potential buffer overflow (Coverity).
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 0d4c3996231c2c601029efa8776820b8cf2eae33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4c3996231c2c601029efa87… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 18 09:50:59 2016 +0200 cmd: Avoid potential buffer overflow (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index de92e0a..87f5387 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -375,7 +375,7 @@ static void WCMD_show_prompt (void) { *q++ = '('; break; case 'D': - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, q, MAX_PATH); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, q, MAX_PATH - (q - out_string)); while (*q) q++; break; case 'E':

1 0

Aaryaman Vasishta : d3drm: Fix viewport object creation.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: f585faff6bb944764e838c2b4777e277856aa3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f585faff6bb944764e838c2b4… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Jun 20 01:16:09 2016 +0530 d3drm: Fix viewport object creation. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 26 +++++++++++++++++++++++--- dlls/d3drm/d3drm_private.h | 14 +++++++++++++- dlls/d3drm/viewport.c | 21 ++++----------------- 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 4f1f840..8d054b5 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -400,10 +400,12 @@ static HRESULT WINAPI d3drm1_CreateShadow(IDirect3DRM *iface, IDirect3DRMVisual static HRESULT WINAPI d3drm1_CreateViewport(IDirect3DRM *iface, IDirect3DRMDevice *device, IDirect3DRMFrame *camera, DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport **viewport) { + struct d3drm *d3drm = impl_from_IDirect3DRM(iface); + FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p partial stub!\n", iface, device, camera, x, y, width, height, viewport); - return Direct3DRMViewport_create(&IID_IDirect3DRMViewport, (IUnknown **)viewport); + return IDirect3DRM2_CreateViewport(&d3drm->IDirect3DRM2_iface, device, camera, x, y, width, height, viewport); } static HRESULT WINAPI d3drm1_CreateWrap(IDirect3DRM *iface, D3DRMWRAPTYPE type, IDirect3DRMFrame *frame, @@ -861,10 +863,19 @@ static HRESULT WINAPI d3drm2_CreateShadow(IDirect3DRM2 *iface, IDirect3DRMVisual static HRESULT WINAPI d3drm2_CreateViewport(IDirect3DRM2 *iface, IDirect3DRMDevice *device, IDirect3DRMFrame *camera, DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport **viewport) { + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + struct d3drm_viewport *object; + HRESULT hr; + FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p partial stub!\n", iface, device, camera, x, y, width, height, viewport); - return Direct3DRMViewport_create(&IID_IDirect3DRMViewport, (IUnknown **)viewport); + if (FAILED(hr = d3drm_viewport_create(&object, &d3drm->IDirect3DRM_iface))) + return hr; + + *viewport = &object->IDirect3DRMViewport_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm2_CreateWrap(IDirect3DRM2 *iface, D3DRMWRAPTYPE type, IDirect3DRMFrame *frame, @@ -1423,10 +1434,19 @@ static HRESULT WINAPI d3drm3_CreateTextureFromSurface(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevice3 *device, IDirect3DRMFrame3 *camera, DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport2 **viewport) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_viewport *object; + HRESULT hr; + FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p partial stub!\n", iface, device, camera, x, y, width, height, viewport); - return Direct3DRMViewport_create(&IID_IDirect3DRMViewport2, (IUnknown **)viewport); + if (FAILED(hr = d3drm_viewport_create(&object, &d3drm->IDirect3DRM_iface))) + return hr; + + *viewport = &object->IDirect3DRMViewport2_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm3_CreateWrap(IDirect3DRM3 *iface, D3DRMWRAPTYPE type, IDirect3DRMFrame3 *frame, diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 42112bf..06cbdc1 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -65,6 +65,18 @@ struct d3drm_frame D3DCOLOR scenebackground; }; +struct d3drm_viewport +{ + struct d3drm_object obj; + IDirect3DRMViewport IDirect3DRMViewport_iface; + IDirect3DRMViewport2 IDirect3DRMViewport2_iface; + IDirect3DRM *d3drm; + D3DVALUE back; + D3DVALUE front; + D3DVALUE field; + D3DRMPROJECTIONTYPE projection; +}; + void d3drm_object_init(struct d3drm_object *object) DECLSPEC_HIDDEN; HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; @@ -73,6 +85,7 @@ void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object) HRESULT d3drm_device_create(struct d3drm_device **out) DECLSPEC_HIDDEN; HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; +HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; IDirect3DRMDevice *IDirect3DRMDevice_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice2 *IDirect3DRMDevice2_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice3 *IDirect3DRMDevice3_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; @@ -80,7 +93,6 @@ HRESULT Direct3DRMFace_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HIDDEN HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; -HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN; HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 98ea582..ab9ccde 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -29,17 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -struct d3drm_viewport -{ - struct d3drm_object obj; - IDirect3DRMViewport IDirect3DRMViewport_iface; - IDirect3DRMViewport2 IDirect3DRMViewport2_iface; - D3DVALUE back; - D3DVALUE front; - D3DVALUE field; - D3DRMPROJECTIONTYPE projection; -}; - static inline struct d3drm_viewport *impl_from_IDirect3DRMViewport(IDirect3DRMViewport *iface) { return CONTAINING_RECORD(iface, struct d3drm_viewport, IDirect3DRMViewport_iface); @@ -829,23 +818,21 @@ static const struct IDirect3DRMViewport2Vtbl d3drm_viewport2_vtbl = d3drm_viewport2_InverseTransformVectors, }; -HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown **out) +HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3drm) { struct d3drm_viewport *object; - TRACE("riid %s, out %p.\n", debugstr_guid(riid), out); + TRACE("viewport %p, d3drm %p.\n", viewport, d3drm); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMViewport_iface.lpVtbl = &d3drm_viewport1_vtbl; object->IDirect3DRMViewport2_iface.lpVtbl = &d3drm_viewport2_vtbl; + object->d3drm = d3drm; d3drm_object_init(&object->obj); - if (IsEqualGUID(riid, &IID_IDirect3DRMViewport2)) - *out = (IUnknown *)&object->IDirect3DRMViewport2_iface; - else - *out = (IUnknown *)&object->IDirect3DRMViewport_iface; + *viewport = object; return S_OK; }

1 0

Aaryaman Vasishta : d3drm: Fix frame object creation method.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: e6feb9b03112b43b853bc12c33cea01d71b8c20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6feb9b03112b43b853bc12c3… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Jun 20 01:16:08 2016 +0530 d3drm: Fix frame object creation method. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 32 +++++++++++++++++++++++++++++--- dlls/d3drm/d3drm_private.h | 23 ++++++++++++++++++++++- dlls/d3drm/frame.c | 38 +++++++++----------------------------- 3 files changed, 60 insertions(+), 33 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 14fed3a..4f1f840 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -150,9 +150,17 @@ static HRESULT WINAPI d3drm1_CreateObject(IDirect3DRM *iface, static HRESULT WINAPI d3drm1_CreateFrame(IDirect3DRM *iface, IDirect3DRMFrame *parent_frame, IDirect3DRMFrame **frame) { + struct d3drm_frame *object; + HRESULT hr; + TRACE("iface %p, parent_frame %p, frame %p.\n", iface, parent_frame, frame); - return Direct3DRMFrame_create(&IID_IDirect3DRMFrame, (IUnknown *)parent_frame, (IUnknown **)frame); + if (FAILED(hr = d3drm_frame_create(&object, (IUnknown *)parent_frame, iface))) + return hr; + + *frame = &object->IDirect3DRMFrame_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm1_CreateMesh(IDirect3DRM *iface, IDirect3DRMMesh **mesh) @@ -624,9 +632,18 @@ static HRESULT WINAPI d3drm2_CreateObject(IDirect3DRM2 *iface, static HRESULT WINAPI d3drm2_CreateFrame(IDirect3DRM2 *iface, IDirect3DRMFrame *parent_frame, IDirect3DRMFrame2 **frame) { + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + struct d3drm_frame *object; + HRESULT hr; + TRACE("iface %p, parent_frame %p, frame %p.\n", iface, parent_frame, frame); - return Direct3DRMFrame_create(&IID_IDirect3DRMFrame2, (IUnknown*)parent_frame, (IUnknown**)frame); + if (FAILED(hr = d3drm_frame_create(&object, (IUnknown *)parent_frame, &d3drm->IDirect3DRM_iface))) + return hr; + + *frame = &object->IDirect3DRMFrame2_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm2_CreateMesh(IDirect3DRM2 *iface, IDirect3DRMMesh **mesh) @@ -1126,9 +1143,18 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_CreateFrame(IDirect3DRM3 *iface, IDirect3DRMFrame3 *parent, IDirect3DRMFrame3 **frame) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_frame *object; + HRESULT hr; + TRACE("iface %p, parent %p, frame %p.\n", iface, parent, frame); - return Direct3DRMFrame_create(&IID_IDirect3DRMFrame3, (IUnknown *)parent, (IUnknown **)frame); + if (FAILED(hr = d3drm_frame_create(&object, (IUnknown *)parent, &d3drm->IDirect3DRM_iface))) + return hr; + + *frame = &object->IDirect3DRMFrame3_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm3_CreateMesh(IDirect3DRM3 *iface, IDirect3DRMMesh **mesh) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 817accf..42112bf 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -44,6 +44,27 @@ struct d3drm_texture D3DRMIMAGE *image; }; +struct d3drm_frame +{ + IDirect3DRMFrame IDirect3DRMFrame_iface; + IDirect3DRMFrame2 IDirect3DRMFrame2_iface; + IDirect3DRMFrame3 IDirect3DRMFrame3_iface; + IDirect3DRM *d3drm; + LONG ref; + struct d3drm_frame *parent; + ULONG nb_children; + ULONG children_capacity; + IDirect3DRMFrame3 **children; + ULONG nb_visuals; + ULONG visuals_capacity; + IDirect3DRMVisual **visuals; + ULONG nb_lights; + ULONG lights_capacity; + IDirect3DRMLight **lights; + D3DRMMATRIX4D transform; + D3DCOLOR scenebackground; +}; + void d3drm_object_init(struct d3drm_object *object) DECLSPEC_HIDDEN; HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; @@ -51,11 +72,11 @@ void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object) HRESULT d3drm_device_create(struct d3drm_device **out) DECLSPEC_HIDDEN; HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; +HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; IDirect3DRMDevice *IDirect3DRMDevice_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice2 *IDirect3DRMDevice2_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice3 *IDirect3DRMDevice3_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; HRESULT Direct3DRMFace_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HIDDEN; -HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 395b9ac..e58dd05 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -38,26 +38,6 @@ static D3DRMMATRIX4D identity = { { 0.0f, 0.0f, 0.0f, 1.0f } }; -struct d3drm_frame -{ - IDirect3DRMFrame IDirect3DRMFrame_iface; - IDirect3DRMFrame2 IDirect3DRMFrame2_iface; - IDirect3DRMFrame3 IDirect3DRMFrame3_iface; - LONG ref; - struct d3drm_frame *parent; - ULONG nb_children; - ULONG children_capacity; - IDirect3DRMFrame3** children; - ULONG nb_visuals; - ULONG visuals_capacity; - IDirect3DRMVisual** visuals; - ULONG nb_lights; - ULONG lights_capacity; - IDirect3DRMLight** lights; - D3DRMMATRIX4D transform; - D3DCOLOR scenebackground; -}; - struct d3drm_frame_array { IDirect3DRMFrameArray IDirect3DRMFrameArray_iface; @@ -2926,12 +2906,12 @@ static inline struct d3drm_frame *unsafe_impl_from_IDirect3DRMFrame(IDirect3DRMF return impl_from_IDirect3DRMFrame(iface); } -HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown *parent, IUnknown **out) +HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, IDirect3DRM *d3drm) { struct d3drm_frame *object; - HRESULT hr; + HRESULT hr = D3DRM_OK; - TRACE("riid %s, parent %p, out %p.\n", debugstr_guid(riid), parent, out); + TRACE("frame %p, parent_frame %p, d3drm %p.\n", frame, parent_frame, d3drm); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; @@ -2939,26 +2919,26 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown *parent, IUnknown **out) object->IDirect3DRMFrame_iface.lpVtbl = &d3drm_frame1_vtbl; object->IDirect3DRMFrame2_iface.lpVtbl = &d3drm_frame2_vtbl; object->IDirect3DRMFrame3_iface.lpVtbl = &d3drm_frame3_vtbl; + object->d3drm = d3drm; object->ref = 1; object->scenebackground = RGBA_MAKE(0, 0, 0, 0xff); memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); - if (parent) + if (parent_frame) { IDirect3DRMFrame3 *p; - hr = IDirect3DRMFrame_QueryInterface(parent, &IID_IDirect3DRMFrame3, (void**)&p); - if (hr != S_OK) + if (FAILED(hr = IDirect3DRMFrame_QueryInterface(parent_frame, &IID_IDirect3DRMFrame3, (void **)&p))) { HeapFree(GetProcessHeap(), 0, object); return hr; } - IDirect3DRMFrame_Release(parent); + IDirect3DRMFrame_Release(parent_frame); IDirect3DRMFrame3_AddChild(p, &object->IDirect3DRMFrame3_iface); } - hr = IDirect3DRMFrame3_QueryInterface(&object->IDirect3DRMFrame3_iface, riid, (void **)out); - IDirect3DRMFrame3_Release(&object->IDirect3DRMFrame3_iface); + *frame = object; + return hr; }

1 0

Jacek Caban : mshtml: Pass correct name length to set_http_header in nsUploadChannel_SetUploadStream.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: d69ae891d53240886afb822bb0fb469aa13792a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69ae891d53240886afb822bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 17 17:13:13 2016 +0200 mshtml: Pass correct name length to set_http_header in nsUploadChannel_SetUploadStream. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 711cca0..cc59d0c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1687,7 +1687,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, const char *content_type; static const WCHAR content_typeW[] = - {'C','o','n','t','e','n','t','-','T','y','p','e',0}; + {'C','o','n','t','e','n','t','-','T','y','p','e'}; TRACE("(%p)->(%p %s %s)\n", This, aStream, debugstr_nsacstr(aContentType), wine_dbgstr_longlong(aContentLength));

1 0

Andrey Gusev : d3dx11: Add D3DX11GetImageInfoFromMemory stub.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 754c68182623657b4862d7700afbf781b4555c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=754c68182623657b4862d7700… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 16 16:32:53 2016 +0300 d3dx11: Add D3DX11GetImageInfoFromMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/d3dx11_43.c | 16 ++++++++++++++++ dlls/d3dx11_43/d3dx11_43.spec | 2 +- include/d3dx11tex.h | 3 +++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index a2a32ff..632e201 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -29,7 +29,7 @@ @ stub D3DX11FilterTexture @ stub D3DX11GetImageInfoFromFileA @ stub D3DX11GetImageInfoFromFileW -@ stub D3DX11GetImageInfoFromMemory +@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) d3dx11_43.D3DX11GetImageInfoFromMemory @ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceW @ stub D3DX11LoadTextureFromTexture diff --git a/dlls/d3dx11_43/d3dx11_43.c b/dlls/d3dx11_43/d3dx11_43.c index 149d953..201f3fb 100644 --- a/dlls/d3dx11_43/d3dx11_43.c +++ b/dlls/d3dx11_43/d3dx11_43.c @@ -26,7 +26,14 @@ #include "winbase.h" #include "winuser.h" #include "objbase.h" + #include "d3dx11.h" +#include "d3dx11core.h" +#include "d3dx11tex.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { @@ -53,3 +60,12 @@ BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) return FALSE; } + +HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, + D3DX11_IMAGE_INFO *img_info, HRESULT *hresult) +{ + FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p stub!\n", + src_data, src_data_size, pump, img_info, hresult); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index a2a32ff..cb76d5f 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -29,7 +29,7 @@ @ stub D3DX11FilterTexture @ stub D3DX11GetImageInfoFromFileA @ stub D3DX11GetImageInfoFromFileW -@ stub D3DX11GetImageInfoFromMemory +@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceW @ stub D3DX11LoadTextureFromTexture diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index 54c77b7..0217777 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -89,6 +89,9 @@ extern "C" { HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); +HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, + D3DX11_IMAGE_INFO *img_info, HRESULT *hresult); + #ifdef __cplusplus } #endif

1 0

Alistair Leslie-Hughes : d3dcompiler_33: Share source with d3dcompiler_43.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: fc4cff834e0356518ae409f17bc48273a2550ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4cff834e0356518ae409f17… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:03:45 2016 +0000 d3dcompiler_33: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_33/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_33/d3dcompiler_33.spec | 18 ++++++------- dlls/d3dcompiler_33/d3dcompiler_33_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in index 7e91201..e769f14 100644 --- a/dlls/d3dcompiler_33/Makefile.in +++ b/dlls/d3dcompiler_33/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_33.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=33 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_33_main.c + asmparser.c \ + blob.c \ + bytecodewriter.c \ + compiler.c \ + main.c \ + reflection.c \ + utils.c + +LEX_SRCS = \ + asmshader.l \ + hlsl.l + +BISON_SRCS = \ + asmshader.y \ + hlsl.y RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_33/d3dcompiler_33.spec b/dlls/d3dcompiler_33/d3dcompiler_33.spec index 5e20e1a..907ca73 100644 --- a/dlls/d3dcompiler_33/d3dcompiler_33.spec +++ b/dlls/d3dcompiler_33/d3dcompiler_33.spec @@ -1,10 +1,10 @@ -@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DGetCodeDebugInfo(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 D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) D3DDisassemble +@ stub D3DDisassembleEffect(ptr long ptr) +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) D3DReflect @ stub DebugSetMute diff --git a/dlls/d3dcompiler_33/d3dcompiler_33_main.c b/dlls/d3dcompiler_33/d3dcompiler_33_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_33/d3dcompiler_33_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index 9b48b16..db9e277 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_33", ], [ "xinput1_3",

1 0

Alistair Leslie-Hughes : d3dcompiler_34: Share source with d3dcompiler_43.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 5980690b7060d094cc5296361675f679a49a7db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5980690b7060d094cc5296361… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:03:33 2016 +0000 d3dcompiler_34: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_34/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_34/d3dcompiler_34.spec | 18 ++++++------- dlls/d3dcompiler_34/d3dcompiler_34_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index f520488..c717fe5 100644 --- a/dlls/d3dcompiler_34/Makefile.in +++ b/dlls/d3dcompiler_34/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_34.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=34 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_34_main.c + asmparser.c \ + blob.c \ + bytecodewriter.c \ + compiler.c \ + main.c \ + reflection.c \ + utils.c + +LEX_SRCS = \ + asmshader.l \ + hlsl.l + +BISON_SRCS = \ + asmshader.y \ + hlsl.y RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_34/d3dcompiler_34.spec b/dlls/d3dcompiler_34/d3dcompiler_34.spec index 5e20e1a..907ca73 100644 --- a/dlls/d3dcompiler_34/d3dcompiler_34.spec +++ b/dlls/d3dcompiler_34/d3dcompiler_34.spec @@ -1,10 +1,10 @@ -@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DGetCodeDebugInfo(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 D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) D3DDisassemble +@ stub D3DDisassembleEffect(ptr long ptr) +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) D3DReflect @ stub DebugSetMute diff --git a/dlls/d3dcompiler_34/d3dcompiler_34_main.c b/dlls/d3dcompiler_34/d3dcompiler_34_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_34/d3dcompiler_34_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index a2d6696..9b48b16 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_34", "d3dcompiler_33", ], [

1 0

Alistair Leslie-Hughes : d3dcompiler_35: Share source with d3dcompiler_43.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 6fe46a605fe9c8f9c033b83a8e3b0bb6358b964c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe46a605fe9c8f9c033b83a8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:03:21 2016 +0000 d3dcompiler_35: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_35/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_35/d3dcompiler_35.spec | 18 ++++++------- dlls/d3dcompiler_35/d3dcompiler_35_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index c122486..8db0e52 100644 --- a/dlls/d3dcompiler_35/Makefile.in +++ b/dlls/d3dcompiler_35/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_35.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=35 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_35_main.c + asmparser.c \ + blob.c \ + bytecodewriter.c \ + compiler.c \ + main.c \ + reflection.c \ + utils.c + +LEX_SRCS = \ + asmshader.l \ + hlsl.l + +BISON_SRCS = \ + asmshader.y \ + hlsl.y RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_35/d3dcompiler_35.spec b/dlls/d3dcompiler_35/d3dcompiler_35.spec index 5e20e1a..907ca73 100644 --- a/dlls/d3dcompiler_35/d3dcompiler_35.spec +++ b/dlls/d3dcompiler_35/d3dcompiler_35.spec @@ -1,10 +1,10 @@ -@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DGetCodeDebugInfo(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 D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) D3DDisassemble +@ stub D3DDisassembleEffect(ptr long ptr) +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) D3DReflect @ stub DebugSetMute diff --git a/dlls/d3dcompiler_35/d3dcompiler_35_main.c b/dlls/d3dcompiler_35/d3dcompiler_35_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_35/d3dcompiler_35_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index f630664..a2d6696 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_35", "d3dcompiler_34", "d3dcompiler_33", ],

1 0

Alistair Leslie-Hughes : d3dcompiler_36: Share source with d3dcompiler_43.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 008644bef8083a63ed707996e289bc986d004d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=008644bef8083a63ed707996e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:03:10 2016 +0000 d3dcompiler_36: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_36/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_36/d3dcompiler_36.spec | 18 ++++++------- dlls/d3dcompiler_36/d3dcompiler_36_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index 89aec41..41ec544 100644 --- a/dlls/d3dcompiler_36/Makefile.in +++ b/dlls/d3dcompiler_36/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_36.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=36 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_36_main.c + asmparser.c \ + blob.c \ + bytecodewriter.c \ + compiler.c \ + main.c \ + reflection.c \ + utils.c + +LEX_SRCS = \ + asmshader.l \ + hlsl.l + +BISON_SRCS = \ + asmshader.y \ + hlsl.y RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_36/d3dcompiler_36.spec b/dlls/d3dcompiler_36/d3dcompiler_36.spec index 5e20e1a..907ca73 100644 --- a/dlls/d3dcompiler_36/d3dcompiler_36.spec +++ b/dlls/d3dcompiler_36/d3dcompiler_36.spec @@ -1,10 +1,10 @@ -@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DGetCodeDebugInfo(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 D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) D3DDisassemble +@ stub D3DDisassembleEffect(ptr long ptr) +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) D3DReflect @ stub DebugSetMute diff --git a/dlls/d3dcompiler_36/d3dcompiler_36_main.c b/dlls/d3dcompiler_36/d3dcompiler_36_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_36/d3dcompiler_36_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index 6c8ff20..f630664 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_36", "d3dcompiler_35", "d3dcompiler_34", "d3dcompiler_33",

1 0