wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Zebediah Figura : quartz: Allow the arguments to IMediaSeeking::GetPositions() to be NULL.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 11df839b69a37b001e05a2dae433209efd100c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11df839b69a37b001e05a2da… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 22 18:29:21 2020 -0500 quartz: Allow the arguments to IMediaSeeking::GetPositions() to be NULL. This allows "UNDER NIGHT IN-BIRTH Exe:Late" to render video. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 18 ++++++++++-------- dlls/quartz/tests/filtergraph.c | 6 +++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7d6463c1f3..b691fd79fc 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2441,16 +2441,18 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * return hr; } -static HRESULT WINAPI MediaSeeking_GetPositions(IMediaSeeking *iface, LONGLONG *pCurrent, - LONGLONG *pStop) +static HRESULT WINAPI MediaSeeking_GetPositions(IMediaSeeking *iface, + LONGLONG *current, LONGLONG *stop) { - struct filter_graph *This = impl_from_IMediaSeeking(iface); - HRESULT hr; + struct filter_graph *graph = impl_from_IMediaSeeking(iface); + HRESULT hr = S_OK; - TRACE("(%p/%p)->(%p, %p)\n", This, iface, pCurrent, pStop); - hr = IMediaSeeking_GetCurrentPosition(iface, pCurrent); - if (SUCCEEDED(hr)) - hr = IMediaSeeking_GetStopPosition(iface, pStop); + TRACE("graph %p, current %p, stop %p.\n", graph, current, stop); + + if (current) + hr = IMediaSeeking_GetCurrentPosition(iface, current); + if (SUCCEEDED(hr) && stop) + hr = IMediaSeeking_GetStopPosition(iface, stop); return hr; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 9219b30cec..4fcd27b291 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4098,14 +4098,14 @@ static void test_graph_seeking(void) ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); hr = IMediaSeeking_GetPositions(seeking, NULL, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaSeeking_GetPositions(seeking, NULL, &stop); - todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); current = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!current, "Got time %s.\n", wine_dbgstr_longlong(time)); hr = IMediaSeeking_GetCurrentPosition(seeking, NULL);

1 0

Brendan Shanks : winemac.drv: Fix warnings for constants deprecated by macOS 10.14.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: f9dc364b4e76a613dde1bd0757c6c15f3030f7b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9dc364b4e76a613dde1bd07… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jul 22 15:49:57 2020 -0700 winemac.drv: Fix warnings for constants deprecated by macOS 10.14. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_clipboard.m | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 39c3b8f872..30f3097c3d 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -23,6 +23,14 @@ #import "cocoa_event.h" #import "cocoa_window.h" +#if !defined(MAC_OS_X_VERSION_10_14) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_14 +/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.14. */ +#define NSBitmapImageFileTypeBMP NSBMPFileType +#define NSBitmapImageFileTypeGIF NSGIFFileType +#define NSBitmapImageFileTypeJPEG NSJPEGFileType +#define NSBitmapImageFileTypePNG NSPNGFileType +#define NSBitmapImageFileTypeTIFF NSTIFFFileType +#endif static int owned_change_count = -1; static int change_count = -1; @@ -86,11 +94,11 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) dispatch_once(&BitmapOutputTypesInitOnce, ^{ NSArray* bitmapFileTypes = [NSArray arrayWithObjects: - [NSNumber numberWithUnsignedInteger:NSTIFFFileType], - [NSNumber numberWithUnsignedInteger:NSPNGFileType], - [NSNumber numberWithUnsignedInteger:NSBMPFileType], - [NSNumber numberWithUnsignedInteger:NSGIFFileType], - [NSNumber numberWithUnsignedInteger:NSJPEGFileType], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeTIFF], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypePNG], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeBMP], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeGIF], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeJPEG], nil]; BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png",

1 0

Brendan Shanks : winemac.drv: Build cocoa_window.m with GL_SILENCE_DEPRECATION.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 737c54dca02f2d8780258eae24c223a7de5fa1cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=737c54dca02f2d8780258eae… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jul 22 15:47:37 2020 -0700 winemac.drv: Build cocoa_window.m with GL_SILENCE_DEPRECATION. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index edbfab518e..9c2ffb1623 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -20,6 +20,7 @@ #include "config.h" +#define GL_SILENCE_DEPRECATION #import <Carbon/Carbon.h> #import <CoreVideo/CoreVideo.h> #ifdef HAVE_METAL_METAL_H

1 0

Matteo Bruni : wined3d: Get rid of default label in debug_cs_op() switch.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 399e01f9e56911cd136f34a75beab63e28d7c889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=399e01f9e56911cd136f34a7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 22 19:00:58 2020 +0200 wined3d: Get rid of default label in debug_cs_op() switch. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b87003c53b..908daa22a5 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -510,9 +510,8 @@ static const char *debug_cs_op(enum wined3d_cs_op op) WINED3D_TO_STR(WINED3D_CS_OP_GENERATE_MIPMAPS); WINED3D_TO_STR(WINED3D_CS_OP_STOP); #undef WINED3D_TO_STR - default: - return wine_dbg_sprintf("UNKNOWN_OP(%#x)", op); } + return wine_dbg_sprintf("UNKNOWN_OP(%#x)", op); } static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data)

