- wine-devel - winehq.org

Re: [PATCH v2 3/5] user32/tests: Add tests for EnableWindow().
by Marvin 17 Mar '17

17 Mar '17

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=29572 Your paranoid android. === w7u (32 bit win) === win.c:3891: Test failed: hwnd 000301BC/000301BC message 0200 win.c:3895: Test failed: hwnd 000301BC/000301BC message 0201 win.c:3904: Test failed: hwnd 0011015A/0011015A message 0202 win.c:3907: Test failed: hwnd 0011015A/0011015A message 0201

1 0

Re: [v2 1/2] msvcrt: Add stub for Concurrency::Alloc
by Piotr Caban 17 Mar '17

17 Mar '17

Hi, On 03/16/17 23:12, Gijs Vermeulen wrote: > dlls/msvcrt/lock.c | 9 +++++++++ I think it would be better to implement the function in heap.c file. Could you please move the implementation there. > +void * __cdecl Alloc(MSVCRT_size_t _NumBytes) Please rename the function to Concurrency_Alloc and argument name to size. > + void *p = MSVCRT_malloc(_NumBytes); > + FIXME("(%ld, %p) stub\n", _NumBytes, p); How about changing the FIXME message to something like: FIXME("(%ld) returning %p\n", size, p); (this matches the trace of operator new). Thanks, Piotr

1 0

Re: [PATCH 1/6] wined3d: Introduce "copy sub-resource" command stream operation.
by Henri Verbeet 17 Mar '17

17 Mar '17

On 17 March 2017 at 12:57, Józef Kucia <jkucia(a)codeweavers.com> wrote: > The idea behind the patch series is to split blit and memcpy-like copy > operations. That wasn't the direction I was going with this though. > A few arguments in favor of this idea: > * memcpy-like is simpler operation (doesn't support conversion or > stretching), Sure, but we do already check for that in wined3d_surface_blt(). > * we shouldn't need to extend blitter to handle other resource types > (it's fine to support just 2D textures), Sure, but extending that interface is trivial, and arguably it should be using texture/sub-resource index anyway. > * blit and copy operations should produce different results between > different formats (blitter performs conversions), That's somewhat of an issue, but we do already have blitter flags for alpha test, color keying, flipping, mirroring, etc. > * copy operation should be allowed between various formats of the same > size (including compressed and non-compressed formats), > * it should be possible to implement wined3d_device_update_texture() > on top of wined3d_cs_emit_copy_sub_resource(). I don't think those are incompatible with the current blitter interface.

1 0

Re: shell32/tests: Return early if the shell folder creation fails in order to avoid a compiler warning.
by Marvin 17 Mar '17

17 Mar '17

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=29562 Your paranoid android. === wvistau64 (32 bit shlfolder) === shlfolder.c:457: Test failed: 0: got 7480017f expected 7080017f shlfolder.c:457: Test failed: 1: got f480017f expected 7080017f shlfolder.c:457: Test failed: 2: got 44400177 expected 40400177 shlfolder.c:457: Test failed: 3: got 44400177 expected 40400177 shlfolder.c:457: Test failed: 4: got 44400177 expected 40400177 === wvistau64 (64 bit shlfolder) === shlfolder.c:457: Test failed: 0: got 7480017f expected 7080017f shlfolder.c:457: Test failed: 1: got f480017f expected 7080017f shlfolder.c:457: Test failed: 2: got 44400177 expected 40400177 shlfolder.c:457: Test failed: 3: got 44400177 expected 40400177 shlfolder.c:457: Test failed: 4: got 44400177 expected 40400177

2 1

Re: [v4 PATCH] odbccp32: Implement SQLRemoveDriver/SQLRemoveDriverW
by Huw Davies 17 Mar '17

17 Mar '17

On Fri, Mar 17, 2017 at 04:22:20AM +0000, Alistair Leslie-Hughes wrote: > v2 - Support Usage Count. > v3 - Write key when not zero. > v4 - Only Close key when it was successfully opened. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/odbccp32/odbccp32.c | 69 +++++++++++++++++++++++++++++++++++++++++----- > dlls/odbccp32/tests/misc.c | 4 +-- > 2 files changed, 64 insertions(+), 9 deletions(-) > > diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c > index 037a2a9..5e70a9d 100644 > --- a/dlls/odbccp32/odbccp32.c > +++ b/dlls/odbccp32/odbccp32.c > @@ -1132,22 +1132,77 @@ BOOL WINAPI SQLRemoveDefaultDataSource(void) > return FALSE; > } > > -BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL fRemoveDSN, > - LPDWORD lpdwUsageCount) > +BOOL WINAPI SQLRemoveDriverW(LPCWSTR drivername, BOOL remove_dsn, LPDWORD usage_count) > { > + HKEY hkey; > + DWORD usagecount = 1; > + > clear_errors(); > - FIXME("%s %d %p\n", debugstr_w(lpszDriver), fRemoveDSN, lpdwUsageCount); > - if (lpdwUsageCount) *lpdwUsageCount = 1; > + TRACE("%s %d %p\n", debugstr_w(drivername), remove_dsn, usage_count); > + > + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) > + { > + HKEY hkeydriver; > + > + if (RegOpenKeyW(hkey, drivername, &hkeydriver) == ERROR_SUCCESS) > + { > + DWORD size, type; > + > + size = sizeof(usagecount); > + RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); > + TRACE("Usage count %d\n", usagecount); > + RegCloseKey(hkeydriver); > + } > + > + if (usagecount) > + usagecount--; > + > + if (!usagecount) > + { > + if (RegDeleteKeyW(hkey, drivername) != ERROR_SUCCESS) > + ERR("Failed to delete registry key: %s\n", debugstr_w(drivername)); > + > + if (RegOpenKeyW(hkey, odbcdrivers, &hkeydriver) == ERROR_SUCCESS) > + { > + if(RegDeleteValueW(hkeydriver, drivername) != ERROR_SUCCESS) > + ERR("Failed to delete registry value: %s\n", debugstr_w(drivername)); > + RegCloseKey(hkeydriver); > + } > + } > + else > + { > + if (RegOpenKeyW(hkey, drivername, &hkeydriver) == ERROR_SUCCESS) > + { > + if (RegSetValueExA(hkeydriver, "UsageCount", 0, REG_DWORD, (BYTE*)&usagecount, sizeof(usagecount)) != ERROR_SUCCESS) > + ERR("Failed to write registry UsageCount key\n"); > + RegCloseKey(hkeydriver); > + } > + } > + > + RegCloseKey(hkey); > + } > + It should be possible to do this without needing to open the drivername key twice. Huw.

1 0

Re: [PATCH v2] user32: Always send WM_NCACTIVATE when changing the foreground window.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Alex Henrie <alexhenrie24(a)gmail.com> writes: > Fixes https://bugs.winehq.org/show_bug.cgi?id=7198 > > v2: Use the wineserver to determine if the new foreground window is > already active in its thread. It still looks suspicious to do it here, particularly since we already have code for this in set_active_window. It would need more tests to determine where it fits with the other messages of the sequence. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: ddraw/tests: Fix Android build by replacing log2f(x) with logf(x)/logf(2)
by Alexandre Julliard 16 Mar '17

16 Mar '17

André Hentschel <nerv(a)dawncrow.de> writes: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/ddraw/tests/ddraw1.c | 2 +- > dlls/ddraw/tests/ddraw2.c | 2 +- > dlls/ddraw/tests/ddraw4.c | 2 +- > dlls/ddraw/tests/ddraw7.c | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) It builds fine here, are you using an old API version? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [v2 2/6] d3dx9: Apply changed states only in CommitChanges.
by Matteo Bruni 16 Mar '17

16 Mar '17

2017-03-14 13:46 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> The current subject might be slightly confusing, something like "d3dx9: Don't apply unmodified states in CommitChanges." would be probably better. The patch looks generally good. Comments follow. > --- > v2: > - stored current_light and current_material in effect structure instead of pass; > - renamed clear_dirty_all() -> clear_dirty_params(). > --- > +static BOOL param_clear_dirty_func(void *dummy, struct d3dx_parameter *param) > +{ > + *param->dirty_flag_ptr &= ~PARAMETER_FLAG_DIRTY; > + return FALSE; > +} > + > +static void clear_dirty_params(struct d3dx9_base_effect *base) > +{ > + unsigned int i; > + > + for (i = 0; i < base->parameter_count; ++i) > + walk_parameter_tree(&base->parameters[i], param_clear_dirty_func, NULL); > +} The walk seems unnecessary since we know that all the children parameters share their dirty flag with their parents. > - param = param->referenced_param; > - TRACE("Array index %u.\n", array_idx); > - if (array_idx >= param->element_count) > + if (array_idx >= ref_param->element_count) > { > - ERR("Computed array index %u is out of bound %u.\n", array_idx, param->element_count); > + ERR("Computed array index %u is out of bound %u.\n", array_idx, ref_param->element_count); > return D3DERR_INVALIDCALL; > } > - param = &param->members[array_idx]; > + param = &ref_param->members[array_idx]; > + *param_dirty = state->index != array_idx || is_param_dirty(param); This looked a bit weird to me at first because of reusing "param". Maybe use a separate "selected_param" variable (or something to that effect)? > - if (FAILED(hr = d3dx9_get_param_value_ptr(effect, pass, state, &param_value, &param))) > + if (FAILED(hr = d3dx9_get_param_value_ptr(effect, pass, state, &param_value, &param, > + update_all, &param_dirty))) > /* Native d3dx returns D3D_OK from BeginPass or Commit involving out of bounds array > - * access and does not touch affected state. */ > + * access and does not touch affected state, except for BeginPass fails with E_FAIL if > + * out of bounds array index depends on dirty parameter(s) in BeginPass. The latter case > + * is TODO. */ Nitpicking on the comment, it sounds better to me with something like "...except for BeginPass when the out of bounds array index depends on dirty parameters. The latter case is supposed to return E_FAIL but is currently TODO". BTW, the ERR in d3dx9_get_param_value_ptr() should probably be a WARN since it can be triggered by the application. > + TRACE("d3dx9_get_param_value_ptr error %#x.\n", hr); This one shouldn't be necessary, I think there should have been a more specific error / warning printed out by d3dx9_get_param_value_ptr() or one of its callees. Otherwise you could repurpose this to say that you're returning D3D_OK notwithstanding the failure. > + return D3D_OK; > + } Actually, it's probably better to change the d3dx9_get_param_value_ptr() return on out of bounds to E_FAIL and only override the return value to D3D_OK in that specific case. > +BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval) > +{ > + return is_const_tab_input_dirty(&peval->pres.inputs) > + || is_const_tab_input_dirty(&peval->shader_inputs); > +} If I'm not mistaken this only needs to check pres.inputs, given that it's only reasonably going to be called on FXLC and ARRAY_SELECTOR preshaders (not on actual shaders' preshaders). It doesn't matter much though. > - set_constants(rs, &pres->inputs); > - if (FAILED(hr = execute_preshader(pres))) > - return hr; > + if (update_all || is_const_tab_input_dirty(&pres->inputs)) > + { > + set_constants(rs, &pres->inputs, TRUE); > + if (FAILED(hr = execute_preshader(pres))) > + return hr; > + regstore_reset_table(rs, PRES_REGTAB_CONST); > + } This is technically a separate bugfix which would be better as a separate patch, before this one.

2 6

Re: [PATCH 2/2] rpcrt4/tests: Added more server listening tests.
by Marvin 16 Mar '17

16 Mar '17

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=29547 Your paranoid android. === w8 (32 bit server) === server.c:1769: Test failed: RpcServerUseProtseqEp(ncacn_np) failed with status 1740 server.c:1776: Test failed: RpcServerListen failed with status 1714 server.c:1777: Test failed: RpcMgmtIsServerListening returned 1715, expected 0 server.c:1780: Test failed: RpcServerListen failed with status 1714 server.c:1783: Test failed: RpcMgmtStopServerListening server.c:1787: Test failed: RpcMgmtWaitServerListening failed with status 1715 === w864 (32 bit server) === server.c:1769: Test failed: RpcServerUseProtseqEp(ncacn_np) failed with status 1740 server.c:1776: Test failed: RpcServerListen failed with status 1714 server.c:1777: Test failed: RpcMgmtIsServerListening returned 1715, expected 0 server.c:1780: Test failed: RpcServerListen failed with status 1714 server.c:1783: Test failed: RpcMgmtStopServerListening server.c:1787: Test failed: RpcMgmtWaitServerListening failed with status 1715 === w1064 (32 bit server) === server.c:1769: Test failed: RpcServerUseProtseqEp(ncacn_np) failed with status 1740 server.c:1776: Test failed: RpcServerListen failed with status 1714 server.c:1777: Test failed: RpcMgmtIsServerListening returned 1715, expected 0 server.c:1780: Test failed: RpcServerListen failed with status 1714 server.c:1783: Test failed: RpcMgmtStopServerListening server.c:1787: Test failed: RpcMgmtWaitServerListening failed with status 1715 === w864 (64 bit server) === server.c:1769: Test failed: RpcServerUseProtseqEp(ncacn_np) failed with status 1740 server.c:1776: Test failed: RpcServerListen failed with status 1714 server.c:1777: Test failed: RpcMgmtIsServerListening returned 1715, expected 0 server.c:1780: Test failed: RpcServerListen failed with status 1714 server.c:1783: Test failed: RpcMgmtStopServerListening server.c:1787: Test failed: RpcMgmtWaitServerListening failed with status 1715 === w1064 (64 bit server) === server.c:1769: Test failed: RpcServerUseProtseqEp(ncacn_np) failed with status 1740 server.c:1776: Test failed: RpcServerListen failed with status 1714 server.c:1777: Test failed: RpcMgmtIsServerListening returned 1715, expected 0 server.c:1780: Test failed: RpcServerListen failed with status 1714 server.c:1783: Test failed: RpcMgmtStopServerListening server.c:1787: Test failed: RpcMgmtWaitServerListening failed with status 1715

1 0

Re: [PATCH] wined3d: Zero-initialize count.
by Henri Verbeet 16 Mar '17

16 Mar '17

On 15 March 2017 at 17:50, Huw Davies <huw(a)codeweavers.com> wrote: > This prevents the loop below accessing beyond multisample_types > if the GL_NUM_SAMPLE_COUNTS call fails. > I think making this a little more robust is fine, but that call should never fail.

1 0

Re: [PATCH 4/8] wined3d: Allow using more than MAX_COMBINED_SAMPLERS texture image units.
by Matteo Bruni 16 Mar '17

16 Mar '17

2017-03-14 13:15 GMT+01:00 Józef Kucia <jkucia(a)codeweavers.com>: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c > index b1cda46..6fe96e4 100644 > --- a/dlls/wined3d/utils.c > +++ b/dlls/wined3d/utils.c > @@ -5994,40 +5994,28 @@ void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *g > void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl_limits, > enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) > { > - static const struct > + if (shader_type == WINED3D_SHADER_TYPE_COMPUTE) > { > - enum wined3d_shader_type type; > - unsigned int base_idx; > - unsigned int count; > + if (gl_limits->combined_samplers == gl_limits->graphics_samplers) > + *base = 0; > + else > + *base = gl_limits->graphics_samplers - 1; > + *count = gl_limits->compute_samplers; > + return; > } Late to the party and not really important but shouldn't *base in the else case be set to gl_limits->graphics_samplers (i.e. without the "- 1")?

2 1

Re: [v3 PATCH] odbccp32: Implement SQLRemoveDriver/SQLRemoveDriverW
by Huw Davies 16 Mar '17

16 Mar '17

On Thu, Mar 16, 2017 at 04:54:08AM +0000, Alistair Leslie-Hughes wrote: > v2 - Support Usage Count. > v3 - Write key when not zero. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/odbccp32/odbccp32.c | 66 +++++++++++++++++++++++++++++++++++++++++----- > dlls/odbccp32/tests/misc.c | 4 +-- > 2 files changed, 61 insertions(+), 9 deletions(-) > > diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c > index 037a2a9..ace801f 100644 > --- a/dlls/odbccp32/odbccp32.c > +++ b/dlls/odbccp32/odbccp32.c > @@ -1132,22 +1132,74 @@ BOOL WINAPI SQLRemoveDefaultDataSource(void) > return FALSE; > } > > -BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL fRemoveDSN, > - LPDWORD lpdwUsageCount) > +BOOL WINAPI SQLRemoveDriverW(LPCWSTR drivername, BOOL remove_dsn, LPDWORD usage_count) > { > + HKEY hkey; > + DWORD usagecount = 1; > + > clear_errors(); > - FIXME("%s %d %p\n", debugstr_w(lpszDriver), fRemoveDSN, lpdwUsageCount); > - if (lpdwUsageCount) *lpdwUsageCount = 1; > + TRACE("%s %d %p\n", debugstr_w(drivername), remove_dsn, usage_count); > + > + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) > + { > + HKEY hkeydriver; > + > + if (RegOpenKeyW(hkey, drivername, &hkeydriver) == ERROR_SUCCESS) > + { > + DWORD size, type; > + > + size = sizeof(usagecount); > + RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); > + TRACE("Usage count %d\n", usagecount); > + } > + > + if (usagecount) > + usagecount--; > + > + if (!usagecount) > + { > + RegCloseKey(hkeydriver); > + > + if (RegDeleteKeyW(hkey, drivername) != ERROR_SUCCESS) > + ERR("Failed to delete registry key: %s\n", debugstr_w(drivername)); > + > + if (RegOpenKeyW(hkey, odbcdrivers, &hkeydriver) == ERROR_SUCCESS) > + { > + if(RegDeleteValueW(hkeydriver, drivername) != ERROR_SUCCESS) > + ERR("Failed to delete registry value: %s\n", debugstr_w(drivername)); > + } > + } > + else > + { > + if (RegSetValueExA(hkeydriver, "UsageCount", 0, REG_DWORD, (BYTE*)&usagecount, sizeof(usagecount)) != ERROR_SUCCESS) > + ERR("Failed to write registry UsageCount key\n"); > + } > + RegCloseKey(hkeydriver); > + > + RegCloseKey(hkey); > + } > + > + if (usage_count) > + *usage_count = usagecount; > + > return TRUE; > } This isn't correct if RegOpenKeyW(hkey, drivername, &hkeydriver) fails. The clue that something is wrong (at least for this style of handling errors) is the two RegCloseKey()s in the same block. Huw.

1 0

Re: [v2 6/6] d3dx9/tests: Add test for CommitChanges in effect.
by Matteo Bruni 15 Mar '17

15 Mar '17

