January 2020 - Wine-commits

Piotr Caban : msvcrt: Add support for quoted paths in _searchenv.
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 1d0cca465ab6b185dd91db00f61d9ad5d272a766 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d0cca465ab6b185dd91db00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 18:26:12 2020 +0100 msvcrt: Add support for quoted paths in _searchenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- dlls/msvcrt/tests/dir.c | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index e8cba58ac7..d07fcd6c7d 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1683,12 +1683,27 @@ void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) for(; *penv; penv = (*end ? end + 1 : end)) { end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; + path_len = 0; + while(*end && *end != ';' && path_len < MAX_PATH) + { + if (*end == '"') + { + end++; + while(*end && *end != '"' && path_len < MAX_PATH) + { + path[path_len++] = *end; + end++; + } + if (*end == '"') end++; + continue; + } + + path[path_len++] = *end; + end++; + } if (!path_len || path_len >= MAX_PATH) continue; - memcpy(path, penv, path_len); if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') path[path_len++] = '\\'; if (path_len + fname_len >= MAX_PATH) diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index 210cf3983c..6c817dfb2e 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -597,6 +597,20 @@ static void test_searchenv(void) ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); } + strcpy(env1, "TEST_PATH="); + strcat(env1, tmppath); + strcat(env1, "\"\\search_env_test\\\"d\"i\"r\"1"); + putenv(env1); + strcpy(exp, tmppath); + strcat(exp, files[0]); + _searchenv("1.dat", "TEST_PATH", result); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + strcat(env1, ";"); + putenv(env1); + _searchenv("1.dat", "TEST_PATH", result); + ok(!result[0], "got %s, expected ''\n", result); + putenv("TEST_PATH="); for (i=ARRAY_SIZE(files)-1; i>=0; i--) {

1 0

Zebediah Figura : rpcrt4: Use a critical section for the context handle lock.
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 76238898fc4ef41b6eb57c5e2589a7579ee6e3c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76238898fc4ef41b6eb57c5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 17:04:11 2020 -0600 rpcrt4: Use a critical section for the context handle lock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_assoc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 504f4d66c8..ab865c2de1 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -24,7 +24,6 @@ #include "rpc.h" #include "rpcndr.h" -#include "winternl.h" #include "wine/debug.h" @@ -55,7 +54,7 @@ typedef struct _RpcContextHandle NDR_RUNDOWN rundown_routine; void *ctx_guard; UUID uuid; - RTL_RWLOCK rw_lock; + CRITICAL_SECTION lock; unsigned int refs; } RpcContextHandle; @@ -463,12 +462,13 @@ RPC_STATUS RpcServerAssoc_AllocateContextHandle(RpcAssoc *assoc, void *CtxGuard, return RPC_S_OUT_OF_MEMORY; context_handle->ctx_guard = CtxGuard; - RtlInitializeResource(&context_handle->rw_lock); + InitializeCriticalSection(&context_handle->lock); + context_handle->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcContextHandle.lock"); context_handle->refs = 1; /* lock here to mirror unmarshall, so we don't need to special-case the * freeing of a non-marshalled context handle */ - RtlAcquireResourceExclusive(&context_handle->rw_lock, TRUE); + EnterCriticalSection(&context_handle->lock); EnterCriticalSection(&assoc->cs); list_add_tail(&assoc->context_handle_list, &context_handle->entry); @@ -500,7 +500,7 @@ RPC_STATUS RpcServerAssoc_FindContextHandle(RpcAssoc *assoc, const UUID *uuid, { LeaveCriticalSection(&assoc->cs); TRACE("found %p\n", context_handle); - RtlAcquireResourceExclusive(&context_handle->rw_lock, TRUE); + EnterCriticalSection(&context_handle->lock); return RPC_S_OK; } } @@ -555,7 +555,8 @@ static void RpcContextHandle_Destroy(RpcContextHandle *context_handle) context_handle->rundown_routine(context_handle->user_context); } - RtlDeleteResource(&context_handle->rw_lock); + context_handle->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&context_handle->lock); HeapFree(GetProcessHeap(), 0, context_handle); } @@ -566,7 +567,7 @@ unsigned int RpcServerAssoc_ReleaseContextHandle(RpcAssoc *assoc, NDR_SCONTEXT S unsigned int refs; if (release_lock) - RtlReleaseResource(&context_handle->rw_lock); + LeaveCriticalSection(&context_handle->lock); EnterCriticalSection(&assoc->cs); refs = --context_handle->refs;

1 0

Zebediah Figura : kernelbase: Implement ReOpenFile().
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: c7019a8887a3b035ce6b1ff6b113a8b5c0cc5e04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7019a8887a3b035ce6b1ff6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 11:06:43 2020 -0600 kernelbase: Implement ReOpenFile(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47668 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 80 ++++++++++++++++++++++++----------- 2 files changed, 158 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7019a8887a3b035ce6b…

1 0

Zebediah Figura : httpapi: Stub HttpSetRequestQueueProperty().
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: afe9217b57c9077dce20a6c9762ae27813d43b5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe9217b57c9077dce20a6c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 10:56:39 2020 -0600 httpapi: Stub HttpSetRequestQueueProperty(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48514 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 1 + dlls/httpapi/httpapi_main.c | 11 +++++++++++ include/http.h | 1 + 3 files changed, 13 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index c27d0c96b0..e1a16c39ab 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -51,6 +51,7 @@ @ stub HttpSetAppPoolInformation @ stub HttpSetConfigGroupInformation @ stub HttpSetControlChannelInformation +@ stdcall HttpSetRequestQueueProperty(ptr long ptr long long ptr) @ stub HttpSetServerContextInformation @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) @ stdcall HttpSetUrlGroupProperty(int64 long ptr long) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 8adbd38be5..c24cadfaeb 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -760,3 +760,14 @@ ULONG WINAPI HttpCloseRequestQueue(HANDLE handle) return GetLastError(); return ERROR_SUCCESS; } + +/*********************************************************************** + * HttpSetRequestQueueProperty (HTTPAPI.@) + */ +ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, + void *value, ULONG length, ULONG reserved1, void *reserved2) +{ + FIXME("queue %p, property %u, value %p, length %u, reserved1 %#x, reserved2 %p, stub!\n", + queue, property, value, length, reserved1, reserved2); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/http.h b/include/http.h index 394167fd68..f569c1ecb5 100644 --- a/include/http.h +++ b/include/http.h @@ -447,6 +447,7 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); +ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length);

