October 2007 - Wine-Commits

Stefan Dösinger : wined3d: Care for the inverted y coords in dsy.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 8f3accc718f7239707dbe5368a9c27c27a7d8c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3accc718f7239707dbe5368… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 13 13:03:56 2007 +0200 wined3d: Care for the inverted y coords in dsy. --- dlls/wined3d/baseshader.c | 2 ++ dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/pixelshader.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index cba756e..2d1c5d9 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -389,6 +389,8 @@ HRESULT shader_get_registers_used( } else { reg_maps->bumpmat = regnum; } + } else if(WINED3DSIO_DSY == curOpcode->opcode) { + reg_maps->usesdsy = 1; } /* This will loop over all the registers and try to diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8a0603b..14ac4e3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -559,7 +559,7 @@ void shader_generate_glsl_declarations( ps_impl->srgb_enabled = 0; ps_impl->srgb_mode_hardcoded = 1; } - if(reg_maps->vpos) { + if(reg_maps->vpos || reg_maps->usesdsy) { if(This->baseShader.limits.constant_float + extra_constants_needed + 1 < GL_LIMITS(pshader_constantsF)) { shader_addline(buffer, "uniform vec4 ycorrection;\n"); ((IWineD3DPixelShaderImpl *) This)->vpos_uniform = 1; @@ -1392,7 +1392,7 @@ void shader_glsl_map2gl(SHADER_OPCODE_ARG* arg) { case WINED3DSIO_EXP: instruction = "exp2"; break; case WINED3DSIO_SGN: instruction = "sign"; break; case WINED3DSIO_DSX: instruction = "dFdx"; break; - case WINED3DSIO_DSY: instruction = "dFdy"; break; + case WINED3DSIO_DSY: instruction = "ycorrection.y * dFdy"; break; default: instruction = ""; FIXME("Opcode %s not yet handled in GLSL\n", curOpcode->name); break; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index a7de7e9..4c31d55 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -599,6 +599,12 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_CompileShader(IWineD3DPixelShader goto recompile; } } + if(This->baseShader.reg_maps.usesdsy && !This->vpos_uniform) { + if(This->render_offscreen ? 0 : 1 != deviceImpl->render_offscreen ? 0 : 1) { + WARN("Recompiling shader because dsy is used, hard compiled and render_offscreen changed\n"); + goto recompile; + } + } return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 446f2a9..2d73e7f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1653,7 +1653,7 @@ typedef struct shader_reg_maps { * Use 0 as default (bit 31 is always 1 on a valid token) */ DWORD samplers[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; char bumpmat, luminanceparams; - char usesnrm, vpos; + char usesnrm, vpos, usesdsy; /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth;

1 0

David Adam : d3dx8: Implement D3DX*Length with a test.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: d6377d2fd8a97c32c830e89ba25e7dd826ca6e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6377d2fd8a97c32c830e89ba… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 14:03:03 2007 +0200 d3dx8: Implement D3DX*Length with a test. --- dlls/d3dx8/tests/math.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ include/d3dx8math.inl | 30 ++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 9ae9018..d0d0b03 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -26,6 +26,23 @@ #define expect_vec(expectedvec,gotvec) ok((fabs(expectedvec.x-gotvec.x)<admitted_error)&&(fabs(expectedvec.y-gotvec.y)<admitted_error),"Expected Vector= (%f, %f)\n , Got Vector= (%f, %f)\n", expectedvec.x, expectedvec.y, gotvec.x, gotvec.y); +static void D3X8QuaternionTest(void) +{ + D3DXQUATERNION q; + FLOAT expected, got; + + q.x = 1.0f, q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; + +/*_______________D3DXQuaternionLength__________________________*/ + expected = 11.0f; + got = D3DXQuaternionLength(&q); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got = D3DXQuaternionLength(NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); +} + static void D3X8Vector2Test(void) { D3DXVECTOR2 expectedvec, gotvec, u, v; @@ -140,7 +157,44 @@ static void D3X8Vector2Test(void) } +static void D3X8Vector3Test(void) +{ + D3DXVECTOR3 u; + FLOAT expected, got; + + u.x = 9.0f; u.y = 6.0f; u.z = 2.0f; + +/*_______________D3DXVec3Length__________________________*/ + expected = 11.0f; + got = D3DXVec3Length(&u); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got = D3DXVec3Length(NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); +} + +static void D3X8Vector4Test(void) +{ + D3DXVECTOR4 u; + FLOAT expected, got; + + u.x = 1.0f; u.y = 2.0f; u.z = 4.0f; u.w = 10.0; + +/*_______________D3DXVec4Length__________________________*/ + expected = 11.0f; + got = D3DXVec4Length(&u); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got = D3DXVec4Length(NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); +} + START_TEST(math) { + D3X8QuaternionTest(); D3X8Vector2Test(); + D3X8Vector3Test(); + D3X8Vector4Test(); } diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 24ff812..94e0019 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -19,6 +19,8 @@ #ifndef __D3DX8MATH_INL__ #define __D3DX8MATH_INL__ +/*_______________D3DXVECTOR2________________________*/ + static inline D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; @@ -91,4 +93,32 @@ static inline D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 return pout; } +/*__________________D3DXVECTOR3_______________________*/ + +static inline FLOAT D3DXVec3Length(CONST D3DXVECTOR3 *pv) +{ + if (!pv) return 0.0f; + return sqrt( (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z) ); +} + +/*__________________D3DXVECTOR4_______________________*/ + +static inline FLOAT D3DXVec4Length(CONST D3DXVECTOR4 *pv) +{ + if (!pv) return 0.0f; + return sqrt( (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z) + (pv->w) * (pv->w) ); +} + + +/*__________________D3DXQUATERNION____________________*/ + +static inline FLOAT D3DXQuaternionLength( CONST D3DXQUATERNION *pq) +{ + if (!pq) return 0.0f; + return sqrt( (pq->x) * (pq->x) + (pq->y) * (pq->y) + (pq->z) * (pq->z) + (pq->w) * (pq->w) ); +} + + + + #endif

1 0

Stefan Dösinger : wined3d: Ignore texture transforms when a shader is used, not set.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 9694cb2df3526d4601f88bd5c3d4c00efab95799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9694cb2df3526d4601f88bd5c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 12 10:18:52 2007 +0200 wined3d: Ignore texture transforms when a shader is used, not set. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6476e6f..5fe1cec 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1897,7 +1897,7 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[texUnit]; /* Ignore this when a vertex shader is used, or if the streams aren't sorted out yet */ - if(stateblock->vertexShader || + if(use_vs(stateblock->wineD3DDevice) || isStateDirty(context, STATE_VDECL)) { TRACE("Using a vertex shader, or stream sources not sorted out yet, skipping\n"); return;

1 0

Alexander Dorofeyev : gdi32: Fix off by one error in BIDI_Reorder.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 4b5ca2ed0ec27a099b48ea538b5a63d8db327e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b5ca2ed0ec27a099b48ea538… Author: Alexander Dorofeyev <alexd14(a)hushmail.com> Date: Sun Oct 21 11:53:34 2007 -0700 gdi32: Fix off by one error in BIDI_Reorder. --- dlls/gdi32/bidi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 037387b..1853a84 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -1157,7 +1157,7 @@ BOOL BIDI_Reorder( for (k = j - 1; k >= lastgood; --k) lpOrder[done + k] = done + j - 1 - k; else - for (k = lastgood; k <= j; ++k) + for (k = lastgood; k < j; ++k) lpOrder[done + k] = done + k; } done += i;

1 0

Stefan Dösinger : wined3d: Create query private data when faking the query.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 0add13759c4401423c3f729803ae9d343276e54c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0add13759c4401423c3f72980… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 12 09:32:43 2007 +0200 wined3d: Create query private data when faking the query. --- dlls/wined3d/device.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 056186c..7a1b79d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1219,24 +1219,24 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE /* allocated the 'extended' data based on the type of query requested */ switch(Type){ case WINED3DQUERYTYPE_OCCLUSION: + object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryOcclusionData)); + ((WineQueryOcclusionData *)(object->extendedData))->ctx = This->activeContext; + if(GL_SUPPORT(ARB_OCCLUSION_QUERY)) { TRACE("(%p) Allocating data for an occlusion query\n", This); - object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryOcclusionData)); GL_EXTCALL(glGenQueriesARB(1, &((WineQueryOcclusionData *)(object->extendedData))->queryId)); - ((WineQueryOcclusionData *)(object->extendedData))->ctx = This->activeContext; break; } case WINED3DQUERYTYPE_EVENT: + object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryEventData)); + ((WineQueryEventData *)(object->extendedData))->ctx = This->activeContext; + if(GL_SUPPORT(APPLE_FENCE)) { - object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryEventData)); GL_EXTCALL(glGenFencesAPPLE(1, &((WineQueryEventData *)(object->extendedData))->fenceId)); checkGLcall("glGenFencesAPPLE"); - ((WineQueryEventData *)(object->extendedData))->ctx = This->activeContext; } else if(GL_SUPPORT(NV_FENCE)) { - object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryEventData)); GL_EXTCALL(glGenFencesNV(1, &((WineQueryEventData *)(object->extendedData))->fenceId)); checkGLcall("glGenFencesNV"); - ((WineQueryEventData *)(object->extendedData))->ctx = This->activeContext; } break;

1 0

Lionel Debroux : ntdll/tests: Fix memory leaks (found by Smatch) and fix a message.
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 8f49ea21d465f9a40f4a0c515f2196c6a16431f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f49ea21d465f9a40f4a0c515… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Oct 20 21:38:35 2007 +0200 ntdll/tests: Fix memory leaks (found by Smatch) and fix a message. --- dlls/ntdll/tests/rtlstr.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index e40bd53..a99011d 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -289,6 +289,8 @@ static void test_RtlInitUnicodeStringEx(void) ok(uni.Buffer == NULL, "pRtlInitUnicodeString(&uni, 0) sets Buffer to %p, expected %p\n", uni.Buffer, NULL); + + free(teststring2); } @@ -1709,7 +1711,8 @@ static void test_RtlIsTextUnicode(void) flags = IS_TEXT_UNICODE_REVERSE_MASK; ok(!pRtlIsTextUnicode(be_unicode, sizeof(unicode) + 2, &flags), "Reverse endian should be Unicode\n"); - todo_wine ok(flags == 0xc0, "Expected flags 0x70, obtained %x\n", flags); + todo_wine ok(flags == 0xc0, "Expected flags 0xc0, obtained %x\n", flags); + HeapFree(GetProcessHeap(), 0, be_unicode); } static const WCHAR szGuid[] = { '{','0','1','0','2','0','3','0','4','-',

1 0

Lionel Debroux : localspl/tests: Fix memory leak (found by Smatch).
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 1a8001af5b6388c62b5d64cc35e35028ecb72491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a8001af5b6388c62b5d64cc3… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Oct 20 21:33:12 2007 +0200 localspl/tests: Fix memory leak (found by Smatch). --- dlls/localspl/tests/localmon.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 06cdfbe..3126731 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -166,6 +166,7 @@ static void find_installed_ports(void) if (!res) { skip("no ports found\n"); + HeapFree(GetProcessHeap(), 0, pi); return; }

1 0

Lionel Debroux : advapi32/tests: Fix memory leak (found by Smatch).
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 5c1334e775a1cb86b0df369ff8cdad0c3527f1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1334e775a1cb86b0df369ff… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Oct 20 21:17:17 2007 +0200 advapi32/tests: Fix memory leak (found by Smatch). --- dlls/advapi32/tests/service.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index e932c64..4b7bd31 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -840,6 +840,7 @@ static void test_sequence(void) Sleep(1000); CloseServiceHandle(scm_handle); + HeapFree(GetProcessHeap(), 0, config); } static void test_refcount(void)

