Commit 72ee10b5 authored by Alexandre Julliard's avatar Alexandre Julliard

sane.ds: Use nameless unions/structs.

parent fe8d66bf
......@@ -22,8 +22,6 @@
#include <stdarg.h>
#include <stdio.h>
#define NONAMELESSUNION
#include "sane_i.h"
#include "winuser.h"
#include "winnls.h"
......@@ -491,7 +489,7 @@ BOOL DoScannerUI(void)
{
struct option_descriptor opt;
psp[page_count].u.pResource = create_options_page(hdc, &index,
psp[page_count].pResource = create_options_page(hdc, &index,
optcount, TRUE);
opt.optno = index;
SANE_CALL( option_get_descriptor, &opt );
......@@ -501,7 +499,7 @@ BOOL DoScannerUI(void)
psp[page_count].pszTitle = wcsdup( opt.title );
}
if (psp[page_count].u.pResource)
if (psp[page_count].pResource)
{
psp[page_count].dwSize = sizeof(PROPSHEETPAGEW);
psp[page_count].dwFlags = PSP_DLGINDIRECT | PSP_USETITLE;
......@@ -526,18 +524,18 @@ BOOL DoScannerUI(void)
psh.dwFlags = PSH_PROPSHEETPAGE|PSH_PROPTITLE|PSH_USECALLBACK;
psh.hwndParent = activeDS.hwndOwner;
psh.hInstance = SANE_instance;
psh.u.pszIcon = 0;
psh.pszIcon = 0;
psh.pszCaption = szCaption;
psh.nPages = page_count;
psh.u2.nStartPage = 0;
psh.u3.ppsp = (LPCPROPSHEETPAGEW)psp;
psh.nStartPage = 0;
psh.ppsp = (LPCPROPSHEETPAGEW)psp;
psh.pfnCallback = PropSheetProc;
psrc = PropertySheetW(&psh);
for(index = 0; index < page_count; index ++)
{
free((LPBYTE)psp[index].u.pResource);
free((LPBYTE)psp[index].pResource);
free((LPBYTE)psp[index].pszTitle);
}
free(szCaption);
......
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