November 2017 - Wine-Commits

Alexandre Julliard : patches: Use a separate table style for the regressions page.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: tools Branch: master Commit: 94fb58ab98d8fe808d4b00c279952ea5f911c627 URL: http://source.winehq.org/git/tools.git/?a=commit;h=94fb58ab98d8fe808d4b00c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 20:06:15 2017 +0100 patches: Use a separate table style for the regressions page. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/patches.css | 2 +- patches/update-regressions | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/patches.css b/patches/patches.css index 24e8f37..4d6df8b 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -131,7 +131,7 @@ div.buglist { width: 100%; border: 1px solid #601919; } -table.main, table.legend { width: 100%; } +table.main, table.legend, table.regressions { width: 100%; } table.main { border-collapse: collapse; } table.legend ul { margin: 2px 0; } diff --git a/patches/update-regressions b/patches/update-regressions index 5e39075..5c8b362 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -86,7 +86,7 @@ sub read_bugs() sub print_bugs($@) { my $row = shift; - printf OUTPUT "<table class=\"main\">\n"; + printf OUTPUT "<table class=\"regressions\">\n"; foreach my $id (sort {$b <=> $a} @_) { my $regression = $regressions{$id}; @@ -135,7 +135,7 @@ printf OUTPUT "<div id=\"logo_blurb\">Wine source repository – Regressions print OUTPUT "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; printf OUTPUT "<h2>%u bisected regressions</h2>\n", $count; -print OUTPUT "<table class=\"main\"><tr><th class=\"count\">Count</th>", +print OUTPUT "<table class=\"regressions\"><tr><th class=\"count\">Count</th>", "<th style=\"width: 100%;\" class=\"author\">Author</th></tr>\n"; my $row = 0; @@ -155,7 +155,7 @@ print OUTPUT "</table></div>\n"; print OUTPUT "<div class=\"main\">\n"; printf OUTPUT "<h2>%u regressions without commit id</h2>\n", scalar @unknown; -print OUTPUT "<table class=\"main\"><tr><th class=\"id\">Id</th>", +print OUTPUT "<table class=\"regressions\"><tr><th class=\"id\">Id</th>", "<th style=\"width: 100%;\" class=\"subject\">Description</th></tr>\n"; $row = 0;

1 0

Alexandre Julliard : patches: Remove support for testfail files.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: tools Branch: master Commit: d60f9e51356848f7a8e805e015593a9fa61e9b60 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d60f9e51356848f7a8e805e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 20:08:22 2017 +0100 patches: Remove support for testfail files. Test failures are now detected from Marvin's replies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 1 - patches/update | 5 ----- 2 files changed, 6 deletions(-) diff --git a/patches/expire b/patches/expire index 759f6c8..ba98885 100755 --- a/patches/expire +++ b/patches/expire @@ -397,7 +397,6 @@ foreach my $p (keys %patches) unlink "$dir/$file.order"; unlink "$dir/$file.review"; unlink "$dir/$file.testbot"; - unlink "$dir/$file.testfail"; unlink "$dir/OLD/$file.status"; } } diff --git a/patches/update b/patches/update index 8db8077..6f930ea 100755 --- a/patches/update +++ b/patches/update @@ -213,11 +213,6 @@ foreach my $file (readdir DIR) close LOG; } } - if (-f "$dir/$file.testfail") - { - $patch{"testbot"} = "<a href=\"data/$file.testfail\">Failed</a>"; - $patch{"testclass"} = "testbot botfail"; - } if (defined $patch{"msgid"}) { $messages{$patch{"msgid"}} = \%patch;

1 0

Fabian Maurer : po: Change Mono to wine-mono for clarity.
by Alexandre Julliard Nov. 21, 2017

Nov. 21, 2017

1 0

Aric Stewart : hidclass: Properly NULL terminate device_deviceid_fmtW.
by Alexandre Julliard Nov. 21, 2017

Nov. 21, 2017

Module: wine Branch: master Commit: 0e6d749a0e18d97fc999372860f37bcc1974b6d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e6d749a0e18d97fc99937286… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 21 14:00:00 2017 -0600 hidclass: Properly NULL terminate device_deviceid_fmtW. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index b92457f..30d1045 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); static const WCHAR device_enumeratorW[] = {'H','I','D',0}; static const WCHAR separator_W[] = {'\\',0}; static const WCHAR device_deviceid_fmtW[] = {'%','s','\\', - 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', '0','4','x'}; + 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', '0','4','x',0}; static NTSTATUS WINAPI internalComplete(DEVICE_OBJECT *deviceObject, IRP *irp, void *context)

1 0

Alex Henrie : comctl32/tests: Detect and handle an RTL locale.
by Alexandre Julliard Nov. 21, 2017

Nov. 21, 2017

Module: wine Branch: master Commit: b8d01f9e1e8c44df5172c4cbfae627158930db72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d01f9e1e8c44df5172c4cbf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 20 22:54:35 2017 -0700 comctl32/tests: Detect and handle an RTL locale. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index a3f910d..ec53e6b 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -29,11 +29,19 @@ static HWND parenthwnd; static HWND sheethwnd; +static BOOL rtl; static LONG active_page = -1; #define IDC_APPLY_BUTTON 12321 +static void detect_locale(void) +{ + DWORD reading_layout; + rtl = GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER, + (void *)&reading_layout, sizeof(reading_layout)) && reading_layout == 1; +} + /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -496,19 +504,28 @@ static void test_buttons(void) button = GetDlgItem(hdlg, IDCANCEL); GetWindowRect(button, &rc); ok(rc.top == top, "Cancel button should have same top as OK button\n"); - ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); + if (rtl) + ok(rc.left < prevRight, "Cancel button should be to the left of OK button\n"); + else + ok(rc.left > prevRight, "Cancel button should be to the right of OK button\n"); prevRight = rc.right; button = GetDlgItem(hdlg, IDC_APPLY_BUTTON); GetWindowRect(button, &rc); ok(rc.top == top, "Apply button should have same top as OK button\n"); - ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); + if (rtl) + ok(rc.left < prevRight, "Apply button should be to the left of Cancel button\n"); + else + ok(rc.left > prevRight, "Apply button should be to the right of Cancel button\n"); prevRight = rc.right; button = GetDlgItem(hdlg, IDHELP); GetWindowRect(button, &rc); ok(rc.top == top, "Help button should have same top as OK button\n"); - ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); + if (rtl) + ok(rc.left < prevRight, "Help button should be to the left of Apply button\n"); + else + ok(rc.left > prevRight, "Help button should be to the right of Apply button\n"); DestroyWindow(hdlg); } @@ -1124,6 +1141,15 @@ static void test_CreatePropertySheetPage(void) START_TEST(propsheet) { + detect_locale(); + if (rtl) + { + /* use locale-specific RTL resources when on an RTL locale */ + /* without this, propsheets on RTL locales use English LTR resources */ + trace("RTL locale detected\n"); + SetProcessDefaultLayout(LAYOUT_RTL); + } + test_title(); test_nopage(); test_disableowner();

1 0

Alexandre Julliard : ntdll: Set the initial process context on ARM.
by Alexandre Julliard Nov. 21, 2017

Nov. 21, 2017