1 0

Matteo Bruni : wined3d: Remove some unnecessary "inline" qualifiers.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 901042a123f72675ce3e66a8d1a0bae1dcf1ae9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=901042a123f72675ce3e66a8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 22 19:00:57 2020 +0200 wined3d: Remove some unnecessary "inline" qualifiers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a14682c95a..34736a802d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1037,7 +1037,7 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context_gl } /* Context activation is done by the caller. */ -static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, const struct wined3d_vec4 *constants, +static void walk_constant_heap(const struct wined3d_gl_info *gl_info, const struct wined3d_vec4 *constants, const GLint *constant_locations, const struct constant_heap *heap, unsigned char *stack, DWORD version) { unsigned int start = ~0U, end = 0; @@ -1111,7 +1111,7 @@ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, con } /* Context activation is done by the caller. */ -static inline void apply_clamped_constant(const struct wined3d_gl_info *gl_info, +static void apply_clamped_constant(const struct wined3d_gl_info *gl_info, GLint location, const struct wined3d_vec4 *data) { GLfloat clamped_constant[4]; @@ -1127,7 +1127,7 @@ static inline void apply_clamped_constant(const struct wined3d_gl_info *gl_info, } /* Context activation is done by the caller. */ -static inline void walk_constant_heap_clamped(const struct wined3d_gl_info *gl_info, +static void walk_constant_heap_clamped(const struct wined3d_gl_info *gl_info, const struct wined3d_vec4 *constants, const GLint *constant_locations, const struct constant_heap *heap, unsigned char *stack, DWORD version) { @@ -8536,7 +8536,7 @@ static GLuint find_glsl_fragment_shader(const struct wined3d_context_gl *context return ret; } -static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const struct vs_compile_args *new, +static BOOL vs_args_equal(const struct vs_compile_args *stored, const struct vs_compile_args *new, const DWORD use_map) { if ((stored->swizzle_map & use_map) != new->swizzle_map)

1 0

Matteo Bruni : wined3d: Set proper values for the guard band caps.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: ffc3c099d4818c3fc2bbfa76a0e9aaa59ab5f9a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffc3c099d4818c3fc2bbfa76… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 22 19:00:56 2020 +0200 wined3d: Set proper values for the guard band caps. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 67e96d1249..55ece68d55 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2088,10 +2088,10 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, caps->MaxTextureAspectRatio = d3d_info->limits.texture_size; caps->MaxVertexW = 1e10f; - caps->GuardBandLeft = 0.0f; - caps->GuardBandTop = 0.0f; - caps->GuardBandRight = 0.0f; - caps->GuardBandBottom = 0.0f; + caps->GuardBandLeft = -32768.0f; + caps->GuardBandTop = -32768.0f; + caps->GuardBandRight = 32768.0f; + caps->GuardBandBottom = 32768.0f; caps->ExtentsAdjust = 0.0f;

1 0

Matteo Bruni : wined3d: Fail adapter creation if driver version info can't be found.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: adf73f7371d27105323643654b236fddd64c60a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adf73f7371d2710532364365… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 22 19:00:55 2020 +0200 wined3d: Fail adapter creation if driver version info can't be found. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 8 ++++++-- dlls/wined3d/adapter_vk.c | 13 +++++++------ dlls/wined3d/directx.c | 23 +++++++++++++---------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index cc78c9046b..5bf9d179e4 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5214,8 +5214,12 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, gl_info->supported[ARB_TEXTURE_STORAGE] = FALSE; } - wined3d_driver_info_init(driver_info, caps_gl_ctx.gpu_description, adapter_gl->a.d3d_info.feature_level, - caps_gl_ctx.vram_bytes, 0); + if (!wined3d_driver_info_init(driver_info, caps_gl_ctx.gpu_description, adapter_gl->a.d3d_info.feature_level, + caps_gl_ctx.vram_bytes, 0)) + { + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); + return FALSE; + } TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", driver_info->version_high, driver_info->version_low); diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cbfb29cdd4..fd7b29fc8a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2037,7 +2037,7 @@ static enum wined3d_display_driver guess_display_driver(enum wined3d_pci_vendor } } -static void adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, +static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, const VkPhysicalDeviceProperties *properties) { const VkPhysicalDeviceMemoryProperties *memory_properties = &adapter_vk->memory_properties; @@ -2082,10 +2082,8 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, gpu_description = &description; } - wined3d_driver_info_init(&adapter_vk->a.driver_info, gpu_description, adapter_vk->a.d3d_info.feature_level, - vram_bytes, sysmem_bytes); - TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", - adapter_vk->a.driver_info.version_high, adapter_vk->a.driver_info.version_low); + return wined3d_driver_info_init(&adapter_vk->a.driver_info, gpu_description, + adapter_vk->a.d3d_info.feature_level, vram_bytes, sysmem_bytes); } static enum wined3d_feature_level feature_level_from_caps(const struct shader_caps *shader_caps) @@ -2209,7 +2207,10 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, wined3d_adapter_vk_init_d3d_info(adapter_vk, wined3d_creation_flags); - adapter_vk_init_driver_info(adapter_vk, &properties2.properties); + if (!adapter_vk_init_driver_info(adapter_vk, &properties2.properties)) + goto fail; + TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", + adapter_vk->a.driver_info.version_high, adapter_vk->a.driver_info.version_low); adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e797f21888..67e96d1249 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -672,7 +672,7 @@ static void wined3d_copy_name(char *dst, const char *src, unsigned int dst_size) } } -void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, +bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_desc, enum wined3d_feature_level feature_level, UINT64 vram_bytes, UINT64 sysmem_bytes) { @@ -849,15 +849,13 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_info->name = version_info->driver_name; driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, driver_feature_level); driver_info->version_low = MAKEDWORD_VERSION(version_info->subversion, version_info->build); + + return true; } - else - { - ERR("No driver version info found for device %04x:%04x, driver model %#x.\n", - driver_info->vendor, driver_info->device, driver_model); - driver_info->name = "Display"; - driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, driver_feature_level); - driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* NVIDIA RIVA TNT, arbitrary */ - } + + ERR("No driver version info found for device %04x:%04x, driver model %#x.\n", + driver_info->vendor, driver_info->device, driver_model); + return false; } enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor *vendor, @@ -2996,7 +2994,12 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, return NULL; } - wined3d_driver_info_init(&adapter->driver_info, &gpu_description, WINED3D_FEATURE_LEVEL_NONE, 0, 0); + if (!wined3d_driver_info_init(&adapter->driver_info, &gpu_description, WINED3D_FEATURE_LEVEL_NONE, 0, 0)) + { + wined3d_adapter_cleanup(adapter); + heap_free(adapter); + return NULL; + } adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 82dfd50775..83d790936f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3199,7 +3199,7 @@ struct wined3d_driver_info DWORD version_low; }; -void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, +bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_description, enum wined3d_feature_level feature_level, UINT64 vram_bytes, UINT64 sysmem_bytes) DECLSPEC_HIDDEN;

1 0

Matteo Bruni : wined3d: Correctly destroy the adapter on format initialization failure in no3d mode.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 1e25ff3cc4d015aa939ad49e334acb16d44e1b94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e25ff3cc4d015aa939ad49e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 22 19:00:54 2020 +0200 wined3d: Correctly destroy the adapter on format initialization failure in no3d mode. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 533d99f026..e797f21888 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2991,6 +2991,7 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, if (!wined3d_adapter_no3d_init_format_info(adapter)) { + wined3d_adapter_cleanup(adapter); heap_free(adapter); return NULL; }

1 0

Zebediah Figura : winspool: Stop modifying the "Devices" profile section.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: a5ef9295bc4994b30dd702f708debb776ccf55ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5ef9295bc4994b30dd702f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 21:50:50 2020 -0500 winspool: Stop modifying the "Devices" profile section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 07398966e7..f9c10f3de1 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -270,7 +270,6 @@ static const WCHAR txTimeoutW[] = {'t','x','T','i','m','e','o','u','t',0}; static const WCHAR UntilTimeW[] = {'U','n','t','i','l','T','i','m','e',0}; static WCHAR WinPrintW[] = {'W','i','n','P','r','i','n','t',0}; static const WCHAR deviceW[] = {'d','e','v','i','c','e',0}; -static const WCHAR devicesW[] = {'d','e','v','i','c','e','s',0}; static const WCHAR windowsW[] = {'w','i','n','d','o','w','s',0}; static WCHAR rawW[] = {'R','A','W',0}; static WCHAR driver_9x[] = {'w','i','n','e','p','s','1','6','.','d','r','v',0}; @@ -3165,7 +3164,6 @@ static void set_devices_and_printerports(PRINTER_INFO_2W *pi) lstrcatW(devline, pi->pPortName); TRACE("using %s\n", debugstr_w(devline)); - WriteProfileStringW(devicesW, pi->pPrinterName, devline); if (!RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey)) { RegSetValueExW(hkey, pi->pPrinterName, 0, REG_SZ, (LPBYTE)devline, (lstrlenW(devline) + 1) * sizeof(WCHAR)); @@ -3429,7 +3427,6 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) RegDeleteTreeW(hkeyPrinters, lpNameW); RegCloseKey(hkeyPrinters); } - WriteProfileStringW(devicesW, lpNameW, NULL); WriteProfileStringW(PrinterPortsW, lpNameW, NULL); if(RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey) == ERROR_SUCCESS) {

1 0

Zebediah Figura : wine.inf: Map the Devices section of win.ini to the registry.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 96115da054d2a1f142df121eb79c4a912505fc70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96115da054d2a1f142df121e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 21:50:49 2020 -0500 wine.inf: Map the Devices section of win.ini to the registry. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 23b91af480..65b224c37f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -565,6 +565,7 @@ HKLM,%CurrentVersionNT%\FontSubstitutes,,16 HKLM,%CurrentVersionNT%\Gre_Initialize,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\LanguagePack,,16

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020