1 0

Lionel Debroux : kernel32/tests: Fix memory leaks (found by Smatch).
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: 938f748b209eed8a6634698f0b98a9514e90541d URL: http://source.winehq.org/git/wine.git/?a=commit;h=938f748b209eed8a6634698f0… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Oct 20 21:22:26 2007 +0200 kernel32/tests: Fix memory leaks (found by Smatch). --- dlls/kernel32/tests/actctx.c | 2 ++ dlls/kernel32/tests/pipe.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 0e687b5..3720f74 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -517,6 +517,7 @@ static void test_info_in_assembly(HANDLE handle, DWORD id, const info_in_assembl else ok(info->lpAssemblyDirectoryName == NULL, "info->lpAssemblyDirectoryName = %s\n", strw(info->lpAssemblyDirectoryName)); + HeapFree(GetProcessHeap(), 0, info); } static void test_file_info(HANDLE handle, ULONG assid, ULONG fileid, LPCWSTR filename) @@ -560,6 +561,7 @@ static void test_file_info(HANDLE handle, ULONG assid, ULONG fileid, LPCWSTR fil if(info->lpFileName) ok(!lstrcmpiW(info->lpFileName, filename), "unexpected info->lpFileName\n"); ok(info->lpFilePath == NULL, "info->lpFilePath != NULL\n"); + HeapFree(GetProcessHeap(), 0, info); } static HANDLE test_create(const char *file, const char *manifest) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 9150e50..ce0f5b6 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -805,6 +805,7 @@ static void test_CreatePipe(void) /* But now we need to get informed that the pipe is closed */ ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL) == 0, "Broken pipe not detected\n"); ok(CloseHandle(piperead), "CloseHandle for the read pipe failed\n"); + HeapFree(GetProcessHeap(), 0, buffer); } struct named_pipe_client_params @@ -1022,7 +1023,11 @@ static BOOL are_all_privileges_disabled(HANDLE hToken) { Privileges = HeapAlloc(GetProcessHeap(), 0, Size); ret = GetTokenInformation(hToken, TokenPrivileges, Privileges, Size, &Size); - if (!ret) return FALSE; + if (!ret) + { + HeapFree(GetProcessHeap(), 0, Privileges); + return FALSE; + } } else return FALSE;

