October 2005 - Wine-commits

wine/dlls/gdi tests/metafile.c tests/Makefile. ...
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20988 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 04:05:53 Modified files: dlls/gdi/tests : metafile.c Makefile.in .cvsignore dlls/gdi/enhmfdrv: init.c dc.c dlls/gdi : dc.c Added files: dlls/gdi/tests : dc.c Log message: Huw Davies <huw(a)codeweavers.com> Fix handling of relative state indices in RestoreDC. Fix return value of SaveDC when writing to an emf. Before writing the EMR_EOF record we should ensure that we clear the state stack. Patch: http://cvs.winehq.org/patch.py?id=20988 Old revision New revision Changes Path 1.18 1.19 +111 -4 wine/dlls/gdi/tests/metafile.c 1.9 1.10 +1 -0 wine/dlls/gdi/tests/Makefile.in 1.9 1.10 +1 -0 wine/dlls/gdi/tests/.cvsignore Added 1.1 +0 -0 wine/dlls/gdi/tests/dc.c 1.32 1.33 +3 -0 wine/dlls/gdi/enhmfdrv/init.c 1.9 1.10 +9 -13 wine/dlls/gdi/enhmfdrv/dc.c 1.13 1.14 +13 -14 wine/dlls/gdi/dc.c

1 0