Module: wine Branch: master Commit: 5e3cf758d15fb468b7860c41ac72282c45be9609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3cf758d15fb468b7860c41a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 20:03:20 2017 +0100 ntdll: Set the initial process context on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e5e3140..bbd6c59 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1011,7 +1011,12 @@ void signal_init_process( CONTEXT *context, LPTHREAD_START_ROUTINE entry ) if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; #endif - /* FIXME: set the initial context */ + /* set the initial context */ + context->ContextFlags = CONTEXT_FULL; + context->R0 = (DWORD)kernel32_start_process; + context->R1 = (DWORD)entry; + context->Sp = (DWORD)NtCurrentTeb()->Tib.StackBase; + context->Pc = (DWORD)call_thread_entry_point; return; error:

1 0

Vincent Povirk : gphoto2.ds: Send notifications through the DSM.
by Alexandre Julliard Nov. 21, 2017

Nov. 21, 2017

Module: wine Branch: master Commit: ddbf3c6ae6bb46483af71af9faf4505d067ee837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbf3c6ae6bb46483af71af9f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 21 15:48:27 2017 -0600 gphoto2.ds: Send notifications through the DSM. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/gphoto2_i.h | 6 ++-- dlls/gphoto2.ds/gphoto2_main.c | 64 +++++++++++++++++++++++++++++++----------- 2 files changed, 49 insertions(+), 21 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index edc4d91..9ab8bbb 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -73,12 +73,10 @@ struct gphoto2_file { /* internal information about an active data source */ struct tagActiveDS { - TW_IDENTITY identity; /* identity */ + TW_IDENTITY identity; /* identity of the data source */ + TW_IDENTITY appIdentity; /* identity of the app */ TW_UINT16 currentState; /* current state */ - TW_EVENT pendingEvent; /* pending event to be sent to - application */ TW_UINT16 twCC; /* condition code */ - HWND hwndOwner; /* window handle of the app */ HWND progressWnd; /* window handle of the scanning window */ #ifdef HAVE_GPHOTO2 diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index acc3aa6..2810041 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +DSMENTRYPROC GPHOTO2_dsmentry; #ifdef HAVE_GPHOTO2 static char* GPHOTO2_StrDup(const char* str) @@ -295,11 +296,25 @@ static TW_UINT16 GPHOTO2_FileSystemRename (pTW_IDENTITY pOrigin, return TWRC_FAILURE; } +static void GPHOTO2_Notify (TW_UINT16 message) +{ + GPHOTO2_dsmentry (&activeDS.identity, &activeDS.appIdentity, DG_CONTROL, DAT_NULL, message, NULL); +} + +/* DG_CONTROL/DAT_ENTRYPOINT/MSG_SET */ +static TW_UINT16 GPHOTO2_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData) +{ + TW_ENTRYPOINT *entry = (TW_ENTRYPOINT*)pData; + + GPHOTO2_dsmentry = entry->DSM_Entry; + + return TWRC_SUCCESS; +} + /* DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT */ static TW_UINT16 GPHOTO2_ProcessEvent (pTW_IDENTITY pOrigin, TW_MEMREF pData) { - TW_UINT16 twRC = TWRC_SUCCESS; pTW_EVENT pEvent = (pTW_EVENT) pData; TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT\n"); @@ -309,16 +324,9 @@ static TW_UINT16 GPHOTO2_ProcessEvent (pTW_IDENTITY pOrigin, return TWRC_FAILURE; } - if (activeDS.pendingEvent.TWMessage != MSG_NULL) { - pEvent->TWMessage = activeDS.pendingEvent.TWMessage; - activeDS.pendingEvent.TWMessage = MSG_NULL; - twRC = TWRC_SUCCESS; - } else { - pEvent->TWMessage = MSG_NULL; /* no message to the application */ - twRC = TWRC_NOTDSEVENT; - } + pEvent->TWMessage = MSG_NULL; /* no message to the application */ activeDS.twCC = TWCC_SUCCESS; - return twRC; + return TWRC_NOTDSEVENT; } /* DG_CONTROL/DAT_PASSTHRU/MSG_PASSTHRU */ @@ -356,7 +364,7 @@ static TW_UINT16 GPHOTO2_PendingXfersEndXfer (pTW_IDENTITY pOrigin, } else { activeDS.currentState = 5; /* Notify the application that it can close the data source */ - activeDS.pendingEvent.TWMessage = MSG_CLOSEDSREQ; + GPHOTO2_Notify(MSG_CLOSEDSREQ); /* close any Transferring dialog */ TransferringDialogBox(activeDS.progressWnd,-1); activeDS.progressWnd = 0; @@ -502,25 +510,23 @@ static TW_UINT16 GPHOTO2_EnableDSUserInterface (pTW_IDENTITY pOrigin, activeDS.twCC = TWCC_SEQERROR; return TWRC_FAILURE; } - activeDS.hwndOwner = pUserInterface->hParent; if (pUserInterface->ShowUI) { BOOL rc; activeDS.currentState = 5; /* Transitions to state 5 */ rc = DoCameraUI(); if (!rc) { - activeDS.pendingEvent.TWMessage = MSG_CLOSEDSREQ; + GPHOTO2_Notify(MSG_CLOSEDSREQ); } else { /* FIXME: The GUI should have marked the files to download... */ - activeDS.pendingEvent.TWMessage = MSG_XFERREADY; + GPHOTO2_Notify(MSG_XFERREADY); activeDS.currentState = 6; /* Transitions to state 6 directly */ } } else { /* no UI will be displayed, so source is ready to transfer data */ - activeDS.pendingEvent.TWMessage = MSG_XFERREADY; + GPHOTO2_Notify(MSG_XFERREADY); activeDS.currentState = 6; /* Transitions to state 6 directly */ } - activeDS.hwndOwner = pUserInterface->hParent; activeDS.twCC = TWCC_SUCCESS; return TWRC_SUCCESS; } @@ -704,6 +710,13 @@ static TW_UINT16 GPHOTO2_SourceControlHandler ( } break; + case DAT_ENTRYPOINT: + if (MSG == MSG_SET) + twRC = GPHOTO2_SetEntryPoint (pOrigin, pData); + else + twRC = TWRC_FAILURE; + break; + case DAT_EVENT: if (MSG == MSG_PROCESSEVENT) twRC = GPHOTO2_ProcessEvent (pOrigin, pData); @@ -1086,7 +1099,7 @@ GPHOTO2_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { TRACE("%d cameras detected.\n", count); self->ProtocolMajor = TWON_PROTOCOLMAJOR; self->ProtocolMinor = TWON_PROTOCOLMINOR; - self->SupportedGroups = DG_CONTROL | DG_IMAGE; + self->SupportedGroups = DG_CONTROL | DG_IMAGE | DF_DS2; lstrcpynA (self->Manufacturer, "The Wine Team", sizeof(self->Manufacturer) - 1); lstrcpynA (self->ProductFamily, "GPhoto2 Camera", sizeof(self->ProductFamily) - 1); @@ -1111,6 +1124,21 @@ GPHOTO2_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { GPPortInfo info; const char *model, *port; + if (GPHOTO2_dsmentry == NULL) + { + static const WCHAR twain32W[] = {'t','w','a','i','n','_','3','2',0}; + HMODULE moddsm = GetModuleHandleW(twain32W); + + if (moddsm) + GPHOTO2_dsmentry = (void*)GetProcAddress(moddsm, "DSM_Entry"); + + if (!GPHOTO2_dsmentry) + { + ERR("can't find DSM entry point\n"); + return TWRC_FAILURE; + } + } + if (TWRC_SUCCESS != gphoto2_auto_detect()) return TWRC_FAILURE; @@ -1193,6 +1221,8 @@ GPHOTO2_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { activeDS.pixelflavor = TWPF_CHOCOLATE; activeDS.pixeltype = TWPT_RGB; activeDS.capXferMech = TWSX_MEMORY; + activeDS.identity.Id = self->Id; + activeDS.appIdentity = *pOrigin; TRACE("OK!\n"); return TWRC_SUCCESS; }

1 0

Nikolay Sivov : gdiplus/tests: Some tests for GdipGetFontCollectionFamilyList() and system collection.
by Alexandre Julliard Nov. 21, 2017

Nov. 21, 2017

Module: wine Branch: master Commit: 4616954a9dc25ab9246fa43bbcd30ac3b7ec7992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4616954a9dc25ab9246fa43bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 21 09:32:07 2017 +0300 gdiplus/tests: Some tests for GdipGetFontCollectionFamilyList() and system collection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 2cae481..6c7738c 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1110,6 +1110,60 @@ todo_wine DeleteDC(hdc); } +static void test_GdipGetFontCollectionFamilyList(void) +{ + GpFontFamily *family, *family2; + GpFontCollection *collection; + INT found, count; + GpStatus status; + + status = GdipNewInstalledFontCollection(&collection); + ok(status == Ok, "Failed to get system collection, status %d.\n", status); + + count = 0; + status = GdipGetFontCollectionFamilyCount(collection, &count); + ok(status == Ok, "Failed to get family count, status %d.\n", status); + ok(count > 0, "Unexpected empty collection.\n"); + + status = GdipGetFontCollectionFamilyList(NULL, 0, NULL, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + + found = 123; + status = GdipGetFontCollectionFamilyList(NULL, 0, NULL, &found); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(found == 123, "Unexpected list count %d.\n", found); + + status = GdipGetFontCollectionFamilyList(collection, 0, NULL, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + + found = 123; + status = GdipGetFontCollectionFamilyList(collection, 0, NULL, &found); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(found == 123, "Unexpected list count %d.\n", found); + + found = 123; + status = GdipGetFontCollectionFamilyList(collection, 1, NULL, &found); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(found == 123, "Unexpected list count %d.\n", found); + + family = NULL; + found = 0; + status = GdipGetFontCollectionFamilyList(collection, 1, &family, &found); + ok(status == Ok, "Failed to get family list, status %d.\n", status); + ok(found == 1, "Unexpected list count %d.\n", found); + ok(family != NULL, "Expected family instance.\n"); + + family = NULL; + found = 0; + status = GdipGetFontCollectionFamilyList(collection, 1, &family2, &found); + ok(status == Ok, "Failed to get family list, status %d.\n", status); + ok(found == 1, "Unexpected list count %d.\n", found); + ok(family2 != family, "Unexpected family instance.\n"); + + GdipDeleteFontFamily(family); + GdipDeleteFontFamily(family2); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1139,6 +1193,7 @@ START_TEST(font) test_getgenerics(); test_installedfonts(); test_heightgivendpi(); + test_GdipGetFontCollectionFamilyList(); GdiplusShutdown(gdiplusToken); }

1 0

Huw Davies : ole32/tests: Use a separate data source for the file dib to avoid confusion.
by Alexandre Julliard Nov. 21, 2017

Nov. 21, 2017

Module: wine Branch: master Commit: ddd1882396b6043f544802a8f44e1d1c31607b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddd1882396b6043f544802a8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 21 09:37:03 2017 +0000 ole32/tests: Use a separate data source for the file dib to avoid confusion. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 51 ++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 1a982b4..07157a7 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -199,19 +199,14 @@ static void inline check_expected_method_fmt(const char *method_name, const FORM } while (0) /* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ -static BYTE dib[] = -{ - 0x42, 0x4d, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, - - 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x00, - 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +static const BYTE dib[] = +{ + 0x28, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc8, 0x00, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; static void create_dib( STGMEDIUM *med ) @@ -219,9 +214,9 @@ static void create_dib( STGMEDIUM *med ) void *ptr; med->tymed = TYMED_HGLOBAL; - U(med)->hGlobal = GlobalAlloc( GMEM_MOVEABLE, sizeof(dib) - sizeof(BITMAPFILEHEADER) ); + U(med)->hGlobal = GlobalAlloc( GMEM_MOVEABLE, sizeof(dib) ); ptr = GlobalLock( U(med)->hGlobal ); - memcpy( ptr, dib + sizeof(BITMAPFILEHEADER), sizeof(dib) - sizeof(BITMAPFILEHEADER) ); + memcpy( ptr, dib, sizeof(dib) ); GlobalUnlock( U(med)->hGlobal ); med->pUnkForRelease = NULL; } @@ -2038,9 +2033,21 @@ static void test_data_cache(void) IStorage_Release(pStorage); } - static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; +/* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ +static BYTE file_dib[] = +{ + 0x42, 0x4d, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x00, + 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +}; + static IStorage *create_storage( int num ) { IStorage *stg; @@ -2056,10 +2063,10 @@ static IStorage *create_storage( int num ) ok( hr == S_OK, "got %08x\n", hr); if (num == 1) /* Set biXPelsPerMeter = 0 */ { - dib[0x26] = 0; - dib[0x27] = 0; + file_dib[0x26] = 0; + file_dib[0x27] = 0; } - hr = IStream_Write( stm, dib, sizeof(dib), &written ); + hr = IStream_Write( stm, file_dib, sizeof(file_dib), &written ); ok( hr == S_OK, "got %08x\n", hr); IStream_Release( stm ); return stg; @@ -2114,7 +2121,7 @@ static void test_data_cache_dib_contents_stream(int num) "got %lu\n", GlobalSize( U(med).hGlobal ) ); ptr = GlobalLock( U(med).hGlobal ); - expect_info = *(BITMAPINFOHEADER *)(dib + sizeof(BITMAPFILEHEADER)); + expect_info = *(BITMAPINFOHEADER *)(file_dib + sizeof(BITMAPFILEHEADER)); if (expect_info.biXPelsPerMeter == 0 || expect_info.biYPelsPerMeter == 0) { HDC hdc = GetDC( 0 ); @@ -2123,8 +2130,8 @@ static void test_data_cache_dib_contents_stream(int num) ReleaseDC( 0, hdc ); } ok( !memcmp( ptr, &expect_info, sizeof(expect_info) ), "mismatch\n" ); - ok( !memcmp( ptr + sizeof(expect_info), dib + sizeof(BITMAPFILEHEADER) + sizeof(expect_info), - sizeof(dib) - sizeof(BITMAPFILEHEADER) - sizeof(expect_info) ), "mismatch\n" ); + ok( !memcmp( ptr + sizeof(expect_info), file_dib + sizeof(BITMAPFILEHEADER) + sizeof(expect_info), + sizeof(file_dib) - sizeof(BITMAPFILEHEADER) - sizeof(expect_info) ), "mismatch\n" ); GlobalUnlock( U(med).hGlobal ); ReleaseStgMedium( &med );

1 0

Alexandre Julliard : ntdll: Delay attaching to dlls loaded because of a forwarded entry point.
by Alexandre Julliard Nov. 21, 2017

Nov. 21, 2017

Module: wine Branch: master Commit: ed893d3591802bb562d100b277f968be402af740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed893d3591802bb562d100b27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 13:13:35 2017 +0100 ntdll: Delay attaching to dlls loaded because of a forwarded entry point. Based on a patch by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 820398b..70f99e6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -473,7 +473,21 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (load_dll( load_path, mod_name, 0, &wm ) == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { - if (process_attach( wm, NULL ) != STATUS_SUCCESS) + if (!imports_fixup_done && current_modref) + { + WINE_MODREF **deps; + if (current_modref->nDeps) + deps = RtlReAllocateHeap( GetProcessHeap(), 0, current_modref->deps, + (current_modref->nDeps + 1) * sizeof(*deps) ); + else + deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*deps) ); + if (deps) + { + deps[current_modref->nDeps++] = wm; + current_modref->deps = deps; + } + } + else if (process_attach( wm, NULL ) != STATUS_SUCCESS) { LdrUnloadDll( wm->ldr.BaseAddress ); wm = NULL; @@ -906,7 +920,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) { int i, nb_imports; const IMAGE_IMPORT_DESCRIPTOR *imports; - WINE_MODREF *prev; + WINE_MODREF *prev, *imp; DWORD size; NTSTATUS status; ULONG_PTR cookie; @@ -940,11 +954,12 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) status = STATUS_SUCCESS; for (i = 0; i < nb_imports; i++) { - if (!import_dll( wm->ldr.BaseAddress, &imports[i], load_path, &wm->deps[i] )) + if (!import_dll( wm->ldr.BaseAddress, &imports[i], load_path, &imp )) { - wm->deps[i] = NULL; + imp = NULL; status = STATUS_DLL_NOT_FOUND; } + wm->deps[i] = imp; } current_modref = prev; if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie );

1 0

Alexandre Julliard : ntdll: Use a separate stack when starting new threads.
by Alexandre Julliard Nov. 21, 2017

Nov. 21, 2017

Module: wine Branch: master Commit: 9e093936e27a29993979f36c18d6c627e36bd737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e093936e27a29993979f36c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 13:50:43 2017 +0100 ntdll: Use a separate stack when starting new threads. Based on a patch by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index ce0ba68..f403b12 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -23,6 +23,7 @@ #include <assert.h> #include <stdarg.h> +#include <limits.h> #include <sys/types.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> @@ -468,6 +469,24 @@ void exit_thread( int status ) /*********************************************************************** + * thread_startup + */ +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + PRTL_THREAD_START_ROUTINE func = info->entry_point; + void *arg = info->entry_arg; + + attach_dlls( (void *)1 ); + + if (TRACE_ON(relay)) + DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); + + call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); +} + + +/*********************************************************************** * start_thread * * Startup routine for a newly created thread. @@ -476,8 +495,6 @@ static void start_thread( struct startup_info *info ) { TEB *teb = info->teb; struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - PRTL_THREAD_START_ROUTINE func = info->entry_point; - void *arg = info->entry_arg; struct debug_info debug_info; debug_info.str_pos = debug_info.strings; @@ -486,14 +503,9 @@ static void start_thread( struct startup_info *info ) thread_data->pthread_id = pthread_self(); signal_init_thread( teb ); - server_init_thread( func ); + server_init_thread( info->entry_point ); - attach_dlls( (void *)1 ); - - if (TRACE_ON(relay)) - DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); - - call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); + wine_switch_to_stack( thread_startup, info, teb->Tib.StackBase ); } @@ -603,8 +615,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * if ((status = virtual_alloc_thread_stack( teb, stack_reserve, stack_commit ))) goto error; pthread_attr_init( &attr ); - pthread_attr_setstack( &attr, teb->DeallocationStack, - (char *)teb->Tib.StackBase - (char *)teb->DeallocationStack ); + pthread_attr_setstacksize( &attr, PTHREAD_STACK_MIN ); pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ interlocked_xchg_add( &nb_threads, 1 ); if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info ))

1 0

Francois Gouget : testbot/WineSendLog: Don' t try to add a MessageId if there is no Patch object.
by Alexandre Julliard Nov. 21, 2017

Nov. 21, 2017

Module: tools Branch: master Commit: 06a0d0208ceb5d43d139d99fe9690eedc7067142 URL: http://source.winehq.org/git/tools.git/?a=commit;h=06a0d0208ceb5d43d139d99f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 20 19:00:29 2017 +0100 testbot/WineSendLog: Don't try to add a MessageId if there is no Patch object. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 1bb37f4..eadfe77 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -189,7 +189,7 @@ sub SendLog($) $Subject .= ": " . $Description; } print SENDMAIL "Subject: $Subject\n"; - if ($Job->Patch->MessageId) + if ($Job->Patch and $Job->Patch->MessageId) { print SENDMAIL "In-Reply-To: ", $Job->Patch->MessageId, "\n"; print SENDMAIL "References: ", $Job->Patch->MessageId, "\n";

1 0

Hans Leidekker : wbemprox: Support NULL tests that use equality operators.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: wine Branch: master Commit: b5633cc69b9fb8ff15e631ede40cc49c70027dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5633cc69b9fb8ff15e631ede… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 20 15:07:03 2017 +0100 wbemprox: Support NULL tests that use equality operators. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 8 +++++++- dlls/wbemprox/wql.y | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 083a717..79b09c0 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -106,8 +106,14 @@ static void test_select( IWbemServices *services ) {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', 'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',' ','w','h','e','r','e',' ', 'a','v','a','i','l','a','b','i','l','i','t','y',' ','=',' ','\'','3','\'',0}; + static const WCHAR query12[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S', + ' ','W','H','E','R','E',' ','N','A','M','E',' ','<','>',' ','N','U','L','L', 0}; + static const WCHAR query13[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','I','O','S', + ' ','W','H','E','R','E',' ','N','U','L','L',' ','=',' ','N','A','M','E', 0}; static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10, - query11 }; + query11, query12, query13 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW ); diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 98b0378..88da2b9 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -414,6 +414,30 @@ expr: if (!$$) YYABORT; } + | prop_val TK_EQ TK_NULL + { + $$ = expr_unary( ctx, $1, OP_ISNULL ); + if (!$$) + YYABORT; + } + | TK_NULL TK_EQ prop_val + { + $$ = expr_unary( ctx, $3, OP_ISNULL ); + if (!$$) + YYABORT; + } + | prop_val TK_NE TK_NULL + { + $$ = expr_unary( ctx, $1, OP_NOTNULL ); + if (!$$) + YYABORT; + } + | TK_NULL TK_NE prop_val + { + $$ = expr_unary( ctx, $3, OP_NOTNULL ); + if (!$$) + YYABORT; + } ; string_val:

1 0

Huw Davies : comctl32: Don' t create a masked imagelist if CLR_NONE is specified.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: wine Branch: master Commit: 92e999f34bff4a27112d22a6d48176daa20ad5f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e999f34bff4a27112d22a6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 20 13:26:16 2017 +0000 comctl32: Don't create a masked imagelist if CLR_NONE is specified. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 3 ++- dlls/comctl32/tests/imagelist.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 157344c..70457c7 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2037,7 +2037,8 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, nImageCount = dib.dsBm.bmWidth / cx; - himl = ImageList_Create (cx, dib.dsBm.bmHeight, ILC_MASK | color, nImageCount, cGrow); + if (clrMask != CLR_NONE) color |= ILC_MASK; + himl = ImageList_Create (cx, dib.dsBm.bmHeight, color, nImageCount, cGrow); if (!himl) { DeleteObject (handle); return NULL; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 20be1ea..a489176 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -39,6 +39,7 @@ #include "wine/test.h" #include "v6util.h" +#include "resources.h" #define IMAGELIST_MAGIC (('L' << 8) | 'I') @@ -67,6 +68,7 @@ static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, REFIID,void **); static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); static int (WINAPI *pImageList_SetColorTable)(HIMAGELIST,int,int,RGBQUAD*); +static DWORD (WINAPI *pImageList_GetFlags)(HIMAGELIST); static HINSTANCE hinst; @@ -2237,6 +2239,26 @@ static void test_copy(void) ImageList_Destroy(src); } +static void test_loadimage(void) +{ + HIMAGELIST list; + DWORD flags; + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_DEFAULT, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == (ILC_COLOR4 | ILC_MASK), "got %08x\n", flags ); + ImageList_Destroy( list ); + + list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_NONE, + IMAGE_BITMAP, LR_CREATEDIBSECTION ); + ok( list != NULL, "got %p\n", list ); + flags = pImageList_GetFlags( list ); + ok( flags == ILC_COLOR4, "got %08x\n", flags ); + ImageList_Destroy( list ); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2370,6 +2392,7 @@ START_TEST(imagelist) pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); pImageList_SetColorTable = (void*)GetProcAddress(hComCtl32, (const char*)390); + pImageList_GetFlags = (void*)GetProcAddress(hComCtl32, "ImageList_GetFlags"); hinst = GetModuleHandleA(NULL); @@ -2388,6 +2411,7 @@ START_TEST(imagelist) test_color_table(ILC_COLOR4); test_color_table(ILC_COLOR8); test_copy(); + test_loadimage(); FreeLibrary(hComCtl32);

1 0

Fabian Maurer : user32/tests: Test manually setting WS_VSCROLL on combobox listbox.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: wine Branch: master Commit: ca1c64d37dc2698a3a53a2ab60bb3e410e61fcde URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1c64d37dc2698a3a53a2ab6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Nov 11 21:56:40 2017 +0100 user32/tests: Test manually setting WS_VSCROLL on combobox listbox. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/combo.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 03fc412..0519ace 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -806,11 +806,54 @@ static void test_listbox_size(DWORD style) } } +void test_WS_VSCROLL(void) +{ + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + HWND hCombo, hList; + COMBOBOXINFO info; + DWORD style; + BOOL ret; + int i; + + pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo) + { + win_skip("GetComboBoxInfo is not available\n"); + return; + } + info.cbSize = sizeof(info); + hCombo = build_combo(CBS_DROPDOWNLIST); + + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &info); + ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); + hList = info.hwndList; + + for(i = 0; i < 3; i++) + { + char buffer[2]; + sprintf(buffer, "%d", i); + SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM)buffer); + } + + style = GetWindowLongA(info.hwndList, GWL_STYLE); + SetWindowLongA(hList, GWL_STYLE, style | WS_VSCROLL); + + SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE, 0); + SendMessageA(hCombo, CB_SHOWDROPDOWN, FALSE, 0); + + style = GetWindowLongA(hList, GWL_STYLE); + ok((style & WS_VSCROLL) != 0, "Style does not include WS_VSCROLL\n"); + + DestroyWindow(hCombo); +} + START_TEST(combo) { hMainWnd = CreateWindowA("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); + test_WS_VSCROLL(); test_setfont(CBS_DROPDOWN); test_setfont(CBS_DROPDOWNLIST); test_setitemheight(CBS_DROPDOWN);

1 0

Fabian Maurer : comdlg32/fontdlg: Allow setting value by typing it into the edit fields.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: wine Branch: master Commit: aa7941d41b2c66066dbc281bfa57364c1a60d863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7941d41b2c66066dbc281bf… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Nov 11 16:15:17 2017 +0100 comdlg32/fontdlg: Allow setting value by typing it into the edit fields. The font-dialog allows the user to select a value from the combobox by typing it into its edit field. This operation seems unique to the fontdialog. It works case-insensitively and doesn't change the selection in the edit field. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index c08b246..82992cb 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -940,14 +940,37 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO int i; long l; HDC hdc; + BOOL cmb_selected_by_edit = FALSE; if (!lpcf) return FALSE; + if(HIWORD(wParam) == CBN_EDITCHANGE) + { + int idx; + WCHAR str_edit[256], str_cmb[256]; + int cmb = LOWORD(wParam); + + GetDlgItemTextW(hDlg, cmb, str_edit, sizeof(str_edit) / sizeof(str_edit[0])); + idx = SendDlgItemMessageW(hDlg, cmb, CB_FINDSTRING, -1, (LPARAM)str_edit); + if(idx != -1) + { + SendDlgItemMessageW(hDlg, cmb, CB_GETLBTEXT, idx, (LPARAM)str_cmb); + + /* Select listbox entry only if we have an exact match */ + if(lstrcmpiW(str_edit, str_cmb) == 0) + { + SendDlgItemMessageW(hDlg, cmb, CB_SETCURSEL, idx, 0); + SendDlgItemMessageW(hDlg, cmb, CB_SETEDITSEL, 0, -1); /* Remove edit field selection */ + cmb_selected_by_edit = TRUE; + } + } + } + TRACE("WM_COMMAND wParam=%08X lParam=%08lX\n", (LONG)wParam, lParam); switch (LOWORD(wParam)) { case cmb1: - if (HIWORD(wParam)==CBN_SELCHANGE) + if (HIWORD(wParam) == CBN_SELCHANGE || cmb_selected_by_edit) { INT pointsize; /* save current pointsize */ LONG pstyle; /* save current style */ @@ -998,7 +1021,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO case cmb2: case cmb3: case cmb5: - if (HIWORD(wParam)==CBN_SELCHANGE || HIWORD(wParam)== BN_CLICKED ) + if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == BN_CLICKED || cmb_selected_by_edit) { WCHAR str[256]; WINDOWINFO wininfo;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: wine Branch: master Commit: a6a477dd58f20c9868d0ffb19f0b5684c25ee2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a477dd58f20c9868d0ffb19… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Nov 18 20:45:42 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index dfe14e8..6c4fc9c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-11-15 21:43+0300\n" +"PO-Revision-Date: 2017-11-18 20:45+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8922,10 +8922,8 @@ msgid " sec" msgstr " sek." #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Parinkite aplanką" +msgstr "Parinkite šaltinį" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning"

1 0

Alexandre Julliard : ntdll: Fixup imports in the first thread that runs, even if it's not the main one.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: wine Branch: master Commit: 8477ae27a87355d98035153927548b4b57d856f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8477ae27a87355d9803515392… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 17:09:29 2017 +0100 ntdll: Fixup imports in the first thread that runs, even if it's not the main one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 1 - dlls/ntdll/loader.c | 85 ++++++++++++++++++++++++------------------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/thread.c | 4 +- 4 files changed, 50 insertions(+), 42 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index bb91ec9..6790185 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3060,7 +3060,6 @@ static void test_SuspendProcessNewThread(void) ok(exit_code == 0x1234, "Invalid remote thread exit code\n"); ret = are_imports_resolved(pi.hProcess, exe_base, &nt_header); - todo_wine ok(ret, "EXE IAT entry not resolved\n"); if (thread_handle) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9c89d57..820398b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -64,6 +64,7 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); typedef void (CALLBACK *LDRENUMPROC)(LDR_MODULE *, void *, BOOLEAN *); +static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */ static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ @@ -1326,28 +1327,16 @@ static void process_detach(void) } /************************************************************************* - * MODULE_DllThreadAttach + * thread_attach * * Send DLL thread attach notifications. These are sent in the * reverse sequence of process detach notification. - * + * The loader_section must be locked while calling this function. */ -NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ) +static void thread_attach(void) { PLIST_ENTRY mark, entry; PLDR_MODULE mod; - NTSTATUS status; - - /* don't do any attach calls if process is exiting */ - if (process_detaching) return STATUS_SUCCESS; - - RtlEnterCriticalSection( &loader_section ); - - RtlAcquirePebLock(); - InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); - RtlReleasePebLock(); - - if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto done; mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; for (entry = mark->Flink; entry != mark; entry = entry->Flink) @@ -1359,13 +1348,8 @@ NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ) if ( mod->Flags & LDR_NO_DLL_CALLS ) continue; - MODULE_InitDLL( CONTAINING_RECORD(mod, WINE_MODREF, ldr), - DLL_THREAD_ATTACH, lpReserved ); + MODULE_InitDLL( CONTAINING_RECORD(mod, WINE_MODREF, ldr), DLL_THREAD_ATTACH, NULL ); } - -done: - RtlLeaveCriticalSection( &loader_section ); - return status; } /****************************************************************** @@ -3014,25 +2998,57 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) /*********************************************************************** - * attach_process_dlls + * attach_dlls * - * Initial attach to all the dlls loaded by the process. + * Attach to all the loaded dlls. + * If this is the first time, perform the full process initialization. */ -static NTSTATUS attach_process_dlls( void *wm ) +NTSTATUS attach_dlls( void *reserved ) { NTSTATUS status; + WINE_MODREF *wm; + LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); + if (process_detaching) return STATUS_SUCCESS; + RtlEnterCriticalSection( &loader_section ); - if ((status = process_attach( wm, (LPVOID)1 )) != STATUS_SUCCESS) + + wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); + assert( wm ); + + if (!imports_fixup_done) { - if (last_failed_modref) - ERR( "%s failed to initialize, aborting\n", - debugstr_w(last_failed_modref->ldr.BaseDllName.Buffer) + 1 ); - return status; + actctx_init(); + if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto done; + imports_fixup_done = TRUE; } - attach_implicitly_loaded_dlls( (LPVOID)1 ); + + RtlAcquirePebLock(); + InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); + RtlReleasePebLock(); + + if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto done; + + if (!(wm->ldr.Flags & LDR_PROCESS_ATTACHED)) /* first time around */ + { + if ((status = process_attach( wm, reserved )) != STATUS_SUCCESS) + { + if (last_failed_modref) + ERR( "%s failed to initialize, aborting\n", + debugstr_w(last_failed_modref->ldr.BaseDllName.Buffer) + 1 ); + goto done; + } + attach_implicitly_loaded_dlls( reserved ); + } + else + { + thread_attach(); + status = STATUS_SUCCESS; + } + +done: RtlLeaveCriticalSection( &loader_section ); return status; } @@ -3109,7 +3125,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; NTSTATUS status; WINE_MODREF *wm; - LPCWSTR load_path; PEB *peb = NtCurrentTeb()->Peb; CONTEXT context = { 0 }; @@ -3134,6 +3149,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, LdrQueryImageFileExecutionOptions( &peb->ProcessParameters->ImagePathName, globalflagW, REG_DWORD, &peb->NtGlobalFlag, sizeof(peb->NtGlobalFlag), NULL ); + heap_set_debug_flags( GetProcessHeap() ); /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); @@ -3144,12 +3160,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0 )) != STATUS_SUCCESS) goto error; if ((status = server_init_process_done( &context )) != STATUS_SUCCESS) goto error; - actctx_init(); - load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; - heap_set_debug_flags( GetProcessHeap() ); - - status = wine_call_on_stack( attach_process_dlls, wm, (char *)NtCurrentTeb()->Tib.StackBase - page_size ); + status = wine_call_on_stack( attach_dlls, (void *)1, (char *)NtCurrentTeb()->Tib.StackBase - page_size ); if (status != STATUS_SUCCESS) goto error; virtual_release_address_space(); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 907bbdd..e469afd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -104,7 +104,7 @@ extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; -extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ) DECLSPEC_HIDDEN; +extern NTSTATUS attach_dlls( void *unused ) DECLSPEC_HIDDEN; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 85ceb2b..ce0ba68 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -349,7 +349,6 @@ HANDLE thread_init(void) thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; thread_data->debug_info = &debug_info; - InsertHeadList( &tls_links, &teb->TlsLinks ); signal_init_thread( teb ); virtual_init_threading(); @@ -488,9 +487,8 @@ static void start_thread( struct startup_info *info ) signal_init_thread( teb ); server_init_thread( func ); - pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); - MODULE_DllThreadAttach( NULL ); + attach_dlls( (void *)1 ); if (TRACE_ON(relay)) DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg );

1 0

Jonathan Doron : kernel32/tests: Test suspended process with new thread.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: wine Branch: master Commit: 2f8c9d449b4107bbe1a81dc08ab9f20a752f8bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f8c9d449b4107bbe1a81dc08… Author: Jonathan Doron <jond(a)wizery.com> Date: Mon Nov 20 16:08:10 2017 +0200 kernel32/tests: Test suspended process with new thread. Test the exe imports resolve time if a new thread is being created in a new suspended process. Signed-off-by: Jonathan Doron <jond(a)wizery.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 180 +++++++++++++++++++++++++++--------------- 1 file changed, 118 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f8c9d449b4107bbe1a81…

1 0

Austin English : advapi32: Add initial Perf* stubs.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: wine Branch: master Commit: adc8d95e02e00dcdb48da209219989ad4b70e059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc8d95e02e00dcdb48da2092… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 17 17:40:06 2017 -0600 advapi32: Add initial Perf* stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 1 + dlls/advapi32/advapi32.spec | 14 ++++---- dlls/advapi32/perf.c | 71 +++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 14 ++++---- include/Makefile.in | 1 + include/perflib.h | 58 +++++++++++++++++++++++++++++++++ 6 files changed, 145 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index ff6452a..224286f 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ crypt_sha.c \ eventlog.c \ lsa.c \ + perf.c \ registry.c \ security.c \ service.c \ diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 359efc9..4645f3c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -553,11 +553,11 @@ # @ stub OperationStart # @ stub PerfAddCounters # @ stub PerfCloseQueryHandle -# @ stub PerfCreateInstance +@ stdcall PerfCreateInstance(long ptr wstr long) # @ stub PerfDecrementULongCounterValue # @ stub PerfDecrementULongLongCounterValue # @ stub PerfDeleteCounters -# @ stub PerfDeleteInstance +@ stdcall PerfDeleteInstance(long ptr) # @ stub PerfEnumerateCounterSet # @ stub PerfEnumerateCounterSetInstances # @ stub PerfIncrementULongCounterValue @@ -573,13 +573,13 @@ # @ stub PerfRegQueryInfoKey # @ stub PerfRegQueryValue # @ stub PerfRegSetValue -# @ stub PerfSetCounterRefValue -# @ stub PerfSetCounterSetInfo +@ stdcall PerfSetCounterRefValue(long ptr long ptr) +@ stdcall PerfSetCounterSetInfo(long ptr long) # @ stub PerfSetULongCounterValue # @ stub PerfSetULongLongCounterValue -# @ stub PerfStartProvider -# @ stub PerfStartProviderEx -# @ stub PerfStopProvider +@ stdcall PerfStartProvider(ptr ptr ptr) +@ stdcall PerfStartProviderEx(ptr ptr ptr) +@ stdcall PerfStopProvider(long) @ stdcall PrivilegeCheck(ptr ptr ptr) @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long) @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) diff --git a/dlls/advapi32/perf.c b/dlls/advapi32/perf.c new file mode 100644 index 0000000..754af2a --- /dev/null +++ b/dlls/advapi32/perf.c @@ -0,0 +1,71 @@ +/* + * advapi32 perf functions + * + * Copyright 2017 Austin English + * + * 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 <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "perflib.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); + +PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(HANDLE handle, LPCGUID guid, const WCHAR *name, ULONG id) +{ + FIXME("%p %s %s %u: stub\n", handle, debugstr_guid(guid), debugstr_w(name), id); + return NULL; +} + +ULONG WINAPI PerfDeleteInstance(HANDLE provider, PPERF_COUNTERSET_INSTANCE block) +{ + FIXME("%p %p: stub\n", provider, block); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfSetCounterSetInfo(HANDLE handle, PPERF_COUNTERSET_INFO template, ULONG size) +{ + FIXME("%p %p %u: stub\n", handle, template, size); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE instance, ULONG counterid, void *address) +{ + FIXME("%p %p %u %p: stub\n", provider, instance, counterid, address); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStopProvider(HANDLE handle) +{ + FIXME("%p: stub\n", handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 395b658..1e57fe8 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1144,20 +1144,20 @@ @ stdcall PeekConsoleInputA(ptr ptr long ptr) kernel32.PeekConsoleInputA @ stdcall PeekConsoleInputW(ptr ptr long ptr) kernel32.PeekConsoleInputW @ stdcall PeekNamedPipe(long ptr long ptr ptr ptr) kernel32.PeekNamedPipe -# @ stub PerfCreateInstance +@ stdcall PerfCreateInstance(long ptr wstr long) advapi32.PerfCreateInstance # @ stub PerfDecrementULongCounterValue # @ stub PerfDecrementULongLongCounterValue -# @ stub PerfDeleteInstance +@ stdcall PerfDeleteInstance(long ptr) advapi32.PerfDeleteInstance # @ stub PerfIncrementULongCounterValue # @ stub PerfIncrementULongLongCounterValue # @ stub PerfQueryInstance -# @ stub PerfSetCounterRefValue -# @ stub PerfSetCounterSetInfo +@ stdcall PerfSetCounterRefValue(long ptr long ptr) advapi32.PerfSetCounterRefValue +@ stdcall PerfSetCounterSetInfo(long ptr long) advapi32.PerfSetCounterSetInfo # @ stub PerfSetULongCounterValue # @ stub PerfSetULongLongCounterValue -# @ stub PerfStartProvider -# @ stub PerfStartProviderEx -# @ stub PerfStopProvider +@ stdcall PerfStartProvider(ptr ptr ptr) advapi32.PerfStartProvider +@ stdcall PerfStartProviderEx(ptr ptr ptr) advapi32.PerfStartProviderEx +@ stdcall PerfStopProvider(long) advapi32.PerfStopProvider # @ stub PoolPerAppKeyStateInternal @ stdcall PostQueuedCompletionStatus(long long ptr ptr) kernel32.PostQueuedCompletionStatus # @ stub PrefetchVirtualMemory diff --git a/include/Makefile.in b/include/Makefile.in index d453dc8..fa1e427 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -568,6 +568,7 @@ HEADER_SRCS = \ patchapi.h \ pdh.h \ pdhmsg.h \ + perflib.h \ physicalmonitorenumerationapi.h \ pktdef.h \ poppack.h \ diff --git a/include/perflib.h b/include/perflib.h new file mode 100644 index 0000000..2d3f6ef --- /dev/null +++ b/include/perflib.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2017 Austin English + * + * 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 + */ + +#ifndef _PERFLIB_H_ +#define _PERFLIB_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef LPVOID (CDECL * PERF_MEM_ALLOC)(SIZE_T,LPVOID); +typedef void (CDECL * PERF_MEM_FREE)(LPVOID,LPVOID); +typedef ULONG (WINAPI * PERFLIBREQUEST)(ULONG,PVOID,ULONG); + +typedef struct _PERF_COUNTERSET_INFO { + GUID CounterSetGuid; + GUID ProviderGuid; + ULONG NumCounters; + ULONG InstanceType; +} PERF_COUNTERSET_INFO, * PPERF_COUNTERSET_INFO; + +typedef struct _PERF_COUNTERSET_INSTANCE { + GUID CounterSetGuid; + ULONG dwSize; + ULONG InstanceId; + ULONG InstanceNameOffset; + ULONG InstanceNameSize; +} PERF_COUNTERSET_INSTANCE, * PPERF_COUNTERSET_INSTANCE; + +typedef struct _PROVIDER_CONTEXT { + DWORD ContextSize; + DWORD Reserved; + PERFLIBREQUEST ControlCallback; + PERF_MEM_ALLOC MemAllocRoutine; + PERF_MEM_FREE MemFreeRoutine; + LPVOID pMemContext; +} PERF_PROVIDER_CONTEXT, * PPERF_PROVIDER_CONTEXT; + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _PERFLIB_H_ */

