August 2018 - Wine-Devel - list.winehq.org

[PATCH] wsdapi/tests: Avoid calls to malloc() and free().
by Francois Gouget Aug. 23, 2018

Aug. 23, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wsdapi/tests/discovery.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 43a4b2c3a44..f33f469a033 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -1029,20 +1029,20 @@ static void Publish_tests(void) another_name.LocalName = (WCHAR *) name_cider; another_name.Space = &ns2; - types_list.Next = malloc(sizeof(WSD_NAME_LIST)); + types_list.Next = heap_alloc(sizeof(WSD_NAME_LIST)); types_list.Element = &another_name; types_list.Next->Next = NULL; types_list.Next->Element = &header_any_name; /* Create scopes and xaddrs lists */ - scopes_list.Next = malloc(sizeof(WSD_URI_LIST)); + scopes_list.Next = heap_alloc(sizeof(WSD_URI_LIST)); scopes_list.Element = uri; scopes_list.Next->Next = NULL; scopes_list.Next->Element = uri_more_tests; - xaddrs_list.Next = malloc(sizeof(WSD_URI_LIST)); + xaddrs_list.Next = heap_alloc(sizeof(WSD_URI_LIST)); xaddrs_list.Element = uri_more_tests; xaddrs_list.Next->Next = NULL; @@ -1056,9 +1056,9 @@ static void Publish_tests(void) WSDFreeLinkedMemory(body_any_element); WSDFreeLinkedMemory(endpoint_any_element); WSDFreeLinkedMemory(ref_param_any_element); - free(types_list.Next); - free(scopes_list.Next); - free(xaddrs_list.Next); + heap_free(types_list.Next); + heap_free(scopes_list.Next); + heap_free(xaddrs_list.Next); ok(rc == S_OK, "Publish failed: %08x\n", rc); -- 2.18.0

1 0

[PATCH] winebus.sys: Avoid calling strdup().
by Francois Gouget Aug. 23, 2018

Aug. 23, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winebus.sys/bus_udev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d34e18c71c7..788b564851e 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -65,6 +65,7 @@ #include "ddk/wdm.h" #include "ddk/hidtypes.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #ifdef HAS_PROPER_INPUT_HEADER @@ -1046,7 +1047,7 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, DWORD *product_id, WCHAR **serial_number) { DWORD bus_type; - char *tmp = strdup(uevent); + char *tmp; char *saveptr = NULL; char *line; char *key; @@ -1055,6 +1056,8 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, int found_id = 0; int found_serial = 0; + tmp = heap_alloc(strlen(uevent) + 1); + strcpy(tmp, uevent); line = strtok_r(tmp, "\n", &saveptr); while (line != NULL) { @@ -1092,7 +1095,7 @@ next_line: line = strtok_r(NULL, "\n", &saveptr); } - free(tmp); + heap_free(tmp); return (found_id && found_serial); } -- 2.18.0

1 0

[PATCH] dbghelp/tests: Make stack_walk_thread() static.
by Francois Gouget Aug. 23, 2018

Aug. 23, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/tests/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 1292b667032..214adb7b16b 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -23,7 +23,7 @@ #if defined(__i386__) || defined(__x86_64__) -DWORD CALLBACK stack_walk_thread(void *arg) +static DWORD CALLBACK stack_walk_thread(void *arg) { DWORD count = SuspendThread(GetCurrentThread()); ok(!count, "got %d\n", count); -- 2.18.0

1 0

[PATCH] msvfw32/tests: Make gdf_driver_proc() static.
by Francois Gouget Aug. 23, 2018

Aug. 23, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvfw32/tests/msvfw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 406a35b8f11..7555015ef15 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -331,7 +331,7 @@ static const RGBQUAD color_yellow = {0x00, 0xff, 0xff, 0x00}; static BITMAPINFOHEADER gdf_in, *gdf_out; -LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, +static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, LPARAM lparam1, LPARAM lparam2) { LRESULT ret = 0; -- 2.18.0

1 0

[PATCH] dmusic: Make midi_port_create() static.
by Francois Gouget Aug. 23, 2018

Aug. 23, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dmusic/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 1fa94694a9a..c313875d08e 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -1174,7 +1174,7 @@ static const IDirectMusicThruVtbl midi_thru_vtbl = { midi_IDirectMusicThru_ThruChannel, }; -HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMUS_PORTCAPS *caps, +static HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMUS_PORTCAPS *caps, IDirectMusicPort **port) { struct midi_port *obj; -- 2.18.0

1 0

[PATCH] ntdll: Simplify the file_part finder in RtlDosPathNameToNtPathName_U_WithStatus
by Gabriel Ivăncescu Aug. 23, 2018

Aug. 23, 2018

Path is known to start with \??\ in this block, so strrchrW cannot ever return NULL, thus there is no reason to check for it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ntdll/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ccc95e3..d2e70bb 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -366,8 +366,8 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U ntpath->Buffer[1] = '?'; /* change \\?\ to \??\ */ if (file_part) { - if ((ptr = strrchrW( ntpath->Buffer, '\\' )) && ptr[1]) *file_part = ptr + 1; - else *file_part = NULL; + ptr = strrchrW(ntpath->Buffer, '\\'); + *file_part = ptr[1] ? ptr + 1 : NULL; } return STATUS_SUCCESS; } -- 1.9.1

1 0

[PATCH] ntdll: Properly set the current directory for UNC paths
by Gabriel Ivăncescu Aug. 23, 2018

Aug. 23, 2018

Most of the other code deals with UNC paths of the form \\server\share in the current directory, which is proper, but the current directory is wrongfully set to the form UNC\server\share, so fix it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37834 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ntdll/path.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ccc95e3..6291f9d 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -1039,12 +1039,22 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) if (curdir->Handle) NtClose( curdir->Handle ); curdir->Handle = handle; - /* append trailing \ if missing */ size = newdir.Length / sizeof(WCHAR); ptr = newdir.Buffer; ptr += 4; /* skip \??\ prefix */ size -= 4; - if (size && ptr[size - 1] != '\\') ptr[size++] = '\\'; + if (size) + { + /* append trailing \ if missing */ + if (ptr[size - 1] != '\\') ptr[size++] = '\\'; + + /* convert \??\UNC\ path to \\ prefix */ + if (size >= 4 && !strncmpiW(ptr, UncPfxW, 4)) + { + ptr += 4-2; size -= 4-2; + *ptr = '\\'; + } + } memcpy( curdir->DosPath.Buffer, ptr, size * sizeof(WCHAR)); curdir->DosPath.Buffer[size] = 0; -- 1.9.1

1 0

[PATCH 5/5] wined3d: Add max_rt_count field to d3d_info.
by Józef Kucia Aug. 23, 2018

Aug. 23, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/cs.c | 17 +++++++++-------- dlls/wined3d/device.c | 22 ++++++++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 39671f2f30cf..1dcf3eb6b6eb 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3658,6 +3658,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); d3d_info->shadow_sampler = gl_info->supported[ARB_SHADOW]; + d3d_info->limits.max_rt_count = gl_info->limits.buffers; d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7bd51f4c2a19..ecfce4181235 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -588,7 +588,7 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; + unsigned int rt_count = cs->device->adapter->d3d_info.limits.max_rt_count; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; @@ -839,6 +839,7 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_shader *geometry_shader; struct wined3d_state *state = &cs->state; @@ -893,7 +894,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) if (state->textures[i]) wined3d_resource_release(&state->textures[i]->resource); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_release(state->fb->render_targets[i]->resource); @@ -906,7 +907,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } static void acquire_graphics_pipeline_resources(const struct wined3d_state *state, - BOOL indexed, const struct wined3d_gl_info *gl_info) + BOOL indexed, const struct wined3d_d3d_info *d3d_info) { unsigned int i; @@ -927,7 +928,7 @@ static void acquire_graphics_pipeline_resources(const struct wined3d_state *stat if (state->textures[i]) wined3d_resource_acquire(&state->textures[i]->resource); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_acquire(state->fb->render_targets[i]->resource); @@ -943,7 +944,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; @@ -959,7 +960,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned op->parameters.u.direct.instance_count = instance_count; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, gl_info); + acquire_graphics_pipeline_resources(state, indexed, d3d_info); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -967,7 +968,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, struct wined3d_buffer *buffer, unsigned int offset, BOOL indexed) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; @@ -980,7 +981,7 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, op->parameters.u.indirect.offset = offset; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, gl_info); + acquire_graphics_pipeline_resources(state, indexed, d3d_info); wined3d_resource_acquire(&buffer->resource); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab67a967a3fa..96b8d3c247d6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -970,7 +970,7 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi BOOL ds_enable = swapchain->desc.enable_auto_depth_stencil; unsigned int i; - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -1240,7 +1240,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) ERR("Something's still holding the auto depth/stencil view (%p).\n", view); } - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -4380,11 +4380,14 @@ void CDECL wined3d_device_clear_unordered_access_view_uint(struct wined3d_device struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx) { + unsigned int max_rt_count; + TRACE("device %p, view_idx %u.\n", device, view_idx); - if (view_idx >= device->adapter->gl_info.limits.buffers) + max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + if (view_idx >= max_rt_count) { - WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", max_rt_count); return NULL; } @@ -4402,13 +4405,15 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport) { struct wined3d_rendertarget_view *prev; + unsigned int max_rt_count; TRACE("device %p, view_idx %u, view %p, set_viewport %#x.\n", device, view_idx, view, set_viewport); - if (view_idx >= device->adapter->gl_info.limits.buffers) + max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + if (view_idx >= max_rt_count) { - WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", max_rt_count); return WINED3DERR_INVALIDCALL; } @@ -4706,6 +4711,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state) { + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; @@ -4739,7 +4745,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state_unbind_resources(&device->state); } - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -5038,7 +5044,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso if (device->d3d_initialized) { - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < ARRAY_SIZE(device->fb.render_targets); ++i) { if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) ERR("Resource %p is still in use as render target %u.\n", resource, i); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d2229c20b2eb..8ad02452a137 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2201,7 +2201,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->AdapterOrdinalInGroup = 0; caps->NumberOfAdaptersInGroup = 1; - caps->NumSimultaneousRTs = gl_info->limits.buffers; + caps->NumSimultaneousRTs = d3d_info->limits.max_rt_count; caps->StretchRectFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT | diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 834ca151cf6a..6bd60fee953f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -164,6 +164,7 @@ struct wined3d_d3d_limits unsigned int ffp_vertex_blend_matrices; unsigned int active_light_count; + unsigned int max_rt_count; float pointsize_max; }; -- 2.16.4

1 0

[PATCH 1/2] comctl32/edit: Move the call to EDIT_EM_SetSel outside the block
by Gabriel Ivăncescu Aug. 23, 2018

Aug. 23, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- It's called in every block anyway including the else block. dlls/comctl32/edit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..c0904cb 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3308,19 +3308,17 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) else EDIT_WM_Clear(es); } else { + EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); if (shift) { /* delete character left of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveBackward(es, TRUE); EDIT_WM_Clear(es); } else if (control) { /* delete to end of line */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveEnd(es, TRUE, FALSE); EDIT_WM_Clear(es); } else { /* delete character right of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveForward(es, TRUE); EDIT_WM_Clear(es); } -- 1.9.1

2 3

[PATCH v2] shell32: Add start menu icon
by Alex Henrie Aug. 23, 2018

Aug. 23, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Forgot to add the icon to shell32.rc --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/menu.ico | Bin 0 -> 4696 bytes dlls/shell32/resources/menu.svg | 214 ++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 219 insertions(+) create mode 100644 dlls/shell32/resources/menu.ico create mode 100644 dlls/shell32/resources/menu.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index bef3f6304a..886301542d 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -74,6 +74,7 @@ SVG_SRCS = \ resources/folder_open.svg \ resources/help.svg \ resources/internet.svg \ + resources/menu.svg \ resources/mycomputer.svg \ resources/mydocs.svg \ resources/netdrive.svg \ diff --git a/dlls/shell32/resources/menu.ico b/dlls/shell32/resources/menu.ico new file mode 100644 index 0000000000000000000000000000000000000000..516fb3a9fe0b25920321fd679a58aea0cc8396a3 GIT binary patch literal 4696 zcmeHKOK4M35Iy<We45aw1r=9s;isGEZ39|@&?F=@K(a)+qD>`D{UC@%a|Voen!gn;cT zf(r%fwzv|z5mEd^iz~&I3q`S{n^LS+gj!;0oZEPtJW<}Ib&*8|CNt;W^JXS<@4$P2 z0d{aPKt;|7jFZopk+1>G1ay$r<Ng*c9<c$c`kQY69yqjk#;L_y+W<wW^6ycukfOzl zf8aYCfzd<JUZ;H<FVq<h1^RfkT&-p(a)3zy?_WXvah5g#y7XkAKdAgm(a)seG%Z&P9U2H z%CwZ70WL6LHV$}h0$a|FJv_XhHjKv)^afD5T6p!8kR=_C1T7`&=1nF`W}@_#mXu^7 zIz+q-Wu^LH<+`V3JVy9TIN*zA-p_q3+9sI;#l`a1cSrK7{qsS?bN|mD--)V`V;5hx ze_5~(zGz*(|LM(c!=z1(V$e9!?j1wPtnA8muVG1(p$;4!63NP)+t;6l*H;%^<7RK% z{+56A*#BWZcf~Qfu79)I22BD2Q`5`Sis?zu^%UJo>_`Xu(*ucg%9A{wB7-j0+3jN8 zt}b_sF%NTl*ghBA>tSs6^{`v>!0EFCr%nw2`+-~6iUpoL9E=9;`s29{^6BOvPRb{P zOSWoOd>WjlG*AaBD+0*cC0=_EAZumg>hWar37%d&*?kdD*2=~eyym<#&@f1pBF;_L z%HA8nlZ~s#6Y*rNUOd(a)-*?fX08&~j}^CEFc8;By#P1cHgA!}vh>hWar37%d&*?kdD z*2=~eJU%Zfsh4#1eT;k|jrKlPt-JO+546>5ZAa_XbGWbFtsy;LvtPAdaj)60YCrV) vAiAc<<M&G;RY}D>ddU~^zvr=1;qUgqGx`qXDzNNYvtDsBf48EaYwhnZVuEqx literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/menu.svg b/dlls/shell32/resources/menu.svg new file mode 100644 index 0000000000..408803b4bb --- /dev/null +++ b/dlls/shell32/resources/menu.svg @@ -0,0 +1,214 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + id="svg8" + version="1.1" + viewBox="0 0 632 272" + height="272" + width="632"> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <rect + y="200" + x="40" + height="32" + width="192" + id="rect815" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="120" + x="40" + height="32" + width="192" + id="rect815-3" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="40" + x="40" + height="32" + width="192" + id="rect815-3-6" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <rect + y="256" + x="278" + height="6" + width="36" + id="rect815-7" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0stroke-opacity:1" /> + <rect + y="241" + x="278" + height="6" + width="36" + id="rect815-3-5" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="226" + x="278" + height="6" + width="36" + id="rect815-3-6-3" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAcIAAAHCAAXfPIkwAAAAHdElNRQfiCBYRBApLB7b2AAAANklEQVRYw+3UMQ4AIAgAMfT/f8bZ +WUVN2o2FCwsRsKpNU+7f2k9fIHA/ABTwrgWAL3jXAvCCAcmqAyIux0X6AAAAJXRFWHRkYXRlOmNy +ZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEwLTA2OjAw89BlqAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx +OC0wOC0yMlQyMzowNDoxMC0wNjowMIKN3RQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v +cmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:48-8" + x="328" + y="220" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAcIAAAHCAAXfPIkwAAAAHdElNRQfiCBYRBApLB7b2AAAANklEQVRYw+3UMQ4AIAgAMfT/f8bZ +WUVN2o2FCwsRsKpNU+7f2k9fIHA/ABTwrgWAL3jXAvCCAcmqAyIux0X6AAAAJXRFWHRkYXRlOmNy +ZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEwLTA2OjAw89BlqAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx +OC0wOC0yMlQyMzowNDoxMC0wNjowMIKN3RQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v +cmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:48-4" + x="384" + y="220" /> + <rect + y="260" + x="444" + height="4" + width="24" + id="rect815-7-5" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="250" + x="444" + height="4" + width="24" + id="rect815-3-5-6" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="240" + x="444" + height="4" + width="24" + id="rect815-3-6-3-2" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAASwAAAEsAAdCmVQYAAAAHdElNRQfiCBYRBApLB7b2AAAAK0lEQVRIx2NgGAWMcNZ/8nQyUeqC +gTdgFAwGMJoSR8HgAKMpcRQwMDAwAAD3KQMWtPUZjwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0w +OC0yMlQyMzowNDoxMC0wNjowMPPQZagAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTgtMDgtMjJUMjM6 +MDQ6MTAtMDY6MDCCjd0UAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJ +RU5ErkJggg== +" + id="icon:32-8" + x="480" + y="236" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAASwAAAEsAAdCmVQYAAAAHdElNRQfiCBYRBApLB7b2AAAAK0lEQVRIx2NgGAWMcNZ/8nQyUeqC +gTdgFAwGMJoSR8HgAKMpcRQwMDAwAAD3KQMWtPUZjwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0w +OC0yMlQyMzowNDoxMC0wNjowMPPQZagAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTgtMDgtMjJUMjM6 +MDQ6MTAtMDY6MDCCjd0UAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJ +RU5ErkJggg== +" + id="icon:32-4" + x="520" + y="236" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBYRChrIM4scAAAAHklEQVQoz2NgoBQwMjAwMDD8xy3L +RLEVlINRRxIJAHSgAwpvTcLEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDIzOjEwOjI2 +LTA2OjAw1uooywAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQyMzoxMDoyNi0wNjowMKe3 +kHcAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:16-32" + x="560" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBYRBAs8AIZgAAAAHklEQVQoz2NgoBQwMjAwMDD8xy3L +RLEVlINRRxIJAHSgAwpvTcLEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEx +LTA2OjAwVaduHAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQyMzowNDoxMS0wNjowMCT6 +1qAAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:16-8" + x="584" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBYRBAs8AIZgAAAAHklEQVQoz2NgoBQwMjAwMDD8xy3L +RLEVlINRRxIJAHSgAwpvTcLEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEx +LTA2OjAwVaduHAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQyMzowNDoxMS0wNjowMCT6 +1qAAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:16-4" + x="608" + y="252" /> +</svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 86ae802bee..d0bd5e85b6 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -538,6 +538,9 @@ IDI_PRINTERS_FOLDER ICON resources/folder.ico /* @makedep: resources/folder.ico */ IDI_FONTS_FOLDER ICON resources/folder.ico +/* @makedep: resources/menu.ico */ +IDI_SHELL_START_MENU ICON resources/menu.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 178fa789ae..5a637e95ba 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -208,6 +208,7 @@ #define IDI_SHELL_APP_FOLDER 37 #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 +#define IDI_SHELL_START_MENU 40 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 -- 2.18.0

2 1