wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Henri Verbeet : ddraw: Get rid of the DDSCAPS_BACKBUFFER validation in ddraw_surface_create().
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 8a9fdb567ed5a2a76cef0e7ba47d3e9bfa04f9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9fdb567ed5a2a76cef0e7ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 2 12:07:36 2013 +0100 ddraw: Get rid of the DDSCAPS_BACKBUFFER validation in ddraw_surface_create(). All callers except ddraw1_CreateSurface() already have a stricter check themselves. --- dlls/ddraw/ddraw.c | 8 ++++++++ dlls/ddraw/surface.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d2d762d..7fca84c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2924,6 +2924,14 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, /* Remove front buffer flag, this causes failure in v7, and its added to normal * primaries anyway. */ surface_desc->ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; + if ((surface_desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER)) + == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER)) + { + WARN("Application tried to create an explicit front or back buffer.\n"); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + DDSD_to_DDSD2(surface_desc, &surface_desc2); hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 29385b7..37fd096 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5640,14 +5640,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_NOEXCLUSIVEMODE; } - if ((desc->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) - == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) - { - WARN("Tried to create a back buffer surface.\n"); - HeapFree(GetProcessHeap(), 0, texture); - return DDERR_INVALIDCAPS; - } - /* This is a special case in ddrawex, but not allowed in ddraw. */ if ((desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) == (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY))

1 0

