December 2009 - Wine-commits

Hans Leidekker : msi: Fix download of installer packages. Return errors from msi_download_file and copy_package_to_temp.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: ff2aa7e3a69bb77a0e86922db5e84ebe6ffa99d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2aa7e3a69bb77a0e86922db… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 17 12:28:49 2009 +0100 msi: Fix download of installer packages. Return errors from msi_download_file and copy_package_to_temp. --- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 48 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 206227e..ac247ac 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -757,7 +757,7 @@ extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR ); extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ); -extern LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ); +extern UINT msi_download_file( LPCWSTR szUrl, LPWSTR filename ); extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR); extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR); extern UINT msi_clone_properties(MSIPACKAGE *); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 574289f..fa84e9d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -833,7 +833,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) * we should read all the tables to memory, then open the * database to read binary streams on demand. */ -static LPCWSTR copy_package_to_temp( LPCWSTR szPackage, LPWSTR filename ) +static UINT copy_package_to_temp( LPCWSTR szPackage, LPWSTR filename ) { WCHAR path[MAX_PATH]; @@ -842,16 +842,16 @@ static LPCWSTR copy_package_to_temp( LPCWSTR szPackage, LPWSTR filename ) if( !CopyFileW( szPackage, filename, FALSE ) ) { + UINT error = GetLastError(); + ERR("failed to copy package %s to %s (%u)\n", debugstr_w(szPackage), debugstr_w(filename), error); DeleteFileW( filename ); - ERR("failed to copy package %s\n", debugstr_w(szPackage) ); - return szPackage; + return error; } - TRACE("Opening relocated package %s\n", debugstr_w( filename )); - return filename; + return ERROR_SUCCESS; } -LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ) +UINT msi_download_file( LPCWSTR szUrl, LPWSTR filename ) { LPINTERNET_CACHE_ENTRY_INFOW cache_entry; DWORD size = 0; @@ -867,20 +867,24 @@ LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ) cache_entry = HeapAlloc( GetProcessHeap(), 0, size ); if ( !GetUrlCacheEntryInfoW( szUrl, cache_entry, &size ) ) { + UINT error = GetLastError(); HeapFree( GetProcessHeap(), 0, cache_entry ); - return szUrl; + return error; } lstrcpyW( filename, cache_entry->lpszLocalFileName ); HeapFree( GetProcessHeap(), 0, cache_entry ); - return filename; + return ERROR_SUCCESS; } hr = URLDownloadToCacheFileW( NULL, szUrl, filename, MAX_PATH, 0, NULL ); if ( FAILED(hr) ) - return szUrl; + { + WARN("failed to download %s to cache file\n", debugstr_w(szUrl)); + return ERROR_FUNCTION_FAILED; + } - return filename; + return ERROR_SUCCESS; } static UINT msi_get_local_package_name( LPWSTR path ) @@ -925,7 +929,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) MSIHANDLE handle; LPWSTR ptr, base_url = NULL; UINT r; - WCHAR temppath[MAX_PATH], localfile[MAX_PATH]; + WCHAR temppath[MAX_PATH], localfile[MAX_PATH], cachefile[MAX_PATH]; LPCWSTR file = szPackage; TRACE("%s %p\n", debugstr_w(szPackage), pPackage); @@ -952,9 +956,15 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { if ( UrlIsW( szPackage, URLIS_URL ) ) { - file = msi_download_file( szPackage, temppath ); - if ( file != szPackage ) - file = copy_package_to_temp( file, temppath ); + r = msi_download_file( szPackage, cachefile ); + if ( r != ERROR_SUCCESS ) + return r; + + r = copy_package_to_temp( cachefile, temppath ); + if ( r != ERROR_SUCCESS ) + return r; + + file = temppath; base_url = strdupW( szPackage ); if ( !base_url ) @@ -964,7 +974,13 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) if (ptr) *(ptr + 1) = '\0'; } else - file = copy_package_to_temp( szPackage, temppath ); + { + r = copy_package_to_temp( szPackage, temppath ); + if ( r != ERROR_SUCCESS ) + return r; + + file = temppath; + } r = msi_get_local_package_name( localfile ); if (r != ERROR_SUCCESS) @@ -979,6 +995,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return GetLastError(); } + TRACE("Opening relocated package %s\n", debugstr_w( file )); + /* transforms that add binary streams require that we open the database * read/write, which is safe because we always create a copy that is thrown * away when we're done.

1 0

Hans Leidekker : msi: Reset the ALLUSERS property from to 2 to 1.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 178ebae4c01c6aed896138d4a0c174c489814f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=178ebae4c01c6aed896138d4a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 17 12:29:41 2009 +0100 msi: Reset the ALLUSERS property from to 2 to 1. --- dlls/msi/package.c | 12 +++ dlls/msi/tests/install.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=178ebae4c01c6aed89613…

1 0

Alexandre Julliard : user32: Move 16-bit instance normalization to CreateWindowEx16.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: aabe5f150f834fbf230787c7e228f4b68c39ee32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aabe5f150f834fbf230787c7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 14:36:26 2009 +0100 user32: Move 16-bit instance normalization to CreateWindowEx16. --- dlls/user32/win.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index dbb8ef2..51cc743 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -187,10 +187,6 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, struct tagCLASS *class = NULL; int extra_bytes = 0; - /* if 16-bit instance, map to module handle */ - if (instance && !HIWORD(instance)) - instance = HINSTANCE_32(GetExePtr(HINSTANCE_16(instance))); - SERVER_START_REQ( create_window ) { req->parent = wine_server_user_handle( parent ); @@ -1076,7 +1072,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) * * Implementation of CreateWindowEx(). */ -static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, LPCWSTR className, UINT flags ) +static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, LPCWSTR className, HINSTANCE module, UINT flags ) { INT cx, cy, style, sw = SW_SHOW; LRESULT result; @@ -1206,7 +1202,7 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, LPCWSTR className, UINT flags /* Create the window structure */ - if (!(wndPtr = create_window_handle( parent, owner, className, cs->hInstance, unicode ))) + if (!(wndPtr = create_window_handle( parent, owner, className, module, unicode ))) return 0; hwnd = wndPtr->obj.handle; @@ -1490,13 +1486,16 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className, cs.lpszClass = className; cs.dwExStyle = exStyle; + /* map to module handle */ + if (instance) instance = GetExePtr( instance ); + if (!IS_INTRESOURCE(className)) { WCHAR bufferW[256]; if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) return 0; - return HWND_16( WIN_CreateWindowEx( &cs, bufferW, 0 )); + return HWND_16( WIN_CreateWindowEx( &cs, bufferW, HINSTANCE_32(instance), 0 )); } else { @@ -1506,7 +1505,7 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className, return 0; } cs.lpszClass = buffer; - return HWND_16( WIN_CreateWindowEx( &cs, (LPCWSTR)className, 0 )); + return HWND_16( WIN_CreateWindowEx( &cs, (LPCWSTR)className, HINSTANCE_32(instance), 0 )); } } @@ -1540,9 +1539,9 @@ HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className, WCHAR bufferW[256]; if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) return 0; - return WIN_CreateWindowEx( &cs, bufferW, WIN_ISWIN32 ); + return WIN_CreateWindowEx( &cs, bufferW, instance, WIN_ISWIN32 ); } - return WIN_CreateWindowEx( &cs, (LPCWSTR)className, WIN_ISWIN32 ); + return WIN_CreateWindowEx( &cs, (LPCWSTR)className, instance, WIN_ISWIN32 ); } @@ -1572,7 +1571,7 @@ HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className, /* Note: we rely on the fact that CREATESTRUCTA and */ /* CREATESTRUCTW have the same layout. */ - return WIN_CreateWindowEx( (CREATESTRUCTA *)&cs, className, WIN_ISWIN32 | WIN_ISUNICODE ); + return WIN_CreateWindowEx( (CREATESTRUCTA *)&cs, className, instance, WIN_ISWIN32 | WIN_ISUNICODE ); }

1 0

Owen Rudge : winemapi: Add Simple MAPI functions.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 44784356cc63630abbc063b48127ba1b99a87c1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=44784356cc63630abbc063b48… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Dec 16 11:22:34 2009 -0600 winemapi: Add Simple MAPI functions. --- dlls/winemapi/Makefile.in | 3 +- dlls/winemapi/main.c | 72 +++++++++++++++++++++++++++++++++++++++++++ dlls/winemapi/sendmail.c | 71 ++++++++++++++++++++++++++++++++++++++++++ dlls/winemapi/winemapi.spec | 22 ++++++------ 4 files changed, 156 insertions(+), 12 deletions(-) diff --git a/dlls/winemapi/Makefile.in b/dlls/winemapi/Makefile.in index 6a4ec21..7cde1ff 100644 --- a/dlls/winemapi/Makefile.in +++ b/dlls/winemapi/Makefile.in @@ -6,7 +6,8 @@ MODULE = winemapi.dll IMPORTS = shlwapi shell32 kernel32 C_SRCS = \ - main.c + main.c \ + sendmail.c @MAKE_DLL_RULES@ diff --git a/dlls/winemapi/main.c b/dlls/winemapi/main.c index e4d4e55..5b6faef 100644 --- a/dlls/winemapi/main.c +++ b/dlls/winemapi/main.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winerror.h" #include "objbase.h" +#include "mapidefs.h" #include "mapi.h" #include "wine/debug.h" @@ -37,3 +38,74 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) TRACE("(%p,%d,%p)\n", hinstDLL, fdwReason, fImpLoad); return TRUE; } + +ULONG WINAPI MAPIAddress(LHANDLE session, ULONG_PTR uiparam, LPSTR caption, + ULONG editfields, LPSTR labels, ULONG nRecips, lpMapiRecipDesc lpRecips, + FLAGS flags, ULONG reserved, LPULONG newRecips, lpMapiRecipDesc * lppNewRecips) +{ + FIXME("(stub)"); + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPIDeleteMail(LHANDLE session, ULONG_PTR uiparam, LPSTR msg_id, + FLAGS flags, ULONG reserved) +{ + FIXME("(stub)"); + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPIDetails(LHANDLE session, ULONG_PTR uiparam, lpMapiRecipDesc recip, + FLAGS flags, ULONG reserved) +{ + FIXME("(stub)"); + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPIFindNext(LHANDLE session, ULONG_PTR uiparam, LPSTR msg_type, + LPSTR seed_msg_id, FLAGS flags, ULONG reserved, LPSTR msg_id) +{ + FIXME("(stub)"); + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, + FLAGS flags, ULONG reserved, LPLHANDLE session) +{ + TRACE("(0x%08lx %s %p 0x%08x 0x%08x %p)\n", uiparam, + debugstr_a(profile), password, flags, reserved, session); + + if (session) + *session = 1; + + return SUCCESS_SUCCESS; +} + +ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, + ULONG reserved) +{ + TRACE("(0x%08lx 0x%08lx 0x%08x 0x%08x)\n", session, + uiparam, flags, reserved); + + return SUCCESS_SUCCESS; +} + +ULONG WINAPI MAPIReadMail(LHANDLE session, ULONG_PTR uiparam, LPSTR msg_id, + FLAGS flags, ULONG reserved, lpMapiMessage msg) +{ + FIXME("(stub)"); + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPIResolveName(LHANDLE session, ULONG_PTR uiparam, LPSTR name, + FLAGS flags, ULONG reserved, lpMapiRecipDesc *recip) +{ + FIXME("(stub)"); + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPISaveMail(LHANDLE session, ULONG_PTR uiparam, lpMapiMessage msg, + FLAGS flags, ULONG reserved, LPSTR msg_id) +{ + FIXME("(stub)"); + return MAPI_E_NOT_SUPPORTED; +} diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c new file mode 100644 index 0000000..3acc2fc --- /dev/null +++ b/dlls/winemapi/sendmail.c @@ -0,0 +1,71 @@ +/* + * MAPISendMail implementation + * + * Copyright 2005 Hans Leidekker + * Copyright 2009 Owen Rudge 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdio.h> +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "mapi.h" +#include "winreg.h" +#include "shellapi.h" +#include "shlwapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winemapi); + +/************************************************************************** + * MAPISendMail + * + * Send a mail. + * + * PARAMS + * session [I] Handle to a MAPI session. + * uiparam [I] Parent window handle. + * message [I] Pointer to a MAPIMessage structure. + * flags [I] Flags. + * reserved [I] Reserved, pass 0. + * + * RETURNS + * Success: SUCCESS_SUCCESS + * Failure: MAPI_E_FAILURE + * + */ +ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, + lpMapiMessage message, FLAGS flags, ULONG reserved) +{ + FIXME("(0x%08x 0x%08lx %p 0x%08x 0x%08x): stub\n", session, uiparam, + message, flags, reserved); + + return MAPI_E_NOT_SUPPORTED; +} + +ULONG WINAPI MAPISendDocuments(ULONG_PTR uiparam, LPSTR delim, LPSTR paths, + LPSTR filenames, ULONG reserved) +{ + return MAPI_E_NOT_SUPPORTED; +} diff --git a/dlls/winemapi/winemapi.spec b/dlls/winemapi/winemapi.spec index 7091f72..83de280 100644 --- a/dlls/winemapi/winemapi.spec +++ b/dlls/winemapi/winemapi.spec @@ -1,11 +1,11 @@ -@ stub MAPIAddress -@ stub MAPIDeleteMail -@ stub MAPIDetails -@ stub MAPIFindNext -@ stub MAPILogon -@ stub MAPILogoff -@ stub MAPIReadMail -@ stub MAPIResolveName -@ stub MAPISaveMail -@ stub MAPISendDocuments -@ stub MAPISendMail +@ stdcall MAPIAddress(ptr ptr str long str long ptr long long ptr ptr) +@ stdcall MAPIDeleteMail(ptr ptr str long long) +@ stdcall MAPIDetails(ptr ptr ptr long long) +@ stdcall MAPIFindNext(ptr ptr str str long long ptr) +@ stdcall MAPILogon(ptr str str long long ptr) +@ stdcall MAPILogoff(ptr ptr long long) +@ stdcall MAPIReadMail(ptr ptr str long long ptr) +@ stdcall MAPIResolveName(ptr ptr str long long ptr) +@ stdcall MAPISaveMail(ptr ptr ptr long long str) +@ stdcall MAPISendDocuments(ptr str str str long) +@ stdcall MAPISendMail(ptr ptr ptr long long)

