November 2007 - Wine-commits

Stefan Dösinger : wined3d: Bool constants aren' t vectors.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: afb06a11842f38313e2a7a6f85db7ff9013d75f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb06a11842f38313e2a7a6f8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 18 17:28:32 2007 +0100 wined3d: Bool constants aren't vectors. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1cc3ec8..d9e525b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -293,7 +293,7 @@ static void shader_glsl_load_constantsB( for (i=0; i<max_constants; ++i) { if (NULL == constants_set || constants_set[i]) { - TRACE_(d3d_constants)("Loading constants %i: %i;\n", i, constants[i*4]); + TRACE_(d3d_constants)("Loading constants %i: %i;\n", i, constants[i]); /* TODO: Benchmark and see if it would be beneficial to store the * locations of the constants to avoid looking up each time */ @@ -301,7 +301,7 @@ static void shader_glsl_load_constantsB( tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); if (tmp_loc != -1) { /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i*4])); + GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i])); checkGLcall("glUniform1ivARB"); } }

1 0

Jonathan Ernst : cmd: Updated French translation.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 3fc12344fc5d91ff09a5506b65030f0b9b1e6ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc12344fc5d91ff09a5506b6… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Nov 20 18:17:44 2007 +0100 cmd: Updated French translation. --- programs/cmd/Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc index 59afbab..4fecb39 100644 --- a/programs/cmd/Fr.rc +++ b/programs/cmd/Fr.rc @@ -3,7 +3,7 @@ * French Language Support * * Copyright 2003 Sylvain Petreolle - * Copyright 2007 Jonathan�Ernst + * Copyright 2007 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Jonathan Ernst : credui: Updated French translation.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: b95bab9b56546b4d30aef5dc37a3dde0f1a99b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95bab9b56546b4d30aef5dc3… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Nov 20 18:22:39 2007 +0100 credui: Updated French translation. --- dlls/credui/credui_Fr.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_Fr.rc b/dlls/credui/credui_Fr.rc index 8faad27..c1d71d4 100644 --- a/dlls/credui/credui_Fr.rc +++ b/dlls/credui/credui_Fr.rc @@ -43,4 +43,8 @@ STRINGTABLE DISCARDABLE { IDS_TITLEFORMAT "Se connecter à %s" IDS_MESSAGEFORMAT "Connexion à %s" + IDS_INCORRECTPASSWORDTITLE "Échec lors de la connexion" + IDS_INCORRECTPASSWORD "Assurez-vous que votre nom d'utilisateur\net votre mot de passe sont corrects." + IDS_CAPSLOCKONTITLE "VERR.MAJ est activé" + IDS_CAPSLOCKON "Le verrouillage majuscule étant activé, cela pourrait provoquer une erreur lors de la saisie de votre mot de passe.\n\nAppuyez sur la touche VERR.MAJ de votre clavier afin de désactiver le verrouilage majuscule avant\nde saisir votre mot de passe." }

1 0

