wine-devel August 2018

wine-devel@winehq.org

62 participants
701 discussions

[PATCH v2 1/2] comctl32/listview: Use bitmask to check if we can send notifications
by Fabian Maurer 25 Aug '18

25 Aug '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/listview.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 200bf93be5..fa0d18e5d6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -211,6 +211,8 @@ typedef struct tagDELAYED_ITEM_EDIT INT iItem; } DELAYED_ITEM_EDIT; +#define FLAG_NOTIFY_CHANGE (0x1) /* Whether we can send change notification messages */ + typedef struct tagLISTVIEW_INFO { /* control window */ @@ -225,7 +227,6 @@ typedef struct tagLISTVIEW_INFO /* notification window */ SHORT notifyFormat; HWND hwndNotify; - BOOL bDoChangeNotify; /* send change notification messages? */ UINT uCallbackMask; /* tooltips */ @@ -326,6 +327,7 @@ typedef struct tagLISTVIEW_INFO /* misc */ DWORD iVersion; /* CCM_[G,S]ETVERSION */ + DWORD notify_mask; } LISTVIEW_INFO; /* @@ -3507,13 +3509,13 @@ Parameters: */ static void LISTVIEW_ShiftFocus(LISTVIEW_INFO *infoPtr, INT focus, INT item, INT direction) { - BOOL old_change = infoPtr->bDoChangeNotify; + BOOL old_change = infoPtr->notify_mask & FLAG_NOTIFY_CHANGE; - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~FLAG_NOTIFY_CHANGE; focus = shift_item(infoPtr, focus, item, direction); if (focus != infoPtr->nFocusedItem) LISTVIEW_SetItemFocus(infoPtr, focus); - infoPtr->bDoChangeNotify = old_change; + infoPtr->notify_mask |= old_change; } /** @@ -3565,8 +3567,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) * only one LVN_ODSTATECHANGED notification. * See MSDN documentation for LVN_ITEMCHANGED. */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + bOldChange = infoPtr->notify_mask & FLAG_NOTIFY_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->notify_mask &= ~FLAG_NOTIFY_CHANGE; if (nFirst == -1) nFirst = nItem; @@ -3585,7 +3587,7 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf)) return FALSE; - infoPtr->bDoChangeNotify = bOldChange; + infoPtr->notify_mask |= bOldChange; return TRUE; } @@ -3656,8 +3658,8 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* disable per item notifications on LVS_OWNERDATA style FIXME: single LVN_ODSTATECHANGED should be used */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + bOldChange = infoPtr->notify_mask & FLAG_NOTIFY_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->notify_mask &= ~FLAG_NOTIFY_CHANGE; LISTVIEW_DeselectAllSkipItems(infoPtr, selection); @@ -3668,7 +3670,7 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* this will also destroy the selection */ iterator_destroy(&i); - infoPtr->bDoChangeNotify = bOldChange; + infoPtr->notify_mask |= bOldChange; LISTVIEW_SetItemFocus(infoPtr, nItem); } @@ -4257,7 +4259,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications are enabled. Even nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if(lpItem && !isNew && infoPtr->bDoChangeNotify) + if(lpItem && !isNew && (infoPtr->notify_mask & FLAG_NOTIFY_CHANGE)) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4350,7 +4352,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; - if (infoPtr->bDoChangeNotify) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); + if (infoPtr->notify_mask & FLAG_NOTIFY_CHANGE) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); return TRUE; } @@ -8986,10 +8988,10 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE /* focus all isn't allowed */ if (lvItem.state & lvItem.stateMask & LVIS_FOCUSED) return FALSE; - notify = infoPtr->bDoChangeNotify; + notify = infoPtr->notify_mask & FLAG_NOTIFY_CHANGE; if (infoPtr->dwStyle & LVS_OWNERDATA) { - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~FLAG_NOTIFY_CHANGE; if (!(lvItem.state & LVIS_SELECTED) && LISTVIEW_GetSelectedCount(infoPtr)) oldstate |= LVIS_SELECTED; if (infoPtr->nFocusedItem != -1) oldstate |= LVIS_FOCUSED; @@ -9003,7 +9005,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE { NMLISTVIEW nmlv; - infoPtr->bDoChangeNotify = notify; + infoPtr->notify_mask |= notify; nmlv.iItem = -1; nmlv.iSubItem = 0; @@ -9484,7 +9486,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->nHotItem = -1; infoPtr->redraw = TRUE; infoPtr->bNoItemMetrics = TRUE; - infoPtr->bDoChangeNotify = TRUE; + infoPtr->notify_mask = ~(0U); /* By default allow sending all notifications */ infoPtr->autoSpacing = TRUE; infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); -- 2.18.0

1 1

[v3 PATCH 1/2] user32: When registering redirected class use correct base class name.
by Nikolay Sivov 25 Aug '18

25 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/class.c | 31 +++++++++++++++++++++---------- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 2 +- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 07d36f05d7..5383b6771f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -320,7 +320,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, BOOL register_class ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, WCHAR *combined, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -335,9 +335,12 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B const WCHAR *module, *ret; UNICODE_STRING name_us; HMODULE hmod; + UINT offset; - if (basename_offset) - *basename_offset = 0; + if (!basename_offset) + basename_offset = &offset; + + *basename_offset = 0; if (IS_INTRESOURCE( name )) return name; @@ -352,14 +355,21 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B return name; wndclass = (struct wndclass_redirect_data *)data.lpData; - if (basename_offset) - *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); + *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); if (!(hmod = GetModuleHandleW( module ))) hmod = LoadLibraryW( module ); + /* Combined name is used to register versioned class name. Base name part will match exactly + original class name and won't be reused from context data. */ ret = (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); + if (combined) + { + memcpy(combined, ret, *basename_offset * sizeof(WCHAR)); + strcpyW(&combined[*basename_offset], name); + ret = combined; + } if (register_class && hmod) { @@ -409,7 +419,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name, NULL, TRUE ); + name = CLASS_GetVersionedName( name, NULL, NULL, TRUE ); for (;;) { @@ -662,8 +672,8 @@ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc ) */ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { + WCHAR name[MAX_ATOM_LEN + 1], combined[MAX_ATOM_LEN + 1]; const WCHAR *classname = NULL; - WCHAR name[MAX_ATOM_LEN + 1]; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -682,7 +692,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); + classname = CLASS_GetVersionedName( name, &basename_offset, combined, FALSE ); classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -720,6 +730,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) */ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { + WCHAR name[MAX_ATOM_LEN + 1]; const WCHAR *classname; UINT basename_offset; ATOM atom; @@ -736,7 +747,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); + classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, name, FALSE ); if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -789,7 +800,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className, NULL, FALSE ); + className = CLASS_GetVersionedName( className, NULL, NULL, FALSE ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 73a2badc7d..0ee7dbeece 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -273,7 +273,7 @@ extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, - BOOL register_class) DECLSPEC_HIDDEN; + WCHAR *combined, BOOL register_class) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c7a3b06c3a..7ba0b4c312 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1344,7 +1344,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className, NULL, TRUE); + className = CLASS_GetVersionedName(className, NULL, NULL, TRUE); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), -- 2.18.0

3 6

[PATCH] comctl32/listview: Don't send LVN_ENDLABELEDIT twice under some circumstances
by Fabian Maurer 25 Aug '18

25 Aug '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/listview.c | 10 +++++++++ dlls/comctl32/tests/listview.c | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 200bf93be55..0193c038ebb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -326,6 +326,7 @@ typedef struct tagLISTVIEW_INFO /* misc */ DWORD iVersion; /* CCM_[G,S]ETVERSION */ + BOOL inEndEditLabel; /* To prevent sending LVN_ENDLABELEDIT during LVN_ENDLABELEDIT */ } LISTVIEW_INFO; /* @@ -5869,6 +5870,9 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL WCHAR *pszText = NULL; BOOL res; + if (infoPtr->inEndEditLabel) + return FALSE; + if (storeText) { DWORD len = isW ? GetWindowTextLengthW(infoPtr->hwndEdit) : GetWindowTextLengthA(infoPtr->hwndEdit); @@ -5914,9 +5918,14 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL dispInfo.item.pszText = same ? NULL : pszText; dispInfo.item.cchTextMax = textlenT(dispInfo.item.pszText, isW); + /* Sending LVN_ENDLABELEDITW might trigger EN_KILLFOCUS which would call this function again */ + infoPtr->inEndEditLabel = TRUE; + /* Do we need to update the Item Text */ res = notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW); + infoPtr->inEndEditLabel = FALSE; + infoPtr->nEditLabelItem = -1; infoPtr->hwndEdit = 0; @@ -9497,6 +9506,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->itemEdit.fEnabled = FALSE; infoPtr->iVersion = COMCTL32_VERSION; infoPtr->colRectsDirty = FALSE; + infoPtr->inEndEditLabel = FALSE; /* get default font (icon title) */ SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e9b715ee412..3e9e9697a4f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -75,6 +75,10 @@ static BOOL g_disp_A_to_W; static NMLVDISPINFOA g_editbox_disp_info; /* when this is set focus will be tested on LVN_DELETEITEM */ static BOOL g_focus_test_LVN_DELETEITEM; +/* Whether to send WM_KILLFOCUS to the edit control during LVN_ENDLABELEDIT */ +static BOOL do_LVN_ENDLABELEDIT_killfocus = FALSE; +/* Number of LVN_ENDLABELEDIT notifications received */ +static BOOL LVN_ENDLABELEDITA_count = 0; static HWND subclass_editbox(HWND hwndListview); @@ -510,6 +514,11 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP ok(IsWindow(edit), "expected valid edit control handle\n"); ok((GetWindowLongA(edit, GWL_STYLE) & ES_MULTILINE) == 0, "edit is multiline\n"); + LVN_ENDLABELEDITA_count++; + + if (do_LVN_ENDLABELEDIT_killfocus) + SendMessageA(edit, WM_KILLFOCUS, 0, 0); + return TRUE; } case LVN_BEGINSCROLL: @@ -6322,6 +6331,37 @@ static void test_LVSCW_AUTOSIZE(void) DestroyWindow(hwnd); } +static void test_LVN_ENDLABELEDITW(void) +{ + HWND hwnd, hwndedit; + LVITEMW item = {0}; + WCHAR text[] = {'l','a','l','a',0}; + DWORD ret; + + hwnd = create_listview_control(LVS_REPORT | LVS_EDITLABELS); + + insert_column(hwnd, 0); + + item.mask = LVIF_TEXT; + item.pszText = text; + ListView_InsertItemW(hwnd, &item); + + SetFocus(hwnd); + hwndedit = (HWND)SendMessageW(hwnd, LVM_EDITLABELW, 0, 0); + + ret = SendMessageA(hwndedit, WM_SETTEXT, 0, (LPARAM)"test"); + expect(TRUE, ret); + + LVN_ENDLABELEDITA_count = 0; + do_LVN_ENDLABELEDIT_killfocus = TRUE; + ret = SendMessageA(hwndedit, WM_KEYDOWN, VK_RETURN, 0); + do_LVN_ENDLABELEDIT_killfocus = FALSE; + ok(LVN_ENDLABELEDITA_count == 1, + "messagebox during LVN_ENDLABELEDIT gave wrong number of LVN_ENDLABELEDITA: %d\n", LVN_ENDLABELEDITA_count); + + DestroyWindow(hwnd); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6425,6 +6465,7 @@ START_TEST(listview) test_oneclickactivate(); test_state_image(); test_LVSCW_AUTOSIZE(); + test_LVN_ENDLABELEDITW(); unload_v6_module(ctx_cookie, hCtx); -- 2.18.0

2 4

URGENT REQUEST - WINEHQ PROBLEM
by Emanuele Caracci 25 Aug '18

25 Aug '18

Dear WineHQ developer, I write this because I installed your program to authenticate Logic Pro X by following this guide: https://www.youtube.com/watch?v=ufULIABO4qs&t=183s 1) Uninstalling WineHQ by removing it from the Applications section does not remove even the Codecs that have been installed. I would like to know how you can completely remove the application. 2) Following the program FAQ in the Unistall section (4.1 and 4.4) at the link: https://wiki.winehq.org/FAQ I inserted those codes on the terminal of my Mac and in this mode it has been removed all the files on the Mac! It's a nice mess because I lost all my documents! All the application data and all user files on the Mac have been erased. The Mac is also unable to shut down. Can they be recovered with inverse codes? I need help urgently! *I await your urgent reply as soon as possible.* Thank you, *Emanuele Caracci - www.emanuelecaracci.com <http://www.emanuelecaracci.com/> - +39/3461314467* [image: image.png] Le informazioni contenute in questo messaggio e negli eventuali allegati sono da considerarsi riservati ed il loro utilizzo è consentito unicamente al destinatario ed unicamente per le finalità sopra indicate. Qualora riceveste il presente messaggio per errore e non ne siate i destinatari, Vi preghiamo di darcene notizia via e-mail, di astenervi dal consultare eventuali files allegati, di cancellare il messaggio dal Vs. sistema informatico. Costituisce comportamento contrario ai principi dettati dal D.Lg. 196/2003 il trattenere il messaggio, diffonderne il contenuto, inviarlo ad altri soggetti, eseguirne copia in tutto od in parte, l’utilizzo da parte di soggetti diversi dal destinatario e per finalità diverse da quelle sopra indicate. — Notice: This message and any attachments may be of a confidential nature or may require protection for other reasons. Should you not be the intended recipient of this message or should you have received this message by mistake, you are not allowed to forward, copy or disseminate the content of the message in any form. Should you have received this message by mistake, please inform the sender and delete the message along with the enclosures.

3 2

[PATCH v2 1/3] ntoskrnl.exe/tests: Add basic tests for ZwLoadDriver()/ZwUnloadDriver().
by Zebediah Figura 25 Aug '18

25 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix test failures on w8adm dlls/ntoskrnl.exe/tests/Makefile.in | 4 ++ dlls/ntoskrnl.exe/tests/driver.c | 44 ++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/{driver.h => driver2.c} | 37 +++++++----- dlls/ntoskrnl.exe/tests/driver2.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 77 ++++++++++++++++++------- 6 files changed, 129 insertions(+), 35 deletions(-) copy dlls/ntoskrnl.exe/tests/{driver.h => driver2.c} (55%) create mode 100644 dlls/ntoskrnl.exe/tests/driver2.spec diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 6a427ca..fae11bb 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -3,8 +3,12 @@ IMPORTS = advapi32 driver_IMPORTS = winecrt0 ntoskrnl driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver2_IMPORTS = winecrt0 ntoskrnl +driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ driver.c \ driver.spec \ + driver2.c \ + driver2.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index cde78e5..d424396 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -187,6 +187,29 @@ static void test_init_funcs(void) ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); } +static const WCHAR driver2_path[] = { + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','S','e','r','v','i','c','e','s', + '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 +}; + +static void test_load_driver(void) +{ + UNICODE_STRING name; + NTSTATUS ret; + + RtlInitUnicodeString(&name, driver2_path); + + ret = ZwLoadDriver(&name); + ok(!ret, "got %#x\n", ret); + + ret = ZwUnloadDriver(&name); + ok(!ret, "got %#x\n", ret); +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -213,6 +236,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_currentprocess(); test_mdl_map(); test_init_funcs(); + test_load_driver(); /* print process report */ if (test_input->winetest_debug) @@ -245,6 +269,23 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR * return STATUS_SUCCESS; } +static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + BOOL *load = irp->AssociatedIrp.SystemBuffer; + UNICODE_STRING name; + + if (!load) + return STATUS_ACCESS_VIOLATION; + + *info = 0; + + RtlInitUnicodeString(&name, driver2_path); + if (*load) + return ZwLoadDriver(&name); + else + return ZwUnloadDriver(&name); +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { irp->IoStatus.Status = STATUS_SUCCESS; @@ -265,6 +306,9 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_MAIN_TEST: status = main_test(irp, stack, &irp->IoStatus.Information); break; + case IOCTL_WINETEST_LOAD_DRIVER: + status = test_load_driver_ioctl(irp, stack, &irp->IoStatus.Information); + break; default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index b254d44..6a4179e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -24,6 +24,7 @@ /* All custom IOCTLs need to have a function value >= 0x800. */ #define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_LOAD_DRIVER CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver2.c similarity index 55% copy from dlls/ntoskrnl.exe/tests/driver.h copy to dlls/ntoskrnl.exe/tests/driver2.c index b254d44..c648ec6 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver2.c @@ -1,9 +1,7 @@ /* - * ntoskrnl.exe testing framework + * Second driver loaded by driver.c * - * Copyright 2015 Sebastian Lackner - * Copyright 2015 Michael Müller - * Copyright 2015 Christian Costa + * Copyright 2018 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,17 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> -/* All custom IOCTLs need to have a function value >= 0x800. */ -#define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" -static const char teststr[] = "Wine is not an emulator"; +#include "driver.h" -struct test_input +static void WINAPI driver_Unload(DRIVER_OBJECT *driver) { - int running_under_wine; - int winetest_report_success; - int winetest_debug; - WCHAR path[1]; -}; + DbgPrint("unloading driver2\n"); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *registry) +{ + DbgPrint("loading driver2\n"); + + driver->DriverUnload = driver_Unload; + + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/tests/driver2.spec b/dlls/ntoskrnl.exe/tests/driver2.spec new file mode 100644 index 0000000..ad33444 --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver2.spec @@ -0,0 +1 @@ +# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 40de760..73f0e85 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -30,9 +30,6 @@ #include "driver.h" -static const char driver_name[] = "WineTestDriver"; -static const char device_path[] = "\\\\.\\WineTestDriver"; - static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); @@ -80,11 +77,9 @@ static void unload_driver(SC_HANDLE service) CloseServiceHandle(service); } -static SC_HANDLE load_driver(char *filename) +static SC_HANDLE load_driver(char *filename, const char *resname, const char *driver_name) { SC_HANDLE manager, service; - SERVICE_STATUS status; - BOOL ret; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!manager && GetLastError() == ERROR_ACCESS_DENIED) @@ -94,12 +89,11 @@ static SC_HANDLE load_driver(char *filename) } ok(!!manager, "OpenSCManager failed\n"); - /* before we start with the actual tests, make sure to terminate - * any old wine test drivers. */ + /* stop any old drivers running under this name */ service = OpenServiceA(manager, driver_name, SERVICE_ALL_ACCESS); if (service) unload_driver(service); - load_resource("driver.dll", filename); + load_resource(resname, filename); trace("Trying to load driver %s\n", filename); service = CreateServiceA(manager, driver_name, driver_name, @@ -107,7 +101,15 @@ static SC_HANDLE load_driver(char *filename) SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, filename, NULL, NULL, NULL, NULL, NULL); ok(!!service, "CreateService failed: %u\n", GetLastError()); + CloseServiceHandle(manager); + return service; +} + +static BOOL start_driver(HANDLE service) +{ + SERVICE_STATUS status; + BOOL ret; SetLastError(0xdeadbeef); ret = StartServiceA(service, 0, NULL); @@ -117,8 +119,7 @@ static SC_HANDLE load_driver(char *filename) skip("Failed to start service; probably your machine doesn't accept unsigned drivers.\n"); DeleteService(service); CloseServiceHandle(service); - DeleteFileA(filename); - return NULL; + return FALSE; } ok(ret, "StartService failed: %u\n", GetLastError()); @@ -134,10 +135,7 @@ static SC_HANDLE load_driver(char *filename) ok(status.dwCurrentState == SERVICE_RUNNING, "expected SERVICE_RUNNING, got %d\n", status.dwCurrentState); - device = CreateFileA(device_path, 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); - - return service; + return TRUE; } static void main_test(void) @@ -194,22 +192,59 @@ static void test_basic_ioctl(void) ok(!strcmp(buf, teststr), "got '%s'\n", buf); } +static void test_load_driver(SC_HANDLE service) +{ + SERVICE_STATUS status; + BOOL load, res; + DWORD sz; + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); + + load = TRUE; + res = DeviceIoControl(device, IOCTL_WINETEST_LOAD_DRIVER, &load, sizeof(load), NULL, 0, &sz, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_RUNNING, "got state %#x\n", status.dwCurrentState); + + load = FALSE; + res = DeviceIoControl(device, IOCTL_WINETEST_LOAD_DRIVER, &load, sizeof(load), NULL, 0, &sz, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); +} + START_TEST(ntoskrnl) { - char filename[MAX_PATH]; - SC_HANDLE service; - BOOL ret; + char filename[MAX_PATH], filename2[MAX_PATH]; + SC_HANDLE service, service2; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); - if (!(service = load_driver(filename))) + if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return; + if (!start_driver(service)) + { + DeleteFileA(filename); + return; + } + service2 = load_driver(filename2, "driver2.dll", "WineTestDriver2"); + + device = CreateFileA("\\\\.\\WineTestDriver", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); test_basic_ioctl(); main_test(); + test_load_driver(service2); + unload_driver(service2); unload_driver(service); - ret = DeleteFileA(filename); - ok(ret, "DeleteFile failed: %u\n", GetLastError()); + ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); + ok(DeleteFileA(filename2), "DeleteFile failed: %u\n", GetLastError()); } -- 2.7.4

1 0

[PATCH 1/3] ntoskrnl.exe/tests: Add basic tests for ZwLoadDriver()/ZwUnloadDriver().
by Zebediah Figura 25 Aug '18

25 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 ++ dlls/ntoskrnl.exe/tests/driver.c | 44 ++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/{driver.h => driver2.c} | 37 +++++++----- dlls/ntoskrnl.exe/tests/driver2.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 76 ++++++++++++++++++------- 6 files changed, 128 insertions(+), 35 deletions(-) copy dlls/ntoskrnl.exe/tests/{driver.h => driver2.c} (55%) create mode 100644 dlls/ntoskrnl.exe/tests/driver2.spec diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 6a427ca..fae11bb 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -3,8 +3,12 @@ IMPORTS = advapi32 driver_IMPORTS = winecrt0 ntoskrnl driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver2_IMPORTS = winecrt0 ntoskrnl +driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ driver.c \ driver.spec \ + driver2.c \ + driver2.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index cde78e5..d424396 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -187,6 +187,29 @@ static void test_init_funcs(void) ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); } +static const WCHAR driver2_path[] = { + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','S','e','r','v','i','c','e','s', + '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 +}; + +static void test_load_driver(void) +{ + UNICODE_STRING name; + NTSTATUS ret; + + RtlInitUnicodeString(&name, driver2_path); + + ret = ZwLoadDriver(&name); + ok(!ret, "got %#x\n", ret); + + ret = ZwUnloadDriver(&name); + ok(!ret, "got %#x\n", ret); +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -213,6 +236,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_currentprocess(); test_mdl_map(); test_init_funcs(); + test_load_driver(); /* print process report */ if (test_input->winetest_debug) @@ -245,6 +269,23 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR * return STATUS_SUCCESS; } +static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + BOOL *load = irp->AssociatedIrp.SystemBuffer; + UNICODE_STRING name; + + if (!load) + return STATUS_ACCESS_VIOLATION; + + *info = 0; + + RtlInitUnicodeString(&name, driver2_path); + if (*load) + return ZwLoadDriver(&name); + else + return ZwUnloadDriver(&name); +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { irp->IoStatus.Status = STATUS_SUCCESS; @@ -265,6 +306,9 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_MAIN_TEST: status = main_test(irp, stack, &irp->IoStatus.Information); break; + case IOCTL_WINETEST_LOAD_DRIVER: + status = test_load_driver_ioctl(irp, stack, &irp->IoStatus.Information); + break; default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index b254d44..6a4179e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -24,6 +24,7 @@ /* All custom IOCTLs need to have a function value >= 0x800. */ #define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_LOAD_DRIVER CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver2.c similarity index 55% copy from dlls/ntoskrnl.exe/tests/driver.h copy to dlls/ntoskrnl.exe/tests/driver2.c index b254d44..c648ec6 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver2.c @@ -1,9 +1,7 @@ /* - * ntoskrnl.exe testing framework + * Second driver loaded by driver.c * - * Copyright 2015 Sebastian Lackner - * Copyright 2015 Michael Müller - * Copyright 2015 Christian Costa + * Copyright 2018 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,17 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> -/* All custom IOCTLs need to have a function value >= 0x800. */ -#define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" -static const char teststr[] = "Wine is not an emulator"; +#include "driver.h" -struct test_input +static void WINAPI driver_Unload(DRIVER_OBJECT *driver) { - int running_under_wine; - int winetest_report_success; - int winetest_debug; - WCHAR path[1]; -}; + DbgPrint("unloading driver2\n"); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *registry) +{ + DbgPrint("loading driver2\n"); + + driver->DriverUnload = driver_Unload; + + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/tests/driver2.spec b/dlls/ntoskrnl.exe/tests/driver2.spec new file mode 100644 index 0000000..ad33444 --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver2.spec @@ -0,0 +1 @@ +# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 40de760..febf4c6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -30,9 +30,6 @@ #include "driver.h" -static const char driver_name[] = "WineTestDriver"; -static const char device_path[] = "\\\\.\\WineTestDriver"; - static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); @@ -80,11 +77,9 @@ static void unload_driver(SC_HANDLE service) CloseServiceHandle(service); } -static SC_HANDLE load_driver(char *filename) +static SC_HANDLE load_driver(char *filename, const char *resname, const char *driver_name) { SC_HANDLE manager, service; - SERVICE_STATUS status; - BOOL ret; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!manager && GetLastError() == ERROR_ACCESS_DENIED) @@ -94,12 +89,11 @@ static SC_HANDLE load_driver(char *filename) } ok(!!manager, "OpenSCManager failed\n"); - /* before we start with the actual tests, make sure to terminate - * any old wine test drivers. */ + /* stop any old drivers running under this name */ service = OpenServiceA(manager, driver_name, SERVICE_ALL_ACCESS); if (service) unload_driver(service); - load_resource("driver.dll", filename); + load_resource(resname, filename); trace("Trying to load driver %s\n", filename); service = CreateServiceA(manager, driver_name, driver_name, @@ -107,7 +101,15 @@ static SC_HANDLE load_driver(char *filename) SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, filename, NULL, NULL, NULL, NULL, NULL); ok(!!service, "CreateService failed: %u\n", GetLastError()); + CloseServiceHandle(manager); + return service; +} + +static BOOL start_driver(HANDLE service) +{ + SERVICE_STATUS status; + BOOL ret; SetLastError(0xdeadbeef); ret = StartServiceA(service, 0, NULL); @@ -117,8 +119,7 @@ static SC_HANDLE load_driver(char *filename) skip("Failed to start service; probably your machine doesn't accept unsigned drivers.\n"); DeleteService(service); CloseServiceHandle(service); - DeleteFileA(filename); - return NULL; + return FALSE; } ok(ret, "StartService failed: %u\n", GetLastError()); @@ -134,10 +135,7 @@ static SC_HANDLE load_driver(char *filename) ok(status.dwCurrentState == SERVICE_RUNNING, "expected SERVICE_RUNNING, got %d\n", status.dwCurrentState); - device = CreateFileA(device_path, 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); - - return service; + return TRUE; } static void main_test(void) @@ -194,22 +192,58 @@ static void test_basic_ioctl(void) ok(!strcmp(buf, teststr), "got '%s'\n", buf); } +static void test_load_driver(SC_HANDLE service) +{ + SERVICE_STATUS status; + BOOL load, res; + DWORD sz; + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); + + load = TRUE; + res = DeviceIoControl(device, IOCTL_WINETEST_LOAD_DRIVER, &load, sizeof(load), NULL, 0, &sz, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_RUNNING, "got state %#x\n", status.dwCurrentState); + + load = FALSE; + res = DeviceIoControl(device, IOCTL_WINETEST_LOAD_DRIVER, &load, sizeof(load), NULL, 0, &sz, NULL); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + + res = QueryServiceStatus(service, &status); + ok(res, "QueryServiceStatusEx failed: %u\n", GetLastError()); + ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); +} + START_TEST(ntoskrnl) { - char filename[MAX_PATH]; - SC_HANDLE service; - BOOL ret; + char filename[MAX_PATH], filename2[MAX_PATH]; + SC_HANDLE service, service2; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); - if (!(service = load_driver(filename))) + service = load_driver(filename, "driver.dll", "WineTestDriver"); + if (!start_driver(service)) + { + DeleteFileA(filename); return; + } + service2 = load_driver(filename2, "driver2.dll", "WineTestDriver2"); + + device = CreateFileA("\\\\.\\WineTestDriver", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); test_basic_ioctl(); main_test(); + test_load_driver(service2); + unload_driver(service2); unload_driver(service); - ret = DeleteFileA(filename); - ok(ret, "DeleteFile failed: %u\n", GetLastError()); + ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); + ok(DeleteFileA(filename2), "DeleteFile failed: %u\n", GetLastError()); } -- 2.7.4

2 3

[PATCH] libs/port/mbtowc: Convert 1 character at a time if dst overlaps into src
by Gabriel Ivăncescu 24 Aug '18

24 Aug '18

Some applications partially overlap the two buffers. For such rare corner cases, do a single check so that there will be no performance regressions, as unsigned operations are defined to wrap around. Bug discovered by Jason Edmeades, revised from bug report. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38558 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- libs/port/mbtowc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 4977c82..6ed2c2e 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -65,6 +65,17 @@ static inline int mbstowcs_sbcs( const struct sbcs_table *table, int flags, ret = -1; } + /* dst can overlap into src, in which case we need to handle 1 char at a time, + but when src < dst, there is no issue no matter how many we handle at once */ + if ((UINT_PTR) ((UINT_PTR)src - (UINT_PTR)dst) < srclen * sizeof(*dst)) + { + do + *dst++ = cp2uni[*src++]; + while (--srclen); + return ret; + } + + /* dst doesn't overlap into src */ for (;;) { switch(srclen) -- 1.9.1

1 0

[PATCH v3 1/2] iphlpapi: Implement GetUdp6Table().
by Guillaume Charifi 24 Aug '18

24 Aug '18

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 30 ++++- dlls/iphlpapi/ipstats.c | 241 ++++++++++++++++++++++++++++++++++ dlls/iphlpapi/ipstats.h | 1 + include/iphlpapi.h | 2 + include/udpmib.h | 53 ++++++++ 6 files changed, 322 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 1686644de0..fd00cc093a 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -141,7 +141,7 @@ @ stdcall GetTcpTable2( ptr ptr long ) @ stub GetTcpTableFromStack #@ stub GetTeredoPort -#@ stub GetUdp6Table +@ stdcall GetUdp6Table( ptr ptr long ) @ stdcall GetUdpStatisticsEx( ptr long ) @ stdcall GetUdpStatistics( ptr ) @ stub GetUdpStatsFromStack diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7de70c9ef4..c7140cd974 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2442,6 +2442,14 @@ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET, UDP_TABLE_BASIC, 0); } +/****************************************************************** + * GetUdp6Table (IPHLPAPI.@) + */ +DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) +{ + return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET6, UDP_TABLE_BASIC, 0); +} + /****************************************************************** * GetExtendedUdpTable (IPHLPAPI.@) */ @@ -2456,15 +2464,25 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; - if (ulAf != WS_AF_INET) - { - FIXME("ulAf = %u not supported\n", ulAf); - return ERROR_NOT_SUPPORTED; - } if (TableClass == UDP_TABLE_OWNER_MODULE) FIXME("UDP_TABLE_OWNER_MODULE not fully supported\n"); - if ((ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size))) + switch (ulAf) + { + case WS_AF_INET: + ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + case WS_AF_INET6: + ret = build_udp6_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); + break; + + default: + FIXME("ulAf = %u not supported\n", ulAf); + ret = ERROR_NOT_SUPPORTED; + } + + if (ret) return ret; if (!pUdpTable || *pdwSize < size) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 799d03d574..08d1fa428b 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2565,6 +2565,247 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE return ret; } +static DWORD get_udp6_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) +{ + DWORD table_size; + + switch (class) + { + case UDP_TABLE_BASIC: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW); + break; + } + case UDP_TABLE_OWNER_PID: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_PID, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_PID); + break; + } + case UDP_TABLE_OWNER_MODULE: + { + table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_MODULE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_MODULE); + break; + } + default: + ERR("unhandled class %u\n", class); + return 0; + } + return table_size; +} + +static MIB_UDP6TABLE *append_udp6_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, + MIB_UDP6TABLE *table, DWORD *count, + const MIB_UDP6ROW_OWNER_MODULE *row, DWORD row_size ) +{ + if (table->dwNumEntries >= *count) + { + MIB_UDP6TABLE *new_table; + DWORD new_count = table->dwNumEntries * 2, new_table_size; + + new_table_size = get_udp6_table_sizes( class, new_count, NULL ); + if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) + { + HeapFree( heap, 0, table ); + return NULL; + } + *count = new_count; + table = new_table; + } + memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); + table->dwNumEntries++; + return table; +} + +static int compare_udp6_rows(const void *a, const void *b) +{ + const MIB_UDP6ROW *rowA = a; + const MIB_UDP6ROW *rowB = b; + int ret; + + if ((ret = memcmp(&rowA->dwLocalAddr, &rowB->dwLocalAddr, sizeof(rowA->dwLocalAddr)) != 0)) return ret; + if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; + return rowA->dwLocalPort - rowB->dwLocalPort; +} + +struct ipv6_addr_scope +{ + IN6_ADDR addr; + DWORD scope; +}; + +static struct ipv6_addr_scope *get_ipv6_addr_scope_table(unsigned int *size) +{ + struct ipv6_addr_scope *table = NULL; + unsigned int table_size = 0; + + if (!(table = HeapAlloc( GetProcessHeap(), 0, sizeof(table[0]) ))) + return NULL; + +#ifdef __linux__ + { + FILE *fp; + char buf[512], *ptr; + + if (!(fp = fopen( "/proc/net/if_inet6", "r" ))) + goto failed; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + WORD a[8]; + DWORD scope; + struct ipv6_addr_scope *new_table; + struct ipv6_addr_scope *entry; + unsigned int i; + + if (sscanf( ptr, "%4hx%4hx%4hx%4hx%4hx%4hx%4hx%4hx %*s %*s %x", + &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6], &a[7], &scope ) != 9) + continue; + + table_size++; + if (!(new_table = HeapReAlloc( GetProcessHeap(), 0, table, table_size * sizeof(table[0]) ))) + { + fclose(fp); + goto failed; + } + + table = new_table; + entry = &table[table_size - 1]; + + i = 0; + while (i < 8) + { + entry->addr.u.Word[i] = htons(a[i]); + i++; + } + + entry->scope = htons(scope); + } + } +#else + FIXME( "not implemented\n" ); + goto failed; +#endif + + *size = table_size; + return table; + +failed: + HeapFree( GetProcessHeap(), 0, table ); + return NULL; +} + +static DWORD find_ipv6_addr_scope(const IN6_ADDR *addr, const struct ipv6_addr_scope *table, unsigned int size) +{ + const BYTE multicast_scope_mask = 0x0F; + const BYTE multicast_scope_shift = 0; + unsigned int i = 0; + + if (IN6_IS_ADDR_UNSPECIFIED(addr)) + return 0; + + if (IN6_IS_ADDR_MULTICAST(addr)) + return htons((addr->u.Byte[1] & multicast_scope_mask) >> multicast_scope_shift); + + if (!table) + return -1; + + while (i < size) + { + if (memcmp(&table[i].addr, addr, sizeof(table[i].addr)) == 0) + return table[i].scope; + i++; + } + + return -1; +} + +DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE heap, DWORD flags, + DWORD *size ) +{ + MIB_UDP6TABLE *table; + MIB_UDP6ROW_OWNER_MODULE row; + DWORD ret = NO_ERROR, count = 16, table_size, row_size; + + if (!(table_size = get_udp6_table_sizes( class, count, &row_size ))) + return ERROR_INVALID_PARAMETER; + + if (!(table = HeapAlloc( heap, flags, table_size ))) + return ERROR_OUTOFMEMORY; + + table->dwNumEntries = 0; + memset( &row, 0, sizeof(row) ); + +#ifdef __linux__ + { + FILE *fp; + + if ((fp = fopen( "/proc/net/udp6", "r" ))) + { + char buf[512], *ptr; + struct pid_map *map = NULL; + unsigned int num_entries = 0; + struct ipv6_addr_scope *addr_scopes; + unsigned int addr_scopes_size = 0; + unsigned int dummy; + int inode; + + addr_scopes = get_ipv6_addr_scope_table(&addr_scopes_size); + + if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); + + /* skip header line */ + ptr = fgets( buf, sizeof(buf), fp ); + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + DWORD in6_addr32[4]; + + if (sscanf( ptr, "%u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, + &in6_addr32[0], &in6_addr32[1], &in6_addr32[2], &in6_addr32[3], + &row.dwLocalPort, &inode ) != 7) + continue; + memcpy(&row.ucLocalAddr, in6_addr32, sizeof(row.ucLocalAddr)); + row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); + row.dwLocalPort = htons( row.dwLocalPort ); + + if (class >= UDP_TABLE_OWNER_PID) + row.dwOwningPid = find_owning_pid( map, num_entries, inode ); + if (class >= UDP_TABLE_OWNER_MODULE) + { + row.liCreateTimestamp.QuadPart = 0; /* FIXME */ + row.u.dwFlags = 0; + memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); + } + if (!(table = append_udp6_row( class, heap, flags, table, &count, &row, row_size ))) + break; + } + HeapFree( GetProcessHeap(), 0, map ); + if (addr_scopes) + HeapFree( GetProcessHeap(), 0, addr_scopes ); + fclose( fp ); + } + else ret = ERROR_NOT_SUPPORTED; + } +#else + FIXME( "not implemented\n" ); + ret = ERROR_NOT_SUPPORTED; +#endif + + if (!table) return ERROR_OUTOFMEMORY; + if (!ret) + { + if (order && table->dwNumEntries) + qsort( table->table, table->dwNumEntries, row_size, compare_udp6_rows ); + *tablep = table; + } + else HeapFree( heap, flags, table ); + if (size) *size = get_udp6_table_sizes( class, count, NULL ); + TRACE( "returning ret %u table %p\n", ret, table ); + return ret; +} + /****************************************************************** * AllocateAndGetUdpTableFromStack (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index d742d6380a..acf43ee27c 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -34,5 +34,6 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDE DWORD build_tcp_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_udp_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; +DWORD build_udp6_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; #endif /* ndef WINE_IPSTATS_H_ */ diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 54d93d1c9c..86507dfd4d 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -51,6 +51,8 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder); DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder); +DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder); + DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats); DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily); diff --git a/include/udpmib.h b/include/udpmib.h index 6b3f51cf2f..3d1bba5ee5 100644 --- a/include/udpmib.h +++ b/include/udpmib.h @@ -18,6 +18,8 @@ #ifndef __WINE_UDPMIB_H #define __WINE_UDPMIB_H +#include <in6addr.h> + #define TCPIP_OWNING_MODULE_SIZE 16 @@ -71,6 +73,57 @@ typedef struct _MIB_UDPTABLE_OWNER_MODULE MIB_UDPROW_OWNER_MODULE table[1]; } MIB_UDPTABLE_OWNER_MODULE, *PMIB_UDPTABLE_OWNER_MODULE; +typedef struct _MIB_UDP6ROW +{ + IN6_ADDR dwLocalAddr; + DWORD dwLocalScopeId; + DWORD dwLocalPort; +} MIB_UDP6ROW, *PMIB_UDP6ROW; + +typedef struct _MIB_UDP6TABLE +{ + DWORD dwNumEntries; + MIB_UDP6ROW table[1]; +} MIB_UDP6TABLE, *PMIB_UDP6TABLE; + +typedef struct _MIB_UDP6ROW_OWNER_PID +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + DWORD dwOwningPid; +} MIB_UDP6ROW_OWNER_PID, *PMIB_UDP6ROW_OWNER_PID; + +typedef struct _MIB_UDP6TABLE_OWNER_PID +{ + DWORD dwNumEntries; + MIB_UDP6ROW_OWNER_PID table[1]; +} MIB_UDP6TABLE_OWNER_PID, *PMIB_UDP6TABLE_OWNER_PID; + +typedef struct _MIB_UDP6ROW_OWNER_MODULE +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + DWORD dwOwningPid; + LARGE_INTEGER liCreateTimestamp; + __C89_NAMELESS union + { + __C89_NAMELESS struct + { + int SpecificPortBind:1; + } __C89_NAMELESSSTRUCTNAME; + int dwFlags; + } __C89_NAMELESSUNIONNAME; + ULONGLONG OwningModuleInfo[TCPIP_OWNING_MODULE_SIZE]; +} MIB_UDP6ROW_OWNER_MODULE, *PMIB_UDP6ROW_OWNER_MODULE; + +typedef struct _MIB_UDP6TABLE_OWNER_MODULE +{ + DWORD dwNumEntries; + MIB_UDP6ROW_OWNER_MODULE table[1]; +} MIB_UDP6TABLE_OWNER_MODULE, *PMIB_UDP6TABLE_OWNER_MODULE; + /* UDP statistics */ typedef struct _MIB_UDPSTATS -- Guillaume Charifi <guillaume.charifi(a)sfr.fr>

2 1

[PATCH 4/5] wined3d: Add shadow sampler capability bit to d3d_info.
by Józef Kucia 24 Aug '18

24 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8c1cce457ed0..39671f2f30cf 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3657,6 +3657,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + d3d_info->shadow_sampler = gl_info->supported[ARB_SHADOW]; d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 774cd48caec6..d2229c20b2eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1607,7 +1607,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } else if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SHADOW) - && !adapter->gl_info.supported[ARB_SHADOW]) + && !adapter->d3d_info.shadow_sampler) { TRACE("[FAILED] - No shadow sampler support.\n"); return WINED3DERR_NOTAVAILABLE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de0b4867de79..834ca151cf6a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -193,7 +193,11 @@ struct wined3d_d3d_info BOOL shader_color_key; DWORD valid_rt_mask; DWORD wined3d_creation_flags; - BOOL shader_double_precision; + + DWORD shadow_sampler : 1; + DWORD shader_double_precision : 1; + DWORD padding : 30; + enum wined3d_feature_level feature_level; }; -- 2.16.4

3 2

[PATCH] winhttp: Escape untrusted URL paths.
by Hans Leidekker 24 Aug '18

24 Aug '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 24 ++++++++++----------- dlls/winhttp/session.c | 8 +++---- dlls/winhttp/tests/url.c | 1 + dlls/winhttp/tests/winhttp.c | 40 ++++++++++++++++++++++++++++++++++ dlls/winhttp/url.c | 49 ++++++++++++++++++++++++------------------ dlls/winhttp/winhttp_private.h | 1 + 6 files changed, 86 insertions(+), 37 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 65d641f3cb..6f6de7c63d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2517,7 +2517,7 @@ static WCHAR *get_redirect_url( request_t *request, DWORD *len ) query_headers( request, WINHTTP_QUERY_LOCATION, NULL, NULL, &size, NULL ); if (get_last_error() != ERROR_INSUFFICIENT_BUFFER) return FALSE; if (!(ret = heap_alloc( size ))) return NULL; - *len = size / sizeof(WCHAR); + *len = size / sizeof(WCHAR) - 1; if (query_headers( request, WINHTTP_QUERY_LOCATION, NULL, ret, &size, NULL )) return ret; heap_free( ret ); return NULL; @@ -2526,42 +2526,42 @@ static WCHAR *get_redirect_url( request_t *request, DWORD *len ) static BOOL handle_redirect( request_t *request, DWORD status ) { BOOL ret = FALSE; - DWORD len, len_url; + DWORD len, len_loc; URL_COMPONENTS uc; connect_t *connect = request->connect; INTERNET_PORT port; WCHAR *hostname = NULL, *location; int index; - if (!(location = get_redirect_url( request, &len_url ))) return FALSE; + if (!(location = get_redirect_url( request, &len_loc ))) return FALSE; memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); uc.dwSchemeLength = uc.dwHostNameLength = uc.dwUrlPathLength = uc.dwExtraInfoLength = ~0u; - if (!WinHttpCrackUrl( location, len_url, 0, &uc )) /* assume relative redirect */ + if (!WinHttpCrackUrl( location, len_loc, 0, &uc )) /* assume relative redirect */ { WCHAR *path, *p; if (location[0] == '/') { - len = strlenW( location ); + len = escape_string( NULL, location, len_loc ); if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - strcpyW( path, location ); + escape_string( path, location, len_loc ); } else { if ((p = strrchrW( request->path, '/' ))) *p = 0; - len = strlenW( request->path ) + 1 + strlenW( location ); + len = strlenW( request->path ) + 1 + escape_string( NULL, location, len_loc ); if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; strcpyW( path, request->path ); strcatW( path, slashW ); - strcatW( path, location ); + escape_string( path + strlenW(path), location, len_loc ); } heap_free( request->path ); request->path = path; - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_url + 1 ); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_loc + 1 ); } else { @@ -2577,7 +2577,7 @@ static BOOL handle_redirect( request_t *request, DWORD status ) request->hdr.flags |= WINHTTP_FLAG_SECURE; } - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_url + 1 ); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_loc + 1 ); len = uc.dwHostNameLength; if (!(hostname = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; @@ -2607,9 +2607,9 @@ static BOOL handle_redirect( request_t *request, DWORD status ) request->path = NULL; if (uc.dwUrlPathLength) { - len = uc.dwUrlPathLength + uc.dwExtraInfoLength; + len = escape_string( NULL, uc.lpszUrlPath, uc.dwUrlPathLength + uc.dwExtraInfoLength ); if (!(request->path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - strcpyW( request->path, uc.lpszUrlPath ); + escape_string( request->path, uc.lpszUrlPath, uc.dwUrlPathLength + uc.dwExtraInfoLength ); } else request->path = strdupW( slashW ); } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 788f7c613f..8da09a2e21 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1142,14 +1142,14 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (object) { WCHAR *path, *p; - unsigned int len; + unsigned int len, len_object = strlenW(object); - len = strlenW( object ) + 1; + len = escape_string( NULL, object, len_object ); if (object[0] != '/') len++; - if (!(p = path = heap_alloc( len * sizeof(WCHAR) ))) goto end; + if (!(p = path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; if (object[0] != '/') *p++ = '/'; - strcpyW( p, object ); + escape_string( p, object, len_object ); request->path = path; } else if (!(request->path = strdupW( slashW ))) goto end; diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 6bde1de70e..214b7f34cf 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -667,6 +667,7 @@ static void WinHttpCrackUrl_test( void ) ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( !lstrcmpW( uc.lpszHostName, hostnameW ), "unexpected host name\n" ); ok( !lstrcmpW( uc.lpszUrlPath, pathW ), "unexpected path\n" ); + ok( uc.dwUrlPathLength == lstrlenW(pathW), "got %u\n", uc.dwUrlPathLength ); uc.dwStructSize = sizeof(uc); uc.lpszScheme = NULL; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2e903e1105..df822b2e46 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2274,6 +2274,11 @@ static DWORD CALLBACK server_thread(LPVOID param) if (!strstr(buffer, "Cookie: name=value\r\n")) send(c, cookiemsg, sizeof(cookiemsg) - 1, 0); else send(c, notokmsg, sizeof(notokmsg) - 1, 0); } + else if (strstr(buffer, "GET /escape")) + { + if (strstr(buffer, "GET /escape?one%20two%0D%0A HTTP/1.1")) send(c, okmsg, sizeof(okmsg) - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -3229,6 +3234,40 @@ static void test_cookies( int port ) WinHttpCloseHandle( ses ); } +static void test_request_path_escapes( int port ) +{ + static const WCHAR objW[] = + {'/','e','s','c','a','p','e','?','o','n','e',' ','t','w','o','\r','\n',0}; + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, objW, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); +} + static void test_connection_info( int port ) { static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; @@ -4555,6 +4594,7 @@ START_TEST (winhttp) test_bad_header(si.port); test_multiple_reads(si.port); test_cookies(si.port); + test_request_path_escapes(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW); diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 32b30da0ce..52a175c84d 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -118,7 +118,7 @@ static BOOL need_escape( WCHAR c ) } } -static DWORD copy_escape( WCHAR *dst, const WCHAR *src, DWORD len ) +DWORD escape_string( WCHAR *dst, const WCHAR *src, DWORD len ) { static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; DWORD ret = len; @@ -129,38 +129,45 @@ static DWORD copy_escape( WCHAR *dst, const WCHAR *src, DWORD len ) { if (need_escape( src[i] )) { - p[0] = '%'; - p[1] = hex[(src[i] >> 4) & 0xf]; - p[2] = hex[src[i] & 0xf]; + if (dst) + { + p[0] = '%'; + p[1] = hex[(src[i] >> 4) & 0xf]; + p[2] = hex[src[i] & 0xf]; + p += 2; + } ret += 2; - p += 2; } - else *p = src[i]; + else if (dst) *p = src[i]; } - dst[ret] = 0; + if (dst) dst[ret] = 0; return ret; } -static WCHAR *escape_url( LPCWSTR url, DWORD *len ) +static WCHAR *escape_url( const WCHAR *url, DWORD *len ) { WCHAR *ret; - const WCHAR *p, *q; + const WCHAR *p; + DWORD len_base, len_path; - if ((p = q = strrchrW( url, '/' ))) + if ((p = strrchrW( url, '/' ))) { - while (*q) - { - if (need_escape( *q )) *len += 2; - q++; - } + len_base = p - url; + len_path = escape_string( NULL, p, *len - len_base ); } - if (!(ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; - if (!p) strcpyW( ret, url ); else { - memcpy( ret, url, (p - url) * sizeof(WCHAR) ); - copy_escape( ret + (p - url), p, q - p ); + len_base = *len; + len_path = 0; } + + if (!(ret = heap_alloc( (len_base + len_path + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, url, len_base * sizeof(WCHAR) ); + + if (p) escape_string( ret + len_base, p, *len - (p - url) ); + ret[len_base + len_path] = 0; + + *len = len_base + len_path; return ret; } @@ -516,7 +523,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (uc->lpszUrlPath) { len = comp_length( uc->dwUrlPathLength, 0, uc->lpszUrlPath ); - if (flags & ICU_ESCAPE) url += copy_escape( url, uc->lpszUrlPath, len ); + if (flags & ICU_ESCAPE) url += escape_string( url, uc->lpszUrlPath, len ); else { memcpy( url, uc->lpszUrlPath, len * sizeof(WCHAR) ); @@ -526,7 +533,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (uc->lpszExtraInfo) { len = comp_length( uc->dwExtraInfoLength, 0, uc->lpszExtraInfo ); - if (flags & ICU_ESCAPE) url += copy_escape( url, uc->lpszExtraInfo, len ); + if (flags & ICU_ESCAPE) url += escape_string( url, uc->lpszExtraInfo, len ); else { memcpy( url, uc->lpszExtraInfo, len * sizeof(WCHAR) ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index f1aa5622c6..7b92afc7ce 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -322,6 +322,7 @@ BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HID void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; void release_host( hostdata_t *host ) DECLSPEC_HIDDEN; +DWORD escape_string( WCHAR *, const WCHAR *, DWORD ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel August 2018