October 2021 - Wine-commits

Damjan Jovanovic : comctl32: Send DTN_DATETIMECHANGE when the checkbox changes too.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 46df61a0878c17b99ed4009f9112e132ce004a72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46df61a0878c17b99ed4009f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 23 15:41:20 2021 +0200 comctl32: Send DTN_DATETIMECHANGE when the checkbox changes too. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19756 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9b61a646012afe7e1b63fc8970a473d2a12ea111) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/datetime.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 71bb3d238b0..dea40c64006 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1033,6 +1033,7 @@ DATETIME_Button_Command (DATETIME_INFO *infoPtr, WPARAM wParam, LPARAM lParam) DWORD state = SendMessageW((HWND)lParam, BM_GETCHECK, 0, 0); infoPtr->dateValid = (state == BST_CHECKED); InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + DATETIME_SendDateTimeChangeNotify(infoPtr); } return 0; }

1 0

Damjan Jovanovic : shell32: The menu wIDs in hmenu were rebased by idCmdFirst.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 3b90fc23149f53b0d0b4dc6afca24975fd13e3c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b90fc23149f53b0d0b4dc6a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 30 07:39:10 2021 +0200 shell32: The menu wIDs in hmenu were rebased by idCmdFirst. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 91a8b4819ead8609f0e1828de527d61da18f1508) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 04ac0b6fd3c..351d1e5d141 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -174,14 +174,14 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( mi.fMask = MIIM_ID | MIIM_STRING | MIIM_FTYPE; mi.dwTypeData = str; mi.cch = 255; - GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND, &mi); + GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND, &mi); RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND); mi.cbSize = sizeof(mi); mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_STRING; mi.dwTypeData = str; mi.fState = MFS_ENABLED; - mi.wID = FCIDM_SHVIEW_EXPLORE; + mi.wID = FCIDM_SHVIEW_EXPLORE + idCmdFirst; mi.fType = MFT_STRING; InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, &mi); } @@ -189,7 +189,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); if(uFlags & ~CMF_CANRENAME) - RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME, MF_BYCOMMAND); + RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME + idCmdFirst, MF_BYCOMMAND); else { UINT enable = MF_BYCOMMAND; @@ -205,7 +205,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( enable |= (attr & SFGAO_CANRENAME) ? MFS_ENABLED : MFS_DISABLED; } - EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME, enable); + EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME + idCmdFirst, enable); } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, uIDMax-idCmdFirst);

1 0

Damjan Jovanovic : shell32: Use a smaller range of shellview menu IDs in our IContextMenu functions.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: df085a31ffc052c77c29c582d7fa928d1c2e7122 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df085a31ffc052c77c29c582… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 30 07:39:24 2021 +0200 shell32: Use a smaller range of shellview menu IDs in our IContextMenu functions. The shellview menu IDs are very large, eg. FCIDM_SHVIEW_OPEN is 0x7102, while applications want menu IDs to fit into a small range, eg. 1-1000 for Explorer++. This causes our IContextMenu_QueryContextMenu() functions to leave out most menu options. We should rebase our shellview menu ids by -0x7000 so they occupy a smaller range. This gets both Explorer++ and Double Commander to show the correct right-click menus. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24893 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2b6458b75713cedc6cd28d2980298d6ac844757e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 57 ++++++++++++++++++++++++++++++++++-------- dlls/shell32/tests/shlfolder.c | 8 ++++++ 2 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 351d1e5d141..e7c1cf16e10 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +#define FCIDM_BASE 0x7000 + typedef struct { IContextMenu3 IContextMenu3_iface; @@ -142,6 +144,37 @@ static ULONG WINAPI ContextMenu_Release(IContextMenu3 *iface) return ref; } +static UINT max_menu_id(HMENU hmenu, UINT offset, UINT last) +{ + int i; + UINT max_id = 0; + + for (i = GetMenuItemCount(hmenu) - 1; i >= 0; i--) + { + MENUITEMINFOW item; + memset(&item, 0, sizeof(MENUITEMINFOW)); + item.cbSize = sizeof(MENUITEMINFOW); + item.fMask = MIIM_ID | MIIM_SUBMENU | MIIM_TYPE; + if (!GetMenuItemInfoW(hmenu, i, TRUE, &item)) + continue; + if (!(item.fType & MFT_SEPARATOR)) + { + if (item.hSubMenu) + { + UINT submenu_max_id = max_menu_id(item.hSubMenu, offset, last); + if (max_id < submenu_max_id) + max_id = submenu_max_id; + } + if (item.wID + offset <= last) + { + if (max_id <= item.wID + offset) + max_id = item.wID + offset + 1; + } + } + } + return max_id; +} + static HRESULT WINAPI ItemMenu_QueryContextMenu( IContextMenu3 *iface, HMENU hmenu, @@ -162,7 +195,8 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( if(uFlags & CMF_EXPLORE) RemoveMenu(hmenures, FCIDM_SHVIEW_OPEN, MF_BYCOMMAND); - uIDMax = Shell_MergeMenus(hmenu, GetSubMenu(hmenures, 0), indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS); + Shell_MergeMenus(hmenu, GetSubMenu(hmenures, 0), indexMenu, idCmdFirst - FCIDM_BASE, idCmdLast, MM_SUBMENUSHAVEIDS); + uIDMax = max_menu_id(GetSubMenu(hmenures, 0), idCmdFirst - FCIDM_BASE, idCmdLast); DestroyMenu(hmenures); @@ -174,14 +208,14 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( mi.fMask = MIIM_ID | MIIM_STRING | MIIM_FTYPE; mi.dwTypeData = str; mi.cch = 255; - GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND, &mi); - RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND); + GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE - FCIDM_BASE + idCmdFirst, MF_BYCOMMAND, &mi); + RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE - FCIDM_BASE + idCmdFirst, MF_BYCOMMAND); mi.cbSize = sizeof(mi); mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_STRING; mi.dwTypeData = str; mi.fState = MFS_ENABLED; - mi.wID = FCIDM_SHVIEW_EXPLORE + idCmdFirst; + mi.wID = FCIDM_SHVIEW_EXPLORE - FCIDM_BASE + idCmdFirst; mi.fType = MFT_STRING; InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, &mi); } @@ -189,7 +223,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); if(uFlags & ~CMF_CANRENAME) - RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME + idCmdFirst, MF_BYCOMMAND); + RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME - FCIDM_BASE + idCmdFirst, MF_BYCOMMAND); else { UINT enable = MF_BYCOMMAND; @@ -205,7 +239,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( enable |= (attr & SFGAO_CANRENAME) ? MFS_ENABLED : MFS_DISABLED; } - EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME + idCmdFirst, enable); + EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME - FCIDM_BASE + idCmdFirst, enable); } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, uIDMax-idCmdFirst); @@ -738,7 +772,7 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( if (IS_INTRESOURCE(lpcmi->lpVerb)) { - switch(LOWORD(lpcmi->lpVerb)) + switch(LOWORD(lpcmi->lpVerb) + FCIDM_BASE) { case FCIDM_SHVIEW_EXPLORE: TRACE("Verb FCIDM_SHVIEW_EXPLORE\n"); @@ -830,7 +864,7 @@ static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR c case GCS_VERBA: case GCS_VERBW: - switch (cmdid) + switch (cmdid + FCIDM_BASE) { case FCIDM_SHVIEW_OPEN: cmdW = openW; @@ -1059,8 +1093,9 @@ static HRESULT WINAPI BackgroundMenu_QueryContextMenu( } else { - idMax = Shell_MergeMenus (hMenu, GetSubMenu(hMyMenu,0), indexMenu, - idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS); + Shell_MergeMenus (hMenu, GetSubMenu(hMyMenu,0), indexMenu, + idCmdFirst - FCIDM_BASE, idCmdLast, MM_SUBMENUSHAVEIDS); + idMax = max_menu_id(GetSubMenu(hMyMenu, 0), idCmdFirst - FCIDM_BASE, idCmdLast); hr = MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, idMax-idCmdFirst); } DestroyMenu(hMyMenu); @@ -1228,7 +1263,7 @@ static HRESULT WINAPI BackgroundMenu_InvokeCommand( } else { - switch (LOWORD(lpcmi->lpVerb)) + switch (LOWORD(lpcmi->lpVerb) + FCIDM_BASE) { case FCIDM_SHVIEW_REFRESH: if (view) IShellView_Refresh(view); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index e724448c7a0..a2c15d9f40e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4385,7 +4385,15 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) ok(hr == S_OK || hr == E_NOTIMPL || hr == E_INVALIDARG, "Got unexpected hr %#x for ID %d, string %s.\n", hr, mii.wID, debugstr_a(mii.dwTypeData)); if (hr == S_OK) + { trace("Got ID %d, verb %s, string %s.\n", mii.wID, debugstr_a(buf), debugstr_a(mii.dwTypeData)); + if (!strcmp(buf, "copy")) + ok(mii.wID == 64 - 0x7000 + FCIDM_SHVIEW_COPY, "wrong menu wID %d\n", mii.wID); + else if (!strcmp(buf, "paste")) + ok(mii.wID == 64 - 0x7000 + FCIDM_SHVIEW_INSERT, "wrong menu wID %d\n", mii.wID); + else if (!strcmp(buf, "properties")) + ok(mii.wID == 64 - 0x7000 + FCIDM_SHVIEW_PROPERTIES, "wrong menu wID %d\n", mii.wID); + } else trace("Got ID %d, hr %#x, string %s.\n", mii.wID, hr, debugstr_a(mii.dwTypeData)); }