2017-03-14 13:47 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> I haven't looked in detail to this patch, just a couple bits I noticed. > + for (i = 0; i < sizeof(check_op_parameters) / sizeof(*check_op_parameters); ++i) You can use ARRAY_SIZE() here too. > + { > + unsigned int j; > + > + for (j = 0; j < 8; ++j) > + { > + hr = IDirect3DDevice9_SetLight(device, j, &test_effect_preshader_light_empty); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); Please add the values of i and j to the message.

1 0

Re: [v2 5/6] d3dx9/tests: Factor out vertex shader constants check helper function from test_effect_preshader().
by Matteo Bruni 15 Mar '17

15 Mar '17

2017-03-14 13:47 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Looks pretty good, I only have a few nitpicks here. > -static void test_effect_preshader(IDirect3DDevice9 *device) > +static const D3DXVECTOR4 fvect_empty = {-9999.0f, -9999.0f, -9999.0f, -9999.0f}; I don't like the "empty" suffix much. Not sure about a better name though... Maybe fvect_filler? > +#define TEST_EFFECT_PRES_NFLOATV ARRAY_SIZE(test_effect_preshader_fconstsv) Same as the previous patch, if you want to keep this define please call it *_COUNT. The naming in general isn't very consistent, probably better to stick to _FVECT_ and similar here and below. > + if (const_updated_mask[i / TEST_EFFECT_FLOATV_BITMASK_BLOCK_SIZE] > + & (1 << (i % TEST_EFFECT_FLOATV_BITMASK_BLOCK_SIZE))) Please use 1u here. > + } > + > +} Spurious empty line.

1 0

Re: [v4 5/5] comctl32: TaskDialog - Implement buttons
by Fabian Maurer 15 Mar '17

15 Mar '17

> They are properly placed but aren't working yet. Sorry, forgot to remove that line, please ignore it. Regards, Fabian Maurer

1 0

Re: [v2 PATCH 2/2] odbccp32: Implement SQLRemoveDriver/SQLRemoveDriverW
by Vincent Povirk 15 Mar '17

15 Mar '17

I think you forgot to write the new usage count to the registry in the case where the driver is not removed.

1 0

Oureachy Applicant Introduction
by chhavi gupta 15 Mar '17

15 Mar '17

Hello! I am Chhavi Gupta, a final year Computer Science Student with an interest in applying for the next round of Outreachy with Wine as some of the ideas have really caught my attention. I am familiar with C and have taken a course in Computer Graphics during my third year in college. Github Profile: https://github.com/chhavip I am interested in the following projects: - Winetest Graphical User Interface - Winecfg / winemenubuilder - enhance MIME type handling - WineCE: Implement the CommandBar I am quite new to Windows programming hence any guidance on how to get started will be extremely helpful! Thank You Chhavi Gupta

2 1

Re: [4/4] kernel32: Add localized version resource.
by Alexandre Julliard 15 Mar '17

15 Mar '17

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > diff --git a/dlls/kernel32/version.rc b/dlls/kernel32/version.rc > index 411bd6e..dbaee67 100644 > --- a/dlls/kernel32/version.rc > +++ b/dlls/kernel32/version.rc > @@ -16,6 +16,13 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > +#include "winresrc.h" > + > +#pragma makedep po > + > +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT > + > +#define WINE_FILEDESCRIPTION_STR "#msgctxt#kernel32#Wine Core DLL" > #define WINE_FILENAME_STR "kernel32.dll" Is there a reason that this needs to be kernel32 specific? Why couldn't other dlls use the translation too? -- Alexandre Julliard julliard(a)winehq.org

2 2

[PATCH] user32: Fix handling of internal messages.
by Zebediah Figura 15 Mar '17

15 Mar '17

I'm submitting this to wine-devel because the code is probably messy and I'm not sure if this is the right approach to solving the problem. This patch adds a new flag and a server reply, allowing GetQueueStatus to ignore internal messages, and MsgWaitForMultipleObjects to process internal messages until a real sent message is found. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/message.c | 129 +++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/msg.c | 8 +-- include/wine/server_protocol.h | 4 +- include/winuser.h | 3 + server/protocol.def | 1 + server/queue.c | 14 ++++- server/request.h | 3 +- server/trace.c | 1 + 8 files changed, 150 insertions(+), 13 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 9bfb453..92caf64 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2964,6 +2964,98 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags /*********************************************************************** + * receive_internal_message + * + * Retrieves and processes a single sent internal message. + */ +static DWORD receive_internal_message(size_t buffer_size) +{ + LRESULT result; + struct user_thread_info *thread_info = get_user_thread_info(); + struct received_message_info info, *old_info; + void *buffer; + size_t size = 0; + + buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size); + + SERVER_START_REQ( get_message ) + { + NTSTATUS res; + + req->flags = PM_REMOVE | PM_QS_SENDMESSAGE; + req->get_win = 0; + req->get_first = 0; + req->get_last = 0; + req->hw_id = 0; + req->wake_mask = 0; + req->changed_mask = 0; + wine_server_set_reply( req, buffer, buffer_size ); + + if ((res = wine_server_call( req )) != STATUS_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, buffer); + if (res == STATUS_BUFFER_OVERFLOW) + return receive_internal_message(reply->total); + + return RtlNtStatusToDosError(res); + } + + size = wine_server_reply_size( reply ); + info.type = reply->type; + info.msg.hwnd = wine_server_ptr_handle( reply->win ); + info.msg.message = reply->msg; + info.msg.wParam = reply->wparam; + info.msg.lParam = reply->lparam; + info.msg.time = reply->time; + info.msg.pt.x = reply->x; + info.msg.pt.y = reply->y; + thread_info->active_hooks = reply->active_hooks; + } + SERVER_END_REQ; + + switch(info.type) + { + case MSG_ASCII: + case MSG_UNICODE: + info.flags = ISMEX_SEND; + break; + case MSG_NOTIFY: + info.flags = ISMEX_NOTIFY; + break; + case MSG_CALLBACK: + info.flags = ISMEX_CALLBACK; + break; + case MSG_HOOK_LL: + info.flags = ISMEX_SEND; + reply_message(&info, 0, TRUE); + return STATUS_SUCCESS; + case MSG_OTHER_PROCESS: + info.flags = ISMEX_SEND; + if (!unpack_message(info.msg.hwnd, info.msg.message, &info.msg.wParam, + &info.msg.lParam, &buffer, size)) + { + /* ignore it */ + reply_message(&info, 0, TRUE); + return ERROR_SUCCESS; + } + break; + default: + ERR("unexpected type %d for internal message %08x\n", info.type, info.msg.message); + } + + old_info = thread_info->receive_info; + thread_info->receive_info = &info; + result = handle_internal_message(info.msg.hwnd, info.msg.message, + info.msg.wParam, info.msg.lParam); + reply_message( &info, result, TRUE ); + thread_info->receive_info = old_info; + + HeapFree(GetProcessHeap(), 0, buffer); + return ERROR_SUCCESS; +} + + +/*********************************************************************** * process_sent_messages * * Process all pending sent messages. @@ -3811,7 +3903,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageA( MSG *msg, HWND hwnd, UINT first, UIN BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last ) { HANDLE server_queue = get_server_queue_handle(); - unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ + unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE | QS_WINE_SENDMESSAGE; /* Always selected */ USER_CheckNotLock(); check_for_driver_events( 0 ); @@ -3825,7 +3917,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT if ((first <= WM_SYSTIMER) && (last >= WM_SYSTIMER)) mask |= QS_TIMER; if ((first <= WM_PAINT) && (last >= WM_PAINT)) mask |= QS_PAINT; } - else mask = QS_ALLINPUT; + else mask |= QS_ALLINPUT; while (!peek_message( msg, hwnd, first, last, PM_REMOVE | (mask << 16), mask )) { @@ -4142,7 +4234,7 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, DWORD timeout, DWORD mask, DWORD flags ) { HANDLE handles[MAXIMUM_WAIT_OBJECTS]; - DWORD i; + DWORD i, res; if (count > MAXIMUM_WAIT_OBJECTS-1) { @@ -4154,8 +4246,37 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, for (i = 0; i < count; i++) handles[i] = pHandles[i]; handles[count] = get_server_queue_handle(); - return wait_objects( count+1, handles, timeout, + mask |= QS_WINE_SENDMESSAGE; + + for (;;) + { + res = wait_objects( count+1, handles, timeout, (flags & MWMO_INPUTAVAILABLE) ? mask : 0, mask, flags ); + if (res == WAIT_OBJECT_0+count) + { + NTSTATUS server_res; + UINT msg; + SERVER_START_REQ( get_queue_status ) + { + req->clear_bits = 0; + if ((server_res = wine_server_call( req )) != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(server_res)); + return WAIT_FAILED; + } + msg = reply->first_sent_msg; + } + SERVER_END_REQ; + + if (msg & 0x80000000) + { + /* If it's a WINE internal message, process it and keep waiting */ + receive_internal_message(256); + continue; + } + } + return res; + } } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 19a1f31..a682b70 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16332,7 +16332,7 @@ static void test_SendMessage_other_thread(int thread_n) GetMessageA(&msg, 0, 0, 0); ok(msg.message == WM_USER, "expected WM_USER, got %04x\n", msg.message); DispatchMessageA(&msg); - ok_sequence(send_message_1, "SendMessage from other thread 1", thread_n == 2); + ok_sequence(send_message_1, "SendMessage from other thread 1", FALSE); /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); @@ -16347,7 +16347,7 @@ static void test_SendMessage_other_thread(int thread_n) trace("main: call PeekMessage\n"); ok(PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE), "PeekMessage should not fail\n"); ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); - ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + ok_sequence(send_message_3, "SendMessage from other thread 3", FALSE); trace("main: call PeekMessage\n"); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); @@ -16359,13 +16359,11 @@ static void test_SendMessage_other_thread(int thread_n) MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); - /* FIXME: remove once Wine is fixed */ -todo_wine_if (thread_n == 2) ok(ret == 0, "wrong status %08x\n", ret); trace("main: call PeekMessage\n"); ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); - ok_sequence(WmEmptySeq, "SendMessage from other thread 5", thread_n == 2); + ok_sequence(WmEmptySeq, "SendMessage from other thread 5", FALSE); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); ok(ret == 0, "wrong status %08x\n", ret); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ee9fdd1..4417cb6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2941,6 +2941,8 @@ struct get_queue_status_reply struct reply_header __header; unsigned int wake_bits; unsigned int changed_bits; + unsigned int first_sent_msg; + char __pad_20[4]; }; @@ -6412,6 +6414,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 524 +#define SERVER_PROTOCOL_VERSION 525 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/include/winuser.h b/include/winuser.h index 2b8331c..d10caba 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2898,6 +2898,9 @@ typedef struct tagTRACKMOUSEEVENT { /* Extra (undocumented) queue wake bits - see "Undoc. Windows" */ #define QS_SMRESULT 0x8000 +/* Internal WINE message */ +#define QS_WINE_SENDMESSAGE 0x80000000 + /* InSendMessageEx flags */ #define ISMEX_NOSEND 0x00000000 #define ISMEX_SEND 0x00000001 diff --git a/server/protocol.def b/server/protocol.def index 60865a6..7b797af 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2162,6 +2162,7 @@ enum char_info_mode @REPLY unsigned int wake_bits; /* wake bits */ unsigned int changed_bits; /* changed bits since last time */ + unsigned int first_sent_msg; /* first message in the sent message queue */ @END diff --git a/server/queue.c b/server/queue.c index c479b38..ea6d5e6 100644 --- a/server/queue.c +++ b/server/queue.c @@ -744,7 +744,8 @@ static void receive_message( struct msg_queue *queue, struct message *msg, queue->recv_result = result; } free( msg ); - if (list_empty( &queue->msg_list[SEND_MESSAGE] )) clear_queue_bits( queue, QS_SENDMESSAGE ); + if (list_empty( &queue->msg_list[SEND_MESSAGE] )) + clear_queue_bits( queue, QS_SENDMESSAGE | QS_WINE_SENDMESSAGE ); } /* set the result of the current received message */ @@ -2272,11 +2273,17 @@ DECL_HANDLER(set_queue_mask) DECL_HANDLER(get_queue_status) { struct msg_queue *queue = current->queue; + struct list *ptr; if (queue) { reply->wake_bits = queue->wake_bits; reply->changed_bits = queue->changed_bits; queue->changed_bits &= ~req->clear_bits; + + if ((ptr = list_head( &queue->msg_list[SEND_MESSAGE] ))) + reply->first_sent_msg = LIST_ENTRY( ptr, struct message, entry )->msg; + else + reply->first_sent_msg = 0; } else reply->wake_bits = reply->changed_bits = 0; } @@ -2339,7 +2346,10 @@ DECL_HANDLER(send_message) /* fall through */ case MSG_NOTIFY: list_add_tail( &recv_queue->msg_list[SEND_MESSAGE], &msg->entry ); - set_queue_bits( recv_queue, QS_SENDMESSAGE ); + if (msg->msg & 0x80000000) /* Wine internal message */ + set_queue_bits( recv_queue, QS_WINE_SENDMESSAGE ); + else + set_queue_bits( recv_queue, QS_SENDMESSAGE ); break; case MSG_POSTED: list_add_tail( &recv_queue->msg_list[POST_MESSAGE], &msg->entry ); diff --git a/server/request.h b/server/request.h index cd396ee..374150d 100644 --- a/server/request.h +++ b/server/request.h @@ -1480,7 +1480,8 @@ C_ASSERT( FIELD_OFFSET(struct get_queue_status_request, clear_bits) == 12 ); C_ASSERT( sizeof(struct get_queue_status_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, wake_bits) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, changed_bits) == 12 ); -C_ASSERT( sizeof(struct get_queue_status_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, first_sent_msg) == 16 ); +C_ASSERT( sizeof(struct get_queue_status_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_process_idle_event_request, handle) == 12 ); C_ASSERT( sizeof(struct get_process_idle_event_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_process_idle_event_reply, event) == 8 ); diff --git a/server/trace.c b/server/trace.c index e0ce45a..5ba65da 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2698,6 +2698,7 @@ static void dump_get_queue_status_reply( const struct get_queue_status_reply *re { fprintf( stderr, " wake_bits=%08x", req->wake_bits ); fprintf( stderr, ", changed_bits=%08x", req->changed_bits ); + fprintf( stderr, ", first_sent_msg=%08x", req->first_sent_msg ); } static void dump_get_process_idle_event_request( const struct get_process_idle_event_request *req ) -- 2.7.4

2 1

Re: [PATCH v2 2/3] msvcrt: Implement Concurrency::event
by Piotr Caban 15 Mar '17

15 Mar '17

Hi Daniel, I think it would be better to also avoid the static critical section. Here are some hints how it can be achieved: typedef struct { struct list *waiters; INT_PTR signaled; critical_section cs; } event; struct thread_wait; typedef struct { struct thread_wait *wait; struct list entry; } thread_wait_entry; typedef struct thread_wait { event *signaled; int pending_waits; thread_wait_entry entries[1]; } thread_wait; (thread_wait structure will need to be accessed in a thread safe way) With such structures event_set may be implemented in following way (this describes the idea, it's not a fully correct code): void __thiscall event_set(event *this) { critical_section_lock(&this->cs); if (this->signaled) unlock and return; this->signaled = TRUE; LIST_FOR_EACH_ENTRY(cur, this->waiters) { if (!InterlockedDecrement(&cur->wait->pending_waits)) { if (!InterlockedCompareExchangePtr(&cur->wait->signaled, this, 0)) NtReleaseKeyedEvent(keyed_event, cur->wait, 0, NULL); } } critical_section_unlock(&this->cs); } void __thiscall event_reset(event *this) { critical_section_lock(&this->cs); if (!this->signaled) unlock and return; this->signaled = FALSE; LIST_FOR_EACH_ENTRY(cur, this->waiters) InterlockedIncrement(&cur->wait->pending_waits); critical_section_unlock(&this->cs); } int __cdecl wait_for_multiple(event **events, MSVCRT_size_t count, MSVCRT_bool wait_all, unsigned int timeout) { wait = allocate thread_wait struct; initialize wait struct; (wait->pending_waits = wait_all ? count : 1) for(int i=0; i<count; i++) { critical_section_lock(events[i]); add wait to waiters queue (decrease wait->pending_waits if necessary) critical_section_unlock(events[i]); } status = NtWaitForKeyedEvent(keyed_event, wait, ...); if(!status || InterlockedCompareExchangePtr(wait->signaled, 1, 0)) get ret from wait->signaled else ret = COOPERATIVE_WAIT_TIMEOUT; for(int i=0; i<count; i++) { critical_section_lock(events[i]); remove wait from waiters queue critical_section_unlock(events[i]); } } Also I think it would be nice to avoid allocation in case of waiting for only one handle (or just in event_wait function). What do you think about it? Thank you, Piotr

2 1

Re: [PATCH] msxml3: Don't QI for IPersistStream in internal_parse
by Nikolay Sivov 15 Mar '17

15 Mar '17

Hi, Daniel. I think it would be better to add a ok(0, ...) call at istream_QueryInterface() instead of adding new stub for interface we are not supposed to support. This function is actually incomplete, because it does not respond to ISequentialStream. If you want to test order of QI calls, just add another QueryInterface test implementation that does that, and reuse the rest of vtable. Did you test with all versions, 3, 4, and 6?

2 1

Re: [PATCH 4/5] server: Added server side mamed pipe read and write implementation and use it for message mode pipes.
by Sebastian Lackner 15 Mar '17

15 Mar '17

On 22.02.2017 14:51, Jacek Caban wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/kernel32/tests/pipe.c | 28 ++- > dlls/ntdll/file.c | 7 +- > dlls/ntdll/tests/file.c | 2 +- > server/async.c | 9 + > server/file.h | 1 + > server/named_pipe.c | 446 > ++++++++++++++++++++++++++++++++++++++++++--- > 6 files changed, 447 insertions(+), 46 deletions(-) As I see this updated patchset allows to return the result immediately, but still uses a USR1 signal to transfer back the IO completion info. Wouldn't it be useful to get rid of that aswell? Also please note that we need to distinguish "immediate returns" and "async returns" to properly implement FileIoCompletionNotificationInformation. This especially means that waiting internally is not an option. > + iosb = async_get_iosb( async ); > + if ((blocking || iosb->status != STATUS_PENDING) > + && !(handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) > + async_terminate( async, get_error() ); I don't think this will work as expected. async_terminate might queue an APC, but the caller will immediately deallocate the async struct in server_write_file because status != STATUS_PENDING.

3 14

Outreachy applicant
by Prerna Garg 14 Mar '17

14 Mar '17

Hi, I would like to participate in the current round of Outreachy. I am new to the world of open source. I am interested to contribute in the project Winetest Graphical User Interface. Can somebody please guide me as to how I should go about it. Regards, Prerna Garg B. Tech. Computer Science NIT Hamirpur India

2 1

Re: appwiz.cpl: Use sha256 checksums to validate Mono/Gecko downloads.
by Alexandre Julliard 14 Mar '17

14 Mar '17

Sebastian Lackner <sebastian(a)fds-team.de> writes: > This patch also replaces the memory mapping logic with ReadFile. That's noticeably slower, any particular reason for doing this? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [2/2] include: Introduce a with_context macro and use it to simplify vcomp tests. [RFC]
by Bruno Jesus 14 Mar '17

14 Mar '17

On Tue, Mar 7, 2017 at 2:29 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > Based on ideas by Mark Jansen. > ... > > The with_context macro allows to specify a format string which is printed in > case of test failures and for trace messages. Currently, to track down the > origin of a test failure, it is necessary to write down all relevant variables > in each ok message. With the new macro it is much easier: > ... Hi, Sebastian. I like this idea, it would be specially useful for table struct tests (eg ws2_32) and functions that are called more than once for different tests (eg rsaenh). Each maintainer/helper could slowly update the tests as they think it fits and new tests could start benefiting from it. I hope more people join this conversation as it clearly took a long time to produce the patch and letting it drop from the list without talk would not be nice ;-)