1 0

Henri Verbeet : d2d1: Pass previous and next vectors to d2d_geometry_outline_add_join().
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 1fe3f60f68ae5bd47cf22914d15566a77d2e64a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fe3f60f68ae5bd47cf22914… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 15:55:27 2020 +0330 d2d1: Pass previous and next vectors to d2d_geometry_outline_add_join(). Instead of the points. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 90 +++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index e2a44c30b6..a61ce692b9 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2090,7 +2090,7 @@ static BOOL d2d_path_geometry_add_figure(struct d2d_geometry *geometry) static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, const D2D1_POINT_2F *prev, const D2D1_POINT_2F *p0, const D2D1_POINT_2F *next) { - D2D1_POINT_2F q_prev, q_next; + static const D2D1_POINT_2F origin = {0.0f, 0.0f}; struct d2d_outline_vertex *v; struct d2d_face *f; size_t base_idx; @@ -2113,35 +2113,29 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, } f = &geometry->outline.faces[geometry->outline.face_count]; - d2d_point_subtract(&q_prev, p0, prev); - d2d_point_subtract(&q_next, next, p0); - - d2d_point_normalise(&q_prev); - d2d_point_normalise(&q_next); - - ccw = d2d_point_ccw(p0, prev, next); + ccw = d2d_point_ccw(&origin, prev, next); if (ccw == 0.0f) { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); - d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); - d2d_outline_vertex_set(&v[2], p0->x + 25.0f * q_prev.x, p0->y + 25.0f * q_prev.y, - -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); - d2d_outline_vertex_set(&v[3], p0->x + 25.0f * q_prev.x, p0->y + 25.0f * q_prev.y, - q_prev.x, q_prev.y, q_prev.x, q_prev.y); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, -prev->x, -prev->y, -prev->x, -prev->y); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, prev->x, prev->y, prev->x, prev->y); + d2d_outline_vertex_set(&v[2], p0->x + 25.0f * -prev->x, p0->y + 25.0f * -prev->y, + prev->x, prev->y, prev->x, prev->y); + d2d_outline_vertex_set(&v[3], p0->x + 25.0f * -prev->x, p0->y + 25.0f * -prev->y, + -prev->x, -prev->y, -prev->x, -prev->y); } else if (ccw < 0.0f) { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, q_next.x, q_next.y, q_prev.x, q_prev.y); - d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_next.x, -q_next.y, -q_next.x, -q_next.y); - d2d_outline_vertex_set(&v[2], p0->x, p0->y, -q_next.x, -q_next.y, -q_prev.x, -q_prev.y); - d2d_outline_vertex_set(&v[3], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, next->x, next->y, -prev->x, -prev->y); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, -next->x, -next->y, -next->x, -next->y); + d2d_outline_vertex_set(&v[2], p0->x, p0->y, -next->x, -next->y, prev->x, prev->y); + d2d_outline_vertex_set(&v[3], p0->x, p0->y, prev->x, prev->y, prev->x, prev->y); } else { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_next.x, -q_next.y); - d2d_outline_vertex_set(&v[1], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); - d2d_outline_vertex_set(&v[2], p0->x, p0->y, q_prev.x, q_prev.y, q_next.x, q_next.y); - d2d_outline_vertex_set(&v[3], p0->x, p0->y, q_next.x, q_next.y, q_next.x, q_next.y); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, prev->x, prev->y, -next->x, -next->y); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, -prev->x, -prev->y, -prev->x, -prev->y); + d2d_outline_vertex_set(&v[2], p0->x, p0->y, -prev->x, -prev->y, next->x, next->y); + d2d_outline_vertex_set(&v[3], p0->x, p0->y, next->x, next->y, next->x, next->y); } geometry->outline.vertex_count += 4; @@ -2304,11 +2298,21 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, else next = &figure->vertices[i + 1]; - if ((figure_end == D2D1_FIGURE_END_CLOSED || (i && i < figure->vertex_count - 1)) - && !d2d_geometry_outline_add_join(geometry, prev, p0, next)) + if (figure_end == D2D1_FIGURE_END_CLOSED || (i && i < figure->vertex_count - 1)) { - ERR("Failed to add join.\n"); - return FALSE; + D2D1_POINT_2F q_next, q_prev; + + d2d_point_subtract(&q_prev, prev, p0); + d2d_point_subtract(&q_next, next, p0); + + d2d_point_normalise(&q_prev); + d2d_point_normalise(&q_next); + + if (!d2d_geometry_outline_add_join(geometry, &q_prev, p0, &q_next)) + { + ERR("Failed to add join.\n"); + return FALSE; + } } if (type == D2D_VERTEX_TYPE_LINE && (figure_end == D2D1_FIGURE_END_CLOSED || i < figure->vertex_count - 1) @@ -4077,9 +4081,24 @@ static const struct ID2D1RectangleGeometryVtbl d2d_rectangle_geometry_vtbl = HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_RECT_F *rect) { struct d2d_face *f; - D2D1_POINT_2F *v, v0p, v0n, v1p, v1n, v2p, v2n, v3p, v3n; + D2D1_POINT_2F *v; float l, r, t, b; + static const D2D1_POINT_2F prev[] = + { + { 1.0f, 0.0f}, + { 0.0f, -1.0f}, + {-1.0f, 0.0f}, + { 0.0f, 1.0f}, + }; + static const D2D1_POINT_2F next[] = + { + { 0.0f, 1.0f}, + { 1.0f, 0.0f}, + { 0.0f, -1.0f}, + {-1.0f, 0.0f}, + }; + d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_rectangle_geometry_vtbl); geometry->u.rectangle.rect = *rect; @@ -4106,15 +4125,6 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory d2d_face_set(&f[1], 0, 2, 3); geometry->fill.face_count = 2; - d2d_point_set(&v0p, l+1.0f, t); - d2d_point_set(&v0n, l, t+1.0f); - d2d_point_set(&v1p, l, b-1.0f); - d2d_point_set(&v1n, l+1.0f, b); - d2d_point_set(&v2p, r-1.0f, b); - d2d_point_set(&v2n, r, b-1.0f); - d2d_point_set(&v3p, r, t+1.0f); - d2d_point_set(&v3n, r-1.0f, t); - if (!d2d_geometry_outline_add_line_segment(geometry, &v[0], &v[1])) goto fail; if (!d2d_geometry_outline_add_line_segment(geometry, &v[1], &v[2])) @@ -4124,13 +4134,13 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory if (!d2d_geometry_outline_add_line_segment(geometry, &v[3], &v[0])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v0p, &v[0], &v0n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[0], &v[0], &next[0])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v1p, &v[1], &v1n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[1], &v[1], &next[1])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v2p, &v[2], &v2n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[2], &v[2], &next[2])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v3p, &v[3], &v3n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[3], &v[3], &next[3])) goto fail; return S_OK;

