wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Vincent Povirk : windowscodecs: Implement IWICStream:: InitializeFromIStreamRegion.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: 1ed39c29e21afac1aa34c1b3d5d0d43d195ba3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed39c29e21afac1aa34c1b3d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 27 18:24:29 2010 -0500 windowscodecs: Implement IWICStream::InitializeFromIStreamRegion. --- dlls/windowscodecs/stream.c | 322 ++++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/stream.c | 2 +- 2 files changed, 321 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ed39c29e21afac1aa34c…

1 0

Vincent Povirk : windowscodecs: Add test for IWICStream:: InitializeFromIStreamRegion.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: 0b532eb83448e959435e4ae83d6d37a79f12ac34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b532eb83448e959435e4ae83… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 27 17:25:40 2010 -0500 windowscodecs: Add test for IWICStream::InitializeFromIStreamRegion. --- dlls/windowscodecs/tests/stream.c | 329 +++++++++++++++++++++++++++++++++++++ include/wincodec.idl | 1 + 2 files changed, 330 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b532eb83448e959435e4…

1 0

André Hentschel : kernel32: Better describe an error.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: 0029e64e4ee7af9e01cbb860fc7f31a10ce7e7c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0029e64e4ee7af9e01cbb860f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 27 21:47:53 2010 +0200 kernel32: Better describe an error. --- dlls/kernel32/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 65dc2eb..ef65a86 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1659,7 +1659,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW if (!is_win64 && !is_wow64 && (binary_info->flags & BINARY_FLAG_64BIT)) { - ERR( "starting 64-bit process %s not supported on this environment\n", debugstr_w(filename) ); + ERR( "starting 64-bit process %s not supported in 32-bit wineprefix\n", debugstr_w(filename) ); SetLastError( ERROR_BAD_EXE_FORMAT ); return FALSE; }

1 0

Frédéric Delanoy : start: Fix French translation.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: 3e3e59b10e1d763567820eb3b4d45422a88555b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3e59b10e1d763567820eb3b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 27 21:36:50 2010 +0200 start: Fix French translation. --- programs/start/Fr.rc | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/programs/start/Fr.rc b/programs/start/Fr.rc index 192313f..5cb95bf 100644 --- a/programs/start/Fr.rc +++ b/programs/start/Fr.rc @@ -5,6 +5,7 @@ * Copyright 2003 Dan Kegel * Copyright 2003 Vincent Béron * Copyright 2008 Jonathan Ernst + * Copyright 2010 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,30 +30,30 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { -STRING_USAGE, "Lance un programme, ou ouvre un document dans le programme normalement utilisé avec cette extension.\n\ +STRING_USAGE, "Lance un programme, ou ouvre un document dans le programme normalement associé à cette extension.\n\ Usage :\n\ start [options] fichier_programme [...]\n\ start [options] fichier_document\n\ \n\ Options :\n\ -/M[inimized] Lance le programme minimisé.\n\ -/MAX[imized] Lance le programme maximisé.\n\ -/R[estored] Lance le programme normalement (ni minimisé ni maximisé).\n\ -/W[ait] Attend que le programme lancé se termine, et termine ensuite avec son code de sortie.\n\ -/ProgIDOpen Open a document using the following progID.\n\ -/L Montre la licence d'utilisation.\n\ +/M[inimized] Lance le programme minimisé.\n\ +/MAX[imized] Lance le programme maximisé.\n\ +/R[estored] Lance le programme normalement (ni minimisé ni maximisé).\n\ +/W[ait] Attend que le programme lancé se termine, et renvoie ensuite son code de sortie.\n\ +/ProgIDOpen progID Ouvre un document en utilisant le programme identifié par progID.\n\ +/L Affiche la licence d'utilisation.\n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ Start est fourni sans AUCUNE GARANTIE ; pour les détails lancez avec l'option /L.\n\ Ceci est un logiciel libre, et vous êtes invité à le redistribuer\n\ -sous certaines condition; lancez 'start /L' pour les détails.\n\ +sous certaines conditions ; lancez 'start /L' pour les détails.\n\ " STRING_LICENSE, "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou\n\ le modifier suivant les termes de la Licence Générale Publique Limitée GNU\n\ telle que publiée par la Free Software Foundation ; soit la version 2.1\n\ -de la License, soit (à votre gré) toute version ultérieure.\n\ +de la Licence, soit (à votre gré) toute version ultérieure.\n\ \n\ Ce programme est distribué dans l’espoir qu'il sera utile, mais\n\ SANS AUCUNE GARANTIE : sans même la garantie implicite de\n\ @@ -67,7 +68,7 @@ MA 02110-1301, USA.\n\ Référez-vous au fichier COPYING.LIB pour plus d’informations sur la licence.\n\ " -STRING_EXECFAIL "Le programme n'a pas pu être lancé, ou il n'y a pas de programme associé avec le fichier spécifié.\nShellExecuteEx a échoué" +STRING_EXECFAIL "Le programme n'a pas pu être lancé, ou aucun programme n'est associé au fichier spécifié.\nShellExecuteEx a échoué" STRING_UNIXFAIL, "Le nom de fichier Unix spécifié n'a pas pu être converti en nom de fichier DOS." }

1 0

Dan Kegel : kernel32: Add error text for WSAECONNREFUSED.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: a5bdb7dbc1e06717553d50aa6d2a53eb6544180a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5bdb7dbc1e06717553d50aa6… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Aug 27 15:27:32 2010 +0000 kernel32: Add error text for WSAECONNREFUSED. --- dlls/kernel32/nls/winerr_dan.mc | 5 +++++ dlls/kernel32/nls/winerr_deu.mc | 5 +++++ dlls/kernel32/nls/winerr_enu.mc | 5 +++++ dlls/kernel32/nls/winerr_fra.mc | 5 +++++ dlls/kernel32/nls/winerr_ita.mc | 5 +++++ dlls/kernel32/nls/winerr_jpn.mc | 5 +++++ dlls/kernel32/nls/winerr_kor.mc | 5 +++++ dlls/kernel32/nls/winerr_lth.mc | 5 +++++ dlls/kernel32/nls/winerr_nld.mc | 5 +++++ dlls/kernel32/nls/winerr_nor.mc | 5 +++++ dlls/kernel32/nls/winerr_plk.mc | 5 +++++ dlls/kernel32/nls/winerr_ptb.mc | 5 +++++ dlls/kernel32/nls/winerr_ptg.mc | 5 +++++ dlls/kernel32/nls/winerr_rus.mc | 5 +++++ dlls/kernel32/nls/winerr_ukr.mc | 5 +++++ 15 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/nls/winerr_dan.mc b/dlls/kernel32/nls/winerr_dan.mc index b847952..c3033e3 100644 --- a/dlls/kernel32/nls/winerr_dan.mc +++ b/dlls/kernel32/nls/winerr_dan.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=DAN Brugernavnet blev ikke fundet . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=DAN +Forbindelse nægtet +. diff --git a/dlls/kernel32/nls/winerr_deu.mc b/dlls/kernel32/nls/winerr_deu.mc index 478f29b..71b2641 100644 --- a/dlls/kernel32/nls/winerr_deu.mc +++ b/dlls/kernel32/nls/winerr_deu.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=DEU Der Benutzername konnte nicht gefunden werden . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=DEU +Verbindung abgelehnt +. diff --git a/dlls/kernel32/nls/winerr_enu.mc b/dlls/kernel32/nls/winerr_enu.mc index 0c3aee4..ed36103 100644 --- a/dlls/kernel32/nls/winerr_enu.mc +++ b/dlls/kernel32/nls/winerr_enu.mc @@ -3733,3 +3733,8 @@ SymbolicName=NERR_UserNotFound Language=ENU The username could not be found . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=ENU +Connection refused +. diff --git a/dlls/kernel32/nls/winerr_fra.mc b/dlls/kernel32/nls/winerr_fra.mc index 7b3e6b6..7f96f34 100644 --- a/dlls/kernel32/nls/winerr_fra.mc +++ b/dlls/kernel32/nls/winerr_fra.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=FRA Nom d'utilisateur introuvable . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=FRA +Connexion refusée +. diff --git a/dlls/kernel32/nls/winerr_ita.mc b/dlls/kernel32/nls/winerr_ita.mc index 2ca8f36..0146857 100644 --- a/dlls/kernel32/nls/winerr_ita.mc +++ b/dlls/kernel32/nls/winerr_ita.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=ITA Impossibile trovare il nome utente . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=ITA +Connessione rifiutata +. diff --git a/dlls/kernel32/nls/winerr_jpn.mc b/dlls/kernel32/nls/winerr_jpn.mc index 64fa3b9..a419baa 100644 --- a/dlls/kernel32/nls/winerr_jpn.mc +++ b/dlls/kernel32/nls/winerr_jpn.mc @@ -3737,3 +3737,8 @@ SymbolicName=NERR_UserNotFound Language=JPN ユーザ名は見つけられません。 . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=JPN +接続は拒否されました。 +. diff --git a/dlls/kernel32/nls/winerr_kor.mc b/dlls/kernel32/nls/winerr_kor.mc index 289b17e..e7db432 100644 --- a/dlls/kernel32/nls/winerr_kor.mc +++ b/dlls/kernel32/nls/winerr_kor.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=KOR �� ̸�� ã�� ϴ� . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=KOR +Connection refused +. diff --git a/dlls/kernel32/nls/winerr_lth.mc b/dlls/kernel32/nls/winerr_lth.mc index 7278025..8f611fe 100644 --- a/dlls/kernel32/nls/winerr_lth.mc +++ b/dlls/kernel32/nls/winerr_lth.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=LTH Naudotojo vardas nerastas . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=LTH +Sujungimas nepriimtas +. diff --git a/dlls/kernel32/nls/winerr_nld.mc b/dlls/kernel32/nls/winerr_nld.mc index 6acf839..51b1401 100644 --- a/dlls/kernel32/nls/winerr_nld.mc +++ b/dlls/kernel32/nls/winerr_nld.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=NLD Gebruikersnaam niet gevonden . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=NLD +Verbinding geweigerd +. diff --git a/dlls/kernel32/nls/winerr_nor.mc b/dlls/kernel32/nls/winerr_nor.mc index d8828e1..6efdfb3 100644 --- a/dlls/kernel32/nls/winerr_nor.mc +++ b/dlls/kernel32/nls/winerr_nor.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=NOR Brukernavnet finnes ikke . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=NOR +Tilkobling nektet +. diff --git a/dlls/kernel32/nls/winerr_plk.mc b/dlls/kernel32/nls/winerr_plk.mc index 6fd397c..6395016 100644 --- a/dlls/kernel32/nls/winerr_plk.mc +++ b/dlls/kernel32/nls/winerr_plk.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=PLK Nie znaleziono nazwy u�ytkownika . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=PLK +Po��czenie odm�wi�o +. diff --git a/dlls/kernel32/nls/winerr_ptb.mc b/dlls/kernel32/nls/winerr_ptb.mc index 883655d..d3007e6 100644 --- a/dlls/kernel32/nls/winerr_ptb.mc +++ b/dlls/kernel32/nls/winerr_ptb.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=PTB O nome de usuário não foi encontrado . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=PTB +Conexão recusada +. diff --git a/dlls/kernel32/nls/winerr_ptg.mc b/dlls/kernel32/nls/winerr_ptg.mc index 26f2fc4..f593f6e 100644 --- a/dlls/kernel32/nls/winerr_ptg.mc +++ b/dlls/kernel32/nls/winerr_ptg.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=PTG O nome de utilizador não foi encontrado . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=PTG +Ligação recusada +. diff --git a/dlls/kernel32/nls/winerr_rus.mc b/dlls/kernel32/nls/winerr_rus.mc index b3142b4..07a81b0 100644 --- a/dlls/kernel32/nls/winerr_rus.mc +++ b/dlls/kernel32/nls/winerr_rus.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=RUS Имя пользователя не найдено . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=RUS +Соединение отвергнуто +. diff --git a/dlls/kernel32/nls/winerr_ukr.mc b/dlls/kernel32/nls/winerr_ukr.mc index 8a607b3..571dc17 100644 --- a/dlls/kernel32/nls/winerr_ukr.mc +++ b/dlls/kernel32/nls/winerr_ukr.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=UKR Ім'я користувача не знайдено . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=UKR +У з'єднанні відмовлено +.

1 0

Matteo Bruni : d3d10: Implement D3D10CompileShader, forward to d3dcompiler.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: da783ee57da68adc4285faf7b9efeb0bc872866f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da783ee57da68adc4285faf7b… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu Aug 26 17:17:38 2010 +0200 d3d10: Implement D3D10CompileShader, forward to d3dcompiler. --- dlls/d3d10/Makefile.in | 2 +- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/shader.c | 9 +++++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index 79b2bbc..f48a1eb 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3d10.dll IMPORTLIB = d3d10 -IMPORTS = dxguid uuid d3d10core dxgi +IMPORTS = dxguid uuid d3d10core d3dcompiler dxgi C_SRCS = \ d3d10_main.c \ diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index e108a5c..1d62aea 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -1,5 +1,5 @@ @ stub D3D10CompileEffectFromMemory -@ stub D3D10CompileShader +@ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr) @ stdcall D3D10CreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob @ stdcall D3D10CreateDevice(ptr long ptr long long ptr) @ stdcall D3D10CreateDeviceAndSwapChain(ptr long ptr long long ptr ptr ptr) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 77a3529..20871ae 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -28,6 +28,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dcompiler.h" /* * This doesn't belong here, but for some functions it is possible to return that value, diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index d5d9e16..29d7897 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -133,3 +133,12 @@ const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl = d3d10_shader_reflection_GetInputParameterDesc, d3d10_shader_reflection_GetOutputParameterDesc, }; + +HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entrypoint, + const char *profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages) +{ + /* Forward to d3dcompiler */ + return D3DCompile(data, data_size, filename, defines, include, + entrypoint, profile, flags, 0, shader, error_messages); +}

