October 2022 - Wine-Commits

Huw Davies : nsi: Update struct nsi_tcp_conn_dynamic for Windows 11.
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: fad925d582801a662bbbb01a4e57d5640a324960 URL: https://gitlab.winehq.org/wine/wine/-/commit/fad925d582801a662bbbb01a4e57d5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 14 10:09:29 2022 -0500 nsi: Update struct nsi_tcp_conn_dynamic for Windows 11. --- dlls/nsi/tests/nsi.c | 3 ++- include/wine/nsi.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index b6dd8f2416d..4cf49993ea1 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -842,7 +842,8 @@ static void test_tcp_stats( int family ) static void test_tcp_tables( int family, int table_type ) { - DWORD dyn_sizes[] = { FIELD_OFFSET(struct nsi_tcp_conn_dynamic, unk[2]), sizeof(struct nsi_tcp_conn_dynamic) }; + DWORD dyn_sizes[] = { FIELD_OFFSET(struct nsi_tcp_conn_dynamic, unk[2]), FIELD_OFFSET(struct nsi_tcp_conn_dynamic, unk[3]), + sizeof(struct nsi_tcp_conn_dynamic) }; DWORD i, err, count, table_num, dyn_size, size; struct nsi_tcp_conn_key *keys; struct nsi_tcp_conn_dynamic *dyn_tbl, *dyn; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 0e20490e2a8..af35593b29c 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -334,7 +334,7 @@ struct nsi_tcp_conn_key struct nsi_tcp_conn_dynamic { UINT state; - UINT unk[3]; + UINT unk[4]; }; struct nsi_tcp_conn_static

1 0

Rémi Bernon : winegstreamer: Implement AAC decoder MFT.
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: a21e7c46d0b418a69c2a24033ee43300c41f7447 URL: https://gitlab.winehq.org/wine/wine/-/commit/a21e7c46d0b418a69c2a24033ee433… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 12 09:52:53 2022 +0200 winegstreamer: Implement AAC decoder MFT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 --- dlls/mf/tests/transform.c | 9 +- dlls/winegstreamer/aac_decoder.c | 418 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 395 insertions(+), 32 deletions(-)

1 0

Nikolay Sivov : dxva2/tests: Add another render target format to fix a test failure.
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: 3adf638c610cad80a1e9758f990bb6c889b6c357 URL: https://gitlab.winehq.org/wine/wine/-/commit/3adf638c610cad80a1e9758f990bb6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 14 22:04:13 2022 +0300 dxva2/tests: Add another render target format to fix a test failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/tests/dxva2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index cc5bc3cd76f..db48f331772 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -580,11 +580,12 @@ static void test_progressive_device(void) MAKEFOURCC('N','V','1','2'), }; - static const D3DFORMAT support_rt_formats[] = + static const D3DFORMAT supported_rt_formats[] = { D3DFMT_X8R8G8B8, MAKEFOURCC('N','V','1','2'), D3DFMT_YUY2, + D3DFMT_A2R10G10B10, }; window = create_window(); @@ -647,7 +648,7 @@ static void test_progressive_device(void) ok(count > 0, "Unexpected format count %u.\n", count); for (j = 0; j < count; ++j) { - ok(check_format_list(rt_formats[j], support_rt_formats, ARRAY_SIZE(support_rt_formats)), + ok(check_format_list(rt_formats[j], supported_rt_formats, ARRAY_SIZE(supported_rt_formats)), "Unexpected rt format %#x for input format %#x.\n", rt_formats[j], input_formats[i]); } CoTaskMemFree(rt_formats);

1 0

