system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 15:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

sane.ds: Use nameless unions/structs.

Browse source
This commit is contained in:
Alexandre Julliard 2023-07-17 11:33:39 +02:00
parent fe8d66bf49
commit 72ee10b5d5
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/sane.ds/ui.c
View file

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