February 2016 - Wine-Devel - list.winehq.org

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

Re: user32: Avoid -Wmisleading-indentation warnings and fix comments in comments in test_AppendMenu.
by Dmitry Timoshkov Aug. 11, 2016

Aug. 11, 2016

Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c > index 33d8eb8..ea965cd 100644 > --- a/dlls/user32/tests/menu.c > +++ b/dlls/user32/tests/menu.c > @@ -3992,13 +3992,15 @@ static void test_AppendMenu(void) > mii.wID = 206; > ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); > ok(ret, "InsertMenuItem failed\n"); > -if (0) /* FIXME: uncomment once Wine is fixed */ > +if (0) /* FIXME: enable once Wine is fixed */ { > check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED); > +} > mii.wID = 207; > ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); > ok(ret, "SetMenuItemInfo failed\n"); > -if (0) /* FIXME: uncomment once Wine is fixed */ > +if (0) /* FIXME: enable once Wine is fixed */ { > check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED); > +} > DestroyMenu(hmenu); > > hbmp = CreateBitmap(1, 1, 1, 1, NULL); Please don't make the code look uglier than it already is. I'd personally argue that checking and forcing indentation rules by a C compiler is pretty disappointing and actually misleading. That warning should be turned off by default IMHO. -- Dmitry.

3 2

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

Student interested in GSoC 2016 implementing D3DX9 API idea
by Xu Zhao March 22, 2016

March 22, 2016

Hello Wine Community, First congrats that Wine Project get accepted into GSoC 2016 summer organization! I am currently a PhD student in University of Toronto and I am interested in the D3DX9 API implementation task. Mainly because I would like to see more games can run in wine because of my work! My research field is operating system so I am a pretty good C/CPP programmer. However I am not very familiar with DirectX related programming and hopefully I can get some help from the community, like where to start. I have read the wiki entry of D3DX9 API and want to get some help in selecting a reasonable sized API list, maybe someone can reply and provide some help? Thank you! Regards, - Xu -- Xu Zhao i(a)xuzhao.net

2 2

GSoC Idea: Tools - Winetest Scripting Interface
by Zhenbo Li March 15, 2016

March 15, 2016

Hello, I'm Zhenbo Li. I participated in GSoC twice. This year, I want to work on "Tools - Winetest Scripting Interface". After "make test", checking the output in stdout manually is horrible. As ok() macro is used quite widely, my patches should cause no surprise. That is to say, other developers need to read neither my patches nor the changelog to continue their jobs, although ok() macro and other tools for test have been changed. I think there will be two steps for the goal: 1. ok() macro ===================== int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { tls_data* data=get_tls_data(); if (data->todo_level){...} else { if (!condition) { printf( "%s:%d: Test failed: ", data->current_file, data->current_line ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else{.....} } } Instead of printing all the data to stderr, I think we can write a wrapper static void test_print(const char *s) { if(want_print_to_file) fprintf(file_handle, s); printf(s); } It needs some work to make sure that the file_handle is opened/closed successfully. With that, we can record the failed tests to a file, and developers don't need to find them in stdout anymore. 2. compare the results ======================= On the idea page, it says that any scripting language is acceptable. I prefer Python3. To make the code simple, I think editing runtest script is the best solution. Currently, our logic in Makefile is htmllocation.ok: ../../../tools/runtest $(RUNTESTFLAGS) -T ../../.. -M mshtml.dll -p mshtml_test.exe.so htmllocation && touch $@ And in runtest, we have exec $WINETEST_WRAPPER "$topobjdir/wine" "$program" "$@" I don't want to touch Makefile. Instead, I'm going to add some options for runtest. For example, one can use ../../../tools/runtest $(RUNTESTFLAGS) -new_option expected_errors_generated before -T ../../.. -M mshtml.dll -p mshtml_test.exe.so htmllocation And in runtest script, we can expected_errors_generated and new_errors_got, then tell that whether the test result has been changed. It should be easy for developers to write a script for git bisect or other circumstance. Problems ========= This approach seems to be quite simple, and there are some conditions can't be handled. For example void test_foo(sturct Data *d){ ret = foo(d); ok(ret, "foo(%s) is %d\n", data_to_str(d), ret); } struct Data list[]={a,b,c,d,e}; void test(){ for(i in list) test_foo(i); } I think we should not do too much "smart deduce" here, and don't hide what's happening to other developers. Maybe we can add another option for runtest script: --scrict=false This is my humble idea for Wine's GSoC 2016. If this project goes well, working on wine test suit will be much more satisfying(although still boring). I appreciate for your comment. With you a happy weekend. -- Have a nice day! Zhenbo Li

6 15

Attachments missing in new wiki
by Qian Hong March 11, 2016

March 11, 2016

Hi folks, Thanks for migrating the wiki to new site. Recently two different people ask me about attachments on https://wiki.winehq.org/WineConf2015, and I found they are missing, anyone knows what happen during the migration? Should we manually upload again? Is there backup for the attachments from old side? Thanks! -- Regards, Qian Hong - http://www.winehq.org

5 5

Re: [PATCH 2/3] user32: Added more dialog owner tests.
by Dmitry Timoshkov March 2, 2016

March 2, 2016

Hi Jacek, Jacek Caban <jacek(a)codeweavers.com> wrote: > + parent = CreateWindowExA(0, "TestParentClass", "Test parent", > + WS_OVERLAPPEDWINDOW | WS_VISIBLE, > + 100, 100, 200, 200, 0, 0, 0, NULL); > + ok (parent != 0, "Failed to create parent window\n"); > + > + child = CreateWindowExA(0, "TestWindowClass", "Test child", > + WS_OVERLAPPEDWINDOW | WS_VISIBLE, > + 100, 100, 200, 200, 0, 0, 0, NULL); > + ok (child != 0, "Failed to create child window\n"); > + > + child2 = CreateWindowExA(0, "SimpleWindowClass", "Test child2", > + WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CHILD, > + 100, 100, 200, 200, child, 0, 0, NULL); > + ok (child2 != 0, "Failed to create child window\n"); > + > + SetParent(child, parent); > + SetFocus(child); Is that really required to use SetParent() instead of specifying correct parent in the CreateWindowEx call? > + flush_sequence(); > + DialogBoxA( 0, "TEST_DIALOG", child2, TestModalDlgProc2 ); > + ok_sequence(WmModalDialogSeq_2, "ModalDialog2", TRUE); Is this test supposed to show that actual dialog owner is parent window? If yes, then this theory is not tested at all. > + SetForegroundWindow(hdlg); > + > + { > + const struct message WmEndDialogSeq[] = { > + { WM_ENABLE, sent }, > + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, > + { HCBT_ACTIVATE, hook|wparam, (WPARAM)hchild }, > + { WM_NCACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)hchild }, > + { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)hchild }, > + /* FIXME: Following two are optional because Wine sends WM_QUERYNEWPALETTE instead of WM_WINDOWPOSCHANGING */ > + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, > + { WM_QUERYNEWPALETTE, sent|optional }, > + { WM_NCACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)hdlg }, > + { WM_GETTEXT, sent|optional|defwinproc }, > + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)hdlg }, > + { HCBT_SETFOCUS, hook|wparam, (WPARAM)hchild }, > + { WM_KILLFOCUS, sent|wparam, (WPARAM)hchild }, > + { WM_SETFOCUS, sent|defwinproc|wparam, (WPARAM)hdlg }, > + { 0 } > + }; > + > + flush_sequence(); > + EndDialog(hdlg, 0); > + ok_sequence(WmEndDialogSeq, "EndDialog", FALSE); > + } Please don't create fake embedded blocks. Also it would be really nice to send the tests first so it would be more clear when a todo_wine is removed with a subsequent patch in order to see whether the patch is actually related to the previously sent tests. -- Dmitry.

3 17

