January 2009 - Wine-commits

Aric Stewart : shell32: Initial stub for SHCreateShellItem. It returns E_NOINTERFACE until shell32 version 6.0 or later.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 9b0be4980a2affcc2ff89a6fc889764263dc50f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0be4980a2affcc2ff89a6fc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 20 13:04:50 2009 -0600 shell32: Initial stub for SHCreateShellItem. It returns E_NOINTERFACE until shell32 version 6.0 or later. --- dlls/shell32/pidl.c | 7 +++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 54ecc5a..bee7166 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -2363,3 +2363,10 @@ LPITEMIDLIST* _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida) return dst; } + +HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, + IShellFolder *psfParent, LPCITEMIDLIST pidl, void **ppsi) +{ + FIXME("STUB: %p %p %p %p\n",pidlParent, psfParent, pidl, ppsi); + return E_NOINTERFACE; +} diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 396227c..6a51bcd 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -328,6 +328,7 @@ @ stdcall SHCreateDirectoryExA(long str ptr) @ stdcall SHCreateDirectoryExW(long wstr ptr) @ stub SHCreateProcessAsUserW +@ stdcall SHCreateShellItem(ptr ptr ptr ptr) @ stdcall SHEmptyRecycleBinA(long str long) @ stdcall SHEmptyRecycleBinW(long wstr long) @ stub SHExtractIconsW

1 0

