wine-devel December 2013

wine-devel@winehq.org

46 participants
148 discussions

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

22 Nov '20

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 28 Sep '18

28 Sep '18

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 14 Jun '18

14 Jun '18

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 16 Jun '16

16 Jun '16

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 05 Jul '15

05 Jul '15

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

Re: [PATCH] user32/tests: Test SetUserObjectInformation for invisible winstation.
by Alexandre Julliard 23 Apr '15

23 Apr '15

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

Re: configure: Add -linotify when present, for non-Linux platforms.
by Alexandre Julliard 23 Aug '14

23 Aug '14

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > A FreeBSD user ran into this when sys/inotify.h was present via an > extra package and Wine went ahead using that, only to fail at link- > time. We'd want to use kqueue instead on FreeBSD. -- Alexandre Julliard julliard(a)winehq.org

2 1

What happened to the Fedora packages?
by Neal Gompa 02 Aug '14

02 Aug '14

What happened to the Fedora packages? They have not been updated since 0.9.2!!!! Right now it is at 0.9.10!!! Nearly every other Linux distro supported has the up to date packages!!! And why does the Red Hat packages site not go to the SourceForge site as it does for SUSE packages and the others?? I have not really had the guts to ask until now, because I thought that maybe there was a slump, but now, its getting annoying!! And Fedora just released Fedora Core 5 yesterday!!! Please tell me new packages will be ready soon!!! Compiling WINE always crashes my computer, so I prefer to use the RPMs...

10 18

Better managing icons files names
by Pedro Henrique Lara Campos 02 Jan '14

02 Jan '14

Can Wine or could it in newer versions, use a prefix for their icons, like wine_56BA_Tcharam.png, or maybe their own folder? My ~/.local/share/icons is like... full of bottles, every corner I look, I find an icon from wine :P

3 2

Re: winex11: Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command
by Alexandre Julliard 31 Dec '13

31 Dec '13

Sebastian Lackner <sebastian(a)fds-team.de> writes: > This patch implements an additional ExtEscape command > X11DRV_FLUSH_GDI_DISPLAY, which can be used by external applications in > order to flush all drawing operations to the Xserver. > > This patch is necessary for a new feature of Pipelight: In NPAPI > windowlessmode the browser provides an X11 drawable, and expects the > plugin (= the wine application) to draw on it. The current > implementation uses CreateDCA() to create a new hDC and then > X11DRV_SET_DRAWABLE to draw on an arbitrary X11 drawable. The additional > command implemented in this patch is required to ensure that the drawing > is finished before the PAINT event returns. Normally an XSync would be > even better, but a lot of testing shows that XFlush is also sufficient > (and faster), thats why we decided to use this approach. You should call MsgWaitForMultipleObjects or some similar function instead of adding private escapes. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [2/2] ntdll: Dynamically grow buffer in read_changes_apc
by Alexandre Julliard 31 Dec '13

31 Dec '13

André Hentschel <nerv(a)dawncrow.de> writes: > --- > dlls/ntdll/directory.c | 35 +++++++++++++++++++++++++++-------- > 1 file changed, 27 insertions(+), 8 deletions(-) You can't allocate memory inside an APC callback. -- Alexandre Julliard julliard(a)winehq.org

1 0

Status of WineD3D on Windows
by Peter Lehmkuhle 31 Dec '13

31 Dec '13

Hi all, I'm not sure if this is the right list for this question, but I guess I'll find out soon. :) On http://wiki.winehq.org/WineD3DOnWindows it is written that "DirectDraw [..] can't be used at this point due to a conflict with opengl32.dll." I guess that's the current status, because the ddraw.dll is not included in the last build. Are there any plans to change this in the near future? TIA for an answer. Best regards, Peter

2 1

Re: [PATCH 1/4] ole32: Fix parameter validation for CreateClassMoniker()
by Marvin 31 Dec '13

31 Dec '13

1 0

Re: kernel32/tests: Add test for FindFirstFileA
by Zhenbo Li 31 Dec '13

31 Dec '13

2013/12/30 Zhenbo Li <litimetal(a)gmail.com>: > As MSDN[1] mentioned, "This parameter should not ... end in a trailing > backslash (\)." So I think I should add this test case. > > [1]: > http://msdn.microsoft.com/en-us/library/windows/desktop/aa364418%28v=vs.85%… > --- > dlls/kernel32/tests/file.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > Sorry, I made a mistake while reading the previous code. Please reject this patch, and I'll send another patch later. Sorry for this inconvenience.

1 0

Re: winhttp/tests: Constify a character string
by Marvin 31 Dec '13

31 Dec '13

1 0

Re: [4/4] ws2_32: Cope with invalid hints in getaddrinfo/GetAddrInfoW
by Marvin 31 Dec '13

31 Dec '13

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://newtestbot.winehq.org/JobDetails.pl?Key=3900 Your paranoid android. === wxppro (32 bit sock) === sock.c:554: Test failed: oob_server (c0): unexpectedly at the OOB mark: 0 === wvista (32 bit sock) === sock.c:5410: Test failed: test 0: expected one result when hints are used for localhost sock.c:5410: Test failed: test 1: expected one result when hints are used for localhost sock.c:5410: Test failed: test 2: expected one result when hints are used for localhost sock.c:5410: Test failed: test 3: expected one result when hints are used for localhost sock.c:5410: Test failed: test 8: expected one result when hints are used for localhost sock.c:5410: Test failed: test 9: expected one result when hints are used for localhost sock.c:5410: Test failed: test 10: expected one result when hints are used for localhost sock.c:5410: Test failed: test 11: expected one result when hints are used for localhost sock.c:5410: Test failed: test 20: expected one result when hints are used for localhost sock.c:5410: Test failed: test 21: expected one result when hints are used for localhost sock.c:5518: Test failed: test 0: expected one result when hints are used for localhost sock.c:5518: Test failed: test 1: expected one result when hints are used for localhost sock.c:5518: Test failed: test 2: expected one result when hints are used for localhost sock.c:5518: Test failed: test 3: expected one result when hints are used for localhost sock.c:5518: Test failed: test 8: expected one result when hints are used for localhost sock.c:5518: Test failed: test 9: expected one result when hints are used for localhost sock.c:5518: Test failed: test 10: expected one result when hints are used for localhost sock.c:5518: Test failed: test 11: expected one result when hints are used for localhost sock.c:5518: Test failed: test 20: expected one result when hints are used for localhost sock.c:5518: Test failed: test 21: expected one result when hints are used for localhost === w2008s64 (32 bit sock) === sock.c:554: Test failed: oob_server (750): unexpectedly at the OOB mark: 0 sock.c:5410: Test failed: test 0: expected one result when hints are used for localhost sock.c:5410: Test failed: test 1: expected one result when hints are used for localhost sock.c:5410: Test failed: test 2: expected one result when hints are used for localhost sock.c:5410: Test failed: test 3: expected one result when hints are used for localhost sock.c:5410: Test failed: test 8: expected one result when hints are used for localhost sock.c:5410: Test failed: test 9: expected one result when hints are used for localhost sock.c:5410: Test failed: test 10: expected one result when hints are used for localhost sock.c:5410: Test failed: test 11: expected one result when hints are used for localhost sock.c:5410: Test failed: test 20: expected one result when hints are used for localhost sock.c:5410: Test failed: test 21: expected one result when hints are used for localhost sock.c:5518: Test failed: test 0: expected one result when hints are used for localhost sock.c:5518: Test failed: test 1: expected one result when hints are used for localhost sock.c:5518: Test failed: test 2: expected one result when hints are used for localhost sock.c:5518: Test failed: test 3: expected one result when hints are used for localhost sock.c:5518: Test failed: test 8: expected one result when hints are used for localhost sock.c:5518: Test failed: test 9: expected one result when hints are used for localhost sock.c:5518: Test failed: test 10: expected one result when hints are used for localhost sock.c:5518: Test failed: test 11: expected one result when hints are used for localhost sock.c:5518: Test failed: test 20: expected one result when hints are used for localhost sock.c:5518: Test failed: test 21: expected one result when hints are used for localhost sock: unhandled exception c0000005 at 00000000 === w7pro64 (32 bit sock) === sock.c:5410: Test failed: test 0: expected one result when hints are used for localhost sock.c:5410: Test failed: test 1: expected one result when hints are used for localhost sock.c:5410: Test failed: test 2: expected one result when hints are used for localhost sock.c:5410: Test failed: test 3: expected one result when hints are used for localhost sock.c:5410: Test failed: test 8: expected one result when hints are used for localhost sock.c:5410: Test failed: test 9: expected one result when hints are used for localhost sock.c:5410: Test failed: test 10: expected one result when hints are used for localhost sock.c:5410: Test failed: test 11: expected one result when hints are used for localhost sock.c:5410: Test failed: test 20: expected one result when hints are used for localhost sock.c:5410: Test failed: test 21: expected one result when hints are used for localhost sock.c:5518: Test failed: test 0: expected one result when hints are used for localhost sock.c:5518: Test failed: test 1: expected one result when hints are used for localhost sock.c:5518: Test failed: test 2: expected one result when hints are used for localhost sock.c:5518: Test failed: test 3: expected one result when hints are used for localhost sock.c:5518: Test failed: test 8: expected one result when hints are used for localhost sock.c:5518: Test failed: test 9: expected one result when hints are used for localhost sock.c:5518: Test failed: test 10: expected one result when hints are used for localhost sock.c:5518: Test failed: test 11: expected one result when hints are used for localhost sock.c:5518: Test failed: test 20: expected one result when hints are used for localhost sock.c:5518: Test failed: test 21: expected one result when hints are used for localhost === w2008s64 (64 bit sock) === sock.c:554: Test failed: oob_server (654): unexpectedly at the OOB mark: 0 sock.c:5410: Test failed: test 0: expected one result when hints are used for localhost sock.c:5410: Test failed: test 1: expected one result when hints are used for localhost sock.c:5410: Test failed: test 2: expected one result when hints are used for localhost sock.c:5410: Test failed: test 3: expected one result when hints are used for localhost sock.c:5410: Test failed: test 8: expected one result when hints are used for localhost sock.c:5410: Test failed: test 9: expected one result when hints are used for localhost sock.c:5410: Test failed: test 10: expected one result when hints are used for localhost sock.c:5410: Test failed: test 11: expected one result when hints are used for localhost sock.c:5410: Test failed: test 20: expected one result when hints are used for localhost sock.c:5410: Test failed: test 21: expected one result when hints are used for localhost sock.c:5518: Test failed: test 0: expected one result when hints are used for localhost sock.c:5518: Test failed: test 1: expected one result when hints are used for localhost sock.c:5518: Test failed: test 2: expected one result when hints are used for localhost sock.c:5518: Test failed: test 3: expected one result when hints are used for localhost sock.c:5518: Test failed: test 8: expected one result when hints are used for localhost sock.c:5518: Test failed: test 9: expected one result when hints are used for localhost sock.c:5518: Test failed: test 10: expected one result when hints are used for localhost sock.c:5518: Test failed: test 11: expected one result when hints are used for localhost sock.c:5518: Test failed: test 20: expected one result when hints are used for localhost sock.c:5518: Test failed: test 21: expected one result when hints are used for localhost sock: unhandled exception c0000005 at 000007FEFE4C9CD9 === w7pro64 (64 bit sock) === sock.c:554: Test failed: oob_server (980): unexpectedly at the OOB mark: 0 sock.c:5410: Test failed: test 0: expected one result when hints are used for localhost sock.c:5410: Test failed: test 1: expected one result when hints are used for localhost sock.c:5410: Test failed: test 2: expected one result when hints are used for localhost sock.c:5410: Test failed: test 3: expected one result when hints are used for localhost sock.c:5410: Test failed: test 8: expected one result when hints are used for localhost sock.c:5410: Test failed: test 9: expected one result when hints are used for localhost sock.c:5410: Test failed: test 10: expected one result when hints are used for localhost sock.c:5410: Test failed: test 11: expected one result when hints are used for localhost sock.c:5410: Test failed: test 20: expected one result when hints are used for localhost sock.c:5410: Test failed: test 21: expected one result when hints are used for localhost sock.c:5518: Test failed: test 0: expected one result when hints are used for localhost sock.c:5518: Test failed: test 1: expected one result when hints are used for localhost sock.c:5518: Test failed: test 2: expected one result when hints are used for localhost sock.c:5518: Test failed: test 3: expected one result when hints are used for localhost sock.c:5518: Test failed: test 8: expected one result when hints are used for localhost sock.c:5518: Test failed: test 9: expected one result when hints are used for localhost sock.c:5518: Test failed: test 10: expected one result when hints are used for localhost sock.c:5518: Test failed: test 11: expected one result when hints are used for localhost sock.c:5518: Test failed: test 20: expected one result when hints are used for localhost sock.c:5518: Test failed: test 21: expected one result when hints are used for localhost

