August 2006 - Wine-Commits - list.winehq.org

Frank Richter : uxtheme: Set non-client metrics from theme.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 11211bf940aa08a4a4e5f669600d124e1f280b65 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11211bf940aa08a4a4e5f66… Author: Frank Richter <frank.richter(a)gmail.com> Date: Mon Aug 14 19:22:18 2006 +0200 uxtheme: Set non-client metrics from theme. --- dlls/uxtheme/msstyles.c | 177 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/uxtheme/system.c | 67 +++++++++++++++++- 2 files changed, 233 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=11211bf940aa08a4a4e…

1 0

Frank Richter : uxtheme: Split color handling out of MSSTYLES_ParseThemeIni into smaller helper functions .
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 3e4bdad4a3bf0f20b3308d545a96606d35750655 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3e4bdad4a3bf0f20b3308d5… Author: Frank Richter <frank.richter(a)gmail.com> Date: Mon Aug 14 17:35:13 2006 +0200 uxtheme: Split color handling out of MSSTYLES_ParseThemeIni into smaller helper functions. --- dlls/uxtheme/msstyles.c | 98 ++++++++++++++++++++++++++++++----------------- 1 files changed, 63 insertions(+), 35 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 827bdf6..4649a36 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -664,6 +664,61 @@ static PTHEME_PROPERTY MSSTYLES_AddMetri return cur; } +/* Color-related state for theme ini parsing */ +struct PARSECOLORSTATE +{ + int colorCount; + int colorElements[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; + COLORREF colorRgb[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; + int captionColors; +}; + +inline void parse_init_color (struct PARSECOLORSTATE* state) +{ + memset (state, 0, sizeof (*state)); +} + +static BOOL parse_handle_color_property (struct PARSECOLORSTATE* state, + int iPropertyId, LPCWSTR lpValue, + DWORD dwValueLen) +{ + int r,g,b; + LPCWSTR lpValueEnd = lpValue + dwValueLen; + MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &r); + MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &g); + if(MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &b)) { + state->colorElements[state->colorCount] = iPropertyId - TMT_FIRSTCOLOR; + state->colorRgb[state->colorCount++] = RGB(r,g,b); + switch (iPropertyId) + { + case TMT_ACTIVECAPTION: + state->captionColors |= 0x1; + break; + case TMT_INACTIVECAPTION: + state->captionColors |= 0x2; + break; + case TMT_GRADIENTACTIVECAPTION: + state->captionColors |= 0x4; + break; + case TMT_GRADIENTINACTIVECAPTION: + state->captionColors |= 0x8; + break; + } + return TRUE; + } + else { + return FALSE; + } +} + +static void parse_apply_color (struct PARSECOLORSTATE* state) +{ + if (state->colorCount > 0) + SetSysColors(state->colorCount, state->colorElements, state->colorRgb); + if (state->captionColors == 0xf) + SystemParametersInfoW (SPI_SETGRADIENTCAPTIONS, 0, (PVOID)TRUE, 0); +} + /*********************************************************************** * MSSTYLES_ParseThemeIni * @@ -696,42 +751,18 @@ void MSSTYLES_ParseThemeIni(PTHEME_FILE while((lpName=UXINI_GetNextSection(ini, &dwLen))) { if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, lpName, dwLen, szSysMetrics, -1) == CSTR_EQUAL) { - int colorCount = 0; - int colorElements[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; - COLORREF colorRgb[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; - LPCWSTR lpValueEnd; - int captionColors = 0; + struct PARSECOLORSTATE colorState; + + parse_init_color (&colorState); while((lpName=UXINI_GetNextValue(ini, &dwLen, &lpValue, &dwValueLen))) { lstrcpynW(szPropertyName, lpName, min(dwLen+1, sizeof(szPropertyName)/sizeof(szPropertyName[0]))); if(MSSTYLES_LookupProperty(szPropertyName, &iPropertyPrimitive, &iPropertyId)) { if(iPropertyId >= TMT_FIRSTCOLOR && iPropertyId <= TMT_LASTCOLOR) { - int r,g,b; - lpValueEnd = lpValue + dwValueLen; - MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &r); - MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &g); - if(MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &b)) { - colorElements[colorCount] = iPropertyId - TMT_FIRSTCOLOR; - colorRgb[colorCount++] = RGB(r,g,b); - switch (iPropertyId) - { - case TMT_ACTIVECAPTION: - captionColors |= 0x1; - break; - case TMT_INACTIVECAPTION: - captionColors |= 0x2; - break; - case TMT_GRADIENTACTIVECAPTION: - captionColors |= 0x4; - break; - case TMT_GRADIENTINACTIVECAPTION: - captionColors |= 0x8; - break; - } - } - else { - FIXME("Invalid color value for %s\n", debugstr_w(szPropertyName)); - } + if (!parse_handle_color_property (&colorState, iPropertyId, + lpValue, dwValueLen)) + FIXME("Invalid color value for %s\n", + debugstr_w(szPropertyName)); } else if (setMetrics && (iPropertyId == TMT_FLATMENUS)) { BOOL flatMenus = (*lpValue == 'T') || (*lpValue == 't'); @@ -744,10 +775,7 @@ void MSSTYLES_ParseThemeIni(PTHEME_FILE TRACE("Unknown system metric %s\n", debugstr_w(szPropertyName)); } } - if (setMetrics && (colorCount > 0)) - SetSysColors(colorCount, colorElements, colorRgb); - if (setMetrics && (captionColors == 0xf)) - SystemParametersInfoW (SPI_SETGRADIENTCAPTIONS, 0, (PVOID)TRUE, 0); + if (setMetrics) parse_apply_color (&colorState); continue; } if(MSSTYLES_ParseIniSectionName(lpName, dwLen, szAppName, szClassName, &iPartId, &iStateId)) {

1 0

Frank Richter : uxtheme: Enable gradient captions if a theme provides colors for them.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: f34412b957cc465bebf54b4d9211c0d2180d9e51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f34412b957cc465bebf54b4… Author: Frank Richter <frank.richter(a)gmail.com> Date: Mon Aug 14 17:02:37 2006 +0200 uxtheme: Enable gradient captions if a theme provides colors for them. --- dlls/uxtheme/msstyles.c | 18 ++++++++++++++++++ dlls/uxtheme/system.c | 3 +++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 76414d9..827bdf6 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -700,6 +700,7 @@ void MSSTYLES_ParseThemeIni(PTHEME_FILE int colorElements[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; COLORREF colorRgb[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; LPCWSTR lpValueEnd; + int captionColors = 0; while((lpName=UXINI_GetNextValue(ini, &dwLen, &lpValue, &dwValueLen))) { lstrcpynW(szPropertyName, lpName, min(dwLen+1, sizeof(szPropertyName)/sizeof(szPropertyName[0]))); @@ -712,6 +713,21 @@ void MSSTYLES_ParseThemeIni(PTHEME_FILE if(MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &b)) { colorElements[colorCount] = iPropertyId - TMT_FIRSTCOLOR; colorRgb[colorCount++] = RGB(r,g,b); + switch (iPropertyId) + { + case TMT_ACTIVECAPTION: + captionColors |= 0x1; + break; + case TMT_INACTIVECAPTION: + captionColors |= 0x2; + break; + case TMT_GRADIENTACTIVECAPTION: + captionColors |= 0x4; + break; + case TMT_GRADIENTINACTIVECAPTION: + captionColors |= 0x8; + break; + } } else { FIXME("Invalid color value for %s\n", debugstr_w(szPropertyName)); @@ -730,6 +746,8 @@ void MSSTYLES_ParseThemeIni(PTHEME_FILE } if (setMetrics && (colorCount > 0)) SetSysColors(colorCount, colorElements, colorRgb); + if (setMetrics && (captionColors == 0xf)) + SystemParametersInfoW (SPI_SETGRADIENTCAPTIONS, 0, (PVOID)TRUE, 0); continue; } if(MSSTYLES_ParseIniSectionName(lpName, dwLen, szAppName, szClassName, &iPartId, &iStateId)) { diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 347074c..e19f913 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -249,6 +249,8 @@ static const WCHAR strColorKey[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', 'C','o','l','o','r','s',0 }; static const WCHAR keyFlatMenus[] = { 'F','l','a','t','M','e','n','u', 0}; +static const WCHAR keyGradientCaption[] = { 'G','r','a','d','i','e','n','t', + 'C','a','p','t','i','o','n', 0 }; static const struct BackupSysParam { @@ -257,6 +259,7 @@ static const struct BackupSysParam } backupSysParams[] = { {SPI_GETFLATMENU, SPI_SETFLATMENU, keyFlatMenus}, + {SPI_GETGRADIENTCAPTIONS, SPI_SETGRADIENTCAPTIONS, keyGradientCaption}, {-1, -1, 0} };

1 0

Shachar Shemesh : fonts: Add Hebrew to the system font.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 67a0c69499cbb8e4ebdc79b52545a9e201e6a84c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67a0c69499cbb8e4ebdc79b… Author: Shachar Shemesh <wine(a)shemesh.biz> Date: Mon Aug 14 12:35:20 2006 +0300 fonts: Add Hebrew to the system font. --- fonts/system.sfd | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 228 insertions(+), 3 deletions(-) diff --git a/fonts/system.sfd b/fonts/system.sfd index 00a8a81..a6f58f9 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -39,12 +39,13 @@ ScriptLang: 2 LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "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.+AAoA +AAoA-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.+AAoA +AAoA-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+AAoA" "http://www.gnu.org/licenses/lgpl.html" Encoding: UnicodeBmp UnicodeInterp: none +NameList: Adobe Glyph List DisplaySize: 16 AntiAlias: 0 FitToEm: 1 -WinInfo: 0 20 18 +WinInfo: 1360 20 13 OnlyBitmaps: 1 -BeginChars: 65536 437 +BeginChars: 65536 465 StartChar: space Encoding: 32 32 0 Width: 4 @@ -2389,8 +2390,176 @@ Width: 16 Flags: W TeX: 0 0 0 0 EndChar +StartChar: afii57636 +Encoding: 8362 8362 437 +Width: 16 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: afii57664 +Encoding: 1488 1488 438 +Width: 12 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57665 +Encoding: 1489 1489 439 +Width: 10 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57666 +Encoding: 1490 1490 440 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57667 +Encoding: 1491 1491 441 +Width: 10 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57668 +Encoding: 1492 1492 442 +Width: 11 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57669 +Encoding: 1493 1493 443 +Width: 5 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: afii57670 +Encoding: 1494 1494 444 +Width: 7 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: afii57671 +Encoding: 1495 1495 445 +Width: 16 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57690 +Encoding: 1514 1514 446 +Width: 750 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57688 +Encoding: 1512 1512 447 +Width: 16 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57687 +Encoding: 1511 1511 448 +Width: 16 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57673 +Encoding: 1497 1497 449 +Width: 16 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: afii57672 +Encoding: 1496 1496 450 +Width: 10 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57674 +Encoding: 1498 1498 451 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57675 +Encoding: 1499 1499 452 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57676 +Encoding: 1500 1500 453 +Width: 10 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57677 +Encoding: 1501 1501 454 +Width: 625 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57678 +Encoding: 1502 1502 455 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57679 +Encoding: 1503 1503 456 +Width: 5 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: afii57680 +Encoding: 1504 1504 457 +Width: 375 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: afii57681 +Encoding: 1505 1505 458 +Width: 10 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57682 +Encoding: 1506 1506 459 +Width: 10 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57683 +Encoding: 1507 1507 460 +Width: 10 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57684 +Encoding: 1508 1508 461 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57685 +Encoding: 1509 1509 462 +Width: 10 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57686 +Encoding: 1510 1510 463 +Width: 10 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii57689 +Encoding: 1513 1513 464 +Width: 11 +Flags: HW +TeX: 0 0 0 0 +EndChar EndChars -BitmapFont: 16 437 13 3 1 +BitmapFont: 16 465 13 3 1 BDFChar: 0 32 4 14 14 0 0 z BDFChar: 1 33 4 1 2 0 9 @@ -3265,5 +3434,61 @@ BDFChar: 435 287 8 1 6 -3 9 b]j,8bfn;Tb^9iCGQ7^D BDFChar: 436 286 10 1 8 0 12 _gVSJB#DF"cbmY54TGH^ +BDFChar: 437 8362 16 1 14 0 11 +s,=b;bfn;Tbfn;Tbfn;Tbfn9>bRDhm +BDFChar: 438 1488 12 1 11 0 9 +^qa?n0Yhsac%*h7_Z7N'^qd`n +BDFChar: 439 1489 10 1 9 0 9 +rW!-&"oni-"oni-"oni-"p"[R +BDFChar: 440 1490 8 1 7 0 9 +i%Qi%3,HgY`l7uY +BDFChar: 441 1491 10 1 9 0 9 +s*t:R"oni-"oni-"oni-"oni- +BDFChar: 442 1492 10 1 9 0 9 +s*t-#!It3$!J&":_19(a)P_19@P +BDFChar: 443 1493 5 1 4 0 9 +n1ZOM0JG170JEJ, +BDFChar: 444 1494 7 1 6 0 9 +r%KfY0JF=\(`35Q +BDFChar: 445 1495 10 1 9 0 9 +s+"O._19(a)P_19@P_19(a)P_19@P +BDFChar: 446 1514 12 1 11 0 9 +5N"5'0OQSB0OQSB0OQSB0OXBX +BDFChar: 447 1512 10 1 9 0 9 +s*t-#!It3$!It3$!It3$!It3$ +BDFChar: 448 1511 10 1 9 -3 9 +s*t-#!It3$!J&":_19E'_Z7[V^];.M^]4?7 +BDFChar: 449 1497 5 1 4 6 9 +n1ZOM +BDFChar: 450 1496 10 1 9 0 9 +a+2!V_19(a)P_19@P_19(a)P_1;Q9 +BDFChar: 451 1498 10 1 9 -3 9 +s*t-#!It3$!It3$!It3$!It3$!It3$!It.M +BDFChar: 452 1499 10 1 9 0 9 +s*t-#!It3$!It3$!It3$!J(3# +BDFChar: 453 1500 10 1 9 0 12 +^];.M^]=Cb!It3$!It3$!rrE'!rrN*"onW' +BDFChar: 454 1501 10 1 9 0 9 +s+"O._19(a)P_19@P_19(a)P_1;Q9 +BDFChar: 455 1502 10 1 9 0 9 +s*uhS@=Z1E_19(a)P_19@P_1:En +BDFChar: 456 1503 5 1 4 -3 9 +n1ZOM0JG170JG170E;(Q +BDFChar: 457 1504 6 1 5 0 9 +GSh87(`4),)#+(2 +BDFChar: 458 1505 10 1 9 0 9 +s+%q9_19(a)P_19@P_19(a)P@fS[m +BDFChar: 459 1506 10 1 9 0 9 +!J&":_15sE0n:-l)1W0H#Cui) +BDFChar: 460 1507 10 1 9 -3 9 +s+"O.@=Vd:H%5pG!It3$!It3$!It3$!It.M +BDFChar: 461 1508 10 1 9 0 9 +s+"O.@=Vd:H%5pG!It3$!J(3# +BDFChar: 462 1509 10 1 9 -3 9 +_15sE0n:2C%KH_6!rrE'!rrE'!rrE'!rr<$ +BDFChar: 463 1510 10 1 9 0 9 +_Z7RS(a)fSCe)upBI"on`*!J(3# +BDFChar: 464 1513 11 1 10 0 9 +^qe10beVH<beVH<beVH<beX7o EndBitmapFont EndSplineFont

1 0

Mike McCormack : oleaut32: Put the HeapFree back in the right place.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 9c5c063ebf42a6c5d3798663a01534f6b5db7b30 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c5c063ebf42a6c5d379866… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Aug 14 21:02:28 2006 +0900 oleaut32: Put the HeapFree back in the right place. --- dlls/oleaut32/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 569fe15..85a9f08 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1838,6 +1838,7 @@ static HRESULT WINAPI OLEPictureImpl_Sav hResult = E_FAIL; break; } + HeapFree(GetProcessHeap(), 0, This->data); This->data = pIconData; This->datalen = iDataSize; } @@ -1850,7 +1851,6 @@ static HRESULT WINAPI OLEPictureImpl_Sav } IStream_Write(pStm, This->data, This->datalen, &dummy); - HeapFree(GetProcessHeap(), 0, This->data); hResult = S_OK; break; case PICTYPE_BITMAP:

1 0

Mike McCormack : ole32: Use PropVariantInit instead of memset.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: c8572a5e43ffe6c4bbc017f6ae48322b20094a62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8572a5e43ffe6c4bbc017f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Aug 14 21:02:09 2006 +0900 ole32: Use PropVariantInit instead of memset. --- dlls/ole32/stg_prop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8db5dab..e39a5d5 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1385,7 +1385,7 @@ static HRESULT PropertyStorage_ReadFromS { PROPVARIANT prop; - memset(&prop, 0, sizeof prop); + PropVariantInit(&prop); if (SUCCEEDED(PropertyStorage_ReadProperty(This, &prop, buf + idOffset->dwOffset - sizeof(PROPERTYSECTIONHEADER)))) {

1 0

Robert Reif : advapi32: Move duplicated code into function.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: b0498a76e096c560fdde7c197c175ea66dc7d1fb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b0498a76e096c560fdde7c1… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Aug 14 07:24:42 2006 -0400 advapi32: Move duplicated code into function. --- dlls/advapi32/lsa.c | 111 ++++++++++++++++++++------------------------------- 1 files changed, 43 insertions(+), 68 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 42221f3..c5e7deb 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -48,13 +48,52 @@ static void dumpLsaAttributes(PLSA_OBJEC { if (oa) { - TRACE("\n\tlength=%lu, rootdir=%p, objectname=%s\n\tattr=0x%08lx, sid=%p qos=%p\n", + TRACE("\n\tlength=%lu, rootdir=%p, objectname=%s\n\tattr=0x%08lx, sid=%s qos=%p\n", oa->Length, oa->RootDirectory, oa->ObjectName?debugstr_w(oa->ObjectName->Buffer):"null", - oa->Attributes, oa->SecurityDescriptor, oa->SecurityQualityOfService); + oa->Attributes, debugstr_sid(oa->SecurityDescriptor), + oa->SecurityQualityOfService); } } +static void ADVAPI_GetDomainName(UNICODE_STRING * name) +{ + HKEY key; + BOOL useDefault = TRUE; + LONG ret; + + if ((ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "System\\CurrentControlSet\\Services\\VxD\\VNETSUP", 0, + KEY_READ, &key)) == ERROR_SUCCESS) + { + DWORD size = 0; + static const WCHAR wg[] = { 'W','o','r','k','g','r','o','u','p',0 }; + + ret = RegQueryValueExW(key, wg, NULL, NULL, NULL, &size); + if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) + { + name->Buffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, size); + + if ((ret = RegQueryValueExW(key, wg, NULL, NULL, + (LPBYTE)name->Buffer, &size)) == ERROR_SUCCESS) + { + name->Length = (USHORT)(size - sizeof(WCHAR)); + name->MaximumLength = (USHORT)size; + useDefault = FALSE; + } + else + { + HeapFree(GetProcessHeap(), 0, name->Buffer); + name->Buffer = NULL; + } + } + RegCloseKey(key); + } + if (useDefault) + RtlCreateUnicodeStringFromAsciiz(name, "DOMAIN"); +} + /****************************************************************************** * LsaAddAccountRights [ADVAPI32.@] * @@ -394,40 +433,8 @@ NTSTATUS WINAPI LsaQueryInformationPolic */ PPOLICY_PRIMARY_DOMAIN_INFO pinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(POLICY_PRIMARY_DOMAIN_INFO)); - HKEY key; - BOOL useDefault = TRUE; - LONG ret; - if ((ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "System\\CurrentControlSet\\Services\\VxD\\VNETSUP", 0, - KEY_READ, &key)) == ERROR_SUCCESS) - { - DWORD size = 0; - static const WCHAR wg[] = { 'W','o','r','k','g','r','o','u','p',0 }; - - ret = RegQueryValueExW(key, wg, NULL, NULL, NULL, &size); - if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) - { - pinfo->Name.Buffer = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, size); - - if ((ret = RegQueryValueExW(key, wg, NULL, NULL, - (LPBYTE)pinfo->Name.Buffer, &size)) == ERROR_SUCCESS) - { - pinfo->Name.Length = (USHORT)(size - sizeof(WCHAR)); - pinfo->Name.MaximumLength = (USHORT)size; - useDefault = FALSE; - } - else - { - HeapFree(GetProcessHeap(), 0, pinfo->Name.Buffer); - pinfo->Name.Buffer = NULL; - } - } - RegCloseKey(key); - } - if (useDefault) - RtlCreateUnicodeStringFromAsciiz(&(pinfo->Name), "DOMAIN"); + ADVAPI_GetDomainName(&pinfo->Name); TRACE("setting domain to %s\n", debugstr_w(pinfo->Name.Buffer)); @@ -482,40 +489,8 @@ NTSTATUS WINAPI LsaQueryInformationPolic */ PPOLICY_DNS_DOMAIN_INFO pinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(POLICY_DNS_DOMAIN_INFO)); - HKEY key; - BOOL useDefault = TRUE; - LONG ret; - if ((ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "System\\CurrentControlSet\\Services\\VxD\\VNETSUP", 0, - KEY_READ, &key)) == ERROR_SUCCESS) - { - DWORD size = 0; - static const WCHAR wg[] = { 'W','o','r','k','g','r','o','u','p',0 }; - - ret = RegQueryValueExW(key, wg, NULL, NULL, NULL, &size); - if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) - { - pinfo->Name.Buffer = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, size); - - if ((ret = RegQueryValueExW(key, wg, NULL, NULL, - (LPBYTE)pinfo->Name.Buffer, &size)) == ERROR_SUCCESS) - { - pinfo->Name.Length = (USHORT)(size - sizeof(WCHAR)); - pinfo->Name.MaximumLength = (USHORT)size; - useDefault = FALSE; - } - else - { - HeapFree(GetProcessHeap(), 0, pinfo->Name.Buffer); - pinfo->Name.Buffer = NULL; - } - } - RegCloseKey(key); - } - if (useDefault) - RtlCreateUnicodeStringFromAsciiz(&(pinfo->Name), "DOMAIN"); + ADVAPI_GetDomainName(&pinfo->Name); TRACE("setting domain to %s\n", debugstr_w(pinfo->Name.Buffer));

