September 2014 - Wine-Devel

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)
by Gerald Pfeifer Nov. 22, 2020

Nov. 22, 2020

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

1 1

ntoskrnl.exe: unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces
by Qian Hong Sept. 28, 2018

Sept. 28, 2018

Dear all, While test another online bank with wine ActiveX, I got an unimplemented fuction of ntoskrnl: IoGetDeviceInterfaces, I found it listed in http://source.winehq.org/WineAPI/ntoskrnl.html as a stup, so I can't understand this log: wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 0022), starting debugger... Grateful for any explain! env: wine1.3.12 on Ubuntu 10.04 Here are the steps: 1. install an ActiveX from https://e.bank.ecitic.com/perbank5/plugs/CNCBSecPkg_EN.exe $ rm -rf ~/.wine $ winetricks -q mfc42 $ wine CNCBSecPkg_EN.exe fixme:ole:DllRegisterServer stub fixme:win:DisableProcessWindowsGhosting : stub fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:ole:CoCreateInstance no instance created for interface {ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf} of class {56fdf344-fd6d-11d0-958a-006097c9a090}, hres is 0x80004002 fixme:sfc:SfcIsFileProtected ((nil), L"C:\\Program Files\\\4e2d\4fe1\94f6\884c\7f51\94f6\5b89\5168\63a7\4ef6\\unins000.exe") stub fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 -1: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 002b), starting debugger... wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting 2. open the online bank entry with wine builtin IE, then IE will crash: $ wine iexplore https://e.bank.ecitic.com/perbank5/signIn.do Please checkout the full log here: http://pastebin.com/rbAg7gwj Should I file a singel bug in ntoskrnl component , or separate bugs, one for ntoskrnl and one for the IE crashing? Generalliy what component should I switch while file a bug about IE crashing? Many thanks! -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

5 6

ODBC Databases: Jet/Access success
by Barry Bird June 14, 2018

June 14, 2018

Good Afternoon. In section 3.3.6.2 of your User Guide you ask readers to report successes with databases other than MS SQL. Well here's one (I know Access 2000 can work with Wine, but this doesn't require Access): How to set up Wine to enable Windows programs that read and write to Jet (Access) databases using ODBC. I write such programs in C and use the API defined in ODBC API Reference http://msdn.microsoft.com/en-us/library/ms714562%28VS.85%29.aspx They work fine on Windows and only require Mingw to be installed to compile and link them, both for console programs and those using Windows SDK. You then can write interactive programs in C which use a full-featured SQL database which comes bundled with Windows. No need to purchase Access. With the set-up below they will also run on Linux (Kubuntu 9.04) and Wine 1.1.26. You need to update the registry to install the Access drivers. Under Windows, export from the Registry to *.reg files the registry entries - HKLM\Software\ODBC - HKLM\Software\Microsoft\Jet all subsidiary keys and values come with them. You can carefully edit these files to remove drivers and DSNs you don't need. Import these files using the registry editor in wine: wine regedit.exe. You need to bring across from Windows to Windows\System32 under wine: clbcatq.dll comres.dll expsrv.dll msjet40.dll mswstr10.dll msjter40.dll msjint40.dll msjtes40.dll msrd3x40.dll odbc32.dll odbccp32.dll odbcji32.dll odbcjt32.dll odbcad32.exe odbcint.dll odbctrac.dll vbajet32.dll Register this server in wine: wine regsvr32.exe msjtes40.dll No need to install MDAC. To use Windows ODBC drivers, you have to override Wine's odbccp32.dll and odbc32.dll with the native versions because the Wine versions are currently wired directly to Linux's unixodbc. This can be done by setting up the ODBC Data Source Administrator odbcad32.exe using winecfg: - Add the program to the Applications tab - then in the libraries tab, pick from 'New override for library' drop-down odbc32.dll and odbccp32.dll add them and edit them to be Native for Windows. Then if you do wine odbcad32.exe this brings up the ODBC Data Source Administrator window as in the Windows Control Panel If needed, set up (System) DSNs using this program. Bring across the programs and *.mdb database files from Windows. Using winecfg, you need to set up each program you want to run with overrides for odbc32.dll and odbccp32.dll (Applications and Libraries tabs) as above. The programs should then run as they did in Windows but perhaps a bit slower with: wine Odbc-prog.exe This has been tested twice on a clean .wine install. I cannot vouch for support of all API and SQL facilities however. I hope someone finds this useful. Barry Bird