1 0

Re: [3/4] ws2_32: Add extended IPX protocol support (try 2, resend)
by Marvin 31 Dec '13

31 Dec '13

1 0

Re: [PATCH 1/6] qcap: Added IPersistPropertyBag::Load implementation.
by Marvin 30 Dec '13

30 Dec '13

1 0

Re: msrle32: Added tests.
by Marvin 30 Dec '13

30 Dec '13

1 0

Win32_PnPEntity WMI class
by Luke A. Guest 29 Dec '13

29 Dec '13

Hi, Is anybody working on this at the moment? I need this working for bug 35224. If not, what do I need to be looking at to get this to work? I know nothing about this API tbh. Thanks, Luke.

1 1

Help about implementing WSACleanup (ws2_32)
by Bruno Jesus 29 Dec '13

29 Dec '13

Hi, in an attempt to fix bugs 18670 and 26031 I would like to try implementing WSACleanup more properly. My limited knowledge in the interactions between the ws2_32 dll and wine server makes me think this is easy. The idea is to add the created socket in WSASocketW in a list and remove it from the list when closesocket is called. When the last WSACleanup is called it would iterate through the socket list and destroy the remaining sockets. When WSASocketW is called it calls the server to create the socket, when closesocket is called the server is also called and the function sock_destroy takes care of shutting down the socket. Currently I'm thinking about doing this in the dll side because the server is not aware of WSACleanup, but maybe it should because it needs to avoid calling any async operation completion. My questions are: 1) When I open 2 programs that use ws2_32 dll the global variables memory is not shared, right? Otherwise the WSAStartup/Cleanup count could be messed up if one application didn't call the Cleanup function. I hope this true so the socket list would not have to take care of different processes id. I understand that one application can have multiple threads and that's what the struct per_thread_data is about, but I hope the dll is not shared among different processes. 2) Is this a reasonable approach? If yes, is there any example of a critical protected list (add, iterate, remove items) that I could use? Best wishes, Bruno