3 3

Re: [PATCH 8/8] d3d9/tests: Add test for vertex textures.
by Marvin 14 Mar '17

14 Mar '17

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=29507 Your paranoid android. === w8 (32 bit visual) === visual.c:8099: Test failed: Got unexpected color 0x00ff00ff for no color attribute test. === w864 (64 bit visual) === visual.c:8099: Test failed: Got unexpected color 0x00ff00ff for no color attribute test.

1 0

Re: [PATCH 3/3] msvcrt100/tests: Add tests for concurrency::event
by Piotr Caban 14 Mar '17

14 Mar '17

Hi, On 03/13/17 21:53, Daniel Lehman wrote: > +static void test_event(void) > +{ > + int i; > + int ret; > + int left; > + int wait; > + event evt; > + event *evts[70]; > + HANDLE thread; > + HANDLE threads[NUMELMS(evts)]; > + > + call_func1(p_event_ctor, &evt); > + > + ret = call_func2(p_event_wait, &evt, 100); > + ok(ret == -1, "expected -1, got %d\n", ret); > + > + call_func1(p_event_set, &evt); > + ret = call_func2(p_event_wait, &evt, 100); > + ok(!ret, "expected 0, got %d\n", ret); Could you please add following test here (to show that event is not reset after wait): ret = call_func2(p_event_wait, &evt, 100); ok(!ret, "expected 0, got %d\n", ret); > + i = 0; > + left = NUMELMS(evts); > + while (left) { > + wait = min(left, MAXIMUM_WAIT_OBJECTS); > + WaitForMultipleObjects(wait, &threads[i], TRUE, 5000); > + left -= wait; > + i += wait; > + } > + > + for (i = 0; i < NUMELMS(evts); i++) > + CloseHandle(threads[i]); I think it's cleaner if you change the while and for loop to something like: for (i = 0; i < NUMELMS(threads); i++) { WaitForSingleObject(threads[i], INFINITE); CloseHandle(threads[i]); } > + /* reset and test wait for multiple with any */ > + for (i = 0; i < NUMELMS(evts); i++) > + call_func1(p_event_reset, evts[i]); > + > + for (i = 0; i < NUMELMS(evts); i++) > + threads[i] = CreateThread(NULL, 0, test_event_thread, (void*)evts[i], 0, NULL); > + > + ret = p_event_wait_for_multiple(evts, NUMELMS(evts), FALSE, 5000); > + ok(ret != -1, "didn't expect -1\n"); Could you please start only one thread in this case and check exact return value from p_event_wait_for_multiple. Could you please also add following test: static DWORD WINAPI multiple_events_thread(void *arg) { event **events = arg; Sleep(50); call_func1(p_event_set, events[0]); call_func1(p_event_reset, events[0]); call_func1(p_event_set, events[1]); call_func1(p_event_reset, events[1]); return 0; } call_func1(p_event_reset, evts[0]); call_func1(p_event_reset, evts[1]); thread = CreateThread(NULL, 0, multiple_events_thread, (void*)evts, 0, NULL); ret = p_event_wait_for_multiple(evts, 2, TRUE, 500); ok(ret == -1, "expect -1, got %d\n", ret); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); Thanks, Piotr

1 0

1.8.7 maintenance release?
by version2013＠openmailbox.org 14 Mar '17

14 Mar '17

I still have much to learn. Why have a 1.8.7 maintenance release after a 2.0 stable release? In advance, thank you for sharing your knowledge as to why.

4 4

Re: [PATCH 1/3] msvcrt: Add Concurrency::event stubs
by Piotr Caban 14 Mar '17

14 Mar '17

Hi Daniel, On 03/13/17 21:53, Daniel Lehman wrote: > include/concrt.h | 25 ++++++++++++++++ The c-runtimes related headers are defined in include/msvcrt/*. In this case I think that it will be better to define needed constants in dlls/msvcrt/msvcrt.h because the concrt.h header is not useful. Thanks, Piotr

1 0

Re: [PATCH] user32: Removed 16-bit windows position and size constraints
by Alexandre Julliard 14 Mar '17

14 Mar '17

Kees Beets <kbeets68(a)gmail.com> writes: > Fixes https://bugs.winehq.org/show_bug.cgi?id=38231 > > Removed 16-bit windows position and size constraints > introduced in 2006. Only kept truncation to 16-bit > in windows messaging to keep same behaviour as windows. I'd find it surprising that the messages wouldn't match the actual window sizes. This would need more test cases. In fact we already had some window size tests, but they were commented out. I've re-enabled them now, so if you try your patch against latest git you'll see new failures, indicating that fixing up the messages is not correct. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/3] msvcrt: Implement Concurrency::event
by Sebastian Lackner 14 Mar '17

14 Mar '17

On 13.03.2017 21:53, Daniel Lehman wrote: > > From 44d603b75fe10d51377c20e4c3c2a1bf031c4fcf Mon Sep 17 00:00:00 2001 > From: Daniel Lehman <dlehman(a)esri.com> > Date: Mon, 12 Dec 2016 16:44:44 -0800 > Subject: [PATCH 2/3] msvcrt: Implement Concurrency::event > > wait_for_multiple can handle more than WaitForMultipleObjects' limit of 64 > a separate thread is used to handle threads that wait on multiple handles > and is loosely modeled after wineserver's select request handler > a very simple command structure is used to communicate with it over a single shared pipe > > Signed-off-by: Daniel Lehman <dlehman(a)esri.com> > --- > dlls/msvcrt/lock.c | 387 +++++++++++++++++++++++++++++++++++++++++++++++++-- > dlls/msvcrt/main.c | 3 + > dlls/msvcrt/msvcrt.h | 18 +++ > 3 files changed, 397 insertions(+), 11 deletions(-) Not sure if its suitable here, but please note that Wines threadpool implementation also supports waiting on more than 64 objects (using similar tricks). If possible, it would be better to avoid the second implementation.

2 3

Re: [PATCH 3/3] d3dx9: Apply changed states only in CommitChanges.
by Matteo Bruni 14 Mar '17

14 Mar '17

2017-03-09 23:15 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/d3dx9_private.h | 8 ++- > dlls/d3dx9_36/effect.c | 146 ++++++++++++++++++++++++++++-------------- > dlls/d3dx9_36/preshader.c | 40 ++++++++++-- > dlls/d3dx9_36/tests/effect.c | 13 ---- > 4 files changed, 137 insertions(+), 70 deletions(-) > > diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h > index 27b91a7..53cf99f 100644 > --- a/dlls/d3dx9_36/d3dx9_private.h > +++ b/dlls/d3dx9_36/d3dx9_private.h > @@ -222,6 +222,11 @@ struct d3dx_parameter > DWORD *dirty_flag_ptr; > }; > > +static inline BOOL is_param_dirty(struct d3dx_parameter *param) > +{ > + return (*param->dirty_flag_ptr & PARAMETER_FLAG_DIRTY); > +} > + > struct d3dx9_base_effect; > > struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, > @@ -233,6 +238,7 @@ void d3dx_free_param_eval(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN; > HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, > const struct d3dx_parameter *param, void *param_value) DECLSPEC_HIDDEN; > HRESULT d3dx_param_eval_set_shader_constants(struct IDirect3DDevice9 *device, > - struct d3dx_param_eval *peval) DECLSPEC_HIDDEN; > + struct d3dx_param_eval *peval, BOOL update_all) DECLSPEC_HIDDEN; > +BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN; > > #endif /* __WINE_D3DX9_PRIVATE_H */ > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index ada78f9..b18465c 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -123,6 +123,9 @@ struct d3dx_pass > > struct d3dx_state *states; > struct d3dx_parameter *annotations; > + > + D3DLIGHT9 current_light[8]; > + D3DMATERIAL9 current_material; > }; I think these might be stored in the effect struct instead. > +static void clear_dirty_all(struct d3dx9_base_effect *base) clear_dirty_params() or something like that would be a clearer name. > @@ -1570,8 +1587,12 @@ static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHAN > { > if (param->rows == 1 && param->columns == 1) > { > - set_number(param->data, param->type, &n, D3DXPT_INT); > - set_dirty(param); > + DWORD value; > + > + set_number(&value, param->type, &n, D3DXPT_INT); > + if (value != *(DWORD *)param->data) > + set_dirty(param); > + *(DWORD *)param->data = value; Shouldn't this go in the previous patch?

2 1

Re: [PATCH 2/3] d3dx9: Set dirty flag on parameter change.
by Matteo Bruni 14 Mar '17

14 Mar '17

2017-03-09 23:15 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > @@ -2021,9 +2055,11 @@ static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base > switch (param->class) > { > case D3DXPC_MATRIX_ROWS: > + set_dirty(param); > for (i = 0; i < count; ++i) > { > set_matrix(&param->members[i], &matrix[i]); > + set_dirty(&param->members[i]); > } > return D3D_OK; > Here and below it should be possible to avoid marking dirty each array element individually. IIRC I had some test showing that arrays are always considered completely dirty or clean on native i.e. CommitChanges updates the whole array even if you only change a subset of the elements.

2 1

Re: [PATCH 1/3] d3dx9/tests: Add test for CommitChanges in effect.
by Matteo Bruni 14 Mar '17

14 Mar '17

2017-03-09 23:15 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/tests/effect.c | 1267 +++++++++++++++++++++++++++++++----------- > 1 file changed, 930 insertions(+), 337 deletions(-) First of all, please split up this patch, this is way too large and does multiple things at once (I see that it extends the test effect and checks the new states, factors out two helper functions from test_effect_preshader() and it also adds the CommitChanges test in the subject). Those are all good changes but when they are squeezed in one patch it becomes hard to review. I haven't looked in too much detail but anyway there are a few additional comments below. > +#define TEST_EFFECT_PRES_NOPTESTS ARRAY_SIZE(test_effect_preshader_op_results) I know this isn't new but I don't think this define is very useful. If you really want to keep it, please name it xxx_TEST_COUNT. > + else if (!state_updated[i]) > + { > + todo_wine_if(memcmp(v, empty_v, sizeof(float) * 4)) > + ok_(__FILE__, line)(!memcmp(v, empty_v, sizeof(float) * 4), > + "Parameter %s, test %d, operation %s, state updated unexpectedly.\n", > + updated_param, i, test_effect_preshader_op_results[i].comment); Eh, this isn't really all that nice. I don't see an obvious way to make this any better though so it probably makes sense to move this part (or even all the tests) to the end of the patch series and avoid the problem altogether. BTW, if you define empty_v as an array you can use sizeof(empty_v) here. > + } > + } > +} > + > +static const D3DXVECTOR4 fvect_empty = {-9999.0f, -9999.0f, -9999.0f, -9999.0f}; > + > +static void test_effect_preshader_clear_vconsts(IDirect3DDevice9 *device) > +{ > + int i; unsigned int i; > + static const struct > + { > + const char *param_name; > + BOOL const_updated[TEST_EFFECT_PRES_NFLOATV]; > + } > + check_vconsts_parameters[] = > + { > + {"g_Selector", > + {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, > + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, > + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, > + FALSE, FALSE, FALSE, TRUE}}, It would be nicer to represent these as 32-bit hexadecimal bitmasks. > + for (i = 0; i < sizeof(check_op_parameters) / sizeof(*check_op_parameters); ++i) > + { > + int j; unsigned int j; Also please leave a blank line between declarations and code. > + for (j = 0; j < 8; j++) Consistency, please stick to the '++j' form.

2 1

Re: [PATCH 3/7] d3d9/tests: Fix test_updatetexture() on GPUs not supporting WINED3DFMT_R32_FLOAT.
by Marvin 13 Mar '17

13 Mar '17

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=29498 Your paranoid android. === w1064 (32 bit visual) === visual.c:7995: Test failed: Got unexpected color 0x00008080 for quad 2 (different colors). visual.c:7995: Test failed: Got unexpected color 0x00007580 for quad 2 (different colors).

1 0

Re: [PATCH 1/7] d3d9/tests: Ignore test_vshader_input() "no color attribute" test result on WARP.
by Marvin 13 Mar '17

13 Mar '17

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=29497 Your paranoid android. === w1064 (32 bit visual) === visual.c:7995: Test failed: Got unexpected color 0x00008080 for quad 2 (different colors). === w1064 (64 bit visual) === visual.c:7995: Test failed: Got unexpected color 0x00007580 for quad 2 (different colors).

1 0

Re: [PATCH] ddraw/tests: Rewrite SrcColorKey32BlitTest (v2).
by Henri Verbeet 13 Mar '17

13 Mar '17

On 8 March 2017 at 20:29, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > *) Accept the Nvidia XRGB color key results with X != 0. I am open to > removing this test entirely as we're accepting a lot of different > outcomes now. Yeah, probably. It does seem consistent with the idea that the "X" channel is undefined, and I don't think that particular test was motivated by application behaviour.

2 1

[PATCH] user32: Fix handling of internal messages.
by Zebediah Figura 13 Mar '17

13 Mar '17

I'm submitting this to wine-devel because the code is probably messy and I'm not sure if this is the right approach to solving the problem. This patch adds a new flag and a server reply, allowing GetQueueStatus to ignore internal messages, and MsgWaitForMultipleObjects to process internal messages until a real sent message is found. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/message.c | 129 +++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/msg.c | 8 +-- include/wine/server_protocol.h | 4 +- include/winuser.h | 3 + server/protocol.def | 1 + server/queue.c | 14 ++++- server/request.h | 3 +- server/trace.c | 1 + 8 files changed, 150 insertions(+), 13 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 9bfb453..92caf64 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2964,6 +2964,98 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags /*********************************************************************** + * receive_internal_message + * + * Retrieves and processes a single sent internal message. + */ +static DWORD receive_internal_message(size_t buffer_size) +{ + LRESULT result; + struct user_thread_info *thread_info = get_user_thread_info(); + struct received_message_info info, *old_info; + void *buffer; + size_t size = 0; + + buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size); + + SERVER_START_REQ( get_message ) + { + NTSTATUS res; + + req->flags = PM_REMOVE | PM_QS_SENDMESSAGE; + req->get_win = 0; + req->get_first = 0; + req->get_last = 0; + req->hw_id = 0; + req->wake_mask = 0; + req->changed_mask = 0; + wine_server_set_reply( req, buffer, buffer_size ); + + if ((res = wine_server_call( req )) != STATUS_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, buffer); + if (res == STATUS_BUFFER_OVERFLOW) + return receive_internal_message(reply->total); + + return RtlNtStatusToDosError(res); + } + + size = wine_server_reply_size( reply ); + info.type = reply->type; + info.msg.hwnd = wine_server_ptr_handle( reply->win ); + info.msg.message = reply->msg; + info.msg.wParam = reply->wparam; + info.msg.lParam = reply->lparam; + info.msg.time = reply->time; + info.msg.pt.x = reply->x; + info.msg.pt.y = reply->y; + thread_info->active_hooks = reply->active_hooks; + } + SERVER_END_REQ; + + switch(info.type) + { + case MSG_ASCII: + case MSG_UNICODE: + info.flags = ISMEX_SEND; + break; + case MSG_NOTIFY: + info.flags = ISMEX_NOTIFY; + break; + case MSG_CALLBACK: + info.flags = ISMEX_CALLBACK; + break; + case MSG_HOOK_LL: + info.flags = ISMEX_SEND; + reply_message(&info, 0, TRUE); + return STATUS_SUCCESS; + case MSG_OTHER_PROCESS: + info.flags = ISMEX_SEND; + if (!unpack_message(info.msg.hwnd, info.msg.message, &info.msg.wParam, + &info.msg.lParam, &buffer, size)) + { + /* ignore it */ + reply_message(&info, 0, TRUE); + return ERROR_SUCCESS; + } + break; + default: + ERR("unexpected type %d for internal message %08x\n", info.type, info.msg.message); + } + + old_info = thread_info->receive_info; + thread_info->receive_info = &info; + result = handle_internal_message(info.msg.hwnd, info.msg.message, + info.msg.wParam, info.msg.lParam); + reply_message( &info, result, TRUE ); + thread_info->receive_info = old_info; + + HeapFree(GetProcessHeap(), 0, buffer); + return ERROR_SUCCESS; +} + + +/*********************************************************************** * process_sent_messages * * Process all pending sent messages. @@ -3811,7 +3903,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageA( MSG *msg, HWND hwnd, UINT first, UIN BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last ) { HANDLE server_queue = get_server_queue_handle(); - unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ + unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE | QS_WINE_SENDMESSAGE; /* Always selected */ USER_CheckNotLock(); check_for_driver_events( 0 ); @@ -3825,7 +3917,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT if ((first <= WM_SYSTIMER) && (last >= WM_SYSTIMER)) mask |= QS_TIMER; if ((first <= WM_PAINT) && (last >= WM_PAINT)) mask |= QS_PAINT; } - else mask = QS_ALLINPUT; + else mask |= QS_ALLINPUT; while (!peek_message( msg, hwnd, first, last, PM_REMOVE | (mask << 16), mask )) { @@ -4142,7 +4234,7 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, DWORD timeout, DWORD mask, DWORD flags ) { HANDLE handles[MAXIMUM_WAIT_OBJECTS]; - DWORD i; + DWORD i, res; if (count > MAXIMUM_WAIT_OBJECTS-1) { @@ -4154,8 +4246,37 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, for (i = 0; i < count; i++) handles[i] = pHandles[i]; handles[count] = get_server_queue_handle(); - return wait_objects( count+1, handles, timeout, + mask |= QS_WINE_SENDMESSAGE; + + for (;;) + { + res = wait_objects( count+1, handles, timeout, (flags & MWMO_INPUTAVAILABLE) ? mask : 0, mask, flags ); + if (res == WAIT_OBJECT_0+count) + { + NTSTATUS server_res; + UINT msg; + SERVER_START_REQ( get_queue_status ) + { + req->clear_bits = 0; + if ((server_res = wine_server_call( req )) != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(server_res)); + return WAIT_FAILED; + } + msg = reply->first_sent_msg; + } + SERVER_END_REQ; + + if (msg & 0x80000000) + { + /* If it's a WINE internal message, process it and keep waiting */ + receive_internal_message(256); + continue; + } + } + return res; + } } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 19a1f31..a682b70 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16332,7 +16332,7 @@ static void test_SendMessage_other_thread(int thread_n) GetMessageA(&msg, 0, 0, 0); ok(msg.message == WM_USER, "expected WM_USER, got %04x\n", msg.message); DispatchMessageA(&msg); - ok_sequence(send_message_1, "SendMessage from other thread 1", thread_n == 2); + ok_sequence(send_message_1, "SendMessage from other thread 1", FALSE); /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); @@ -16347,7 +16347,7 @@ static void test_SendMessage_other_thread(int thread_n) trace("main: call PeekMessage\n"); ok(PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE), "PeekMessage should not fail\n"); ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); - ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + ok_sequence(send_message_3, "SendMessage from other thread 3", FALSE); trace("main: call PeekMessage\n"); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); @@ -16359,13 +16359,11 @@ static void test_SendMessage_other_thread(int thread_n) MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); - /* FIXME: remove once Wine is fixed */ -todo_wine_if (thread_n == 2) ok(ret == 0, "wrong status %08x\n", ret); trace("main: call PeekMessage\n"); ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); - ok_sequence(WmEmptySeq, "SendMessage from other thread 5", thread_n == 2); + ok_sequence(WmEmptySeq, "SendMessage from other thread 5", FALSE); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); ok(ret == 0, "wrong status %08x\n", ret); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ee9fdd1..4417cb6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2941,6 +2941,8 @@ struct get_queue_status_reply struct reply_header __header; unsigned int wake_bits; unsigned int changed_bits; + unsigned int first_sent_msg; + char __pad_20[4]; }; @@ -6412,6 +6414,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 524 +#define SERVER_PROTOCOL_VERSION 525 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/include/winuser.h b/include/winuser.h index 2b8331c..d10caba 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2898,6 +2898,9 @@ typedef struct tagTRACKMOUSEEVENT { /* Extra (undocumented) queue wake bits - see "Undoc. Windows" */ #define QS_SMRESULT 0x8000 +/* Internal WINE message */ +#define QS_WINE_SENDMESSAGE 0x80000000 + /* InSendMessageEx flags */ #define ISMEX_NOSEND 0x00000000 #define ISMEX_SEND 0x00000001 diff --git a/server/protocol.def b/server/protocol.def index 60865a6..7b797af 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2162,6 +2162,7 @@ enum char_info_mode @REPLY unsigned int wake_bits; /* wake bits */ unsigned int changed_bits; /* changed bits since last time */ + unsigned int first_sent_msg; /* first message in the sent message queue */ @END diff --git a/server/queue.c b/server/queue.c index c479b38..ea6d5e6 100644 --- a/server/queue.c +++ b/server/queue.c @@ -744,7 +744,8 @@ static void receive_message( struct msg_queue *queue, struct message *msg, queue->recv_result = result; } free( msg ); - if (list_empty( &queue->msg_list[SEND_MESSAGE] )) clear_queue_bits( queue, QS_SENDMESSAGE ); + if (list_empty( &queue->msg_list[SEND_MESSAGE] )) + clear_queue_bits( queue, QS_SENDMESSAGE | QS_WINE_SENDMESSAGE ); } /* set the result of the current received message */ @@ -2272,11 +2273,17 @@ DECL_HANDLER(set_queue_mask) DECL_HANDLER(get_queue_status) { struct msg_queue *queue = current->queue; + struct list *ptr; if (queue) { reply->wake_bits = queue->wake_bits; reply->changed_bits = queue->changed_bits; queue->changed_bits &= ~req->clear_bits; + + if ((ptr = list_head( &queue->msg_list[SEND_MESSAGE] ))) + reply->first_sent_msg = LIST_ENTRY( ptr, struct message, entry )->msg; + else + reply->first_sent_msg = 0; } else reply->wake_bits = reply->changed_bits = 0; } @@ -2339,7 +2346,10 @@ DECL_HANDLER(send_message) /* fall through */ case MSG_NOTIFY: list_add_tail( &recv_queue->msg_list[SEND_MESSAGE], &msg->entry ); - set_queue_bits( recv_queue, QS_SENDMESSAGE ); + if (msg->msg & 0x80000000) /* Wine internal message */ + set_queue_bits( recv_queue, QS_WINE_SENDMESSAGE ); + else + set_queue_bits( recv_queue, QS_SENDMESSAGE ); break; case MSG_POSTED: list_add_tail( &recv_queue->msg_list[POST_MESSAGE], &msg->entry ); diff --git a/server/request.h b/server/request.h index cd396ee..374150d 100644 --- a/server/request.h +++ b/server/request.h @@ -1480,7 +1480,8 @@ C_ASSERT( FIELD_OFFSET(struct get_queue_status_request, clear_bits) == 12 ); C_ASSERT( sizeof(struct get_queue_status_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, wake_bits) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, changed_bits) == 12 ); -C_ASSERT( sizeof(struct get_queue_status_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, first_sent_msg) == 16 ); +C_ASSERT( sizeof(struct get_queue_status_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_process_idle_event_request, handle) == 12 ); C_ASSERT( sizeof(struct get_process_idle_event_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_process_idle_event_reply, event) == 8 ); diff --git a/server/trace.c b/server/trace.c index e0ce45a..5ba65da 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2698,6 +2698,7 @@ static void dump_get_queue_status_reply( const struct get_queue_status_reply *re { fprintf( stderr, " wake_bits=%08x", req->wake_bits ); fprintf( stderr, ", changed_bits=%08x", req->changed_bits ); + fprintf( stderr, ", first_sent_msg=%08x", req->first_sent_msg ); } static void dump_get_process_idle_event_request( const struct get_process_idle_event_request *req ) -- 2.7.4

1 0

Re: [PATCH 1/5] wined3d: Get rid of "texture_stages" variable in draw_primitive_immediate_mode().
by Henri Verbeet 13 Mar '17

13 Mar '17

On 13 March 2017 at 11:57, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -281,8 +281,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const > GL_EXTCALL(glSecondaryColor3fEXT)(0.0f, 0.0f, 0.0f); > } > > - texture_stages = d3d_info->limits.ffp_blend_stages; > - for (texture_idx = 0; texture_idx < texture_stages; ++texture_idx) > + for (texture_idx = 0; texture_idx < d3d_info->limits.ffp_blend_stages; ++texture_idx) It doesn't matter that much, but I'm not sure that's an improvement.

1 0

Re: [PATCH] ole32/tests: Stop crash on XP
by Jacek Caban 13 Mar '17

13 Mar '17

Hi Alistair, On 12.03.2017 22:11, Alistair Leslie-Hughes wrote: > Fixes crash > http://test.winehq.org/data/4b1445940d47870895b7fa87b7d69d12abe701ef/xp_fg-… > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/ole32/tests/compobj.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c > index 8f6ff7107c..db68fd05c6 100644 > --- a/dlls/ole32/tests/compobj.c > +++ b/dlls/ole32/tests/compobj.c > @@ -3569,7 +3569,12 @@ static void test_GlobalOptions(void) > > hres = CoCreateInstance(&CLSID_GlobalOptions, NULL, CLSCTX_INPROC_SERVER, > &IID_IGlobalOptions, (void**)&global_options); > - ok(hres == S_OK, "CoCreateInstance(CLSID_GlobalOptions) failed: %08x\n", hres); Instead of removing ok(), please change it with '|| broken(hres == E_NOINTERFACE)'. > + if(FAILED(hres)) > + { > + win_skip("CLSID_GlobalOptions not available\n"); > + CoUninitialize(); > + return; > + } > > IGlobalOptions_Release(global_options); Jacek

