June 2015 - 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

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

Speed of gdi vs opengl DirectDrawRenderer
by Jonas Maebe Oct. 11, 2015

Oct. 11, 2015

Hi, I had a problem with Majesty Gold HD running at glacial speed on my machine (quad Core i5 2.9GHz, NVidia GeForce GT 750M 1GB, OS X 10.9.5). I'm using wine 1.7.35, but I've had similar problems with older wine versions. It's a DirectDraw7 game that has been partially remastered to run on modern systems, but still uses DirectDraw7. This is a common problem on Windows too, but generally can be resolved by telling the game to use the DirectDraw blitter (instead of blitting itself). That didn't help on Wine though. I profiled wine (Instruments time profile) and noticed that most time was spent in wined3d's convert_r5g6b5_x8r8g8b8. Replacing that routine with an optimized sse2 version from pixman did not make much of a difference. Then I discovered that if I told the game to render to a 16 bit instead of to a 32 bit surface, wine would let OpenGL handle the colour conversion. Unfortunately, while this significantly reduced wine's cpu usage, it by no means made the game any faster. Looking at the OpenGL Driver Monitor stats, it seems the cpu was simply waiting all the time on the GPU, probably while it was blitting all of those 1920x1080 images to the screen. Reducing the resolution to the lowest supported by the game (800x600) made it slightly faster, but not much. Next, I added the DirectDrawRenderer registry key and set it to gdi. Now, while it's still slow at 1920x1080, the game runs much faster at 800x600 and even still at 1024x768. Profiling the gdi renderer shows that it has way higher cpu usage than the OpenGL renderer (virtually all in convert_to_8888), but it seems that for some reason it has causes much less traffic to the GPU. The wiki's wording suggests the gdi renderer is deprecated though. Does that mean this qualifies as a bug in the OpenGL renderer (maybe it tries to update the screen more often than necessary, saturating the bus that way?), and are there any things I can try to narrow down why the gdi renderer is so much faster? I didn't immediately see where it blits things actually to the screen. Thanks, Jonas

4 10

Migrating away from Sourceforge
by Austin English Sept. 29, 2015

Sept. 29, 2015

Howdy all, I noticed there was some discussion of this on #winehackers a week or two ago, but I haven't seen any formal discussion about it. Given SourceForge's recent activities [1] [2] with taking over open source projects for their own gain, I propose that we migrate away from SourceForge. The main uses for SourceForge is for mirroring tarballs, wine-gecko/wine-mono installers, and the wine-gecko git repository. @Jeremy, would it be feasible for winehq's (existing) servers to handle the additional load? [1] http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijackin… [2] http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijackin… -- -Austin

14 22

[PATCH] Use asserts for mmap failure modes
by Michael Gilbert July 26, 2015

July 26, 2015

Hi, Using exit in shared libraries is a discouraged practice, and wine's mmap implementation currently does that. I attach a proposed change using asserts instead. Let me know if you have any feedback. Best wishes, Mike (btw I'm the debian wine maintainer)

2 2

wine CPU usage and CreateWaitableTimer
by andrea July 9, 2015

July 9, 2015

Hi, I'm trying to understand why AppleWin uses 100% CPU when running in wine vs ~1% in Windows. my case is wine 1.7.43 vs Windows 7 https://appdb.winehq.org/objectManager.php?sClass=version&iId=29403 https://bugs.winehq.org/show_bug.cgi?id=34945 basically 97% time is spent in a WaitForSingleObject on a semaphore signalled by a DirectSound IReferenceClock via AdvisePeriodic. The timer period is set to 1 millisecond. I have tried an other Windows call to create the timer: CreateWaitableTimer The latter uses about 50% CPU, so it is much better, but still not very good. This is true even on a simple app that does nothing other than waiting for this timer all the time. Does anybody know 1) is this normal? should these waits be almost free like they are in Windows? 2) what is the best implemented timer in wine that can be used for a periodic event (~1ms)? Thanks

3 10

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

July 5, 2015

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

5 6

A wrapper around the GTK+ rendering engine
by Ivan Akulinchev July 2, 2015

July 2, 2015

Hello, I just want to thank you for Wine and show you my own uxtheme.dll implementation, which uses the GTK+ rendering engine. Thus Wine applications look really native for users. Here is the link: https://github.com/akulinchev/uxthemegtk (see the screenshots at the bottom of the page) If you want, I can help you to add it to the Wine code. If not, I will develop it alone as a third-party project, but then I have a question: what is the best way to replace a Wine library? I think, I shouldn't change anything in /usr/lib/wine. I know about "native libs", but it's an ELF binary, not PE. Regards, Ivan

5 8

Re: kernel32: K32EnumProcessModules: Handle NULL pointer gracefully.
by Alex Henrie July 1, 2015

July 1, 2015

> diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c > index f495e81..5461881 100644 > --- a/dlls/kernel32/module.c > +++ b/dlls/kernel32/module.c > @@ -1226,6 +1226,12 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, > if (!init_module_iterator(&iter, process)) > return FALSE; > > + if (!lphModule) > + { > + SetLastError(ERROR_NOACCESS); > + return FALSE; > + } > + > if (!needed) > { > SetLastError(ERROR_NOACCESS); Wouldn't it be easier to write "if (!lphModule || !needed)"? Adding a test or two would also be nice. -Alex

2 1

Re: [PATCH 1/6]: msvcp110: Add tr2_sys__Copy_file implementation and test.
by Piotr Caban July 1, 2015

July 1, 2015

On 06/27/15 19:49, YongHaoHu wrote: > + ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); > + ok(ret == GetLastError(), "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, GetLastError(), ret); > + ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); Please check the return value of the function explicitly. Currently your implementation returns error while it should succeed and it's not visible in the tests. Thanks, Piotr

2 6

Proposal: to make binfmt-misc with wine workable and make Wine compadiblity modes more like Windows compadiblity mode.
by Peter Dolding July 1, 2015

July 1, 2015

For binfmt-misc to be workable a few things need to be known. 1) What version of wine 2) What wineprefix 3) What setting overrides. None of these can be done by environmental vars because binfmt-misc might be directly executing the file. Windows compadiblity mode does not use the registry like wine does. Instead it done in two horible halves. Half 1. The application manifest file. The mainfest file may be embedded in the .exe file or be .exe.mainfest https://msdn.microsoft.com/en-us/library/windows/desktop/hh848036%28v=vs.85… Yes this is where you set what version of Windows application was designed to run with. So running XP mode on Windows 7 is here. Half 2. Application Compatilibity Database This is where it gets horible using shims on particular executables to make broken executables work. Also when this gets too large starts slowing windows down as it searching the database to make applications work. Yes reason some old applications don't work with Windows 10 that worked with 7 is that their entries were deleted from this database. To solve the problem I think we could get away with just Half the manifest can include library overrides and some windows configuration tweaks. But we have problems the include library information wine needs because of native and built-in libraries. Due to the fact wine is running on Linux and other OS's some of the configuration tweaks are going to be wine dependant. So we need another schema. http://wiki.winehq.org/UsefulRegistryKeys Because if Microsoft manifest would tolerate alien schema really everything under software\wine\appdefaults could be moved from the registry to the manifest. Advantage 1 this can be write protected per application and second advantage possibility of embedding in the exe itself. Also for binfmt-misc support have in the schema the means to record wineprefix and wine to use. So the program starting wine applications by binfmt-misc looks for either a mainfest or a winemainfest file in the same directory as the exe to see what wine environment the application should be running with. If there is no configured environment possibly ask user what wineprefix they do what to run the application with. What I do not know is if Microsoft application manifest file will tolerate an alien schema. Don't have different versions of Windows to test if Microsoft application manifest with a alien schema parts works or just causes windows to throw error or just results in the manifest being complete ignored. Now if Microsoft application manifest will not tolerate alien I have to ask would creating own own like exe.winemainfest be acceptable. I do hope Microsoft application manifest will tolerate alien because it would be really useful to have applications with a manifest a values saying what versions of wine they were tested with by the maker. Currently there is no way for a application vendor to record in the application they tested with wine. A lot of ways putting what shim modifications the application need in the manifest would also remove having to look up a huge database. Getting binfmt-misc working also will remove having to use setcap on wineloader instead of the .exe. Also would make if someone set a capicapity limitation by logind not break every wine application just because a few application where needing privileged operation.. So this alteration would be getting closer to how Windows does stuff and in the process making Linux integration better. Peter Dolding

4 7

Re: windowscodecs: Fix build failure on OSX.
by Austin English June 30, 2015

June 30, 2015

On Tue, Jun 30, 2015 at 2:02 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > The build failure unfortunately was introduced by my last patch > http://source.winehq.org/git/wine.git/commit/863f432a7d73b8b480a742fcbaf01d… > > Somehow I missed that this part is OSX specific and tested on Linux only - sorry for > the trouble. :/ The patch was tested by jam__ on IRC, would be nice if someone could > double check that no other warnings were introduced by my original commit. > > --- > dlls/windowscodecs/icnsformat.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c > index 54c7707..5d48a1a 100644 > --- a/dlls/windowscodecs/icnsformat.c > +++ b/dlls/windowscodecs/icnsformat.c > @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) > if (This->icns_image != NULL) > HeapFree(GetProcessHeap(), 0, This->icns_image); > > - IWICBitmapFrameEncode_Release(&This->encoder->IWICBitmapFrameEncode_iface); > + IWICBitmapEncoder_Release(&This->encoder->IWICBitmapEncoder_iface); > HeapFree(GetProcessHeap(), 0, This); > } > > -- > 2.4.4 > > With your patch applied, the build is fixed for me. There are 5 warnings, but they're unrelated to your patch (deprecated warnings): Austins-Mac-mini:windowscodecs austin$ make gcc -m32 -c -o icnsformat.o icnsformat.c -I. -I../../include -I/opt/local/include/libpng16 -D__WINESRC__ \ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body \ -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings -Wpointer-arith \ -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -I/usr/X11/include -I/opt/local/include \ -I/usr/local/include -g -O2 icnsformat.c:430:11: warning: 'PtrToHand' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] ret = PtrToHand(This->icns_image, &handle, This->size * This->size * 4); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1772:1: note: 'PtrToHand' has been explicitly marked deprecated here PtrToHand( ^ icnsformat.c:439:5: warning: 'DisposeHandle' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] DisposeHandle(handle); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1278:1: note: 'DisposeHandle' has been explicitly marked deprecated here DisposeHandle(Handle h) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ icnsformat.c:526:13: warning: 'DisposeHandle' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] DisposeHandle((Handle)This->icns_family); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1278:1: note: 'DisposeHandle' has been explicitly marked deprecated here DisposeHandle(Handle h) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ icnsformat.c:550:43: warning: 'NewHandle' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] This->icns_family = (IconFamilyHandle)NewHandle(0); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:451:1: note: 'NewHandle' has been explicitly marked deprecated here NewHandle(Size byteCount) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ icnsformat.c:667:19: warning: 'GetHandleSize' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] buffer_size = GetHandleSize((Handle)This->icns_family); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1356:1: note: 'GetHandleSize' has been explicitly marked deprecated here GetHandleSize(Handle h) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ 5 warnings generated. -- -Austin

1 0

Re: odbccp32: Implement SQLGetPrivateProfileString (try 6 - resend)
by Nikolay Sivov June 30, 2015

June 30, 2015

