- wine-devel - winehq.org

Re: [PATCH 5/5] d3dx9_36: Implement ID3DXFileDataImpl_GetType. (try 2)
by Rico Schüller 23 Oct '12

23 Oct '12

On 22.10.2012 23:57, Christian Costa wrote: > -static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID* guid) > +static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID *guid) > > - ID3DXFileDataImpl* object; > + ID3DXFileDataImpl *object; One minor thing: I'd put that fixes in patch 4/5. It doesn't make much sense to add a line and change the style in the next patch from the same series. I think it's better to correct this when it is added in the first place. Cheers Rico

1 0

Re: [PATCH 1/5] d3dx9_36: Implement D3DXFileCreate.
by Jacek Caban 23 Oct '12

23 Oct '12

On 10/22/12 10:13 PM, Rico Schüller wrote: > On 22.10.2012 21:27, Christian Costa wrote: >> +static HRESULT WINAPI ID3DXFileImpl_QueryInterface(ID3DXFile *iface, REFIID riid, LPVOID *ret_iface) >> + ID3DXFileImpl *This = impl_from_ID3DXFile(iface); >> + ID3DXFileImpl* object; > Please be a bit more consistent across your patch... There are a lot more occurrences where you mix both usages. His usage seems natural when you think about using 'This' as analogy to 'this' in C++ implementation. That said, it's really a matter of taste, but such analogy feels natural when you work with COM. And by that logic, the patch is consistent. It uses 'object' as name of global function, which is not member of any class-like thing. Christian, there were some informal attempts to limit usage of stuff like LPVOID (and really any LP* types). It would be nice if you could avoid it in your patches. Jacek

4 3

Re: [PATCH 4/5] d3dx9_36: Implement ID3DXFileEnumObjectImpl_GetChildren & ID3DXFileEnumObjectImpl_GetChild and add stubbed interface for ID3DXFileData.
by Rico Schüller 23 Oct '12

23 Oct '12

On 22.10.2012 21:28, Christian Costa wrote: > +static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID* guid) Spacing. msdn says "const GUID *pType" see http://msdn.microsoft.com/en-us/library/windows/desktop/bb205843%28v=vs.85%…. Is it a bug in msdn? > + ID3DXFileDataImpl* object; *object? > + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXFileDataImpl)); I'd use sizeof(*object), but that's probably only a matter of taste.

3 3

Re: winex11: Never use a surface for embedded windows, even for the parents. (Regression)
by Christian Inci 22 Oct '12

22 Oct '12

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, this patch is causing CS:GO (Counter Strike: Global Offensive) to exit silently on startup. (Commit: 5fae649bdf14fb63b8d44984eda6edd1094a3314) - -Chris -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBAgAGBQJQhbWdAAoJEC7OUg5VIFIFgw8QAI+9slyGg+G5T6mEEq1O5f3l 3AMOqCBVQ7F8mhBCqC8JhiMkjJRnJ8cRupXflPl5+iugXrhxHWxM49G/stJ9kqeQ m/uSwX+CSBUR/I2kBeYYljJtD28QEthjUP/X6VMTHsQKvInmyjZKXN5PXuLWwmq4 p1ZayBAixRNu0sLEDkH2vsRjRm0Ehla3YMFU6JkAH9mQcBl6x4V8Ii6E89onAC1i sV4x8ASHnnb8p4/I9m/mScmO1WAN/TnCQyh/QEXCgA/FFHvkSWNN7liDqRgRbNeM Ozx2Cj6UctzQpeHH7XeTzFQRHXY37cRcRvVVKU56yOC3N5hxK0ncXVWD2BflqBYZ C2cOwZpmzw3iG00csDjEWoLsZH0jw0foQNl5Nx/DWPyqqtY6hVT8++F80b1WroIM 47AcNeY9NakaDkBVnvmy0YeiVH0QIhZlT2L6h4LlogjIF6gl4m5kVBcGKCYAgF9C kqcGCg+CIlRqbDeEBto07GnDDDeuvG5NoCU3W2iB6xydBsEAfzj5xyOafbmueJuc JN7pBPgMfONmpg3RhkZgkiGFKlkA7URxTxHuQZsElBeKJiE2VkeZ4obXOf+YbPkc pTtQBIhkSXlStnxSJtKc6sY683YSoQinewGgHVV3qrbWhpPlz6ONQJjfifFhY3DO Vyakqk3iDicIg76kVuM6 =WTR3 -----END PGP SIGNATURE-----

1 0

Re: [PATCH 2/5] d3dx9_36: Implement ID3DXFileImpl_RegisterTemplates.
by Rico Schüller 22 Oct '12

22 Oct '12

On 22.10.2012 21:28, Christian Costa wrote: > } ID3DXFileImpl; > > > - > static inline ID3DXFileImpl *impl_from_ID3DXFile(ID3DXFile *iface) It doesn't make much sense to add an empty line and remove it in the next patch.

1 0

Re: [PATCH 5/5] d3dx9_36: Implement ID3DXFileDataImpl_GetType.
by Rico Schüller 22 Oct '12

22 Oct '12

On 22.10.2012 21:28, Christian Costa wrote: > static HRESULT WINAPI ID3DXFileDataImpl_Unlock(ID3DXFileData *iface) > { > + > FIXME("(%p)->(): stub\n", iface); Why?

1 0

Re: [PATCH 1/5] d3dx9_36: Implement D3DXFileCreate.
by Rico Schüller 22 Oct '12

22 Oct '12

On 22.10.2012 21:27, Christian Costa wrote: > +static HRESULT WINAPI ID3DXFileImpl_QueryInterface(ID3DXFile *iface, REFIID riid, LPVOID *ret_iface) > > + ID3DXFileImpl *This = impl_from_ID3DXFile(iface); > > + ID3DXFileImpl* object; Please be a bit more consistent across your patch... There are a lot more occurrences where you mix both usages.

1 0

Re: [PATCH 6/8] ntdll: Standardize on sysconf to detect the number of processors for all platforms.
by Alexandre Julliard 22 Oct '12

22 Oct '12

James Eder <jimportal(a)gmail.com> writes: > @@ -1010,6 +1010,16 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) > */ > void fill_cpu_info(void) > { > + long num; > + > + num = sysconf(_SC_NPROCESSORS_ONLN); > + if (num < 1) > + { > + num = 1; > + WARN("Failed to detect the number of processors.\n"); > + } > + NtCurrentTeb()->Peb->NumberOfProcessors = num; Have you verified that this works correctly on all the platforms you are changing? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] user32: Fix error handling in MapWindowPoints, ClientToScreen and ScreenToClient and add tests for them. (try 2)
by Alexandre Julliard 22 Oct '12

