September 2023 - Wine-commits

Alistair Leslie-Hughes : d3drm: Correctly query for the returned interface.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: fa4be54777517c93c6058cc23efdb63fbca37b35 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa4be54777517c93c6058cc23efdb6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 15 20:39:14 2023 +1000 d3drm: Correctly query for the returned interface. IDirect3DRM2::CreateTextureFromSurface is expected to return an IDirect3DRMTexture2 object. --- dlls/d3drm/d3drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 761132b3bd1..39b5b0fcb20 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1064,7 +1064,7 @@ static HRESULT WINAPI d3drm2_CreateTextureFromSurface(IDirect3DRM2 *iface, return hr; } - hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)texture); + hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture2, (void **)texture); IDirect3DRMTexture3_Release(texture3); return hr;

1 0

Hans Leidekker : winmm/tests: Avoid truncating the handle passed to waveInGetDevCapsW().
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 37c19e7a877e942f446a156ecb515797c782b7b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/37c19e7a877e942f446a156ecb5157… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 19 16:56:17 2023 +0200 winmm/tests: Avoid truncating the handle passed to waveInGetDevCapsW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55240 --- dlls/winmm/tests/capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index a3d15e418ec..f95ea0c17e6 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -176,7 +176,7 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, pwfx->nChannels, nSamplesPerSec, wBitsPerSample, nChannels); /* waveInGetDevCaps allows an open handle instead of a device id */ - rc=waveInGetDevCapsW(HandleToUlong(win),&capsW,sizeof(capsW)); + rc=waveInGetDevCapsW((UINT_PTR)win,&capsW,sizeof(capsW)); ok(rc==MMSYSERR_NOERROR, "waveInGetDevCapsW(%s): MMSYSERR_NOERROR " "expected, got %s\n",dev_name(device),wave_in_error(rc));

1 0