Damjan Jovanovic : shlwapi: Support the command file type association query .
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 36a24b93c76369d246bc72651ebd16b9ab6ef2fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a24b93c76369d246bc72651… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jan 20 18:19:21 2009 +0200 shlwapi: Support the command file type association query. --- dlls/shlwapi/assoc.c | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 53a873f..5ef5ba6 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -594,9 +594,8 @@ static HRESULT ASSOC_GetValue(HKEY hkey, WCHAR ** pszText) return S_OK; } -static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, - LPCWSTR pszExtra, LPWSTR path, - DWORD pathlen, DWORD *len) +static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, + LPCWSTR pszExtra, WCHAR **ppszCommand) { HKEY hkeyCommand; HKEY hkeyFile; @@ -604,16 +603,11 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, HKEY hkeyVerb; HRESULT hr; LONG ret; - WCHAR * pszCommand; - WCHAR * pszEnd; WCHAR * pszExtraFromReg = NULL; WCHAR * pszFileType; - WCHAR * pszStart; static const WCHAR commandW[] = { 'c','o','m','m','a','n','d',0 }; static const WCHAR shellW[] = { 's','h','e','l','l',0 }; - assert(len); - hr = ASSOC_GetValue(This->hkeySource, &pszFileType); if (FAILED(hr)) return hr; @@ -672,8 +666,23 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, RegCloseKey(hkeyVerb); if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); - hr = ASSOC_GetValue(hkeyCommand, &pszCommand); + hr = ASSOC_GetValue(hkeyCommand, ppszCommand); RegCloseKey(hkeyCommand); + return hr; +} + +static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, + LPCWSTR pszExtra, LPWSTR path, + DWORD pathlen, DWORD *len) +{ + WCHAR *pszCommand; + WCHAR *pszStart; + WCHAR *pszEnd; + HRESULT hr; + + assert(len); + + hr = ASSOC_GetCommand(This, pszExtra, &pszCommand); if (FAILED(hr)) return hr; @@ -763,6 +772,18 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( switch (str) { + case ASSOCSTR_COMMAND: + { + WCHAR *command; + hr = ASSOC_GetCommand(This, pszExtra, &command); + if (SUCCEEDED(hr)) + { + hr = ASSOC_ReturnData(pszOut, pcchOut, command, strlenW(command) + 1); + HeapFree(GetProcessHeap(), 0, command); + } + return hr; + } + case ASSOCSTR_EXECUTABLE: { hr = ASSOC_GetExecutable(This, pszExtra, path, MAX_PATH, &len);

1 0

Paul Vriens : crypt32/tests: Skip a few tests if needed.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: efe334b5b1c880d9a4213bb4935e1791cad3e5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe334b5b1c880d9a4213bb49… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 21 08:19:57 2009 +0100 crypt32/tests: Skip a few tests if needed. --- dlls/crypt32/tests/encode.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9c35de1..3dfe9c2 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -993,6 +993,13 @@ static void test_encodeUnicodeName(DWORD dwEncoding) static void compareNameValues(const CERT_NAME_VALUE *expected, const CERT_NAME_VALUE *got) { + if (expected->dwValueType == CERT_RDN_UTF8_STRING && + got->dwValueType == CERT_RDN_ENCODED_BLOB) + { + win_skip("Can't handle CERT_RDN_UTF8_STRING\n"); + return; + } + ok(got->dwValueType == expected->dwValueType, "Expected string type %d, got %d\n", expected->dwValueType, got->dwValueType);

1 0

Ge van Geldorp : user32/tests: Prevent buffer overflow.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 33a6e66befaedfd93ee8e96d5a716e3fdd4d14a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a6e66befaedfd93ee8e96d5… Author: Ge van Geldorp <ge(a)gse.nl> Date: Tue Jan 20 15:07:15 2009 +0100 user32/tests: Prevent buffer overflow. --- dlls/user32/tests/input.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 4a82200..cb03e6e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -63,7 +63,7 @@ static long timetag = 0x10000000; static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); -#define MAXKEYEVENTS 6 +#define MAXKEYEVENTS 10 #define MAXKEYMESSAGES MAXKEYEVENTS /* assuming a key event generates one and only one message */ @@ -799,10 +799,14 @@ static LRESULT CALLBACK WndProc2(HWND hWnd, UINT Msg, WPARAM wParam, Msg != WM_GETICON && Msg != WM_DEVICECHANGE) { - sent_messages[sent_messages_cnt].message = Msg; - sent_messages[sent_messages_cnt].flags = 0; - sent_messages[sent_messages_cnt].wParam = wParam; - sent_messages[sent_messages_cnt++].lParam = HIWORD(lParam) & (KF_UP|KF_EXTENDED); + ok(sent_messages_cnt < MAXKEYMESSAGES, "Too many messages\n"); + if (sent_messages_cnt < MAXKEYMESSAGES) + { + sent_messages[sent_messages_cnt].message = Msg; + sent_messages[sent_messages_cnt].flags = 0; + sent_messages[sent_messages_cnt].wParam = wParam; + sent_messages[sent_messages_cnt++].lParam = HIWORD(lParam) & (KF_UP|KF_EXTENDED); + } } return DefWindowProc(hWnd, Msg, wParam, lParam); } @@ -813,10 +817,14 @@ static LRESULT CALLBACK hook_proc(int code, WPARAM wparam, LPARAM lparam) if (code == HC_ACTION) { - sent_messages[sent_messages_cnt].message = wparam; - sent_messages[sent_messages_cnt].flags = hook; - sent_messages[sent_messages_cnt].wParam = hook_info->vkCode; - sent_messages[sent_messages_cnt++].lParam = hook_info->flags & (LLKHF_UP|LLKHF_EXTENDED); + ok(sent_messages_cnt < MAXKEYMESSAGES, "Too many messages\n"); + if (sent_messages_cnt < MAXKEYMESSAGES) + { + sent_messages[sent_messages_cnt].message = wparam; + sent_messages[sent_messages_cnt].flags = hook; + sent_messages[sent_messages_cnt].wParam = hook_info->vkCode; + sent_messages[sent_messages_cnt++].lParam = hook_info->flags & (LLKHF_UP|LLKHF_EXTENDED); + } if(0) /* For some reason not stable on Wine */ {

1 0

Paul Chitescu : wined3d: Detect Radeon Xpress Series, report PCI ID of Radeon Xpress 200M.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 540febecf9c40e210957e2d4c8d717897137fe56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=540febecf9c40e210957e2d4c… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Jan 20 18:09:24 2009 +0200 wined3d: Detect Radeon Xpress Series, report PCI ID of Radeon Xpress 200M. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 84d18b6..478c216 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1286,6 +1286,12 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->gl_card = CARD_ATI_RADEON_X700; vidmem = 128; /* x700/x8*0 use 128-256MB, >=x1300 128-512MB */ } + /* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400MHz */ + else if(strstr(gl_info->gl_renderer, "Radeon Xpress")) + { + gl_info->gl_card = CARD_ATI_RADEON_XPRESS_200M; + vidmem = 64; /* Shared RAM, BIOS configurable, 64-256M */ + } /* Radeon R3xx */ else { gl_info->gl_card = CARD_ATI_RADEON_9500; /* Radeon 9500/9550/9600/9700/9800/X300/X550/X600 */ diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 07ca0d5..dd3946e 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3257,6 +3257,7 @@ typedef enum _GL_Cards { CARD_ATI_RADEON_7200 = 0x5144, CARD_ATI_RADEON_8500 = 0x514c, CARD_ATI_RADEON_9500 = 0x4144, + CARD_ATI_RADEON_XPRESS_200M = 0x5955, CARD_ATI_RADEON_X700 = 0x5e4c, CARD_ATI_RADEON_X1600 = 0x71c2, CARD_ATI_RADEON_HD2300 = 0x7210,

1 0

Paul Vriens : wintrust/tests: Add some cdf parsing tests.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: d4cf5a55c62403172eb92f3ccb938175290b12c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4cf5a55c62403172eb92f3cc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 20 15:59:07 2009 +0100 wintrust/tests: Add some cdf parsing tests. --- dlls/wintrust/tests/crypt.c | 312 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 296 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4cf5a55c62403172eb92…

1 0

Paul Vriens : wintrust/tests: Check file attributes set by CryptCATAdminAddCatalog.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: d18249dda6b902c0816dd018ea49e2b575ca0491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18249dda6b902c0816dd018e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 20 18:18:13 2009 +0100 wintrust/tests: Check file attributes set by CryptCATAdminAddCatalog. --- dlls/wintrust/tests/crypt.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 1440f1d..882b939 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -522,6 +522,11 @@ static void test_CryptCATAdminAddRemoveCatalog(void) memset(catfileW, 0, sizeof(catfileW)); MultiByteToWideChar(0, 0, p, -1, catfileW, MAX_PATH); + /* Set the file attributes so we can check what happens with them during the 'copy' */ + attrs = FILE_ATTRIBUTE_READONLY; + ret = SetFileAttributesA(tmpfile, attrs); + ok(ret, "SetFileAttributesA failed : %u\n", GetLastError()); + /* winetest.cat will be created */ hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 0); ok(hcatinfo != NULL, "CryptCATAdminAddCatalog failed %u\n", GetLastError()); @@ -530,6 +535,10 @@ static void test_CryptCATAdminAddRemoveCatalog(void) lstrcatA(catfilepath, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}\\winetest.cat"); attrs = GetFileAttributes(catfilepath); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath); + todo_wine + ok(attrs == FILE_ATTRIBUTE_SYSTEM || + attrs == (FILE_ATTRIBUTE_NOT_CONTENT_INDEXED | FILE_ATTRIBUTE_SYSTEM), /* Vista */ + "File has wrong attributes : %08x\n", attrs); info.cbStruct = sizeof(info); info.wszCatalogFile[0] = 0; @@ -563,6 +572,9 @@ static void test_CryptCATAdminAddRemoveCatalog(void) ret = pCryptCATAdminReleaseContext(hcatadmin, 0); ok(ret, "CryptCATAdminReleaseContext failed %u\n", GetLastError()); + /* Set the attributes so we can delete the file */ + attrs = FILE_ATTRIBUTE_NORMAL; + ret = SetFileAttributesA(tmpfile, attrs); DeleteFileA(tmpfile); }

1 0

Paul Vriens : wintrust: Add some cdf parsing definitions.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 78d75b7a5dc6740490fb0d9074360e1e7af2807d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d75b7a5dc6740490fb0d907… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 20 13:13:03 2009 +0100 wintrust: Add some cdf parsing definitions. --- include/mscat.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/mscat.h b/include/mscat.h index a45e024..7c5c86b 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -38,6 +38,22 @@ extern "C" { #define CRYPTCAT_OPEN_SORTED 0x40000000 #define CRYPTCAT_OPEN_FLAGS_MASK 0xffff0000 +#define CRYPTCAT_E_AREA_HEADER 0x00000000 +#define CRYPTCAT_E_AREA_MEMBER 0x00010000 +#define CRYPTCAT_E_AREA_ATTRIBUTE 0x00020000 + +#define CRYPTCAT_E_CDF_UNSUPPORTED 0x00000001 +#define CRYPTCAT_E_CDF_DUPLICATE 0x00000002 +#define CRYPTCAT_E_CDF_TAGNOTFOUND 0x00000004 + +#define CRYPTCAT_E_CDF_MEMBER_FILE_PATH 0x00010001 +#define CRYPTCAT_E_CDF_MEMBER_INDIRECTDATA 0x00010002 +#define CRYPTCAT_E_CDF_MEMBER_FILENOTFOUND 0x00010004 + +#define CRYPTCAT_E_CDF_BAD_GUID_CONV 0x00020001 +#define CRYPTCAT_E_CDF_ATTR_TOOFEWVALUES 0x00020002 +#define CRYPTCAT_E_CDF_ATTR_TYPECOMBO 0x00020004 + #include <pshpack8.h> typedef struct CRYPTCATATTRIBUTE_

1 0

Hans Leidekker : wintrust: Set system attribute on the target catalog file in CryptCATAdminAddCatalog .
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: e361356e8ef5a827ae0115b53b0c2a529e245407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e361356e8ef5a827ae0115b53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 20 17:12:09 2009 +0100 wintrust: Set system attribute on the target catalog file in CryptCATAdminAddCatalog. --- dlls/wintrust/crypt.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index cf8aa73..e01a230 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -188,6 +188,8 @@ HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile, HeapFree(GetProcessHeap(), 0, target); return NULL; } + SetFileAttributesW(target, FILE_ATTRIBUTE_SYSTEM); + if (!(ci = HeapAlloc(GetProcessHeap(), 0, sizeof(*ci)))) { HeapFree(GetProcessHeap(), 0, target);

1 0

Hans Leidekker : updspapi: Add a stub implementation of UpdSpSetDynamicStringA.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 41e94622dcb3ae22d0aed90943a2625b228a4e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e94622dcb3ae22d0aed9094… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 20 14:23:11 2009 +0100 updspapi: Add a stub implementation of UpdSpSetDynamicStringA. --- dlls/updspapi/Makefile.in | 3 +++ dlls/updspapi/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/updspapi/updspapi.spec | 2 +- 3 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/updspapi/Makefile.in b/dlls/updspapi/Makefile.in index 8917f49..5f4182f 100644 --- a/dlls/updspapi/Makefile.in +++ b/dlls/updspapi/Makefile.in @@ -5,6 +5,9 @@ VPATH = @srcdir@ MODULE = updspapi.dll IMPORTS = setupapi kernel32 +C_SRCS = \ + main.c + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/updspapi/main.c b/dlls/updspapi/main.c new file mode 100644 index 0000000..73af32f --- /dev/null +++ b/dlls/updspapi/main.c @@ -0,0 +1,37 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "setupapi.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(updspapi); + +DWORD WINAPI UpdSpSetDynamicStringA(HINF hinf, LPSTR str1, LPSTR str2) +{ + FIXME("%p %s %s\n", hinf, debugstr_a(str1), debugstr_a(str2)); + return 1; +} diff --git a/dlls/updspapi/updspapi.spec b/dlls/updspapi/updspapi.spec index eb47bc4..ca4ef7c 100644 --- a/dlls/updspapi/updspapi.spec +++ b/dlls/updspapi/updspapi.spec @@ -63,7 +63,7 @@ @ stdcall UpdSpScanFileQueueW(long long long ptr ptr ptr) setupapi.SetupScanFileQueueW @ stdcall UpdSpSetDirectoryIdA(long long str) setupapi.SetupSetDirectoryIdA @ stdcall UpdSpSetDirectoryIdW(long long wstr) setupapi.SetupSetDirectoryIdW -@ stub UpdSpSetDynamicStringA +@ stdcall UpdSpSetDynamicStringA(ptr str str) @ stub UpdSpSetDynamicStringExA @ stub UpdSpSetDynamicStringExW @ stub UpdSpSetDynamicStringW

1 0