January 2006 - Wine-Commits

Vitaliy Margolen : ntdll: NtQueryInformationToken change parameters according to PSDK.
by Alexandre Julliard Jan. 12, 2006

Jan. 12, 2006

Module: wine Branch: refs/heads/master Commit: 978f4706924f37322aba17493f4cec96c737a21e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=978f4706924f37322aba174… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Thu Jan 12 13:32:09 2006 +0100 ntdll: NtQueryInformationToken change parameters according to PSDK. Check for NULL pointer. --- dlls/ntdll/nt.c | 23 ++++++++++++----------- include/winternl.h | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3fe44cb..5d40c4c 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -189,15 +189,15 @@ NTSTATUS WINAPI NtAdjustPrivilegesToken( */ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, - DWORD tokeninfoclass, - LPVOID tokeninfo, - DWORD tokeninfolength, - LPDWORD retlen ) + TOKEN_INFORMATION_CLASS tokeninfoclass, + PVOID tokeninfo, + ULONG tokeninfolength, + PULONG retlen ) { - unsigned int len = 0; + ULONG len; NTSTATUS status = STATUS_SUCCESS; - TRACE("(%p,%ld,%p,%ld,%p)\n", + TRACE("(%p,%d,%p,%ld,%p)\n", token,tokeninfoclass,tokeninfo,tokeninfolength,retlen); switch (tokeninfoclass) @@ -224,10 +224,11 @@ NTSTATUS WINAPI NtQueryInformationToken( case TokenImpersonationLevel: case TokenStatistics: #endif /* 0 */ + default: + len = 0; } - /* FIXME: what if retlen == NULL ? */ - *retlen = len; + if (retlen) *retlen = len; if (tokeninfolength < len) return STATUS_BUFFER_TOO_SMALL; @@ -244,7 +245,7 @@ NTSTATUS WINAPI NtQueryInformationToken( req->handle = token; wine_server_set_reply( req, sid, sid_len ); status = wine_server_call( req ); - *retlen = reply->user_len + sizeof(TOKEN_USER); + if (retlen) *retlen = reply->user_len + sizeof(TOKEN_USER); if (status == STATUS_SUCCESS) { tuser->User.Sid = sid; @@ -291,7 +292,7 @@ NTSTATUS WINAPI NtQueryInformationToken( if (tpriv && tokeninfolength > FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges )) wine_server_set_reply( req, &tpriv->Privileges, tokeninfolength - FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) ); status = wine_server_call( req ); - *retlen = FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) + reply->len; + if (retlen) *retlen = FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) + reply->len; if (tpriv) tpriv->PrivilegeCount = reply->len / sizeof(LUID_AND_ATTRIBUTES); } SERVER_END_REQ; @@ -309,7 +310,7 @@ NTSTATUS WINAPI NtQueryInformationToken( break; default: { - ERR("Unhandled Token Information class %ld!\n", tokeninfoclass); + ERR("Unhandled Token Information class %d!\n", tokeninfoclass); return STATUS_NOT_IMPLEMENTED; } } diff --git a/include/winternl.h b/include/winternl.h index 0a7b110..67403bb 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1819,7 +1819,7 @@ NTSTATUS WINAPI NtQueryInformationFile( NTSTATUS WINAPI NtQueryInformationPort(HANDLE,PORT_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSTATUS WINAPI NtQueryInformationProcess(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG); NTSTATUS WINAPI NtQueryInformationThread(HANDLE,THREADINFOCLASS,PVOID,ULONG,PULONG); -NTSTATUS WINAPI NtQueryInformationToken(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); +NTSTATUS WINAPI NtQueryInformationToken(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSTATUS WINAPI NtQueryInstallUILanguage(LANGID*); NTSTATUS WINAPI NtQueryIntervalProfile(KPROFILE_SOURCE,PULONG); NTSTATUS WINAPI NtQueryIoCompletion(HANDLE,IO_COMPLETION_INFORMATION_CLASS,PVOID,ULONG,PULONG);

1 0

Ge van Geldorp : shell32: Fix directory execution.
by Alexandre Julliard Jan. 12, 2006

Jan. 12, 2006

Module: wine Branch: refs/heads/master Commit: a8d1e6e068cc3b385214e7c1f1f37de064a76954 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8d1e6e068cc3b385214e7c… Author: Ge van Geldorp <gvg(a)reactos.org> Date: Thu Jan 12 13:31:45 2006 +0100 shell32: Fix directory execution. Only use the Folder class handler if we're actually executing a folder. --- dlls/shell32/shlexec.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 350ad7d..8290639 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1315,9 +1315,22 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW strcpyW(wszApplicationName, wExplorer); sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST; - } else if (HCR_GetExecuteCommandW(0, wszFolder, sei_tmp.lpVerb?sei_tmp.lpVerb:wszOpen, buffer, sizeof(buffer))) { - SHELL_ArgifyW(wszApplicationName, sizeof(wszApplicationName)/sizeof(WCHAR), buffer, NULL, sei_tmp.lpIDList, NULL); - + } else { + WCHAR target[MAX_PATH]; + DWORD attribs; + /* Check if we're executing a directory and if so use the + handler for the Folder class */ + strcpyW(target, buffer); + attribs = GetFileAttributesW(buffer); + if (attribs != INVALID_FILE_ATTRIBUTES && + (attribs & FILE_ATTRIBUTE_DIRECTORY) && + HCR_GetExecuteCommandW(0, wszFolder, + sei_tmp.lpVerb?sei_tmp.lpVerb:wszOpen, + buffer, sizeof(buffer))) { + SHELL_ArgifyW(wszApplicationName, + sizeof(wszApplicationName)/sizeof(WCHAR), + buffer, target, sei_tmp.lpIDList, NULL); + } sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST; } }

1 0

James Hawkins : advpack: Add documentation for ExecuteCab.
by Alexandre Julliard Jan. 12, 2006

Jan. 12, 2006

Module: wine Branch: refs/heads/master Commit: 92797c7b21d071af9ecbdaf4ee74b1b3b27decad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92797c7b21d071af9ecbdaf… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jan 12 13:31:23 2006 +0100 advpack: Add documentation for ExecuteCab. --- dlls/advpack/advpack.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 01f2490..8fd87fd 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -565,6 +565,17 @@ HRESULT WINAPI DelNodeRunDLL32( HWND hWn /*********************************************************************** * ExecuteCab (ADVPACK.@) + * + * Installs the INF file extracted from a specified cabinet file. + * + * PARAMS + * hwnd [I] Handle to the window used for the display. + * pCab [I] Information about the cabinet file. + * pReserved [I] Reserved. Must be NULL. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. * * BUGS * Unimplemented

1 0

James Hawkins : advpack: Add stubs for the remaining registry functions.
by Alexandre Julliard Jan. 12, 2006

Jan. 12, 2006

Module: wine Branch: refs/heads/master Commit: ee3194bee2d0684c3f29bd6e2a0bf333331cf0c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee3194bee2d0684c3f29bd6… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jan 12 13:31:12 2006 +0100 advpack: Add stubs for the remaining registry functions. --- dlls/advpack/advpack.spec | 6 +-- dlls/advpack/reg.c | 97 +++++++++++++++++++++++++++++++++++++++++++++ include/advpub.h | 19 +++++++++ 3 files changed, 119 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 0d238ba..f1e200f 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -20,9 +20,9 @@ @ stub OpenINFEngine @ stub RebootCheckOnInstall @ stdcall RegInstall(ptr str ptr) -@ stub RegRestoreAll -@ stub RegSaveRestore -@ stub RegSaveRestoreOnINF +@ stdcall RegRestoreAll(ptr str long) +@ stdcall RegSaveRestore(ptr str long str str str long) +@ stdcall RegSaveRestoreOnINF(ptr str str str long long long) @ stdcall RegisterOCX(ptr ptr str long) @ stdcall RunSetupCommand(long str str str str ptr long ptr) @ stub SetPerUserSecValues diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 95922a3..84b696d 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -100,6 +100,17 @@ error: /*********************************************************************** * RegInstall (advpack.@) * + * Loads an INF from a string resource, adds entries to the string + * substitution table, and executes the INF. + * + * PARAMS + * hm [I] Module that contains the REGINST resouce. + * pszSection [I] The INF section to execute. + * pstTable [I] Table of string substitutions. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. */ HRESULT WINAPI RegInstall(HMODULE hm, LPCSTR pszSection, LPCSTRTABLE pstTable) { @@ -176,3 +187,89 @@ HRESULT WINAPI RegInstall(HMODULE hm, LP return S_OK; } + +/*********************************************************************** + * RegRestoreAll (advpack.@) + * + * Restores all saved registry entries. + * + * PARAMS + * hWnd [I] Handle to the window used for the display. + * pszTitleString [I] Title of the window. + * hkBackupKey [I] Handle to the backup key. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * BUGS + * Unimplemented. + */ +HRESULT WINAPI RegRestoreAll(HWND hWnd, PSTR pszTitleString, HKEY hkBackupKey) +{ + FIXME("(%p, %p, %p) stub\n", hWnd, pszTitleString, hkBackupKey); + + return E_FAIL; +} + +/*********************************************************************** + * RegSaveRestore (advpack.@) + * + * Saves or restores the specified registry value. + * + * PARAMS + * hWnd [I] Handle to the window used for the display. + * pszTitleString [I] Title of the window. + * hkBackupKey [I] Key used to store the backup data. + * pcszRootKey [I] Root key of the registry value + * pcszSubKey [I] Sub key of the registry value. + * pcszValueName [I] Value to save or restore. + * dwFlags [I] See advpub.h. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * BUGS + * Unimplemented. + */ +HRESULT WINAPI RegSaveRestore(HWND hWnd, PCSTR pszTitleString, HKEY hkBackupKey, + PCSTR pcszRootKey, PCSTR pcszSubKey, + PCSTR pcszValueName, DWORD dwFlags) +{ + FIXME("(%p, %p, %p, %p, %p, %p, %ld) stub\n", hWnd, pszTitleString, + hkBackupKey, pcszRootKey, pcszSubKey, pcszValueName, dwFlags); + + return E_FAIL; +} + +/*********************************************************************** + * RegSaveRestoreOnINF (advpack.@) + * + * Saves or restores the specified INF Reg section. + * + * PARAMS + * hWnd [I] Handle to the window used for the display. + * pszTitle [I] Title of the window. + * pszINF [I] Filename of the INF. + * pszSection [I] Section to save or restore. + * hHKLMBackKey [I] Opened key in HKLM to store data. + * hHKCUBackKey [I] Opened key in HKCU to store data. + * dwFlags [I] See advpub.h + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * BUGS + * Unimplemented. + */ +HRESULT WINAPI RegSaveRestoreOnINF(HWND hWnd, PCSTR pszTitle, PCSTR pszINF, + PCSTR pszSection, HKEY hHKLMBackKey, + HKEY hHKCUBackKey, DWORD dwFlags) +{ + FIXME("(%p, %p, %p, %p, %p, %p, %ld) stub\n", hWnd, pszTitle, pszINF, + pszSection, hHKLMBackKey, hHKCUBackKey, dwFlags); + + return E_FAIL; +} diff --git a/include/advpub.h b/include/advpub.h index 2d0139f..04c60fd 100644 --- a/include/advpub.h +++ b/include/advpub.h @@ -72,6 +72,20 @@ typedef CSTRTABLE *LPCSTRTABLE; #define ADN_DONT_DEL_DIR 0x00000004 #define ADN_DEL_UNC_PATHS 0x00000008 +/* Flags for RegRestoreAll, RegSaveRestore, RegSaveRestoreOnINF */ +#define IE4_RESTORE 0x00000001 +#define IE4_BACKNEW 0x00000002 +#define IE4_NODELETENEW 0x00000004 +#define IE4_NOMESSAGES 0x00000008 +#define IE4_NOPROGRESS 0x00000010 +#define IE4_NOENUMKEY 0x00000020 +#define IE4_NO_CRC_MAPPING 0x00000040 +#define IE4_REGSECTION 0x00000080 +#define IE4_FRDOALL 0x00000100 +#define IE4_UPDREFCNT 0x00000200 +#define IE4_USEREFCNT 0x00000400 +#define IE4_EXTRAINCREFCNT 0x00000800 + HRESULT WINAPI AdvInstallFile(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile, LPCSTR lpszDestDir, LPCSTR lpszDestFile, DWORD dwFlags, DWORD dwReserved); @@ -87,6 +101,11 @@ HRESULT WINAPI LaunchINFSectionEx(HWND,H DWORD WINAPI NeedRebootInit(VOID); BOOL WINAPI NeedReboot(DWORD dwRebootCheck); HRESULT WINAPI RegInstall(HMODULE hm, LPCSTR pszSection, LPCSTRTABLE pstTable); +HRESULT WINAPI RegRestoreAll(HWND hWnd, PSTR pszTitleString, HKEY hkBackupKey); +HRESULT WINAPI RegSaveRestore(HWND hWnd, PCSTR pszTitleString, HKEY hkBackupKey, + PCSTR pcszRootKey, PCSTR pcszSubKey, PCSTR pcszValueName, DWORD dwFlags); +HRESULT WINAPI RegSaveRestoreOnINF(HWND hWnd, PCSTR pszTitle, PCSTR pszINF, + PCSTR pszSection, HKEY hHKLMBackKey, HKEY hHKCUBackKey, DWORD dwFlags); HRESULT WINAPI RunSetupCommand(HWND hWnd, LPCSTR szCmdName, LPCSTR szInfSection, LPCSTR szDir, LPCSTR lpszTitle, HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved);

1 0

James Hawkins : cabinet: Move the remaining cabextract.c functions to fdi.c.
by Alexandre Julliard Jan. 12, 2006

Jan. 12, 2006

Module: wine Branch: refs/heads/master Commit: 877c8092cf32418ce65838b9c89ae5b556fc1832 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=877c8092cf32418ce65838b… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jan 12 13:30:43 2006 +0100 cabinet: Move the remaining cabextract.c functions to fdi.c. --- dlls/cabinet/Makefile.in | 1 dlls/cabinet/cabextract.c | 209 --------------------------------------------- dlls/cabinet/cabinet.h | 3 - dlls/cabinet/fdi.c | 163 +++++++++++++++++++++++++++++++++++ 4 files changed, 164 insertions(+), 212 deletions(-) delete mode 100644 dlls/cabinet/cabextract.c

1 0

Stefan Brüns : commdlg: Makes return value of FILEDLG95_SendFileOK dependent of
by Alexandre Julliard Jan. 12, 2006

Jan. 12, 2006

Module: wine Branch: refs/heads/master Commit: 324b11f206c046e581b858a2f6b2af7a6bc383d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=324b11f206c046e581b858a… Author: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Date: Thu Jan 12 13:30:11 2006 +0100 commdlg: Makes return value of FILEDLG95_SendFileOK dependent of return value, not of DWL_MSGRESULT. --- dlls/commdlg/filedlg.c | 26 ++++++++++++++++---------- dlls/commdlg/filedlgbrowser.c | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c index cbe6198..014e9f3 100644 --- a/dlls/commdlg/filedlg.c +++ b/dlls/commdlg/filedlg.c @@ -228,7 +228,7 @@ static void *MemAlloc(UINT size); static void MemFree(void *mem); INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -void SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); +LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCount, UINT sizeUsed); static BOOL BrowseSelectedFolder(HWND hwnd); @@ -811,13 +811,15 @@ static HWND CreateTemplateDialog(FileOpe * Send CustomDialogNotification (CDN_FIRST -- CDN_LAST) message to the custom template dialog */ -void SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode) +LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode) { + LRESULT hook_result = 0; + FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwndParentDlg,FileOpenDlgInfosStr); TRACE("%p 0x%04x\n",hwndParentDlg, uCode); - if(!fodInfos) return; + if(!fodInfos) return 0; if(fodInfos->DlgInfos.hwndCustomDlg) { @@ -830,7 +832,7 @@ void SendCustomDlgNotificationMessage(HW ofnNotify.hdr.code = uCode; ofnNotify.lpOFN = fodInfos->ofnInfos; ofnNotify.pszFile = NULL; - SendMessageW(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify); + hook_result = SendMessageW(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify); } else { @@ -840,10 +842,12 @@ void SendCustomDlgNotificationMessage(HW ofnNotify.hdr.code = uCode; ofnNotify.lpOFN = (LPOPENFILENAMEA)fodInfos->ofnInfos; ofnNotify.pszFile = NULL; - SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify); + hook_result = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify); } TRACE("RET NOTIFY\n"); } + TRACE("Retval: 0x%08lx\n", hook_result); + return hook_result; } static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer) @@ -1593,22 +1597,24 @@ static BOOL FILEDLG95_SendFileOK( HWND h /* ask the hook if we can close */ if(IsHooked(fodInfos)) { + LRESULT retval; + TRACE("---\n"); /* First send CDN_FILEOK as MSDN doc says */ - SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK); + retval = SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK); if (GetWindowLongPtrW(fodInfos->DlgInfos.hwndCustomDlg, DWLP_MSGRESULT)) { TRACE("canceled\n"); - return FALSE; + return (retval == 0); } /* fodInfos->ofnInfos points to an ASCII or UNICODE structure as appropriate */ - SendMessageW(fodInfos->DlgInfos.hwndCustomDlg, - fodInfos->HookMsg.fileokstring, 0, (LPARAM)fodInfos->ofnInfos); + retval = SendMessageW(fodInfos->DlgInfos.hwndCustomDlg, + fodInfos->HookMsg.fileokstring, 0, (LPARAM)fodInfos->ofnInfos); if (GetWindowLongPtrW(fodInfos->DlgInfos.hwndCustomDlg, DWLP_MSGRESULT)) { TRACE("canceled\n"); - return FALSE; + return (retval == 0); } } return TRUE; diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c index 2b7d678..c8731b9 100644 --- a/dlls/commdlg/filedlgbrowser.c +++ b/dlls/commdlg/filedlgbrowser.c @@ -88,7 +88,7 @@ extern LPITEMIDLIST GetParentPidl(LP extern LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPCSTR lpcstrFileName); extern int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl); -extern void SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); +extern LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); /*

1 0

Detlef Riekenberg : ntdll/tests: Skip tests if NtCurrentTeb doesn't exist.
by Alexandre Julliard Jan. 12, 2006

Jan. 12, 2006

Module: wine Branch: refs/heads/master Commit: 1be185f76e7a7158d2d77c5a7f186eac4e5cf3ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1be185f76e7a7158d2d77c5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jan 12 13:29:49 2006 +0100 ntdll/tests: Skip tests if NtCurrentTeb doesn't exist. --- dlls/ntdll/tests/exception.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0667e57..9cc431b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -18,7 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <assert.h> #include <stdarg.h> #ifndef _WIN32_WINNT @@ -202,7 +201,11 @@ static void test_prot_fault(void) } exc_frame; pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); - assert( pNtCurrentTeb ); + if (!pNtCurrentTeb) + { + trace( "NtCurrentTeb not found, skipping tests\n" ); + return; + } exc_frame.frame.Handler = handler; exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList;

1 0

Martin Fuchs : shell32: MSVC compatibility fix in dump_pidl_hex().
by Alexandre Julliard Jan. 12, 2006

Jan. 12, 2006

Module: wine Branch: refs/heads/master Commit: 73096db50133187cc18dffa23b4be99af3c2abd4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73096db50133187cc18dffa… Author: Martin Fuchs <martin-fuchs(a)gmx.net> Date: Thu Jan 12 13:29:21 2006 +0100 shell32: MSVC compatibility fix in dump_pidl_hex(). --- dlls/shell32/debughlp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index 46230b6..35b6b2c 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -224,7 +224,8 @@ void pdump (LPCITEMIDLIST pidl) static void dump_pidl_hex( LPCITEMIDLIST pidl ) { const unsigned char *p = (const unsigned char *)pidl; - const int max_bytes = 0x80, max_line = 0x10; + const int max_bytes = 0x80; +#define max_line 0x10 char szHex[max_line*3+1], szAscii[max_line+1]; int i, n;

1 0

Robert Shearman : kernel32: Fix GlobalReAlloc for size = 0.
by Alexandre Julliard Jan. 12, 2006

Jan. 12, 2006

Module: wine Branch: refs/heads/master Commit: 9cc41d278ff1d0bebe034ca64d82388751e4aeb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9cc41d278ff1d0bebe034ca… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jan 12 11:55:25 2006 +0100 kernel32: Fix GlobalReAlloc for size = 0. GlobalReAlloc should return NULL if the requested size is 0, the block is moveable and it is locked, but otherwise it should return the original memory block. --- dlls/kernel/heap.c | 12 +++++++++--- dlls/kernel/tests/heap.c | 14 ++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index 6c0b913..19d4b5b 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -657,11 +657,17 @@ HGLOBAL WINAPI GlobalReAlloc( } else { - if(pintern->Pointer) + if (pintern->LockCount == 0) { - HeapFree(GetProcessHeap(), 0, (char *) pintern->Pointer-HGLOBAL_STORAGE); - pintern->Pointer=NULL; + if(pintern->Pointer) + { + HeapFree(GetProcessHeap(), 0, (char *) pintern->Pointer-HGLOBAL_STORAGE); + pintern->Pointer = NULL; + } + hnew = hmem; } + else + WARN("not freeing memory associated with locked handle\n"); } } } diff --git a/dlls/kernel/tests/heap.c b/dlls/kernel/tests/heap.c index 27a51cf..a6284a0 100644 --- a/dlls/kernel/tests/heap.c +++ b/dlls/kernel/tests/heap.c @@ -63,11 +63,8 @@ START_TEST(heap) size = GlobalSize(gbl); ok(size >= 10 && size <= 16, "Memory not resized to size 10, instead size=%ld\n", size); - todo_wine - { - gbl = GlobalReAlloc(gbl, 0, GMEM_MOVEABLE); - ok(gbl != NULL, "GlobalReAlloc should not fail on size 0\n"); - } + gbl = GlobalReAlloc(gbl, 0, GMEM_MOVEABLE); + ok(gbl != NULL, "GlobalReAlloc should not fail on size 0\n"); size = GlobalSize(gbl); ok(size == 0, "Memory not resized to size 0, instead size=%ld\n", size); @@ -87,11 +84,8 @@ START_TEST(heap) size = LocalSize(gbl); ok(size >= 10 && size <= 16, "Memory not resized to size 10, instead size=%ld\n", size); - todo_wine - { - gbl = LocalReAlloc(gbl, 0, LMEM_MOVEABLE); - ok(gbl != NULL, "LocalReAlloc should not fail on size 0\n"); - } + gbl = LocalReAlloc(gbl, 0, LMEM_MOVEABLE); + ok(gbl != NULL, "LocalReAlloc should not fail on size 0\n"); size = LocalSize(gbl); ok(size == 0, "Memory not resized to size 0, instead size=%ld\n", size);

1 0

Phil Krylov : riched20: Initial support for word break callback procedures.
by Alexandre Julliard Jan. 12, 2006

Jan. 12, 2006

Module: wine Branch: refs/heads/master Commit: 49eecf5128947c82065538639d668942e5c76cb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=49eecf5128947c820655386… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Thu Jan 12 11:54:57 2006 +0100 riched20: Initial support for word break callback procedures. --- dlls/riched20/caret.c | 101 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/riched20/editor.c | 20 +++++++-- dlls/riched20/editor.h | 3 + dlls/riched20/editstr.h | 1 dlls/riched20/string.c | 48 ++++++++++++++++++++++ 5 files changed, 161 insertions(+), 12 deletions(-)

1 0