April 2011 - Wine-Devel - list.winehq.org

Re: wined3d/query: Add support for timestamp queries.
by Stefan Dösinger April 26, 2011

April 26, 2011

I think timestamp queries are supposed to return GPU-side timestamps. Otherwise I don't see the point in adding a complex d3d query around QueryPerformanceFrequency. There's GL_ARB_timer_query which looks like it does what you need.

1 0

Re: wined3d/state: Treat unrecognized D3DZBUFFERTYPEs as WINED3DZB_TRUE.
by Henri Verbeet April 26, 2011

April 26, 2011

Nope.

1 0

Re: wined3d/query: Add support for timestamp queries.
by Henri Verbeet April 26, 2011

April 26, 2011

On 26 April 2011 19:35, Adam Martinson <amartinson(a)codeweavers.com> wrote: > +#include "d3d10.h" I don't think so.

1 0

Re: [PATCH 3/4] dsound: Implement capture buffer based on mmdevapi, try 2
by Andrew Eikum April 26, 2011

April 26, 2011

It would be nice if you used more descriptive variable names. For example: +struct IDirectSoundCaptureBufferImpl +{ + DWORD buf_size; + DWORD pos; What units are these sizes and positions in? Frames? Bytes? Time? What position is being represented here, read, write, or something else? Using more descriptive names helps when understanding and verifying code like this: + pos1 = This->pos; + if (This->playing) + { + pos2 = This->format->nSamplesPerSec / 100; + pos2 *= This->format->nBlockAlign; + pos2 += pos1; + if (!This->looping && pos2 > This->buf_size) + pos2 = 0; + else + pos2 %= This->buf_size; + } + else + pos2 = pos1; + pos2 %= This->buf_size; Are all of these positions in Bytes? I hope so... (Remember this has tripped things up in the past, see bbbf72ddcb). If everything is always in bytes, maybe make a note of that near the variable declarations, and then verify that it's true throughout the code. Also, why is pos1 a separate variable here? These patches are all missing quite a lot of error handling, which really makes me hesitate. Especially on some important calls: + IAudioCaptureClient_GetBuffer(buf->cap_dev, &data, &read, &flags, &pos, 0); + IAudioClient_GetDevicePeriod(This->dev, &default_period, &min_period); + IAudioClient_Start(This->dev); Knowing when these functions fail will help debugging if something goes wrong. Much worse to suddenly crash four function calls later due to invalid default_period value than to just error out appropriately when the error occurs. This doesn't matter a whole lot, but I think it would be more clear to use a separate object here, instead of a separate refcount: struct IDirectSoundCaptureBufferImpl { IDirectSoundCaptureBuffer8 IDirectSoundCaptureBuffer8_iface; - LONG ref; + IDirectSoundNotify IDirectSoundNotify_iface; + LONG ref, notify_ref; If not, at least a comment explaining why two refcounts are needed. Obviously a test would improve it even more, if one doesn't already exist.

1 0

Re: cmd: handle spaces in directory names in del /s
by Alexandre Julliard April 26, 2011

April 26, 2011

Dan Kegel <dank(a)kegel.com> writes: > @@ -771,13 +771,16 @@ BOOL WCMD_delete (WCHAR *command, BOOL expectDir) { > > DIRECTORY_STACK *nextDir; > WCHAR subParm[MAX_PATH]; > + static const WCHAR quoteW[] = { '"', 0 }; > > /* Work out search parameter in sub dir */ > - strcpyW (subParm, thisDir); > + strcpyW (subParm, quoteW); > + strcatW (subParm, thisDir); > strcatW (subParm, fd.cFileName); > strcatW (subParm, slashW); > strcatW (subParm, fname); > strcatW (subParm, ext); > + strcatW (subParm, quoteW); That's ugly. File names should not go through command processing again. -- Alexandre Julliard julliard(a)winehq.org

1 0

requesting review and/or testing for directsound changes
by Maarten Lankhorst April 26, 2011

April 26, 2011

Hi all, with http://repo.or.cz/w/wine/multimedia.git and http://repo.or.cz/w/openal-soft.git you should be able to get the benefits of openal-soft's mixer while continuing to use whatever driver you want for mmdevapi. As a result directsound will only support openal-soft, but multi channel is suddenly supported, as is support for the floating point format. 24-bits and 32-bits int are currently not, but as soon as that capability is added to openal-soft.git wine will have a nice working dsound implementation with support for a lot of things that are missing now. The resampling code will also be a lot better and you should expect a higher quality when resampling is used. The capture changes should work nicely, and I don't expect a problem with that, since it's based on openal. The rendering code is essentially reviving the old dsound-openal, and outputting it to mmdevapi. Note: 24-bits and 32-bits int are unsupported and will most likely cause a crash, disable the #if 1 in get_fmtstr_EXT to prevent lying about support. It was put in place so the wine dsound tests would pass. A dsound.dll.so binary with openal-soft.git statically linked in can be found at: http://www.astro.rug.nl/~lankhorst/dsound.dll.so If you're using pulseaudio, patch your 32-bits alsa-plugins with the attached patch, or silence may occur when using the new mmdevapi drivers. Cheers, Maarten

2 1

Re: dinput/tests: Initial tests for Action Mapping. Added some tests for the creation of a DirectInput8 Interface and a dummy call of EnumDevicesBySemantics.
by Austin English April 26, 2011

April 26, 2011

On Sun, Apr 24, 2011 at 18:12, Lucas Fialho Zawacki <lfzawacki(a)gmail.com> wrote: Howdy Lucas, > + hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1, &IID_IDirectInput8A, (LPVOID*)&pDI); > + if (hr == DIERR_OLDDIRECTINPUTVERSION || > + hr == DIERR_BETADIRECTINPUTVERSION || > + hr == REGDB_E_CLASSNOTREG) > + { > + skip("ActionMapping requires dinput8\n"); > + return; > + } > + ok(SUCCEEDED(hr), "DirectInput8 Create failed: hr=%08x\n", hr); > + if (FAILED(hr)) return; > + > + hr = IDirectInput8_Initialize(pDI,hinst, 0x0800 /* DirectInput8 */ ); > + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION) > + { > + skip("ActionMapping requires dinput8\n"); > + return; > + } You probably should use win_skip here, Wine shouldn't have missing dinput8 support. Cheers, Austin

3 2

Re: d3dx9_36: Fix uninitialized variable warnings.
by Matteo Bruni April 26, 2011

April 26, 2011

2011/4/26 Nicolas Le Cam <niko.lecam(a)gmail.com>: > msdn tells us to use 0 to disable colorkey [1]. Let me know if you > think it isn't the correct things to do. > > [1] http://msdn.microsoft.com/en-us/library/bb172902%28v=vs.85%29.aspx > > -- > Nicolas Le Cam > Argh, this was already spotted by Gerald Pfeifer some time ago and I told him I was going to send a patch, which didn't happen yet... I'm sending it now (I prefer to fix this in a different way), assuming your patch wasn't already committed by AJ.

2 1

Google Summer of Code 2011 is on!
by Austin English April 26, 2011

April 26, 2011

We've got five projects this year: Jay Yang - Implement the Explorer - http://socghop.appspot.com/gsoc/project/google/gsoc2011/yangjay/8001 Lucas Fialho Zawacki - Implementation of DirectInput8 Action Mapping feature - http://socghop.appspot.com/gsoc/project/google/gsoc2011/lfzawacki/8001 Michael Mc Donnell - Implement Missing Mesh Functions in Wine’s D3DX9 - http://socghop.appspot.com/gsoc/project/google/gsoc2011/mmd/9001 Michal Zietek - Implementing WScript API - http://socghop.appspot.com/gsoc/project/google/gsoc2011/misiek/6001 Pluciński Mariusz - Extending gameux.dll by Games Explorer Shell Extension - http://socghop.appspot.com/gsoc/project/google/gsoc2011/vshader/29001 Congrats everyone! Now get coding :-). -- -Austin

2 1

re: VarDateFromStr parses yyyy-mm-dd as yyyy-dd-mm in European locales
by Dan Kegel April 25, 2011

April 25, 2011

Nikolay wrote: >> Who has authority to approve it? > A patch? Alexandre Julliard, he's the only project maintainer. > Send a patch to wine-patches at winehq.org when you think > it's ready and you'll get some feedback if it's not. Be sure to send it to winetestbot first, and fix any problems it finds; see http://wiki.winehq.org/SubmittingPatches - Dan

2 1

ERROR: Compile wine tests on WINDOWS with MS C/C++
by Gerold Jens Wucherpfennig April 25, 2011

April 25, 2011

Regarding: 5.5.4. Standalone, using the Microsoft C++ Toolkit of http://www.winehq.org/docs/winedev-guide/testing-windows : I tried to compile dlls/rasapi32/test/rasapi.c on Windows and got these error messages: Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 15.00.30729.01 for 80x86 Copyright (C) Microsoft Corporation. All rights reserved. rasapi.c .\wine/test.h(66) : error C2143: syntax error : missing '{' before 'const' .\wine/test.h(70) : error C2054: expected '(' to follow 'inline' .\wine/test.h(71) : error C2085: 'winetest_strcmpW' : not in formal parameter li st .\wine/test.h(71) : error C2143: syntax error : missing ';' before '{' -- Gerold

2 1

Re: [PATCH 6/6] mmdevapi/tests: Add tests for IAudioClock
by Alexandre Julliard April 25, 2011

April 25, 2011

Andrew Eikum <aeikum(a)codeweavers.com> writes: > + pcpos = 0; > + hr = IAudioClock_GetPosition(acl, &pos, &pcpos); > + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); > + ok(pos == 0, "GetPosition returned non-zero pos before being started: %lld\n", pos); Please avoid %ll formats. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/6] wineoss.drv: Add MMDevAPI driver
by Alexandre Julliard April 25, 2011

April 25, 2011

Andrew Eikum <aeikum(a)codeweavers.com> writes: > +{ > + int i, mixer_fd; > + oss_sysinfo sysinfo; > + static int print_once = 0; > + > + TRACE("%d %p %p %p\n", flow, ids, num, def_index); > + > + mixer_fd = open("/dev/mixer", O_RDONLY, 0); > + if(mixer_fd < 0){ > + ERR("OSS /dev/mixer doesn't seem to exist\n"); > + return AUDCLNT_E_SERVICE_NOT_RUNNING; > + } > + > + if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ > + close(mixer_fd); > + > + if(errno == EINVAL){ > + ERR("OSS version too old, need at least OSSv4\n"); > + return AUDCLNT_E_SERVICE_NOT_RUNNING; You'll need a configure check too, things like the oss_sysinfo type don't exist on OSSv3. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] mountmgr: Populate HKLM\HARDWARE\DEVICEMAP\Scsi here instead of in kernel32. (try 2)
by Alexandre Julliard April 25, 2011

April 25, 2011

Charles Davis <cdavis(a)mymail.mines.edu> writes: > Try 2: don't depend on the existence of scsi-generic entries in the HAL tree. It's still not listing my /dev/hda CD drive. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 1/3] d3dx9: Implement ID3DXBaseEffect::GetParameterByName().
by Henri Verbeet April 25, 2011

April 25, 2011

2011/4/20 Rico Schüller <kgbricola(a)web.de>: > +inline LPSTR get_partial_string(LPCSTR name, char initial, char final) That should probably be static instead of inline. Also, get_parameter_by_name() looks like it could be split up, and you can probably avoid the copy in get_partial_string().

2 1

Style updates for source.winehq/patches
by Jerome Leclanche April 24, 2011

April 24, 2011

Attached patch to tools.git/patches/patches.css adds the necessary styling for a WineHQ-style patch status page: http://i.imgur.com/5ToSc.png The div class="main" needs to be replaced by the html attached in the other file. I can write a patch for it if it's to be included, but I cannot test it. Is it worth doing? J. Leclanche

1 0

Re: VarDateFromStr parses yyyy-mm-dd as yyyy-dd-mm in European locales
by Nikolay Sivov April 23, 2011

April 23, 2011

On 4/23/2011 22:46, John Fremlin wrote: > Nikolay Sivov<bunglehead(a)gmail.com> writes: > >> On 4/23/2011 22:22, John Fremlin wrote: >>> Nikolay Sivov<bunglehead(a)gmail.com> writes: >>> >>>> On 4/23/2011 19:00, John Fremlin wrote: >>>>> Europeans write dates generally as dd-mm-yyyy. This makes sense. So does >>>>> yyyy-mm-dd. Native will parse dates written yyyy-mm-dd correctly. Wine for some >>>>> reasons assumes they are yyyy-dd-mm. This is not a date ordering used anywhere >>>>> as far as I know and contradicts the MS behaviour. >>>>> >>>>> I've submitted http://bugs.winehq.org/show_bug.cgi?id=26902 >>>>> >>>>> I've included a patch which fixes the problem and adds a testcase. Is >>>>> there anything I can do to improve the chances that this fairly >>>>> unambiguous fix meets the next release? -- I have some secret and >>>>> cunning plans which are unfortunately predicated on this being fixed. >>>>> @@ -3458,6 +3458,7 @@ static void test_VarDateFromStr(void) >>>>> DFS("02.01.1970"); EXPECT_DBL(25570.0); >>>>> DFS("02.13.1970"); EXPECT_DBL(25612.0); >>>>> DFS("02-13-1970"); EXPECT_DBL(25612.0); >>>>> + DFS("2020-01-11"); EXPECT_DBL(43841.0); >>>> Hi, John. >>>> >>>> This is locale-dependent thing, so it will need at least more tests >>>> for different locales (locales with different default month/day order >>>> I mean). >>> Hi Nikolay, >>> >>> Is there really ever a locale which actually parses ydm under the native >>> implementation? >> Not really, as far as I know. My point was to test with different >> pattern anyway. For example for >> yyyy/mm/dd and dd/mm/yyyy locales. Also this particular test is not >> very descriptive cause >> month and day in it both fit month or day range, so you can't tell how >> it's interpreted. > I don't understand the confusion here? > > The single test extra test is explicitly for a date that can only be > converted either as y-m-d or the imaginary Wine-only y-d-m format. That > should be interpreted in exactly one way, and it is interpreted > incorrectly at the moment. The patch fixes that. Yes, I got it. Wine converts 2020-01-11 string as 1st of November while native treats it as 11th of January. What I meant that test data should be clear about what field is day and what's a month. For your case it could be '2020-01-30' to make 30 invalid value for a month. > If you want extra tests, I'm sure they'd be great, but I think this > pretty unambiguously represents an improvement. About additional tests, what about cases like '2020-20-01' on locales that use 'mm/dd/yyyy' or '2020-01-30' for locales that are 'dd/mm/yyyy'? Even if you're sure patch doesn't break that it's always better to add more tests (maybe some tests for that are in already). > Who has authority to approve it? A patch? Alexandre Julliard, he's the only project maintainer. Send a patch to wine-patches(a)winehq.org when you think it's ready and you'll get some feedback if it's not.

1 0

VarDateFromStr parses yyyy-mm-dd as yyyy-dd-mm in European locales
by John Fremlin April 23, 2011

April 23, 2011

Europeans write dates generally as dd-mm-yyyy. This makes sense. So does yyyy-mm-dd. Native will parse dates written yyyy-mm-dd correctly. Wine for some reasons assumes they are yyyy-dd-mm. This is not a date ordering used anywhere as far as I know and contradicts the MS behaviour. I've submitted http://bugs.winehq.org/show_bug.cgi?id=26902 I've included a patch which fixes the problem and adds a testcase. Is there anything I can do to improve the chances that this fairly unambiguous fix meets the next release? -- I have some secret and cunning plans which are unfortunately predicated on this being fixed.

2 3

Re: Matching Windows 7 folder locations?
by newsletter [at] Schiermeier-Software April 23, 2011

April 23, 2011

Hello Dan, wdrwo> Windows 7 changed the folders in c:/users/$USERNAME around a bit. not only 'a bit'. There are a lot of changes in the folder structure since Vista: See URL: <http://msdn.microsoft.com/en-us/library/dd378457(v=VS.85).aspx> -- Joerg Schiermeier

1 0

Missing backtrace when debugging a game
by Jerome Leclanche April 23, 2011

April 23, 2011

I'm currently trying to debug http://bugs.winehq.org/show_bug.cgi?id=25977. Even when running "winedbg bin/release/loader.exe", this is what happens: Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00365327). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:00365327 ESP:0033dd20 EBP:000003d9 EFLAGS:00010246( R- -- I Z- -P- ) EAX:00000000 EBX:00000000 ECX:0018e268 EDX:00000011 ESI:0018e268 EDI:0016e560 Stack dump: 0x0033dd20: 00000000 0018e268 003670f9 0033dd9c 0x0033dd30: 0033fb68 0002002a 001712b0 00000005 0x0033dd40: 100d2e46 00401920 0002002a 0033e39c 0x0033dd50: 0033ddc8 7edb2ff4 00000000 00000000 0x0033dd60: 00000000 00000000 00000690 0000041a 0x0033dd70: 0000002c 00000000 00000001 ffffffff 000c: sel=0067 base=00000000 limit=00000000 16-bit rw- Backtrace: 0x00365327: movl 0x0(%eax),%ecx Wine-dbg>bt Backtrace: Any advice, or idea why this would happen? Furthermore, is it a bug with winedbg, and worth filing? J. Leclanche

3 2

Matching Windows 7 folder locations?
by Dan Kegel April 23, 2011

April 23, 2011

Windows 7 changed the folders in c:/users/$USERNAME around a bit. My Documents is now just a link to the new folder Documents Application Data is now just a link to the new folder AppData/Roaming Local Settings is now just a link to the new folder AppData/Local How is this going to affect Wine? Well-behaved apps that use CSIDL_PERSONAL to get at "My Documents" or "Documents" will work regardless, but users or badly behaved apps might start expecting the shorter directory names sometime. (I always hated the spaces, anyway.)

3 2

Re: user32: Fix Jittery Mouse movement
by Vitaliy Margolen April 23, 2011

April 23, 2011

On 04/22/2011 02:06 PM, EG Galano wrote: > This fixes jittery mouse movement in Combat Arms. This was introduced > in commit 79c2e55b5a6331d15788f65a929e9e002c2f8b05 > > This is likely the same issue discussed here but I don't have a copy > to test: http://forum.winehq.org/viewtopic.php?t=11759&sid=9d9518057d4c0ef51be8c37d9… > - if (ret && (prev_x != new_x || prev_y != new_y)) USER_Driver->pSetCursorPos( new_x, new_y ); > + if (ret && (prev_x != new_x && prev_y != new_y)) USER_Driver->pSetCursorPos( new_x, new_y ); Obviously this is wrong. Something else is at fault here. Vitaliy.

2 1

Managing word agreements in PO translations?
by Frédéric Delanoy April 22, 2011

April 22, 2011

Hi, In various languages, there are multiple forms/agreements for a pronoun/adjective. In French, for instance masculine and feminine forms exist; in other languages (like German IIRC) there's even a neutral form (other languages may also be more complicated) while agreements in English are limited, e.g. there's only one form for masculine/feminine/plural adjectives. This makes translating short English words problematic. In my case, I've a problem with the following PO entry #: comctl32.rc:44 crypt32.rc:198 progman.rc:78 winecfg.rc:76 msgid "None" According to context, it can be translated (in French) as either "Aucun" or "Aucune" (agreements on the same word). Admitedly, it could be translated with "Aucun(e)" but that seems more like a workaround and feels a bit weird (user shouldn't see partially incorrect/odd translations because of technical issues) OTOH, creating a distinct msgcontext for every agreement in every supported language may be overkill, although the number of affected msgids is limited. What's your opinion on how to handle that, folks? Frédéric Delanoy NB: This obviously posed no problem before the rc->po migration, since it was duplicated in different rc files

2 3

Re: d3d8: Attempting to set a NULL rt is legal in d3d8
by Henri Verbeet April 22, 2011

April 22, 2011

On 22 April 2011 14:25, "Stefan Dösinger" <stefandoesinger(a)gmx.at> wrote: > An unrelated issue I am ignoring for now: > void * __cdecl wined3d_buffer_get_parent(const struct wined3d_buffer *buffer); > > in the .idl file is compiled by Microsoft's midl to > > void *__cdecl wined3d_buffer_get_parent( > struct wined3d_buffer *buffer); > > ie, the const is lost, leading to complaints from msvc that the implementation function doesn't match the declaration. Any idea how to fix it? > Odd. But I think we can ignore it unless there's an easy fix, the IDL file should go away anyway once COM is gone from wined3d. Though maybe widl should match that behaviour.

1 0

Re: [2/2] wined3d: Scale the depthbias factor by the depth buffer's depth
by Henri Verbeet April 22, 2011

April 22, 2011

On 22 April 2011 13:17, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + scale = 0; I thought you cared about the warnings MSVC generates for this kind of thing. :)

1 0

Re: d3d8: Attempting to set a NULL rt is legal in d3d8
by Henri Verbeet April 22, 2011

April 22, 2011

Tests, please. Also, at least with the current code this is still going to fail because wined3d disallows setting RT0 to NULL.

2 2

Instrumenting wined3d library
by Emanuele Oriani April 22, 2011

April 22, 2011

Hi guys, I'd like to instrument wined3d in order to get to the bottom of the two issues with StarCraft II: - low FPS when we don't set affinity of all threads on one core - low FPS when shader level is > MEDIUM Which kind of function should I instrument? I've instrumented all the non static in 'context.c', 'buffer.c' and 'device.c', but I guess that I should instrument all the static function IWineD3DDeviceImpl_* in 'device.c', right? What kind of functions should I instrument? Cheers, Ema

2 1

Creating tests for rasapi32.dll
by Gerold Jens Wucherpfennig April 22, 2011

April 22, 2011

Hi, I want to try to create some tests for rasapi32.dll. May I just create some tests and do the implementation later? For the time being that will mean that RASAPI32 tests will fail, because of missing code in rasapi.c. Is that OK? I haven't created DLL-tests yet... Regards Gerold

3 2

Re: [PATCH 5/5] ddraw: Destroy the ddraw surface after the wined3d texture is destroyed.
by Stefan Dösinger April 21, 2011

April 21, 2011

Hi, I guess the obvious next step is to let wined3d manage the surface creation by getting rid of the CreateAdditionalSurface mess and let IWineD3DDeviceParent::CreateSurface handle this. I guess we should also get rid of the complex_array attachment list and handle those attachment by querying the wined3d container for the backbuffer or mipmap sublevel list. And while AddAttachedSurface mostly serves the function of SetDepthStencilSurface I'm afraid we won't be able to get rid of the manual attachment list - but we should probably replace it with a wine list(*) Anyway, thanks for cleaning up this mess. I feel guilty because I should have done this long ago :-/ Cheers, Stefan (*) I think I did that at some point, maybe is was another case of written but never finished patches. Or maybe I did this with some other surface list... On Wednesday 20 April 2011 22:09:27 Henri Verbeet wrote: > --- > dlls/ddraw/surface.c | 34 ++++++++++++++++++++++++++-------- > 1 files changed, 26 insertions(+), 8 deletions(-) > > diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c > index 16b831a..84082c5 100644 > --- a/dlls/ddraw/surface.c > +++ b/dlls/ddraw/surface.c > @@ -180,10 +180,13 @@ static ULONG WINAPI > ddraw_surface7_AddRef(IDirectDrawSurface7 *iface) > > TRACE("%p increasing refcount to %u.\n", This, refCount); > > - if (refCount == 1 && This->WineD3DSurface) > + if (refCount == 1) > { > EnterCriticalSection(&ddraw_cs); > - IWineD3DSurface_AddRef(This->WineD3DSurface); > + if (This->WineD3DSurface) > + IWineD3DSurface_AddRef(This->WineD3DSurface); > + if (This->wined3d_texture) > + wined3d_texture_incref(This->wined3d_texture); > LeaveCriticalSection(&ddraw_cs); > } > > @@ -256,9 +259,7 @@ static void > ddraw_surface_cleanup(IDirectDrawSurfaceImpl *surface) > > TRACE("surface %p.\n", surface); > > - if (surface->wined3d_texture) /* If it's a texture, destroy the > wined3d texture. */ - > wined3d_texture_decref(surface->wined3d_texture); > - else if (surface->wined3d_swapchain) > + if (surface->wined3d_swapchain) > { > IDirectDrawImpl *ddraw = surface->ddraw; > > @@ -388,7 +389,10 @@ static ULONG WINAPI > ddraw_surface7_Release(IDirectDrawSurface7 *iface) > LeaveCriticalSection(&ddraw_cs); > return ref; > } > - ddraw_surface_cleanup(This); > + if (This->wined3d_texture) /* If it's a texture, destroy the > wined3d texture. */ + > wined3d_texture_decref(This->wined3d_texture); > + else > + ddraw_surface_cleanup(This); > LeaveCriticalSection(&ddraw_cs); > } > > @@ -3491,6 +3495,20 @@ const struct wined3d_parent_ops > ddraw_surface_wined3d_parent_ops = ddraw_surface_wined3d_object_destroyed, > }; > > +static void STDMETHODCALLTYPE ddraw_texture_wined3d_object_destroyed(void > *parent) +{ > + IDirectDrawSurfaceImpl *surface = parent; > + > + TRACE("surface %p.\n", surface); > + > + ddraw_surface_cleanup(surface); > +} > + > +static const struct wined3d_parent_ops ddraw_texture_wined3d_parent_ops = > +{ > + ddraw_texture_wined3d_object_destroyed, > +}; > + > HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) > { > const DDSURFACEDESC2 *desc = &surface->surface_desc; > @@ -3513,10 +3531,10 @@ HRESULT > ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) format = > PixelFormat_DD2WineD3D(&surface->surface_desc.u4.ddpfPixelFormat); if > (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) > return > IWineD3DDevice_CreateCubeTexture(surface->ddraw->wineD3DDevice, > desc->dwWidth, - levels, 0, format, pool, surface, > &ddraw_null_wined3d_parent_ops, &surface->wined3d_texture); + > levels, 0, format, pool, surface, &ddraw_texture_wined3d_parent_ops, > &surface->wined3d_texture); else > return IWineD3DDevice_CreateTexture(surface->ddraw->wineD3DDevice, > desc->dwWidth, desc->dwHeight, - levels, 0, format, pool, > surface, &ddraw_null_wined3d_parent_ops, &surface->wined3d_texture); + > levels, 0, format, pool, surface, > &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); } > > HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, > IDirectDrawImpl *ddraw,

1 0

Re: [PATCH 1/2] mountmgr: Populate HKLM\HARDWARE\DEVICEMAP\Scsi here instead of in kernel32.
by Alexandre Julliard April 21, 2011

April 21, 2011

Charles Davis <cdavis(a)mymail.mines.edu> writes: > --- > dlls/kernel32/Makefile.in | 1 - > dlls/kernel32/oldconfig.c | 404 ------------------------------------------ > dlls/kernel32/process.c | 3 - > dlls/mountmgr.sys/hal.c | 116 ++++++++++++ > dlls/mountmgr.sys/mountmgr.c | 138 ++++++++++++++ > dlls/mountmgr.sys/mountmgr.h | 3 + > 6 files changed, 257 insertions(+), 408 deletions(-) > delete mode 100644 dlls/kernel32/oldconfig.c It doesn't seem to work here, I don't get any devices. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: winex11.drv: Ignore the zero-size owners used by Delphi apps when deciding whether to add NET_WM_STATE_SKIP_TASKBAR.
by Alexandre Julliard April 21, 2011

April 21, 2011

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > This patch reverts a part of 61e50e15ba45ad54655f98619f5ef33917033165 and > fixes the regression reported in the bug 26670. This will cause spurious task bar entries in many apps. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/4] msvcp90: Added basic_string<char>::append(size_t, char) implementation.
by Piotr Caban April 21, 2011

April 21, 2011

Hi, On 04/18/11 23:53, Vincas Miliūnas wrote: > My remark: (The method is implemented by reusing existing code) this->size+count<this->size is the same as count< 0 and throwing a "string too long" exception in that case is not semantic. count is an unsigned variable so it cannot be smaller then 0. My intention was to make sure there's no overflow. This check is not needed because MSVCP_basic_string_char_npos-this->size <= count already makes sure this->size+count has small enough value. +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_len_wchar( + basic_string_wchar *this, size_t count, wchar_t c) +{ + TRACE("%p %lu %lc\n", this, (unsigned long)count, c); It's probably not allowed to use %lc format. Cheers, Piotr

2 1

Re: d3dxof/tests: Make expected value in string and comparison match.
by Marvin April 20, 2011

April 20, 2011

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 http://testbot.winehq.org/JobDetails.pl?Key=10525 Your paranoid android. === WVISTAADM (32 bit d3dxof) === Failure running script in VM: The specified guest user must be logged in interactively to perform this operation

1 0

Re: msvcrt: Added _resetstkoflw implementation
by Alexandre Julliard April 20, 2011

April 20, 2011

Piotr Caban <piotr(a)codeweavers.com> writes: > +/********************************************************************* > + * _resetstkoflw (MSVCRT.@) > + */ > +int CDECL _resetstkoflw(void) > +{ > + MEMORY_BASIC_INFORMATION mbi; > + SYSTEM_INFO info; > + DWORD prot; > + void *alloc; > + > + GetSystemInfo(&info); > + if(!VirtualQuery(&mbi, &mbi, sizeof(mbi))) > + return 0; > + > + alloc = VirtualAlloc((char*)mbi.BaseAddress, info.dwPageSize, MEM_COMMIT, PAGE_READWRITE); > + if(!alloc) > + return 0; > + > + return VirtualProtect(alloc, info.dwPageSize, PAGE_GUARD|PAGE_READWRITE, &prot); This doesn't make sense to me, why do you need a VirtualAlloc in there? And what about the limits in the TEB? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 03/10] msvcrt: Use callback based printf in fprintf functions family (try2)
by Alexandre Julliard April 19, 2011

April 19, 2011

Piotr Caban <piotr(a)codeweavers.com> writes: > --- > dlls/msvcrt/file.c | 118 > ++++++++++------------------------------------------ > 1 files changed, 22 insertions(+), 96 deletions(-) This one is causing console apps to output null characters. You'll have to spend more time on this patch series, it doesn't seem quite ready. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: include: Add rmxftmpl.h with contents generated from rmxftmpl.x.
by Alexandre Julliard April 19, 2011

April 19, 2011

Dylan Smith <dylan.ah.smith(a)gmail.com> writes: > +#ifndef __WINE_RMXFTMPL_H > +#define __WINE_RMXFTMPL_H > + > +/* sizeof(D3DRM_XTEMPLATES) */ > +#define D3DRM_XTEMPLATE_BYTES 3278 > + > +/* Contents of D3DRM_XTEMPLATES generated using: > + * ../tools/binencxftmpl rmxftmpl.x | xxd -i > + */ You should generate the whole file, it shouldn't need to be updated by hand. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: serial: Fix race for IOCTL_SERIAL_WAIT_ON_MASK
by Alexandre Julliard April 19, 2011

April 19, 2011

Wolfgang Walter <wolfgang.walter(a)stwm.de> writes: > set status field of piosb to STATUS_PENDING before calling wait_on(). If wait_on > returns with STATUS_PENDING don't touch piosb. > > Reason: if wait_on returns with STATUS_PENDING it started a thread which > itself modifies the status field. In general the iosb is not modified until the operation completes. -- Alexandre Julliard julliard(a)winehq.org

2 3

Cairo Graphics
by Jaime Rave April 19, 2011

April 19, 2011

Hey Guys, On some of the bugs that i have reported to freedesktop, i have been asked about why Wine is making calls like XDrawSegmentand not using Cairo to handle the 2d drawing which always provides consistent behavior regardless of drivers[1]. I have also read that cairo support "X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends includeOpenGL <http://www.cairographics.org/OpenGL/>, XCB, BeOS, OS/2, and DirectFB"[2]. So it will also works with Wayland when this is ready :D. So i think this is a good way to make Wine more graphic driver agnostic and improve the behavior on MacOS without having to write a complete new driver just for Quartz. So i would like to know your thoughts, if Cairo could improve some stuff or if is not related or useless to the project Greetings Jaime Rave [1] https://bugs.freedesktop.org/show_bug.cgi?id=22770#c14 [2] http://www.cairographics.org/

2 1

Re: [PATCH 06/10] msvcrt: Added sprintf_p_l implementation (try2)
by Alexandre Julliard April 19, 2011

April 19, 2011

Piotr Caban <piotr(a)codeweavers.com> writes: > @@ -552,6 +552,74 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API > return written; > } > > +#ifndef PRINTF_WIDE > +/* This functions stores sizes of arguments. It uses args[0] > + * internally (in the following way): > + * 0x1 - using positional parameters > + * 0x2 - not using positional parameters > + * 0x4 - error occurred > + */ > +static printf_arg arg_clbk_size(void *ctx, int pos, int type, __ms_va_list *valist) > +{ > + static const printf_arg ret; > + printf_arg *args = ctx; > + > + if(pos == -1) { > + args[0].get_int |= 1; > + return ret; > + } else > + args[0].get_int |= 2; > + > + if(pos<1 || pos>MSVCRT__ARGMAX || (args[pos].get_int && args[pos].get_int!=type)) > + args[0].get_int |= 4; > + else > + args[pos].get_int = type; > + return ret; > +} Using magic values like this is ugly, please add proper defines. Also you probably want to fix the name of the function and the comments. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] Fix SystemProcessorPerformanceInformation to include DPC and Interrupt times
by Alexandre Julliard April 19, 2011

April 19, 2011

"Ray Hinchliffe (RH)" <ray(a)rh-software.com> writes: > 1) When possible report DPC and Interrupt times > > 2) Fix _APPLE_ to return times in 100ns units and zero the unset members > > 3) Change the failure code to return 100ns values > > 4) Expunge unnecessary use of RtlAllocateHeap() etc.. Separate changes should be separate patches. > @@ -1241,8 +1241,9 @@ typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION { > LARGE_INTEGER IdleTime; > LARGE_INTEGER KernelTime; > LARGE_INTEGER UserTime; > - LARGE_INTEGER Reserved1[2]; > - ULONG Reserved2; > + LARGE_INTEGER DpcTime; > + LARGE_INTEGER IntTime; > + ULONG IntCount; You can't change the public definition. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: psapi: Forward EmptyWorkingSet implementation to kernel32
by Dmitry Timoshkov April 19, 2011

April 19, 2011

Jacek Caban <jacek(a)codeweavers.com> wrote: > +BOOL WINAPI K32EmptyWorkingSet(HANDLE hProcess) > +{ > + return SetProcessWorkingSetSize(hProcess, (SIZE_T)-1, (SIZE_T)-1); > +} You need to export it from kernel32. Also using ~0 instead of casting -1 would be better IMHO. -- Dmitry.

2 1

re: Cairo Graphics
by Dan Kegel April 19, 2011

April 19, 2011

Wrappers like Cairo Graphics, Phonon, and OpenAL sound nice, but can get in the way of reliably reproducing win32 behavior.

1 0

Re: Patch to fix GetThreadTimes() to work for all threads - fixes Bug 20230
by Vitaliy Margolen April 19, 2011

April 19, 2011

On 04/18/2011 12:45 AM, Ray Hinchliffe (RH) wrote: > The patch works by reading from /proc/<pid>/task/<tid>/stat. If this in not > possible it will report the fix messages as before. > Given that SystemProcessorPerformanceInformation uses /proc/stat I expect this Thanks for the patch, however there are several issues with it: - Don't attach changes to automatically generated files (server/trace.c, server/request.h, etc). Only server/protocol.def should be included, which you didn't even modify. - Keep formatting of the original file you modifying. No whitespace only changes, no funky new formatting styles. - Please use Windows types instead of system types for integers (ULONG instead of unsigned long) > + sprintf( buf, "/proc/%u/task/%u/stat", reply->unix_pid, reply->unix_tid ); Please don't call any functions in the server call context. Also you not using this buffer if server call fails, or if the thread is the same. Vitaliy.

1 0

How to debug steam based games
by Brock York April 19, 2011

April 19, 2011

Hey I was wondering how/what is the best approach to debug steam games under wine. If I launch the actual exe file in the steam folders of the game it just just opens and runs steam then killing the process I launched then actually launching the game. The only way I've found to get any useful output is to launch steam itself from the command line with the debugging options enabled there. Is this the only way to get debugging information from steam games without cracking them? Thanks Regards Brock

2 1

Re: ntdll: Add Windows XP x64
by Alexandre Julliard April 18, 2011

April 18, 2011

Ken Sharp <kennybobs(a)o2.co.uk> writes: > Windows XP x64 has an updated kernel to XP, so just setting XP in > winecfg will still cause apps to fail. IE8 for XP x64 is an example. This should most likely be done automatically on 64-bit. -- Alexandre Julliard julliard(a)winehq.org

3 4

Re: wintrust: Implement IsCatalogFile
by Austin English April 18, 2011

April 18, 2011

On Sat, Apr 16, 2011 at 12:34, Juan Lang <juan.lang(a)gmail.com> wrote: > Since I didn't see an updated patch from Austin, here's what I think > should suffice. Without knowing the app that depends on it, I can't > be certain. Sorry, I had a busy weekend, thanks for fixing it. It works great here! -- -Austin

1 0

Re: serial: improve handling of usb2serial adapters
by Austin English April 18, 2011

April 18, 2011

2011/4/18 Wolfgang Walter <wolfgang.walter(a)stwm.de>: Please, one patch per email. Thanks for helping Wine! -- -Austin

1 0

Can someone ban tiaotiao (tiaotiao213@hotmail.com -- link spammer) <EOM>
by Reece Dunn April 18, 2011

April 18, 2011

1 0

DEC Alpha Support
by André Hentschel April 18, 2011

April 18, 2011

Hi all, i would like to remove the remaining Alpha support code, because of all our ports Alpha is the most incomplete and it seems it has no chance to get some love. Further Alpha chips aren't produced anymore since years AFAIK. Any Objections? -- Best Regards, André Hentschel

1 0

Re: ntdll: Remove more path trailing chars. (try 2)
by Alexandre Julliard April 18, 2011

April 18, 2011

Vincent Pelletier <plr.vincent(a)gmail.com> writes: > Add tests via FindFirstFileA. You need tests for the low-level ntdll functions. -- Alexandre Julliard julliard(a)winehq.org

1 0