July 2023 - Wine-commits - list.winehq.org

Conor McCarthy : vkd3d-shader/dxil: Validate the module format version.
by Alexandre Julliard 11 Jul '23

11 Jul '23

Module: vkd3d Branch: master Commit: 22157c3da37d5edf068df10c746bec5604ca6ca8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/22157c3da37d5edf068df10c746be… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 29 15:32:44 2023 +1000 vkd3d-shader/dxil: Validate the module format version. --- libs/vkd3d-shader/dxil.c | 56 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 57 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 3a8b2fdb..cf0d4bb5 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -70,6 +70,13 @@ enum bitcode_address_space ADDRESS_SPACE_GROUPSHARED, }; +enum bitcode_module_code +{ + MODULE_CODE_VERSION = 1, + MODULE_CODE_GLOBALVAR = 7, + MODULE_CODE_FUNCTION = 8, +}; + enum bitcode_type_code { TYPE_CODE_NUMENTRY = 1, @@ -1201,6 +1208,49 @@ static enum vkd3d_result sm6_parser_symtab_init(struct sm6_parser *sm6) return VKD3D_OK; } +static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) +{ + const struct dxil_block *block = &sm6->root_block; + const struct dxil_record *record; + uint64_t version; + size_t i; + + sm6->p.location.line = block->id; + sm6->p.location.column = 0; + + for (i = 0; i < block->record_count; ++i) + { + sm6->p.location.column = i; + record = block->records[i]; + switch (record->code) + { + case MODULE_CODE_FUNCTION: + FIXME("Functions are not implemented yet.\n"); + break; + + case MODULE_CODE_GLOBALVAR: + FIXME("Global variables are not implemented yet.\n"); + break; + + case MODULE_CODE_VERSION: + dxil_record_validate_operand_count(record, 1, 1, sm6); + if ((version = record->operands[0]) != 1) + { + FIXME("Unsupported format version %#"PRIx64".\n", version); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_UNSUPPORTED_BITCODE_FORMAT, + "Bitcode format version %#"PRIx64" is unsupported.", version); + return VKD3D_ERROR_INVALID_SHADER; + } + break; + + default: + break; + } + } + + return VKD3D_OK; +} + static void sm6_type_table_cleanup(struct sm6_type *types, size_t count) { size_t i; @@ -1411,6 +1461,12 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } + if ((ret = sm6_parser_globals_init(sm6)) < 0) + { + WARN("Failed to load global declarations.\n"); + return ret; + } + dxil_block_destroy(&sm6->root_block); return VKD3D_OK; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 3802af1c..e73a8cd1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -158,6 +158,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND_COUNT = 8005, VKD3D_SHADER_ERROR_DXIL_INVALID_TYPE_TABLE = 8006, VKD3D_SHADER_ERROR_DXIL_INVALID_VALUE_SYMTAB = 8007, + VKD3D_SHADER_ERROR_DXIL_UNSUPPORTED_BITCODE_FORMAT = 8008, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301,

1 0

Conor McCarthy : vkd3d-shader/dxil: Read global function declarations.
by Alexandre Julliard 11 Jul '23

11 Jul '23

Module: vkd3d Branch: master Commit: c96143abdcd9dbf42cbe4a3a05f4755ea401dd01 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c96143abdcd9dbf42cbe4a3a05f47… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon May 15 12:45:09 2023 +1000 vkd3d-shader/dxil: Read global function declarations. --- libs/vkd3d-shader/dxil.c | 232 ++++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 2 files changed, 233 insertions(+), 1 deletion(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Read numeric constants.
by Alexandre Julliard 11 Jul '23

11 Jul '23

Module: vkd3d Branch: master Commit: 5d33fb4633cbe858cea158eadff7c61d233d022f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5d33fb4633cbe858cea158eadff7c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon May 15 13:52:00 2023 +1000 vkd3d-shader/dxil: Read numeric constants. --- libs/vkd3d-shader/dxil.c | 320 ++++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 2 files changed, 318 insertions(+), 4 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Read function bodies.
by Alexandre Julliard 11 Jul '23

11 Jul '23

Module: vkd3d Branch: master Commit: 1ec112e3d7d8ebb1231687587e3dbd039e6b44f7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1ec112e3d7d8ebb1231687587e3db… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon May 15 16:11:42 2023 +1000 vkd3d-shader/dxil: Read function bodies. --- libs/vkd3d-shader/dxil.c | 249 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 247 insertions(+), 2 deletions(-)

1 0

Alexandre Julliard : comctl32: Use nameless unions/structs.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 22c56f97528b83c7a844b3e8ddc309287fda524d URL: https://gitlab.winehq.org/wine/wine/-/commit/22c56f97528b83c7a844b3e8ddc309… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 17:13:29 2023 +0200 comctl32: Use nameless unions/structs. --- dlls/comctl32/commctrl.c | 2 - dlls/comctl32/propsheet.c | 108 ++++++++++++++++++++++----------------------- dlls/comctl32/taskdialog.c | 12 +++-- dlls/comctl32/treeview.c | 4 +- 4 files changed, 59 insertions(+), 67 deletions(-)

1 0

Alexandre Julliard : comdlg32: Use nameless unions/structs.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: c86bb6064097ae6d1664e143ff93a495c5330ca5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c86bb6064097ae6d1664e143ff93a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 17:14:08 2023 +0200 comdlg32: Use nameless unions/structs. --- dlls/comdlg32/filedlg.c | 20 +++++----- dlls/comdlg32/filedlgbrowser.c | 10 ++--- dlls/comdlg32/itemdlg.c | 2 - dlls/comdlg32/printdlg.c | 90 +++++++++++++++++++----------------------- 4 files changed, 53 insertions(+), 69 deletions(-)

1 0

Alexandre Julliard : dinput: Use nameless unions/structs.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: aa9aace5f38894f75a6b8af945cb2d15262c935f URL: https://gitlab.winehq.org/wine/wine/-/commit/aa9aace5f38894f75a6b8af945cb2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 17:14:57 2023 +0200 dinput: Use nameless unions/structs. --- dlls/dinput/config.c | 8 +++----- dlls/dinput/dinput_main.c | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 8cc73c80242..d7a416501f0 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "objbase.h" #include "dinput_private.h" @@ -138,7 +136,7 @@ static void lv_set_action(HWND dialog, int item, int action, LPDIACTIONFORMATW l if (item < 0) return; if (action != -1) - action_text = lpdiaf->rgoAction[action].u.lptszActionName; + action_text = lpdiaf->rgoAction[action].lptszActionName; /* Keep the action and text in the listview item */ lvItem.iItem = item; @@ -280,7 +278,7 @@ static void show_suitable_actions(HWND dialog) /* Add action string and index in the action format to the list entry */ if (DIDFT_GETINSTANCE(lpdiaf->rgoAction[i].dwSemantic) & DIDFT_GETTYPE(device->ddo[obj].dwType)) { - SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_ADDSTRING, 0, (LPARAM)lpdiaf->rgoAction[i].u.lptszActionName); + SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_ADDSTRING, 0, (LPARAM)lpdiaf->rgoAction[i].lptszActionName); SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_SETITEMDATA, added, (LPARAM) i); added++; } @@ -336,7 +334,7 @@ static void copy_actions(LPDIACTIONFORMATW to, LPDIACTIONFORMATW from) to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance; to->rgoAction[i].dwObjID = from->rgoAction[i].dwObjID; to->rgoAction[i].dwHow = from->rgoAction[i].dwHow; - to->rgoAction[i].u.lptszActionName = from->rgoAction[i].u.lptszActionName; + to->rgoAction[i].lptszActionName = from->rgoAction[i].lptszActionName; } } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 51e1a134023..e0406db62b1 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -26,8 +26,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winuser.h"

1 0

Alexandre Julliard : dplayx: Use nameless unions/structs.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: a56fcef71512a35ecaf5043360ee3d27d0e596c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a56fcef71512a35ecaf5043360ee3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 17:15:41 2023 +0200 dplayx: Use nameless unions/structs. --- dlls/dplayx/dplay.c | 134 ++++++++++++++++++++++---------------------- dlls/dplayx/dplayx_global.c | 98 ++++++++++++++++---------------- dlls/dplayx/dplobby.c | 8 +-- dlls/dplayx/name_server.c | 10 ++-- 4 files changed, 121 insertions(+), 129 deletions(-)

1 0

Alexandre Julliard : riched20: Use nameless unions/structs.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 26826d3af8b1969de389f3d6702d7c8b805126e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/26826d3af8b1969de389f3d6702d7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 17:17:11 2023 +0200 riched20: Use nameless unions/structs. --- dlls/riched20/clipboard.c | 6 ++---- dlls/riched20/editor.c | 12 +++++------- dlls/riched20/richole.c | 13 ++++++------- dlls/riched20/writer.c | 6 ++---- 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index c94951b8f6f..a66848a5cf7 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "editor.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); @@ -226,9 +224,9 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor return DV_E_TYMED; if(This->unicode && pformatetc->cfFormat == CF_UNICODETEXT) - pmedium->u.hGlobal = This->unicode; + pmedium->hGlobal = This->unicode; else if(This->rtf && pformatetc->cfFormat == cfRTF) - pmedium->u.hGlobal = This->rtf; + pmedium->hGlobal = This->rtf; else return DV_E_FORMATETC; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8ac71379533..5cf43f4e29a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -224,8 +224,6 @@ * */ -#define NONAMELESSUNION - #include "editor.h" #include "commdlg.h" #include "winreg.h" @@ -1129,13 +1127,13 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB if (hemf) { stgm.tymed = TYMED_ENHMF; - stgm.u.hEnhMetaFile = hemf; + stgm.hEnhMetaFile = hemf; fm.cfFormat = CF_ENHMETAFILE; } else if (hbmp) { stgm.tymed = TYMED_GDI; - stgm.u.hBitmap = hbmp; + stgm.hBitmap = hbmp; fm.cfFormat = CF_BITMAP; } else return E_FAIL; @@ -2205,7 +2203,7 @@ static HRESULT paste_rtf(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) ME_GlobalDestStruct gds; HRESULT hr; - gds.hData = med->u.hGlobal; + gds.hData = med->hGlobal; gds.nLength = 0; es.dwCookie = (DWORD_PTR)&gds; es.pfnCallback = ME_ReadFromHGLOBALRTF; @@ -2220,7 +2218,7 @@ static HRESULT paste_text(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) ME_GlobalDestStruct gds; HRESULT hr; - gds.hData = med->u.hGlobal; + gds.hData = med->hGlobal; gds.nLength = 0; es.dwCookie = (DWORD_PTR)&gds; es.pfnCallback = ME_ReadFromHGLOBALUnicode; @@ -2234,7 +2232,7 @@ static HRESULT paste_emf(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) HRESULT hr; SIZEL sz = {0, 0}; - hr = insert_static_object( editor, med->u.hEnhMetaFile, NULL, &sz ); + hr = insert_static_object( editor, med->hEnhMetaFile, NULL, &sz ); if (SUCCEEDED(hr)) { ME_CommitUndo( editor ); diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 90496742e36..11fde52873e 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -21,7 +21,6 @@ #include <stdarg.h> -#define NONAMELESSUNION #define COBJMACROS #include "windef.h" @@ -5762,12 +5761,12 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) switch (stgm.tymed) { case TYMED_GDI: - GetObjectW(stgm.u.hBitmap, sizeof(dibsect), &dibsect); + GetObjectW(stgm.hBitmap, sizeof(dibsect), &dibsect); pSize->cx = dibsect.dsBm.bmWidth; pSize->cy = dibsect.dsBm.bmHeight; break; case TYMED_ENHMF: - GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); + GetEnhMetaFileHeader(stgm.hEnhMetaFile, sizeof(emh), &emh); pSize->cx = emh.rclBounds.right - emh.rclBounds.left; pSize->cy = emh.rclBounds.bottom - emh.rclBounds.top; break; @@ -5854,9 +5853,9 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) switch (stgm.tymed) { case TYMED_GDI: - GetObjectW(stgm.u.hBitmap, sizeof(dibsect), &dibsect); + GetObjectW(stgm.hBitmap, sizeof(dibsect), &dibsect); hMemDC = CreateCompatibleDC(c->hDC); - old_bm = SelectObject(hMemDC, stgm.u.hBitmap); + old_bm = SelectObject(hMemDC, stgm.hBitmap); if (has_size) { convert_sizel(c, &run->reobj->obj.sizel, &sz); @@ -5876,7 +5875,7 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) DeleteDC(hMemDC); break; case TYMED_ENHMF: - GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); + GetEnhMetaFileHeader(stgm.hEnhMetaFile, sizeof(emh), &emh); if (has_size) { convert_sizel(c, &run->reobj->obj.sizel, &sz); @@ -5894,7 +5893,7 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) rc.top = y - sz.cy; rc.right = x + sz.cx; rc.bottom = y; - PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); + PlayEnhMetaFile(c->hDC, stgm.hEnhMetaFile, &rc); break; default: FIXME("Unsupported tymed %ld\n", stgm.tymed); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index def16a4925a..a47a1897973 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "editor.h" #include "rtf.h" @@ -953,13 +951,13 @@ static BOOL stream_out_graphics( ME_TextEditor *editor, ME_OutStream *stream, if (FAILED(hr)) goto done; if (med.tymed != TYMED_ENHMF) goto done; - size = GetEnhMetaFileBits( med.u.hEnhMetaFile, 0, NULL ); + size = GetEnhMetaFileBits( med.hEnhMetaFile, 0, NULL ); if (size < FIELD_OFFSET(ENHMETAHEADER, cbPixelFormat)) goto done; emf_bits = HeapAlloc( GetProcessHeap(), 0, size ); if (!emf_bits) goto done; - size = GetEnhMetaFileBits( med.u.hEnhMetaFile, size, (BYTE *)emf_bits ); + size = GetEnhMetaFileBits( med.hEnhMetaFile, size, (BYTE *)emf_bits ); if (size < FIELD_OFFSET(ENHMETAHEADER, cbPixelFormat)) goto done; /* size_in_pixels = (frame_size / 100) * szlDevice / szlMillimeters

1 0

Alexandre Julliard : urlmon: Use nameless unions/structs.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: dd44930b440136dfedccda3785c98fd2b4badaa1 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd44930b440136dfedccda3785c98f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 17:17:35 2023 +0200 urlmon: Use nameless unions/structs. --- dlls/urlmon/binding.c | 18 ++++++++---------- dlls/urlmon/http.c | 8 +++----- dlls/urlmon/urlmon_main.c | 32 +++++++++++++++----------------- dlls/urlmon/usrmarshal.c | 12 +++++------- 4 files changed, 31 insertions(+), 39 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index fd738f6cf0f..07a00558eec 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "urlmon_main.h" #include "winreg.h" #include "shlwapi.h" @@ -143,7 +141,7 @@ static void dump_BINDINFO(BINDINFO *bi) "}\n", bi->cbSize, debugstr_w(bi->szExtraInfo), - bi->stgmedData.tymed, bi->stgmedData.u.hGlobal, bi->stgmedData.pUnkForRelease, + bi->stgmedData.tymed, bi->stgmedData.hGlobal, bi->stgmedData.pUnkForRelease, bi->grfBindInfoF > BINDINFOF_URLENCODEDEXTRAINFO ? "unknown" : BINDINFOF_str[bi->grfBindInfoF], bi->dwBindVerb > BINDVERB_CUSTOM @@ -522,7 +520,7 @@ static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove LARGE_INTEGER new_pos; DWORD method; - TRACE("(%p)->(%ld %08lx %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + TRACE("(%p)->(%ld %08lx %p)\n", This, dlibMove.LowPart, dwOrigin, plibNewPosition); if(This->buf->file == INVALID_HANDLE_VALUE) { /* We should probably call protocol handler's Seek. */ @@ -558,7 +556,7 @@ static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove static HRESULT WINAPI ProtocolStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) { ProtocolStream *This = impl_from_IStream(iface); - FIXME("(%p)->(%ld)\n", This, libNewSize.u.LowPart); + FIXME("(%p)->(%ld)\n", This, libNewSize.LowPart); return E_NOTIMPL; } @@ -566,7 +564,7 @@ static HRESULT WINAPI ProtocolStream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) { ProtocolStream *This = impl_from_IStream(iface); - FIXME("(%p)->(%p %ld %p %p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten); + FIXME("(%p)->(%p %ld %p %p)\n", This, pstm, cb.LowPart, pcbRead, pcbWritten); return E_NOTIMPL; } @@ -592,7 +590,7 @@ static HRESULT WINAPI ProtocolStream_LockRegion(IStream *iface, ULARGE_INTEGER l ULARGE_INTEGER cb, DWORD dwLockType) { ProtocolStream *This = impl_from_IStream(iface); - FIXME("(%p)->(%ld %ld %ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); + FIXME("(%p)->(%ld %ld %ld)\n", This, libOffset.LowPart, cb.LowPart, dwLockType); return E_NOTIMPL; } @@ -600,7 +598,7 @@ static HRESULT WINAPI ProtocolStream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { ProtocolStream *This = impl_from_IStream(iface); - FIXME("(%p)->(%ld %ld %ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); + FIXME("(%p)->(%ld %ld %ld)\n", This, libOffset.LowPart, cb.LowPart, dwLockType); return E_NOTIMPL; } @@ -669,7 +667,7 @@ static HRESULT stgmed_stream_fill_stgmed(stgmed_obj_t *obj, STGMEDIUM *stgmed) ProtocolStream *stream = (ProtocolStream*)obj; stgmed->tymed = TYMED_ISTREAM; - stgmed->u.pstm = &stream->IStream_iface; + stgmed->pstm = &stream->IStream_iface; stgmed->pUnkForRelease = &stream->buf->IUnknown_iface; return S_OK; @@ -735,7 +733,7 @@ static HRESULT stgmed_file_fill_stgmed(stgmed_obj_t *obj, STGMEDIUM *stgmed) read_protocol_data(file_obj->buf); stgmed->tymed = TYMED_FILE; - stgmed->u.lpszFileName = file_obj->buf->cache_file; + stgmed->lpszFileName = file_obj->buf->cache_file; stgmed->pUnkForRelease = &file_obj->buf->IUnknown_iface; return S_OK; diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index d1c104fc8e3..a24006ba08c 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "urlmon_main.h" #include "wininet.h" @@ -251,7 +249,7 @@ static ULONG send_http_request(HttpProtocol *This) switch(This->base.bind_info.stgmedData.tymed) { case TYMED_HGLOBAL: /* Native does not use GlobalLock/GlobalUnlock, so we won't either */ - send_buffer.lpvBuffer = This->base.bind_info.stgmedData.u.hGlobal; + send_buffer.lpvBuffer = This->base.bind_info.stgmedData.hGlobal; send_buffer.dwBufferLength = send_buffer.dwBufferTotal = This->base.bind_info.cbstgmedData; break; case TYMED_ISTREAM: { @@ -259,7 +257,7 @@ static ULONG send_http_request(HttpProtocol *This) send_buffer.dwBufferTotal = This->base.bind_info.cbstgmedData; if(!This->base.post_stream) { - This->base.post_stream = This->base.bind_info.stgmedData.u.pstm; + This->base.post_stream = This->base.bind_info.stgmedData.pstm; IStream_AddRef(This->base.post_stream); } @@ -791,7 +789,7 @@ static HRESULT WINAPI HttpProtocol_Seek(IInternetProtocolEx *iface, LARGE_INTEGE DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { HttpProtocol *This = impl_from_IInternetProtocolEx(iface); - FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 00ccc449e15..491313b7cf8 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -20,8 +20,6 @@ #include <stdarg.h> -#define NONAMELESSUNION - #include "urlmon_main.h" #include "winreg.h" @@ -598,32 +596,32 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst) case TYMED_NULL: break; case TYMED_FILE: - if(src->u.lpszFileName && !src->pUnkForRelease) { - DWORD size = (lstrlenW(src->u.lpszFileName)+1)*sizeof(WCHAR); - dst->u.lpszFileName = CoTaskMemAlloc(size); - if(!dst->u.lpszFileName) + if(src->lpszFileName && !src->pUnkForRelease) { + DWORD size = (lstrlenW(src->lpszFileName)+1)*sizeof(WCHAR); + dst->lpszFileName = CoTaskMemAlloc(size); + if(!dst->lpszFileName) return E_OUTOFMEMORY; - memcpy(dst->u.lpszFileName, src->u.lpszFileName, size); + memcpy(dst->lpszFileName, src->lpszFileName, size); } break; case TYMED_ISTREAM: - if(dst->u.pstm) - IStream_AddRef(dst->u.pstm); + if(dst->pstm) + IStream_AddRef(dst->pstm); break; case TYMED_ISTORAGE: - if(dst->u.pstg) - IStorage_AddRef(dst->u.pstg); + if(dst->pstg) + IStorage_AddRef(dst->pstg); break; case TYMED_HGLOBAL: - if(dst->u.hGlobal) { - SIZE_T size = GlobalSize(src->u.hGlobal); + if(dst->hGlobal) { + SIZE_T size = GlobalSize(src->hGlobal); char *src_ptr, *dst_ptr; - dst->u.hGlobal = GlobalAlloc(GMEM_FIXED, size); - if(!dst->u.hGlobal) + dst->hGlobal = GlobalAlloc(GMEM_FIXED, size); + if(!dst->hGlobal) return E_OUTOFMEMORY; - dst_ptr = GlobalLock(dst->u.hGlobal); - src_ptr = GlobalLock(src->u.hGlobal); + dst_ptr = GlobalLock(dst->hGlobal); + src_ptr = GlobalLock(src->hGlobal); memcpy(dst_ptr, src_ptr, size); GlobalUnlock(src_ptr); GlobalUnlock(dst_ptr); diff --git a/dlls/urlmon/usrmarshal.c b/dlls/urlmon/usrmarshal.c index 950d1a3d67a..57cfaf64ec6 100644 --- a/dlls/urlmon/usrmarshal.c +++ b/dlls/urlmon/usrmarshal.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "urlmon_main.h" #include "wine/debug.h" @@ -93,7 +91,7 @@ static HRESULT marshal_stgmed(STGMEDIUM *stgmed, RemSTGMEDIUM **ret) ULONG size = 0; HRESULT hres = S_OK; - if((stgmed->tymed == TYMED_ISTREAM && stgmed->u.pstm) || stgmed->pUnkForRelease) { + if((stgmed->tymed == TYMED_ISTREAM && stgmed->pstm) || stgmed->pUnkForRelease) { hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); if(FAILED(hres)) return hres; @@ -103,8 +101,8 @@ static HRESULT marshal_stgmed(STGMEDIUM *stgmed, RemSTGMEDIUM **ret) case TYMED_NULL: break; case TYMED_ISTREAM: - if(stgmed->u.pstm) - hres = CoMarshalInterface(stream, &IID_IStream, (IUnknown*)stgmed->u.pstm, + if(stgmed->pstm) + hres = CoMarshalInterface(stream, &IID_IStream, (IUnknown*)stgmed->pstm, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); break; default: @@ -140,7 +138,7 @@ static HRESULT marshal_stgmed(STGMEDIUM *stgmed, RemSTGMEDIUM **ret) rem_stgmed->tymed = stgmed->tymed; rem_stgmed->dwHandleType = 0; - rem_stgmed->pData = stgmed->u.pstm != NULL; + rem_stgmed->pData = stgmed->pstm != NULL; rem_stgmed->pUnkForRelease = stgmed->pUnkForRelease != NULL; rem_stgmed->cbData = size; if(stream) { @@ -181,7 +179,7 @@ static HRESULT unmarshal_stgmed(RemSTGMEDIUM *rem_stgmed, STGMEDIUM *stgmed) break; case TYMED_ISTREAM: if(rem_stgmed->pData) - hres = CoUnmarshalInterface(stream, &IID_IStream, (void**)&stgmed->u.pstm); + hres = CoUnmarshalInterface(stream, &IID_IStream, (void**)&stgmed->pstm); break; default: FIXME("unsupported tymed %lu\n", stgmed->tymed);

1 0