October 2008 - Wine-Commits

Lei Zhang : regedit: Use W version of TreeView_GetItem.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 4389066754358a0f615218ace74017e54804b8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4389066754358a0f615218ace… Author: Lei Zhang <thestig(a)google.com> Date: Thu Oct 2 01:30:22 2008 -0700 regedit: Use W version of TreeView_GetItem. --- programs/regedit/treeview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index d028b4a..6153a70 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -57,7 +57,7 @@ static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPWSTR* pKe item.mask = TVIF_PARAM; item.hItem = hItem; - if (!TreeView_GetItem(hwndTV, &item)) return FALSE; + if (!TreeView_GetItemW(hwndTV, &item)) return FALSE; if (item.lParam) { /* found root key with valid key value */ @@ -216,7 +216,7 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, item.hItem = hItem; item.pszText = keyname; item.cchTextMax = KEY_MAX_LEN; - if (!TreeView_GetItem(hwndTV, &item)) return FALSE; + if (!TreeView_GetItemW(hwndTV, &item)) return FALSE; if ((mode & SEARCH_KEYS) && match_string(keyname, sstring, mode)) { *row = -1; return TRUE;

1 0

Rob Shearman : wininet: Add tests for InternetTimeFromSystemTimeW with insufficient buffer.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: ef0e3792bb10410bce88b7876b2d8014bf23f661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0e3792bb10410bce88b7876… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Oct 2 11:38:30 2008 +0100 wininet: Add tests for InternetTimeFromSystemTimeW with insufficient buffer. --- dlls/wininet/tests/http.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1c52f27..db4f075 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -789,12 +789,23 @@ static void InternetTimeFromSystemTimeA_test(void) static const SYSTEMTIME time = { 2005, 1, 5, 7, 12, 6, 35, 0 }; char string[INTERNET_RFC1123_BUFSIZE]; static const char expect[] = "Fri, 07 Jan 2005 12:06:35 GMT"; + DWORD error; ret = pInternetTimeFromSystemTimeA( &time, INTERNET_RFC1123_FORMAT, string, sizeof(string) ); ok( ret, "InternetTimeFromSystemTimeA failed (%u)\n", GetLastError() ); ok( !memcmp( string, expect, sizeof(expect) ), "InternetTimeFromSystemTimeA failed (%u)\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = pInternetTimeFromSystemTimeA( &time, INTERNET_RFC1123_FORMAT, string, 0 ); + error = GetLastError(); + todo_wine { + ok( !ret, "InternetTimeFromSystemTimeA should have returned FALSE\n" ); + ok( error == ERROR_INSUFFICIENT_BUFFER, + "InternetTimeFromSystemTimeA failed with ERROR_INSUFFICIENT_BUFFER instead of %u\n", + error ); + } } static void InternetTimeFromSystemTimeW_test(void) @@ -804,12 +815,22 @@ static void InternetTimeFromSystemTimeW_test(void) WCHAR string[INTERNET_RFC1123_BUFSIZE + 1]; static const WCHAR expect[] = { 'F','r','i',',',' ','0','7',' ','J','a','n',' ','2','0','0','5',' ', '1','2',':','0','6',':','3','5',' ','G','M','T',0 }; + DWORD error; ret = pInternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT, string, sizeof(string) ); ok( ret, "InternetTimeFromSystemTimeW failed (%u)\n", GetLastError() ); ok( !memcmp( string, expect, sizeof(expect) ), "InternetTimeFromSystemTimeW failed (%u)\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = pInternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT, string, sizeof(string)/sizeof(string[0]) ); + error = GetLastError(); + ok( !ret, "InternetTimeFromSystemTimeW should have returned FALSE\n" ); + todo_wine + ok( error == ERROR_INSUFFICIENT_BUFFER, + "InternetTimeFromSystemTimeW failed with ERROR_INSUFFICIENT_BUFFER instead of %u\n", + error ); } static void InternetTimeToSystemTimeA_test(void)

1 0

Jeff Zaroyko : hhctrl.ocx: Always set WS_OVERLAPPEDWINDOW.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 8595ffadd99d5d4571ea6c2c735fa082ed21b8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8595ffadd99d5d4571ea6c2c7… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Thu Oct 2 15:10:27 2008 +1000 hhctrl.ocx: Always set WS_OVERLAPPEDWINDOW. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 6a694a9..ff70338 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -825,7 +825,7 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) /* Read in window parameters if available */ if (info->WinType.fsValidMembers & HHWIN_PARAM_STYLES) - dwStyles = info->WinType.dwStyles; + dwStyles = info->WinType.dwStyles | WS_OVERLAPPEDWINDOW; else dwStyles = WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN;

1 0

Rob Shearman : oleaut32: Make the code in copy_to_variant and copy_from_variant more portable.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 5910626aa29883a7aef313a5390cbdba6e0b6259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5910626aa29883a7aef313a53… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Oct 2 11:38:05 2008 +0100 oleaut32: Make the code in copy_to_variant and copy_from_variant more portable. The typeof keyword isn't available on all compilers so avoid it if at all possible. --- dlls/oleaut32/recinfo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 61f6554..a4da4d3 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -59,7 +59,7 @@ static HRESULT copy_to_variant(void *src, VARIANT *pvar, enum VARENUM vt) #define CASE_COPY(x) \ case VT_ ## x: \ - V_ ## x(pvar) = *(typeof(V_ ## x(pvar))*)src; \ + memcpy(&V_ ## x(pvar), src, sizeof(V_ ## x(pvar))); \ break switch(vt) { @@ -106,7 +106,7 @@ static HRESULT copy_from_variant(VARIANT *src, void *dest, enum VARENUM vt) #define CASE_COPY(x) \ case VT_ ## x: \ - *(typeof(V_ ## x(&var))*)dest = V_ ## x(&var); \ + memcpy(dest, &V_ ## x(&var), sizeof(V_ ## x(&var))); \ break switch(vt) {

1 0

Lei Zhang : regedit: Check return values, don' t request unneeded value which always fails.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 86a4e99c04e6ac60148ae858fa0d2c7a0af5ebc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a4e99c04e6ac60148ae858f… Author: Lei Zhang <thestig(a)google.com> Date: Thu Oct 2 01:35:59 2008 -0700 regedit: Check return values, don't request unneeded value which always fails. --- programs/regedit/treeview.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 6153a70..2b6f176 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -267,7 +267,10 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, if ((mode & SEARCH_CONTENT) && (type == REG_EXPAND_SZ || type == REG_SZ)) { LPWSTR buffer; buffer = HeapAlloc(GetProcessHeap(), 0, lenValue); - RegEnumValueW(hKey, i, valName, &lenName, NULL, &type, (LPBYTE)buffer, &lenValue); + if (!buffer) + break; + if (ERROR_SUCCESS != RegEnumValueW(hKey, i, NULL, NULL, NULL, &type, (LPBYTE)buffer, &lenValue)) + break; if (match_string(buffer, sstring, mode)) { HeapFree(GetProcessHeap(), 0, buffer); RegCloseKey(hKey);

1 0

Huw Davies : rpcrt4: Actually set an unmarshalled object ptr to NULL when a NULL pointer id is received .
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: c74de4a1ce1eb0a68925125687414da10b2b36c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74de4a1ce1eb0a6892512568… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 1 13:43:37 2008 -0500 rpcrt4: Actually set an unmarshalled object ptr to NULL when a NULL pointer id is received. --- dlls/rpcrt4/ndr_marshall.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 80e5b81..3be736d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -861,7 +861,10 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (pointer_id) pointer_needs_unmarshaling = 1; else + { + *pPointer = NULL; pointer_needs_unmarshaling = 0; + } break; case RPC_FC_FP: pointer_id = NDR_LOCAL_UINT32_READ(Buffer);

1 0

Dmitry Timoshkov : wine.inf: Correct the Pacific SA Standard Time entry.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 47ecb4882f77d773ba23ff5e70aa913a4a30b790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ecb4882f77d773ba23ff5e7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 2 04:48:44 2008 +0900 wine.inf: Correct the Pacific SA Standard Time entry. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index ffa27c7..3497ce3 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2585,7 +2585,7 @@ HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"TZI",1,5c,fe,ff,ff, HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Display",,"America/Santiago" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Dlt",,"Pacific SA Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Std",,"Pacific SA Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Display",,"America/Los_Angeles" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Dlt",,"Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Std",,"Pacific Standard Time"

1 0

Dmitry Timoshkov : gdi32: Do not skip the font metrics update after the DC transform change.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: b31d7dbe8e41f20243a2d8c22c079985d730f7a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31d7dbe8e41f20243a2d8c22… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 2 06:16:26 2008 +0900 gdi32: Do not skip the font metrics update after the DC transform change. --- dlls/gdi32/font.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1e8cac3..21d2ebb 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -484,14 +484,11 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) return 0; } - if (dc->hFont != handle || dc->gdiFont == NULL) + if (GetDeviceCaps( dc->hSelf, TEXTCAPS ) & TC_VA_ABLE) { - if(GetDeviceCaps(dc->hSelf, TEXTCAPS) & TC_VA_ABLE) - { - FONTOBJ *font = GDI_GetObjPtr( handle, FONT_MAGIC ); /* to grab the GDI lock (FIXME) */ - dc->gdiFont = WineEngCreateFontInstance(dc, handle); - if (font) GDI_ReleaseObj( handle ); - } + FONTOBJ *font = GDI_GetObjPtr( handle, FONT_MAGIC ); /* to grab the GDI lock (FIXME) */ + dc->gdiFont = WineEngCreateFontInstance( dc, handle ); + if (font) GDI_ReleaseObj( handle ); } if (dc->funcs->pSelectFont) ret = dc->funcs->pSelectFont( dc->physDev, handle, dc->gdiFont );

