February 2008 - Wine-commits

Jeff Latimer : pdh: Remove unnecessary test done in PdhLookupPerfNameByIndexW.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 75adca5385aa54bf680bb0020d89358440785c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75adca5385aa54bf680bb0020… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Mon Feb 18 20:32:04 2008 +1100 pdh: Remove unnecessary test done in PdhLookupPerfNameByIndexW. --- dlls/pdh/pdh_main.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index a42b931..f2ecc89 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -832,21 +832,17 @@ PDH_STATUS WINAPI PdhLookupPerfIndexByNameW( LPCWSTR machine, LPCWSTR name, LPDW PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR buffer, LPDWORD size ) { PDH_STATUS ret; + WCHAR *machineW = NULL; WCHAR bufferW[PDH_MAX_COUNTER_NAME]; DWORD sizeW = sizeof(bufferW) / sizeof(WCHAR); TRACE("%s %d %p %p\n", debugstr_a(machine), index, buffer, size); - if (machine) - { - FIXME("remote machine not supported\n"); - return PDH_CSTATUS_NO_MACHINE; - } - if (!buffer || !size) return PDH_INVALID_ARGUMENT; - if (!index) return ERROR_SUCCESS; - if (!(ret = PdhLookupPerfNameByIndexW( NULL, index, bufferW, &sizeW ))) + if (machine && !(machineW = pdh_strdup_aw( machine ))) return PDH_MEMORY_ALLOCATION_FAILURE; + + if (!(ret = PdhLookupPerfNameByIndexW( machineW, index, bufferW, &sizeW ))) { int required = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); @@ -854,6 +850,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR else WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, required, NULL, NULL ); if (size) *size = required; } + heap_free( machineW ); return ret; }

1 0