1 0

Fabian Maurer : shell32/tests: Add test for IAutoComplete2 with custom source.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: wine Branch: master Commit: 5e88f928edc13d1c8b00e3d3f9333173ad71f80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e88f928edc13d1c8b00e3d3f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Nov 17 19:54:44 2017 +0100 shell32/tests: Add test for IAutoComplete2 with custom source. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 167 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 63a2eb2..99b394b 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -225,6 +225,171 @@ static void createMainWnd(void) CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, NULL, NULL, GetModuleHandleA(NULL), 0); } +struct string_enumerator +{ + IEnumString IEnumString_iface; + LONG ref; + WCHAR **data; + int data_len; + int cur; +}; + +static struct string_enumerator *impl_from_IEnumString(IEnumString *iface) +{ + return CONTAINING_RECORD(iface, struct string_enumerator, IEnumString_iface); +} + +static HRESULT WINAPI string_enumerator_QueryInterface(IEnumString *iface, REFIID riid, void **ppv) +{ + if (IsEqualGUID(riid, &IID_IEnumString) || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI string_enumerator_AddRef(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + ULONG ref = InterlockedIncrement(&this->ref); + + return ref; +} + +static ULONG WINAPI string_enumerator_Release(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + ULONG ref = InterlockedDecrement(&this->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, this); + + return ref; +} + +static HRESULT WINAPI string_enumerator_Next(IEnumString *iface, ULONG num, LPOLESTR *strings, ULONG *num_returned) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + int i, len; + + *num_returned = 0; + for (i = 0; i < num; i++) + { + if (this->cur >= this->data_len) + return S_FALSE; + + len = lstrlenW(this->data[this->cur]) + 1; + + strings[i] = CoTaskMemAlloc(len * sizeof(WCHAR)); + memcpy(strings[i], this->data[this->cur], len * sizeof(WCHAR)); + + (*num_returned)++; + this->cur++; + } + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + this->cur = 0; + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Skip(IEnumString *iface, ULONG num) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + this->cur += num; + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Clone(IEnumString *iface, IEnumString **out) +{ + *out = NULL; + return E_NOTIMPL; +} + +static IEnumStringVtbl string_enumerator_vtlb = +{ + string_enumerator_QueryInterface, + string_enumerator_AddRef, + string_enumerator_Release, + string_enumerator_Next, + string_enumerator_Skip, + string_enumerator_Reset, + string_enumerator_Clone +}; + +static HRESULT string_enumerator_create(void **ppv, WCHAR **suggestions, int count) +{ + struct string_enumerator *object; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object->IEnumString_iface.lpVtbl = &string_enumerator_vtlb; + object->ref = 1; + object->data = suggestions; + object->data_len = count; + object->cur = 0; + + *ppv = &object->IEnumString_iface; + + return S_OK; +} + +static void test_custom_source(void) +{ + static WCHAR str_alpha[] = {'t','e','s','t','1',0}; + static WCHAR str_alpha2[] = {'t','e','s','t','2',0}; + static WCHAR str_beta[] = {'a','u','t','o',' ','c','o','m','p','l','e','t','e',0}; + static WCHAR *suggestions[] = { str_alpha, str_alpha2, str_beta }; + IUnknown *enumerator; + IAutoComplete2 *autocomplete; + HWND hwnd_edit; + WCHAR buffer[20]; + HRESULT hr; + MSG msg; + + ShowWindow(hMainWnd, SW_SHOW); + + hwnd_edit = CreateWindowA("Edit", "", WS_OVERLAPPED | WS_VISIBLE | WS_CHILD | WS_BORDER, 50, 5, 200, 20, hMainWnd, 0, NULL, 0); + + hr = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, &IID_IAutoComplete2, (void**)&autocomplete); + ok(hr == S_OK, "CoCreateInstance failed: %x\n", hr); + + string_enumerator_create((void**)&enumerator, suggestions, sizeof(suggestions) / sizeof(*suggestions)); + + hr = IAutoComplete2_SetOptions(autocomplete, ACO_AUTOSUGGEST | ACO_AUTOAPPEND); + ok(hr == S_OK, "IAutoComplete2_SetOptions failed: %x\n", hr); + hr = IAutoComplete2_Init(autocomplete, hwnd_edit, enumerator, NULL, NULL); + ok(hr == S_OK, "IAutoComplete_Init failed: %x\n", hr); + + SendMessageW(hwnd_edit, WM_CHAR, 'a', 1); + /* Send a keyup message since wine doesn't handle WM_CHAR yet */ + SendMessageW(hwnd_edit, WM_KEYUP, 'u', 1); + Sleep(100); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + SendMessageW(hwnd_edit, WM_GETTEXT, sizeof(buffer) / sizeof(*buffer), (LPARAM)buffer); + ok(lstrcmpW(str_beta, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_beta), wine_dbgstr_w(buffer)); + + ShowWindow(hMainWnd, SW_HIDE); + DestroyWindow(hwnd_edit); +} + START_TEST(autocomplete) { HRESULT r; @@ -246,6 +411,8 @@ START_TEST(autocomplete) goto cleanup; test_killfocus(); + test_custom_source(); + PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg);

1 0

Vincent Povirk : gphoto2.ds: Set supported groups.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: wine Branch: master Commit: 500f077dd695d8f79b9b27cee0b657d1a98c7197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500f077dd695d8f79b9b27cee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 16 16:07:16 2017 -0600 gphoto2.ds: Set supported groups. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/gphoto2_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 4377090..acc3aa6 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -1086,6 +1086,7 @@ GPHOTO2_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { TRACE("%d cameras detected.\n", count); self->ProtocolMajor = TWON_PROTOCOLMAJOR; self->ProtocolMinor = TWON_PROTOCOLMINOR; + self->SupportedGroups = DG_CONTROL | DG_IMAGE; lstrcpynA (self->Manufacturer, "The Wine Team", sizeof(self->Manufacturer) - 1); lstrcpynA (self->ProductFamily, "GPhoto2 Camera", sizeof(self->ProductFamily) - 1);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: wine Branch: master Commit: 4e67151e073af3b9daba5398208bdb5cf66425e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e67151e073af3b9daba53982… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 18 15:31:51 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index c807f01..33c0375 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-11-15 17:25+0300\n" +"PO-Revision-Date: 2017-11-18 12:12+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -8922,10 +8922,8 @@ msgid " sec" msgstr " сек" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Выберите папку" +msgstr "Выберите источник" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning"

1 0

Francois Gouget : testbot: Replace a non-ascii character in the Item:: PutColValue() documentation.
by Alexandre Julliard Nov. 20, 2017

Nov. 20, 2017

Module: tools Branch: master Commit: 17686c20f3dfddf797245f09789e36d145b4fcd4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=17686c20f3dfddf797245f09… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 20 17:41:39 2017 +0100 testbot: Replace a non-ascii character in the Item::PutColValue() documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Item.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 170f44c..c27e40c 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -173,7 +173,7 @@ then invoke KeyChanged() so the object can be retrieved from the Collection using the new key value. Further note that KeyChanged() should only be called once all of the -primary key??s columns have reached their final values: in a two column +primary key's columns have reached their final values: in a two column primary key, calling KeyChanged() with the (new1, old2) values may collide with another Item which would cause a spurious error even though the final (new1, new2) key is unique.

1 0

Julian Rüger : German translation for release 2.21
by Jeremy Newman Nov. 20, 2017

Nov. 20, 2017

Module: website Branch: master Commit: f3bbed6de279f3917fc3d908d6deb4520f8c740f URL: http://source.winehq.org/git/website.git/?a=commit;h=f3bbed6de279f3917fc3d9… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 17 14:00:23 2017 +0100 German translation for release 2.21 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017111101.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2017111101.xml b/news/de/2017111101.xml new file mode 100644 index 0000000..640e86e --- /dev/null +++ b/news/de/2017111101.xml @@ -0,0 +1,18 @@ +<news> +<date>11. November 2017</date> +<title>Wine 2.21 freigegeben</title> +<body> +<p> Die Entwicklungsversion 2.21 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/2.21">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Weitere Verbesserung der Metafile-Unterstützung in GdiPlus.</li> + <li>Unterstützung von Indirect-Draws in Direct 3D.</li> + <li>Korrekturen der Calling-Convention unter ARM.</li> + <li>Verbesserte Erkennung serieller Ports unter Linux.</li> + <li>Korrekturen an Hintergrunddiensten unter WoW64.</li> + <li>Bessere DPI-Skalierung im Explorer.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0