November 2006 - Wine-commits

Hans Leidekker : setupapi: Implement SetupGetSourceFileLocation{A, W}.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: 02c5df73d2104209f06c93165bf25c9d592f0d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c5df73d2104209f06c93165… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Nov 13 21:04:32 2006 +0100 setupapi: Implement SetupGetSourceFileLocation{A,W}. --- dlls/setupapi/query.c | 144 ++++++++++++++++++++++++++++++++++++++ dlls/setupapi/queue.c | 13 ---- dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/setupapi_private.h | 12 +++ include/setupapi.h | 3 + 5 files changed, 161 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 932fb98..e11ea59 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -29,10 +29,32 @@ #include "setupapi.h" #include "advpub.h" #include "winnls.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "setupapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +#ifdef __i386__ +static const WCHAR source_disks_names_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','x','8','6',0}; +static const WCHAR source_disks_files_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','x','8','6',0}; +#elif defined(__x86_64) +static const WCHAR source_disks_names_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','m','d','6','4',0}; +static const WCHAR source_disks_files_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','m','d','6','4',0}; +#else /* FIXME: other platforms */ +static const WCHAR source_disks_names_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; +static const WCHAR source_disks_files_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; +#endif +static const WCHAR source_disks_names[] = + {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; +static const WCHAR source_disks_files[] = + {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; + /* fills the PSP_INF_INFORMATION struct fill_info is TRUE * always returns the required size of the information */ @@ -281,3 +303,125 @@ BOOL WINAPI SetupQueryInfFileInformation lstrcpyW(ReturnBuffer, ptr); return TRUE; } + +/*********************************************************************** + * SetupGetSourceFileLocationA (SETUPAPI.@) + */ + +BOOL WINAPI SetupGetSourceFileLocationA( HINF hinf, PINFCONTEXT context, PCSTR filename, + PUINT source_id, PSTR buffer, DWORD buffer_size, + PDWORD required_size ) +{ + BOOL ret = FALSE; + WCHAR *filenameW = NULL, *bufferW = NULL; + DWORD required; + INT size; + + TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_a(filename), source_id, + buffer, buffer_size, required_size); + + if (filename && !(filenameW = strdupAtoW( filename ))) + return FALSE; + + if (!SetupGetSourceFileLocationW( hinf, context, filenameW, source_id, NULL, 0, &required )) + goto done; + + if (!(bufferW = HeapAlloc( GetProcessHeap(), 0, required * sizeof(WCHAR) ))) + goto done; + + if (!SetupGetSourceFileLocationW( hinf, context, filenameW, source_id, bufferW, required, NULL )) + goto done; + + size = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); + if (required_size) *required_size = size; + + if (buffer) + { + if (buffer_size >= size) + WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, buffer_size, NULL, NULL ); + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + goto done; + } + } + ret = TRUE; + + done: + HeapFree( GetProcessHeap(), 0, filenameW ); + HeapFree( GetProcessHeap(), 0, bufferW ); + return ret; +} + +static LPWSTR get_source_id( HINF hinf, PINFCONTEXT context, PCWSTR filename ) +{ + DWORD size; + LPWSTR source_id; + + if (!SetupFindFirstLineW( hinf, source_disks_files_platform, filename, context ) && + !SetupFindFirstLineW( hinf, source_disks_files, filename, context )) + return NULL; + + if (!SetupGetStringFieldW( context, 1, NULL, 0, &size )) + return NULL; + + if (!(source_id = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) + return NULL; + + if (!SetupGetStringFieldW( context, 1, source_id, size, NULL )) + { + HeapFree( GetProcessHeap(), 0, source_id ); + return NULL; + } + + if (!SetupFindFirstLineW( hinf, source_disks_names_platform, source_id, context ) && + !SetupFindFirstLineW( hinf, source_disks_names, source_id, context )) + { + HeapFree( GetProcessHeap(), 0, source_id ); + return NULL; + } + return source_id; +} + +/*********************************************************************** + * SetupGetSourceFileLocationW (SETUPAPI.@) + */ + +BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR filename, + PUINT source_id, PWSTR buffer, DWORD buffer_size, + PDWORD required_size ) +{ + INFCONTEXT ctx; + WCHAR *end, *source_id_str; + + TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_w(filename), source_id, + buffer, buffer_size, required_size); + + if (!context) context = &ctx; + + if (!(source_id_str = get_source_id( hinf, context, filename ))) + return FALSE; + + *source_id = strtolW( source_id_str, &end, 10 ); + if (end == source_id_str || *end) + { + HeapFree( GetProcessHeap(), 0, source_id_str ); + return FALSE; + } + HeapFree( GetProcessHeap(), 0, source_id_str ); + + if (SetupGetStringFieldW( context, 4, buffer, buffer_size, required_size )) + return TRUE; + + if (required_size) *required_size = 1; + if (buffer) + { + if (buffer_size >= 1) buffer[0] = 0; + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + } + return TRUE; +} diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 3ddb552..26522e6 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -84,19 +84,6 @@ inline static WCHAR *strdupW( const WCHA return ret; } - -inline static WCHAR *strdupAtoW( const char *str ) -{ - WCHAR *ret = NULL; - if (str) - { - DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); - } - return ret; -} - inline static char *strdupWtoA( const WCHAR *str ) { char *ret = NULL; diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index d0a6d22..4ea80f5 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -413,8 +413,8 @@ # Yes, Microsoft really misspelled this @ stdcall SetupGetLineTextW(ptr long wstr wstr ptr long ptr) @ stdcall SetupGetMultiSzFieldA(ptr long ptr long ptr) @ stdcall SetupGetMultiSzFieldW(ptr long ptr long ptr) -@ stub SetupGetSourceFileLocationA -@ stub SetupGetSourceFileLocationW +@ stdcall SetupGetSourceFileLocationA(ptr ptr str ptr ptr long ptr) +@ stdcall SetupGetSourceFileLocationW(ptr ptr wstr ptr ptr long ptr) @ stub SetupGetSourceFileSizeA @ stub SetupGetSourceFileSizeW @ stdcall SetupGetSourceInfoA(ptr long long str long ptr) diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index bce05cb..ed9a7bf 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -29,6 +29,18 @@ #define REG_INSTALLEDFILES "System\\Curr #define REGPART_RENAME "\\Rename" #define REG_VERSIONCONFLICT "Software\\Microsoft\\VersionConflictManager" +inline static WCHAR *strdupAtoW( const char *str ) +{ + WCHAR *ret = NULL; + if (str) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); + } + return ret; +} + /* string substitutions */ struct inf_file; diff --git a/include/setupapi.h b/include/setupapi.h index 231b30a..f74bd5b 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -814,6 +814,9 @@ #define SetupGetLineText WINELIB BOOL WINAPI SetupGetMultiSzFieldA( PINFCONTEXT context, DWORD index, PSTR buffer, DWORD size, LPDWORD required ); BOOL WINAPI SetupGetMultiSzFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer, DWORD size, LPDWORD required ); #define SetupGetMultiSzField WINELIB_NAME_AW(SetupGetMultiSzField) +BOOL WINAPI SetupGetSourceFileLocationA( HINF hinf, PINFCONTEXT context, PCSTR filename, PUINT source_id, PSTR buffer, DWORD buffer_size, PDWORD required_size ); +BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR filename, PUINT source_id, PWSTR buffer, DWORD buffer_size, PDWORD required_size ); +#define SetupGetSourceFileLocation WINELIB_NAME_AW(SetupGetSourceFileLocation) BOOL WINAPI SetupGetStringFieldA( PINFCONTEXT context, DWORD index, PSTR buffer, DWORD size, PDWORD required ); BOOL WINAPI SetupGetStringFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer, DWORD size, PDWORD required ); #define SetupGetStringField WINELIB_NAME_AW(SetupGetStringField)

1 0

Andrew Talbot : rsaenh: Cast-qual warning fix.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: 5319668a30481ede52356cdcc1b09a5535132eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5319668a30481ede52356cdcc… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Nov 13 19:19:11 2006 +0000 rsaenh: Cast-qual warning fix. --- dlls/rsaenh/implglue.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 30f3cb6..32268a1 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -42,7 +42,7 @@ VOID WINAPI MD5Update( MD5_CTX *ctx, con VOID WINAPI MD5Final( MD5_CTX *ctx ); /* Function prototypes copied from dlls/advapi32/crypt_sha.c */ VOID WINAPI A_SHAInit(PSHA_CTX Context); -VOID WINAPI A_SHAUpdate(PSHA_CTX Context, PCHAR Buffer, UINT BufferSize); +VOID WINAPI A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, UINT BufferSize); VOID WINAPI A_SHAFinal(PSHA_CTX Context, PULONG Result); /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); @@ -89,7 +89,7 @@ BOOL update_hash_impl(ALG_ID aiAlgid, HA break; case CALG_SHA: - A_SHAUpdate(&pHashContext->sha, (PCHAR)pbData, dwDataLen); + A_SHAUpdate(&pHashContext->sha, pbData, dwDataLen); break; default:

1 0

Andrew Talbot : secur32: Cast-qual warning fix.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: fde63f974275d9b6ad6aa43bef5d4bca5f5a03ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde63f974275d9b6ad6aa43be… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Nov 13 20:27:35 2006 +0000 secur32: Cast-qual warning fix. --- dlls/secur32/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/util.c b/dlls/secur32/util.c index 7a43de7..ed39336 100644 --- a/dlls/secur32/util.c +++ b/dlls/secur32/util.c @@ -151,7 +151,7 @@ void SECUR32_CalcNTLMv2Subkey(PBYTE sess MD5Init(&ctx); MD5Update(&ctx, session_key, 16); - MD5Update(&ctx, (unsigned char*)magic, lstrlenA(magic)+1); + MD5Update(&ctx, (const unsigned char*)magic, lstrlenA(magic)+1); MD5Final(&ctx); memcpy(subkey, ctx.digest, 16); }

1 0

Alexandre Julliard : winex11.drv: Update the X11 window position when the primary monitor origin changes.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: 00e097b6e332990289d272c934cc9d7c060d5a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e097b6e332990289d272c93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 14 10:40:49 2006 +0100 winex11.drv: Update the X11 window position when the primary monitor origin changes. --- dlls/winex11.drv/winpos.c | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index b3e70f5..552622e 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -1224,17 +1224,36 @@ void X11DRV_UnmapNotify( HWND hwnd, XEve else WIN_ReleasePtr( win ); } +struct desktop_resize_data +{ + RECT old_screen_rect; + RECT old_virtual_rect; +}; -static BOOL CALLBACK update_windows_fullscreen_state( HWND hwnd, LPARAM lparam ) +static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam ) { struct x11drv_win_data *data; Display *display = thread_display(); - RECT *old_screen_rect = (RECT *)lparam; + struct desktop_resize_data *resize_data = (struct desktop_resize_data *)lparam; + int mask = 0; + + if (!(data = X11DRV_get_win_data( hwnd ))) return TRUE; + + if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE) + update_fullscreen_state( display, data, &data->client_rect, &resize_data->old_screen_rect ); - if ((data = X11DRV_get_win_data( hwnd )) && - (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) + if (resize_data->old_virtual_rect.left != virtual_screen_rect.left) mask |= CWX; + if (resize_data->old_virtual_rect.top != virtual_screen_rect.top) mask |= CWY; + if (mask && data->whole_window) { - update_fullscreen_state( display, data, &data->client_rect, old_screen_rect ); + XWindowChanges changes; + + wine_tsx11_lock(); + changes.x = data->whole_rect.left - virtual_screen_rect.left; + changes.y = data->whole_rect.top - virtual_screen_rect.top; + XReconfigureWMWindow( display, data->whole_window, + DefaultScreen(display), mask, &changes ); + wine_tsx11_unlock(); } return TRUE; } @@ -1245,15 +1264,14 @@ static BOOL CALLBACK update_windows_full */ void X11DRV_handle_desktop_resize( unsigned int width, unsigned int height ) { - unsigned int old_screen_width, old_screen_height; - RECT rect; HWND hwnd = GetDesktopWindow(); struct x11drv_win_data *data; + struct desktop_resize_data resize_data; if (!(data = X11DRV_get_win_data( hwnd ))) return; - old_screen_width = screen_width; - old_screen_height = screen_height; + SetRect( &resize_data.old_screen_rect, 0, 0, screen_width, screen_height ); + resize_data.old_virtual_rect = virtual_screen_rect; screen_width = width; screen_height = height; @@ -1266,8 +1284,7 @@ void X11DRV_handle_desktop_resize( unsig SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_depth, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); - SetRect( &rect, 0, 0, old_screen_width, old_screen_height ); - EnumWindows( update_windows_fullscreen_state, (LPARAM)&rect ); + EnumWindows( update_windows_on_desktop_resize, (LPARAM)&resize_data ); }