1 0

Owen Rudge : winemapi: Implement MAPISendMail.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: b5c572119ce63af3fbb4d88e0df071e4ffb99e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c572119ce63af3fbb4d88e0… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Dec 16 10:44:33 2009 -0600 winemapi: Implement MAPISendMail. --- dlls/winemapi/sendmail.c | 183 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 180 insertions(+), 3 deletions(-) diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c index 3acc2fc..44c1d00 100644 --- a/dlls/winemapi/sendmail.c +++ b/dlls/winemapi/sendmail.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winemapi); /************************************************************************** * MAPISendMail * - * Send a mail. + * Send a message using a native mail client. * * PARAMS * session [I] Handle to a MAPI session. @@ -58,10 +58,187 @@ WINE_DEFAULT_DEBUG_CHANNEL(winemapi); ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, lpMapiMessage message, FLAGS flags, ULONG reserved) { - FIXME("(0x%08x 0x%08lx %p 0x%08x 0x%08x): stub\n", session, uiparam, + ULONG ret = MAPI_E_FAILURE; + unsigned int i, to_count = 0, cc_count = 0, bcc_count = 0; + unsigned int to_size = 0, cc_size = 0, bcc_size = 0, subj_size, body_size; + + char *to = NULL, *cc = NULL, *bcc = NULL; + const char *address, *subject, *body; + static const char format[] = + "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; + char *mailto = NULL, *escape = NULL; + char empty_string[] = ""; + HRESULT res; + DWORD size; + + TRACE("(0x%08lx 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam, message, flags, reserved); - return MAPI_E_NOT_SUPPORTED; + if (!message) + return MAPI_E_FAILURE; + + for (i = 0; i < message->nRecipCount; i++) + { + if (!message->lpRecips) + { + WARN("No recipients found\n"); + return MAPI_E_FAILURE; + } + + address = message->lpRecips[i].lpszAddress; + + if (address) + { + switch (message->lpRecips[i].ulRecipClass) + { + case MAPI_ORIG: + TRACE("From: %s\n", debugstr_a(address)); + break; + + case MAPI_TO: + TRACE("To: %s\n", debugstr_a(address)); + to_size += lstrlenA(address) + 1; + break; + + case MAPI_CC: + TRACE("Cc: %s\n", debugstr_a(address)); + cc_size += lstrlenA(address) + 1; + break; + + case MAPI_BCC: + TRACE("Bcc: %s\n", debugstr_a(address)); + bcc_size += lstrlenA(address) + 1; + break; + + default: + TRACE("Unknown recipient class: %d\n", + message->lpRecips[i].ulRecipClass); + } + } + else + FIXME("Name resolution and entry identifiers not supported\n"); + } + + if (message->nFileCount) + FIXME("Ignoring attachments\n"); + + subject = message->lpszSubject ? message->lpszSubject : ""; + body = message->lpszNoteText ? message->lpszNoteText : ""; + + TRACE("Subject: %s\n", debugstr_a(subject)); + TRACE("Body: %s\n", debugstr_a(body)); + + subj_size = lstrlenA(subject); + body_size = lstrlenA(body); + + ret = MAPI_E_INSUFFICIENT_MEMORY; + + if (to_size) + { + to = HeapAlloc(GetProcessHeap(), 0, to_size); + + if (!to) + goto exit; + + to[0] = 0; + } + + if (cc_size) + { + cc = HeapAlloc(GetProcessHeap(), 0, cc_size); + + if (!cc) + goto exit; + + cc[0] = 0; + } + + if (bcc_size) + { + bcc = HeapAlloc(GetProcessHeap(), 0, bcc_size); + + if (!bcc) + goto exit; + + bcc[0] = 0; + } + + if (message->lpOriginator) + TRACE("From: %s\n", debugstr_a(message->lpOriginator->lpszAddress)); + + for (i = 0; i < message->nRecipCount; i++) + { + address = message->lpRecips[i].lpszAddress; + + if (address) + { + switch (message->lpRecips[i].ulRecipClass) + { + case MAPI_TO: + if (to_count) + lstrcatA(to, ","); + + lstrcatA(to, address); + to_count++; + break; + + case MAPI_CC: + if (cc_count) + lstrcatA(cc, ","); + + lstrcatA(cc, address); + cc_count++; + break; + + case MAPI_BCC: + if (bcc_count) + lstrcatA(bcc, ","); + + lstrcatA(bcc, address); + bcc_count++; + break; + } + } + } + ret = MAPI_E_FAILURE; + size = sizeof(format) + to_size + cc_size + bcc_size + subj_size + body_size; + + mailto = HeapAlloc(GetProcessHeap(), 0, size); + + if (!mailto) + goto exit; + + sprintf(mailto, format, to ? to : "", subject, cc ? cc : "", bcc ? bcc : "", body); + + size = 1; + res = UrlEscapeA(mailto, empty_string, &size, URL_ESCAPE_SPACES_ONLY); + + if (res != E_POINTER) + goto exit; + + escape = HeapAlloc(GetProcessHeap(), 0, size); + + if (!escape) + goto exit; + + res = UrlEscapeA(mailto, escape, &size, URL_ESCAPE_SPACES_ONLY); + + if (res != S_OK) + goto exit; + + TRACE("Executing winebrowser.exe with parameters '%s'\n", debugstr_a(escape)); + + if ((UINT_PTR) ShellExecuteA(NULL, "open", "winebrowser.exe", escape, NULL, 0) > 32) + ret = SUCCESS_SUCCESS; + +exit: + HeapFree(GetProcessHeap(), 0, to); + HeapFree(GetProcessHeap(), 0, cc); + HeapFree(GetProcessHeap(), 0, bcc); + HeapFree(GetProcessHeap(), 0, mailto); + HeapFree(GetProcessHeap(), 0, escape); + + return ret; } ULONG WINAPI MAPISendDocuments(ULONG_PTR uiparam, LPSTR delim, LPSTR paths,

1 0

Owen Rudge : wine.inf: Add winemapi.dll to the mail clients section.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 75f52140b734da13ff5000f470214dff4f5a8c5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=75f52140b734da13ff5000f47… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Dec 16 10:44:35 2009 -0600 wine.inf: Add winemapi.dll to the mail clients section. --- tools/wine.inf.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 623ea0a..59af25a 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -528,6 +528,9 @@ HKLM,%MciExtStr%,"wvx",,"MPEGVideo" [Misc] HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000 +HKLM,Software\Clients\Mail,,2,"Native Mail Client" +HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client" +HKLM,Software\Clients\Mail\Native Mail Client,"DLLPath",2,"%11%\winemapi.dll" HKLM,Software\Microsoft\Advanced INF Setup,,,"" HKLM,Software\Microsoft\Rpc\SecurityService,1,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,10,2,"secur32.dll"

1 0

Owen Rudge : mapi32: Remove fallback procedure in MAPISendMail and replace with error message.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: b4b7724a790af8fdab693ef5d422a1b84d7941a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b7724a790af8fdab693ef5d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Dec 16 10:44:38 2009 -0600 mapi32: Remove fallback procedure in MAPISendMail and replace with error message. --- dlls/mapi32/En.rc | 30 +++++++++ dlls/mapi32/Makefile.in | 6 +- dlls/mapi32/mapi32_main.c | 2 + dlls/mapi32/res.h | 26 ++++++++ dlls/mapi32/sendmail.c | 150 +++------------------------------------------ dlls/mapi32/util.h | 1 + 6 files changed, 71 insertions(+), 144 deletions(-) diff --git a/dlls/mapi32/En.rc b/dlls/mapi32/En.rc new file mode 100644 index 0000000..9a6bf77 --- /dev/null +++ b/dlls/mapi32/En.rc @@ -0,0 +1,30 @@ +/* +* MAPI32 English resources +* +* Copyright 2009 Owen Rudge 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 +* +*/ + +#include "res.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Mail sending failed as you do not have a MAPI mail client installed." + IDS_SEND_MAIL, "Send Mail" +} diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index e38cfcf..e06b926 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mapi32.dll IMPORTLIB = mapi32 -IMPORTS = uuid shlwapi shell32 advapi32 kernel32 +IMPORTS = uuid shlwapi shell32 user32 advapi32 kernel32 C_SRCS = \ imalloc.c \ @@ -13,7 +13,9 @@ C_SRCS = \ sendmail.c \ util.c -RC_SRCS = version.rc +RC_SRCS = \ + En.rc \ + version.rc @MAKE_DLL_RULES@ diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 906c22e..6c35563 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mapi); LONG MAPI_ObjectCount = 0; +HINSTANCE hInstMAPI32; /*********************************************************************** * DllMain (MAPI32.init) @@ -45,6 +46,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) switch (fdwReason) { case DLL_PROCESS_ATTACH: + hInstMAPI32 = hinstDLL; DisableThreadLibraryCalls(hinstDLL); load_mapi_providers(); break; diff --git a/dlls/mapi32/res.h b/dlls/mapi32/res.h new file mode 100644 index 0000000..658f8f6 --- /dev/null +++ b/dlls/mapi32/res.h @@ -0,0 +1,26 @@ +/* +* MAPI32 resources +* +* Copyright 2009 Owen Rudge 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 +* +*/ + +#include <windef.h> + +/* Strings */ +#define IDS_NO_MAPI_CLIENT 1 +#define IDS_SEND_MAIL 2 diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 6f1d554..e115649 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -30,6 +30,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winuser.h" #include "objbase.h" #include "objidl.h" #include "mapi.h" @@ -41,6 +42,7 @@ #include "shlwapi.h" #include "wine/debug.h" #include "util.h" +#include "res.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); @@ -383,27 +385,11 @@ cleanup: ; * Success: SUCCESS_SUCCESS * Failure: MAPI_E_FAILURE * - * NOTES - * The fallback procedure is a temporary hack. */ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, lpMapiMessage message, FLAGS flags, ULONG reserved ) { - ULONG ret = MAPI_E_FAILURE; - unsigned int i, to_count = 0, cc_count = 0, bcc_count = 0; - unsigned int to_size = 0, cc_size = 0, bcc_size = 0, subj_size, body_size; - - char *to = NULL, *cc = NULL, *bcc = NULL; - const char *address, *subject, *body; - static const char format[] = - "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; - char *mailto = NULL, *escape = NULL; - char empty_string[] = ""; - HRESULT res; - DWORD size; - - TRACE( "(0x%08lx 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam, - message, flags, reserved ); + WCHAR msg_title[READ_BUF_SIZE], error_msg[READ_BUF_SIZE]; /* Check to see if we have a Simple MAPI provider loaded */ if (mapiFunctions.MAPISendMail) @@ -413,133 +399,13 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, if (MAPIInitialize(NULL) == S_OK) return sendmail_extended_mapi(session, uiparam, message, flags, reserved); - /* Fall back on our own implementation */ - if (!message) return MAPI_E_FAILURE; + /* Display an error message since we apparently have no mail clients */ + LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, sizeof(error_msg) / sizeof(WCHAR)); + LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, sizeof(msg_title) / sizeof(WCHAR)); - for (i = 0; i < message->nRecipCount; i++) - { - if (!message->lpRecips) - { - WARN("No recipients found\n"); - return MAPI_E_FAILURE; - } + MessageBoxW((HWND) uiparam, error_msg, msg_title, MB_ICONEXCLAMATION); - address = message->lpRecips[i].lpszAddress; - if (address) - { - switch (message->lpRecips[i].ulRecipClass) - { - case MAPI_ORIG: - TRACE( "From: %s\n", debugstr_a(address) ); - break; - case MAPI_TO: - TRACE( "To: %s\n", debugstr_a(address) ); - to_size += lstrlenA( address ) + 1; - break; - case MAPI_CC: - TRACE( "Cc: %s\n", debugstr_a(address) ); - cc_size += lstrlenA( address ) + 1; - break; - case MAPI_BCC: - TRACE( "Bcc: %s\n", debugstr_a(address) ); - bcc_size += lstrlenA( address ) + 1; - break; - default: - TRACE( "Unknown recipient class: %d\n", - message->lpRecips[i].ulRecipClass ); - } - } - else - FIXME("Name resolution and entry identifiers not supported\n"); - } - if (message->nFileCount) FIXME("Ignoring attachments\n"); - - subject = message->lpszSubject ? message->lpszSubject : ""; - body = message->lpszNoteText ? message->lpszNoteText : ""; - - TRACE( "Subject: %s\n", debugstr_a(subject) ); - TRACE( "Body: %s\n", debugstr_a(body) ); - - subj_size = lstrlenA( subject ); - body_size = lstrlenA( body ); - - ret = MAPI_E_INSUFFICIENT_MEMORY; - if (to_size) - { - to = HeapAlloc( GetProcessHeap(), 0, to_size ); - if (!to) goto exit; - to[0] = 0; - } - if (cc_size) - { - cc = HeapAlloc( GetProcessHeap(), 0, cc_size ); - if (!cc) goto exit; - cc[0] = 0; - } - if (bcc_size) - { - bcc = HeapAlloc( GetProcessHeap(), 0, bcc_size ); - if (!bcc) goto exit; - bcc[0] = 0; - } - - if (message->lpOriginator) - TRACE( "From: %s\n", debugstr_a(message->lpOriginator->lpszAddress) ); - - for (i = 0; i < message->nRecipCount; i++) - { - address = message->lpRecips[i].lpszAddress; - if (address) - { - switch (message->lpRecips[i].ulRecipClass) - { - case MAPI_TO: - if (to_count) lstrcatA( to, "," ); - lstrcatA( to, address ); - to_count++; - break; - case MAPI_CC: - if (cc_count) lstrcatA( cc, "," ); - lstrcatA( cc, address ); - cc_count++; - break; - case MAPI_BCC: - if (bcc_count) lstrcatA( bcc, "," ); - lstrcatA( bcc, address ); - bcc_count++; - break; - } - } - } - ret = MAPI_E_FAILURE; - size = sizeof(format) + to_size + cc_size + bcc_size + subj_size + body_size; - - mailto = HeapAlloc( GetProcessHeap(), 0, size ); - if (!mailto) goto exit; - - sprintf( mailto, format, to ? to : "", subject, cc ? cc : "", bcc ? bcc : "", body ); - - size = 1; - res = UrlEscapeA( mailto, empty_string, &size, URL_ESCAPE_SPACES_ONLY ); - if (res != E_POINTER) goto exit; - - escape = HeapAlloc( GetProcessHeap(), 0, size ); - if (!escape) goto exit; - - res = UrlEscapeA( mailto, escape, &size, URL_ESCAPE_SPACES_ONLY ); - if (res != S_OK) goto exit; - - if ((UINT_PTR)ShellExecuteA( NULL, "open", escape, NULL, NULL, 0 ) > 32) - ret = SUCCESS_SUCCESS; - -exit: - HeapFree( GetProcessHeap(), 0, to ); - HeapFree( GetProcessHeap(), 0, cc ); - HeapFree( GetProcessHeap(), 0, bcc ); - HeapFree( GetProcessHeap(), 0, mailto ); - HeapFree( GetProcessHeap(), 0, escape ); - - return ret; + return MAPI_E_NOT_SUPPORTED; } ULONG WINAPI MAPISendDocuments(ULONG_PTR uiparam, LPSTR delim, LPSTR paths, diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index fd813ca..df03d6e 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -61,5 +61,6 @@ typedef struct MAPI_FUNCTIONS { } MAPI_FUNCTIONS; extern MAPI_FUNCTIONS mapiFunctions; +extern HINSTANCE hInstMAPI32; #endif

