- wine-devel - winehq.org

[PATCH] ntdll: Report valid data for ProcessVmCounters on Linux.
by achurch＠achurch.org 11 Nov '15

11 Nov '15

Forwarded by request from https://bugs.winehq.org/show_bug.cgi?id=35563 (please note that I am not subscribed to the list). This patch modifies NtQueryInformationProcess() to return valid data for ProcessVmCounters on Linux by reading /proc/self/status, so that GetProcessMemoryInfo() reports actual process information rather than all zeros. --Andrew Church http://achurch.org/ diff -urN wine-git-4a1629c-orig/dlls/ntdll/process.c wine-git-4a1629c/dlls/ntdll/process.c --- wine-git-4a1629c-orig/dlls/ntdll/process.c 2015-11-11 20:54:45 +0900 +++ wine-git-4a1629c/dlls/ntdll/process.c 2015-11-11 20:55:30 +0900 @@ -243,6 +243,46 @@ /* FIXME : real data */ memset(&pvmi, 0 , sizeof(VM_COUNTERS)); +#ifdef __linux__ + FILE *f = fopen("/proc/self/status", "r"); + if (f) { + char buf[100]; + int at_bol = 1; + while (fgets(buf, sizeof(buf), f)) { + const int has_eol = (buf[strlen(buf)-1] == '\n'); + if (at_bol) { + const char *tag = buf; + char *s = strchr(buf, ':'); + if (s) { + *s++ = '\0'; + unsigned long value = strtoul(s, NULL, 10); + if (strcmp(tag, "VmPeak") == 0) { + pvmi.PeakVirtualSize = value*1024; + pvmi.PeakPagefileUsage = value*1024; + pvmi.QuotaPeakPagedPoolUsage = value*1024; + } else if (strcmp(tag, "VmSize") == 0) { + pvmi.VirtualSize = value*1024; + pvmi.PagefileUsage = value*1024; + pvmi.QuotaPagedPoolUsage = value*1024; + } else if (strcmp(tag, "VmHWM") == 0) { + pvmi.PeakWorkingSetSize = value*1024; + } else if (strcmp(tag, "VmRSS") == 0) { + pvmi.WorkingSetSize = value*1024; + } + /* We could get QuotaNonPagedPoolUsage from + * the VmLck line, but Linux doesn't give a + * peak value for that, so we just ignore + * it instead of returning a "peak" value + * that might decrease over time. + * FIXME: track the peak value ourselves. */ + } + } + at_bol = has_eol; + } + fclose(f); + } +#endif /* __linux__ */ + len = ProcessInformationLength; if (len != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) len = sizeof(VM_COUNTERS);

1 0

Re: [v6 01/13] d3d9: Call wined3d_device_copy_sub_resource_region() instead of wined3d_device_update_surface() in d3d9_device_UpdateSurface().
by Riccardo Bortolato 11 Nov '15

11 Nov '15

Hi, what can I do to improve patches 1 to 6 in order to get them accepted? I will be on IRC for quicker discussion. Ciao, Riccardo 2015-11-05 17:15 GMT+01:00 Marvin <testbot(a)winehq.org>: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch.

2 2

Re: user32: Test layered window focus
by Alexandre Julliard 11 Nov '15

11 Nov '15

Piotr Caban <piotr(a)codeweavers.com> writes: > + hwnd = CreateWindowExA( WS_EX_LAYERED, "MainWindowClass", "layered window", > + WS_POPUP | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL ); > + ok( hwnd != 0, "failed to create layered window\n" ); > + > + ok(GetFocus() == hwnd, "GetFocus() = %p, expected %p\n", GetFocus(), hwnd); > + flush_events(TRUE); > + todo_wine ok(GetFocus() == hwnd, "GetFocus() = %p, expected %p\n", GetFocus(), hwnd); What problem are you trying to demonstrate? It works fine here: ../../../tools/runtest -q -P wine -T ../../.. -M user32.dll -p user32_test.exe.so win && touch win.ok win.c:6566: Test succeeded inside todo block: GetFocus() = 0x8200f6, expected 0x8200f6 Makefile:609: recipe for target 'win.ok' failed -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: user32: Test layered window focus
by Marvin 11 Nov '15

11 Nov '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=18123 Your paranoid android. === w8 (32 bit win) === win.c:3467: Test failed: hwnd 00030196 message 0118 === w864 (32 bit win) === win.c:3467: Test failed: hwnd 0003019E message 0118 === w1064 (32 bit win) === win.c:6718: Test failed: 0x80/0x1c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6740: Test failed: 0x80/0x1010000: window rect 0,0-1024,768 win.c:6718: Test failed: 0x80/0x81c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6718: Test failed: 0/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6718: Test failed: 0x40000/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6718: Test failed: 0x80/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6718: Test failed: 0x80/0x1c50000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6740: Test failed: 0x80/0x1050000: window rect 0,0-1024,768 win.c:6718: Test failed: 0x80/0x1c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6740: Test failed: 0x80/0x1410000: window rect 0,0-1024,768

2 1

Re: server: Only send WM_WINE_CLIPCURSOR for forced clip resets. (resend)
by Ken Thomases 11 Nov '15

11 Nov '15

On Nov 10, 2015, at 10:30 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > > It would be nice if someone familiar with winemac.drv could confirm/test that > removing the duplicate notification doesn't break anything. It shouldn't break anything. The Mac driver works very differently from the X11 driver in this area. Cursor clipping isn't closely related to the delivery of relative mouse movement events. There's nothing like grabbing the pointer or the use of an extra window, etc. Also, the desktop owner doesn't ever present a window (no virtual desktop mode support, yet), so it's never the active Mac process. So, calls or lack of calls to macdrv_ClipCursor() in that process make no difference. All of that said, it seems the problem is specific to the X11 driver and the solution should probably be restricted to there, too. No matter what thread or process receives WM_WINE_CLIPCURSOR, it gets the cursor clipping rectangle and (re)establishes that via the driver. The driver should never do the wrong thing when it receives a request that's appropriate to the current state. The fact that cursor clipping and relative mouse movements are closely intertwined is an artifact of X11. If grab_clipping_window() is going to be used for both, then the X11 driver has to take care not to call ungrab_clipping_window() just because one of those two needs is not currently in effect. -Ken

2 1

Re: [PATCH] mshtml: Make it clear that ATTR_FIX_PX and ATTR_FIX_URL as exclusive (Coverity)
by Jacek Caban 11 Nov '15

11 Nov '15

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> On 11/10/15 20:31, Nikolay Sivov wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > > Otherwise first allocated val is leaked. Jacek, can you confirm? Well, I don't think this causes a real leak because even if we try to apply both fixups, the attribute would need to be URL and integer at the same time for the leak to happen. However, I don't think there are attributes that could require both fixups, so I'm fine with the patch. Thanks, Jacek

1 0

Re: [resend] dbghelp: Crash fix in module_find_cb on trying to parse non image files.
by Marcus Meissner 11 Nov '15

11 Nov '15

Hi, Patch looks good to me. (doing it in the nested style of this if () if () if() nesting is probably not needed) Ciao, Marcus On Tue, Nov 10, 2015 at 07:22:03PM +0100, Ralf Habacker wrote: > > Bug: https://bugs.winehq.org/show_bug.cgi?id=39568 > > Signed-off-by: Ralf Habacker <ralf.habacker(a)freenet.de> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > --- > dlls/dbghelp/path.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > > diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c > index a0e51bd..8c74426 100644 > --- a/dlls/dbghelp/path.c > +++ b/dlls/dbghelp/path.c > @@ -490,7 +490,13 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) > if ((mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL) > { > IMAGE_NT_HEADERS* nth = RtlImageNtHeader(mapping); > - > + if (!nth) > + { > + UnmapViewOfFile(mapping); > + CloseHandle(hMap); > + CloseHandle(hFile); > + return FALSE; > + } > matched++; > timestamp = nth->FileHeader.TimeDateStamp; > size = nth->OptionalHeader.SizeOfImage; > >

1 0

Re: [PATCH 1/2] wininet: Free Critical Section (valrind)
by Marvin 11 Nov '15

11 Nov '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=18101 Your paranoid android. === w1064 (32 bit http) === http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1773: Test failed: Expected 2, got 4 http.c:1774: Test failed: Expected CRLF, got ' http.c:2408: Test failed: count was wrong http.c:2409: Test failed: http data wrong, got: Garbage: Header http.c:3072: Test failed: HttpAddRequestHeaders succeeded http.c:3073: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3078: Test failed: code = 200, expected 400 http.c:3078: Test failed: code = 200, expected 400 http.c:3078: Test failed: unexpected status code 200, expected 400 http.c:3078: Test failed: unexpected status code 200, expected 400 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

2 1

Re: [2/2] server: Allow multiple registry notifications per key.
by Sebastian Lackner 11 Nov '15

11 Nov '15