1 0

Re: [v3 04/12] comctl32: Extend TaskDialog, add simple callback and tests
by Nikolay Sivov 13 Mar '17

13 Mar '17

On 10.03.2017 21:21, Fabian Maurer wrote: > v3: Rewrite to implement Nikolay Sivov's suggestions > > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > --- > dlls/comctl32/taskdialog.c | 29 +++++++++++++++++++++++-- > dlls/comctl32/tests/taskdialog.c | 46 +++++++++++++++++++++++++++++++++------- > 2 files changed, 65 insertions(+), 10 deletions(-) > > diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c > index 2166ce1898..c5f410716e 100644 > --- a/dlls/comctl32/taskdialog.c > +++ b/dlls/comctl32/taskdialog.c > @@ -147,17 +147,41 @@ static void controls_add(struct list *controls, WORD id, const WCHAR *class, con > list_add_tail(controls, &data->entry); > } > > +/* FIXME: Make thread safe */ > +static const TASKDIALOGCONFIG *task_config = 0; > +static HRESULT callback(HWND hwnd, UINT uNotification, WPARAM wParam, LPARAM lParam) > +{ > + if(task_config->pfCallback) > + return task_config->pfCallback(hwnd, uNotification, wParam, lParam, task_config->lpCallbackData); > + return S_OK; > +} > + There's no reason to introduce global variable for that, just to remove it two patches after. > static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) > { > + HRESULT ret_callback; > + > switch (uMsg) > { > + case WM_INITDIALOG: > + callback(hwndDlg, TDN_DIALOG_CONSTRUCTED, 0, 0); > + callback(hwndDlg, TDN_CREATED, 0, 0); > + return TRUE; > case WM_COMMAND: > - if(HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDOK) > + if(HIWORD(wParam) == BN_CLICKED) > { > - EndDialog(hwndDlg, 0); > + WORD command_id = LOWORD(wParam); > + > + ret_callback = callback(hwndDlg, TDN_BUTTON_CLICKED, command_id, 0); > + if(ret_callback == S_OK) /* FIXME */ > + { > + EndDialog(hwndDlg, command_id); > + } > return TRUE; > } > break; > + case WM_DESTROY: > + callback(hwndDlg, TDN_DESTROYED, 0, 0); > + break; > } > return FALSE; For minimal working replacement of MessageBox callback support is not needed, right?

2 4

Re: [v2] user32: Removed 16-bit windows position and size constraints
by Alex Henrie 12 Mar '17

12 Mar '17

2017-03-12 4:23 GMT-06:00 Kees Beets <kbeets68(a)gmail.com>: > Thanks. Changed and submitted again. > > > I'm new to wine. From the instructions here > https://wiki.winehq.org/Submitting_Patches it sounds like there is a > possibility to submit corrections to patches without creating new entries in > the patch list. Somehow I've not been able to get that working. Hope I don't > get on people's nerves :). Alexandre manually removes old patches from the list after a couple of days. If you suspect that there is something wrong with a patch, don't send it to wine-patches, but don't feel bad about sending a new patch to fix an honest mistake. -Alex

