wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Marcus Meissner : cmd: Avoid potential buffer overflow (Coverity).
by Alexandre Julliard 20 Jun '16

20 Jun '16

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

Michael Stefaniuc : gdi32/tests: Compare RECTs with EqualRect instead of memcmp.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: 27f80dab77ce5f80b53029b9bafe18fe4ce3ff90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f80dab77ce5f80b53029b9b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 17 17:23:25 2016 +0200 gdi32/tests: Compare RECTs with EqualRect instead of memcmp. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dib.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 693df4a..a5ec539 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1275,10 +1275,8 @@ static void compare_bounds( HDC hdc, const char *info ) return; } - ok( !memcmp( current_bounds, &rect, sizeof(RECT) ), - "%s: %s: expected bounds %d,%d,%d,%d got %d,%d,%d,%d\n", dst_format, info, - current_bounds->left, current_bounds->top, current_bounds->right, current_bounds->bottom, - rect.left, rect.top, rect.right, rect.bottom ); + ok( EqualRect( current_bounds, &rect ), "%s: %s: expected bounds %s got %s\n", dst_format, info, + wine_dbgstr_rect( current_bounds ), wine_dbgstr_rect( &rect )); current_bounds++; }

1 0

Bruno Jesus : ws2_32: Ensure default route IP addresses are returned first in gethostbyname.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: 134bf22b8c7b291717f9717f0515dc485f489aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=134bf22b8c7b291717f9717f0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 19 15:59:59 2016 -0300 ws2_32: Ensure default route IP addresses are returned first in gethostbyname. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 23 +++++++++++++++++------ dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a2e6912..b0af3d7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -596,7 +596,7 @@ struct per_thread_data struct route { struct in_addr addr; IF_INDEX interface; - DWORD metric; + DWORD metric, default_route; }; static INT num_startup; /* reference counter */ @@ -6044,7 +6044,14 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) */ static int WS_compare_routes_by_metric_asc(const void *left, const void *right) { - return ((const struct route*)left)->metric - ((const struct route*)right)->metric; + const struct route *a = left, *b = right; + if (a->default_route && b->default_route) + return a->default_route - b->default_route; + if (a->default_route && !b->default_route) + return -1; + if (b->default_route && !a->default_route) + return 1; + return a->metric - b->metric; } /*********************************************************************** @@ -6061,7 +6068,7 @@ static int WS_compare_routes_by_metric_asc(const void *left, const void *right) */ static struct WS_hostent* WS_get_local_ips( char *hostname ) { - int numroutes = 0, i, j; + int numroutes = 0, i, j, default_routes = 0; DWORD n; PIP_ADAPTER_INFO adapters = NULL, k; struct WS_hostent *hostlist = NULL; @@ -6088,10 +6095,13 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) for (n = 0; n < routes->dwNumEntries; n++) { IF_INDEX ifindex; - DWORD ifmetric; + DWORD ifmetric, ifdefault = 0; BOOL exists = FALSE; - if (routes->table[n].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) + /* Check if this is a default route (there may be more than one) */ + if (!routes->table[n].dwForwardDest) + ifdefault = ++default_routes; + else if (routes->table[n].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) continue; ifindex = routes->table[n].dwForwardIfIndex; ifmetric = routes->table[n].dwForwardMetric1; @@ -6112,13 +6122,14 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) goto cleanup; /* Memory allocation error, fail gracefully */ route_addrs[numroutes].interface = ifindex; route_addrs[numroutes].metric = ifmetric; + route_addrs[numroutes].default_route = ifdefault; /* If no IP is found in the next step (for whatever reason) * then fall back to the magic loopback address. */ memcpy(&(route_addrs[numroutes].addr.s_addr), magic_loopback_addr, 4); numroutes++; } - if (numroutes == 0) + if (numroutes == 0) goto cleanup; /* No routes, fall back to the Magic IP */ /* Find the IP address associated with each found interface */ for (i = 0; i < numroutes; i++) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9e0c2f9..6853279 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4556,7 +4556,6 @@ static void test_gethostbyname(void) } } } -todo_wine ok (found_default, "failed to find the first IP from gethostbyname!\n"); cleanup:

1 0

Akihiro Sagawa : kernel32: Fix typo of i386 macro name in GetLargePageMinimum().
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: 7a9b36ca1130a515fb79aae3635ce6178ab47f46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9b36ca1130a515fb79aae36… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jun 19 22:08:11 2016 +0900 kernel32: Fix typo of i386 macro name in GetLargePageMinimum(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 72a9d13..756d8f9 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -297,7 +297,7 @@ err: */ SIZE_T WINAPI GetLargePageMinimum(void) { -#if defined(__i386___) || defined(__x86_64__) || defined(__arm__) +#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) return 2 * 1024 * 1024; #endif FIXME("Not implemented on your platform/architecture.\n");

1 0

Andrey Gusev : d3dx11: Add D3DX11GetImageInfoFromMemory stub.
by Alexandre Julliard 17 Jun '16

17 Jun '16

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

Jacek Caban : mshtml: Pass correct name length to set_http_header in nsUploadChannel_SetUploadStream.
by Alexandre Julliard 17 Jun '16

17 Jun '16

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

Alistair Leslie-Hughes : d3dx9_36: Move functions D3DXDebugMute, D3DXGetDriverLevel to utils.c.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 42fcc1f9f81fc4af619d1094b2a5ecf0a7b175bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=42fcc1f9f81fc4af619d1094b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:10:53 2016 +0000 d3dx9_36: Move functions D3DXDebugMute, D3DXGetDriverLevel to utils.c. 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/d3dx9_36/d3dx9_36_main.c | 18 ------------------ dlls/d3dx9_36/util.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_main.c b/dlls/d3dx9_36/d3dx9_36_main.c index 04c1877..599b76a 100644 --- a/dlls/d3dx9_36/d3dx9_36_main.c +++ b/dlls/d3dx9_36/d3dx9_36_main.c @@ -53,21 +53,3 @@ BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) else return FALSE; } - -/*********************************************************************** - * D3DXDebugMute - * Returns always FALSE for us. - */ -BOOL WINAPI D3DXDebugMute(BOOL mute) -{ - return FALSE; -} - -/*********************************************************************** - * D3DXGetDriverLevel. - * Returns always 900 (DX 9) for us - */ -UINT WINAPI D3DXGetDriverLevel(struct IDirect3DDevice9 *device) -{ - return 900; -} diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index d8cd43a..8f9b0b3 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -378,3 +378,22 @@ void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D break; } } + + +/*********************************************************************** + * D3DXDebugMute + * Returns always FALSE for us. + */ +BOOL WINAPI D3DXDebugMute(BOOL mute) +{ + return FALSE; +} + +/*********************************************************************** + * D3DXGetDriverLevel. + * Returns always 900 (DX 9) for us + */ +UINT WINAPI D3DXGetDriverLevel(struct IDirect3DDevice9 *device) +{ + return 900; +}

1 0

Alistair Leslie-Hughes : d3dcompiler: Correct spec for function D3DDisassemble10Effect.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 8ebaccdf3f122f77b15d23c09b335ed3c402543b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebaccdf3f122f77b15d23c09… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:04:08 2016 +0000 d3dcompiler: Correct spec for function D3DDisassemble10Effect. 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_46/d3dcompiler_46.spec | 2 +- dlls/d3dcompiler_47/d3dcompiler_47.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec index 7234c41..b069779 100644 --- a/dlls/d3dcompiler_46/d3dcompiler_46.spec +++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec @@ -6,7 +6,7 @@ @ stdcall D3DCreateBlob(long ptr) @ stub D3DDecompressShaders @ stdcall D3DDisassemble(ptr long long ptr ptr) -@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stub D3DDisassemble10Effect(ptr long ptr) @ stub D3DDisassemble11Trace @ stub D3DDisassembleRegion @ stdcall D3DGetBlobPart(ptr long long long ptr) diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec index 05bc793..38ae896 100644 --- a/dlls/d3dcompiler_47/d3dcompiler_47.spec +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -8,7 +8,7 @@ @ stub D3DCreateLinker @ stub D3DDecompressShaders @ stdcall D3DDisassemble(ptr long long ptr ptr) -@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stub D3DDisassemble10Effect(ptr long ptr) @ stub D3DDisassemble11Trace @ stub D3DDisassembleRegion @ stdcall D3DGetBlobPart(ptr long long long ptr)

1 0

Alistair Leslie-Hughes : tools: D3dcompiler_46/ 7 already use shared source.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 2083a870860ba40c4252d34b83f70cf59bac129b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2083a870860ba40c4252d34b8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:03:56 2016 +0000 tools: D3dcompiler_46/7 already use shared source. 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> --- tools/make_specfiles | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index db9e277..f55a42f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -108,11 +108,6 @@ my @dll_groups = "d3dx10_33", ], [ - "d3dcompiler_43", - "d3dcompiler_47", - "d3dcompiler_46", - ], - [ "xinput1_3", "xinput1_4", "xinput1_2",

1 0

Alistair Leslie-Hughes : d3dcompiler_33: Share source with d3dcompiler_43.
by Alexandre Julliard 17 Jun '16

17 Jun '16

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

← Newer
1
...
13
14
15
16
17
18
19
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2016