Alexandre Julliard : user32: Rewrite SWP_DoOwnedPopups to take into account topmost windows.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 8f15dd4d4e4424a84623f4af7c71b955e7aa234b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f15dd4d4e4424a84623f4af7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 15:00:38 2008 +0100 user32: Rewrite SWP_DoOwnedPopups to take into account topmost windows. --- dlls/user32/winpos.c | 88 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 53 insertions(+), 35 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index e6ab36c..4da5d28 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1326,27 +1326,6 @@ static inline void get_valid_rects( const RECT *old_client, const RECT *new_clie } } -struct move_owned_info -{ - HWND owner; - HWND insert_after; -}; - -static BOOL CALLBACK move_owned_popups( HWND hwnd, LPARAM lparam ) -{ - struct move_owned_info *info = (struct move_owned_info *)lparam; - - if (hwnd == info->owner) return FALSE; - if ((GetWindowLongW( hwnd, GWL_STYLE ) & WS_POPUP) && - GetWindow( hwnd, GW_OWNER ) == info->owner) - { - SetWindowPos( hwnd, info->insert_after, 0, 0, 0, 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | - SWP_NOSENDCHANGING | SWP_DEFERERASE ); - info->insert_after = hwnd; - } - return TRUE; -} /*********************************************************************** * SWP_DoOwnedPopups @@ -1358,36 +1337,75 @@ static BOOL CALLBACK move_owned_popups( HWND hwnd, LPARAM lparam ) */ static HWND SWP_DoOwnedPopups(HWND hwnd, HWND hwndInsertAfter) { - HWND owner = GetWindow( hwnd, GW_OWNER ); LONG style = GetWindowLongW( hwnd, GWL_STYLE ); - struct move_owned_info info; + HWND owner, *list = NULL; + unsigned int i; TRACE("(%p) hInsertAfter = %p\n", hwnd, hwndInsertAfter ); - if ((style & WS_POPUP) && owner) + if ((style & WS_POPUP) && (owner = GetWindow( hwnd, GW_OWNER ))) { /* make sure this popup stays above the owner */ if (hwndInsertAfter != HWND_TOP && hwndInsertAfter != HWND_TOPMOST) { - HWND hwndLocalPrev = HWND_TOP; - HWND prev = GetWindow( owner, GW_HWNDPREV ); + if (!(list = WIN_ListChildren( GetDesktopWindow() ))) return hwndInsertAfter; - while (prev && prev != hwndInsertAfter) + for (i = 0; list[i]; i++) { - if (hwndLocalPrev == HWND_TOP && GetWindowLongW( prev, GWL_STYLE ) & WS_VISIBLE) - hwndLocalPrev = prev; - prev = GetWindow( prev, GW_HWNDPREV ); + if (list[i] == owner) + { + if (i > 0) hwndInsertAfter = list[i-1]; + else hwndInsertAfter = HWND_TOP; + break; + } + + if (hwndInsertAfter == HWND_NOTOPMOST) + { + if (!(GetWindowLongW( list[i], GWL_EXSTYLE ) & WS_EX_TOPMOST)) break; + } + else if (list[i] == hwndInsertAfter) break; } - if (!prev) hwndInsertAfter = hwndLocalPrev; } } else if (style & WS_CHILD) return hwndInsertAfter; - info.owner = hwnd; - info.insert_after = hwndInsertAfter; - EnumWindows( move_owned_popups, (LPARAM)&info ); - return info.insert_after; + if (hwndInsertAfter == HWND_BOTTOM) goto done; + if (!list && !(list = WIN_ListChildren( GetDesktopWindow() ))) goto done; + + i = 0; + if (hwndInsertAfter == HWND_TOP || hwndInsertAfter == HWND_NOTOPMOST) + { + if (hwndInsertAfter == HWND_NOTOPMOST || !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_TOPMOST)) + { + /* skip all the topmost windows */ + while (list[i] && (GetWindowLongW( list[i], GWL_EXSTYLE ) & WS_EX_TOPMOST)) i++; + } + } + else if (hwndInsertAfter != HWND_TOPMOST) + { + /* skip windows that are already placed correctly */ + for (i = 0; list[i]; i++) + { + if (list[i] == hwndInsertAfter) break; + if (list[i] == hwnd) goto done; /* nothing to do if window is moving backwards in z-order */ + } + } + + for ( ; list[i]; i++) + { + if (list[i] == hwnd) break; + if (!(GetWindowLongW( list[i], GWL_STYLE ) & WS_POPUP)) continue; + if (GetWindow( list[i], GW_OWNER ) != hwnd) continue; + TRACE( "moving %p owned by %p after %p\n", list[i], hwnd, hwndInsertAfter ); + SetWindowPos( list[i], hwndInsertAfter, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOSENDCHANGING | SWP_DEFERERASE ); + hwndInsertAfter = list[i]; + } + +done: + HeapFree( GetProcessHeap(), 0, list ); + return hwndInsertAfter; } /***********************************************************************

1 0

Maarten Lankhorst : cryptdlg: Add initial stub dll.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: f9308217792c47ccda45e462107a89dbed126be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9308217792c47ccda45e4621… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 17 18:20:32 2008 -0800 cryptdlg: Add initial stub dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/cryptdlg/Makefile.in | 13 ++++++++++++ dlls/cryptdlg/cryptdlg.spec | 21 +++++++++++++++++++ dlls/cryptdlg/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 87 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4b4fcf1..c7a5306 100644 --- a/Makefile.in +++ b/Makefile.in @@ -188,6 +188,7 @@ ALL_MAKEFILES = \ dlls/crtdll/Makefile \ dlls/crypt32/Makefile \ dlls/crypt32/tests/Makefile \ + dlls/cryptdlg/Makefile \ dlls/cryptdll/Makefile \ dlls/cryptnet/Makefile \ dlls/cryptnet/tests/Makefile \ @@ -579,6 +580,7 @@ dlls/credui/tests/Makefile: dlls/credui/tests/Makefile.in dlls/Maketest.rules dlls/crtdll/Makefile: dlls/crtdll/Makefile.in dlls/Makedll.rules dlls/crypt32/Makefile: dlls/crypt32/Makefile.in dlls/Makedll.rules dlls/crypt32/tests/Makefile: dlls/crypt32/tests/Makefile.in dlls/Maketest.rules +dlls/cryptdlg/Makefile: dlls/cryptdlg/Makefile.in dlls/Makedll.rules dlls/cryptdll/Makefile: dlls/cryptdll/Makefile.in dlls/Makedll.rules dlls/cryptnet/Makefile: dlls/cryptnet/Makefile.in dlls/Makedll.rules dlls/cryptnet/tests/Makefile: dlls/cryptnet/tests/Makefile.in dlls/Maketest.rules diff --git a/configure b/configure index 0eb274a..758a851 100755 --- a/configure +++ b/configure @@ -21227,6 +21227,8 @@ ac_config_files="$ac_config_files dlls/crypt32/Makefile" ac_config_files="$ac_config_files dlls/crypt32/tests/Makefile" +ac_config_files="$ac_config_files dlls/cryptdlg/Makefile" + ac_config_files="$ac_config_files dlls/cryptdll/Makefile" ac_config_files="$ac_config_files dlls/cryptnet/Makefile" @@ -22515,6 +22517,7 @@ do "dlls/crtdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crtdll/Makefile" ;; "dlls/crypt32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crypt32/Makefile" ;; "dlls/crypt32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crypt32/tests/Makefile" ;; + "dlls/cryptdlg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptdlg/Makefile" ;; "dlls/cryptdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptdll/Makefile" ;; "dlls/cryptnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/Makefile" ;; "dlls/cryptnet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index a9252e0..bb8aac4 100644 --- a/configure.ac +++ b/configure.ac @@ -1687,6 +1687,7 @@ AC_CONFIG_FILES([dlls/credui/tests/Makefile]) AC_CONFIG_FILES([dlls/crtdll/Makefile]) AC_CONFIG_FILES([dlls/crypt32/Makefile]) AC_CONFIG_FILES([dlls/crypt32/tests/Makefile]) +AC_CONFIG_FILES([dlls/cryptdlg/Makefile]) AC_CONFIG_FILES([dlls/cryptdll/Makefile]) AC_CONFIG_FILES([dlls/cryptnet/Makefile]) AC_CONFIG_FILES([dlls/cryptnet/tests/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index d29aafb..6577b2a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -38,6 +38,7 @@ BASEDIRS = \ credui \ crtdll \ crypt32 \ + cryptdlg \ cryptdll \ cryptnet \ ctapi32 \ diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in new file mode 100644 index 0000000..9c93630 --- /dev/null +++ b/dlls/cryptdlg/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = cryptdlg.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/cryptdlg/cryptdlg.spec b/dlls/cryptdlg/cryptdlg.spec new file mode 100644 index 0000000..1b80d40 --- /dev/null +++ b/dlls/cryptdlg/cryptdlg.spec @@ -0,0 +1,21 @@ +1 stub CertConfigureTrustA +2 stub CertConfigureTrustW +3 stub CertTrustCertPolicy +4 stub CertTrustCleanup +5 stub CertTrustFinalPolicy +6 stub CertTrustInit +7 stub DecodeAttrSequence +8 stub DecodeRecipientID +9 stub EncodeAttrSequence +10 stub EncodeRecipientID +11 stub FormatPKIXEmailProtection +12 stub FormatVerisignExtension +13 stub CertModifyCertificatesToTrust +14 stub CertSelectCertificateA +15 stub CertSelectCertificateW +16 stub CertViewPropertiesA +17 stub CertViewPropertiesW +18 stub DllRegisterServer +19 stub DllUnregisterServer +20 stub GetFriendlyNameOfCertA +21 stub GetFriendlyNameOfCertW diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c new file mode 100644 index 0000000..eec0fa0 --- /dev/null +++ b/dlls/cryptdlg/main.c @@ -0,0 +1,46 @@ +/* + * Copyright 2008 Maarten Lankhorst + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cryptdlg); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + return TRUE; +}

1 0

Francois Gouget : inetcomm: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 84acc6f9c1406b3da1c5fb8e753a93d5ee0feb87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84acc6f9c1406b3da1c5fb8e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 18 11:54:22 2008 +0100 inetcomm: Fix compilation on systems that don't support nameless unions. --- dlls/inetcomm/mimeole.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index a0da6b9..e986e7f 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1257,7 +1257,7 @@ static HRESULT WINAPI sub_stream_CopyTo( ULARGE_INTEGER totalBytesRead; ULARGE_INTEGER totalBytesWritten; - TRACE("(%p)->(%p, %d, %p, %p)\n", iface, pstm, cb.LowPart, pcbRead, pcbWritten); + TRACE("(%p)->(%p, %d, %p, %p)\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten); totalBytesRead.QuadPart = 0; totalBytesWritten.QuadPart = 0; @@ -1525,7 +1525,7 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc zero.QuadPart = 0; hr = IStream_Seek(stm, zero, STREAM_SEEK_CUR, &cur); - start = cur.LowPart; + start = cur.u.LowPart; do { hr = IStream_Read(stm, overlap, PARSER_BUF_SIZE, &read); @@ -1599,7 +1599,7 @@ static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *off IMimeBody_Load(mime_body, pStm); zero.QuadPart = 0; hr = IStream_Seek(pStm, zero, STREAM_SEEK_CUR, &cur); - offset->cbBodyStart = cur.LowPart + offset->cbHeaderStart; + offset->cbBodyStart = cur.u.LowPart + offset->cbHeaderStart; if(parent) MimeBody_set_offsets(impl_from_IMimeBody(mime_body), offset); IMimeBody_SetData(mime_body, IET_BINARY, NULL, NULL, &IID_IStream, pStm); body = new_body_entry(mime_body, msg->next_hbody, parent); @@ -1629,8 +1629,8 @@ static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *off IStream *sub_stream; ULARGE_INTEGER start, length; - start.LowPart = cur->offsets.cbHeaderStart; - length.LowPart = cur->offsets.cbBodyEnd - cur->offsets.cbHeaderStart; + start.u.LowPart = cur->offsets.cbHeaderStart; + length.u.LowPart = cur->offsets.cbBodyEnd - cur->offsets.cbHeaderStart; create_sub_stream(pStm, start, length, &sub_stream); sub_body = create_sub_body(msg, sub_stream, &cur->offsets, body); IStream_Release(sub_stream); @@ -1674,7 +1674,7 @@ static HRESULT WINAPI MimeMessage_Load( zero.QuadPart = 0; IStream_Seek(pStm, zero, STREAM_SEEK_END, &cur); - offsets.cbBodyEnd = cur.LowPart; + offsets.cbBodyEnd = cur.u.LowPart; MimeBody_set_offsets(impl_from_IMimeBody(root_body->mime_body), &offsets); list_add_head(&This->body_tree, &root_body->entry);

1 0

Jeff Latimer : pdh/tests: Add test for size > 0 but no buffer.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 52f03de95188458d2bd60d9bf57354d2f2eb5c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f03de95188458d2bd60d9bf… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Mon Feb 18 20:31:51 2008 +1100 pdh/tests: Add test for size > 0 but no buffer. --- dlls/pdh/tests/pdh.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index f1b856d..7b31cb4 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -646,6 +646,10 @@ static void test_PdhLookupPerfNameByIndexA( void ) ok(size == sizeof("% Processor Time"), "PdhLookupPerfNameByIndexA failed %d\n", size); size = sizeof(buffer); + ret = PdhLookupPerfNameByIndexA( NULL, 674, NULL, &size ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); + + size = sizeof(buffer); ret = PdhLookupPerfNameByIndexA( NULL, 674, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); ok(!lstrcmpA( buffer, "System Up Time" ), @@ -672,6 +676,10 @@ static void test_PdhLookupPerfNameByIndexW( void ) ok(size == sizeof(processor_time) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); size = sizeof(buffer) / sizeof(WCHAR); + ret = PdhLookupPerfNameByIndexW( NULL, 674, NULL, &size ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); + + size = sizeof(buffer) / sizeof(WCHAR); ret = PdhLookupPerfNameByIndexW( NULL, 674, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); ok(size == sizeof(uptime) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size);

1 0

Jeff Latimer : pdh: Check for size > 0 but no buffer.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 33c386f7fe5565ed6498e662214115f2ea52a835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c386f7fe5565ed6498e6622… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Mon Feb 18 20:31:58 2008 +1100 pdh: Check for size > 0 but no buffer. --- dlls/pdh/pdh_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index d78af4a..a42b931 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -843,7 +843,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR return PDH_CSTATUS_NO_MACHINE; } - if (!buffer && !size) return PDH_INVALID_ARGUMENT; + if (!buffer || !size) return PDH_INVALID_ARGUMENT; if (!index) return ERROR_SUCCESS; if (!(ret = PdhLookupPerfNameByIndexW( NULL, index, bufferW, &sizeW )))

1 0

Roderick Colenbrander : wined3d: Add separate alpha blend support.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: c2d978410f6fbc3988181dc6fe1765353352a121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d978410f6fbc3988181dc6f… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Feb 16 15:42:11 2008 +0000 wined3d: Add separate alpha blend support. --- dlls/wined3d/directx.c | 6 ++- dlls/wined3d/state.c | 143 +++++++++++++++++++++++++++++++++++++------- include/wine/wined3d_gl.h | 16 +++++ 3 files changed, 141 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2d978410f6fbc3988181…

1 0

Paul Vriens : advapi32/tests: Skip tests when our language isn' t LANG_ENGLISH.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: ba4669860eb8d7914fe82025510d6f4926171cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4669860eb8d7914fe820255… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Feb 16 14:11:57 2008 +0100 advapi32/tests: Skip tests when our language isn't LANG_ENGLISH. --- dlls/advapi32/tests/security.c | 90 +++++++++++++++++++++++----------------- 1 files changed, 52 insertions(+), 38 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 97b5a85..1cb3130 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1543,18 +1543,25 @@ static void test_LookupAccountName(void) domain_size = domain_save; sid_size = sid_save; - ret = LookupAccountNameA(NULL, "Everyone", psid, &sid_size, domain, &domain_size, &sid_use); - get_sid_info(psid, &account, &sid_dom); - ok(ret, "Failed to lookup account name\n"); - ok(sid_size != 0, "sid_size was zero\n"); - ok(!lstrcmp(account, "Everyone"), "Expected Everyone, got %s\n", account); - todo_wine - ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); - ok(domain_size == 0, "Expected 0, got %d\n", domain_size); - todo_wine - ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); - ok(sid_use == SidTypeWellKnownGroup, "Expected SidTypeUser, got %d\n", sid_use); - domain_size = domain_save; + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + { + skip("Non-english locale (test with hardcoded 'Everyone')\n"); + } + else + { + ret = LookupAccountNameA(NULL, "Everyone", psid, &sid_size, domain, &domain_size, &sid_use); + get_sid_info(psid, &account, &sid_dom); + ok(ret, "Failed to lookup account name\n"); + ok(sid_size != 0, "sid_size was zero\n"); + ok(!lstrcmp(account, "Everyone"), "Expected Everyone, got %s\n", account); + todo_wine + ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); + ok(domain_size == 0, "Expected 0, got %d\n", domain_size); + todo_wine + ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); + ok(sid_use == SidTypeWellKnownGroup, "Expected SidTypeUser, got %d\n", sid_use); + domain_size = domain_save; + } /* NULL Sid with zero sid size */ SetLastError(0xdeadbeef); @@ -2046,32 +2053,39 @@ static void test_SetEntriesInAcl(void) ok(NewAcl != NULL, "returned acl was NULL\n"); LocalFree(NewAcl); - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; - ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszEveryone; - res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); - ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); - ok(NewAcl != NULL, "returned acl was NULL\n"); - LocalFree(NewAcl); - - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_BAD_FORM; - res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); - ok(res == ERROR_INVALID_PARAMETER, "SetEntriesInAclW failed: %u\n", res); - ok(NewAcl == NULL, "returned acl wasn't NULL: %p\n", NewAcl); - LocalFree(NewAcl); - - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; - ExplicitAccess.Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; - res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); - ok(res == ERROR_INVALID_PARAMETER, "SetEntriesInAclW failed: %u\n", res); - ok(NewAcl == NULL, "returned acl wasn't NULL: %p\n", NewAcl); - LocalFree(NewAcl); - - ExplicitAccess.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; - ExplicitAccess.grfAccessMode = SET_ACCESS; - res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); - ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); - ok(NewAcl != NULL, "returned acl was NULL\n"); - LocalFree(NewAcl); + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + { + skip("Non-english locale (test with hardcoded 'Everyone')\n"); + } + else + { + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszEveryone; + res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(NewAcl != NULL, "returned acl was NULL\n"); + LocalFree(NewAcl); + + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_BAD_FORM; + res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); + ok(res == ERROR_INVALID_PARAMETER, "SetEntriesInAclW failed: %u\n", res); + ok(NewAcl == NULL, "returned acl wasn't NULL: %p\n", NewAcl); + LocalFree(NewAcl); + + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; + res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); + ok(res == ERROR_INVALID_PARAMETER, "SetEntriesInAclW failed: %u\n", res); + ok(NewAcl == NULL, "returned acl wasn't NULL: %p\n", NewAcl); + LocalFree(NewAcl); + + ExplicitAccess.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + ExplicitAccess.grfAccessMode = SET_ACCESS; + res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(NewAcl != NULL, "returned acl was NULL\n"); + LocalFree(NewAcl); + } ExplicitAccess.grfAccessMode = REVOKE_ACCESS; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_SID;

