wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

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

20 Nov '17

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 20 Nov '17

20 Nov '17

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 20 Nov '17

20 Nov '17

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

Vincent Povirk : gphoto2.ds: Set supported groups.
by Alexandre Julliard 20 Nov '17

20 Nov '17

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

Austin English : advapi32: Add initial Perf* stubs.
by Alexandre Julliard 20 Nov '17

20 Nov '17

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 20 Nov '17

20 Nov '17

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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 20 Nov '17

20 Nov '17

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

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

20 Nov '17

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

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

20 Nov '17

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 20 Nov '17

20 Nov '17

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> + Die Entwicklungsversion 2.21 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.21">Neuerungen (en)</a> in dieser Version: +<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> +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. +</body></news>

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
44
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-commits November 2017