> + sect = heap_strdupAtoW(lpszSection); > + entry = heap_strdupAtoW(lpszEntry); > + string = heap_strdupAtoW(lpszDefault); > + file = heap_strdupAtoW(lpszFilename); > + retval = heap_alloc(cbRetBuffer*sizeof(WCHAR)); > + > + ret = SQLGetPrivateProfileStringW(sect, entry, string, retval, cbRetBuffer, file); > + if(ret) > + { > + WideCharToMultiByte(CP_ACP, 0, retval, -1, RetBuffer, ret+1, NULL, NULL); > + } > + > + heap_free(sect); > + heap_free(entry); > + heap_free(string); > + heap_free(file); > + > + heap_free(retval); I think it's still the same issue as last time - you're using WCHAR vs CHAR buffer lengths wrong, it might work for this function as long as it's always called with simple strings. But in general WideCharToMultiByte should not be used like that: 'cbRetBuffer' you got here is A-buffer length, yet you allocate W-buffer of this length. Later when you convert W->A you use return value from W-call as A-buffer length.

1 0

Re: d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs (try 2)
by Matteo Bruni June 30, 2015

June 30, 2015

2015-06-30 11:01 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > Removed #if > Corrected FIXME to be consistent with the reset of the file. > > Changelog: > d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs > > > Best Regards > Alistair Leslie-Hughes I guess it's good enough for me. For your following patches: avoid LPxxx types, watch your whitespaces, no need to manually add '\n' in the middle of trace strings.

1 0

Re: [PATCH 0/8] advapi32: Fail on missing value or val_count parameters. (was advapi32: Fix RegEnumValueW when enumerating long values)
by Nikolay Sivov June 30, 2015

June 30, 2015

On 30.06.2015 15:37, Bernhard Übelacker wrote: > Bug #38796: > RegEnumValue currently returns wrong minimum expected data_count when called without proper > value or val_count when the retrieved data (+overhead) exceeds the fixed buffer > variable in RegEnumValue. > > This series of patches does following: > - Add tests to cover calls to RegEnumValue without proper value and val_count parameters. > I think it's better to have tests committed first and change all other places after that.

1 0

Re: [PATCH 4/6]: msvcp110: Add tr2_sys__Stat implementation and test.
by Piotr Caban June 30, 2015

June 30, 2015

On 06/27/15 19:50, YongHaoHu wrote: > +static file_type stat_set_error(int *err_code) > +{ > + file_type ret; > + *err_code = ERROR_SUCCESS; > + > + switch(GetLastError()) { > + case ERROR_FILE_NOT_FOUND: > + case ERROR_BAD_NETPATH: > + case ERROR_INVALID_NAME: > + case ERROR_BAD_PATHNAME: > + case ERROR_PATH_NOT_FOUND: > + ret = file_not_found; > + break; > + case ERROR_BAD_DEV_TYPE: > + ret = regular_file; > + break; > + default: > + ret = status_unknown; Shouldn't err_code be set to GetLastError in default case? You end up setting it to ERROR_SUCCESS in every case except if path is NULL. Why are you handling ERROR_BAD_DEV_TYPE error here? > + TRACE("(%s %p)\n", debugstr_a(path), err_code); > + DWORD attr; This will produce a compilation warning. Cheers, Piotr

2 4

Re: ntdll: Randomize security cookie when available (try 4)
by Alexandre Julliard June 30, 2015

June 30, 2015

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -1278,6 +1281,26 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz > } > } > > + > + /* randomize security cookie */ > + > + if (IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG < nt->OptionalHeader.NumberOfRvaAndSizes && > + (pos = nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress)) > + { > + IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg = (IMAGE_LOAD_CONFIG_DIRECTORY *)(ptr + pos); > + ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie; > + struct timeval tv; > + > + gettimeofday( &tv, NULL ); > + srand( tv.tv_usec * getpid() ); > + *cookie = rand(); That's not much better. It doesn't make sense to reset the seed on every call. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH]winecfg: Double click in dlls list to edit overides. (try 4)
by Nikolay Sivov June 30, 2015

June 30, 2015

On 29.06.2015 12:35, Hao Peng wrote: > Add a feature to winecfg. User can double click in dlls list to edit > overides of selected item. > > superseded all earlier patches. > > --- > programs/winecfg/libraries.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > + case CBN_DBLCLK: > + if (LOWORD(wParam) == IDC_DLLS_LIST) > + { > + int index; > + POINT p; > + if (GetCursorPos(&p) && ScreenToClient((HWND)lParam, &p)) > + { > + index = SendDlgItemMessageW(hDlg, IDC_DLLS_LIST, > + LB_ITEMFROMPOINT, 0, MAKELPARAM(p.x, p.y)); > + if (!HIWORD(index)) > + on_edit_click(hDlg); > + } > + } > + break; Correct me if I'm wrong, but I don't think you get CBN_DBLCLK unless clicked on an item. Quick test with ControlSpy on Windows confirms that. And by the time you get CBN_DBLCLK something is always selected I think, which makes all that cursor complexity redundant.

2 2

Re: winedbg: Add be_xpoint_FAIL=-1 to enum be_xpoint_type.
by Michael Stefaniuc June 30, 2015

June 30, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Thanks Gerald, On 06/30/2015 01:12 AM, Gerald Pfeifer wrote: > This replaces my original submission with a different approach. > > Recall this is about clang 3.4.1 complaining as follows: > > gdbproxy.c:2147:23: warning: comparison of constant -1 with > expression of type 'enum be_xpoint_type' is always false > > In my original submission I noted that "I see two ways to address > this: adding a dummy set to -1 to the enum, or casting the enum to > int before comparing against -1". > > Michael kindly provided feeback to go with the former approach. > This patch does that. (Thanks, Michael!) but can you please change the magic -1 to be_xpoint_FAIL too? > > Gerald --- programs/winedbg/be_cpu.h | 2 +- 1 file changed, 1 > insertion(+), 1 deletion(-) > > diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h > index 889f638..c95ed7c 100644 --- a/programs/winedbg/be_cpu.h +++ > b/programs/winedbg/be_cpu.h @@ -20,7 +20,7 @@ > > enum be_cpu_addr {be_cpu_addr_pc, be_cpu_addr_stack, > be_cpu_addr_frame}; enum be_xpoint_type {be_xpoint_break, > be_xpoint_watch_exec, be_xpoint_watch_read, - > be_xpoint_watch_write}; + > be_xpoint_watch_write, be_xpoint_FAIL=-1}; I'd rather have be_xpoint_FAIL as first element in the enum. > struct backend_cpu { const DWORD machine; bye michael -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iD8DBQFVklO10ei8kcpE1VERAnKJAKCDf9tLHh2u4/mHPqdwjXTB/ol8MACcDQOx 1UIk4kBN8htbqwT0Wi3z5bo= =M6XR -----END PGP SIGNATURE-----