On 10.11.2015 23:01, Sebastian Lackner wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > After this patch there are still a couple of remaining problems: [...] > * The WatchSubtree Flag and the filters parameter should be stored somewhere in the > key object itself? It seems like its not possible to change it anymore after > the first notification. I just saw that this was already working fine in the old implementation, which means my patch could cause regressions. :( Please ignore this patch for now. I'll resend 1/2 alone with some more tests.

1 0

Re: ntoskrnl.exe: add CmRegisterCallback/CmUnRegisterCallback stub (5/8)
by Sebastian Lackner 11 Nov '15

11 Nov '15

On 09.11.2015 06:59, Austin English wrote: > +/*********************************************************************** > + * CmRegisterCallback (NTOSKRNL.EXE.@) > + */ > +NTSTATUS CmRegisterCallback(EX_CALLBACK_FUNCTION *function, void *context, LARGE_INTEGER *cookie) You forgot to specify the calling convention. The function should be declared as WINAPI. > +{ > + FIXME("(%p %p %p): stub\n", function, context, cookie); > + return STATUS_NOT_IMPLEMENTED; > +} > + > +/*********************************************************************** > + * CmUnRegisterCallback (NTOSKRNL.EXE.@) > + */ > +NTSTATUS CmUnRegisterCallback(LARGE_INTEGER cookie) Same here. > +{ > + FIXME("%d): stub\n", cookie.u.LowPart); There is a "(" missing at the beginning of the FIXME. Also, I think it would be useful to print the whole value. Either something like: FIXME("(%x%08x): stub\n", cookie.u.HighPart, cookie.u.LowPart); or use wine_dbgstr_longlong: FIXME("(%s): stub\n", wine_dbgstr_longlong(cookie.QuadPart)); > + return STATUS_NOT_IMPLEMENTED; > +}

1 0

Re: ntoskrnl.exe: add RtlInitializeGenericTableAvl/RtlInsertElementGenericTableAvl stubs (resend) (1/8)
by Sebastian Lackner 11 Nov '15

11 Nov '15

On 09.11.2015 06:55, Austin English wrote: > From 8ddf8d4bbdaf8a84b73740495d93035f18a15d20 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Sun, 8 Nov 2015 23:22:31 -0600 > Subject: [PATCH 1/8] ntoskrnl.exe: add > RtlInitializeGenericTableAvl/RtlInsertElementGenericTableAvl stubs (resend) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/ntdll/ntdll.spec | 4 +-- > dlls/ntdll/rtl.c | 16 +++++++++++ > dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +-- > include/ddk/ntddk.h | 55 ++++++++++++++++++++++++++++++++++++- > 4 files changed, 74 insertions(+), 5 deletions(-) > > diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec > index 464b233..f9b31ff 100644 > --- a/dlls/ntdll/ntdll.spec > +++ b/dlls/ntdll/ntdll.spec > @@ -683,7 +683,7 @@ > @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) > @ stdcall RtlInitializeCriticalSectionEx(ptr long long) > @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) > -# @ stub RtlInitializeGenericTableAvl > +@ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) > @ stdcall RtlInitializeHandleTable(long long ptr) > @ stub RtlInitializeRXact > # @ stub RtlInitializeRangeList > @@ -693,7 +693,7 @@ > @ stdcall RtlInitializeSid(ptr ptr long) > # @ stub RtlInitializeStackTraceDataBase > @ stub RtlInsertElementGenericTable > -# @ stub RtlInsertElementGenericTableAvl > +@ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) > @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) > @ stdcall RtlInt64ToUnicodeString(int64 long ptr) > @ stdcall RtlIntegerToChar(long long long ptr) > diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c > index 8eb3e9f..0ca27c2 100644 > --- a/dlls/ntdll/rtl.c > +++ b/dlls/ntdll/rtl.c > @@ -1595,3 +1595,19 @@ void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor) > processor->Number = NtGetCurrentProcessorNumber(); > processor->Reserved = 0; > } > + > +/*********************************************************************** > + * RtlInitializeGenericTableAvl (NTOSKRNL.EXE.@) Your implementation is in NTDLL, so it would be better to write that in the comment above. > + */ > +void WINAPI RtlInitializeGenericTableAvl(void *table, void *compare, void *allocate, void *free, void *context) According to MSDN all those parameters are documented. You also added them to the include below, why do you not use them here? We'll need them anyway sooner or later, when someone is going to implement them. > +{ > + FIXME("%p %p %p %p %p: stub\n", table, compare, allocate, free, context); > +} > + > +/*********************************************************************** > + * RtlInsertElementGenericTableAvl (NTOSKRNL.EXE.@) NTOSKRNL -> NTDLL, as above. > + */ > +void WINAPI RtlInsertElementGenericTableAvl(void *table, void *buffer, long size, BOOL *element) I would also recommend to use the real types here. Especially "long" should be avoided because it has a different size depending on the architecture. The correct type for the third parameter seems to be CLONG = ULONG. > +{ > + FIXME("%p %p %lu %p: stub\n", table, buffer, size, element); After fixing the types above, you'll have to replace %lu -> %u. > +} > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > index 1957a9a..7690268 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > @@ -1055,12 +1055,12 @@ > @ stdcall RtlInitUnicodeString(ptr wstr) ntdll.RtlInitUnicodeString > @ stdcall RtlInitializeBitMap(ptr long long) ntdll.RtlInitializeBitMap > @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) ntdll.RtlInitializeGenericTable > -@ stub RtlInitializeGenericTableAvl > +@ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) ntdll.RtlInitializeGenericTableAvl > @ stub RtlInitializeRangeList > @ stdcall RtlInitializeSid(ptr ptr long) ntdll.RtlInitializeSid > @ stub RtlInitializeUnicodePrefix > @ stub RtlInsertElementGenericTable > -@ stub RtlInsertElementGenericTableAvl > +@ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) ntdll.RtlInsertElementGenericTableAvl > @ stub RtlInsertElementGenericTableFull > @ stub RtlInsertElementGenericTableFullAvl > @ stub RtlInsertUnicodePrefix > diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h > index bccfd39..6f656a3 100644 > --- a/include/ddk/ntddk.h > +++ b/include/ddk/ntddk.h > @@ -149,6 +149,59 @@ typedef struct _KWAIT_BLOCK { > USHORT WaitType; > } KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; > > +typedef struct _RTL_BALANCED_LINKS { > + struct _RTL_BALANCED_LINKS *parent; > + struct _RTL_BALANCED_LINKS *left_child; > + struct _RTL_BALANCED_LINKS *right_child; > + CHAR balance; > + UCHAR reserved[3]; > +} RTL_BALANCED_LINKS; > +typedef RTL_BALANCED_LINKS *PRTL_BALANCED_LINKS; Not sure which headers you are using, but basically all of the information I found says those struct members should be called "Parent", "LeftChild", "RightChild", and so on. Did you rename them? Please note that this doesn't work, the header files should be compatible with Windows. > + > +struct _RTL_AVL_TABLE; > + > +typedef enum _RTL_GENERIC_COMPARE_RESULTS { > + generic_less_than, > + generic_greater_than, > + generic_qual > +} RTL_GENERIC_COMPARE_RESULTS; Same here, it should probably be "GenericLessThan", "GenericGreaterThan", and so on. > + > +RTL_GENERIC_COMPARE_RESULTS WINAPI RTL_AVL_COMPARE_ROUTINE ( > + struct _RTL_AVL_TABLE *table, > + void *struct1, > + void *struct2 > +); There is no need to keep the formatting the same. Something like: RTL_GENERIC_COMPARE_RESULTS WINAPI RTL_AVL_COMPARE_ROUTINE(struct _RTL_AVL_TABLE *, void *, void *); Would also work, for example. You could even merge it with the line below: typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *); > + > +typedef enum RTL_AVL_COMPARE_ROUTINE *PRTL_AVL_COMPARE_ROUTINE; RTL_AVL_COMPARE_ROUTINE is not an enumeration. > + > +void WINAPI RTL_AVL_ALLOCATE_ROUTINE ( > + struct _RTL_AVL_TABLE *table, > + LONG size > +); > + > +typedef enum RTL_AVL_ALLOCATE_ROUTINE *PRTL_AVL_ALLOCATE_ROUTINE; > + > +void WINAPI RTL_AVL_FREE_ROUTINE ( > + struct _RTL_AVL_TABLE *table, > + void *buffer > +); > + > +typedef enum RTL_AVL_FREE_ROUTINE *PRTL_AVL_FREE_ROUTINE; > + > +typedef struct _RTL_AVL_TABLE { > + RTL_BALANCED_LINKS balanced_root; > + void *ordered_pointer; > + ULONG which_ordered_element; > + ULONG number_generic_table_elements; > + ULONG tree_depth; > + PRTL_BALANCED_LINKS restart_key; > + ULONG delete_count; > + PRTL_AVL_COMPARE_ROUTINE compare_routine; > + PRTL_AVL_ALLOCATE_ROUTINE allocate_routine; > + PRTL_AVL_FREE_ROUTINE free_routine; > + void *table_context; > +} RTL_AVL_TABLE, *PRTL_AVL_TABLE; The struct members of RTL_AVL_TABLE also don't match my header files. > + > typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); > typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); > typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); > @@ -160,5 +213,5 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ > void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); > NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); > NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); > - > +void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE, PRTL_AVL_COMPARE_ROUTINE, PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE, VOID *); Is there any reason why you only add one of both functions? > #endif > -- 2.6.2 > BTW: You could also think about moving all those definitions to winternl.h. It already contains definitions for many other Rtl* functions, and those AVL tree functions are probably also useful for other parts of Wine, in the long term - not just for ntoskrnl.

1 0

Re: [PATCH] hnetcfg: Add Dispatch support to interface INetFwOpenPort
by Nikolay Sivov 10 Nov '15

10 Nov '15

This looks fine to me, it applies on current git. One thing that is wrong is subject - it should say INetFwOpenPorts.

1 0

Attention packagers: New optional dependency on libpulse
by Andrew Eikum 10 Nov '15

10 Nov '15

As you may have noticed, Wine recently integrated the PulseAudio audio backend. This obviously introduces a dependency on libpulse, in 32- and/or 64-bit forms depending on what you're building. Building winepulse will be enabled at configure-time if libpulse is present, otherwise winepulse will not be built. If PulseAudio is not running, or libpulse is not installed, Wine will fall back on another driver. Thanks, Andrew

1 0

Re: [PATCH] crypt32/tests: Added a simple CA test for CertOpenStore.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Qian Hong <qhong(a)codeweavers.com> writes: > Signed-off-by: Qian Hong <qhong(a)codeweavers.com> > --- > dlls/crypt32/tests/cert.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) It fails here: ../../../tools/runtest -q -P wine -T ../../.. -M crypt32.dll -p crypt32_test.exe.so cert && touch cert.ok cert.c:1758: Test succeeded inside todo block: CertEnumCertificatesInStore should have worked cert.c:1762: Test succeeded inside todo block: Expected CRYPT_E_SELF_SIGNED or CRYPT_E_NOT_FOUND, got 80092007 make[1]: *** [cert.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2 PATCH 1/4] kernel32: GetLocaleInfoA() doesn't support LOCALE_SSHORTTIME
by Marvin 10 Nov '15

10 Nov '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=18066 Your paranoid android. === w1064 (32 bit locale) === locale.c:2337: Test failed: LCMapStringEx should fail with bad locale name locale.c:2338: Test failed: unexpected error code -559038737 locale.c:2429: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4155: Test failed: IsValidLocaleName should have failed locale.c:4157: Test failed: IsValidLocaleName should have failed locale.c:4522: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4524: Test failed: For id 7, Expected IVC, got ''

2 1

Re: [v2 PATCH 3/4] kernel32: Added support for TIME_NOSECONDS, restructured EnumTimeFormats implementation
by Marvin 10 Nov '15

10 Nov '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=18068 Your paranoid android. === w1064 (32 bit locale) === locale.c:2337: Test failed: LCMapStringEx should fail with bad locale name locale.c:2338: Test failed: unexpected error code -559038737 locale.c:2429: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4152: Test failed: IsValidLocaleName should have failed locale.c:4154: Test failed: IsValidLocaleName should have failed locale.c:4519: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4521: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [v2 PATCH 2/4] kernel32: EnumTimeFormatsA() doesn't support TIME_NOSECONDS
by Marvin 10 Nov '15

10 Nov '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=18067 Your paranoid android. === w1064 (32 bit locale) === locale.c:2337: Test failed: LCMapStringEx should fail with bad locale name locale.c:2338: Test failed: unexpected error code -559038737 locale.c:2429: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4154: Test failed: IsValidLocaleName should have failed locale.c:4156: Test failed: IsValidLocaleName should have failed locale.c:4521: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4523: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [v2 PATCH 3/4] kernel32: Added support for TIME_NOSECONDS, restructured EnumTimeFormats implementation
by Dmitry Timoshkov 10 Nov '15