1 0

Juan Lang : wintrust: Implement OpenPersonalTrustDBDialog.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 0f43beaa7bd94c4a16092a13e1140e18bb8f21d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f43beaa7bd94c4a16092a13e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 1 21:46:47 2008 -0700 wintrust: Implement OpenPersonalTrustDBDialog. --- dlls/wintrust/Makefile.in | 2 +- dlls/wintrust/wintrust.spec | 2 +- dlls/wintrust/wintrust_main.c | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in index 6f30fd6..f747179 100644 --- a/dlls/wintrust/Makefile.in +++ b/dlls/wintrust/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = wintrust.dll IMPORTLIB = wintrust IMPORTS = crypt32 user32 advapi32 kernel32 ntdll -DELAYIMPORTS = imagehlp +DELAYIMPORTS = cryptui imagehlp C_SRCS = \ asn.c \ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index f385933..a9d0857 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -55,7 +55,7 @@ @ stub MsCatFreeHashTag @ stub OfficeCleanupPolicy @ stub OfficeInitializePolicy -@ stub OpenPersonalTrustDBDialog +@ stdcall OpenPersonalTrustDBDialog(ptr) @ stdcall SoftpubAuthenticode(ptr) @ stdcall SoftpubCheckCert(ptr long long long) @ stdcall SoftpubCleanup(ptr) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 091c0d4..a4bfe75 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -34,6 +34,7 @@ #include "objbase.h" #include "winuser.h" #include "cryptdlg.h" +#include "cryptuiapi.h" #include "wintrust_priv.h" #include "wine/debug.h" @@ -1057,3 +1058,27 @@ BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, SetLastError(ERROR_OUTOFMEMORY); return ret; } + +/*********************************************************************** + * OpenPersonalTrustDBDialog (WINTRUST.@) + * + * Opens the certificate manager dialog, showing only the stores that + * contain trusted software publishers. + * + * PARAMS + * hwnd [I] handle of parent window + * + * RETURNS + * TRUE if the dialog could be opened, FALSE if not. + */ +BOOL WINAPI OpenPersonalTrustDBDialog(HWND hwnd) +{ + CRYPTUI_CERT_MGR_STRUCT uiCertMgr; + + uiCertMgr.dwSize = sizeof(uiCertMgr); + uiCertMgr.hwndParent = hwnd; + uiCertMgr.dwFlags = CRYPTUI_CERT_MGR_PUBLISHER_TAB; + uiCertMgr.pwszTitle = NULL; + uiCertMgr.pszInitUsageOID = NULL; + return CryptUIDlgCertMgr(&uiCertMgr); +}

1 0

Alexander Nicolaysen Sørnes : objectManager: Never show add entry link if the user isn't an admin
by Chris Morgan Oct. 1, 2008

Oct. 1, 2008

Module: appdb Branch: master Commit: ecbfa84600e4306f8f034695230bc14847e0982d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ecbfa84600e4306f8f034695… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 2 00:49:01 2008 +0200 objectManager: Never show add entry link if the user isn't an admin --- include/objectManager.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 088746c..4ddf644 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -322,7 +322,7 @@ class ObjectManager } } - if($this->GetOptionalSetting("objectShowAddEntry", FALSE)) + if($this->GetOptionalSetting("objectShowAddEntry", FALSE) && $oObject->canEdit()) { echo "<br><center><a href=\"". $this->makeUrl("add", false,

1 0