1 0

Matteo Bruni : include: Update some d3d10shader.h definitions.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: e574c89f88ab8ca2f013b677c1ffb1208e5c54b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e574c89f88ab8ca2f013b677c… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu Aug 26 17:15:44 2010 +0200 include: Update some d3d10shader.h definitions. --- include/d3d10shader.h | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 592dd18..f06df30 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -127,11 +127,14 @@ typedef enum D3D10_REGISTER_COMPONENT_TYPE D3D10_REGISTER_COMPONENT_FLOAT32 = 3, } D3D10_REGISTER_COMPONENT_TYPE; -typedef struct _D3D10_SHADER_MACRO -{ - LPCSTR Name; - LPCSTR Definition; -} D3D10_SHADER_MACRO, *LPD3D10_SHADER_MACRO; +/* These are defined as version-neutral in d3dcommon.h */ +typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO; +typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO; + +typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE; +typedef ID3DInclude ID3D10Include; +typedef ID3DInclude *LPD3D10INCLUDE; +#define IID_ID3D10Include IID_ID3DInclude typedef enum D3D10_RESOURCE_RETURN_TYPE { @@ -279,6 +282,9 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown) }; #undef INTERFACE +HRESULT WINAPI D3D10CompileShader(LPCSTR data, SIZE_T data_size, LPCSTR filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, LPCSTR entrypoint, + LPCSTR profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages); LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);

