April 2021 - Wine-commits - list.winehq.org

Zebediah Figura : rpcrt4: Avoid gai_strerror().
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: be101103dbee37d0b382032c2a8bc1d53f333a65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be101103dbee37d0b382032c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 27 11:07:22 2021 -0500 rpcrt4: Avoid gai_strerror(). It's not thread-safe. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4f2c6642792..d1a2f99c147 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -941,7 +941,7 @@ static size_t rpcrt4_ip_tcp_get_top_of_tower(unsigned char *tower_data, ret = getaddrinfo("0.0.0.0", endpoint, &hints, &ai); if (ret) { - ERR("getaddrinfo failed: %s\n", gai_strerror(ret)); + ERR("getaddrinfo failed, error %u\n", WSAGetLastError()); return 0; } } @@ -1147,8 +1147,8 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) ret = getaddrinfo(Connection->NetworkAddr, Connection->Endpoint, &hints, &ai); if (ret) { - ERR("getaddrinfo for %s:%s failed: %s\n", Connection->NetworkAddr, - Connection->Endpoint, gai_strerror(ret)); + ERR("getaddrinfo for %s:%s failed, error %u\n", Connection->NetworkAddr, + Connection->Endpoint, WSAGetLastError()); return RPC_S_SERVER_UNAVAILABLE; } @@ -1228,8 +1228,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr ret = getaddrinfo(NULL, endpoint ? endpoint : "0", &hints, &ai); if (ret) { - ERR("getaddrinfo for port %s failed: %s\n", endpoint, - gai_strerror(ret)); + ERR("getaddrinfo for port %s failed, error %u\n", endpoint, WSAGetLastError()); if ((ret == EAI_SERVICE) || (ret == EAI_NONAME)) return RPC_S_INVALID_ENDPOINT_FORMAT; return RPC_S_CANT_CREATE_ENDPOINT; @@ -1293,7 +1292,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr NI_NUMERICSERV); if (ret) { - WARN("getnameinfo failed: %s\n", gai_strerror(ret)); + WARN("getnameinfo failed, error %u\n", WSAGetLastError()); closesocket(sock); status = RPC_S_CANT_CREATE_ENDPOINT; continue;

1 0

Zebediah Figura : include: Forbid using unsuffixed gai_strerror() in the Wine source.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 56b9a72f649f61d1c7bc5ff424338137655f7e3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=56b9a72f649f61d1c7bc5ff4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 27 11:07:23 2021 -0500 include: Forbid using unsuffixed gai_strerror() in the Wine source. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2tcpip.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 5ba891185b5..f6f5d4dd886 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -167,8 +167,6 @@ static inline WCHAR *gai_strerrorW(int errcode) #ifdef USE_WS_PREFIX # define WS_gai_strerror WINELIB_NAME_AW(gai_strerror) -#elif defined(WINE_NO_UNICODE_MACROS) -# define gai_strerror gai_strerrorA #else # define gai_strerror WINELIB_NAME_AW(gai_strerror) #endif

1 0

Jacek Caban : jscript: Add Map object stub implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 6dda7096bf3b8697ee919e24da60dc06929e0081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dda7096bf3b8697ee919e24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:11:37 2021 +0200 jscript: Add Map object stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 5 ++ dlls/jscript/jscript.h | 2 + dlls/jscript/object.c | 1 + dlls/jscript/set.c | 120 ++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 24 ++++++++ 5 files changed, 152 insertions(+) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 7a037d09b2d..9148451f1cb 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -483,6 +483,11 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) This->ctx->site = NULL; } + if(This->ctx->map_prototype) { + jsdisp_release(This->ctx->map_prototype); + This->ctx->map_prototype = NULL; + } + if(This->ctx->set_prototype) { jsdisp_release(This->ctx->set_prototype); This->ctx->set_prototype = NULL; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index d64d927c227..e4137855430 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -131,6 +131,7 @@ typedef enum { JSCLASS_ARGUMENTS, JSCLASS_VBARRAY, JSCLASS_JSON, + JSCLASS_MAP, JSCLASS_SET, } jsclass_t; @@ -467,6 +468,7 @@ struct _script_ctx_t { jsdisp_t *regexp_constr; jsdisp_t *string_constr; jsdisp_t *vbarray_constr; + jsdisp_t *map_prototype; jsdisp_t *set_prototype; }; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 46d50000cc3..c8c0572c839 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -48,6 +48,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u L"[object Object]", L"[object Object]", L"[object Object]", + L"[object Object]", L"[object Object]" }; diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index ec22b69eb91..8ac2475ff90 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -26,6 +26,10 @@ typedef struct { jsdisp_t dispex; } SetInstance; +typedef struct { + jsdisp_t dispex; +} MapInstance; + static HRESULT Set_add(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -119,6 +123,107 @@ static HRESULT Set_constructor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } } +static HRESULT Map_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Map_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Map_get(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Map_set(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Map_has(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Map_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_prop_t Map_prototype_props[] = { + {L"clear", Map_clear, PROPF_METHOD}, + {L"delete" , Map_delete, PROPF_METHOD|1}, + {L"forEach", Map_forEach, PROPF_METHOD|1}, + {L"get", Map_get, PROPF_METHOD|1}, + {L"has", Map_has, PROPF_METHOD|1}, + {L"set", Map_set, PROPF_METHOD|2}, +}; + +static const builtin_info_t Map_prototype_info = { + JSCLASS_OBJECT, + {NULL, Map_value, 0}, + ARRAY_SIZE(Map_prototype_props), + Map_prototype_props, + NULL, + NULL +}; + +static const builtin_info_t Map_info = { + JSCLASS_MAP, + {NULL, Map_value, 0}, + 0, NULL, + NULL, + NULL +}; + +static HRESULT Map_constructor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + MapInstance *map; + HRESULT hres; + + switch(flags) { + case DISPATCH_CONSTRUCT: + TRACE("\n"); + + if(!(map = heap_alloc_zero(sizeof(*map)))) + return E_OUTOFMEMORY; + + hres = init_dispex(&map->dispex, ctx, &Map_info, ctx->map_prototype); + if(FAILED(hres)) + return hres; + + *r = jsval_obj(&map->dispex); + return S_OK; + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } +} + HRESULT init_set_constructor(script_ctx_t *ctx) { jsdisp_t *constructor; @@ -139,5 +244,20 @@ HRESULT init_set_constructor(script_ctx_t *ctx) hres = jsdisp_define_data_property(ctx->global, L"Set", PROPF_WRITABLE, jsval_obj(constructor)); jsdisp_release(constructor); + if(FAILED(hres)) + return hres; + + hres = create_dispex(ctx, &Map_prototype_info, ctx->object_prototype, &ctx->map_prototype); + if(FAILED(hres)) + return hres; + + hres = create_builtin_constructor(ctx, Map_constructor, L"Map", NULL, + PROPF_CONSTR, ctx->map_prototype, &constructor); + if(FAILED(hres)) + return hres; + + hres = jsdisp_define_data_property(ctx->global, L"Map", PROPF_WRITABLE, + jsval_obj(constructor)); + jsdisp_release(constructor); return hres; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d46da5d44a0..d4394e011ce 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -117,6 +117,7 @@ sync_test("window_props", function() { test_exposed("onfocusout", v >= 9); test_exposed("getComputedStyle", v >= 9); test_exposed("requestAnimationFrame", v >= 10); + test_exposed("Map", v >= 11); test_exposed("Set", v >= 11); if(v >= 9) /* FIXME: native exposes it in all compat modes */ test_exposed("performance", true); @@ -623,6 +624,29 @@ sync_test("set_obj", function() { ok(r === "[object Object]", "toString returned " + r); }); +sync_test("map_obj", function() { + if(!("Map" in window)) return; + + var s = new Map, r; + ok(Object.getPrototypeOf(s) === Map.prototype, "unexpected Map prototype"); + + function test_length(name, len) { + ok(Map.prototype[name].length === len, "Map.prototype." + name + " = " + Map.prototype[name].length); + } + test_length("clear", 0); + test_length("delete", 1); + test_length("forEach", 1); + test_length("get", 1); + test_length("has", 1); + test_length("set", 2); + ok(!("entries" in s), "entries are in Map"); + ok(!("keys" in s), "keys are in Map"); + ok(!("values" in s), "values are in Map"); + + r = Object.prototype.toString.call(s); + ok(r === "[object Object]", "toString returned " + r); +}); + sync_test("elem_attr", function() { var v = document.documentMode; var elem = document.createElement("div"), r;

1 0

Jacek Caban : jscript: Add Map.prototype.set implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

1 0

Jacek Caban : jscript: Add Map.prototype.get implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 6cc5aa4286ed62fd603ac84b186f5eedf07a0744 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cc5aa4286ed62fd603ac84b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:12:01 2021 +0200 jscript: Add Map.prototype.get implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 7524bf02759..789ba8e398e 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -231,8 +231,20 @@ static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig static HRESULT Map_get(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); - return E_NOTIMPL; + jsval_t key = argc >= 1 ? argv[0] : jsval_undefined(); + struct jsval_map_entry *entry; + MapInstance *map; + + if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + + TRACE("%p (%s)\n", map, debugstr_jsval(key)); + + if(!(entry = get_map_entry(map, key))) { + if(r) *r = jsval_undefined(); + return S_OK; + } + + return r ? jsval_copy(entry->value, r) : S_OK; } static HRESULT Map_set(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Jacek Caban : jscript: Add Map.prototype.clear implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: f7915fb5e4074a21961d2c4c9103a45b23cf99d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7915fb5e4074a21961d2c4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:12:10 2021 +0200 jscript: Add Map.prototype.clear implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 789ba8e398e..6038a647e76 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -207,11 +207,30 @@ static void release_map_entry(struct jsval_map_entry *entry) heap_free(entry); } +static void delete_map_entry(MapInstance *map, struct jsval_map_entry *entry) +{ + map->size--; + wine_rb_remove(&map->map, &entry->entry); + entry->deleted = TRUE; + release_map_entry(entry); +} + static HRESULT Map_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); - return E_NOTIMPL; + MapInstance *map; + + if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + + TRACE("%p\n", map); + + while(!list_empty(&map->entries)) { + struct jsval_map_entry *entry = LIST_ENTRY(list_head(&map->entries), struct jsval_map_entry, list_entry); + delete_map_entry(map, entry); + } + + if(r) *r = jsval_undefined(); + return S_OK; } static HRESULT Map_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Jacek Caban : jscript: Add Map.prototype.delete implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 6e9f69d4e938550f32145822d562b327b7db6834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e9f69d4e938550f32145822… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:12:14 2021 +0200 jscript: Add Map.prototype.delete implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 6038a647e76..5a2865155ae 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -236,8 +236,17 @@ static HRESULT Map_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne static HRESULT Map_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); - return E_NOTIMPL; + jsval_t key = argc >= 1 ? argv[0] : jsval_undefined(); + struct jsval_map_entry *entry; + MapInstance *map; + + if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + + TRACE("%p (%s)\n", map, debugstr_jsval(key)); + + if((entry = get_map_entry(map, key))) delete_map_entry(map, entry); + if(r) *r = jsval_bool(!!entry); + return S_OK; } static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Alexandre Julliard : server: Check the supported machines list to validate an image mapping.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 8d50c3465579eeda92580f3c2153b6a07b0bd1f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d50c3465579eeda92580f3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 10:35:16 2021 +0200 server: Check the supported machines list to validate an image mapping. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 32 ++++++++------------------------ server/object.h | 15 +++++++++++++++ server/thread.c | 6 ------ server/thread.h | 1 - 4 files changed, 23 insertions(+), 31 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 3c4b707f282..a8de45482c9 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -642,7 +642,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s off_t pos; int size, opt_size; size_t mz_size, clr_va, clr_size; - unsigned int i, cpu_mask = get_supported_cpu_mask(); + unsigned int i; /* load the headers */ @@ -671,17 +671,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s switch (nt.opt.hdr32.Magic) { case IMAGE_NT_OPTIONAL_HDR32_MAGIC: - switch (nt.FileHeader.Machine) - { - case IMAGE_FILE_MACHINE_I386: - if (cpu_mask & (CPU_FLAG(CPU_x86) | CPU_FLAG(CPU_x86_64))) break; - return STATUS_INVALID_IMAGE_FORMAT; - case IMAGE_FILE_MACHINE_ARMNT: - if (cpu_mask & (CPU_FLAG(CPU_ARM) | CPU_FLAG(CPU_ARM64))) break; - return STATUS_INVALID_IMAGE_FORMAT; - default: - return STATUS_INVALID_IMAGE_FORMAT; - } + if (!is_machine_32bit( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; + if (!is_machine_supported( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; + clr_va = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; clr_size = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; @@ -710,18 +702,10 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s break; case IMAGE_NT_OPTIONAL_HDR64_MAGIC: - if (!(cpu_mask & CPU_64BIT_MASK)) return STATUS_INVALID_IMAGE_WIN_64; - switch (nt.FileHeader.Machine) - { - case IMAGE_FILE_MACHINE_AMD64: - if (cpu_mask & (CPU_FLAG(CPU_x86) | CPU_FLAG(CPU_x86_64))) break; - return STATUS_INVALID_IMAGE_FORMAT; - case IMAGE_FILE_MACHINE_ARM64: - if (cpu_mask & (CPU_FLAG(CPU_ARM) | CPU_FLAG(CPU_ARM64))) break; - return STATUS_INVALID_IMAGE_FORMAT; - default: - return STATUS_INVALID_IMAGE_FORMAT; - } + if (!is_machine_64bit( supported_machines[0] )) return STATUS_INVALID_IMAGE_WIN_64; + if (!is_machine_64bit( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; + if (!is_machine_supported( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; + clr_va = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; clr_size = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; diff --git a/server/object.h b/server/object.h index 604362d6e2c..89e39a7fa00 100644 --- a/server/object.h +++ b/server/object.h @@ -244,6 +244,21 @@ extern unsigned short supported_machines[8]; extern void init_registry(void); extern void flush_registry(void); +static inline int is_machine_32bit( unsigned short machine ) +{ + return machine == IMAGE_FILE_MACHINE_I386 || machine == IMAGE_FILE_MACHINE_ARMNT; +} +static inline int is_machine_64bit( unsigned short machine ) +{ + return machine == IMAGE_FILE_MACHINE_AMD64 || machine == IMAGE_FILE_MACHINE_ARM64; +} +static inline int is_machine_supported( unsigned short machine ) +{ + unsigned int i; + for (i = 0; i < supported_machines_count; i++) if (supported_machines[i] == machine) return 1; + return 0; +} + /* signal functions */ extern void start_watchdog(void); diff --git a/server/thread.c b/server/thread.c index a649dc432f6..3c438a2002a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1341,12 +1341,6 @@ int is_cpu_supported( enum cpu_type cpu ) return 0; } -/* return the cpu mask for supported cpus */ -unsigned int get_supported_cpu_mask(void) -{ - return supported_cpus & get_prefix_cpu_mask(); -} - /* create a new thread */ DECL_HANDLER(new_thread) { diff --git a/server/thread.h b/server/thread.h index 5f8eeeb3c50..0ae0a354695 100644 --- a/server/thread.h +++ b/server/thread.h @@ -120,7 +120,6 @@ extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct token *thread_get_impersonation_token( struct thread *thread ); extern int set_thread_affinity( struct thread *thread, affinity_t affinity ); extern int is_cpu_supported( enum cpu_type cpu ); -extern unsigned int get_supported_cpu_mask(void); extern int suspend_thread( struct thread *thread ); extern int resume_thread( struct thread *thread );

1 0

Alexandre Julliard : server: Use a 64-bit machine for IL executables.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 94d19eff22cc8bad73c9165e5e7142c4c1c822c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94d19eff22cc8bad73c9165e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 10:39:57 2021 +0200 server: Use a 64-bit machine for IL executables. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51067 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index a8de45482c9..c9d64856024 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -349,6 +349,18 @@ struct memory_view *get_exe_view( struct process *process ) return LIST_ENTRY( list_head( &process->views ), struct memory_view, entry ); } +static void set_process_machine( struct process *process, struct memory_view *view ) +{ + unsigned short machine = view->image.machine; + + if (machine == IMAGE_FILE_MACHINE_I386 && (view->image.image_flags & IMAGE_FLAGS_ComPlusNativeReady)) + { + if (is_machine_supported( IMAGE_FILE_MACHINE_AMD64 )) machine = IMAGE_FILE_MACHINE_AMD64; + else if (is_machine_supported( IMAGE_FILE_MACHINE_ARM64 )) machine = IMAGE_FILE_MACHINE_ARM64; + } + process->machine = machine; +} + /* add a view to the process list */ static void add_process_view( struct thread *thread, struct memory_view *view ) { @@ -362,7 +374,7 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) else if (!(view->image.image_charact & IMAGE_FILE_DLL)) { /* main exe */ - process->machine = view->image.machine; + set_process_machine( process, view ); list_add_head( &process->views, &view->entry ); if (get_view_nt_name( view, &name ) && (process->image = memdup( name.str, name.len ))) process->imagelen = name.len;

1 0

Alexandre Julliard : server: Store a machine ID instead of a CPU in the context structure.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 308bd35746f16f9db0e55daa60798b1967bd0bf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=308bd35746f16f9db0e55daa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 10:40:53 2021 +0200 server: Store a machine ID instead of a CPU in the context structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 4 ++-- dlls/ntdll/unix/signal_arm64.c | 4 ++-- dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 6 +++--- dlls/ntdll/unix/thread.c | 4 ++-- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 2 +- server/ptrace.c | 12 ++++++------ server/thread.c | 40 +++++++++++++++++++++------------------- server/trace.c | 19 ++++++++++++------- 10 files changed, 53 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=308bd35746f16f9db0e5…

1 0