January 2006 - Wine-commits

Alexandre Julliard : ntdll: Check file size when mapping image sections to avoid SIGBUS errors.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 67f29999a36ce3725a52b79ed618964244cc96ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67f29999a36ce3725a52b79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 17:39:23 2006 +0100 ntdll: Check file size when mapping image sections to avoid SIGBUS errors. --- dlls/ntdll/virtual.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 922c1b3..912f5c4 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -35,6 +35,7 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> +#include <sys/stat.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif @@ -835,6 +836,7 @@ static NTSTATUS map_image( HANDLE hmappi NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; off_t pos; + struct stat st; struct file_view *view = NULL; char *ptr; @@ -857,7 +859,13 @@ static NTSTATUS map_image( HANDLE hmappi /* map the header */ + if (fstat( fd, &st ) == -1) + { + status = FILE_GetNtStatus(); + goto error; + } status = STATUS_INVALID_IMAGE_FORMAT; /* generic error */ + if (header_size > st.st_size) goto error; if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ, removable ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr; @@ -996,7 +1004,9 @@ static NTSTATUS map_image( HANDLE hmappi /* Note: if the section is not aligned properly map_file_into_view will magically * fall back to read(), so we don't need to check anything here. */ - if (map_file_into_view( view, fd, sec->VirtualAddress, file_size, sec->PointerToRawData, + end = sec->PointerToRawData + file_size; + if (sec->PointerToRawData >= st.st_size || end > st.st_size || end < sec->PointerToRawData || + map_file_into_view( view, fd, sec->VirtualAddress, file_size, sec->PointerToRawData, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, removable ) != STATUS_SUCCESS) {

1 0

Robert Reif : dsound: Remove WINAPI from internal functions.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 0265676a2758320b6a4454337cb1444e93eb0f80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0265676a2758320b6a44543… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Jan 3 17:32:50 2006 +0100 dsound: Remove WINAPI from internal functions. --- dlls/dsound/buffer.c | 12 +++++----- dlls/dsound/capture.c | 8 +++---- dlls/dsound/dsound.c | 16 +++++++------ dlls/dsound/dsound_private.h | 50 +++++++++++++++++++++--------------------- dlls/dsound/primary.c | 2 +- dlls/dsound/propset.c | 6 +++-- dlls/dsound/sound3d.c | 8 +++---- 7 files changed, 51 insertions(+), 51 deletions(-)

1 0