Henri Verbeet : ddraw: Use hr_ddraw_from_wined3d() in ddraw_surface_create( ).
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: d56b7c20160fbaaecf36ce1e4279a82576000f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56b7c20160fbaaecf36ce1e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 2 12:07:35 2013 +0100 ddraw: Use hr_ddraw_from_wined3d() in ddraw_surface_create(). --- dlls/ddraw/surface.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e94876f..29385b7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5698,7 +5698,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { ERR("Failed to get display mode, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, texture); - return hr; + return hr_ddraw_from_wined3d(hr); } /* No pixelformat given? Use the current screen format. */ @@ -5757,7 +5757,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { ERR("Failed to reset device.\n"); HeapFree(GetProcessHeap(), 0, texture); - return hr; + return hr_ddraw_from_wined3d(hr); } } } @@ -5906,18 +5906,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); - switch (hr) - { - case WINED3DERR_INVALIDCALL: - hr = DDERR_INVALIDPARAMS; - break; - - default: - FIXME("Unexpected wined3d error %#x.\n", hr); - break; - } HeapFree(GetProcessHeap(), 0, texture); - return hr; + return hr_ddraw_from_wined3d(hr); } resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); @@ -6006,6 +5996,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) { HeapFree(GetProcessHeap(), 0, texture); + hr = hr_ddraw_from_wined3d(hr); goto fail; }

1 0

Henri Verbeet : wined3d: Properly check for the front buffer in d3dfmt_get_conv().
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 7052c87358ee3d54fc07cd4ae26f9cc21c530323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7052c87358ee3d54fc07cd4ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 2 12:07:34 2013 +0100 wined3d: Properly check for the front buffer in d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ac168dd..ccf6249 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1823,7 +1823,7 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ * in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which * conflicts with this. */ - if (!((blit_supported && device->fb.render_targets && surface == device->fb.render_targets[0])) + if (!((blit_supported && surface->swapchain && surface == surface->swapchain->front_buffer)) || colorkey_active || !use_texturing) { format->glFormat = GL_RGBA;

1 0

Hans Leidekker : msi: Fix handling of empty mask edit templates.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 3271b982632e7730d6cee373f4c9a4af37012036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3271b982632e7730d6cee373f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 2 11:18:06 2013 +0100 msi: Fix handling of empty mask edit templates. --- dlls/msi/dialog.c | 59 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 42 insertions(+), 17 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 245ed1e..baa6890 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1822,24 +1822,33 @@ static void msi_mask_control_change( struct msi_maskedit_info *info ) val = msi_alloc( (info->num_chars+1)*sizeof(WCHAR) ); for( i=0, n=0; i<info->num_groups; i++ ) { - if( (info->group[i].len + n) > info->num_chars ) + if (info->group[i].len == ~0u) { - ERR("can't fit control %d text into template\n",i); - break; - } - if (!msi_mask_editable(info->group[i].type)) - { - for(r=0; r<info->group[i].len; r++) - val[n+r] = info->group[i].type; - val[n+r] = 0; + UINT len = SendMessageW( info->group[i].hwnd, WM_GETTEXTLENGTH, 0, 0 ); + val = msi_realloc( val, (len + 1) * sizeof(WCHAR) ); + GetWindowTextW( info->group[i].hwnd, val, len + 1 ); } else { - r = GetWindowTextW( info->group[i].hwnd, &val[n], info->group[i].len+1 ); - if( r != info->group[i].len ) + if (info->group[i].len + n > info->num_chars) + { + ERR("can't fit control %d text into template\n",i); break; + } + if (!msi_mask_editable(info->group[i].type)) + { + for(r=0; r<info->group[i].len; r++) + val[n+r] = info->group[i].type; + val[n+r] = 0; + } + else + { + r = GetWindowTextW( info->group[i].hwnd, &val[n], info->group[i].len+1 ); + if( r != info->group[i].len ) + break; + } + n += r; } - n += r; } TRACE("%d/%d controls were good\n", i, info->num_groups); @@ -1934,14 +1943,14 @@ msi_maskedit_set_text( struct msi_maskedit_info *info, LPCWSTR text ) static struct msi_maskedit_info * msi_dialog_parse_groups( LPCWSTR mask ) { - struct msi_maskedit_info * info = NULL; + struct msi_maskedit_info *info; int i = 0, n = 0, total = 0; LPCWSTR p; TRACE("masked control, template %s\n", debugstr_w(mask)); if( !mask ) - return info; + return NULL; info = msi_alloc_zero( sizeof *info ); if( !info ) @@ -1957,7 +1966,16 @@ static struct msi_maskedit_info * msi_dialog_parse_groups( LPCWSTR mask ) { /* stop at the end of the string */ if( p[0] == 0 || p[0] == '>' ) + { + if (!total) + { + /* create a group for the empty mask */ + info->group[0].type = '&'; + info->group[0].len = ~0u; + i = 1; + } break; + } /* count the number of the same identifier */ for( n=0; p[n] == p[0]; n++ ) @@ -2003,9 +2021,16 @@ msi_maskedit_create_children( struct msi_maskedit_info *info, LPCWSTR font ) { if (!msi_mask_editable( info->group[i].type )) continue; - wx = (info->group[i].ofs * width) / info->num_chars; - ww = (info->group[i].len * width) / info->num_chars; - + if (info->num_chars) + { + wx = (info->group[i].ofs * width) / info->num_chars; + ww = (info->group[i].len * width) / info->num_chars; + } + else + { + wx = 0; + ww = width; + } hwnd = CreateWindowW( szEdit, NULL, style, wx, 0, ww, height, info->hwnd, NULL, NULL, NULL ); if( !hwnd )

1 0

Andrey Gusev : d3dcompiler_43: Fix a typo.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 1f29734b185fa06759c38075cb9f3bd9abbef45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f29734b185fa06759c38075c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 30 23:54:51 2013 +0200 d3dcompiler_43: Fix a typo. --- dlls/d3dcompiler_43/reflection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 9d59ce4..e2955f0 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -182,7 +182,7 @@ static BOOL copy_value(const char *ptr, void **value, DWORD size) *value = HeapAlloc(GetProcessHeap(), 0, size); if (!*value) { - ERR("Failed to allocate vlaue memory.\n"); + ERR("Failed to allocate value memory.\n"); return FALSE; }

1 0

Andrey Gusev : d3d11: Add version.rc file.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: f5be799b07fda8d79e53fd6cc981dc777c92d19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5be799b07fda8d79e53fd6cc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 30 01:56:03 2013 +0200 d3d11: Add version.rc file. --- dlls/d3d11/Makefile.in | 2 ++ dlls/d3d11/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in index da7bbe6..d8ca7fb 100644 --- a/dlls/d3d11/Makefile.in +++ b/dlls/d3d11/Makefile.in @@ -3,4 +3,6 @@ MODULE = d3d11.dll C_SRCS = \ d3d11_main.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ diff --git a/dlls/d3d11/version.rc b/dlls/d3d11/version.rc new file mode 100644 index 0000000..4246bda --- /dev/null +++ b/dlls/d3d11/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2013 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Direct3D" +#define WINE_FILENAME_STR "d3d11.dll" +#define WINE_FILEVERSION 7,0,6002,18107 +#define WINE_FILEVERSION_STR "7.0.6002.18107" +#define WINE_PRODUCTVERSION 7,0,6002,18107 +#define WINE_PRODUCTVERSION_STR "7.0.6002.18107" + +#include "wine/wine_common_ver.rc"

1 0

André Hentschel : include: Add bdaiface.idl.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 5430fafa8535bad4eb9bb6eabff0c5d1f8ea3565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5430fafa8535bad4eb9bb6eab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 29 23:36:49 2013 +0100 include: Add bdaiface.idl. --- .gitignore | 1 + include/Makefile.in | 3 + include/bdaiface.idl | 778 ++++++++++++++++++++++++++++++++++++++++++++++ include/bdaiface_enums.h | 89 ++++++ include/bdatypes.h | 264 ++++++++++++++++ 5 files changed, 1135 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5430fafa8535bad4eb9bb…

1 0

André Hentschel : propsys: Add stub for PSGetPropertyDescriptionListFromString.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: e8ac5892e847448761b63f56ae734f417dc63f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ac5892e847448761b63f56a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 29 23:36:46 2013 +0100 propsys: Add stub for PSGetPropertyDescriptionListFromString. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 6 ++++++ include/propsys.idl | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15386d7..a64d53a 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -81,7 +81,7 @@ @ stub PSGetNamedPropertyFromPropertyStorage @ stdcall PSGetPropertyDescription(ptr ptr ptr) @ stub PSGetPropertyDescriptionByName -@ stub PSGetPropertyDescriptionListFromString +@ stdcall PSGetPropertyDescriptionListFromString(ptr ptr ptr) @ stub PSGetPropertyFromPropertyStorage @ stub PSGetPropertyKeyFromName @ stub PSGetPropertySystem diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 8d05ad0..ad96aab 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -159,6 +159,12 @@ HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY propkey, REFIID riid, voi return E_NOTIMPL; } +HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR proplist, REFIID riid, void **ppv) +{ + FIXME("%s, %p, %p\n", debugstr_w(proplist), riid, ppv); + return E_NOTIMPL; +} + HRESULT WINAPI PSRefreshPropertySchema(void) { FIXME("\n"); diff --git a/include/propsys.idl b/include/propsys.idl index 993686d..0117090 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -802,6 +802,7 @@ cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") +cpp_quote("HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR,REFIID,void **);") cpp_quote("HRESULT WINAPI PSRefreshPropertySchema(void);") /* TODO: Add remainder of the C api here */

1 0

Frédéric Delanoy : winealsa.drv: Use BOOL type where appropriate.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 901fff3c07541e9f54892206ce8e8ec637c12a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=901fff3c07541e9f54892206c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 30 01:47:02 2013 +0100 winealsa.drv: Use BOOL type where appropriate. --- dlls/winealsa.drv/midi.c | 14 +++++++------- dlls/winealsa.drv/mmdevdrv.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 748fa79..4e74440 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -216,11 +216,11 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static int midi_warn = 1; +static BOOL midi_warn = TRUE; /************************************************************************** * midiOpenSeq [internal] */ -static int midiOpenSeq(int create_client) +static int midiOpenSeq(BOOL create_client) { if (numOpenMidiSeq == 0) { if (snd_seq_open(&midiSeq, "default", SND_SEQ_OPEN_DUPLEX, 0) < 0) @@ -229,7 +229,7 @@ static int midiOpenSeq(int create_client) { WARN("Error opening ALSA sequencer.\n"); } - midi_warn = 0; + midi_warn = FALSE; return -1; } @@ -474,7 +474,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_INVALFLAG; } - if (midiOpenSeq(1) < 0) { + if (midiOpenSeq(TRUE) < 0) { return MMSYSERR_ERROR; } @@ -732,7 +732,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) case MOD_FMSYNTH: case MOD_MIDIPORT: case MOD_SYNTH: - if (midiOpenSeq(1) < 0) { + if (midiOpenSeq(TRUE) < 0) { return MMSYSERR_ALLOCATED; } break; @@ -1221,7 +1221,7 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* * * Initializes the MIDI devices information variables */ -static LONG ALSA_MidiInit(void) +static BOOL ALSA_MidiInit(void) { static BOOL bInitDone = FALSE; snd_seq_client_info_t *cinfo; @@ -1234,7 +1234,7 @@ static LONG ALSA_MidiInit(void) bInitDone = TRUE; /* try to open device */ - if (midiOpenSeq(0) == -1) { + if (midiOpenSeq(FALSE) == -1) { return TRUE; } diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6e854e4..3cfad3a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -770,7 +770,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient int err; snd_pcm_stream_t stream; snd_config_t *lconf; - static int handle_underrun = 1; + static BOOL handle_underrun = TRUE; char alsa_name[256]; EDataFlow dataflow; HRESULT hr; @@ -816,7 +816,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient if(err == -EINVAL){ ERR_(winediag)("PulseAudio \"%s\" %d without handle_underrun. Audio may hang." " Please upgrade to alsa_plugins >= 1.0.24\n", alsa_name, err); - handle_underrun = 0; + handle_underrun = FALSE; } }else err = -EINVAL;

1 0

Nikolay Sivov : ntdll: Allow NULL return length argument in NtAdjustPrivilegesToken().
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: fd65b0a1c3f5f981cc110ca9e6a0edb6323e1296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd65b0a1c3f5f981cc110ca9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 2 09:38:09 2013 +0400 ntdll: Allow NULL return length argument in NtAdjustPrivilegesToken(). --- dlls/advapi32/security.c | 5 +++-- dlls/advapi32/tests/security.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/nt.c | 2 +- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 359b1e2..a77bad4 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -611,8 +611,9 @@ AdjustTokenPrivileges( HANDLE TokenHandle, BOOL DisableAllPrivileges, { NTSTATUS status; - TRACE("\n"); - + TRACE("(%p %d %p %d %p %p)\n", TokenHandle, DisableAllPrivileges, NewState, BufferLength, + PreviousState, ReturnLength); + status = NtAdjustPrivilegesToken(TokenHandle, DisableAllPrivileges, NewState, BufferLength, PreviousState, ReturnLength); diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index fe31b5c..4de588f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4760,6 +4760,41 @@ static void test_default_dacl_owner_sid(void) CloseHandle( handle ); } +static void test_AdjustTokenPrivileges(void) +{ + TOKEN_PRIVILEGES tp, prev; + HANDLE token; + DWORD len; + LUID luid; + BOOL ret; + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) + return; + + if (!LookupPrivilegeValueA(NULL, SE_BACKUP_NAME, &luid)) + { + CloseHandle(token); + return; + } + + tp.PrivilegeCount = 1; + tp.Privileges[0].Luid = luid; + tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + len = 0xdeadbeef; + ret = AdjustTokenPrivileges(token, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), NULL, &len); + ok(ret, "got %d\n", ret); + ok(len == 0xdeadbeef, "got length %d\n", len); + + /* revert */ + tp.PrivilegeCount = 1; + tp.Privileges[0].Luid = luid; + tp.Privileges[0].Attributes = 0; + AdjustTokenPrivileges(token, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), &prev, NULL); + + CloseHandle(token); +} + START_TEST(security) { init(); @@ -4800,4 +4835,5 @@ START_TEST(security) test_CreateRestrictedToken(); test_TokenIntegrityLevel(); test_default_dacl_owner_sid(); + test_AdjustTokenPrivileges(); } diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index db8272f..ce648de 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -223,7 +223,7 @@ NTSTATUS WINAPI NtAdjustPrivilegesToken( ret = wine_server_call( req ); if (PreviousState) { - *ReturnLength = reply->len + FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ); + if (ReturnLength) *ReturnLength = reply->len + FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ); PreviousState->PrivilegeCount = reply->len / sizeof(LUID_AND_ATTRIBUTES); } }

1 0

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 December 2013