April 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32/tests: Fix a few sysparams tests on various Windows versions.
by Alexandre Julliard April 22, 2009

April 22, 2009

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

Reece Dunn : winecfg: Fix the size of the application static text in Spanish.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: 2c3d5b27c220f77cdcc3638f05a49c8b92b564bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c3d5b27c220f77cdcc3638f0… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Tue Apr 21 21:10:04 2009 +0100 winecfg: Fix the size of the application static text in Spanish. --- programs/winecfg/Es.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 440ea71..86639f7 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -52,9 +52,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Configuraci�n de aplicaciones ",IDC_STATIC, 8,4,244,240 LTEXT "Wine puede imitar distintas versiones de Windows para cada aplicaci�n. Esta pesta�a est� enlazada a las de Librer�as y Gr�ficos para poder cambiar en ellas la configuraci�n global y/o la de por aplicaci�n.", - IDC_STATIC,15,20,227,30 + IDC_STATIC,15,20,227,32 CONTROL "Aplicaciones",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, - 15,50,230,150 + 15,56,230,144 PUSHBUTTON "&A�adir aplicaci�n...",IDC_APP_ADDAPP, 90,204,75,14 PUSHBUTTON "&Eliminar aplicaci�n...",IDC_APP_REMOVEAPP, 170,204,75,14 LTEXT "&Versi�n a imitar:",IDC_STATIC,17,226,58,16

1 0

Reece Dunn : winecfg: Fix the size of the application static text in Japanese.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: cd71cb26f9d1ed81715838aeefd740437bc061f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd71cb26f9d1ed81715838aee… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Tue Apr 21 21:10:24 2009 +0100 winecfg: Fix the size of the application static text in Japanese. --- programs/winecfg/Ja.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index 8eaa603..a7868bb 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -57,9 +57,9 @@ FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " アプリケーション設定 ",IDC_STATIC, 8,4,244,240 LTEXT "Wineはアプリケーションによって異なるWindowsのバージョンをエミュレートできます。このタブはライブラリ及びグラフィック各タブと連動しますので、システム全体の設定や\n個別アプリケーションの設定の変更が行えます。", - IDC_STATIC,15,20,227,30 + IDC_STATIC,15,20,227,36 CONTROL "アプリケーション",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, - 15,50,230,150 + 15,56,230,144 PUSHBUTTON "アプリケーションを追加(&A)...",IDC_APP_ADDAPP, 90,204,75,14 PUSHBUTTON "アプリケーションを削除(&R)",IDC_APP_REMOVEAPP, 170,204,75,14 LTEXT "&Windows バージョン:",IDC_STATIC,17,226,58,8

1 0

Kai Blin : sxs: Implement a stub CreateAssemblyCache to make Publish or Perish install.
by Alexandre Julliard April 21, 2009

April 21, 2009

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 April 21, 2009

April 21, 2009

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 April 21, 2009

April 21, 2009

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 April 21, 2009

April 21, 2009

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

Hans Leidekker : server: Add requests to set and retrieve default dacl.
by Alexandre Julliard April 21, 2009

April 21, 2009