1 0

Re: wine/test.h: Identify the process responsible for test summary lines.
by Sebastian Lackner 12 Mar '17

12 Mar '17

On 22.02.2017 15:33, Francois Gouget wrote: > Currently the child process summary lines are indistinguishable from the > main process one. This makes it impossible to automatically detect > when a process exits abruptly, i.e. without printing a summary line, > if it has run a subprocess. > This patch will let analysis tools identify which summary lines > correspond to processes they started and thus when some are missing. > Note also that in case of a crash the 'unhandled exception' play the > same role as the test summary lines. Thus it is important to also tag > them with the pid of the source process. > > Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> > --- > include/wine/test.h | 8 +++++--- > programs/winetest/main.c | 14 +++++++++----- > 2 files changed, 14 insertions(+), 8 deletions(-) Ugh... actually it looks like we have a summary line hardcoded in schedsvc tests: --- snip --- if (winetest_debug) { fprintf(stdout, "rpcapi: 0 tests executed (0 marked as todo, 0 failures), 1 skipped.\n"); fflush(stdout); } ExitProcess(0); --- snip --- Is it still recognized by the testbot?

2 1

Re: [v3 03/12] comctl32: Added basic implementation for task dialogs and add tests
by Nikolay Sivov 12 Mar '17

12 Mar '17

On 10.03.2017 21:21, Fabian Maurer wrote: > + UINT text_size; /* Length in bytes including null-terminator */ > + UINT class_size; /* Length in bytes including null-terminator */ > + struct list entry; > +}control_info; > + > +typedef struct > +{ > + DLGTEMPLATE template; > + WORD menu; > + WORD class; > + const WCHAR *title; > + > + /* Not part of actual template */ > + UINT titleSize; /* Length in bytes including null-terminator */ > +}dialog_header; About formatting issues, for consistency please add space after bracket, same goes for 'if' and other places. "titleSize" -> "title_size". > +#define MEMCPY_MOVEPTR(target, source, size) memcpy(target, source, size); target += size; I think this one will be better as a function, also this macro assumes that target point is char*, which is impossible to guess. > +static void* align_pointer(void *ptr, unsigned int boundary) > +{ > + boundary--; > + return (void *)(((UINT_PTR)ptr + boundary) & ~boundary); > +} This is usually done with macros in Wine I think, like ((x) + size - 1) & ~(size - 1). > +LPDLGTEMPLATEW dialog_template_create(dialog_header header, struct list *controls) Why is 'header' passed by value? > + void *template_data_start; I think it's better to declare this with a type you're going to return. > + data_size += sizeof(WORD)*2 + header.titleSize; Same formatting issue - please add spaces around operator. > + /* Align on WORD boundary for the strings */ > + template_data = align_pointer(template_data, 2); I don't see how it could be not aligned to WORD, could you explain?

2 3

Interested to contribute to WINE via Outreachy
by Himadri Pandya 12 Mar '17

12 Mar '17

Hello Everyone, I'm Himadri, an undergraduate student from India pursuing my bachelors in computer engineering. I'm a newbie to the FOSS community and keen to be a part by contributing to some interesting project. And I guess starting the journey with Outreachy would be the best ! Gsoc project : "Tools - Winetest Graphical User Interface" seems quite interesting to me. I would love to be a part of it. It would be really appreciable if I can get some replies about how can I contribute to it. Regards Himadri Pandya Linked In : https://www.linkedin.com/in/himadri2117

3 3

Re: [PATCH] oledb32: Ignore IRunnableObject in IDataSourceLocator_QueryInterface.
by Sebastian Lackner 12 Mar '17

12 Mar '17

On 12.03.2017 05:34, Alistair Leslie-Hughes wrote: > + else if (IsEqualIID(riid, &IID_IDataInitialize)) > + { > + TRACE("IID_IRunnableObject returning NULL\n"); > + } You are checking for the wrong IID. Also, the TRACE does not really prevent that the FIXME message shows up.

1 0

Re: [v2] user32: Removed 16-bit windows position and size constraints
by Alex Henrie 11 Mar '17

11 Mar '17

+ // truncate x,y to 16-bit in WM_WINDOWPOSCHANGING message (only) + // truncate x,y to 16-bit in WM_WINDOWPOSCHANGED message (only) C++-style comments are not permitted in Wine patches. See https://wiki.winehq.org/Developer_Hints#Using_only_C89-compliant_code -Alex

1 0

GSoC 2017 : CMD - implement more robust parser
by Kevin Jojo 11 Mar '17

11 Mar '17

I am Prateek Bilung , a first year undergraduate student of Mathematics & Computing at BIT Mesra ,Ranchi , India. I am interested in contributing for project "CMD - implement more robust parser" . Please guide me . Thank you !

1 0

Re: [PATCH] user32: Removed 16-bit windows position and size constraints
by Alexandre Julliard 11 Mar '17

11 Mar '17

Kees Beets <kbeets68(a)gmail.com> writes: > Fixes https://bugs.winehq.org/show_bug.cgi?id=38231 > > Removed code introduced in 2006 to correctly reflect Win9x 16-bit winpos > behaviour. Newer versions of Windows do not have the 16-bit constraint > and this code is now actually causing a bug in Adobe Lightroom on Wine. > I've not used iswin9x to ensure compatibility with Win9x as: > - Applications that can run on Win9x should take care of this > - Adding such code will over time make wine more complex > > Tested on Ubuntu 16.04, HP Elitebook with AMD A10. > 13 failures before change, 10 failures after change. Test code uses > iswin9x, so to have 0 failures means changes to the test suite or > further introduction of 'if isinw9x' logic. > > Signed-off-by: Kees Beets <kbeets68(a)gmail.com> > --- > dlls/user32/winpos.c | 16 ---------------- > 1 file changed, 16 deletions(-) It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M user32.dll -p user32_test.exe.so win && touch win.ok win.c:776: Test failed: bad winpos->x -32769 win.c:777: Test failed: bad winpos->y -40000 win.c:795: Test failed: bad winpos->x -32769 win.c:796: Test failed: bad winpos->y -40000 win.c:776: Test failed: bad winpos->x 32768 win.c:777: Test failed: bad winpos->y 40000 win.c:795: Test failed: bad winpos->x 32768 win.c:796: Test failed: bad winpos->y 40000 Makefile:649: recipe for target 'win.ok' failed -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [v3 01/12] comctl32: Move TaskDialogIndirect and tests into own source files
by Nikolay Sivov 11 Mar '17

11 Mar '17

On 10.03.2017 21:21, Fabian Maurer wrote: > diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c > new file mode 100644 > index 0000000000..c26d53bac9 > --- /dev/null > +++ b/dlls/comctl32/taskdialog.c > @@ -0,0 +1,72 @@ > +/* > + * Task dialog control > + * > + * Copyright 2017 Fabian Maurer for the Wine project > + * > + * 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 <stdarg.h> > +#include <string.h> > + > +#include "windef.h" > +#include "winbase.h" > +#include "winuser.h" > +#include "commctrl.h" > +#include "winerror.h" > +#include "comctl32.h" > +#include "wine/debug.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(commctrl); > + Since it's move to its own file, let's call new debug channel "taskdlg" for instance.

2 2

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