1 0

Re: [PATCH 2/2] dmusic/tests: Add some COM tests for IDirectMusic/IDirectMusicCollection
by Marvin 28 Dec '13

28 Dec '13

1 0

Re: qedit/tests: Constify some character strings
by Marvin 28 Dec '13

28 Dec '13

1 0

Re: wtsapi32: partial implementation of WTSEnumerateProcessesW (resend)
by André Hentschel 28 Dec '13

28 Dec '13

> diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c > index 898b95d..53c6325 100644 > --- a/dlls/wtsapi32/wtsapi32.c > +++ b/dlls/wtsapi32/wtsapi32.c > @@ -18,9 +18,13 @@ > #include "config.h" > #include <stdarg.h> > #include <stdlib.h> > -#include "windef.h" > -#include "winbase.h" > +#include "ntstatus.h" > +#define WIN32_NO_STATUS > +#include "winternl.h" > #include "wtsapi32.h" > +#include "wine/library.h" > +#include "wine/server.h" > +#include "wine/unicode.h" > #include "wine/debug.h" do you need that all? > WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); > @@ -84,14 +88,65 @@ BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version > BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version, > PWTS_PROCESS_INFOW* ppProcessInfo, DWORD* pCount) > { > - FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, > - ppProcessInfo, pCount); > + SYSTEM_PROCESS_INFORMATION *spi; > + ULONG size = 0x4000; > + void *buf = NULL; > + NTSTATUS status; > + DWORD i,lcount = 0; > + WTS_PROCESS_INFOW *linfo; can't you use sizeof(*spi) or a multiple of it for size? or clean it up somehow else... > if (!ppProcessInfo || !pCount) return FALSE; > > *pCount = 0; > *ppProcessInfo = NULL; > > + if (hServer != WTS_CURRENT_SERVER_HANDLE) > + { > + FIXME("Only WTS_CURRENT_SERVER_HANDLE is impemented\n"); > + return FALSE; > + } > + > + do { > + size *= 2; > + HeapFree(GetProcessHeap(), 0, buf); > + buf = HeapAlloc(GetProcessHeap(), 0, size); > + if (!buf) > + return FALSE; > + > + status = NtQuerySystemInformation(SystemProcessInformation, buf, size, NULL); > + } while(status == STATUS_INFO_LENGTH_MISMATCH); > + > + if (status != STATUS_SUCCESS) > + { > + HeapFree(GetProcessHeap(), 0, buf); > + SetLastError(RtlNtStatusToDosError(status)); > + return FALSE; > + } > + > + spi = buf; why not dropping buf completely? > + do { > + lcount++; > + spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset); > + } while(spi->NextEntryOffset != 0); isn't there an easier way to get the count? > + linfo = HeapAlloc(GetProcessHeap(), 0, lcount * sizeof(WTS_PROCESS_INFOW)); > + if(!linfo) > + return FALSE; > + > + for(i = 0, spi = buf; i < lcount; i++) > + { > + linfo[i].SessionId = 0; > + linfo[i].ProcessId = HandleToUlong(spi->UniqueProcessId); > + linfo[i].pProcessName = spi->ProcessName.Buffer; > + linfo[i].pUserSid = NULL; > + spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset); > + } > + *ppProcessInfo = linfo; > + *pCount = lcount; > + FIXME("pUserSid not filled\n"); > + > + HeapFree(GetProcessHeap(), 0, buf); > return TRUE; > } > > diff --git a/include/wtsapi32.h b/include/wtsapi32.h > index f4bab56..0476478 100644 > --- a/include/wtsapi32.h > +++ b/include/wtsapi32.h > @@ -135,6 +135,8 @@ typedef struct _WTS_SERVER_INFOW > DECL_WINELIB_TYPE_AW(WTS_SERVER_INFO) > DECL_WINELIB_TYPE_AW(PWTS_SERVER_INFO) > > +#define WTS_CURRENT_SERVER_HANDLE NULL > + maybe some more WTS_ defines while you're at it > void WINAPI WTSCloseServer(HANDLE); > BOOL WINAPI WTSConnectSessionA(ULONG, ULONG, PSTR, BOOL); > BOOL WINAPI WTSConnectSessionW(ULONG, ULONG, PWSTR, BOOL); >

2 1

Re: kernel32/tests: add test for RemoveDirectory
by Dmitry Timoshkov 28 Dec '13

28 Dec '13

Zhenbo Li <litimetal(a)gmail.com> wrote: > + /* remove a nonexist directory */ > + rc = RemoveDirectoryA(directory); > + todo_wine > + ok(!rc && GetLastError() == ERROR_FILE_NOT_FOUND, > + "Expected ERROR_FILE_NOT_FOUND, got ret=%d, gle=%d\n", rc, GetLastError() ); This kind of test for several values simultaneously is really very awkward as a starting point for any person who is going to work on this, or just is looking for a simple bug to fix and greps for todo_wine in the tests. First of all it's not clear where the failure is: is it the API failing to return correct return value, or is it just last error which is set differently? I admit that the error message mentions both values, but it's often more useful to spot areas with todo_wine statements and clearly see the reason of a failure without actually running the test. -- Dmitry.

3 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel December 2013