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

Rémi Bernon : imm32: Use offsets instead of lengths to decide on sending updates.
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: e5646191723fa4b5e4cb38187e1611a58ebc8695 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5646191723fa4b5e4cb38187e1611… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 15 14:56:35 2023 +0200 imm32: Use offsets instead of lengths to decide on sending updates. The composition or result strings may be present, but with zero length. In which case we still want to send the messages, to indicate any change for instance whenever a character is deleted and strings become empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55055 --- dlls/imm32/ime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index b5c4fc5b2e1..0470f3b6d6c 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -559,7 +559,7 @@ UINT WINAPI ImeToAsciiEx( UINT vkey, UINT vsc, BYTE *state, TRANSMSGLIST *msgs, TRANSMSG status_msg = {.message = ime_set_composition_status( himc, !!compstr->dwCompStrOffset )}; if (status_msg.message) msgs->TransMsg[count++] = status_msg; - if (compstr->dwResultStrLen) + if (compstr->dwResultStrOffset) { const WCHAR *result = (WCHAR *)((BYTE *)compstr + compstr->dwResultStrOffset); TRANSMSG msg = {.message = WM_IME_COMPOSITION, .wParam = result[0], .lParam = GCS_RESULTSTR}; @@ -567,7 +567,7 @@ UINT WINAPI ImeToAsciiEx( UINT vkey, UINT vsc, BYTE *state, TRANSMSGLIST *msgs, msgs->TransMsg[count++] = msg; } - if (compstr->dwCompStrLen) + if (compstr->dwCompStrOffset) { const WCHAR *comp = (WCHAR *)((BYTE *)compstr + compstr->dwCompStrOffset); TRANSMSG msg = {.message = WM_IME_COMPOSITION, .wParam = comp[0], .lParam = GCS_COMPSTR | GCS_CURSORPOS | GCS_DELTASTART};

1 0

Rémi Bernon : winex11: Report empty preedit string when result string is committed.
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: 97c0a52ae552ed856c0955e8badfe0ddf88be91d URL: https://gitlab.winehq.org/wine/wine/-/commit/97c0a52ae552ed856c0955e8badfe0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 13 07:14:33 2023 +0200 winex11: Report empty preedit string when result string is committed. Based on a patch from Byeong-Sik Jeon <bsjeon(a)hanmail.net>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55027 --- dlls/winex11.drv/xim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 1c3d2dd9875..1b063cfe886 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -140,7 +140,7 @@ void xim_set_result_string( HWND hwnd, const char *str, UINT count ) len = ntdll_umbstowcs( str, count, output, count ); output[len] = 0; - post_ime_update( hwnd, 0, ime_comp_buf, output ); + post_ime_update( hwnd, 0, NULL, output ); free( output ); }

1 0

Rémi Bernon : winex11: Make sure HIMC is opened before sending IME updates.
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: f7e76184f1c5064604381cdfc3c30ef357955e52 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7e76184f1c5064604381cdfc3c30e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 30 13:16:39 2023 +0200 winex11: Make sure HIMC is opened before sending IME updates. --- dlls/winex11.drv/xim.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 1b063cfe886..209d63f0402 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -175,6 +175,7 @@ static int xic_preedit_start( XIC xic, XPointer user, XPointer arg ) if ((ime_comp_buf = realloc( ime_comp_buf, sizeof(WCHAR) ))) *ime_comp_buf = 0; else ERR( "Failed to allocate preedit buffer\n" ); + NtUserPostMessage( hwnd, WM_IME_NOTIFY, IMN_WINE_SET_OPEN_STATUS, TRUE ); post_ime_update( hwnd, 0, ime_comp_buf, NULL ); return -1; @@ -190,6 +191,7 @@ static int xic_preedit_done( XIC xic, XPointer user, XPointer arg ) ime_comp_buf = NULL; post_ime_update( hwnd, 0, NULL, NULL ); + NtUserPostMessage( hwnd, WM_IME_NOTIFY, IMN_WINE_SET_OPEN_STATUS, FALSE ); return 0; }

1 0

Alex Henrie : wbemprox: Fix memory leak on error path in enum_key (scan-build).
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: 078f4dcd44d432dcb8db59612f34d24d41796373 URL: https://gitlab.winehq.org/wine/wine/-/commit/078f4dcd44d432dcb8db59612f34d2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 18 22:34:21 2023 -0600 wbemprox: Fix memory leak on error path in enum_key (scan-build). --- dlls/wbemprox/reg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index cd7db81aed7..cdfb5d28007 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -186,6 +186,7 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, IWbemCo if (!(tmp = realloc( strings, count * sizeof(BSTR) ))) { RegCloseKey( hkey ); + free( strings ); return E_OUTOFMEMORY; } strings = tmp;

1 0

Alexandre Julliard : winecfg: Use nameless unions/structs.
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: 4368bd8e601e306610474472b8c3238cbff5309b URL: https://gitlab.winehq.org/wine/wine/-/commit/4368bd8e601e306610474472b8c323… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:59:16 2023 +0200 winecfg: Use nameless unions/structs. --- programs/winecfg/audio.c | 1 - programs/winecfg/main.c | 35 +++++++++++++++++------------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 0112a897245..a5065ee5c21 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -20,7 +20,6 @@ */ #define WIN32_LEAN_AND_MEAN -#define NONAMELESSUNION #include <assert.h> #include <stdlib.h> diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 67df9146f3d..d218d79770c 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -22,7 +22,6 @@ */ #define WIN32_LEAN_AND_MEAN -#define NONAMELESSUNION #include <windows.h> #include <commctrl.h> @@ -74,8 +73,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_APPCFG); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_APPCFG); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = AppDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_APPLICATIONS); psp[pg].lParam = 0; @@ -88,8 +87,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_DLLCFG); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_DLLCFG); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = LibrariesDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_DLLS); psp[pg].lParam = 0; @@ -102,8 +101,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_GRAPHCFG); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_GRAPHCFG); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = GraphDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_GRAPHICS); psp[pg].lParam = 0; @@ -112,8 +111,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_DESKTOP_INTEGRATION); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_DESKTOP_INTEGRATION); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = ThemeDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_DESKTOP_INTEGRATION); psp[pg].lParam = 0; @@ -122,8 +121,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_DRIVECFG); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_DRIVECFG); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = DriveDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_DRIVES); psp[pg].lParam = 0; @@ -132,8 +131,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_AUDIOCFG); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_AUDIOCFG); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = AudioDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_AUDIO); psp[pg].lParam = 0; @@ -146,8 +145,8 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_ABOUTCFG); - psp[pg].u2.pszIcon = NULL; + psp[pg].pszTemplate = MAKEINTRESOURCEW (IDD_ABOUTCFG); + psp[pg].pszIcon = NULL; psp[pg].pfnDlgProc = AboutDlgProc; psp[pg].pszTitle = load_string (IDS_TAB_ABOUT); psp[pg].lParam = 0; @@ -160,12 +159,12 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hOwner; psh.hInstance = hInstance; - psh.u.pszIcon = MAKEINTRESOURCEW (IDI_WINECFG); + psh.pszIcon = MAKEINTRESOURCEW (IDI_WINECFG); psh.pszCaption = load_string (IDS_WINECFG_TITLE); psh.nPages = NUM_PROPERTY_PAGES; - psh.u3.ppsp = psp; + psh.ppsp = psp; psh.pfnCallback = PropSheetCallback; - psh.u2.nStartPage = 0; + psh.nStartPage = 0; /* * Display the modal property sheet

1 0

Alexandre Julliard : winedbg: Use nameless unions/structs.
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: f20710d9b32ea5366297729c3f82fe7b20a528e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f20710d9b32ea5366297729c3f82fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:59:35 2023 +0200 winedbg: Use nameless unions/structs. --- programs/winedbg/be_arm64.c | 148 ++++++++++++++++---------------- programs/winedbg/be_x86_64.c | 185 ++++++++++++++++++++-------------------- programs/winedbg/debugger.h | 2 - programs/winedbg/gdbproxy.c | 3 - programs/winedbg/tgt_minidump.c | 29 +++---- 5 files changed, 178 insertions(+), 189 deletions(-)

1 0

Alexandre Julliard : winefile: Use nameless unions/structs.
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: 63f94c4925e25e853f2f2580f0015f53ac9e777a URL: https://gitlab.winehq.org/wine/wine/-/commit/63f94c4925e25e853f2f2580f0015f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 11:22:22 2023 +0200 winefile: Use nameless unions/structs. --- programs/winefile/winefile.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 6d18954e05a..018da337d11 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -26,12 +26,6 @@ #include "winefile.h" #include "resource.h" -#ifdef NONAMELESSUNION -#define UNION_MEMBER(x) DUMMYUNIONNAME.x -#else -#define UNION_MEMBER(x) x -#endif - #define DEFAULT_SPLIT_POS 300 static const WCHAR registry_key[] = { 'S','o','f','t','w','a','r','e','\\', @@ -449,7 +443,7 @@ static Entry* read_tree_win(Root* root, LPCWSTR path, SORT_ORDER sortOrder, HWND static void free_strret(STRRET* str) { if (str->uType == STRRET_WSTR) - IMalloc_Free(Globals.iMalloc, str->UNION_MEMBER(pOleStr)); + IMalloc_Free(Globals.iMalloc, str->pOleStr); } static LPWSTR wcscpyn(LPWSTR dest, LPCWSTR source, size_t count) @@ -467,15 +461,15 @@ static void get_strretW(STRRET* str, const SHITEMID* shiid, LPWSTR buffer, int l { switch(str->uType) { case STRRET_WSTR: - wcscpyn(buffer, str->UNION_MEMBER(pOleStr), len); + wcscpyn(buffer, str->pOleStr, len); break; case STRRET_OFFSET: - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)shiid+str->UNION_MEMBER(uOffset), -1, buffer, len); + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)shiid+str->uOffset, -1, buffer, len); break; case STRRET_CSTR: - MultiByteToWideChar(CP_ACP, 0, str->UNION_MEMBER(cStr), -1, buffer, len); + MultiByteToWideChar(CP_ACP, 0, str->cStr, -1, buffer, len); } } @@ -673,7 +667,7 @@ static void fill_w32fdata_shell(IShellFolder* folder, LPCITEMIDLIST pidl, SFGAOF IDataObject_Release(pDataObj); if (SUCCEEDED(hr)) { - LPCWSTR path = GlobalLock(medium.UNION_MEMBER(hGlobal)); + LPCWSTR path = GlobalLock(medium.hGlobal); UINT sem_org = SetErrorMode(SEM_FAILCRITICALERRORS); if (GetFileAttributesExW(path, GetFileExInfoStandard, &fad)) { @@ -690,8 +684,8 @@ static void fill_w32fdata_shell(IShellFolder* folder, LPCITEMIDLIST pidl, SFGAOF SetErrorMode(sem_org); - GlobalUnlock(medium.UNION_MEMBER(hGlobal)); - GlobalFree(medium.UNION_MEMBER(hGlobal)); + GlobalUnlock(medium.hGlobal); + GlobalFree(medium.hGlobal); } } }

1 0

Alexandre Julliard : winemenubuilder: Use nameless unions/structs.
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: 6c9246e022af77f3d71fc190a95a97bb7a7493de URL: https://gitlab.winehq.org/wine/wine/-/commit/6c9246e022af77f3d71fc190a95a97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:59:47 2023 +0200 winemenubuilder: Use nameless unions/structs. --- programs/winemenubuilder/winemenubuilder.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index ae657d87bb1..c16d22e2a57 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -69,8 +69,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION - #include <windows.h> #include <winternl.h> #include <shlobj.h> @@ -2364,9 +2362,9 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link WINE_TRACE("path : %s\n", wine_dbgstr_w(urlPath)); ps[0].ulKind = PRSPEC_PROPID; - ps[0].u.propid = PID_IS_ICONFILE; + ps[0].propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; - ps[1].u.propid = PID_IS_ICONINDEX; + ps[1].propid = PID_IS_ICONINDEX; hr = url->lpVtbl->QueryInterface(url, &IID_IPropertySetStorage, (void **) &pPropSetStg); if (SUCCEEDED(hr))

1 0

Alexandre Julliard : winhlp32: Use nameless unions/structs.
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: 35299b39cbea8d62093acabf1106829f7f7707d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/35299b39cbea8d62093acabf110682… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:59:58 2023 +0200 winhlp32: Use nameless unions/structs. --- programs/winhlp32/winhelp.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 037d319f290..d648cab7982 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -28,8 +28,6 @@ #include <stdarg.h> #include <stdlib.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -1565,12 +1563,12 @@ BOOL WINHELP_CreateIndexWindow(BOOL is_search) psp.dwFlags = 0; psp.hInstance = Globals.hInstance; - psp.u.pszTemplate = MAKEINTRESOURCEA(IDD_INDEX); + psp.pszTemplate = MAKEINTRESOURCEA(IDD_INDEX); psp.lParam = (LPARAM)&id; psp.pfnDlgProc = WINHELP_IndexDlgProc; psPage[0] = CreatePropertySheetPageA(&psp); - psp.u.pszTemplate = MAKEINTRESOURCEA(IDD_SEARCH); + psp.pszTemplate = MAKEINTRESOURCEA(IDD_SEARCH); psp.lParam = (LPARAM)&id; psp.pfnDlgProc = WINHELP_SearchDlgProc; psPage[1] = CreatePropertySheetPageA(&psp); @@ -1583,9 +1581,9 @@ BOOL WINHELP_CreateIndexWindow(BOOL is_search) psHead.pszCaption = buf; psHead.nPages = 2; - psHead.u2.nStartPage = is_search ? 1 : 0; + psHead.nStartPage = is_search ? 1 : 0; psHead.hwndParent = Globals.active_win->hMainWnd; - psHead.u3.phpage = psPage; + psHead.phpage = psPage; psHead.dwFlags = PSH_NOAPPLYNOW; PropertySheetA(&psHead);

1 0

Alexandre Julliard : wordpad: Use nameless unions/structs.
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: c938f92e4c76744a2ee4d584d0587fbf1b696c3a URL: https://gitlab.winehq.org/wine/wine/-/commit/c938f92e4c76744a2ee4d584d0587f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 11:22:37 2023 +0200 wordpad: Use nameless unions/structs. --- programs/wordpad/wordpad.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 2a0d380a101..ed55a1d2268 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -37,16 +37,6 @@ #include "wordpad.h" -#ifdef NONAMELESSUNION -# define U(x) (x).u -# define U2(x) (x).u2 -# define U3(x) (x).u3 -#else -# define U(x) (x) -# define U2(x) (x) -# define U3(x) (x) -#endif - /* use LoadString */ static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; @@ -1180,7 +1170,7 @@ static void dialog_viewproperties(void) psp[0].dwSize = sizeof(PROPSHEETPAGEW); psp[0].dwFlags = PSP_USETITLE; - U(psp[0]).pszTemplate = MAKEINTRESOURCEW(IDD_FORMATOPTS); + psp[0].pszTemplate = MAKEINTRESOURCEW(IDD_FORMATOPTS); psp[0].pfnDlgProc = formatopts_proc; psp[0].hInstance = hInstance; psp[0].lParam = reg_formatindex(SF_TEXT); @@ -1190,7 +1180,7 @@ static void dialog_viewproperties(void) { psp[i].dwSize = psp[0].dwSize; psp[i].dwFlags = psp[0].dwFlags; - U(psp[i]).pszTemplate = U(psp[0]).pszTemplate; + psp[i].pszTemplate = psp[0].pszTemplate; psp[i].pfnDlgProc = psp[0].pfnDlgProc; psp[i].hInstance = psp[0].hInstance; psp[i].lParam = reg_formatindex(SF_RTF); @@ -1204,13 +1194,13 @@ static void dialog_viewproperties(void) psh.hInstance = hInstance; psh.pszCaption = MAKEINTRESOURCEW(STRING_VIEWPROPS_TITLE); psh.nPages = ARRAY_SIZE(psp); - U3(psh).ppsp = ppsp; - U(psh).pszIcon = MAKEINTRESOURCEW(IDI_WORDPAD); + psh.ppsp = ppsp; + psh.pszIcon = MAKEINTRESOURCEW(IDI_WORDPAD); if(fileFormat & SF_RTF) - U2(psh).nStartPage = 1; + psh.nStartPage = 1; else - U2(psh).nStartPage = 0; + psh.nStartPage = 0; PropertySheetW(&psh); set_bar_states(); target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]);

1 0