10 Nov '15

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > -BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) > +BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) > { > - WCHAR buf[256]; > + struct enumtimeformats_context ctxt; > > - if (!proc) > + /* EnumTimeFormatsA doesn't support flags, EnumTimeFormatsW does. */ > + if (flags & ~LOCALE_USE_CP_ACP) > { > - SetLastError(ERROR_INVALID_PARAMETER); > + SetLastError(ERROR_INVALID_FLAGS); This change doesn't seem to be confirmed by a test case. -- Dmitry.

2 2

test
by André Hentschel 10 Nov '15

10 Nov '15

please ignore, sorry for the noise

1 0

Re: [PATCH 3/4] kernel32: Added support for TIME_NOSECONDS, restructured EnumTimeFormats implementation
by Dmitry Timoshkov 10 Nov '15

10 Nov '15

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) > { > - WCHAR buf[256]; > + struct enumtimeformats_context ctxt; > > - if (!proc) > + /* EnumTimeFormatsA doesn't support flags, EnumTimeFormatsW does. */ > + if (flags & ~LOCALE_USE_CP_ACP) > { > - SetLastError(ERROR_INVALID_PARAMETER); > + SetLastError(ERROR_INVALID_FLAGS); Is there any particular reason that you need 3/4 in order to fix something you've added in 2/4? This looks like badly tested code. -- Dmitry.

1 0

Re: [PATCH 3/4] kernel32: Added support for TIME_NOSECONDS, restructured EnumTimeFormats implementation
by Marvin 10 Nov '15

10 Nov '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=18065 Your paranoid android. === w1064 (32 bit locale) === locale.c:2337: Test failed: LCMapStringEx should fail with bad locale name locale.c:2338: Test failed: unexpected error code -559038737 locale.c:2429: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4152: Test failed: IsValidLocaleName should have failed locale.c:4154: Test failed: IsValidLocaleName should have failed locale.c:4519: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4521: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [PATCH 1/4] kernel32: GetLocaleInfoA() doesn't support LOCALE_SSHORTTIME
by Marvin 10 Nov '15

10 Nov '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=18064 Your paranoid android. === w1064 (32 bit locale) === locale.c:2337: Test failed: LCMapStringEx should fail with bad locale name locale.c:2338: Test failed: unexpected error code -559038737 locale.c:2429: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4155: Test failed: IsValidLocaleName should have failed locale.c:4157: Test failed: IsValidLocaleName should have failed locale.c:4522: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4524: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [v7 07/10] ddraw7/tests: Test SetColorKey() on cubemap surfaces.
by Marvin 10 Nov '15

10 Nov '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=18063 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2243: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw7.c:3084: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3086: Test failed: Got unexpected screen width 1024. ddraw7.c:3088: Test failed: Got unexpected screen height 768. ddraw7.c:3101: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3103: Test failed: Got unexpected screen width 1024. ddraw7.c:3105: Test failed: Got unexpected screen height 768. ddraw7.c:3109: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3111: Test failed: Got unexpected screen width 1024. ddraw7.c:3113: Test failed: Got unexpected screen height 768. ddraw7.c:3132: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3134: Test failed: Got unexpected screen width 1024. ddraw7.c:3136: Test failed: Got unexpected screen height 768. ddraw7.c:3140: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3142: Test failed: Got unexpected screen width 1024. ddraw7.c:3144: Test failed: Got unexpected screen height 768. ddraw7.c:3164: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3166: Test failed: Got unexpected screen width 1024. ddraw7.c:3168: Test failed: Got unexpected screen height 768. ddraw7.c:3173: Test failed: Got unexpected screen width 1024. ddraw7.c:3175: Test failed: Got unexpected screen height 768. ddraw7.c:3188: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3190: Test failed: Got unexpected screen width 1024. ddraw7.c:3192: Test failed: Got unexpected screen height 768. ddraw7.c:3196: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3198: Test failed: Got unexpected screen width 1024. ddraw7.c:3200: Test failed: Got unexpected screen height 768. ddraw7.c:3208: Test failed: Got unexpected screen width 1024. ddraw7.c:3210: Test failed: Got unexpected screen height 768. ddraw7.c:3222: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3224: Test failed: Got unexpected screen width 1024. ddraw7.c:3226: Test failed: Got unexpected screen height 768. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4081: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4094: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4110: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4129: Test failed: Display mode restored after ddraw1-ddraw7 SetCooperativeLevel() call sequence ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:5937: Test failed: Failed to set display mode, hr 0x80004001. === w864 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000 === w1064 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000

1 0

Re: [PATCH 1/2] winemac: Check the window's display link after adding it as a child of another window, which may order it on screen.
by Huw Davies 10 Nov '15

10 Nov '15

On 10 Nov 2015, at 02:31, Ken Thomases wrote: > This fixes a problem where child windows ("owned" windows in Windows parlance) > would never display their contents on OS X 10.8 or earlier. Beginning with > 10.9, Cocoa calls -windowDidChangeOcclusionState: when the window becomes > visible, which is why they display on that version and later. > --- > Reported by Huw Davies. Works great, thanks! Huw.

1 0

Re: [PATCH 1/2] winemac: Use CVDisplayLink to limit window redrawing to the display refresh rate. (try 2)
by Huw Davies 10 Nov '15

10 Nov '15

Thanks Ken, Just confirming that this series now builds for me on 10.7 Huw.

3 3

How to change the ACCESS_MASK of a thread?
by Bruno Jesus 09 Nov '15

09 Nov '15

Hi all. I have a simple question that I could not find an answer after looking for a lot. All I need is to remove the THREAD_SUSPEND_RESUME flag from the ACCESS_MASK to add it again later. info.GrantedAccess = 0; NtQueryObject(GetCurrentThread(), ObjectBasicInformation, &info, sizeof(info), NULL); if (info.GrantedAccess & THREAD_SUSPEND_RESUME) { changed = TRUE; info.GrantedAccess &= ~THREAD_SUSPEND_RESUME; //magic here } This is about fixing bug 3930 where SuspendThread is called from inside a callback deadlocking the game. If I can prevent the SuspendThread from running it will work. Best wishes, Bruno

1 0

Re: [PATCH] msvcp120: implement _Cnd_* functions (try 2)
by Piotr Caban 09 Nov '15

09 Nov '15

On 11/09/15 16:38, Daniel Lehman wrote: > +static int (__cdecl*p__Mtx_init)(_Mtx_t*); This function has different header. > + if (0) /* causes crash in later_Cnd_* calls on Windows */ > + p__Cnd_destroy(&cm.cnd); This is not what I meant. I'm attaching a patch (generated on top of yours with the test I had in mind). It only shows the problem, the test needs more work. > + for(i = 0; i < NUM_THREADS; i++) > + p__Thrd_create(&threads[i], cnd_bcast_thread, (void*)&cm); ... > + p__Mtx_lock(&mtx); > + cm.go = 1; > + p__Mtx_unlock(&mtx); Please add some kind of synchronization to make sure the thread is waiting on condition variable before setting cm.go to 1. > + cm.go = 0; > + p__Thrd_create(&threads[0], cnd_signal_thread, (void*)&cm); > + p__Mtx_lock(&mtx); > + while(!cm.go) { > + r = p__Cnd_wait(&cnd, &mtx); > + ok(!r, "failed to wait\n"); > + } Here's a similar synchronization problem. In most cases p__Cnd_wait will not be called. > + diff = p__Xtime_diff_to_millis2(&after, &before); > + ok(r == 2, "should have timed out\n"); > + ok(diff > 2000 - TIMEDELTA, "got %d\n", diff); This test failed once on my computer (in ~10 runs, diff == 1800). Thanks, Piotr

1 0

Re: [PATCH v2 3/3] msvcp140: Add MSVC 2015 C++ support DLL
by Piotr Caban 09 Nov '15

09 Nov '15

On 11/06/15 13:51, Martin Storsjo wrote: > static void init_cxx_funcs(void) > { > @@ -77,6 +125,11 @@ static void init_cxx_funcs(void) > > if (!hmod) FIXME( "%s not loaded\n", MSVCRT_NAME(_MSVCP_VER) ); > > +#if _MSVCP_VER >= 140 > + MSVCRT_operator_new = operator_new; > + MSVCRT_operator_delete = operator_delete; > + MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "_set_new_handler"); > +#else > if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ > { > MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z"); > @@ -113,6 +166,7 @@ static void init_cxx_funcs(void) > #endif > #endif /* _MSVCP_VER >= 110 */ > } > +#endif > } Please also initialize critical_section related functions. Thanks, Piotr

1 0

Re: [PATCH] msvcp120: implement _Cnd_* functions
by Piotr Caban 09 Nov '15

09 Nov '15

On 11/07/15 00:58, Daniel Lehman wrote: > +void __cdecl _Cnd_destroy(_Cnd_t *cnd) > +{ > + MSVCRT_operator_delete(*cnd); > +} What happens when _Cnd_destroy is called while someone waits on condition variable? > +int __cdecl _Cnd_timedwait(_Cnd_t *cnd, _Mtx_t *mtx, const xtime *xt) > +{ > + CONDITION_VARIABLE *cv = &(*cnd)->cv; > + LARGE_INTEGER timeout; > + NTSTATUS status; > + > + InterlockedExchangeAdd( (LONG *)&cv->Ptr, 1 ); > + _Mtx_unlock(mtx); > + > + timeout.QuadPart = (ULONGLONG)_Xtime_diff_to_millis(xt) * -10000; > + status = NtWaitForKeyedEvent(keyed_event, &cv->Ptr, FALSE, &timeout); > + if (status) > + { > + if (!interlocked_dec_if_nonzero( (LONG *)&cv->Ptr )) > + NtWaitForKeyedEvent( keyed_event, &cv->Ptr, FALSE, NULL ); You need to update status here. Thanks, Piotr

2 1

Re: [1/5] gdi32: Fix the advance width in synthetic bold glyphs when using scaling factors. (try 2)
by Alexandre Julliard 09 Nov '15

09 Nov '15

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > Try 2: > - Rename the vector normalization function name and returns > calculated value. > - Avoid division by zero. > Thanks Huw and Henri. > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/gdi32/freetype.c | 50 ++++++++++++++++++++++++++++++++++--------------- > dlls/gdi32/tests/font.c | 10 ++++++++++ > 2 files changed, 45 insertions(+), 15 deletions(-) It breaks the tests here: ../../../tools/runtest -q -P wine -T ../../.. -M gdi32.dll -p gdi32_test.exe.so font && touch font.ok font.c:389: Test failed: cx 221 != 243 font.c:389: Test failed: cx 221 != 243 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] odbccp32: Implement SQLGetPrivateProfileStringW/SQLGetPrivateProfileString (try 3)
by Alexandre Julliard 09 Nov '15

09 Nov '15

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Corrected formatting. > Use strlen where approperate. > Improved tests to show that we cannot write directly to the buffer passed in. It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M odbccp32.dll -p odbccp32_test.exe.so misc && touch misc.ok misc.c:273: Test failed: incorrect string 'testing' make[1]: *** [misc.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 5/5] d3d9/tests: Improve the shade mode test.
by Henri Verbeet 09 Nov '15

09 Nov '15

On 8 November 2015 at 20:25, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > dlls/d3d9/tests/visual.c | 275 ++++++++++++++++++++++++++++++++--------------- > 1 file changed, 191 insertions(+), 84 deletions(-) > I think most of this test would work for d3d8 and ddraw as well. Could you please port it? > + {&novs, &ps_3, D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, FALSE, 0x00ff0000, 0x0000ff00}, > + {&novs, &ps_3, D3DPT_TRIANGLESTRIP, D3DSHADE_GOURAUD, FALSE, 0x000dca28, 0x000d45c7}, These fail here on Windows: visual.c:8338: Test failed: Test 14 shading has color0 00ffffff, expected 00ff0000. visual.c:8340: Test failed: Test 14 shading has color1 00ffffff, expected 0000ff00. visual.c:8338: Test failed: Test 15 shading has color0 00ffffff, expected 000dca28. visual.c:8340: Test failed: Test 15 shading has color1 00ffffff, expected 000d45c7. IIRC SM3 vertex and pixel shaders need to be used together, or results are undefined / implementation defined.

2 1

Re: [PATCH 3/9] d3d11/tests: Port test_texture() from d3d10core.
by Henri Verbeet 09 Nov '15

09 Nov '15

On 6 November 2015 at 18:38, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + for (i = 0; i < 4; ++i) > + { > + for (j = 0; j < 4; ++j) > + { > + color = get_texture_color(backbuffer, 80 + j * 160, 60 + i * 120); > + ok(compare_color(color, bitmap_data[j + i * 4], 1), > + "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", > + color, j, i, bitmap_data[j + i * 4]); > + } > + } It's not a terribly high priority, but Matteo recently introduced get_rt_readback()/release_surface_readback() in the d3d8/9 tests. We'll want to introduce that interface in the d3d10/11 tests as well.

1 0

Re: [PATCH v4] ucrtbase: Hook up _seh_filter_exe and _seh_filter_dll
by Piotr Caban 09 Nov '15

09 Nov '15

On 11/09/15 12:36, Martin Storsjo wrote: > +@ cdecl _seh_filter_dll(long ptr) __CppXcptFilter > +@ cdecl _seh_filter_exe(long ptr) __CppXcptFilter _seh_filter_dll should behave like __CppXcptFilter and _seh_filter_exe like _XcptFilter. You also need to copy -arch=i386,x86_64,arm parameter. Otherwise you break compilation for other architectures because __CppXcptFilter is not defined there. Thanks, Piotr

2 1

Re: [PATCH 4/4] ntdll: Added NtNotifyChangeMultipleKeys implementation.
by Dmitry Timoshkov 09 Nov '15

09 Nov '15

Hi Jacek, Jacek Caban <jacek(a)codeweavers.com> wrote: > diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec > index 464b233..d9bab90 100644 > --- a/dlls/ntdll/ntdll.spec > +++ b/dlls/ntdll/ntdll.spec > @@ -205,7 +205,7 @@ > # @ stub NtModifyBootEntry > @ stdcall NtNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) > @ stdcall NtNotifyChangeKey(long long ptr ptr ptr long long ptr long long) > -# @ stub NtNotifyChangeMultipleKeys > +@ stdcall NtNotifyChangeMultipleKeys(long long ptr long ptr ptr ptr long long ptr long long) You forgot to update the Zw* .spec entry. -- Dmitry.

1 0

Re: [PATCH v5] ucrtbase: Hook up _seh_filter_exe and _seh_filter_dll
by Piotr Caban 09 Nov '15

09 Nov '15

On 11/09/15 12:46, Martin Storsjo wrote: > +@ cdecl -arch=i386,x86_64,arm _seh_filter_dll(long ptr) __CppXcptFilter > +@ cdecl -arch=i386,x86_64,arm _seh_filter_exe(long ptr) __CppXcptFilter This is still wrong.

2 3

Re: [PATCH v3] ucrtbase: Implement _seh_filter_exe and _seh_filter_dll
by Piotr Caban 09 Nov '15

09 Nov '15

On 11/05/15 13:52, Martin Storsjo wrote: > +int CDECL _seh_filter_dll(MSVCRT_ulong ex, PEXCEPTION_POINTERS ptr) > +{ > + TRACE("(%08x,%p)\n", ex, ptr); > + /* I assume ptr->ExceptionRecord->ExceptionCode is the same as ex */ > + return msvcrt_exception_filter(ptr); > +} This function should behave like __CppXcptFilter. Thanks, Piotr

2 2

Re: [PATCH] oledb32/tests: Add more GetConversionSize tests
by Nikolay Sivov 09 Nov '15

09 Nov '15

On 09.11.2015 12:49, Alistair Leslie-Hughes wrote: > It appears that if the type being converted is of a fixed > size then it returns a constant value of 110. > I don't think it makes sense to have such magic size in tests, until there's an understanding what DataConvert returns as destination in such cases.

1 0

Re: [4/5] gdi32: Embolden width direction only if ppem <= 50. (resend)
by Huw Davies 09 Nov '15

09 Nov '15

On Fri, Nov 06, 2015 at 09:25:11PM +0900, Akihiro Sagawa wrote: > > In other words, avoid increasing the thickness of height direction if > the size is small. This prevents distorting fonts as in Bug 34884. > This feature requires newer FreeType library (2.4.10 and/or later). What does Windows do here? Does it really have a cutoff at 50 ppem? I suspect we should always just stretch in the x-direction irrespective of the ppem (at least in the case where we have FT_Outline_EmboldenXY). Huw.

1 0

Re: [3/5] gdi32: Implement synthesizing bold glyphs for bitmap fonts. (resend)
by Huw Davies 09 Nov '15

09 Nov '15

On Fri, Nov 06, 2015 at 09:25:09PM +0900, Akihiro Sagawa wrote: > @@ -6970,7 +6971,16 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, > INT w = min( pitch, (ft_face->glyph->bitmap.width + 7) >> 3 ); > INT h = min( height, ft_face->glyph->bitmap.rows ); > while(h--) { > - memcpy(dst, src, w); > + if (!font->fake_bold) > + memcpy(dst, src, w); > + else { > + INT x; > + dst[0] = 0; > + for (x = 0; x < w; x++) { > + dst[x ] = (dst[x] & 0x80) | (src[x] >> 1) | src[x]; > + dst[x+1] = (src[x] & 0x01) << 7; This could write past the end of dst (and similarly for ones below). Huw.

1 0

Re: [PATCH 3/3] quartz: Fix error code when chekcing circular connection.
by Qian Hong 09 Nov '15

09 Nov '15

Please drop this patch, I find the actual define for 80040217 this time, will resend soon.

1 0

Re: [PATCH] gdi32: Initialize system font link registry.
by Huw Davies 09 Nov '15

09 Nov '15

On Wed, Nov 04, 2015 at 09:40:38PM +0800, Qian Hong wrote: > +static void update_font_system_link_info(UINT current_ansi_codepage) > + if (RegCreateKeyA(HKEY_LOCAL_MACHINE, font_link_reg_key, &hkey) == ERROR_SUCCESS) > + { > + HKEY hsubkey; > + if (RegCreateKeyA(hkey, system_link_subkey, &hsubkey) == ERROR_SUCCESS) > + { You could create this key in one call. Please use the unicode registry functions for both key creation and value setting (yes, I know there are many ansi versions already there, but let's avoid adding more!). You'll find the system link unicode string already defined in 'system_link'. Huw.

2 1

Re: taskschd/tests: Fix memory leaks (Valgrind).
by Marvin 09 Nov '15

09 Nov '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=18033 Your paranoid android. === w1064 (32 bit scheduler) === scheduler.c:159: Test failed: expected ERROR_INVALID_NAME, got 0x80070002 scheduler.c:204: Test failed: expected ERROR_PATH_NOT_FOUND, got 0x80070002 scheduler.c:354: Test failed: expected ERROR_FILE_NOT_FOUND, got 0 scheduler.c:767: Test failed: expected ERROR_PATH_NOT_FOUND, got 0x80070002 scheduler.c:773: Test failed: expected ERROR_PATH_NOT_FOUND, got 0x80070002 scheduler.c:941: Test failed: expected ERROR_FILE_NOT_FOUND, got 0

1 0

Re: [PATCH] odbccp32: Implement SQLGetPrivateProfileStringW/SQLGetPrivateProfileString (try 2)
by Nikolay Sivov 08 Nov '15

08 Nov '15

On 08.11.2015 13:09, Alistair Leslie-Hughes wrote: > + ret = RegOpenKeyW(hkeyfilename, section, &hkeysection); > + RegCloseKey(hkeyfilename); > + > + return hkeysection; I didn't mean that you need to remove error handling completely, last return in previous iteration 'return ret ? ...' was fine.

1 0

Re: include: Add d3dx10.h file (try 3)
by Matteo Bruni 08 Nov '15

08 Nov '15

I know I told you otherwise earlier, but looking again now: please use an unsigned literal for DXGI_FORMAT_FROM_FILE too, the definition of DXGI_FORMAT has a "DXGI_FORMAT_FORCE_UINT" entry so it should use unsigned values. While you're at it, you can drop the parentheses from the 3 defines.

1 0

Re: *.idl: Use correct type for BSTR strings in the defaultvalue() statements.
by Nikolay Sivov 06 Nov '15

06 Nov '15

On 06.11.2015 11:37, Dmitry Timoshkov wrote: > This matches midl/PSDK syntax, and allows to use Wine headers for compiling > applications with a C++ win32/win64 compiler. In order to be usable by C++ > unix compilers widl needs to emit appropriate statically initialized WCHAR > strings, but that's a different problem, currently the generated Wine headers > with default(BSTR) statements can't be used with C++ at all. > Where do you see this? Mshtml.idl from Windows 10 SDK doesn't use this notation, and in fact only fsrm*.idl files do, so it's not a common practice. Generated headers should use L"", like you said. But only in case of empty strings. Also leaving this broken for everything that's not PSDK compiler doesn't sound right.

3 8

Re: [PATCH 1/3] msvcrt: Lock the heap in _callnewh
by Piotr Caban 06 Nov '15

06 Nov '15

On 11/06/15 11:28, Martin Storsjo wrote: > int CDECL _callnewh(MSVCRT_size_t size) > { > + int ret = 0; > + LOCK_HEAP; > if(MSVCRT_new_handler) > - (*MSVCRT_new_handler)(size); > - return 0; > + ret = (*MSVCRT_new_handler)(size); > + UNLOCK_HEAP; > + return ret; > } It doesn't make sense to lock heap cs in this case. Native is not doing it (at least in case of msvcp90.dll). The return value change looks almost correct - the function only returns 0 or 1. Thanks, Piotr

2 3

Re: [PATCH 1/2] winemac: Use CVDisplayLink to limit window redrawing to the display refresh rate.
by Huw Davies 06 Nov '15

06 Nov '15

On Fri, Nov 06, 2015 at 02:47:10AM -0600, Ken Thomases wrote: > dlls/winemac.drv/Makefile.in | 2 +- > dlls/winemac.drv/cocoa_window.h | 2 + > dlls/winemac.drv/cocoa_window.m | 166 ++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 169 insertions(+), 1 deletion(-) Hi Ken, This doesn't build for me on 10.7: gcc -m32 -c -o cocoa_window.o cocoa_window.m -I. -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wstrict-prototypes \ -Wwrite-strings -Wpointer-arith -gdwarf-2 -fno-omit-frame-pointer -g -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 cocoa_window.m:161: error: expected specifier-qualifier-list before ‘CVDisplayLinkRef’ cocoa_window.m:174: error: expected ‘)’ before ‘displayLink’ cocoa_window.m: In function ‘-[WineDisplayLink initWithDisplayID:]’: cocoa_window.m:181: warning: implicit declaration of function ‘CVDisplayLinkCreateWithCGDisplay’ cocoa_window.m:181: error: ‘_link’ undeclared (first use in this function) cocoa_window.m:181: error: (Each undeclared identifier is reported only once cocoa_window.m:181: error: for each function it appears in.) cocoa_window.m:185: warning: implicit declaration of function ‘CVDisplayLinkSetOutputCallback’ cocoa_window.m:185: error: ‘WineDisplayLinkCallback’ undeclared (first use in this function) cocoa_window.m: In function ‘-[WineDisplayLink dealloc]’: cocoa_window.m:200: error: ‘_link’ undeclared (first use in this function) cocoa_window.m:202: warning: implicit declaration of function ‘CVDisplayLinkStop’ cocoa_window.m:203: warning: implicit declaration of function ‘CVDisplayLinkRelease’ cocoa_window.m: In function ‘-[WineDisplayLink addWindow:]’: cocoa_window.m:215: warning: implicit declaration of function ‘CVDisplayLinkStart’ cocoa_window.m:215: error: ‘_link’ undeclared (first use in this function) cocoa_window.m: In function ‘-[WineDisplayLink removeWindow:]’: cocoa_window.m:225: error: ‘_link’ undeclared (first use in this function) cocoa_window.m: At top level: cocoa_window.m:242: error: expected ‘)’ before ‘displayLink’ cocoa_window.m: In function ‘+[WineWindow createWindowWithFeatures:windowFrame:hwnd:queue:]’: cocoa_window.m:689: error: request for member ‘autodisplay’ in something not a structure or union cocoa_window.m: In function ‘-[WineWindow orderBelow:orAbove:activate:]’: cocoa_window.m:1310: warning: ‘WineWindow’ may not respond to ‘-checkWineDisplayLink’ cocoa_window.m:1310: warning: (Messages without a matching method signature cocoa_window.m:1310: warning: will be assumed to return ‘id’ and accept cocoa_window.m:1310: warning: ‘...’ as arguments.) cocoa_window.m:1329: warning: ‘WineWindow’ may not respond to ‘-checkWineDisplayLink’ cocoa_window.m: In function ‘-[WineWindow doOrderOut]’: cocoa_window.m:1370: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1372: warning: ‘WineWindow’ may not respond to ‘-grabDockIconSnapshotFromWindow:force:’ cocoa_window.m:1383: warning: ‘WineWindow’ may not respond to ‘-checkWineDisplayLink’ cocoa_window.m: In function ‘-[WineWindow checkWineDisplayLink]’: cocoa_window.m:1682: warning: ‘WineWindow’ may not respond to ‘-isEmptyShaped’ cocoa_window.m:1689: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1694: warning: ISO C90 forbids mixed declarations and code cocoa_window.m: In function ‘-[WineWindow grabDockIconSnapshotFromWindow:force:]’: cocoa_window.m:1744: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1761: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1774: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1781: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1785: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1788: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1805: warning: ‘NSImage’ may not respond to ‘-drawInRect:’ cocoa_window.m:1811: warning: ISO C90 forbids mixed declarations and code cocoa_window.m: In function ‘-[WineWindow miniaturize:]’: cocoa_window.m:2031: warning: ISO C90 forbids mixed declarations and code cocoa_window.m: In function ‘-[WineWindow windowWillResize:toSize:]’: cocoa_window.m:2413: warning: ISO C90 forbids mixed declarations and code cocoa_window.m: In function ‘-[WineWindow draggingEntered:]’: cocoa_window.m:2554: warning: ‘WineWindow’ may not respond to ‘-draggingUpdated:’ cocoa_window.m:2554: warning: return makes integer from pointer without a cast make[1]: *** [cocoa_window.o] Error 1 make: *** [dlls/winemac.drv] Error 2

2 5

Re: [PATCH 2/3] msvcrt: Use the right _iob functions in the public msvcrt header for ucrtbase
by Piotr Caban 06 Nov '15

06 Nov '15

On 11/06/15 11:28, Martin Storsjo wrote: > #ifndef _STDIO_DEFINED > -# ifdef __i386__ > -FILE* __cdecl __p__iob(void); > -# define _iob (__p__iob()) > +# ifdef UCRTBASE > +FILE* __cdecl __acrt_iob_func(unsigned); > +# define _iob(x) (__acrt_iob_func(x)) > # else > +# ifdef __i386__ > +FILE* __cdecl __p__iob(void); > +# define _iob(x) (__p__iob() + (x)) > +# else > FILE* __cdecl __iob_func(void); > -# define _iob (__iob_func()) > +# define _iob(x) (__iob_func() + (x)) > +# endif This makes _iob definition incompatible with native headers. It can't be done this way. I don't know how to solve this problem. Maybe adding something like this in msvcp90/ios.c will be acceptable: #if _MSVCP_VER >= 140 FILE* __cdecl __acrt_iob_func(unsigned); #undef stdin #define stdin __acrt_iob_func(STDIN_FILENO) ... #endif Thanks, Piotr

1 0

Re: [RFC PATCH] msvcp140: Add MSVC 2015 C++ support DLL
by Piotr Caban 06 Nov '15

06 Nov '15

On 11/04/15 20:12, Martin Storsjo wrote: > The built DLL links to (and loads function pointers at runtime from) > msvcr120, instead of ucrtbase (which would be more correct). We really need to e.g. share file handles between ucrtbase and msvcp140. We will need to find a way of linking against ucrtbase. It will probably need to be done by defining wrappers around some functions. For example missing _invalid_parameter should be probably worked around by defining following function in msvcp140: void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, unsigned int line, uintptr_t arg) { return _invalid_parameter_noinfo(); } Something similar needs to be done with __p__iob (use __acrt_iob_func function). If you have any problems with other function please let me know. Probably some more testing/work will be needed to deal with missing new/delete functions. Thanks, Piotr

2 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel