- wine-devel - winehq.org

Re: msvcrt: Make the first call to fwrite bufferred (try2)
by Andreas Fuchs 02 Oct '14

02 Oct '14

Hi Piotr, Hi all, I traced down this commit as the origin of the regression, where I cannot parse stdout of wine correctly anymore. See also https://bugs.winehq.org/show_bug.cgi?id=37345 I hope, sombody knowledgable (Piotr maybe you as the author) could help me figure this out or even provide a fix... Description: When calling wine from another process after redirecting stdout to a pipe, wine does not flush the stdout-buffer correctly anymore (Wine 1.6 did correctly). Attached is a usecase. To test do: i686-w64-mingw32-gcc helloworld.c gcc callwine.c ./a.out What will happen is: - on a buggy wine it will take 10 seconds and then all of the stdout-buffer is flushed on the exit of the child. (imagine the child would run longer than the 10 seconds) - on a good wine we will see some stdout-content then 10 second sleep and then the rest of the content. This is a regression that happened between 1.7.4 and 1.7.5. The bisect identified commit afec0b00bd6250fe21e8deccbc8116a4aca6a7a4 "msvcrt: Make the first call to fwrite buffered." as problem. The attached patch is a revert of this commit ported forward to 1.7.27. Unfortunately I don't quite grasp the logics of the offending commit. If somebody who knows that patch could help, I'd highly appreciate it. Cheers, Andreas

3 2

Re: [PATCH 1/3] comctl32: Move TaskDialogIndirect function to separate file
by Nikolay Sivov 02 Oct '14

02 Oct '14

On 10/1/2014 16:35, Joachim Priesner wrote: > +#include <stdarg.h> > +#include <string.h> > + > +#include "comctl32.h" > +#include "shlwapi.h" > + > +#include "windef.h" > +#include "winbase.h" > +#include "wingdi.h" > +#include "winternl.h" > +#include "dlgs.h" > +#include "wine/debug.h" > +#include "wine/unicode.h" It's unlikely you need all of those. > +#define TD_WARNING_ICON MAKEINTRESOURCEW(-1) > +#define TD_ERROR_ICON MAKEINTRESOURCEW(-2) > +#define TD_INFORMATION_ICON MAKEINTRESOURCEW(-3) > +#define TD_SHIELD_ICON MAKEINTRESOURCEW(-4) Where this comes from? I mean particular id values.

2 2

Re: [PATCH 1/6] user32/tests: Test minimizing an unminimizable window.
by Dmitry Timoshkov 02 Oct '14

02 Oct '14

Stefan Dösinger <stefan(a)codeweavers.com> wrote: > This shows that the abesence of a minimization button does not prevent > the application from programmatically minimizing the window. KWin and > fvwm behave like Windows in this regard, whereas Metacity-based WMs > prevent the minimization. My understanding is that not the absence of minimize/maximize button prevents an ability to programmatically minimize/maximize a window, but an item in the system menu. I'd suggest to also add a test for sending WM_SYSCOMMAND/SC_MINIMIZE/SC_MAXIMIZE behaviour. -- Dmitry.

2 2

Re: [PATCH 6/6] d3d8/tests: Test messages on focus loss (v2).
by Marvin 01 Oct '14

01 Oct '14

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=9170 Your paranoid android. === w8 (32 bit device) === device.c:2325: Test failed: Expected message 0x6 for window 0x1, but didn't receive it. device.c:2330: Test failed: The focus window is active. device.c:2336: Test failed: Got unexpect width 640. device.c:2337: Test failed: Got unexpect height 480. device.c:2477: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3119: Test failed: Expected wndproc 0x413050, got 0x413050.

2 1

Re: [PATCH 1/6] user32/tests: Test minimizing an unminimizable window.
by Marvin 01 Oct '14

01 Oct '14

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=9167 Your paranoid android. === w7u (32 bit msg) === msg.c:12149: Test failed: unexpected hwnd 0017014A msg.c:12171: Test failed: bad time 3077e/3078e

2 1

Re: [2/4] server: Support sending process and thread security descriptors for the "new_process" request in the protocol.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Joris van der Wel <joris(a)jorisvanderwel.com> writes: > + if (req->process_sd_size > get_req_data_size() || > + req->thread_sd_size > get_req_data_size() - req->process_sd_size || > + req->info_size > get_req_data_size() - req->process_sd_size - req->thread_sd_size) > + { > + close( socket_fd ); > + return; > + } You have to return an error. > + req_info = (const startup_info_t *) > + ((char*)get_req_data() + req->process_sd_size + req->thread_sd_size); > + req_env = (const WCHAR *) > + ((char*)get_req_data() + req->process_sd_size + req->thread_sd_size + req->info_size); > + req_env_size = get_req_data_size() - (req->process_sd_size + req->thread_sd_size + req->info_size); These may not be valid pointers (alignment is not checked) so it would be better to avoid declaring them as variables. -- Alexandre Julliard julliard(a)winehq.org

