February 2006 - Wine-commits

lostwages/templates/en status.template status_ ...
by Jeremy Newman 22 Feb '06

22 Feb '06

ChangeSet ID: 23216 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/02/22 09:40:12 Modified files: templates/en : status.template status_changelog.template status_dlls.template Log message: Tom Wickline <twickline(a)gmail.com> status page updates Patch: http://cvs.winehq.org/patch.py?id=23216 Old revision New revision Changes Path 1.42 1.43 +1 -1 lostwages/templates/en/status.template 1.44 1.45 +11 -0 lostwages/templates/en/status_changelog.template 1.39 1.40 +11 -4 lostwages/templates/en/status_dlls.template Index: lostwages/templates/en/status.template diff -u -p lostwages/templates/en/status.template:1.42 lostwages/templates/en/status.template:1.43 --- lostwages/templates/en/status.template:1.42 22 Feb 2006 15:40:12 -0000 +++ lostwages/templates/en/status.template 22 Feb 2006 15:40:12 -0000 @@ -8,7 +8,7 @@ <h1>Wine Status</h1> - <p>Last update: February 10, 2006.</p> + <p>Last update: February 22, 2006.</p> <div align=center> <table width="90%" border="0" cellspacing="0" cellpadding="2"> Index: lostwages/templates/en/status_changelog.template diff -u -p lostwages/templates/en/status_changelog.template:1.44 lostwages/templates/en/status_changelog.template:1.45 --- lostwages/templates/en/status_changelog.template:1.44 22 Feb 2006 15:40:12 -0000 +++ lostwages/templates/en/status_changelog.template 22 Feb 2006 15:40:12 -0000 @@ -2,6 +2,17 @@ <h1>Wine Status - ChangeLog</h1> +<p>Changes since February 22, 2006:</p> + + <ul> + <li>ADD - sfc.dll section</li> + <li>ADD - Aric Stewart as worker to twain32.dll</li> + <li>ADD - Jeff Latimer as worker to usp10.dll</li> + <li>Rename - ctl3d.dll directory to ctl3d32.dll</li> + <li>usp10.dll 5% -> 15%</li> + </ul> + <br> + <p>Changes since February 10, 2006:</p> <ul> Index: lostwages/templates/en/status_dlls.template diff -u -p lostwages/templates/en/status_dlls.template:1.39 lostwages/templates/en/status_dlls.template:1.40 --- lostwages/templates/en/status_dlls.template:1.39 22 Feb 2006 15:40:12 -0000 +++ lostwages/templates/en/status_dlls.template 22 Feb 2006 15:40:12 -0000 @@ -129,7 +129,7 @@ <td></td> </tr> <tr> - <td>ctl3d.dll</td> + <td>ctl3d32.dll</td> <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmfc98/ht…">MSDN: Using CTL3D</a></td> <td>None</td> <td class="pct20">20% complete</td> @@ -559,6 +559,13 @@ <td>James Hawkins</td> </tr> <tr> + <td>sfc.dll</td> + <td class="adequate"><a href="http://windowssdk.msdn.microsoft.com/library/default.asp?url=/library/en-us…">MSDN: WFP Functions</a></td> + <td>None</td> + <td class="pct5">5% complete</td> + <td>Detlef Riekenberg</td> + </tr> + <tr> <td>shdocvw.dll</td> <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/workshop/browser/prog_br…">MSDN: Programming and Reusing the Browser</a></td> <td><a href="{$root}/site/?issue=211#Embedding%20Mozilla's%20ActiveX%20Control">#211</a></td> @@ -629,7 +636,7 @@ <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/still/hh/s…">MSDN: TWAIN-Compatible Applications</a></td> <td><a href="{$root}/site/?issue=257#Setting%20Up%20a%20Scanner">#257</a></td> <td class="pct25">25% complete</td> - <td></td> + <td>Aric Stewart</td> </tr> <tr> <td>unicows.dll</td> @@ -663,8 +670,8 @@ <td>usp10.dll</td> <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/intl/unisc…">MSDN: Uniscribe</a></td> <td><a href="{$root}/site/?issue=292#Lotus%20Notes%20Breakage%20and%20Fix">#292</a></td> - <td class="pct5">5% complete</td> - <td>Hans Leidekker</td> + <td class="pct15">15% complete</td> + <td>Hans Leidekker,<br>Jeff Latimer</td> </tr> <tr> <td>uxtheme.dll</td>

1 0