Re: [PATCH 1/3] winemac.drv: Fix our handling of bitmaps on the clipboard.
by Ken Thomases March 2, 2016

March 2, 2016

On Feb 26, 2016, at 3:55 AM, Charles Davis <cdavis5x(a)gmail.com> wrote: > > dlls/winemac.drv/clipboard.c | 87 ++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 76 insertions(+), 11 deletions(-) Mostly looks good. One request, though: please move create_bitmap_from_dib() to above import_clipboard_data(), just to keep all of the import_* functions together. Also, do you happen to have or know of a convenient program to test this with? Thanks, Ken

1 1

The Wine Project has been accepted as a GSoC 2016 mentor organization!
by André Hentschel March 1, 2016

March 1, 2016

Hi, I'm a little late, but yes, we're accepted again!

2 2

Problems in winedbg.1, msiexec.1, winemaker.1
by esr＠thyrsus.com March 1, 2016

March 1, 2016

This is automatically generated email about markup problems in a man page for which you appear to be responsible. If you are not the right person or list, please tell me so I can correct my database. See http://catb.org/~esr/doclifter/bugs.html for details on how and why these patches were generated. Feel free to email me with any questions. Note: These patches do not change the modification date of any manual page. You may wish to do that by hand. I apologize if this message seems spammy or impersonal. The volume of markup bugs I am tracking is over five hundred - there is no real alternative to generating bugmail from a database and template. -- Eric S. Raymond Problems with winedbg.1: Ambiguous or invalid backslash. This doesn't cause groff a problem. but it confuses doclifter and may confuse older troff implementations. --- winedbg.1-unpatched 2014-06-02 09:40:08.604693388 -0400 +++ winedbg.1 2014-06-02 09:41:09.350110336 -0400 @@ -163,7 +163,7 @@ .IP \fBbreak\ \fIN\fR Adds a breakpoint at line \fIN\fR of current source file. .IP \fBbreak\fR -Adds a breakpoint at current \f$PC\fR address. +Adds a breakpoint at current \fB$PC\fR address. .IP \fBwatch\ *\ \fIN\fR Adds a watch command (on write) at address \fIN\fR (on 4 bytes). .IP \fBwatch\ \fIid\fR Problems with msiexec.1: Ambiguous or invalid backslash. This doesn't cause groff a problem. but it confuses doclifter and may confuse older troff implementations. --- msiexec.1-unpatched 2014-06-02 17:15:58.428528019 -0400 +++ msiexec.1 2014-06-02 17:18:59.360645276 -0400 @@ -24,25 +24,25 @@ \fR[\fBp\fR|\fBo\fR|\fBe\fR|\fBd\fR|\fBc\fR|\fBa\fR|\fBu\fR|\fBm\fR|\fBs\fR|\fBv\fR]\ \ \fR{\fIpackage\fR|\fIproductcode\fR} Repair an installation. Default options are \'omus\' -.IP "\flp\fR" +.IP "\fBlp\fR" Reinstall the file if it is missing. -.IP "\flo\fR" +.IP "\fBlo\fR" Reinstall the file if it is missing or if any older version is installed. -.IP "\fle\fR" +.IP "\fBle\fR" Reinstall the file if it is missing, or if the installed version is equal or older. -.IP "\fld\fR" +.IP "\fBld\fR" Reinstall the file if it is missing or a different version is installed. -.IP "\flc\fR" +.IP "\fBlc\fR" Reinstall the file if it is missing or the checksum does not match. -.IP "\fla\fR" +.IP "\fBla\fR" Reinstall all files. -.IP "\flu\fR" +.IP "\fBlu\fR" Rewrite all required user registry entries. -.IP "\flm\fR" +.IP "\fBlm\fR" Rewrite all required machine registry entries. -.IP "\fls\fR" +.IP "\fBls\fR" Overwrite any conflicting shortcuts. -.IP "\flv\fR" +.IP "\fBlv\fR" Recache the local installation package from the source installation package. .SH PATCHING .IP \fB/p\ \fR{\fIpatch\fR}\ \fR[\fIproperty\fR=\fIfoobar\fR] @@ -65,35 +65,35 @@ [\fBi\fR|\fBw\fR|\fBe\fR|\fBa\fR|\fBr\fR|\fBu\fR|\fBc\fR|\fBm\fR|\fBo\fR|\fBp\fR|\fBv\fR]\ [\fB+\fR|\fB!\fR]\ {\fIlogfile\fR} Enable logging to \fIlogfile\fR. Defaults are \'iwearmo\'. -.IP "\fl*\fR" +.IP "\fBl*\fR" Enable all logging options except \'v\' and \'x\'. -.IP "\fli\fR" +.IP "\fBli\fR" Log status messages. -.IP "\flw\fR" +.IP "\fBlw\fR" Log nonfatal warnings. -.IP "\fle\fR" +.IP "\fBle\fR" Log all error messages. -.IP "\fla\fR" +.IP "\fBla\fR" Log start of actions. -.IP "\flr\fR" +.IP "\fBlr\fR" Log action specifc records. -.IP "\flu\fR" +.IP "\fBlu\fR" Log user requests. -.IP "\flc\fR" +.IP "\fBlc\fR" Log initial UI parameters. -.IP "\flm\fR" +.IP "\fBlm\fR" Log out of memory errors. -.IP "\flo\fR" +.IP "\fBlo\fR" Log out of diskspace messages. -.IP "\flp \fR" +.IP "\fBlp \fR" Log terminal properties. -.IP "\flv \fR" +.IP "\fBlv \fR" Verbose logging. -.IP "\flx \fR" +.IP "\fBlx \fR" Log extra debugging messages. -.IP "\fl+ \fR" +.IP "\fBl+ \fR" Append logging to existing file. -.IP "\fl! \fR" +.IP "\fBl! \fR" Flush each line to log. .SH OTHER OPTIONS .IP \fB/h Problems with winemaker.1: Unbalanced group in command synopis. You probably forgot to open or close a [ ] or { } group properly. --- winemaker.1-unpatched 2014-06-02 09:52:02.517334795 -0400 +++ winemaker.1 2014-06-02 09:54:21.272566508 -0400 @@ -29,7 +29,6 @@ .br [ .BR "--generated-files " "] [ " "--nogenerated-files " "] -] .br [ .BR "--wine32 " "]

3 3

Re: [PATCH] winex11: Don't create a temporary context each time X11DRV_wglBindTexImageARB is called.
by Ken Thomases March 1, 2016

March 1, 2016

On Feb 26, 2016, at 5:29 PM, Miklós Máté <mtmkls(a)gmail.com> wrote: > @@ -2320,6 +2322,7 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) > TRACE("(%p)\n", object); > > pglXDestroyPbuffer(gdi_display, object->drawable); > + pglXDestroyContext(gdi_display, object->tmp_context); I think you need to check if object->tmp_context is non-zero before calling glXDestroyContext() to avoid a GLXBadContext error. > + if (!object->tmp_context) { > + object->tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); > + object->prev_context = prev_context; > + } else if (object->prev_context != prev_context) { > + pglXDestroyContext(gdi_display, object->tmp_context); > + object->tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); > + object->prev_context = prev_context; > + } Those two branches are mostly the same. This could be reduced to: if (!object->tmp_context || object->prev_context != prev_context) { if (object->tmp_context) pglXDestroyContext(gdi_display, object->tmp_context); object->tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); object->prev_context = prev_context; } Is it necessary, when a context is destroyed, to go through all wgl_pbuffer structs looking for any whose prev_context matches the one being destroyed and clear it? Otherwise, you risk having a stale reference that could be reused for a different context and not realize you need to recreate tmp_context. Of course, enumerating all of them in a thread-safe manner is going to require a lot of added infrastructure and complexity. -Ken

3 3

Re: [PATCH 6/6] d3d10core/tests: Port test_multiple_render_targets() from d3d11.
by Marvin Feb. 29, 2016

Feb. 29, 2016

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=20980 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 5/6] d3d10core/tests: Introduce check_texture_color().
by Marvin Feb. 29, 2016

Feb. 29, 2016

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=20979 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 4/6] d3d11/tests: Introduce check_texture_color().
by Marvin Feb. 29, 2016

Feb. 29, 2016

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=20978 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/6] d3d11/tests: Add test for multiple render targets.
by Marvin Feb. 29, 2016

Feb. 29, 2016

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=20977 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 1/6] d3d10core/tests: Port test_create_typeless_resource() from d3d11.
by Marvin Feb. 29, 2016

Feb. 29, 2016

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=20976 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: ole32: Do not open registry keys with no access rights.
by Sebastian Lackner Feb. 29, 2016

Feb. 29, 2016

On 29.02.2016 16:49, Thomas Faber wrote: > While simply opening a subkey (as done here) does not require any > access rights in particular, NtOpenKey with 0 desired access always > fails with STATUS_ACCESS_DENIED on Windows. > Consequently specifying a nonzero access is a prerequisite for some day > fixing Wine's NtOpenKey behavior in this regard. It would be nice to have tests for that in the wine source tree (marked with todo_wine, until all places which rely on it have been fixed).

2 1

Re: [PATCH v3] winex11.drv: Make the GL context current even if no drawables were given.
by Matteo Bruni Feb. 29, 2016

Feb. 29, 2016

2016-02-24 5:12 GMT+01:00 Charles Davis <cdavis5x(a)gmail.com>: > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > Try 3: Fix an assignment I missed. (Thanks, Ken.) > > dlls/opengl32/tests/opengl.c | 2 +- > dlls/winex11.drv/opengl.c | 69 +++++++++++++++++++++++++------------------- > 2 files changed, 41 insertions(+), 30 deletions(-) > > diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c > index e5e1507..c058c19 100644 > --- a/dlls/opengl32/tests/opengl.c > +++ b/dlls/opengl32/tests/opengl.c > @@ -975,7 +975,7 @@ static void test_opengl3(HDC hdc) > * expect drivers to ever offer it. > */ > res = wglMakeCurrent(0, gl3Ctx); > - ok(res == FALSE, "Wow, OpenGL 3.0 windowless rendering passed while it was expected not to!\n"); > + ok(res || broken(!res), "OpenGL 3.0 windowless rendering failed!\n"); That seems suspicious... AFAICS the comment right above this hunk is still valid (it is for current Nvidia drivers on Win7 at least), which probably means that this patch is not a good idea.

4 5

Re: [PATCH 2/3] user32: Added more dialog owner tests.
by Marvin Feb. 29, 2016

Feb. 29, 2016

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=20971 Your paranoid android. === w7u (32 bit msg) === msg.c:8926: Test failed: did not get expected count for minimum timeout (51 != ~100). === w7pro64 (32 bit msg) === msg.c:15473: Test failed: wrong status 00400040 === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

1 0

Re: [PATCH 1/2] include: add authz.h
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > +typedef struct _AUTHZ_ACCESS_REPLY > +{ > + DWORD ResultListLength; > + DWORD *SaclEvaluationResults; > + DWORD *Error; > +} AUTHZ_ACCESS_REPLY, *PAUTHZ_ACCESS_REPLY; There's a field missing here. > +BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, void *access_checker, > + void *compute_dyn_groups, void *free_dyn_groups, > + const WCHAR *managername, void *handle ); That's not the correct prototype. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v4 PATCH] comctl32/tooltip: Protect TTM_ADDTOOLW from invalid text pointers
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -1041,6 +1041,9 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) > if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW) > return FALSE; > > + if(isW && ti->lpszText && IsBadReadPtr(ti->lpszText, sizeof(WCHAR))) > + return FALSE; You want IsBadStringPtrW, and this should most likely be merged with the check above it one way or another. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/4] d3d10core/tests: Test swapchain buffer cycling.
by Henri Verbeet Feb. 29, 2016

Feb. 29, 2016

On 24 February 2016 at 23:28, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Testing multisampling is not possible because only > DXGI_SWAP_EFFECT_DISCARD supports multisampled swapchains and it allows > only access to buffer 0. > > Not exactly test_flip from ddraw because we can't write to the end of > the chain... > > Plenty of todo_wine in here. The read-only part is missing and texturing > from swapchain buffers doesn't work either. > > foo > Is there a d3d11 version of this as well?

1 0

Re: xcopy/tests: Reset "current directory" of current process.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Jactry Zeng <jzeng(a)codeweavers.com> writes: > @@ -97,4 +99,5 @@ START_TEST(xcopy) > > DeleteFileA("xcopy1"); > RemoveDirectoryA("xcopytest"); > + SetCurrentDirectoryW(curdir); Restoring the directory at process exit is not useful. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: shell32/tests: Reset "current directory" of current process.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Jactry Zeng <jzeng(a)codeweavers.com> writes: > @@ -1882,6 +1884,7 @@ static void test_ITEMIDLIST_format(void) { > } > > IShellFolder_Release(psfPersonal); > + SetCurrentDirectoryW(curdir); > } You'd need to do that on the various error returns too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] ntoskrnl.exe: Track drivers created with IoCreateDriver
by Sebastian Lackner Feb. 29, 2016

Feb. 29, 2016

On 26.02.2016 21:22, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 64 +++++++++++++++++++++++++++++++++----------- > 1 file changed, 48 insertions(+), 16 deletions(-) > > > > 0002-ntoskrnl.exe-Track-drivers-created-with-IoCreateDriver.txt > > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index 3bee2bf..49c8cab 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -72,6 +72,16 @@ static DWORD request_thread; > static DWORD client_tid; > static DWORD client_pid; > > +typedef struct _created_driver { > + struct list entry; > + > + UNICODE_STRING driver_name; > + DRIVER_OBJECT *driver_obj; > + DRIVER_EXTENSION *driver_extension; Isn't it possible to add the DRIVER_OBJECT and DRIVER_EXTENSION struct directly (without pointer), to avoid multiple memory allocations? I would also suggest to use a more meaningful name than "created_driver", and you also don't really need the typedef. Something like "struct wine_driver" would make more sense for example, but probably you have a better idea. ;) > +} created_driver; > + > +struct list created_drivers = LIST_INIT(created_drivers); > + > #ifdef __i386__ > #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ > __ASM_STDCALL_FUNC( name, 4, \ > @@ -818,36 +828,47 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, > */ > NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) > { > - DRIVER_OBJECT *driver; > - DRIVER_EXTENSION *extension; > + created_driver *driver; > NTSTATUS status; > > TRACE("(%s, %p)\n", debugstr_us(name), init); > > if (!(driver = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, > - sizeof(*driver) + sizeof(*extension) ))) > + sizeof(*driver) ))) > + return STATUS_NO_MEMORY; > + > + if (!(driver->driver_obj = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, > + sizeof(*driver->driver_obj) + sizeof(*driver->driver_extension) ))) > + { > + RtlFreeHeap( GetProcessHeap(), 0, driver ); > return STATUS_NO_MEMORY; > + } > > - if ((status = RtlDuplicateUnicodeString( 1, name, &driver->DriverName ))) > + if ((status = RtlDuplicateUnicodeString( 1, name, &driver->driver_name ))) > { > + RtlFreeHeap( GetProcessHeap(), 0, driver->driver_obj ); > RtlFreeHeap( GetProcessHeap(), 0, driver ); > return status; > } > > - extension = (DRIVER_EXTENSION *)(driver + 1); > - driver->Size = sizeof(*driver); > - driver->DriverInit = init; > - driver->DriverExtension = extension; > - extension->DriverObject = driver; > - extension->ServiceKeyName = driver->DriverName; > + driver->driver_extension = (DRIVER_EXTENSION *)((BYTE*)driver->driver_obj + sizeof(*driver->driver_obj)); > + driver->driver_obj->DriverName = driver->driver_name; > + driver->driver_obj->Size = sizeof(*driver->driver_obj); > + driver->driver_obj->DriverInit = init; > + driver->driver_obj->DriverExtension = driver->driver_extension; > + driver->driver_extension->DriverObject = driver->driver_obj; > + driver->driver_extension->ServiceKeyName = driver->driver_name; > > - status = driver->DriverInit( driver, name ); > + status = driver->driver_obj->DriverInit( driver->driver_obj, name ); > > if (status) > { > - RtlFreeUnicodeString( &driver->DriverName ); > + RtlFreeUnicodeString( &driver->driver_name ); > + RtlFreeHeap( GetProcessHeap(), 0, driver->driver_obj ); > RtlFreeHeap( GetProcessHeap(), 0, driver ); > } > + > + list_add_tail( &created_drivers, &driver->entry ); Such a global list will need locking. > return status; > } > > @@ -855,12 +876,23 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) > /*********************************************************************** > * IoDeleteDriver (NTOSKRNL.EXE.@) > */ > -void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver ) > +void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) > { > - TRACE("(%p)\n", driver); > + created_driver *driver, *next; > + > + TRACE("(%p)\n", driver_object); > + By putting the driver_object in the same struct, you could use CONTAINING_RECORD here. Also, a lock will be required while unlinking the driver from the list. > + LIST_FOR_EACH_ENTRY_SAFE(driver, next, &created_drivers, created_driver, entry) > + { > + if (driver->driver_obj == driver_object) > + { > + list_remove( &driver->entry ); > + RtlFreeUnicodeString( &driver->driver_name); > + break; > + } > + } > > - RtlFreeUnicodeString( &driver->DriverName ); > - RtlFreeHeap( GetProcessHeap(), 0, driver ); > + RtlFreeHeap( GetProcessHeap(), 0, driver_object ); > } > > > > >

