wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Piotr Caban : msvcrt: Change the way locale information is stored in __thread_data.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: e15ac98cbcf01f64333d7ae75c266dab12e0ee54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15ac98cbcf01f64333d7ae75… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:22:42 2011 +0200 msvcrt: Change the way locale information is stored in __thread_data. --- dlls/msvcrt/locale.c | 253 +++++++++++++++++++++++++++----------------------- dlls/msvcrt/main.c | 4 +- dlls/msvcrt/msvcrt.h | 110 +++++++++++----------- dlls/msvcrt/thread.c | 2 + 4 files changed, 198 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e15ac98cbcf01f64333d7…

1 0

Piotr Caban : msvcrt: Use get_locinfo instead of get_locale.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 6991ac0331554fc91820212d448e884e8e034f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6991ac0331554fc91820212d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:22:32 2011 +0200 msvcrt: Use get_locinfo instead of get_locale. --- dlls/msvcrt/ctype.c | 44 +++++++++++++------- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/locale.c | 12 +++++- dlls/msvcrt/mbcs.c | 107 +++++++++++++++++++++++++++---------------------- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/printf.h | 55 +++++++++++++------------ dlls/msvcrt/scanf.h | 9 +++- dlls/msvcrt/string.c | 52 ++++++++++++++++-------- dlls/msvcrt/wcs.c | 22 ++++++---- 9 files changed, 182 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6991ac0331554fc918202…

1 0

Piotr Caban : msvcrt: Use _create_locale instead of setlocale during initialization.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 11bfced55d7a480248b01d9a8cfed73f74e50280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bfced55d7a480248b01d9a8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:22:23 2011 +0200 msvcrt: Use _create_locale instead of setlocale during initialization. --- dlls/msvcrt/locale.c | 74 +++++++++++++++++++++++++------------------------- dlls/msvcrt/main.c | 2 +- dlls/msvcrt/msvcrt.h | 2 +- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 7da61d8..002a38b 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1079,43 +1079,6 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) return loc; } -/* _configthreadlocale - not exported in native msvcrt */ -int CDECL _configthreadlocale(int type) -{ - thread_data_t *data = msvcrt_get_thread_data(); - int ret; - - if(!data) - return -1; - - ret = (data->locale ? MSVCRT__ENABLE_PER_THREAD_LOCALE : MSVCRT__DISABLE_PER_THREAD_LOCALE); - - if(type == MSVCRT__ENABLE_PER_THREAD_LOCALE) { - if(!data->locale) { - /* Copy current global locale */ - data->locale = MSVCRT__create_locale(MSVCRT_LC_ALL, MSVCRT_setlocale(MSVCRT_LC_ALL, NULL)); - if(!data->locale) - return -1; - } - - return ret; - } - - if(type == MSVCRT__DISABLE_PER_THREAD_LOCALE) { - if(data->locale) { - MSVCRT__free_locale(data->locale); - data->locale = NULL; - } - - return ret; - } - - if(!type) - return ret; - - return -1; -} - /********************************************************************* * setlocale (MSVCRT.@) */ @@ -1262,3 +1225,40 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) return cur->locinfo->lc_category[category].locale; } + +/* _configthreadlocale - not exported in native msvcrt */ +int CDECL _configthreadlocale(int type) +{ + thread_data_t *data = msvcrt_get_thread_data(); + int ret; + + if(!data) + return -1; + + ret = (data->locale ? MSVCRT__ENABLE_PER_THREAD_LOCALE : MSVCRT__DISABLE_PER_THREAD_LOCALE); + + if(type == MSVCRT__ENABLE_PER_THREAD_LOCALE) { + if(!data->locale) { + /* Copy current global locale */ + data->locale = MSVCRT__create_locale(MSVCRT_LC_ALL, MSVCRT_setlocale(MSVCRT_LC_ALL, NULL)); + if(!data->locale) + return -1; + } + + return ret; + } + + if(type == MSVCRT__DISABLE_PER_THREAD_LOCALE) { + if(data->locale) { + MSVCRT__free_locale(data->locale); + data->locale = NULL; + } + + return ret; + } + + if(!type) + return ret; + + return -1; +} diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index f1ef67b..54a0689 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -93,7 +93,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) if (!msvcrt_init_tls()) return FALSE; msvcrt_init_mt_locks(); - if(!MSVCRT_setlocale(0, "C")) { + if(!(MSVCRT_locale = MSVCRT__create_locale(0, "C"))) { msvcrt_free_mt_locks(); msvcrt_free_tls_mem(); return FALSE; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 58fd0b7..49d4768 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -805,7 +805,6 @@ void __cdecl MSVCRT_abort(void); MSVCRT_ulong* __cdecl MSVCRT___doserrno(void); int* __cdecl MSVCRT__errno(void); char* __cdecl MSVCRT_getenv(const char*); -char* __cdecl MSVCRT_setlocale(int,const char*); int __cdecl MSVCRT_fclose(MSVCRT_FILE*); void __cdecl MSVCRT_terminate(void); MSVCRT_FILE* __cdecl MSVCRT__iob_func(void); @@ -877,6 +876,7 @@ typedef struct MSVCRT_localeinfo_struct #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 extern MSVCRT__locale_t MSVCRT_locale; +MSVCRT__locale_t MSVCRT__create_locale(int, const char*); MSVCRT__locale_t get_locale(void); void __cdecl MSVCRT__free_locale(MSVCRT__locale_t);

1 0

Piotr Caban : msvcrt: Reorder fields of __thread_data structure.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 093909cf8819082612824fe9c8c3e19efdb9978e URL: http://source.winehq.org/git/wine.git/?a=commit;h=093909cf8819082612824fe9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:22:14 2011 +0200 msvcrt: Reorder fields of __thread_data structure. --- dlls/msvcrt/msvcrt.h | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 8fc3b03..58fd0b7 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -111,22 +111,30 @@ struct __thread_data { HANDLE handle; int thread_errno; MSVCRT_ulong thread_doserrno; + int unk1; unsigned int random_seed; /* seed for rand() */ char *strtok_next; /* next ptr for strtok() */ - unsigned char *mbstok_next; /* next ptr for mbstok() */ MSVCRT_wchar_t *wcstok_next; /* next ptr for wcstok() */ - char *efcvt_buffer; /* buffer for ecvt/fcvt */ + unsigned char *mbstok_next; /* next ptr for mbstok() */ + char *strerror_buffer; /* buffer for strerror */ + MSVCRT_wchar_t *wcserror_buffer; /* buffer for wcserror */ + void *unk2[4]; char *asctime_buffer; /* buffer for asctime */ MSVCRT_wchar_t *wasctime_buffer; /* buffer for wasctime */ struct MSVCRT_tm time_buffer; /* buffer for localtime/gmtime */ - char *strerror_buffer; /* buffer for strerror */ - MSVCRT_wchar_t *wcserror_buffer; /* buffer for wcserror */ + char *efcvt_buffer; /* buffer for ecvt/fcvt */ + int unk3[2]; + void *unk4[4]; int fpecode; + struct MSVCRT_localeinfo_struct *locale; + int unk5[2]; MSVCRT_terminate_function terminate_handler; MSVCRT_unexpected_function unexpected_handler; MSVCRT__se_translator_function se_translator; + void *unk6[3]; + int unk7; EXCEPTION_RECORD *exc_record; - struct MSVCRT_localeinfo_struct *locale; + void *unk8[100]; }; typedef struct __thread_data thread_data_t;

1 0

Piotr Caban : msvcrt: Close thread handle when _beginthread is used.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 2bcc9d452a19f2d11ec4b3e655a3c4456b02cc96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcc9d452a19f2d11ec4b3e65… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 24 17:22:02 2011 +0200 msvcrt: Close thread handle when _beginthread is used. --- dlls/msvcrt/main.c | 1 + dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/thread.c | 59 ++++++++++++++++++++++++++++++++++--------------- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index cca6189..f1ef67b 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -66,6 +66,7 @@ static inline void msvcrt_free_tls_mem(void) thread_data_t *tls = TlsGetValue(msvcrt_tls_index); if (tls) { + CloseHandle(tls->handle); HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); HeapFree(GetProcessHeap(),0,tls->asctime_buffer); HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 31fe719..8fc3b03 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -107,6 +107,8 @@ struct MSVCRT_tm { extern DWORD msvcrt_tls_index; struct __thread_data { + DWORD tid; + HANDLE handle; int thread_errno; MSVCRT_ulong thread_doserrno; unsigned int random_seed; /* seed for rand() */ diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index dc6edcd..2afb183 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /********************************************************************/ typedef struct { + HANDLE is_ready, thread; MSVCRT__beginthread_start_routine_t start_address; void *arglist; } _beginthread_trampoline_t; @@ -44,6 +45,8 @@ thread_data_t *msvcrt_get_thread_data(void) if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) _amsg_exit( _RT_THREAD ); if (!TlsSetValue( msvcrt_tls_index, ptr )) _amsg_exit( _RT_THREAD ); + ptr->tid = GetCurrentThreadId(); + ptr->handle = INVALID_HANDLE_VALUE; ptr->random_seed = 1; } SetLastError( err ); @@ -56,13 +59,19 @@ thread_data_t *msvcrt_get_thread_data(void) */ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) { - _beginthread_trampoline_t local_trampoline; + _beginthread_trampoline_t local_trampoline, *trampoline = arg; + thread_data_t *data = msvcrt_get_thread_data(); + + if(!DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), + &trampoline->thread, 0, TRUE, DUPLICATE_SAME_ACCESS)) { + trampoline->thread = NULL; + SetEvent(&trampoline->is_ready); + return 0; + } - /* Maybe it's just being paranoid, but freeing arg right - * away seems safer. - */ - memcpy(&local_trampoline,arg,sizeof(local_trampoline)); - MSVCRT_free(arg); + memcpy(&local_trampoline, trampoline, sizeof(local_trampoline)); + data->handle = local_trampoline.thread; + SetEvent(trampoline->is_ready); local_trampoline.start_address(local_trampoline.arglist); return 0; @@ -76,21 +85,35 @@ MSVCRT_uintptr_t CDECL _beginthread( unsigned int stack_size, /* [in] Stack size for new thread or 0 */ void *arglist) /* [in] Argument list to be passed to new thread or NULL */ { - _beginthread_trampoline_t* trampoline; + _beginthread_trampoline_t trampoline; + HANDLE thread; TRACE("(%p, %d, %p)\n", start_address, stack_size, arglist); - /* Allocate the trampoline here so that it is still valid when the thread - * starts... typically after this function has returned. - * _beginthread_trampoline is responsible for freeing the trampoline - */ - trampoline=MSVCRT_malloc(sizeof(*trampoline)); - trampoline->start_address = start_address; - trampoline->arglist = arglist; - - /* FIXME */ - return (MSVCRT_uintptr_t)CreateThread(NULL, stack_size, _beginthread_trampoline, - trampoline, 0, NULL); + trampoline.is_ready = CreateEventW(NULL, FALSE, FALSE, NULL); + if(!trampoline.is_ready) { + *MSVCRT__errno() = MSVCRT_EAGAIN; + return -1; + } + trampoline.start_address = start_address; + trampoline.arglist = arglist; + + thread = CreateThread(NULL, stack_size, _beginthread_trampoline, + &trampoline, 0, NULL); + if(!thread) { + *MSVCRT__errno() = MSVCRT_EAGAIN; + return -1; + } + CloseHandle(thread); + + WaitForSingleObject(trampoline.is_ready, INFINITE); + CloseHandle(trampoline.is_ready); + + if(!trampoline.thread) { + *MSVCRT__errno() = MSVCRT_EAGAIN; + return -1; + } + return (MSVCRT_uintptr_t)trampoline.thread; } /*********************************************************************

1 0

Alexandre Julliard : makefiles: Set the module name in stripped modules to the non-stripped name.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: ee5a3216edc653b105e1220c16083068c19f9e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5a3216edc653b105e1220c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 25 10:24:57 2011 +0200 makefiles: Set the module name in stripped modules to the non-stripped name. --- Maketest.rules.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Maketest.rules.in b/Maketest.rules.in index d31522a..b60986c 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -33,7 +33,7 @@ $(MODULE) $(MODULE).so: $(OBJS) Makefile.in $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(LIBPORT) $(ALL_LIBS) $(WINETEST_EXE): $(OBJS) Makefile.in - $(WINEGCC) -s $(APPMODE) $(OBJS) -o $@ $(LIBPORT) $(ALL_LIBS) + $(WINEGCC) -s -Wb,-F,$(MODULE) $(APPMODE) $(OBJS) -o $@ $(LIBPORT) $(ALL_LIBS) $(WINETEST_RES): $(WINETEST_EXE) echo "$(MODULE) TESTRES \"$(WINETEST_EXE)\"" | $(LDPATH) $(WRC) $(RCFLAGS) -o $@

1 0

Alexandre Julliard : include: Add compatibility macros for non-widl compilers.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: ea9750d773ded6b86a3e28f38666b8376f984d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9750d773ded6b86a3e28f38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 23:58:55 2011 +0200 include: Add compatibility macros for non-widl compilers. --- include/msxml2.idl | 6 ++++++ include/xmldom.idl | 6 ++++++ include/xmldso.idl | 6 ++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index f9c10ef..6680518 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -25,6 +25,12 @@ import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl"; +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ uuid(f5078f18-c551-11d3-89b9-0000f81fe221), version(3.0), diff --git a/include/xmldom.idl b/include/xmldom.idl index 45e9f13..a388592 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -19,6 +19,12 @@ #include <xmldomdid.h> #include <idispids.h> +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + interface IXMLDOMImplementation; interface IXMLDOMNode; interface IXMLDOMDocumentFragment; diff --git a/include/xmldso.idl b/include/xmldso.idl index cde98dc..86f2a3a 100644 --- a/include/xmldso.idl +++ b/include/xmldso.idl @@ -19,6 +19,12 @@ #include <idispids.h> #include <xmldsodid.h> +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + interface IXMLDOMDocument; [

1 0

Alexandre Julliard : widl: Also compute buffer size for non-ref pointers.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 96a5def6787c543f7fe2050a12aef7219e675bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a5def6787c543f7fe2050a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 23:53:11 2011 +0200 widl: Also compute buffer size for non-ref pointers. --- tools/widl/typegen.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f6bb2f9..4bdc94c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3185,13 +3185,19 @@ static unsigned int get_required_buffer_size_type( break; case TGT_POINTER: - if (get_pointer_fc(type, attrs, toplevel_param) == RPC_FC_RP) { + unsigned int size, align; const type_t *ref = type_pointer_get_ref(type); if (is_string_type( attrs, ref )) break; - return get_required_buffer_size_type( ref, name, ref->attrs, FALSE, alignment ); + if (!(size = get_required_buffer_size_type( ref, name, NULL, FALSE, &align ))) break; + if (get_pointer_fc(type, attrs, toplevel_param) != RPC_FC_RP) + { + size += 4 + align; + align = 4; + } + *alignment = align; + return size; } - break; case TGT_ARRAY: if (get_pointer_fc(type, attrs, toplevel_param) == RPC_FC_RP)

1 0

Alexandre Julliard : widl: Return the buffer size of the object pointed by a ref pointer for all types .
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 8f156e266ef0ac766fecadc7e82a2b215d4cf89c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f156e266ef0ac766fecadc7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 23:13:47 2011 +0200 widl: Return the buffer size of the object pointed by a ref pointer for all types. --- tools/widl/typegen.c | 25 +++---------------------- 1 files changed, 3 insertions(+), 22 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 687bf53..f6bb2f9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3111,7 +3111,7 @@ static unsigned int get_required_buffer_size_type( const type_t *type, const char *name, const attr_list_t *attrs, int toplevel_param, unsigned int *alignment) { *alignment = 0; - switch (typegen_detect_type(type, NULL, TDT_IGNORE_STRINGS|TDT_IGNORE_RANGES)) + switch (typegen_detect_type(type, NULL, TDT_IGNORE_RANGES)) { case TGT_USER_TYPE: { @@ -3188,27 +3188,8 @@ static unsigned int get_required_buffer_size_type( if (get_pointer_fc(type, attrs, toplevel_param) == RPC_FC_RP) { const type_t *ref = type_pointer_get_ref(type); - switch (typegen_detect_type(ref, NULL, TDT_ALL_TYPES)) - { - case TGT_BASIC: - case TGT_ENUM: - case TGT_RANGE: - return get_required_buffer_size_type( ref, name, NULL, FALSE, alignment ); - case TGT_STRUCT: - if (get_struct_fc(ref) == RPC_FC_STRUCT) - return get_required_buffer_size_type( ref, name, NULL, FALSE, alignment ); - break; - case TGT_USER_TYPE: - case TGT_CTXT_HANDLE: - case TGT_CTXT_HANDLE_POINTER: - case TGT_STRING: - case TGT_POINTER: - case TGT_ARRAY: - case TGT_IFACE_POINTER: - case TGT_UNION: - case TGT_INVALID: - break; - } + if (is_string_type( attrs, ref )) break; + return get_required_buffer_size_type( ref, name, ref->attrs, FALSE, alignment ); } break;

1 0

Alexandre Julliard : widl: Call marshalling routines directly also for user-marshalled types accessed through a ref pointer .
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 2099d9400188b320a6ae7bb1a69a14912fe4456b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2099d9400188b320a6ae7bb1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 23:10:48 2011 +0200 widl: Call marshalling routines directly also for user-marshalled types accessed through a ref pointer. --- tools/widl/typegen.c | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 324211e..687bf53 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3536,6 +3536,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const enum pass pass, enum remoting_phase phase, const var_t *var) { int in_attr, out_attr, pointer_type; + const char *type_str = NULL; const type_t *type = var->type; unsigned int alignment, start_offset = type->typestring_offset; @@ -3785,8 +3786,6 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, start_offset); break; case TGT_STRUCT: - { - const char *struct_type = NULL; switch (get_struct_fc(ref)) { case RPC_FC_STRUCT: @@ -3794,7 +3793,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const * pass and don't have any memory to free and so don't * need a freeing pass */ if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) - struct_type = "SimpleStruct"; + type_str = "SimpleStruct"; else if (phase == PHASE_FREE && pass == PASS_RETURN) { print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); @@ -3804,57 +3803,62 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const } break; case RPC_FC_PSTRUCT: - struct_type = "SimpleStruct"; + type_str = "SimpleStruct"; break; case RPC_FC_CSTRUCT: case RPC_FC_CPSTRUCT: - struct_type = "ConformantStruct"; + type_str = "ConformantStruct"; break; case RPC_FC_CVSTRUCT: - struct_type = "ConformantVaryingStruct"; + type_str = "ConformantVaryingStruct"; break; case RPC_FC_BOGUS_STRUCT: - struct_type = "ComplexStruct"; + type_str = "ComplexStruct"; break; default: error("write_remoting_arguments: Unsupported type: %s (0x%02x)\n", var->name, get_struct_fc(ref)); } - if (struct_type) + if (type_str) { if (phase == PHASE_FREE) - struct_type = "Pointer"; + type_str = "Pointer"; else start_offset = ref->typestring_offset; - print_phase_function(file, indent, struct_type, local_var_prefix, phase, var, start_offset); + print_phase_function(file, indent, type_str, local_var_prefix, phase, var, start_offset); } break; - } case TGT_UNION: - { - const char *union_type = NULL; if (phase == PHASE_FREE) - union_type = "Pointer"; + type_str = "Pointer"; else { if (type_get_type(ref) == TYPE_UNION) - union_type = "NonEncapsulatedUnion"; + type_str = "NonEncapsulatedUnion"; else if (type_get_type(ref) == TYPE_ENCAPSULATED_UNION) - union_type = "EncapsulatedUnion"; + type_str = "EncapsulatedUnion"; start_offset = ref->typestring_offset; } - print_phase_function(file, indent, union_type, local_var_prefix, + print_phase_function(file, indent, type_str, local_var_prefix, phase, var, start_offset); break; - } + case TGT_USER_TYPE: + if (phase != PHASE_FREE) + { + type_str = "UserMarshal"; + start_offset = ref->typestring_offset; + } + else type_str = "Pointer"; + + print_phase_function(file, indent, type_str, local_var_prefix, phase, var, start_offset); + break; case TGT_STRING: case TGT_POINTER: case TGT_ARRAY: case TGT_RANGE: case TGT_IFACE_POINTER: - case TGT_USER_TYPE: case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER: print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, start_offset);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011