1 0

Robert Reif : include: Add dsgetdc.h.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: dd66a69614bee2cc2af88db904db29e1883f002f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd66a69614bee2cc2af88db… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Aug 14 07:41:40 2006 -0400 include: Add dsgetdc.h. --- include/Makefile.in | 1 + include/dsgetdc.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) create mode 100644 include/dsgetdc.h diff --git a/include/Makefile.in b/include/Makefile.in index 88e93ed..67fbced 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -138,6 +138,7 @@ WINDOWS_INCLUDES = \ dpnathlp.h \ dsconf.h \ dsdriver.h \ + dsgetdc.h \ dshow.h \ dsound.h \ dsrole.h \ diff --git a/include/dsgetdc.h b/include/dsgetdc.h new file mode 100644 index 0000000..ea947bf --- /dev/null +++ b/include/dsgetdc.h @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2006 Robert Reif + * + * 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 + */ + +#ifndef __WINE_DSGETDC_H +#define __WINE_DSGETDC_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define DS_FORCE_REDISCOVERY 0x00000001 +#define DS_DIRECTORY_SERVICE_REQUIRED 0x00000010 +#define DS_DIRECTORY_SERVICE_PREFERRED 0x00000020 +#define DS_GC_SERVER_REQUIRED 0x00000040 +#define DS_PDC_REQUIRED 0x00000080 +#define DS_BACKGROUND_ONLY 0x00000100 +#define DS_IP_REQUIRED 0x00000200 +#define DS_KDC_REQUIRED 0x00000400 +#define DS_TIMESERV_REQUIRED 0x00000800 +#define DS_WRITABLE_REQUIRED 0x00001000 +#define DS_GOOD_TIMESERV_PREFERRED 0x00002000 +#define DS_AVOID_SELF 0x00004000 +#define DS_ONLY_LDAP_NEEDED 0x00008000 + +#define DS_IS_FLAT_NAME 0x00010000 +#define DS_IS_DNS_NAME 0x00020000 + +#define DS_RETURN_DNS_NAME 0x40000000 +#define DS_RETURN_FLAT_NAME 0x80000000 + +#define DSGETDC_VALID_FLAGS ( \ + DS_FORCE_REDISCOVERY | \ + DS_DIRECTORY_SERVICE_REQUIRED | \ + DS_DIRECTORY_SERVICE_PREFERRED | \ + DS_GC_SERVER_REQUIRED | \ + DS_PDC_REQUIRED | \ + DS_BACKGROUND_ONLY | \ + DS_IP_REQUIRED | \ + DS_KDC_REQUIRED | \ + DS_TIMESERV_REQUIRED | \ + DS_WRITABLE_REQUIRED | \ + DS_GOOD_TIMESERV_PREFERRED | \ + DS_AVOID_SELF | \ + DS_ONLY_LDAP_NEEDED | \ + DS_IS_FLAT_NAME | \ + DS_IS_DNS_NAME | \ + DS_RETURN_FLAT_NAME | \ + DS_RETURN_DNS_NAME ) + +typedef struct _DOMAIN_CONTROLLER_INFOA { + LPSTR DomainControllerName; + LPSTR DomainControllerAddress; + ULONG DomainControllerAddressType; + GUID DomainGuid; + LPSTR DomainName; + LPSTR DnsForestName; + ULONG Flags; + LPSTR DcSiteName; + LPSTR ClientSiteName; +} DOMAIN_CONTROLLER_INFOA, *PDOMAIN_CONTROLLER_INFOA; + +typedef struct _DOMAIN_CONTROLLER_INFOW { + LPWSTR DomainControllerName; + LPWSTR DomainControllerAddress; + ULONG DomainControllerAddressType; + GUID DomainGuid; + LPWSTR DomainName; + LPWSTR DnsForestName; + ULONG Flags; + LPWSTR DcSiteName; + LPWSTR ClientSiteName; +} DOMAIN_CONTROLLER_INFOW, *PDOMAIN_CONTROLLER_INFOW; + +DECL_WINELIB_TYPE_AW(DOMAIN_CONTROLLER_INFO) + +DWORD WINAPI DsGetDcNameA(LPCSTR,LPCSTR,GUID*,LPCSTR,ULONG,PDOMAIN_CONTROLLER_INFOA*); +DWORD WINAPI DsGetDcNameW(LPCWSTR,LPCWSTR,GUID*,LPCWSTR,ULONG,PDOMAIN_CONTROLLER_INFOW*); +#define DsGetDcName WINELIB_NAME_AW(DsGetDcName) + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_DSGETDC_H */