1 0

Matteo Bruni : d3dx9: Forward D3DXCompileShader to d3dcompiler.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: 3a6050b6aba351fdf0805a901417cdef892a5c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a6050b6aba351fdf0805a901… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Aug 25 18:43:42 2010 +0200 d3dx9: Forward D3DXCompileShader to d3dcompiler. --- dlls/d3dx9_36/shader.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 9c6700a..35665d6 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -25,6 +25,7 @@ #include "wingdi.h" #include "objbase.h" #include "d3dcommon.h" +#include "d3dcompiler.h" #include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -371,16 +372,15 @@ HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData, LPD3DXBUFFER* ppErrorMsgs, LPD3DXCONSTANTTABLE * ppConstantTable) { - FIXME("(%p, %d, %p, %p, %s, %s, %x, %p, %p, %p): stub\n", - pSrcData, srcDataLen, pDefines, pInclude, debugstr_a(pFunctionName), - debugstr_a(pProfile), Flags, ppShader, ppErrorMsgs, ppConstantTable); + HRESULT hr = D3DCompile(pSrcData, srcDataLen, NULL, + (D3D_SHADER_MACRO *)pDefines, (ID3DInclude *)pInclude, + pFunctionName, pProfile, Flags, 0, + (ID3DBlob **)ppShader, (ID3DBlob **)ppErrorMsgs); - TRACE("Shader source:\n"); - TRACE("%s\n", debugstr_an(pSrcData, srcDataLen)); - - if (ppErrorMsgs) - D3DXCreateBuffer(1, ppErrorMsgs); /* zero fill used as string end */ - return D3DERR_INVALIDCALL; + if(SUCCEEDED(hr) && ppConstantTable) + return D3DXGetShaderConstantTable(ID3DXBuffer_GetBufferPointer(*ppShader), + ppConstantTable); + return hr; } static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl;

1 0

Matteo Bruni : d3dcompiler: Stub D3DCompile implementation.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: 390b48035682db6fd6b1fe3b7432747bef52a283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=390b48035682db6fd6b1fe3b7… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Aug 21 03:00:47 2010 +0200 d3dcompiler: Stub D3DCompile implementation. --- dlls/d3dcompiler_43/compiler.c | 17 +++++++++++++++++ dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- include/d3dcompiler.h | 4 ++++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 1c5c32b..43a5a3a 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -491,3 +491,20 @@ cleanup: LeaveCriticalSection(&wpp_mutex); return hr; } + +HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) +{ + FIXME("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" + "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p stub!\n", + data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), + debugstr_a(target), sflags, eflags, shader, error_messages); + + TRACE("Shader source:\n%s\n", debugstr_an(data, data_size)); + + if (error_messages) + D3DCreateBlob(1, error_messages); /* zero fill used as string end */ + + return D3DERR_INVALIDCALL; +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index e86acef..ef57d52 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -1,6 +1,6 @@ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stub DebugSetMute -@ stub D3DCompile +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr) @ stub D3DDecompressShaders diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 1939124..9929cba 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -41,6 +41,10 @@ #define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x8000 #define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x40000 +HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); + HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob); #endif

1 0

Alexandre Julliard : msvcrt: Add -ret64 flag on some functions that return a 64-bit value.
by Alexandre Julliard 30 Aug '10

30 Aug '10

Module: wine Branch: master Commit: dfdea6c4a59af94cfbf17367c703812a33c74b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfdea6c4a59af94cfbf17367c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 29 12:07:37 2010 +0200 msvcrt: Add -ret64 flag on some functions that return a 64-bit value. --- dlls/msvcr100/msvcr100.spec | 18 +++++++++--------- dlls/msvcr70/msvcr70.spec | 10 +++++----- dlls/msvcr71/msvcr71.spec | 10 +++++----- dlls/msvcr80/msvcr80.spec | 18 +++++++++--------- dlls/msvcr90/msvcr90.spec | 18 +++++++++--------- dlls/msvcrt/msvcrt.spec | 20 ++++++++++---------- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- 8 files changed, 49 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfdea6c4a59af94cfbf17…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
89
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 August 2010