September 2007 - Wine-Commits

Stefan Dösinger : wined3d: Put V8U8 back into the UNKNOWN format group.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: bf9cc30aacf84798422b2ba2862a889d2128f403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9cc30aacf84798422b2ba28… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 24 16:16:31 2007 +0200 wined3d: Put V8U8 back into the UNKNOWN format group. --- dlls/wined3d/arb_program_shader.c | 7 ++++++- dlls/wined3d/utils.c | 33 ++++++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4d404d6..3ceffe7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -598,10 +598,15 @@ static void shader_arb_color_correction(SHADER_OPCODE_ARG* arg) { case WINED3DFMT_V16U16: if(GL_SUPPORT(NV_TEXTURE_SHADER) || (GL_SUPPORT(ATI_ENVMAP_BUMPMAP) && fmt == WINED3DFMT_V8U8)) { - /* The 3rd channel returns 1.0 in d3d, but 0.0 in gl. Fix this while we're at it :-) */ +#if 0 + /* The 3rd channel returns 1.0 in d3d, but 0.0 in gl. Fix this while we're at it :-) + * disabled until an application that needs it is found because it causes unneeded + * shader recompilation in some game + */ if(strlen(writemask) >= 4) { shader_addline(arg->buffer, "MOV %s.%c, one.z;\n", reg, writemask[3]); } +#endif } else { /* Correct the sign, but leave the blue as it is - it was loaded correctly already * ARB shaders are a bit picky wrt writemasks and swizzles. If we're free to scale diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4765ae5..bd1d7d3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -230,18 +230,33 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) gl_info->gl_formats[dst].conversion_group= WINED3DFMT_UNKNOWN; } - /* V8U8 and V16U16 are always tidied up in the pixel shader - blue is set to 1.0. - * They can't be switched with other formats, but they can be switched with each other, - * except if GL_ATI_envmap_bumpmap is supported. In this case, V8U8 uses the gl native format, - * but V16U16 is converted. + /* V8U8 is supported natively by GL_ATI_envmap_bumpmap and GL_NV_texture_shader. + * V16U16 is only supported by GL_NV_texture_shader. The formats need fixup if + * their extensions are not available. + * + * In theory, V8U8 and V16U16 need a fixup of the undefined blue channel. OpenGL + * returns 0.0 when sampling from it, DirectX 1.0. This is disabled until we find + * an application that needs this because it causes performance problems due to + * shader recompiling in some games. */ - dst = getFmtIdx(WINED3DFMT_V8U8); - gl_info->gl_formats[dst].conversion_group = WINED3DFMT_V8U8; - dst = getFmtIdx(WINED3DFMT_V16U16); - if(!GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + if(!GL_SUPPORT(ATI_ENVMAP_BUMPMAP) && !GL_SUPPORT(NV_TEXTURE_SHADER2)) { + /* signed -> unsigned fixup */ + dst = getFmtIdx(WINED3DFMT_V8U8); gl_info->gl_formats[dst].conversion_group = WINED3DFMT_V8U8; - } else { + dst = getFmtIdx(WINED3DFMT_V16U16); + gl_info->gl_formats[dst].conversion_group = WINED3DFMT_V8U8; + } else if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + /* signed -> unsigned fixup */ + dst = getFmtIdx(WINED3DFMT_V16U16); gl_info->gl_formats[dst].conversion_group = WINED3DFMT_V16U16; + } else { + /* Blue = 1.0 fixup, disabled for now */ +#if 0 + dst = getFmtIdx(WINED3DFMT_V8U8); + gl_info->gl_formats[dst].conversion_group = WINED3DFMT_V8U8; + dst = getFmtIdx(WINED3DFMT_V16U16); + gl_info->gl_formats[dst].conversion_group = WINED3DFMT_V8U8; +#endif } if(!GL_SUPPORT(NV_TEXTURE_SHADER)) {

1 0

Juan Lang : setupapi: Implement SetupDiGetClassDevsA on top of SetupDiGetClassDevsExW.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: 1b023ff69d35d1008f83cef79a3f37802c7ff0d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b023ff69d35d1008f83cef79… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 24 13:02:58 2007 -0700 setupapi: Implement SetupDiGetClassDevsA on top of SetupDiGetClassDevsExW. --- dlls/setupapi/devinst.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5faeaa0..503eaa5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1761,7 +1761,8 @@ HDEVINFO WINAPI SetupDiGetClassDevsA( } MultiByteToWideChar(CP_ACP, 0, enumstr, -1, enumstrW, len); } - ret = SetupDiGetClassDevsW(class, enumstrW, parent, flags); + ret = SetupDiGetClassDevsExW(class, enumstrW, parent, flags, NULL, NULL, + NULL); HeapFree(GetProcessHeap(), 0, enumstrW); end:

1 0

Juan Lang : setupapi: Implement SetupDiGetClassDevsW on top of SetupDiGetClassDevsExW.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: e45f8409444ff5a719ee28833d134aa8d72750e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45f8409444ff5a719ee28833… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 24 13:02:01 2007 -0700 setupapi: Implement SetupDiGetClassDevsW on top of SetupDiGetClassDevsExW. --- dlls/setupapi/devinst.c | 25 ++----------------------- 1 files changed, 2 insertions(+), 23 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0df3b70..5faeaa0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2061,29 +2061,8 @@ HDEVINFO WINAPI SetupDiGetClassDevsW( HWND parent, DWORD flags) { - static const DWORD unsupportedFlags = DIGCF_DEFAULT | DIGCF_PRESENT | - DIGCF_PROFILE; - HDEVINFO set; - - TRACE("%s %s %p 0x%08x\n", debugstr_guid(class), debugstr_w(enumstr), parent, flags); - - if (!(flags & DIGCF_ALLCLASSES) && !class) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - if (flags & unsupportedFlags) - WARN("unsupported flags %08x\n", flags & unsupportedFlags); - /* WinXP always succeeds, returns empty list for unknown classes */ - set = SetupDiCreateDeviceInfoList(class, parent); - if (set) - { - if (flags & DIGCF_DEVICEINTERFACE) - SETUPDI_EnumerateInterfaces(set, class, enumstr, flags); - else - SETUPDI_EnumerateDevices(set, class, enumstr, flags); - } - return set; + return SetupDiGetClassDevsExW(class, enumstr, parent, flags, NULL, NULL, + NULL); } /***********************************************************************

1 0

Juan Lang : setupapi: Partially implement SetupDiGetClassDevsExW.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: 4e06874117497e28006d6d91861054d9e952b9a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e06874117497e28006d6d918… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 24 13:00:42 2007 -0700 setupapi: Partially implement SetupDiGetClassDevsExW. --- dlls/setupapi/devinst.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 85ef0ac..0df3b70 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2098,8 +2098,36 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW( PCWSTR machine, PVOID reserved) { - FIXME("stub\n"); - return NULL; + static const DWORD unsupportedFlags = DIGCF_DEFAULT | DIGCF_PRESENT | + DIGCF_PROFILE; + HDEVINFO set; + + TRACE("%s %s %p 0x%08x %p %s %p\n", debugstr_guid(class), + debugstr_w(enumstr), parent, flags, deviceset, debugstr_w(machine), + reserved); + + if (!(flags & DIGCF_ALLCLASSES) && !class) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (flags & unsupportedFlags) + WARN("unsupported flags %08x\n", flags & unsupportedFlags); + if (deviceset) + set = deviceset; + else + set = SetupDiCreateDeviceInfoListExW(class, parent, machine, reserved); + if (set) + { + if (machine) + FIXME("%s: unimplemented for remote machines\n", + debugstr_w(machine)); + else if (flags & DIGCF_DEVICEINTERFACE) + SETUPDI_EnumerateInterfaces(set, class, enumstr, flags); + else + SETUPDI_EnumerateDevices(set, class, enumstr, flags); + } + return set; } /***********************************************************************

1 0

Juan Lang : setupapi: Implement SetupDiGetDeviceInfoListDetailA/W.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: 9ac11e38647c9844adfaa575f968881b2c8169c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac11e38647c9844adfaa575f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 24 12:45:42 2007 -0700 setupapi: Implement SetupDiGetDeviceInfoListDetailA/W. --- dlls/setupapi/devinst.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 18 ------------- 2 files changed, 66 insertions(+), 18 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index a5356e5..85ef0ac 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2103,6 +2103,72 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW( } /*********************************************************************** + * SetupDiGetDeviceInfoListDetailA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInfoListDetailA( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_LIST_DETAIL_DATA_A DevInfoData ) +{ + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + + TRACE("%p %p\n", DeviceInfoSet, DevInfoData); + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DevInfoData || + DevInfoData->cbSize != sizeof(SP_DEVINFO_LIST_DETAIL_DATA_A)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + memcpy(&DevInfoData->ClassGuid, &set->ClassGuid, sizeof(GUID)); + DevInfoData->RemoteMachineHandle = NULL; + DevInfoData->RemoteMachineName[0] = '\0'; + return TRUE; +} + +/*********************************************************************** + * SetupDiGetDeviceInfoListDetailW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInfoListDetailW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_LIST_DETAIL_DATA_W DevInfoData ) +{ + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + + TRACE("%p %p\n", DeviceInfoSet, DevInfoData); + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DevInfoData || + DevInfoData->cbSize != sizeof(SP_DEVINFO_LIST_DETAIL_DATA_W)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + memcpy(&DevInfoData->ClassGuid, &set->ClassGuid, sizeof(GUID)); + DevInfoData->RemoteMachineHandle = NULL; + DevInfoData->RemoteMachineName[0] = '\0'; + return TRUE; +} + +/*********************************************************************** * SetupDiCreateDeviceInterfaceA (SETUPAPI.@) */ BOOL WINAPI SetupDiCreateDeviceInterfaceA( diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index bf3fa90..3342a65 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -50,24 +50,6 @@ DWORD WINAPI suErrorToIds16( WORD w1, WORD w2 ) } /*********************************************************************** - * SetupDiGetDeviceInfoListDetailA (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDeviceInfoListDetailA(HDEVINFO devinfo, PSP_DEVINFO_LIST_DETAIL_DATA_A devinfo_data ) -{ - FIXME("\n"); - return FALSE; -} - -/*********************************************************************** - * SetupDiGetDeviceInfoListDetailW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDeviceInfoListDetailW(HDEVINFO devinfo, PSP_DEVINFO_LIST_DETAIL_DATA_W devinfo_data ) -{ - FIXME("\n"); - return FALSE; -} - -/*********************************************************************** * (SETUPAPI.@) * * NO WINAPI in description given

1 0

Stefan Leichter : ddrawex: Remove 'recursive registry key delete' function.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: eb77d12b2af92c82b8fa367352cefc665bec329d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb77d12b2af92c82b8fa36735… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Sep 25 09:56:47 2007 +0200 ddrawex: Remove 'recursive registry key delete' function. --- dlls/ddrawex/regsvr.c | 73 +++---------------------------------------------- 1 files changed, 4 insertions(+), 69 deletions(-) diff --git a/dlls/ddrawex/regsvr.c b/dlls/ddrawex/regsvr.c index 0e73abc..5467f6b 100644 --- a/dlls/ddrawex/regsvr.c +++ b/dlls/ddrawex/regsvr.c @@ -94,9 +94,6 @@ static LONG register_key_defvalueW(HKEY base, WCHAR const *name, WCHAR const *value); static LONG register_key_defvalueA(HKEY base, WCHAR const *name, char const *value); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_coclasses @@ -200,11 +197,13 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -256,70 +255,6 @@ static LONG register_key_defvalueA( } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */

1 0

Stefan Leichter : ddraw: Remove 'recursive registry key delete' function.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: b78736a4bbf8fbef7db4afaff5435fa4a9578cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b78736a4bbf8fbef7db4afaff… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Sep 25 10:07:49 2007 +0200 ddraw: Remove 'recursive registry key delete' function. --- dlls/ddraw/regsvr.c | 76 ++++----------------------------------------------- 1 files changed, 6 insertions(+), 70 deletions(-) diff --git a/dlls/ddraw/regsvr.c b/dlls/ddraw/regsvr.c index 877c8a2..4371e62 100644 --- a/dlls/ddraw/regsvr.c +++ b/dlls/ddraw/regsvr.c @@ -105,9 +105,6 @@ static LONG register_key_defvalueW(HKEY base, WCHAR const *name, WCHAR const *value); static LONG register_key_defvalueA(HKEY base, WCHAR const *name, char const *value); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -196,7 +193,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -306,11 +304,13 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -373,70 +373,6 @@ static LONG register_key_defvalueA( } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */

1 0

Mikolaj Zalewski : ntdll: Add RtlAddAuditAccessAceEx.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: 04e688a26d9f7c93748edb4eac650fd03c6d2381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e688a26d9f7c93748edb4ea… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Mon Sep 24 17:20:36 2007 -0700 ntdll: Add RtlAddAuditAccessAceEx. --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/sec.c | 21 +++++++++++++++++---- include/winternl.h | 1 + 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 07abf1c..1c4a39d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -402,8 +402,8 @@ @ stub RtlAddActionToRXact @ stdcall RtlAddAtomToAtomTable(ptr wstr ptr) @ stub RtlAddAttributeActionToRXact -@ stdcall RtlAddAuditAccessAce(ptr long long ptr long long) -# @ stub RtlAddAuditAccessAceEx +@ stdcall RtlAddAuditAccessAce(ptr long long ptr long long) +@ stdcall RtlAddAuditAccessAceEx(ptr long long long ptr long long) # @ stub RtlAddAuditAccessObjectAce # @ stub RtlAddCompoundAce # @ stub RtlAddRange diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index af89b72..0eaa9fe 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1213,17 +1213,16 @@ NTSTATUS WINAPI RtlAddAccessDeniedAceEx( /************************************************************************** * RtlAddAuditAccessAce [NTDLL.@] */ -NTSTATUS WINAPI RtlAddAuditAccessAce( +NTSTATUS WINAPI RtlAddAuditAccessAceEx( IN OUT PACL pAcl, IN DWORD dwAceRevision, + IN DWORD dwAceFlags, IN DWORD dwAccessMask, IN PSID pSid, IN BOOL bAuditSuccess, IN BOOL bAuditFailure) { - DWORD dwAceFlags = 0; - - TRACE("(%p,%d,%d,%p,%u,%u)\n",pAcl,dwAceRevision,dwAccessMask, + TRACE("(%p,%d,0x%08x,0x%08x,%p,%u,%u)\n",pAcl,dwAceRevision,dwAceFlags,dwAccessMask, pSid,bAuditSuccess,bAuditFailure); if (bAuditSuccess) @@ -1235,6 +1234,20 @@ NTSTATUS WINAPI RtlAddAuditAccessAce( return add_access_ace(pAcl, dwAceRevision, dwAceFlags, dwAccessMask, pSid, SYSTEM_AUDIT_ACE_TYPE); } + +/************************************************************************** + * RtlAddAuditAccessAce [NTDLL.@] + */ +NTSTATUS WINAPI RtlAddAuditAccessAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAccessMask, + IN PSID pSid, + IN BOOL bAuditSuccess, + IN BOOL bAuditFailure) +{ + return RtlAddAuditAccessAceEx(pAcl, dwAceRevision, 0, dwAccessMask, pSid, bAuditSuccess, bAuditFailure); +} /****************************************************************************** * RtlValidAcl [NTDLL.@] diff --git a/include/winternl.h b/include/winternl.h index 541eb58..88c36b1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1987,6 +1987,7 @@ NTSTATUS WINAPI RtlAddAccessDeniedAce(PACL,DWORD,DWORD,PSID); NTSTATUS WINAPI RtlAddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID); NTSTATUS WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ATOM*); NTSTATUS WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); +NTSTATUS WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL); void WINAPI RtlAddRefActivationContext(HANDLE); PVOID WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); NTSTATUS WINAPI RtlAdjustPrivilege(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN);

1 0

Mikolaj Zalewski : advapi32: Make ConvertStringSidToSid not to ignore the first subauthority.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: ff3ab48081e1e0ee5d195db74f190cac98dfcc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3ab48081e1e0ee5d195db74… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Mon Sep 24 19:04:11 2007 -0700 advapi32: Make ConvertStringSidToSid not to ignore the first subauthority. --- dlls/advapi32/security.c | 4 ++-- dlls/advapi32/tests/security.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5889213..89e3d90 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3900,12 +3900,12 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) while (*StringSid) { + pisid->SubAuthority[i++] = atoiW(StringSid); + while (*StringSid && *StringSid != '-') StringSid++; if (*StringSid == '-') StringSid++; - - pisid->SubAuthority[i++] = atoiW(StringSid); } if (i != pisid->SubAuthorityCount) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 86c4c50..9e356ac 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -148,6 +148,7 @@ static void test_sid(void) const char noSubAuthStr[] = "S-1-5"; unsigned int i; PSID psid = NULL; + SID *pisid; BOOL r; LPSTR str = NULL; @@ -185,6 +186,13 @@ static void test_sid(void) "expected GetLastError() is ERROR_INVALID_SID, got %d\n", GetLastError() ); + ok(pConvertStringSidToSidA("S-1-5-21-93476-23408-4576", &psid), "ConvertStringSidToSidA failed\n"); + pisid = (SID *)psid; + ok(pisid->SubAuthorityCount == 4, "Invalid sub authority count - expected 4, got %d\n", pisid->SubAuthorityCount); + ok(pisid->SubAuthority[0] == 21, "Invalid subauthority 0 - expceted 21, got %d\n", pisid->SubAuthority[0]); + ok(pisid->SubAuthority[3] == 4576, "Invalid subauthority 0 - expceted 4576, got %d\n", pisid->SubAuthority[3]); + LocalFree(str); + for( i = 0; i < sizeof(refs) / sizeof(refs[0]); i++ ) { PISID pisid;

1 0

Mikolaj Zalewski : advapi32: Fix a test.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: 1122dc130a447c190fc02508432772ab75db3bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1122dc130a447c190fc025084… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Mon Sep 24 16:56:32 2007 -0700 advapi32: Fix a test. --- dlls/advapi32/tests/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 7aea906..bfb535d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -727,7 +727,7 @@ static void test_sequence(void) static const CHAR servicename [] = "Winetest"; static const CHAR displayname [] = "Winetest dummy service"; static const CHAR pathname [] = "we_dont_care.exe"; - static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0\0"; + static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0"; static const CHAR password [] = ""; static const CHAR empty [] = ""; static const CHAR localsystem [] = "LocalSystem";

1 0