wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

Rob Shearman : mapi32: Add a stub implementation of HrQueryAllRows@24.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 0eaab1add2a2cb3d669510398504889e781948b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eaab1add2a2cb3d669510398… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:54:23 2008 +0000 mapi32: Add a stub implementation of HrQueryAllRows@24. --- dlls/mapi32/mapi32.spec | 2 +- dlls/mapi32/util.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index bf97415..abf79bf 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -54,7 +54,7 @@ 72 stdcall FEqualNames@8(ptr ptr) FEqualNames 73 stub WrapStoreEntryID@24 74 stdcall IsBadBoundedStringPtr@8(ptr long) IsBadBoundedStringPtr - 75 stub HrQueryAllRows@24 + 75 stdcall HrQueryAllRows@24(ptr ptr ptr ptr long ptr) HrQueryAllRows 76 stdcall PropCopyMore@16(ptr ptr ptr ptr) PropCopyMore 77 stdcall UlPropSize@4(ptr) UlPropSize 78 stdcall FPropContainsProp@12(ptr ptr long) FPropContainsProp diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 6621e6f..76c08ca 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -890,3 +890,12 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path } return ret; } + +HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags, + LPSRestriction lpRestriction, LPSSortOrderSet lpSortOrderSet, + LONG crowsMax, LPSRowSet *lppRows) +{ + FIXME("(%p, %p, %p, %p, %d, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); + *lppRows = NULL; + return MAPI_E_CALL_FAILED; +}

1 0

Eric Pouech : dbghelp: Store the PE version information in module block.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 7b81ea47c626c79814f97c0d193d1424199a9be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b81ea47c626c79814f97c0d1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:04:17 2008 +0100 dbghelp: Store the PE version information in module block. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/minidump.c | 24 +++++++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 280e199..fa94a1f 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = dbghelp.dll IMPORTLIB = libdbghelp.$(IMPLIBEXT) IMPORTS = psapi kernel32 ntdll +DELAYIMPORTS = version C_SRCS = \ coff.c \ diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index d532217..4eec39f 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -329,6 +329,28 @@ static void fetch_modules_info(struct dump_context* dc) elf_enum_modules(dc->hProcess, fetch_elf_module_info_cb, dc); } +static void fetch_module_versioninfo(LPCWSTR filename, VS_FIXEDFILEINFO* ffi) +{ + DWORD handle; + DWORD sz; + static const WCHAR backslashW[] = {'\\', '\0'}; + + memset(ffi, 0, sizeof(*ffi)); + if ((sz = GetFileVersionInfoSizeW(filename, &handle))) + { + void* info = HeapAlloc(GetProcessHeap(), 0, sz); + if (info && GetFileVersionInfoW(filename, handle, sz, info)) + { + VS_FIXEDFILEINFO* ptr; + UINT len; + + if (VerQueryValueW(info, backslashW, (void*)&ptr, &len)) + memcpy(ffi, ptr, min(len, sizeof(*ffi))); + } + HeapFree(GetProcessHeap(), 0, info); + } +} + /****************************************************************** * add_memory_block * @@ -515,7 +537,7 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) mdModule.ModuleNameRva = dc->rva; ms->Length -= sizeof(WCHAR); append(dc, ms, sizeof(ULONG) + ms->Length + sizeof(WCHAR)); - memset(&mdModule.VersionInfo, 0, sizeof(mdModule.VersionInfo)); /* FIXME */ + fetch_module_versioninfo(ms->Buffer, &mdModule.VersionInfo); mdModule.CvRecord.DataSize = 0; /* FIXME */ mdModule.CvRecord.Rva = 0; /* FIXME */ mdModule.MiscRecord.DataSize = 0; /* FIXME */

1 0

Eric Pouech : dbghelp: Removed double assignment of checksum.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 8e45b07483713c8dca75f6d2ae293d80f7b7213a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e45b07483713c8dca75f6d2a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:04:10 2008 +0100 dbghelp: Removed double assignment of checksum. --- dlls/dbghelp/minidump.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 300a5a0..d532217 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -789,7 +789,6 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, mdHead.StreamDirectoryRva = sizeof(mdHead); mdHead.u.TimeDateStamp = time(NULL); mdHead.Flags = DumpType; - mdHead.CheckSum = 0; append(&dc, &mdHead, sizeof(mdHead)); /* 3) write stream directories */

1 0

Eric Pouech : dbghelp: Fixed the suspend count when creating a minidump in the middle of an exception .
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 04c0ffdc4791faacb80e98cccdda2ed19ee764fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c0ffdc4791faacb80e98ccc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:04:04 2008 +0100 dbghelp: Fixed the suspend count when creating a minidump in the middle of an exception. --- dlls/dbghelp/minidump.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index d7dddea..300a5a0 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -222,6 +222,7 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, else if (tid == GetCurrentThreadId() && except) { CONTEXT lctx, *pctx; + mdThd->SuspendCount = 1; if (except->ClientPointers) { EXCEPTION_POINTERS ep; @@ -237,6 +238,7 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, memcpy(ctx, pctx, sizeof(*ctx)); fetch_thread_stack(dc, tbi.TebBaseAddress, pctx, &mdThd->Stack); } + else mdThd->SuspendCount = 0; } } CloseHandle(hThread);

1 0

Eric Pouech : dbghelp: Return the size of each directory instead of passing a pointer to it.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: ecdbae7ceb4deaeb8587f8dd9b34d6a02e3c0f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecdbae7ceb4deaeb8587f8dd9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:03:57 2008 +0100 dbghelp: Return the size of each directory instead of passing a pointer to it. --- dlls/dbghelp/minidump.c | 57 +++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 9ae5307..d7dddea 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -381,9 +381,8 @@ static void append(struct dump_context* dc, void* data, unsigned size) * * Write in File the exception information from pcs */ -static void dump_exception_info(struct dump_context* dc, - const MINIDUMP_EXCEPTION_INFORMATION* except, - DWORD *size) +static unsigned dump_exception_info(struct dump_context* dc, + const MINIDUMP_EXCEPTION_INFORMATION* except) { MINIDUMP_EXCEPTION_STREAM mdExcpt; EXCEPTION_RECORD rec, *prec; @@ -422,8 +421,8 @@ static void dump_exception_info(struct dump_context* dc, mdExcpt.ThreadContext.Rva = dc->rva + sizeof(mdExcpt); append(dc, &mdExcpt, sizeof(mdExcpt)); - *size = sizeof(mdExcpt); append(dc, pctx, sizeof(*pctx)); + return sizeof(mdExcpt); } /****************************************************************** @@ -431,7 +430,7 @@ static void dump_exception_info(struct dump_context* dc, * * Write in File the modules from pcs */ -static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size) +static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) { MINIDUMP_MODULE mdModule; MINIDUMP_MODULE_LIST mdModuleList; @@ -440,6 +439,7 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size ULONG i, nmod; RVA rva_base; DWORD flags_out; + unsigned sz; for (i = nmod = 0; i < dc->num_modules; i++) { @@ -460,7 +460,7 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size in the minidump file. Since each string is referenced by RVA they can all safely be located anywhere between streams in the file, so the end of this stream is sufficient. */ rva_base = dc->rva; - dc->rva += *size = sizeof(mdModuleList.NumberOfModules) + sizeof(mdModule) * nmod; + dc->rva += sz = sizeof(mdModuleList.NumberOfModules) + sizeof(mdModule) * nmod; for (i = 0; i < dc->num_modules; i++) { if ((dc->modules[i].is_elf && !dump_elf) || @@ -528,6 +528,8 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size } writeat(dc, rva_base, &mdModuleList.NumberOfModules, sizeof(mdModuleList.NumberOfModules)); + + return sz; } /****************************************************************** @@ -535,7 +537,7 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size * * Dumps into File the information about the system */ -static void dump_system_info(struct dump_context* dc, DWORD *size) +static unsigned dump_system_info(struct dump_context* dc) { MINIDUMP_SYSTEM_INFO mdSysInfo; SYSTEM_INFO sysInfo; @@ -565,7 +567,6 @@ static void dump_system_info(struct dump_context* dc, DWORD *size) memset(&mdSysInfo.Cpu, 0, sizeof(mdSysInfo.Cpu)); append(dc, &mdSysInfo, sizeof(mdSysInfo)); - *size = sizeof(mdSysInfo); /* write the service pack version string after this stream. It is referenced within the stream by its RVA in the file. */ @@ -573,6 +574,8 @@ static void dump_system_info(struct dump_context* dc, DWORD *size) WriteFile(dc->hFile, &slen, sizeof(slen), &written, NULL); WriteFile(dc->hFile, osInfo.szCSDVersion, slen, &written, NULL); dc->rva += sizeof(ULONG) + slen; + + return sizeof(mdSysInfo); } /****************************************************************** @@ -580,9 +583,8 @@ static void dump_system_info(struct dump_context* dc, DWORD *size) * * Dumps into File the information about running threads */ -static void dump_threads(struct dump_context* dc, - const MINIDUMP_EXCEPTION_INFORMATION* except, - DWORD *size) +static unsigned dump_threads(struct dump_context* dc, + const MINIDUMP_EXCEPTION_INFORMATION* except) { MINIDUMP_THREAD mdThd; MINIDUMP_THREAD_LIST mdThdList; @@ -662,7 +664,8 @@ static void dump_threads(struct dump_context* dc, } writeat(dc, rva_base, &mdThdList.NumberOfThreads, sizeof(mdThdList.NumberOfThreads)); - *size = dc->rva - rva_base; + + return dc->rva - rva_base; } /****************************************************************** @@ -670,12 +673,12 @@ static void dump_threads(struct dump_context* dc, * * dumps information about the memory of the process (stack of the threads) */ -static void dump_memory_info(struct dump_context* dc, DWORD* size) +static unsigned dump_memory_info(struct dump_context* dc) { MINIDUMP_MEMORY_LIST mdMemList; MINIDUMP_MEMORY_DESCRIPTOR mdMem; DWORD written; - unsigned i, pos, len; + unsigned i, pos, len, sz; RVA rva_base; char tmp[1024]; @@ -683,9 +686,9 @@ static void dump_memory_info(struct dump_context* dc, DWORD* size) append(dc, &mdMemList.NumberOfMemoryRanges, sizeof(mdMemList.NumberOfMemoryRanges)); rva_base = dc->rva; - dc->rva += mdMemList.NumberOfMemoryRanges * sizeof(mdMem); - *size = sizeof(mdMemList.NumberOfMemoryRanges) + - mdMemList.NumberOfMemoryRanges * sizeof(mdMem); + sz = mdMemList.NumberOfMemoryRanges * sizeof(mdMem); + dc->rva += sz; + sz += sizeof(mdMemList.NumberOfMemoryRanges); for (i = 0; i < dc->num_mem; i++) { @@ -708,9 +711,11 @@ static void dump_memory_info(struct dump_context* dc, DWORD* size) writeat(dc, dc->mem[i].rva, &mdMem.Memory.Rva, sizeof(mdMem.Memory.Rva)); } } + + return sz; } -static void dump_misc_info(struct dump_context* dc, DWORD* size) +static unsigned dump_misc_info(struct dump_context* dc) { MINIDUMP_MISC_INFO mmi; @@ -723,7 +728,7 @@ static void dump_misc_info(struct dump_context* dc, DWORD* size) mmi.ProcessUserTime = 0; append(dc, &mmi, sizeof(mmi)); - *size = sizeof(mmi); + return sizeof(mmi); } /****************************************************************** @@ -794,37 +799,37 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, /* must be first in minidump */ mdDir.StreamType = SystemInfoStream; mdDir.Location.Rva = dc.rva; - dump_system_info(&dc, &mdDir.Location.DataSize); + mdDir.Location.DataSize = dump_system_info(&dc); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = ThreadListStream; mdDir.Location.Rva = dc.rva; - dump_threads(&dc, ExceptionParam, &mdDir.Location.DataSize); + mdDir.Location.DataSize = dump_threads(&dc, ExceptionParam); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = ModuleListStream; mdDir.Location.Rva = dc.rva; - dump_modules(&dc, FALSE, &mdDir.Location.DataSize); + mdDir.Location.DataSize = dump_modules(&dc, FALSE); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = 0xfff0; /* FIXME: this is part of MS reserved streams */ mdDir.Location.Rva = dc.rva; - dump_modules(&dc, TRUE, &mdDir.Location.DataSize); + mdDir.Location.DataSize = dump_modules(&dc, TRUE); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = MemoryListStream; mdDir.Location.Rva = dc.rva; - dump_memory_info(&dc, &mdDir.Location.DataSize); + mdDir.Location.DataSize = dump_memory_info(&dc); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = MiscInfoStream; mdDir.Location.Rva = dc.rva; - dump_misc_info(&dc, &mdDir.Location.DataSize); + mdDir.Location.DataSize = dump_misc_info(&dc); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); @@ -833,7 +838,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, { mdDir.StreamType = ExceptionStream; mdDir.Location.Rva = dc.rva; - dump_exception_info(&dc, ExceptionParam, &mdDir.Location.DataSize); + mdDir.Location.DataSize = dump_exception_info(&dc, ExceptionParam); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); }

1 0

Michael Stefaniuc : user32: Remove duplicated get_hook_proc() function.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 4715dbec2418d6b7e8a9e4d0ba0168e89ecc8679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4715dbec2418d6b7e8a9e4d0b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 31 14:35:27 2008 +0100 user32: Remove duplicated get_hook_proc() function. --- dlls/user32/hook.c | 2 +- dlls/user32/message.c | 19 ------------------- dlls/user32/user_private.h | 1 + 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index ed010a8..4354e05 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -314,7 +314,7 @@ static LRESULT call_hook_proc( HOOKPROC proc, INT id, INT code, WPARAM wparam, L * * Retrieve the hook procedure real value for a module-relative proc */ -static void *get_hook_proc( void *proc, const WCHAR *module ) +void *get_hook_proc( void *proc, const WCHAR *module ) { HMODULE mod; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 67bf10e..eb0168f 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1987,25 +1987,6 @@ static inline void call_sendmsg_callback( SENDASYNCPROC callback, HWND hwnd, UIN /*********************************************************************** - * get_hook_proc - * - * Retrieve the hook procedure real value for a module-relative proc - */ -static void *get_hook_proc( void *proc, const WCHAR *module ) -{ - HMODULE mod; - - if (!(mod = GetModuleHandleW(module))) - { - TRACE( "loading %s\n", debugstr_w(module) ); - /* FIXME: the library will never be freed */ - if (!(mod = LoadLibraryW(module))) return NULL; - } - return (char *)mod + (ULONG_PTR)proc; -} - - -/*********************************************************************** * peek_message * * Peek for a message matching the given parameters. Return FALSE if none available. diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 505c3ef..2f6ac68 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -235,6 +235,7 @@ extern BOOL CLIPBOARD_ReleaseOwner(void) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL HOOK_IsHooked( INT id ) DECLSPEC_HIDDEN; extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; +extern void *get_hook_proc( void *proc, const WCHAR *module ); extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid,

1 0

Dmitry Timoshkov : kernel32: LOADPARAMS16->showCmd can be NULL, do not crash in that case.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 21204f579e508872ab6e39282bb801fb0219b65d URL: http://source.winehq.org/git/wine.git/?a=commit;h=21204f579e508872ab6e39282… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jan 31 14:08:08 2008 +0800 kernel32: LOADPARAMS16->showCmd can be NULL, do not crash in that case. --- dlls/kernel32/ne_module.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index e41ced9..09e3175 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -1193,7 +1193,7 @@ HINSTANCE16 WINAPI LoadModule16( LPCSTR name, LPVOID paramBlock ) HMODULE16 hModule; NE_MODULE *pModule; LPSTR cmdline; - WORD cmdShow; + WORD cmdShow = 1; /* SW_SHOWNORMAL but we don't want to include winuser.h here */ if (name == NULL) return 0; @@ -1235,7 +1235,8 @@ HINSTANCE16 WINAPI LoadModule16( LPCSTR name, LPVOID paramBlock ) * information. */ params = (LOADPARAMS16 *)paramBlock; - cmdShow = ((WORD *)MapSL(params->showCmd))[1]; + if (params->showCmd) + cmdShow = ((WORD *)MapSL( params->showCmd ))[1]; cmdline = MapSL( params->cmdLine ); return NE_CreateThread( pModule, cmdShow, cmdline ); }

1 0

Rob Shearman : widl: Output code for initialising and freeing full pointer translation tables.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 661b01f92248206df7a86c8aa94caf102ccc4c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661b01f92248206df7a86c8aa… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 30 22:29:39 2008 +0000 widl: Output code for initialising and freeing full pointer translation tables. --- tools/widl/client.c | 7 +++++ tools/widl/proxy.c | 12 +++++++++ tools/widl/server.c | 7 +++++ tools/widl/typegen.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/widl/typegen.h | 3 ++ 5 files changed, 95 insertions(+), 0 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 5cd2a81..2eaa43c 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -85,6 +85,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { const var_t *def = func->def; const var_t* explicit_handle_var; + int has_full_pointer = is_full_pointer_function(func); /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); @@ -142,6 +143,9 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) } fprintf(client, "\n"); + if (has_full_pointer) + write_full_pointer_init(client, indent, func, FALSE); + /* check pointers */ check_pointers(func); @@ -245,6 +249,9 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) /* FIXME: emit client finally code */ + if (has_full_pointer) + write_full_pointer_free(client, indent, func); + print_client("NdrFreeBuffer((PMIDL_STUB_MESSAGE)&_StubMsg);\n"); indent--; diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 731629f..217c64b 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -254,6 +254,7 @@ static void gen_proxy(type_t *iface, const func_t *cur, int idx, { var_t *def = cur->def; int has_ret = !is_void(def->type); + int has_full_pointer = is_full_pointer_function(cur); indent = 0; write_type_decl_left(proxy, def->type); @@ -279,6 +280,9 @@ static void gen_proxy(type_t *iface, const func_t *cur, int idx, } print_proxy( "\n"); + if (has_full_pointer) + write_full_pointer_init(proxy, indent, cur, FALSE); + /* FIXME: trace */ clear_output_vars( cur->args ); @@ -325,6 +329,8 @@ static void gen_proxy(type_t *iface, const func_t *cur, int idx, print_proxy( "RpcFinally\n" ); print_proxy( "{\n" ); indent++; + if (has_full_pointer) + write_full_pointer_free(proxy, indent, cur); print_proxy( "NdrProxyFreeBuffer(This, &_StubMsg);\n" ); indent--; print_proxy( "}\n"); @@ -356,6 +362,7 @@ static void gen_stub(type_t *iface, const func_t *cur, const char *cas, var_t *def = cur->def; const var_t *arg; int has_ret = !is_void(def->type); + int has_full_pointer = is_full_pointer_function(cur); indent = 0; print_proxy( "void __RPC_STUB %s_", iface->name); @@ -384,6 +391,8 @@ static void gen_stub(type_t *iface, const func_t *cur, const char *cas, print_proxy("RpcTryFinally\n"); print_proxy("{\n"); indent++; + if (has_full_pointer) + write_full_pointer_init(proxy, indent, cur, TRUE); print_proxy("if ((_pRpcMessage->DataRepresentation & 0xffff) != NDR_LOCAL_DATA_REPRESENTATION)\n"); indent++; print_proxy("NdrConvert( &_StubMsg, &__MIDL_ProcFormatString.Format[%u]);\n", proc_offset ); @@ -439,6 +448,9 @@ static void gen_stub(type_t *iface, const func_t *cur, const char *cas, write_remoting_arguments(proxy, indent+1, cur, PASS_OUT, PHASE_FREE); + if (has_full_pointer) + write_full_pointer_free(proxy, indent, cur); + print_proxy("}\n"); print_proxy("RpcEndFinally\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index 3bcd231..53dd099 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -62,6 +62,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) LIST_FOR_EACH_ENTRY( func, iface->funcs, const func_t, entry ) { const var_t *def = func->def; + int has_full_pointer = is_full_pointer_function(func); /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); @@ -126,6 +127,9 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_server("{\n"); indent++; + if (has_full_pointer) + write_full_pointer_init(server, indent, func, TRUE); + if (func->args) { print_server("if ((_pRpcMessage->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION)\n"); @@ -236,6 +240,9 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) write_remoting_arguments(server, indent, func, PASS_OUT, PHASE_FREE); + if (has_full_pointer) + write_full_pointer_free(server, indent, func); + indent--; print_server("}\n"); print_server("RpcEndFinally\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0e8a096..41dd22f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -193,6 +193,46 @@ static int type_has_pointers(const type_t *type) return FALSE; } +static int type_has_full_pointer(const type_t *type) +{ + if (is_user_type(type)) + return FALSE; + else if (type->type == RPC_FC_FP) + return TRUE; + else if (is_ptr(type)) + return FALSE; + else if (is_array(type)) + return type_has_full_pointer(type->ref); + else if (is_struct(type->type)) + { + const var_t *field; + if (type->fields) LIST_FOR_EACH_ENTRY( field, type->fields, const var_t, entry ) + { + if (type_has_full_pointer(field->type)) + return TRUE; + } + } + else if (is_union(type->type)) + { + var_list_t *fields; + const var_t *field; + if (type->type == RPC_FC_ENCAPSULATED_UNION) + { + const var_t *uv = LIST_ENTRY(list_tail(type->fields), const var_t, entry); + fields = uv->type->fields; + } + else + fields = type->fields; + if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) + { + if (field->type && type_has_full_pointer(field->type)) + return TRUE; + } + } + + return FALSE; +} + static unsigned short user_type_offset(const char *name) { user_type_t *ut; @@ -903,6 +943,32 @@ size_t type_memsize(const type_t *t, unsigned int *align) return size; } +int is_full_pointer_function(const func_t *func) +{ + const var_t *var; + if (type_has_full_pointer(func->def->type)) + return TRUE; + if (!func->args) + return FALSE; + LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) + if (type_has_full_pointer( var->type )) + return TRUE; + return FALSE; +} + +void write_full_pointer_init(FILE *file, int indent, const func_t *func, int is_server) +{ + print_file(file, indent, "_StubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,%s);\n", + is_server ? "XLAT_SERVER" : "XLAT_CLIENT"); + fprintf(file, "\n"); +} + +void write_full_pointer_free(FILE *file, int indent, const func_t *func) +{ + print_file(file, indent, "NdrFullPointerXlatFree(_StubMsg.FullPtrXlatTables);\n"); + fprintf(file, "\n"); +} + static unsigned int write_nonsimple_pointer(FILE *file, const type_t *type, size_t offset) { short absoff = type->ref->typestring_offset; diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index c9a5148..4408ffa 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -60,3 +60,6 @@ void print(FILE *file, int indent, const char *format, va_list ap); int get_padding(const var_list_t *fields); int is_user_type(const type_t *t); expr_t *get_size_is_expr(const type_t *t, const char *name); +int is_full_pointer_function(const func_t *func); +void write_full_pointer_init(FILE *file, int indent, const func_t *func, int is_server); +void write_full_pointer_free(FILE *file, int indent, const func_t *func);

1 0

Rob Shearman : widl: Don' t search for a import file name with a path in the include directories for compatibility with MIDL .
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 454e489c2f34d93bce47297eff7f0f6348bf6565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454e489c2f34d93bce47297ef… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 30 22:29:23 2008 +0000 widl: Don't search for a import file name with a path in the include directories for compatibility with MIDL. --- tools/widl/parser.l | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 98f17af..2497a5e 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -414,7 +414,11 @@ int do_import(char *fname) import->next = first_import; first_import = import; - if (!(path = wpp_find_include( fname, input_name ))) + /* don't search for a file name with a path in the include directories, + * for compatibility with MIDL */ + if (strchr( fname, '/' ) || strchr( fname, '\\' )) + path = strdup( fname ); + else if (!(path = wpp_find_include( fname, input_name ))) error_loc("Unable to open include file %s\n", fname); import_stack[ptr].temp_name = temp_name;

1 0

Jacek Caban : widl: Ignore ATTR_LOCAL in create_msft_typeinfo.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 2118aeca162c13a88858a1aec57ce15fb5799ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2118aeca162c13a88858a1aec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 01:13:25 2008 +0100 widl: Ignore ATTR_LOCAL in create_msft_typeinfo. --- tools/widl/write_msft.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index f5ea2f7..51227bf 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1841,6 +1841,9 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ typeinfo->flags |= 0x10; /* TYPEFLAG_FHIDDEN */ break; + case ATTR_LOCAL: + break; + case ATTR_NONCREATABLE: typeinfo->flags &= ~0x2; /* TYPEFLAG_FCANCREATE */ break;

1 0

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 February 2008