Alexandre Julliard : oleaut32: Add SEH annotations to ARM64 assembly code.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: bb611b9db795129c32db1bb46c238cc213e52ff6 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb611b9db795129c32db1bb46c238c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 11:17:40 2023 +0200 oleaut32: Add SEH annotations to ARM64 assembly code. --- dlls/oleaut32/typelib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5e9093f61a4..fa512184182 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6822,7 +6822,10 @@ extern float CDECL call_float_method( void *func, int nb_stk_args, const DWORD_P extern double CDECL call_double_method( void *func, int nb_stk_args, const DWORD_PTR *stk_args, const DWORD_PTR *reg_args ); __ASM_GLOBAL_FUNC( call_method, "stp x29, x30, [sp, #-16]!\n\t" + __ASM_SEH(".seh_save_fplr_x 16\n\t") "mov x29, sp\n\t" + __ASM_SEH(".seh_set_fp\n\t") + __ASM_SEH(".seh_endprologue\n\t") "sub sp, sp, x1, lsl #3\n\t" "cbz x1, 2f\n" "1:\tsub x1, x1, #1\n\t"

1 0

Alexandre Julliard : rpcrt4: Add SEH annotations to ARM64 assembly code.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 3acb058a558ee687ca9c67175bf1490bddf34016 URL: https://gitlab.winehq.org/wine/wine/-/commit/3acb058a558ee687ca9c67175bf149… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 11:18:10 2023 +0200 rpcrt4: Add SEH annotations to ARM64 assembly code. --- dlls/rpcrt4/cproxy.c | 3 +++ dlls/rpcrt4/ndr_stubless.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 80400422e41..ea0d65db259 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -201,7 +201,10 @@ static inline void init_thunk( struct thunk *thunk, unsigned int index ) extern void call_stubless_func(void); __ASM_GLOBAL_FUNC( call_stubless_func, "stp x29, x30, [sp, #-0x90]!\n\t" + __ASM_SEH(".seh_save_fplr_x 0x90\n\t") "mov x29, sp\n\t" + __ASM_SEH(".seh_set_fp\n\t") + __ASM_SEH(".seh_endprologue\n\t") "stp d0, d1, [sp, #0x10]\n\t" "stp d2, d3, [sp, #0x20]\n\t" "stp d4, d5, [sp, #0x30]\n\t" diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 8fc5fd41ca6..2e84d64bba5 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1181,7 +1181,10 @@ __ASM_GLOBAL_FUNC( call_server_func, LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char *args, unsigned int stack_size); __ASM_GLOBAL_FUNC( call_server_func, "stp x29, x30, [sp, #-16]!\n\t" + __ASM_SEH(".seh_save_fplr_x 16\n\t") "mov x29, sp\n\t" + __ASM_SEH(".seh_set_fp\n\t") + __ASM_SEH(".seh_endprologue\n\t") "add x9, x2, #15\n\t" "lsr x9, x9, #4\n\t" "sub sp, sp, x9, lsl #4\n\t"

1 0

Alexandre Julliard : vcomp: Add SEH annotations to ARM64 assembly code.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: a947eff6a47fdac9d2e76510f0d760f9955e212e URL: https://gitlab.winehq.org/wine/wine/-/commit/a947eff6a47fdac9d2e76510f0d760… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 11:18:29 2023 +0200 vcomp: Add SEH annotations to ARM64 assembly code. --- dlls/vcomp/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 374adf3991a..63ec0502b9b 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -253,7 +253,10 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "stp x29, x30, [SP,#-16]!\n\t" + __ASM_SEH(".seh_save_fplr_x 16\n\t") "mov x29, SP\n\t" + __ASM_SEH(".seh_set_fp\n\t") + __ASM_SEH(".seh_endprologue\n\t") "mov x9, x0\n\t" "cbz w1, 4f\n\t" "lsl w8, w1, #3\n\t"

1 0

Alexandre Julliard : ntdll: Remove unneeded SEH annotations in Unix code.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: a5fe0bc70fbfccc9dc4d6abbca169326383a9c54 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5fe0bc70fbfccc9dc4d6abbca1693… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 11:22:50 2023 +0200 ntdll: Remove unneeded SEH annotations in Unix code. --- dlls/ntdll/unix/signal_x86_64.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 48b5b4d5de9..79d69d11547 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2522,8 +2522,6 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B */ __ASM_GLOBAL_FUNC( signal_start_thread, "subq $56,%rsp\n\t" - __ASM_SEH(".seh_stackalloc 56\n\t") - __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") "movq %rbp,48(%rsp)\n\t" __ASM_CFI(".cfi_rel_offset %rbp,48\n\t")

1 0

Alex Henrie : ncrypt: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 82faa82339cf25a573f729bb159c683c626127ec URL: https://gitlab.winehq.org/wine/wine/-/commit/82faa82339cf25a573f729bb159c68… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 19 23:18:36 2023 -0600 ncrypt: Use the wcsdup function instead of reimplementing it. --- dlls/ncrypt/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index fa2eff49774..8a720382bef 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -95,13 +95,12 @@ struct object_property *add_object_property(struct object *object, const WCHAR * } memset(property, 0, sizeof(*property)); - if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) + if (!(property->key = wcsdup(name))) { ERR("Error allocating memory.\n"); return NULL; } - lstrcpyW(property->key, name); return property; }

1 0

Alex Henrie : shell32: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 42d134684684448ba7ed5f4660cc8b35728fc614 URL: https://gitlab.winehq.org/wine/wine/-/commit/42d134684684448ba7ed5f4660cc8b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 19 23:28:15 2023 -0600 shell32: Use the wcsdup function instead of reimplementing it. --- dlls/shell32/shelllink.c | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 8fe1529891b..30cd038728f 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -705,8 +705,7 @@ static HRESULT Stream_LoadAdvertiseInfo( IStream* stm, LPWSTR *str ) return E_FAIL; } - *str = malloc( (lstrlenW(buffer.szwDarwinID) + 1) * sizeof(WCHAR) ); - lstrcpyW( *str, buffer.szwDarwinID ); + *str = wcsdup( buffer.szwDarwinID ); return S_OK; } @@ -1161,11 +1160,9 @@ static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWor if (!*abs_path) lstrcpyW(abs_path, sPathRel); - *psPath = malloc((lstrlenW(abs_path) + 1) * sizeof(WCHAR)); + *psPath = wcsdup(abs_path); if (!*psPath) return E_OUTOFMEMORY; - - lstrcpyW(*psPath, abs_path); } return S_OK; @@ -1745,11 +1742,9 @@ static HRESULT WINAPI IShellLinkW_fnSetIDList(IShellLinkW * iface, LPCITEMIDLIST if ( SHGetPathFromIDListW( pidl, path ) ) { - This->sPath = malloc((lstrlenW(path) + 1) * sizeof(WCHAR)); + This->sPath = wcsdup(path); if (!This->sPath) return E_OUTOFMEMORY; - - lstrcpyW(This->sPath, path); } This->bDirty = TRUE; @@ -1779,11 +1774,9 @@ static HRESULT WINAPI IShellLinkW_fnSetDescription(IShellLinkW * iface, LPCWSTR free(This->sDescription); if (pszName) { - This->sDescription = malloc( (lstrlenW( pszName ) + 1) * sizeof(WCHAR) ); + This->sDescription = wcsdup(pszName); if ( !This->sDescription ) return E_OUTOFMEMORY; - - lstrcpyW( This->sDescription, pszName ); } else This->sDescription = NULL; @@ -1813,10 +1806,9 @@ static HRESULT WINAPI IShellLinkW_fnSetWorkingDirectory(IShellLinkW * iface, LPC TRACE("(%p)->(dir=%s)\n",This, debugstr_w(pszDir)); free(This->sWorkDir); - This->sWorkDir = malloc( (lstrlenW( pszDir ) + 1) * sizeof(WCHAR) ); + This->sWorkDir = wcsdup(pszDir); if ( !This->sWorkDir ) return E_OUTOFMEMORY; - lstrcpyW( This->sWorkDir, pszDir ); This->bDirty = TRUE; return S_OK; @@ -1845,10 +1837,9 @@ static HRESULT WINAPI IShellLinkW_fnSetArguments(IShellLinkW * iface, LPCWSTR ps free(This->sArgs); if (pszArgs) { - This->sArgs = malloc( (lstrlenW( pszArgs ) + 1) * sizeof(WCHAR) ); + This->sArgs = wcsdup(pszArgs); if ( !This->sArgs ) return E_OUTOFMEMORY; - lstrcpyW( This->sArgs, pszArgs ); } else This->sArgs = NULL; @@ -1928,11 +1919,9 @@ static HRESULT WINAPI IShellLinkW_fnSetIconLocation(IShellLinkW * iface, const W free(This->sIcoPath); if (path) { - size_t len = (lstrlenW(path) + 1) * sizeof(WCHAR); - This->sIcoPath = malloc(len); + This->sIcoPath = wcsdup(path); if (!This->sIcoPath) return E_OUTOFMEMORY; - memcpy(This->sIcoPath, path, len); } else This->sIcoPath = NULL; @@ -1949,10 +1938,9 @@ static HRESULT WINAPI IShellLinkW_fnSetRelativePath(IShellLinkW * iface, LPCWSTR TRACE("(%p)->(path=%s %lx)\n",This, debugstr_w(pszPathRel), dwReserved); free(This->sPathRel); - This->sPathRel = malloc( (lstrlenW( pszPathRel ) + 1) * sizeof(WCHAR) ); + This->sPathRel = wcsdup(pszPathRel); if ( !This->sPathRel ) return E_OUTOFMEMORY; - lstrcpyW( This->sPathRel, pszPathRel ); This->bDirty = TRUE; return ShellLink_UpdatePath(This->sPathRel, This->sPath, This->sWorkDir, &This->sPath); @@ -1975,23 +1963,20 @@ static HRESULT WINAPI IShellLinkW_fnResolve(IShellLinkW * iface, HWND hwnd, DWOR bSuccess = SHGetPathFromIDListW(This->pPidl, buffer); if (bSuccess && *buffer) { - This->sPath = malloc((lstrlenW(buffer) + 1) * sizeof(WCHAR)); + This->sPath = wcsdup(buffer); if (!This->sPath) return E_OUTOFMEMORY; - lstrcpyW(This->sPath, buffer); - This->bDirty = TRUE; } else hr = S_OK; /* don't report an error occurred while just caching information */ } if (!This->sIcoPath && This->sPath) { - This->sIcoPath = malloc((lstrlenW(This->sPath) + 1) * sizeof(WCHAR)); + This->sIcoPath = wcsdup(This->sPath); if (!This->sIcoPath) return E_OUTOFMEMORY; - lstrcpyW(This->sIcoPath, This->sPath); This->iIcoNdx = 0; This->bDirty = TRUE; @@ -2151,14 +2136,12 @@ static HRESULT WINAPI IShellLinkW_fnSetPath(IShellLinkW * iface, LPCWSTR pszFile This->pPidl = SHSimpleIDListFromPathW(pszFile); ShellLink_GetVolumeInfo(buffer, &This->volume); - This->sPath = malloc( (lstrlenW( buffer ) + 1) * sizeof(WCHAR) ); + This->sPath = wcsdup(buffer); if (!This->sPath) { free(unquoted); return E_OUTOFMEMORY; } - - lstrcpyW(This->sPath, buffer); } This->bDirty = TRUE; free(unquoted);

1 0

Alex Henrie : wshom: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 9ef927472ceef8a0334b8a93532dd48c8abfe7a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ef927472ceef8a0334b8a93532dd4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 19 23:37:54 2023 -0600 wshom: Use the wcsdup function instead of reimplementing it. --- dlls/wshom.ocx/shell.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 845f931be70..69db995cd0d 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1311,8 +1311,7 @@ static WCHAR *split_command( BSTR cmd, WCHAR **params ) WCHAR *ret, *ptr; BOOL in_quotes = FALSE; - if (!(ret = malloc((lstrlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; - lstrcpyW( ret, cmd ); + if (!(ret = wcsdup(cmd))) return NULL; *params = NULL; for (ptr = ret; *ptr; ptr++)

1 0

Jactry Zeng : msi: Use CreateFileW() for handling path from cabinet_open() instead.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 085e95cd5eceb36c3e21cb7d42adab5a6af38a38 URL: https://gitlab.winehq.org/wine/wine/-/commit/085e95cd5eceb36c3e21cb7d42adab… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Sep 19 10:12:44 2023 -0500 msi: Use CreateFileW() for handling path from cabinet_open() instead. --- dlls/msi/media.c | 12 ++++++++---- dlls/msi/msipriv.h | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 50673f99cae..ecc51e60a4e 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -109,6 +109,8 @@ static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) DWORD dwAccess = 0; DWORD dwShareMode = 0; DWORD dwCreateDisposition = OPEN_EXISTING; + HANDLE handle; + WCHAR *path; switch (oflag & _O_ACCMODE) { @@ -131,8 +133,10 @@ static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) else if (oflag & _O_CREAT) dwCreateDisposition = CREATE_ALWAYS; - return (INT_PTR)CreateFileA(pszFile, dwAccess, dwShareMode, NULL, - dwCreateDisposition, 0, NULL); + path = strdupUtoW(pszFile); + handle = CreateFileW(path, dwAccess, dwShareMode, NULL, dwCreateDisposition, 0, NULL); + free(path); + return (INT_PTR)handle; } static UINT CDECL cabinet_read(INT_PTR hf, void *pv, UINT cb) @@ -577,11 +581,11 @@ static BOOL extract_cabinet( MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data return FALSE; } - cabinet = strdupWtoA( mi->cabinet ); + cabinet = strdupWtoU( mi->cabinet ); if (!cabinet) goto done; - cab_path = strdupWtoA( mi->sourcedir ); + cab_path = strdupWtoU( mi->sourcedir ); if (!cab_path) goto done; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 89495b5a6a5..85cc5e257a7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1168,4 +1168,30 @@ static inline LPWSTR strdupAtoW( LPCSTR str ) return ret; } +static inline char *strdupWtoU( LPCWSTR str ) +{ + LPSTR ret = NULL; + DWORD len; + + if (!str) return ret; + len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL); + ret = malloc( len ); + if (ret) + WideCharToMultiByte( CP_UTF8, 0, str, -1, ret, len, NULL, NULL ); + return ret; +} + +static inline LPWSTR strdupUtoW( LPCSTR str ) +{ + LPWSTR ret = NULL; + DWORD len; + + if (!str) return ret; + len = MultiByteToWideChar( CP_UTF8, 0, str, -1, NULL, 0 ); + ret = malloc( len * sizeof(WCHAR) ); + if (ret) + MultiByteToWideChar( CP_UTF8, 0, str, -1, ret, len ); + return ret; +} + #endif /* __WINE_MSI_PRIVATE__ */

1 0