Piotr Caban : comctl32: Don't cast HPROPSHEETPAGE to PROPSHEETPAGEW*.
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: d75deeec384fe7c5a163ffba1118c422210b83db URL: https://gitlab.winehq.org/wine/wine/-/commit/d75deeec384fe7c5a163ffba1118c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 31 19:53:39 2022 +0200 comctl32: Don't cast HPROPSHEETPAGE to PROPSHEETPAGEW*. --- dlls/comctl32/propsheet.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 0791e4896fa..b0a011b2c55 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -281,10 +281,8 @@ static INT PROPSHEET_FindPageByResId(const PropSheetInfo * psInfo, LRESULT resId for (i = 0; i < psInfo->nPages; i++) { - LPCPROPSHEETPAGEA lppsp = (LPCPROPSHEETPAGEA)psInfo->proppage[i].hpage; - /* Fixme: if resource ID is a string shall we use strcmp ??? */ - if (lppsp->u.pszTemplate == (LPVOID)resId) + if (psInfo->proppage[i].hpage->psp.u.pszTemplate == (LPVOID)resId) break; } @@ -1514,7 +1512,6 @@ static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo) HWND hwndTabCtrl; HWND hwndLineHeader; HWND control; - LPCPROPSHEETPAGEW ppshpage; TRACE("active_page %d, index %d\n", psInfo->active_page, index); if (index == psInfo->active_page) @@ -1555,9 +1552,9 @@ static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo) if (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW) ) { hwndLineHeader = GetDlgItem(hwndDlg, IDC_SUNKEN_LINEHEADER); - ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[index].hpage; - if ((ppshpage->dwFlags & PSP_HIDEHEADER) || (!(psInfo->ppshheader.dwFlags & PSH_HEADER)) ) + if ((psInfo->proppage[index].hpage->psp.dwFlags & PSP_HIDEHEADER) || + (!(psInfo->ppshheader.dwFlags & PSH_HEADER)) ) ShowWindow(hwndLineHeader, SW_HIDE); else ShowWindow(hwndLineHeader, SW_SHOW); @@ -2399,9 +2396,9 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, psInfo->active_page--; /* Unsubclass the page dialog window */ - if((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD) && + if((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && (psInfo->ppshheader.dwFlags & PSH_WATERMARK) && - ((PROPSHEETPAGEW*)psInfo->proppage[index].hpage)->dwFlags & PSP_HIDEHEADER)) + (psInfo->proppage[index].hpage->psp.dwFlags & PSP_HIDEHEADER)) { RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_WizardSubclassProc, 1); @@ -2413,9 +2410,7 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, /* Free page resources */ if(psInfo->proppage[index].hpage) { - PROPSHEETPAGEW* psp = (PROPSHEETPAGEW*)psInfo->proppage[index].hpage; - - if (psp->dwFlags & PSP_USETITLE) + if (psInfo->proppage[index].hpage->psp.dwFlags & PSP_USETITLE) Free ((LPVOID)psInfo->proppage[index].pszText); DestroyPropertySheetPage(psInfo->proppage[index].hpage); @@ -2505,7 +2500,7 @@ static void PROPSHEET_SetHeaderTitleW(HWND hwndDlg, UINT page_index, const WCHAR if (page_index >= psInfo->nPages) return; - page = (PROPSHEETPAGEW *)psInfo->proppage[page_index].hpage; + page = &psInfo->proppage[page_index].hpage->psp; if (!IS_INTRESOURCE(page->pszHeaderTitle)) Free((void *)page->pszHeaderTitle); @@ -2541,7 +2536,7 @@ static void PROPSHEET_SetHeaderSubTitleW(HWND hwndDlg, UINT page_index, const WC if (page_index >= psInfo->nPages) return; - page = (PROPSHEETPAGEW *)psInfo->proppage[page_index].hpage; + page = &psInfo->proppage[page_index].hpage->psp; if (!IS_INTRESOURCE(page->pszHeaderSubTitle)) Free((void *)page->pszHeaderSubTitle); @@ -2629,12 +2624,10 @@ static LRESULT PROPSHEET_IndexToPage(HWND hwndDlg, int iPageIndex) static LRESULT PROPSHEET_IdToIndex(HWND hwndDlg, int iPageId) { int index; - LPCPROPSHEETPAGEW psp; PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); TRACE("(%p, %d)\n", hwndDlg, iPageId); for (index = 0; index < psInfo->nPages; index++) { - psp = (LPCPROPSHEETPAGEW)psInfo->proppage[index].hpage; - if (psp->u.pszTemplate == MAKEINTRESOURCEW(iPageId)) + if (psInfo->proppage[index].hpage->psp.u.pszTemplate == MAKEINTRESOURCEW(iPageId)) return index; } @@ -2653,7 +2646,7 @@ static LRESULT PROPSHEET_IndexToId(HWND hwndDlg, int iPageIndex) WARN("%d out of range.\n", iPageIndex); return 0; } - psp = (LPCPROPSHEETPAGEW)psInfo->proppage[iPageIndex].hpage; + psp = &psInfo->proppage[iPageIndex].hpage->psp; if (psp->dwFlags & PSP_DLGINDIRECT || !IS_INTRESOURCE(psp->u.pszTemplate)) { return 0; } @@ -2713,7 +2706,7 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) for (i = 0; i < psInfo->nPages; i++) { - PROPSHEETPAGEA* psp = (PROPSHEETPAGEA*)psInfo->proppage[i].hpage; + PROPSHEETPAGEW* psp = &psInfo->proppage[i].hpage->psp; /* Unsubclass the page dialog window */ if((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && @@ -3100,28 +3093,28 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage */ BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage) { - PROPSHEETPAGEW *psp = (PROPSHEETPAGEW *)hPropPage; + PROPSHEETPAGEW *psp = &hPropPage->psp; if (!hPropPage) return FALSE; if ((psp->dwFlags & PSP_USECALLBACK) && psp->pfnCallback) - psp->pfnCallback(0, PSPCB_RELEASE, psp + 1); + psp->pfnCallback(0, PSPCB_RELEASE, &hPropPage->callback_psp); if (!(psp->dwFlags & PSP_DLGINDIRECT) && !IS_INTRESOURCE( psp->u.pszTemplate )) - Free ((LPVOID)psp->u.pszTemplate); + Free((void*)psp->u.pszTemplate); if ((psp->dwFlags & PSP_USEICONID) && !IS_INTRESOURCE( psp->u2.pszIcon )) - Free ((LPVOID)psp->u2.pszIcon); + Free((void*)psp->u2.pszIcon); if ((psp->dwFlags & PSP_USETITLE) && !IS_INTRESOURCE( psp->pszTitle )) - Free ((LPVOID)psp->pszTitle); + Free((void*)psp->pszTitle); if ((psp->dwFlags & PSP_USEHEADERTITLE) && !IS_INTRESOURCE( psp->pszHeaderTitle )) - Free ((LPVOID)psp->pszHeaderTitle); + Free((void*)psp->pszHeaderTitle); if ((psp->dwFlags & PSP_USEHEADERSUBTITLE) && !IS_INTRESOURCE( psp->pszHeaderSubTitle )) - Free ((LPVOID)psp->pszHeaderSubTitle); + Free((void*)psp->pszHeaderSubTitle); Free(hPropPage); @@ -3272,7 +3265,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) if (psInfo->active_page < 0) ppshpage = NULL; else - ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[psInfo->active_page].hpage; + ppshpage = &psInfo->proppage[psInfo->active_page].hpage->psp; if ( (ppshpage && !(ppshpage->dwFlags & PSP_HIDEHEADER)) && (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) &&

