March 2010 - Wine-commits - list.winehq.org

Nikolay Sivov : shlwapi: Implement IUnknown_QueryServiceExec with tests.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: c9f2007e7250c489fbe6c1b935a27fe6d5ed8af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f2007e7250c489fbe6c1b93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 03:34:07 2010 +0300 shlwapi: Implement IUnknown_QueryServiceExec with tests. --- dlls/shlwapi/ordinal.c | 52 +++++++-- dlls/shlwapi/tests/ordinal.c | 274 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 316 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9f2007e7250c489fbe6c…

1 0

Paul Vriens : mmdevapi/tests: Fix test failure on some Vista boxes.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 7a80e976015f67521983dc16cdb52d8e41fd6382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a80e976015f67521983dc16c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 25 13:56:35 2010 +0100 mmdevapi/tests: Fix test failure on some Vista boxes. --- dlls/mmdevapi/tests/render.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index cf19129..23c158b 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -200,7 +200,8 @@ static void test_audioclient(IAudioClient *ac) hr = IAudioClient_SetEventHandle(ac, handle); ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED || - hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) + hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || + hr == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME) /* Some Vista */ , "SetEventHandle returns %08x\n", hr); CloseHandle(handle);

1 0

André Hentschel : kernel32: Make process traces aware of 64-bit.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: a9a7d963c2c3c9c80b0267ce5872a61d225074e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a7d963c2c3c9c80b0267ce5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 25 14:47:38 2010 +0100 kernel32: Make process traces aware of 64-bit. --- dlls/kernel32/process.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 115cd05..30e7ca4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2058,8 +2058,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, else switch (binary_info.type) { case BINARY_PE: - TRACE( "starting %s as Win32 binary (%p-%p)\n", - debugstr_w(name), binary_info.res_start, binary_info.res_end ); + TRACE( "starting %s as Win%d binary (%p-%p)\n", + debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, + binary_info.res_start, binary_info.res_end ); retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); break; @@ -2146,8 +2147,9 @@ static void exec_process( LPCWSTR name ) switch (binary_info.type) { case BINARY_PE: - TRACE( "starting %s as Win32 binary (%p-%p)\n", - debugstr_w(name), binary_info.res_start, binary_info.res_end ); + TRACE( "starting %s as Win%d binary (%p-%p)\n", + debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, + binary_info.res_start, binary_info.res_end ); create_process( hFile, name, GetCommandLineW(), NULL, NULL, NULL, NULL, FALSE, 0, &startup_info, &info, NULL, &binary_info, TRUE ); break;

1 0

Damjan Jovanovic : include: Define IoGetCurrentIrpStackLocation based on NONAMELESSUNION and NONAMELESSSTRUCT .
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 394839fecfd09301f011a9af37910fe0985b0131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=394839fecfd09301f011a9af3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Mar 25 16:24:09 2010 +0200 include: Define IoGetCurrentIrpStackLocation based on NONAMELESSUNION and NONAMELESSSTRUCT. --- include/ddk/wdm.h | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 95a27a8..102dda8 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1021,7 +1021,19 @@ typedef enum _MM_SYSTEM_SIZE NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); -#define IoGetCurrentIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.CurrentStackLocation) +#ifdef NONAMELESSUNION +# ifdef NONAMELESSSTRUCT +# define IoGetCurrentIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.s.u2.CurrentStackLocation) +# else +# define IoGetCurrentIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.u2.CurrentStackLocation) +# endif +#else +# ifdef NONAMELESSSTRUCT +# define IoGetCurrentIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.s.CurrentStackLocation) +# else +# define IoGetCurrentIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.CurrentStackLocation) +# endif +#endif #define KernelMode 0 #define UserMode 1

1 0

Damjan Jovanovic : mountmgr: Frame device service functions with IoGetCurrentIrpStackLocation and IoCompleteRequest .
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 63bc9c484a1c5c53e733014e7b874172201d603c URL: http://source.winehq.org/git/wine.git/?a=commit;h=63bc9c484a1c5c53e733014e7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Mar 23 18:08:03 2010 +0200 mountmgr: Frame device service functions with IoGetCurrentIrpStackLocation and IoCompleteRequest. --- dlls/mountmgr.sys/device.c | 3 ++- dlls/mountmgr.sys/mountmgr.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index bf2bcee..ba5a02b 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -858,7 +858,7 @@ NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, ch /* handler for ioctls on the harddisk device */ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) { - IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u2.CurrentStackLocation; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct disk_device *dev = device->DeviceExtension; TRACE( "ioctl %x insize %u outsize %u\n", @@ -904,6 +904,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) } LeaveCriticalSection( &device_section ); + IoCompleteRequest( irp, IO_NO_INCREMENT ); return irp->IoStatus.u.Status; } diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index c92e4a4..87d9007 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -351,7 +351,7 @@ done: /* handler for ioctls on the mount manager device */ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) { - IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u2.CurrentStackLocation; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); TRACE( "ioctl %x insize %u outsize %u\n", irpsp->Parameters.DeviceIoControl.IoControlCode, @@ -390,6 +390,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; break; } + IoCompleteRequest( irp, IO_NO_INCREMENT ); return irp->IoStatus.u.Status; }

1 0

Ilya Basin : shell32: Enable dde for SEE_MASK_CLASSALL.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 9ff19d1d48018e71e75ee44f80a2b76870dbaaaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff19d1d48018e71e75ee44f8… Author: Ilya Basin <basinilya(a)gmail.com> Date: Wed Mar 24 21:05:21 2010 +0300 shell32: Enable dde for SEE_MASK_CLASSALL. --- dlls/shell32/shlexec.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index a81cada..19ad1b3 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -467,6 +467,24 @@ end: return found; } +/************************************************************************* + * SHELL_FindExecutableByOperation [Internal] + * + * called from SHELL_FindExecutable or SHELL_execute_class + * in/out: + * filetype a buffer, big enough, to get the key name to do actually the + * command "WordPad.Document.1\\shell\\open\\command" + * passed as "WordPad.Document.1" + * in: + * lpOperation the operation on it (open) + * commandlen the size of command buffer (in bytes) + * out: + * command a buffer, to store the command to do the + * operation on the file + * key a buffer, big enough, to get the key name to do actually the + * command "WordPad.Document.1\\shell\\open\\command" + * Can be NULL + */ static UINT SHELL_FindExecutableByOperation(LPCWSTR lpOperation, LPWSTR key, LPWSTR filetype, LPWSTR command, LONG commandlen) { static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0}; @@ -1294,17 +1312,25 @@ static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei ) return r; } +static UINT_PTR SHELL_quote_and_execute( LPCWSTR wcmd, LPCWSTR wszParameters, LPCWSTR lpstrProtocol, LPCWSTR wszApplicationName, LPWSTR env, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ); + static UINT_PTR SHELL_execute_class( LPCWSTR wszApplicationName, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) { + static const WCHAR wQuote[] = {'"',0}; static const WCHAR wSpace[] = {' ',0}; - WCHAR execCmd[1024], wcmd[1024]; + WCHAR execCmd[1024], filetype[1024]; /* launch a document by fileclass like 'WordPad.Document.1' */ /* the Commandline contains 'c:\Path\wordpad.exe "%1"' */ /* FIXME: wcmd should not be of a fixed size. Fixed to 1024, MAX_PATH is way too short! */ ULONG cmask=(psei->fMask & SEE_MASK_CLASSALL); DWORD resultLen; BOOL done; + UINT_PTR rslt; + /* FIXME: remove following block when SHELL_quote_and_execute supports hkeyClass parameter */ + if (cmask != SEE_MASK_CLASSNAME) + { + WCHAR wcmd[1024]; HCR_GetExecuteCommandW((cmask == SEE_MASK_CLASSKEY) ? psei->hkeyClass : NULL, (cmask == SEE_MASK_CLASSNAME) ? psei->lpClass: NULL, psei->lpVerb, @@ -1318,11 +1344,30 @@ static UINT_PTR SHELL_execute_class( LPCWSTR wszApplicationName, LPSHELLEXECUTEI if (!done && wszApplicationName[0]) { strcatW(wcmd, wSpace); - strcatW(wcmd, wszApplicationName); + if (*wszApplicationName != '"') + { + strcatW(wcmd, wQuote); + strcatW(wcmd, wszApplicationName); + strcatW(wcmd, wQuote); + } + else + strcatW(wcmd, wszApplicationName); } if (resultLen > sizeof(wcmd)/sizeof(WCHAR)) ERR("Argify buffer not large enough... truncating\n"); return execfunc(wcmd, NULL, FALSE, psei, psei_out); + } + + strcpyW(filetype, psei->lpClass); + rslt = SHELL_FindExecutableByOperation(psei->lpVerb, NULL, filetype, execCmd, sizeof(execCmd)); + + TRACE("SHELL_FindExecutableByOperation returned %u (%s, %s)\n", (unsigned int)rslt, debugstr_w(filetype), debugstr_w(execCmd)); + if (33 > rslt) + return rslt; + rslt = SHELL_quote_and_execute( execCmd, wszEmpty, filetype, + wszApplicationName, NULL, psei, + psei_out, execfunc ); + return rslt; } static BOOL SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameters, DWORD parametersLen, LPWSTR wszApplicationName, DWORD dwApplicationNameLen )

1 0

Piotr Caban : msvcr90: Implement _encode_pointer and _decode_pointer.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: c452249e0050a6297ff0ed87c550044d341c014b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c452249e0050a6297ff0ed87c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 25 11:06:29 2010 +0100 msvcr90: Implement _encode_pointer and _decode_pointer. --- configure | 4 ++-- configure.ac | 4 ++-- dlls/msvcr80/Makefile.in | 3 +-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/Makefile.in | 1 - dlls/msvcr90/msvcr90.c | 21 +++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcr90/tests/msvcr90.c | 26 +++++++++++++++++++++++++- 8 files changed, 55 insertions(+), 12 deletions(-) diff --git a/configure b/configure index ed41bb5..60dc4ab 100755 --- a/configure +++ b/configure @@ -14377,8 +14377,8 @@ wine_fn_config_test dlls/mstask/tests mstask_test wine_fn_config_dll msvcirt enable_msvcirt wine_fn_config_dll msvcr70 enable_msvcr70 msvcr70 wine_fn_config_dll msvcr71 enable_msvcr71 msvcr71 -wine_fn_config_dll msvcr80 enable_msvcr80 msvcr80 -wine_fn_config_dll msvcr90 enable_msvcr90 msvcr90 +wine_fn_config_dll msvcr80 enable_msvcr80 +wine_fn_config_dll msvcr90 enable_msvcr90 wine_fn_config_test dlls/msvcr90/tests msvcr90_test wine_fn_config_dll msvcrt enable_msvcrt msvcrt wine_fn_config_test dlls/msvcrt/tests msvcrt_test diff --git a/configure.ac b/configure.ac index 31c7170..fe11a04 100644 --- a/configure.ac +++ b/configure.ac @@ -2398,8 +2398,8 @@ WINE_CONFIG_TEST(dlls/mstask/tests) WINE_CONFIG_DLL(msvcirt) WINE_CONFIG_DLL(msvcr70,,[msvcr70]) WINE_CONFIG_DLL(msvcr71,,[msvcr71]) -WINE_CONFIG_DLL(msvcr80,,[msvcr80]) -WINE_CONFIG_DLL(msvcr90,,[msvcr90]) +WINE_CONFIG_DLL(msvcr80) +WINE_CONFIG_DLL(msvcr90) WINE_CONFIG_TEST(dlls/msvcr90/tests) WINE_CONFIG_DLL(msvcrt,,[msvcrt]) WINE_CONFIG_TEST(dlls/msvcrt/tests) diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index 31dae6a..a448e41 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -3,8 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvcr80.dll -IMPORTLIB = msvcr80 -IMPORTS = msvcrt msvcr90 kernel32 +IMPORTS = msvcrt kernel32 C_SRCS = \ msvcr80.c diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7c1e100..13a7fa1 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -360,7 +360,7 @@ @ stub _cwscanf_s @ stub _cwscanf_s_l @ extern _daylight msvcrt._daylight -@ stub _decode_pointer +@ cdecl _decode_pointer(ptr) msvcr90._decode_pointer @ cdecl _difftime32(long long) msvcrt._difftime32 @ cdecl _difftime64(long long) msvcrt._difftime64 @ stub _dosmaperr @@ -370,7 +370,7 @@ @ stub _dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ stub _ecvt_s -@ stub _encode_pointer +@ cdecl _encode_pointer(ptr) msvcr90._encode_pointer @ stub _encoded_null @ cdecl _endthread() msvcrt._endthread @ cdecl _endthreadex(long) msvcrt._endthreadex diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 029e2c0..613edab 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvcr90.dll -IMPORTLIB = msvcr90 IMPORTS = msvcrt kernel32 C_SRCS = \ diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index e7baa6f..97d0921 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -44,6 +44,27 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) return TRUE; } +/********************************************************************* + * _decode_pointer (MSVCR90.@) + * + * cdecl version of DecodePointer + * + */ +void * CDECL MSVCR90_decode_pointer(void * ptr) +{ + return DecodePointer(ptr); +} + +/********************************************************************* + * _encode_pointer (MSVCR90.@) + * + * cdecl version of EncodePointer + * + */ +void * CDECL MSVCR90_encode_pointer(void * ptr) +{ + return EncodePointer(ptr); +} /********************************************************************* * _initterm_e (MSVCR90.@) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f95f92b..8c3138b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -352,7 +352,7 @@ @ stub _cwscanf_s @ stub _cwscanf_s_l @ extern _daylight msvcrt._daylight -@ stub _decode_pointer +@ cdecl _decode_pointer(ptr) MSVCR90_decode_pointer @ cdecl _difftime32(long long) msvcrt._difftime32 @ cdecl _difftime64(long long) msvcrt._difftime64 @ stub _dosmaperr @@ -362,7 +362,7 @@ @ stub _dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ stub _ecvt_s -@ stub _encode_pointer +@ cdecl _encode_pointer(ptr) MSVCR90_encode_pointer @ stub _encoded_null @ cdecl _endthread() msvcrt._endthread @ cdecl _endthreadex(long) msvcrt._endthreadex diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index ddfd781..d8b8407 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -27,6 +27,8 @@ typedef int (__cdecl *_INITTERM_E_FN)(void); static int (__cdecl *p_initterm_e)(_INITTERM_E_FN *table, _INITTERM_E_FN *end); +static void* (__cdecl *p_encode_pointer)(void *); +static void* (__cdecl *p_decode_pointer)(void *); int cb_called[4]; /* ########## */ @@ -130,6 +132,26 @@ static void test__initterm_e(void) } +static void test__encode_pointer(void) +{ + void *ptr, *res; + + if(!p_encode_pointer || !p_decode_pointer) { + win_skip("_encode_pointer or _decode_pointer not found\n"); + return; + } + + ptr = (void*)0xdeadbeef; + res = p_encode_pointer(ptr); + res = p_decode_pointer(res); + ok(res == ptr, "Pointers are different after encoding and decoding\n"); + + ptr = p_encode_pointer(p_encode_pointer); + res = EncodePointer(p_encode_pointer); + ok(ptr == res, "_encode_pointer produced different result than EncodePointer\n"); + ok(p_decode_pointer(ptr) == p_encode_pointer, "Error decoding pointer\n"); +} + /* ########## */ START_TEST(msvcr90) @@ -144,7 +166,9 @@ START_TEST(msvcr90) } p_initterm_e = (void *) GetProcAddress(hcrt, "_initterm_e"); + p_encode_pointer = (void *) GetProcAddress(hcrt, "_encode_pointer"); + p_decode_pointer = (void *) GetProcAddress(hcrt, "_decode_pointer"); test__initterm_e(); - + test__encode_pointer(); }