1 0

Mikołaj Zalewski : advapi32: Make CreateWellKnownSid create domain sids (with test).
by Alexandre Julliard Oct. 22, 2007

Oct. 22, 2007

Module: wine Branch: master Commit: cf509c29f121e908609ec36a984839f3e0186ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf509c29f121e908609ec36a9… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 21 02:01:56 2007 -0700 advapi32: Make CreateWellKnownSid create domain sids (with test). --- dlls/advapi32/security.c | 57 +++++++++++++++++++++++++++++++++++----- dlls/advapi32/tests/security.c | 11 +++++++- 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5d33fd2..79f5a3a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -122,12 +122,37 @@ static const WELLKNOWNSID WellKnownSids[] = { {0,0}, WinSChannelAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_SCHANNEL_RID } } }, { {0,0}, WinThisOrganizationSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_THIS_ORGANIZATION_RID } } }, { {0,0}, WinOtherOrganizationSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_OTHER_ORGANIZATION_RID } } }, + { {0,0}, WinBuiltinIncomingForestTrustBuildersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS } } }, { {0,0}, WinBuiltinPerfMonitoringUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_MONITORING_USERS } } }, { {0,0}, WinBuiltinPerfLoggingUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_LOGGING_USERS } } }, { {0,0}, WinBuiltinAuthorizationAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS } } }, { {0,0}, WinBuiltinTerminalServerLicenseServersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS } } }, }; +/* these SIDs must be constructed as relative to some domain - only the RID is well-kown */ +typedef struct WELLKOWNRID +{ + WELL_KNOWN_SID_TYPE Type; + DWORD Rid; +} WELLKNOWNRID; + +WELLKNOWNRID WellKnownRids[] = { + { WinAccountAdministratorSid, DOMAIN_USER_RID_ADMIN }, + { WinAccountGuestSid, DOMAIN_USER_RID_GUEST }, + { WinAccountKrbtgtSid, DOMAIN_USER_RID_KRBTGT }, + { WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, + { WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, + { WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, + { WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, + { WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, + { WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, + { WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, + { WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, + { WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, + { WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, +}; + + static SID const sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; typedef struct _AccountSid { @@ -784,13 +809,7 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, unsigned int i; TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); - if (DomainSid != NULL) { - FIXME("Only local computer supported!\n"); - SetLastError(ERROR_INVALID_PARAMETER); /* FIXME */ - return FALSE; - } - - if (cbSid == NULL || pSid == NULL) { + if (cbSid == NULL || pSid == NULL || (DomainSid && !IsValidSid(DomainSid))) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -810,6 +829,30 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, } } + if (DomainSid == NULL || *GetSidSubAuthorityCount(DomainSid) == SID_MAX_SUB_AUTHORITIES) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + if (WellKnownRids[i].Type == WellKnownSidType) { + UCHAR domain_subauth = *GetSidSubAuthorityCount(DomainSid); + DWORD domain_sid_length = GetSidLengthRequired(domain_subauth); + DWORD output_sid_length = GetSidLengthRequired(domain_subauth + 1); + + if (*cbSid < output_sid_length) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + CopyMemory(pSid, DomainSid, domain_sid_length); + (*GetSidSubAuthorityCount(pSid))++; + (*GetSidSubAuthority(pSid, domain_subauth)) = WellKnownRids[i].Rid; + *cbSid = output_sid_length; + return TRUE; + } + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 40b3f12..9cf409e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1128,7 +1128,7 @@ static void test_CreateWellKnownSid() LPSTR str; DWORD cb; - if (value->sid_string == NULL || !value->without_domain) + if (value->sid_string == NULL) continue; if (i >= WinBuiltinTerminalServerLicenseServersSid + 1) @@ -1150,6 +1150,15 @@ static void test_CreateWellKnownSid() ok(strcmp(str, value->sid_string) == 0, "SID mismatch - expected %s, got %s\n", value->sid_string, str); LocalFree(str); + + if (value->without_domain) + { + char buf2[SECURITY_MAX_SID_SIZE]; + cb = sizeof(buf2); + ok(CreateWellKnownSid(i, domainsid, buf2, &cb), "Couldn't create well known sid %d with optional domain\n", i); + expect_eq(GetSidLengthRequired(*GetSidSubAuthorityCount(sid_buffer)), cb, DWORD, "%d"); + ok(memcmp(buf2, sid_buffer, cb) == 0, "SID create with domain is different than without (%d)\n", i); + } } }

1 0