Peter Beutner : msvcrt: Save esp before calling catch block and restore afterwards.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 82818284c3a227fdbd894e626b887f5bb6b3addc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=82818284c3a227fdbd894e6… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Wed Feb 22 12:21:00 2006 +0100 msvcrt: Save esp before calling catch block and restore afterwards. It seems like the esp value (which is saved at [ebp-16]) is sometimes changed inside the catch handler so we end up with a bogus esp afterwards. To avoid that save it before calling the catch block. --- dlls/msvcrt/cppexcept.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index 3f28166..da7b0fb 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -285,6 +285,7 @@ inline static void call_catch_block( PEX struct catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; thread_data_t *thread_data = msvcrt_get_thread_data(); + DWORD save_esp = ((DWORD*)frame)[-1]; for (i = 0; i < descr->tryblock_count; i++) { @@ -339,6 +340,7 @@ inline static void call_catch_block( PEX thread_data->exc_record = nested_frame.prev_rec; __wine_pop_frame( &nested_frame.frame ); + ((DWORD*)frame)[-1] = save_esp; if (info && info->destructor) call_dtor( info->destructor, object ); TRACE( "done, continuing at %p\n", addr );

1 0

Peter Beutner : msvcrt: Fix handling of multiple nested exceptions.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: be07b6db594d279a3391b7fb5af8048dcd78473b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be07b6db594d279a3391b7f… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Wed Feb 22 12:06:56 2006 +0100 msvcrt: Fix handling of multiple nested exceptions. Save in each nested frame a pointer to the original exception record. Only one refence in thread_data isn't enough when we have multiple nested frames. --- dlls/msvcrt/cppexcept.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index d42e88e..3f28166 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -229,6 +229,7 @@ struct catch_func_nested_frame cxx_exception_frame *cxx_frame; /* frame of parent exception */ cxx_function_descr *descr; /* descriptor of parent exception */ int trylevel; /* current try level */ + EXCEPTION_RECORD *rec; /* rec associated with frame */ }; /* handler for exceptions happening while calling a catch function */ @@ -247,7 +248,7 @@ static DWORD catch_function_nested_handl if(rec->ExceptionCode == CXX_EXCEPTION) { - PEXCEPTION_RECORD prev_rec = msvcrt_get_thread_data()->exc_record; + PEXCEPTION_RECORD prev_rec = nested_frame->rec; if(rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) { /* exception was rethrown */ @@ -330,6 +331,7 @@ inline static void call_catch_block( PEX nested_frame.cxx_frame = frame; nested_frame.descr = descr; nested_frame.trylevel = nested_trylevel + 1; + nested_frame.rec = rec; __wine_push_frame( &nested_frame.frame ); thread_data->exc_record = rec;

1 0

Peter Beutner : msvcrt: Fix handling of nested exceptions.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 62dc7f52f47f8a406d3b8a155b7d81cb19f3c98b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=62dc7f52f47f8a406d3b8a1… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Wed Feb 22 12:04:13 2006 +0100 msvcrt: Fix handling of nested exceptions. Move handling of nested exceptions completely in the catch_function_nested_handler(). If a new exception was thrown inside a catch block destroy the old exception object, if it is a rethrow re-propagate the previous object. --- dlls/msvcrt/cppexcept.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index 073674a..d42e88e 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -242,13 +242,34 @@ static DWORD catch_function_nested_handl msvcrt_get_thread_data()->exc_record = nested_frame->prev_rec; return ExceptionContinueSearch; } - else + + TRACE( "got nested exception in catch function\n" ); + + if(rec->ExceptionCode == CXX_EXCEPTION) { - TRACE( "got nested exception in catch function\n" ); - return cxx_frame_handler( rec, nested_frame->cxx_frame, context, - NULL, nested_frame->descr, &nested_frame->frame, - nested_frame->trylevel ); + PEXCEPTION_RECORD prev_rec = msvcrt_get_thread_data()->exc_record; + if(rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) + { + /* exception was rethrown */ + rec->ExceptionInformation[1] = prev_rec->ExceptionInformation[1]; + rec->ExceptionInformation[2] = prev_rec->ExceptionInformation[2]; + TRACE("detect rethrow: re-propagate: obj: %lx, type: %lx\n", + rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + } + else { + /* new exception in exception handler, destroy old */ + void *object = (void*)prev_rec->ExceptionInformation[1]; + cxx_exception_type *info = (cxx_exception_type*) prev_rec->ExceptionInformation[2]; + TRACE("detect threw new exception in catch block - destroy old(obj: %p type: %p)\n", + object, info); + if(info && info->destructor) + call_dtor( info->destructor, object ); + } } + + return cxx_frame_handler( rec, nested_frame->cxx_frame, context, + NULL, nested_frame->descr, &nested_frame->frame, + nested_frame->trylevel ); } /* find and call the appropriate catch block for an exception */ @@ -359,11 +380,7 @@ DWORD cxx_frame_handler( PEXCEPTION_RECO return exc_type->custom_handler( rec, frame, context, dispatch, descr, nested_trylevel, nested_frame, 0 ); } - if (!exc_type) /* nested exception, fetch info from original exception */ - { - rec = msvcrt_get_thread_data()->exc_record; - exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; - } + if (TRACE_ON(seh)) { TRACE("handling C++ exception rec %p frame %p trylevel %d descr %p nested_frame %p\n",

1 0

Eric Pouech : shell32: Fixes for bugs found by valgrind on shell32 tests harness.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 1be2e1edef9440a947c03ddc73a72fab64f3858d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1be2e1edef9440a947c03dd… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Feb 22 12:04:02 2006 +0100 shell32: Fixes for bugs found by valgrind on shell32 tests harness. - read strings from left to right (PathGetDriveNumberW) - don't access buffers before they are filled (SHGetPathFromIDListW) - fill buffers & variables on all paths (SHELL_FindExecutable) - handle error condition (unix_fs) - don't shoot in the blind for AW APIs (tests/shelllink.c) --- dlls/shell32/pidl.c | 2 +- dlls/shell32/shfldr_unixfs.c | 3 ++- dlls/shell32/shlexec.c | 5 +++++ dlls/shell32/tests/shelllink.c | 15 ++++++++------- dlls/shlwapi/path.c | 9 ++++++--- 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 6ec496f..a3f9574 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1259,7 +1259,7 @@ BOOL WINAPI SHGetPathFromIDListW(LPCITEM DWORD dwAttributes; STRRET strret; - TRACE_(shell)("(pidl=%p,%p)\n", pidl, debugstr_w(pszPath)); + TRACE_(shell)("(pidl=%p,%p)\n", pidl, pszPath); pdump(pidl); if (!pidl) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index c0d7f87..7780adc 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -701,6 +701,7 @@ static BOOL UNIXFS_path_to_pidl(UnixFold if (!pNextPathElement) { SHFree(*ppidl); + *ppidl = NULL; return FALSE; } pidl = ILGetNext(pidl); @@ -1753,7 +1754,7 @@ static HRESULT WINAPI UnixFolder_ISFHelp ILFree(pidlRelative); SHChangeNotify(SHCNE_MKDIR, SHCNF_IDLIST, pidlAbsolute, NULL); ILFree(pidlAbsolute); - } + } else return E_FAIL; return S_OK; } } diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 14739d6..f5b1e88 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -597,6 +597,11 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath filetype[filetypelen] = '\0'; TRACE("File type: %s\n", debugstr_w(filetype)); } + else + { + *filetype = '\0'; + filetypelen = 0; + } } if (*filetype) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 7d45ef3..384d914 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -43,23 +43,24 @@ static const WCHAR notafile[]= { 'C',':' * SHSimpleIDListFromPathA does not work on NT4. But if we call both we * get what we want on all platforms. */ -static LPITEMIDLIST (WINAPI *pSHSimpleIDListFromPathA)(LPCSTR)=NULL; +static LPITEMIDLIST (WINAPI *pSHSimpleIDListFromPathAW)(LPCVOID); static LPITEMIDLIST path_to_pidl(const char* path) { LPITEMIDLIST pidl; - if (!pSHSimpleIDListFromPathA) + if (!pSHSimpleIDListFromPathAW) { HMODULE hdll=LoadLibraryA("shell32.dll"); - pSHSimpleIDListFromPathA=(void*)GetProcAddress(hdll, (char*)162); - if (!pSHSimpleIDListFromPathA) - trace("SHSimpleIDListFromPathA not found in shell32.dll\n"); + pSHSimpleIDListFromPathAW=(void*)GetProcAddress(hdll, (char*)162); + if (!pSHSimpleIDListFromPathAW) + trace("SHSimpleIDListFromPathAW not found in shell32.dll\n"); } pidl=NULL; - if (pSHSimpleIDListFromPathA) - pidl=pSHSimpleIDListFromPathA(path); + /* pSHSimpleIDListFromPathAW maps to A on non NT platforms */ + if (pSHSimpleIDListFromPathAW && (GetVersion() & 0x80000000)) + pidl=pSHSimpleIDListFromPathAW(path); if (!pidl) { diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 93c7fe8..bf9abf9 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -506,9 +506,12 @@ int WINAPI PathGetDriveNumberW(LPCWSTR l { TRACE ("(%s)\n",debugstr_w(lpszPath)); - if (lpszPath && lpszPath[1] == ':' && - tolowerW(*lpszPath) >= 'a' && tolowerW(*lpszPath) <= 'z') - return tolowerW(*lpszPath) - 'a'; + if (lpszPath) + { + WCHAR tl = tolowerW(lpszPath[0]); + if (tl >= 'a' && tl <= 'z' && lpszPath[1] == ':') + return tl - 'a'; + } return -1; }

1 0

Marco Timpano : winedos: Fixed a couple of typos in ppdev.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 8d845e3a1a4d8f05b20b5727dd578ea1b1e731e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d845e3a1a4d8f05b20b572… Author: Marco Timpano <marcotimpano(a)hotmail.it> Date: Wed Feb 22 12:03:07 2006 +0100 winedos: Fixed a couple of typos in ppdev. --- dlls/winedos/ppdev.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winedos/ppdev.c b/dlls/winedos/ppdev.c index 3a25de9..527ffe2 100644 --- a/dlls/winedos/ppdev.c +++ b/dlls/winedos/ppdev.c @@ -169,7 +169,7 @@ char IO_pp_init(void) } /* Check for the minimum required IOCTLS */ if ((ioctl(fd,PPRDATA,&res))|| - (ioctl(fd,PPRCONTROL,&res))|| + (ioctl(fd,PPRSTATUS,&res))|| (ioctl(fd,PPRCONTROL,&res))) { ERR("PPUSER IOCTL not available for parport device %s\n",buffer); @@ -289,7 +289,7 @@ int IO_pp_inp(int port, DWORD* res) /* IO_pp_outp * - * Check if we can satisfy the INP command with some of the configured PPDEV deviced + * Check if we can satisfy the OUTP command with some of the configured PPDEV deviced * Return NULL on success */ BOOL IO_pp_outp(int port, DWORD* res)

1 0

Francois Gouget : mapi: Add some missing MAPI prototypes.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 4db07ab496844eea76f693b4e5c21e3ed2ac8c44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4db07ab496844eea76f693b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 12:02:46 2006 +0100 mapi: Add some missing MAPI prototypes. Add some missing MAPI prototypes to mapi.h (spotted by winapi_check) and include it where they are implemented. Make mapi.h and mapix.h compatible. gcc does not like macros and prototypes to be redefined so this involved protecting against multiple definitions. Fix the MAPISendMail() implementation prototype. --- dlls/mapi32/mapi32_main.c | 1 + dlls/mapi32/sendmail.c | 2 + include/mapi.h | 76 +++++++++++++++++++++++++++++++++++++++++++-- include/mapix.h | 40 +++++++++++++++++------- 4 files changed, 103 insertions(+), 16 deletions(-) diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 8596045..c0363fb 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -25,6 +25,7 @@ #include "winerror.h" #include "objbase.h" #include "mapix.h" +#include "mapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 3d9c545..9a86b79 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -56,7 +56,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mapi); * NOTES * This is a temporary hack. */ -ULONG WINAPI MAPISendMail( LHANDLE session, ULONG uiparam, +ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, lpMapiMessage message, FLAGS flags, ULONG reserved ) { ULONG ret = MAPI_E_FAILURE; diff --git a/include/mapi.h b/include/mapi.h index 79591ef..17b20be 100644 --- a/include/mapi.h +++ b/include/mapi.h @@ -31,7 +31,11 @@ typedef unsigned long LHANDLE, #endif #define lhSessionNull ((LHANDLE)0) +#ifndef WINE_FLAGS_DEFINED +#define WINE_FLAGS_DEFINED typedef unsigned long FLAGS; +#endif +typedef unsigned long* LPULONG; typedef struct { @@ -79,7 +83,10 @@ typedef struct /* Error codes */ -#define SUCCESS_SUCCESS 0 +#ifndef SUCCESS_SUCCESS +#define SUCCESS_SUCCESS 0L +#endif + #define MAPI_USER_ABORT 1 #define MAPI_E_USER_ABORT MAPI_USER_ABORT #define MAPI_E_FAILURE 2 @@ -112,11 +119,21 @@ typedef struct /* MAPILogon */ +#ifndef MAPI_LOGON_UI #define MAPI_LOGON_UI 0x00000001 -#define MAPI_PASSWORD_UI 0x00020000 +#endif +#ifndef MAPI_NEW_SESSION #define MAPI_NEW_SESSION 0x00000002 -#define MAPI_FORCE_DOWNLOAD 0x00001000 +#endif +#ifndef MAPI_EXTENDED #define MAPI_EXTENDED 0x00000020 +#endif +#ifndef MAPI_FORCE_DOWNLOAD +#define MAPI_FORCE_DOWNLOAD 0x00001000 +#endif +#ifndef MAPI_PASSWORD_UI +#define MAPI_PASSWORD_UI 0x00020000 +#endif /* MAPISendMail */ @@ -124,6 +141,59 @@ typedef struct #define MAPI_DIALOG 0x00000008 +/* API typedefs and prototypes */ + +typedef ULONG (WINAPI MAPIADDRESS)(LHANDLE,ULONG_PTR,LPSTR,ULONG,LPSTR,ULONG,lpMapiRecipDesc,FLAGS,ULONG,LPULONG,lpMapiRecipDesc*); +typedef MAPIADDRESS *LPMAPIADDRESS; +MAPIADDRESS MAPIAddress; + +typedef ULONG (WINAPI MAPIDELETEMAIL)(LHANDLE,ULONG_PTR,LPSTR,FLAGS,ULONG); +typedef MAPIDELETEMAIL *LPMAPIDELETEMAIL; +MAPIDELETEMAIL MAPIDeleteMail; + +typedef ULONG (WINAPI MAPIDETAILS)(LHANDLE,ULONG_PTR,lpMapiRecipDesc,FLAGS,ULONG); +typedef MAPIDETAILS *LPMAPIDETAILS; +MAPIDETAILS MAPIDetails; + +typedef ULONG (WINAPI MAPIFINDNEXT)(LHANDLE,ULONG_PTR,LPSTR,LPSTR,FLAGS,ULONG,LPSTR); +typedef MAPIFINDNEXT *LPMAPIFINDNEXT; +MAPIFINDNEXT MAPIFindNext; + +#ifndef MAPIFREEBUFFER_DEFINED +#define MAPIFREEBUFFER_DEFINED +typedef ULONG (WINAPI MAPIFREEBUFFER)(LPVOID); +typedef MAPIFREEBUFFER *LPMAPIFREEBUFFER; +MAPIFREEBUFFER MAPIFreeBuffer; +#endif + +typedef ULONG (WINAPI MAPILOGOFF)(LHANDLE,ULONG_PTR,FLAGS,ULONG); +typedef MAPILOGOFF *LPMAPILOGOFF; +MAPILOGOFF MAPILogoff; + +typedef ULONG (WINAPI MAPILOGON)(ULONG_PTR,LPSTR,LPSTR,FLAGS,ULONG,LPLHANDLE); +typedef MAPILOGON *LPMAPILOGON; +MAPILOGON MAPILogon; + +typedef ULONG (WINAPI MAPIREADMAIL)(LHANDLE,ULONG_PTR,LPSTR,FLAGS,ULONG,lpMapiMessage); +typedef MAPIREADMAIL *LPMAPIREADMAIL; +MAPIREADMAIL MAPIReadMail; + +typedef ULONG (WINAPI MAPIRESOLVENAME)(LHANDLE,ULONG_PTR,LPSTR,FLAGS,ULONG,lpMapiRecipDesc*); +typedef MAPIRESOLVENAME *LPMAPIRESOLVENAME; +MAPIRESOLVENAME MAPIResolveName; + +typedef ULONG (WINAPI MAPISAVEMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG,LPSTR); +typedef MAPISAVEMAIL *LPMAPISAVEMAIL; +MAPISAVEMAIL MAPISaveMail; + +typedef ULONG (WINAPI MAPISENDDOCUMENTS)(ULONG_PTR,LPSTR,LPSTR,LPSTR,ULONG); +typedef MAPISENDDOCUMENTS *LPMAPISENDDOCUMENTS; +MAPISENDDOCUMENTS MAPISendDocuments; + +typedef ULONG (WINAPI MAPISENDMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG); +typedef MAPISENDMAIL *LPMAPI; +MAPISENDMAIL MAPISendMail; + #ifdef __cplusplus } #endif diff --git a/include/mapix.h b/include/mapix.h index 5300b3b..99cbd75 100644 --- a/include/mapix.h +++ b/include/mapix.h @@ -42,20 +42,33 @@ typedef struct IMsgServiceAdmin IMsgServ typedef IMsgServiceAdmin *LPSERVICEADMIN; typedef struct IMAPISession *LPMAPISESSION; -typedef unsigned long FLAGS; +#ifndef WINE_FLAGS_DEFINED +#define WINE_FLAGS_DEFINED +typedef unsigned long FLAGS; +#endif /* Flags for MAPILogon and MAPILogonEx */ -#define MAPI_LOGON_UI 0x000001 -#define MAPI_NEW_SESSION 0x000002 -#define MAPI_EXTENDED 0x000020 -#define MAPI_FORCE_DOWNLOAD 0x001000 -#define MAPI_PASSWORD_UI 0x020000 -#define MAPI_ALLOW_OTHERS 0x000008 -#define MAPI_EXPLICIT_PROFILE 0x000010 -#define MAPI_SERVICE_UI_ALWAYS 0x002000 -#define MAPI_NO_MAIL 0x008000 -#define MAPI_NT_SERVICE 0x010000 -#define MAPI_TIMEOUT_SHORT 0x100000 +#ifndef MAPI_LOGON_UI +#define MAPI_LOGON_UI 0x00000001 +#endif +#ifndef MAPI_NEW_SESSION +#define MAPI_NEW_SESSION 0x00000002 +#endif +#define MAPI_ALLOW_OTHERS 0x00000008 +#define MAPI_EXPLICIT_PROFILE 0x00000010 +#ifndef MAPI_EXTENDED +#define MAPI_EXTENDED 0x00000020 +#endif +#ifndef MAPI_FORCE_DOWNLOAD +#define MAPI_FORCE_DOWNLOAD 0x00001000 +#endif +#ifndef MAPI_PASSWORD_UI +#define MAPI_PASSWORD_UI 0x00020000 +#endif +#define MAPI_SERVICE_UI_ALWAYS 0x00002000 +#define MAPI_NO_MAIL 0x00008000 +#define MAPI_NT_SERVICE 0x00010000 +#define MAPI_TIMEOUT_SHORT 0x00100000 #define MAPI_SIMPLE_DEFAULT (MAPI_LOGON_UI|MAPI_ALLOW_OTHERS|MAPI_FORCE_DOWNLOAD) #define MAPI_SIMPLE_EXPLICIT (MAPI_NEW_SESSION|MAPI_EXPLICIT_PROFILE|MAPI_FORCE_DOWNLOAD) @@ -94,9 +107,12 @@ typedef SCODE (WINAPI MAPIALLOCATEMORE)( typedef MAPIALLOCATEMORE *LPMAPIALLOCATEMORE; MAPIALLOCATEMORE MAPIAllocateMore; +#ifndef MAPIFREEBUFFER_DEFINED +#define MAPIFREEBUFFER_DEFINED typedef ULONG (WINAPI MAPIFREEBUFFER)(LPVOID); typedef MAPIFREEBUFFER *LPMAPIFREEBUFFER; MAPIFREEBUFFER MAPIFreeBuffer; +#endif /***************************************************************************** * IMAPISession interface

1 0

Lei Zhang : riched20: Implement FR_MATCHCASE for EM_FINDTEXT.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 805dc748097d0a7a79fdd31d46e3cd10296ee612 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=805dc748097d0a7a79fdd31… Author: Lei Zhang <leiz(a)ucla.edu> Date: Tue Feb 21 10:19:01 2006 -0800 riched20: Implement FR_MATCHCASE for EM_FINDTEXT. Removed todo flag from affected FR_MATCHCASE tests. --- dlls/riched20/Makefile.in | 2 +- dlls/riched20/editor.c | 6 ++---- dlls/riched20/editor.h | 6 ++++++ dlls/riched20/tests/editor.c | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index bb646c8..38df23c 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = riched20.dll IMPORTLIB = libriched20.$(IMPLIBEXT) IMPORTS = ole32 user32 gdi32 kernel32 -EXTRALIBS = -luuid +EXTRALIBS = $(LIBUNICODE) -luuid C_SRCS = \ caret.c \ diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e7b7fec..496210e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -773,8 +773,6 @@ ME_FindText(ME_TextEditor *editor, DWORD TRACE("flags==0x%08lx, chrg->cpMin==%ld, chrg->cpMax==%ld text==%s\n", flags, chrg->cpMin, chrg->cpMax, debugstr_w(text)); - if (!(flags & FR_MATCHCASE)) - FIXME("Case-insensitive search not implemented\n"); if (flags & ~(FR_DOWN | FR_MATCHCASE)) FIXME("Flags 0x%08lx not implemented\n", flags & ~(FR_DOWN | FR_MATCHCASE)); @@ -825,7 +823,7 @@ ME_FindText(ME_TextEditor *editor, DWORD int nCurStart = nStart; int nMatched = 0; - while (pCurItem && pCurItem->member.run.strText->szData[nCurStart + nMatched] == text[nMatched]) + while (pCurItem && ME_CharCompare(pCurItem->member.run.strText->szData[nCurStart + nMatched], text[nMatched], (flags & FR_MATCHCASE))) { nMatched++; if (nMatched == nLen) @@ -874,7 +872,7 @@ ME_FindText(ME_TextEditor *editor, DWORD int nCurEnd = nEnd; int nMatched = 0; - while (pCurItem && pCurItem->member.run.strText->szData[nCurEnd - nMatched - 1] == text[nLen - nMatched - 1]) + while (ME_CharCompare(pCurItem->member.run.strText->szData[nCurEnd - nMatched - 1], text[nLen - nMatched - 1], (flags & FR_MATCHCASE))) { nMatched++; if (nMatched == nLen) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index ec8bd5b..8d39f9b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -19,6 +19,7 @@ */ #include "editstr.h" +#include "wine/unicode.h" #define ALLOC_OBJ(type) HeapAlloc(me_heap, 0, sizeof(type)) #define ALLOC_N_OBJ(type, count) HeapAlloc(me_heap, 0, (count)*sizeof(type)) @@ -95,6 +96,11 @@ static inline int ME_IsWSpace(WCHAR ch) return ch > '\0' && ch <= ' '; } +static inline int ME_CharCompare(WCHAR a, WCHAR b, int caseSensitive) +{ + return caseSensitive ? (a == b) : (toupperW(a) == toupperW(b)); +} + /* note: those two really return the first matching offset (starting from EOS)+1 * in other words, an offset of the first trailing white/black */ int ME_ReverseFindNonWhitespaceV(ME_String *s, int nVChar); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 874aee9..b650785 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -76,7 +76,7 @@ struct find_s find_tests2[] = { {20, 10, "Wine", FR_MATCHCASE, 13, 0}, /* Case-insensitive */ - {1, 31, "wInE", FR_DOWN, 4, 1}, + {1, 31, "wInE", FR_DOWN, 4, 0}, {1, 31, "Wine", FR_DOWN, 4, 0}, /* High-to-low ranges */

1 0

Ulrich Czekalla : msi: Implement MsiSourceListAddSource.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 9d389ec03f2f3eb4c7391112530ebae02d5c42d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d389ec03f2f3eb4c739111… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Tue Feb 21 14:24:25 2006 -0500 msi: Implement MsiSourceListAddSource. --- dlls/msi/msi.spec | 4 ++-- dlls/msi/source.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 7c0ea81..8dfade1 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -203,8 +203,8 @@ 207 stub MsiSetFeatureAttributesW 208 stub MsiSourceListClearAllA 209 stub MsiSourceListClearAllW -210 stub MsiSourceListAddSourceA -211 stub MsiSourceListAddSourceW +210 stdcall MsiSourceListAddSourceA(str str long str) +211 stdcall MsiSourceListAddSourceW(wstr wstr long wstr) 212 stub MsiSourceListForceResolutionA 213 stub MsiSourceListForceResolutionW 214 stub MsiIsProductElevatedA diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 4f67e18..e0ed472 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -37,6 +37,7 @@ #include "winuser.h" #include "wine/unicode.h" #include "action.h" +#include "sddl.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -397,6 +398,61 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWS } /****************************************************************** + * MsiSourceListAddSourceW (MSI.@) + */ +UINT WINAPI MsiSourceListAddSourceW( LPCWSTR szProduct, LPCWSTR szUserName, + DWORD dwReserved, LPCWSTR szSource) +{ + INT ret; + LPWSTR sidstr = NULL; + DWORD sidsize = 0; + + TRACE("%s %s %s\n", debugstr_w(szProduct), debugstr_w(szUserName), debugstr_w(szSource)); + + if (LookupAccountNameW(NULL, szUserName, NULL, &sidsize, NULL, NULL, NULL)) + { + PSID psid = msi_alloc(sidsize); + + if (LookupAccountNameW(NULL, szUserName, psid, &sidsize, NULL, NULL, NULL)) + ConvertSidToStringSidW(psid, &sidstr); + + msi_free(psid); + } + + ret = MsiSourceListAddSourceExW(szProduct, sidstr, + MSIINSTALLCONTEXT_USERMANAGED, MSISOURCETYPE_NETWORK, szSource, 0); + + if (sidstr) + LocalFree(sidstr); + + return ret; +} + +/****************************************************************** + * MsiSourceListAddSourceA (MSI.@) + */ +UINT WINAPI MsiSourceListAddSourceA( LPCSTR szProduct, LPCSTR szUserName, + DWORD dwReserved, LPCSTR szSource) +{ + INT ret; + LPWSTR szwproduct; + LPWSTR szwusername; + LPWSTR szwsource; + + szwproduct = strdupAtoW( szProduct ); + szwusername = strdupAtoW( szUserName ); + szwsource = strdupAtoW( szSource ); + + ret = MsiSourceListAddSourceW(szwproduct, szwusername, 0, szwsource); + + msi_free(szwproduct); + msi_free(szwusername); + msi_free(szwsource); + + return ret; +} + +/****************************************************************** * MsiSourceListAddSourceExW (MSI.@) */ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid,

1 0

Ulrich Czekalla : advapi32: Add partial implementation of LookupAccountNameW.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 7aa3be47412a759a2458058a31d5d68c9d6e5817 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7aa3be47412a759a2458058… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Tue Feb 21 14:17:24 2006 -0500 advapi32: Add partial implementation of LookupAccountNameW. --- dlls/advapi32/security.c | 71 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index cd61f53..746c79a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1775,13 +1775,50 @@ LookupAccountNameA( IN OUT LPDWORD cbReferencedDomainName, OUT PSID_NAME_USE name_use ) { + BOOL ret; + UNICODE_STRING lpSystemW; + UNICODE_STRING lpAccountW; + LPWSTR lpReferencedDomainNameW = NULL; + + RtlCreateUnicodeStringFromAsciiz(&lpSystemW, system); + RtlCreateUnicodeStringFromAsciiz(&lpAccountW, account); + + if (ReferencedDomainName) + lpReferencedDomainNameW = HeapAlloc(GetProcessHeap(), 0, *cbReferencedDomainName * sizeof(WCHAR)); + + ret = LookupAccountNameW(lpSystemW.Buffer, lpAccountW.Buffer, sid, cbSid, lpReferencedDomainNameW, + cbReferencedDomainName, name_use); + + if (ret && lpReferencedDomainNameW) + { + WideCharToMultiByte(CP_ACP, 0, lpReferencedDomainNameW, *cbReferencedDomainName, + ReferencedDomainName, *cbReferencedDomainName, NULL, NULL); + } + + RtlFreeUnicodeString(&lpSystemW); + RtlFreeUnicodeString(&lpAccountW); + + if (lpReferencedDomainNameW) + HeapFree(GetProcessHeap(), 0, lpReferencedDomainNameW); + + return ret; +} + +/****************************************************************************** + * LookupAccountNameW [ADVAPI32.@] + */ +BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSID Sid, + LPDWORD cbSid, LPWSTR ReferencedDomainName, + LPDWORD cchReferencedDomainName, PSID_NAME_USE peUse ) +{ /* Default implementation: Always return a default SID */ SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; BOOL ret; PSID pSid; - static const char dm[] = "DOMAIN"; + static const WCHAR dm[] = {'D','O','M','A','I','N'}; - FIXME("(%s,%s,%p,%p,%p,%p,%p), stub.\n",system,account,sid,cbSid,ReferencedDomainName,cbReferencedDomainName,name_use); + FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), + Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); ret = AllocateAndInitializeSid(&identifierAuthority, 2, @@ -1792,14 +1829,15 @@ LookupAccountNameA( if (!ret) return FALSE; - if(!RtlValidSid(pSid)) + + if (!RtlValidSid(pSid)) { FreeSid(pSid); return FALSE; } - if (sid != NULL && (*cbSid >= GetLengthSid(pSid))) - CopySid(*cbSid, sid, pSid); + if (Sid != NULL && (*cbSid >= GetLengthSid(pSid))) + CopySid(*cbSid, Sid, pSid); if (*cbSid < GetLengthSid(pSid)) { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -1807,14 +1845,16 @@ LookupAccountNameA( } *cbSid = GetLengthSid(pSid); - if (ReferencedDomainName != NULL && (*cbReferencedDomainName > strlen(dm))) - strcpy(ReferencedDomainName, dm); - if (*cbReferencedDomainName <= strlen(dm)) + if (ReferencedDomainName != NULL && (*cchReferencedDomainName > strlenW(dm))) + strcpyW(ReferencedDomainName, dm); + + if (*cchReferencedDomainName <= strlenW(dm)) { SetLastError(ERROR_INSUFFICIENT_BUFFER); ret = FALSE; } - *cbReferencedDomainName = strlen(dm)+1; + + *cchReferencedDomainName = strlenW(dm)+1; FreeSid(pSid); @@ -1822,19 +1862,6 @@ LookupAccountNameA( } /****************************************************************************** - * LookupAccountNameW [ADVAPI32.@] - */ -BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSID Sid, - LPDWORD cbSid, LPWSTR ReferencedDomainName, - LPDWORD cchReferencedDomainName, PSID_NAME_USE peUse ) -{ - FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), - Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); - - return FALSE; -} - -/****************************************************************************** * PrivilegeCheck [ADVAPI32.@] */ BOOL WINAPI PrivilegeCheck( HANDLE ClientToken, PPRIVILEGE_SET RequiredPrivileges, LPBOOL pfResult)

1 0