1 0

Zebediah Figura : msi: Check for a NULL return from deformat_string() when checking for failure.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 5703c141108c41ac5d3d21cc30aa28007f9f8d4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5703c141108c41ac5d3d21cc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:47 2021 -0500 msi: Check for a NULL return from deformat_string() when checking for failure. An empty string is valid, and can occur if e.g. a nonexistent property is expanded. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51091 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 814f18ab756cd69158ce893c4f7898e14d3e46dc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/action.c | 69 ++++++++++++++++++++++++++++++++----------------- dlls/msi/tests/action.c | 8 +++++- 2 files changed, 52 insertions(+), 25 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cc5d56fdc2b..4217e0efe85 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6790,25 +6790,34 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) if (res != ERROR_SUCCESS || !value) goto done; - if (value && !deformat_string(package, value, &deformatted)) + if (value) { - res = ERROR_OUTOFMEMORY; - goto done; - } + DWORD len = deformat_string( package, value, &deformatted ); + if (!deformatted) + { + res = ERROR_OUTOFMEMORY; + goto done; + } - if ((value = deformatted)) - { - if (flags & ENV_MOD_PREFIX) + if (len) { - p = wcsrchr( value, ';' ); - len_value = p - value; + value = deformatted; + if (flags & ENV_MOD_PREFIX) + { + p = wcsrchr( value, ';' ); + len_value = p - value; + } + else if (flags & ENV_MOD_APPEND) + { + value = wcschr( value, ';' ) + 1; + len_value = lstrlenW( value ); + } + else len_value = lstrlenW( value ); } - else if (flags & ENV_MOD_APPEND) + else { - value = wcschr( value, ';' ) + 1; - len_value = lstrlenW( value ); + value = NULL; } - else len_value = lstrlenW( value ); } res = open_env_key( flags, &env ); @@ -6997,22 +7006,34 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) return ERROR_SUCCESS; } - if (value && !deformat_string( package, value, &deformatted )) - return ERROR_OUTOFMEMORY; - - if ((value = deformatted)) + if (value) { - if (flags & ENV_MOD_PREFIX) + DWORD len = deformat_string( package, value, &deformatted ); + if (!deformatted) + { + res = ERROR_OUTOFMEMORY; + goto done; + } + + if (len) { - p = wcschr( value, ';' ); - len_value = p - value; + value = deformatted; + if (flags & ENV_MOD_PREFIX) + { + p = wcsrchr( value, ';' ); + len_value = p - value; + } + else if (flags & ENV_MOD_APPEND) + { + value = wcschr( value, ';' ) + 1; + len_value = lstrlenW( value ); + } + else len_value = lstrlenW( value ); } - else if (flags & ENV_MOD_APPEND) + else { - value = wcschr( value, ';' ) + 1; - len_value = lstrlenW( value ); + value = NULL; } - else len_value = lstrlenW( value ); } r = open_env_key( flags, &env ); diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 48866e36f44..d1396ed0110 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -249,7 +249,9 @@ static const char env_environment_dat[] = "Var27\t+-MSITESTVAR21\t[~];1\tOne\n" "Var28\t-MSITESTVAR22\t1\tOne\n" "Var29\t-MSITESTVAR23\t2\tOne\n" - "Var30\t*MSITESTVAR100\t1\tOne\n"; + "Var30\t*MSITESTVAR100\t1\tOne\n" + "Var31\t-=MSITESTVAR24\t[SERVNAME]\tOne\n" + "Var32\t-=MSITESTVAR25\t[bogus_prop]\tOne\n"; static const char service_install_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" @@ -5050,6 +5052,7 @@ static void test_envvar(void) CHECK_REG_STR(env, "MSITESTVAR19", "1"); CHECK_REG_STR(env, "MSITESTVAR20", "1"); CHECK_REG_STR(env, "MSITESTVAR21", "1"); + CHECK_REG_STR(env, "MSITESTVAR24", "TestService"); CHECK_REG_STR(env2, "MSITESTVAR100", "1"); res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2); @@ -5058,6 +5061,9 @@ static void test_envvar(void) res = RegSetValueExA(env, "MSITESTVAR23", 0, REG_SZ, (const BYTE *)"1", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegDeleteValueA(env, "MSITESTVAR25"); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(!r, "got %u\n", r);

1 0

Louis Lenders : wbemprox: Add ProductType to win32_operatingsystem class.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 81f705ee5b49fca784022c4914ccf2f95ed8d822 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81f705ee5b49fca784022c49… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Mar 14 21:22:51 2021 +0100 wbemprox: Add ProductType to win32_operatingsystem class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50805 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 733dc15bae32ce88d324ee221860f2a0e3e5d347) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b86326327fb..6bb26a9d17b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -246,6 +246,7 @@ static const struct column col_operatingsystem[] = { L"OSProductSuite", CIM_UINT32 }, { L"OSType", CIM_UINT16 }, { L"Primary", CIM_BOOLEAN }, + { L"ProductType", CIM_UINT32 }, { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, @@ -654,6 +655,7 @@ struct record_operatingsystem UINT32 osproductsuite; UINT16 ostype; int primary; + UINT32 producttype; const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; @@ -3543,6 +3545,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ rec->primary = -1; + rec->producttype = 1; rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a0488f40e52..2cb9e3c54bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1289,6 +1289,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"CurrentTimeZone", VT_I2, CIM_SINT16 ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); + check_property( obj, L"ProductType", VT_I4, CIM_UINT32 ); check_property( obj, L"ServicePackMajorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"ServicePackMinorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"SuiteMask", VT_I4, CIM_UINT32 );

1 0

Hans Leidekker : msi: Fix building the fusion filename.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 60fcda90f4bee8c15fb30207ea104c06f7caaabd URL: https://source.winehq.org/git/wine.git/?a=commit;h=60fcda90f4bee8c15fb30207… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 16 09:47:28 2021 +0100 msi: Fix building the fusion filename. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50809 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 46424c6196a7b544ff6173d544fc120cc9f804d9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2483d99e2b5..c56afbc6d51 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -534,7 +534,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, path); - lstrcpyW(filename, L"\\"); + lstrcatW(filename, L"\\"); lstrcatW(filename, L"fusion.dll"); if (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES) {

1 0

Dmitry Kislyuk : mshtml: Fix NULL offset parent handling in IHTMLElement::get_offsetParent.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 506a20a1da58b7b6f6a2e1328113a7c677e9fb84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=506a20a1da58b7b6f6a2e132… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Mon Mar 29 13:21:43 2021 +0200 mshtml: Fix NULL offset parent handling in IHTMLElement::get_offsetParent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50875 Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 35d0fda0f044497df90d1ef5c1e2e359e8d3166e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/tests/dom.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 732db50a78c..584f2e6a9d3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1628,7 +1628,7 @@ static HRESULT WINAPI HTMLElement_get_offsetParent(IHTMLElement *iface, IHTMLEle if(!nsparent) { *p = NULL; - hres = S_OK; + return S_OK; } hres = get_element(nsparent, &parent); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 94923d83add..e46fc54bb70 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1298,11 +1298,14 @@ static void _test_elem_offset(unsigned line, IUnknown *unk, const WCHAR *parent_ hres = IHTMLElement_get_offsetParent(elem, &off_parent); ok_(__FILE__,line) (hres == S_OK, "get_offsetParent failed: %08x\n", hres); - - _test_elem_tag(line, (IUnknown*)off_parent, parent_tag); - IHTMLElement_Release(off_parent); - IHTMLElement_Release(elem); + + if(off_parent) { + _test_elem_tag(line, (IUnknown*)off_parent, parent_tag); + IHTMLElement_Release(off_parent); + }else { + ok_(__FILE__,line) (parent_tag == NULL, "Offset parent is NULL. %s expected\n", wine_dbgstr_w(parent_tag)); + } } #define test_elem_source_index(a,b) _test_elem_source_index(__LINE__,a,b) @@ -8902,6 +8905,10 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = doc_get_body(doc); + test_elem_offset((IUnknown*)elem, NULL); + IHTMLElement_Release(elem); + elem = get_elem_by_id(doc, L"sc", TRUE); if(elem) { IHTMLScriptElement *script;

1 0

David White : urlmon: Implement IMoniker_ComposeWith() for url monikers.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: d7827c674515bfa0c8caad5ba7bebbc9b8862efc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7827c674515bfa0c8caad5b… Author: David White <dwhite(a)codeweavers.com> Date: Wed Mar 17 17:29:14 2021 -0500 urlmon: Implement IMoniker_ComposeWith() for url monikers. Signed-off-by: David White <dwhite(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 67e7f6cd566c6fdc9d5503ec46cedeab02ebc925) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/url.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/umon.c | 25 ++++++++--- 2 files changed, 132 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 6dd47732dda..dab70f8eca0 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -40,6 +40,7 @@ static HRESULT (WINAPI *pCreateAsyncBindCtxEx)(IBindCtx *, DWORD, IBindStatusCallback *, IEnumFORMATETC *, IBindCtx **, DWORD); static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); +DEFINE_OLEGUID(CLSID_CompositeMoniker, 0x309, 0, 0 ); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); @@ -2896,6 +2897,114 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) if (winetest_debug > 1) trace("URL: %s\n", wine_dbgstr_w(current_url)); } +static void test_MonikerComposeWith(void) +{ + static const struct test_data + { + const WCHAR *l, *r, *expected; + } data[] = + { + {L"https://test.winehq.org/", L"/tests/hello.html", L"https://test.winehq.org/tests/hello.html"}, + {L"url1", L"url2", L"url2"}, + {L"http://", L"tests.winehq.org", L"http:///tests.winehq.org"}, + {L"http://a/b/c/d;p?q#f", L"g", L"http://a/b/c/g"}, + {L"http://a/b/c/d;p?q#f", L"./g", L"http://a/b/c/g"}, + {L"http://a/b/c/d;p?q#f", L"g/", L"http://a/b/c/g/"}, + {L"http://a/b/c/d;p?q#f", L"/g", L"http://a/g"}, + {L"http://a/b/c/d;p?q#f", L"//g", L"http://g/"}, + {L"http://a/b/c/d;p?q#f", L"?y", L"http://a/b/c/d;p?y"}, + {L"http://a/b/c/d;p?q#f", L"g?y", L"http://a/b/c/g?y"}, + {L"http://a/b/c/d;p?q#f", L"g?y/./x", L"http://a/b/c/g?y/./x"}, + {L"http://a/b/c/d;p?q#f", L"#s", L"http://a/b/c/d;p?q#s"}, + {L"http://a/b/c/d;p?q#f", L"g#s", L"http://a/b/c/g#s"}, + {L"http://a/b/c/d;p?q#f", L"g#s/./x", L"http://a/b/c/g#s/./x"}, + {L"http://a/b/c/d;p?q#f", L"g?y#s", L"http://a/b/c/g?y#s"}, + {L"http://a/b/c/d;p?q#f", L";x", L"http://a/b/c/;x"}, + {L"http://a/b/c/d;p?q#f", L"g;x", L"http://a/b/c/g;x"}, + {L"http://a/b/c/d;p?q#f", L"g;x?y#s", L"http://a/b/c/g;x?y#s"}, + {L"http://a/b/c/d;p?q#f", L".", L"http://a/b/c/"}, + {L"http://a/b/c/d;p?q#f", L"./", L"http://a/b/c/"}, + {L"http://a/b/c/d;p?q#f", L"..", L"http://a/b/"}, + {L"http://a/b/c/d;p?q#f", L"../", L"http://a/b/"}, + {L"http://a/b/c/d;p?q#f", L"../g", L"http://a/b/g"}, + {L"http://a/b/c/d;p?q#f", L"../..", L"http://a/"}, + {L"http://a/b/c/d;p?q#f", L"../../", L"http://a/"}, + {L"http://a/b/c/d;p?q#f", L"../../g", L"http://a/g"}, + {L"http://a/b/c/d;p?q#f", L"../../../g", L"http://a/g"}, + {L"http://a/b/c/d;p?q#f", L"../../../../g", L"http://a/g"}, + {L"http://a/b/c/d;p?q#f", L"/./g", L"http://a/g"}, + {L"http://a/b/c/d;p?q#f", L"/../g", L"http://a/g"}, + {L"http://a/b/c/d;p?q#f", L"g.", L"http://a/b/c/g."}, + {L"http://a/b/c/d;p?q#f", L".g", L"http://a/b/c/.g"}, + {L"http://a/b/c/d;p?q#f", L"g..", L"http://a/b/c/g.."}, + {L"http://a/b/c/d;p?q#f", L"..g", L"http://a/b/c/..g"}, + {L"http://a/b/c/d;p?q#f", L"./../g", L"http://a/b/g"}, + {L"http://a/b/c/d;p?q#f", L"./g/.", L"http://a/b/c/g/"}, + {L"http://a/b/c/d;p?q#f", L"g/./h", L"http://a/b/c/g/h"}, + {L"http://a/b/c/d;p?q#f", L"g/../h", L"http://a/b/c/h"}, + {L"file://a/b/c/d;p?q#f", L"http:g", L"http:g"}, + {L"http://a/b/c/d;p?q#f", L"http://g/h", L"http://g/h"}, + }; + IMoniker *lmon, *rmon, *outmon, *filemon; + HRESULT hres; + LPOLESTR urlpath; + CLSID clsid; + int i; + IBindCtx* bind; + + CreateBindCtx(0, &bind); + for(i = 0; i < ARRAY_SIZE( data ); i++){ + hres = CreateURLMoniker(NULL, data[i].l, &lmon); + ok(hres == S_OK, "failed to create moniker: %08x\n", hres); + hres = CreateURLMoniker(NULL, data[i].r, &rmon); + ok(hres == S_OK, "failed to create moniker: %08x\n", hres); + + hres = IMoniker_ComposeWith(lmon, rmon, FALSE, &outmon); + ok(hres == S_OK, + "ComposeWith failed: l: %s, r: %s, ret: %08x\n", wine_dbgstr_w(data[i].l), wine_dbgstr_w(data[i].r), hres); + + IMoniker_GetClassID(outmon, &clsid); + ok(IsEqualCLSID(&clsid, &CLSID_StdURLMoniker), + "ComposeWith error: expected URL CLSID, got %s\n", wine_dbgstr_guid(&clsid)); + IMoniker_GetDisplayName(outmon, bind, NULL, &urlpath); + ok(lstrcmpW(data[i].expected, urlpath) == S_OK, + "ComposeWith expected %s got %s\n", wine_dbgstr_w(data[i].expected), wine_dbgstr_w(urlpath)); + + IMoniker_Release(lmon); + IMoniker_Release(rmon); + IMoniker_Release(outmon); + CoTaskMemFree(urlpath); + } + IBindCtx_Release(bind); + + hres = CreateURLMoniker(NULL, data[0].l, &lmon); + ok(hres == S_OK, "failed to create moniker: %08x\n", hres); + hres = CreateURLMoniker(NULL, data[0].r, &rmon); + ok(hres == S_OK, "failed to create moniker: %08x\n", hres); + hres = CreateFileMoniker(L"/a/b", &filemon); + ok(hres == S_OK, "failed to create moniker: %08x\n", hres); + + hres = IMoniker_ComposeWith(lmon, NULL, FALSE, &outmon); + ok(hres == E_INVALIDARG, "ComposeWith error: %08x\n", hres); + + hres = IMoniker_ComposeWith(lmon, rmon, FALSE, NULL); + ok(hres == E_INVALIDARG, "ComposeWith error: %08x\n", hres); + + hres = IMoniker_ComposeWith(lmon, filemon, TRUE, &outmon); + ok(hres == MK_E_NEEDGENERIC, "ComposeWith error: %08x\n", hres); + hres = IMoniker_ComposeWith(lmon, filemon, FALSE, &outmon); + ok(hres == S_OK, "ComposeWith error: %08x\n", hres); + + IMoniker_GetClassID(outmon, &clsid); + ok(IsEqualCLSID(&clsid, &CLSID_CompositeMoniker), + "ComposeWith: got CLSID %s, not generic\n", wine_dbgstr_guid(&clsid)); + + IMoniker_Release(lmon); + IMoniker_Release(rmon); + IMoniker_Release(filemon); + IMoniker_Release(outmon); +} + static void test_BindToStorage(int protocol, DWORD flags, DWORD t) { IMoniker *mon; @@ -3931,6 +4040,9 @@ START_TEST(url) trace("test StdURLMoniker...\n"); test_StdURLMoniker(); + trace("test URLMonikerComposeWith...\n"); + test_MonikerComposeWith(); + trace("synchronous http test...\n"); test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM); diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index e51b2f07d26..7959468ecd7 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -295,12 +295,27 @@ static HRESULT WINAPI URLMoniker_Reduce(IMoniker *iface, IBindCtx *pbc, return MK_S_REDUCED_TO_SELF; } -static HRESULT WINAPI URLMoniker_ComposeWith(IMoniker *iface, IMoniker *pmkRight, - BOOL fOnlyIfNotGeneric, IMoniker **ppmkComposite) +static HRESULT WINAPI URLMoniker_ComposeWith(IMoniker *iface, IMoniker *right, + BOOL only_if_not_generic, IMoniker **composite) { - URLMoniker *This = impl_from_IMoniker(iface); - FIXME("(%p)->(%p,%d,%p): stub\n",This,pmkRight,fOnlyIfNotGeneric,ppmkComposite); - return E_NOTIMPL; + HRESULT res; + IUri *right_uri; + IUriContainer *uri_container; + + TRACE("(%p)->(%p,%d,%p)\n", iface, right, only_if_not_generic, composite); + + if (!right || !composite) return E_INVALIDARG; + + res = IMoniker_QueryInterface(right, &IID_IUriContainer, (void**)&uri_container); + if (SUCCEEDED(res)){ + res = IUriContainer_GetIUri(uri_container, &right_uri); + if (SUCCEEDED(res)) res = CreateURLMonikerEx2(iface, right_uri, composite, 0); + IUriContainer_Release(uri_container); + return res; + } + + if(only_if_not_generic) return MK_E_NEEDGENERIC; + return CreateGenericComposite(iface, right, composite); } static HRESULT WINAPI URLMoniker_Enum(IMoniker *iface, BOOL fForward, IEnumMoniker **ppenumMoniker)

1 0

Jan Sikorski : wined3d: Handle different slice pitches in uncompressed texture updates.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: cfec1ccd0dcf668537b04f7f6c02e5305fdced53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfec1ccd0dcf668537b04f7f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Mar 26 14:21:46 2021 +0100 wined3d: Handle different slice pitches in uncompressed texture updates. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fc29f2a6767005eed7686a1f312a1a0d8aecba16) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/texture.c | 72 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 707566413d5..0e7714cabf1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2135,10 +2135,10 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format, GLenum target, - unsigned int level, unsigned int src_row_pitch, unsigned int dst_x, unsigned int dst_y, - unsigned int dst_z, unsigned int update_w, unsigned int update_h, unsigned int update_d, - const BYTE *addr, BOOL srgb, struct wined3d_texture *dst_texture, - const struct wined3d_gl_info *gl_info) + unsigned int level, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, unsigned int update_w, + unsigned int update_h, unsigned int update_d, const BYTE *addr, BOOL srgb, + struct wined3d_texture *dst_texture, const struct wined3d_gl_info *gl_info) { const struct wined3d_format_gl *format_gl = wined3d_format_gl(src_format); @@ -2211,17 +2211,19 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format } else { - unsigned int y, y_count; + unsigned int y, y_count, z, z_count; + bool unpacking_rows = false; TRACE("Uploading data, target %#x, level %u, x %u, y %u, z %u, " "w %u, h %u, d %u, format %#x, type %#x, addr %p.\n", target, level, dst_x, dst_y, dst_z, update_w, update_h, update_d, format_gl->format, format_gl->type, addr); - if (src_row_pitch) + if (src_row_pitch && !(src_row_pitch % src_format->byte_count)) { gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / src_format->byte_count); y_count = 1; + unpacking_rows = true; } else { @@ -2229,25 +2231,47 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format update_h = 1; } - for (y = 0; y < y_count; ++y) + if (src_slice_pitch && unpacking_rows && !(src_slice_pitch % src_row_pitch)) { - if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) - { - GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y + y, dst_z, - update_w, update_h, update_d, format_gl->format, format_gl->type, addr)); - } - else if (target == GL_TEXTURE_1D) - { - gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, - update_w, format_gl->format, format_gl->type, addr); - } - else + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, src_slice_pitch / src_row_pitch); + z_count = 1; + } + else if (src_slice_pitch && !unpacking_rows && !(src_slice_pitch % (update_w * src_format->byte_count))) + { + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, + src_slice_pitch / (update_w * src_format->byte_count)); + z_count = 1; + } + else + { + z_count = update_d; + update_d = 1; + } + + for (z = 0; z < z_count; ++z) + { + for (y = 0; y < y_count; ++y) { - gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y + y, - update_w, update_h, format_gl->format, format_gl->type, addr); + const BYTE *upload_addr = &addr[z * src_slice_pitch + y * src_row_pitch]; + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + { + GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y + y, dst_z + z, update_w, + update_h, update_d, format_gl->format, format_gl->type, upload_addr)); + } + else if (target == GL_TEXTURE_1D) + { + gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, + update_w, format_gl->format, format_gl->type, upload_addr); + } + else + { + gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y + y, + update_w, update_h, format_gl->format, format_gl->type, upload_addr); + } } } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0); checkGLcall("Upload texture data"); } } @@ -2460,8 +2484,8 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); - wined3d_texture_gl_upload_bo(src_format, target, level, dst_row_pitch, dst_x, dst_y, - dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); + wined3d_texture_gl_upload_bo(src_format, target, level, dst_row_pitch, dst_slice_pitch, dst_x, + dst_y, dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); } wined3d_context_gl_unmap_bo_address(context_gl, &bo, 0, NULL); @@ -2475,8 +2499,8 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, checkGLcall("glBindBuffer"); } - wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, dst_x, dst_y, - dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); + wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, src_slice_pitch, dst_x, + dst_y, dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); if (bo.buffer_object) {

1 0

Piotr Caban : msvcp90: Add macro that define type_info vtable.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 1a38fd0a543e57e3141362a474bfee3bfc1698ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a38fd0a543e57e3141362a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 6 17:05:09 2021 +0300 msvcp90: Add macro that define type_info vtable. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6568a8cb628e3c28839a7859c1ed7eb38fc9af92) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/cxx.h | 32 ++++++++++++++++++++++++++++++++ dlls/msvcp90/exception.c | 32 ++------------------------------ 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 02735a3c168..5052f433875 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -449,3 +449,35 @@ typedef struct } cxx_exception_type; #endif + +#define CREATE_TYPE_INFO_VTABLE\ + static void MSVCP_type_info_dtor(type_info * _this) \ +{ \ + free(_this->name); \ +} \ +\ +DEFINE_THISCALL_WRAPPER(MSVCP_type_info_vector_dtor,8) \ +void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int flags) \ +{ \ + if (flags & 2) \ + { \ + /* we have an array, with the number of elements stored before the first object */ \ + INT_PTR i, *ptr = (INT_PTR *)_this - 1; \ +\ + for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i); \ + free(ptr); \ + } \ + else \ + { \ + MSVCP_type_info_dtor(_this); \ + if (flags & 1) free(_this); \ + } \ + return _this; \ +} \ +\ +DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) \ +\ +__ASM_BLOCK_BEGIN(type_info_vtables) \ + __ASM_VTABLE(type_info, \ + VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); \ +__ASM_BLOCK_END diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 8ea4e132a0f..496dd915608 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -26,6 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +CREATE_TYPE_INFO_VTABLE + #define CLASS_IS_SIMPLE_TYPE 1 #define CLASS_HAS_VIRTUAL_BASE_CLASS 4 @@ -65,34 +67,6 @@ extern const vtable_ptr MSVCP_bad_cast_vtable; /* ??_7range_error(a)std@@6B@ */ extern const vtable_ptr MSVCP_range_error_vtable; -static void MSVCP_type_info_dtor(type_info * _this) -{ - free(_this->name); -} - -/* Unexported */ -DEFINE_THISCALL_WRAPPER(MSVCP_type_info_vector_dtor,8) -void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int flags) -{ - TRACE("(%p %x)\n", _this, flags); - if (flags & 2) - { - /* we have an array, with the number of elements stored before the first object */ - INT_PTR i, *ptr = (INT_PTR *)_this - 1; - - for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i); - MSVCRT_operator_delete(ptr); - } - else - { - MSVCP_type_info_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); - } - return _this; -} - -DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) - /* ??0exception@@QAE(a)ABQBD@Z */ /* ??0exception@@QEAA(a)AEBQEBD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor,8) @@ -1022,8 +996,6 @@ void __cdecl __ExceptionPtrDestroy(exception_ptr *ep) #endif __ASM_BLOCK_BEGIN(exception_vtables) - __ASM_VTABLE(type_info, - VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); EXCEPTION_VTABLE(exception, VTABLE_ADD_FUNC(MSVCP_exception_vector_dtor) VTABLE_ADD_FUNC(MSVCP_exception_what));

1 0