1 0

Chip Davis : setupapi: Implement CM_Get_DevNode_Property[_Ex]W().
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 4588f10f8d3895624a8a2087f2e5c3c1b51e576f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4588f10f8d3895624a8a2087… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Jan 26 18:02:37 2020 -0600 setupapi: Implement CM_Get_DevNode_Property[_Ex]W(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-devices-config-l1-1-0.spec | 2 +- .../api-ms-win-devices-config-l1-1-1.spec | 2 +- dlls/cfgmgr32/cfgmgr32.spec | 2 + dlls/setupapi/devinst.c | 105 +++++++++++++++------ dlls/setupapi/setupapi.spec | 2 + 5 files changed, 83 insertions(+), 30 deletions(-) diff --git a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec index 6fe5ee3b21..59004c997f 100644 --- a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec +++ b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec @@ -8,7 +8,7 @@ @ stub CM_Get_Class_Property_Keys @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stub CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec index 33dad4eaac..e10352eda5 100644 --- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -8,7 +8,7 @@ @ stub CM_Get_Class_Property_Keys @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stub CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 20ede7b13d..8360048421 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -57,6 +57,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Property_ExW @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyA @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 25d4040da0..f8a4e93efc 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4177,47 +4177,26 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, return (have_guid || have_name); } -/*********************************************************************** - * SetupDiGetDevicePropertyW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, - const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, - DWORD prop_buff_size, DWORD *required_size, DWORD flags) +static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, DWORD prop_buff_size, DWORD *required_size, DWORD flags) { - static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; - WCHAR key_path[55] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\\'}; + WCHAR key_path[55] = L"Properties\\"; HKEY hkey; DWORD value_type; DWORD value_size = 0; LSTATUS ls; - struct device *device; - - TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, - required_size, flags); - - if (!(device = get_device(devinfo, device_data))) - return FALSE; if (!prop_key) - { - SetLastError(ERROR_INVALID_DATA); - return FALSE; - } + return ERROR_INVALID_DATA; if (!prop_type || (!prop_buff && prop_buff_size)) - { - SetLastError(ERROR_INVALID_USER_BUFFER); - return FALSE; - } + return ERROR_INVALID_USER_BUFFER; if (flags) - { - SetLastError(ERROR_INVALID_FLAGS); - return FALSE; - } + return ERROR_INVALID_FLAGS; SETUPDI_GuidToString(&prop_key->fmtid, key_path + 11); - swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, formatW, prop_key->pid); + swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, L"\\%04X", prop_key->pid); ls = RegOpenKeyExW(device->key, key_path, 0, KEY_QUERY_VALUE, &hkey); if (!ls) @@ -4248,10 +4227,80 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ if (required_size) *required_size = value_size; + return ls; +} + +/*********************************************************************** + * SetupDiGetDevicePropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, + const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, + DWORD prop_buff_size, DWORD *required_size, DWORD flags) +{ + struct device *device; + LSTATUS ls; + + TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, + required_size, flags); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, prop_buff_size, required_size, flags); + SetLastError(ls); return !ls; } +/*********************************************************************** + * CM_Get_DevNode_Property_ExW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, ULONG *prop_buff_size, ULONG flags, HMACHINE machine) +{ + struct device *device = get_devnode_device(devnode); + LSTATUS ls; + + TRACE("%u, %p, %p, %p, %p, %#x, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size, + flags, machine); + + if (machine) + return CR_MACHINE_UNAVAILABLE; + + if (!device) + return CR_NO_SUCH_DEVINST; + + if (!prop_buff_size) + return CR_INVALID_POINTER; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, *prop_buff_size, prop_buff_size, flags); + switch (ls) + { + case NO_ERROR: + return CR_SUCCESS; + case ERROR_INVALID_DATA: + return CR_INVALID_DATA; + case ERROR_INVALID_USER_BUFFER: + return CR_INVALID_POINTER; + case ERROR_INVALID_FLAGS: + return CR_INVALID_FLAG; + case ERROR_INSUFFICIENT_BUFFER: + return CR_BUFFER_SMALL; + case ERROR_NOT_FOUND: + return CR_NO_SUCH_VALUE; + } + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dev, const DEVPROPKEY *key, DEVPROPTYPE *type, + PVOID buf, PULONG len, ULONG flags) +{ + return CM_Get_DevNode_Property_ExW(dev, key, type, buf, len, flags, NULL); +} + /*********************************************************************** * SetupDiInstallDeviceInterfaces (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8c4ebcc101..74c252c6fd 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -67,6 +67,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr)

1 0

Nikolay Sivov : ole32/tests: Test default item moniker instance.
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 7e5a764d8b4a8867b26e64233a63282952e6c490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e5a764d8b4a8867b26e6423… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 10:32:18 2020 +0300 ole32/tests: Test default item moniker instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index bec5c76caa..8b150738b2 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1311,6 +1311,13 @@ static const BYTE expected_item_moniker_comparison_data5[] = 'S',0x00, 'T',0x00,0x00,0x00, }; +static const BYTE expected_item_moniker_comparison_data6[] = +{ + 0x04,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x00,0x00, +}; + static const BYTE expected_item_moniker_saved_data[] = { 0x02,0x00,0x00,0x00, '!',0x00,0x05,0x00, @@ -1341,6 +1348,12 @@ static const BYTE expected_item_moniker_saved_data5[] = 0x00,0x00,0x00, 'T', 'e', 's', 't',0x00, }; +static const BYTE expected_item_moniker_saved_data6[] = +{ + 0x01,0x00,0x00,0x00,0x00,0x01,0x00,0x00, + 0x00,0x00, +}; + static const BYTE expected_item_moniker_marshal_data[] = { 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, @@ -1401,6 +1414,18 @@ static const BYTE expected_item_moniker_marshal_data5[] = 0x00,0x00,0x00, 'T', 'e', 's', 't',0x00, }; +static const BYTE expected_item_moniker_marshal_data6[] = +{ + 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, + 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x04,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x00,0x00,0x00,0x00,0x22,0x00,0x00,0x00, + 0x01,0x00,0x00,0x00,0x00,0x01,0x00,0x00, + 0x00,0x00, +}; + static const BYTE expected_anti_moniker_marshal_data[] = { 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, @@ -2239,6 +2264,18 @@ todo_wine IMoniker_Release(moniker); IMoniker_Release(moniker2); } + + /* Default instance. */ + hr = CoCreateInstance(&CLSID_ItemMoniker, NULL, CLSCTX_SERVER, &IID_IMoniker, (void **)&moniker); + ok(hr == S_OK, "Failed to create item moniker, hr %#x.\n", hr); + + test_moniker("item moniker 6", moniker, + expected_item_moniker_marshal_data6, sizeof(expected_item_moniker_marshal_data6), + expected_item_moniker_saved_data6, sizeof(expected_item_moniker_saved_data6), + expected_item_moniker_comparison_data6, sizeof(expected_item_moniker_comparison_data6), + 34, L""); + + IMoniker_Release(moniker); } static void stream_write_dword(IStream *stream, DWORD value)

