May 2007 - Wine-commits - list.winehq.org

Nigel Liang : shlwapi: Stub implementation for SHSetTimerQueueTimer.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: ddbb317915f7cfb1dd6f48431f4fde43527eb068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbb317915f7cfb1dd6f48431… Author: Nigel Liang <ncliang(a)gmail.com> Date: Mon May 21 18:05:28 2007 -0700 shlwapi: Stub implementation for SHSetTimerQueueTimer. --- dlls/shlwapi/ordinal.c | 26 ++++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- include/shlwapi.h | 4 ++++ 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 213980c..7d5c6cb 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4223,6 +4223,32 @@ BOOL WINAPI SHQueueUserWorkItem(LPTHREAD_START_ROUTINE pfnCallback, } /*********************************************************************** + * SHSetTimerQueueTimer (SHLWAPI.263) + */ +HANDLE WINAPI SHSetTimerQueueTimer(HANDLE hQueue, + WAITORTIMERCALLBACK pfnCallback, LPVOID pContext, DWORD dwDueTime, + DWORD dwPeriod, LPCSTR lpszLibrary, DWORD dwFlags) +{ + HANDLE hNewTimer; + + /* SHSetTimerQueueTimer flags -> CreateTimerQueueTimer flags */ + if (dwFlags & TPS_LONGEXECTIME) { + dwFlags &= ~TPS_LONGEXECTIME; + dwFlags |= WT_EXECUTELONGFUNCTION; + } + if (dwFlags & TPS_EXECUTEIO) { + dwFlags &= ~TPS_EXECUTEIO; + dwFlags |= WT_EXECUTEINIOTHREAD; + } + + if (!CreateTimerQueueTimer(&hNewTimer, hQueue, pfnCallback, pContext, + dwDueTime, dwPeriod, dwFlags)) + return NULL; + + return hNewTimer; +} + +/*********************************************************************** * IUnknown_OnFocusChangeIS (SHLWAPI.@) */ HRESULT WINAPI IUnknown_OnFocusChangeIS(LPUNKNOWN lpUnknown, LPUNKNOWN pFocusObject, BOOL bFocus) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index ec7d259..d236858 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -260,7 +260,7 @@ 260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) 261 stub -noname SHCreateTimerQueue 262 stub -noname SHDeleteTimerQueue -263 stub -noname SHSetTimerQueueTimer +263 stdcall -noname SHSetTimerQueueTimer(long ptr ptr long long str long) 264 stub -noname SHChangeTimerQueueTimer 265 stub -noname SHCancelTimerQueueTimer 266 stdcall -noname SHRestrictionLookup(long wstr ptr ptr) diff --git a/include/shlwapi.h b/include/shlwapi.h index 638a958..21b1e99 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1041,6 +1041,10 @@ HRESULT WINAPI DllInstall(BOOL,LPCWSTR) DECLSPEC_HIDDEN; BOOL WINAPI IsOS(DWORD); +/* SHSetTimerQueueTimer definitions */ +#define TPS_EXECUTEIO 0x00000001 +#define TPS_LONGEXECTIME 0x00000008 + #include <poppack.h> #ifdef __cplusplus

1 0

