wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Jacek Caban : atlthunk/tests: Add tests.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 2f9922903ee79b2c56c413c84e3507aa5cfb22ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f9922903ee79b2c56c413c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 22:06:22 2019 +0100 atlthunk/tests: Add tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/atlthunk/tests/Makefile.in | 6 ++++ dlls/atlthunk/tests/atlthunk.c | 62 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) diff --git a/configure b/configure index b86e260..f3739a4 100755 --- a/configure +++ b/configure @@ -19359,6 +19359,7 @@ wine_fn_config_makefile dlls/atl80 enable_atl80 wine_fn_config_makefile dlls/atl80/tests enable_tests wine_fn_config_makefile dlls/atl90 enable_atl90 wine_fn_config_makefile dlls/atlthunk enable_atlthunk +wine_fn_config_makefile dlls/atlthunk/tests enable_tests wine_fn_config_makefile dlls/atmlib enable_atmlib wine_fn_config_makefile dlls/authz enable_authz wine_fn_config_makefile dlls/avicap32 enable_avicap32 diff --git a/configure.ac b/configure.ac index da14848..f7eb42b 100644 --- a/configure.ac +++ b/configure.ac @@ -3094,6 +3094,7 @@ WINE_CONFIG_MAKEFILE(dlls/atl80) WINE_CONFIG_MAKEFILE(dlls/atl80/tests) WINE_CONFIG_MAKEFILE(dlls/atl90) WINE_CONFIG_MAKEFILE(dlls/atlthunk) +WINE_CONFIG_MAKEFILE(dlls/atlthunk/tests) WINE_CONFIG_MAKEFILE(dlls/atmlib) WINE_CONFIG_MAKEFILE(dlls/authz) WINE_CONFIG_MAKEFILE(dlls/avicap32) diff --git a/dlls/atlthunk/tests/Makefile.in b/dlls/atlthunk/tests/Makefile.in new file mode 100644 index 0000000..9da3a96 --- /dev/null +++ b/dlls/atlthunk/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = atlthunk.dll +IMPORTS = atlthunk + + +C_SRCS = \ + atlthunk.c diff --git a/dlls/atlthunk/tests/atlthunk.c b/dlls/atlthunk/tests/atlthunk.c new file mode 100644 index 0000000..b316ae1 --- /dev/null +++ b/dlls/atlthunk/tests/atlthunk.c @@ -0,0 +1,62 @@ +/* + * Copyright 2019 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include "atlthunk.h" +#include "wine/test.h" + +static LRESULT WINAPI test_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + ok(msg == 1, "msg = %u\n", msg); + ok(wparam == 2, "wparam = %lu\n", wparam); + ok(lparam == 3, "lparam = %lu\n", lparam); + return (LRESULT)hwnd | 0x1000; +} + +static void test_thunk_proc(void) +{ + AtlThunkData_t *thunks[513]; + WNDPROC thunk_proc; + LRESULT res; + int i; + + for(i=0; i < ARRAY_SIZE(thunks); i++) + { + thunks[i] = AtlThunk_AllocateData(); + ok(thunks[i] != NULL, "thunk = NULL\n"); + + AtlThunk_InitData(thunks[i], test_proc, i); + } + + for(i=0; i < ARRAY_SIZE(thunks); i++) + { + thunk_proc = AtlThunk_DataToCode(thunks[i]); + ok(thunk_proc != NULL, "thunk_proc = NULL\n"); + + res = thunk_proc((HWND)0x1234, 1, 2, 3); + ok(res == (i | 0x1000), "res = %lu\n", res); + } + + for(i=0; i < ARRAY_SIZE(thunks); i++) + AtlThunk_FreeData(thunks[i]); +} + +START_TEST(atlthunk) +{ + test_thunk_proc(); +}

1 0

Jacek Caban : atlthunk: Implement AtlThunk functions.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 89ef868e5e25d236b3673dd6d3e7bd54013e3617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ef868e5e25d236b3673dd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 22:06:15 2019 +0100 atlthunk: Implement AtlThunk functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atlthunk/atlthunk.c | 148 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 144 insertions(+), 4 deletions(-) diff --git a/dlls/atlthunk/atlthunk.c b/dlls/atlthunk/atlthunk.c index 79d0432..cd37b75 100644 --- a/dlls/atlthunk/atlthunk.c +++ b/dlls/atlthunk/atlthunk.c @@ -22,24 +22,164 @@ WINE_DEFAULT_DEBUG_CHANNEL(atlthunk); +#if defined(__i386__) || defined(__x86_64__) + +struct AtlThunkData_t { + struct thunk_pool *pool; + WNDPROC proc; + SIZE_T arg; +}; + +/* Thunk replaces the first argument and jumps to provided proc. */ +#include "pshpack1.h" +struct thunk_code +{ +#if defined(__x86_64__) + BYTE mov_rip_rcx[3]; /* mov mov_offset(%rip), %rcx */ + DWORD mov_offset; + WORD jmp_rip; /* jmp *jmp_offset(%rip) */ + DWORD jmp_offset; +#elif defined(__i386__) + BYTE mov_data_addr_eax; /* movl data_addr, %eax */ + DWORD data_addr; + DWORD mov_eax_esp; /* movl %eax, 4(%esp) */ + WORD jmp; + DWORD jmp_addr; /* jmp *jmp_addr */ +#endif +}; +#include "poppack.h" + +#define THUNK_POOL_SIZE (4096 / sizeof(struct thunk_code)) + +struct thunk_pool +{ + struct thunk_code thunks[THUNK_POOL_SIZE]; + LONG first_free; + LONG free_count; + AtlThunkData_t data[THUNK_POOL_SIZE]; +}; + +C_ASSERT(FIELD_OFFSET(struct thunk_pool, first_free) == 4096); + +static struct thunk_pool *alloc_thunk_pool(void) +{ + struct thunk_pool *thunks; + DWORD old_protect; + unsigned i; + + if (!(thunks = VirtualAlloc(NULL, sizeof(*thunks), MEM_COMMIT, PAGE_READWRITE))) + return NULL; + + for (i = 0; i < ARRAY_SIZE(thunks->thunks); i++) + { + struct thunk_code *thunk = &thunks->thunks[i]; +#if defined(__x86_64__) + thunk->mov_rip_rcx[0] = 0x48; /* mov mov_offset(%rip), %rcx */ + thunk->mov_rip_rcx[1] = 0x8b; + thunk->mov_rip_rcx[2] = 0x0d; + thunk->mov_offset = (const BYTE *)&thunks->data[i].arg - (const BYTE *)(&thunk->mov_offset + 1); + thunk->jmp_rip = 0x25ff; /* jmp *jmp_offset(%rip) */ + thunk->jmp_offset = (const BYTE *)&thunks->data[i].proc - (const BYTE *)(&thunk->jmp_offset + 1); +#elif defined(__i386__) + thunk->mov_data_addr_eax = 0xa1; /* movl data_addr, %eax */ + thunk->data_addr = (DWORD)&thunks->data[i].arg; + thunk->mov_eax_esp = 0x04244489; /* movl %eax, 4(%esp) */ + thunk->jmp = 0x25ff; /* jmp *jmp_addr */ + thunk->jmp_addr = (DWORD)&thunks->data[i].proc; +#endif + } + VirtualProtect(thunks->thunks, FIELD_OFFSET(struct thunk_pool, first_free), PAGE_EXECUTE_READ, &old_protect); + thunks->first_free = 0; + thunks->free_count = 0; + return thunks; +} + +static struct thunk_pool *current_pool; + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + case DLL_PROCESS_DETACH: + if (reserved) break; + if (current_pool && current_pool->free_count == current_pool->first_free) + VirtualFree(current_pool, sizeof(*current_pool), MEM_RELEASE); + break; + } + return TRUE; +} + +static CRITICAL_SECTION thunk_alloc_cs; +static CRITICAL_SECTION_DEBUG thunk_alloc_cs_debug = { + 0, 0, &thunk_alloc_cs, + { &thunk_alloc_cs_debug.ProcessLocksList, + &thunk_alloc_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": thunk_alloc_cs") } +}; +static CRITICAL_SECTION thunk_alloc_cs = { &thunk_alloc_cs_debug, -1, 0, 0, 0, 0 }; + AtlThunkData_t* WINAPI AtlThunk_AllocateData(void) { - FIXME("\n"); + AtlThunkData_t *thunk = NULL; + + EnterCriticalSection(&thunk_alloc_cs); + + if (!current_pool) current_pool = alloc_thunk_pool(); + if (current_pool) + { + thunk = &current_pool->data[current_pool->first_free]; + thunk->pool = current_pool; + thunk->proc = NULL; + thunk->arg = 0; + if (++current_pool->first_free == ARRAY_SIZE(current_pool->data)) + current_pool = NULL; + } + + LeaveCriticalSection(&thunk_alloc_cs); + return thunk; +} + +WNDPROC WINAPI AtlThunk_DataToCode(AtlThunkData_t *thunk) +{ + WNDPROC code = (WNDPROC)&thunk->pool->thunks[thunk - thunk->pool->data]; + TRACE("(%p) -> %p\n", thunk, code); + return code; +} + +void WINAPI AtlThunk_FreeData(AtlThunkData_t *thunk) +{ + if (InterlockedIncrement(&thunk->pool->free_count) == ARRAY_SIZE(thunk->pool->thunks)) + VirtualFree(thunk->pool, sizeof(*thunk->pool), MEM_RELEASE); +} + +void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) +{ + thunk->proc = proc; + thunk->arg = arg; +} + +#else /* __i386__ || __x86_64__ */ + +AtlThunkData_t* WINAPI AtlThunk_AllocateData(void) +{ + FIXME("Unsupported architecture.\n"); return NULL; } WNDPROC WINAPI AtlThunk_DataToCode(AtlThunkData_t *thunk) { - FIXME("(%p)\n", thunk); return NULL; } void WINAPI AtlThunk_FreeData(AtlThunkData_t *thunk) { - FIXME("(%p)\n", thunk); } void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) { - FIXME("(%p %p %lx)\n", thunk, proc, arg); } + +#endif /* __i386__ || __x86_64__ */