1 0

Nikolay Sivov : ole32: Remove some internal helpers for item moniker.
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: e7ce88ab7cc1bec99523d67e4f3281693f9cc461 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7ce88ab7cc1bec99523d67e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 10:32:19 2020 +0300 ole32: Remove some internal helpers for item moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 132 ++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 83 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index c85e263774..7ebfaea6b6 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -137,8 +137,6 @@ static HRESULT set_container_lock(IOleItemContainer *container, IBindCtx *pbc) return hr; } -static HRESULT ItemMonikerImpl_Destroy(ItemMonikerImpl* iface); - /******************************************************************************* * ItemMoniker_QueryInterface *******************************************************************************/ @@ -195,17 +193,20 @@ static ULONG WINAPI ItemMonikerImpl_AddRef(IMoniker* iface) ******************************************************************************/ static ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface) { - ItemMonikerImpl *This = impl_from_IMoniker(iface); - ULONG ref; - - TRACE("(%p)\n",This); + ItemMonikerImpl *moniker = impl_from_IMoniker(iface); + ULONG refcount = InterlockedDecrement(&moniker->ref); - ref = InterlockedDecrement(&This->ref); + TRACE("%p, refcount %u.\n", iface, refcount); - /* destroy the object if there are no more references to it */ - if (ref == 0) ItemMonikerImpl_Destroy(This); + if (!refcount) + { + if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); + heap_free(moniker->itemName); + heap_free(moniker->itemDelimiter); + heap_free(moniker); + } - return ref; + return refcount; } /****************************************************************************** @@ -1008,107 +1009,72 @@ static const IROTDataVtbl VT_ROTDataImpl = }; /****************************************************************************** - * ItemMoniker_Construct (local function) - *******************************************************************************/ -static HRESULT ItemMonikerImpl_Construct(ItemMonikerImpl* This, const WCHAR *delimiter, const WCHAR *name) + * CreateItemMoniker [OLE32.@] + ******************************************************************************/ +HRESULT WINAPI CreateItemMoniker(const WCHAR *delimiter, const WCHAR *name, IMoniker **ret) { + ItemMonikerImpl *moniker; int str_len; + HRESULT hr; + + TRACE("%s, %s, %p.\n", debugstr_w(delimiter), debugstr_w(name), ret); - TRACE("(%p, %s, %s)\n", This, debugstr_w(delimiter), debugstr_w(name)); + if (!(moniker = heap_alloc_zero(sizeof(*moniker)))) + return E_OUTOFMEMORY; - /* Initialize the virtual function table. */ - This->IMoniker_iface.lpVtbl = &VT_ItemMonikerImpl; - This->IROTData_iface.lpVtbl = &VT_ROTDataImpl; - This->ref = 0; - This->pMarshal = NULL; - This->itemDelimiter = NULL; + moniker->IMoniker_iface.lpVtbl = &VT_ItemMonikerImpl; + moniker->IROTData_iface.lpVtbl = &VT_ROTDataImpl; + moniker->ref = 1; str_len = (lstrlenW(name) + 1) * sizeof(WCHAR); - This->itemName = heap_alloc(str_len); - if (!This->itemName) - return E_OUTOFMEMORY; - memcpy(This->itemName, name, str_len); + moniker->itemName = heap_alloc(str_len); + if (!moniker->itemName) + { + hr = E_OUTOFMEMORY; + goto failed; + } + memcpy(moniker->itemName, name, str_len); if (delimiter) { str_len = (lstrlenW(delimiter) + 1) * sizeof(WCHAR); - This->itemDelimiter = heap_alloc(str_len); - if (!This->itemDelimiter) + moniker->itemDelimiter = heap_alloc(str_len); + if (!moniker->itemDelimiter) { - heap_free(This->itemName); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto failed; } - memcpy(This->itemDelimiter, delimiter, str_len); + memcpy(moniker->itemDelimiter, delimiter, str_len); } - return S_OK; -} - -/****************************************************************************** - * ItemMoniker_Destroy (local function) - *******************************************************************************/ -static HRESULT ItemMonikerImpl_Destroy(ItemMonikerImpl* This) -{ - TRACE("(%p)\n",This); - - if (This->pMarshal) IUnknown_Release(This->pMarshal); - HeapFree(GetProcessHeap(),0,This->itemName); - HeapFree(GetProcessHeap(),0,This->itemDelimiter); - HeapFree(GetProcessHeap(),0,This); + *ret = &moniker->IMoniker_iface; return S_OK; -} - -/****************************************************************************** - * CreateItemMoniker [OLE32.@] - ******************************************************************************/ -HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim, LPCOLESTR lpszItem, IMoniker **ppmk) -{ - ItemMonikerImpl* newItemMoniker; - HRESULT hr; - - TRACE("(%s,%s,%p)\n",debugstr_w(lpszDelim),debugstr_w(lpszItem),ppmk); - - newItemMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(ItemMonikerImpl)); - if (!newItemMoniker) - return STG_E_INSUFFICIENTMEMORY; +failed: + IMoniker_Release(&moniker->IMoniker_iface); - hr = ItemMonikerImpl_Construct(newItemMoniker,lpszDelim,lpszItem); - - if (FAILED(hr)){ - HeapFree(GetProcessHeap(),0,newItemMoniker); - return hr; - } - - return ItemMonikerImpl_QueryInterface(&newItemMoniker->IMoniker_iface,&IID_IMoniker, - (void**)ppmk); + return hr; } -HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, - IUnknown *pUnk, REFIID riid, void **ppv) +HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { - ItemMonikerImpl* newItemMoniker; - HRESULT hr; - static const WCHAR wszEmpty[] = { 0 }; + static const WCHAR emptyW[] = { 0 }; + IMoniker *moniker; + HRESULT hr; - TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv); *ppv = NULL; - if (pUnk) + if (outer) return CLASS_E_NOAGGREGATION; - newItemMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(ItemMonikerImpl)); - if (!newItemMoniker) - return E_OUTOFMEMORY; - - hr = ItemMonikerImpl_Construct(newItemMoniker, wszEmpty, wszEmpty); + if (FAILED(hr = CreateItemMoniker(emptyW, emptyW, &moniker))) + return hr; - if (SUCCEEDED(hr)) - hr = ItemMonikerImpl_QueryInterface(&newItemMoniker->IMoniker_iface, riid, ppv); - if (FAILED(hr)) - HeapFree(GetProcessHeap(),0,newItemMoniker); + hr = IMoniker_QueryInterface(moniker, riid, ppv); + IMoniker_Release(moniker); return hr; }