Markus Amsler : advpack: Make DoInfInstall return an HRESULT.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 30086feb441175fab81e323dab0c77e0443f1e9a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30086feb441175fab81e323… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Tue Jan 3 17:33:02 2006 +0100 advpack: Make DoInfInstall return an HRESULT. --- dlls/advpack/advpack.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 6a6f591..31fa51c 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -190,8 +190,17 @@ typedef struct /*********************************************************************** * DoInfInstall (ADVPACK.@) + * + * Install an INF section. + * + * PARAMS + * setup [I] Structure containing install information. + * + * RETURNS + * S_OK Everything OK + * HRESULT_FROM_WIN32(GetLastError()) Some other error */ -BOOL WINAPI DoInfInstall(const SETUPCOMMAND_PARAMS *setup) +HRESULT WINAPI DoInfInstall(const SETUPCOMMAND_PARAMS *setup) { BOOL ret; HINF hinf; @@ -202,7 +211,7 @@ BOOL WINAPI DoInfInstall(const SETUPCOMM debugstr_a(setup->section_name)); hinf = SetupOpenInfFileA(setup->inf_name, NULL, INF_STYLE_WIN4, NULL); - if (hinf == INVALID_HANDLE_VALUE) return FALSE; + if (hinf == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); callback_context = SetupInitDefaultQueueCallback(setup->hwnd); @@ -212,7 +221,7 @@ BOOL WINAPI DoInfInstall(const SETUPCOMM SetupTermDefaultQueueCallback(callback_context); SetupCloseInfFile(hinf); - return ret; + return ret ? S_OK : HRESULT_FROM_WIN32(GetLastError()); } /***********************************************************************

1 0

Alexandre Julliard : Support building flex files without debug support.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 88991e2a4e61a8e40c7ca8041961974a37ab00bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88991e2a4e61a8e40c7ca80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 15:11:46 2006 +0100 Support building flex files without debug support. --- libs/wpp/wpp.c | 2 +- tools/widl/widl.c | 1 + tools/wrc/wrc.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index ec70e87..d7b2dc8 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -28,7 +28,7 @@ #include "wpp_private.h" #include "wine/wpp.h" -int ppdebug; +int ppdebug, pp_flex_debug; struct define { diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 2c4a3c6..02e7eee 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -80,6 +80,7 @@ static const char version_string[] = "Wi int win32 = 1; int debuglevel = DEBUGLEVEL_NONE; +int yy_flex_debug; int pedantic = 0; static int do_everything = 1; diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 394efb0..679f0cd 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -166,6 +166,8 @@ int char_number = 1; /* The current cha char *cmdline; /* The entire commandline */ time_t now; /* The time of start of wrc */ +int yy_flex_debug; + resource_t *resource_top; /* The top of the parsed resources */ int getopt (int argc, char *const *argv, const char *optstring);

1 0

Markus Amsler : advpack: Fix LaunchInfSection[Ex] documentation.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: b286e7f503f208f27843f58fe8d736bc74f9e899 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b286e7f503f208f27843f58… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Tue Jan 3 15:12:29 2006 +0100 advpack: Fix LaunchInfSection[Ex] documentation. --- dlls/advpack/advpack.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 2951900..6a6f591 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -127,7 +127,23 @@ HRESULT WINAPI RunSetupCommand( HWND hWn /*********************************************************************** * LaunchINFSection (ADVPACK.@) * - * See LaunchINFSectionEx. + * Installs an INF section without BACKUP/ROLLBACK capabilities. + * + * PARAMS + * hWnd [I] Handle to parent window, NULL for desktop. + * hInst [I] Instance of the process. + * cmdline [I] Contains parameters in the order INF,section,flags. + * show [I] Reboot behaviour: + * 'A' reboot always + * 'I' default, reboot if needed + * 'N' no reboot + * + * RETURNS + * Success: S_OK. + * Failure: S_FALSE + * + * BUGS + * Unimplemented. */ INT WINAPI LaunchINFSection( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) { @@ -138,13 +154,16 @@ INT WINAPI LaunchINFSection( HWND hWnd, /*********************************************************************** * LaunchINFSectionEx (ADVPACK.@) * - * Installs an INF section. + * Installs an INF section with BACKUP/ROLLBACK capabilities. * * PARAMS - * hWnd [I] Handle to the window used for the display. + * hWnd [I] Handle to parent window, NULL for desktop. * hInst [I] Instance of the process. * cmdline [I] Contains parameters in the order INF,section,CAB,flags. - * show [I] How the window should be shown. + * show [I] Reboot behaviour: + * 'A' reboot always + * 'I' default, reboot if needed + * 'N' no reboot * * RETURNS * Success: S_OK.

1 0

Rolf Kalbermatter : include: Fix DECLSPEC_NORETURN for compilation with MS C compiler.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 97ede2dca82a0f210bcfd0b9e219b784facc668c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=97ede2dca82a0f210bcfd0b… Author: Rolf Kalbermatter <rolf.kalbermatter(a)citeng.com> Date: Tue Jan 3 13:33:22 2006 +0100 include: Fix DECLSPEC_NORETURN for compilation with MS C compiler. --- include/wine/pthread.h | 4 +--- include/winternl.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/wine/pthread.h b/include/wine/pthread.h index 1ec3307..36381fe 100644 --- a/include/wine/pthread.h +++ b/include/wine/pthread.h @@ -73,9 +73,7 @@ struct wine_pthread_callbacks /* we don't want to include winnt.h here */ #ifndef DECLSPEC_NORETURN -# if defined(_MSC_VER) && (_MSC_VER >= 1200) -# define DECLSPEC_NORETURN __declspec(noreturn) -# elif defined(__GNUC__) +# ifdef __GNUC__ # define DECLSPEC_NORETURN __attribute__((noreturn)) # else # define DECLSPEC_NORETURN diff --git a/include/winternl.h b/include/winternl.h index 2be14d3..dcd251e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2013,7 +2013,7 @@ BOOL WINAPI RtlEqualPrefixSid(PSID, BOOL WINAPI RtlEqualSid(PSID,PSID); BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); -void WINAPI RtlExitUserThread(ULONG) DECLSPEC_NORETURN; +void DECLSPEC_NORETURN WINAPI RtlExitUserThread(ULONG); NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT); LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT);

1 0

Michael Jung : shell32/unixfs: Added unicode support in folder and file pidls.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 9281c948bf2c0cdf9a70eb12bac2bfb8e249f7cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9281c948bf2c0cdf9a70eb1… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Tue Jan 3 13:23:59 2006 +0100 shell32/unixfs: Added unicode support in folder and file pidls. --- dlls/shell32/shfldr_unixfs.c | 344 +++++++++++++++++++++++++++++----------- dlls/shell32/tests/shlfolder.c | 13 +- 2 files changed, 257 insertions(+), 100 deletions(-)

1 0

Michael Jung : shell32: Helper function for unicode support in folder and file pidls.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 5136f57f12e99f2be686e3a6d9b4eaad2e436428 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5136f57f12e99f2be686e3a… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Tue Jan 3 13:23:44 2006 +0100 shell32: Helper function for unicode support in folder and file pidls. --- dlls/shell32/pidl.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++---- dlls/shell32/pidl.h | 15 ++++++++++++++ 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index b39fb24..fb85949 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1811,15 +1811,21 @@ DWORD _ILSimpleGetText (LPCITEMIDLIST pi */ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) { - DWORD dwReturn; + DWORD dwReturn; char szTemp[MAX_PATH]; + FileStructW *pFileStructW = _ILGetFileStructW(pidl); TRACE("(%p %p %x)\n",pidl,szOut,uOutSize); - dwReturn = _ILSimpleGetText(pidl, szTemp, uOutSize); + if (pFileStructW) { + lstrcpynW(szOut, pFileStructW->wszName, uOutSize); + dwReturn = lstrlenW(pFileStructW->wszName); + } else { + dwReturn = _ILSimpleGetText(pidl, szTemp, MAX_PATH); - if (!MultiByteToWideChar(CP_ACP, 0, szTemp, -1, szOut, MAX_PATH)) - *szOut = 0; + if (!MultiByteToWideChar(CP_ACP, 0, szTemp, -1, szOut, uOutSize)) + *szOut = 0; + } TRACE("-- (%p=%s 0x%08lx)\n",szOut,debugstr_w(szOut),dwReturn); return dwReturn; @@ -1938,6 +1944,45 @@ IID* _ILGetGUIDPointer(LPCITEMIDLIST pid return NULL; } +/****************************************************************************** + * _ILGetFileStructW [Internal] + * + * Get pointer the a SHITEMID's FileStructW field if present + * + * PARAMS + * pidl [I] The SHITEMID + * + * RETURNS + * Success: Pointer to pidl's FileStructW field. + * Failure: NULL + */ +FileStructW* _ILGetFileStructW(LPCITEMIDLIST pidl) { + FileStructW *pFileStructW; + WORD cbOffset; + + if (!(_ILIsValue(pidl) || _ILIsFolder(pidl))) + return NULL; + + cbOffset = *(WORD*)((LPBYTE)pidl + pidl->mkid.cb - sizeof(WORD)); + pFileStructW = (FileStructW*)((LPBYTE)pidl + cbOffset); + + /* Currently I don't see a fool prove way to figure out if a pidl is for sure of WinXP + * style with a FileStructW member. If we switch all our shellfolder-implementations to + * the new format, this won't be a problem. For now, we do as many sanity checks as possible. */ + if (cbOffset & 0x1 || /* FileStructW member is word aligned in the pidl */ + /* FileStructW is positioned after FileStruct */ + cbOffset < sizeof(pidl->mkid.cb) + sizeof(PIDLTYPE) + sizeof(FileStruct) || + /* There has to be enough space at cbOffset in the pidl to hold FileStructW and cbOffset */ + cbOffset > pidl->mkid.cb - sizeof(cbOffset) - sizeof(FileStructW) || + pidl->mkid.cb != cbOffset + pFileStructW->cbLen) + { + WARN("Invalid pidl format (cbOffset = %d)!\n", cbOffset); + return NULL; + } + + return pFileStructW; +} + /************************************************************************* * _ILGetFileDateTime * diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index df3d1f2..691aa2a 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -143,6 +143,20 @@ typedef struct tagFileStruct The second the dos name when needed or just 0x00 */ } FileStruct; +/* At least on WinXP, this struct is appended with 2-byte-alignment to FileStruct. There follows + * a WORD member after the wszName string, which gives the offset from the beginning of the PIDL + * to the FileStructW member. */ +typedef struct tagFileStructW { + WORD cbLen; + BYTE dummy1[6]; + WORD uCreationDate; + WORD uCreationTime; + WORD uLastAccessDate; + WORD uLastAccessTime; + BYTE dummy2[4]; + WCHAR wszName[1]; +} FileStructW; + typedef struct tagValueW { WCHAR name[1]; @@ -240,6 +254,7 @@ LPPIDLDATA _ILGetDataPointer (LPCITEMIDL LPSTR _ILGetTextPointer (LPCITEMIDLIST); LPSTR _ILGetSTextPointer (LPCITEMIDLIST); IID *_ILGetGUIDPointer (LPCITEMIDLIST pidl); +FileStructW *_ILGetFileStructW (LPCITEMIDLIST pidl); /* * debug helper

1 0

Rein Klazes : user32: Separate menu bitmaps and strings.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: b34868dffa0df144ea9d6e1586a67cff70ae9c4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b34868dffa0df144ea9d6e1… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Tue Jan 3 13:23:28 2006 +0100 user32: Separate menu bitmaps and strings. Store bitmaps and bitmaps always in separate fields in the internal menu structure. Get rid of a lot of assumptions in the code that the menu can have strings only when it is not some other type and that bitmaps come in two flavors. Add a lot of conformance tests, including some submitted by Jason Edmeades. --- dlls/user/menu.c | 317 ++++++++++++++++---------- dlls/user/tests/menu.c | 593 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 785 insertions(+), 125 deletions(-)

1 0

Steven Edwards : gdi: Win16/32 split of most of the metafile support.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: f824852b2662177adebee2445d4a715b1399c329 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f824852b2662177adebee24… Author: Steven Edwards <winehacker(a)gmail.com> Date: Tue Jan 3 13:23:21 2006 +0100 gdi: Win16/32 split of most of the metafile support. --- dlls/gdi/Makefile.in | 1 dlls/gdi/gdi_private.h | 5 + dlls/gdi/metafile.c | 319 ------------------------------------------------ dlls/gdi/metafile16.c | 316 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi/mfdrv/init.c | 23 +++ 5 files changed, 348 insertions(+), 316 deletions(-) create mode 100644 dlls/gdi/metafile16.c

1 0