Rob Shearman : secur32: Fix the dwVersion field in the security function tables returned by InitSecurityInterfaceA /W.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 087eedc3f58dd7761de4832debc46bd57c16cd9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=087eedc3f58dd7761de4832de… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu May 24 13:05:28 2007 +0100 secur32: Fix the dwVersion field in the security function tables returned by InitSecurityInterfaceA/W. --- dlls/secur32/secur32.c | 4 ++-- dlls/secur32/tests/secur32.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 421b115..aabb56c 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -86,7 +86,7 @@ static SecurePackageTable *packageTable = NULL; static SecureProviderTable *providerTable = NULL; static SecurityFunctionTableA securityFunctionTableA = { - SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION_2, + SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, EnumerateSecurityPackagesA, QueryCredentialsAttributesA, AcquireCredentialsHandleA, @@ -117,7 +117,7 @@ static SecurityFunctionTableA securityFunctionTableA = { }; static SecurityFunctionTableW securityFunctionTableW = { - SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION_2, + SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, EnumerateSecurityPackagesW, QueryCredentialsAttributesW, AcquireCredentialsHandleW, diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 57f2ee1..99d5069 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -32,6 +32,8 @@ static HMODULE secdll; static BOOLEAN (WINAPI * pGetComputerObjectNameA)(EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG lpnSize); static BOOLEAN (WINAPI * pGetComputerObjectNameW)(EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG lpnSize); +static PSecurityFunctionTableA (SEC_ENTRY * pInitSecurityInterfaceA)(void); +static PSecurityFunctionTableW (SEC_ENTRY * pInitSecurityInterfaceW)(void); static EXTENDED_NAME_FORMAT formats[] = { NameUnknown, NameFullyQualifiedDN, NameSamCompatible, NameDisplay, @@ -86,6 +88,38 @@ static void testGetComputerObjectNameW(void) } } +static void test_InitSecurityInterface(void) +{ + PSecurityFunctionTableA sftA; + PSecurityFunctionTableW sftW; + + sftA = pInitSecurityInterfaceA(); + ok(sftA != NULL, "pInitSecurityInterfaceA failed\n"); + ok(sftA->dwVersion == SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, "wrong dwVersion %ld in security function table\n", sftA->dwVersion); + ok(!sftA->Reserved2, "Reserved2 should be NULL instead of %p in security function table\n", sftA->Reserved2); + todo_wine + ok(sftA->Reserved3 != NULL, "Reserved3 should not be NULL in security function table\n"); + todo_wine + ok(sftA->Reserved4 != NULL, "Reserved4 should not be NULL in security function table\n"); + ok(!sftA->Reserved8, "Reserved8 should be NULL instead of %p in security function table\n", sftA->Reserved8); + + if (!pInitSecurityInterfaceW) + { + skip("InitSecurityInterfaceW not exported by secur32.dll\n"); + return; + } + + sftW = pInitSecurityInterfaceW(); + ok(sftW != NULL, "pInitSecurityInterfaceW failed\n"); + ok(sftW->dwVersion == SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, "wrong dwVersion %ld in security function table\n", sftW->dwVersion); + ok(!sftW->Reserved2, "Reserved2 should be NULL instead of %p in security function table\n", sftW->Reserved2); + todo_wine + ok(sftW->Reserved3 != NULL, "Reserved3 should note be NULL in security function table\n"); + todo_wine + ok(sftW->Reserved4 != NULL, "Reserved4 should not be NULL in security function table\n"); + ok(!sftW->Reserved8, "Reserved8 should be NULL instead of %p in security function table\n", sftW->Reserved8); +} + START_TEST(secur32) { secdll = LoadLibraryA("secur32.dll"); @@ -97,6 +131,8 @@ START_TEST(secur32) { pGetComputerObjectNameA = (PVOID)GetProcAddress(secdll, "GetComputerObjectNameA"); pGetComputerObjectNameW = (PVOID)GetProcAddress(secdll, "GetComputerObjectNameW"); + pInitSecurityInterfaceA = (PVOID)GetProcAddress(secdll, "InitSecurityInterfaceA"); + pInitSecurityInterfaceW = (PVOID)GetProcAddress(secdll, "InitSecurityInterfaceW"); if (pGetComputerObjectNameA) testGetComputerObjectNameA(); @@ -104,6 +140,8 @@ START_TEST(secur32) if (pGetComputerObjectNameW) testGetComputerObjectNameW(); + test_InitSecurityInterface(); + FreeLibrary(secdll); } }

1 0

Michael Stefaniuc : msi: A signed 1-bit bitfield doesn't make much sense; use unsigned.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 7043b7baa411901762459e4c214eb04120f63995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7043b7baa411901762459e4c2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 24 01:32:18 2007 +0200 msi: A signed 1-bit bitfield doesn't make much sense; use unsigned. --- dlls/msi/msipriv.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a8d833f..bcb7512 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -300,9 +300,9 @@ typedef struct tagMSICOMPONENT LPWSTR FullKeypath; LPWSTR AdvertiseString; - int hasAdvertiseFeature:1; - int hasLocalFeature:1; - int hasSourceFeature:1; + unsigned int hasAdvertiseFeature:1; + unsigned int hasLocalFeature:1; + unsigned int hasSourceFeature:1; } MSICOMPONENT; typedef struct tagComponentList

1 0