1 0

Roderick Colenbrander : wined3d: Add SURFACE_BUSY support to *_Blt.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 5437cb01f1fc7043349587ede9b156879798eb7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5437cb01f1fc7043349587ede… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Feb 15 22:55:36 2008 +0000 wined3d: Add SURFACE_BUSY support to *_Blt. --- dlls/wined3d/surface.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index be464eb..e241a85 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3436,6 +3436,12 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, RECT *Dest TRACE("(%p)->(%p,%p,%p,%x,%p)\n", This, DestRect, SrcSurface, SrcRect, Flags, DDBltFx); TRACE("(%p): Usage is %s\n", This, debug_d3dusage(This->resource.usage)); + if ( (This->Flags & SFLAG_LOCKED) || ((Src != NULL) && (Src->Flags & SFLAG_LOCKED))) + { + WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n"); + return WINEDDERR_SURFACEBUSY; + } + /* Accessing the depth stencil is supposed to fail between a BeginScene and EndScene pair, * except depth blits, which seem to work */

1 0

Roderick Colenbrander : wined3d: Add SURFACE_BUSY support to *_BltFast.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: a29584b34ffe62684176e3cdf066d765d35db8e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29584b34ffe62684176e3cdf… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Feb 15 22:58:38 2008 +0000 wined3d: Add SURFACE_BUSY support to *_BltFast. --- dlls/wined3d/surface.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e241a85..6a17949 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3474,6 +3474,12 @@ HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, D IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; TRACE("(%p)->(%d, %d, %p, %p, %08x\n", iface, dstx, dsty, Source, rsrc, trans); + if ( (This->Flags & SFLAG_LOCKED) || ((srcImpl != NULL) && (srcImpl->Flags & SFLAG_LOCKED))) + { + WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n"); + return WINEDDERR_SURFACEBUSY; + } + if(myDevice->inScene && (iface == myDevice->stencilBufferTarget || (Source && Source == myDevice->stencilBufferTarget))) {

1 0