1 0

Piotr Caban : comctl32: Introduce _PSP structure to store HPROPSHEETPAGE data.
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: fdd443130450f6756e264a65c8438919423b2b1d URL: https://gitlab.winehq.org/wine/wine/-/commit/fdd443130450f6756e264a65c84389… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 31 16:52:06 2022 +0200 comctl32: Introduce _PSP structure to store HPROPSHEETPAGE data. --- dlls/comctl32/propsheet.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 884a0638abb..bdd99c51dde 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -93,6 +93,12 @@ typedef struct } MyDLGITEMTEMPLATEEX; #include "poppack.h" +struct _PSP +{ + PROPSHEETPAGEW psp; + PROPSHEETPAGEW callback_psp; +}; + typedef struct tagPropPageInfo { HPROPSHEETPAGE hpage; /* to keep track of pages not passed to PropertySheet */ @@ -2953,21 +2959,19 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( LPCPROPSHEETPAGEA lpPropSheetPage) { PROPSHEETPAGEW *ppsp; + HPROPSHEETPAGE ret; if (lpPropSheetPage->dwSize < PROPSHEETPAGEA_V1_SIZE) return NULL; + ret = Alloc(sizeof(*ret)); + ppsp = &ret->psp; + memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); /* original data is used for callback notifications */ if ((lpPropSheetPage->dwFlags & PSP_USECALLBACK) && lpPropSheetPage->pfnCallback) { - ppsp = Alloc(2 * sizeof(*ppsp)); - memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); - memcpy(ppsp + 1, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); - } - else - { - ppsp = Alloc(sizeof(*ppsp)); - memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); + memcpy(&ret->callback_psp, lpPropSheetPage, + min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); } ppsp->dwFlags &= ~PSP_INTERNAL_UNICODE; @@ -3025,7 +3029,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( if ((ppsp->dwFlags & PSP_USECALLBACK) && ppsp->dwSize > PROPSHEETPAGEA_V1_SIZE && ppsp->pfnCallback) ppsp->pfnCallback(0, PSPCB_ADDREF, ppsp + 1); - return (HPROPSHEETPAGE)ppsp; + return ret; } /****************************************************************************** @@ -3036,21 +3040,19 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage) { PROPSHEETPAGEW *ppsp; + HPROPSHEETPAGE ret; if (lpPropSheetPage->dwSize < PROPSHEETPAGEW_V1_SIZE) return NULL; + ret = Alloc(sizeof(*ret)); + ppsp = &ret->psp; + memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); /* original data is used for callback notifications */ if ((lpPropSheetPage->dwFlags & PSP_USECALLBACK) && lpPropSheetPage->pfnCallback) { - ppsp = Alloc(2 * sizeof(*ppsp)); - memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); - memcpy(ppsp + 1, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); - } - else - { - ppsp = Alloc(sizeof(*ppsp)); - memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); + memcpy(&ret->callback_psp, lpPropSheetPage, + min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); } ppsp->dwFlags |= PSP_INTERNAL_UNICODE; @@ -3088,7 +3090,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage if ((ppsp->dwFlags & PSP_USECALLBACK) && ppsp->dwSize > PROPSHEETPAGEW_V1_SIZE && ppsp->pfnCallback) ppsp->pfnCallback(0, PSPCB_ADDREF, ppsp + 1); - return (HPROPSHEETPAGE)ppsp; + return ret; } /****************************************************************************** @@ -3106,7 +3108,7 @@ BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage) { PROPSHEETPAGEW *psp = (PROPSHEETPAGEW *)hPropPage; - if (!psp) + if (!hPropPage) return FALSE; if ((psp->dwFlags & PSP_USECALLBACK) && psp->pfnCallback)

