wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

David Adam : d3d9: Add tests for IDirect3D9Device_Reset.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: d993f85167fdbde73ddf6c44a898d2161e9bc707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d993f85167fdbde73ddf6c44a… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Apr 21 15:25:31 2009 +0200 d3d9: Add tests for IDirect3D9Device_Reset. --- dlls/d3d9/tests/device.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f254719..fe4318e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1049,6 +1049,45 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); ok(hr == D3DERR_DEVICENOTRESET, "IDirect3DDevice9_TestCooperativeLevel after a failed reset returned %#x\n", hr); + pDevice = NULL; + IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.EnableAutoDepthStencil = FALSE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + + if(FAILED(hr)) + { + skip("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr); + goto cleanup; + } + + hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after creation returned %#x\n", hr); + + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = TRUE; + d3dpp.BackBufferWidth = 400; + d3dpp.BackBufferHeight = 300; + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); + todo_wine ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with 0x%08x\n", hr); + + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DDevice9_GetDepthStencilSurface(pDevice, &surface); + todo_wine ok(hr == D3D_OK, "GetDepthStencilSurface failed with 0x%08x\n", hr); + todo_wine ok(surface != NULL, "Depth stencil should not be NULL\n"); + if (surface) IDirect3DSurface9_Release(surface); + cleanup: HeapFree(GetProcessHeap(), 0, modes); if(pD3d) IDirect3D9_Release(pD3d);

1 0

David Adam : d3d8: Add tests for IDirect3D8Device_Reset.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 458902b5b21a4c8d2ae6a2d0ce4a17af83265038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458902b5b21a4c8d2ae6a2d0c… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Apr 21 15:22:29 2009 +0200 d3d8: Add tests for IDirect3D8Device_Reset. --- dlls/d3d8/tests/device.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index aa2b627..6f410fd 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1358,6 +1358,45 @@ static void test_depth_stencil_reset(void) ok(hr == D3DERR_NOTFOUND, "GetDepthStencilSurface returned 0x%08x, expected D3DERR_NOTFOUND\n", hr); ok(surface == NULL, "Depth stencil should be NULL\n"); + device = NULL; + IDirect3D8_GetAdapterDisplayMode( d3d8, D3DADAPTER_DEFAULT, &display_mode ); + + ZeroMemory( &present_parameters, sizeof(present_parameters) ); + present_parameters.Windowed = TRUE; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferFormat = display_mode.Format; + present_parameters.EnableAutoDepthStencil = FALSE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device ); + + if(FAILED(hr)) + { + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + goto cleanup; + } + + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3D_OK, "IDirect3DDevice8_TestCooperativeLevel after creation returned %#x\n", hr); + + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = TRUE; + present_parameters.BackBufferWidth = 400; + present_parameters.BackBufferHeight = 300; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3DDevice8_Reset(device, &present_parameters); + todo_wine ok(hr == D3D_OK, "IDirect3DDevice8_Reset failed with 0x%08x\n", hr); + + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surface); + todo_wine ok(hr == D3D_OK, "GetDepthStencilSurface failed with 0x%08x\n", hr); + todo_wine ok(surface != NULL, "Depth stencil should not be NULL\n"); + if (surface) IDirect3DSurface8_Release(surface); + cleanup: if(d3d8) IDirect3D8_Release(d3d8); if(device) IDirect3D8_Release(device);

1 0