1 0

Wine Gecko 2.34-beta1 release
by Jacek Caban 01 Oct '14

01 Oct '14

Hi all, After about a year since the last release, I'm happy to announce that we have a new Wine Gecko packages ready for testing. I'm not attaching a patch this time, because it's quite big and will change over next few weeks (I will be submitting some of those changes, so the patch would be invalid soon). I set up a Wine fork at [1] instead. It contains snapshot of my development tree on top of Wine, so be prepared for forced updates. Let me know if you'd prefer it to be in a different form. This update catches up on development made for 10 Firefox releases that happened meantime. There were many problems that needed to be solved for this to happen. There were tree wide changes breaking our build config as well as API changes, that needed to be fixed. We still have long term problem with API that we use for embedding Gecko (mostly DOM APIs) that is slowly removed from Gecko. We need a long term solution, which means working on auto generated C/C++ bindings based on the new, WebIDL files. I may write a separated mail about that if there is an interest. I decided to make this beta from Gecko tip at the point where it's branched. I usually waited until Gecko enters beta, but I want to catch up on development as much as possible this time. How the final release will look like depends on how testing goes. It will not be sooner than after a bit of Firefox beta. As usually, everything that uses MSHTML is an interesting testing target. Let me know if there are any problems. Thanks, Jacek [1] http://repo.or.cz/w/wine/wine-gecko.git

2 3

Re: [PATCH 4/5] d3d9/tests: Add a test for vs_3_0 shaders using more than 256 constants.
by Stefan Dösinger 01 Oct '14

01 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-09-30 14:51, schrieb Matteo Bruni: > --- > dlls/d3d9/tests/device.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) I think it would be a good idea to check the behavior of d3d9ex. It may lift some restrictions of plain d3d9. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUK+z6AAoJEN0/YqbEcdMwrrsP/1aU53A4nN8vmohZ4KtnKs42 DYvnr1cJxCjRCTM9c8xcH4t1FAMcbIy0HTygQNrvifvYBZbGqSmkA3vArIRxsIeK t5vSlAFvV14sWi4krsw+sRLzsYtpe1LWji9AW6DpzheJDNl2eaE2oxFRhloPv/KE 9d2O3x/9g0ww/231drtc6RxL5kd7cFs15XKw1LnawurxOB79McuEFkt75OEOFpB6 7wlzQdhe9PI0uiluxhXfKqLF3EehBR4j2KAYQO5O8KpFLMObSUJrdwhvc6Fmlwtb t6vH20mDewuCJF6fliCKyLpM4ujnxuwmBz5sl6D50javzknqX2kzG5PX6jnj8ezR iSBoGZJMY/B+UKKMHgJNzgbP6g3X7LICAs7lBlfuiTdVau+YvUf+8JiNoCkF7NFO aXPuVt/rJ+4k5Q5ZFCq9Vt7dmy9gtJGM8ZJw4z30Nz0v16LSRFQHMfBaqco3HCib todvTsy1/bLwrA6k+ANvWWwJmqKHaLIFm7ZcEZNi5cMxNtAKKHbyPzN19syhFuVU gxlqVtTuB/yT+3Kd7G+1pH2Wr7NZNG1szJfQLVS4ns4PXBtbarINDCYW2fUpfvS6 bpzMjYzWe0ePGN58XRCVqrptx7q6IW3GLueJYq5zSHsRRmawwQx1xJBTA0qAqq7I GworiiALSOo3MMD4YZb+ =42bF -----END PGP SIGNATURE-----

1 0

Re: [PATCH 5/5] jscript: Added support for '-' CC expression.
by Marvin 01 Oct '14

01 Oct '14

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=9163 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/5] jscript: Added tests for @if/@elif/@else/@end.
by Marvin 01 Oct '14

01 Oct '14

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=9160 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: dpnet: Implement IDirectPlay8Address GetComponentByName (try 2)
by Marvin 01 Oct '14

01 Oct '14

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=9156 Your paranoid android. === w8 (32 bit address) === Failure running script in VM: timed out waiting for the child process

1 0

DirectPlay
by Michael Müller 01 Oct '14

01 Oct '14