1 0

Piotr Caban : comctl32: Use HPROPSHEETPAGE directly in PROPSHEET_GetPageRect.
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: fd6c1d597c9bdb799f2352e69b6f15f60cc04830 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd6c1d597c9bdb799f2352e69b6f15… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 31 19:26:25 2022 +0200 comctl32: Use HPROPSHEETPAGE directly in PROPSHEET_GetPageRect. --- dlls/comctl32/propsheet.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 5ca19102f61..0791e4896fa 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -232,7 +232,7 @@ static VOID PROPSHEET_UnImplementedFlags(DWORD dwFlags) * Retrieve rect from tab control and map into the dialog for SetWindowPos */ static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg, - RECT *rc, LPCPROPSHEETPAGEW ppshpage) + RECT *rc, HPROPSHEETPAGE hpsp) { if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) { HWND hwndChild; @@ -240,7 +240,7 @@ static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg, if (((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && (psInfo->ppshheader.dwFlags & PSH_HEADER) && - !(ppshpage->dwFlags & PSP_HIDEHEADER)) || + !(hpsp->psp.dwFlags & PSP_HIDEHEADER)) || (psInfo->ppshheader.dwFlags & PSH_WIZARD)) { rc->left = rc->top = WIZARD_PADDING; @@ -255,7 +255,7 @@ static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg, if ((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && (psInfo->ppshheader.dwFlags & PSH_HEADER) && - !(ppshpage->dwFlags & PSP_HIDEHEADER)) + !(hpsp->psp.dwFlags & PSP_HIDEHEADER)) { hwndChild = GetDlgItem(hwndDlg, IDC_SUNKEN_LINEHEADER); GetClientRect(hwndChild, &r); @@ -1996,7 +1996,6 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, int result; PSHNOTIFY psn; RECT rc; - LPCPROPSHEETPAGEW ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[index].hpage; if (hwndTabControl) SendMessageW(hwndTabControl, TCM_SETCURSEL, index, 0); @@ -2029,7 +2028,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, * wizards). * NOTE: The resizing happens every time the page is selected and * not only when it's created (some applications depend on it). */ - PROPSHEET_GetPageRect(psInfo, hwndDlg, &rc, ppshpage); + PROPSHEET_GetPageRect(psInfo, hwndDlg, &rc, psInfo->proppage[index].hpage); TRACE("setting page %p, rc (%s) w=%ld, h=%ld\n", psInfo->proppage[index].hwndPage, wine_dbgstr_rect(&rc), rc.right - rc.left, rc.bottom - rc.top);

1 0

Piotr Caban : comctl32: Use HPROPSHEETPAGE directly in PROPSHEET_CollectPageInfo.
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: c7b5108c02bcb9973203f49fe4cd4d492b5d78c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7b5108c02bcb9973203f49fe4cd4d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 31 19:16:55 2022 +0200 comctl32: Use HPROPSHEETPAGE directly in PROPSHEET_CollectPageInfo. --- dlls/comctl32/propsheet.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index bdd99c51dde..e32ac063ea4 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -400,7 +400,7 @@ static void PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh, * Collect property sheet data. * With code taken from DIALOG_ParseTemplate32. */ -static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, +static BOOL PROPSHEET_CollectPageInfo(HPROPSHEETPAGE hpsp, PropSheetInfo * psInfo, int index, BOOL resize) { @@ -409,19 +409,19 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, DWORD dwFlags; int width, height; - if (!lppsp) + if (!hpsp) return FALSE; TRACE("\n"); - psInfo->proppage[index].hpage = (HPROPSHEETPAGE)lppsp; + psInfo->proppage[index].hpage = hpsp; psInfo->proppage[index].hwndPage = 0; psInfo->proppage[index].isDirty = FALSE; /* * Process property page flags. */ - dwFlags = lppsp->dwFlags; - psInfo->proppage[index].useCallback = (dwFlags & PSP_USECALLBACK) && (lppsp->pfnCallback); + dwFlags = hpsp->psp.dwFlags; + psInfo->proppage[index].useCallback = (dwFlags & PSP_USECALLBACK) && (hpsp->psp.pfnCallback); psInfo->proppage[index].hasHelp = dwFlags & PSP_HASHELP; psInfo->proppage[index].hasIcon = dwFlags & (PSP_USEHICON | PSP_USEICONID); @@ -433,22 +433,22 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, * Process page template. */ if (dwFlags & PSP_DLGINDIRECT) - pTemplate = lppsp->u.pResource; + pTemplate = hpsp->psp.u.pResource; else if(dwFlags & PSP_INTERNAL_UNICODE ) { - HRSRC hResource = FindResourceW(lppsp->hInstance, - lppsp->u.pszTemplate, + HRSRC hResource = FindResourceW(hpsp->psp.hInstance, + hpsp->psp.u.pszTemplate, (LPWSTR)RT_DIALOG); - HGLOBAL hTemplate = LoadResource(lppsp->hInstance, + HGLOBAL hTemplate = LoadResource(hpsp->psp.hInstance, hResource); pTemplate = LockResource(hTemplate); } else { - HRSRC hResource = FindResourceA(lppsp->hInstance, - (LPCSTR)lppsp->u.pszTemplate, + HRSRC hResource = FindResourceA(hpsp->psp.hInstance, + (LPCSTR)hpsp->psp.u.pszTemplate, (LPSTR)RT_DIALOG); - HGLOBAL hTemplate = LoadResource(lppsp->hInstance, + HGLOBAL hTemplate = LoadResource(hpsp->psp.hInstance, hResource); pTemplate = LockResource(hTemplate); } @@ -485,7 +485,7 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, width = (WORD)*p; p++; height = (WORD)*p; p++; - if (lppsp->dwFlags & (PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE)) + if (hpsp->psp.dwFlags & (PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE)) psInfo->ppshheader.dwFlags |= PSH_HEADER; /* Special calculation for interior wizard pages so the largest page is @@ -552,9 +552,9 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, WCHAR szTitle[256]; const WCHAR *pTitle; - if (IS_INTRESOURCE( lppsp->pszTitle )) + if (IS_INTRESOURCE( hpsp->psp.pszTitle )) { - if (LoadStringW( lppsp->hInstance, (DWORD_PTR)lppsp->pszTitle, szTitle, ARRAY_SIZE(szTitle))) + if (LoadStringW( hpsp->psp.hInstance, (DWORD_PTR)hpsp->psp.pszTitle, szTitle, ARRAY_SIZE(szTitle))) pTitle = szTitle; else if (*p) pTitle = p; @@ -562,7 +562,7 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, pTitle = L"(null)"; } else - pTitle = lppsp->pszTitle; + pTitle = hpsp->psp.pszTitle; psInfo->proppage[index].pszText = heap_strdupW( pTitle ); } @@ -577,10 +577,10 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, int icon_cy = GetSystemMetrics(SM_CYSMICON); if (dwFlags & PSP_USEICONID) - hIcon = LoadImageW(lppsp->hInstance, lppsp->u2.pszIcon, IMAGE_ICON, + hIcon = LoadImageW(hpsp->psp.hInstance, hpsp->psp.u2.pszIcon, IMAGE_ICON, icon_cx, icon_cy, LR_DEFAULTCOLOR); else - hIcon = lppsp->u2.hIcon; + hIcon = hpsp->psp.u2.hIcon; if ( hIcon ) { @@ -2283,7 +2283,7 @@ static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, memcpy(&ppi[index + 1], &prev_ppi[index], (psInfo->nPages - index) * sizeof(PropPageInfo)); psInfo->proppage = ppi; - if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, index, FALSE)) + if (!PROPSHEET_CollectPageInfo(hpage, psInfo, index, FALSE)) { psInfo->proppage = prev_ppi; Free(ppi); @@ -2851,8 +2851,7 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) pByte += ((LPCPROPSHEETPAGEA)pByte)->dwSize; } - if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage, - psInfo, n, TRUE)) + if (!PROPSHEET_CollectPageInfo(psInfo->proppage[n].hpage, psInfo, n, TRUE)) { if (psInfo->usePropPage) DestroyPropertySheetPage(psInfo->proppage[n].hpage); @@ -2892,8 +2891,7 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) pByte += ((LPCPROPSHEETPAGEW)pByte)->dwSize; } - if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage, - psInfo, n, TRUE)) + if (!PROPSHEET_CollectPageInfo(psInfo->proppage[n].hpage, psInfo, n, TRUE)) { if (psInfo->usePropPage) DestroyPropertySheetPage(psInfo->proppage[n].hpage);

1 0

Piotr Caban : comctl32: Use HPROPSHEETPAGE directly in PROPSHEET_CreatePage.
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: aefd67ff608bff33bbcc2c4cfc9d190952196ce7 URL: https://gitlab.winehq.org/wine/wine/-/commit/aefd67ff608bff33bbcc2c4cfc9d19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 31 19:24:04 2022 +0200 comctl32: Use HPROPSHEETPAGE directly in PROPSHEET_CreatePage. --- dlls/comctl32/propsheet.c | 55 ++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index e32ac063ea4..5ca19102f61 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1341,7 +1341,7 @@ static UINT GetTemplateSize(const DLGTEMPLATE* pTemplate) static BOOL PROPSHEET_CreatePage(HWND hwndParent, int index, const PropSheetInfo * psInfo, - LPCPROPSHEETPAGEW ppshpage) + HPROPSHEETPAGE hpsp) { const DLGTEMPLATE* pTemplate; HWND hwndPage; @@ -1350,30 +1350,30 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, TRACE("index %d\n", index); - if (ppshpage == NULL) + if (hpsp == NULL) { return FALSE; } - if (ppshpage->dwFlags & PSP_DLGINDIRECT) + if (hpsp->psp.dwFlags & PSP_DLGINDIRECT) { - pTemplate = ppshpage->u.pResource; + pTemplate = hpsp->psp.u.pResource; resSize = GetTemplateSize(pTemplate); } - else if(ppshpage->dwFlags & PSP_INTERNAL_UNICODE) + else if(hpsp->psp.dwFlags & PSP_INTERNAL_UNICODE) { HRSRC hResource; HANDLE hTemplate; - hResource = FindResourceW(ppshpage->hInstance, - ppshpage->u.pszTemplate, + hResource = FindResourceW(hpsp->psp.hInstance, + hpsp->psp.u.pszTemplate, (LPWSTR)RT_DIALOG); if(!hResource) return FALSE; - resSize = SizeofResource(ppshpage->hInstance, hResource); + resSize = SizeofResource(hpsp->psp.hInstance, hResource); - hTemplate = LoadResource(ppshpage->hInstance, hResource); + hTemplate = LoadResource(hpsp->psp.hInstance, hResource); if(!hTemplate) return FALSE; @@ -1387,15 +1387,15 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, HRSRC hResource; HANDLE hTemplate; - hResource = FindResourceA(ppshpage->hInstance, - (LPCSTR)ppshpage->u.pszTemplate, + hResource = FindResourceA(hpsp->psp.hInstance, + (LPCSTR)hpsp->psp.u.pszTemplate, (LPSTR)RT_DIALOG); if(!hResource) return FALSE; - resSize = SizeofResource(ppshpage->hInstance, hResource); + resSize = SizeofResource(hpsp->psp.hInstance, hResource); - hTemplate = LoadResource(ppshpage->hInstance, hResource); + hTemplate = LoadResource(hpsp->psp.hInstance, hResource); if(!hTemplate) return FALSE; @@ -1439,21 +1439,20 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, } if (psInfo->proppage[index].useCallback) - (*(ppshpage->pfnCallback))(0, PSPCB_CREATE, - (LPPROPSHEETPAGEW)ppshpage); + (*(hpsp->psp.pfnCallback))(0, PSPCB_CREATE, &hpsp->psp); - if(ppshpage->dwFlags & PSP_INTERNAL_UNICODE) - hwndPage = CreateDialogIndirectParamW(ppshpage->hInstance, + if(hpsp->psp.dwFlags & PSP_INTERNAL_UNICODE) + hwndPage = CreateDialogIndirectParamW(hpsp->psp.hInstance, pTemplateCopy, hwndParent, - ppshpage->pfnDlgProc, - (LPARAM)ppshpage); + hpsp->psp.pfnDlgProc, + (LPARAM)&hpsp->psp); else - hwndPage = CreateDialogIndirectParamA(ppshpage->hInstance, + hwndPage = CreateDialogIndirectParamA(hpsp->psp.hInstance, pTemplateCopy, hwndParent, - ppshpage->pfnDlgProc, - (LPARAM)ppshpage); + hpsp->psp.pfnDlgProc, + (LPARAM)&hpsp->psp); /* Free a no more needed copy */ Free(pTemplateCopy); @@ -1465,7 +1464,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, /* Subclass exterior wizard pages */ if((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && (psInfo->ppshheader.dwFlags & PSH_WATERMARK) && - (ppshpage->dwFlags & PSP_HIDEHEADER)) + (hpsp->psp.dwFlags & PSP_HIDEHEADER)) { SetWindowSubclass(hwndPage, PROPSHEET_WizardSubclassProc, 1, 0); } @@ -1525,10 +1524,9 @@ static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo) return TRUE; } - ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[index].hpage; if (psInfo->proppage[index].hwndPage == 0) { - PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage); + PROPSHEET_CreatePage(hwndDlg, index, psInfo, psInfo->proppage[index].hpage); } if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) @@ -2009,7 +2007,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, psn.lParam = 0; if (!psInfo->proppage[index].hwndPage) { - if(!PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage)) { + if(!PROPSHEET_CreatePage(hwndDlg, index, psInfo, psInfo->proppage[index].hpage)) { PROPSHEET_RemovePage(hwndDlg, index, NULL); if (!psInfo->isModeless) @@ -2247,7 +2245,6 @@ static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); PropPageInfo *ppi, *prev_ppi = psInfo->proppage; HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); - LPCPROPSHEETPAGEW ppsp = (LPCPROPSHEETPAGEW)hpage; TCITEMW item; int index; @@ -2292,10 +2289,10 @@ static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, psInfo->proppage[index].hpage = hpage; - if (ppsp->dwFlags & PSP_PREMATURE) + if (hpage->psp.dwFlags & PSP_PREMATURE) { /* Create the page but don't show it */ - if (!PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppsp)) + if (!PROPSHEET_CreatePage(hwndDlg, index, psInfo, hpage)) { psInfo->proppage = prev_ppi; Free(ppi);

1 0

Rémi Bernon : opengl32: Consistently use $func instead of $func_ref.
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: f2bd9917a1325612006990b4ff655374e4828cfa URL: https://gitlab.winehq.org/wine/wine/-/commit/f2bd9917a1325612006990b4ff6553… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 5 19:56:28 2022 +0200 opengl32: Consistently use $func instead of $func_ref. --- dlls/opengl32/make_opengl | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index ba1f5d7231a..fd02aceafb8 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -224,28 +224,28 @@ sub get_func_args($$$) # sub GenerateThunk($$$) { - my ($name, $func_ref, $prefix) = @_; - my $call_args = get_func_args( $func_ref, 0, 0 ); + my ($name, $func, $prefix) = @_; + my $call_args = get_func_args( $func, 0, 0 ); - my $ret = get_func_proto( "%s WINAPI %s(%s)", $name, $func_ref, 0 ); + my $ret = get_func_proto( "%s WINAPI %s(%s)", $name, $func, 0 ); $ret .= "\n{\n"; # special case for functions that take an HDC as first parameter - if (@{$func_ref->[1]} && get_arg_type( ${$func_ref->[1]}[0] ) eq "HDC") + if (@{$func->[1]} && get_arg_type( ${$func->[1]}[0] ) eq "HDC") { - my $pname = get_arg_name( ${$func_ref->[1]}[0] ); + my $pname = get_arg_name( ${$func->[1]}[0] ); $ret .= " const struct opengl_funcs *funcs = get_dc_funcs( $pname );\n"; - $ret .= " " . get_func_trace( $name, $func_ref ) if $gen_traces; + $ret .= " " . get_func_trace( $name, $func ) if $gen_traces; $ret .= " if (!funcs || !funcs->$prefix.p_$name) return"; - $ret .= " 0" unless is_void_func( $func_ref ); + $ret .= " 0" unless is_void_func( $func ); $ret .= ";\n"; } else { $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; - $ret .= " " . get_func_trace( $name, $func_ref ) if $gen_traces; + $ret .= " " . get_func_trace( $name, $func ) if $gen_traces; } $ret .= " "; - $ret .= "return " unless is_void_func( $func_ref ); + $ret .= "return " unless is_void_func( $func ); $ret .= "funcs->$prefix.p_$name($call_args);\n"; $ret .= "}\n\n"; return $ret; @@ -253,18 +253,18 @@ sub GenerateThunk($$$) sub generate_null_func($$$) { - my ($name, $func_ref, $callconv) = @_; + my ($name, $func, $callconv) = @_; my $ret; return "" if $name eq "glDebugEntry"; - $ret = get_func_proto( "static %s$callconv null_%s(%s)", $name, $func_ref, 1 ); + $ret = get_func_proto( "static %s$callconv null_%s(%s)", $name, $func, 1 ); $ret .= " {"; if ($name eq "glGetError") { $ret .= " return GL_INVALID_OPERATION;"; } - elsif (!is_void_func( $func_ref )) + elsif (!is_void_func( $func )) { $ret .= " return 0;"; } @@ -800,8 +800,8 @@ print EXT $wrappers; print EXT "\nconst OpenGL_extension extension_registry[$count] = {\n"; my $i = 0; foreach (sort keys %ext_functions) { - my $func_ref = $ext_functions{$_}; - printf EXT " { \"%s\", \"%s\", %s }", $_, join(" ", sort @{$func_ref->[2]}), $_; + my $func = $ext_functions{$_}; + printf EXT " { \"%s\", \"%s\", %s }", $_, join(" ", sort @{$func->[2]}), $_; if ($i != $count-1) { print EXT ","; }

1 0

Rémi Bernon : opengl32: Replace get_function_proto helper with get_func_(args|ret).
by Alexandre Julliard Oct. 14, 2022

Oct. 14, 2022

Module: wine Branch: master Commit: 3f17c701a20a20a157790d85128d6a9dfc337851 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f17c701a20a20a157790d85128d6a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 5 20:00:59 2022 +0200 opengl32: Replace get_function_proto helper with get_func_(args|ret). --- dlls/opengl32/make_opengl | 55 ++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index fd02aceafb8..d836118a14d 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -219,6 +219,14 @@ sub get_func_args($$$) return $ret; } +sub get_func_ret($$) +{ + my ($func, $convert_args) = @_; + my $ret = $convert_args ? ConvertType( $func->[0] ) : $func->[0]->textContent(); + $ret =~ s/ $//; + return $ret; +} + # # This functions generates the thunk for a given function. # @@ -226,8 +234,11 @@ sub GenerateThunk($$$) { my ($name, $func, $prefix) = @_; my $call_args = get_func_args( $func, 0, 0 ); + my $decl_args = get_func_args( $func, 1, 0 ); + my $func_ret = get_func_ret( $func, 0 ); + my $ret = ""; - my $ret = get_func_proto( "%s WINAPI %s(%s)", $name, $func, 0 ); + $ret .= "$func_ret WINAPI $name($decl_args)"; $ret .= "\n{\n"; # special case for functions that take an HDC as first parameter if (@{$func->[1]} && get_arg_type( ${$func->[1]}[0] ) eq "HDC") @@ -254,11 +265,13 @@ sub GenerateThunk($$$) sub generate_null_func($$$) { my ($name, $func, $callconv) = @_; - my $ret; + my $decl_args = get_func_args( $func, 1, 1 ); + my $func_ret = get_func_ret( $func, 1 ); + my $ret = ""; return "" if $name eq "glDebugEntry"; - $ret = get_func_proto( "static %s$callconv null_%s(%s)", $name, $func, 1 ); + $ret .= "static $func_ret$callconv null_$name($decl_args)"; $ret .= " {"; if ($name eq "glGetError") { @@ -313,22 +326,6 @@ sub get_arg_name($) return $name[0]->textContent(); } -sub get_func_proto($$$$) -{ - my ($format, $name, $func, $convert_args) = @_; - die "unknown func $name" unless defined $func->[0]; - my $proto = $convert_args ? ConvertType( $func->[0] ) : $func->[0]->textContent(); - $proto =~ s/ $//; - my $args = ""; - foreach my $arg (@{$func->[1]}) - { - $args .= " " . ($convert_args ? ConvertType( $arg ) : $arg->textContent()) . ","; - } - $args =~ s/,$/ /; - $args ||= "void"; - return sprintf $format, $proto, $name, $args; -} - # # Extract and checks the number of arguments # @@ -646,7 +643,9 @@ print HEADER " struct\n {\n"; foreach (sort keys %wgl_functions) { next unless defined $supported_wgl_functions{$_}; - print HEADER get_func_proto(" %-10s (WINAPI *p_%s)(%s);\n", $_, $wgl_functions{$_}, 1); + my $decl_args = get_func_args( $wgl_functions{$_}, 1, 1 ); + my $func_ret = get_func_ret( $wgl_functions{$_}, 1 ); + printf HEADER " %-10s (WINAPI *p_$_)($decl_args);\n", $func_ret; } print HEADER " } wgl;\n\n"; @@ -654,14 +653,18 @@ print HEADER " struct\n {\n"; foreach (sort keys %norm_functions) { next if $_ eq "glDebugEntry"; - print HEADER get_func_proto(" %-10s (WINE_GLAPI *p_%s)(%s);\n", $_, $norm_functions{$_}, 1); + my $decl_args = get_func_args( $norm_functions{$_}, 1, 1 ); + my $func_ret = get_func_ret( $norm_functions{$_}, 1 ); + printf HEADER " %-10s (WINE_GLAPI *p_$_)($decl_args);\n", $func_ret; } print HEADER " } gl;\n\n"; print HEADER " struct\n {\n"; foreach (sort keys %ext_functions) { - print HEADER get_func_proto(" %-10s (WINE_GLAPI *p_%s)(%s);\n", $_, $ext_functions{$_}, 1); + my $decl_args = get_func_args( $ext_functions{$_}, 1, 1 ); + my $func_ret = get_func_ret( $ext_functions{$_}, 1 ); + printf HEADER " %-10s (WINE_GLAPI *p_$_)($decl_args);\n", $func_ret; } print HEADER " } ext;\n"; print HEADER "};\n\n"; @@ -708,7 +711,9 @@ print HEADER "\n"; foreach (sort keys %norm_functions) { - printf HEADER "%s;\n", get_func_proto("%-10s GLAPIENTRY %s(%s)", $_, $norm_functions{$_}, 0); + my $decl_args = get_func_args( $norm_functions{$_}, 1, 0 ); + my $func_ret = get_func_ret( $norm_functions{$_}, 0 ); + printf HEADER "%-10s GLAPIENTRY $_($decl_args);\n", $func_ret; } print HEADER "\n#endif /* __WINE_WGL_H */\n"; @@ -787,7 +792,9 @@ print EXT "const int extension_registry_size = $count;\n\n"; foreach (sort keys %ext_functions) { if (needs_wrapper( $_, $ext_functions{$_} )) { - $wrappers .= get_func_proto("extern %s WINAPI %s(%s) DECLSPEC_HIDDEN;\n", $_, $ext_functions{$_}, 0); + my $decl_args = get_func_args( $ext_functions{$_}, 1, 0 ); + my $func_ret = get_func_ret( $ext_functions{$_}, 0 ); + $wrappers .= "extern $func_ret WINAPI $_($decl_args) DECLSPEC_HIDDEN;\n"; } else {

1 0