wine/dlls/ddraw opengl_private.h light.c direc ...
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20987 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 04:05:15 Modified files: dlls/ddraw : opengl_private.h light.c direct3d_opengl.c Log message: Christian Costa <titan.costa(a)wanadoo.fr> Finish moving d3d[1..3] light code to use d3d7. Patch: http://cvs.winehq.org/patch.py?id=20987 Old revision New revision Changes Path 1.2 1.3 +2 -9 wine/dlls/ddraw/opengl_private.h 1.2 1.3 +31 -25 wine/dlls/ddraw/light.c 1.2 1.3 +2 -21 wine/dlls/ddraw/direct3d_opengl.c Index: wine/dlls/ddraw/opengl_private.h diff -u -p wine/dlls/ddraw/opengl_private.h:1.2 wine/dlls/ddraw/opengl_private.h:1.3 --- wine/dlls/ddraw/opengl_private.h 31 Oct 2005 10: 5:15 -0000 +++ /dev/null 31 Oct 2005 10: 5:15 -0000 @@ -48,16 +48,9 @@ typedef enum { /* This structure is used for the 'd3d_private' field of the IDirectDraw structure */ typedef struct IDirect3DGLImpl { - DWORD free_lights; - void (*light_released)(IDirectDrawImpl *, GLenum light_num); + int dummy; /* Empty for the moment */ } IDirect3DGLImpl; -typedef struct IDirect3DLightGLImpl -{ - struct IDirect3DLightImpl parent; - GLenum light_num; -} IDirect3DLightGLImpl; - /* This structure is used for the 'private' field of the IDirectDrawSurfaceImpl structure */ typedef struct IDirect3DTextureGLImpl { @@ -185,7 +178,7 @@ extern GL_EXTENSIONS_LIST GL_extensions; /* All non-static functions 'exported' by various sub-objects */ extern HRESULT direct3d_create(IDirectDrawImpl *This); extern HRESULT d3dtexture_create(IDirectDrawImpl *d3d, IDirectDrawSurfaceImpl *surf, BOOLEAN at_creation, IDirectDrawSurfaceImpl *main_surf); -extern HRESULT d3dlight_create(IDirect3DLightImpl **obj, IDirectDrawImpl *d3d, GLenum light_num); +extern HRESULT d3dlight_create(IDirect3DLightImpl **obj, IDirectDrawImpl *d3d); extern HRESULT d3dexecutebuffer_create(IDirect3DExecuteBufferImpl **obj, IDirectDrawImpl *d3d, IDirect3DDeviceImpl *d3ddev, LPD3DEXECUTEBUFFERDESC lpDesc); extern HRESULT d3dmaterial_create(IDirect3DMaterialImpl **obj, IDirectDrawImpl *d3d); extern HRESULT d3dviewport_create(IDirect3DViewportImpl **obj, IDirectDrawImpl *d3d); Index: wine/dlls/ddraw/light.c diff -u -p wine/dlls/ddraw/light.c:1.2 wine/dlls/ddraw/light.c:1.3 --- wine/dlls/ddraw/light.c 31 Oct 2005 10: 5:16 -0000 +++ /dev/null 31 Oct 2005 10: 5:16 -0000 @@ -156,54 +156,63 @@ Main_IDirect3DLightImpl_1_GetLight(LPDIR * Light static functions */ -static void update(IDirect3DLightImpl* This) { +static void update(IDirect3DLightImpl* This) +{ IDirect3DDeviceImpl* device; - if (!This->active_viewport||!This->active_viewport->active_device) + + TRACE("(%p)\n", This); + + if (!This->active_viewport || !This->active_viewport->active_device) return; device = This->active_viewport->active_device; - IDirect3DDevice7_SetLight(ICOM_INTERFACE(device,IDirect3DDevice7),This->dwLightIndex,&(This->light7)); + + IDirect3DDevice7_SetLight(ICOM_INTERFACE(device,IDirect3DDevice7), This->dwLightIndex, &(This->light7)); } -static void activate(IDirect3DLightImpl* This) { - IDirect3DLightGLImpl *glThis = (IDirect3DLightGLImpl *) This; +static void activate(IDirect3DLightImpl* This) +{ + IDirect3DDeviceImpl* device; TRACE("(%p)\n", This); + + if (!This->active_viewport || !This->active_viewport->active_device) + return; + device = This->active_viewport->active_device; - ENTER_GL(); update(This); /* If was not active, activate it */ - if ((glThis->parent.light.dwFlags & D3DLIGHT_ACTIVE) == 0) { - glEnable(glThis->light_num); - glThis->parent.light.dwFlags |= D3DLIGHT_ACTIVE; + if ((This->light.dwFlags & D3DLIGHT_ACTIVE) == 0) { + IDirect3DDevice7_LightEnable(ICOM_INTERFACE(device,IDirect3DDevice7), This->dwLightIndex, TRUE); + This->light.dwFlags |= D3DLIGHT_ACTIVE; } - LEAVE_GL(); } -static void desactivate(IDirect3DLightImpl* This) { - IDirect3DLightGLImpl *glThis = (IDirect3DLightGLImpl *) This; - +static void desactivate(IDirect3DLightImpl* This) +{ + IDirect3DDeviceImpl* device; + TRACE("(%p)\n", This); + + if (!This->active_viewport || !This->active_viewport->active_device) + return; + device = This->active_viewport->active_device; - ENTER_GL(); /* If was not active, activate it */ - if ((glThis->parent.light.dwFlags & D3DLIGHT_ACTIVE) != 0) { - glDisable(glThis->light_num); - glThis->parent.light.dwFlags &= ~D3DLIGHT_ACTIVE; + if ((This->light.dwFlags & D3DLIGHT_ACTIVE) != 0) { + IDirect3DDevice7_LightEnable(ICOM_INTERFACE(device,IDirect3DDevice7), This->dwLightIndex, FALSE); + This->light.dwFlags &= ~D3DLIGHT_ACTIVE; } - LEAVE_GL(); } ULONG WINAPI GL_IDirect3DLightImpl_1_Release(LPDIRECT3DLIGHT iface) { ICOM_THIS_FROM(IDirect3DLightImpl, IDirect3DLight, iface); - IDirect3DLightGLImpl *glThis = (IDirect3DLightGLImpl *) This; ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p/%p)->() decrementing from %lu.\n", This, iface, ref + 1); if (!ref) { - ((IDirect3DGLImpl *) This->d3d->d3d_private)->light_released(This->d3d, glThis->light_num); HeapFree(GetProcessHeap(), 0, This); return 0; } @@ -233,14 +242,12 @@ static const IDirect3DLightVtbl VTABLE_I -HRESULT d3dlight_create(IDirect3DLightImpl **obj, IDirectDrawImpl *d3d, GLenum light_num) +HRESULT d3dlight_create(IDirect3DLightImpl **obj, IDirectDrawImpl *d3d) { IDirect3DLightImpl *object; - IDirect3DLightGLImpl *gl_object; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DLightGLImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DLightImpl)); if (object == NULL) return DDERR_OUTOFMEMORY; - gl_object = (IDirect3DLightGLImpl *) object; object->ref = 1; object->d3d = d3d; @@ -249,7 +256,6 @@ HRESULT d3dlight_create(IDirect3DLightIm object->desactivate = desactivate; object->update = update; object->active_viewport = NULL; - gl_object->light_num = light_num; ICOM_INIT_INTERFACE(object, IDirect3DLight, VTABLE_IDirect3DLight); Index: wine/dlls/ddraw/direct3d_opengl.c diff -u -p wine/dlls/ddraw/direct3d_opengl.c:1.2 wine/dlls/ddraw/direct3d_opengl.c:1.3 --- wine/dlls/ddraw/direct3d_opengl.c 31 Oct 2005 10: 5:16 -0000 +++ /dev/null 31 Oct 2005 10: 5:16 -0000 @@ -97,22 +97,12 @@ GL_IDirect3DImpl_3_2T_1T_CreateLight(LPD IUnknown* pUnkOuter) { ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D3, iface); - IDirect3DGLImpl *glThis = (IDirect3DGLImpl *) This->d3d_private; - int fl; IDirect3DLightImpl *d3dlimpl; HRESULT ret_value; TRACE("(%p/%p)->(%p,%p)\n", This, iface, lplpDirect3DLight, pUnkOuter); - for (fl = 0; fl < MAX_LIGHTS; fl++) { - if ((glThis->free_lights & (0x01 << fl)) != 0) { - glThis->free_lights &= ~(0x01 << fl); - break; - } - } - if (fl == MAX_LIGHTS) { - return DDERR_INVALIDPARAMS; /* No way to say 'max lights reached' ... */ - } - ret_value = d3dlight_create(&d3dlimpl, This, GL_LIGHT0 + fl); + + ret_value = d3dlight_create(&d3dlimpl, This); *lplpDirect3DLight = ICOM_INTERFACE(d3dlimpl, IDirect3DLight); return ret_value; @@ -306,12 +296,6 @@ GL_IDirect3DImpl_7_3T_CreateVertexBuffer return res; } -static void light_released(IDirectDrawImpl *This, GLenum light_num) -{ - IDirect3DGLImpl *glThis = (IDirect3DGLImpl *) This->d3d_private; - glThis->free_lights |= (light_num - GL_LIGHT0); -} - #if !defined(__STRICT_ANSI__) && defined(__GNUC__) # define XCAST(fun) (typeof(VTABLE_IDirect3D7.fun)) #else @@ -453,9 +437,6 @@ HRESULT direct3d_create(IDirectDrawImpl ICOM_INIT_INTERFACE(This, IDirect3D3, VTABLE_IDirect3D3); ICOM_INIT_INTERFACE(This, IDirect3D7, VTABLE_IDirect3D7); - globject->free_lights = (0x01 << MAX_LIGHTS) - 1; /* There are, in total, 8 lights in OpenGL */ - globject->light_released = light_released; - This->d3d_private = globject; TRACE(" creating OpenGL private storage at %p.\n", globject);

1 0

wine/dlls/kernel time.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20986 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 04:04:57 Modified files: dlls/kernel : time.c Log message: Marcus Meissner <meissner(a)suse.de> Define obsoleted CLK_TCK to CLOCKS_PER_SEC if not there. Patch: http://cvs.winehq.org/patch.py?id=20986 Old revision New revision Changes Path 1.55 1.56 +3 -0 wine/dlls/kernel/time.c Index: wine/dlls/kernel/time.c diff -u -p wine/dlls/kernel/time.c:1.55 wine/dlls/kernel/time.c:1.56 --- wine/dlls/kernel/time.c 31 Oct 2005 10: 4:57 -0000 +++ /dev/null 31 Oct 2005 10: 4:57 -0000 @@ -516,6 +516,9 @@ VOID WINAPI GetSystemTimeAsFileTime( * 2) Time is relative. There is no 'starting date', so there is * no need for offset correction, like in UnixTimeToFileTime */ +#ifndef CLK_TCK +# define CLK_TCK CLOCKS_PER_SEC +#endif static void TIME_ClockTimeToFileTime(clock_t unix_time, LPFILETIME filetime) { ULONGLONG secs = RtlEnlargedUnsignedMultiply( unix_time, 10000000 );

1 0

wine/dlls/odbccp32 odbccp32.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20985 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 04:04:13 Modified files: dlls/odbccp32 : odbccp32.c Log message: Hans Leidekker <hans(a)it.vu.nl> Improve the implementation of SQLConfigDataSource, SQLConfigDriver, SQLInstallDriver{,Ex}, SQLInstallerError and SQLInstallTranslator{,Ex}. Patch: http://cvs.winehq.org/patch.py?id=20985 Old revision New revision Changes Path 1.4 1.5 +199 -55 wine/dlls/odbccp32/odbccp32.c

1 0

wine/dlls/crypt32 tests/cert.c crypt32.spec cert.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20984 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 04:04:06 Modified files: dlls/crypt32/tests: cert.c dlls/crypt32 : crypt32.spec cert.c Log message: Juan Lang <juan_lang(a)yahoo.com> Implement CertSignSignature and CertVerifySignature(Ex). Patch: http://cvs.winehq.org/patch.py?id=20984 Old revision New revision Changes Path 1.10 1.11 +210 -0 wine/dlls/crypt32/tests/cert.c 1.31 1.32 +3 -2 wine/dlls/crypt32/crypt32.spec 1.20 1.21 +169 -0 wine/dlls/crypt32/cert.c

1 0

wine/dlls/winmm/tests wave.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20983 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 04:03:25 Modified files: dlls/winmm/tests: wave.c Log message: Robert Reif <reif(a)earthlink.net> Add waveOutPause/waveOutRestart test. Tighten up play duration test when ending too soon. Set VirtualFree size to 0. Patch: http://cvs.winehq.org/patch.py?id=20983 Old revision New revision Changes Path 1.52 1.53 +46 -23 wine/dlls/winmm/tests/wave.c Index: wine/dlls/winmm/tests/wave.c diff -u -p wine/dlls/winmm/tests/wave.c:1.52 wine/dlls/winmm/tests/wave.c:1.53 --- wine/dlls/winmm/tests/wave.c 31 Oct 2005 10: 3:25 -0000 +++ /dev/null 31 Oct 2005 10: 3:25 -0000 @@ -485,7 +485,7 @@ static void check_position(int device, H static void wave_out_test_deviceOut(int device, double duration, LPWAVEFORMATEX pwfx, DWORD format, DWORD flags, LPWAVEOUTCAPS pcaps, - BOOL interactive, BOOL sine) + BOOL interactive, BOOL sine, BOOL pause) { HWAVEOUT wout; HANDLE hevent; @@ -496,6 +496,8 @@ static void wave_out_test_deviceOut(int WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME; + double paused = 0.0; + double actual; hevent=CreateEvent(NULL,FALSE,FALSE,NULL); ok(hevent!=NULL,"CreateEvent(): error=%ld\n",GetLastError()); @@ -585,15 +587,31 @@ static void wave_out_test_deviceOut(int rc=waveOutWrite(wout, &frag, sizeof(frag)); ok(rc==MMSYSERR_NOERROR,"waveOutWrite(%s): rc=%s\n", dev_name(device),wave_out_error(rc)); + + if (pause) { + paused = duration / 2; + Sleep(paused * 1000); + rc=waveOutPause(wout); + ok(rc==MMSYSERR_NOERROR,"waveOutPause(%s): rc=%s\n", + dev_name(device),wave_out_error(rc)); + trace("pausing for %g seconds\n", paused); + Sleep(paused * 1000); + rc=waveOutRestart(wout); + ok(rc==MMSYSERR_NOERROR,"waveOutRestart(%s): rc=%s\n", + dev_name(device),wave_out_error(rc)); + } + WaitForSingleObject(hevent,INFINITE); - /* Check the sound duration was within 10% of the expected value */ + /* Check the sound duration was between -2% and +10% of the expected value */ end=GetTickCount(); + actual = (end - start) / 1000.0; if (winetest_debug > 1) - trace("sound duration=%ld\n",end-start); - ok(fabs(1000*duration-end+start)<=100*duration, - "The sound played for %ld ms instead of %g ms\n", - end-start,1000*duration); + trace("sound duration=%g ms\n",1000*actual); + ok((actual > (0.98 * (duration+paused))) && + (actual < (1.1 * (duration+paused))), + "The sound played for %g ms instead of %g ms\n", + 1000*actual,1000*(duration+paused)); check_position(device, wout, frag.dwBufferLength, pwfx); } @@ -723,7 +741,7 @@ static void wave_out_test_device(int dev format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; format.cbSize=0; wave_out_test_deviceOut(device,5.0,&format,WAVE_FORMAT_2M08,0,&capsA, - TRUE,TRUE); + TRUE,TRUE,FALSE); } else { format.wFormatTag=WAVE_FORMAT_PCM; format.nChannels=1; @@ -733,7 +751,9 @@ static void wave_out_test_device(int dev format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; format.cbSize=0; wave_out_test_deviceOut(device,1.0,&format,WAVE_FORMAT_2M08,0,&capsA, - TRUE,FALSE); + TRUE,FALSE,FALSE); + wave_out_test_deviceOut(device,1.0,&format,WAVE_FORMAT_2M08,0,&capsA, + TRUE,FALSE,TRUE); } for (f=0;f<NB_WIN_FORMATS;f++) { @@ -745,15 +765,18 @@ static void wave_out_test_device(int dev format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; format.cbSize=0; wave_out_test_deviceOut(device,1.0,&format,win_formats[f][0], - 0,&capsA,winetest_interactive,TRUE); + 0,&capsA,winetest_interactive,TRUE,FALSE); + if (winetest_interactive) + wave_out_test_deviceOut(device,1.0,&format,win_formats[f][0], + 0,&capsA,winetest_interactive,TRUE,TRUE); if (device != WAVE_MAPPER) { wave_out_test_deviceOut(device,1.0,&format,win_formats[f][0], WAVE_FORMAT_DIRECT,&capsA,winetest_interactive, - TRUE); + TRUE,FALSE); wave_out_test_deviceOut(device,1.0,&format,win_formats[f][0], WAVE_MAPPED,&capsA,winetest_interactive, - TRUE); + TRUE,FALSE); } } @@ -776,18 +799,18 @@ static void wave_out_test_device(int dev pwfx->nBlockAlign=pwfx->nChannels*pwfx->wBitsPerSample/8; pwfx->nAvgBytesPerSec=pwfx->nSamplesPerSec*pwfx->nBlockAlign; wave_out_test_deviceOut(device,1.0,pwfx,WAVE_FORMAT_2M08,0, - &capsA,winetest_interactive,TRUE); + &capsA,winetest_interactive,TRUE,FALSE); if (device != WAVE_MAPPER) { wave_out_test_deviceOut(device,1.0,pwfx,WAVE_FORMAT_2M08, WAVE_FORMAT_DIRECT,&capsA, - winetest_interactive,TRUE); + winetest_interactive,TRUE,FALSE); wave_out_test_deviceOut(device,1.0,pwfx,WAVE_FORMAT_2M08, WAVE_MAPPED,&capsA,winetest_interactive, - TRUE); + TRUE,FALSE); } } - VirtualFree(twoPages, 2 * dwPageSize, MEM_RELEASE); + VirtualFree(twoPages, 0, MEM_RELEASE); } /* Testing invalid format: 11 bits per sample */ @@ -852,7 +875,7 @@ static void wave_out_test_device(int dev if (rc==MMSYSERR_NOERROR) { waveOutClose(wout); wave_out_test_deviceOut(device,1.0,&format,0,0, - &capsA,winetest_interactive,TRUE); + &capsA,winetest_interactive,TRUE,FALSE); } else trace("waveOutOpen(%s): WAVE_FORMAT_MULAW not supported\n", dev_name(device)); @@ -872,7 +895,7 @@ static void wave_out_test_device(int dev if (rc==MMSYSERR_NOERROR) { waveOutClose(wout); wave_out_test_deviceOut(device,1.0,&format,0,0, - &capsA,winetest_interactive,TRUE); + &capsA,winetest_interactive,TRUE,FALSE); } else trace("waveOutOpen(%s): WAVE_FORMAT_ADPCM not supported\n", dev_name(device)); @@ -897,7 +920,7 @@ static void wave_out_test_device(int dev if (rc==MMSYSERR_NOERROR) { waveOutClose(wout); wave_out_test_deviceOut(device,1.0,&wfex.Format,WAVE_FORMAT_2M16,0, - &capsA,winetest_interactive,TRUE); + &capsA,winetest_interactive,TRUE,FALSE); } else trace("waveOutOpen(%s): WAVE_FORMAT_EXTENSIBLE not supported\n", dev_name(device)); @@ -922,7 +945,7 @@ static void wave_out_test_device(int dev if (rc==MMSYSERR_NOERROR) { waveOutClose(wout); wave_out_test_deviceOut(device,1.0,&wfex.Format,0,0, - &capsA,winetest_interactive,TRUE); + &capsA,winetest_interactive,TRUE,FALSE); } else trace("waveOutOpen(%s): 4 channels not supported\n", dev_name(device)); @@ -947,7 +970,7 @@ static void wave_out_test_device(int dev if (rc==MMSYSERR_NOERROR) { waveOutClose(wout); wave_out_test_deviceOut(device,1.0,&wfex.Format,WAVE_FORMAT_2M16,0, - &capsA,winetest_interactive,TRUE); + &capsA,winetest_interactive,TRUE,FALSE); } else trace("waveOutOpen(%s): 6 channels not supported\n", dev_name(device)); @@ -973,7 +996,7 @@ static void wave_out_test_device(int dev if (rc==MMSYSERR_NOERROR) { waveOutClose(wout); wave_out_test_deviceOut(device,1.0,&wfex.Format,WAVE_FORMAT_2M16,0, - &capsA,winetest_interactive,TRUE); + &capsA,winetest_interactive,TRUE,FALSE); } else trace("waveOutOpen(%s): 24 bit samples not supported\n", dev_name(device)); @@ -999,7 +1022,7 @@ static void wave_out_test_device(int dev if (rc==MMSYSERR_NOERROR) { waveOutClose(wout); wave_out_test_deviceOut(device,1.0,&wfex.Format,WAVE_FORMAT_2M16,0, - &capsA,winetest_interactive,TRUE); + &capsA,winetest_interactive,TRUE,FALSE); } else trace("waveOutOpen(%s): 32 bit samples not supported\n", dev_name(device)); @@ -1024,7 +1047,7 @@ static void wave_out_test_device(int dev if (rc==MMSYSERR_NOERROR) { waveOutClose(wout); wave_out_test_deviceOut(device,1.0,&wfex.Format,WAVE_FORMAT_2M16,0, - &capsA,winetest_interactive,TRUE); + &capsA,winetest_interactive,TRUE,FALSE); } else trace("waveOutOpen(%s): 32 bit float samples not supported\n", dev_name(device));

1 0

wine/dlls/shlwapi/tests path.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20982 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 04:02:24 Modified files: dlls/shlwapi/tests: path.c Log message: Stefan Leichter <Stefan.Leichter(a)camLine.com> Stop PathIsValidCharW tests after 100 failing tests. Patch: http://cvs.winehq.org/patch.py?id=20982 Old revision New revision Changes Path 1.22 1.23 +9 -1 wine/dlls/shlwapi/tests/path.c Index: wine/dlls/shlwapi/tests/path.c diff -u -p wine/dlls/shlwapi/tests/path.c:1.22 wine/dlls/shlwapi/tests/path.c:1.23 --- wine/dlls/shlwapi/tests/path.c 31 Oct 2005 10: 2:24 -0000 +++ /dev/null 31 Oct 2005 10: 2:24 -0000 @@ -751,7 +751,7 @@ static void test_PathIsValidCharA(void) static void test_PathIsValidCharW(void) { BOOL ret; - unsigned int c; + unsigned int c, err_count = 0; ret = pPathIsValidCharW( 0x7f, 0 ); ok ( !ret, "PathIsValidCharW succeeded: 0x%08lx\n", (DWORD)ret ); @@ -773,6 +773,14 @@ static void test_PathIsValidCharW(void) ok ( ret == 0x00000100, "PathIsValidCharW failed: 0x%02x got 0x%08lx expected 0x00000100\n", c, (DWORD)ret ); + if (ret != 0x00000100) + { + if(++err_count > 100 ) { + trace("skipping rest of PathIsValidCharW tests " + "because of the current number of errors\n"); + break; + } + } } }

1 0

wine/dlls/d3d9 query.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20981 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 03:59:56 Modified files: dlls/d3d9 : query.c Log message: Roderick Colenbrander <thunderbird2k(a)gmx.net> In case of D3D9 the CreateQuery call can be used to retrieve status information. According to MSDN the 'ppQuery' parameter can be set to NULL to detect if a certain query Type is supported. Patch: http://cvs.winehq.org/patch.py?id=20981 Old revision New revision Changes Path 1.10 1.11 +1 -3 wine/dlls/d3d9/query.c Index: wine/dlls/d3d9/query.c diff -u -p wine/dlls/d3d9/query.c:1.10 wine/dlls/d3d9/query.c:1.11 --- wine/dlls/d3d9/query.c 31 Oct 2005 9:59:56 -0000 +++ /dev/null 31 Oct 2005 9:59:56 -0000 @@ -124,9 +124,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Crea HRESULT hr = D3D_OK; TRACE("(%p) Relay\n", This); - if (NULL == ppQuery) { - return D3DERR_INVALIDCALL; - } + /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DQuery9Impl)); if (NULL == object) {

1 0

CVSROOT/. loginfo ciabot
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20980 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2005/10/31 03:56:52 Modified files: . : loginfo Removed files: . : ciabot Log message: Enable mailing out diffs and CIA notices. Patch: http://cvs.winehq.org/patch.py?id=20980 Old revision New revision Changes Path 1.48 1.49 +1 -7 CVSROOT/loginfo 1.2 Removed +0 -0 CVSROOT/ciabot

1 0

CVSROOT/. log_accum
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20979 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2005/10/31 03:52:52 Modified files: . : log_accum Log message: Dimi Paun <dimi(a)lattica.com> Merge the CIA script into log_accum. Patch: http://cvs.winehq.org/patch.py?id=20979 Old revision New revision Changes Path 1.28 1.29 +46 -11 CVSROOT/log_accum

1 0