January 2008 - Wine-commits

Alistair Leslie-Hughes : mscoree: Fix memory leak.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 74a468d01bd2519b6e300788070c9e104134f538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a468d01bd2519b6e3007880… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 16 07:10:25 2008 +1100 mscoree: Fix memory leak. --- dlls/mscoree/mscoree_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index ecefc27..35564ac 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -99,6 +99,8 @@ HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor return E_FAIL; } + HeapFree(GetProcessHeap(), 0, mono_exe); + return S_OK; }

1 0

Alexandre Julliard : ntdll: Copy extended registers too in copy_context().
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: f45b7078bfea35e599914ae1cc73b6521cae8352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45b7078bfea35e599914ae1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 18:00:13 2008 +0100 ntdll: Copy extended registers too in copy_context(). --- dlls/ntdll/thread.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index a934392..88ded56 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -886,6 +886,10 @@ static inline void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) { to->FloatSave = from->FloatSave; } + if (flags & CONTEXT_EXTENDED_REGISTERS) + { + memcpy( to->ExtendedRegisters, from->ExtendedRegisters, sizeof(to->ExtendedRegisters) ); + } #elif defined(__x86_64__) flags &= ~CONTEXT_AMD64; /* get rid of CPU id */ if (flags & CONTEXT_CONTROL)

1 0