Hello Alistair, I am watching your DirectPlay patches for some time and I am very happy that you haven't yet given up implementing it. Most of the Wine developers do not really care much about DirectPlay since there is an easy workaround and no modern game makes use of it. Just today I wrote a fix for a multiplayer lobby client for Age of Empires 2 which also makes use of DP ( https://bugs.winehq.org/show_bug.cgi?id=29384 ). Although using the Windows 98 dlls works, I think it is important for ordinary wine users that it works out of the box. Sometimes Wine is not really that user friendly and I think it is important to enhance these parts to improve the image of wine. Not everybody is searching through the AppDB or bugtracker, instead most people give up if it does not work out of the box. For this reason I am contributing to a project called wine-compholio ( https://github.com/compholio/wine-compholio ) which collects correct patches that did not get upstream because AJ did not like them for some reason (although they were correct) or they didn't get any attention and dropped out of the queue. The idea is to use this project as staging tree and to improve these patches till wine accepts them. We also add our own patches there before we send them upstream so that other people can review and test them. This makes fixes/patches faster available to users as for example Fedora applies all our patches to their wine build. Moreover often developers review your patches before you send them to Wine devel. This makes it easier to get patches upstream since the chance that they contain a critical errors is much lower. If you think this might also help your patches, you can find us in #pipelight / #wine-compholio on FreeNode. However, I just wanted to say thank you that you are still working on DP. Regards, Michael Müller

1 0

Re: wined3d: Correctly display fog for right-handed projection matrix (try 3)
by Matteo Bruni 30 Sep '14

30 Sep '14

2014-09-30 11:33 GMT+02:00 Joachim Priesner <joachim.priesner(a)web.de>: Hi Joachim, > When using a right-handed projection matrix, z coordinates of vertices may be negative. This is not considered in the code generating the GLSL fog shader for fixed-function fog. The patch fixes that and adds a test. > > Tested on openSUSE 13.1 and Windows 8.1. > > Try 3 with tests using pixel shaders and tests for d3d8. I have not included tests using vertex shaders since the bug is in Wine's FFP implementation, so using vertex shaders would not touch the relevant code path. If I understood Henri's comment to the previous iteration of this patch correctly, the point of the additional test is to make sure that the bug is really in the vertex FFP replacement code (as opposed to the pixel pipeline part). You could verify that by writing a negative value into oFog via a vertex shader (see e.g. vertex_shader_code_2 in visual.c) and checking the results of the rendering. For example you could draw a quad setting oFog to -0.5 for the vertices on the left side and 0.5 on the right side. If the pixel pipeline uses the value output by the vertex pipeline with no changes then you should get an horizontal fog gradient. If, on the other hand, it's the pixel pipe that takes the absolute value of the (interpolated) fog coefficient, you would get two mirrored gradients in the two halves of the quad. I'm sure Henri will correct me if I got it wrong. > Also I have not included ddraw tests since I could not even get the unchanged tests to run on either Linux or Windows and I feel I have spent *way* too much time on this one-line fix already, sorry :-) > Sorry you feel like that but we'd really like to have such fixes backed by tests, too many times "obvious" fixes turned out to be wrong when actually tested thoroughly.

1 0

Re: comctl32: Display icon (if possible) and all supplied texts in TaskDialogIndirect
by Alexandre Julliard 30 Sep '14

30 Sep '14

Joachim Priesner <joachim.priesner(a)web.de> writes: > The TaskDialogIndirect function takes three texts: content, main instruction, and footer. The current implementation would only display the main instruction. Now all texts are displayed, concatenated by two newlines if necessary. > > Also, if the requested icon is one that is supported by MessageBoxW (error, warning, question, information), that icon is displayed. This should be made into a proper dialog instead. It's not a good fit for a message box. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/5] gdi32: Don't overflow the buffer in GetGlyphOutline.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Matteo Bruni <mbruni(a)codeweavers.com> writes: > The code already mixes tabs and spaces; since newer stuff seems to be > using spaces I'm using spaces for the new code too. I'm cleaning up the > lines nearby while at it. > It's quite a bit of code motion, hopefully the actual changes are still > readable enough. It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M d3dx9_36.dll -p d3dx9_36_test.exe.so mesh && touch mesh.ok mesh.c:4199: Test failed: Expected: 0, Got: 0.637207 mesh.c:4200: Test failed: Expected: 632928, Got: 0.464355 mesh.c:4201: Test failed: Expected: 0, Got: 0.00195312 mesh.c:4202: Test failed: Expected: 0, Got: 0.464355 mesh.c:4203: Test failed: Expected: 0, Got: 0.645508 mesh.c:4199: Test failed: Expected: 0, Got: 0.0786133 mesh.c:4200: Test failed: Expected: 632928, Got: 0.640625 ... -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/5] wined3d: Fail to create shaders using more than the supported number of float constants.
by Henri Verbeet 30 Sep '14

30 Sep '14

On 30 September 2014 14:51, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + case WINED3D_SHADER_VERSION(1, 0): > + case WINED3D_SHADER_VERSION(1, 1): > + shader->limits.constant_bool = 0; > + shader->limits.constant_int = 0; > + shader->limits.packed_output = 12; > + shader->limits.sampler = 0; > + /* TODO: vs_1_1 has a minimum of 96 constants. What happens when > + * a vs_1_1 shader is used on a vs_3_0 capable card that has 256 > + * constants? */ > + shader->limits.constant_float = min(256, vs_uniform_count); Since you touched it... Perhaps at least as interesting as what happens when trying to create SM3 shaders that use more that 256 constants is what happens when trying to create e.g. SM1 shaders that use more than 96 constants. Also note that aside from the somewhat questionable clamping of "constant_float" to the uniform count, this is all just static const data, and there's really no reason that every single shader needs its own copy of it. I don't think there are a lot of users of "constant_float" that don't already do that kind of clamping themselves, so we should probably just fix the remaining ones, if any. > + switch (reg_maps->shader_version.type) > + { > + case WINED3D_SHADER_TYPE_VERTEX: > + vertexshader_set_limits(shader); > + break; > + case WINED3D_SHADER_TYPE_GEOMETRY: > + geometryshader_set_limits(shader); > + break; > + case WINED3D_SHADER_TYPE_PIXEL: > + pixelshader_set_limits(shader); > + break; > + default: > + FIXME("Unexpected shader type %u found.\n", reg_maps->shader_version.type); > + } > + > reg_maps->constf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, > sizeof(*reg_maps->constf) * ((constf_size + 31) / 32)); But now you can use "shader->limits.constant_float" instead of "constf_size".

2 1

Re: [PATCH 6/6] jscript: Added @set tests.
by Marvin 30 Sep '14

30 Sep '14

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=9140 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/5] gdi32/tests: Add a test for GetGlyphOutline with an insufficient buffer.
by Marvin 30 Sep '14

30 Sep '14

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=9137 Your paranoid android. === wvistau64 (32 bit font) === The test timed out

2 1

Re: [PATCH] vbscript: Implemented RGB(try 4)
by Marvin 30 Sep '14

30 Sep '14

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=9135 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/3] user32: Add initial WindowFromPoint tests
by Dmitry Timoshkov 30 Sep '14

30 Sep '14

Hi Piotr, Piotr Caban <piotr(a)codeweavers.com> wrote: > --- > dlls/user32/tests/win.c | 39 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) There already exist the tests for RealChildWindowFromPoint with a FIXME about adding new tests for WindowFromPoint, ChildWindowFromPoint and ChildWindowFromPointEx, is it possible to use existing tests as a base and extend them as needed? -- Dmitry.

2 1

Re: [PATCH 1/3] mshtml: Use proper type for text node in exec_hyperlink.
by Michael Stefaniuc 30 Sep '14

30 Sep '14