2 2

Re: [PATCH] programs/winedevice.exe: Use IoCreateDriver and IoDeleteDriver
by Sebastian Lackner Feb. 29, 2016

Feb. 29, 2016

On 26.02.2016 21:15, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > programs/winedevice/device.c | 55 ++++++++++++++++++++------------------------ > 1 file changed, 25 insertions(+), 30 deletions(-) > > > > 0001-programs-winedevice.exe-Use-IoCreateDriver-and-IoDelet.txt > > > diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c > index 94132ed..f6dd678 100644 > --- a/programs/winedevice/device.c > +++ b/programs/winedevice/device.c > @@ -43,8 +43,8 @@ extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); > static WCHAR *driver_name; > static SERVICE_STATUS_HANDLE service_handle; > static HANDLE stop_event; > -static DRIVER_OBJECT driver_obj; > -static DRIVER_EXTENSION driver_extension; > +static DRIVER_OBJECT *driver_obj; > +static HMODULE driver_module; Most of it looks fine, but isn't the plan to get rid of global variables? Do you plan to remove it again in follow-up patches? > > /* find the LDR_MODULE corresponding to the driver module */ > static LDR_MODULE *find_ldr_module( HMODULE module ) > @@ -133,38 +133,35 @@ error: > }

2 1

Re: [PATCH] packet: create packet.dll and Implement PacketGetAdapterNames(try 7)
by André Hentschel Feb. 27, 2016

Feb. 27, 2016

Am 26.02.2016 um 02:35 schrieb Jianqiu Zhang: > > Hi, still some problems: see the mail by slackner on try 6 missing blank lines I pointed out meanwhile you can totally omit empty_str no need for brackets around single lines Best regards

1 0

Re: shell32/tests: Reset "current directory" of current process.
by Marvin Feb. 27, 2016

Feb. 27, 2016

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=20931 Your paranoid android. === w1064 (32 bit shlfolder) === shlfolder.c:1591: Test failed: IShellFolder_GetDisplayNameOf(NULL) failed! hr = 80070057

1 0

Re: windowscodecs/tests: Use todo_wine_if() in tests.
by Frédéric Delanoy Feb. 27, 2016

Feb. 27, 2016

Arf, forget this one, bad title. My bad. Frédéric On Sat, Feb 27, 2016 at 2:42 PM, Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> > --- > dlls/dxgi/tests/device.c | 20 ++++---------------- > 1 file changed, 4 insertions(+), 16 deletions(-) > > diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c > index dd5da83..7b052d3 100644 > --- a/dlls/dxgi/tests/device.c > +++ b/dlls/dxgi/tests/device.c > @@ -478,19 +478,13 @@ static void test_createswapchain(void) > hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); > ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); > > ...

1 0

[PATCH] comdlg32: Use SetDlgItemInt() instead of writing number manually.
by carlo.bramix＠libero.it Feb. 27, 2016

Feb. 27, 2016

Hello friends, I have sent this patch: https://source.winehq.org/patches/data/119492 but it has been put in "Formatting" state and I cannot understand why. Could you help me and tell me what's wrong, so I will use more attention next time? Thank you very much. Sincerely, Carlo Bramini.

3 2

[GSoC] Idea: Implement functions from Concurrency namespace
by YongHao Hu Feb. 27, 2016

Feb. 27, 2016

Hello, folks. I'm YongHao Hu. I participated in GSoC of Wine last year and most of the work are finished. This year I want to implement functions from Concurrency namespace[1]. As Wine had already implemented class Concurrency::critical_section[2], SpinWait and Concurrency::details::_GetConcurrency, and I had found information in Microsoft open-source project for cloud-based client-server communication in native code using a modern asynchronous C++ API design[3] which are helpful for the implementation, I think that I am able to handle this project. By now, I had made some patches as my proof of concept.[4] There are many bugs[4-8] relied on functions from Concurrency namespace, this project would fix some bugs and benefit wine's behavior on many software. By making an appropriate proposal, I think the project's work can satisfy GSoC's requirement. Thank you for reading this email. I will be grateful for any advice you can provide. [1]: https://msdn.microsoft.com/en-us/library/dd492819.aspx [2]: https://msdn.microsoft.com/en-us/library/dd492843.aspx [3]: https://github.com/Microsoft/cpprestsdk [4]: https://github.com/YongHaoWu/wine-hub/commits/Concurrency [5]: https://bugs.winehq.org/show_bug.cgi?id=37887 [6]: https://bugs.winehq.org/show_bug.cgi?id=37997 [7]: https://bugs.winehq.org/show_bug.cgi?id=39685 [8]: https://bugs.winehq.org/show_bug.cgi?id=34676 [9]: https://bugs.winehq.org/show_bug.cgi?id=37976

3 6

Wine Mono release plans
by Vincent Povirk Feb. 26, 2016

Feb. 26, 2016

Hi everyone, With Wine moving to a yearly stable release series, I thought it would make sense to base Wine Mono updates on that schedule. My general plan is to create a branch of Wine Mono after each new development series of Wine begins. After this branch is made, there will be no more merges from upstream Mono (barring some compelling changes that can't easily be cherry-picked). Build fixes and obviously correct bug fixes for related platforms will be cherry-picked from upstream, as will changes that look especially relevant to Wine. If you want to suggest a specific change for Wine Mono (whether it's upstream or not), email me or send a pull request to one of my repositories on github. I've made a wine-mono-4.6 branch for this on github (https://github.com/madewokherd/wine-mono/tree/wine-mono-4.6) and there are 4.6.0 packages on dl.winehq.org (http://dl.winehq.org/wine/wine-mono/4.6.0/) I plan to send patches to update Wine to use this version shortly, but as always you can install it early if you want by using 'wine64 msiexec' (or just 'wine msiexec' if you have a 32-bit prefix). Merges from upstream Mono will still be made on the master branch, and I will work to keep Wine compatible with the master branch as the development cycle goes on. However, no releases will be made from the master branch. Each Wine Mono series will be compatible with the corresponding development series of Wine, and the stable series before and after. Thus all Wine Mono 4.6.x versions should work with Wine 1.8.x, 1.9.x, or 2.0.x. I'm not sure if I will continue to publish changelogs for each release. In this case, the only major changes in 4.6.0 are the update from upstream and the ability to function on a basic level in a 64-bit Wine process.

1 0

Re: [PATCH] winex11: Don't create a temporary context each time X11DRV_wglBindTexImageARB is called.
by Matteo Bruni Feb. 26, 2016

Feb. 26, 2016

2016-02-25 16:22 GMT+01:00 Miklós Máté <mtmkls(a)gmail.com>: > Theoretically wglBindTexImageARB is supposed to be a fast > render-to-texture method, and creating a new context is anything but fast. > > This fixes horrible performance in Star Wars > Knights of the Old Republic when post-process effects are enabled. > > Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> > --- > dlls/winex11.drv/opengl.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c > index 99befde..d2b72cf 100644 > --- a/dlls/winex11.drv/opengl.c > +++ b/dlls/winex11.drv/opengl.c > @@ -235,6 +235,8 @@ struct wgl_pbuffer > GLenum texture_type; > GLuint texture; > int texture_level; > + GLXContext tmp_context; > + int has_tmp_context; > }; You don't need the "has_tmp_context" field, the struct is zeroed at allocation and you can just check if the context is non-zero. You do need to store the context which was current at the time tmp_context was last created though (see below). > > enum dc_gl_type > @@ -2940,12 +2942,15 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) > } > > TRACE("drawable=%lx, context=%p\n", object->drawable, prev_context); > - tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); > + if (!object->has_tmp_context) { > + object->tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); > + object->has_tmp_context = 1; > + } As I mentioned in my previous reply, the temporary context is shared with prev_context (which is correct, second to last parameter of glXCreateNewContext()) and that means it has to be recreated if prev_context changes between calls to wglBindTexImageARB. So please store prev_context in object and destroy and recreate the temporary context if the current prev_context is different.

1 0

Re: [PATCH 2/2] authz: Stub functions AuthzAccessCheck, AuthzFreeContext, AuthzInitializeContextFromSid, AuthzInitializeContextFromToken
by Sebastian Lackner Feb. 26, 2016

Feb. 26, 2016

On 25.02.2016 08:50, Alistair Leslie-Hughes wrote: > From: Zhenbo Li <litimetal(a)gmail.com> > > Moved defines to authz.h I will assume you typed the definitions in patch 1 yourself, and did not move them from Zhenbo Lis patch - otherwise a remark about authorship would be necessary in 1/2. > Minor cleanup of parameter names. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/authz/authz.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/authz/authz.spec | 8 +++---- > 2 files changed, 62 insertions(+), 4 deletions(-) >

2 2

Re: [PATCH 2/2] Programs: Load device drivers of the same group into the same winedevice process
by Sebastian Lackner Feb. 26, 2016

Feb. 26, 2016

On 24.02.2016 15:16, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > programs/services/services.c | 124 ++++++++++++++++++++++++++++ > programs/winedevice/device.c | 191 ++++++++++++++++++++++++++++++++++++------- > 2 files changed, 286 insertions(+), 29 deletions(-) > Although the general idea seems fine, the patches are still very hacky, and I fear we need a better method to communicate between services and winedevices - a separate mailslot communication doesn't seem like a good idea. The main issues I still see: * Instead of two separate communication channels, we should implement marshalling of data structures, and return them for example in the ServiceCtrlHandler callback. Depending on the exact mechanism, special care has to be taken to ensure the process is up and running before sending control commands. * Currently wine supports loading of both 32-bit and 64-bit drivers. This needs special care in both patch 1 and patch 2. A winedevice process with the wrong architecture will not be able to load the driver. * programs/services should be able to track the services correctly. Unfortunately it seems like the advapi32 functions do not offer any nice method to add additional services after startup. Maybe we could add a wine-specific extension here? * Proper locking is required before accessing the database or services structures. Those are technical issues though, and can be fixed of course. I'm currently trying a couple of own ideas, and will share them as soon as they do something useful. ;) Regards, Sebastian

2 1

Re: [PATCH] configure: Check for __builtin_ms_va_list on all x86_64 platforms.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Charles Davis <cdavis5x(a)gmail.com> writes: > If we're running configure, we're probably not going to be using Visual > C++, even on Windows. Everywhere else, we need this for variadic > argument lists to work. You could probably unify the Mac OS case with the x86_64 one, instead of adding another check for the build host. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] winex11: Don't create a temporary context each time X11DRV_wglBindTexImageARB is called.
by Ken Thomases Feb. 26, 2016

Feb. 26, 2016

On Feb 25, 2016, at 9:22 AM, Miklós Máté <mtmkls(a)gmail.com> wrote: > > Theoretically wglBindTexImageARB is supposed to be a fast > render-to-texture method, and creating a new context is anything but fast. > > This fixes horrible performance in Star Wars > Knights of the Old Republic when post-process effects are enabled. > > Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> > --- > dlls/winex11.drv/opengl.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) You need to destroy the temporary context when the pbuffer object is destroyed in X11DRV_wglDestroyPbufferARB(). -Ken

1 0

Re: user32: Preserve beginning of extra data for MDI windows.
by Marvin Feb. 26, 2016

Feb. 26, 2016

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=20905 Your paranoid android. === w7u (32 bit msg) === msg.c:8803: Test failed: did not get expected count for minimum timeout (54 != ~100). === w1064 (32 bit msg) === msg.c:6294: Test failed: Update region shouldn't be empty msg.c:6528: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6530: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6300: Test failed: Regions are different msg.c:6300: Test failed: Regions are different msg.c:6300: Test failed: Regions are different

2 1

Re: user32: Always enable owner window in EndDialog.
by Marvin Feb. 25, 2016

Feb. 25, 2016

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=20897 Your paranoid android. === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

1 0

Re: user32: Always enable owner window in EndDialog.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Jacek Caban <jacek(a)codeweavers.com> writes: > @@ -12245,6 +12245,7 @@ static void test_EndDialog(void) > hactive = GetForegroundWindow(); > ok(hdlg == hactive, "Wrong window has focus (%p != %p)\n", hdlg, hactive); > EndDialog(hdlg, 0); > + ok(IsWindowEnabled(hparent), "parent is not enabled\n"); > hactive = GetForegroundWindow(); > ok(hparent == hactive, "Wrong window has focus (parent != active) (active: %p, parent: %p, dlg: %p, other: %p)\n", hactive, hparent, hdlg, hother); > DestroyWindow(hdlg); It would be interesting to test what happens if the dialog is not the active window. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] packet: create packet.dll and Implement PacketGetAdapterNames(try 6)
by Sebastian Lackner Feb. 25, 2016

Feb. 25, 2016

On 25.02.2016 15:55, Jianqiu Zhang wrote: > > 0001-packet-create-packet.dll-and-Implement-PacketGetAdapte.txt > > > From 9853273e566d9ae34bbfef459a730e3701d54d22 Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Sun, 14 Feb 2016 17:27:37 +0800 > Subject: [PATCH] packet: create packet.dll and Implement PacketGetAdapterNames > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > configure.ac | 7 +++-- > dlls/packet/Makefile.in | 5 +++ > dlls/packet/packet.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/packet/packet.spec | 32 +++++++++++++++++++ > dlls/wpcap/Makefile.in | 1 + > 5 files changed, 124 insertions(+), 2 deletions(-) > create mode 100644 dlls/packet/Makefile.in > create mode 100644 dlls/packet/packet.c > create mode 100644 dlls/packet/packet.spec > > diff --git a/configure.ac b/configure.ac > index c9445e7..b61a5c2 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1185,8 +1185,10 @@ then > AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(PCAP_LIBS,["-lpcap"])]) > fi > WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes], > - [pcap ${notice_platform}development files not found, wpcap won't be supported.]) > + [pcap ${notice_platform}development files not found, wpcap and packet won't be supported.]) > test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_wpcap=${enable_wpcap:-no} > +test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_packet=${enable_packet:-no} > + > > dnl **** Check for libxml2 **** > > @@ -3180,6 +3182,7 @@ WINE_CONFIG_DLL(opengl32,,[implib]) > WINE_CONFIG_TEST(dlls/opengl32/tests) > WINE_CONFIG_DLL(packager,,[clean]) > WINE_CONFIG_TEST(dlls/packager/tests) > +WINE_CONFIG_DLL(packet) > WINE_CONFIG_DLL(pdh,,[implib]) > WINE_CONFIG_TEST(dlls/pdh/tests) > WINE_CONFIG_DLL(photometadatahandler) > @@ -3388,7 +3391,7 @@ WINE_CONFIG_TEST(dlls/wmp/tests) > WINE_CONFIG_DLL(wmvcore) > WINE_CONFIG_DLL(wnaspi32,,[implib]) > WINE_CONFIG_DLL(wow32,enable_win16,[implib]) > -WINE_CONFIG_DLL(wpcap) > +WINE_CONFIG_DLL(wpcap,,[implib]) > WINE_CONFIG_DLL(ws2_32,,[implib]) > WINE_CONFIG_TEST(dlls/ws2_32/tests) > WINE_CONFIG_DLL(wshom.ocx,,[clean]) > diff --git a/dlls/packet/Makefile.in b/dlls/packet/Makefile.in > new file mode 100644 > index 0000000..9caced8 > --- /dev/null > +++ b/dlls/packet/Makefile.in > @@ -0,0 +1,5 @@ > +MODULE = packet.dll > +IMPORTS = wpcap > + > +C_SRCS = \ > + packet.c > diff --git a/dlls/packet/packet.c b/dlls/packet/packet.c > new file mode 100644 > index 0000000..0e9ff97 > --- /dev/null > +++ b/dlls/packet/packet.c > @@ -0,0 +1,81 @@ > +#include "config.h" > + > +#include "windows.h" > +#include "wine/debug.h" > + > +#include "pcap.h" As pointed out on IRC yesterday, the system pcap.h header file declares functions with the wrong calling convention. You would have to add a separate wine header file, or directly use the linux pcap library (without going through wpcap). > + > +WINE_DEFAULT_DEBUG_CHANNEL(packet); > + > +BOOLEAN CDECL PacketGetAdapterNames(char *name_list, ULONG *size) > +{ > + pcap_if_t *alldevs, *ptr; > + char errbuf[PCAP_ERRBUF_SIZE]; > + int min_desc_size, min_name_size, min_size, desc_offset, name_offset; > + DWORD ret; > + char empty_str[] = ""; > + > + TRACE("(%p, %p)\n", name_list, size); > + > + ret = pcap_findalldevs(&alldevs, errbuf); > + > + if (ret) > + { > + pcap_freealldevs(alldevs); > + return FALSE; > + } > + ptr = alldevs; > + min_name_size = min_desc_size = min_size = 0; > + while (ptr) > + { > + /* Work around bug in libpcap ptr->description == NULL when no description got */ > + if (ptr->description == NULL) > + { > + ptr->description = empty_str; > + } > + > + min_name_size += strlen(ptr->name) + 1; > + min_desc_size += strlen(ptr->description) + 1; > + ptr = ptr->next; > + } > + > + min_size = min_name_size + min_desc_size + 2; > + > + if (!name_list || *size < min_size) > + { > + ptr = alldevs; > + while (ptr) > + { > + if (!strcmp(ptr->description, "")) > + { > + ptr->description = NULL; It is not really clear to me why you change ->description to an empty string, just to change it back here. If its only for the size computation, why not just handle this case separately? > + } > + ptr = ptr->next; > + } > + SetLastError(ERROR_INSUFFICIENT_BUFFER); > + pcap_freealldevs(alldevs); > + *size = min_size; As pointed out in one of the previous mails, the official packet.dll doesn't seem to do that (at least the versions I found). > + return FALSE; > + } > + ptr = alldevs; > + desc_offset = name_offset = 0; > + while (ptr) > + { > + strcpy(name_list + name_offset, ptr->name); > + strcpy(name_list + min_name_size + desc_offset + 1, ptr->description); > + name_offset += strlen(ptr->name) + 1; > + desc_offset += strlen(ptr->description) + 1; > + > + /* Work around bug in libpcap ptr->description == NULL when no description got */ > + if(!strcmp(ptr->description, "")) > + { > + ptr->description = NULL; > + } > + ptr = ptr->next; > + } > + name_list[min_name_size] = '\0'; > + name_list[min_size - 1] = '\0'; > + > + pcap_freealldevs(alldevs); > + return TRUE; > +} > diff --git a/dlls/packet/packet.spec b/dlls/packet/packet.spec > new file mode 100644 > index 0000000..32b9bc0 > --- /dev/null > +++ b/dlls/packet/packet.spec > @@ -0,0 +1,32 @@ > +@ stub PacketAllocatePacket > +@ stub PacketCloseAdapter > +@ stub PacketFreePacket > +@ cdecl PacketGetAdapterNames(ptr ptr) > +@ stub PacketGetAirPcapHandle > +@ stub PacketGetDriverVersion > +@ stub PacketGetNetInfoEx > +@ stub PacketGetNetType > +@ stub PacketGetReadEvent > +@ stub PacketGetStats > +@ stub PacketGetStatsEx > +@ stub PacketGetVersion > +@ stub PacketInitPacket > +@ stub PacketIsDumpEnded > +@ stub PacketLibraryVersion > +@ stub PacketOpenAdapter > +@ stub PacketReceivePacket > +@ stub PacketRequest > +@ stub PacketSendPacket > +@ stub PacketSendPackets > +@ stub PacketSetBpf > +@ stub PacketSetBuff > +@ stub PacketSetDumpLimits > +@ stub PacketSetDumpName > +@ stub PacketSetHwFilter > +@ stub PacketSetLoopbackBehavior > +@ stub PacketSetMinToCopy > +@ stub PacketSetMode > +@ stub PacketSetNumWrites > +@ stub PacketSetReadTimeout > +@ stub PacketSetSnapLen > +@ stub PacketStopDriver > diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in > index 91b4a95..e9794cf 100644 > --- a/dlls/wpcap/Makefile.in > +++ b/dlls/wpcap/Makefile.in > @@ -1,6 +1,7 @@ > MODULE = wpcap.dll > DELAYIMPORTS = ws2_32 > EXTRALIBS = $(PCAP_LIBS) > +IMPORTLIB = wpcap > > C_SRCS = \ > wpcap.c > -- 2.7.1 > > >

1 0

Re: [PATCH 1/2] opengl: don't create a tmp context for glCopyTexImage2D
by Ken Thomases Feb. 25, 2016

Feb. 25, 2016

On Feb 23, 2016, at 11:37 AM, Miklós Máté <mtmkls(a)gmail.com> wrote: > > It works fine without the tmp context, and Mesa's wgl state tracker doesn't > do that either. Theoretically wglBindTexImageARB is supposed to be a fast > render-to-texture method, and creating a new context is anything but fast. I don't know the history of this code, but there are comments and a FIXME strongly suggesting that, even as is, it doesn't completely work. So, you need to do a thorough investigation for why the code was written this way. I note that use_render_texture_emulation is always true, these days, so maybe things have changed. I'm not sure why that variable exists. Also see notes below. > diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c > index 99befde..871cfc1 100644 > --- a/dlls/winex11.drv/opengl.c > +++ b/dlls/winex11.drv/opengl.c > @@ -2922,10 +2922,8 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) > > if (use_render_texture_emulation) { > static BOOL initialized = FALSE; > - int prev_binded_texture = 0; > GLXContext prev_context; > Drawable prev_drawable; > - GLXContext tmp_context; > > prev_context = pglXGetCurrentContext(); > prev_drawable = pglXGetCurrentDrawable(); > @@ -2940,21 +2938,15 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) > } > > TRACE("drawable=%lx, context=%p\n", object->drawable, prev_context); > - tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); > - > - opengl_funcs.gl.p_glGetIntegerv(object->texture_bind_target, &prev_binded_texture); > > /* Switch to our pbuffer */ > - pglXMakeCurrent(gdi_display, object->drawable, tmp_context); > + pglXMakeCurrent(gdi_display, object->drawable, prev_context); prev_context is precisely the current context. So, there should be no need to make it current. > > - /* Make sure that the prev_binded_texture is set as the current texture state isn't shared between contexts. > - * After that upload the pbuffer texture data. */ > - opengl_funcs.gl.p_glBindTexture(object->texture_target, prev_binded_texture); > + /* Upload the pbuffer texture data. */ > opengl_funcs.gl.p_glCopyTexImage2D(object->texture_target, 0, object->use_render_texture, 0, 0, object->width, object->height, 0); > > /* Switch back to the original drawable and upload the pbuffer-texture */ > pglXMakeCurrent(gdi_display, prev_drawable, prev_context); It shouldn't be necessary to "restore" prev_context as the current context, since you never switched to a temporary context. The prev_context and prev_drawable variables should go away entirely. It seems to me that this entire function boils down to little more than a wrapper around glCopyTexImage2D(). I'm not familiar enough with wglBindTexImageARB() to know if that makes sense. -Ken

3 5

Re: [PATCH 2/2] desktop: add 1280x960 resolution
by Matteo Bruni Feb. 25, 2016

Feb. 25, 2016

2016-02-23 18:37 GMT+01:00 Miklós Máté <mtmkls(a)gmail.com>: > This enables high resolution setting in Anachronox, when Wine is configured > to emulate a virtual desktop. The game only supports 640x480 and 1280x960. > > Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> > --- > dlls/winex11.drv/desktop.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c > index 603e19f..2d8c039 100644 > --- a/dlls/winex11.drv/desktop.c > +++ b/dlls/winex11.drv/desktop.c > @@ -37,8 +37,8 @@ static unsigned int dd_mode_count; > static unsigned int max_width; > static unsigned int max_height; > > -static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1400, 1600}; > -static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 1024, 1050, 1200}; > +static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; > +static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; > #define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0])) I would replace those two arrays with an array of structs i.e. something like: static const struct { unsigned int width; unsigned int height; } desktop_modes[] = { {320, 200}, ... }; changing the rest accordingly. Not sure if there are other concerns with this patch. I guess we could add more modes (e.g. 1366x768, 1280x800, 1920x1080, 1920x1200, 2560x1440, 2560x1600, maybe even more from https://en.wikipedia.org/wiki/Graphics_display_resolution or similar). I don't think there is a problem with maintaining a list here (or, at least, I don't see any way to do without). I trust someone else will correct me if I'm utterly wrong.

1 0

Re: [PATCH] d3dx: D3DXQuaternionToAxisAngle should not crash on NULLs in output parameters.
by Matteo Bruni Feb. 25, 2016

Feb. 25, 2016

2016-02-25 11:36 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/math.c | 12 ++++++++---- > dlls/d3dx9_36/tests/math.c | 5 +++++ > 2 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c > index 5e8d51a..123bd2f 100644 > --- a/dlls/d3dx9_36/math.c > +++ b/dlls/d3dx9_36/math.c > @@ -1652,10 +1652,14 @@ void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *pax > { > TRACE("pq %p, paxis %p, pangle %p\n", pq, paxis, pangle); > > - paxis->x = pq->x; > - paxis->y = pq->y; > - paxis->z = pq->z; > - *pangle = 2.0f * acosf(pq->w); > + if (paxis) > + { > + paxis->x = pq->x; > + paxis->y = pq->y; > + paxis->z = pq->z; > + } > + if (pangle) > + *pangle = 2.0f * acosf(pq->w); > } > > /*_________________D3DXVec2_____________________*/ > diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c > index ac4475d..a4e24da 100644 > --- a/dlls/d3dx9_36/tests/math.c > +++ b/dlls/d3dx9_36/tests/math.c > @@ -1022,6 +1022,11 @@ static void D3DXQuaternionTest(void) > D3DXQuaternionToAxisAngle(&nul,&axis,&angle); > expect_vec3(expectedvec,axis); > ok(relative_error(angle, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); > +/* test NULLs in output parameters */ > + D3DXQuaternionToAxisAngle(&nul,&axis,NULL); > + D3DXQuaternionToAxisAngle(&nul,NULL,&angle); > + expect_vec3(expectedvec,axis); > + ok(relative_error(angle, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); > } Please indent the comment, or maybe (better IMO) just drop it altogether. Be consistent with whitespace after the comma and no whitespace before the ')'. Yes, I know, the code right above is broken exactly in the same way...

1 0

Re: [PATCH] msi: Files with the same version need to check file/hash as well
by Hans Leidekker Feb. 25, 2016

Feb. 25, 2016

Hi Alistair, > diff --git a/dlls/msi/files.c b/dlls/msi/files.c > index 9b46762..0285a7e 100644 > --- a/dlls/msi/files.c > +++ b/dlls/msi/files.c > @@ -120,18 +120,11 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil > debugstr_w(file->File), debugstr_w(file->Version), > HIWORD(file_version->dwFileVersionMS), LOWORD(file_version->dwFileVersionMS), > HIWORD(file_version->dwFileVersionLS), LOWORD(file_version->dwFileVersionLS)); > - state = msifs_overwrite; > - } > - else > - { > - TRACE("keeping %s (new version %s old version %u.%u.%u.%u)\n", > - debugstr_w(file->File), debugstr_w(file->Version), > - HIWORD(file_version->dwFileVersionMS), LOWORD(file_version->dwFileVersionMS), > - HIWORD(file_version->dwFileVersionLS), LOWORD(file_version->dwFileVersionLS)); > - state = msifs_present; > + return msifs_overwrite; > } > + > msi_free( file_version ); > - return state; > + /* Fall through to check the size and hash */ Please add tests for all sensible combinations of version, size and hash.

1 0

Re: [PATCH 1/4] msvcp110: Add _Thrd_detach implementation
by Piotr Caban Feb. 25, 2016

Feb. 25, 2016

On 02/25/16 10:12, Piotr Caban wrote: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/msvcp110/msvcp110.spec | 2 +- > dlls/msvcp120/msvcp120.spec | 2 +- > dlls/msvcp120/tests/msvcp120.c | 12 +++++++++++- > dlls/msvcp120_app/msvcp120_app.spec | 2 +- > dlls/msvcp90/misc.c | 5 +++++ > 5 files changed, 19 insertions(+), 4 deletions(-) Please ignore this patches, 64-bit tests are not working.

1 0

Re: [PATCH v3] ntdll: Finish serial reads of size 0 immediately.
by Marvin Feb. 25, 2016

Feb. 25, 2016

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=20877 Your paranoid android. === wxppro (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1553: test_AbortWaitCts timeout 500 handle 00000770 comm.c:1520: Changing CommMask on the fly for handle 00000770 after timeout 500 === w2008s64 (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1553: test_AbortWaitCts timeout 500 handle 000000BC comm.c:1520: Changing CommMask on the fly for handle 000000BC after timeout 500 === w2008s64 (64 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting

1 0

Re: [PATCH] packet: create packet.dll and Implement PacketGetAdapterNames(try 5)
by André Hentschel Feb. 25, 2016

Feb. 25, 2016

Am 23.02.2016 um 09:44 schrieb Jianqiu Zhang: > According to advice frome André Hentschel, implement packet.dll using > the method of calling wine wpcap function, rewrite > PacketGetAdapterNames. > > > > > > From 691679b504530c38c400813bacbc416c28028655 Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Sun, 14 Feb 2016 17:27:37 +0800 > Subject: [PATCH] packet: create packet.dll and Implement PacketGetAdapterNames > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > configure.ac | 7 ++-- > dlls/packet/Makefile.in | 5 +++ > dlls/packet/packet.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/packet/packet.spec | 32 +++++++++++++++++++ > dlls/wpcap/Makefile.in | 1 + > 5 files changed, 128 insertions(+), 2 deletions(-) > create mode 100644 dlls/packet/Makefile.in > create mode 100644 dlls/packet/packet.c > create mode 100644 dlls/packet/packet.spec > > diff --git a/configure.ac b/configure.ac > index c9445e7..b61a5c2 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1185,8 +1185,10 @@ then > AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(PCAP_LIBS,["-lpcap"])]) > fi > WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes], > - [pcap ${notice_platform}development files not found, wpcap won't be supported.]) > + [pcap ${notice_platform}development files not found, wpcap and packet won't be supported.]) > test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_wpcap=${enable_wpcap:-no} > +test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_packet=${enable_packet:-no} > + > > dnl **** Check for libxml2 **** > > @@ -3180,6 +3182,7 @@ WINE_CONFIG_DLL(opengl32,,[implib]) > WINE_CONFIG_TEST(dlls/opengl32/tests) > WINE_CONFIG_DLL(packager,,[clean]) > WINE_CONFIG_TEST(dlls/packager/tests) > +WINE_CONFIG_DLL(packet) > WINE_CONFIG_DLL(pdh,,[implib]) > WINE_CONFIG_TEST(dlls/pdh/tests) > WINE_CONFIG_DLL(photometadatahandler) > @@ -3388,7 +3391,7 @@ WINE_CONFIG_TEST(dlls/wmp/tests) > WINE_CONFIG_DLL(wmvcore) > WINE_CONFIG_DLL(wnaspi32,,[implib]) > WINE_CONFIG_DLL(wow32,enable_win16,[implib]) > -WINE_CONFIG_DLL(wpcap) > +WINE_CONFIG_DLL(wpcap,,[implib]) > WINE_CONFIG_DLL(ws2_32,,[implib]) > WINE_CONFIG_TEST(dlls/ws2_32/tests) > WINE_CONFIG_DLL(wshom.ocx,,[clean]) > diff --git a/dlls/packet/Makefile.in b/dlls/packet/Makefile.in > new file mode 100644 > index 0000000..9caced8 > --- /dev/null > +++ b/dlls/packet/Makefile.in > @@ -0,0 +1,5 @@ > +MODULE = packet.dll > +IMPORTS = wpcap > + > +C_SRCS = \ > + packet.c > diff --git a/dlls/packet/packet.c b/dlls/packet/packet.c > new file mode 100644 > index 0000000..2b002ec > --- /dev/null > +++ b/dlls/packet/packet.c > @@ -0,0 +1,85 @@ > +#include "config.h" > + > +#include "windows.h" > +#include "wine/debug.h" > + > +#include "pcap.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(packet); > + > +BOOLEAN CDECL PacketGetAdapterNames(char *name_list, ULONG *size) > +{ > + pcap_if_t *alldevs, *ptr; > + char errbuf[PCAP_ERRBUF_SIZE]; > + int min_desc_size, min_name_size, min_size, desc_offset, name_offset; > + DWORD ret; > + > + TRACE("(%p, %p)\n", name_list, size); > + > + ret = pcap_findalldevs(&alldevs, errbuf); > + > + TRACE("ret = %d, alldevs = %p\n", ret, alldevs); Only useful for debugging > + > + if(ret) > + { > + pcap_freealldevs(alldevs); > + return FALSE; > + } > + ptr = alldevs; > + min_name_size = min_desc_size = min_size = 0; > + while(ptr) some blank lines would be great above, also we normally use a space between C keywords (if, while, ...) and the parenthesis > + { > + /* Work around bug in libpcap ptr->description == NULL when no description got */ > + if(ptr->description == NULL) > + { > + ptr->description = (char *)HeapAlloc(GetProcessHeap(), 0, sizeof(char)); > + *(ptr->description) = '\0'; Can't we simply use a static const "" here? That also would avoid the hack later to free the heap space > + } > + > + min_name_size += strlen(ptr->name) + 1; > + min_desc_size += strlen(ptr->description) + 1; > + ptr = ptr->next; > + } > + > + min_size = min_name_size + min_desc_size + 2; > + > + if(!name_list || *size < min_size) > + { > + ptr = alldevs; > + while(ptr) > + { > + if(!strcmp(ptr->description, "")) > + { > + HeapFree(GetProcessHeap(), 0, ptr->description); > + ptr->description = NULL; > + } > + ptr = ptr->next; > + } > + SetLastError(ERROR_INSUFFICIENT_BUFFER); > + pcap_freealldevs(alldevs); > + *size = min_size; > + return FALSE; > + } > + ptr = alldevs; > + desc_offset = name_offset = 0; > + while(ptr) > + { > + strcpy(name_list + name_offset, ptr->name); > + strcpy(name_list + min_name_size + desc_offset + 1, ptr->description); > + name_offset += strlen(ptr->name) + 1; > + desc_offset += strlen(ptr->description) + 1; > + > + /* Work around bug in libpcap ptr->description == NULL when no description got */ > + if(!strcmp(ptr->description, "")) > + { > + HeapFree(GetProcessHeap(), 0, ptr->description); > + ptr->description = NULL; > + } > + ptr = ptr->next; > + } > + name_list[min_name_size] = '\0'; > + name_list[min_size - 1] = '\0'; > + > + pcap_freealldevs(alldevs); > + return TRUE; > +} > diff --git a/dlls/packet/packet.spec b/dlls/packet/packet.spec > new file mode 100644 > index 0000000..32b9bc0 > --- /dev/null > +++ b/dlls/packet/packet.spec > @@ -0,0 +1,32 @@ > +@ stub PacketAllocatePacket > +@ stub PacketCloseAdapter > +@ stub PacketFreePacket > +@ cdecl PacketGetAdapterNames(ptr ptr) > +@ stub PacketGetAirPcapHandle > +@ stub PacketGetDriverVersion > +@ stub PacketGetNetInfoEx > +@ stub PacketGetNetType > +@ stub PacketGetReadEvent > +@ stub PacketGetStats > +@ stub PacketGetStatsEx > +@ stub PacketGetVersion > +@ stub PacketInitPacket > +@ stub PacketIsDumpEnded > +@ stub PacketLibraryVersion > +@ stub PacketOpenAdapter > +@ stub PacketReceivePacket > +@ stub PacketRequest > +@ stub PacketSendPacket > +@ stub PacketSendPackets > +@ stub PacketSetBpf > +@ stub PacketSetBuff > +@ stub PacketSetDumpLimits > +@ stub PacketSetDumpName > +@ stub PacketSetHwFilter > +@ stub PacketSetLoopbackBehavior > +@ stub PacketSetMinToCopy > +@ stub PacketSetMode > +@ stub PacketSetNumWrites > +@ stub PacketSetReadTimeout > +@ stub PacketSetSnapLen > +@ stub PacketStopDriver > diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in > index 91b4a95..e9794cf 100644 > --- a/dlls/wpcap/Makefile.in > +++ b/dlls/wpcap/Makefile.in > @@ -1,6 +1,7 @@ > MODULE = wpcap.dll > DELAYIMPORTS = ws2_32 > EXTRALIBS = $(PCAP_LIBS) > +IMPORTLIB = wpcap > > C_SRCS = \ > wpcap.c > -- > 2.7.1 >

2 1