1 0

Piotr Caban : msvcr90: Added _encoded_null() implementation.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: d91b71e0df2f707939d535d20ac82d3b9a68922c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91b71e0df2f707939d535d20… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 25 11:09:13 2010 +0100 msvcr90: Added _encoded_null() implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.c | 10 ++++++++++ dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 9 +++++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 13a7fa1..7294d89 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -371,7 +371,7 @@ @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ stub _ecvt_s @ cdecl _encode_pointer(ptr) msvcr90._encode_pointer -@ stub _encoded_null +@ cdecl _encoded_null() msvcr90._encoded_null @ cdecl _endthread() msvcrt._endthread @ cdecl _endthreadex(long) msvcrt._endthreadex @ extern _environ msvcrt._environ diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 97d0921..1bada8b 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -67,6 +67,16 @@ void * CDECL MSVCR90_encode_pointer(void * ptr) } /********************************************************************* + * _encoded_null (MSVCR90.@) + */ +void * CDECL _encoded_null(void) +{ + TRACE("\n"); + + return MSVCR90_encode_pointer(NULL); +} + +/********************************************************************* * _initterm_e (MSVCR90.@) * * call an array of application initialization functions and report the return value diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8c3138b..9feaa47 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -363,7 +363,7 @@ @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ stub _ecvt_s @ cdecl _encode_pointer(ptr) MSVCR90_encode_pointer -@ stub _encoded_null +@ cdecl _encoded_null() @ cdecl _endthread() msvcrt._endthread @ cdecl _endthreadex(long) msvcrt._endthreadex @ extern _environ msvcrt._environ diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index d8b8407..f332622 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -29,6 +29,8 @@ typedef int (__cdecl *_INITTERM_E_FN)(void); static int (__cdecl *p_initterm_e)(_INITTERM_E_FN *table, _INITTERM_E_FN *end); static void* (__cdecl *p_encode_pointer)(void *); static void* (__cdecl *p_decode_pointer)(void *); +static void* (__cdecl *p_encoded_null)(void); + int cb_called[4]; /* ########## */ @@ -136,8 +138,8 @@ static void test__encode_pointer(void) { void *ptr, *res; - if(!p_encode_pointer || !p_decode_pointer) { - win_skip("_encode_pointer or _decode_pointer not found\n"); + if(!p_encode_pointer || !p_decode_pointer || !p_encoded_null) { + win_skip("_encode_pointer, _decode_pointer or _encoded_null not found\n"); return; } @@ -150,6 +152,8 @@ static void test__encode_pointer(void) res = EncodePointer(p_encode_pointer); ok(ptr == res, "_encode_pointer produced different result than EncodePointer\n"); ok(p_decode_pointer(ptr) == p_encode_pointer, "Error decoding pointer\n"); + + ok(p_encoded_null() == p_encode_pointer(NULL), "Error encoding null\n"); } /* ########## */ @@ -168,6 +172,7 @@ START_TEST(msvcr90) p_initterm_e = (void *) GetProcAddress(hcrt, "_initterm_e"); p_encode_pointer = (void *) GetProcAddress(hcrt, "_encode_pointer"); p_decode_pointer = (void *) GetProcAddress(hcrt, "_decode_pointer"); + p_encoded_null = (void *) GetProcAddress(hcrt, "_encoded_null"); test__initterm_e(); test__encode_pointer();

1 0

Alexandre Julliard : makefiles: Output all the dll install rules explicitly for each module.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 82b743ffad556a737257eaad89eb3759205a7ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b743ffad556a737257eaad8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:15:32 2010 +0100 makefiles: Output all the dll install rules explicitly for each module. --- Makefile.in | 6 ++---- aclocal.m4 | 23 ++++++++++++++++++----- configure | 21 +++++++++++++++++---- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in index c8baf6d..743919c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,15 +36,13 @@ ALL_TOP_DIRS = @ALL_TOP_DIRS@ BUILDSUBDIRS = \ libs/wine \ $(ALL_TOOL_DIRS) \ - $(ALL_TOP_DIRS) \ - $(ALL_DLL_DIRS) + $(ALL_TOP_DIRS) # Sub-directories to run make install/uninstall into INSTALLSUBDIRS = \ libs/wine \ $(ALL_TOOL_DIRS) \ - $(ALL_TOP_DIRS) \ - $(ALL_DLL_DIRS) + $(ALL_TOP_DIRS) # Sub-directories that don't have a makefile EXTRASUBDIRS = dlls libs diff --git a/aclocal.m4 b/aclocal.m4 index 7a86834..128c813 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -209,14 +209,23 @@ wine_fn_config_dll () wine_fn_append_file ALL_DIRS dlls/$ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"dlls/$ac_dir dlls/$ac_dir/__install__ dlls/$ac_dir/__install-lib__ dlls/$ac_dir/__install-dev__: __builddeps__ dlls/$ac_dir/Makefile -dlls/$ac_dir/__clean__ dlls/$ac_dir/__uninstall__ dlls/$ac_dir: dlls/$ac_dir/Makefile +"dlls/$ac_dir/__clean__: dlls/$ac_dir/Makefile dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.status dlls/Makedll.rules \$(MAKEDEP) @./config.status --file dlls/$ac_dir/Makefile && cd dlls/$ac_dir && \$(MAKE) depend" + AS_VAR_IF([$ac_enable],[no], dnl enable_win16 is special in that it disables import libs too [test "$ac_enable" != enable_win16 || return 0], - [wine_fn_append_file ALL_DLL_DIRS dlls/$ac_dir]) + [wine_fn_append_file ALL_DLL_DIRS dlls/$ac_dir + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"all: dlls/$ac_dir +dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ +install:: dlls/$ac_dir/Makefile __builddeps__ + @cd dlls/$ac_dir && \$(MAKE) install +install-lib:: dlls/$ac_dir/Makefile __builddeps__ + @cd dlls/$ac_dir && \$(MAKE) install-lib +uninstall:: dlls/$ac_dir/Makefile + @cd dlls/$ac_dir && \$(MAKE) uninstall"]) if test -n "$ac_implibsrc" then @@ -227,14 +236,18 @@ $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps $ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile @cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\` $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/Makefile dummy - @cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\`" + @cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\` +install-dev:: dlls/$ac_dir/Makefile __builddeps__ + @cd dlls/$ac_dir && \$(MAKE) install-dev" elif test -n "$ac_implib" then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__builddeps__: $ac_file.$IMPLIBEXT __buildcrossdeps__: $ac_file.cross.a $ac_file.$IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps - @cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\`" + @cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\` +install-dev:: dlls/$ac_dir/Makefile __builddeps__ + @cd dlls/$ac_dir && \$(MAKE) install-dev" if test "$ac_dir" != "$ac_implib" then diff --git a/configure b/configure index 15a589e..3d6f4f6 100755 --- a/configure +++ b/configure @@ -13932,15 +13932,24 @@ wine_fn_config_dll () wine_fn_append_file ALL_DIRS dlls/$ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"dlls/$ac_dir dlls/$ac_dir/__install__ dlls/$ac_dir/__install-lib__ dlls/$ac_dir/__install-dev__: __builddeps__ dlls/$ac_dir/Makefile -dlls/$ac_dir/__clean__ dlls/$ac_dir/__uninstall__ dlls/$ac_dir: dlls/$ac_dir/Makefile +"dlls/$ac_dir/__clean__: dlls/$ac_dir/Makefile dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.status dlls/Makedll.rules \$(MAKEDEP) @./config.status --file dlls/$ac_dir/Makefile && cd dlls/$ac_dir && \$(MAKE) depend" + eval as_val=\$$ac_enable if test "x$as_val" = x""no; then : test "$ac_enable" != enable_win16 || return 0 else wine_fn_append_file ALL_DLL_DIRS dlls/$ac_dir + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"all: dlls/$ac_dir +dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ +install:: dlls/$ac_dir/Makefile __builddeps__ + @cd dlls/$ac_dir && \$(MAKE) install +install-lib:: dlls/$ac_dir/Makefile __builddeps__ + @cd dlls/$ac_dir && \$(MAKE) install-lib +uninstall:: dlls/$ac_dir/Makefile + @cd dlls/$ac_dir && \$(MAKE) uninstall" fi if test -n "$ac_implibsrc" @@ -13952,14 +13961,18 @@ $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps $ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile @cd dlls/$ac_dir && \$(MAKE) \`basename \$@\` $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/Makefile dummy - @cd dlls/$ac_dir && \$(MAKE) \`basename \$@\`" + @cd dlls/$ac_dir && \$(MAKE) \`basename \$@\` +install-dev:: dlls/$ac_dir/Makefile __builddeps__ + @cd dlls/$ac_dir && \$(MAKE) install-dev" elif test -n "$ac_implib" then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__builddeps__: $ac_file.$IMPLIBEXT __buildcrossdeps__: $ac_file.cross.a $ac_file.$IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps - @cd dlls/$ac_dir && \$(MAKE) \`basename \$@\`" + @cd dlls/$ac_dir && \$(MAKE) \`basename \$@\` +install-dev:: dlls/$ac_dir/Makefile __builddeps__ + @cd dlls/$ac_dir && \$(MAKE) install-dev" if test "$ac_dir" != "$ac_implib" then

1 0

Alexandre Julliard : makefiles: Output all the tool install rules explicitly for each module.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 6dbe7a038884d375f284f52101c93d94e3808c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dbe7a038884d375f284f5210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:51:24 2010 +0100 makefiles: Output all the tool install rules explicitly for each module. --- Makefile.in | 14 ++------------ aclocal.m4 | 23 ++++++++++++++++++++--- configure | 24 +++++++++++++++++++----- 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/Makefile.in b/Makefile.in index 743919c..535f251 100644 --- a/Makefile.in +++ b/Makefile.in @@ -29,19 +29,16 @@ MODULE = none ALL_DIRS = @ALL_DIRS@ ALL_DLL_DIRS = @ALL_DLL_DIRS@ -ALL_TOOL_DIRS = @ALL_TOOL_DIRS@ ALL_TOP_DIRS = @ALL_TOP_DIRS@ # Sub-directories to run make all into BUILDSUBDIRS = \ libs/wine \ - $(ALL_TOOL_DIRS) \ $(ALL_TOP_DIRS) # Sub-directories to run make install/uninstall into INSTALLSUBDIRS = \ libs/wine \ - $(ALL_TOOL_DIRS) \ $(ALL_TOP_DIRS) # Sub-directories that don't have a makefile @@ -156,14 +153,14 @@ manpages htmlpages sgmlpages xmlpages: dummy # Dependencies between directories # dependencies needed to build any dll or program -__tooldeps__: libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS) +__tooldeps__: libs/port libs/wine libs/wpp __builddeps__ __buildcrossdeps__: __tooldeps__ include .PHONY: __tooldeps__ __builddeps__ __buildcrossdeps__ loader server: libs/port libs/wine tools fonts: tools include: tools/widl -libs/wine $(ALL_TOOL_DIRS): libs/port +libs/wine: libs/port tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp @@ -173,13 +170,6 @@ include/__install__ include/__install-dev__: include libs/wine/__install__ libs/wine/__install-lib__ libs/wine/__install-dev__: libs/wine loader/__install__ loader/__install-lib__: libs/port libs/wine tools server/__install__ server/__install-lib__: libs/port libs/wine tools -tools/__install__ tools/__install-lib__ tools/__install-dev__: tools -tools/widl/__install__ tools/widl/__install-dev__: tools/widl -tools/winebuild/__install__ tools/winebuild/__install-dev__: tools/winebuild -tools/winedump/__install__ tools/winedump/__install-dev__: tools/winedump -tools/winegcc/__install__ tools/winegcc/__install-dev__: tools/winegcc -tools/wmc/__install__ tools/wmc/__install-dev__: tools/wmc -tools/wrc/__install__ tools/wrc/__install-dev__: tools/wrc tools/__depend__: $(MAKEDEP) $(MAKEDEP): include/config.h tools/Makefile diff --git a/aclocal.m4 b/aclocal.m4 index 128c813..3807ff8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -149,7 +149,6 @@ AC_SUBST(ALL_SYMLINKS,"") AC_SUBST(ALL_DIRS,"") AC_SUBST(ALL_TOP_DIRS,"") AC_SUBST(ALL_DLL_DIRS,"") -AC_SUBST(ALL_TOOL_DIRS,"") AC_SUBST(ALL_TEST_BINARIES,"") AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") @@ -328,10 +327,28 @@ wine_fn_config_tool () fi wine_fn_append_file ALL_DIRS $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__clean__ $ac_dir/__install__ $ac_dir/__install-dev__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile +"$ac_dir/__clean__: $ac_dir/Makefile $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status $ac_deps @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" - AS_VAR_IF([enable_tools],[no],,[wine_fn_append_file ALL_TOOL_DIRS $ac_dir]) + + AS_VAR_IF([enable_tools],[no],,[case $ac_dir in + dnl tools directory has both install-lib and install-dev + tools) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install:: $ac_dir + @cd $ac_dir && \$(MAKE) install +install-lib:: $ac_dir + @cd $ac_dir && \$(MAKE) install-lib +install-dev:: $ac_dir + @cd $ac_dir && \$(MAKE) install-dev" ;; + *) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install install-dev:: $ac_dir + @cd $ac_dir && \$(MAKE) install" ;; + esac + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"uninstall:: $ac_dir/Makefile + @cd $ac_dir && \$(MAKE) uninstall +all __tooldeps__: $ac_dir +$ac_dir: $ac_dir/Makefile libs/port"]) }]) dnl **** Define helper function to append a file to a makefile file list **** diff --git a/configure b/configure index 3d6f4f6..f771fa9 100755 --- a/configure +++ b/configure @@ -598,7 +598,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS ALL_PROGRAM_BIN_INSTALL_DIRS ALL_TEST_BINARIES -ALL_TOOL_DIRS ALL_DLL_DIRS ALL_TOP_DIRS ALL_DIRS @@ -13864,8 +13863,6 @@ ALL_TOP_DIRS="" ALL_DLL_DIRS="" -ALL_TOOL_DIRS="" - ALL_TEST_BINARIES="" ALL_PROGRAM_BIN_INSTALL_DIRS="" @@ -14061,13 +14058,30 @@ wine_fn_config_tool () fi wine_fn_append_file ALL_DIRS $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__clean__ $ac_dir/__install__ $ac_dir/__install-dev__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile +"$ac_dir/__clean__: $ac_dir/Makefile $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status $ac_deps @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + if test "x$enable_tools" = x""no; then : else - wine_fn_append_file ALL_TOOL_DIRS $ac_dir + case $ac_dir in + tools) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install:: $ac_dir + @cd $ac_dir && \$(MAKE) install +install-lib:: $ac_dir + @cd $ac_dir && \$(MAKE) install-lib +install-dev:: $ac_dir + @cd $ac_dir && \$(MAKE) install-dev" ;; + *) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install install-dev:: $ac_dir + @cd $ac_dir && \$(MAKE) install" ;; + esac + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"uninstall:: $ac_dir/Makefile + @cd $ac_dir && \$(MAKE) uninstall +all __tooldeps__: $ac_dir +$ac_dir: $ac_dir/Makefile libs/port" fi } ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd"

1 0