Alexandre Julliard : ntdll: Linux support for saving and restoring the extended FPU context on exceptions .
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: bd352bcd1c98ed91bdb337e73cddfd8ceac095d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd352bcd1c98ed91bdb337e73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 18:08:29 2008 +0100 ntdll: Linux support for saving and restoring the extended FPU context on exceptions. --- dlls/ntdll/signal_i386.c | 119 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 101 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f70544d..b07715c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -68,6 +68,33 @@ #undef ERR /* Solaris needs to define this */ +/* not defined for x86, so copy the x86_64 definition */ +typedef struct DECLSPEC_ALIGN(16) _M128A +{ + ULONGLONG Low; + LONGLONG High; +} M128A; + +typedef struct +{ + WORD ControlWord; + WORD StatusWord; + BYTE TagWord; + BYTE Reserved1; + WORD ErrorOpcode; + DWORD ErrorOffset; + WORD ErrorSelector; + WORD Reserved2; + DWORD DataOffset; + WORD DataSelector; + WORD Reserved3; + DWORD MxCsr; + DWORD MxCsr_Mask; + M128A FloatRegisters[8]; + M128A XmmRegisters[16]; + BYTE Reserved4[96]; +} XMM_SAVE_AREA32; + /*********************************************************************** * signal context platform-specific definitions */ @@ -98,6 +125,7 @@ typedef ucontext_t SIGCONTEXT; #define ERROR_sig(context) ((context)->uc_mcontext.gregs[REG_ERR]) #define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpregs)) +#define FPUX_sig(context) ((context)->uc_mcontext.fpregs->status >> 16 ? NULL : (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1)) #define VM86_EAX 0 /* the %eax value while vm86_enter is executing */ @@ -165,6 +193,9 @@ typedef struct trapframe SIGCONTEXT; #define EIP_sig(context) (*((unsigned long*)&(context)->tf_eip)) #define ESP_sig(context) (*((unsigned long*)&(context)->tf_esp)) +#define FPU_sig(context) NULL /* FIXME */ +#define FPUX_sig(context) NULL /* FIXME */ + #endif /* bsdi */ #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) @@ -193,6 +224,9 @@ typedef struct sigcontext SIGCONTEXT; #define EIP_sig(context) ((context)->sc_eip) #define ESP_sig(context) ((context)->sc_esp) +#define FPU_sig(context) NULL /* FIXME */ +#define FPUX_sig(context) NULL /* FIXME */ + #endif /* *BSD */ #if defined(__svr4__) || defined(_SCO_DS) || defined(__sun) @@ -240,6 +274,9 @@ typedef struct ucontext SIGCONTEXT; #define TRAP_sig(context) ((context)->uc_mcontext.gregs[TRAPNO]) #endif +#define FPU_sig(context) NULL /* FIXME */ +#define FPUX_sig(context) NULL /* FIXME */ + #endif /* svr4 || SCO_DS */ #ifdef __APPLE__ @@ -288,6 +325,9 @@ typedef ucontext_t SIGCONTEXT; #define ERROR_sig(context) ((context)->uc_mcontext->es.err) #endif +#define FPU_sig(context) NULL /* FIXME */ +#define FPUX_sig(context) NULL /* FIXME */ + #endif /* __APPLE__ */ WINE_DEFAULT_DEBUG_CHANNEL(seh); @@ -299,6 +339,8 @@ static size_t signal_stack_size; static wine_signal_handler handlers[256]; +static int fpux_support; /* whether the CPU support extended fpu context */ + extern void DECLSPEC_NORETURN __wine_call_from_32_restore_regs( const CONTEXT *context ); enum i386_trap_code @@ -606,6 +648,25 @@ static inline void save_fpu( CONTEXT *context ) /*********************************************************************** + * save_fpux + * + * Save the thread FPU extended context. + */ +static inline void save_fpux( CONTEXT *context ) +{ +#ifdef __GNUC__ + /* we have to enforce alignment by hand */ + char buffer[sizeof(XMM_SAVE_AREA32) + 16]; + XMM_SAVE_AREA32 *state = (XMM_SAVE_AREA32 *)(((ULONG_PTR)buffer + 15) & ~15); + + __asm__ __volatile__( "fxsave %0" : "=m" (*state) ); + context->ContextFlags |= CONTEXT_EXTENDED_REGISTERS; + memcpy( context->ExtendedRegisters, state, sizeof(*state) ); +#endif +} + + +/*********************************************************************** * restore_fpu * * Restore the FPU context to a sigcontext. @@ -622,6 +683,26 @@ static inline void restore_fpu( const CONTEXT *context ) /*********************************************************************** + * restore_fpux + * + * Restore the FPU extended context to a sigcontext. + */ +static inline void restore_fpux( const CONTEXT *context ) +{ +#ifdef __GNUC__ + /* we have to enforce alignment by hand */ + char buffer[sizeof(XMM_SAVE_AREA32) + 16]; + XMM_SAVE_AREA32 *state = (XMM_SAVE_AREA32 *)(((ULONG_PTR)buffer + 15) & ~15); + + memcpy( state, context->ExtendedRegisters, sizeof(*state) ); + /* reset the current interrupt status */ + state->StatusWord &= state->ControlWord | 0xff80; + __asm__ __volatile__( "fxrstor %0" : : "m" (*state) ); +#endif +} + + +/*********************************************************************** * save_context * * Build a context structure from the signal info. @@ -629,6 +710,8 @@ static inline void restore_fpu( const CONTEXT *context ) static inline void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext, WORD fs, WORD gs ) { struct ntdll_thread_regs * const regs = ntdll_get_thread_regs(); + FLOATING_SAVE_AREA *fpu = FPU_sig(sigcontext); + XMM_SAVE_AREA32 *fpux = FPUX_sig(sigcontext); memset(context, 0, sizeof(*context)); context->ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS; @@ -655,17 +738,20 @@ static inline void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext, context->Dr6 = regs->dr6; context->Dr7 = regs->dr7; -#ifdef FPU_sig - if (FPU_sig(sigcontext)) + if (fpu) { context->ContextFlags |= CONTEXT_FLOATING_POINT; - context->FloatSave = *FPU_sig(sigcontext); + context->FloatSave = *fpu; } - else -#endif + if (fpux) { - save_fpu( context ); + save_fpux( context ); + context->ContextFlags |= CONTEXT_EXTENDED_REGISTERS; + memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); + fpux_support = 1; + /* FIXME: convert fpux to fpu */ } + if (!fpu && !fpux) save_fpu( context ); } @@ -677,6 +763,8 @@ static inline void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext, static inline void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) { struct ntdll_thread_regs * const regs = ntdll_get_thread_regs(); + FLOATING_SAVE_AREA *fpu = FPU_sig(sigcontext); + XMM_SAVE_AREA32 *fpux = FPUX_sig(sigcontext); regs->dr0 = context->Dr0; regs->dr1 = context->Dr1; @@ -709,16 +797,9 @@ static inline void restore_context( const CONTEXT *context, SIGCONTEXT *sigconte wine_set_fs( context->SegFs ); #endif -#ifdef FPU_sig - if (FPU_sig(sigcontext)) - { - *FPU_sig(sigcontext) = context->FloatSave; - } - else -#endif - { - restore_fpu( context ); - } + if (fpu) *fpu = context->FloatSave; + if (fpux) memcpy( fpux, context->ExtendedRegisters, sizeof(*fpux) ); + if (!fpu && !fpux) restore_fpu( context ); } @@ -730,7 +811,8 @@ static inline void restore_context( const CONTEXT *context, SIGCONTEXT *sigconte void WINAPI __regs_get_cpu_context( CONTEXT *context, CONTEXT *regs ) { *context = *regs; - save_fpu( context ); + if (fpux_support) save_fpux( context ); + else save_fpu( context ); } DEFINE_REGS_ENTRYPOINT( get_cpu_context, 4, 4 ) @@ -744,7 +826,8 @@ void set_cpu_context( const CONTEXT *context ) { DWORD flags = context->ContextFlags & ~CONTEXT_i386; - if (flags & CONTEXT_FLOATING_POINT) restore_fpu( context ); + if (flags & CONTEXT_EXTENDED_REGISTERS) restore_fpux( context ); + else if (flags & CONTEXT_FLOATING_POINT) restore_fpu( context ); if (flags & CONTEXT_DEBUG_REGISTERS) {