1 0

Robert Reif : advapi32: Try again with different access mask if LsaOpenPolicy fails with STATUS_ACCESS_DENIED .
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 70071af6adc14381d2ef4410ce5b28f0ed3aca9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70071af6adc14381d2ef441… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Aug 14 07:17:55 2006 -0400 advapi32: Try again with different access mask if LsaOpenPolicy fails with STATUS_ACCESS_DENIED. --- dlls/advapi32/tests/lsa.c | 11 ++++++++++- dlls/advapi32/tests/security.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index da357ce..31fd802 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -62,9 +62,18 @@ static void test_lsa(void) LSA_OBJECT_ATTRIBUTES object_attributes; ZeroMemory(&object_attributes, sizeof(object_attributes)); + object_attributes.Length = sizeof(object_attributes); status = pLsaOpenPolicy( NULL, &object_attributes, POLICY_ALL_ACCESS, &handle); - ok(status == STATUS_SUCCESS, "LsaOpenPolicy() returned 0x%08lx\n", status); + ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "LsaOpenPolicy(POLICY_ALL_ACCESS) returned 0x%08lx\n", status); + + /* try a more restricted access mask if necessary */ + if (status == STATUS_ACCESS_DENIED) { + trace("LsaOpenPolicy(POLICY_ALL_ACCESS) failed, trying POLICY_VIEW_LOCAL_INFORMATION\n"); + status = pLsaOpenPolicy( NULL, &object_attributes, POLICY_VIEW_LOCAL_INFORMATION, &handle); + ok(status == STATUS_SUCCESS, "LsaOpenPolicy(POLICY_VIEW_LOCAL_INFORMATION) returned 0x%08lx\n", status); + } if (status == STATUS_SUCCESS) { PPOLICY_AUDIT_EVENTS_INFO audit_events_info; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4aa6e79..51d76e0 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -941,9 +941,18 @@ static void test_LookupAccountSid(void) LSA_OBJECT_ATTRIBUTES object_attributes; ZeroMemory(&object_attributes, sizeof(object_attributes)); + object_attributes.Length = sizeof(object_attributes); status = pLsaOpenPolicy( NULL, &object_attributes, POLICY_ALL_ACCESS, &handle); - ok(status == STATUS_SUCCESS, "LsaOpenPolicy() returned 0x%08lx\n", status); + ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "LsaOpenPolicy(POLICY_ALL_ACCESS) returned 0x%08lx\n", status); + + /* try a more restricted access mask if necessary */ + if (status == STATUS_ACCESS_DENIED) { + trace("LsaOpenPolicy(POLICY_ALL_ACCESS) failed, trying POLICY_VIEW_LOCAL_INFORMATION\n"); + status = pLsaOpenPolicy( NULL, &object_attributes, POLICY_VIEW_LOCAL_INFORMATION, &handle); + ok(status == STATUS_SUCCESS, "LsaOpenPolicy(POLICY_VIEW_LOCAL_INFORMATION) returned 0x%08lx\n", status); + } if (status == STATUS_SUCCESS) {

1 0

lostwages/wwn wn20020913_135.xml wn20030314_16 ...
by Jeremy Newman Aug. 14, 2006

Aug. 14, 2006

ChangeSet ID: 27372 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/08/14 10:46:58 Modified files: wwn : wn20020913_135.xml wn20030314_161.xml wn20030620_175.xml wn20030905_186.xml wn20031010_191.xml wn20041105_247.xml wn20041126_250.xml wn20051125_299.xml wn20051202_300.xml wn20060410_311.xml wn20060428_312.xml wn20060515_313.xml wn20060526_314.xml wn20060605_315.xml wn20060611_316.xml wn20060619_317.xml wn20060710_318.xml wn20060810_319.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes and small tweaks. Patch: http://cvs.winehq.org/patch.py?id=27372 Old revision New revision Changes Path 1.12 1.13 +4 -4 lostwages/wwn/wn20020913_135.xml 1.6 1.7 +6 -6 lostwages/wwn/wn20030314_161.xml 1.8 1.9 +2 -2 lostwages/wwn/wn20030620_175.xml 1.5 1.6 +1 -1 lostwages/wwn/wn20030905_186.xml 1.6 1.7 +1 -1 lostwages/wwn/wn20031010_191.xml 1.2 1.3 +1 -1 lostwages/wwn/wn20041105_247.xml 1.5 1.6 +1 -1 lostwages/wwn/wn20041126_250.xml 1.2 1.3 +1 -1 lostwages/wwn/wn20051125_299.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20051202_300.xml 1.3 1.4 +19 -19 lostwages/wwn/wn20060410_311.xml 1.1 1.2 +11 -11 lostwages/wwn/wn20060428_312.xml 1.1 1.2 +12 -12 lostwages/wwn/wn20060515_313.xml 1.3 1.4 +25 -25 lostwages/wwn/wn20060526_314.xml 1.1 1.2 +24 -24 lostwages/wwn/wn20060605_315.xml 1.2 1.3 +27 -27 lostwages/wwn/wn20060611_316.xml 1.2 1.3 +9 -9 lostwages/wwn/wn20060619_317.xml 1.1 1.2 +11 -11 lostwages/wwn/wn20060710_318.xml 1.1 1.2 +19 -19 lostwages/wwn/wn20060810_319.xml

1 0