1 0

Rob Shearman : include: Add wincred.h header file.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 0ca78828c36b1bf37fb8dd2f8ae112ec5c49946a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca78828c36b1bf37fb8dd2f8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 13 14:37:57 2006 +0000 include: Add wincred.h header file. --- include/Makefile.in | 1 + include/wincred.h | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 2e2ddee..c55919b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -289,6 +289,7 @@ WINDOWS_INCLUDES = \ vfwmsgs.h \ winbase.h \ wincon.h \ + wincred.h \ wincrypt.h \ windef.h \ windns.h \ diff --git a/include/wincred.h b/include/wincred.h new file mode 100644 index 0000000..f66af02 --- /dev/null +++ b/include/wincred.h @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2006 Robert Shearman (for CodeWeavers) + * + * 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 _WINCRED_H_ +#define _WINCRED_H_ + +#ifndef __SECHANDLE_DEFINED__ +#define __SECHANDLE_DEFINED__ +typedef struct _SecHandle +{ + ULONG_PTR dwLower; + ULONG_PTR dwUpper; +} SecHandle, *PSecHandle; +#endif + +typedef SecHandle CtxtHandle; +typedef PSecHandle PCtxtHandle; + +typedef struct _CREDUI_INFOA +{ + DWORD cbSize; + HWND hwndParent; + PCSTR pszMessageText; + PCSTR pszCaptionText; + HBITMAP hbmBanner; +} CREDUI_INFOA, *PCREDUI_INFOA; + +typedef struct _CREDUI_INFOW +{ + DWORD cbSize; + HWND hwndParent; + PCWSTR pszMessageText; + PCWSTR pszCaptionText; + HBITMAP hbmBanner; +} CREDUI_INFOW, *PCREDUI_INFOW; + +#define CRED_MAX_STRING_LENGTH 256 +#define CRED_MAX_USERNAME_LENGTH 513 +#define CRED_MAX_GENERIC_TARGET_NAME_LENGTH 32767 +#define CRED_MAX_DOMAIN_TARGET_NAME_LENGTH 337 +#define CRED_MAX_VALUE_SIZE 256 +#define CRED_MAX_ATTRIBUTES 64 + +#define CRED_MAX_BLOB_SIZE 512 + +#define CREDUI_MAX_MESSAGE_LENGTH 32767 +#define CREDUI_MAX_CAPTION_LENGTH 128 +#define CREDUI_MAX_GENERIC_TARGET_LENGTH CRED_MAX_GENERIC_TARGET_NAME_LENGTH +#define CREDUI_MAX_DOMAIN_TARGET_LENGTH CRED_MAX_DOMAIN_TARGET_LENGTH +#define CREDUI_MAX_USERNAME_LENGTH CRED_MAX_USERNAME_LENGTH +#define CREDUI_MAX_PASSWORD_LENGTH (CRED_MAX_CREDENTIAL_BLOB_SIZE / 2) + +#define CREDUI_FLAGS_INCORRECT_PASSWORD 0x00000001 +#define CREDUI_FLAGS_DO_NOT_PERSIST 0x00000002 +#define CREDUI_FLAGS_REQUEST_ADMINISTRATOR 0x00000004 +#define CREDUI_FLAGS_EXCLUDE_CERTIFICATES 0x00000008 +#define CREDUI_FLAGS_REQUIRE_CERTIFICATE 0x00000010 +#define CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX 0x00000040 +#define CREDUI_FLAGS_ALWAYS_SHOW_UI 0x00000080 +#define CREDUI_FLAGS_REQUIRE_SMARTCARD 0x00000100 +#define CREDUI_FLAGS_PASSWORD_ONLY_OK 0x00000200 +#define CREDUI_FLAGS_VALIDATE_USERNAME 0x00000400 +#define CREDUI_FLAGS_COMPLETE_USERNAME 0x00000800 +#define CREDUI_FLAGS_PERSIST 0x00001000 +#define CREDUI_FLAGS_SERVER_CREDENTIAL 0x00004000 +#define CREDUI_FLAGS_EXPECT_CONFIRMATION 0x00020000 +#define CREDUI_FLAGS_GENERIC_CREDENTIALS 0x00040000 +#define CREDUI_FLAGS_USERNAME_TARGET_CREDENTIALS 0x00080000 +#define CREDUI_FLAGS_KEEP_USERNAME 0x00100000 + +DWORD WINAPI CredUICmdLinePromptForCredentialsW(PCWSTR,PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,BOOL*,DWORD); +DWORD WINAPI CredUICmdLinePromptForCredentialsA(PCSTR,PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,BOOL*,DWORD); +#define CredUICmdLinePromptForCredentials WINELIB_NAME_AW(CredUICmdLinePromptForCredentials) +DWORD WINAPI CredUIConfirmCredentialsW(PCWSTR,BOOL); +DWORD WINAPI CredUIConfirmCredentialsA(PCSTR,BOOL); +#define CredUIConfirmCredentials WINELIB_NAME_AW(CredUIConfirmCredentials) +DWORD WINAPI CredUIParseUserNameW(PCWSTR,PWSTR,ULONG,PWSTR,ULONG); +DWORD WINAPI CredUIParseUserNameA(PCSTR,PSTR,ULONG,PSTR,ULONG); +#define CredUIParseUserName WINELIB_NAME_AW(CredUIParseUserName) +DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW,PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,BOOL*,DWORD); +DWORD WINAPI CredUIPromptForCredentialsA(PCREDUI_INFOA,PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,BOOL*,DWORD); +#define CredUIPromptForCredentials WINELIB_NAME_AW(CredUIPromptForCredentials) +DWORD WINAPI CredUIStoreSSOCredW(PCWSTR,PCWSTR,PCWSTR,BOOL); +/* Note: no CredUIStoreSSOCredA in PSDK header */ +DWORD WINAPI CredUIReadSSOCredW(PCWSTR,PWSTR*); +/* Note: no CredUIReadSSOCredA in PSDK header */ + +#endif /* _WINCRED_H_ */