Louis Lenders : shell32: Update Dutch resource.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 2d83063288f63f442981494f53c6b9c1e7fe72b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d83063288f63f442981494f5… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu May 24 08:35:26 2007 +0100 shell32: Update Dutch resource. --- dlls/shell32/shell32_Nl.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index bbc5186..17da1e4 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -37,10 +37,10 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. Wine zal het vervolgens openen.", 12289, 36, 11, 182, 18 + LTEXT "&Openen:", 12305, 7, 39, 28, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Annuleren", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Bladeren...", 12288, 170, 63, 50, 14, WS_TABSTOP }

1 0

Dmitry Timoshkov : comctl32/tests: Fix some problems revealed by compilation in 64-bit mode.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 6055d04f07c8ef026987b7bdfe7f83c0a69aed96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6055d04f07c8ef026987b7bdf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 24 17:14:31 2007 +0900 comctl32/tests: Fix some problems revealed by compilation in 64-bit mode. --- dlls/comctl32/tests/datetime.c | 8 ++++---- dlls/comctl32/tests/header.c | 8 ++++---- dlls/comctl32/tests/listview.c | 28 ++++++++++++++-------------- dlls/comctl32/tests/monthcal.c | 8 ++++---- dlls/comctl32/tests/tab.c | 6 +++--- dlls/comctl32/tests/trackbar.c | 6 +++--- dlls/comctl32/tests/treeview.c | 17 +++++------------ dlls/comctl32/tests/updown.c | 16 ++++++++-------- 8 files changed, 45 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6055d04f07c8ef026987b…

1 0

Dmitry Timoshkov : kernel32/tests: Fix a problem revealed by compilation in 64-bit mode.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: c28ffeeb9a37131ac0a574b8fbeb78c411e99bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28ffeeb9a37131ac0a574b8f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 24 17:15:03 2007 +0900 kernel32/tests: Fix a problem revealed by compilation in 64-bit mode. --- dlls/kernel32/tests/loader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 7b297a2..cb23299 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -40,8 +40,10 @@ static const struct static IMAGE_NT_HEADERS nt_header = { IMAGE_NT_SIGNATURE, /* Signature */ -#ifdef __i386__ +#if defined __i386__ { IMAGE_FILE_MACHINE_I386, /* Machine */ +#elif defined __x86_64__ + { IMAGE_FILE_MACHINE_AMD64, /* Machine */ #else # error You must specify the machine type #endif

1 0

Michael Stefaniuc : winedump: '$' isn' t a valid character in an identifier regardless that gcc accepts it without warning .
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 192c46155e922dd9113e315ef7855b05da24aadc URL: http://source.winehq.org/git/wine.git/?a=commit;h=192c46155e922dd9113e315ef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 23 23:34:01 2007 +0200 winedump: '$' isn't a valid character in an identifier regardless that gcc accepts it without warning. --- tools/winedump/lib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index 155a6fa..85f305d 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -106,9 +106,9 @@ static void dump_long_import(const void *base, const IMAGE_SECTION_HEADER *ish, } else if (globals.do_debug && !strcmp((const char *)ish[i].Name, ".debug$S")) { - const char *imp_debug$ = (const char *)base + ish[i].PointerToRawData; + const char *imp_debugS = (const char *)base + ish[i].PointerToRawData; - codeview_dump_symbols(imp_debug$, ish[i].SizeOfRawData); + codeview_dump_symbols(imp_debugS, ish[i].SizeOfRawData); printf("\n"); } }

1 0

Rob Shearman : hlink: Fix HlinkCreateFromString to create a URL moniker if the input target is a URL .
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 873905ac43151a6b1c5df93e4a0bea791549bf65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=873905ac43151a6b1c5df93e4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:04:13 2007 +0100 hlink: Fix HlinkCreateFromString to create a URL moniker if the input target is a URL. --- dlls/hlink/hlink_main.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 1a595ae..3a4632f 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -134,17 +134,22 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, if (FAILED(r)) { - FIXME("ParseDisplayName failed, falling back to file\n"); - r = CreateFileMoniker(pwzTarget,&pTgtMk); + LPCWSTR p = strchrW(pwzTarget, ':'); + if (p && (p - pwzTarget > 1)) + r = CreateURLMoniker(NULL, pwzTarget, &pTgtMk); + else + r = CreateFileMoniker(pwzTarget,&pTgtMk); } - if (pTgtMk) + if (FAILED(r)) { - IHlink_SetMonikerReference(hl, 0, pTgtMk, pwzLocation); - IMoniker_Release(pTgtMk); + ERR("couldn't create moniker for %s, failed with error 0x%08x\n", + debugstr_w(pwzTarget), r); + return r; } - else - FIXME("Unable to come up with a moniker, expect problems\n"); + + IHlink_SetMonikerReference(hl, 0, pTgtMk, pwzLocation); + IMoniker_Release(pTgtMk); IHlink_SetStringReference(hl, HLINKSETF_TARGET, pwzTarget, NULL); }

1 0

Rob Shearman : urlmon: Fix a typo in URLMonikerImpl_Save.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: d76a15a36dc411c3809091f227e6c4719b17edba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76a15a36dc411c3809091f22… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:04:49 2007 +0100 urlmon: Fix a typo in URLMonikerImpl_Save. The data in This->URLName should be written out, not the pointer followed by garbage. --- dlls/urlmon/umon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 7765f27..0f86b83 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -454,7 +454,7 @@ static HRESULT WINAPI URLMonikerImpl_Save(IMoniker* iface, len = strlenW(This->URLName); res=IStream_Write(pStm,&len,sizeof(ULONG),NULL); if(SUCCEEDED(res)) - res=IStream_Write(pStm,&This->URLName,len*sizeof(WCHAR),NULL); + res=IStream_Write(pStm,This->URLName,len*sizeof(WCHAR),NULL); return res; }

1 0

Rob Shearman : urlmon: The persisted version of URL monikers should be size of URL
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: d82c456e5f94fcdb07040eedd2bec04bffddbd1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82c456e5f94fcdb07040eedd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:05:24 2007 +0100 urlmon: The persisted version of URL monikers should be size of URL including nul-terminating character (4-bytes), followed by the URL string including nul-terminating character. --- dlls/urlmon/umon.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 0f86b83..5c795f0 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -410,23 +410,23 @@ static HRESULT WINAPI URLMonikerImpl_Load(IMoniker* iface,IStream* pStm) URLMonikerImpl *This = (URLMonikerImpl *)iface; HRESULT res; - ULONG len; + ULONG size; ULONG got; TRACE("(%p,%p)\n",This,pStm); if(!pStm) return E_INVALIDARG; - res = IStream_Read(pStm, &len, sizeof(ULONG), &got); + res = IStream_Read(pStm, &size, sizeof(ULONG), &got); if(SUCCEEDED(res)) { if(got == sizeof(ULONG)) { HeapFree(GetProcessHeap(), 0, This->URLName); - This->URLName=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(len+1)); + This->URLName=HeapAlloc(GetProcessHeap(),0,size); if(!This->URLName) res = E_OUTOFMEMORY; else { - res = IStream_Read(pStm, This->URLName, len, NULL); - This->URLName[len] = 0; + res = IStream_Read(pStm, This->URLName, size, NULL); + This->URLName[size/sizeof(WCHAR) - 1] = 0; } } else @@ -445,16 +445,16 @@ static HRESULT WINAPI URLMonikerImpl_Save(IMoniker* iface, URLMonikerImpl *This = (URLMonikerImpl *)iface; HRESULT res; - ULONG len; + ULONG size; TRACE("(%p,%p,%d)\n",This,pStm,fClearDirty); if(!pStm) return E_INVALIDARG; - len = strlenW(This->URLName); - res=IStream_Write(pStm,&len,sizeof(ULONG),NULL); + size = (strlenW(This->URLName) + 1)*sizeof(WCHAR); + res=IStream_Write(pStm,&size,sizeof(ULONG),NULL); if(SUCCEEDED(res)) - res=IStream_Write(pStm,This->URLName,len*sizeof(WCHAR),NULL); + res=IStream_Write(pStm,This->URLName,size,NULL); return res; } @@ -472,8 +472,7 @@ static HRESULT WINAPI URLMonikerImpl_GetSizeMax(IMoniker* iface, if(!pcbSize) return E_INVALIDARG; - pcbSize->u.LowPart = sizeof(ULONG) + (strlenW(This->URLName) * sizeof(WCHAR)); - pcbSize->u.HighPart = 0; + pcbSize->QuadPart = sizeof(ULONG) + ((strlenW(This->URLName)+1) * sizeof(WCHAR)); return S_OK; }

1 0