22 Oct '12

Christian Costa <titan.costa(a)gmail.com> writes: > @@ -236,20 +236,32 @@ BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect ) > > > /******************************************************************* > - * ClientToScreen (USER32.@) > + * ClientToScreen (USER32.@) > */ > BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) > { > + if (!IsWindow( hwnd )) > + { > + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); > + return FALSE; > + } > + You should never use IsWindow(). Handles should be checked at the point where they are used. -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH] try2 wineboot: detect correct processor name and vendorID, use Intel Pentium 4 as fallback
by Patrick Rudolph 22 Oct '12

22 Oct '12

This patch super-seeds my previous attempt ID 91173. This time I used do_cpuid from ntdll / wbemprox. If cpuid is not available, the default "Intel Pentium 4" string is used. I modified get_processor_name to remove leading white-spaces. I also updated the code for Identifier REG_SZ. This applies to 64bit wine only, as 32bit still reports x86.

1 0

Re: [PATCH 5/6] dsound: rework ugly mixer logic
by Andrew Eikum 22 Oct '12

22 Oct '12

Mostly good cleanup in this one. Some thoughts below... On Tue, Oct 16, 2012 at 02:06:29PM +0200, Maarten Lankhorst wrote: > diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h > index feef787..7817b88 100644 > --- a/dlls/dsound/dsound_private.h > +++ b/dlls/dsound/dsound_private.h > @@ -73,10 +73,8 @@ struct DirectSoundDevice > - DWORD writelead, buflen, state, playpos, mixpos; > + DWORD writelead, buflen, aclen, fraglen, state, playpos, pad; If you're introducing new variables, surely you can come up with something more descriptive than "aclen." Something like "ac_buffer_frames," maybe? I'm a big fan of units on my variable names so mistakes like "pos_bytes = ac_frames;" are obvious. Similar for "pad," maybe something like "in_mmdev_bytes" (Is that actually used any more after your patches? You could re-use it if not.) > @@ -209,7 +207,6 @@ HRESULT DSOUND_PrimaryCreate(DirectSoundDevice *device) DECLSPEC_HIDDEN; > HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) DECLSPEC_HIDDEN; > HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device) DECLSPEC_HIDDEN; > HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) DECLSPEC_HIDDEN; > -HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LPDWORD writepos) DECLSPEC_HIDDEN; Good riddance. > @@ -682,147 +623,100 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) > LeaveCriticalSection(&device->mixlock); > return; > } > - > - to_mix_frags = device->prebuf - (pad * device->pwfx->nBlockAlign + device->fraglen - 1) / device->fraglen; > - > - to_mix_bytes = to_mix_frags * device->fraglen; > - > - if(device->in_mmdev_bytes > 0){ > - DWORD delta_bytes = min(to_mix_bytes, device->in_mmdev_bytes); > - device->in_mmdev_bytes -= delta_bytes; > - device->playing_offs_bytes += delta_bytes; > - device->playing_offs_bytes %= device->buflen; > + block = device->pwfx->nBlockAlign; Bleh. Do we really need to alias that? > + if (maxq > device->fraglen * 3) > + maxq = device->fraglen * 3; > + This seems to be replacing ds_snd_queue_max, right? Why remove the configurability? Why 3 instead of the old default of 10? This should be a separate patch at least. > + writepos = (device->playpos + pad) % device->buflen; > > if (device->priolevel != DSSCL_WRITEPRIMARY) { > - BOOL recover = FALSE, all_stopped = FALSE; > - DWORD playpos, writepos, writelead, maxq, prebuff_max, prebuff_left, size1, size2; > - LPVOID buf1, buf2; > + BOOL all_stopped = FALSE; > int nfiller; > + BOOL native = device->normfunction == normfunctions[4]; > + DWORD bpp = device->pwfx->wBitsPerSample>>3; Again, do we need to alias that? > -static DWORD DSOUND_fraglen(DirectSoundDevice *device) > -{ > - REFERENCE_TIME period; > - HRESULT hr; > - DWORD ret; > - > - hr = IAudioClient_GetDevicePeriod(device->client, &period, NULL); > - if(FAILED(hr)){ > - /* just guess at 10ms */ > - WARN("GetDevicePeriod failed: %08x\n", hr); > - ret = MulDiv(device->pwfx->nBlockAlign, device->pwfx->nSamplesPerSec, 100); > - }else > - ret = MulDiv(device->pwfx->nSamplesPerSec * device->pwfx->nBlockAlign, period, 10000000); > - > - ret -= ret % device->pwfx->nBlockAlign; > - return ret; > -} > - ... > + device->fraglen = MulDiv(device->pwfx->nSamplesPerSec, period, 10000000) * device->pwfx->nBlockAlign; This should be a separate patch. I don't have an argument /against/ it, but why do you prefer 10ms over whatever the driver prefers? Andrew

3 3

Re: [PATCH 4/6] dsound: Use event based threads
by Andrew Eikum 22 Oct '12

22 Oct '12

I like it. Before I can give a sign-off, I need to run it through my usual battery of tests on all the platforms. I'll do that after patch 3 gets figured out. Some thoughts below... On Tue, Oct 16, 2012 at 02:06:28PM +0200, Maarten Lankhorst wrote: > + /* ALSA is retarded, add a timeout.. */ > + ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); No arguments here :) but I'm curious what you mean. Presumably winealsa isn't sending events when it ought to? I know Jorg has discovered that failure, I wonder if it's worth testing and fixing across all the drivers. > diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c > index 94bdf9c..9d9fa27 100644 > --- a/dlls/dsound/primary.c > +++ b/dlls/dsound/primary.c > @@ -170,6 +172,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > device->pwfx->wFormatTag = WAVE_FORMAT_PCM; > device->pwfx->cbSize = 0; > } > + IAudioClient_SetEventHandle(device->client, device->sleepev); > > hres = IAudioClient_GetService(device->client, &IID_IAudioRenderClient, > (void**)&device->render); > @@ -203,6 +206,19 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > WARN("GetService failed: %08x\n", hres); > return hres; > } > + /* Now kick off the timer so the event fires periodically */ > + IAudioClient_Start(device->client); > + > + IAudioClient_GetStreamLatency(device->client, &period); I'm a big fan of error checking (or at least reporting), so these unchecked calls make me nervous. They'll probably never fail, but if they do, I think they should fail loudly. Andrew

2 2

Re: [PATCH 5/5] services: Added tests for service thread termination without setting service state to stopped
by Marvin 22 Oct '12

22 Oct '12

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=22392 Your paranoid android. === WVISTAADM (32 bit service) === service.c:397: Test failed: status.dwCurrentState = 3 service.c:411: Test failed: status.dwCurrentState = 3 === W2K8SE (32 bit service) === service.c:397: Test failed: status.dwCurrentState = 3 service.c:411: Test failed: status.dwCurrentState = 3

1 0

ntdll feature detection patch set
by James Eder 22 Oct '12

22 Oct '12

I've been kicking this patch set around in my local git tree for a while and I want to get it out there for comments and maybe even inclusion in Wine. Seeing some comments in another thread about wineboot made me think I should get these patches out rather than holding onto them much longer. I feel fairly good about the first 6 patches. They're small, bite-sized, and all x86/x86_64 so I can test them easily. However, the last two in the series are some what large and do things with ARM and PowerPC code. While it looks good to me, I don't have hardware or a build environment for them. I may have some ARM+Linux hardware in the coming months but I doubt I'll ever see a PowerPC come my way. If you have a build environment for ARM or PowerPC I would very much appreciate some feedback. Also I did some greping and found two other locations in Wine with similar do_cpuid type functions: dlls/wbemprox/builtin.c and dlls/dbghelp/minidump.c. Would it be worthwhile to have the function in a common header somewhere? -- Jim

2 1

Re: [PATCH 4/4] mshtml: Added more events tests
by Marvin 22 Oct '12

22 Oct '12

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=22386 Your paranoid android. === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/2] d3dxof: Use sizeof(GUID) instead of hardcoding the value.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Christian Costa <titan.costa(a)gmail.com> writes: > @@ -599,7 +599,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetId(IDirectXFileData* iface, LPGUID > if (!pGuid) > return DXFILEERR_BADVALUE; > > - memcpy(pGuid, &This->pobj->class_id, 16); > + memcpy(pGuid, &This->pobj->class_id, sizeof(GUID)); Using normal assignments would be even better. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/4] mshtml: Fixed attribute object caching logic
by Marvin 22 Oct '12

22 Oct '12

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=22384 Your paranoid android. === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: d3dx9_36: Add tests for D3DXSHRotateZ
by Rico Schüller 22 Oct '12

22 Oct '12

On 19.10.2012 13:15, Nozomi Kodama wrote: > This patch adds tests for the patch sent by Rico for D3DXSHRotateZ. > > Moreover, I changed const in CONST in the declaration of the function in > order to uniformize with the file. > + const FLOAT angle[] = ... I'd prefer "const" because it is used a little bit more often than CONST, but it is only a matter of taste. git grep "[ (,]const " | wc -l ~61k git grep "[ (,]CONST " | wc -l ~1.2k > + if ( i >= square || ( (order >= D3DXSH_MAXORDER) && ( i >= D3DXSH_MAXORDER * D3DXSH_MAXORDER ) ) ) > + if (l > 0) I'd write it "if (i >= square || ((... for consistency. > + ok(relative_error(expected, out_temp[i]) < admitted_error, "angle %f, order %u index %u, Expected %f, received %f\n", angle[j], order, i, expected, out_temp[i]); Expected -> expected? (2 times) > + expected = table[36 * (l + 3 * j ) + i]; The spacing looks a bit ugly. Cheers Rico

4 3

Re: [PATCH 5/8] ntdll: Add detection for PF_SSE_DAZ_MODE_AVAILABLE
by Chris Robinson 22 Oct '12

22 Oct '12

On 10/20/2012 05:40 PM, James Eder wrote: > + /* Intel says we need a zeroed 16-byte aligned buffer */ > + char buffer[512 + 16]; > + XMM_SAVE_AREA32 *state = (XMM_SAVE_AREA32 *)(((ULONG_PTR)buffer + 15) & ~15); > + memset(buffer, 0, sizeof(buffer)); > + > + __asm__ __volatile__( "fxsave %0" : "=m" (*state) : "m" (*state) ); Wouldn't this be simpler? DECLSPEC_ALIGN(16) XMM_SAVE_AREA32 state; memset(state, 0, sizeof(state)); __asm__ __volatile__("fxsave %0" : "=m" (*&state) : "m" (*&state)); May also want to make sure the two structs are packed.

4 7

re: [PATCH] services: Fix some weird sizeof usages.
by Dan Kegel 21 Oct '12

21 Oct '12

Christian Costa wrote: ... --- a/programs/services/rpc.c +++ b/programs/services/rpc.c ... @@ -952,7 +952,7 @@ BOOL service_send_command( struct service_entry *service, HANDLE pipe, } r = GetOverlappedResult( pipe, &overlapped, &count, FALSE ); } - if (!r || count != sizeof *result) + if (!r || count != sizeof(*result)) I was curious about this, so I looked around a bit. There are about 800 instances of sizeof without parens in Wine vs. 34628 with. I would have thought "Heck, this is just like return without parentheses, it emphasizes that it's not a function call, maybe it's a good idea." But it seems it's only legal to use it without parentheses for values; you need the parentheses when getting sizeof a type. cf. c89: http://web.archive.org/web/20040907153347/http://danpop.home.cern.ch/danpop… http://bytes.com/topic/c/answers/478596-using-sizeof-without-parentheses Does anybody feel strongly one way or the other?

2 1

Re: [PATCH 2/2] d3dxof: Use sizeof(GUID) instead of hardcoding the value.
by Rico Schüller 21 Oct '12

21 Oct '12

Why is there a "static guid" used in GetType? What happens if you query: hr = IDirectXFileData_GetType(lpDirectXFileData, &clsid_type); hr = IDirectXFileData_GetType(lpDirectXFileData2, &clsid_type2); Are thy both containing the value to clsid_type2 then? Do clsid_type and clsid_type2 match in that case to the same pointer both pointing to the same static guid? I don't see a test for this. Why doesn't *pguid = &This->pobj->type; do the job in that case? While trying to check the cases above, I got the following problem... Under which circumstances is the test_dump test run? It looks like the tests are never run because there is no objects.txt, see: hFile = CreateFileA("objects.txt", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) return; CloseHandle(hFile); All machines (http://test.winehq.org/data/tests/d3dxof:d3dxof.html) seem to run 107 tests or skip all of them, which is the same on my machine (I got 107 tests), so none of them is running the whole test_dump ... How is this supposed to work? Cheers Rico On 21.10.2012 14:50, Christian Costa wrote: > @@ -647,7 +647,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetType(IDirectXFileData* iface, cons > if (!pguid) > return DXFILEERR_BADVALUE; > > - memcpy(&guid, &This->pobj->type, 16); > + memcpy(&guid, &This->pobj->type, sizeof(GUID)); > *pguid = &guid; > > return DXFILE_OK;

2 1

Re: [PATCH] user32: Fix error handling in MapWindowPoints, ClientToScreen and ScreenToClient and add tests for them. (try 2)
by Rico Schüller 21 Oct '12

21 Oct '12

I think we also need a test to prove that "return MapWindowPoints( hwnd, 0, lppnt, 1 ) != 0;" is wrong. I'd probably split the changes to ScreenToClient/ClientToScreen and MapWindowPoints, because they are not necessarily bound together. What about something like: wnd2 = CreateWindow("static", "wnd2", WS_POPUP, 0, 0, 150, 150, NULL, NULL, NULL, NULL); ok(wnd2 != NULL, "CreateWindow failed\n"); SetLastError(0xdeadbeef); p.x = p.y = 0; ret = ScreenToClient(wnd2, &p); err = GetLastError(); ok(ret, "ScreenToClient() failed\n"); ok(p.x == 0 && p.y == 0, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 0, 0); ok(err == 0xdeadbeef, "GetLastError failed, got %x, expected %x\n", err, 0xdeadbeef); Also msdn says: "Do not use ScreenToClient when in a mirroring situation, that is, when changing from left-to-right layout to right-to-left layout. Instead, use MapWindowPoints. For more information, see "Window Layout and Mirroring" in Window Features." We may also check that case. So they may not share the exact same steps. Cheers Rico On 20.10.2012 12:27, Christian Costa wrote: > Based ont a patch of Rico Schuller. > > Try 2: > - Test window handle in ClienToScreen and ScreenToClient instead of relying on GetLastError(). > - Don't rename params. > --- > dlls/user32/tests/win.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++ > dlls/user32/winpos.c | 28 +++++- > 2 files changed, 237 insertions(+), 4 deletions(-)

2 3

Re: [PATCH 1/1] d3dx9/tests: Move device creation to main func.
by Henri Verbeet 21 Oct '12

21 Oct '12

2012/10/21 Rico Schüller <kgbricola(a)web.de>: > --- We've generally been moving in the opposite direction for the D3D tests, having each set of tests create its own device, window, etc. instead. This makes the tests much more self-contained, which in turn makes it much easier to debug if you have failures on some setup. I.e., you don't have to worry about some obscure render state that was set 15 tests ago, but affects every test in between, or some memory corruption due to a driver bug that only becomes visible when you're adding a new test. The ddraw/d3d8/d3d9 visual tests are particular bad in that regard. See also e.g. ddraw:ddraw7, etc., or to a lesser extent some of the more recent d3d8/d3d9:device tests.

2 1

Re: [PATCH] wineboot: detect correct processor name and vendorID, use Intel Pentium 4 as fallback
by Eric Pouech 20 Oct '12

20 Oct '12

Le 20/10/2012 12:42, Patrick Rudolph a écrit : > This patch need lots of testing, since I can only test it on linux > using an Intel CPU. > Please tests on other OS and systems, too. please use the ntdll or kernel32 relevant API so that you don't have to copy the same code A+

3 4

Re: [PATCH] user32: Fix error handling in MapWindowPoints, ClientToScreen and ScreenToClient and add tests for them.
by Dmitry Timoshkov 20 Oct '12

20 Oct '12

Christian Costa <titan.costa(a)gmail.com> wrote: > -BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) > +BOOL WINAPI ClientToScreen( HWND wnd, LPPOINT point ) > { > - MapWindowPoints( hwnd, 0, lppnt, 1 ); > + DWORD error = GetLastError(); > + > + if (!wnd) > + { > + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); > + return FALSE; > + } > + > + SetLastError( 0xdeadbeef ); > + MapWindowPoints( wnd, 0, point, 1 ); > + > + if (GetLastError() != 0xdeadbeef) > + return FALSE; > + > + SetLastError(error); > return TRUE; > } All this logic with saving/restoring last error code is wrong (here and in another places), there is no need for that. -- Dmitry.

2 1

Re: [PATCH] user32: Fix error handling in MapWindowPoints, ClientToScreen and ScreenToClient and add tests for them.
by Dmitry Timoshkov 20 Oct '12

20 Oct '12

Christian Costa <titan.costa(a)gmail.com> wrote: > -BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt ) > +BOOL WINAPI ScreenToClient( HWND wnd, LPPOINT point ) Please stick to commonly used 'hwnd' for a window handle, renaming 'lppnt' to 'point' is also not justified. -- Dmitry.

2 1

Re: [PATCH 6/6] dsound: remove now unused variables
by Andrew Eikum 19 Oct '12

19 Oct '12

Be nice if you could split this up and squash it into the previous patches. Andrew On Tue, Oct 16, 2012 at 02:06:30PM +0200, Maarten Lankhorst wrote: > From: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> > > No longer influence anything, so zap them. > --- > dlls/dsound/dsound_main.c | 17 ----------------- > dlls/dsound/dsound_private.h | 4 ---- > 2 files changed, 21 deletions(-) > > diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c > index 3fded64..607c3d4 100644 > --- a/dlls/dsound/dsound_main.c > +++ b/dlls/dsound/dsound_main.c > @@ -29,7 +29,6 @@ > * Handle static buffers - put those in hardware, non-static not in hardware > * Hardware DuplicateSoundBuffer > * Proper volume calculation for 3d buffers > - * Remove DS_HEL_FRAGS and use mixer fragment length for it > */ > > #include <stdarg.h> > @@ -92,9 +91,6 @@ WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; > > /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ > int ds_hel_buflen = 32768 * 2; > -int ds_snd_queue_max = 10; > -int ds_default_sample_rate = 44100; > -int ds_default_bits_per_sample = 16; > static HINSTANCE instance; > > /* > @@ -147,23 +143,10 @@ void setup_dsound_options(void) > if (!get_config_key( hkey, appkey, "HelBuflen", buffer, MAX_PATH )) > ds_hel_buflen = atoi(buffer); > > - if (!get_config_key( hkey, appkey, "SndQueueMax", buffer, MAX_PATH )) > - ds_snd_queue_max = atoi(buffer); > - > - > - if (!get_config_key( hkey, appkey, "DefaultSampleRate", buffer, MAX_PATH )) > - ds_default_sample_rate = atoi(buffer); > - > - if (!get_config_key( hkey, appkey, "DefaultBitsPerSample", buffer, MAX_PATH )) > - ds_default_bits_per_sample = atoi(buffer); > - > if (appkey) RegCloseKey( appkey ); > if (hkey) RegCloseKey( hkey ); > > TRACE("ds_hel_buflen = %d\n", ds_hel_buflen); > - TRACE("ds_snd_queue_max = %d\n", ds_snd_queue_max); > - TRACE("ds_default_sample_rate = %d\n", ds_default_sample_rate); > - TRACE("ds_default_bits_per_sample = %d\n", ds_default_bits_per_sample); > } > > static const char * get_device_id(LPCGUID pGuid) > diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h > index 7817b88..bdd3a37 100644 > --- a/dlls/dsound/dsound_private.h > +++ b/dlls/dsound/dsound_private.h > @@ -31,10 +31,6 @@ > #include "wine/list.h" > > extern int ds_hel_buflen DECLSPEC_HIDDEN; > -extern int ds_snd_queue_max DECLSPEC_HIDDEN; > -extern int ds_snd_shadow_maxsize DECLSPEC_HIDDEN; > -extern int ds_default_sample_rate DECLSPEC_HIDDEN; > -extern int ds_default_bits_per_sample DECLSPEC_HIDDEN; > > /***************************************************************************** > * Predeclare the interface implementation structures > -- > 1.7.11.3 > > >

1 0

Re: [PATCH 3/5] wined3d: Implement WINED3DSIH_ROUND_NI in the GLSL shader backend.
by Matteo Bruni 19 Oct '12

19 Oct '12

2012/10/18 Henri Verbeet <hverbeet(a)codeweavers.com>: > --- > dlls/wined3d/glsl_shader.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index 57119e1..993b547 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -2530,6 +2530,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) > case WINED3DSIH_EXP: instruction = "exp2"; break; > case WINED3DSIH_DSX: instruction = "dFdx"; break; > case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; > + case WINED3DSIH_ROUND_NI: instruction = "floor"; break; Hmm, does ROUND_NI really translate to floor() (as opposed to round()) or is that because round() is not supported in GLSL 1.20? In the latter case maybe a FIXME would help.

2 2

Re: ntdll: Don't use strncasecmp for _strnicmp implementation
by Marcus Meissner 19 Oct '12

19 Oct '12

On Tue, Oct 16, 2012 at 12:38:51PM +0200, Jacek Caban wrote: > --- > dlls/ntdll/string.c | 12 +++++++++++- > dlls/ntdll/tests/string.c | 33 +++++++++++++++++++++++++++++++++ > 2 files changed, 44 insertions(+), 1 deletions(-) > > > diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c > index 716dbdf..288e910 100644 > --- a/dlls/ntdll/string.c > +++ b/dlls/ntdll/string.c > @@ -254,7 +254,17 @@ int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) > */ > int __cdecl _strnicmp( LPCSTR str1, LPCSTR str2, size_t n ) > { > - return strncasecmp( str1, str2, n ); > + int ret = 0; > + > + /* 32-bit Windows return only -1,0,1 values */ > + while(n--) { > + if(!*str1) > + return sizeof(void*) == 4 ? (*str2 ? -1 : 0) : -(unsigned char)*str2; > + if((ret = tolower(*str1++) - tolower(*str2++))) > + return sizeof(void*) == 4 ? (ret > 0 ? 1 : -1) : ret; > + } Errm. Why not int ret = strncasecmp( str1, str2, n ); if (ret < 0 ) return -1; if (ret > 0 ) return 1; return 0; Ciao, Marcus

3 5

Re: vcomp: single-threaded implementation of _vcomp_fork (try 6)
by Alexandre Julliard 19 Oct '12

19 Oct '12

Dan Kegel <dank(a)kegel.com> writes: > +void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) > +{ > + __ms_va_list valist; > + TRACE("(%d, %d, %p, ...)\n", ifval, nargs, wrapper); > + __ms_va_start(valist, wrapper); > + _vcomp_fork_call_wrapper(wrapper, nargs, valist); > + __ms_va_end(valist); > +} It's not a real varargs function, as you noted in the comments, so it's ugly to use varargs only as a hack to get a pointer to the first argument. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/3] ntdll: Implement nanosecond precision file time storage.
by Alexandre Julliard 19 Oct '12

19 Oct '12

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > This series of patches provides a fix for Bug #31858 (Netflix Internet > Connection Problem). With this particular patch the POSIX.1-2008 > futimens() function is used to replace the BSD futimes() function, > allowing for nanosecond precision of recorded file times. This would need a configure check. -- Alexandre Julliard julliard(a)winehq.org

1 0

"Survey about gaming on linux"
by Saulius Krasuckas 19 Oct '12

19 Oct '12

The post: http://www.linuxforums.org/forum/coffee-lounge/192526-survey-about-gaming-l… The results containing one item about using Wine: https://docs.google.com/spreadsheet/viewanalytics?formkey=dEI5dEx1SGw5TEJMW… S.

2 1

Re: [PATCH] user32: Add tests showing that MapWindowPoints, ClientToScreen and ScreenToClient never fail.
by Daniel Santos 19 Oct '12

19 Oct '12

On 10/16/2012 01:12 PM, Christian Costa wrote: > + /* Choose point inside the client area */ > + point.x = rect.right / 2 - 50; > + point.y = rect.bottom / 2 - 50; > + ret = ScreenToClient(wnd, &point); > + ok(ret, "ScreenToClient failed with %#x\n", GetLastError()); > + ret = MapWindowPoints(NULL, wnd, &point, 1); > + ok(ret, "MapWindowPoints failed with %#x\n", GetLastError()); > + > + /* Choose point outside the client area */ > + point.x = rect.right / 2 + 50; > + point.y = rect.bottom / 2 + 50; > + ret = ScreenToClient(wnd, &point); > + ok(ret, "ScreenToClient failed with %#x\n", GetLastError()); > + ret = MapWindowPoints(NULL, wnd, &point, 1); > + ok(ret, "MapWindowPoints failed with %#x\n", GetLastError()); When I do these tests, I like throwing every stupid thing I can possibly come up with (and I'm gifted and coming up with stupid things) but always get shot down because I can't produce an example of a real-world app doing it. So here's one from LoTRO: 8.385:0009:Call user32.ScreenToClient(00000000,0033fd68) ret=006d4d87 And if you don't return zero when it does this, the game crashes resulting in my in-box filling up from desperate game addicts posting to appdb. So if you can please include the below in your patch, I can omit it from mine (see http://bugs.winehq.org/show_bug.cgi?id=31979) and thank you! + /* LoTRO will do this and crash if we don't return zero, precious indeed! */ + ret = ScreenToClient( NULL, &point ); + ok(!ret, "ScreenToClient didn't fail as expected (got %d)\n", ret); Daniel

3 3

Re: [PATCH 2/7] gdi32/tests: Fixed broken bitmap font metrics test on CJK locales.
by Qian Hong 18 Oct '12

18 Oct '12

Hello, On Fri, Oct 19, 2012 at 2:11 AM, Qian Hong <fracting(a)gmail.com> wrote: > Including Arabic, Chinese, English, Dutch, Japanese, Russian > Forgot to say, we have no Korean system in our testbot vms, so I tested this patch locally with Korean Windows 8 preview. -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

1 0

Re: jscript: Don't release possible NULL pointer (coverity)
by Jacek Caban 18 Oct '12

18 Oct '12

Hi André, On 10/18/12 00:14, André Hentschel wrote: > CID 735258 > > --- > dlls/jscript/regexp.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c > index bdff445..71474c7 100644 > --- a/dlls/jscript/regexp.c > +++ b/dlls/jscript/regexp.c > @@ -3378,7 +3378,9 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D > last_match = jsstr_alloc_len(str, len); > if(!last_match) > return E_OUTOFMEMORY; > - jsstr_release(ctx->last_match); > + > + if(ctx->last_match) > + jsstr_release(ctx->last_match); > ctx->last_match = last_match; ctx->last_match should always be a valid string. I guess coverity is confused by earlier compare to NULL, which is a leftover after string representation change. We should use jsstr_t here to avoid allocation anyway, I will send a patch. Thanks, Jacek

1 0

Re: (resend) programs/winemenubuilder: scale 64x64 classic icons to 48x48 for Icns format
by Ken Thomases 18 Oct '12

18 Oct '12

On Oct 16, 2012, at 2:15 PM, Aric Stewart wrote: > @@ -1052,6 +1079,7 @@ static inline int size_to_slot(int size) > case 16: return 0; > case 32: return 1; > case 48: return 2; > + case 64: return 2; /* Classic Mode */ > case 128: return 3; > case 256: return 4; > case 512: return 5; If an ICO has both a 48x48 and a 64x64 entry (improbable, I know), then the 48x48 should be preferred. So, you need additional logic to pick the best index for a slot in platform_write_icon(). Track the best-so-far's width and prefer the smaller. Beyond that, perhaps the scaling should be put into the ICNS encoder rather than convert_to_native_icon(). That is, if it's handed a size that doesn't fit properly into one of the predefined slots, it would scale down to the next lower size. Although it might be better to synthesize a 32x32 rather than a 48x48 from a 64x64. *shrug* -Ken

5 6

Re: advapi32: Only require a domain in the username for CRED_PERSIST_ENTERPRISE credentials.
by Marvin 18 Oct '12

18 Oct '12

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=22306 Your paranoid android. === WXPPROSP3 (32 bit cred) === cred.c:128: Test failed: CredWriteA failed with error 2202 cred.c:131: Test failed: CredDeleteA failed with error 1168 cred.c:135: Test failed: CredWriteA failed with error 1312 cred.c:138: Test failed: CredDeleteA failed with error 1168 cred.c:149: Test failed: CredWriteA failed with error 2202 cred.c:152: Test failed: CredDeleteA failed with error 1168 === W2K3R2SESP2 (32 bit cred) === cred.c:128: Test failed: CredWriteA failed with error 2202 cred.c:131: Test failed: CredDeleteA failed with error 1168 cred.c:135: Test failed: CredWriteA failed with error 1312 cred.c:138: Test failed: CredDeleteA failed with error 1168 cred.c:149: Test failed: CredWriteA failed with error 2202 cred.c:152: Test failed: CredDeleteA failed with error 1168

1 0

Re: msvcp: free facet and _Locimp in Locimp dtor
by Piotr Caban 18 Oct '12

18 Oct '12

On 10/17/12 02:35, Daniel Lehman wrote: @@ -7241,10 +7241,11 @@ void __thiscall locale__Locimp_dtor(locale__Locimp *this) MSVCP_size_t i; for(i=0; i<this->facet_cnt; i++) if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) - call_locale_facet_vector_dtor(this->facetvec[i], 0); + call_locale_facet_vector_dtor(this->facetvec[i], 1); MSVCRT_operator_delete(this->facetvec); MSVCP_basic_string_char_dtor(&this->name); + MSVCRT_operator_delete(this); } } Memory allocated for locale__Locimp object should be freed in locale class (locale_dtor function). You can't delete it here. Cheers, Piotr

2 4

Re: gdiplus: fix font test when liberation fonts are installed
by Dmitry Timoshkov 18 Oct '12

18 Oct '12

Austin English <austinenglish(a)gmail.com> wrote: > + ok(!lstrcmp(lf.lfFaceName, "Arial") || > + !lstrcmp(lf.lfFaceName, "Liberation Sans"), "wrong face name %s\n", lf.lfFaceName); The tests are supposed to reflect Windows behaviour, what Windows version does return "Liberation Sans" in this test? -- Dmitry.

2 2

re: [PATCH 4/6] [cmd] Add for /f parsingkeyword parsing, add support for skip=
by Dan Kegel 17 Oct '12

17 Oct '12

Jason wrote: >>It's clearly time to start splitting WCMD_for into several helper functions. > > I completely agree, and it was definitely on my radar to do... its really > ugly code in there (I take responsibility for a lot of that!) as it has > been a slow incremental increase in what we actually supported... I was > aiming to get a set of working /f tests before I did such a reshuffle as > that is the last of the functionality that for was missing (ie I could > ensure I keep it all working), but will prioritize it if you want it before > that. Seems like it makes sense to add as many tests as possible before refactoring, but if they're messy to submit without also fixing the problems they find, go ahead and keep them local for now... just don't forget to submit them asap. I must say, it's awesome how you're tearing into the cmd problems! - Dan

1 0

Re: shell32/tests: Test ShellExecute()'s URL handling.
by Marvin 17 Oct '12

17 Oct '12

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=22302 Your paranoid android. === WNT4WSSP6 (32 bit shlexec) === shlexec.c:1800: Test failed: ShellExecute(file="notaproto://foo") succeeded: rc=2 shlexec.c:1803: Test failed: ShellExecute(file="fakeproto://foo/bar") expected SE_ERR_ACCESSDENIED got rc=2 shlexec.c:152: Test failed: ShellExecute(file="shlproto://foo/bar") Got different return value with empty string: 42 2 shlexec.c:152: Test failed: ShellExecute(file="shlproto://foo/bar.lnk") Got different return value with empty string: 42 2 shlexec.c:137: Test failed: ShellExecute(file="file://shlproto://foo/bar") WaitForSingleObject returned 258 shlexec.c:152: Test failed: ShellExecute(file="file://shlproto://foo/bar") Got different return value with empty string: 42 2 shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=42 === W2KPROSP4 (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=5 === WVISTAADM (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W2K8SE (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W7PRO (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W7PROX64 (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === TEST64_W7SP1 (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W7PROX64 (64 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === TEST64_W7SP1 (64 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2

1 0

Re: [PATCH] winmm: Load winealsa if winepulse is found
by Austin English 17 Oct '12

17 Oct '12

On Tue, Oct 16, 2012 at 5:10 AM, Maarten Lankhorst <m.b.lankhorst(a)gmail.com> wrote: > From: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> > > Fixes midi on winepulse > --- > dlls/winmm/lolvldrv.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c > index f387323..3b1be27 100644 > --- a/dlls/winmm/lolvldrv.c > +++ b/dlls/winmm/lolvldrv.c > @@ -543,7 +543,10 @@ static void MMDRV_Init(void) > drvA = HeapAlloc(GetProcessHeap(), 0, size); > WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, drvA, size, NULL, NULL); > > - MMDRV_Install(drvA, drvA, FALSE); > + if (!strcasecmp(drvA, "winepulse.drv")) > + MMDRV_Install("winealsa.drv", "winealsa.drv", 0); > + else > + MMDRV_Install(drvA, drvA, FALSE); > > HeapFree(GetProcessHeap(), 0, drvA); > PropVariantClear(&pv); > -- > 1.7.11.3 Shouldn't this be part of the winepulse patch itself? It will never get used in Wine, as is... -- -Austin

2 1

Re: d3dx9_36 [patch 1/3]: Fix the case out = in for D3DXSHRotateZ
by Nozomi Kodama 17 Oct '12

17 Oct '12

My bad. My patch pass the tests but not yours. Can you check these facts? Nozomi >Hi Nozomi, > >the huge arrays, the loop, it looks a bit ugly. Your implementation makes the D3DXSHRotateZ function a >bit more compatible. What comes into my mind is: >D3DXSHRotateZ(out, y, 1,25f, in); >D3DXSHRotateZ(out, y, 1,25f, out); >D3DXSHRotateZ(out, y, 1,25f, &out[x]); // x ... 1 - y * y >D3DXSHRotateZ(&out[x], y, 1,25f, out); // x ... 1 - y * y > >Do the last 2 also work and are they producing the same values as native? > >Attached is a simple hack to succeed your test, it has some major stuff which needs to be fixed first, but >nevertheless, please have a look. I think the implementation could be a lot smaller and faster. What do you >think? I'd like to hear your opinion, before you try to send a patch. >+FLOAT * WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in) >There is a double space after "order,". > >Cheers >Rico

2 2

Re: (try 3) programs/winemenubuilder: scale 64x64 classic icons to 48x48 for Icns format
by Ken Thomases 17 Oct '12

17 Oct '12

On Oct 17, 2012, at 9:50 AM, Aric Stewart wrote: > - if (iconDirEntries[i].wBitCount >= best[slot].maxBits) > + if (((best[slot].maxBits && !scaled) || (!best[slot].maxBits) || (scaled && best[slot].scaled)) && (iconDirEntries[i].wBitCount >= best[slot].maxBits || (!scaled && best[slot].scaled))) This could be more clearly written as: if ((!scaled || !best[slot].maxBits || best[slot].scaled) && (iconDirEntries[i].wBitCount >= best[slot].maxBits || (!scaled && best[slot].scaled))) or even: if (scaled && best[slot].maxBits && !best[slot].scaled) continue; /* don't replace unscaled with scaled */ if (iconDirEntries[i].wBitCount >= best[slot].maxBits || (!scaled && best[slot].scaled)) That is, your left side of the outer && has redundancies and all the negatives make it hard to penetrate. -Ken

1 0

Re: [PATCH 4/6] [cmd] Add for /f parsingkeyword parsing, add support for skip=
by Alexandre Julliard 17 Oct '12

17 Oct '12

Ann and Jason Edmeades <jason(a)edmeades.me.uk> writes: > Parse the options you can provide with for /f to control the > subsequent parsing, and add support for the simplest (skip). > @@ -1546,6 +1545,13 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { > int itemNum; > CMD_LIST *thisCmdStart; > int parameterNo = 0; > + WCHAR forf_eol=0; > + int forf_skip=0; > + WCHAR forf_delims[256]; > + WCHAR forf_tokens[MAXSTRING]; > + BOOL forf_usebackq = FALSE; > + static const WCHAR forf_defaultdelims[] = {' ', '\t'}; > + static const WCHAR forf_defaulttokens[] = {'1'}; It's clearly time to start splitting WCMD_for into several helper functions. -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH] krnl386.exe: Implement INT 33h function 15h
by Christian Costa 17 Oct '12

17 Oct '12

1 0

Re: [PATCH 20/25] mciseq: Check stop condition after sleeping. (Try 5)
by Marcus Meissner 17 Oct '12

17 Oct '12

On Wed, Oct 17, 2012 at 10:36:44AM +0200, Joerg-Cyril.Hoehle(a)t-systems.com wrote: > Please note that the patch queue failed to detect some superseded patches: > > 90588: I should not have named that 17/25 in the first place. > 90672 + 90674: the original 20-21/25 were never marked superseded by later patches. > 90841+ 90482: try 3 was superseded by try 4, now superseded by this try 5. I would suggest to resubmit your queue in smaller batches (like eg. 5 pieces per day) and wait for it to get applied. In the current state testbot will not be run on the sequence I think. Ciao, Marcus

1 0

Re: testbot/lib: If we cannot open the log file, then log to stderr.
by Christian Costa 17 Oct '12

17 Oct '12

Hi François, While your are at it. I would like to do a suggestion. Indeed that would be great to be able to download some files along with the test. Typically for me avi files and dlls (or .drv) would be great ! :D Thanks Christian, 2012/10/15 Francois Gouget <fgouget(a)codeweavers.com> > --- > testbot/lib/WineTestBot/Log.pm | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/testbot/lib/WineTestBot/Log.pm > b/testbot/lib/WineTestBot/Log.pm > index 6883968..7de6dcb 100644 > --- a/testbot/lib/WineTestBot/Log.pm > +++ b/testbot/lib/WineTestBot/Log.pm > @@ -38,20 +38,18 @@ sub LogMsg(@) > if (!defined $logfile) > { > my $oldumask = umask(002); > - if (open($logfile, ">>", "$LogDir/log")) > - { > - # Flush after each print > - my $tmp=select($logfile); > - $| = 1; > - select($tmp); > - } > - else > + if (!open($logfile, ">>", "$LogDir/log")) > { > require File::Basename; > print STDERR File::Basename::basename($0), ":warning: could not > open '$LogDir/log' for writing: $!\n"; > - $logfile = undef; > + open($logfile, ">>&=", 2); > } > umask($oldumask); > + > + # Flush after each print > + my $tmp=select($logfile); > + $| = 1; > + select($tmp); > } > print $logfile scalar localtime, " ", @_ if ($logfile); > } > -- > 1.7.10.4 > > > >

4 10

Re: [PATCH 3/3] mshtml: Added more ActiveX loading and script binding tests
by Marvin 17 Oct '12

17 Oct '12

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

1 0

Tr : d3dx9_36 [patch 1/3]: Fix the case out = in for D3DXSHRotateZ
by Nozomi Kodama 17 Oct '12

17 Oct '12

Hi Both your patch and mine fail to pass the attached tests. More thoughts are needed. Nozomi >Hi Nozomi, > >the huge arrays, the loop, it looks a bit ugly. Your implementation makes the D3DXSHRotateZ function a >bit more compatible. What comes into my mind is: >D3DXSHRotateZ(out, y, 1,25f, in); >D3DXSHRotateZ(out, y, 1,25f, out); >D3DXSHRotateZ(out, y, 1,25f, &out[x]); // x ... 1 - y * y >D3DXSHRotateZ(&out[x], y, 1,25f, out); // x ... 1 - y * y > >Do the last 2 also work and are they producing the same values as native? > >Attached is a simple hack to succeed your test, it has some major stuff which needs to be fixed first, but >nevertheless, please have a look. I think the implementation could be a lot smaller and faster. What do you >think? I'd like to hear your opinion, before you try to send a patch. > >+FLOAT * WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in) >There is a double space after "order,". > >Cheers >Rico

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel