January 2010 - Wine-commits

Uwe Bonnes : msvcrt: Handle CR at buffer boundary and test case.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: e6f1ae029e39d24ca3c56175df966ffb39ba532e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f1ae029e39d24ca3c56175d… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Sat Jan 16 17:24:19 2010 +0100 msvcrt: Handle CR at buffer boundary and test case. --- dlls/msvcrt/file.c | 22 ++++++++++++++++++++++ dlls/msvcrt/tests/file.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index a9678ed..655f17e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -60,6 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define WX_OPEN 0x01 #define WX_ATEOF 0x02 #define WX_READEOF 0x04 /* like ATEOF, but for underlying file rather than buffer */ +#define WX_READCR 0x08 /* underlying file is at \r */ #define WX_DONTINHERIT 0x10 #define WX_APPEND 0x20 #define WX_TEXT 0x80 @@ -941,6 +942,9 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, MSVCRT_long offset, int whence) if (file->_ptr[i] == '\n') offset--; } + /* Black magic when reading CR at buffer boundary*/ + if(MSVCRT_fdesc[file->_file].wxflag & WX_READCR) + offset--; } } /* Discard buffered input */ @@ -1742,6 +1746,10 @@ int CDECL _rmtmp(void) /********************************************************************* * (internal) read_i + * + * When reading \r as last character in text mode, read() positions + * the file pointer on the \r character while getc() goes on to + * the following \n */ static int read_i(int fd, void *buf, unsigned int count) { @@ -1768,6 +1776,13 @@ static int read_i(int fd, void *buf, unsigned int count) if (MSVCRT_fdesc[fd].wxflag & WX_TEXT) { DWORD i, j; + if (bufstart[num_read-1] == '\r') + { + MSVCRT_fdesc[fd].wxflag |= WX_READCR; + num_read--; + } + else + MSVCRT_fdesc[fd].wxflag &= ~WX_READCR; for (i=0, j=0; i<num_read; i++) { /* in text mode, a ctrl-z signals EOF */ @@ -2890,6 +2905,10 @@ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) if (file->_ptr[i] == '\n') off--; } + /* Black magic when reading CR at buffer boundary*/ + if(MSVCRT_fdesc[file->_file].wxflag & WX_READCR) + off--; + } } } @@ -2916,6 +2935,9 @@ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) if (file->_ptr[i] == '\n') off--; } + /* Black magic when reading CR at buffer boundary*/ + if(MSVCRT_fdesc[file->_file].wxflag & WX_READCR) + off--; } } } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 042a82e..18247ad 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -422,6 +422,35 @@ static WCHAR* AtoW( const char* p ) return buffer; } +/* Test reading in text mode when the 512'th character read is \r*/ +static void test_readboundary(void) +{ + FILE *fp; + char buf[513], rbuf[513]; + int i, j; + for (i = 0; i < 511; i++) + { + j = (i%('~' - ' ')+ ' '); + buf[i] = j; + } + buf[511] = '\n'; + buf[512] =0; + fp = fopen("boundary.tst", "wt"); + fwrite(buf, 512,1,fp); + fclose(fp); + fp = fopen("boundary.tst", "rt"); + for(i=0; i<512; i++) + { + fseek(fp,0 , SEEK_CUR); + rbuf[i] = fgetc(fp); + } + rbuf[512] =0; + fclose(fp); + unlink("boundary.tst"); + + ok(strcmp(buf, rbuf) == 0,"CRLF on buffer boundary failure\n"); + } + static void test_fgetc( void ) { char* tempf; @@ -808,15 +837,23 @@ static void test_file_write_read( void ) tempfd = _open(tempf,_O_RDONLY|_O_TEXT); /* open in TEXT mode */ _lseek(tempfd, -1, FILE_END); ret = _read(tempfd,btext,LLEN); - ok(ret == 1, "_read expected 1 got bad length: %d\n", ret); + ok(ret == 1 && *btext == '\n', "_read expected 1 got bad length: %d\n", ret); _lseek(tempfd, -2, FILE_END); ret = _read(tempfd,btext,LLEN); ok(ret == 1 && *btext == '\n', "_read expected '\\n' got bad length: %d\n", ret); _lseek(tempfd, -3, FILE_END); + ret = _read(tempfd,btext,1); + ok(ret == 1 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); + ok(tell(tempfd) == 41, "bad position %u expecting 41\n", tell(tempfd)); + _lseek(tempfd, -3, FILE_END); ret = _read(tempfd,btext,2); ok(ret == 1 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); ok(tell(tempfd) == 42, "bad position %u expecting 42\n", tell(tempfd)); - _close(tempfd); + _lseek(tempfd, -3, FILE_END); + ret = _read(tempfd,btext,3); + ok(ret == 2 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); + ok(tell(tempfd) == 43, "bad position %u expecting 43\n", tell(tempfd)); + _close(tempfd); ret = unlink(tempf); ok( ret == 0 ,"Can't unlink '%s': %d\n", tempf, errno); @@ -1402,6 +1439,7 @@ START_TEST(file) test_asciimode2(); test_readmode(FALSE); /* binary mode */ test_readmode(TRUE); /* ascii mode */ + test_readboundary(); test_fgetc(); test_fputc(); test_flsbuf();

1 0

Andrew Nguyen : mapi32/tests: Report skips for unavailable property functions.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 3bd474d7f3672196b9061d0ac0880cdc600929ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd474d7f3672196b9061d0ac… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Jan 18 06:59:43 2010 -0600 mapi32/tests: Report skips for unavailable property functions. --- dlls/mapi32/tests/prop.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 237134b..bf6c275 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -92,15 +92,26 @@ static void test_PropCopyMore(void) pPropCopyMore = (void*)GetProcAddress(hMapi32, "PropCopyMore(a)16"); if (!pPropCopyMore) + { + win_skip("PropCopyMore is not available\n"); return; + } scode = pMAPIAllocateBuffer(sizeof(LPSPropValue), lpDest); + ok(scode == S_OK, "Expected MAPIAllocateBuffer to return S_OK, got 0x%x\n", scode); if (FAILED(scode)) + { + skip("MAPIAllocateBuffer failed\n"); return; + } scode = pMAPIAllocateMore(sizeof(LPSPropValue), lpDest, lpSrc); + ok(scode == S_OK, "Expected MAPIAllocateMore to return S_OK, got 0x%x\n", scode); if (FAILED(scode)) + { + skip("MAPIAllocateMore failed\n"); return; + } for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) { @@ -163,7 +174,10 @@ static void test_UlPropSize(void) pUlPropSize = (void*)GetProcAddress(hMapi32, "UlPropSize(a)4"); if (!pUlPropSize) + { + win_skip("UlPropSize is not available\n"); return; + } for (pt = 0; pt < PROP_ID_INVALID; pt++) { @@ -260,7 +274,10 @@ static void test_FPropContainsProp(void) pFPropContainsProp = (void*)GetProcAddress(hMapi32, "FPropContainsProp(a)12"); if (!pFPropContainsProp) + { + win_skip("FPropContainsProp is not available\n"); return; + } /* Ensure that only PT_STRING8 and PT_BINARY are handled */ for (pt = 0; pt < PROP_ID_INVALID; pt++) @@ -409,7 +426,10 @@ static void test_FPropCompareProp(void) pFPropCompareProp = (void*)GetProcAddress(hMapi32, "FPropCompareProp(a)12"); if (!pFPropCompareProp) + { + win_skip("FPropCompareProp is not available\n"); return; + } lbuffa[1] = '\0'; rbuffa[1] = '\0'; @@ -538,7 +558,10 @@ static void test_LPropCompareProp(void) pLPropCompareProp = (void*)GetProcAddress(hMapi32, "LPropCompareProp(a)8"); if (!pLPropCompareProp) + { + win_skip("LPropCompareProp is not available\n"); return; + } lbuffa[1] = '\0'; rbuffa[1] = '\0'; @@ -643,7 +666,10 @@ static void test_PpropFindProp(void) pPpropFindProp = (void*)GetProcAddress(hMapi32, "PpropFindProp(a)12"); if (!pPpropFindProp) + { + win_skip("PpropFindProp is not available\n"); return; + } for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) { @@ -682,7 +708,10 @@ static void test_ScCountProps(void) pScCountProps = (void*)GetProcAddress(hMapi32, "ScCountProps(a)12"); if (!pScCountProps) + { + win_skip("ScCountProps is not available\n"); return; + } for (pt = 0; pt < PROP_ID_INVALID && success; pt++) { @@ -818,7 +847,10 @@ static void test_ScCopyRelocProps(void) pScRelocProps = (void*)GetProcAddress(hMapi32, "ScRelocProps(a)20"); if (!pScCopyProps || !pScRelocProps) + { + win_skip("SPropValue copy functions are not available\n"); return; + } pvProp.ulPropTag = PROP_TAG(PT_MV_STRING8, 1u); @@ -880,7 +912,10 @@ static void test_LpValFindProp(void) pLpValFindProp = (void*)GetProcAddress(hMapi32, "LpValFindProp(a)12"); if (!pLpValFindProp) + { + win_skip("LpValFindProp is not available\n"); return; + } for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) { @@ -914,7 +949,10 @@ static void test_FBadRglpszA(void) pFBadRglpszA = (void*)GetProcAddress(hMapi32, "FBadRglpszA(a)8"); if (!pFBadRglpszA) + { + win_skip("FBadRglpszA is not available\n"); return; + } bRet = pFBadRglpszA(NULL, 10); ok(bRet == TRUE, "FBadRglpszA(Null): expected TRUE, got FALSE\n"); @@ -939,7 +977,10 @@ static void test_FBadRglpszW(void) pFBadRglpszW = (void*)GetProcAddress(hMapi32, "FBadRglpszW(a)8"); if (!pFBadRglpszW) + { + win_skip("FBadRglpszW is not available\n"); return; + } bRet = pFBadRglpszW(NULL, 10); ok(bRet == TRUE, "FBadRglpszW(Null): expected TRUE, got FALSE\n"); @@ -962,7 +1003,10 @@ static void test_FBadRowSet(void) pFBadRowSet = (void*)GetProcAddress(hMapi32, "FBadRowSet(a)4"); if (!pFBadRowSet) + { + win_skip("FBadRowSet is not available\n"); return; + } ulRet = pFBadRowSet(NULL); ok(ulRet != 0, "FBadRow(null): Expected non-zero, got 0\n"); @@ -976,7 +1020,10 @@ static void test_FBadPropTag(void) pFBadPropTag = (void*)GetProcAddress(hMapi32, "FBadPropTag(a)4"); if (!pFBadPropTag) + { + win_skip("FBadPropTag is not available\n"); return; + } for (pt = 0; pt < PROP_ID_INVALID; pt++) { @@ -1008,7 +1055,10 @@ static void test_FBadRow(void) pFBadRow = (void*)GetProcAddress(hMapi32, "FBadRow(a)4"); if (!pFBadRow) + { + win_skip("FBadRow is not available\n"); return; + } ulRet = pFBadRow(NULL); ok(ulRet != 0, "FBadRow(null): Expected non-zero, got 0\n"); @@ -1025,7 +1075,10 @@ static void test_FBadProp(void) pFBadProp = (void*)GetProcAddress(hMapi32, "FBadProp(a)4"); if (!pFBadProp) + { + win_skip("FBadProp is not available\n"); return; + } for (pt = 0; pt < PROP_ID_INVALID; pt++) { @@ -1099,7 +1152,10 @@ static void test_FBadColumnSet(void) pFBadColumnSet = (void*)GetProcAddress(hMapi32, "FBadColumnSet(a)4"); if (!pFBadColumnSet) + { + win_skip("FBadColumnSet is not available\n"); return; + } res = pFBadColumnSet(NULL); ok(res != 0, "(null): Expected non-zero, got 0\n"); @@ -1160,7 +1216,10 @@ static void test_IProp(void) pCreateIProp = (void*)GetProcAddress(hMapi32, "CreateIProp(a)24"); if (!pCreateIProp) + { + win_skip("CreateIProp is not available\n"); return; + } memset(&tags, 0 , sizeof(tags));

1 0

Henri Verbeet : d3d8: Remove the unused Direct3DResource8_Vtbl.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: cdb7a94ae2dc831e6c9a093c1fc9fabb4c42c822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb7a94ae2dc831e6c9a093c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 17 21:31:28 2010 +0100 d3d8: Remove the unused Direct3DResource8_Vtbl. --- dlls/d3d8/d3d8_private.h | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 2c5f66f..4ba399b 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -275,18 +275,6 @@ HRESULT surface_init(IDirect3DSurface8Impl *surface, IDirect3DDevice8Impl *devic UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level, DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) DECLSPEC_HIDDEN; -/* ------------------ */ -/* IDirect3DResource8 */ -/* ------------------ */ - -/***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const IDirect3DResource8Vtbl Direct3DResource8_Vtbl DECLSPEC_HIDDEN; - -/***************************************************************************** - * IDirect3DResource8 implementation structure - */ struct IDirect3DResource8Impl { /* IUnknown fields */

1 0

Henri Verbeet : d3d9: Add a separate function for query initialization.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: bfb63a8634ff818f00f9ce07870bb599d0425534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb63a8634ff818f00f9ce078… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 17 21:31:29 2010 +0100 d3d9: Add a separate function for query initialization. --- dlls/d3d9/d3d9_private.h | 6 ++-- dlls/d3d9/device.c | 31 ++++++++++++++++++++++++++++ dlls/d3d9/query.c | 51 +++++++++++---------------------------------- 3 files changed, 47 insertions(+), 41 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 7736bea..c01da91 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -228,9 +228,6 @@ extern HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantB(IDirect3DDevi UINT StartRegister, const BOOL *pConstantData, UINT BoolCount) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantB(IDirect3DDevice9Ex *iface, UINT StartRegister, BOOL *pConstantData, UINT BoolCount) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(IDirect3DDevice9Ex *iface, - D3DQUERYTYPE Type, IDirect3DQuery9 **ppQuery) DECLSPEC_HIDDEN; - /* ---------------- */ /* IDirect3DVolume9 */ @@ -564,4 +561,7 @@ typedef struct IDirect3DQuery9Impl { LPDIRECT3DDEVICE9EX parentDevice; } IDirect3DQuery9Impl; +HRESULT query_init(IDirect3DQuery9Impl *query, IDirect3DDevice9Impl *device, + D3DQUERYTYPE type) DECLSPEC_HIDDEN; + #endif /* __WINE_D3D9_PRIVATE_H */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4d0d4bd..35eaf7c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2178,6 +2178,37 @@ static HRESULT WINAPI IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9EX ifa return hr; } +static HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(IDirect3DDevice9Ex *iface, + D3DQUERYTYPE type, IDirect3DQuery9 **query) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IDirect3DQuery9Impl *object; + HRESULT hr; + + TRACE("iface %p, type %#x, query %p.\n", iface, type, query); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate query memory.\n"); + return E_OUTOFMEMORY; + } + + hr = query_init(object, This, type); + if (FAILED(hr)) + { + WARN("Failed to initialize query, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created query %p.\n", object); + if (query) *query = (IDirect3DQuery9 *)object; + else IDirect3DQuery9_Release((IDirect3DQuery9 *)object); + + return D3D_OK; +} + static HRESULT WINAPI IDirect3DDevice9ExImpl_SetConvolutionMonoKernel(IDirect3DDevice9Ex *iface, UINT width, UINT height, float *rows, float *columns) { diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index ecb2e71..a38dc9d 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -150,49 +150,24 @@ static const IDirect3DQuery9Vtbl Direct3DQuery9_Vtbl = IDirect3DQuery9Impl_GetData }; +HRESULT query_init(IDirect3DQuery9Impl *query, IDirect3DDevice9Impl *device, D3DQUERYTYPE type) +{ + HRESULT hr; -/* IDirect3DDevice9 IDirect3DQuery9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9EX iface, D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - IDirect3DQuery9Impl *object = NULL; - HRESULT hr = D3D_OK; - - TRACE("iface %p, type %#x, query %p.\n", iface, Type, ppQuery); + query->lpVtbl = &Direct3DQuery9_Vtbl; + query->ref = 1; - if (!ppQuery) + wined3d_mutex_lock(); + hr = IWineD3DDevice_CreateQuery(device->WineD3DDevice, type, &query->wineD3DQuery, (IUnknown *)query); + wined3d_mutex_unlock(); + if (FAILED(hr)) { - wined3d_mutex_lock(); - hr = IWineD3DDevice_CreateQuery(This->WineD3DDevice, Type, NULL, NULL); - wined3d_mutex_unlock(); - + WARN("Failed to create wined3d query, hr %#x.\n", hr); return hr; } - /* Allocate the storage for the device */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DQuery9Impl)); - if (NULL == object) { - ERR("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } + query->parentDevice = (IDirect3DDevice9Ex *)device; + IDirect3DDevice9Ex_AddRef(query->parentDevice); - object->lpVtbl = &Direct3DQuery9_Vtbl; - object->ref = 1; - - wined3d_mutex_lock(); - hr = IWineD3DDevice_CreateQuery(This->WineD3DDevice, Type, &object->wineD3DQuery, (IUnknown *)object); - wined3d_mutex_unlock(); - - if (FAILED(hr)) { - - /* free up object */ - WARN("(%p) call to IWineD3DDevice_CreateQuery failed\n", This); - HeapFree(GetProcessHeap(), 0, object); - } else { - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - *ppQuery = (LPDIRECT3DQUERY9) object; - TRACE("(%p) : Created query %p\n", This , object); - } - TRACE("(%p) : returning %x\n", This, hr); - return hr; + return D3D_OK; }

1 0

Henri Verbeet : wined3d: Add a separate function for query initialization.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: a2624ae82e7c2e404974146b1078d3d2d78ab2d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2624ae82e7c2e404974146b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 17 21:31:30 2010 +0100 wined3d: Add a separate function for query initialization. --- dlls/wined3d/device.c | 109 +++++++--------------------------------- dlls/wined3d/query.c | 78 +++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 5 +- 3 files changed, 96 insertions(+), 96 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34495d3..4dbfeb1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -784,104 +784,33 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINED3DQUERYTYPE Type, IWineD3DQuery **ppQuery, IUnknown* parent) { +static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, + WINED3DQUERYTYPE type, IWineD3DQuery **query, IUnknown *parent) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; - IWineD3DQueryImpl *object; /*NOTE: impl ref allowed since this is a create function */ - HRESULT hr = WINED3DERR_NOTAVAILABLE; - const IWineD3DQueryVtbl *vtable; - - /* Just a check to see if we support this type of query */ - switch(Type) { - case WINED3DQUERYTYPE_OCCLUSION: - TRACE("(%p) occlusion query\n", This); - if (gl_info->supported[ARB_OCCLUSION_QUERY]) - hr = WINED3D_OK; - else - WARN("Unsupported in local OpenGL implementation: ARB_OCCLUSION_QUERY/NV_OCCLUSION_QUERY\n"); - - vtable = &IWineD3DOcclusionQuery_Vtbl; - break; - - case WINED3DQUERYTYPE_EVENT: - if (!gl_info->supported[NV_FENCE] && !gl_info->supported[APPLE_FENCE]) - { - /* Half-Life 2 needs this query. It does not render the main menu correctly otherwise - * Pretend to support it, faking this query does not do much harm except potentially lowering performance - */ - FIXME("(%p) Event query: Unimplemented, but pretending to be supported\n", This); - } - vtable = &IWineD3DEventQuery_Vtbl; - hr = WINED3D_OK; - break; + IWineD3DQueryImpl *object; + HRESULT hr; - case WINED3DQUERYTYPE_VCACHE: - case WINED3DQUERYTYPE_RESOURCEMANAGER: - case WINED3DQUERYTYPE_VERTEXSTATS: - case WINED3DQUERYTYPE_TIMESTAMP: - case WINED3DQUERYTYPE_TIMESTAMPDISJOINT: - case WINED3DQUERYTYPE_TIMESTAMPFREQ: - case WINED3DQUERYTYPE_PIPELINETIMINGS: - case WINED3DQUERYTYPE_INTERFACETIMINGS: - case WINED3DQUERYTYPE_VERTEXTIMINGS: - case WINED3DQUERYTYPE_PIXELTIMINGS: - case WINED3DQUERYTYPE_BANDWIDTHTIMINGS: - case WINED3DQUERYTYPE_CACHEUTILIZATION: - default: - /* Use the base Query vtable until we have a special one for each query */ - vtable = &IWineD3DQuery_Vtbl; - FIXME("(%p) Unhandled query type %d\n", This, Type); - } - if(NULL == ppQuery || hr != WINED3D_OK) { - return hr; - } + TRACE("iface %p, type %#x, query %p, parent %p.\n", iface, type, query, parent); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if(!object) + if (!object) { - ERR("Out of memory\n"); - *ppQuery = NULL; - return WINED3DERR_OUTOFVIDEOMEMORY; + ERR("Failed to allocate query memory.\n"); + return E_OUTOFMEMORY; } - object->lpVtbl = vtable; - object->type = Type; - object->state = QUERY_CREATED; - object->device = This; - object->parent = parent; - object->ref = 1; - - *ppQuery = (IWineD3DQuery *)object; - - /* allocated the 'extended' data based on the type of query requested */ - switch(Type){ - case WINED3DQUERYTYPE_OCCLUSION: - object->extendedData = HeapAlloc(GetProcessHeap(), 0, sizeof(struct wined3d_occlusion_query)); - ((struct wined3d_occlusion_query *)object->extendedData)->context = NULL; - break; + hr = query_init(object, This, type, parent); + if (FAILED(hr)) + { + WARN("Failed to initialize query, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } - case WINED3DQUERYTYPE_EVENT: - object->extendedData = HeapAlloc(GetProcessHeap(), 0, sizeof(struct wined3d_event_query)); - ((struct wined3d_event_query *)object->extendedData)->context = NULL; - break; + TRACE("Created query %p.\n", object); + *query = (IWineD3DQuery *)object; - case WINED3DQUERYTYPE_VCACHE: - case WINED3DQUERYTYPE_RESOURCEMANAGER: - case WINED3DQUERYTYPE_VERTEXSTATS: - case WINED3DQUERYTYPE_TIMESTAMP: - case WINED3DQUERYTYPE_TIMESTAMPDISJOINT: - case WINED3DQUERYTYPE_TIMESTAMPFREQ: - case WINED3DQUERYTYPE_PIPELINETIMINGS: - case WINED3DQUERYTYPE_INTERFACETIMINGS: - case WINED3DQUERYTYPE_VERTEXTIMINGS: - case WINED3DQUERYTYPE_PIXELTIMINGS: - case WINED3DQUERYTYPE_BANDWIDTHTIMINGS: - case WINED3DQUERYTYPE_CACHEUTILIZATION: - default: - object->extendedData = 0; - FIXME("(%p) Unhandled query type %d\n",This , Type); - } - TRACE("(%p) : Created Query %p\n", This, object); return WINED3D_OK; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1280a3b..be8cf08 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -626,7 +626,7 @@ static HRESULT WINAPI IWineD3DQueryImpl_Issue(IWineD3DQuery* iface, DWORD dwIs * IWineD3DQuery VTbl follows **********************************************************/ -const IWineD3DQueryVtbl IWineD3DQuery_Vtbl = +static const IWineD3DQueryVtbl IWineD3DQuery_Vtbl = { /*** IUnknown methods ***/ IWineD3DQueryImpl_QueryInterface, @@ -640,7 +640,7 @@ const IWineD3DQueryVtbl IWineD3DQuery_Vtbl = IWineD3DQueryImpl_Issue }; -const IWineD3DQueryVtbl IWineD3DEventQuery_Vtbl = +static const IWineD3DQueryVtbl IWineD3DEventQuery_Vtbl = { /*** IUnknown methods ***/ IWineD3DQueryImpl_QueryInterface, @@ -654,7 +654,7 @@ const IWineD3DQueryVtbl IWineD3DEventQuery_Vtbl = IWineD3DEventQueryImpl_Issue }; -const IWineD3DQueryVtbl IWineD3DOcclusionQuery_Vtbl = +static const IWineD3DQueryVtbl IWineD3DOcclusionQuery_Vtbl = { /*** IUnknown methods ***/ IWineD3DQueryImpl_QueryInterface, @@ -667,3 +667,75 @@ const IWineD3DQueryVtbl IWineD3DOcclusionQuery_Vtbl = IWineD3DQueryImpl_GetType, IWineD3DOcclusionQueryImpl_Issue }; + +HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, + WINED3DQUERYTYPE type, IUnknown *parent) +{ + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + + switch (type) + { + case WINED3DQUERYTYPE_OCCLUSION: + TRACE("Occlusion query.\n"); + if (!gl_info->supported[ARB_OCCLUSION_QUERY]) + { + WARN("Unsupported in local OpenGL implementation: ARB_OCCLUSION_QUERY/NV_OCCLUSION_QUERY\n"); + return WINED3DERR_NOTAVAILABLE; + } + query->lpVtbl = &IWineD3DOcclusionQuery_Vtbl; + query->extendedData = HeapAlloc(GetProcessHeap(), 0, sizeof(struct wined3d_occlusion_query)); + if (!query->extendedData) + { + ERR("Failed to allocate occlusion query extended data.\n"); + return E_OUTOFMEMORY; + } + ((struct wined3d_occlusion_query *)query->extendedData)->context = NULL; + break; + + case WINED3DQUERYTYPE_EVENT: + TRACE("Event query.\n"); + if (!gl_info->supported[NV_FENCE] && !gl_info->supported[APPLE_FENCE]) + { + /* Half-Life 2 needs this query. It does not render the main + * menu correctly otherwise. Pretend to support it, faking + * this query does not do much harm except potentially + * lowering performance. */ + FIXME("Event query: Unimplemented, but pretending to be supported.\n"); + } + query->lpVtbl = &IWineD3DEventQuery_Vtbl; + query->extendedData = HeapAlloc(GetProcessHeap(), 0, sizeof(struct wined3d_event_query)); + if (!query->extendedData) + { + ERR("Failed to allocate event query extended data.\n"); + return E_OUTOFMEMORY; + } + ((struct wined3d_event_query *)query->extendedData)->context = NULL; + break; + + case WINED3DQUERYTYPE_VCACHE: + case WINED3DQUERYTYPE_RESOURCEMANAGER: + case WINED3DQUERYTYPE_VERTEXSTATS: + case WINED3DQUERYTYPE_TIMESTAMP: + case WINED3DQUERYTYPE_TIMESTAMPDISJOINT: + case WINED3DQUERYTYPE_TIMESTAMPFREQ: + case WINED3DQUERYTYPE_PIPELINETIMINGS: + case WINED3DQUERYTYPE_INTERFACETIMINGS: + case WINED3DQUERYTYPE_VERTEXTIMINGS: + case WINED3DQUERYTYPE_PIXELTIMINGS: + case WINED3DQUERYTYPE_BANDWIDTHTIMINGS: + case WINED3DQUERYTYPE_CACHEUTILIZATION: + default: + /* Use the base query vtable until we have a special one for each query. */ + query->lpVtbl = &IWineD3DQuery_Vtbl; + FIXME("Unhandled query type %#x.\n", type); + return WINED3DERR_NOTAVAILABLE; + } + + query->type = type; + query->state = QUERY_CREATED; + query->device = device; + query->parent = parent; + query->ref = 1; + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d501247..94989c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2347,9 +2347,8 @@ typedef struct IWineD3DQueryImpl void *extendedData; } IWineD3DQueryImpl; -extern const IWineD3DQueryVtbl IWineD3DQuery_Vtbl DECLSPEC_HIDDEN; -extern const IWineD3DQueryVtbl IWineD3DEventQuery_Vtbl DECLSPEC_HIDDEN; -extern const IWineD3DQueryVtbl IWineD3DOcclusionQuery_Vtbl DECLSPEC_HIDDEN; +HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, + WINED3DQUERYTYPE type, IUnknown *parent) DECLSPEC_HIDDEN; /* IWineD3DBuffer */

1 0

Henri Verbeet : wined3d: Remove some unused query code.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 36b21e332c8aa4329dcd37f693b872a99dadd9cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b21e332c8aa4329dcd37f69… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 17 21:31:31 2010 +0100 wined3d: Remove some unused query code. --- dlls/wined3d/query.c | 251 -------------------------------------------------- 1 files changed, 0 insertions(+), 251 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36b21e332c8aa4329dcd3…

1 0

Henri Verbeet : wined3d: Merge baseshader.c into shader.c.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 516d54bf91ea4ada98e94c7bcd22671d7c1341bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=516d54bf91ea4ada98e94c7bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 17 21:31:32 2010 +0100 wined3d: Merge baseshader.c into shader.c. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/baseshader.c | 1444 ---------------------------------------- dlls/wined3d/shader.c | 1400 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 12 - 4 files changed, 1400 insertions(+), 1457 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=516d54bf91ea4ada98e94…

1 0

Jason Edmeades : netapi31: Add basic support for NetServerGetInfo.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: c6be6a4bfefe9c9ff8849a91531df3d5dc56df69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6be6a4bfefe9c9ff8849a915… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sat Jan 16 14:55:20 2010 -0800 netapi31: Add basic support for NetServerGetInfo. Based on code from NetWkstaGetInfo, and retrieves the basic system information. Note the 'type' field is a little generic as there is currently no concept of domain controllers, servers or workstation so I used the most accurate value I could. --- dlls/netapi32/netapi32.c | 57 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 12218fc..fb4468f 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -26,6 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(netbios); static HMODULE NETAPI32_hModule; +BOOL NETAPI_IsLocalComputer(LMCSTR ServerName); + BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); @@ -97,8 +99,59 @@ NET_API_STATUS WINAPI NetServerEnumEx( */ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bufptr) { - FIXME("stub (%s, %d, %p)\n", debugstr_w(servername), level, bufptr); - return ERROR_ACCESS_DENIED; + NET_API_STATUS ret; + + TRACE("%s %d %p\n", debugstr_w( servername ), level, bufptr ); + if (servername) + { + if (!NETAPI_IsLocalComputer(servername)) + { + FIXME("remote computers not supported\n"); + return ERROR_INVALID_LEVEL; + } + } + if (!bufptr) return ERROR_INVALID_PARAMETER; + + switch (level) + { + case 100: + case 101: + { + DWORD computerNameLen, size; + WCHAR computerName[MAX_COMPUTERNAME_LENGTH + 1]; + + computerNameLen = MAX_COMPUTERNAME_LENGTH + 1; + GetComputerNameW(computerName, &computerNameLen); + computerNameLen++; /* include NULL terminator */ + + size = sizeof(SERVER_INFO_101) + computerNameLen * sizeof(WCHAR); + ret = NetApiBufferAllocate(size, (LPVOID *)bufptr); + if (ret == NERR_Success) + { + /* INFO_100 structure is a subset of INFO_101 */ + PSERVER_INFO_101 info = (PSERVER_INFO_101)*bufptr; + OSVERSIONINFOW verInfo; + + info->sv101_platform_id = PLATFORM_ID_NT; + info->sv101_name = (LMSTR)(*bufptr + sizeof(SERVER_INFO_101)); + memcpy(info->sv101_name, computerName, + computerNameLen * sizeof(WCHAR)); + verInfo.dwOSVersionInfoSize = sizeof(verInfo); + GetVersionExW(&verInfo); + info->sv101_version_major = verInfo.dwMajorVersion; + info->sv101_version_minor = verInfo.dwMinorVersion; + /* Use generic type as no wine equivalent of DC / Server */ + info->sv101_type = SV_TYPE_NT; + info->sv101_comment = NULL; + } + break; + } + + default: + FIXME("level %d unimplemented\n", level); + ret = ERROR_INVALID_LEVEL; + } + return ret; }

1 0

Kusanagi Kouichi : user32: F10 key deactivates menu.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 56416b09a6988c31b333f8e1c9e5750364ad0c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56416b09a6988c31b333f8e1c… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Mon Jan 18 18:30:06 2010 +0900 user32: F10 key deactivates menu. --- dlls/user32/menu.c | 1 + dlls/user32/tests/menu.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 0f083ff..6e7e663 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3119,6 +3119,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, switch(msg.wParam) { case VK_MENU: + case VK_F10: fEndMenu = TRUE; break; diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 88e2753..761d70c 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1890,8 +1890,10 @@ static struct menu_mouse_tests_s { { INPUT_KEYBOARD, {{0}}, {'D', 0}, FALSE, FALSE }, { INPUT_KEYBOARD, {{0}}, {VK_MENU, 'M', 'P', 0}, TRUE, FALSE }, { INPUT_KEYBOARD, {{0}}, {'E', 0}, FALSE, FALSE }, + { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, TRUE, FALSE }, + { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 18 */ + { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 20 */ { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, TRUE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE },

1 0

Andrew Nguyen : ntdll/tests: Re-enable a commented virtual memory test.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: ab23f87bcca07cf2673a1448249e2efb301d637c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab23f87bcca07cf2673a14482… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Fri Jan 15 11:46:50 2010 -0600 ntdll/tests: Re-enable a commented virtual memory test. --- dlls/ntdll/tests/info.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index dc5de94..1914564 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -878,14 +878,10 @@ static void test_readvirtualmemory(void) ok( readcount == 12, "Expected to read 12 bytes, got %ld\n",readcount); ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n"); - /* this test currently crashes wine with "wine client error:<process id>: read: Bad address" - * because the reply from wine server is directly read into the buffer and that fails with EFAULT - */ /* illegal local address */ - /*status = pNtReadVirtualMemory(process, teststring, (void *)0x1234, 12, &readcount); - ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status); + status = pNtReadVirtualMemory(process, teststring, (void *)0x1234, 12, &readcount); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); - */ CloseHandle(process); }

1 0