1 0

Rob Shearman : include: Fix a typo in the SecInvalidateHandle macro in sspi .h.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: d5da94011e9fab44752b9a03f27e29d92672353b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5da94011e9fab44752b9a03f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 13 13:29:06 2006 +0000 include: Fix a typo in the SecInvalidateHandle macro in sspi.h. --- include/sspi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/sspi.h b/include/sspi.h index 1a4ce52..459de14 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -54,7 +54,7 @@ #endif #define SecInvalidateHandle(x) do { \ ((PSecHandle)(x))->dwLower = ((ULONG_PTR)((INT_PTR)-1)); \ ((PSecHandle)(x))->dwUpper = ((ULONG_PTR)((INT_PTR)-1)); \ - while (0) + } while (0) #define SecIsValidHandle(x) \ ((((PSecHandle)(x))->dwLower != ((ULONG_PTR)(INT_PTR)-1)) && \

1 0

Alexandre Julliard : ntdll: Added support for reading directories using the BSD getdirentries function .
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: a9f214cb0d99335378688fbaf6f8894ab050fb37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f214cb0d99335378688fbaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 13 15:42:48 2006 +0100 ntdll: Added support for reading directories using the BSD getdirentries function. --- configure | 2 + configure.ac | 1 + dlls/ntdll/directory.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++-- include/config.h.in | 3 + 4 files changed, 116 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 54e689e..64e16d1 100755 --- a/configure +++ b/configure @@ -18185,6 +18185,7 @@ fi + for ac_func in \ _pclose \ _popen \ @@ -18209,6 +18210,7 @@ for ac_func in \ futimes \ futimesat \ getaddrinfo \ + getdirentries \ gethostbyname \ getnameinfo \ getnetbyname \ diff --git a/configure.ac b/configure.ac index 958a6c8..37cc2ae 100644 --- a/configure.ac +++ b/configure.ac @@ -1200,6 +1200,7 @@ AC_CHECK_FUNCS(\ futimes \ futimesat \ getaddrinfo \ + getdirentries \ gethostbyname \ getnameinfo \ getnetbyname \ diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index d2c0d16..042daef 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -135,6 +135,8 @@ #define INVALID_DOS_CHARS INVALID_NT_CH #define MAX_DIR_ENTRY_LEN 255 /* max length of a directory entry in chars */ +static const unsigned int max_dir_info_size = FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName[MAX_DIR_ENTRY_LEN] ); + static int show_dot_files = -1; /* at some point we may want to allow Winelib apps to set this */ @@ -971,7 +973,6 @@ static int read_directory_vfat( int fd, size_t len; KERNEL_DIRENT *de; FILE_BOTH_DIR_INFORMATION *info, *last_info = NULL; - static const unsigned int max_dir_info_size = sizeof(*info) + (MAX_DIR_ENTRY_LEN-1) * sizeof(WCHAR); io->u.Status = STATUS_SUCCESS; @@ -1063,7 +1064,6 @@ static int read_directory_getdents( int char local_buffer[8192]; KERNEL_DIRENT64 *data, *de; FILE_BOTH_DIR_INFORMATION *info, *last_info = NULL; - static const unsigned int max_dir_info_size = sizeof(*info) + (MAX_DIR_ENTRY_LEN-1) * sizeof(WCHAR); if (size <= sizeof(local_buffer) || !(data = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { @@ -1135,7 +1135,111 @@ done: if ((char *)data != local_buffer) RtlFreeHeap( GetProcessHeap(), 0, data ); return res; } -#endif /* USE_GETDENTS */ + +#elif defined HAVE_GETDIRENTRIES + +/*********************************************************************** + * read_directory_getdirentries + * + * Read a directory using the BSD getdirentries system call; helper for NtQueryDirectoryFile. + */ +static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG length, + BOOLEAN single_entry, const UNICODE_STRING *mask, + BOOLEAN restart_scan ) +{ + long restart_pos; + ULONG_PTR restart_info_pos = 0; + size_t size, initial_size = length; + int res; + char *data, local_buffer[8192]; + struct dirent *de; + FILE_BOTH_DIR_INFORMATION *info, *last_info = NULL, *restart_last_info = NULL; + + size = initial_size; + data = local_buffer; + if (size > sizeof(local_buffer) && !(data = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + { + io->u.Status = STATUS_NO_MEMORY; + return io->u.Status; + } + + if (restart_scan) lseek( fd, 0, SEEK_SET ); + + io->u.Status = STATUS_SUCCESS; + + /* FIXME: should make sure size is larger than filesystem block size */ + res = getdirentries( fd, data, size, &restart_pos ); + if (res == -1) + { + io->u.Status = FILE_GetNtStatus(); + res = 0; + goto done; + } + + de = (struct dirent *)data; + + while (res > 0) + { + res -= de->d_reclen; + if (de->d_fileno && + ((info = append_entry( buffer, &io->Information, length, de->d_name, NULL, mask )))) + { + last_info = info; + if ((char *)info->FileName + info->FileNameLength > (char *)buffer + length) + { + lseek( fd, (unsigned long)restart_pos, SEEK_SET ); + if (restart_info_pos) /* if we have a complete read already, return it */ + { + io->Information = restart_info_pos; + last_info = restart_last_info; + break; + } + /* otherwise restart from the start with a smaller size */ + size = (char *)de - data; + if (!size) + { + io->u.Status = STATUS_BUFFER_OVERFLOW; + break; + } + io->Information = 0; + last_info = NULL; + goto restart; + } + /* if we have to return but the buffer contains more data, restart with a smaller size */ + if (res > 0 && (single_entry || io->Information + max_dir_info_size > length)) + { + lseek( fd, (unsigned long)restart_pos, SEEK_SET ); + size = (char *)de - data; + io->Information = restart_info_pos; + last_info = restart_last_info; + goto restart; + } + } + /* move on to the next entry */ + if (res > 0) + { + de = (struct dirent *)((char *)de + de->d_reclen); + continue; + } + if (size < initial_size) break; /* already restarted once, give up now */ + size = min( size, length - io->Information ); + /* if size is too small don't bother to continue */ + if (size < max_dir_info_size && last_info) break; + restart_last_info = last_info; + restart_info_pos = io->Information; + restart: + res = getdirentries( fd, data, size, &restart_pos ); + de = (struct dirent *)data; + } + + if (last_info) last_info->NextEntryOffset = 0; + else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; + res = 0; +done: + if (data != local_buffer) RtlFreeHeap( GetProcessHeap(), 0, data ); + return res; +} +#endif /* HAVE_GETDIRENTRIES */ /*********************************************************************** @@ -1151,7 +1255,6 @@ static void read_directory_readdir( int off_t i, old_pos = 0; struct dirent *de; FILE_BOTH_DIR_INFORMATION *info, *last_info = NULL; - static const unsigned int max_dir_info_size = sizeof(*info) + (MAX_DIR_ENTRY_LEN-1) * sizeof(WCHAR); if (!(dir = opendir( "." ))) { @@ -1326,6 +1429,9 @@ #endif #ifdef USE_GETDENTS if ((read_directory_getdents( fd, io, buffer, length, single_entry, mask, restart_scan )) != -1) goto done; +#elif defined HAVE_GETDIRENTRIES + if ((read_directory_getdirentries( fd, io, buffer, length, single_entry, mask, restart_scan )) != -1) + goto done; #endif read_directory_readdir( fd, io, buffer, length, single_entry, mask, restart_scan ); diff --git a/include/config.h.in b/include/config.h.in index f26735d..69a0af9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -180,6 +180,9 @@ #undef HAVE_FUTIMESAT /* Define to 1 if you have the `getaddrinfo' function. */ #undef HAVE_GETADDRINFO +/* Define to 1 if you have the `getdirentries' function. */ +#undef HAVE_GETDIRENTRIES + /* Define to 1 if you have the `gethostbyname' function. */ #undef HAVE_GETHOSTBYNAME

1 0

Paul Vriens : comctl32: Remove deadcode (Coverity).
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: d4796304ad9ea2844990166599aa53ce24ea0614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4796304ad9ea284499016659… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Nov 11 19:28:18 2006 +0100 comctl32: Remove deadcode (Coverity). --- dlls/comctl32/imagelist.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 36fe384..e9970e0 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1980,7 +1980,7 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE { ILHEAD ilHead; HIMAGELIST himl; - HBITMAP hbmColor=0,hbmMask=0; + HBITMAP hbmColor=0; int i; TRACE("%p\n", pstm); @@ -1995,7 +1995,6 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); if (!himl) { DeleteObject(hbmColor); - DeleteObject(hbmMask); return NULL; } if (!_read_bitmap(himl, himl->hdcImage, pstm, ilHead.flags & ~ILC_MASK)) { @@ -2012,11 +2011,6 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE SelectObject(himl->hdcImage, hbmColor); DeleteObject(himl->hbmImage); himl->hbmImage = hbmColor; - if (hbmMask){ - SelectObject(himl->hdcMask, hbmMask); - DeleteObject(himl->hbmMask); - himl->hbmMask = hbmMask; - } himl->cCurImage = ilHead.cCurImage; himl->cMaxImage = ilHead.cMaxImage;

1 0

Andrey Turkin : atl: Implement AtlModuleRegisterServer.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 131d9964b7a5be574177ca9393d00240575840a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=131d9964b7a5be574177ca939… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Sat Nov 11 00:08:11 2006 +0300 atl: Implement AtlModuleRegisterServer. --- dlls/atl/atl_main.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 7195f13..c64ef46 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -257,7 +257,34 @@ HRESULT WINAPI AtlInternalQueryInterface */ HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const CLSID* clsid) { - FIXME("%p %d %s\n", pM, bRegTypeLib, debugstr_guid(clsid)); + int i; + HRESULT hRes; + + TRACE("%p %d %s\n", pM, bRegTypeLib, debugstr_guid(clsid)); + + if (pM == NULL) + return E_INVALIDARG; + + for (i = 0; pM->m_pObjMap[i].pclsid != NULL; i++) /* register CLSIDs */ + { + if (!clsid || IsEqualCLSID(pM->m_pObjMap[i].pclsid, clsid)) + { + const _ATL_OBJMAP_ENTRYW *obj = &pM->m_pObjMap[i]; + + TRACE("Registering clsid %s\n", debugstr_guid(obj->pclsid)); + hRes = obj->pfnUpdateRegistry(TRUE); /* register */ + if (FAILED(hRes)) + return hRes; + } + } + + if (bRegTypeLib) + { + hRes = AtlModuleRegisterTypeLib(pM, NULL); + if (FAILED(hRes)) + return hRes; + } + return S_OK; }

1 0

Andrey Turkin : atl: Implement AtlRegisterLoadTypeLib.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: da7bdf745f7a9973feff9d0aa9dd9fd3acbcc406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7bdf745f7a9973feff9d0aa… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Sat Nov 11 00:07:29 2006 +0300 atl: Implement AtlRegisterLoadTypeLib. --- dlls/atl/atl_main.c | 21 +++++++++++++++++++-- dlls/atl/atlbase.h | 1 + 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 1fac5b1..7195f13 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -341,8 +341,25 @@ HRESULT WINAPI AtlModuleGetClassObject(_ */ HRESULT WINAPI AtlModuleRegisterTypeLib(_ATL_MODULEW *pm, LPCOLESTR lpszIndex) { - FIXME("%p %s\n", pm, debugstr_w(lpszIndex)); - return E_FAIL; + HRESULT hRes; + BSTR path; + ITypeLib *typelib; + + TRACE("%p %s\n", pm, debugstr_w(lpszIndex)); + + if (!pm) + return E_INVALIDARG; + + hRes = AtlModuleLoadTypeLib(pm, lpszIndex, &path, &typelib); + + if (SUCCEEDED(hRes)) + { + hRes = RegisterTypeLib(typelib, path, NULL); /* FIXME: pass help directory */ + ITypeLib_Release(typelib); + SysFreeString(path); + } + + return hRes; } /*********************************************************************** diff --git a/dlls/atl/atlbase.h b/dlls/atl/atlbase.h index 809a89f..0aec2e9 100644 --- a/dlls/atl/atlbase.h +++ b/dlls/atl/atlbase.h @@ -154,6 +154,7 @@ LPVOID WINAPI AtlModuleExtractCreateWnd HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW* pM, DWORD dwClsContext, DWORD dwFlags); HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const CLSID* pCLSID); +HRESULT WINAPI AtlModuleRegisterTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex); HRESULT WINAPI AtlModuleUnregisterServer(_ATL_MODULEW* pM, const CLSID* pCLSID); HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW *pM, LPCOLESTR lpszRes, BOOL bRegister, struct _ATL_REGMAP_ENTRY *pMapEntries, IRegistrar *pReg ); HRESULT WINAPI AtlModuleUnregisterServerEx(_ATL_MODULEW* pM, BOOL bUnRegTypeLib, const CLSID* pCLSID);

1 0