Alexandre Julliard : user32/tests: Fix a few sysparams tests on various Windows versions.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: ffe30a5c6534b986f0f4bc380935dbd076af79c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe30a5c6534b986f0f4bc380… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 12:55:38 2009 +0200 user32/tests: Fix a few sysparams tests on various Windows versions. --- dlls/user32/tests/sysparams.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index b4a7c50..0e68de4 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1079,7 +1079,7 @@ static void test_SPI_SETICONTITLEWRAP( void ) /* 26 */ if( regval != vals[i]) regval = metricfromreg( SPI_SETICONTITLEWRAP_REGKEY1, SPI_SETICONTITLEWRAP_VALNAME, dpi); - ok( regval == vals[i], + ok( regval == vals[i] || broken(regval == -1), /* win9x */ "wrong value in registry %d, expected %d\n", regval, vals[i] ); rc=SystemParametersInfoA( SPI_GETICONTITLEWRAP, 0, &v, 0 ); @@ -1668,9 +1668,11 @@ static void test_SPI_SETICONMETRICS( void ) /* 46 */ return; /* check some registry values */ regval = metricfromreg( SPI_ICONHORIZONTALSPACING_REGKEY, SPI_ICONHORIZONTALSPACING_VALNAME, dpi); - ok( regval==im_orig.iHorzSpacing, "wrong value in registry %d, expected %d\n", regval, im_orig.iHorzSpacing); + ok( regval==im_orig.iHorzSpacing || broken(regval == -1), /* nt4 */ + "wrong value in registry %d, expected %d\n", regval, im_orig.iHorzSpacing); regval = metricfromreg( SPI_ICONVERTICALSPACING_REGKEY, SPI_ICONVERTICALSPACING_VALNAME, dpi); - ok( regval==im_orig.iVertSpacing, "wrong value in registry %d, expected %d\n", regval, im_orig.iVertSpacing); + ok( regval==im_orig.iVertSpacing || broken(regval == -1), /* nt4 */ + "wrong value in registry %d, expected %d\n", regval, im_orig.iVertSpacing); regval = metricfromreg( SPI_SETICONTITLEWRAP_REGKEY2, SPI_SETICONTITLEWRAP_VALNAME, dpi); if( regval != im_orig.iTitleWrap) regval = metricfromreg( SPI_SETICONTITLEWRAP_REGKEY1, SPI_SETICONTITLEWRAP_VALNAME, dpi); @@ -1798,8 +1800,11 @@ static void test_SPI_SETWORKAREA( void ) /* 47 */ test_change_message( SPI_SETWORKAREA, 0); eq( area.left, curr_val.left, "left", "%d" ); eq( area.top, curr_val.top, "top", "%d" ); - eq( area.right, curr_val.right, "right", "%d" ); - eq( area.bottom, curr_val.bottom, "bottom", "%d" ); + /* size may be rounded up */ + ok( area.right >= curr_val.right && area.right < curr_val.right + 8, + "right: got %d instead of %d\n", area.right, curr_val.right ); + ok( area.bottom >= curr_val.bottom && area.bottom < curr_val.bottom + 8, + "bottom: got %d instead of %d\n", area.bottom, curr_val.bottom ); curr_val = area; rc=SystemParametersInfoA( SPI_SETWORKAREA, 0, &old_area, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); @@ -1810,8 +1815,11 @@ static void test_SPI_SETWORKAREA( void ) /* 47 */ test_change_message( SPI_SETWORKAREA, 0 ); eq( area.left, old_area.left, "left", "%d" ); eq( area.top, old_area.top, "top", "%d" ); - eq( area.right, old_area.right, "right", "%d" ); - eq( area.bottom, old_area.bottom, "bottom", "%d" ); + /* size may be rounded up */ + ok( area.right >= old_area.right && area.right < old_area.right + 8, + "right: got %d instead of %d\n", area.right, old_area.right ); + ok( area.bottom >= old_area.bottom && area.bottom < old_area.bottom + 8, + "bottom: got %d instead of %d\n", area.bottom, old_area.bottom ); } static void test_SPI_SETSHOWSOUNDS( void ) /* 57 */

1 0

Kai Blin : sxs: Implement a stub CreateAssemblyCache to make Publish or Perish install.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 16a052817457ad34de8fd6b171697660eac9d896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a052817457ad34de8fd6b17… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Apr 19 23:55:14 2009 +0200 sxs: Implement a stub CreateAssemblyCache to make Publish or Perish install. --- dlls/sxs/sxs.c | 8 ++++++++ dlls/sxs/sxs.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 06e6672..76c2f85 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -22,7 +22,9 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(sxs); /*********************************************************************** * DllMain (SXS.@) @@ -40,3 +42,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +HRESULT WINAPI CreateAssemblyCache(DWORD unimplemented, DWORD dwReserved) +{ + FIXME("%u %u stub\n", unimplemented, dwReserved); + return E_NOTIMPL; +} diff --git a/dlls/sxs/sxs.spec b/dlls/sxs/sxs.spec index 012d06b..cd32a2e 100644 --- a/dlls/sxs/sxs.spec +++ b/dlls/sxs/sxs.spec @@ -1,2 +1,2 @@ -@ stub CreateAssemblyCache +@ stdcall CreateAssemblyCache(long long) @ stub CreateAssemblyNameObject

1 0

Damjan Jovanovic : winemenubuilder: Build freedesktop MIME type list for later use.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 0b4499cdcde2614d2bd2a9e0a9dd8ac718367bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4499cdcde2614d2bd2a9e0a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Apr 11 10:10:59 2009 +0200 winemenubuilder: Build freedesktop MIME type list for later use. --- programs/winemenubuilder/winemenubuilder.c | 169 ++++++++++++++++++++++++++++ 1 files changed, 169 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 9dafc16..58e84c6 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -78,6 +78,7 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "wine/library.h" +#include "wine/list.h" #include "wine.xpm" #ifdef HAVE_PNG_H @@ -144,6 +145,13 @@ typedef struct int nIndex; } ENUMRESSTRUCT; +struct xdg_mime_type +{ + char *mimeType; + char *glob; + struct list entry; +}; + static char *xdg_config_dir; static char *xdg_data_dir; static char *xdg_desktop_dir; @@ -1243,6 +1251,165 @@ static HRESULT get_cmdline( IShellLinkW *sl, LPWSTR szPath, DWORD pathSize, return hr; } +static BOOL next_line(FILE *file, char **line, int *size) +{ + int pos = 0; + char *cr; + if (*line == NULL) + { + *size = 4096; + *line = HeapAlloc(GetProcessHeap(), 0, *size); + } + while (*line != NULL) + { + if (fgets(&(*line)[pos], *size - pos, file) == NULL) + { + HeapFree(GetProcessHeap(), 0, *line); + *line = NULL; + if (feof(file)) + return TRUE; + return FALSE; + } + pos = strlen(*line); + cr = strchr(*line, '\n'); + if (cr == NULL) + { + char *line2; + (*size) *= 2; + line2 = HeapReAlloc(GetProcessHeap(), 0, *line, *size); + if (line2) + *line = line2; + else + { + HeapFree(GetProcessHeap(), 0, *line); + *line = NULL; + } + } + else + { + *cr = 0; + return TRUE; + } + } + return FALSE; +} + +static BOOL add_mimes(const char *xdg_data_dir, struct list *mime_types) +{ + char *globs_filename = NULL; + BOOL ret = TRUE; + globs_filename = heap_printf("%s/mime/globs", xdg_data_dir); + if (globs_filename) + { + FILE *globs_file = fopen(globs_filename, "r"); + if (globs_file) /* doesn't have to exist */ + { + char *line = NULL; + int size = 0; + while (ret && (ret = next_line(globs_file, &line, &size)) && line) + { + char *pos; + struct xdg_mime_type *mime_type_entry = NULL; + if (line[0] != '#' && (pos = strchr(line, ':'))) + { + mime_type_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xdg_mime_type)); + if (mime_type_entry) + { + *pos = 0; + mime_type_entry->mimeType = line; + mime_type_entry->glob = pos + 1; + list_add_tail(mime_types, &mime_type_entry->entry); + } + else + ret = FALSE; + } + } + HeapFree(GetProcessHeap(), 0, line); + fclose(globs_file); + } + HeapFree(GetProcessHeap(), 0, globs_filename); + } + else + ret = FALSE; + return ret; +} + +static void free_native_mime_types(struct list *native_mime_types) +{ + struct xdg_mime_type *mime_type_entry, *mime_type_entry2; + + LIST_FOR_EACH_ENTRY_SAFE(mime_type_entry, mime_type_entry2, native_mime_types, struct xdg_mime_type, entry) + { + list_remove(&mime_type_entry->entry); + HeapFree(GetProcessHeap(), 0, mime_type_entry->mimeType); + HeapFree(GetProcessHeap(), 0, mime_type_entry); + } + HeapFree(GetProcessHeap(), 0, native_mime_types); +} + +static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mime_types) +{ + char *xdg_data_dirs; + BOOL ret; + + *mime_types = NULL; + + xdg_data_dirs = getenv("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) + xdg_data_dirs = heap_printf("/usr/local/share/:/usr/share/"); + else + xdg_data_dirs = heap_printf("%s", xdg_data_dirs); + + if (xdg_data_dirs) + { + *mime_types = HeapAlloc(GetProcessHeap(), 0, sizeof(struct list)); + if (*mime_types) + { + const char *begin; + char *end; + + list_init(*mime_types); + ret = add_mimes(xdg_data_home, *mime_types); + if (ret) + { + for (begin = xdg_data_dirs; (end = strchr(begin, ':')); begin = end + 1) + { + *end = '\0'; + ret = add_mimes(begin, *mime_types); + *end = ':'; + if (!ret) + break; + } + if (ret) + ret = add_mimes(begin, *mime_types); + } + } + else + ret = FALSE; + HeapFree(GetProcessHeap(), 0, xdg_data_dirs); + } + else + ret = FALSE; + if (!ret && *mime_types) + { + free_native_mime_types(*mime_types); + *mime_types = NULL; + } + return ret; +} + +static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir) +{ + struct list *nativeMimeTypes = NULL; + + if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes)) + { + WINE_ERR("could not build native MIME types\n"); + return FALSE; + } + return TRUE; +} + static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) { static const WCHAR startW[] = {'\\','c','o','m','m','a','n','d', @@ -1708,6 +1875,8 @@ static void RefreshFileTypeAssociations(void) } create_directories(applications_dir); + generate_associations(xdg_data_dir, packages_dir, applications_dir); + end: if (hSem) {

1 0

Christian Costa : ddraw/tests: Add tests for refcount handling of light with viewport.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 06d2b30903c7bdb685c59d5264937d4c64886ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d2b30903c7bdb685c59d526… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 20 21:19:46 2009 +0200 ddraw/tests: Add tests for refcount handling of light with viewport. --- dlls/ddraw/tests/d3d.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 405edc9..57e1da0 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -20,11 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <assert.h> #include "wine/test.h" #include "initguid.h" #include "ddraw.h" #include "d3d.h" +#include "unknwn.h" static LPDIRECTDRAW7 lpDD = NULL; static LPDIRECT3D7 lpD3D = NULL; @@ -41,6 +44,7 @@ static IDirect3D *Direct3D1 = NULL; static IDirect3DDevice *Direct3DDevice1 = NULL; static IDirect3DExecuteBuffer *ExecuteBuffer = NULL; static IDirect3DViewport *Viewport = NULL; +static IDirect3DLight *Light = NULL; typedef struct { int total; @@ -75,6 +79,13 @@ static void init_function_pointers(void) } +static ULONG getRefcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + + static BOOL CreateDirect3D(void) { HRESULT rc; @@ -1000,11 +1011,17 @@ static BOOL D3D1_createObjects(void) hr = IDirect3DViewport_SetViewport(Viewport, &vp_data); ok(hr == D3D_OK, "IDirect3DViewport_SetViewport returned %08x\n", hr); + hr = IDirect3D_CreateLight(Direct3D1, &Light, NULL); + ok(hr == D3D_OK, "IDirect3D_CreateLight failed: %08x\n", hr); + if (!Light) + return FALSE; + return TRUE; } static void D3D1_releaseObjects(void) { + if (Light) IDirect3DLight_Release(Light); if (Viewport) IDirect3DViewport_Release(Viewport); if (ExecuteBuffer) IDirect3DExecuteBuffer_Release(ExecuteBuffer); if (Direct3DDevice1) IDirect3DDevice_Release(Direct3DDevice1); @@ -1034,6 +1051,8 @@ static void Direct3D1Test(void) D3DINSTRUCTION *instr; D3DBRANCH *branch; IDirect3D *Direct3D_alt; + IDirect3DLight *d3dlight; + ULONG refcount; unsigned int idx = 0; static struct v_in testverts[] = { {0.0, 0.0, 0.0}, { 1.0, 1.0, 1.0}, {-1.0, -1.0, -1.0}, @@ -1394,6 +1413,24 @@ static void Direct3D1Test(void) hr = IDirect3DDevice_DeleteViewport(Direct3DDevice1, Viewport); ok(hr == D3D_OK, "IDirect3DDevice_DeleteViewport returned %08x\n", hr); + + hr = IDirect3DViewport_AddLight(Viewport, Light); + ok(hr == D3D_OK, "IDirect3DViewport_AddLight returned %08x\n", hr); + refcount = getRefcount((IUnknown*) Light); + ok(refcount == 2, "Refcount should be 2, returned is %d\n", refcount); + + hr = IDirect3DViewport_NextLight(Viewport, NULL, &d3dlight, D3DNEXT_HEAD); + ok(hr == D3D_OK, "IDirect3DViewport_AddLight returned %08x\n", hr); + ok(d3dlight == Light, "Got different light returned %p, expected %p\n", d3dlight, Light); + refcount = getRefcount((IUnknown*) Light); + ok(refcount == 3, "Refcount should be 2, returned is %d\n", refcount); + + hr = IDirect3DViewport_DeleteLight(Viewport, Light); + ok(hr == D3D_OK, "IDirect3DViewport_DeleteLight returned %08x\n", hr); + refcount = getRefcount((IUnknown*) Light); + ok(refcount == 2, "Refcount should be 2, returned is %d\n", refcount); + + IDirect3DLight_Release(Light); } static BOOL colortables_check_equality(PALETTEENTRY table1[256], PALETTEENTRY table2[256])

1 0

Christian Costa : ddraw: Handle refcount of lights when interacting with viewport.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: ffb5f749d58a641ac44e1cc7da56db1a58bb8b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb5f749d58a641ac44e1cc7d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 20 21:19:28 2009 +0200 ddraw: Handle refcount of lights when interacting with viewport. --- dlls/ddraw/viewport.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 30d5e18..c6e346e 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -751,6 +751,7 @@ IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface, /* Add the light in the 'linked' chain */ lpDirect3DLightImpl->next = This->lights; This->lights = lpDirect3DLightImpl; + IDirect3DLight_AddRef(lpDirect3DLight); /* Attach the light to the viewport */ lpDirect3DLightImpl->active_viewport = This; @@ -796,6 +797,7 @@ IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *iface, else prev_light->next = cur_light->next; /* Detach the light to the viewport */ cur_light->active_viewport = NULL; + IDirect3DLight_Release( (IDirect3DLight *)cur_light ); This->num_lights--; This->map_lights &= ~(1<<lpDirect3DLightImpl->dwLightIndex); LeaveCriticalSection(&ddraw_cs); @@ -871,6 +873,9 @@ IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface, break; } + if (*lplpDirect3DLight) + IDirect3DLight_AddRef(*lplpDirect3DLight); + LeaveCriticalSection(&ddraw_cs); return *lplpDirect3DLight ? D3D_OK : DDERR_INVALIDPARAMS;

1 0

David Adam : ddraw: Remove useless comments.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 8681d49030a8b6e8e93540e87dae37ff685d6302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8681d49030a8b6e8e93540e87… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Apr 11 13:46:47 2009 +0200 ddraw: Remove useless comments. --- dlls/ddraw/device.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4fe6532..bb3f479 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4356,8 +4356,6 @@ Thunk_IDirect3DDeviceImpl_3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface, * The return value consist of a combination of D3DCLIP_* flags, or it's * 0 if the sphere is completely visible(according to the SDK, not checked) * - * Sounds like an overdose of math ;) - * * Version 3 and 7 * * Params: @@ -4368,7 +4366,7 @@ Thunk_IDirect3DDeviceImpl_3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface, * ReturnValues: Array to write the results to * * Returns: - * D3D_OK because it's a stub + * D3D_OK * (DDERR_INVALIDPARAMS if Centers, Radii or ReturnValues are NULL) * (D3DERR_INVALIDMATRIX if the combined world, view and proj matrix * is singular)

1 0

Peter Schauer : comctl32/listview: Fix warning from DPA_GetPtr.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 56720276e898bb0c0b350378f26047358bd6cf8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56720276e898bb0c0b350378f… Author: Peter Schauer <peterschauer(a)gmx.net> Date: Sun Apr 19 13:14:55 2009 +0200 comctl32/listview: Fix warning from DPA_GetPtr. --- dlls/comctl32/listview.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a4899c6..e6fa8ec 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2654,15 +2654,17 @@ static void ranges_assert(RANGES ranges, LPCSTR desc, const char *func, int line assert (ranges); assert (DPA_GetPtrCount(ranges->hdpa) >= 0); ranges_dump(ranges); - prev = DPA_GetPtr(ranges->hdpa, 0); if (DPA_GetPtrCount(ranges->hdpa) > 0) - assert (prev->lower >= 0 && prev->lower < prev->upper); - for (i = 1; i < DPA_GetPtrCount(ranges->hdpa); i++) { - curr = DPA_GetPtr(ranges->hdpa, i); - assert (prev->upper <= curr->lower); - assert (curr->lower < curr->upper); - prev = curr; + prev = DPA_GetPtr(ranges->hdpa, 0); + assert (prev->lower >= 0 && prev->lower < prev->upper); + for (i = 1; i < DPA_GetPtrCount(ranges->hdpa); i++) + { + curr = DPA_GetPtr(ranges->hdpa, i); + assert (prev->upper <= curr->lower); + assert (curr->lower < curr->upper); + prev = curr; + } } TRACE("--- Done checking---\n"); }

1 0

Hans Leidekker : ntdll: Implement NtQuery/SetInformationToken( TokenDefaultDacl).
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: f483f71ad2bac670c2f2c297c3e096d623164aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f483f71ad2bac670c2f2c297c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 09:53:49 2009 +0200 ntdll: Implement NtQuery/SetInformationToken(TokenDefaultDacl). --- dlls/advapi32/tests/security.c | 49 +++++++++++++++++++++++++++- dlls/ntdll/nt.c | 69 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 110 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f775d10..b68629d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1176,14 +1176,16 @@ static void test_AccessCheck(void) static void test_token_attr(void) { HANDLE Token, ImpersonationToken; - DWORD Size; + DWORD Size, Size2; TOKEN_PRIVILEGES *Privileges; TOKEN_GROUPS *Groups; TOKEN_USER *User; + TOKEN_DEFAULT_DACL *Dacl; BOOL ret; DWORD i, GLE; LPSTR SidString; SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + ACL *acl; /* cygwin-like use case */ SetLastError(0xdeadbeef); @@ -1214,7 +1216,7 @@ static void test_token_attr(void) } SetLastError(0xdeadbeef); - ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &Token); + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &Token); ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); /* groups */ @@ -1283,6 +1285,49 @@ static void test_token_attr(void) ok(ImpersonationLevel == SecurityAnonymous, "ImpersonationLevel should have been SecurityAnonymous instead of %d\n", ImpersonationLevel); CloseHandle(ImpersonationToken); + + /* default dacl */ + ret = GetTokenInformation(Token, TokenDefaultDacl, NULL, 0, &Size); + ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); + + Dacl = HeapAlloc(GetProcessHeap(), 0, Size); + ret = GetTokenInformation(Token, TokenDefaultDacl, Dacl, Size, &Size); + ok(ret, "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetTokenInformation(Token, TokenDefaultDacl, NULL, 0); + GLE = GetLastError(); + ok(!ret, "SetTokenInformation(TokenDefaultDacl) succeeded\n"); + ok(GLE == ERROR_BAD_LENGTH, "expected ERROR_BAD_LENGTH got %u\n", GLE); + + SetLastError(0xdeadbeef); + ret = SetTokenInformation(Token, TokenDefaultDacl, NULL, Size); + GLE = GetLastError(); + ok(!ret, "SetTokenInformation(TokenDefaultDacl) succeeded\n"); + ok(GLE == ERROR_NOACCESS, "expected ERROR_NOACCESS got %u\n", GLE); + + acl = Dacl->DefaultDacl; + Dacl->DefaultDacl = NULL; + + ret = SetTokenInformation(Token, TokenDefaultDacl, Dacl, Size); + ok(ret, "SetTokenInformation(TokenDefaultDacl) succeeded\n"); + + Size2 = 0; + Dacl->DefaultDacl = (ACL *)0xdeadbeef; + ret = GetTokenInformation(Token, TokenDefaultDacl, Dacl, Size, &Size2); + ok(ret, "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); + ok(Dacl->DefaultDacl == NULL, "expected NULL, got %p\n", Dacl->DefaultDacl); + ok(Size2 == sizeof(TOKEN_DEFAULT_DACL), "got %u expected sizeof(TOKEN_DEFAULT_DACL)\n", Size2); + + Dacl->DefaultDacl = acl; + ret = SetTokenInformation(Token, TokenDefaultDacl, Dacl, Size); + ok(ret, "SetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); + + ret = GetTokenInformation(Token, TokenDefaultDacl, Dacl, Size, &Size2); + ok(ret, "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, Dacl); CloseHandle(Token); } diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index d2e133c..8ffa9e0 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -242,9 +242,6 @@ NTSTATUS WINAPI NtQueryInformationToken( case TokenPrimaryGroup: len = sizeof(TOKEN_PRIMARY_GROUP); break; - case TokenDefaultDacl: - len = sizeof(TOKEN_DEFAULT_DACL); - break; case TokenSource: len = sizeof(TOKEN_SOURCE); break; @@ -441,6 +438,31 @@ NTSTATUS WINAPI NtQueryInformationToken( } SERVER_END_REQ; break; + case TokenDefaultDacl: + SERVER_START_REQ( get_token_default_dacl ) + { + TOKEN_DEFAULT_DACL *default_dacl = tokeninfo; + ACL *acl = (ACL *)(default_dacl + 1); + DWORD acl_len; + + if (tokeninfolength < sizeof(TOKEN_DEFAULT_DACL)) acl_len = 0; + else acl_len = tokeninfolength - sizeof(TOKEN_DEFAULT_DACL); + + req->handle = wine_server_obj_handle( token ); + wine_server_set_reply( req, acl, acl_len ); + status = wine_server_call( req ); + + if (retlen) *retlen = reply->acl_len + sizeof(TOKEN_DEFAULT_DACL); + if (status == STATUS_SUCCESS) + { + if (reply->acl_len) + default_dacl->DefaultDacl = acl; + else + default_dacl->DefaultDacl = NULL; + } + } + SERVER_END_REQ; + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass); @@ -460,9 +482,44 @@ NTSTATUS WINAPI NtSetInformationToken( PVOID TokenInformation, ULONG TokenInformationLength) { - FIXME("%p %d %p %u\n", TokenHandle, TokenInformationClass, - TokenInformation, TokenInformationLength); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS ret = STATUS_NOT_IMPLEMENTED; + + TRACE("%p %d %p %u\n", TokenHandle, TokenInformationClass, + TokenInformation, TokenInformationLength); + + switch (TokenInformationClass) + { + case TokenDefaultDacl: + if (TokenInformationLength < sizeof(TOKEN_DEFAULT_DACL)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + if (!TokenInformation) + { + ret = STATUS_ACCESS_VIOLATION; + break; + } + SERVER_START_REQ( set_token_default_dacl ) + { + ACL *acl = ((TOKEN_DEFAULT_DACL *)TokenInformation)->DefaultDacl; + WORD size; + + if (acl) size = acl->AclSize; + else size = 0; + + req->handle = wine_server_obj_handle( TokenHandle ); + wine_server_add_data( req, acl, size ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + break; + default: + FIXME("unimplemented class %u\n", TokenInformationClass); + break; + } + + return ret; } /******************************************************************************

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
67
Older →

Jump to page:

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-commits April 2009