October 2009 - Wine-commits

Huw Davies : widl: Add support for parsing the annotation attribute.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: ab32b3df4df8adcee75e39b8bcc4e2330aa5b2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab32b3df4df8adcee75e39b8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 12:15:23 2009 +0000 widl: Add support for parsing the annotation attribute. --- tools/widl/parser.l | 1 + tools/widl/parser.y | 4 +++- tools/widl/widltypes.h | 1 + 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 55a73c7..f45b228 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -279,6 +279,7 @@ static const struct keyword attr_keywords[] = { {"aggregatable", tAGGREGATABLE}, {"allocate", tALLOCATE}, + {"annotation", tANNOTATION}, {"appobject", tAPPOBJECT}, {"async", tASYNC}, {"async_uuid", tASYNCUUID}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c2f1abc..b12741c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -194,7 +194,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %token EQUALITY INEQUALITY %token GREATEREQUAL LESSEQUAL %token LOGICALOR LOGICALAND -%token tAGGREGATABLE tALLOCATE tAPPOBJECT tASYNC tASYNCUUID +%token tAGGREGATABLE tALLOCATE tANNOTATION tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE @@ -472,6 +472,7 @@ str_list: aSTRING { $$ = append_str( NULL, $1 ); } attribute: { $$ = NULL; } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } + | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } | tASYNC { $$ = make_attr(ATTR_ASYNC); } | tAUTOHANDLE { $$ = make_attr(ATTR_AUTO_HANDLE); } @@ -1872,6 +1873,7 @@ struct allowed_attr allowed_attr[] = { /* attr { D ACF I Fn ARG T En St Un Fi L DI M C <display name> } */ /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "aggregatable" }, + /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, /* ATTR_APPOBJECT */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "appobject" }, /* ATTR_ASYNC */ { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "async" }, /* ATTR_AUTO_HANDLE */ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "auto_handle" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index c1c07ea..e80c7ed 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -72,6 +72,7 @@ typedef struct list statement_list_t; enum attr_type { ATTR_AGGREGATABLE, + ATTR_ANNOTATION, ATTR_APPOBJECT, ATTR_ASYNC, ATTR_AUTO_HANDLE,

1 0

Huw Davies : include: Remove comments around annotation attributes.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 752b617746d33ad3161d3fd716c2d74b0ba3083c URL: http://source.winehq.org/git/wine.git/?a=commit;h=752b617746d33ad3161d3fd71… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 12:16:08 2009 +0000 include: Remove comments around annotation attributes. --- include/crtrow.idl | 2 +- include/dbdsad.idl | 2 +- include/dbprop.idl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/crtrow.idl b/include/crtrow.idl index da26a72..98c0bce 100644 --- a/include/crtrow.idl +++ b/include/crtrow.idl @@ -32,7 +32,7 @@ interface ICreateRow : IUnknown [in, unique] IAuthenticate *pAuthenticate, [in, out, unique] DBIMPLICITSESSION *pImplSession, [in, out, unique] DBBINDURLSTATUS *pdwBindStatus, - [out, /*annotation("__deref_opt_out_opt")*/] LPOLESTR *ppwszNewURL, + [out, annotation("__deref_opt_out_opt")] LPOLESTR *ppwszNewURL, [out, iid_is(riid)] IUnknown **ppUnk); [call_as(CreateRow)] diff --git a/include/dbdsad.idl b/include/dbdsad.idl index 1fb8c9f..ad2695e 100644 --- a/include/dbdsad.idl +++ b/include/dbdsad.idl @@ -51,7 +51,7 @@ interface IDBDataSourceAdmin : IUnknown [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], [in, out] ULONG *pcPropertyInfoSets, [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, - [out, /*annotation("__deref_out_z_opt")*/] OLECHAR **ppDescBuffer); + [out, annotation("__deref_out_z_opt")] OLECHAR **ppDescBuffer); [call_as(GetCreationProperties)] HRESULT RemoteGetCreationProperties([in] ULONG cPropertyIDSets, diff --git a/include/dbprop.idl b/include/dbprop.idl index 77ceab0..782191a 100644 --- a/include/dbprop.idl +++ b/include/dbprop.idl @@ -40,7 +40,7 @@ interface IDBProperties : IUnknown { [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], [in, out] ULONG *pcPropertyInfoSets, [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, - [out, /*annotation("__deref_out_z_opt")*/] OLECHAR **ppDescBuffer); + [out, annotation("__deref_out_z_opt")] OLECHAR **ppDescBuffer); [call_as(GetPropertyInfo)] HRESULT RemoteGetPropertyInfo( [in] ULONG cPropertyIDSets,

1 0

Jörg Höhle : winmm: Time formats hms/ tmsf use leading zeroes as in 00:00:00.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 91344ae77ca9cf6869efc1293c7e8d777da82238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91344ae77ca9cf6869efc1293… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 18 17:40:41 2009 +0200 winmm: Time formats hms/tmsf use leading zeroes as in 00:00:00. --- dlls/winmm/mci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 72f590e..e28a298 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1155,8 +1155,8 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret { static const WCHAR wszLd [] = {'%','l','d',0}; static const WCHAR wszLd4 [] = {'%','l','d',' ','%','l','d',' ','%','l','d',' ','%','l','d',0}; - static const WCHAR wszCol3[] = {'%','d',':','%','d',':','%','d',0}; - static const WCHAR wszCol4[] = {'%','d',':','%','d',':','%','d',':','%','d',0}; + static const WCHAR wszCol3[] = {'%','0','2','d',':','%','0','2','d',':','%','0','2','d',0}; + static const WCHAR wszCol4[] = {'%','0','2','d',':','%','0','2','d',':','%','0','2','d',':','%','0','2','d',0}; if (lpstrRet) { switch (retType) {

1 0

Louis Lenders : wuaueng: Add stubbed wuaueng.dll.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 616136799e6322c83d1549751782cfe8b1efab42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=616136799e6322c83d1549751… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Oct 26 12:49:41 2009 +0100 wuaueng: Add stubbed wuaueng.dll. --- configure | 9 ++++++++ configure.ac | 1 + dlls/wuaueng/Makefile.in | 13 ++++++++++++ dlls/wuaueng/main.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wuaueng/wuaueng.spec | 16 +++++++++++++++ 5 files changed, 87 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 906bc67..937d1ae 100755 --- a/configure +++ b/configure @@ -17375,6 +17375,14 @@ dlls/wuapi/Makefile: dlls/wuapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wuapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/wuaueng/Makefile" +test "x$enable_wuaueng" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wuaueng" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/wuaueng/Makefile: dlls/wuaueng/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/wuaueng/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/xinput1_1/Makefile" test "x$enable_xinput1_1" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ xinput1_1" @@ -19198,6 +19206,7 @@ do "dlls/wsock32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wsock32/Makefile" ;; "dlls/wtsapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wtsapi32/Makefile" ;; "dlls/wuapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wuapi/Makefile" ;; + "dlls/wuaueng/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wuaueng/Makefile" ;; "dlls/xinput1_1/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_1/Makefile" ;; "dlls/xinput1_2/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_2/Makefile" ;; "dlls/xinput1_3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/Makefile" ;; diff --git a/configure.ac b/configure.ac index 68f0f27..a6daf78 100644 --- a/configure.ac +++ b/configure.ac @@ -2558,6 +2558,7 @@ WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wuapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wuaueng/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_2/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/wuaueng/Makefile.in b/dlls/wuaueng/Makefile.in new file mode 100644 index 0000000..26be0bb --- /dev/null +++ b/dlls/wuaueng/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wuaueng.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wuaueng/main.c b/dlls/wuaueng/main.c new file mode 100644 index 0000000..487c302 --- /dev/null +++ b/dlls/wuaueng/main.c @@ -0,0 +1,48 @@ +/* + * Copyright 2009 Louis Lenders + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuaueng); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/wuaueng/wuaueng.spec b/dlls/wuaueng/wuaueng.spec new file mode 100644 index 0000000..9046a42 --- /dev/null +++ b/dlls/wuaueng/wuaueng.spec @@ -0,0 +1,16 @@ +1 stub GetAUOptionsEx +2 stub DSRunStoreAsComServer +3 stub UHRunRemoteHandlerServer +4 stub WUCheckForUpdatesAtShutdown +5 stub WUAutoUpdateAtShutdown + +@ stub GeneralizeForImaging +@ stub GetEngineStatusInfo +@ stub RegisterServiceVersion +@ stub ServiceHandler +@ stub ServiceMain +@ stub WUServiceMain +@ stub DllInstall +@ stub DllMain +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Louis Lenders : wuaueng: Add version resource.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: a4fcb9a8c6c9d3f6d081dd974fa3ed85cb9414b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fcb9a8c6c9d3f6d081dd974… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Oct 26 13:04:27 2009 +0100 wuaueng: Add version resource. --- dlls/wuaueng/Makefile.in | 2 ++ dlls/wuaueng/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/wuaueng/Makefile.in b/dlls/wuaueng/Makefile.in index 26be0bb..e4cd655 100644 --- a/dlls/wuaueng/Makefile.in +++ b/dlls/wuaueng/Makefile.in @@ -8,6 +8,8 @@ IMPORTS = kernel32 C_SRCS = \ main.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wuaueng/version.rc b/dlls/wuaueng/version.rc new file mode 100644 index 0000000..5931e86 --- /dev/null +++ b/dlls/wuaueng/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2009 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Update Agent" +#define WINE_FILENAME_STR "wuaueng.dll" +#define WINE_FILEVERSION 7,2,6001,788 +#define WINE_FILEVERSION_STR "7.2.6001.788" +#define WINE_PRODUCTVERSION 7,2,6001,788 +#define WINE_PRODUCTVERSION_STR "7.2.6001.788" + +#include "wine/wine_common_ver.rc"

1 0

Alexandre Julliard : winetest: Refuse to submit results if we are using native dlls.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 31a5f31127ee9959d191b34ab9ff4d02429dee79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a5f31127ee9959d191b34ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 13:38:05 2009 +0100 winetest: Refuse to submit results if we are using native dlls. --- programs/winetest/main.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 2c9a57d..ee092e5 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -50,6 +50,7 @@ struct wine_test char *tag = NULL; static struct wine_test *wine_tests; static int nr_of_files, nr_of_tests; +static int nr_native_dlls; static const char whitespace[] = " \t\r\n"; static const char testexe[] = "_test.exe"; static char build_id[64]; @@ -679,6 +680,7 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, { FreeLibrary(dll); xprintf (" %s=load error Configured as native\n", dllname); + nr_native_dlls++; return TRUE; } if (!strcmp( dllname, "mshtml" ) && running_under_wine() && !gecko_check()) @@ -817,6 +819,9 @@ run_tests (char *logname, char *outdir) report (R_DELTA, 0, "Extracting: Done"); + if (nr_native_dlls) + report( R_WARNING, "Some dlls are configured as native, you won't be able to submit results." ); + report (R_STATUS, "Running tests"); report (R_PROGRESS, 1, nr_of_tests); for (i = 0; i < nr_of_files; i++) { @@ -1054,7 +1059,7 @@ int main( int argc, char *argv[] ) if (!logname) { logname = run_tests (NULL, outdir); - if (build_id[0] && !nb_filters && + if (build_id[0] && !nb_filters && !nr_native_dlls && report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES) if (!send_file (logname) && !DeleteFileA(logname)) report (R_WARNING, "Can't remove logfile: %u", GetLastError());

1 0

Huw Davies : rpcrt4: Move the full pointer table init to after a potential call to NdrServerInitializeNew ().
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: da86e727bd9e5bb3be00445afa51aca765d4f845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da86e727bd9e5bb3be00445af… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 11:33:39 2009 +0000 rpcrt4: Move the full pointer table init to after a potential call to NdrServerInitializeNew(). --- dlls/rpcrt4/ndr_stubless.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 8cb5f2b..8150238 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1299,10 +1299,6 @@ LONG WINAPI NdrStubCall2( TRACE("NDR Version: 0x%x\n", pStubDesc->Version); - /* create the full pointer translation tables, if requested */ - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) - stubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,XLAT_SERVER); - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; @@ -1377,6 +1373,10 @@ LONG WINAPI NdrStubCall2( else NdrServerInitializeNew(pRpcMsg, &stubMsg, pStubDesc); + /* create the full pointer translation tables, if requested */ + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) + stubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,XLAT_SERVER); + /* store the RPC flags away */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) pRpcMsg->RpcFlags = ((const NDR_PROC_HEADER_RPC *)pProcHeader)->rpc_flags;

1 0

Rico Schüller : d3d10: Add matrix column major parsing .
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 22d8fc081ae90e6f7507e2e066fdec453378331f URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d8fc081ae90e6f7507e2e06… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 25 17:11:42 2009 +0100 d3d10: Add matrix column major parsing. --- dlls/d3d10/effect.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0d1eab0..2a0dfb7 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); #define D3D10_FX10_TYPE_CLASS_SHIFT 0 #define D3D10_FX10_TYPE_CLASS_MASK (0x7 << D3D10_FX10_TYPE_CLASS_SHIFT) +#define D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK 0x4000 + static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl; static const struct ID3D10EffectVariableVtbl d3d10_effect_variable_vtbl; @@ -286,13 +288,14 @@ static HRESULT parse_shader(struct d3d10_effect_object *o, const char *data) return parse_dxbc(ptr, dxbc_size, shader_chunk_handler, s); } -static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c) +static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c, BOOL is_column_major) { switch (c) { case 1: return D3D10_SVC_SCALAR; case 2: return D3D10_SVC_VECTOR; - case 3: return D3D10_SVC_MATRIX_ROWS; + case 3: if (is_column_major) return D3D10_SVC_MATRIX_COLUMNS; + else return D3D10_SVC_MATRIX_ROWS; default: FIXME("Unknown variable class %#x.\n", c); return 0; @@ -385,7 +388,7 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con t->column_count = (tmp & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (tmp & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; t->basetype = d3d10_variable_type((tmp & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE); - t->type_class = d3d10_variable_class((tmp & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT); + t->type_class = d3d10_variable_class((tmp & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT, tmp & D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK); TRACE("Type description: %#x.\n", tmp); TRACE("\tcolumns: %u.\n", t->column_count); @@ -393,7 +396,7 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); TRACE("\tunknown bits: %#x.\n", tmp & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK - | D3D10_FX10_TYPE_BASETYPE_MASK | D3D10_FX10_TYPE_CLASS_MASK)); + | D3D10_FX10_TYPE_BASETYPE_MASK | D3D10_FX10_TYPE_CLASS_MASK | D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK)); } else if (unknown0 == 3) {

1 0

Rico Schüller : d3d10: Improve parse_fx10_type().
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 7e1ad91ea4d0b61abe36bdd0e69a0dd437a205e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1ad91ea4d0b61abe36bdd0e… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 25 17:11:46 2009 +0100 d3d10: Improve parse_fx10_type(). --- dlls/d3d10/effect.c | 146 +++++++++++++++++++++++++++++---------------------- 1 files changed, 83 insertions(+), 63 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2a0dfb7..08c6f05 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -352,6 +352,8 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con { DWORD unknown0; DWORD offset; + DWORD typeinfo; + unsigned int i; read_dword(&ptr, &offset); TRACE("Type name at offset %#x.\n", offset); @@ -378,84 +380,102 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con read_dword(&ptr, &t->size_packed); TRACE("Packed size %#x.\n", t->size_packed); - if (unknown0 == 1) + switch (unknown0) { - DWORD tmp; + case 1: + t->member_count = 0; - t->member_count = 0; + read_dword(&ptr, &typeinfo); + t->column_count = (typeinfo & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; + t->row_count = (typeinfo & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; + t->basetype = d3d10_variable_type((typeinfo & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE); + t->type_class = d3d10_variable_class((typeinfo & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT, typeinfo & D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK); - read_dword(&ptr, &tmp); - t->column_count = (tmp & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; - t->row_count = (tmp & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; - t->basetype = d3d10_variable_type((tmp & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE); - t->type_class = d3d10_variable_class((tmp & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT, tmp & D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK); + TRACE("Type description: %#x.\n", typeinfo); + TRACE("\tcolumns: %u.\n", t->column_count); + TRACE("\trows: %u.\n", t->row_count); + TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); + TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); + TRACE("\tunknown bits: %#x.\n", typeinfo & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK + | D3D10_FX10_TYPE_BASETYPE_MASK | D3D10_FX10_TYPE_CLASS_MASK | D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK)); + break; - TRACE("Type description: %#x.\n", tmp); - TRACE("\tcolumns: %u.\n", t->column_count); - TRACE("\trows: %u.\n", t->row_count); - TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); - TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); - TRACE("\tunknown bits: %#x.\n", tmp & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK - | D3D10_FX10_TYPE_BASETYPE_MASK | D3D10_FX10_TYPE_CLASS_MASK | D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK)); - } - else if (unknown0 == 3) - { - unsigned int i; + case 2: + TRACE("Type is an object.\n"); - TRACE("Type is a structure.\n"); + t->member_count = 0; + t->column_count = 0; + t->row_count = 0; + t->type_class = D3D10_SVC_OBJECT; - read_dword(&ptr, &t->member_count); - TRACE("Member count: %u.\n", t->member_count); + read_dword(&ptr, &typeinfo); + t->basetype = d3d10_variable_type(typeinfo, TRUE); - t->column_count = 0; - t->row_count = 0; - t->basetype = 0; - t->type_class = D3D10_SVC_STRUCT; + TRACE("Type description: %#x.\n", typeinfo); + TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); + TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); + break; - t->members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, t->member_count * sizeof(*t->members)); - if (!t->members) - { - ERR("Failed to allocate members memory.\n"); - return E_OUTOFMEMORY; - } + case 3: + TRACE("Type is a structure.\n"); - for (i = 0; i < t->member_count; ++i) - { - struct d3d10_effect_type_member *typem = &t->members[i]; + read_dword(&ptr, &t->member_count); + TRACE("Member count: %u.\n", t->member_count); - read_dword(&ptr, &offset); - TRACE("Member name at offset %#x.\n", offset); + t->column_count = 0; + t->row_count = 0; + t->basetype = 0; + t->type_class = D3D10_SVC_STRUCT; - if (!copy_name(data + offset, &typem->name)) + t->members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, t->member_count * sizeof(*t->members)); + if (!t->members) { - ERR("Failed to copy name.\n"); + ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; } - TRACE("Member name: %s.\n", debugstr_a(typem->name)); - - read_dword(&ptr, &offset); - TRACE("Member semantic at offset %#x.\n", offset); - if (!copy_name(data + offset, &typem->semantic)) + for (i = 0; i < t->member_count; ++i) { - ERR("Failed to copy semantic.\n"); - return E_OUTOFMEMORY; + struct d3d10_effect_type_member *typem = &t->members[i]; + + read_dword(&ptr, &offset); + TRACE("Member name at offset %#x.\n", offset); + + if (!copy_name(data + offset, &typem->name)) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + TRACE("Member name: %s.\n", debugstr_a(typem->name)); + + read_dword(&ptr, &offset); + TRACE("Member semantic at offset %#x.\n", offset); + + if (!copy_name(data + offset, &typem->semantic)) + { + ERR("Failed to copy semantic.\n"); + return E_OUTOFMEMORY; + } + TRACE("Member semantic: %s.\n", debugstr_a(typem->semantic)); + + read_dword(&ptr, &typem->buffer_offset); + TRACE("Member offset in struct: %#x.\n", typem->buffer_offset); + + read_dword(&ptr, &offset); + TRACE("Member type info at offset %#x.\n", offset); + + typem->type = get_fx10_type(t->effect, data, offset); + if (!typem->type) + { + ERR("Failed to get variable type.\n"); + return E_FAIL; + } } - TRACE("Member semantic: %s.\n", debugstr_a(typem->semantic)); - - read_dword(&ptr, &typem->buffer_offset); - TRACE("Member offset in struct: %#x.\n", typem->buffer_offset); - - read_dword(&ptr, &offset); - TRACE("Member type info at offset %#x.\n", offset); + break; - typem->type = get_fx10_type(t->effect, data, offset); - if (!typem->type) - { - ERR("Failed to get variable type.\n"); - return E_FAIL; - } - } + default: + FIXME("Unhandled case %#x.\n", unknown0); + return E_FAIL; } if (t->element_count)

1 0

Rico Schüller : d3d10: Parse local_variables.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: b55641f14a210f689cde8b08750a78779657c06e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55641f14a210f689cde8b087… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 25 17:11:49 2009 +0100 d3d10: Parse local_variables. --- dlls/d3d10/d3d10_private.h | 3 +- dlls/d3d10/effect.c | 120 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 120 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index ebc4db1..f077115 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -154,7 +154,7 @@ struct d3d10_effect DWORD version; DWORD local_buffer_count; DWORD variable_count; - DWORD object_count; + DWORD local_variable_count; DWORD sharedbuffers_count; DWORD sharedobjects_count; DWORD technique_count; @@ -171,6 +171,7 @@ struct d3d10_effect struct wine_rb_tree types; struct d3d10_effect_variable *local_buffers; + struct d3d10_effect_variable *local_variables; struct d3d10_effect_technique *techniques; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 08c6f05..def2c1a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -967,6 +967,95 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * return S_OK; } +static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const char **ptr, const char *data) +{ + unsigned int i; + HRESULT hr; + + hr = parse_fx10_variable_head(v, ptr, data); + if (FAILED(hr)) return hr; + + skip_dword_unknown(ptr, 2); + + switch (v->type->basetype) + { + case D3D10_SVT_TEXTURE1D: + case D3D10_SVT_TEXTURE1DARRAY: + case D3D10_SVT_TEXTURE2D: + case D3D10_SVT_TEXTURE2DARRAY: + case D3D10_SVT_TEXTURE2DMS: + case D3D10_SVT_TEXTURE2DMSARRAY: + case D3D10_SVT_TEXTURE3D: + case D3D10_SVT_TEXTURECUBE: + case D3D10_SVT_RENDERTARGETVIEW: + case D3D10_SVT_DEPTHSTENCILVIEW: + TRACE("SVT could not have elements.\n"); + break; + + case D3D10_SVT_VERTEXSHADER: + case D3D10_SVT_PIXELSHADER: + case D3D10_SVT_GEOMETRYSHADER: + TRACE("SVT is a shader.\n"); + for (i = 0; i < max(v->type->element_count, 1); ++i) + { + DWORD shader_offset; + + /* + * TODO: Parse the shader + */ + read_dword(ptr, &shader_offset); + FIXME("Shader offset: %#x.\n", shader_offset); + } + break; + + case D3D10_SVT_DEPTHSTENCIL: + case D3D10_SVT_BLEND: + case D3D10_SVT_RASTERIZER: + case D3D10_SVT_SAMPLER: + TRACE("SVT is a state.\n"); + for (i = 0; i < max(v->type->element_count, 1); ++i) + { + unsigned int j; + DWORD object_count; + + read_dword(ptr, &object_count); + TRACE("Object count: %#x.\n", object_count); + + for (j = 0; j < object_count; ++j) + { + skip_dword_unknown(ptr, 4); + } + } + break; + + default: + FIXME("Unhandled case %s.\n", debug_d3d10_shader_variable_type(v->type->basetype)); + return E_FAIL; + } + + read_dword(ptr, &v->annotation_count); + TRACE("Variable has %u annotations.\n", v->annotation_count); + + v->annotations = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, v->annotation_count * sizeof(*v->annotations)); + if (!v->annotations) + { + ERR("Failed to allocate variable annotations memory.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < v->annotation_count; ++i) + { + struct d3d10_effect_variable *a = &v->annotations[i]; + + a->effect = v->effect; + + hr = parse_fx10_annotation(a, ptr, data); + if (FAILED(hr)) return hr; + } + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(struct d3d10_effect_variable *l, const char **ptr, const char *data) { unsigned int i; @@ -1188,6 +1277,13 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d return E_OUTOFMEMORY; } + e->local_variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->local_variable_count * sizeof(*e->local_variables)); + if (!e->local_variables) + { + ERR("Failed to allocate local variable memory.\n"); + return E_OUTOFMEMORY; + } + e->techniques = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->technique_count * sizeof(*e->techniques)); if (!e->techniques) { @@ -1206,6 +1302,17 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d if (FAILED(hr)) return hr; } + for (i = 0; i < e->local_variable_count; ++i) + { + struct d3d10_effect_variable *v = &e->local_variables[i]; + + v->effect = e; + v->vtbl = &d3d10_effect_variable_vtbl; + + hr = parse_fx10_local_variable(v, &ptr, data); + if (FAILED(hr)) return hr; + } + for (i = 0; i < e->technique_count; ++i) { struct d3d10_effect_technique *t = &e->techniques[i]; @@ -1235,8 +1342,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->variable_count); TRACE("Variable count: %u\n", e->variable_count); - read_dword(&ptr, &e->object_count); - TRACE("Object count: %u\n", e->object_count); + read_dword(&ptr, &e->local_variable_count); + TRACE("Object count: %u\n", e->local_variable_count); read_dword(&ptr, &e->sharedbuffers_count); TRACE("Sharedbuffers count: %u\n", e->sharedbuffers_count); @@ -1533,6 +1640,15 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) HeapFree(GetProcessHeap(), 0, This->techniques); } + if (This->local_variables) + { + for (i = 0; i < This->local_variable_count; ++i) + { + d3d10_effect_variable_destroy(&This->local_variables[i]); + } + HeapFree(GetProcessHeap(), 0, &This->local_variables); + } + if (This->local_buffers) { for (i = 0; i < This->local_buffer_count; ++i)

1 0