On 09/30/2014 10:12 AM, Jacek Caban wrote: > --- dlls/mshtml/editor.c | 7 ++++--- 1 file changed, 4 > insertions(+), 3 deletions(-) > > > > 0001-mshtml-Use-proper-type-for-text-node-in-exec_hyperlin.diff > > > diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index > 14aab53..779dcc7 100644 --- a/dlls/mshtml/editor.c +++ > b/dlls/mshtml/editor.c @@ -1170,13 +1170,14 @@ static HRESULT > exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, > > /* create an element with text of URL */ if (insert_link_at_caret) > { - nsIDOMNode *text_node, *unused_node; + nsIDOMNode > *unused_node; + nsIDOMText *text_node; > > nsIDOMHTMLDocument_CreateTextNode(This->doc_node->nsdoc, &ns_url, > (nsIDOMText **)&text_node); Jacek, you don't need the above cast anymore. > /* wrap the <a> tags around the text element */ - > nsIDOMHTMLElement_AppendChild(anchor_elem, text_node, > &unused_node); - nsIDOMNode_Release(text_node); + > nsIDOMHTMLElement_AppendChild(anchor_elem, (nsIDOMNode*)text_node, > &unused_node); + nsIDOMText_Release(text_node); > nsIDOMNode_Release(unused_node); } bye michael

1 0

Re: dpnet: Implement IDirectPlay8Address GetComponentByName
by Marvin 30 Sep '14

30 Sep '14

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=9131 Your paranoid android. === w8 (32 bit address) === The test timed out

1 0

Re: dpnet: Implement IDirectPlay8Address GetComponentByName
by Nikolay Sivov 30 Sep '14

30 Sep '14

On 9/30/2014 08:08, Alistair Leslie-Hughes wrote: > + *pdwBufferSize = entry->size; > + > + if(*pdwBufferSize < entry->size) > + return DPNERR_BUFFERTOOSMALL; Looks broken.

1 0

Re: wpp: Fix a few memory leaks
by Alexandre Julliard 29 Sep '14

29 Sep '14

Fabian Ebner <f.ebner94(a)gmail.com> writes: > Fixes bug 37130 where it was discovered. You can't do that, the buffer is on the buffer stack. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [2/2] shell32: Implement IApplicationAssociationRegistration, QueryCurrentDefault
by Nikolay Sivov 29 Sep '14

29 Sep '14

> + hr = CoCreateInstance(&CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC_SERVER, > + &IID_IApplicationAssociationRegistration, (LPVOID*)&appreg); > + if (FAILED(hr)) { > + skip("IApplicationAssociationRegistration not created: 0x%x\n", hr); > + return; > + } Just check it with ok(), missing implementation is already checked in START_TEST(). > + trace("%s\n", wine_dbgstr_w(assocprog)); Do you really need this? > - test_IApplicationAssociationRegistration_QueryInterface(); > + /* this works since Vista */ > + hr = CoCreateInstance(&CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC_SERVER, > + &IID_IApplicationAssociationRegistration, (LPVOID*)&appreg); > + if (hr == S_OK) > + { > + test_IApplicationAssociationRegistration_QueryInterface(); > + test_IApplicationAssociationRegistration_QueryCurrentDefault(); > + > + IApplicationAssociationRegistration_Release(appreg); > + } > + else > + skip("IApplicationAssociationRegistration not supported: 0x%x\n", hr); This should be win_skip().

1 0

Re: Assorted spelling fixes.
by Marvin 29 Sep '14

29 Sep '14

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=9111 Your paranoid android. === w8 (32 bit device) === device.c:2398: Test failed: Expected foreground window 000301E4, got 0002004C. device.c:3040: Test failed: Expected wndproc 0x412cf0, got 0x412cf0.

1 0

Re: Assorted spelling fixes.
by Marvin 28 Sep '14

28 Sep '14

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=9103 Your paranoid android. === wvistau64 (32 bit shlfileop) === shlfileop.c:815: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR === wvistau64 (64 bit shlfileop) === shlfileop.c:815: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR

1 0

Re: [PATCH] vbscript: Implemented RGB (try 3)
by Qian Hong 26 Sep '14

26 Sep '14

Hi Shuai, > Call ok(RGB(0, &h00001f&, &h0000f1&) = &hf11f00&, " I think Call ok(RGB(0, &h1f&, &hf1&) = &hf11f00&, "... is better and clearer.

2 1

Re: [PATCH] jscript: Implemented conditional compilation support for @if, @elif, @else and @end keywords.
by Jacek Caban 26 Sep '14

26 Sep '14

Hi Qian, On 09/26/14 07:17, Qian Hong wrote: > This patch improves QQDownload on Wine. Most of parser code and > compiler code for '@if statement' are implemented based on the Wine > vbscript implementation of 'if statement' since Microsoft JScript > conditional compilation '@if statement' shares similar syntax with > vbscript 'if statement'. Not really, @if causes conditional compilation. Your patch unconditionally compiles everything. See my simple test on top of your patch for what I mean. Jacek

2 1

Re: [PATCH] jscript: Implemented conditional compilation support for @if, @elif, @else and @end keywords.
by Marvin 26 Sep '14

26 Sep '14

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=9084 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH] vbscript: Implemented RGB (try 3)
by Marvin 25 Sep '14

25 Sep '14

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=9072 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 10/10] ddraw/tests: Test focus loss style changes.
by Marvin 25 Sep '14

25 Sep '14

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=9071 Your paranoid android. === w8 (32 bit ddraw1) === ddraw1.c:1318: Test failed: Expected color 0x00ff0000 for test 0, got 0x0000ff00. ddraw1.c:1340: Test failed: Expected color 0x000000ff for test 0, got 0x0000ff00.

1 0

Re: [PATCH 09/10] d3d/tests: Add focus loss style tests.
by Marvin 25 Sep '14

