June 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : rpcrt4: Preserve the previous MaxCount value when computing variance through a callback .
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: fa847909f2ae6a8118c300809c77d12e317dea3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa847909f2ae6a8118c300809… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 14 12:57:30 2011 +0200 rpcrt4: Preserve the previous MaxCount value when computing variance through a callback. --- dlls/rpcrt4/ndr_marshall.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 1e99c2e..c62675d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -590,6 +590,8 @@ PFORMAT_STRING ComputeConformanceOrVariance( case RPC_FC_CALLBACK: { unsigned char *old_stack_top = pStubMsg->StackTop; + ULONG_PTR max_count, old_max_count = pStubMsg->MaxCount; + pStubMsg->StackTop = ptr; /* ofs is index into StubDesc->apfnExprEval */ @@ -599,7 +601,9 @@ PFORMAT_STRING ComputeConformanceOrVariance( pStubMsg->StackTop = old_stack_top; /* the callback function always stores the computed value in MaxCount */ - *pCount = pStubMsg->MaxCount; + max_count = pStubMsg->MaxCount; + pStubMsg->MaxCount = old_max_count; + *pCount = max_count; goto finish_conf; } default:

1 0

Alexandre Julliard : rpcrt4: Add a wrapper for NdrClientCall2 to isolate calling convention differences .
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 379479a973a49dcdb07eb806a2b8c0ad08fde403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=379479a973a49dcdb07eb806a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 12:39:47 2011 +0200 rpcrt4: Add a wrapper for NdrClientCall2 to isolate calling convention differences. --- dlls/rpcrt4/cproxy.c | 12 +++++++----- dlls/rpcrt4/ndr_stubless.c | 42 +++++++++++++++++++----------------------- dlls/rpcrt4/ndr_stubless.h | 2 ++ dlls/rpcrt4/rpcrt4.spec | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 8352ba3..6a73953 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -37,6 +37,7 @@ #include "cpsf.h" #include "ndr_misc.h" +#include "ndr_stubless.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -95,19 +96,20 @@ __ASM_GLOBAL_FUNC(call_stubless_func, "addl %edx,%esp\n\t" "jmp *%ecx" ); -CLIENT_CALL_RETURN WINAPI ObjectStubless(DWORD *args) +LONG_PTR WINAPI ObjectStubless(void **args) { - DWORD index = args[0]; + DWORD index = (DWORD)args[0]; void **iface = (void **)args[2]; const void **vtbl = (const void **)*iface; const MIDL_STUBLESS_PROXY_INFO *stubless = *(const MIDL_STUBLESS_PROXY_INFO **)(vtbl - 2); const PFORMAT_STRING fs = stubless->ProcFormatString + stubless->FormatStringOffset[index]; + DWORD arg_size = *(const WORD*)(fs + 8); /* store bytes to remove from stack */ - args[0] = *(const WORD*)(fs + 8); - TRACE("(%p)->(%d)([%d bytes]) ret=%08x\n", iface, index, args[0], args[1]); + args[0] = (void *)arg_size; + TRACE("(%p)->(%d)([%d bytes]) ret=%p\n", iface, index, arg_size, args[1]); - return NdrClientCall2(stubless->pStubDesc, fs, args + 2); + return ndr_client_call(stubless->pStubDesc, fs, args + 2); } #define BLOCK_SIZE 1024 diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index f019776..9591f2d 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -565,7 +565,7 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, } } -CLIENT_CALL_RETURN WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, ...) +LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, void **stack_top ) { /* pointer to start of stack where arguments start */ RPC_MESSAGE rpcMsg; @@ -594,7 +594,6 @@ CLIENT_CALL_RETURN WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STR PFORMAT_STRING pHandleFormat; /* correlation cache */ ULONG_PTR NdrCorrCache[256]; - __ms_va_list args; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); @@ -623,7 +622,7 @@ CLIENT_CALL_RETURN WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STR if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { /* object is always the first argument */ - This = **(void *const **)(&pFormat+1); + This = stack_top[0]; NdrProxyInitialize(This, &rpcMsg, &stubMsg, pStubDesc, procedure_number); } else @@ -632,11 +631,7 @@ CLIENT_CALL_RETURN WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STR TRACE("Oi_flags = 0x%02x\n", pProcHeader->Oi_flags); TRACE("MIDL stub version = 0x%x\n", pStubDesc->MIDLVersion); - /* needed for conformance of top-level objects */ - __ms_va_start( args, pFormat ); - stubMsg.StackTop = va_arg( args, unsigned char * ); - __ms_va_end( args ); - + stubMsg.StackTop = (unsigned char *)stack_top; pHandleFormat = pFormat; /* we only need a handle if this isn't an object method */ @@ -915,9 +910,24 @@ CLIENT_CALL_RETURN WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STR done: TRACE("RetVal = 0x%lx\n", RetVal); - return *(CLIENT_CALL_RETURN *)&RetVal; + return RetVal; } +/*********************************************************************** + * NdrClientCall2 [RPCRT4.@] + */ +CLIENT_CALL_RETURN WINAPIV NdrClientCall2( PMIDL_STUB_DESC desc, PFORMAT_STRING format, ... ) +{ + __ms_va_list args; + LONG_PTR ret; + + __ms_va_start( args, format ); + ret = ndr_client_call( desc, format, va_arg( args, void ** )); + __ms_va_end( args ); + return *(CLIENT_CALL_RETURN *)&ret; +} + + /* Calls a function with the specified arguments, restoring the stack * properly afterwards as we don't know the calling convention of the * function */ @@ -1651,20 +1661,6 @@ void WINAPI NdrServerCall2(PRPC_MESSAGE pRpcMsg) } /*********************************************************************** - * NdrClientCall [RPCRT4.@] - */ -CLIENT_CALL_RETURN WINAPIV NdrClientCall( PMIDL_STUB_DESC desc, PFORMAT_STRING format, ... ) -{ - __ms_va_list args; - CLIENT_CALL_RETURN ret; - - __ms_va_start( args, format ); - ret = NdrClientCall2( desc, format, va_arg( args, unsigned char * )); - __ms_va_end( args ); - return ret; -} - -/*********************************************************************** * NdrStubCall [RPCRT4.@] */ LONG WINAPI NdrStubCall( struct IRpcStubBuffer *This, struct IRpcChannelBuffer *channel, diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index b672554..baa1f3e 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -236,6 +236,8 @@ typedef struct _NDR_EHD_CONTEXT #include "poppack.h" +LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, + void **stack_top ) DECLSPEC_HIDDEN; void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, int phase, unsigned char *args, unsigned short stack_size, unsigned char *pRetVal, BOOL object_proc, diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index bacef8c..b88c16d 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -127,7 +127,7 @@ @ stdcall NdrCStdStubBuffer_Release(ptr ptr) @ stdcall NdrClearOutParameters(ptr ptr ptr) @ varargs NdrClientCall2(ptr ptr) -@ varargs NdrClientCall(ptr ptr) +@ varargs -arch=i386 NdrClientCall(ptr ptr) NdrClientCall2 @ stdcall NdrClientContextMarshall(ptr ptr long) @ stdcall NdrClientContextUnmarshall(ptr ptr ptr) @ stub NdrClientInitialize

1 0

Alexandre Julliard : rpcrt4: Add an assembly wrapper to implement the NdrClientCall2 calling convention on x86_64 .
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: b6599bd7df87e3e0ade896fd0fd92a504f58f1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6599bd7df87e3e0ade896fd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 12:40:30 2011 +0200 rpcrt4: Add an assembly wrapper to implement the NdrClientCall2 calling convention on x86_64. --- dlls/rpcrt4/ndr_stubless.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 9591f2d..da895e1 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -913,6 +913,21 @@ done: return RetVal; } +#ifdef __x86_64__ + +__ASM_GLOBAL_FUNC( NdrClientCall2, + "movq %r8,0x18(%rsp)\n\t" + "movq %r9,0x20(%rsp)\n\t" + "leaq 0x18(%rsp),%r8\n\t" + "subq $0x28,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "call " __ASM_NAME("ndr_client_call") "\n\t" + "addq $0x28,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t") + "ret" ); + +#else /* __x86_64__ */ + /*********************************************************************** * NdrClientCall2 [RPCRT4.@] */ @@ -927,6 +942,7 @@ CLIENT_CALL_RETURN WINAPIV NdrClientCall2( PMIDL_STUB_DESC desc, PFORMAT_STRING return *(CLIENT_CALL_RETURN *)&ret; } +#endif /* __x86_64__ */ /* Calls a function with the specified arguments, restoring the stack * properly afterwards as we don't know the calling convention of the

1 0

Andrew Nguyen : dxdiag: Introduce the file output infrastructure.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 9678907d34ceec9c0eab2b9a4b798b7b5e8b5883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9678907d34ceec9c0eab2b9a4… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 14 08:01:37 2011 -0500 dxdiag: Introduce the file output infrastructure. --- programs/dxdiag/Makefile.in | 3 +- programs/dxdiag/dxdiag_private.h | 45 +++++++++++++++++++++++++++++++ programs/dxdiag/main.c | 39 ++++++++++++++++++++++++--- programs/dxdiag/output.c | 55 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 137 insertions(+), 5 deletions(-) diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in index 941d2c7..608790a 100644 --- a/programs/dxdiag/Makefile.in +++ b/programs/dxdiag/Makefile.in @@ -3,6 +3,7 @@ MODULE = dxdiag.exe APPMODE = -mwindows -municode C_SRCS = \ - main.c + main.c \ + output.c @MAKE_PROG_RULES@ diff --git a/programs/dxdiag/dxdiag_private.h b/programs/dxdiag/dxdiag_private.h new file mode 100644 index 0000000..48b4c4d --- /dev/null +++ b/programs/dxdiag/dxdiag_private.h @@ -0,0 +1,45 @@ +/* + * Private definitions for the DirectX Diagnostic Tool + * + * Copyright 2011 Andrew Nguyen + * + * 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 + */ + +/* Output backend definitions. */ +enum output_type +{ + OUTPUT_NONE, + OUTPUT_TEXT, + OUTPUT_XML, +}; + +static inline const char *debugstr_output_type(enum output_type type) +{ + switch (type) + { + case OUTPUT_NONE: + return "(none)"; + case OUTPUT_TEXT: + return "Plain-text output"; + case OUTPUT_XML: + return "XML output"; + default: + return "(unknown)"; + } +} + +const WCHAR *get_output_extension(enum output_type type); +BOOL output_dxdiag_information(const WCHAR *filename, enum output_type type); diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 3b89b19..6e4042c 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -23,11 +23,14 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "dxdiag_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); struct command_line_info { WCHAR outfile[MAX_PATH]; + enum output_type output_type; BOOL whql_check; }; @@ -37,7 +40,7 @@ static void usage(void) ExitProcess(0); } -static BOOL process_file_name(const WCHAR *cmdline, WCHAR *filename, size_t filename_len) +static BOOL process_file_name(const WCHAR *cmdline, enum output_type output_type, WCHAR *filename, size_t filename_len) { const WCHAR *endptr; size_t len; @@ -65,6 +68,17 @@ static BOOL process_file_name(const WCHAR *cmdline, WCHAR *filename, size_t file memcpy(filename, cmdline, len * sizeof(WCHAR)); filename[len] = '\0'; + /* Append an extension appropriate for the output type if the filename does not have one. */ + if (!(endptr = strrchrW(filename, '.'))) + { + const WCHAR *filename_ext = get_output_extension(output_type); + + if (len + strlenW(filename_ext) >= filename_len) + return FALSE; + + strcatW(filename, filename_ext); + } + return TRUE; } @@ -87,6 +101,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info static const WCHAR onW[] = {'o','n',0}; info->whql_check = FALSE; + info->output_type = OUTPUT_NONE; while (*cmdline) { @@ -96,7 +111,11 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info /* If no option is specified, treat the command line as a filename. */ if (*cmdline != '-' && *cmdline != '/') - return process_file_name(cmdline, info->outfile, sizeof(info->outfile)/sizeof(WCHAR)); + { + info->output_type = OUTPUT_TEXT; + return process_file_name(cmdline, OUTPUT_TEXT, info->outfile, + sizeof(info->outfile)/sizeof(WCHAR)); + } cmdline++; @@ -104,10 +123,14 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info { case 'T': case 't': - return process_file_name(cmdline + 1, info->outfile, sizeof(info->outfile)/sizeof(WCHAR)); + info->output_type = OUTPUT_TEXT; + return process_file_name(cmdline + 1, OUTPUT_TEXT, info->outfile, + sizeof(info->outfile)/sizeof(WCHAR)); case 'X': case 'x': - return process_file_name(cmdline + 1, info->outfile, sizeof(info->outfile)/sizeof(WCHAR)); + info->output_type = OUTPUT_XML; + return process_file_name(cmdline + 1, OUTPUT_XML, info->outfile, + sizeof(info->outfile)/sizeof(WCHAR)); case 'W': case 'w': if (strncmpiW(cmdline, whql_colonW, 5)) @@ -147,6 +170,14 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm usage(); WINE_TRACE("WHQL check: %s\n", info.whql_check ? "TRUE" : "FALSE"); + WINE_TRACE("Output type: %d\n", info.output_type); + if (info.output_type != OUTPUT_NONE) + WINE_TRACE("Output filename: %s\n", debugstr_output_type(info.output_type)); + + if (info.output_type != OUTPUT_NONE) + output_dxdiag_information(info.outfile, info.output_type); + else + WINE_FIXME("Information dialog is not implemented\n"); return 0; } diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c new file mode 100644 index 0000000..c7b3060 --- /dev/null +++ b/programs/dxdiag/output.c @@ -0,0 +1,55 @@ +/* + * DxDiag file information output + * + * Copyright 2011 Andrew Nguyen + * + * 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 <assert.h> + +#include "wine/debug.h" + +#include "dxdiag_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +static struct output_backend +{ + const WCHAR filename_ext[5]; +} output_backends[] = +{ + /* OUTPUT_TEXT */ + { + {'.','t','x','t',0}, + }, + /* OUTPUT_XML */ + { + {'.','x','m','l',0}, + }, +}; + +const WCHAR *get_output_extension(enum output_type type) +{ + assert(type > OUTPUT_NONE && type <= sizeof(output_backends)/sizeof(output_backends[0])); + + return output_backends[type - 1].filename_ext; +} + +BOOL output_dxdiag_information(const WCHAR *filename, enum output_type type) +{ + WINE_FIXME("File information output is not implemented\n"); + return FALSE; +}

1 0

Andrew Nguyen : dxdiag: Display a usage message box when unknown options are requested.
by Alexandre Julliard 14 Jun '11

14 Jun '11

1 0

Andrew Nguyen : dxdiag: Introduce the information collection infrastructure .
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: c349a34e1694265da0f3b25c532278ab69362b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c349a34e1694265da0f3b25c5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 14 08:01:51 2011 -0500 dxdiag: Introduce the information collection infrastructure. --- programs/dxdiag/Makefile.in | 1 + programs/dxdiag/dxdiag_private.h | 8 +++++++- programs/dxdiag/information.c | 36 ++++++++++++++++++++++++++++++++++++ programs/dxdiag/main.c | 12 +++++++++++- programs/dxdiag/output.c | 2 +- 5 files changed, 56 insertions(+), 3 deletions(-) diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in index 6a43982..3a691b0 100644 --- a/programs/dxdiag/Makefile.in +++ b/programs/dxdiag/Makefile.in @@ -4,6 +4,7 @@ APPMODE = -mwindows -municode IMPORTS = user32 C_SRCS = \ + information.c \ main.c \ output.c diff --git a/programs/dxdiag/dxdiag_private.h b/programs/dxdiag/dxdiag_private.h index 6026a9d..cbd9f5d 100644 --- a/programs/dxdiag/dxdiag_private.h +++ b/programs/dxdiag/dxdiag_private.h @@ -26,6 +26,12 @@ #define STRING_DXDIAG_TOOL 101 #define STRING_USAGE 102 +/* Information collection definitions. */ +struct dxdiag_information; + +struct dxdiag_information *collect_dxdiag_information(BOOL whql_check); +void free_dxdiag_information(struct dxdiag_information *dxdiag_info); + /* Output backend definitions. */ enum output_type { @@ -50,4 +56,4 @@ static inline const char *debugstr_output_type(enum output_type type) } const WCHAR *get_output_extension(enum output_type type); -BOOL output_dxdiag_information(const WCHAR *filename, enum output_type type); +BOOL output_dxdiag_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename, enum output_type type); diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c new file mode 100644 index 0000000..ecdaa92 --- /dev/null +++ b/programs/dxdiag/information.c @@ -0,0 +1,36 @@ +/* + * DxDiag information collection + * + * Copyright 2011 Andrew Nguyen + * + * 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 "wine/debug.h" + +#include "dxdiag_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +void free_dxdiag_information(struct dxdiag_information *system_info) +{ + /* Do nothing for now. */ +} + +struct dxdiag_information *collect_dxdiag_information(BOOL whql_check) +{ + WINE_FIXME("DxDiag information collection is not implemented\n"); + return NULL; +} diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 5380548..f286db6 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -174,6 +174,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { struct command_line_info info; + struct dxdiag_information *dxdiag_info; hInstance = hInst; @@ -185,10 +186,19 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm if (info.output_type != OUTPUT_NONE) WINE_TRACE("Output filename: %s\n", debugstr_output_type(info.output_type)); + dxdiag_info = collect_dxdiag_information(info.whql_check); + if (!dxdiag_info) + { + WINE_ERR("DxDiag information collection failed\n"); + return 1; + } + if (info.output_type != OUTPUT_NONE) - output_dxdiag_information(info.outfile, info.output_type); + output_dxdiag_information(dxdiag_info, info.outfile, info.output_type); else WINE_FIXME("Information dialog is not implemented\n"); + free_dxdiag_information(dxdiag_info); + return 0; } diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index c7b3060..effe2a2 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -48,7 +48,7 @@ const WCHAR *get_output_extension(enum output_type type) return output_backends[type - 1].filename_ext; } -BOOL output_dxdiag_information(const WCHAR *filename, enum output_type type) +BOOL output_dxdiag_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename, enum output_type type) { WINE_FIXME("File information output is not implemented\n"); return FALSE;

1 0

Andrew Nguyen : dxdiagn: Stub out some properties for dxdiag.exe.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 7d3b78af95bda2f51f4279f08eee788704300753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3b78af95bda2f51f4279f08… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 14 08:01:58 2011 -0500 dxdiagn: Stub out some properties for dxdiag.exe. --- dlls/dxdiagn/provider.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 1731b8f..9d19558 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); +static const WCHAR szEmpty[] = {0}; + static HRESULT build_information_tree(IDxDiagContainerImpl_Container **pinfo_root); static void free_information_tree(IDxDiagContainerImpl_Container *node); @@ -570,6 +572,14 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) static const WCHAR szPageFileEnglish[] = {'s','z','P','a','g','e','F','i','l','e','E','n','g','l','i','s','h',0}; static const WCHAR szMachineNameLocalized[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','L','o','c','a','l','i','z','e','d',0}; static const WCHAR szMachineNameEnglish[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','E','n','g','l','i','s','h',0}; + static const WCHAR szSystemManufacturerEnglish[] = {'s','z','S','y','s','t','e','m','M','a','n','u','f','a','c','t','u','r','e','r','E','n','g','l','i','s','h',0}; + static const WCHAR szSystemModelEnglish[] = {'s','z','S','y','s','t','e','m','M','o','d','e','l','E','n','g','l','i','s','h',0}; + static const WCHAR szBIOSEnglish[] = {'s','z','B','I','O','S','E','n','g','l','i','s','h',0}; + static const WCHAR szProcessorEnglish[] = {'s','z','P','r','o','c','e','s','s','o','r','E','n','g','l','i','s','h',0}; + static const WCHAR szSetupParamEnglish[] = {'s','z','S','e','t','u','p','P','a','r','a','m','E','n','g','l','i','s','h',0}; + static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0}; + + static const WCHAR notpresentW[] = {'N','o','t',' ','p','r','e','s','e','n','t',0}; static const WCHAR pagefile_fmtW[] = {'%','u','M','B',' ','u','s','e','d',',',' ','%','u','M','B',' ','a','v','a','i','l','a','b','l','e',0}; static const WCHAR physmem_fmtW[] = {'%','u','M','B',' ','R','A','M',0}; @@ -689,6 +699,30 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; + hr = add_bstr_property(node, szSystemManufacturerEnglish, szEmpty); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szSystemModelEnglish, szEmpty); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szBIOSEnglish, szEmpty); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szProcessorEnglish, szEmpty); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szSetupParamEnglish, notpresentW); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szDxDiagVersion, szEmpty); + if (FAILED(hr)) + return hr; + hr = fill_language_information(node); if (FAILED(hr)) return hr; @@ -720,7 +754,6 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) static const WCHAR szDisplayMemoryEnglish[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; static const WCHAR szAdapterID[] = {'0',0}; - static const WCHAR szEmpty[] = {0}; IDxDiagContainerImpl_Container *display_adapter; HRESULT hr;

1 0

Andrew Nguyen : dxdiag: Add code to collect information from the DxDiag_SystemInfo container.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 82024ee14f20d2240ed196c7521fa7736a530877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82024ee14f20d2240ed196c75… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 14 08:02:05 2011 -0500 dxdiag: Add code to collect information from the DxDiag_SystemInfo container. --- programs/dxdiag/Makefile.in | 2 +- programs/dxdiag/dxdiag_private.h | 28 +++++- programs/dxdiag/information.c | 204 +++++++++++++++++++++++++++++++++++++- programs/dxdiag/main.c | 6 + 4 files changed, 236 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82024ee14f20d2240ed19…

1 0

Andrew Nguyen : dxdiag: Add code for plain-text information output.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 8d37cfed44fe95de7f26a9da8200d83a3b051f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d37cfed44fe95de7f26a9da8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 14 08:02:12 2011 -0500 dxdiag: Add code for plain-text information output. --- programs/dxdiag/output.c | 136 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 134 insertions(+), 2 deletions(-) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index effe2a2..5176f69 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -18,26 +18,157 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> #include <assert.h> +#include <stdio.h> #include "wine/debug.h" +#include "wine/unicode.h" #include "dxdiag_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); +static char output_buffer[1024]; +static const char crlf[2] = "\r\n"; + +static BOOL output_text_header(HANDLE hFile, const char *caption) +{ + DWORD len = strlen(caption); + DWORD total_len = 3 * (len + sizeof(crlf)); + char *ptr = output_buffer; + + assert(total_len <= sizeof(output_buffer)); + + memset(ptr, '-', len); + ptr += len; + + memcpy(ptr, crlf, sizeof(crlf)); + ptr += sizeof(crlf); + + memcpy(ptr, caption, len); + ptr += len; + + memcpy(ptr, crlf, sizeof(crlf)); + ptr += sizeof(crlf); + + memset(ptr, '-', len); + ptr += len; + + memcpy(ptr, crlf, sizeof(crlf)); + ptr += sizeof(crlf); + + return WriteFile(hFile, output_buffer, total_len, NULL, NULL); +} + +static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_width, const WCHAR *value) +{ + DWORD value_lenW = strlenW(value); + DWORD value_lenA = WideCharToMultiByte(CP_ACP, 0, value, value_lenW, NULL, 0, NULL, NULL); + DWORD total_len = field_width + sizeof(": ") - 1 + value_lenA + sizeof(crlf); + char sprintf_fmt[1 + 10 + 3 + 1]; + char *ptr = output_buffer; + + assert(total_len <= sizeof(output_buffer)); + + sprintf(sprintf_fmt, "%%%us: ", field_width); + ptr += sprintf(ptr, sprintf_fmt, field_name); + + ptr += WideCharToMultiByte(CP_ACP, 0, value, value_lenW, ptr, value_lenA, NULL, NULL); + + memcpy(ptr, crlf, sizeof(crlf)); + ptr += sizeof(crlf); + + return WriteFile(hFile, output_buffer, total_len, NULL, NULL); +} + +static BOOL output_crlf(HANDLE hFile) +{ + return WriteFile(hFile, crlf, sizeof(crlf), NULL, NULL); +} + +static BOOL output_text_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename) +{ + const struct information_block + { + const char *caption; + size_t field_width; + struct information_field + { + const char *field_name; + const WCHAR *value; + } fields[50]; + } output_table[] = + { + {"System Information", 19, + { + {"Time of this report", dxdiag_info->system_info.szTimeEnglish}, + {"Machine name", dxdiag_info->system_info.szMachineNameEnglish}, + {"Operating System", dxdiag_info->system_info.szOSExLongEnglish}, + {"Language", dxdiag_info->system_info.szLanguagesEnglish}, + {"System Manufacturer", dxdiag_info->system_info.szSystemManufacturerEnglish}, + {"System Model", dxdiag_info->system_info.szSystemManufacturerEnglish}, + {"BIOS", dxdiag_info->system_info.szSystemManufacturerEnglish}, + {"Processor", dxdiag_info->system_info.szProcessorEnglish}, + {"Memory", dxdiag_info->system_info.szPhysicalMemoryEnglish}, + {"Page File", dxdiag_info->system_info.szPageFileEnglish}, + {"Windows Dir", dxdiag_info->system_info.szWindowsDir}, + {"DirectX Version", dxdiag_info->system_info.szDirectXVersionLongEnglish}, + {"DX Setup Parameters", dxdiag_info->system_info.szSetupParamEnglish}, + {"DxDiag Version", dxdiag_info->system_info.szDxDiagVersion}, + {NULL, NULL}, + } + }, + }; + + HANDLE hFile; + size_t i; + + hFile = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + WINE_ERR("File creation failed, last error %u\n", GetLastError()); + return FALSE; + } + + for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++) + { + const struct information_field *fields = output_table[i].fields; + unsigned int j; + + output_text_header(hFile, output_table[i].caption); + for (j = 0; fields[j].field_name; j++) + output_text_field(hFile, fields[j].field_name, output_table[i].field_width, fields[j].value); + output_crlf(hFile); + } + + CloseHandle(hFile); + return FALSE; +} + +static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename) +{ + WINE_FIXME("XML information output is not implemented\n"); + return FALSE; +} + static struct output_backend { const WCHAR filename_ext[5]; + BOOL (*output_handler)(struct dxdiag_information *, const WCHAR *filename); } output_backends[] = { /* OUTPUT_TEXT */ { {'.','t','x','t',0}, + output_text_information, }, /* OUTPUT_XML */ { {'.','x','m','l',0}, + output_xml_information, }, }; @@ -50,6 +181,7 @@ const WCHAR *get_output_extension(enum output_type type) BOOL output_dxdiag_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename, enum output_type type) { - WINE_FIXME("File information output is not implemented\n"); - return FALSE; + assert(type > OUTPUT_NONE && type <= sizeof(output_backends)/sizeof(output_backends[0])); + + return output_backends[type - 1].output_handler(dxdiag_info, filename); }

1 0

Stefan Dösinger : wined3d: Add GL_ARB_draw_elements_base_vertex.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 7de2fa267048bdb25f5b36fca957030f65f556d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de2fa267048bdb25f5b36fca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 11 15:39:30 2011 +0200 wined3d: Add GL_ARB_draw_elements_base_vertex. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1dd2cba..34eea82 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -55,6 +55,7 @@ static const struct { {"GL_ARB_depth_clamp", ARB_DEPTH_CLAMP, 0 }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE, 0 }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS, 0 }, + {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX, 0 }, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM, 0 }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER, 0 }, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index be50b2f..85e5fea 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1738,6 +1738,7 @@ typedef enum wined3d_gl_extension ARB_DEPTH_CLAMP, ARB_DEPTH_TEXTURE, ARB_DRAW_BUFFERS, + ARB_DRAW_ELEMENTS_BASE_VERTEX, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_FRAMEBUFFER_OBJECT, @@ -1965,6 +1966,19 @@ typedef void (WINE_GLAPI *PGLFNCLAMPCOLORARBPROC)(GLenum target, GLenum clamp); #endif typedef void (WINE_GLAPI *PGLFNDRAWBUFFERSARBPROC)(GLsizei n, const GLenum *bufs); +/* GL_ARB_draw_elements_base_vertex */ +#ifndef GL_ARB_draw_elements_base_vertex +#define GL_ARB_draw_elements_base_vertex 1 +typedef void (WINE_GLAPI *PGLFNDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei count, GLenum type, + const GLvoid *indices, GLint basevertex); +typedef void (WINE_GLAPI *PGLFNDRAWRANGEELEMENTSBASEVERTEXPROC)(GLenum mode, GLuint start, GLuint end, + GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); +typedef void (WINE_GLAPI *PGLFNDRAWELEMENTSINSTANCEDBASEVERTEXPROC)(GLenum mode, GLsizei count, + GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); +typedef void (WINE_GLAPI *PGLFNMULTIDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei *count, GLenum type, + const GLvoid **indices, GLsizei primcount, GLint *basevertex); +#endif + /* GL_ARB_fragment_program */ #ifndef GL_ARB_fragment_program #define GL_ARB_fragment_program 1 @@ -3789,6 +3803,15 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSWAPINTERVALEXTPROC)(int interval); /* GL_ARB_draw_buffers */ \ USE_GL_FUNC(PGLFNDRAWBUFFERSARBPROC, \ glDrawBuffersARB, ARB_DRAW_BUFFERS, NULL) \ + /* GL_ARB_draw_elements_base_vertex */ \ + USE_GL_FUNC(PGLFNDRAWELEMENTSBASEVERTEXPROC, \ + glDrawElementsBaseVertex, ARB_DRAW_ELEMENTS_BASE_VERTEX, NULL) \ + USE_GL_FUNC(PGLFNDRAWRANGEELEMENTSBASEVERTEXPROC, \ + glDrawRangeElementsBaseVertex, ARB_DRAW_ELEMENTS_BASE_VERTEX, NULL) \ + USE_GL_FUNC(PGLFNDRAWELEMENTSINSTANCEDBASEVERTEXPROC, \ + glDrawElementsInstancedBaseVertex, ARB_DRAW_ELEMENTS_BASE_VERTEX, NULL) \ + USE_GL_FUNC(PGLFNMULTIDRAWELEMENTSBASEVERTEXPROC, \ + glMultiDrawElementsBaseVertex, ARB_DRAW_ELEMENTS_BASE_VERTEX, NULL) \ /* GL_ARB_framebuffer_object */ \ USE_GL_FUNC(PGLFNGLISRENDERBUFFERPROC, \ glIsRenderbuffer, ARB_FRAMEBUFFER_OBJECT, NULL) \

1 0