1 0

Alexandre Julliard : kernel32/tests: Avoid size_t in traces.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 93cdead182e01dcdc99204769b0299600d572a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=93cdead182e01dcdc99204769… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 17:08:09 2008 +0100 kernel32/tests: Avoid size_t in traces. --- dlls/kernel32/tests/environ.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 06943de..5f85f5d 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -234,7 +234,7 @@ static void test_ExpandEnvironmentStringsA(void) /* v5.1.2600.2945 (XP SP2) returns len + 2 here! */ ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2 || ret_size == 0 /* Win95 */, "ExpandEnvironmentStrings returned %d instead of %d\n", - ret_size, strlen(value)+1); + ret_size, lstrlenA(value)+1); if (ret_size == strlen(value)+2) trace("ExpandEnvironmentStrings is buggy: it returned len + 2\n"); @@ -243,27 +243,27 @@ static void test_ExpandEnvironmentStringsA(void) /* v5.1.2600.2945 (XP SP2) returns len + 2 here! */ ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2, "ExpandEnvironmentStrings returned %d instead of %d\n", - ret_size, strlen(value)+1); + ret_size, lstrlenA(value)+1); /* Try with a buffer that's too small */ ret_size = ExpandEnvironmentStringsA(buf, buf1, 12); /* v5.1.2600.2945 (XP SP2) returns len + 2 here! */ ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2, "ExpandEnvironmentStrings returned %d instead of %d\n", - ret_size, strlen(value)+1); + ret_size, lstrlenA(value)+1); /* Try with a buffer of just the right size */ /* v5.1.2600.2945 (XP SP2) needs and returns len + 2 here! */ ret_size = ExpandEnvironmentStringsA(buf, buf1, ret_size); ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2, "ExpandEnvironmentStrings returned %d instead of %d\n", - ret_size, strlen(value)+1); + ret_size, lstrlenA(value)+1); ok(!strcmp(buf1, value), "ExpandEnvironmentStrings returned [%s]\n", buf1); /* Try with an unset environment variable */ strcpy(buf, not_an_env_var); ret_size = ExpandEnvironmentStringsA(buf, buf1, sizeof(buf1)); - ok(ret_size == strlen(not_an_env_var)+1, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, strlen(value)+1); + ok(ret_size == strlen(not_an_env_var)+1, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, lstrlenA(value)+1); ok(!strcmp(buf1, not_an_env_var), "ExpandEnvironmentStrings returned [%s]\n", buf1); /* test a large destination size */

1 0

Andrey Esin : wordpad: Adding to Russian translation.
by Alexandre Julliard 15 Jan '08

15 Jan '08