5 4

IMM / IME work
by Aric Stewart June 16, 2016

June 16, 2016

Hello all, I know this will only interest a small portion of you but thought i would give a quick update on the state of IMM32 since I have brought it to a major milestone. All the main patches are in which now separate IMM32 and IMEs. There is still more work to do but the major framework is in place. X11 XIM processing should be unchanged. However wine can now begin to load native windows IMEs as well. I have tested with windows ATOK20 (a popular Japanese IME) and successfully had text processing in a fully IME aware application. There are still clear issues to resolve in many aspects of this processing but we have forward progress. ImmInstallIME does not work yet, nor does switching keyboards. So to get the native IME to work you need to add this registry key. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\<keyboard layout>] "Ime File"=<IME filename> so for example for ATOK20 in Japanese i used. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\e0010411] "Ime File"="ATOK20W.IME" I would love to hear how well things work. I am sure using native IMEs will quickly show us many places where IMM32 needs to be improved. One issues I am going to investigate next is that sometimes non x11drv ime initialization, if occurring too early, causes x11drv to fail to create windows. I have not investigated with the latest changes to xim.c (which may already correct this problem) but if you see this problem this patch may help and i believe the IME_UpdateAssociation(NULL) is already unneeded. diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index d4df9f7..0c98136 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -475,7 +475,6 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XP XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, wine_tsx11_unlock(); IME_XIMPresent(TRUE); - IME_UpdateAssociation(NULL); } thanks, -aric

5 7

Re: XInput [1/4]: Implement XInputGetState
by Stefan Dösinger July 5, 2015

July 5, 2015

Am 09.07.2009 um 02:58 schrieb Michael Gruber: > This patch series implements parts of the XInput library. You can use > this to play games that support Xbox 360 Controllers. To be able to > use this you will need to have your Controller working on Linux via > the xpad kernel driver and the event interface. It will not work on > any OS other than Linux. It supports gamepads, should work with > guitars and wheels, but will not work with dance-mats. > <1-XInputGetState.patch> Is it possible to implement XInput on top of DirectInput? DirectInput already has some internal abstraction layers for differnet joystick APIs, and has basic support for OSX joysticks. Does DInput have enough capabilities to access all the Xbox controller's features? My gut says no, otherwise MS wouldn't have created a new lib. I guess its worth checking though.

5 6

Wine 64 bit
by Kevin Davies June 5, 2015

June 5, 2015

Hello, Where would you find information on wine64 status for running 64 bit windows software under OSX. These days a lot of Windows programs are going 64bit to make use of the available memory. Its becoming necessary to have this capability. Many thanks Kevin

13 31

Re: [PATCH] user32/tests: Test SetUserObjectInformation for invisible winstation.
by Alexandre Julliard April 23, 2015

April 23, 2015

Qian Hong <qhong(a)codeweavers.com> writes: > --- > dlls/user32/tests/winstation.c | 57 > ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 57 insertions(+) Can you please fix the test failures introduced by your previous changes first? cf. https://test.winehq.org/data/tests/user32:winstation.html -- Alexandre Julliard julliard(a)winehq.org

3 8

Wine Gecko 2.34-beta1 release
by Jacek Caban Oct. 1, 2014

Oct. 1, 2014

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: wined3d: Correctly display fog for right-handed projection matrix (try 3)
by Matteo Bruni Sept. 30, 2014

Sept. 30, 2014

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 Sept. 30, 2014

Sept. 30, 2014

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 Sept. 30, 2014

Sept. 30, 2014

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 Sept. 30, 2014

Sept. 30, 2014

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 Sept. 30, 2014

Sept. 30, 2014

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 Sept. 30, 2014

Sept. 30, 2014

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 Sept. 30, 2014

Sept. 30, 2014

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 Sept. 30, 2014

Sept. 30, 2014

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 Sept. 30, 2014

Sept. 30, 2014

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 Sept. 29, 2014

Sept. 29, 2014

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 Sept. 29, 2014

Sept. 29, 2014

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 Sept. 29, 2014

Sept. 29, 2014

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 Sept. 28, 2014

Sept. 28, 2014

> + 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 Sept. 28, 2014

Sept. 28, 2014

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 Sept. 28, 2014

Sept. 28, 2014

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 Sept. 26, 2014

Sept. 26, 2014

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 Sept. 26, 2014

Sept. 26, 2014

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 Sept. 26, 2014

Sept. 26, 2014

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 Sept. 25, 2014

Sept. 25, 2014

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 Sept. 25, 2014

Sept. 25, 2014

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 Sept. 25, 2014

Sept. 25, 2014

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 Sept. 25, 2014

Sept. 25, 2014

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 Sept. 25, 2014

Sept. 25, 2014

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 Sept. 25, 2014

Sept. 25, 2014

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 Sept. 25, 2014

Sept. 25, 2014

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 Sept. 25, 2014

Sept. 25, 2014

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 Sept. 25, 2014

Sept. 25, 2014

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 Sept. 25, 2014

Sept. 25, 2014

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 Sept. 25, 2014

Sept. 25, 2014

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 Sept. 24, 2014

Sept. 24, 2014

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 Sept. 24, 2014

Sept. 24, 2014

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 Sept. 24, 2014

Sept. 24, 2014

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 Sept. 24, 2014

Sept. 24, 2014

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 Sept. 24, 2014

Sept. 24, 2014

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 Sept. 24, 2014

Sept. 24, 2014

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 Sept. 24, 2014

Sept. 24, 2014

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 Sept. 24, 2014

Sept. 24, 2014

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 Sept. 23, 2014

Sept. 23, 2014

> +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

Re: [PATCH] vbscript: Implemented RGB(try 2)
by Jacek Caban Sept. 23, 2014

Sept. 23, 2014

On 09/20/14 11:27, Shuai Meng wrote: > diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index 311c892..14276c5 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -112,9 +112,6 @@ static HRESULT return_short(VARIANT *res, short val) > > static HRESULT return_int(VARIANT *res, int val) > { > - if((short)val == val) > - return return_short(res, val); This really needs tests. I wrote them to review your patch, so I may submit them for you. > - > if(res) { > V_VT(res) = VT_I4; > V_I4(res) = val; > @@ -783,8 +780,28 @@ static HRESULT Global_UBound(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA > > static HRESULT Global_RGB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + HRESULT hres; > + int i, total, color[3];/* color[0] for red, color[1] for green, color[2] for blue. */ > + > + TRACE("%s %s %s\n", debugstr_variant(arg), debugstr_variant(arg + 1), debugstr_variant(arg + 2)); > + > + assert(args_cnt == 3); > + > + for(i = 0; i < 3; i++) { > + hres = to_int(arg + i, color + i); > + if(FAILED(hres)) > + return hres; > + } > + > + for(i = 0; i < 3;i++) { Why do you need two loops? Can you do that in just one? > + if(color[i] > 255) > + color[i] = 255; > + if(color[i] < 0) > + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); > + } > + total = RGB(color[0], color[1], color[2]); > + > + return return_int(res, total); > } > > static HRESULT Global_Len(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs > index d688e17..f9c86f8 100644 > --- a/dlls/vbscript/tests/api.vbs > +++ b/dlls/vbscript/tests/api.vbs > @@ -1240,4 +1240,40 @@ Call ok(getVT(Log(CByte(2))) = "VT_R8", "getVT(Log(CByte(2))) = " & getVT(Log(CB > Call ok(getVT(Date) = "VT_DATE", "getVT(Date) = " & getVT(Date)) > Call ok(getVT(Time) = "VT_DATE", "getVT(Time) = " & getVT(Time)) > > +Sub testRGBError(arg1, arg2, arg3, error_num1, error_num2) > + on error resume next > + Dim x > + > + Call Err.clear() > + x = RGB(arg1, arg2, arg3) > + Call ok(Err.number = error_num1, "Err.number1 = " & Err.number) > + > + Call Err.clear() > + Call RGB(arg1, arg2, arg3) > + Call ok(Err.number = error_num2, "Err.number2 = " & Err.number) If error codes are equal in all cases, you don't need two separated error_num* arguments. > +End Sub > + > +Call ok(RGB(-0.5, -0.5, -0.5) = 0, "RGB(-0.5, -0.5, -0.5) = " & RGB(-0.5, -0.5, -0.5)) > +Call ok(getVT(RGB(-0.5, -0.5, -0.5)) = "VT_I4", "getVT(RGB(-0.5, -0.5, -0.5)) = " & getVT(RGB(-0.5, -0.5, -0.5))) > +Call ok(RGB(0, 0, 0) = 0, "RGB(0, 0, 0) = " & RGB(0, 0, 0)) > +Call ok(getVT(RGB(0, 0, 0)) = "VT_I4", "getVT(RGB(0, 0, 0)) = " & getVT(RGB(0, 0, 0))) > +Call ok(RGB(0.49, 0.49, 0.49) = 0, "RGB(0.49, 0.49, 0.49) = " & RGB(0.49, 0.49, 0.49)) > +Call ok(getVT(RGB(0.49, 0.49, 0.49)) = "VT_I4", "getVT(RGB(0.49, 0.49, 0.49)) = " & getVT(RGB(0.49, 0.49, 0.49))) > +Call ok(RGB(0.5, 0.5, 0.5) = 0, "RGB(0.5, 0.5, 0.5) = " & RGB(0.5, 0.5, 0.5)) > +Call ok(getVT(RGB(0.5, 0.5, 0.5)) = "VT_I4", "getVT(RGB(0.5, 0.5, 0.5)) = " & getVT(RGB(0.5, 0.5, 0.5))) > +Call ok(RGB(1, 1, 1) = 65793, "RGB(1, 1, 1) = " & RGB(1, 1, 1)) This would be a lot cleaner if you used hex constant (it's &hXXXX& in vbscript). > +Call ok(getVT(RGB(1, 1, 1)) = "VT_I4", "getVT(RGB(1, 1, 1)) = " & getVT(RGB(1, 1, 1))) > +Call ok(RGB(1.49, 1.49, 1.49) = 65793, "RGB(1.49, 1.49, 1.49) = " & RGB(1.49, 1.49, 1.49)) > +Call ok(getVT(RGB(1.49, 1.49, 1.49)) = "VT_I4", "getVT(RGB(1.49, 1.49, 1.49)) = " & getVT(RGB(1.49, 1.49, 1.49))) > +Call ok(RGB(2, 2, 2) = 131586, "RGB(2, 2, 2) = " & RGB(2, 2, 2)) > +Call ok(getVT(RGB(2, 2, 2)) = "VT_I4", "getVT(RGB(2, 2, 2)) = " & getVT(RGB(2, 2, 2))) > +Call ok(RGB(255, 255, 255) = 16777215, "RGB(255, 255, 255) = " & RGB(255, 255, 255)) > +Call ok(getVT(RGB(255, 255, 255)) = "VT_I4", "getVT(RGB(255, 255, 255)) = " & getVT(RGB(255, 255, 255))) > +Call ok(RGB(256, 256, 256) = 16777215, "RGB(256, 256, 256) = " & RGB(256, 256, 256)) > +Call ok(getVT(RGB(256, 256, 256)) = "VT_I4", "getVT(RGB(256, 256, 256)) = " & getVT(RGB(256, 256, 256))) > +Call ok(RGB("255", "255", "255") = 16777215, "RGB(""255"", ""255"", ""255"") = " & RGB("255", "255", "255")) > +Call ok(getVT(RGB("255", "255", "255")) = "VT_I4", "getVT(RGB(""255"", ""255"", ""255"")) = " & getVT(RGB("255", "255", "255"))) R=G=B in all your tests, so you don't really check if those are correctly handled. Please add tests where all those are different. Jacek

3 4

Re: user32: Return early on child windows in DrawMenuBar
by Marvin Sept. 23, 2014

Sept. 23, 2014

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=9017 Your paranoid android. === w7u (32 bit msg) === msg.c:12111: Test failed: unexpected hwnd 0014013C msg.c:12133: Test failed: bad time 308e5/308f5

1 0

Re: [PATCH 5/5] d3d8/tests: Extend focus loss tests.
by Marvin Sept. 23, 2014

Sept. 23, 2014

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

1 0

Re: [PATCH 4/5] d3d9/tests: Extend focus loss tests.
by Marvin Sept. 23, 2014

Sept. 23, 2014

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=9014 Your paranoid android. === wvistau64 (32 bit d3d9ex) === d3d9ex: unhandled exception c0000005 at 00000000 === w2008s64 (32 bit d3d9ex) === d3d9ex: unhandled exception c0000005 at 00000000 === w7u (32 bit d3d9ex) === d3d9ex: unhandled exception c0000005 at 00000000 === wvistau64 (64 bit d3d9ex) === d3d9ex: unhandled exception c0000005 at 0000000000000000 === w2008s64 (64 bit d3d9ex) === d3d9ex: unhandled exception c0000005 at 0000000000000000

1 0