Skip to content

W
wine-winehq
Commit f082e4f2 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

oledlg: Use nameless unions/structs.

parent 1ce80d35
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
dlls/oledlg/pastespl.c
View file @ f082e4f2
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
*/ */
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION
#include <stdarg.h> #include <stdarg.h>
...@@ -139,7 +138,7 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) ...@@ -139,7 +138,7 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct)
fmtetc.cfFormat = cf_object_descriptor; fmtetc.cfFormat = cf_object_descriptor;
if(IDataObject_GetData(ps_struct->ps->lpSrcDataObj, &fmtetc, &stg) == S_OK) if(IDataObject_GetData(ps_struct->ps->lpSrcDataObj, &fmtetc, &stg) == S_OK)
{ {
OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.u.hGlobal); OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.hGlobal);
if(obj_desc->dwSrcOfCopy) if(obj_desc->dwSrcOfCopy)
ps_struct->source_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); ps_struct->source_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy));
if(obj_desc->dwFullUserTypeName) if(obj_desc->dwFullUserTypeName)
...@@ -147,8 +146,8 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) ...@@ -147,8 +146,8 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct)
OleRegGetUserType(&obj_desc->clsid, USERCLASSTYPE_APPNAME, &ps_struct->app_name); OleRegGetUserType(&obj_desc->clsid, USERCLASSTYPE_APPNAME, &ps_struct->app_name);
/* Get the icon here. If dwDrawAspect & DVASCPECT_ICON call GetData(CF_METAFILEPICT), otherwise /* Get the icon here. If dwDrawAspect & DVASCPECT_ICON call GetData(CF_METAFILEPICT), otherwise
native calls OleGetIconFromClass(obj_desc->clsid) */ native calls OleGetIconFromClass(obj_desc->clsid) */
GlobalUnlock(stg.u.hGlobal); GlobalUnlock(stg.hGlobal);
GlobalFree(stg.u.hGlobal); GlobalFree(stg.hGlobal);
} }
else else
{ {
...@@ -158,13 +157,13 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) ...@@ -158,13 +157,13 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct)
fmtetc.cfFormat = cf_link_src_descriptor; fmtetc.cfFormat = cf_link_src_descriptor;
if(IDataObject_GetData(ps_struct->ps->lpSrcDataObj, &fmtetc, &stg) == S_OK) if(IDataObject_GetData(ps_struct->ps->lpSrcDataObj, &fmtetc, &stg) == S_OK)
{ {
OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.u.hGlobal); OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.hGlobal);
if(obj_desc->dwSrcOfCopy) if(obj_desc->dwSrcOfCopy)
ps_struct->link_source_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); ps_struct->link_source_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy));
if(obj_desc->dwFullUserTypeName) if(obj_desc->dwFullUserTypeName)
ps_struct->link_type_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwFullUserTypeName)); ps_struct->link_type_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwFullUserTypeName));
GlobalUnlock(stg.u.hGlobal); GlobalUnlock(stg.hGlobal);
GlobalFree(stg.u.hGlobal); GlobalFree(stg.hGlobal);
} }
if(ps_struct->source_name == NULL && ps_struct->link_source_name == NULL) if(ps_struct->source_name == NULL && ps_struct->link_source_name == NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment