Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

01/01: [SHDOCVW_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3f4d62dde2e4854aa89d… commit d3f4d62dde2e4854aa89d99ce8bd4d7f214421e4 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 20 13:19:06 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 20 13:19:06 2018 +0100 [SHDOCVW_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/shdocvw/shdocvw.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/rostests/winetests/shdocvw/shdocvw.c b/modules/rostests/winetests/shdocvw/shdocvw.c index 50ee9a3863..3bdceb5728 100644 --- a/modules/rostests/winetests/shdocvw/shdocvw.c +++ b/modules/rostests/winetests/shdocvw/shdocvw.c @@ -212,13 +212,13 @@ static void test_ParseURLFromOutsideSourceA(void) buffer[sizeof(buffer)-1] = '\0'; len = sizeof(buffer); dummy = 0; - /* on success, string size including terminating 0 is returned for ansi version */ + /* on success, len+1 is returned. No idea, if someone depend on this */ res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy); /* len does not include the terminating 0, when buffer is large enough */ - ok( res == (ParseURL_table[i].len+1) && len == ParseURL_table[i].len && + ok( res != 0 && len == ParseURL_table[i].len && !lstrcmpA(buffer, ParseURL_table[i].newurl), - "#%d: got %d and %d with '%s' (expected %d and %d with '%s')\n", - i, res, len, buffer, ParseURL_table[i].len+1, ParseURL_table[i].len, ParseURL_table[i].newurl); + "#%d: got %d and %d with '%s' (expected '!=0' and %d with '%s')\n", + i, res, len, buffer, ParseURL_table[i].len, ParseURL_table[i].newurl); /* use the size test only for the first examples */ @@ -308,12 +308,11 @@ static void test_ParseURLFromOutsideSourceW(void) /* len is in characters */ len = sizeof(bufferW)/sizeof(bufferW[0]); dummy = 0; - /* on success, 1 is returned for unicode version */ res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy); WideCharToMultiByte(CP_ACP, 0, bufferW, -1, bufferA, sizeof(bufferA), NULL, NULL); - ok( res == 1 && len == ParseURL_table[0].len && + ok( res != 0 && len == ParseURL_table[0].len && !lstrcmpA(bufferA, ParseURL_table[0].newurl), - "got %d and %d with '%s' (expected 1 and %d with '%s')\n", + "got %d and %d with '%s' (expected '!=0' and %d with '%s')\n", res, len, bufferA, ParseURL_table[0].len, ParseURL_table[0].newurl);

6 years, 11 months

01/01: [TWAIN_32] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0edcbac349451ffbf0a99… commit 0edcbac349451ffbf0a99e84a4a8ad74ea641096 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 20 13:17:45 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 20 13:17:45 2018 +0100 [TWAIN_32] Sync with Wine 3.0. CORE-14225 --- dll/win32/twain_32/CMakeLists.txt | 2 +- dll/win32/twain_32/dsm_ctrl.c | 206 ++++++++++++++++++++++++++++++++++++-- dll/win32/twain_32/resource.h | 24 +++++ dll/win32/twain_32/twain.rc | 33 ++++++ dll/win32/twain_32/twain32_main.c | 46 +++++++++ dll/win32/twain_32/twain_32.rc | 3 + dll/win32/twain_32/twain_i.h | 17 ++++ media/doc/README.WINE | 2 +- 8 files changed, 321 insertions(+), 12 deletions(-) diff --git a/dll/win32/twain_32/CMakeLists.txt b/dll/win32/twain_32/CMakeLists.txt index d25fde9596..ac028ed450 100644 --- a/dll/win32/twain_32/CMakeLists.txt +++ b/dll/win32/twain_32/CMakeLists.txt @@ -15,6 +15,6 @@ add_library(twain_32 SHARED set_module_type(twain_32 win32dll) target_link_libraries(twain_32 wine) -add_importlibs(twain_32 msvcrt kernel32 ntdll) +add_importlibs(twain_32 user32 msvcrt kernel32 ntdll) add_pch(twain_32 twain_i.h SOURCE) add_cd_file(TARGET twain_32 DESTINATION reactos FOR all) diff --git a/dll/win32/twain_32/dsm_ctrl.c b/dll/win32/twain_32/dsm_ctrl.c index aa2a4c1188..ce845c9531 100644 --- a/dll/win32/twain_32/dsm_ctrl.c +++ b/dll/win32/twain_32/dsm_ctrl.c @@ -21,9 +21,15 @@ #include "twain_i.h" +#include <winuser.h> + +#include "resource.h" + static TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */ static TW_UINT32 DSM_sourceId; /* source id generator */ static TW_UINT16 DSM_currentDevice; /* keep track of device during enumeration */ +static HWND DSM_parent; +static UINT event_message; struct all_devices { char *modname; @@ -102,6 +108,86 @@ twain_autodetect(void) { #endif } +/* DG_CONTROL/DAT_NULL/MSG_CLOSEDSREQ|MSG_DEVICEEVENT|MSG_XFERREADY */ +TW_UINT16 TWAIN_ControlNull (pTW_IDENTITY pOrigin, pTW_IDENTITY pDest, activeDS *pSource, TW_UINT16 MSG, TW_MEMREF pData) +{ + struct pending_message *message; + + TRACE ("DG_CONTROL/DAT_NULL MSG=%i\n", MSG); + + if (MSG != MSG_CLOSEDSREQ && + MSG != MSG_DEVICEEVENT && + MSG != MSG_XFERREADY) + { + DSM_twCC = TWCC_BADPROTOCOL; + return TWRC_FAILURE; + } + + message = HeapAlloc(GetProcessHeap(), 0, sizeof(*message)); + if (!message) + { + DSM_twCC = TWCC_LOWMEMORY; + return TWRC_FAILURE; + } + + message->msg = MSG; + list_add_tail(&pSource->pending_messages, &message->entry); + + /* Delphi twain only sends us messages from one window, and it + doesn't even give us the real handle to that window. Other + applications might decide to forward messages sent to DSM_parent + or to the one supplied to ENABLEDS. So let's try very hard to + find a window that will work. */ + if (DSM_parent) + PostMessageW(DSM_parent, event_message, 0, 0); + if (pSource->ui_window && pSource->ui_window != DSM_parent) + PostMessageW(pSource->ui_window, event_message, 0, 0); + if (pSource->event_window && pSource->event_window != pSource->ui_window && + pSource->event_window != DSM_parent) + PostMessageW(pSource->event_window, event_message, 0, 0); + PostMessageW(0, event_message, 0, 0); + + return TWRC_SUCCESS; +} + +/* Filters MSG_PROCESSEVENT messages before reaching the data source */ +TW_UINT16 TWAIN_ProcessEvent (pTW_IDENTITY pOrigin, activeDS *pSource, TW_MEMREF pData) +{ + TW_EVENT *event = (TW_EVENT*)pData; + MSG *msg = (MSG*)event->pEvent; + TW_UINT16 result = TWRC_NOTDSEVENT; + + TRACE("%x,%x\n", msg->message, event_message); + + if (msg->message == event_message) + { + if (!list_empty (&pSource->pending_messages)) + { + struct list *entry = list_head (&pSource->pending_messages); + struct pending_message *message = LIST_ENTRY(entry, struct pending_message, entry); + event->TWMessage = message->msg; + list_remove (entry); + TRACE("<-- %x\n", event->TWMessage); + } + else + event->TWMessage = MSG_NULL; + result = TWRC_DSEVENT; + } + + if (msg->hwnd) + { + MSG dummy; + pSource->event_window = msg->hwnd; + if (!list_empty (&pSource->pending_messages) && + !PeekMessageW(&dummy, msg->hwnd, event_message, event_message, PM_NOREMOVE)) + { + PostMessageW(msg->hwnd, event_message, 0, 0); + } + } + + return result; +} + /* DG_CONTROL/DAT_IDENTITY/MSG_CLOSEDS */ TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) { @@ -230,34 +316,131 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) } newSource->hmod = hmod; newSource->dsEntry = (DSENTRYPROC)GetProcAddress(hmod, "DS_Entry"); + /* Assign id for the opened data source */ + pIdentity->Id = DSM_sourceId ++; if (TWRC_SUCCESS != newSource->dsEntry (pOrigin, DG_CONTROL, DAT_IDENTITY, MSG_OPENDS, pIdentity)) { DSM_twCC = TWCC_OPERATIONERROR; HeapFree(GetProcessHeap(), 0, newSource); + DSM_sourceId--; return TWRC_FAILURE; } - /* Assign name and id for the opened data source */ - pIdentity->Id = DSM_sourceId ++; /* add the data source to an internal active source list */ newSource->next = activeSources; newSource->identity.Id = pIdentity->Id; strcpy (newSource->identity.ProductName, pIdentity->ProductName); + list_init(&newSource->pending_messages); + newSource->ui_window = NULL; + newSource->event_window = NULL; activeSources = newSource; DSM_twCC = TWCC_SUCCESS; return TWRC_SUCCESS; } +typedef struct { + pTW_IDENTITY origin; + pTW_IDENTITY result; +} userselect_data; + +static INT_PTR CALLBACK userselect_dlgproc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + userselect_data *data = (userselect_data*)lparam; + int i; + HWND sourcelist; + BOOL any_devices = FALSE; + + SetWindowLongPtrW(hwnd, DWLP_USER, (LONG_PTR)data); + + sourcelist = GetDlgItem(hwnd, IDC_LISTSOURCE); + + for (i=0; i<nrdevices; i++) + { + TW_IDENTITY *id = &devices[i].identity; + LRESULT index; + + if ((id->SupportedGroups & data->origin->SupportedGroups) == 0) + continue; + + index = SendMessageA(sourcelist, LB_ADDSTRING, 0, (LPARAM)id->ProductName); + SendMessageW(sourcelist, LB_SETITEMDATA, (WPARAM)index, (LPARAM)i); + any_devices = TRUE; + } + + if (any_devices) + { + EnableWindow(GetDlgItem(hwnd, IDOK), TRUE); + + /* FIXME: Select the supplied product name or default source. */ + SendMessageW(sourcelist, LB_SETCURSEL, 0, 0); + } + + return TRUE; + } + case WM_CLOSE: + EndDialog(hwnd, 0); + return TRUE; + case WM_COMMAND: + if (wparam == MAKEWPARAM(IDCANCEL, BN_CLICKED)) + { + EndDialog(hwnd, 0); + return TRUE; + } + else if (wparam == MAKEWPARAM(IDOK, BN_CLICKED) || + wparam == MAKEWPARAM(IDC_LISTSOURCE, LBN_DBLCLK)) + { + userselect_data *data = (userselect_data*)GetWindowLongPtrW(hwnd, DWLP_USER); + HWND sourcelist; + LRESULT index; + + sourcelist = GetDlgItem(hwnd, IDC_LISTSOURCE); + + index = SendMessageW(sourcelist, LB_GETCURSEL, 0, 0); + + if (index == LB_ERR) + return TRUE; + + index = SendMessageW(sourcelist, LB_GETITEMDATA, (WPARAM)index, 0); + + *data->result = devices[index].identity; + + /* FIXME: Save this as the default source */ + + EndDialog(hwnd, 1); + return TRUE; + } + break; + } + return FALSE; +} + /* DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT */ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) { - pTW_IDENTITY selected = (pTW_IDENTITY)pData; + userselect_data param = {pOrigin, pData}; + HWND parent = DSM_parent; - if (!nrdevices) { - DSM_twCC = TWCC_OPERATIONERROR; - return TWRC_FAILURE; - } - *selected = devices[0].identity; - DSM_twCC = TWCC_SUCCESS; - return TWRC_SUCCESS; + TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n", + pOrigin->SupportedGroups, wine_dbgstr_a(param.result->ProductName)); + + twain_autodetect(); + + if (!IsWindow(parent)) + parent = NULL; + + if (DialogBoxParamW(DSM_hinstance, MAKEINTRESOURCEW(DLG_USERSELECT), + parent, userselect_dlgproc, (LPARAM)&param) == 0) + { + TRACE("canceled\n"); + DSM_twCC = TWCC_SUCCESS; + return TWRC_CANCEL; + } + + TRACE("<-- %s\n", wine_dbgstr_a(param.result->ProductName)); + DSM_twCC = TWCC_SUCCESS; + return TWRC_SUCCESS; } /* DG_CONTROL/DAT_PARENT/MSG_CLOSEDSM */ @@ -280,6 +463,7 @@ TW_UINT16 TWAIN_CloseDSM (pTW_IDENTITY pOrigin, TW_MEMREF pData) currentDS = nextDS; } activeSources = NULL; + DSM_parent = NULL; DSM_twCC = TWCC_SUCCESS; return TWRC_SUCCESS; } else { @@ -295,6 +479,7 @@ TW_UINT16 TWAIN_OpenDSM (pTW_IDENTITY pOrigin, TW_MEMREF pData) TRACE("DG_CONTROL/DAT_PARENT/MSG_OPENDSM\n"); if (!DSM_initialized) { + event_message = RegisterWindowMessageA("WINE TWAIN_32 EVENT"); DSM_currentDevice = 0; DSM_initialized = TRUE; DSM_twCC = TWCC_SUCCESS; @@ -304,6 +489,7 @@ TW_UINT16 TWAIN_OpenDSM (pTW_IDENTITY pOrigin, TW_MEMREF pData) DSM_twCC = TWCC_SEQERROR; twRC = TWRC_FAILURE; } + DSM_parent = (HWND)pData; return twRC; } diff --git a/dll/win32/twain_32/resource.h b/dll/win32/twain_32/resource.h new file mode 100644 index 0000000000..1cbc26e733 --- /dev/null +++ b/dll/win32/twain_32/resource.h @@ -0,0 +1,24 @@ +/* + * Copyright 2017 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> +#include <winuser.h> + +#define DLG_USERSELECT 1 + +#define IDC_LISTSOURCE 1001 diff --git a/dll/win32/twain_32/twain.rc b/dll/win32/twain_32/twain.rc new file mode 100644 index 0000000000..339ead68bb --- /dev/null +++ b/dll/win32/twain_32/twain.rc @@ -0,0 +1,33 @@ +/* + * Copyright 2017 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +DLG_USERSELECT DIALOG 0, 0, 140, 140 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_NOIDLEMSG +FONT 8, "MS Shell Dlg" +CAPTION "Select Source" +{ + LISTBOX IDC_LISTSOURCE, 7, 7, 126, 104 + DEFPUSHBUTTON "OK", IDOK, 29, 118, 50, 15, BS_DEFPUSHBUTTON|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Cancel", IDCANCEL, 83, 118, 50, 15 +} diff --git a/dll/win32/twain_32/twain32_main.c b/dll/win32/twain_32/twain32_main.c index 4044cb2dcc..1607c9b2d7 100644 --- a/dll/win32/twain_32/twain32_main.c +++ b/dll/win32/twain_32/twain32_main.c @@ -21,6 +21,24 @@ #include "twain_i.h" +extern HINSTANCE DSM_hinstance; + +BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved) +{ + TRACE("%p,%x,%p\n", hinstance, reason, reserved); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstance); + DSM_hinstance = hinstance; + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + /* A helper function that looks up a destination identity in the active source list */ static activeDS *TWAIN_LookupSource (const TW_IDENTITY *pDest) @@ -132,6 +150,19 @@ DSM_Entry (pTW_IDENTITY pOrigin, TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG); + if (DG == DG_CONTROL && DAT == DAT_NULL) + { + activeDS *pSource = TWAIN_LookupSource (pOrigin); + if (!pSource) + { + ERR("No source associated with pSource %p\n", pDest); + DSM_twCC = TWCC_BADPROTOCOL; + return TWRC_FAILURE; + } + + return TWAIN_ControlNull (pOrigin, pDest, pSource, MSG, pData); + } + if (pDest) { activeDS *pSource = TWAIN_LookupSource (pDest); @@ -142,6 +173,21 @@ DSM_Entry (pTW_IDENTITY pOrigin, DSM_twCC = TWCC_BADDEST; return TWRC_FAILURE; } + + if (DG == DG_CONTROL && DAT == DAT_EVENT && MSG == MSG_PROCESSEVENT) + { + twRC = TWAIN_ProcessEvent(pOrigin, pSource, pData); + if (twRC == TWRC_DSEVENT) + return twRC; + } + + if (DG == DG_CONTROL && DAT == DAT_USERINTERFACE && + (MSG == MSG_ENABLEDS || MSG == MSG_ENABLEDSUIONLY) && + pData != NULL) + { + pSource->ui_window = ((TW_USERINTERFACE*)pData)->hParent; + } + DSM_twCC = TWCC_SUCCESS; TRACE("Forwarding %d/%d/%d/%p to DS.\n", DG, DAT, MSG, pData); twRC = pSource->dsEntry(pOrigin, DG, DAT, MSG, pData); diff --git a/dll/win32/twain_32/twain_32.rc b/dll/win32/twain_32/twain_32.rc index a09a0ee7e5..bf1cff4e7e 100644 --- a/dll/win32/twain_32/twain_32.rc +++ b/dll/win32/twain_32/twain_32.rc @@ -3,3 +3,6 @@ #define REACTOS_STR_INTERNAL_NAME "twain_32" #define REACTOS_STR_ORIGINAL_FILENAME "twain_32.dll" #include <reactos/version.rc> + +#include "twain.rc" + diff --git a/dll/win32/twain_32/twain_i.h b/dll/win32/twain_32/twain_i.h index a170454a4e..32ebc2a221 100644 --- a/dll/win32/twain_32/twain_i.h +++ b/dll/win32/twain_32/twain_i.h @@ -32,8 +32,16 @@ #include <twain.h> #include <wine/debug.h> +#include <wine/list.h> + WINE_DEFAULT_DEBUG_CHANNEL(twain); +struct pending_message +{ + struct list entry; + TW_UINT16 msg; +}; + /* internal information about an active data source */ typedef struct tagActiveDS { @@ -41,12 +49,17 @@ typedef struct tagActiveDS TW_IDENTITY identity; /* identity */ HMODULE hmod; DSENTRYPROC dsEntry; + struct list pending_messages; + HWND ui_window; + HWND event_window; } activeDS; TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ +HINSTANCE DSM_hinstance DECLSPEC_HIDDEN; + /* Implementation of operation triplets (From Application to Source Manager) */ extern TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; @@ -66,5 +79,9 @@ extern TW_UINT16 TWAIN_OpenDSM (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_GetDSMStatus (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; +extern TW_UINT16 TWAIN_ControlNull + (pTW_IDENTITY pOrigin, pTW_IDENTITY pDest, activeDS *pSource, TW_UINT16 MSG, TW_MEMREF pData) DECLSPEC_HIDDEN; +extern TW_UINT16 TWAIN_ProcessEvent + (pTW_IDENTITY pOrigin, activeDS *pSource, TW_MEMREF pData) DECLSPEC_HIDDEN; #endif /* _TWAIN32_H */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index a4f3a1397d..5106521886 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -185,7 +185,7 @@ reactos/dll/win32/sxs # Synced to WineStaging-2.16 reactos/dll/win32/t2embed # Synced to WineStaging-2.9 reactos/dll/win32/tapi32 # Synced to WineStaging-2.9 reactos/dll/win32/traffic # Synced to WineStaging-2.9 -reactos/dll/win32/twain_32 # Synced to WineStaging-2.9 +reactos/dll/win32/twain_32 # Synced to Wine-3.0 reactos/dll/win32/updspapi # Synced to WineStaging-2.9 reactos/dll/win32/url # Synced to WineStaging-2.9 reactos/dll/win32/urlmon # Synced to WineStaging-2.16

6 years, 11 months

01/01: [SHLWAPI] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7250325e41ef8bef91bf… commit b7250325e41ef8bef91bf696e64fa03ab31809f7 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 20 13:15:19 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 20 13:15:19 2018 +0100 [SHLWAPI] Sync with Wine 3.0. CORE-14225 --- dll/win32/shlwapi/assoc.c | 227 ++------------------------------------------ dll/win32/shlwapi/clist.c | 14 +-- dll/win32/shlwapi/ordinal.c | 6 -- dll/win32/shlwapi/path.c | 28 ++++-- dll/win32/shlwapi/url.c | 9 +- media/doc/README.WINE | 2 +- 6 files changed, 36 insertions(+), 250 deletions(-) diff --git a/dll/win32/shlwapi/assoc.c b/dll/win32/shlwapi/assoc.c index d4f886e543..b34c272455 100644 --- a/dll/win32/shlwapi/assoc.c +++ b/dll/win32/shlwapi/assoc.c @@ -89,174 +89,6 @@ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface) return SHCoCreateInstance( NULL, &clsid, NULL, refiid, lpInterface ); } - -struct AssocPerceivedInfo -{ - PCWSTR Type; - PERCEIVED Perceived; - INT FlagHardcoded; - INT FlagSoftcoded; - PCWSTR Extensions; -}; - -static const WCHAR unspecified_exts[] = { - '.','l','n','k',0, - '.','s','e','a','r','c','h','-','m','s',0, - 0 -}; - -static const WCHAR image_exts[] = { - '.','b','m','p',0, - '.','d','i','b',0, - '.','e','m','f',0, - '.','g','i','f',0, - '.','i','c','o',0, - '.','j','f','i','f',0, - '.','j','p','e',0, - '.','j','p','e','g',0, - '.','j','p','g',0, - '.','p','n','g',0, - '.','r','l','e',0, - '.','t','i','f',0, - '.','t','i','f','f',0, - '.','w','m','f',0, - 0 -}; - -static const WCHAR audio_exts[] = { - '.','a','i','f',0, - '.','a','i','f','c',0, - '.','a','i','f','f',0, - '.','a','u',0, - '.','m','3','u',0, - '.','m','i','d',0, - '.','m','i','d','i',0, -#if _WIN32_WINNT > 0x602 - '.','m','p','2',0, -#endif - '.','m','p','3',0, - '.','r','m','i',0, - '.','s','n','d',0, - '.','w','a','v',0, - '.','w','a','x',0, - '.','w','m','a',0, - 0 -}; - -static const WCHAR video_exts[] = { - '.','a','s','f',0, - '.','a','s','x',0, - '.','a','v','i',0, - '.','d','v','r','-','m','s',0, - '.','I','V','F',0, - '.','m','1','v',0, -#if _WIN32_WINNT <= 0x602 - '.','m','p','2',0, -#endif - '.','m','p','2','v',0, - '.','m','p','a',0, - '.','m','p','e',0, - '.','m','p','e','g',0, - '.','m','p','g',0, - '.','m','p','v','2',0, - '.','w','m',0, - '.','w','m','v',0, - '.','w','m','x',0, - '.','w','v','x',0, - 0 -}; - -static const WCHAR compressed_exts[] = { - '.','z','i','p',0, - 0 -}; - -static const WCHAR document_exts[] = { -#if _WIN32_WINNT >= 0x600 - '.','h','t','m',0, - '.','h','t','m','l',0, -#endif - '.','m','h','t',0, - 0 -}; - -static const WCHAR system_exts[] = { - '.','c','p','l',0, - 0 -}; - -static const WCHAR application_exts[] = { - '.','b','a','s',0, - '.','b','a','t',0, - '.','c','m','d',0, - '.','c','o','m',0, - '.','e','x','e',0, - '.','h','t','a',0, - '.','m','s','i',0, - '.','p','i','f',0, - '.','r','e','g',0, - '.','s','c','r',0, - '.','v','b',0, - 0 -}; - -const WCHAR type_text[] = {'t','e','x','t',0}; -const WCHAR type_image[] = {'i','m','a','g','e',0}; -const WCHAR type_audio[] = {'a','u','d','i','o',0}; -const WCHAR type_video[] = {'v','i','d','e','o',0}; -const WCHAR type_compressed[] = {'c','o','m','p','r','e','s','s','e','d',0}; -const WCHAR type_document[] = {'d','o','c','u','m','e','n','t',0}; -const WCHAR type_system[] = {'s','y','s','t','e','m',0}; -const WCHAR type_application[] = {'a','p','p','l','i','c','a','t','i','o','n',0}; - -#define HARDCODED_NATIVE_WMSDK (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_WMSDK) -#define HARDCODED_NATIVE_GDIPLUS (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_GDIPLUS) -#define HARDCODED_NATIVE_ZIPFLDR (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_ZIPFOLDER) -#define SOFTCODED_NATIVESUPPORT (PERCEIVEDFLAG_SOFTCODED | PERCEIVEDFLAG_NATIVESUPPORT) - -static const struct AssocPerceivedInfo known_types[] = { - { NULL, PERCEIVED_TYPE_UNSPECIFIED, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, unspecified_exts }, - { type_text, PERCEIVED_TYPE_TEXT, PERCEIVEDFLAG_HARDCODED, SOFTCODED_NATIVESUPPORT, NULL }, - { type_image, PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, PERCEIVEDFLAG_SOFTCODED, image_exts }, - { type_audio, PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, PERCEIVEDFLAG_SOFTCODED, audio_exts }, - { type_video, PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, PERCEIVEDFLAG_SOFTCODED, video_exts }, - { type_compressed, PERCEIVED_TYPE_COMPRESSED, HARDCODED_NATIVE_ZIPFLDR, PERCEIVEDFLAG_SOFTCODED, compressed_exts }, - { type_document, PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, document_exts }, - { type_system, PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, system_exts }, - { type_application, PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, application_exts }, -}; - -static const struct AssocPerceivedInfo* AssocFindByBuiltinExtension(LPCWSTR pszExt) -{ - UINT n; - for (n = 0; n < sizeof(known_types) / sizeof(known_types[0]); ++n) - { - PCWSTR Ext = known_types[n].Extensions; - while (Ext && *Ext) - { - if (!StrCmpIW(Ext, pszExt)) - return &known_types[n]; - Ext += (strlenW(Ext) + 1); - } - } - return NULL; -} - -static const struct AssocPerceivedInfo* AssocFindByType(LPCWSTR pszType) -{ - UINT n; - for (n = 0; n < sizeof(known_types) / sizeof(known_types[0]); ++n) - { - if (known_types[n].Type) - { - if (!StrCmpIW(known_types[n].Type, pszType)) - return &known_types[n]; - } - } - return NULL; -} - - /************************************************************************* * AssocGetPerceivedType [SHLWAPI.@] * @@ -278,64 +110,19 @@ static const struct AssocPerceivedInfo* AssocFindByType(LPCWSTR pszType) * lppszType is optional and it can be NULL. * if lpType or lpFlag are NULL, the function will crash. * if lpszExt is NULL, an error is returned. + * + * BUGS + * Unimplemented. */ HRESULT WINAPI AssocGetPerceivedType(LPCWSTR lpszExt, PERCEIVED *lpType, INT *lpFlag, LPWSTR *lppszType) { - static const WCHAR PerceivedTypeKey[] = {'P','e','r','c','e','i','v','e','d','T','y','p','e',0}; - static const WCHAR SystemFileAssociationsKey[] = {'S','y','s','t','e','m','F','i','l','e', - 'A','s','s','o','c','i','a','t','i','o','n','s','\\','%','s',0}; - const struct AssocPerceivedInfo *Info; + FIXME("(%s, %p, %p, %p) not supported\n", debugstr_w(lpszExt), lpType, lpFlag, lppszType); - TRACE("(%s,%p,%p,%p)\n", debugstr_w(lpszExt), lpType, lpFlag, lppszType); - - Info = AssocFindByBuiltinExtension(lpszExt); - if (Info) - { - *lpType = Info->Perceived; - *lpFlag = Info->FlagHardcoded; - } - else - { - WCHAR Buffer[100] = { 0 }; - DWORD Size = sizeof(Buffer); - if (RegGetValueW(HKEY_CLASSES_ROOT, lpszExt, PerceivedTypeKey, - RRF_RT_REG_SZ, NULL, Buffer, &Size) == ERROR_SUCCESS) - { - Info = AssocFindByType(Buffer); - } - if (!Info) - { - WCHAR KeyName[MAX_PATH] = { 0 }; - snprintfW(KeyName, MAX_PATH, SystemFileAssociationsKey, lpszExt); - Size = sizeof(Buffer); - if (RegGetValueW(HKEY_CLASSES_ROOT, KeyName, PerceivedTypeKey, - RRF_RT_REG_SZ, NULL, Buffer, &Size) == ERROR_SUCCESS) - { - Info = AssocFindByType(Buffer); - } - } - if (Info) - { - *lpType = Info->Perceived; - *lpFlag = Info->FlagSoftcoded; - } - } - - if (Info) - { - if (lppszType && Info->Type) - { - return SHStrDupW(Info->Type, lppszType); - } - return Info->Type ? S_OK : E_FAIL; - } - else - { - *lpType = PERCEIVED_TYPE_UNSPECIFIED; - *lpFlag = 0; - } + if (lpszExt == NULL) return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + return E_NOTIMPL; } /************************************************************************* diff --git a/dll/win32/shlwapi/clist.c b/dll/win32/shlwapi/clist.c index 2913adf6f5..763a40e349 100644 --- a/dll/win32/shlwapi/clist.c +++ b/dll/win32/shlwapi/clist.c @@ -54,19 +54,19 @@ static inline LPDATABLOCK_HEADER NextItem(LPDBLIST lpList) * the call returns S_OK but does not actually add the element. * See SHWriteDataBlockList. */ -BOOL WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) +HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) { LPDATABLOCK_HEADER lpInsertAt = NULL; ULONG ulSize; TRACE("(%p,%p)\n", lppList, lpNewItem); - if(!lppList || !lpNewItem) - return FALSE; + if(!lppList || !lpNewItem ) + return E_INVALIDARG; if (lpNewItem->cbSize < sizeof(DATABLOCK_HEADER) || lpNewItem->dwSignature == CLIST_ID_CONTAINER) - return FALSE; + return S_OK; ulSize = lpNewItem->cbSize; @@ -123,9 +123,9 @@ BOOL WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) lpInsertAt = NextItem(lpInsertAt); lpInsertAt->cbSize = 0; - return TRUE; + return lpNewItem->cbSize; } - return FALSE; + return S_OK; } /************************************************************************* @@ -343,7 +343,7 @@ VOID WINAPI SHFreeDataBlockList(LPDBLIST lpList) */ BOOL WINAPI SHRemoveDataBlock(LPDBLIST* lppList, DWORD dwSignature) { - LPDATABLOCK_HEADER lpList = NULL; + LPDATABLOCK_HEADER lpList = 0; LPDATABLOCK_HEADER lpItem = NULL; LPDATABLOCK_HEADER lpNext; ULONG ulNewSize; diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 4e331f4800..b2543d4154 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -78,12 +78,6 @@ HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, TRACE("(%p,%d,%d,%08x,%08x)\n", hShared, dwDstProcId, dwSrcProcId, dwAccess, dwOptions); - if (!hShared) - { - TRACE("Returning handle NULL\n"); - return NULL; - } - /* Get dest process handle */ if (dwDstProcId == dwMyProcId) hDst = GetCurrentProcess(); diff --git a/dll/win32/shlwapi/path.c b/dll/win32/shlwapi/path.c index 4d3c5cf152..342ef46e54 100644 --- a/dll/win32/shlwapi/path.c +++ b/dll/win32/shlwapi/path.c @@ -527,17 +527,25 @@ int WINAPI PathGetDriveNumberA(LPCSTR lpszPath) * * See PathGetDriveNumberA. */ -int WINAPI PathGetDriveNumberW(LPCWSTR lpszPath) +int WINAPI PathGetDriveNumberW(const WCHAR *path) { - TRACE ("(%s)\n",debugstr_w(lpszPath)); + WCHAR drive; - if (lpszPath) - { - WCHAR tl = tolowerW(lpszPath[0]); - if (tl >= 'a' && tl <= 'z' && lpszPath[1] == ':') - return tl - 'a'; - } - return -1; + static const WCHAR nt_prefixW[] = {'\\','\\','?','\\'}; + + TRACE("(%s)\n", debugstr_w(path)); + + if (!path) + return -1; + + if (!strncmpW(path, nt_prefixW, 4)) + path += 4; + + drive = tolowerW(path[0]); + if (drive < 'a' || drive > 'z' || path[1] != ':') + return -1; + + return drive - 'a'; } /************************************************************************* @@ -1643,7 +1651,7 @@ BOOL WINAPI PathIsRootW(LPCWSTR lpszPath) * Although this function is prototyped as returning a BOOL, it returns * FILE_ATTRIBUTE_DIRECTORY for success. This means that code such as: * - *| if (PathIsDirectoryA("c:\\windows\\") != FALSE) + *| if (PathIsDirectoryA("c:\\windows\\") == TRUE) *| ... * * will always fail. diff --git a/dll/win32/shlwapi/url.c b/dll/win32/shlwapi/url.c index 9bb8df4d22..ed34aa73a5 100644 --- a/dll/win32/shlwapi/url.c +++ b/dll/win32/shlwapi/url.c @@ -154,7 +154,7 @@ HRESULT WINAPI ParseURLA(LPCSTR x, PARSEDURLA *y) if(y->cbSize != sizeof(*y)) return E_INVALIDARG; - while(*ptr && (isalnum(*ptr) || *ptr == '-')) + while(*ptr && (isalnum(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.')) ptr++; if (*ptr != ':' || ptr <= x+1) { @@ -188,7 +188,7 @@ HRESULT WINAPI ParseURLW(LPCWSTR x, PARSEDURLW *y) if(y->cbSize != sizeof(*y)) return E_INVALIDARG; - while(*ptr && (isalnumW(*ptr) || *ptr == '-')) + while(*ptr && (isalnumW(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.')) ptr++; if (*ptr != ':' || ptr <= x+1) { @@ -902,10 +902,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, work = preliminary + base.cchProtocol+1+base.cchSuffix - 1; if (*work++ != '/') *(work++) = '/'; - if (relative.pszSuffix[0] == '.' && relative.pszSuffix[1] == 0) - *work = 0; - else - strcpyW(work, relative.pszSuffix); + strcpyW(work, relative.pszSuffix); break; default: diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 44d037d760..a4f3a1397d 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -174,7 +174,7 @@ reactos/dll/win32/shdoclc # Synced to WineStaging-2.9 reactos/dll/win32/shdocvw # Synced to Wine-3.0 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-2.9 -reactos/dll/win32/shlwapi # Synced to WineStaging-2.16 +reactos/dll/win32/shlwapi # Synced to Wine-3.0 reactos/dll/win32/slbcsp # Synced to WineStaging-2.9 reactos/dll/win32/snmpapi # Synced to WineStaging-2.9 reactos/dll/win32/softpub # Synced to WineStaging-2.9

6 years, 11 months

01/01: [SHDOCVW] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2462dae72bdcdbfe18b5… commit b2462dae72bdcdbfe18b58f41a5597382aca64db Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 20 13:14:14 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 20 13:14:14 2018 +0100 [SHDOCVW] Sync with Wine 3.0. CORE-14225 --- dll/win32/shdocvw/shdocvw_main.c | 8 +++----- media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dll/win32/shdocvw/shdocvw_main.c b/dll/win32/shdocvw/shdocvw_main.c index 89081e8840..8a4c8c0269 100644 --- a/dll/win32/shdocvw/shdocvw_main.c +++ b/dll/win32/shdocvw/shdocvw_main.c @@ -365,7 +365,8 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L HRESULT hr; DWORD needed; DWORD len; - DWORD res; + DWORD res = 0; + TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown, plen ? *plen : 0, unknown ? *unknown : 0); @@ -391,12 +392,10 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L needed = lstrlenW(buffer_out)+1; TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed); - res = 0; if (*plen >= needed) { if (out != NULL) { lstrcpyW(out, buffer_out); - /* On success, 1 is returned for unicode version */ - res = 1; + res++; } needed--; } @@ -439,7 +438,6 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD if (*plen >= needed) { if (out != NULL) { WideCharToMultiByte(CP_ACP, 0, buffer, -1, out, *plen, NULL, NULL); - /* On success, string size including terminating 0 is returned for ansi version */ res = needed; } needed--; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 2f9a3b8ed4..44d037d760 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -171,7 +171,7 @@ reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to WineStaging-2.9 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to WineStaging-2.9 -reactos/dll/win32/shdocvw # Synced to WineStaging-2.9 +reactos/dll/win32/shdocvw # Synced to Wine-3.0 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-2.9 reactos/dll/win32/shlwapi # Synced to WineStaging-2.16

6 years, 11 months

01/01: [RPCRT4] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90155f749fa92205620c9… commit 90155f749fa92205620c9aed5d27b8c9f0743f45 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 20 13:13:03 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 20 13:13:03 2018 +0100 [RPCRT4] Sync with Wine 3.0. CORE-14225 --- dll/win32/rpcrt4/cstub.c | 2 +- dll/win32/rpcrt4/ndr_stubless.c | 17 ++++++++--------- dll/win32/rpcrt4/rpc_server.c | 2 -- dll/win32/rpcrt4/rpc_transport.c | 4 ++++ media/doc/README.WINE | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dll/win32/rpcrt4/cstub.c b/dll/win32/rpcrt4/cstub.c index 6b1e47d02f..7c78f1c82e 100644 --- a/dll/win32/rpcrt4/cstub.c +++ b/dll/win32/rpcrt4/cstub.c @@ -41,7 +41,7 @@ typedef struct static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface ) { - return CONTAINING_RECORD((void *)iface, cstdstubbuffer_delegating_t, stub_buffer); + return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer); } HRESULT CStdStubBuffer_Construct(REFIID riid, diff --git a/dll/win32/rpcrt4/ndr_stubless.c b/dll/win32/rpcrt4/ndr_stubless.c index 0a16cae8e2..f3e0399ef3 100644 --- a/dll/win32/rpcrt4/ndr_stubless.c +++ b/dll/win32/rpcrt4/ndr_stubless.c @@ -1116,6 +1116,11 @@ LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, uns } #endif +static inline BOOL param_needs_alloc( PARAM_ATTRIBUTES attr ) +{ + return attr.IsOut && !attr.IsIn && !attr.IsBasetype && !attr.IsByValue; +} + static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat, enum stubless_phase phase, unsigned short number_of_params) @@ -1151,20 +1156,14 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, { HeapFree(GetProcessHeap(), 0, *(void **)pArg); } - else if (params[i].attr.IsOut && - !params[i].attr.IsIn && - !params[i].attr.IsBasetype && - !params[i].attr.IsByValue) + else if (param_needs_alloc(params[i].attr) && + (!params[i].attr.MustFree || params[i].attr.IsSimpleRef)) { if (*pTypeFormat != RPC_FC_BIND_CONTEXT) pStubMsg->pfnFree(*(void **)pArg); } break; case STUBLESS_INITOUT: - if (!params[i].attr.IsIn && - params[i].attr.IsOut && - !params[i].attr.IsBasetype && - !params[i].attr.ServerAllocSize && - !params[i].attr.IsByValue) + if (param_needs_alloc(params[i].attr) && !params[i].attr.ServerAllocSize) { if (*pTypeFormat == RPC_FC_BIND_CONTEXT) { diff --git a/dll/win32/rpcrt4/rpc_server.c b/dll/win32/rpcrt4/rpc_server.c index 25722691dd..57d64ff0fc 100644 --- a/dll/win32/rpcrt4/rpc_server.c +++ b/dll/win32/rpcrt4/rpc_server.c @@ -784,10 +784,8 @@ static RPC_STATUS RPCRT4_stop_listen(BOOL auto_listen) if (stop_listen) { RpcServerProtseq *cps; - EnterCriticalSection(&server_cs); LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) RPCRT4_sync_with_server_thread(cps); - LeaveCriticalSection(&server_cs); } if (!auto_listen) diff --git a/dll/win32/rpcrt4/rpc_transport.c b/dll/win32/rpcrt4/rpc_transport.c index 6897db6241..0a2c9a5fb0 100644 --- a/dll/win32/rpcrt4/rpc_transport.c +++ b/dll/win32/rpcrt4/rpc_transport.c @@ -151,6 +151,10 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, if (pipe != INVALID_HANDLE_VALUE) break; err = GetLastError(); if (err == ERROR_PIPE_BUSY) { + if (WaitNamedPipeA(pname, NMPWAIT_USE_DEFAULT_WAIT)) { + TRACE("retrying busy server\n"); + continue; + } TRACE("connection failed, error=%x\n", err); return RPC_S_SERVER_TOO_BUSY; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 4b6fadfe70..2f9a3b8ed4 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -160,7 +160,7 @@ reactos/dll/win32/rasapi32 # Synced to WineStaging-2.9 reactos/dll/win32/resutils # Synced to WineStaging-2.9 reactos/dll/win32/riched20 # Synced to Wine-3.0 reactos/dll/win32/riched32 # Synced to WineStaging-2.9 -reactos/dll/win32/rpcrt4 # Synced to WineStaging-2.16 +reactos/dll/win32/rpcrt4 # Synced to Wine-3.0 reactos/dll/win32/rsabase # Synced to WineStaging-2.9 reactos/dll/win32/rsaenh # Synced to WineStaging-2.9 reactos/dll/win32/sccbase # Synced to WineStaging-2.9

6 years, 11 months

01/01: [RICHED20_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44f07538ba725990e4fa2… commit 44f07538ba725990e4fa2ea622bd5a9490cb5b50 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 20 13:11:06 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 20 13:11:06 2018 +0100 [RICHED20_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/riched20/editor.c | 116 +++++-- modules/rostests/winetests/riched20/richole.c | 457 -------------------------- 2 files changed, 83 insertions(+), 490 deletions(-) diff --git a/modules/rostests/winetests/riched20/editor.c b/modules/rostests/winetests/riched20/editor.c index e0edadbb92..9bfbf45837 100644 --- a/modules/rostests/winetests/riched20/editor.c +++ b/modules/rostests/winetests/riched20/editor.c @@ -70,6 +70,10 @@ static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS20A, ES_MULTILINE, parent); } +static HWND new_richedit_with_style(HWND parent, DWORD style) { + return new_window(RICHEDIT_CLASS20A, style, parent); +} + static HWND new_richeditW(HWND parent) { return new_windowW(RICHEDIT_CLASS20W, ES_MULTILINE, parent); } @@ -3748,6 +3752,20 @@ static void test_WM_SETTEXT(void) TEST_SETTEXTW(urtftextW, urtftextW) /* interpreted as ascii text */ DestroyWindow(hwndRichEdit); #undef TEST_SETTEXTW + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"line1\r\nline2"); + ok(result == 1, "WM_SETTEXT returned %ld, expected 12\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); + ok(result == 5, "WM_GETTEXT returned %ld, expected 5\n", result); + ok(!strcmp(buf, "line1"), "WM_GETTEXT returned incorrect string '%s'\n", buf); + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"{\\rtf1 ABC\\rtlpar\\par DEF\\par HIJ\\pard\\par}"); + ok(result == 1, "WM_SETTEXT returned %ld, expected 1\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); + ok(result == 3, "WM_GETTEXT returned %ld, expected 3\n", result); + ok(!strcmp(buf, "ABC"), "WM_GETTEXT returned incorrect string '%s'\n", buf); + DestroyWindow(hwndRichEdit); } /* Set *pcb to one to show that the remaining cb-1 bytes are not @@ -4406,6 +4424,17 @@ static void test_EM_SETTEXTEX(void) } DestroyWindow(hwndRichEdit); + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + setText.flags = ST_DEFAULT; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"line1\r\nline2"); + ok(result == 1, "EM_SETTEXTEX incorrectly returned %d, expected 1\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + ok(!strcmp(bufACP, "line1"), "EM_SETTEXTEX: Test single-line text: Result: %s\n", bufACP); + DestroyWindow(hwndRichEdit); } static void test_EM_LIMITTEXT(void) @@ -5351,6 +5380,15 @@ static void test_EM_REPLACESEL(int redraw) SendMessageA(hwndRichEdit, WM_SETREDRAW, TRUE, 0); DestroyWindow(hwndRichEdit); + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"line1\r\nline2"); + ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r); + r = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok(r == 5, "WM_GETTEXT returned %d, expected 5\n", r); + ok(!strcmp(buffer, "line1"), "WM_GETTEXT returned incorrect string '%s'\n", buffer); + DestroyWindow(hwndRichEdit); } /* Native riched20 inspects the keyboard state (e.g. GetKeyState) @@ -5498,6 +5536,39 @@ static void test_WM_PASTE(void) "test paste: strcmp = %i, actual = '%s'\n", result, buffer); release_key(VK_CONTROL); + /* Copy multiline text to clipboard for future use */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, WM_COPY, 0, 0); + SendMessageA(hwndRichEdit, EM_SETSEL, 0, 0); + + /* Paste into read-only control */ + result = SendMessageA(hwndRichEdit, EM_SETREADONLY, TRUE, 0); + SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer, text3); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + + /* Cut from read-only control */ + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, WM_CUT, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer, text3); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + + /* FIXME: Wine doesn't flush Ole clipboard when window is destroyed so do it manually */ + OleFlushClipboard(); + DestroyWindow(hwndRichEdit); + + /* Paste multi-line text into single-line control */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer, "testing paste"); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); DestroyWindow(hwndRichEdit); } @@ -5958,6 +6029,18 @@ static void test_EM_STREAMIN(void) ok(es.dwError == 0, "EM_STREAMIN: Test 5 set error %d, expected %d\n", es.dwError, 0); DestroyWindow(hwndRichEdit); + + /* Single-line richedit */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + ptr = "line1\r\nline2"; + es.dwCookie = (DWORD_PTR)&ptr; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); + ok(result == 12, "got %ld, expected %d\n", result, 12); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok (!strcmp(buffer, "line1"), + "EM_STREAMIN: Unexpected text '%s'\n", buffer); } static void test_EM_StreamIn_Undo(void) @@ -8715,38 +8798,6 @@ static void test_para_numbering(void) DestroyWindow( edit ); } -static void test_window_classes(void) -{ - static const struct - { - const char *class; - BOOL success; - } test[] = - { - { "RichEdit", FALSE }, - { "RichEdit20A", TRUE }, - { "RichEdit20W", TRUE }, - { "RichEdit50A", FALSE }, - { "RichEdit50W", FALSE } - }; - int i; - HWND hwnd; - - for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) - { - SetLastError(0xdeadbeef); - hwnd = CreateWindowExA(0, test[i].class, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL); -todo_wine_if(!strcmp(test[i].class, "RichEdit50A") || !strcmp(test[i].class, "RichEdit50W")) - ok(!hwnd == !test[i].success, "CreateWindow(%s) should %s\n", - test[i].class, test[i].success ? "succeed" : "fail"); - if (!hwnd) -todo_wine - ok(GetLastError() == ERROR_CANNOT_FIND_WND_CLASS, "got %d\n", GetLastError()); - else - DestroyWindow(hwnd); - } -} - START_TEST( editor ) { BOOL ret; @@ -8756,7 +8807,6 @@ START_TEST( editor ) ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); - test_window_classes(); test_WM_CHAR(); test_EM_FINDTEXT(FALSE); test_EM_FINDTEXT(TRUE); diff --git a/modules/rostests/winetests/riched20/richole.c b/modules/rostests/winetests/riched20/richole.c index 3a69819630..656eee1ea4 100644 --- a/modules/rostests/winetests/riched20/richole.c +++ b/modules/rostests/winetests/riched20/richole.c @@ -3396,451 +3396,6 @@ static void test_Expand(void) ITextRange_Release(range); } -static void test_ITextRange_SetStart(void) -{ - HWND w; - IRichEditOle *reOle = NULL; - ITextDocument *txtDoc = NULL; - ITextRange *txtRge = NULL; - HRESULT hres; - LONG first, lim, start, end; - static const CHAR test_text1[] = "TestSomeText"; - - create_interfaces(&w, &reOle, &txtDoc, NULL); - SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - - first = 4, lim = 8; - ITextDocument_Range(txtDoc, first, lim, &txtRge); - hres = ITextRange_SetStart(txtRge, first); - ok(hres == S_FALSE, "ITextRange_SetStart\n"); - -#define TEST_TXTRGE_SETSTART(cp, expected_start, expected_end) \ - hres = ITextRange_SetStart(txtRge, cp); \ - ok(hres == S_OK, "ITextRange_SetStart\n"); \ - ITextRange_GetStart(txtRge, &start); \ - ITextRange_GetEnd(txtRge, &end); \ - ok(start == expected_start, "got wrong start value: %d\n", start); \ - ok(end == expected_end, "got wrong end value: %d\n", end); - - TEST_TXTRGE_SETSTART(2, 2, 8) - TEST_TXTRGE_SETSTART(-1, 0, 8) - TEST_TXTRGE_SETSTART(13, 12, 12) - - release_interfaces(&w, &reOle, &txtDoc, NULL); -} - -static void test_ITextRange_SetEnd(void) -{ - HWND w; - IRichEditOle *reOle = NULL; - ITextDocument *txtDoc = NULL; - ITextRange *txtRge = NULL; - HRESULT hres; - LONG first, lim, start, end; - static const CHAR test_text1[] = "TestSomeText"; - - create_interfaces(&w, &reOle, &txtDoc, NULL); - SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - - first = 4, lim = 8; - ITextDocument_Range(txtDoc, first, lim, &txtRge); - hres = ITextRange_SetEnd(txtRge, lim); - ok(hres == S_FALSE, "ITextRange_SetEnd\n"); - -#define TEST_TXTRGE_SETEND(cp, expected_start, expected_end) \ - hres = ITextRange_SetEnd(txtRge, cp); \ - ok(hres == S_OK, "ITextRange_SetEnd\n"); \ - ITextRange_GetStart(txtRge, &start); \ - ITextRange_GetEnd(txtRge, &end); \ - ok(start == expected_start, "got wrong start value: %d\n", start); \ - ok(end == expected_end, "got wrong end value: %d\n", end); - - TEST_TXTRGE_SETEND(6, 4, 6) - TEST_TXTRGE_SETEND(14, 4, 13) - TEST_TXTRGE_SETEND(-1, 0, 0) - - ITextRange_Release(txtRge); - release_interfaces(&w, &reOle, &txtDoc, NULL); -} - -static void test_ITextSelection_SetStart(void) -{ - HWND w; - IRichEditOle *reOle = NULL; - ITextDocument *txtDoc = NULL; - ITextSelection *txtSel = NULL; - HRESULT hres; - LONG first, lim, start, end; - static const CHAR test_text1[] = "TestSomeText"; - - create_interfaces(&w, &reOle, &txtDoc, &txtSel); - SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - - first = 4, lim = 8; - SendMessageA(w, EM_SETSEL, first, lim); - hres = ITextSelection_SetStart(txtSel, first); - ok(hres == S_FALSE, "ITextSelection_SetStart\n"); - -#define TEST_TXTSEL_SETSTART(cp, expected_start, expected_end) \ - hres = ITextSelection_SetStart(txtSel, cp); \ - ok(hres == S_OK, "ITextSelection_SetStart\n"); \ - SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); \ - ok(start == expected_start, "got wrong start value: %d\n", start); \ - ok(end == expected_end, "got wrong end value: %d\n", end); - - TEST_TXTSEL_SETSTART(2, 2, 8) - TEST_TXTSEL_SETSTART(-1, 0, 8) - TEST_TXTSEL_SETSTART(13, 12, 12) - - release_interfaces(&w, &reOle, &txtDoc, &txtSel); -} - -static void test_ITextSelection_SetEnd(void) -{ - HWND w; - IRichEditOle *reOle = NULL; - ITextDocument *txtDoc = NULL; - ITextSelection *txtSel = NULL; - HRESULT hres; - LONG first, lim, start, end; - static const CHAR test_text1[] = "TestSomeText"; - - create_interfaces(&w, &reOle, &txtDoc, &txtSel); - SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - - first = 4, lim = 8; - SendMessageA(w, EM_SETSEL, first, lim); - hres = ITextSelection_SetEnd(txtSel, lim); - ok(hres == S_FALSE, "ITextSelection_SetEnd\n"); - -#define TEST_TXTSEL_SETEND(cp, expected_start, expected_end) \ - hres = ITextSelection_SetEnd(txtSel, cp); \ - ok(hres == S_OK, "ITextSelection_SetEnd\n"); \ - SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); \ - ok(start == expected_start, "got wrong start value: %d\n", start); \ - ok(end == expected_end, "got wrong end value: %d\n", end); - - TEST_TXTSEL_SETEND(6, 4, 6) - TEST_TXTSEL_SETEND(14, 4, 13) - TEST_TXTSEL_SETEND(-1, 0, 0) - - release_interfaces(&w, &reOle, &txtDoc, &txtSel); -} - -static void test_ITextRange_GetFont(void) -{ - HWND w; - IRichEditOle *reOle = NULL; - ITextDocument *txtDoc = NULL; - ITextRange *txtRge = NULL; - ITextFont *txtFont = NULL, *txtFont1 = NULL; - HRESULT hres; - int first, lim; - int refcount; - static const CHAR test_text1[] = "TestSomeText"; - LONG value; - - create_interfaces(&w, &reOle, &txtDoc, NULL); - SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - - first = 4, lim = 4; - ITextDocument_Range(txtDoc, first, lim, &txtRge); - refcount = get_refcount((IUnknown *)txtRge); - ok(refcount == 1, "got wrong ref count: %d\n", refcount); - - hres = ITextRange_GetFont(txtRge, &txtFont); - ok(hres == S_OK, "ITextRange_GetFont\n"); - refcount = get_refcount((IUnknown *)txtFont); - ok(refcount == 1, "got wrong ref count: %d\n", refcount); - refcount = get_refcount((IUnknown *)txtRge); - ok(refcount == 2, "got wrong ref count: %d\n", refcount); - - hres = ITextRange_GetFont(txtRge, &txtFont1); - ok(hres == S_OK, "ITextRange_GetFont\n"); - ok(txtFont1 != txtFont, "A new pointer should be return\n"); - refcount = get_refcount((IUnknown *)txtFont1); - ok(refcount == 1, "got wrong ref count: %d\n", refcount); - ITextFont_Release(txtFont1); - refcount = get_refcount((IUnknown *)txtRge); - ok(refcount == 2, "got wrong ref count: %d\n", refcount); - - ITextRange_Release(txtRge); - release_interfaces(&w, &reOle, &txtDoc, NULL); - - hres = ITextFont_GetOutline(txtFont, &value); - ok(hres == CO_E_RELEASED, "ITextFont after ITextDocument destroyed\n"); - - ITextFont_Release(txtFont); -} - -static void test_ITextSelection_GetFont(void) -{ - HWND w; - IRichEditOle *reOle = NULL; - ITextDocument *txtDoc = NULL; - ITextSelection *txtSel = NULL; - ITextFont *txtFont = NULL, *txtFont1 = NULL; - HRESULT hres; - int first, lim; - int refcount; - static const CHAR test_text1[] = "TestSomeText"; - LONG value; - - create_interfaces(&w, &reOle, &txtDoc, &txtSel); - SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - - first = 4, lim = 4; - SendMessageA(w, EM_SETSEL, first, lim); - refcount = get_refcount((IUnknown *)txtSel); - ok(refcount == 2, "got wrong ref count: %d\n", refcount); - - hres = ITextSelection_GetFont(txtSel, &txtFont); - ok(hres == S_OK, "ITextSelection_GetFont\n"); - refcount = get_refcount((IUnknown *)txtFont); - ok(refcount == 1, "got wrong ref count: %d\n", refcount); - refcount = get_refcount((IUnknown *)txtSel); - ok(refcount == 3, "got wrong ref count: %d\n", refcount); - - hres = ITextSelection_GetFont(txtSel, &txtFont1); - ok(hres == S_OK, "ITextSelection_GetFont\n"); - ok(txtFont1 != txtFont, "A new pointer should be return\n"); - refcount = get_refcount((IUnknown *)txtFont1); - ok(refcount == 1, "got wrong ref count: %d\n", refcount); - ITextFont_Release(txtFont1); - refcount = get_refcount((IUnknown *)txtSel); - ok(refcount == 3, "got wrong ref count: %d\n", refcount); - - release_interfaces(&w, &reOle, &txtDoc, &txtSel); - - hres = ITextFont_GetOutline(txtFont, &value); - ok(hres == CO_E_RELEASED, "ITextFont after ITextDocument destroyed\n"); - - ITextFont_Release(txtFont); -} - -static void test_ITextRange_GetPara(void) -{ - HWND w; - IRichEditOle *reOle = NULL; - ITextDocument *txtDoc = NULL; - ITextRange *txtRge = NULL; - ITextPara *txtPara = NULL, *txtPara1 = NULL; - HRESULT hres; - int first, lim; - int refcount; - static const CHAR test_text1[] = "TestSomeText"; - LONG value; - - create_interfaces(&w, &reOle, &txtDoc, NULL); - SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - - first = 4, lim = 4; - ITextDocument_Range(txtDoc, first, lim, &txtRge); - refcount = get_refcount((IUnknown *)txtRge); - ok(refcount == 1, "got wrong ref count: %d\n", refcount); - - hres = ITextRange_GetPara(txtRge, &txtPara); - ok(hres == S_OK, "ITextRange_GetPara\n"); - refcount = get_refcount((IUnknown *)txtPara); - ok(refcount == 1, "got wrong ref count: %d\n", refcount); - refcount = get_refcount((IUnknown *)txtRge); - ok(refcount == 2, "got wrong ref count: %d\n", refcount); - - hres = ITextRange_GetPara(txtRge, &txtPara1); - ok(hres == S_OK, "ITextRange_GetPara\n"); - ok(txtPara1 != txtPara, "A new pointer should be return\n"); - refcount = get_refcount((IUnknown *)txtPara1); - ok(refcount == 1, "got wrong ref count: %d\n", refcount); - ITextPara_Release(txtPara1); - refcount = get_refcount((IUnknown *)txtRge); - ok(refcount == 2, "got wrong ref count: %d\n", refcount); - - ITextRange_Release(txtRge); - release_interfaces(&w, &reOle, &txtDoc, NULL); - - hres = ITextPara_GetStyle(txtPara, &value); - ok(hres == CO_E_RELEASED, "ITextPara after ITextDocument destroyed\n"); - - ITextPara_Release(txtPara); -} - -static void test_ITextRange_GetText(void) -{ - HWND w; - IRichEditOle *reOle = NULL; - ITextDocument *txtDoc = NULL; - ITextRange *txtRge = NULL; - HRESULT hres; - BSTR bstr = NULL; - static const CHAR test_text1[] = "TestSomeText"; - static const WCHAR bufW1[] = {'T', 'e', 's', 't', 0}; - static const WCHAR bufW2[] = {'T', 'e', 'x', 't', '\r', 0}; - static const WCHAR bufW3[] = {'T', 'e', 'x', 't', 0}; - static const WCHAR bufW4[] = {'T', 'e', 's', 't', 'S', 'o', 'm', - 'e', 'T', 'e', 'x', 't', '\r', 0}; - static const WCHAR bufW5[] = {'\r', 0}; - - -#define TEST_TXTRGE_GETTEXT(first, lim, expected_string) \ - create_interfaces(&w, &reOle, &txtDoc, NULL); \ - SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); \ - ITextDocument_Range(txtDoc, first, lim, &txtRge); \ - hres = ITextRange_GetText(txtRge, &bstr); \ - ok(hres == S_OK, "ITextRange_GetText\n"); \ - ok(!lstrcmpW(bstr, expected_string), "got wrong text: %s\n", wine_dbgstr_w(bstr)); \ - SysFreeString(bstr); \ - ITextRange_Release(txtRge); \ - release_interfaces(&w, &reOle, &txtDoc, NULL); - - TEST_TXTRGE_GETTEXT(0, 4, bufW1) - TEST_TXTRGE_GETTEXT(4, 0, bufW1) - TEST_TXTRGE_GETTEXT(8, 12, bufW3) - TEST_TXTRGE_GETTEXT(8, 13, bufW2) - TEST_TXTRGE_GETTEXT(12, 13, bufW5) - TEST_TXTRGE_GETTEXT(0, 13, bufW4) - TEST_TXTRGE_GETTEXT(1, 1, NULL) -} - -static void test_ITextRange_SetRange(void) -{ - HWND w; - IRichEditOle *reOle = NULL; - ITextDocument *txtDoc = NULL; - ITextRange *txtRge = NULL; - HRESULT hres; - int start, end; - static const CHAR test_text1[] = "TestSomeText"; - - create_interfaces(&w, &reOle, &txtDoc, NULL); - SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - ITextDocument_Range(txtDoc, 0, 0, &txtRge); - -#define TEST_TXTRGE_SETRANGE(first, lim, expected_start, expected_end, expected_return) \ - hres = ITextRange_SetRange(txtRge, first, lim); \ - ok(hres == expected_return, "ITextRange_SetRange\n"); \ - ITextRange_GetStart(txtRge, &start); \ - ITextRange_GetEnd(txtRge, &end); \ - ok(start == expected_start, "got wrong start value: %d\n", start); \ - ok(end == expected_end, "got wrong end value: %d\n", end); - - TEST_TXTRGE_SETRANGE(2, 4, 2, 4, S_OK) - TEST_TXTRGE_SETRANGE(2, 4, 2, 4, S_FALSE) - TEST_TXTRGE_SETRANGE(4, 2, 2, 4, S_FALSE) - TEST_TXTRGE_SETRANGE(14, 14, 12, 12, S_OK) - TEST_TXTRGE_SETRANGE(15, 15, 12, 12, S_FALSE) - TEST_TXTRGE_SETRANGE(14, 1, 1, 13, S_OK) - TEST_TXTRGE_SETRANGE(-1, 4, 0, 4, S_OK) - - ITextRange_Release(txtRge); - release_interfaces(&w, &reOle, &txtDoc, NULL); -} - -static void test_ITextRange_IsEqual2(void) -{ - HWND w; - IRichEditOle *reOle = NULL; - ITextDocument *txtDoc = NULL; - ITextRange *txtRge1 = NULL, *txtRge2 = NULL; - HRESULT hres; - static const CHAR test_text1[] = "TestSomeText"; - LONG res; - - create_interfaces(&w, &reOle, &txtDoc, NULL); - SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - ITextDocument_Range(txtDoc, 2, 4, &txtRge1); - ITextDocument_Range(txtDoc, 2, 4, &txtRge2); - -#define TEST_TXTRGE_ISEQUAL(expected_hres, expected_res) \ - hres = ITextRange_IsEqual(txtRge1, txtRge2, &res); \ - ok(hres == expected_hres, "ITextRange_IsEqual\n"); \ - ok(res == expected_res, "got wrong return value: %d\n", res); - - TEST_TXTRGE_ISEQUAL(S_OK, tomTrue) - ITextRange_SetRange(txtRge2, 1, 2); - TEST_TXTRGE_ISEQUAL(S_FALSE, tomFalse) - - ITextRange_SetRange(txtRge1, 1, 1); - ITextRange_SetRange(txtRge2, 2, 2); - TEST_TXTRGE_ISEQUAL(S_FALSE, tomFalse) - - ITextRange_SetRange(txtRge2, 1, 1); - TEST_TXTRGE_ISEQUAL(S_OK, tomTrue) - - hres = ITextRange_IsEqual(txtRge1, txtRge1, &res); - ok(hres == S_OK, "ITextRange_IsEqual\n"); - ok(res == tomTrue, "got wrong return value: %d\n", res); - - hres = ITextRange_IsEqual(txtRge1, txtRge2, NULL); - ok(hres == S_OK, "ITextRange_IsEqual\n"); - - hres = ITextRange_IsEqual(txtRge1, NULL, NULL); - ok(hres == S_FALSE, "ITextRange_IsEqual\n"); - - ITextRange_Release(txtRge1); - ITextRange_Release(txtRge2); - release_interfaces(&w, &reOle, &txtDoc, NULL); -} - -static void test_ITextRange_GetStoryLength(void) -{ - HWND w; - IRichEditOle *reOle = NULL; - ITextDocument *txtDoc = NULL; - ITextRange *txtRge = NULL; - HRESULT hres; - LONG count; - static const CHAR test_text1[] = "TestSomeText"; - int len = strlen(test_text1) + 1; - - create_interfaces(&w, &reOle, &txtDoc, NULL); - SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - ITextDocument_Range(txtDoc, 0, 0, &txtRge); - - hres = ITextRange_GetStoryLength(txtRge, &count); - ok(hres == S_OK, "ITextRange_GetStoryLength\n"); - ok(count == len, "got wrong length: %d\n", count); - - ITextRange_SetRange(txtRge, 1, 2); - hres = ITextRange_GetStoryLength(txtRge, &count); - ok(hres == S_OK, "ITextRange_GetStoryLength\n"); - ok(count == len, "got wrong length: %d\n", count); - - hres = ITextRange_GetStoryLength(txtRge, NULL); - ok(hres == E_INVALIDARG, "ITextRange_GetStoryLength\n"); - - ITextRange_Release(txtRge); - release_interfaces(&w, &reOle, &txtDoc, NULL); -} - -static void test_ITextSelection_GetStoryLength(void) -{ - HWND w; - IRichEditOle *reOle = NULL; - ITextDocument *txtDoc = NULL; - ITextSelection *txtSel = NULL; - HRESULT hres; - LONG count; - static const CHAR test_text1[] = "TestSomeText"; - int len = strlen(test_text1) + 1; - - create_interfaces(&w, &reOle, &txtDoc, &txtSel); - SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - - hres = ITextSelection_GetStoryLength(txtSel, &count); - ok(hres == S_OK, "ITextSelection_GetStoryLength\n"); - ok(count == len, "got wrong length: %d\n", count); - - SendMessageA(w, EM_SETSEL, 1, 2); - hres = ITextSelection_GetStoryLength(txtSel, &count); - ok(hres == S_OK, "ITextSelection_GetStoryLength\n"); - ok(count == len, "got wrong length: %d\n", count); - - hres = ITextSelection_GetStoryLength(txtSel, NULL); - ok(hres == E_INVALIDARG, "ITextSelection_GetStoryLength\n"); - - release_interfaces(&w, &reOle, &txtDoc, &txtSel); -} - START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -3853,25 +3408,13 @@ START_TEST(richole) test_GetText(); test_ITextSelection_GetChar(); test_ITextSelection_GetStart_GetEnd(); - test_ITextSelection_SetStart(); - test_ITextSelection_SetEnd(); test_ITextSelection_Collapse(); - test_ITextSelection_GetFont(); - test_ITextSelection_GetStoryLength(); test_ITextDocument_Range(); test_ITextRange_GetChar(); test_ITextRange_ScrollIntoView(); test_ITextRange_GetStart_GetEnd(); test_ITextRange_GetDuplicate(); - test_ITextRange_SetStart(); - test_ITextRange_SetEnd(); test_ITextRange_Collapse(); - test_ITextRange_GetFont(); - test_ITextRange_GetPara(); - test_ITextRange_GetText(); - test_ITextRange_SetRange(); - test_ITextRange_IsEqual2(); - test_ITextRange_GetStoryLength(); test_GetClientSite(); test_IOleWindow_GetWindow(); test_IOleInPlaceSite_GetWindow();

6 years, 11 months

01/01: [RICHED20] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2bf764722bd13783e9c85… commit 2bf764722bd13783e9c85ad572e62c75329badc8 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 20 13:09:57 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 20 13:09:57 2018 +0100 [RICHED20] Sync with Wine 3.0. CORE-14225 --- dll/win32/riched20/caret.c | 4 + dll/win32/riched20/editor.c | 80 ++++----- dll/win32/riched20/editor.h | 2 +- dll/win32/riched20/ocr_reverse.cur | Bin 33134 -> 33134 bytes dll/win32/riched20/paint.c | 2 +- dll/win32/riched20/richole.c | 330 +++++-------------------------------- dll/win32/riched20/run.c | 9 +- dll/win32/riched20/table.c | 2 +- media/doc/README.WINE | 2 +- 9 files changed, 86 insertions(+), 345 deletions(-) diff --git a/dll/win32/riched20/caret.c b/dll/win32/riched20/caret.c index 26af743518..8a99394dcb 100644 --- a/dll/win32/riched20/caret.c +++ b/dll/win32/riched20/caret.c @@ -551,6 +551,10 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_DisplayItem *tp, *end_run, *run, *prev; int eol_len = 0; + /* Check if new line is allowed for this control */ + if (!(editor->styleFlags & ES_MULTILINE)) + break; + /* Find number of CR and LF in end of paragraph run */ if (*pos =='\r') { diff --git a/dll/win32/riched20/editor.c b/dll/win32/riched20/editor.c index 645d06cedc..20ffb0cdc1 100644 --- a/dll/win32/riched20/editor.c +++ b/dll/win32/riched20/editor.c @@ -176,7 +176,7 @@ + ES_DISABLENOSCROLL (scrollbar is always visible) - ES_EX_NOCALLOLEINIT + ES_LEFT - - ES_MULTILINE (currently single line controls aren't supported) + + ES_MULTILINE - ES_NOIME - ES_READONLY (I'm not sure if beeping is the proper behaviour) + ES_RIGHT @@ -2291,6 +2291,14 @@ static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BO struct paste_format *format; IDataObject *data; + /* Protect read-only edit control from modification */ + if (editor->styleFlags & ES_READONLY) + { + if (!check_only) + MessageBeep(MB_ICONERROR); + return FALSE; + } + init_paste_formats(); if (ps && ps->dwAspect != DVASPECT_CONTENT) @@ -2348,6 +2356,30 @@ static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) return SUCCEEDED(hr); } +static BOOL copy_or_cut(ME_TextEditor *editor, BOOL cut) +{ + BOOL result; + int offs, num_chars; + int start_cursor = ME_GetSelectionOfs(editor, &offs, &num_chars); + ME_Cursor *sel_start = &editor->pCursors[start_cursor]; + + if (cut && (editor->styleFlags & ES_READONLY)) + { + MessageBeep(MB_ICONERROR); + return FALSE; + } + + num_chars -= offs; + result = ME_Copy(editor, sel_start, num_chars); + if (result && cut) + { + ME_InternalDeleteText(editor, sel_start, num_chars, FALSE); + ME_CommitUndo(editor); + ME_UpdateRepaint(editor, TRUE); + } + return result; +} + /* helper to send a msg filter notification */ static BOOL ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) @@ -2642,22 +2674,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) case 'C': case 'X': if (ctrl_is_down) - { - BOOL result; - int nOfs, nChars; - int nStartCur = ME_GetSelectionOfs(editor, &nOfs, &nChars); - ME_Cursor *selStart = &editor->pCursors[nStartCur]; - - nChars -= nOfs; - result = ME_Copy(editor, selStart, nChars); - if (result && nKey == 'X') - { - ME_InternalDeleteText(editor, selStart, nChars, FALSE); - ME_CommitUndo(editor); - ME_UpdateRepaint(editor, TRUE); - } - return result; - } + return copy_or_cut(editor, nKey == 'X'); break; case 'Z': if (ctrl_is_down) @@ -3401,21 +3418,7 @@ static void ME_SetText(ME_TextEditor *editor, void *text, BOOL unicode) int textLen; LPWSTR wszText = ME_ToUnicode(codepage, text, &textLen); - - if (textLen > 0) - { - int len = -1; - - /* uses default style! */ - if (!(editor->styleFlags & ES_MULTILINE)) - { - WCHAR *p = wszText; - - while (*p != '\0' && *p != '\r' && *p != '\n') p++; - len = p - wszText; - } - ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); - } + ME_InsertTextFromCursor(editor, 0, wszText, textLen, editor->pBuffer->pDefaultStyle); ME_EndToUnicode(codepage, wszText); } @@ -4065,19 +4068,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_CUT: case WM_COPY: - { - int nFrom, nTo, nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo); - int nChars = nTo - nFrom; - ME_Cursor *selStart = &editor->pCursors[nStartCur]; - - if (ME_Copy(editor, selStart, nChars) && msg == WM_CUT) - { - ME_InternalDeleteText(editor, selStart, nChars, FALSE); - ME_CommitUndo(editor); - ME_UpdateRepaint(editor, TRUE); - } + copy_or_cut(editor, msg == WM_CUT); return 0; - } case WM_GETTEXTLENGTH: { GETTEXTLENGTHEX how; diff --git a/dll/win32/riched20/editor.h b/dll/win32/riched20/editor.h index 9599a3eef6..8da0ed94d7 100644 --- a/dll/win32/riched20/editor.h +++ b/dll/win32/riched20/editor.h @@ -283,7 +283,7 @@ int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, ME_Paragraph *para, BOOL selected) DECLSPEC_HIDDEN; +void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, BOOL selected) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) DECLSPEC_HIDDEN; void ME_DeleteReObject(REOBJECT* reo) DECLSPEC_HIDDEN; diff --git a/dll/win32/riched20/ocr_reverse.cur b/dll/win32/riched20/ocr_reverse.cur index f6b5ca20f5..6392093f62 100644 Binary files a/dll/win32/riched20/ocr_reverse.cur and b/dll/win32/riched20/ocr_reverse.cur differ diff --git a/dll/win32/riched20/paint.c b/dll/win32/riched20/paint.c index 41b38969c0..b4b6697165 100644 --- a/dll/win32/riched20/paint.c +++ b/dll/win32/riched20/paint.c @@ -481,7 +481,7 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa } if (run->nFlags & MERF_GRAPHICS) - ME_DrawOLE(c, x, y, run, para, (runofs >= nSelFrom) && (runofs < nSelTo)); + ME_DrawOLE(c, x, y, run, (runofs >= nSelFrom) && (runofs < nSelTo)); else { ME_DrawTextWithStyle(c, run, x, y, nSelFrom - runofs, nSelTo - runofs, diff --git a/dll/win32/riched20/richole.c b/dll/win32/riched20/richole.c index 2507b77344..b04b6b10a3 100644 --- a/dll/win32/riched20/richole.c +++ b/dll/win32/riched20/richole.c @@ -936,14 +936,6 @@ static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, R IUnknown_AddRef((IUnknown *)*ppvObj); return S_OK; } - - if (IsEqualGUID(riid, &IID_ITextServices)) - { - static int once; - if (!once++) FIXME("%p: unhandled interface IID_ITextServices\n", This); - return E_NOINTERFACE; - } - FIXME("%p: unhandled interface %s\n", This, debugstr_guid(riid)); return E_NOINTERFACE; @@ -1979,23 +1971,6 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG unit, LONG inde return E_NOTIMPL; } -static void cp2range(ME_TextEditor *editor, LONG *cp1, LONG *cp2) -{ - int len = ME_GetTextLength(editor) + 1; - *cp1 = max(*cp1, 0); - *cp2 = max(*cp2, 0); - *cp1 = min(*cp1, len); - *cp2 = min(*cp2, len); - if (*cp1 > *cp2) - { - int tmp = *cp1; - *cp1 = *cp2; - *cp2 = tmp; - } - if (*cp1 == len) - *cp1 = *cp2 = len - 1; -} - static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG anchor, LONG active) { ITextRangeImpl *This = impl_from_ITextRange(me); @@ -2005,13 +1980,7 @@ static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG anchor, LONG ac if (!This->child.reole) return CO_E_RELEASED; - cp2range(This->child.reole->editor, &anchor, &active); - if (anchor == This->start && active == This->end) - return S_FALSE; - - This->start = anchor; - This->end = active; - return S_OK; + return E_NOTIMPL; } static HRESULT textrange_inrange(LONG start, LONG end, ITextRange *range, LONG *ret) @@ -2624,10 +2593,6 @@ static HRESULT WINAPI TextFont_SetDuplicate(ITextFont *iface, ITextFont *pFont) { ITextFontImpl *This = impl_from_ITextFont(iface); FIXME("(%p)->(%p): stub\n", This, pFont); - - if (This->range && !get_range_reole(This->range)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -2635,10 +2600,6 @@ static HRESULT WINAPI TextFont_CanChange(ITextFont *iface, LONG *ret) { ITextFontImpl *This = impl_from_ITextFont(iface); FIXME("(%p)->(%p): stub\n", This, ret); - - if (This->range && !get_range_reole(This->range)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -2646,10 +2607,6 @@ static HRESULT WINAPI TextFont_IsEqual(ITextFont *iface, ITextFont *font, LONG * { ITextFontImpl *This = impl_from_ITextFont(iface); FIXME("(%p)->(%p %p): stub\n", This, font, ret); - - if (This->range && !get_range_reole(This->range)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -2823,10 +2780,6 @@ static HRESULT WINAPI TextFont_GetStyle(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); FIXME("(%p)->(%p): stub\n", This, value); - - if (This->range && !get_range_reole(This->range)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -2834,10 +2787,6 @@ static HRESULT WINAPI TextFont_SetStyle(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); FIXME("(%p)->(%d): stub\n", This, value); - - if (This->range && !get_range_reole(This->range)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3344,16 +3293,6 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface) return ref; } -static IRichEditOleImpl *para_get_reole(ITextParaImpl *This) -{ - if (This->range) - { - ITextRangeImpl *rng = impl_from_ITextRange(This->range); - return rng->child.reole; - } - return NULL; -} - static HRESULT WINAPI TextPara_GetTypeInfoCount(ITextPara *iface, UINT *pctinfo) { ITextParaImpl *This = impl_from_ITextPara(iface); @@ -3421,10 +3360,6 @@ static HRESULT WINAPI TextPara_GetDuplicate(ITextPara *iface, ITextPara **ret) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, ret); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3432,10 +3367,6 @@ static HRESULT WINAPI TextPara_SetDuplicate(ITextPara *iface, ITextPara *para) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, para); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3443,10 +3374,6 @@ static HRESULT WINAPI TextPara_CanChange(ITextPara *iface, LONG *ret) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, ret); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3454,10 +3381,6 @@ static HRESULT WINAPI TextPara_IsEqual(ITextPara *iface, ITextPara *para, LONG * { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p %p)\n", This, para, ret); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3465,10 +3388,6 @@ static HRESULT WINAPI TextPara_Reset(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3476,10 +3395,6 @@ static HRESULT WINAPI TextPara_GetStyle(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3487,23 +3402,13 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); - static int once; - - if (!once++) FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - + FIXME("(%p)->(%p)\n", This, value); return E_NOTIMPL; } @@ -3511,10 +3416,6 @@ static HRESULT WINAPI TextPara_SetAlignment(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3522,10 +3423,6 @@ static HRESULT WINAPI TextPara_GetHyphenation(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3533,10 +3430,6 @@ static HRESULT WINAPI TextPara_SetHyphenation(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3544,10 +3437,6 @@ static HRESULT WINAPI TextPara_GetFirstLineIndent(ITextPara *iface, FLOAT *value { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3555,10 +3444,6 @@ static HRESULT WINAPI TextPara_GetKeepTogether(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3566,10 +3451,6 @@ static HRESULT WINAPI TextPara_SetKeepTogether(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3577,10 +3458,6 @@ static HRESULT WINAPI TextPara_GetKeepWithNext(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3588,10 +3465,6 @@ static HRESULT WINAPI TextPara_SetKeepWithNext(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3599,10 +3472,6 @@ static HRESULT WINAPI TextPara_GetLeftIndent(ITextPara *iface, FLOAT *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3610,10 +3479,6 @@ static HRESULT WINAPI TextPara_GetLineSpacing(ITextPara *iface, FLOAT *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3621,10 +3486,6 @@ static HRESULT WINAPI TextPara_GetLineSpacingRule(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3632,10 +3493,6 @@ static HRESULT WINAPI TextPara_GetListAlignment(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3643,10 +3500,6 @@ static HRESULT WINAPI TextPara_SetListAlignment(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3654,10 +3507,6 @@ static HRESULT WINAPI TextPara_GetListLevelIndex(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3665,10 +3514,6 @@ static HRESULT WINAPI TextPara_SetListLevelIndex(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3676,10 +3521,6 @@ static HRESULT WINAPI TextPara_GetListStart(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3687,10 +3528,6 @@ static HRESULT WINAPI TextPara_SetListStart(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3698,10 +3535,6 @@ static HRESULT WINAPI TextPara_GetListTab(ITextPara *iface, FLOAT *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3709,10 +3542,6 @@ static HRESULT WINAPI TextPara_SetListTab(ITextPara *iface, FLOAT value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3720,10 +3549,6 @@ static HRESULT WINAPI TextPara_GetListType(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3731,10 +3556,6 @@ static HRESULT WINAPI TextPara_SetListType(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3742,10 +3563,6 @@ static HRESULT WINAPI TextPara_GetNoLineNumber(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3753,10 +3570,6 @@ static HRESULT WINAPI TextPara_SetNoLineNumber(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3764,10 +3577,6 @@ static HRESULT WINAPI TextPara_GetPageBreakBefore(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3775,10 +3584,6 @@ static HRESULT WINAPI TextPara_SetPageBreakBefore(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3786,10 +3591,6 @@ static HRESULT WINAPI TextPara_GetRightIndent(ITextPara *iface, FLOAT *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3797,10 +3598,6 @@ static HRESULT WINAPI TextPara_SetRightIndent(ITextPara *iface, FLOAT value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3808,10 +3605,6 @@ static HRESULT WINAPI TextPara_SetIndents(ITextPara *iface, FLOAT StartIndent, F { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f %.2f %.2f)\n", This, StartIndent, LeftIndent, RightIndent); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3819,10 +3612,6 @@ static HRESULT WINAPI TextPara_SetLineSpacing(ITextPara *iface, LONG LineSpacing { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d %.2f)\n", This, LineSpacingRule, LineSpacing); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3830,10 +3619,6 @@ static HRESULT WINAPI TextPara_GetSpaceAfter(ITextPara *iface, FLOAT *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3841,10 +3626,6 @@ static HRESULT WINAPI TextPara_SetSpaceAfter(ITextPara *iface, FLOAT value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3852,10 +3633,6 @@ static HRESULT WINAPI TextPara_GetSpaceBefore(ITextPara *iface, FLOAT *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3863,10 +3640,6 @@ static HRESULT WINAPI TextPara_SetSpaceBefore(ITextPara *iface, FLOAT value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3874,10 +3647,6 @@ static HRESULT WINAPI TextPara_GetWidowControl(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3885,10 +3654,6 @@ static HRESULT WINAPI TextPara_SetWidowControl(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3896,10 +3661,6 @@ static HRESULT WINAPI TextPara_GetTabCount(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3907,10 +3668,6 @@ static HRESULT WINAPI TextPara_AddTab(ITextPara *iface, FLOAT tbPos, LONG tbAlig { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f %d %d)\n", This, tbPos, tbAlign, tbLeader); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3918,10 +3675,6 @@ static HRESULT WINAPI TextPara_ClearAllTabs(ITextPara *iface) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)\n", This); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3929,10 +3682,6 @@ static HRESULT WINAPI TextPara_DeleteTab(ITextPara *iface, FLOAT pos) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f)\n", This, pos); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -3940,10 +3689,6 @@ static HRESULT WINAPI TextPara_GetTab(ITextPara *iface, LONG iTab, FLOAT *ptbPos { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d %p %p %p)\n", This, iTab, ptbPos, ptbAlign, ptbLeader); - - if (!para_get_reole(This)) - return CO_E_RELEASED; - return E_NOTIMPL; } @@ -4282,12 +4027,26 @@ ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2, ITextRange** ppRange) { IRichEditOleImpl *This = impl_from_ITextDocument(me); + const int len = ME_GetTextLength(This->editor) + 1; TRACE("%p %p %d %d\n", This, ppRange, cp1, cp2); if (!ppRange) return E_INVALIDARG; - cp2range(This->editor, &cp1, &cp2); + cp1 = max(cp1, 0); + cp2 = max(cp2, 0); + cp1 = min(cp1, len); + cp2 = min(cp2, len); + if (cp1 > cp2) + { + LONG tmp; + tmp = cp1; + cp1 = cp2; + cp2 = tmp; + } + if (cp1 == len) + cp1 = cp2 = len - 1; + return CreateITextRange(This, cp1, cp2, ppRange); } @@ -5484,6 +5243,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) return; } } + IDataObject_Release(ido); switch (stgm.tymed) { @@ -5491,19 +5251,17 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) GetObjectW(stgm.u.hBitmap, sizeof(dibsect), &dibsect); pSize->cx = dibsect.dsBm.bmWidth; pSize->cy = dibsect.dsBm.bmHeight; - if (!stgm.pUnkForRelease) DeleteObject(stgm.u.hBitmap); break; case TYMED_ENHMF: GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); pSize->cx = emh.rclBounds.right - emh.rclBounds.left; pSize->cy = emh.rclBounds.bottom - emh.rclBounds.top; - if (!stgm.pUnkForRelease) DeleteEnhMetaFile(stgm.u.hEnhMetaFile); break; default: FIXME("Unsupported tymed %d\n", stgm.tymed); break; } - IDataObject_Release(ido); + ReleaseStgMedium(&stgm); if (c->editor->nZoomNumerator != 0) { pSize->cx = MulDiv(pSize->cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); @@ -5511,8 +5269,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) } } -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, - ME_Paragraph *para, BOOL selected) +void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) { IDataObject* ido; FORMATETC fmt; @@ -5522,6 +5279,8 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, HDC hMemDC; SIZE sz; BOOL has_size; + HBITMAP old_bm; + RECT rc; assert(run->nFlags & MERF_GRAPHICS); assert(run->ole_obj); @@ -5547,36 +5306,31 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, return; } } + IDataObject_Release(ido); + switch (stgm.tymed) { case TYMED_GDI: GetObjectW(stgm.u.hBitmap, sizeof(dibsect), &dibsect); hMemDC = CreateCompatibleDC(c->hDC); - SelectObject(hMemDC, stgm.u.hBitmap); + old_bm = SelectObject(hMemDC, stgm.u.hBitmap); if (has_size) { convert_sizel(c, &run->ole_obj->sizel, &sz); } else { - sz.cx = MulDiv(dibsect.dsBm.bmWidth, c->dpi.cx, 96); - sz.cy = MulDiv(dibsect.dsBm.bmHeight, c->dpi.cy, 96); + sz.cx = dibsect.dsBm.bmWidth; + sz.cy = dibsect.dsBm.bmHeight; } if (c->editor->nZoomNumerator != 0) { sz.cx = MulDiv(sz.cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); } - if (sz.cx == dibsect.dsBm.bmWidth && sz.cy == dibsect.dsBm.bmHeight) - { - BitBlt(c->hDC, x, y - sz.cy, - dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, - hMemDC, 0, 0, SRCCOPY); - } else { - StretchBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, - hMemDC, 0, 0, dibsect.dsBm.bmWidth, - dibsect.dsBm.bmHeight, SRCCOPY); - } + StretchBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, + hMemDC, 0, 0, dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, SRCCOPY); + + SelectObject(hMemDC, old_bm); DeleteDC(hMemDC); - if (!stgm.pUnkForRelease) DeleteObject(stgm.u.hBitmap); break; case TYMED_ENHMF: GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); @@ -5584,8 +5338,8 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, { convert_sizel(c, &run->ole_obj->sizel, &sz); } else { - sz.cy = MulDiv(emh.rclBounds.bottom - emh.rclBounds.top, c->dpi.cx, 96); - sz.cx = MulDiv(emh.rclBounds.right - emh.rclBounds.left, c->dpi.cy, 96); + sz.cx = emh.rclBounds.right - emh.rclBounds.left; + sz.cy = emh.rclBounds.bottom - emh.rclBounds.top; } if (c->editor->nZoomNumerator != 0) { @@ -5593,25 +5347,21 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); } - { - RECT rc; - - rc.left = x; - rc.top = y - sz.cy; - rc.right = x + sz.cx; - rc.bottom = y; - PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); - } - if (!stgm.pUnkForRelease) DeleteEnhMetaFile(stgm.u.hEnhMetaFile); + rc.left = x; + rc.top = y - sz.cy; + rc.right = x + sz.cx; + rc.bottom = y; + PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); break; default: FIXME("Unsupported tymed %d\n", stgm.tymed); selected = FALSE; break; } + ReleaseStgMedium(&stgm); + if (selected && !c->editor->bHideSelection) PatBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, DSTINVERT); - IDataObject_Release(ido); } void ME_DeleteReObject(REOBJECT* reo) diff --git a/dll/win32/riched20/run.c b/dll/win32/riched20/run.c index 445bbc2f91..098c4f8b4d 100644 --- a/dll/win32/riched20/run.c +++ b/dll/win32/riched20/run.c @@ -185,10 +185,9 @@ void ME_RunOfsFromCharOfs(ME_TextEditor *editor, int *pOfs) { ME_DisplayItem *item, *next_item; - int endOfs = nCharOfs, len = ME_GetTextLength(editor); nCharOfs = max(nCharOfs, 0); - nCharOfs = min(nCharOfs, len); + nCharOfs = min(nCharOfs, ME_GetTextLength(editor)); /* Find the paragraph at the offset. */ next_item = editor->pBuffer->pFirst->member.para.next_para; @@ -211,11 +210,7 @@ void ME_RunOfsFromCharOfs(ME_TextEditor *editor, nCharOfs -= item->member.run.nCharOfs; if (ppRun) *ppRun = item; - if (pOfs) { - if (((*ppRun)->member.run.nFlags & MERF_ENDPARA) && endOfs > len) - *pOfs = (*ppRun)->member.run.len; - else *pOfs = nCharOfs; - } + if (pOfs) *pOfs = nCharOfs; } /****************************************************************************** diff --git a/dll/win32/riched20/table.c b/dll/win32/riched20/table.c index b834bc7bc3..d2cab9a817 100644 --- a/dll/win32/riched20/table.c +++ b/dll/win32/riched20/table.c @@ -400,7 +400,7 @@ void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nC } } if (*nChars < 0) - nChars = 0; + *nChars = 0; } } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index a30fea9f86..4b6fadfe70 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -158,7 +158,7 @@ reactos/dll/win32/qmgrprxy # Synced to WineStaging-2.9 reactos/dll/win32/query # Synced to WineStaging-2.9 reactos/dll/win32/rasapi32 # Synced to WineStaging-2.9 reactos/dll/win32/resutils # Synced to WineStaging-2.9 -reactos/dll/win32/riched20 # Synced to WineStaging-2.16 +reactos/dll/win32/riched20 # Synced to Wine-3.0 reactos/dll/win32/riched32 # Synced to WineStaging-2.9 reactos/dll/win32/rpcrt4 # Synced to WineStaging-2.16 reactos/dll/win32/rsabase # Synced to WineStaging-2.9

6 years, 11 months

01/01: [PROPSYS_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f41035d141dc2be927552… commit f41035d141dc2be92755200b320cb41528da35fd Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 20 13:06:43 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 20 13:06:43 2018 +0100 [PROPSYS_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/propsys/propsys.c | 212 +++++++++++++++++++++++++++ 1 file changed, 212 insertions(+) diff --git a/modules/rostests/winetests/propsys/propsys.c b/modules/rostests/winetests/propsys/propsys.c index 753953787c..f226c164eb 100644 --- a/modules/rostests/winetests/propsys/propsys.c +++ b/modules/rostests/winetests/propsys/propsys.c @@ -890,6 +890,217 @@ static void test_intconversions(void) ok(llval == -7, "got wrong value %s\n", wine_dbgstr_longlong(llval)); } +static void test_PropVariantToBoolean(void) +{ + static WCHAR str_0[] = {'0',0}; + static WCHAR str_1[] = {'1',0}; + static WCHAR str_7[] = {'7',0}; + static WCHAR str_n7[] = {'-','7',0}; + static WCHAR str_true[] = {'t','r','u','e',0}; + static WCHAR str_true2[] = {'#','T','R','U','E','#',0}; + static WCHAR str_true_case[] = {'t','R','U','e',0}; + static WCHAR str_false[] = {'f','a','l','s','e',0}; + static WCHAR str_false2[] = {'#','F','A','L','S','E','#',0}; + static WCHAR str_true_space[] = {'t','r','u','e',' ',0}; + static WCHAR str_yes[] = {'y','e','s',0}; + PROPVARIANT propvar; + HRESULT hr; + BOOL val; + + /* VT_BOOL */ + propvar.vt = VT_BOOL; + propvar.u.boolVal = VARIANT_FALSE; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + propvar.vt = VT_BOOL; + propvar.u.boolVal = 1; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + propvar.vt = VT_BOOL; + propvar.u.boolVal = VARIANT_TRUE; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + /* VT_EMPTY */ + propvar.vt = VT_EMPTY; + propvar.u.boolVal = VARIANT_TRUE; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + /* test integer conversion */ + propvar.vt = VT_I4; + propvar.u.lVal = 0; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + propvar.vt = VT_I4; + propvar.u.lVal = 1; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + propvar.vt = VT_I4; + propvar.u.lVal = 67; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + propvar.vt = VT_I4; + propvar.u.lVal = -67; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + /* test string conversion */ + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = str_0; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = str_1; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = str_7; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = str_n7; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = str_true; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = str_true_case; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = str_true2; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = str_false; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = str_false2; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = str_true_space; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == DISP_E_TYPEMISMATCH, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = str_yes; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == DISP_E_TYPEMISMATCH, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = NULL; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == DISP_E_TYPEMISMATCH, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + /* VT_LPSTR */ + propvar.vt = VT_LPSTR; + propvar.u.pszVal = (char *)"#TruE#"; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == DISP_E_TYPEMISMATCH, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = (char *)"#TRUE#"; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = (char *)"tRUe"; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = (char *)"#FALSE#"; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = (char *)"fALSe"; + val = TRUE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == FALSE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = (char *)"1"; + val = FALSE; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = (char *)"-1"; + hr = PropVariantToBoolean(&propvar, &val); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(val == TRUE, "Unexpected value %d\n", val); +} + static void test_PropVariantChangeType_LPWSTR(void) { PROPVARIANT dest, src; @@ -938,4 +1149,5 @@ START_TEST(propsys) test_PropVariantCompare(); test_intconversions(); test_PropVariantChangeType_LPWSTR(); + test_PropVariantToBoolean(); }

6 years, 11 months

01/01: [PSDK] Update propvarutil.h. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dd1f8b08975dc0989ed6… commit 2dd1f8b08975dc0989ed6e189d71c919160b1e51 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 20 13:04:48 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 20 13:04:48 2018 +0100 [PSDK] Update propvarutil.h. CORE-14225 --- sdk/include/psdk/propvarutil.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/psdk/propvarutil.h b/sdk/include/psdk/propvarutil.h index d0aecdb872..4dc3521a02 100644 --- a/sdk/include/psdk/propvarutil.h +++ b/sdk/include/psdk/propvarutil.h @@ -76,6 +76,7 @@ HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret); HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); +HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret);

6 years, 11 months

01/01: [PROPSYS] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95c3773f7320163ed674c… commit 95c3773f7320163ed674c88e24126eb1d49cf123 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Jan 20 13:02:49 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Jan 20 13:02:49 2018 +0100 [PROPSYS] Sync with Wine 3.0. CORE-14225 --- dll/win32/propsys/propsys.spec | 2 +- dll/win32/propsys/propvar.c | 60 ++++++++++++++++++++++++++++++++++++++++++ media/doc/README.WINE | 2 +- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dll/win32/propsys/propsys.spec b/dll/win32/propsys/propsys.spec index 1dee58c97e..2ee71ba370 100644 --- a/dll/win32/propsys/propsys.spec +++ b/dll/win32/propsys/propsys.spec @@ -108,7 +108,7 @@ @ stub PropVariantGetUInt32Elem @ stub PropVariantGetUInt64Elem @ stub PropVariantToBSTR -@ stub PropVariantToBoolean +@ stdcall PropVariantToBoolean(ptr ptr) @ stub PropVariantToBooleanVector @ stub PropVariantToBooleanVectorAlloc @ stub PropVariantToBooleanWithDefault diff --git a/dll/win32/propsys/propvar.c b/dll/win32/propsys/propvar.c index dab77f8c5a..4b9292eecb 100644 --- a/dll/win32/propsys/propvar.c +++ b/dll/win32/propsys/propvar.c @@ -212,6 +212,66 @@ HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret) return hr; } +HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) +{ + static const WCHAR trueW[] = {'t','r','u','e',0}; + static const WCHAR falseW[] = {'f','a','l','s','e',0}; + static const WCHAR true2W[] = {'#','T','R','U','E','#',0}; + static const WCHAR false2W[] = {'#','F','A','L','S','E','#',0}; + LONGLONG res; + HRESULT hr; + + TRACE("%p,%p\n", propvarIn, ret); + + *ret = FALSE; + + switch (propvarIn->vt) + { + case VT_BOOL: + *ret = propvarIn->u.boolVal == VARIANT_TRUE; + return S_OK; + + case VT_LPWSTR: + case VT_BSTR: + if (!propvarIn->u.pwszVal) + return DISP_E_TYPEMISMATCH; + + if (!lstrcmpiW(propvarIn->u.pwszVal, trueW) || !lstrcmpW(propvarIn->u.pwszVal, true2W)) + { + *ret = TRUE; + return S_OK; + } + + if (!lstrcmpiW(propvarIn->u.pwszVal, falseW) || !lstrcmpW(propvarIn->u.pwszVal, false2W)) + { + *ret = FALSE; + return S_OK; + } + break; + + case VT_LPSTR: + if (!propvarIn->u.pszVal) + return DISP_E_TYPEMISMATCH; + + if (!lstrcmpiA(propvarIn->u.pszVal, "true") || !lstrcmpA(propvarIn->u.pszVal, "#TRUE#")) + { + *ret = TRUE; + return S_OK; + } + + if (!lstrcmpiA(propvarIn->u.pszVal, "false") || !lstrcmpA(propvarIn->u.pszVal, "#FALSE#")) + { + *ret = FALSE; + return S_OK; + } + break; + } + + hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res); + *ret = !!res; + return hr; +} + HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) { WCHAR *res = NULL; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d7b5451b3c..a30fea9f86 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -151,7 +151,7 @@ reactos/dll/win32/pdh # Synced to WineStaging-2.9 reactos/dll/win32/pidgen # Synced to WineStaging-2.9 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to WineStaging-2.9 -reactos/dll/win32/propsys # Synced to WineStaging-2.16 +reactos/dll/win32/propsys # Synced to Wine-3.0 reactos/dll/win32/pstorec # Synced to WineStaging-2.2 reactos/dll/win32/qmgr # Synced to WineStaging-2.9 reactos/dll/win32/qmgrprxy # Synced to WineStaging-2.9

6 years, 11 months

← Newer
1
...
18
19
20
21
22
23
24
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2018