1 0

Jacek Caban : atlthunk: Add stub DLL.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 3fe02210a9764120facba7f3be1146233359f803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fe02210a9764120facba7f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 22:06:04 2019 +0100 atlthunk: Add stub DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/atlthunk/Makefile.in | 5 +++++ dlls/atlthunk/atlthunk.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/atlthunk/atlthunk.spec | 4 ++++ 5 files changed, 57 insertions(+) diff --git a/configure b/configure index ac22582..b86e260 100755 --- a/configure +++ b/configure @@ -1119,6 +1119,7 @@ enable_atl100 enable_atl110 enable_atl80 enable_atl90 +enable_atlthunk enable_atmlib enable_authz enable_avicap32 @@ -19357,6 +19358,7 @@ wine_fn_config_makefile dlls/atl110 enable_atl110 wine_fn_config_makefile dlls/atl80 enable_atl80 wine_fn_config_makefile dlls/atl80/tests enable_tests wine_fn_config_makefile dlls/atl90 enable_atl90 +wine_fn_config_makefile dlls/atlthunk enable_atlthunk wine_fn_config_makefile dlls/atmlib enable_atmlib wine_fn_config_makefile dlls/authz enable_authz wine_fn_config_makefile dlls/avicap32 enable_avicap32 diff --git a/configure.ac b/configure.ac index e468966..da14848 100644 --- a/configure.ac +++ b/configure.ac @@ -3093,6 +3093,7 @@ WINE_CONFIG_MAKEFILE(dlls/atl110) WINE_CONFIG_MAKEFILE(dlls/atl80) WINE_CONFIG_MAKEFILE(dlls/atl80/tests) WINE_CONFIG_MAKEFILE(dlls/atl90) +WINE_CONFIG_MAKEFILE(dlls/atlthunk) WINE_CONFIG_MAKEFILE(dlls/atmlib) WINE_CONFIG_MAKEFILE(dlls/authz) WINE_CONFIG_MAKEFILE(dlls/avicap32) diff --git a/dlls/atlthunk/Makefile.in b/dlls/atlthunk/Makefile.in new file mode 100644 index 0000000..1adeedf --- /dev/null +++ b/dlls/atlthunk/Makefile.in @@ -0,0 +1,5 @@ +MODULE = atlthunk.dll +IMPORTLIB = atlthunk + +C_SRCS = \ + atlthunk.c diff --git a/dlls/atlthunk/atlthunk.c b/dlls/atlthunk/atlthunk.c new file mode 100644 index 0000000..79d0432 --- /dev/null +++ b/dlls/atlthunk/atlthunk.c @@ -0,0 +1,45 @@ +/* + * Copyright 2019 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include "atlthunk.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atlthunk); + +AtlThunkData_t* WINAPI AtlThunk_AllocateData(void) +{ + FIXME("\n"); + return NULL; +} + +WNDPROC WINAPI AtlThunk_DataToCode(AtlThunkData_t *thunk) +{ + FIXME("(%p)\n", thunk); + return NULL; +} + +void WINAPI AtlThunk_FreeData(AtlThunkData_t *thunk) +{ + FIXME("(%p)\n", thunk); +} + +void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) +{ + FIXME("(%p %p %lx)\n", thunk, proc, arg); +} diff --git a/dlls/atlthunk/atlthunk.spec b/dlls/atlthunk/atlthunk.spec new file mode 100644 index 0000000..25516a8 --- /dev/null +++ b/dlls/atlthunk/atlthunk.spec @@ -0,0 +1,4 @@ +@ stdcall AtlThunk_AllocateData() +@ stdcall AtlThunk_DataToCode(ptr) +@ stdcall AtlThunk_FreeData(ptr) +@ stdcall AtlThunk_InitData(ptr ptr long)

1 0

Jacek Caban : include: Add atlthunk.h.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 5f296d971f23a2c86d659c242af6e6d992ed89c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f296d971f23a2c86d659c24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 22:05:50 2019 +0100 include: Add atlthunk.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/atlthunk.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index eaf3114..c9f5be9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -22,6 +22,7 @@ SOURCES = \ atlbase.h \ atlcom.h \ atliface.idl \ + atlthunk.h \ atlwin.h \ audevcod.h \ audioclient.idl \ diff --git a/include/atlthunk.h b/include/atlthunk.h new file mode 100644 index 0000000..c7f2d27 --- /dev/null +++ b/include/atlthunk.h @@ -0,0 +1,37 @@ +/* + * Copyright 2019 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __ATLTHUNK_H__ +#define __ATLTHUNK_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct AtlThunkData_t AtlThunkData_t; + +AtlThunkData_t* WINAPI AtlThunk_AllocateData(void); +WNDPROC WINAPI AtlThunk_DataToCode(AtlThunkData_t*); +void WINAPI AtlThunk_FreeData(AtlThunkData_t*); +void WINAPI AtlThunk_InitData(AtlThunkData_t*,void*,SIZE_T); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __ATLTHUNK_H__ */

1 0

Michael Stefaniuc : hnetcfg: Remove redundant "not NULL" check ( coccinellery).
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: c6ecb1b6a477e1b7367cb01bafb20837c68252bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6ecb1b6a477e1b7367cb01b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 19 00:06:21 2019 +0100 hnetcfg: Remove redundant "not NULL" check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/policy.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index c2f3252..53f39ae 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -641,11 +641,8 @@ static HRESULT WINAPI fwpolicy2_get_Rules(INetFwPolicy2 *iface, INetFwRules **ru if(!rules) return E_POINTER; - if(rules) - { - *rules = This->fw_policy2_rules; - INetFwRules_AddRef(This->fw_policy2_rules); - } + *rules = This->fw_policy2_rules; + INetFwRules_AddRef(This->fw_policy2_rules); return S_OK; }

1 0

Alexandre Julliard : winebuild: Align resource data to dword boundaries even on 64-bit.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 39698f5468bd2b9e9e9fe3d10e587991238002ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=39698f5468bd2b9e9e9fe3d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 22:55:34 2019 +0100 winebuild: Align resource data to dword boundaries even on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/res32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 1686f56..d237782 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -492,7 +492,7 @@ void output_resources( DLLSPEC *spec ) for (i = 0, res = spec->resources; i < spec->nb_resources; i++, res++) { - output( "\n\t.align %d\n", get_alignment(get_ptr_size()) ); + output( "\n\t.align %d\n", get_alignment(4) ); output( ".L__wine_spec_res_%d:\n", i ); dump_res_data( res ); }

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.8.0.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 5e86cc0a8f37295072b03b1c13aa205ff3e6f3e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e86cc0a8f37295072b03b1c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 18 13:41:37 2019 -0600 mscoree: Update Wine Mono to 4.8.0. New in this release: * Nearly 2 years of updates from the Mono project. * A separate Framework64 directory is now created in 64-bit prefixes. * The csc command-line interface to the C# compiler is now present in Framework directories. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46639 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 5b71a66..225f915 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.7.5" -#define MONO_SHA "154d68d476cdedef56f159d837fbb5eef9358a9f85de89f86c189ec4da004b3f" +#define MONO_VERSION "4.8.0" +#define MONO_SHA "890159ffd1679ca7d45e840e1890caba8c24acbc18c59db1ca718b35a5ab8778" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 19d120e..785ecd0 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.7.5"; + static const char* mono_version = "4.8.0"; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Andrey Gusev : ext-ms-win-gdi-dc-create-l1-1-0: Add dll.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 8a46597dc4b75f681b4a339b06e79b391620493f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a46597dc4b75f681b4a339b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 18 21:37:06 2019 +0200 ext-ms-win-gdi-dc-create-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in | 1 + .../ext-ms-win-gdi-dc-create-l1-1-0.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index 3738f43..ac22582 100755 --- a/configure +++ b/configure @@ -1261,6 +1261,7 @@ enable_explorerframe enable_ext_ms_win_authz_context_l1_1_0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 enable_ext_ms_win_dwmapi_ext_l1_1_0 +enable_ext_ms_win_gdi_dc_create_l1_1_0 enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 @@ -19561,6 +19562,7 @@ wine_fn_config_makefile dlls/explorerframe/tests enable_tests wine_fn_config_makefile dlls/ext-ms-win-authz-context-l1-1-0 enable_ext_ms_win_authz_context_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-domainjoin-netjoin-l1-1-0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-dwmapi-ext-l1-1-0 enable_ext_ms_win_dwmapi_ext_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-create-l1-1-0 enable_ext_ms_win_gdi_dc_create_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 diff --git a/configure.ac b/configure.ac index 16f72f6..e468966 100644 --- a/configure.ac +++ b/configure.ac @@ -3298,6 +3298,7 @@ WINE_CONFIG_MAKEFILE(dlls/explorerframe/tests) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-authz-context-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-domainjoin-netjoin-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-dwmapi-ext-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-devcaps-l1-1-0) diff --git a/dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in b/dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in new file mode 100644 index 0000000..aa82fc2 --- /dev/null +++ b/dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-dc-create-l1-1-0.dll diff --git a/dlls/ext-ms-win-gdi-dc-create-l1-1-0/ext-ms-win-gdi-dc-create-l1-1-0.spec b/dlls/ext-ms-win-gdi-dc-create-l1-1-0/ext-ms-win-gdi-dc-create-l1-1-0.spec new file mode 100644 index 0000000..114f8bc --- /dev/null +++ b/dlls/ext-ms-win-gdi-dc-create-l1-1-0/ext-ms-win-gdi-dc-create-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stdcall CreateCompatibleDC(long) gdi32.CreateCompatibleDC +@ stdcall CreateDCW(wstr wstr wstr ptr) gdi32.CreateDCW +@ stdcall DeleteDC(long) gdi32.DeleteDC diff --git a/tools/make_specfiles b/tools/make_specfiles index 42e0f9f..d93723d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -431,6 +431,7 @@ my @dll_groups = "gdi32", "api-ms-win-dx-d3dkmt-l1-1-0", "api-ms-win-gdi-dpiinfo-l1-1-0", + "ext-ms-win-gdi-dc-create-l1-1-0", "ext-ms-win-gdi-dc-create-l1-1-1", "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-ntuser-window-l1-1-4: Update spec file.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 1c7855af78249cf3c44ab4dc4266bfd7d964b48a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c7855af78249cf3c44ab4dc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 18 21:37:05 2019 +0200 ext-ms-win-ntuser-window-l1-1-4: Update spec file. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec b/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec index 77e7b1f..a950535 100644 --- a/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec +++ b/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec @@ -1,3 +1,4 @@ +@ stdcall CallWindowProcW(ptr long long long long) user32.CallWindowProcW @ stdcall KillTimer(long long) user32.KillTimer @ stdcall ScreenToClient(long ptr) user32.ScreenToClient @ stdcall SetTimer(long long long ptr) user32.SetTimer

1 0

Andrey Gusev : ext-ms-win-ntuser-window-l1-1-0: Add dll.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: e527d25de1deb0b50fd7af3ca4f953ea1a1597fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e527d25de1deb0b50fd7af3c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 18 21:37:04 2019 +0200 ext-ms-win-ntuser-window-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-window-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-window-l1-1-0.spec | 40 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 45 insertions(+) diff --git a/configure b/configure index efc3d65..3738f43 100755 --- a/configure +++ b/configure @@ -1279,6 +1279,7 @@ enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_private_l1_3_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 +enable_ext_ms_win_ntuser_window_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_ntuser_window_l1_1_4 enable_ext_ms_win_ntuser_windowclass_l1_1_0 @@ -19578,6 +19579,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-3-1 enable_ext_ms_win_ntuser_private_l1_3_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-0 enable_ext_ms_win_ntuser_window_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-4 enable_ext_ms_win_ntuser_window_l1_1_4 wine_fn_config_makefile dlls/ext-ms-win-ntuser-windowclass-l1-1-0 enable_ext_ms_win_ntuser_windowclass_l1_1_0 diff --git a/configure.ac b/configure.ac index e3b7016..16f72f6 100644 --- a/configure.ac +++ b/configure.ac @@ -3316,6 +3316,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-3-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-windowclass-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-window-l1-1-0/Makefile.in new file mode 100644 index 0000000..d89b45b8 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-window-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-window-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-0/ext-ms-win-ntuser-window-l1-1-0.spec b/dlls/ext-ms-win-ntuser-window-l1-1-0/ext-ms-win-ntuser-window-l1-1-0.spec new file mode 100644 index 0000000..a332425 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-window-l1-1-0/ext-ms-win-ntuser-window-l1-1-0.spec @@ -0,0 +1,40 @@ +@ stdcall AdjustWindowRectEx(ptr long long long) user32.AdjustWindowRectEx +@ stdcall AllowSetForegroundWindow(long) user32.AllowSetForegroundWindow +@ stdcall AnimateWindow(long long long) user32.AnimateWindow +@ stdcall BringWindowToTop(long) user32.BringWindowToTop +@ stdcall CallNextHookEx(long long long long) user32.CallNextHookEx +@ stdcall CreateWindowExA(long str str long long long long long long long long ptr) user32.CreateWindowExA +@ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) user32.CreateWindowExW +@ stdcall DefWindowProcA(long long long long) user32.DefWindowProcA +@ stdcall DefWindowProcW(long long long long) user32.DefWindowProcW +@ stdcall DestroyWindow(long) user32.DestroyWindow +@ stdcall EnumChildWindows(long ptr long) user32.EnumChildWindows +@ stdcall EnumThreadWindows(long ptr long) user32.EnumThreadWindows +@ stdcall EnumWindows(ptr long) user32.EnumWindows +@ stdcall FindWindowA(str str) user32.FindWindowA +@ stdcall FindWindowW(wstr wstr) user32.FindWindowW +@ stdcall GetClientRect(long long) user32.GetClientRect +@ stdcall GetDesktopWindow() user32.GetDesktopWindow +@ stdcall GetForegroundWindow() user32.GetForegroundWindow +@ stdcall GetParent(long) user32.GetParent +@ stdcall GetPropW(long wstr) user32.GetPropW +@ stdcall GetShellWindow() user32.GetShellWindow +@ stdcall GetWindow(long long) user32.GetWindow +@ stdcall GetWindowInfo(long ptr) user32.GetWindowInfo +@ stdcall GetWindowPlacement(long ptr) user32.GetWindowPlacement +@ stdcall GetWindowRect(long ptr) user32.GetWindowRect +@ stdcall GetWindowTextW(long ptr long) user32.GetWindowTextW +@ stdcall GetWindowThreadProcessId(long ptr) user32.GetWindowThreadProcessId +@ stdcall IsChild(long long) user32.IsChild +@ stdcall IsIconic(long) user32.IsIconic +@ stdcall IsWindow(long) user32.IsWindow +@ stdcall RemovePropW(long wstr) user32.RemovePropW +@ stdcall SetForegroundWindow(long) user32.SetForegroundWindow +@ stdcall SetParent(long long) user32.SetParent +@ stdcall SetPropW(long wstr long) user32.SetPropW +@ stdcall SetWindowPos(long long long long long long long) user32.SetWindowPos +@ stdcall SetWindowsHookExW(long long long long) user32.SetWindowsHookExW +@ stdcall SetWindowTextW(long wstr) user32.SetWindowTextW +@ stdcall ShowWindow(long long) user32.ShowWindow +@ stub SoundSentry +@ stdcall UnhookWindowsHookEx(long) user32.UnhookWindowsHookEx diff --git a/tools/make_specfiles b/tools/make_specfiles index 8f771b8..42e0f9f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -391,6 +391,7 @@ my @dll_groups = "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-1", + "ext-ms-win-ntuser-window-l1-1-0", "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-ntuser-window-l1-1-4", "ext-ms-win-rtcore-ntuser-cursor-l1-1-0",

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
68
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 February 2019