1 0

Nikolay Sivov : ole32: Fix IsRunning() for item moniker.
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 25ad349d30a4db3ac5f9f3b75740f1ab019df434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25ad349d30a4db3ac5f9f3b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 10:32:20 2020 +0300 ole32: Fix IsRunning() for item moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 70 ++++++++++++++++++++++------------------------ dlls/ole32/tests/moniker.c | 66 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 95 insertions(+), 41 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 7ebfaea6b6..111b111a1a 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -648,53 +648,51 @@ static HRESULT WINAPI ItemMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) /****************************************************************************** * ItemMoniker_IsRunning ******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_IsRunning(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - IMoniker* pmkNewlyRunning) +static HRESULT WINAPI ItemMonikerImpl_IsRunning(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, + IMoniker *pmkNewlyRunning) { - ItemMonikerImpl *This = impl_from_IMoniker(iface); + ItemMonikerImpl *moniker = impl_from_IMoniker(iface); + IOleItemContainer *container; IRunningObjectTable* rot; - HRESULT res; - IOleItemContainer *poic=0; + HRESULT hr; TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning); - /* If pmkToLeft is NULL, this method returns TRUE if pmkNewlyRunning is non-NULL and is equal to this */ - /* moniker. Otherwise, the method checks the ROT to see whether this moniker is running. */ - if (pmkToLeft==NULL) - if ((pmkNewlyRunning!=NULL)&&(IMoniker_IsEqual(pmkNewlyRunning,iface)==S_OK)) - return S_OK; - else { - if (pbc==NULL) - return E_INVALIDARG; - - res=IBindCtx_GetRunningObjectTable(pbc,&rot); - - if (FAILED(res)) - return res; - - res = IRunningObjectTable_IsRunning(rot,iface); + if (!pbc) + return E_INVALIDARG; - IRunningObjectTable_Release(rot); + if (!pmkToLeft) + { + if (pmkNewlyRunning) + { + return IMoniker_IsEqual(iface, pmkNewlyRunning); } - else{ - - /* If pmkToLeft is non-NULL, the method calls IMoniker::BindToObject on the pmkToLeft parameter, */ - /* requesting an IOleItemContainer interface pointer. The method then calls IOleItemContainer::IsRunning,*/ - /* passing the string contained within this moniker. */ - - res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)&poic); - - if (SUCCEEDED(res)){ - - res=IOleItemContainer_IsRunning(poic,This->itemName); + else + { + hr = IBindCtx_GetRunningObjectTable(pbc, &rot); + if (SUCCEEDED(hr)) + { + hr = IRunningObjectTable_IsRunning(rot, iface); + IRunningObjectTable_Release(rot); + } + } + } + else + { + /* Container itself must be running too. */ + hr = IMoniker_IsRunning(pmkToLeft, pbc, NULL, NULL); + if (hr != S_OK) + return hr; - IOleItemContainer_Release(poic); + hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IOleItemContainer, (void **)&container); + if (SUCCEEDED(hr)) + { + hr = IOleItemContainer_IsRunning(container, moniker->itemName); + IOleItemContainer_Release(container); } } - return res; + return hr; } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 8b150738b2..7d4c8224ad 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -385,6 +385,7 @@ static HRESULT WINAPI test_item_container_GetObjectStorage(IOleItemContainer *if static HRESULT WINAPI test_item_container_IsRunning(IOleItemContainer *iface, LPOLESTR item) { + ok(0, "Unexpected call.\n"); return E_NOTIMPL; } @@ -569,7 +570,7 @@ Moniker_IsRunning(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, IMoniker* pmkNewlyRunning) { CHECK_EXPECTED_METHOD("Moniker_IsRunning"); - return E_NOTIMPL; + return 0x8beef000; } static HRESULT WINAPI @@ -1999,6 +2000,11 @@ static void test_item_moniker(void) { L"%", L"A", 0x41 }, { L"%", L"a", 0x41 }, }; + static const char *methods_isrunning[] = + { + "Moniker_IsRunning", + NULL + }; IMoniker *moniker, *moniker2, *reduced; HRESULT hr; DWORD moniker_type, i; @@ -2012,10 +2018,12 @@ static void test_item_moniker(void) struct test_moniker *container_moniker; WCHAR displayname[16] = L"display name"; IEnumMoniker *enummoniker; + IRunningObjectTable *rot; WCHAR *display_name; BIND_OPTS bind_opts; LARGE_INTEGER pos; IStream *stream; + DWORD cookie; hr = CreateItemMoniker(NULL, wszObjectName, &moniker); ok(hr == S_OK, "Failed to create item moniker, hr %#x.\n", hr); @@ -2139,19 +2147,65 @@ todo_wine "dwMkSys != MKSYS_ITEMMONIKER, instead was 0x%08x\n", moniker_type); + container_moniker = create_test_moniker(); + /* IsRunning test */ hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "IMoniker_IsRunning should return E_INVALIDARG, not 0x%08x\n", hr); + hr = IMoniker_IsRunning(moniker, NULL, &container_moniker->IMoniker_iface, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); ok(hr == S_FALSE, "IMoniker_IsRunning should return S_FALSE, not 0x%08x\n", hr); + hr = CreateItemMoniker(wszDelimiter, wszObjectName, &moniker2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + hr = IMoniker_IsRunning(moniker, bindctx, NULL, moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker2); + + /* Different moniker as newly running. */ + hr = CreateItemMoniker(wszDelimiter, L"Item123", &moniker2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = IMoniker_IsRunning(moniker, bindctx, NULL, moniker2); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IBindCtx_GetRunningObjectTable(bindctx, &rot); + ok(hr == S_OK, "Failed to get ROT, hr %#x.\n", hr); + + hr = IRunningObjectTable_Register(rot, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)moniker, moniker, &cookie); + ok(hr == S_OK, "Failed to register, hr %#x.\n", hr); + + hr = IRunningObjectTable_IsRunning(rot, moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsRunning(moniker, bindctx, NULL, moniker2); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IRunningObjectTable_Revoke(rot, cookie); + ok(hr == S_OK, "Failed to revoke registration, hr %#x.\n", hr); + + IRunningObjectTable_Release(rot); + + expected_method_list = methods_isrunning; + hr = IMoniker_IsRunning(moniker, bindctx, &container_moniker->IMoniker_iface, NULL); + ok(hr == 0x8beef000, "Unexpected hr %#x.\n", hr); + + expected_method_list = methods_isrunning; + hr = IMoniker_IsRunning(moniker, bindctx, &container_moniker->IMoniker_iface, moniker2); + ok(hr == 0x8beef000, "Unexpected hr %#x.\n", hr); + + IMoniker_Release(moniker2); + /* BindToObject() */ hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); ok(hr == E_INVALIDARG, "IMoniker_BindToStorage should return E_INVALIDARG, not 0x%08x\n", hr); - container_moniker = create_test_moniker(); - hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); ok(hr == (0x8bee0000 | BINDSPEED_INDEFINITE), "Unexpected hr %#x.\n", hr); @@ -2275,6 +2329,9 @@ todo_wine expected_item_moniker_comparison_data6, sizeof(expected_item_moniker_comparison_data6), 34, L""); + hr = CoCreateInstance(&CLSID_ItemMoniker, (IUnknown *)moniker, CLSCTX_SERVER, &IID_IMoniker, (void **)&moniker2); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); } @@ -2622,8 +2679,7 @@ todo_wine ok(hr == E_INVALIDARG, "IMoniker_IsRunning should return E_INVALIDARG, not 0x%08x\n", hr); hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); - todo_wine - ok(hr == S_FALSE, "IMoniker_IsRunning should return S_FALSE, not 0x%08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); ok(hr == MK_E_NOTBINDABLE, "IMoniker_GetTimeOfLastChange should return MK_E_NOTBINDABLE, not 0x%08x\n", hr);

1 0

Nikolay Sivov : ole32: Lock item container on BindToStorage().
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 0187babcc6d8a27c5d465c89b161b4c70d6b418c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0187babcc6d8a27c5d465c89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 10:32:21 2020 +0300 ole32: Lock item container on BindToStorage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 34 ++++++++++++++++------------------ dlls/ole32/tests/moniker.c | 5 ++++- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 111b111a1a..19876aa363 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -462,33 +462,31 @@ static HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface, /****************************************************************************** * ItemMoniker_BindToStorage ******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - REFIID riid, - VOID** ppvResult) +static HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, + void **ppvResult) { - ItemMonikerImpl *This = impl_from_IMoniker(iface); - HRESULT res; - IOleItemContainer *poic=0; + ItemMonikerImpl *moniker = impl_from_IMoniker(iface); + IOleItemContainer *container; + HRESULT hr; - TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); + TRACE("%p, %p, %p, %s, %p.\n", iface, pbc, pmkToLeft, debugstr_guid(riid), ppvResult); - *ppvResult=0; + *ppvResult = 0; - if(pmkToLeft==NULL) + if (!pmkToLeft) return E_INVALIDARG; - res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)&poic); - - if (SUCCEEDED(res)){ - - res=IOleItemContainer_GetObjectStorage(poic,This->itemName,pbc,riid,ppvResult); + hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IOleItemContainer, (void **)&container); + if (SUCCEEDED(hr)) + { + if (FAILED(hr = set_container_lock(container, pbc))) + WARN("Failed to lock container, hr %#x.\n", hr); - IOleItemContainer_Release(poic); + hr = IOleItemContainer_GetObjectStorage(container, moniker->itemName, pbc, riid, ppvResult); + IOleItemContainer_Release(container); } - return res; + return hr; } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7d4c8224ad..231551b244 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -380,7 +380,7 @@ static HRESULT WINAPI test_item_container_GetObject(IOleItemContainer *iface, LP static HRESULT WINAPI test_item_container_GetObjectStorage(IOleItemContainer *iface, LPOLESTR item, IBindCtx *pbc, REFIID riid, void **obj) { - return E_NOTIMPL; + return 0x8bee0001; } static HRESULT WINAPI test_item_container_IsRunning(IOleItemContainer *iface, LPOLESTR item) @@ -2235,6 +2235,9 @@ todo_wine hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_BindToStorage(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); + ok(hr == 0x8bee0001, "Unexpected hr %#x.\n", hr); + /* ParseDisplayName() */ hr = IMoniker_ParseDisplayName(moniker, bindctx, NULL, displayname, &eaten, &moniker2); ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr);

1 0