Module: wine Branch: master Commit: 24af6f3e0185e0d61327093bfa6c25de124bfbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=24af6f3e0185e0d61327093bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 09:53:16 2009 +0200 server: Add requests to set and retrieve default dacl. --- include/wine/server_protocol.h | 32 +++++++++++++++++++++++++++- server/protocol.def | 12 ++++++++++ server/request.h | 9 +++++++ server/token.c | 46 ++++++++++++++++++++++++++++++++++++++++ server/trace.c | 30 ++++++++++++++++++++++++++ 5 files changed, 128 insertions(+), 1 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 31ef863..f819686 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4100,6 +4100,30 @@ struct get_token_groups_reply char __pad_12[4]; }; +struct get_token_default_dacl_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_token_default_dacl_reply +{ + struct reply_header __header; + data_size_t acl_len; + /* VARARG(acl,ACL); */ + char __pad_12[4]; +}; + +struct set_token_default_dacl_request +{ + struct request_header __header; + obj_handle_t handle; + /* VARARG(acl,ACL); */ +}; +struct set_token_default_dacl_reply +{ + struct reply_header __header; +}; + struct set_security_object_request { struct request_header __header; @@ -4765,6 +4789,8 @@ enum request REQ_access_check, REQ_get_token_user, REQ_get_token_groups, + REQ_get_token_default_dacl, + REQ_set_token_default_dacl, REQ_set_security_object, REQ_get_security_object, REQ_create_mailslot, @@ -5008,6 +5034,8 @@ union generic_request struct access_check_request access_check_request; struct get_token_user_request get_token_user_request; struct get_token_groups_request get_token_groups_request; + struct get_token_default_dacl_request get_token_default_dacl_request; + struct set_token_default_dacl_request set_token_default_dacl_request; struct set_security_object_request set_security_object_request; struct get_security_object_request get_security_object_request; struct create_mailslot_request create_mailslot_request; @@ -5249,6 +5277,8 @@ union generic_reply struct access_check_reply access_check_reply; struct get_token_user_reply get_token_user_reply; struct get_token_groups_reply get_token_groups_reply; + struct get_token_default_dacl_reply get_token_default_dacl_reply; + struct set_token_default_dacl_reply set_token_default_dacl_reply; struct set_security_object_reply set_security_object_reply; struct get_security_object_reply get_security_object_reply; struct create_mailslot_reply create_mailslot_reply; @@ -5280,6 +5310,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 385 +#define SERVER_PROTOCOL_VERSION 386 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 004f4c9..8ae653b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2896,6 +2896,18 @@ enum message_type VARARG(user,token_groups); /* groups the token's user belongs to */ @END +(a)REQ(get_token_default_dacl) + obj_handle_t handle; /* handle to the token */ +(a)REPLY + data_size_t acl_len; /* length needed to store access control list */ + VARARG(acl,ACL); /* access control list */ +(a)END + +(a)REQ(set_token_default_dacl) + obj_handle_t handle; /* handle to the token */ + VARARG(acl,ACL); /* default dacl to set */ +(a)END + @REQ(set_security_object) obj_handle_t handle; /* handle to the object */ unsigned int security_info; /* which parts of security descriptor to set */ diff --git a/server/request.h b/server/request.h index f0ebcba..f85756c 100644 --- a/server/request.h +++ b/server/request.h @@ -318,6 +318,8 @@ DECL_HANDLER(duplicate_token); DECL_HANDLER(access_check); DECL_HANDLER(get_token_user); DECL_HANDLER(get_token_groups); +DECL_HANDLER(get_token_default_dacl); +DECL_HANDLER(set_token_default_dacl); DECL_HANDLER(set_security_object); DECL_HANDLER(get_security_object); DECL_HANDLER(create_mailslot); @@ -560,6 +562,8 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_access_check, (req_handler)req_get_token_user, (req_handler)req_get_token_groups, + (req_handler)req_get_token_default_dacl, + (req_handler)req_set_token_default_dacl, (req_handler)req_set_security_object, (req_handler)req_get_security_object, (req_handler)req_create_mailslot, @@ -1750,6 +1754,11 @@ C_ASSERT( sizeof(struct get_token_user_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_token_groups_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_token_groups_reply, user_len) == 8 ); C_ASSERT( sizeof(struct get_token_groups_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_token_default_dacl_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_token_default_dacl_reply, acl_len) == 8 ); +C_ASSERT( sizeof(struct get_token_default_dacl_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_token_default_dacl_request, handle) == 12 ); +C_ASSERT( sizeof(struct set_token_default_dacl_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_security_object_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_security_object_request, security_info) == 16 ); C_ASSERT( sizeof(struct set_security_object_request) == 24 ); diff --git a/server/token.c b/server/token.c index 7352ec2..ce896ac 100644 --- a/server/token.c +++ b/server/token.c @@ -1344,3 +1344,49 @@ DECL_HANDLER(get_token_statistics) release_object( token ); } } + +DECL_HANDLER(get_token_default_dacl) +{ + struct token *token; + + reply->acl_len = 0; + + if ((token = (struct token *)get_handle_obj( current->process, req->handle, + TOKEN_QUERY, + &token_ops ))) + { + if (token->default_dacl) + reply->acl_len = token->default_dacl->AclSize; + + if (reply->acl_len <= get_reply_max_size()) + { + ACL *acl_reply = set_reply_data_size( reply->acl_len ); + if (acl_reply) + memcpy( acl_reply, token->default_dacl, reply->acl_len ); + } + else set_error( STATUS_BUFFER_TOO_SMALL ); + + release_object( token ); + } +} + +DECL_HANDLER(set_token_default_dacl) +{ + struct token *token; + + if ((token = (struct token *)get_handle_obj( current->process, req->handle, + TOKEN_ADJUST_DEFAULT, + &token_ops ))) + { + const ACL *acl = get_req_data(); + unsigned int acl_size = get_req_data_size(); + + free( token->default_dacl ); + token->default_dacl = NULL; + + if (acl_size) + token->default_dacl = memdup( acl, acl_size ); + + release_object( token ); + } +} diff --git a/server/trace.c b/server/trace.c index 4a7bfa5..6781ef7 100644 --- a/server/trace.c +++ b/server/trace.c @@ -907,6 +907,13 @@ static void dump_inline_acl( const char *prefix, const ACL *acl, data_size_t siz fputc( '}', stderr ); } +static void dump_varargs_ACL( const char *prefix, data_size_t size ) +{ + const ACL *acl = cur_data; + dump_inline_acl( prefix, acl, size ); + remove_data( size ); +} + static void dump_inline_security_descriptor( const char *prefix, const struct security_descriptor *sd, data_size_t size ) { fprintf( stderr,"%s{", prefix ); @@ -3461,6 +3468,23 @@ static void dump_get_token_groups_reply( const struct get_token_groups_reply *re dump_varargs_token_groups( ", user=", cur_size ); } +static void dump_get_token_default_dacl_request( const struct get_token_default_dacl_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_get_token_default_dacl_reply( const struct get_token_default_dacl_reply *req ) +{ + fprintf( stderr, " acl_len=%u", req->acl_len ); + dump_varargs_ACL( ", acl=", cur_size ); +} + +static void dump_set_token_default_dacl_request( const struct set_token_default_dacl_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + dump_varargs_ACL( ", acl=", cur_size ); +} + static void dump_set_security_object_request( const struct set_security_object_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -3995,6 +4019,8 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_access_check_request, (dump_func)dump_get_token_user_request, (dump_func)dump_get_token_groups_request, + (dump_func)dump_get_token_default_dacl_request, + (dump_func)dump_set_token_default_dacl_request, (dump_func)dump_set_security_object_request, (dump_func)dump_get_security_object_request, (dump_func)dump_create_mailslot_request, @@ -4234,6 +4260,8 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_access_check_reply, (dump_func)dump_get_token_user_reply, (dump_func)dump_get_token_groups_reply, + (dump_func)dump_get_token_default_dacl_reply, + NULL, NULL, (dump_func)dump_get_security_object_reply, (dump_func)dump_create_mailslot_reply, @@ -4473,6 +4501,8 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "access_check", "get_token_user", "get_token_groups", + "get_token_default_dacl", + "set_token_default_dacl", "set_security_object", "get_security_object", "create_mailslot",

1 0

Hans Leidekker : ntdll: Implement NtQuery/SetInformationToken( TokenDefaultDacl).
by Alexandre Julliard April 21, 2009

April 21, 2009

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

Peter Schauer : comctl32/listview: Fix warning from DPA_GetPtr.
by Alexandre Julliard April 21, 2009

April 21, 2009

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