1 0

Paul Vriens : kernel32: Fix a crash with GetLongPathNameW and UNC path names.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: d58bd680b195da55687cedaf0ab8b8781fb95bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58bd680b195da55687cedaf0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 17 10:44:05 2009 +0100 kernel32: Fix a crash with GetLongPathNameW and UNC path names. --- dlls/kernel32/path.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index e9463bb..7618dc9 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -313,9 +313,15 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen if (shortpath[0] == '\\' && shortpath[1] == '\\') { - ERR("UNC pathname %s\n", debugstr_w(shortpath)); - lstrcpynW( longpath, shortpath, longlen ); - return strlenW(longpath); + FIXME("UNC pathname %s\n", debugstr_w(shortpath)); + + tmplen = strlenW(shortpath); + if (tmplen < longlen) + { + if (longpath != shortpath) strcpyW( longpath, shortpath ); + return tmplen; + } + return tmplen + 1; } unixabsolute = (shortpath[0] == '/');

1 0

Paul Vriens : kernel32/tests: Add some tests for GetLongPathNameW.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 17eb00409c915c5906b6780a951fb2e21fbab16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=17eb00409c915c5906b6780a9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 17 10:44:38 2009 +0100 kernel32/tests: Add some tests for GetLongPathNameW. --- dlls/kernel32/tests/path.c | 82 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 104a48c..1c899c8 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1065,12 +1065,20 @@ static void test_GetLongPathNameA(void) static void test_GetLongPathNameW(void) { - DWORD length; + DWORD length, expanded; + BOOL ret; + HANDLE file; WCHAR empty[MAX_PATH]; + WCHAR tempdir[MAX_PATH], name[200]; + WCHAR dirpath[4 + MAX_PATH + 200]; /* To ease removal */ + WCHAR shortpath[4 + MAX_PATH + 200 + 1 + 200]; + static const WCHAR prefix[] = { '\\','\\','?','\\', 0}; + static const WCHAR backslash[] = { '\\', 0}; + static const WCHAR letterX[] = { 'X', 0}; + + if (!pGetLongPathNameW) + return; - /* Not present in all windows versions */ - if(pGetLongPathNameW) - { SetLastError(0xdeadbeef); length = pGetLongPathNameW(NULL,NULL,0); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -1086,7 +1094,73 @@ static void test_GetLongPathNameW(void) length = pGetLongPathNameW(empty,NULL,0); ok(0==length,"GetLongPathNameW returned %d but expected 0\n",length); ok(GetLastError()==ERROR_PATH_NOT_FOUND,"GetLastError returned %d but expected ERROR_PATH_NOT_FOUND\n",GetLastError()); + + /* Create a long path name. The path needs to exist for these tests to + * succeed so we need the "\\?\" prefix when creating directories and + * files. + */ + name[0] = 0; + while (lstrlenW(name) < (sizeof(name)/sizeof(WCHAR) - 1)) + lstrcatW(name, letterX); + + GetTempPathW(MAX_PATH, tempdir); + + lstrcpyW(shortpath, prefix); + lstrcatW(shortpath, tempdir); + lstrcatW(shortpath, name); + lstrcpyW(dirpath, shortpath); + ret = CreateDirectoryW(shortpath, NULL); + ok(ret, "Could not create the temporary directory : %d\n", GetLastError()); + lstrcatW(shortpath, backslash); + lstrcatW(shortpath, name); + + /* Path does not exist yet and we know it overruns MAX_PATH */ + + /* No prefix */ + SetLastError(0xdeadbeef); + length = pGetLongPathNameW(shortpath + 4, NULL, 0); + ok(length == 0, "Expected 0, got %d\n", length); + todo_wine + ok(GetLastError() == ERROR_PATH_NOT_FOUND, + "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); + /* With prefix */ + SetLastError(0xdeadbeef); + length = pGetLongPathNameW(shortpath, NULL, 0); + todo_wine + { + ok(length == 0, "Expected 0, got %d\n", length); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); + } + + file = CreateFileW(shortpath, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, + "Could not create the temporary file : %d.\n", GetLastError()); + CloseHandle(file); + + /* Path exists */ + + /* No prefix */ + SetLastError(0xdeadbeef); + length = pGetLongPathNameW(shortpath + 4, NULL, 0); + todo_wine + { + ok(length == 0, "Expected 0, got %d\n", length); + ok(GetLastError() == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); } + /* With prefix */ + expanded = 4 + (pGetLongPathNameW(tempdir, NULL, 0) - 1) + lstrlenW(name) + 1 + lstrlenW(name) + 1; + SetLastError(0xdeadbeef); + length = pGetLongPathNameW(shortpath, NULL, 0); + ok(length == expanded, "Expected %d, got %d\n", expanded, length); + + /* NULL buffer with length crashes on Windows */ + if (0) + length = pGetLongPathNameW(shortpath, NULL, 20); + + ok(DeleteFileW(shortpath), "Could not delete temporary file\n"); + ok(RemoveDirectoryW(dirpath), "Could not delete temporary directory\n"); } static void test_GetShortPathNameW(void)

1 0

Alexandre Julliard : user32: Pre-allocate the window procedure for the dialog class.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 0cbf191add364fddd669d39793d3f0950a14e5b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbf191add364fddd669d3979… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 13:00:23 2009 +0100 user32: Pre-allocate the window procedure for the dialog class. --- dlls/user32/controls.h | 1 + dlls/user32/dialog.c | 4 ++-- dlls/user32/winproc.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 72a65a0..35be645 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -35,6 +35,7 @@ enum builtin_winprocs { WINPROC_BUTTON = 0, WINPROC_COMBO, + WINPROC_DIALOG, WINPROC_EDIT, WINPROC_LISTBOX, WINPROC_SCROLLBAR, diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index b6989a6..1309c09 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -97,8 +97,8 @@ const struct builtin_class_descr DIALOG_builtin_class = { (LPCWSTR)DIALOG_CLASS_ATOM, /* name */ CS_SAVEBITS | CS_DBLCLKS, /* style */ - DefDlgProcA, /* procA */ - DefDlgProcW, /* procW */ + NULL, /* procA */ + BUILTIN_WINPROC(WINPROC_DIALOG), /* procW */ DLGWINDOWEXTRA, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index d2e75a1..89a1ae9 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -66,6 +66,7 @@ static WINDOWPROC winproc_array[MAX_WINPROCS] = { { ButtonWndProcA, ButtonWndProcW }, /* WINPROC_BUTTON */ { ComboWndProcA, ComboWndProcW }, /* WINPROC_COMBO */ + { DefDlgProcA, DefDlgProcW }, /* WINPROC_DIALOG */ { EditWndProcA, EditWndProcW }, /* WINPROC_EDIT */ { ListBoxWndProcA, ListBoxWndProcW }, /* WINPROC_LISTBOX */ { ScrollBarWndProcA, ScrollBarWndProcW }, /* WINPROC_SCROLLBAR */

1 0