Module: wine Branch: master Commit: 09c7cc1e365090474dea676c0b77a83f0568ef6b URL: https://gitlab.winehq.org/wine/wine/-/commit/09c7cc1e365090474dea676c0b77a83...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Jul 4 12:59:36 2023 +0200
shlwapi: Use nameless unions/structs.
---
dlls/shlwapi/istream.c | 2 -- dlls/shlwapi/stopwatch.c | 2 -- dlls/shlwapi/string.c | 46 ++++++++++++++++++++++------------------------ 3 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 37fa4c6ddcc..b0087209e75 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -21,8 +21,6 @@ #include <string.h>
#define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/shlwapi/stopwatch.c b/dlls/shlwapi/stopwatch.c index 68ffab944ea..8a5d07b14e4 100644 --- a/dlls/shlwapi/stopwatch.c +++ b/dlls/shlwapi/stopwatch.c @@ -27,8 +27,6 @@ #include <string.h> #include <stdlib.h>
-#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winreg.h" diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 2c894198239..b8bf0bb227c 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -24,8 +24,6 @@ #include <stdio.h> #include <string.h>
-#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #define NO_SHLWAPI_REG @@ -220,16 +218,16 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U switch (src->uType) { case STRRET_WSTR: - WideCharToMultiByte(CP_ACP, 0, src->u.pOleStr, -1, dest, len, NULL, NULL); - CoTaskMemFree(src->u.pOleStr); + WideCharToMultiByte(CP_ACP, 0, src->pOleStr, -1, dest, len, NULL, NULL); + CoTaskMemFree(src->pOleStr); break;
case STRRET_CSTR: - lstrcpynA(dest, src->u.cStr, len); + lstrcpynA(dest, src->cStr, len); break;
case STRRET_OFFSET: - lstrcpynA(dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len); + lstrcpynA(dest, ((LPCSTR)&pidl->mkid)+src->uOffset, len); break;
default: @@ -263,12 +261,12 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, switch (src->uType) { case STRRET_WSTR: { size_t dst_len; - if (!src->u.pOleStr) + if (!src->pOleStr) return E_FAIL; - dst_len = lstrlenW(src->u.pOleStr); - memcpy(dest, src->u.pOleStr, min(dst_len, len-1) * sizeof(WCHAR)); + dst_len = lstrlenW(src->pOleStr); + memcpy(dest, src->pOleStr, min(dst_len, len-1) * sizeof(WCHAR)); dest[min(dst_len, len-1)] = 0; - CoTaskMemFree(src->u.pOleStr); + CoTaskMemFree(src->pOleStr); if (len <= dst_len) { dest[0] = 0; @@ -278,14 +276,14 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, }
case STRRET_CSTR: - if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len )) + if (!MultiByteToWideChar( CP_ACP, 0, src->cStr, -1, dest, len )) dest[len-1] = 0; break;
case STRRET_OFFSET: if (pidl) { - if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, -1, + if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->uOffset, -1, dest, len )) dest[len-1] = 0; } @@ -320,16 +318,16 @@ HRESULT WINAPI StrRetToStrA(LPSTRRET lpStrRet, const ITEMIDLIST *pidl, LPSTR *pp switch (lpStrRet->uType) { case STRRET_WSTR: - hRet = _SHStrDupAW(lpStrRet->u.pOleStr, ppszName); - CoTaskMemFree(lpStrRet->u.pOleStr); + hRet = _SHStrDupAW(lpStrRet->pOleStr, ppszName); + CoTaskMemFree(lpStrRet->pOleStr); break;
case STRRET_CSTR: - hRet = _SHStrDupAA(lpStrRet->u.cStr, ppszName); + hRet = _SHStrDupAA(lpStrRet->cStr, ppszName); break;
case STRRET_OFFSET: - hRet = _SHStrDupAA(((LPCSTR)&pidl->mkid) + lpStrRet->u.uOffset, ppszName); + hRet = _SHStrDupAA(((LPCSTR)&pidl->mkid) + lpStrRet->uOffset, ppszName); break;
default: @@ -351,16 +349,16 @@ HRESULT WINAPI StrRetToStrW(LPSTRRET lpStrRet, const ITEMIDLIST *pidl, LPWSTR *p switch (lpStrRet->uType) { case STRRET_WSTR: - hRet = SHStrDupW(lpStrRet->u.pOleStr, ppszName); - CoTaskMemFree(lpStrRet->u.pOleStr); + hRet = SHStrDupW(lpStrRet->pOleStr, ppszName); + CoTaskMemFree(lpStrRet->pOleStr); break;
case STRRET_CSTR: - hRet = SHStrDupA(lpStrRet->u.cStr, ppszName); + hRet = SHStrDupA(lpStrRet->cStr, ppszName); break;
case STRRET_OFFSET: - hRet = SHStrDupA(((LPCSTR)&pidl->mkid) + lpStrRet->u.uOffset, ppszName); + hRet = SHStrDupA(((LPCSTR)&pidl->mkid) + lpStrRet->uOffset, ppszName); break;
default: @@ -414,18 +412,18 @@ HRESULT WINAPI StrRetToBSTR(STRRET *lpStrRet, LPCITEMIDLIST pidl, BSTR* pBstrOut switch (lpStrRet->uType) { case STRRET_WSTR: - *pBstrOut = SysAllocString(lpStrRet->u.pOleStr); + *pBstrOut = SysAllocString(lpStrRet->pOleStr); if (*pBstrOut) hRet = S_OK; - CoTaskMemFree(lpStrRet->u.pOleStr); + CoTaskMemFree(lpStrRet->pOleStr); break;
case STRRET_CSTR: - hRet = _SHStrDupAToBSTR(lpStrRet->u.cStr, pBstrOut); + hRet = _SHStrDupAToBSTR(lpStrRet->cStr, pBstrOut); break;
case STRRET_OFFSET: - hRet = _SHStrDupAToBSTR(((LPCSTR)&pidl->mkid) + lpStrRet->u.uOffset, pBstrOut); + hRet = _SHStrDupAToBSTR(((LPCSTR)&pidl->mkid) + lpStrRet->uOffset, pBstrOut); break;
default:
-
Alexandre Julliard