November 2019 - Wine-Commits

Alexandre Julliard : mscoree: Store the Mono base directory in Unicode.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: df3c911c635c3c0d236af30ddfff1c618367dd8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=df3c911c635c3c0d236af30d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 17 16:09:37 2019 +0100 mscoree: Store the Mono base directory in Unicode. --- dlls/mscoree/metahost.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 18232a4568..4c1e4e97c1 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -711,7 +711,7 @@ static BOOL get_mono_path_registry(LPWSTR path) static BOOL get_mono_path_dos(const WCHAR *dir, LPWSTR path) { static const WCHAR unix_prefix[] = {'\\','\\','?','\\','u','n','i','x','\\'}; - static const char basedir[] = "\\wine-mono-" WINE_MONO_VERSION; + static const WCHAR basedir[] = L"\\wine-mono-" WINE_MONO_VERSION; LPWSTR dos_dir; WCHAR mono_dll_path[MAX_PATH]; DWORD len; @@ -720,10 +720,10 @@ static BOOL get_mono_path_dos(const WCHAR *dir, LPWSTR path) if (memcmp(dir, unix_prefix, sizeof(unix_prefix)) == 0) return FALSE; /* No drive letter for this directory */ - len = lstrlenW( dir ) + MultiByteToWideChar( CP_UNIXCP, 0, basedir, -1, NULL, 0 ); + len = lstrlenW( dir ) + lstrlenW( basedir ) + 1; if (!(dos_dir = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; lstrcpyW( dos_dir, dir ); - MultiByteToWideChar( CP_UNIXCP, 0, basedir, -1, dos_dir + lstrlenW(dos_dir), len - lstrlenW(dos_dir)); + lstrcatW( dos_dir, basedir ); ret = find_mono_dll(dos_dir, mono_dll_path); if (ret)

1 0

Zebediah Figura : ddraw: Track WINED3D_RS_ZENABLE in the primary stateblock.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 769ba7d1e91c9a178786b9139a301cdffef2300b URL: https://source.winehq.org/git/wine.git/?a=commit;h=769ba7d1e91c9a178786b913… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 17:26:32 2019 -0600 ddraw: Track WINED3D_RS_ZENABLE in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 2 ++ dlls/ddraw/surface.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cdb2e9c2ba..4ad1fdb7f5 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -7025,6 +7025,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, ddraw->d3ddevice = device; + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_ZENABLE, + d3d_device_update_depth_stencil(device)); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, d3d_device_update_depth_stencil(device)); if (version == 1) /* Color keying is initially enabled for version 1 devices. */ diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 89e5024c0e..fda42f2982 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6085,6 +6085,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return hr_ddraw_from_wined3d(hr); } + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); }

1 0

Michael Stefaniuc : dmstyle/tests: Check all IDirectMusicTrack8_IsParamSupported() types.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 5d11ee2fe02a37a3bc5beb8bfcc320e7492698c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d11ee2fe02a37a3bc5beb8b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:16 2019 +0100 dmstyle/tests: Check all IDirectMusicTrack8_IsParamSupported() types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 66 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 6b2275866c..0c17ef3b41 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -244,22 +244,61 @@ static void test_track(void) CLSID classid; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } param_types[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicChordMap) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) } + }; +#undef X #define X(class) &CLSID_ ## class, #class const struct { REFCLSID clsid; const char *name; BOOL has_save; BOOL has_join; + /* bitfields with supported param types */ + unsigned int has_params; + unsigned int todo_params; } class[] = { - { X(DirectMusicAuditionTrack), TRUE, FALSE }, - { X(DirectMusicChordTrack), TRUE, TRUE }, - { X(DirectMusicCommandTrack), TRUE, TRUE }, - { X(DirectMusicMotifTrack), FALSE, FALSE }, - { X(DirectMusicMuteTrack), TRUE, FALSE }, - { X(DirectMusicStyleTrack), FALSE, TRUE }, + { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 }, + { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 1 }, + { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 }, + { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 }, + { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 }, + { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200, 0 }, }; #undef X - unsigned int i; + unsigned int i, j; for (i = 0; i < ARRAY_SIZE(class); i++) { trace("Testing %s\n", class[i].name); @@ -287,6 +326,19 @@ static void test_track(void) hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + for (j = 0; j < ARRAY_SIZE(param_types); j++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[j].type); + if (class[i].has_params & (1 << j)) + todo_wine_if(class[i].todo_params & (1 << j)) + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[j].name, hr); + else + todo_wine_if(class[i].todo_params & (1 << j)) + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[j].name, hr); + } + if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr);

1 0

Zebediah Figura : d3d9: Track WINED3D_RS_ZENABLE in the primary stateblock.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: c7073bec0c84239072d80ca809b944dfc56ab4cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7073bec0c84239072d80ca8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 17:26:30 2019 -0600 d3d9: Track WINED3D_RS_ZENABLE in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ec1800a649..5ef0c9cdf6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1007,6 +1007,8 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (!extended) { device->auto_mipmaps = 0; + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); } @@ -4630,6 +4632,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_swapchain_incref(d3d_swapchain->wined3d_swapchain); IDirect3DSwapChain9Ex_Release(&d3d_swapchain->IDirect3DSwapChain9Ex_iface); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc->enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil);

1 0

Gijs Vermeulen : odbccp32: Handle NULL sizeout in SQLGetInstalledDrivers.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 3915b8d22921daeb30015b2204ff90f25ca19cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3915b8d22921daeb30015b22… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Nov 16 17:08:44 2019 +0100 odbccp32: Handle NULL sizeout in SQLGetInstalledDrivers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48111 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 3 ++- dlls/odbccp32/tests/misc.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 1198b487f3..a09d6571f3 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -583,7 +583,8 @@ BOOL WINAPI SQLGetInstalledDrivers(char *buf, WORD size, WORD *sizeout) return FALSE; } - *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL); + if (sizeout) + *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, wbuf, written, buf, size, NULL, NULL); heap_free(wbuf); diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index dc2ca7ed3f..e2f48ee732 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -643,6 +643,11 @@ static void test_SQLGetInstalledDrivers(void) ok(!ret, "got %d\n", ret); check_error(ODBC_ERROR_INVALID_BUFF_LEN); + ret = SQLGetInstalledDrivers(buffer, 10, NULL); + ok(ret, "got %d\n", ret); + ok(strlen(buffer) == 8, "got len %u\n", lstrlenA(buffer)); + ok(!buffer[9], "buffer not doubly null-terminated\n"); + ret = SQLGetInstalledDrivers(buffer, 10, &written); ok(ret, "got %d\n", ret); ok(strlen(buffer) == 8, "got len %u\n", lstrlenA(buffer));

1 0

Alexandre Julliard : kernel32: Move Get/SetCalendarInfo to kernelbase.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: ab6970d9b09d763ccd27660e706dff157b6195e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6970d9b09d763ccd27660e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 21:27:00 2019 +0100 kernel32: Move Get/SetCalendarInfo to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/time.c | 227 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/locale.c | 204 ++++++++++++++++++++++++++++++++++++ 4 files changed, 210 insertions(+), 233 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab6970d9b09d763ccd27…

1 0

Nikolay Sivov : ole32/tests: Check more return values in moniker tests (Coverity).
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: b9462e66a4d75e4477285bf220af4e92ca8bcbed URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9462e66a4d75e4477285bf2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 16 21:06:38 2019 +0300 ole32/tests: Check more return values in moniker tests (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 9e2c23b421..cbffad4dfa 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1049,36 +1049,33 @@ todo_wine ok_ole_success(hr, CreateBindCtx); hr = CreateFileMoniker(wszFileName1, &pmk1); - ok(hr==0, "CreateFileMoniker for file hr=%08x\n", hr); + ok(hr == S_OK, "Failed to create file moniker, hr %#x.\n", hr); hr = CreateFileMoniker(wszFileName2, &pmk2); - ok(hr==0, "CreateFileMoniker for file hr=%08x\n", hr); + ok(hr == S_OK, "Failed to create file moniker, hr %#x.\n", hr); hr = IBindCtx_GetRunningObjectTable(pbc, &pprot); - ok(hr==0, "IBindCtx_GetRunningObjectTable hr=%08x\n", hr); + ok(hr == S_OK, "Failed to get ROT, hr %#x.\n", hr); /* Check EnumMoniker before registering */ hr = IRunningObjectTable_EnumRunning(pprot, &spEM1); - ok(hr==0, "IRunningObjectTable_EnumRunning hr=%08x\n", hr); - hr = IEnumMoniker_QueryInterface(spEM1, &IID_IUnknown, (void*) &lpEM1); + ok(hr == S_OK, "Failed to get enum object, hr %#x.\n", hr); + hr = IEnumMoniker_QueryInterface(spEM1, &IID_IUnknown, (void *)&lpEM1); /* Register a couple of Monikers and check is ok */ - ok(hr==0, "IEnumMoniker_QueryInterface hr %08x %p\n", hr, lpEM1); - + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + matchCnt = count_moniker_matches(pbc, spEM1); trace("Number of matches is %i\n", matchCnt); grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk1, &pdwReg1); - ok(hr==0, "IRunningObjectTable_Register hr=%08x %p %08x %p %p %d\n", - hr, pprot, grflags, lpEM1, pmk1, pdwReg1); + ok(hr == S_OK, "Failed to register object, hr %#x.\n", hr); - trace("IROT::Register\n"); grflags=0; grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk2, &pdwReg2); - ok(hr==0, "IRunningObjectTable_Register hr=%08x %p %08x %p %p %d\n", hr, - pprot, grflags, lpEM1, pmk2, pdwReg2); + ok(hr == S_OK, "Failed to register object, hr %#x.\n", hr); hr = IRunningObjectTable_EnumRunning(pprot, &spEM2); - ok(hr==0, "IRunningObjectTable_EnumRunning hr=%08x\n", hr); + ok(hr == S_OK, "Failed to get enum object, hr %#x.\n", hr); matchCnt = count_moniker_matches(pbc, spEM2); ok(matchCnt==2, "Number of matches should be equal to 2 not %i\n", matchCnt); @@ -1094,8 +1091,10 @@ todo_wine matchCnt = count_moniker_matches(pbc, spEM3); ok(matchCnt==2, "Number of matches should be equal to 2 not %i\n", matchCnt); - IRunningObjectTable_Revoke(pprot,pdwReg1); - IRunningObjectTable_Revoke(pprot,pdwReg2); + hr = IRunningObjectTable_Revoke(pprot,pdwReg1); + ok(hr == S_OK, "Failed to revoke, hr %#x.\n", hr); + hr = IRunningObjectTable_Revoke(pprot,pdwReg2); + ok(hr == S_OK, "Failed to revoke, hr %#x.\n", hr); IUnknown_Release(lpEM1); IEnumMoniker_Release(spEM1); IEnumMoniker_Release(spEM2);

1 0

Serge Gautherie : wbemprox: Always free 'new_path'.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: a45dfea99a2eeaf3ede829b04e58c13d14b33970 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a45dfea99a2eeaf3ede829b0… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon Nov 18 11:16:48 2019 +0100 wbemprox: Always free 'new_path'. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 96d1e0b850..53d4b169cd 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2341,7 +2341,13 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c goto done; } if (!wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW )) continue; - new_path = append_path( path, data.cFileName, &len ); + + if (!(new_path = append_path( path, data.cFileName, &len ))) + { + status = FILL_STATUS_FAILED; + FindClose( handle ); + goto done; + } if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -2354,6 +2360,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c rec = (struct record_datafile *)(table->data + offset); rec->name = build_name( root[0], new_path ); rec->version = get_file_version( rec->name ); + heap_free( new_path ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row ); @@ -2465,7 +2472,13 @@ static enum fill_status fill_directory( struct table *table, const struct expr * !wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW )) continue; - new_path = append_path( path, data.cFileName, &len ); + if (!(new_path = append_path( path, data.cFileName, &len ))) + { + FindClose( handle ); + status = FILL_STATUS_FAILED; + goto done; + } + if (!(push_dir( dirstack, new_path, len ))) { heap_free( new_path ); @@ -2476,6 +2489,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * rec = (struct record_directory *)(table->data + offset); rec->accessmask = FILE_ALL_ACCESS; rec->name = build_name( root[0], new_path ); + heap_free( new_path ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

1 0

Alexandre Julliard : appwiz.cpl: Use Unicode strings for addons file names.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 0a443c1f36c9f7fd8242f129dbbfcc4604cf8e2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a443c1f36c9f7fd8242f129… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 17 15:58:59 2019 +0100 appwiz.cpl: Use Unicode strings for addons file names. --- dlls/appwiz.cpl/addons.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 350c25ef90..8d4be64930 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -63,8 +63,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); typedef struct { const char *version; - const char *file_name; - const char *subdir_name; + const WCHAR *file_name; + const WCHAR *subdir_name; const char *sha; const char *url_default; const char *config_key; @@ -79,8 +79,8 @@ typedef struct { static const addon_info_t addons_info[] = { { GECKO_VERSION, - "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", - "gecko", + L"wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", + L"gecko", GECKO_SHA, "http://source.winehq.org/winegecko.php", "MSHTML", "GeckoUrl", "GeckoCabDir", @@ -88,8 +88,8 @@ static const addon_info_t addons_info[] = { }, { MONO_VERSION, - "wine-mono-" MONO_VERSION ".msi", - "mono", + L"wine-mono-" MONO_VERSION ".msi", + L"mono", MONO_SHA, "http://source.winehq.org/winemono.php", "Dotnet", "MonoUrl", "MonoCabDir", @@ -198,28 +198,23 @@ static enum install_res install_file(const WCHAR *file_name) return INSTALL_OK; } -static enum install_res install_from_dos_file(const WCHAR *dir, const char *subdir, const char *file_name) +static enum install_res install_from_dos_file(const WCHAR *dir, const WCHAR *subdir, const WCHAR *file_name) { - static const WCHAR ntprefixW[] = {'\\','?','?','\\',0}; WCHAR *path; enum install_res ret; int len = lstrlenW( dir ); int size = len + 1; - size += MultiByteToWideChar( CP_UNIXCP, 0, subdir, -1, NULL, 0 ); - size += MultiByteToWideChar( CP_UNIXCP, 0, file_name, -1, NULL, 0 ); + size += lstrlenW( subdir ) + lstrlenW( file_name ) + 2; if (!(path = heap_alloc( size * sizeof(WCHAR) ))) return INSTALL_FAILED; lstrcpyW( path, dir ); - if (!wcsncmp( path, ntprefixW, wcslen(ntprefixW) )) path[1] = '\\'; /* change \??\ into \\?\ */ + if (!wcsncmp( path, L"\\??\\", 4 )) path[1] = '\\'; /* change \??\ into \\?\ */ if (len && path[len-1] != '/' && path[len-1] != '\\') path[len++] = '\\'; - if (*subdir) - { - len += MultiByteToWideChar( CP_UNIXCP, 0, subdir, -1, path + len, size - len ); - path[len - 1] = '\\'; - } - MultiByteToWideChar( CP_UNIXCP, 0, file_name, -1, path + len, size - len ); + lstrcpyW( path + len, subdir ); + lstrcatW( path, L"\\" ); + lstrcatW( path, file_name ); if (GetFileAttributesW( path ) == INVALID_FILE_ATTRIBUTES) { @@ -234,7 +229,7 @@ static enum install_res install_from_dos_file(const WCHAR *dir, const char *subd return ret; } -static enum install_res install_from_unix_file(const char *dir, const char *subdir, const char *file_name) +static enum install_res install_from_unix_file(const char *dir, const WCHAR *subdir, const WCHAR *file_name) { WCHAR *dos_dir; enum install_res ret = INSTALL_NEXT; @@ -290,7 +285,7 @@ static enum install_res install_from_registered_dir(void) return INSTALL_FAILED; } - ret = install_from_unix_file(package_dir, "", addon->file_name); + ret = install_from_unix_file(package_dir, L"", addon->file_name); heap_free(package_dir); return ret; @@ -357,8 +352,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) return NULL; } - size = lstrlenW( cache_dir ) + ARRAY_SIZE(wineW); - size += MultiByteToWideChar( CP_UNIXCP, 0, addon->file_name, -1, NULL, 0 ); + size = lstrlenW( cache_dir ) + ARRAY_SIZE(wineW) + lstrlenW( addon->file_name ) + 1; if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) { heap_free( cache_dir ); @@ -376,7 +370,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) } len = lstrlenW( ret ); ret[len++] = '\\'; - MultiByteToWideChar( CP_UNIXCP, 0, addon->file_name, -1, ret + len, size - len ); + lstrcpyW( ret + len, addon->file_name ); TRACE( "got %s\n", debugstr_w(ret) ); return ret;

1 0

Alexandre Julliard : kernel32: Move EnumDateFormats functions to kernelbase.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 02d9ccb3c3903550c3206ca0ee6c59de30470e35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d9ccb3c3903550c3206ca0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 19:57:12 2019 +0100 kernel32: Move EnumDateFormats functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/lcformat.c | 173 ---------------------------------------- dlls/kernel32/locale.c | 24 ++++++ dlls/kernelbase/kernelbase.spec | 8 +- dlls/kernelbase/locale.c | 83 +++++++++++++++++++ 5 files changed, 114 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02d9ccb3c3903550c320…

1 0