1 0

Re: [4/14]hid: Implement HidP_GetCaps
by Alexandre Julliard June 30, 2015

June 30, 2015

Aric Stewart <aric(a)codeweavers.com> writes: > --- /dev/null > +++ b/include/wine/hid.h > @@ -0,0 +1,80 @@ > +/* > + * Wine internal HID structures > + * You shouldn't need a global header for internal structures. -- Alexandre Julliard julliard(a)winehq.org

5 7

Re: new patch
by Marvin June 30, 2015

June 30, 2015

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

1 0

Re: [3/4] shell32: Release shell folders obtained via IFolderView_GetFolder.
by Matteo Bruni June 29, 2015

June 29, 2015

2015-06-29 23:10 GMT+02:00 Thomas Faber <thomas.faber(a)reactos.org>: > As a consequence of the previous patch, Wine now leaks shell folder > references after calling GetFolder. This fixes the call sites to > release them. I think it would be better to merge this with the previous patch, to avoid the temporary regression.

1 0

Re: [4/4] shell32/tests: Remove a misleading test.
by Nikolay Sivov June 29, 2015

June 29, 2015

Whole series looks good to me, thanks for working on this. On 30.06.2015 0:57, Thomas Faber wrote: > This removes the aforementioned test. Yes, this test was my doing. I guess I misinterpreted results, and static desktop impl hid the issue. By the way, regarding GetFolder(), msdn says that IShellItemArray is also supported, we probably can easily get away be using SHCreateShellItemArray; but that is a separate thing of course, that deserves its own patch and tests.

1 0

Re: d3dx9_36 [try 2]: Save multiplications and divisions to improve performance
by Matteo Bruni June 29, 2015

June 29, 2015

2015-06-25 23:45 GMT+02:00 David Adam <david.adam.cnrs(a)gmail.com>: > Hi, > > I added a test with 65000 sides. All the test pass with a native d3dx9_36 > dll. You should have mentioned that the new test doesn't pass with the previous implementation, which is what makes this patch really convincing. So this patch is okay to me. Also notice that this in practice doesn't save any multiplication in the loop, at least with my version of GCC: the multiplication 2.0f * D3DX_PI was precalculated at compile time. A better patch title mentioning D3DXCreatePolygon would be nice. The tests generally have some room for improvement. As a followup it would be nice to try and improve them, maybe by replacing the comparison function with one which allows for a relative error and makes it possible to choose a potentially different error value for each test (to be able to lower those as much as possible). I would like to point you to some other place in Wine where the float comparison is done right but, on the spot, I only found relative_error + expect_color macros from d3dx9_36/tests/math.c which are really ugly. FWIW https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbe… seems to be a good read on the subject.

1 0

Re: d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs
by Matteo Bruni June 29, 2015

June 29, 2015

2015-06-27 8:41 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > These functions are only supported with d3dcompiler version 46 and above. > > Changelog: > d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs > > > Best Regards > Alistair Leslie-Hughes I don't think you need to encompass the function definitions in an #if D3D_COMPILER_VERSION since they won't be exported anyway by the spec files for version < 46. Can you use a format like the one used in D3DCompile() for the tracing of function parameters in the FIXME?

1 0

Re: d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 9 resend).
by Marvin June 29, 2015

June 29, 2015

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

1 0

Re: d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromSurface (try 7 resend).
by Marvin June 29, 2015

June 29, 2015

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

1 0

Re: d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 9).
by Marvin June 29, 2015

June 29, 2015

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

1 0

Wiki is down
by Rosanne DiMesio June 29, 2015

June 29, 2015

Http://wiki.winehq.org leads to a bluehost.com page that says "There is no website configured at this address" and links to specific wiki pages produce 404: File not found. -- Rosanne DiMesio <dimesio(a)earthlink.net>

4 3

Re: [PATCH 3/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 8).
by Stefan Dösinger June 29, 2015

June 29, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-06-28 um 11:14 schrieb Aaryaman Vasishta: > + if (FAILED(IDirectDraw2_CreateSurface(ddraw, &surface_desc, ds, NULL))) > + continue; > + > + hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds); > + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); > + if (FAILED(hr)) > + continue; You're leaking the depth surface in this case. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVkUYtAAoJEN0/YqbEcdMwCt4P/09yNvjELjIyH5T/5HRdUWm4 LoJLtK/OhmlwdaHCvsShqImde4IjszHm/wzL7sIokNxXJ9zDOvmFPjQ+8jcyBJoG ZPNGB7o2QT1RqVhgXRBJkAGWkrG7Pwd6oTShibKmbxySsTVuol62hcjqSZkZshCz 6iO/9MwhzW1KdpHrVGbXcKAQZzPg8rsqDb+97k5350FYdJFFd0935WOCUiNfHOuu iqAm6V3sJbcQ3SBxJN5l2vPLG2m4j40307fEFNJor9jOkFOGv9RnxzGCp2O+gUcV h6n6l/bmznT/lVl4IedUFYkxIQUgdGIMoUXZfgs5MZZYhuaUrR9XxeNlv7oJrcVQ i1fp3pjEQldw7X4KQXqlwzOn7CvVZTtSqH4D4Glyn/3rHFD0V9fIWINg6Fj/Nd73 fZf8TAHM45WqQ+9ueVmnaYGdkUhN0bq8JDE2QfCKUfXNIOC8j5vLgJ7NC5YhC7xc WtOAsXxF7RRVmbQbfMUYOWJcMWR9XUbTNGyWQhWsiWx92rz3n1m7C3e+K9fp2F2P Eybs30FWbPuKuBxvEy0Ws1bA1xY+my1iD/mQN4YEc1aet2X/YpZ4EqYSWOzwKLM/ FuAchmQFwo7Hyr+9nrAc47441ENMBdQQ/dpAS90wGy/uQPJURj08LFt3EWDjXy/O bkMhBscSpcPpizrksvna =U/er -----END PGP SIGNATURE-----

1 0

Re: vbscript: Treat empty regexp pattern the same way as NULL pattern.
by Marvin June 29, 2015

June 29, 2015

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

1 0

Re: [1/2] user32/tests: Add some tests to show that WS_CLIPCHILDREN doesn't exclude children from update region.
by Marvin June 29, 2015

June 29, 2015

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=14817 Your paranoid android. === wvistau64 (64 bit msg) === msg.c:10561: Test failed: expected PeekMessage to return FALSE, got 1

1 0

Re: [1/2] qcap: Distinguish interface and implementation pointer for VfwCapture output pin.
by Nikolay Sivov June 29, 2015

June 29, 2015

On 29.06.2015 9:08, Sebastian Lackner wrote: > - BasePin *pin; > + VfwPinImpl *pin; > > TRACE("destroying everything\n"); > if (This->init) > @@ -226,10 +236,10 @@ static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) > qcap_driver_stop(This->driver_info, &This->filter.state); > qcap_driver_destroy(This->driver_info); > } > - pin = (BasePin*) This->pOutputPin; > - if (pin->pConnectedTo != NULL) > + pin = impl_from_IPin(This->pOutputPin); > + if (pin->pin.pin.pConnectedTo != NULL) > { > - IPin_Disconnect(pin->pConnectedTo); > + IPin_Disconnect(pin->pin.pin.pConnectedTo); This is not better than it is now, 'pOutputPin' is IPin* so you should be using public methods. > if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) > - *ppv = This; > + *ppv = &This->pin.pin.IPin_iface; This could as well say 'iface'.

2 3

Re: [PATCH 2/6]: msvcp110: Add tr2_sys__Rename implementation and test.
by Piotr Caban June 29, 2015

June 29, 2015

On 06/27/15 19:50, YongHaoHu wrote: > + ok(GetFileInformationByHandle(h2, &info2), "GetFileInformationByHandle failed\n"); > + CloseHandle(h2); > + ok(info1.nFileIndexHigh == info2.nFileIndexHigh > + && info1.nFileIndexLow == info2.nFileIndexLow, > + "test_tr2_sys__Rename(): test %d expect two files equivalent\n", i+1); This test is not working when run from VirtualBox share. Could you please run the tests inside temp directroy? Thanks, Piotr

1 0

Re: [1/2] qcap: Distinguish interface and implementation pointer for VfwCapture output pin.
by Michael Stefaniuc June 29, 2015

June 29, 2015

On 06/29/2015 08:08 AM, Sebastian Lackner wrote: > --- dlls/qcap/vfwcapture.c | 42 > ++++++++++++++++++++++++++---------------- 1 file changed, 26 > insertions(+), 16 deletions(-) > > diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index > 7804a3d..31620c0 100644 --- a/dlls/qcap/vfwcapture.c +++ > b/dlls/qcap/vfwcapture.c @@ -557,7 +567,7 @@ PPB_Load( > IPersistPropertyBag * iface, IPropertyBag *pPropBag, > var.__VARIANT_NAME_1.__VARIANT_NAME_2.__VARIANT_NAME_3.ulVal ); if > (This->driver_info) { - pin = (VfwPinImpl > *)This->pOutputPin; + pin = > impl_from_IPin(This->pOutputPin); impl_from_IFoo() is just for the interface pointer of a method. For internal stuff the object pointer should be passed or stored instead. For application provided interface pointers an unsafe_impl_from_IFoo() should be used. bye michael

1 0

Re: qmgr: Fix WINHTTP_OPTION_CONTEXT_VALUE data pointer (Coverity)
by Hans Leidekker June 29, 2015

June 29, 2015

> On 27 Jun 2015, at 09:57, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > Hans, does it look right? Yes, thanks.

1 0

Re: [2/2] windowscodecs: Distinguish interface and implementation pointer for IcnsEncoder.
by Nikolay Sivov June 29, 2015

June 29, 2015

On 29.06.2015 9:08, Sebastian Lackner wrote: > --- > dlls/windowscodecs/icnsformat.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c > index 5ce44a2..3f24e91 100644 > --- a/dlls/windowscodecs/icnsformat.c > +++ b/dlls/windowscodecs/icnsformat.c > @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) > if (This->icns_image != NULL) > HeapFree(GetProcessHeap(), 0, This->icns_image); > > - IUnknown_Release((IUnknown*)This->encoder); > + IUnknown_Release(&This->encoder->IWICBitmapFrameEncode_iface); > HeapFree(GetProcessHeap(), 0, This); > } > > @@ -489,7 +489,7 @@ static HRESULT WINAPI IcnsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFII > if (IsEqualIID(&IID_IUnknown, iid) || > IsEqualIID(&IID_IWICBitmapEncoder, iid)) > { > - *ppv = This; > + *ppv = &This->IWICBitmapEncoder_iface; > } > else > { > @@ -639,7 +639,7 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, > frameEncode->committed = FALSE; > *ppIFrameEncode = &frameEncode->IWICBitmapFrameEncode_iface; > This->outstanding_commits++; > - IUnknown_AddRef((IUnknown*)This); > + IUnknown_AddRef(&This->IWICBitmapEncoder_iface); > > end: > LeaveCriticalSection(&This->lock); > @@ -725,8 +725,8 @@ HRESULT IcnsEncoder_CreateInstance(REFIID iid, void** ppv) > InitializeCriticalSection(&This->lock); > This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IcnsEncoder.lock"); > > - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); > - IUnknown_Release((IUnknown*)This); > + ret = IUnknown_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); > + IUnknown_Release(&This->IWICBitmapEncoder_iface); > > return ret; > } > Please use proper wrappers for that.

1 0

Re: [PATCH 1/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper (unmodified resend).
by Stefan Dösinger June 28, 2015

June 28, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Here's something for future reference. I believe Henri mentioned the same thing for a different place already. I don't think a resend is necessary for this, you can fix this when you add this test for d3drm1 and d3drm3. Am 2015-06-27 um 18:38 schrieb Aaryaman Vasishta: > + hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper); > + ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr); > + if (SUCCEEDED(hr)) > + { > + ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper); > + IDirectDrawClipper_Release(d3drm_clipper); > + } You don't really need the if (SUCCEEDED(hr)) here. You're unconditionally expecting GetClipper to return a clipper in the ok() line above. If it doesn't return one the test already failed, and there's no need to bother about preventing follow-up failures or crashes. (Yeah, we have many instances in the code of things like these, e.g. if (SUCCEEDED(hr)) after BeginScene / EndScene. They should ideally be fixe d.) > + if (d3drm_primary) > + IDirectDrawSurface_Release(d3drm_primary); Same thing here. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVj5yEAAoJEN0/YqbEcdMwi+oP/0uFOap9QRVWMILPN/PrupVO g3IR6KBx+QNf/mzkOEyP6rQVbZx0UUlHlQ16v0ftziediL73qpQfRKSIxf135THH ji6+DK0xHUvBNSz6XDSZjDky/cTtnTO0IRdRqZlL4Cd+y46GF04hwoiuIijnx1Fd +AHurqTvEBgYepc+oEPgQRh2q/OApxUs3kMTPXzK9rPIp2SKZwpcJ8NMkYhaGMRC FXEOq/lfaanQbgQdcPqavMgHBDCOR9xvhgSsPktUlCtltsrNJ/1INyRHHfbt8F1k Yg5yfXdxvaThkWy5pNlAeatPZFhYzJIiyECvol7MXymHSP4zMDlF+WoG9V21fHOR aYCA5lplQY3P7+0r0Nv7rQgtqWoo/mx6ntgm3Etl7MBKV5+ED8RNVPCWCkBV4j/y EXWJe8RLj+a0pHIA+sTop0Yym+F00/6SPH6sJcHnqqSo1W34FFnpzH5ddV3oNst0 8fVjYNLyQwdo9k2z5DVf1ZJQk87dk3Rg6bzZpofwhOd3NEmNr1f8kMDLCYNbs5GK jr1QdyLtFCpxoqqDu1iE2174SZgECXkDU6DJQE99BVtNs9QcIx9pqNXmHbLXXDyX akHSKWeDQrZpMOSZI/XZxlXhhVdxeGRJGdkZmzr4H1Qpu4kHA5OgOaXBGVRIoUNg ii/ChTzxObM40BdpuaH+ =5Y9W -----END PGP SIGNATURE-----

1 0

Re: [PATCH 3/6]: msvcp110: Add tr2_sys__Statvfs implementation and test.
by Nikolay Sivov June 28, 2015

June 28, 2015

On 27.06.2015 20:50, YongHaoHu wrote: > +typedef struct { > + ULONGLONG capacity; > + ULONGLONG free; > + ULONGLONG available; > +} space_info; > + Is this documented somewhere? > + info.capacity = ((ULONGLONG)(total.HighPart)<< 32) + total.LowPart; > + info.free = ((ULONGLONG)(free.HighPart)<< 32) + free.LowPart; > + info.available = ((ULONGLONG)(available.HighPart)<< 32) + available.LowPart; I don't think you'll need this if you used QuadPart.

2 1

Re: [PATCH 3/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 7).
by Stefan Dösinger June 27, 2015

June 27, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-06-27 um 18:38 schrieb Aaryaman Vasishta: > +static IDirect3DDevice2 *create_device(IDirectDraw2 *ddraw, HWND window, IDirectDrawSurface **ds) > ... > + if (FAILED(IDirectDraw2_CreateSurface(ddraw, &surface_desc, ds, NULL))) > + continue; > + > + hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds); > + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); > + IDirectDrawSurface_Release(*ds); should release the depth stencil surface in the success case because you're passing it out of the function. The other patches are OK. I'll ack them on monday on IRC, including a fixed version of patch 3 if it is on wine-patches by then. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVjwwxAAoJEN0/YqbEcdMwz+sP/1+Lme2ItbNjmvKnCwtSWdul tcMr9DkNrjkyUMsM1Glzgoll5XphGRj+4M6ZnPTrLU5i4qlZ8w6MWm8kkrQK3h12 KWhfYEhWBahqBTDva7dulThM6TvzHrvq7pK8ObfmDdWlchhv4Y89hksSIlIdGUD8 7QuEx7EvcutcEnaNFZI5yCtOGEvUNAK4GYzFPWYNnFjDpgq7567TBh5oXdFkyQsT 3wKOf8Uxt5O9/2f5E+7cYyOLC+BR6YM4uGarnma2eqQIzTUOXySm7UYA0gJ3KRw6 9OtzWUyIPw5Iz2CkVkP5M5o9srtkSVungsCg6aQSQIcbGaedvhu9K0G4fFJxVqWJ zmntVVp4yQzP+yov9NHEYOvX1rAkO9V3RudeVfe2sytxHNYYC7hwTR8lXLaM0WF6 fbWx32k8+6o0JP02PgkZFHBhlYZLN5a1deYFTpUFsW0YhUKNrRXAwV9MuVMihreC MmNbnE7DnnrX/vYkxh6MHAnkCFM6/uMy9M8jvTEuzpr0mhCfjn50mbv/lgUK3WiV leUda/RCBmfiM4YPJkhV3qytikRL5EPouB5LcvCR7xjpKT83TBnKOphCRgLPVBrR 2uuJ5orV8M+V9g67zXYibkaeh3yBr8w8vuvTz/L638zkdjshJJmQ/L/51FL0t9Qk 1FEipapwnAjq4NOKJvJi =+VK0 -----END PGP SIGNATURE-----

1 0

Re: user32: Limit number of hooks called recursively.
by Marvin June 26, 2015

June 26, 2015

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=14749 Your paranoid android. === wvistau64 (64 bit msg) === msg.c:10595: Test failed: expected PeekMessage to return FALSE, got 1

1 0

Re: [PATCH] msvcp90: Implement time_get<char> ctors and dtors
by Piotr Caban June 26, 2015

June 26, 2015

On 06/26/15 16:51, Daniel Lehman wrote: > + days = _Locinfo__Getdays((_Locinfo *)locinfo); Could you please change _Locinfo__Getdays header and make the cast there? Thanks to it we will much _Locinfo__Getdays mangled name. Also _Locinfo__W_Getmonths, _Locinfo__Getmonths and _Locinfo__W_Getdays header needs to be fixed. This will make this cast not needed. > + len = strlen(days)+1; > + this->days = MSVCRT_operator_new(len); > + if(this->days) Please handle allocation failures as it's done in other locale classes. > time_get_char* __thiscall time_get_char_ctor_locinfo(time_get_char *this, > const _Locinfo *locinfo, unsigned int refs) > { > - FIXME("(%p %p %d) stub\n", this, locinfo, refs); > + TRACE("(%p %p %d)\n", this, locinfo, refs); > + locale_facet_ctor_refs(&this->facet, refs); > this->facet.vtable = &MSVCP_time_get_char_vtable; > + time_get_char__Init(this, locinfo); > return NULL; > } You forgot to return THIS here. Thanks, Piotr

2 2

Re: [PATCH 2/2] msvcp90: Copy name in _Getctype (Valgrind) (try2)
by Piotr Caban June 26, 2015

June 26, 2015

On 06/24/15 16:46, Daniel Lehman wrote: > + name = ___lc_locale_name_func()[LC_COLLATE]; > + size = wcslen(name)+1; > + ret->name = malloc(size*sizeof(*name)); > + if (!ret->name) throw_exception(EXCEPTION_BAD_ALLOC, NULL); > + memcpy(ret->name, name, size*sizeof(*name)); This will not work if ___lc_locale_name_func()[LC_COLLATE] is NULL. Thanks, Piotr

2 2

Re: [PATCH 2/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromSurface (try 6).
by Stefan Dösinger June 26, 2015

June 26, 2015

Hi, > + ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); Style-only issue: You're just checking one flag here, so ok(dwCaps & ZBUFFER, "..."); is enough > + IDirectDrawSurface_Release(surface); > + > + memset(&desc, 0, sizeof(desc)); > + desc.dwSize = sizeof(desc); > + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; > + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; > + desc.dwWidth = rc.right; > + desc.dwHeight = rc.bottom; > + > + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); > + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); Minor issue: I don't think there's a reason to destroy and recreate the surface. > + IDirectDrawSurface_Release(d3drm_ds); > + IDirectDrawSurface_Release(d3drm_surface); > + IDirectDrawSurface_Release(ds); What happens to the depth buffer here? Does it remain attached? Stefan

2 3

Re: [PATCH 3/4] dmband: Remove the extraneous IUnknown from DMBandTrack
by Jacek Caban June 26, 2015

June 26, 2015

Hi Michael, On 06/26/15 00:18, Michael Stefaniuc wrote: > @@ -97,22 +41,47 @@ static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr > } > > static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, > - void **ppobj) > + void **ret_iface) > { > IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); > - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); > + > + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack) || > + IsEqualIID(riid, &IID_IDirectMusicTrack8)) > + *ret_iface = iface; > + else if (IsEqualIID(riid, &IID_IPersistStream)) > + *ret_iface = &This->PersistStreamVtbl; > + else { > + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); > + return E_NOINTERFACE; > + } The patch is obviously fine and the problem exists in current code, but QI is supposed to set output interface on error and such assumption is common for callers. It would be nice to fix that when you rewrite QI ;) Cheers, Jacek

2 1

Re: [2/14]hid: break HidD_ functions out into their own module
by Charles Davis June 26, 2015

June 26, 2015

> On Jun 25, 2015, at 9:15 AM, Aric Stewart <aric(a)codeweavers.com> wrote: > --- a/dlls/hid/main.c > +++ b/dlls/hid/main.c > @@ -39,43 +35,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) > { > switch(fdwReason) > { > - case DLL_WINE_PREATTACH: > - return FALSE; /* prefer native version */ This is minor, but I don’t think we should prefer the builtin hid.dll until we’re done implementing it. Chip

2 1

Re: [1/14]include: add ddk/hidclass.h
by Charles Davis June 26, 2015

June 26, 2015

> On Jun 25, 2015, at 9:15 AM, Aric Stewart <aric(a)codeweavers.com> wrote: > @@ -0,0 +1,63 @@ […] > +#ifndef __HIDCLASS_H > +#define __HIDCLASS_H […] > +DEFINE_GUID (GUID_DEVINTERFACE_HID, \ > + 0x4D1E55B2L, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30); Correct me if I’m wrong, but I think this should go outside the header guard. That way, you can usefully include this definition multiple times, and one of those times you can define INITGUID to get a real definition. Chip

1 0

Re: [PATCH 1/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper (try 6).
by Stefan Dösinger June 25, 2015

June 25, 2015

Hi, This patch looks good to me. Stefan > Am 25.06.2015 um 22:42 schrieb Aaryaman Vasishta <jem456.vasishta(a)gmail.com>: > > --- > dlls/d3drm/tests/d3drm.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 202 insertions(+) > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 5dcfddc..666150f 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1947,6 +1947,207 @@ static void test_frame_qi(void) > IDirect3DRM_Release(d3drm1); > } > > +static HRESULT CALLBACK surface_callback(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) > +{ > + IDirectDrawSurface **primary = context; > + > + if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) > + { > + *primary = surface; > + return DDENUMRET_CANCEL; > + } > + IDirectDrawSurface_Release(surface); > + > + return DDENUMRET_OK; > +} > + > +static void test_create_device_from_clipper(void) > +{ > + DDSCAPS caps = { DDSCAPS_ZBUFFER }; > + IDirect3DRM *d3drm1 = NULL; > + IDirect3DRM2 *d3drm2 = NULL; > + IDirectDraw *ddraw = NULL; > + IUnknown *unknown = NULL; > + IDirect3DRMDevice2 *device2 = NULL; > + IDirect3DDevice2 *d3ddevice2 = NULL; > + IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL; > + IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL; > + IDirectDrawSurface7 *surface7 = NULL; > + DDSURFACEDESC desc, surface_desc; > + DWORD expected_flags; > + HWND window; > + GUID driver = IID_IDirect3DRGBDevice; > + HRESULT hr; > + ULONG ref1, ref2, ref3, cref1, cref2; > + RECT rc; > + > + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 500, 400, 0, 0, 0, 0); > + GetClientRect(window, &rc); > + hr = DirectDrawCreateClipper(0, &clipper, NULL); > + ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr); > + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); > + ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr); > + > + hr = Direct3DRMCreate(&d3drm1); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); > + ref1 = get_refcount((IUnknown *)d3drm1); > + cref1 = get_refcount((IUnknown *)clipper); > + > + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); > + ref2 = get_refcount((IUnknown *)d3drm2); > + > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 0, 0, &device2); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); > + > + /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */ > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 0, 0, &device2); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); > + > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2); > + ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); > + ref3 = get_refcount((IUnknown *)d3drm1); > + todo_wine ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); > + ref3 = get_refcount((IUnknown *)d3drm2); > + ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); > + cref2 = get_refcount((IUnknown *)clipper); > + todo_wine ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2); > + > + /* Fetch immediate mode device in order to access render target */ > + hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); > + todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); > + if (FAILED(hr)) > + goto cleanup; > + > + hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > + ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); > + > + hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper); > + ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr); > + > + /* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */ > + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7); > + ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr); > + IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown); > + hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw); > + ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); > + IUnknown_Release(unknown); > + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, > + NULL, &d3drm_primary, surface_callback); > + ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr); > + ok(d3drm_primary != NULL, "No primary surface was enumerated.\n"); > + hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper); > + ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr); > + if (SUCCEEDED(hr)) > + { > + ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper); > + IDirectDrawClipper_Release(d3drm_clipper); > + } > + if (d3drm_primary) > + IDirectDrawSurface_Release(d3drm_primary); > + IDirectDrawSurface7_Release(surface7); > + IDirectDraw_Release(ddraw); > + > + /* Check properties of render target and depth surface */ > + surface_desc.dwSize = sizeof(surface_desc); > + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); > + ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); > + > + ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", > + surface_desc.dwWidth, surface_desc.dwHeight); > + ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), > + "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps); > + expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; > + ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags); > + > + hr = DirectDrawCreate(NULL, &ddraw, NULL); > + ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); > + desc.dwSize = sizeof(desc); > + hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > + ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr); > + ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n", > + surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount); > + > + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds); > + ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr); > + > + desc.dwSize = sizeof(desc); > + hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); > + ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); > + > + ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", > + desc.dwWidth, desc.dwHeight); > + ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); > + expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; > + ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags); > + ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth); > + ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask); > + > + /* Release old objects and check refcount of device and clipper */ > + IDirectDrawSurface_Release(ds); > + ds = NULL; > + IDirectDrawSurface_Release(surface); > + surface = NULL; > + IDirect3DDevice2_Release(d3ddevice2); > + d3ddevice2 = NULL; > + IDirect3DRMDevice2_Release(device2); > + ref3 = get_refcount((IUnknown *)d3drm1); > + ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3); > + ref3 = get_refcount((IUnknown *)d3drm2); > + ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); > + cref2 = get_refcount((IUnknown *)clipper); > + todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); > + > + /* Test if render target format follows the screen format */ > + hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > + ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr); > + hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16); > + ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr); > + > + hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > + ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr); > + ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); > + > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2); > + ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); > + > + hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); > + todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); > + if (FAILED(hr)) > + goto cleanup; > + > + hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > + ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); > + > + surface_desc.dwSize = sizeof(surface_desc); > + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); > + ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); > + todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", > + surface_desc.ddpfPixelFormat.dwRGBBitCount); > + > + hr = IDirectDraw2_RestoreDisplayMode(ddraw); > + ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); > + > +cleanup: > + if (ds) > + IDirectDrawSurface_Release(ds); > + if (surface) > + IDirectDrawSurface_Release(surface); > + if (d3ddevice2) > + IDirect3DDevice2_Release(d3ddevice2); > + if (device2) > + IDirect3DRMDevice2_Release(device2); > + if (d3drm2) > + IDirect3DRM2_Release(d3drm2); > + if (d3drm1) > + IDirect3DRM_Release(d3drm1); > + if (clipper) > + IDirectDrawClipper_Release(clipper); > + if (ddraw) > + IDirectDraw_Release(ddraw); > + DestroyWindow(window); > +} > + > START_TEST(d3drm) > { > test_MeshBuilder(); > @@ -1964,4 +2165,5 @@ START_TEST(d3drm) > test_frame_mesh_materials(); > test_d3drm_qi(); > test_frame_qi(); > + test_create_device_from_clipper(); > } > -- > 1.9.3 (Apple Git-50) > > >

1 0