Module: wine Branch: master Commit: 44923ffb2b963b92e09f61638e21d103f0406eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44923ffb2b963b92e09f61638… Author: Andrey Esin <andrey(a)esin.name> Date: Mon Jan 14 22:03:27 2008 +0300 wordpad: Adding to Russian translation. --- programs/wordpad/Ru.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 5a55d3c..754ccf1 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -63,7 +63,7 @@ BEGIN BEGIN MENUITEM "�� &��", ID_TOGGLE_TOOLBAR MENUITEM "�&�� ", ID_TOGGLE_FORMATBAR - MENUITEM "&Ruler", ID_TOGGLE_RULER + MENUITEM "&��", ID_TOGGLE_RULER MENUITEM "&�� ", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&�� . . .", ID_VIEWPROPERTIES @@ -168,7 +168,7 @@ BEGIN GROUPBOX "��", 0, 150, 10, 120, 85 CHECKBOX "&��", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&��", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&��", IDC_PAGEFMT_RU, 160, 56, 80, 15 CHECKBOX "&�� ", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END

1 0

Andrej Sinicyn : wordpad: Update German strings and correct shortcuts to match XP wordpad.
by Alexandre Julliard 15 Jan '08

15 Jan '08

Module: wine Branch: master Commit: 4278c3fe849a5efaf2f82e39ff459f1ce44f878b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4278c3fe849a5efaf2f82e39f… Author: Andrej Sinicyn <Andrej4000(a)gmx.de> Date: Mon Jan 14 23:57:16 2008 +0100 wordpad: Update German strings and correct shortcuts to match XP wordpad. --- programs/wordpad/De.rc | 178 ++++++++++++++++++++++++------------------------ 1 files changed, 89 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4278c3fe849a5efaf2f82…

1 0

Rob Shearman : ole32: Partially implement ServerRpcChannelBuffer_GetDestCtx .
by Alexandre Julliard 15 Jan '08

15 Jan '08

Module: wine Branch: master Commit: fcccd9fca605d1d4c462df5c33f4bacf03bdda5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcccd9fca605d1d4c462df5c3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 15 12:09:57 2008 +0000 ole32: Partially implement ServerRpcChannelBuffer_GetDestCtx. --- dlls/ole32/rpc.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 027d0ee..e2f56fc 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1026,8 +1026,13 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) { - FIXME("(%p,%p), stub!\n", pdwDestContext, ppvDestContext); - return E_FAIL; + WARN("(%p,%p), stub!\n", pdwDestContext, ppvDestContext); + + /* FIXME: implement this by storing the dwDestContext and pvDestContext + * values passed into IMarshal_MarshalInterface and returning them here */ + *pdwDestContext = MSHCTX_DIFFERENTMACHINE; + *ppvDestContext = NULL; + return S_OK; } static HRESULT WINAPI RpcChannelBuffer_IsConnected(LPRPCCHANNELBUFFER iface)

1 0

Allan Tong : wined3d: Set swapchain container before flagging front buffer with SFLAG_INDRAWABLE .
by Alexandre Julliard 15 Jan '08

15 Jan '08

Module: wine Branch: master Commit: 7b40fd645d7e86f1905e8fdbcddee78bdaef74a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b40fd645d7e86f1905e8fdbc… Author: Allan Tong <actong88(a)gmail.com> Date: Mon Jan 14 21:29:14 2008 -0500 wined3d: Set swapchain container before flagging front buffer with SFLAG_INDRAWABLE. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 84cbe89..a17dc9e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1495,8 +1495,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic &object->frontBuffer, NULL /* pShared (always null)*/); if (object->frontBuffer != NULL) { - IWineD3DSurface_ModifyLocation(object->frontBuffer, SFLAG_INDRAWABLE, TRUE); IWineD3DSurface_SetContainer(object->frontBuffer, (IWineD3DBase *)object); + IWineD3DSurface_ModifyLocation(object->frontBuffer, SFLAG_INDRAWABLE, TRUE); } else { ERR("Failed to create the front buffer\n"); goto error;

1 0

Rob Shearman : rpcrt4: Allow NULL networkaddr and endpoint in rpcrt4_np_get_top_of_tower.
by Alexandre Julliard 15 Jan '08

15 Jan '08

Module: wine Branch: master Commit: 1a3d7c77a51f3d9d144d33bcee19bb81634364c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3d7c77a51f3d9d144d33bce… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 15 12:09:52 2008 +0000 rpcrt4: Allow NULL networkaddr and endpoint in rpcrt4_np_get_top_of_tower. Add tests for this. --- dlls/rpcrt4/rpc_transport.c | 14 ++++++++++---- dlls/rpcrt4/tests/rpc.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4fda513..eb6bd8d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -422,8 +422,8 @@ static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data, TRACE("(%p, %s, %s)\n", tower_data, networkaddr, endpoint); - networkaddr_size = strlen(networkaddr) + 1; - endpoint_size = strlen(endpoint) + 1; + networkaddr_size = networkaddr ? strlen(networkaddr) + 1 : 1; + endpoint_size = endpoint ? strlen(endpoint) + 1 : 1; size = sizeof(*smb_floor) + endpoint_size + sizeof(*nb_floor) + networkaddr_size; if (!tower_data) @@ -437,7 +437,10 @@ static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data, smb_floor->protid = EPM_PROTOCOL_SMB; smb_floor->count_rhs = endpoint_size; - memcpy(tower_data, endpoint, endpoint_size); + if (endpoint) + memcpy(tower_data, endpoint, endpoint_size); + else + tower_data[0] = 0; tower_data += endpoint_size; nb_floor = (twr_empty_floor_t *)tower_data; @@ -448,7 +451,10 @@ static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data, nb_floor->protid = EPM_PROTOCOL_NETBIOS; nb_floor->count_rhs = networkaddr_size; - memcpy(tower_data, networkaddr, networkaddr_size); + if (networkaddr) + memcpy(tower_data, networkaddr, networkaddr_size); + else + tower_data[0] = 0; tower_data += networkaddr_size; return size; diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 17721d8..e92b057 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -374,6 +374,16 @@ static void test_towers(void) I_RpcFree(address); I_RpcFree(tower); + + /* test the behaviour for np with no address */ + ret = TowerConstruct(&mapi_if_id, &ndr_syntax, "ncacn_np", "\\pipe\\test", NULL, &tower); + ok(ret == RPC_S_OK, "TowerConstruct failed with error %ld\n", ret); + ret = TowerExplode(tower, NULL, NULL, NULL, NULL, &address); + ok(ret == RPC_S_OK, "TowerExplode failed with error %ld\n", ret); + ok(!strcmp(address, ""), "address was \"%s\" instead of \"\"\n", address); + + I_RpcFree(address); + I_RpcFree(tower); } static void test_I_RpcMapWin32Status(void)

1 0

Jonathan Ernst : loader: Updated French man page.
by Alexandre Julliard 15 Jan '08

15 Jan '08

Module: wine Branch: master Commit: ff72b544455733a5d57e3e98eabbb3592a792258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff72b544455733a5d57e3e98e… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Fri Jan 11 14:40:09 2008 +0100 loader: Updated French man page. --- loader/wine.fr.man.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/wine.fr.man.in b/loader/wine.fr.man.in index e497ae3..17c727e 100644 --- a/loader/wine.fr.man.in +++ b/loader/wine.fr.man.in @@ -168,7 +168,7 @@ dans l'espace d'adressage d'un processus : Les dlls natives de Windows ( .I builtin ). Le type peut être abrégé avec la première lettre du type ( .I n, b -). Chaque séquence d'ordre doit être séparé par une virgule. +). La bibliothèque peut également être désactivée (''). Chaque séquence d'ordre doit être séparé par une virgule. .RS .PP Chaque dll peut avoir son ordre de chargement propre. L'orde de chargement @@ -198,12 +198,12 @@ WINEDLLOVERRIDES="comdlg32,shell32=n;c:\(rs\(rsfoo\(rs\(rsbar\(rs\(rsbaz=b" Tente de charger les bibliothèques windows natives comdlg32 et shell32. De plus, si une application demande le chargement de c:\(rsfoo\(rsbar\(rsbaz.dll, chargera la bibliothèque fournie baz. .TP -WINEDLLOVERRIDES="comdlg32=b,n;shell32=b;comctl32=n" +WINEDLLOVERRIDES="comdlg32=b,n;shell32=b;comctl32=n;oleaut32=" .br Tente de charger la bibliothèque fournie comdlg32 en premier, puis essaie la version native ensuite si le chargement de la version fournie échoue. Dans tous les cas, la version fournie de shell32 et la -version native de comctl32 sera chargée. +version native de comctl32 sera chargée. Oleaut32 sera désactivée. .RE .TP .I DISPLAY

1 0