25 Sep '14

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=9070 Your paranoid android. === w2000pro (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (64 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (64 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6.

1 0

Re: [PATCH 09/10] d3d/tests: Add focus loss style tests.
by Marvin 25 Sep '14

25 Sep '14

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=9069 Your paranoid android. === w2000pro (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === w8 (32 bit device) === device.c:2388: Test failed: Expected message 0x6 for window 0x1, but didn't receive it. device.c:2393: Test failed: The focus window is active. device.c:2426: Test failed: Expected message 0x6 for window 0x1, but didn't receive it.

1 0

Re: [PATCH 08/10] d3d/tests: Additional swapchains are only allowed in windowed mode.
by Marvin 25 Sep '14

25 Sep '14

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=9068 Your paranoid android. === w2000pro (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (64 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (64 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6.

1 0

Re: [PATCH 08/10] d3d/tests: Additional swapchains are only allowed in windowed mode.
by Marvin 25 Sep '14

25 Sep '14

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=9067 Your paranoid android. === w2000pro (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === w8 (32 bit device) === device.c:2388: Test failed: Expected message 0x6 for window 0x1, but didn't receive it. device.c:2393: Test failed: The focus window is active. device.c:2426: Test failed: Expected message 0x6 for window 0x1, but didn't receive it.

1 0

Re: [PATCH 07/10] wined3d: Do not minimize invisible windows.
by Marvin 25 Sep '14

25 Sep '14

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=9066 Your paranoid android. === w2000pro (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (64 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (64 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6.

1 0

Re: [PATCH 07/10] wined3d: Do not minimize invisible windows.
by Marvin 25 Sep '14

25 Sep '14

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=9065 Your paranoid android. === w2000pro (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === w8 (32 bit device) === device.c:2341: Test failed: Expected message 0x6 for window 0x1, but didn't receive it. device.c:2346: Test failed: The focus window is active. device.c:2379: Test failed: Expected message 0x6 for window 0x1, but didn't receive it.

1 0

Re: [PATCH 06/10] d3d8/tests: Test messages on focus loss.
by Marvin 25 Sep '14

25 Sep '14

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=9064 Your paranoid android. === w2000pro (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === w8 (32 bit device) === device.c:2321: Test failed: Expected message 0x6 for window 0x1, but didn't receive it. device.c:2326: Test failed: The focus window is active. device.c:2332: Test failed: Got unexpect width 640. device.c:2333: Test failed: Got unexpect height 480. device.c:2472: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3114: Test failed: Expected wndproc 0x413050, got 0x413050.

1 0

Re: d3d10core: Add support for map_type flags D3D10_MAP_READ, D3D10_MAP_WRITE_NO_OVERWRITE and D3D10_MAP_DISCARD. (try 2)
by Henri Verbeet 25 Sep '14

25 Sep '14

On 24 September 2014 17:06, Johannes Brandstätter <jbrandst(a)2ds.eu> wrote: > + DWORD wine_map_flags = wined3d_map_flags_from_d3d10_map_type(map_type); > > TRACE("iface %p, map_type %u, map_flags %#x, data %p.\n", iface, map_type, map_flags, data); > > - if (map_type != D3D10_MAP_READ_WRITE) > - FIXME("Ignoring map_type %#x.\n", map_type); > if (map_flags) > FIXME("Ignoring map_flags %#x.\n", map_flags); > > - return wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, 0); > + return wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, wine_map_flags); You don't really need the wine_map_flags variable here. > +DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) > +{ > + switch (map_type) > + { > + case D3D10_MAP_READ_WRITE: > + return 0; > + > + case D3D10_MAP_READ: > + return WINED3D_MAP_READONLY; > + > + case D3D10_MAP_WRITE_DISCARD: > + return WINED3D_MAP_DISCARD; > + > + case D3D10_MAP_WRITE_NO_OVERWRITE: > + return WINED3D_MAP_NOOVERWRITE; > + > + default: > + FIXME("Unhandled map_type %#x.\n", map_type); > + } > + > + return 0; You can just return in the default case.

1 0

Re: [PATCH 04/10] d3d9/tests: Test messages on focus loss.
by Marvin 25 Sep '14

25 Sep '14

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=9062 Your paranoid android. === w2000pro (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (64 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (64 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6.

1 0

Question about implementing a test for BCryptGetFipsAlgorithmMode
by Kai Blaschke 24 Sep '14

24 Sep '14

Hi, I had a small patch lying around here for some while which properly implements the BCryptGetFipsAlgorithmMode function, behaving identically to the original implementation. Just one question is bugging me, regarding the test. To properly test the function, I'd have to write to a registry key in HKLM\System\CurrentControlSet\Control\Lsa. Is it safe to assume that the test has write access to this key? Additionally, I noticed I put a small bug in the code, returning false for all registry values which are multiples of 256, which is a result of simply casting a registry DWORD value to a BOOLEAN. To my surprise, the original function - tested with WinXP and Win7 - has the same bug, so I wouldn't fix my implementation before sending in the patch if no one votes against it. Regards Kai

3 5

Re: [PATCH 4/5] d3d9/tests: Extend focus loss tests.
by Henri Verbeet 24 Sep '14

24 Sep '14

I don't think the tests really support the implementation. For example, they don't test multiple swapchains at all, and they basically only test if WS_MINIMIZE is set or not as far as window styles are concerned. I'd expect at least some basic message and style tests along the lines of e.g. test_wndproc() and test_window_style().

2 3

Re: dpvoice: Add DirectPlay Voice Test (try 2)
by Alexandre Julliard 24 Sep '14

24 Sep '14

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Hi, > Fix errors on systems which don't have Direct Voice configured. > > Changelog: > dpvoice: Add DirectPlay Voice Test It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M dpvoice.dll -p dpvoice_test.exe.so voice && touch voice.ok voice.c:106: Test succeeded inside todo block: AddComponent(addr) with 0x00000000 voice.c:109: Test succeeded inside todo block: AddComponent(port)) with 0x00000000 voice.c:187: Test succeeded inside todo block: AddComponent(addr) with 0x00000000 voice.c:190: Test succeeded inside todo block: AddComponent(port)) with 0x00000000 make: *** [voice.ok] Error 4 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: d3d10core: Add support for map_type flags D3D10_MAP_READ, D3D10_MAP_WRITE_NO_OVERWRITE and D3D10_MAP_DISCARD.
by Henri Verbeet 24 Sep '14

24 Sep '14

On 23 September 2014 12:55, Johannes Brandstätter <jbrandst(a)2ds.eu> wrote: > + switch (map_type) > + { > + case D3D10_MAP_READ: > + wine_map_flags = WINED3D_MAP_READONLY; > + break; > + > + case D3D10_MAP_WRITE_DISCARD: > + wine_map_flags = WINED3D_MAP_DISCARD; > + break; > + > + case D3D10_MAP_WRITE_NO_OVERWRITE: > + wine_map_flags = WINED3D_MAP_NOOVERWRITE; > + break; > + > + default: > + FIXME("Ignoring map_type %#x.\n", map_type); > + } > + } You'll want to turn that into a helper function and use it for the other resource mapping functions as well. See also e.g. wined3d_usage_from_d3d10core() and wined3dformat_from_dxgi_format().

1 0

Re: [PATCH 1/2] jscript: Add define for JS_E_OUT_OF_MEMORY.
by Jacek Caban 24 Sep '14

24 Sep '14

Hi Qian, On 09/24/14 10:45, Qian Hong wrote: > --- a/dlls/jscript/resource.h > +++ b/dlls/jscript/resource.h > @@ -24,6 +24,7 @@ > > #define IDS_TO_PRIMITIVE 0x0001 > #define IDS_INVALID_CALL_ARG 0x0005 > +#define IDS_OUT_OF_MEMORY 0x0007 Adding private defines that are not used is not really useful. Please at least add resources. Jacek

2 1

Re: [PATCH] mshtml: Add IHTMLAnchorElement::search propertyimplementation(try 3)
by Jacek Caban 24 Sep '14

24 Sep '14

Hi Hao, On 09/24/14 11:14, Hao Peng wrote: > +#define test_anchor_search_strange(a,h,n) _test_anchor_search_strange(__LINE__,a,h,n) > +static void _test_anchor_search_strange(unsigned line, IUnknown *unk, const char *search, const char *result) > +{ > + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); > + BSTR str; > + HRESULT hres; > + > + if ( ! result) > + result = search; > + > + str = search ? a2bstr(search) : NULL; > + hres = IHTMLAnchorElement_put_search(anchor, str); > + ok_(__FILE__,line)(hres == S_OK, "put_search failed: %08x\n", hres); > + SysFreeString(str); > + > + hres = IHTMLAnchorElement_get_search(anchor, &str); > + ok_(__FILE__,line)(hres == S_OK, "get_search failed: %08x\n", hres); > + if ( ! str) > + /* due to IE5's incorrect behavior, search string without leading "?" is interpreted > + as part of the pathname, and can not be accessed by get_search. */ > + win_skip("incorrect behavior on IE5"); Why do you need this? Those tests are already not ran on IE5 anyway. Jacek

1 0

Re: libwine: Respect TMPDIR environment variable
by Alexandre Julliard 24 Sep '14

24 Sep '14

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -36,7 +36,7 @@ > #include "wine/library.h" > > static const char server_config_dir[] = "/.wine"; /* config dir relative to $HOME */ > -static const char server_root_prefix[] = "/tmp/.wine"; /* prefix for server root dir */ > +static const char server_root_prefix[] = "/.wine"; /* prefix for server root dir */ > static const char server_dir_prefix[] = "/server-"; /* prefix for server dir */ > > static char *bindir; > @@ -220,15 +220,19 @@ static char *get_runtime_argvdir( const char *argv0 ) > /* initialize the server directory value */ > static void init_server_dir( dev_t dev, ino_t ino ) > { > + const char* tmpdir; > char *p, *root; > > + if (!(tmpdir = getenv("TMPDIR"))) tmpdir = "/tmp"; The server dir needs to be unique for a given prefix, so it cannot depend on environment variables. -- Alexandre Julliard julliard(a)winehq.org

1 0

Patches for adding IRichEditOle/ITextDocument support for ITextServices::QueryInterface ask for review
by Jactry Zeng 24 Sep '14

24 Sep '14

Hi folks, I wrote two patches for adding IRichEditOle/ITextDocument support for ITextServices::QueryInterface(for bug 17042[1]), but I'm no sure is it the correct way. I need your review and comment! I will really appreciate it! There are some tests for ITextServices::QueryInterface in dlls/riched20/txtsrv.c: test_QueryInterfaces(): 1. refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); /* IID_IRichEditOle */ hres = ITextServices_QueryInterface(txtserv, &IID_IRichEditOle, (void **)&txtsrv_reOle); ok(hres == S_OK, "ITextServices_QueryInterface\n"); refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 2, "got wrong ref count: %d\n", refcount); >From this case we know ref count of ITextServices will increase after get a IRichEditOle interface from ITextServices::QueryInterface. ITextServices::QueryInterface(&IID_ITextDocument) is also similar. 2. refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 2, "got wrong ref count: %d\n", refcount); if (SUCCEEDED(hres)) { refcount = get_refcount((IUnknown *)txtsrv_reOle); ok(refcount == 2, "got wrong ref count: %d\n", refcount); hres = IRichEditOle_QueryInterface(txtsrv_reOle, &IID_ITextDocument, (void **)&txtDoc); ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 3, "got wrong ref count: %d\n", refcount); refcount = get_refcount((IUnknown *)txtsrv_reOle); ok(refcount == 3, "got wrong ref count: %d\n", refcount); >From this case we know when a IRichEditOle was got by ITextServices::QueryInterface(&IID_IRichEditOle) then we used IRichEditOle::QueryInterface to get another interface, the ref count of ITextServices will increase too. For implementing this feature I added IUnknown *parent in IRichEditOleImpl and passed ITextServices interface into CreateIRichEditOle when we call it in ITextServices::QueryInterface: dlls/riched20/richole.c ---snip--- typedef struct IRichEditOleImpl { IRichEditOle IRichEditOle_iface; ITextDocument ITextDocument_iface; LONG ref; ME_TextEditor *editor; ITextSelectionImpl *txtSel; IOleClientSiteImpl *clientSite; struct list rangelist; IUnknown *parent; } IRichEditOleImpl; ---snip--- dlls/riched20/txtsrv.c ---snip--- else if (IsEqualIID(riid, &IID_IRichEditOle) || IsEqualIID(riid, &IID_ITextDocument)) { if (!This->editor->reOle) CreateIRichEditOle(This->editor, (LPVOID *)&(This->editor->reOle), iface); IRichEditOle_QueryInterface(This->editor->reOle, riid, (void **)ppv); return S_OK; } else { ---snip--- 3. By some other tests, I found when a ITextServices was got by IRichEditOle::QueryInterface, then we use ITextServices::QueryInterface to got another interface, the ref count of IRichEditOle will increase too. Thanks! [1] https://bugs.winehq.org/show_bug.cgi?id=17042 -- Regards, Jactry Zeng

1 0

Re: [PATCH 1/2] riched20: Stub for ITextFont interface and implement ITextRange::GetFont. (try 3)
by Nikolay Sivov 24 Sep '14

24 Sep '14

> +typedef struct ITextFontImpl { > + ITextFont ITextFont_iface; > + LONG ref; > + > + ITextRangeImpl *txtRge; > + ITextSelectionImpl *txtSel; > +} ITextFontImpl; > + I think 'range' and 'selection' would be more readable, but what's more important you don't use 'txtSel' at all. > +static HRESULT WINAPI ITextFont_fnQueryInterface(ITextFont *me, REFIID riid, void **ppvObj) If we want some unification, it's usually called 'iface', not 'me'. > + *ppvObj = me; That's not how it should look. > +static IRichEditOleImpl *get_reOle(ITextFontImpl *txtFont) > +{ > + if (txtFont->txtRge) > + return txtFont->txtRge->reOle; > + else > + return txtFont->txtSel->reOle; > +} Please use a better naming, like 'get_reole_from_font()' or something like that. > + FIXME("not implemented: %p\n", This); > + return E_NOTIMPL; This should give a proper trace line with arguments, and it should appear on every call. > + ITextFontImpl *This = impl_from_ITextFont(me); > + if (pValue) > + return E_INVALIDARG; > + if (!get_reOle(This)) > + return CO_E_RELEASED; > + > + FIXME("Stub\n"); > + *pValue = tomFalse; > + return S_OK; That's another example of tracing done wrong. > static HRESULT WINAPI ITextRange_fnGetFont(ITextRange *me, ITextFont **pFont) > { > ITextRangeImpl *This = impl_from_ITextRange(me); > + ITextFontImpl *txtFont = NULL; > + HRESULT hres; > + > if (!This->reOle) > return CO_E_RELEASED; > > - FIXME("not implemented %p\n", This); > - return E_NOTIMPL; > + TRACE("%p\n", This); And another.

2 1

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