Rob Shearman : server: Fix incorrect translation of the World SID to and from Unix file permissions .
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: ec8a27f5736a6fcce068a0919972f09950799728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8a27f5736a6fcce068a0919… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 20 17:49:07 2007 +0000 server: Fix incorrect translation of the World SID to and from Unix file permissions. The World SID now maps to user|group|other instead of just other. --- server/file.c | 51 +++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 43 insertions(+), 8 deletions(-) diff --git a/server/file.c b/server/file.c index 58973c0..ad98d21 100644 --- a/server/file.c +++ b/server/file.c @@ -299,6 +299,7 @@ static struct security_descriptor *file_get_sd( struct object *obj ) const SID *user; const SID *group; size_t dacl_size; + ACE_HEADER *current_ace; ACCESS_ALLOWED_ACE *aaa; ACL *dacl; SID *sid; @@ -328,6 +329,11 @@ static struct security_descriptor *file_get_sd( struct object *obj ) if (st.st_mode & S_IRWXU) dacl_size += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); + if ((!(st.st_mode & S_IRUSR) && (st.st_mode & (S_IRGRP|S_IROTH))) || + (!(st.st_mode & S_IWUSR) && (st.st_mode & (S_IWGRP|S_IWOTH))) || + (!(st.st_mode & S_IXUSR) && (st.st_mode & (S_IXGRP|S_IXOTH)))) + dacl_size += FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + + FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); if (st.st_mode & S_IRWXO) dacl_size += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + FIELD_OFFSET(SID, SubAuthority[world_sid->SubAuthorityCount]); @@ -355,10 +361,15 @@ static struct security_descriptor *file_get_sd( struct object *obj ) dacl->Sbz1 = 0; dacl->AclSize = dacl_size; dacl->AceCount = 1 + (st.st_mode & S_IRWXU ? 1 : 0) + (st.st_mode & S_IRWXO ? 1 : 0); + if ((!(st.st_mode & S_IRUSR) && (st.st_mode & (S_IRGRP|S_IROTH))) || + (!(st.st_mode & S_IWUSR) && (st.st_mode & (S_IWGRP|S_IWOTH))) || + (!(st.st_mode & S_IXUSR) && (st.st_mode & (S_IXGRP|S_IXOTH)))) + dacl->AceCount++; dacl->Sbz2 = 0; /* always give FILE_ALL_ACCESS for Local System */ aaa = (ACCESS_ALLOWED_ACE *)(dacl + 1); + current_ace = &aaa->Header; aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; aaa->Header.AceFlags = 0; aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + @@ -370,7 +381,8 @@ static struct security_descriptor *file_get_sd( struct object *obj ) if (st.st_mode & S_IRWXU) { /* appropriate access rights for the user */ - aaa = (ACCESS_ALLOWED_ACE *)ace_next( &aaa->Header ); + aaa = (ACCESS_ALLOWED_ACE *)ace_next( current_ace ); + current_ace = &aaa->Header; aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; aaa->Header.AceFlags = 0; aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + @@ -385,10 +397,33 @@ static struct security_descriptor *file_get_sd( struct object *obj ) sid = (SID *)&aaa->SidStart; memcpy( sid, user, FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) ); } + if ((!(st.st_mode & S_IRUSR) && (st.st_mode & (S_IRGRP|S_IROTH))) || + (!(st.st_mode & S_IWUSR) && (st.st_mode & (S_IWGRP|S_IWOTH))) || + (!(st.st_mode & S_IXUSR) && (st.st_mode & (S_IXGRP|S_IXOTH)))) + { + /* deny just in case the user is a member of the group */ + ACCESS_DENIED_ACE *ada = (ACCESS_DENIED_ACE *)ace_next( current_ace ); + current_ace = &ada->Header; + ada->Header.AceType = ACCESS_DENIED_ACE_TYPE; + ada->Header.AceFlags = 0; + ada->Header.AceSize = FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + + FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); + ada->Mask = 0; + if (!(st.st_mode & S_IRUSR) && (st.st_mode & (S_IRGRP|S_IROTH))) + ada->Mask |= FILE_GENERIC_READ; + if (!(st.st_mode & S_IWUSR) && (st.st_mode & (S_IWGRP|S_IROTH))) + ada->Mask |= FILE_GENERIC_WRITE | DELETE; + if (!(st.st_mode & S_IXUSR) && (st.st_mode & (S_IXGRP|S_IXOTH))) + ada->Mask |= FILE_GENERIC_EXECUTE; + ada->Mask &= ~STANDARD_RIGHTS_ALL; /* never deny standard rights */ + sid = (SID *)&ada->SidStart; + memcpy( sid, user, FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) ); + } if (st.st_mode & S_IRWXO) { /* appropriate access rights for Everyone */ - aaa = (ACCESS_ALLOWED_ACE *)ace_next( &aaa->Header ); + aaa = (ACCESS_ALLOWED_ACE *)ace_next( current_ace ); + current_ace = &aaa->Header; aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; aaa->Header.AceFlags = 0; aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + @@ -438,11 +473,11 @@ static mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner { unsigned int access = generic_file_map_access( ad_ace->Mask ); if (access & FILE_READ_DATA) - denied_mode |= S_IROTH; + denied_mode |= S_IRUSR|S_IRGRP|S_IROTH; if (access & FILE_WRITE_DATA) - denied_mode |= S_IWOTH; + denied_mode |= S_IWUSR|S_IWGRP|S_IWOTH; if (access & FILE_EXECUTE) - denied_mode |= S_IXOTH; + denied_mode |= S_IXUSR|S_IXGRP|S_IXOTH; } else if (security_equal_sid( sid, owner )) { @@ -462,11 +497,11 @@ static mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner { unsigned int access = generic_file_map_access( aa_ace->Mask ); if (access & FILE_READ_DATA) - new_mode |= S_IROTH; + new_mode |= S_IRUSR|S_IRGRP|S_IROTH; if (access & FILE_WRITE_DATA) - new_mode |= S_IWOTH; + new_mode |= S_IWUSR|S_IWGRP|S_IWOTH; if (access & FILE_EXECUTE) - new_mode |= S_IXOTH; + new_mode |= S_IXUSR|S_IXGRP|S_IXOTH; } else if (security_equal_sid( sid, owner )) {

1 0

Rob Shearman : rpcrt4: Raise an exception if a NULL ref-pointer is passed in to PointerMarshall or PointerBufferSize .
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 046f24a0e740533f4ffc9851b3b26935b7c3ed43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046f24a0e740533f4ffc9851b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 20 18:03:18 2007 +0000 rpcrt4: Raise an exception if a NULL ref-pointer is passed in to PointerMarshall or PointerBufferSize. --- dlls/rpcrt4/ndr_marshall.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 0590203..57a442c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -871,10 +871,11 @@ static void PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ -#if 0 /* this causes problems for InstallShield so is disabled - we need more tests */ if (!Pointer) + { + ERR("NULL ref pointer is not allowed\n"); RpcRaiseException(RPC_X_NULL_REF_POINTER); -#endif + } pointer_needs_marshaling = 1; break; case RPC_FC_UP: /* unique pointer */ @@ -1016,6 +1017,11 @@ static void PointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ + if (!Pointer) + { + ERR("NULL ref pointer is not allowed\n"); + RpcRaiseException(RPC_X_NULL_REF_POINTER); + } break; case RPC_FC_OP: case RPC_FC_UP:

1 0

Lei Zhang : shell32: Perform copy in UnixFolder_ISFHelper_CopyItems.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: fa057686bb52b0f39d4acc790c7d9b4b0f7f20e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa057686bb52b0f39d4acc790… Author: Lei Zhang <thestig(a)google.com> Date: Tue Nov 20 11:54:58 2007 -0800 shell32: Perform copy in UnixFolder_ISFHelper_CopyItems. --- dlls/shell32/shfldr_unixfs.c | 73 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 6016dc7..6c19001 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -742,6 +742,61 @@ static HRESULT UNIXFS_initialize_target_folder(UnixFolder *This, const char *szB } /****************************************************************************** + * UNIXFS_copy [Internal] + * + * Copy pwszDosSrc to pwszDosDst. + * + * PARAMS + * pwszDosSrc [I] absolute path of the source + * pwszDosDst [I] absolute path of the destination + * + * RETURNS + * Success: S_OK, + * Failure: E_FAIL + */ +static HRESULT UNIXFS_copy(LPCWSTR pwszDosSrc, LPCWSTR pwszDosDst) +{ + SHFILEOPSTRUCTW op; + LPWSTR pwszSrc, pwszDst; + HRESULT res = E_OUTOFMEMORY; + UINT iSrcLen, iDstLen; + + if (!pwszDosSrc || !pwszDosDst) + return E_FAIL; + + iSrcLen = lstrlenW(pwszDosSrc); + iDstLen = lstrlenW(pwszDosDst); + pwszSrc = HeapAlloc(GetProcessHeap(), 0, (iSrcLen + 2) * sizeof(WCHAR)); + pwszDst = HeapAlloc(GetProcessHeap(), 0, (iDstLen + 2) * sizeof(WCHAR)); + + if (pwszSrc && pwszDst) { + lstrcpyW(pwszSrc, pwszDosSrc); + lstrcpyW(pwszDst, pwszDosDst); + /* double null termination */ + pwszSrc[iSrcLen + 1] = 0; + pwszDst[iDstLen + 1] = 0; + + ZeroMemory(&op, sizeof(op)); + op.hwnd = GetActiveWindow(); + op.wFunc = FO_COPY; + op.pFrom = pwszSrc; + op.pTo = pwszDst; + op.fFlags = FOF_ALLOWUNDO; + if (!SHFileOperationW(&op)) + { + WARN("SHFileOperationW failed\n"); + res = E_FAIL; + } + else + res = S_OK; + } + + HeapFree(GetProcessHeap(), 0, pwszSrc); + HeapFree(GetProcessHeap(), 0, pwszDst); + return res; +} + +/****************************************************************************** * UnixFolder * * Class whose heap based instances represent unix filesystem directories. @@ -1864,7 +1919,7 @@ static HRESULT WINAPI UnixFolder_ISFHelper_CopyItems(ISFHelper* iface, IShellFol HRESULT hr; char szAbsoluteDst[FILENAME_MAX], *pszRelativeDst; - TRACE("(iface=%p, psfFrom=%p, cidl=%d, apidl=%p): semi-stub\n", iface, psfFrom, cidl, apidl); + TRACE("(iface=%p, psfFrom=%p, cidl=%d, apidl=%p)\n", iface, psfFrom, cidl, apidl); if (!psfFrom || !cidl || !apidl) return E_INVALIDARG; @@ -1882,6 +1937,8 @@ static HRESULT WINAPI UnixFolder_ISFHelper_CopyItems(ISFHelper* iface, IShellFol WCHAR wszSrc[MAX_PATH]; char szSrc[FILENAME_MAX]; STRRET strret; + HRESULT res; + WCHAR *pwszDosSrc, *pwszDosDst; /* Build the unix path of the current source item. */ if (FAILED(IShellFolder_GetDisplayNameOf(psfFrom, apidl[i], SHGDN_FORPARSING, &strret))) @@ -1894,7 +1951,19 @@ static HRESULT WINAPI UnixFolder_ISFHelper_CopyItems(ISFHelper* iface, IShellFol /* Build the unix path of the current destination item */ UNIXFS_filename_from_shitemid(apidl[i], pszRelativeDst); - FIXME("Would copy %s to %s. Not yet implemented.\n", szSrc, szAbsoluteDst); + pwszDosSrc = wine_get_dos_file_name(szSrc); + pwszDosDst = wine_get_dos_file_name(szAbsoluteDst); + + if (pwszDosSrc && pwszDosDst) + res = UNIXFS_copy(pwszDosSrc, pwszDosDst); + else + res = E_OUTOFMEMORY; + + HeapFree(GetProcessHeap(), 0, pwszDosSrc); + HeapFree(GetProcessHeap(), 0, pwszDosDst); + + if (res != S_OK) + return res; } return S_OK; }

1 0

Lei Zhang : shell32: Only notify immediate parent.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: cb99cd331d34762dd093829e7d5e1b2be41a48af URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb99cd331d34762dd093829e7… Author: Lei Zhang <thestig(a)google.com> Date: Tue Nov 20 12:41:08 2007 -0800 shell32: Only notify immediate parent. --- dlls/shell32/changenotify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index c88ca1f..4cd17e9 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -267,7 +267,7 @@ static BOOL should_notify( LPCITEMIDLIST changed, LPCITEMIDLIST watched, BOOL su return FALSE; if (ILIsEqual( watched, changed ) ) return TRUE; - if( sub && ILIsParent( watched, changed, FALSE ) ) + if( sub && ILIsParent( watched, changed, TRUE ) ) return TRUE; return FALSE; }

1 0

Alexander Nicolaysen Sørnes : user32: Change to modern Windows colours.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: 1f8ba9612880582b8db827cae4b6f2c4504c602e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8ba9612880582b8db827cae… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Nov 20 14:55:22 2007 +0100 user32: Change to modern Windows colours. --- dlls/user32/resources/display.rc | 10 +++++----- dlls/user32/sysparams.c | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/user32/resources/display.rc b/dlls/user32/resources/display.rc index 647bf00..243bf2d 100644 --- a/dlls/user32/resources/display.rc +++ b/dlls/user32/resources/display.rc @@ -31,8 +31,8 @@ 0x01, /* horizontal-line width */ /* default system color values */ - 0x00c0c0c0L, /* scrollbar */ - 0x00c0c0c0L, /* desktop */ + 0x00d4d0c8L, /* scrollbar */ + 0x00d4d0c8L, /* desktop */ 0x00800000L, /* active caption */ 0x00ffffffL, /* inactive caption */ 0x00ffffffL, /* menu */ @@ -41,12 +41,12 @@ 0x00000000L, /* menu text */ 0x00000000L, /* window text */ 0x00ffffffL, /* caption text */ - 0x00c0c0c0L, /* active border */ - 0x00c0c0c0L, /* inactive border */ + 0x00d4d0c8L, /* active border */ + 0x00d4d0c8L, /* inactive border */ 0x00ffffffL, /* app workspace */ 0x00800000L, /* hilite bk */ 0x00ffffffL, /* hilite text */ - 0x00c0c0c0L, /* btn face */ + 0x00d4d0c8L, /* btn face */ 0x00808080L, /* btn shadow */ 0x00c0c0c0L, /* gray text */ 0x00000000L, /* btn text */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index f5be96c..3c314f9 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -87,26 +87,26 @@ enum spi_index static const char * const DefSysColors[] = { - "Scrollbar", "192 192 192", /* COLOR_SCROLLBAR */ + "Scrollbar", "212 208 200", /* COLOR_SCROLLBAR */ "Background", "0 128 128", /* COLOR_BACKGROUND */ "ActiveTitle", "0 0 128", /* COLOR_ACTIVECAPTION */ "InactiveTitle", "128 128 128", /* COLOR_INACTIVECAPTION */ - "Menu", "192 192 192", /* COLOR_MENU */ + "Menu", "212 208 200", /* COLOR_MENU */ "Window", "255 255 255", /* COLOR_WINDOW */ "WindowFrame", "0 0 0", /* COLOR_WINDOWFRAME */ "MenuText", "0 0 0", /* COLOR_MENUTEXT */ "WindowText", "0 0 0", /* COLOR_WINDOWTEXT */ "TitleText", "255 255 255", /* COLOR_CAPTIONTEXT */ - "ActiveBorder", "192 192 192", /* COLOR_ACTIVEBORDER */ - "InactiveBorder", "192 192 192", /* COLOR_INACTIVEBORDER */ + "ActiveBorder", "212 208 200", /* COLOR_ACTIVEBORDER */ + "InactiveBorder", "212 208 200", /* COLOR_INACTIVEBORDER */ "AppWorkSpace", "128 128 128", /* COLOR_APPWORKSPACE */ "Hilight", "0 0 128", /* COLOR_HIGHLIGHT */ "HilightText", "255 255 255", /* COLOR_HIGHLIGHTTEXT */ - "ButtonFace", "192 192 192", /* COLOR_BTNFACE */ + "ButtonFace", "212 208 200", /* COLOR_BTNFACE */ "ButtonShadow", "128 128 128", /* COLOR_BTNSHADOW */ "GrayText", "128 128 128", /* COLOR_GRAYTEXT */ "ButtonText", "0 0 0", /* COLOR_BTNTEXT */ - "InactiveTitleText", "192 192 192", /* COLOR_INACTIVECAPTIONTEXT */ + "InactiveTitleText", "212 208 200", /* COLOR_INACTIVECAPTIONTEXT */ "ButtonHilight", "255 255 255", /* COLOR_BTNHIGHLIGHT */ "ButtonDkShadow", "0 0 0", /* COLOR_3DDKSHADOW */ "ButtonLight", "224 224 224", /* COLOR_3DLIGHT */ @@ -117,7 +117,7 @@ static const char * const DefSysColors[] = "GradientActiveTitle", "16 132 208", /* COLOR_GRADIENTACTIVECAPTION */ "GradientInactiveTitle", "181 181 181", /* COLOR_GRADIENTINACTIVECAPTION */ "MenuHilight", "0 0 0", /* COLOR_MENUHILIGHT */ - "MenuBar", "192 192 192" /* COLOR_MENUBAR */ + "MenuBar", "212 208 200" /* COLOR_MENUBAR */ }; /**

1 0

Alexandre Julliard : kernel32/tests: Don' t crash the test if GetThreadContext fails.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: 58b85bba3ea2359ba60ad7efdf59f94d37835d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b85bba3ea2359ba60ad7efd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 17:53:43 2007 +0100 kernel32/tests: Don't crash the test if GetThreadContext fails. --- dlls/kernel32/tests/thread.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 38692d4..6b90ad1 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -795,6 +795,7 @@ static void test_SetThreadContext(void) HANDLE thread; DWORD threadid; DWORD prevcount; + BOOL ret; SetLastError(0xdeadbeef); event = CreateEvent( NULL, TRUE, FALSE, NULL ); @@ -811,16 +812,20 @@ static void test_SetThreadContext(void) ctx.ContextFlags = CONTEXT_FULL; SetLastError(0xdeadbeef); - ok( GetThreadContext( thread, &ctx ), "GetThreadContext failed : (%d)\n", GetLastError() ); - - /* simulate a call to set_test_val(10) */ - stack = (int *)ctx.Esp; - stack[-1] = 10; - stack[-2] = ctx.Eip; - ctx.Esp -= 2 * sizeof(int *); - ctx.Eip = (DWORD)set_test_val; - SetLastError(0xdeadbeef); - ok( SetThreadContext( thread, &ctx ), "SetThreadContext failed : (%d)\n", GetLastError() ); + ret = GetThreadContext( thread, &ctx ); + ok( ret, "GetThreadContext failed : (%u)\n", GetLastError() ); + + if (ret) + { + /* simulate a call to set_test_val(10) */ + stack = (int *)ctx.Esp; + stack[-1] = 10; + stack[-2] = ctx.Eip; + ctx.Esp -= 2 * sizeof(int *); + ctx.Eip = (DWORD)set_test_val; + SetLastError(0xdeadbeef); + ok( SetThreadContext( thread, &ctx ), "SetThreadContext failed : (%d)\n", GetLastError() ); + } SetLastError(0xdeadbeef); prevcount = ResumeThread( thread );

1 0

Francois Gouget : ntdll/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: 10e738f23687526767dcd3ba4c95452c9ed36321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e738f23687526767dcd3ba4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 20 13:48:15 2007 +0100 ntdll/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ntdll/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 8ea454c..846448e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -512,7 +512,7 @@ static void test_iocp_fileio(HANDLE h) NTSTATUS res = pNtSetInformationFile( hPipeSrv, &iosb, &fci, sizeof(fci), FileCompletionInformation ); ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res ); - ok( iosb.Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", iosb.Status ); + ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", U(iosb).Status ); count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count );

1 0