November 2005 - Wine-Commits

wine/dlls/rpcrt4 ndr_marshall.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21450 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:00:06 Modified files: dlls/rpcrt4 : ndr_marshall.c Log message: Robert Shearman <rob(a)codeweavers.com> We should always allocate in NdrConformantStringUnmarshal if the memory pointer is NULL. Patch: http://cvs.winehq.org/patch.py?id=21450 Old revision New revision Changes Path 1.30 1.31 +4 -15 wine/dlls/rpcrt4/ndr_marshall.c Index: wine/dlls/rpcrt4/ndr_marshall.c diff -u -p wine/dlls/rpcrt4/ndr_marshall.c:1.30 wine/dlls/rpcrt4/ndr_marshall.c:1.31 --- wine/dlls/rpcrt4/ndr_marshall.c:1.30 28 Nov 2005 11: 0: 6 -0000 +++ wine/dlls/rpcrt4/ndr_marshall.c 28 Nov 2005 11: 0: 6 -0000 @@ -526,7 +526,6 @@ unsigned char *WINAPI NdrConformantStrin unsigned char** ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc ) { unsigned long len, esize, ofs; - unsigned char *pMem; TRACE("(pStubMsg == ^%p, *pMemory == ^%p, pFormat == ^%p, fMustAlloc == %u)\n", pStubMsg, *ppMemory, pFormat, fMustAlloc); @@ -551,28 +550,18 @@ unsigned char *WINAPI NdrConformantStrin FIXME("sized string format=%d\n", pFormat[1]); } - if (fMustAlloc) { + if (fMustAlloc || !*ppMemory) *ppMemory = NdrAllocate(pStubMsg, len*esize + BUFFER_PARANOIA); - } else { - if (pStubMsg->ReuseBuffer && !*ppMemory) - /* for servers, we may just point straight into the RPC buffer, I think - * (I guess that's what MS does since MIDL code doesn't try to free) */ - *ppMemory = pStubMsg->Buffer - ofs*esize; - /* for clients, memory should be provided by caller */ - } - - pMem = *ppMemory + ofs*esize; - if (pMem != pStubMsg->Buffer) - memcpy(pMem, pStubMsg->Buffer, len*esize); + memcpy(*ppMemory, pStubMsg->Buffer, len*esize); pStubMsg->Buffer += len*esize; if (*pFormat == RPC_FC_C_CSTRING) { - TRACE("string=%s\n", debugstr_a((char*)pMem)); + TRACE("string=%s\n", debugstr_a((char*)*ppMemory)); } else if (*pFormat == RPC_FC_C_WSTRING) { - TRACE("string=%s\n", debugstr_w((LPWSTR)pMem)); + TRACE("string=%s\n", debugstr_w((LPWSTR)*ppMemory)); } return NULL; /* FIXME: is this always right? */

1 0

wine/dlls/dinput device.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21449 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 04:59:56 Modified files: dlls/dinput : device.c Log message: Lionel Ulmer <lionel.ulmer(a)free.fr> Handle DInput8 interfaces in device QueryInterface. Patch: http://cvs.winehq.org/patch.py?id=21449 Old revision New revision Changes Path 1.31 1.32 +10 -0 wine/dlls/dinput/device.c Index: wine/dlls/dinput/device.c diff -u -p wine/dlls/dinput/device.c:1.31 wine/dlls/dinput/device.c:1.32 --- wine/dlls/dinput/device.c:1.31 28 Nov 2005 10:59:56 -0000 +++ wine/dlls/dinput/device.c 28 Nov 2005 10:59:56 -0000 @@ -517,6 +517,11 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ *ppobj = This; return DI_OK; } + if (IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { + IDirectInputDevice8_AddRef(iface); + *ppobj = This; + return DI_OK; + } TRACE("Unsupported interface !\n"); return E_FAIL; } @@ -548,6 +553,11 @@ HRESULT WINAPI IDirectInputDevice2WImpl_ *ppobj = This; return DI_OK; } + if (IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { + IDirectInputDevice8_AddRef(iface); + *ppobj = This; + return DI_OK; + } TRACE("Unsupported interface !\n"); return E_FAIL; }

1 0

wine/dlls/wldap32 add.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21448 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 04:59:48 Modified files: dlls/wldap32 : add.c Log message: Hans Leidekker <hans(a)it.vu.nl> Document the ldap_add* functions. Patch: http://cvs.winehq.org/patch.py?id=21448 Old revision New revision Changes Path 1.3 1.4 +98 -0 wine/dlls/wldap32/add.c Index: wine/dlls/wldap32/add.c diff -u -p wine/dlls/wldap32/add.c:1.3 wine/dlls/wldap32/add.c:1.4 --- wine/dlls/wldap32/add.c:1.3 28 Nov 2005 10:59:48 -0000 +++ wine/dlls/wldap32/add.c 28 Nov 2005 10:59:48 -0000 @@ -41,6 +41,11 @@ static LDAPMod *nullattrs[] = { NULL }; WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +/*********************************************************************** + * ldap_addA (WLDAP32.@) + * + * See ldap_addW. + */ ULONG ldap_addA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[] ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -73,6 +78,25 @@ exit: return ret; } +/*********************************************************************** + * ldap_addW (WLDAP32.@) + * + * Add entries to a directory tree (asynchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to add. + * attrs [I] Pointer to an array of LDAPModW structures, each + * specifying an attribute and its values to add. + * + * RETURNS + * Message ID of the add operation. + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. Cancel the operation by calling ldap_abandon + * with the message ID. + */ ULONG ldap_addW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[] ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -111,6 +135,11 @@ exit: return ret; } +/*********************************************************************** + * ldap_add_extA (WLDAP32.@) + * + * See ldap_add_extW. + */ ULONG ldap_add_extA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[], PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message ) { @@ -156,6 +185,29 @@ exit: return ret; } +/*********************************************************************** + * ldap_add_extW (WLDAP32.@) + * + * Add entries to a directory tree (asynchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to add. + * attrs [I] Pointer to an array of LDAPModW structures, each + * specifying an attribute and its values to add. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * message [O] Message ID of the add operation. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. The serverctrls and clientctrls parameters are + * optional and should be set to NULL if not used. + */ ULONG ldap_add_extW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[], PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message ) { @@ -203,6 +255,11 @@ exit: return ret; } +/*********************************************************************** + * ldap_add_ext_sA (WLDAP32.@) + * + * See ldap_add_ext_sW. + */ ULONG ldap_add_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[], PLDAPControlA *serverctrls, PLDAPControlA *clientctrls ) { @@ -248,6 +305,27 @@ exit: return ret; } +/*********************************************************************** + * ldap_add_ext_sW (WLDAP32.@) + * + * Add entries to a directory tree (synchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to add. + * attrs [I] Pointer to an array of LDAPModW structures, each + * specifying an attribute and its values to add. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * The serverctrls and clientctrls parameters are optional and + * should be set to NULL if not used. + */ ULONG ldap_add_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[], PLDAPControlW *serverctrls, PLDAPControlW *clientctrls ) { @@ -295,6 +373,11 @@ exit: return ret; } +/*********************************************************************** + * ldap_add_sA (WLDAP32.@) + * + * See ldap_add_sW. + */ ULONG ldap_add_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[] ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -327,6 +410,21 @@ exit: return ret; } +/*********************************************************************** + * ldap_add_sW (WLDAP32.@) + * + * Add entries to a directory tree (synchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to add. + * attrs [I] Pointer to an array of LDAPModW structures, each + * specifying an attribute and its values to add. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + */ ULONG ldap_add_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[] ) { ULONG ret = LDAP_NOT_SUPPORTED;

1 0

wine/dlls/gdi bitblt.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21447 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 04:59:44 Modified files: dlls/gdi : bitblt.c Log message: Huw Davies <huw(a)codeweavers.com> If the driver doesn't support StretchBlt try to use StretchDIBits instead. Patch: http://cvs.winehq.org/patch.py?id=21447 Old revision New revision Changes Path 1.7 1.8 +58 -15 wine/dlls/gdi/bitblt.c Index: wine/dlls/gdi/bitblt.c diff -u -p wine/dlls/gdi/bitblt.c:1.7 wine/dlls/gdi/bitblt.c:1.8 --- wine/dlls/gdi/bitblt.c:1.7 28 Nov 2005 10:59:44 -0000 +++ wine/dlls/gdi/bitblt.c 28 Nov 2005 10:59:44 -0000 @@ -84,25 +84,68 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT BOOL ret = FALSE; DC *dcDst, *dcSrc; - if ((dcSrc = DC_GetDCUpdate( hdcSrc ))) GDI_ReleaseObj( hdcSrc ); - /* FIXME: there is a race condition here */ - if ((dcDst = DC_GetDCUpdate( hdcDst ))) + if ((dcDst = DC_GetDCUpdate( hdcDst )) && dcDst->funcs->pStretchBlt) { - dcSrc = DC_GetDCPtr( hdcSrc ); - - TRACE("%p %d,%d %dx%d -> %p %d,%d %dx%d rop=%06lx\n", - hdcSrc, xSrc, ySrc, widthSrc, heightSrc, - hdcDst, xDst, yDst, widthDst, heightDst, rop ); + GDI_ReleaseObj( hdcDst ); + /* FIXME: there is a race condition here */ + if ((dcSrc = DC_GetDCUpdate( hdcSrc ))) + { + dcDst = DC_GetDCPtr( hdcDst ); + + TRACE("%p %d,%d %dx%d -> %p %d,%d %dx%d rop=%06lx\n", + hdcSrc, xSrc, ySrc, widthSrc, heightSrc, + hdcDst, xDst, yDst, widthDst, heightDst, rop ); + + ret = dcDst->funcs->pStretchBlt( dcDst->physDev, xDst, yDst, widthDst, heightDst, + dcSrc->physDev, xSrc, ySrc, widthSrc, heightSrc, + rop ); + GDI_ReleaseObj( hdcDst ); + GDI_ReleaseObj( hdcSrc ); + } + } + else if(dcDst && dcDst->funcs->pStretchDIBits) + { + BITMAP bm; + BITMAPINFOHEADER info_hdr; + HBITMAP hbm; + LPVOID bits; + INT lines; - if (dcSrc) { - if (dcDst->funcs->pStretchBlt) - ret = dcDst->funcs->pStretchBlt( dcDst->physDev, xDst, yDst, widthDst, heightDst, - dcSrc->physDev, xSrc, ySrc, widthSrc, heightSrc, - rop ); - GDI_ReleaseObj( hdcSrc ); - } GDI_ReleaseObj( hdcDst ); + + if(GetObjectType( hdcSrc ) != OBJ_MEMDC) return FALSE; + + GetObjectW(GetCurrentObject(hdcSrc, OBJ_BITMAP), sizeof(bm), &bm); + + info_hdr.biSize = sizeof(info_hdr); + info_hdr.biWidth = bm.bmWidth; + info_hdr.biHeight = bm.bmHeight; + info_hdr.biPlanes = 1; + info_hdr.biBitCount = 32; + info_hdr.biCompression = BI_RGB; + info_hdr.biSizeImage = 0; + info_hdr.biXPelsPerMeter = 0; + info_hdr.biYPelsPerMeter = 0; + info_hdr.biClrUsed = 0; + info_hdr.biClrImportant = 0; + + if(!(bits = HeapAlloc(GetProcessHeap(), 0, bm.bmHeight * bm.bmWidth * 4))) + return FALSE; + + /* Select out the src bitmap before calling GetDIBits */ + hbm = SelectObject(hdcSrc, GetStockObject(DEFAULT_BITMAP)); + GetDIBits(hdcSrc, hbm, 0, bm.bmHeight, bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS); + SelectObject(hdcSrc, hbm); + + lines = StretchDIBits(hdcDst, xDst, yDst, widthDst, heightDst, xSrc, ySrc, widthSrc, heightSrc, + bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS, rop); + + HeapFree(GetProcessHeap(), 0, bits); + return (lines == bm.bmHeight); } + else if(dcDst) + GDI_ReleaseObj( hdcDst ); + return ret; }

1 0

wine/dlls/shell32 shfldr_desktop.c shlfolder.c ...
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21446 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 04:59:39 Modified files: dlls/shell32 : shfldr_desktop.c shlfolder.c dlls/shell32/tests: shlfolder.c Log message: Martin Fuchs <martin-fuchs(a)gmx.net> Correctly call HCR_GetFolderAttributes() in SHELL32_GetItemAttributes(). Directly return the correct "My Computer" attributes in ISF_Desktop_fnGetAttributesOf(). Remove "todo_wine" from the "My Computer" attributes test case. Add test case for retrieving the file system path from the CSIDL_PROGRAM_FILES PIDL using SHGetPathFromIDListW(). Patch: http://cvs.winehq.org/patch.py?id=21446 Old revision New revision Changes Path 1.50 1.51 +5 -0 wine/dlls/shell32/shfldr_desktop.c 1.106 1.107 +4 -5 wine/dlls/shell32/shlfolder.c 1.43 1.44 +18 -2 wine/dlls/shell32/tests/shlfolder.c Index: wine/dlls/shell32/shfldr_desktop.c diff -u -p wine/dlls/shell32/shfldr_desktop.c:1.50 wine/dlls/shell32/shfldr_desktop.c:1.51 --- wine/dlls/shell32/shfldr_desktop.c:1.50 28 Nov 2005 10:59:39 -0000 +++ wine/dlls/shell32/shfldr_desktop.c 28 Nov 2005 10:59:39 -0000 @@ -431,6 +431,9 @@ static HRESULT WINAPI ISF_Desktop_fnGetA static const DWORD dwDesktopAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + static const DWORD dwMyComputerAttributes = + SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | + SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); @@ -450,6 +453,8 @@ static HRESULT WINAPI ISF_Desktop_fnGetA pdump (*apidl); if (_ILIsDesktop(*apidl)) { *rgfInOut &= dwDesktopAttributes; + } else if (_ILIsMyComputer(*apidl)) { + *rgfInOut &= dwMyComputerAttributes; } else { SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut); } Index: wine/dlls/shell32/shlfolder.c diff -u -p wine/dlls/shell32/shlfolder.c:1.106 wine/dlls/shell32/shlfolder.c:1.107 --- wine/dlls/shell32/shlfolder.c:1.106 28 Nov 2005 10:59:39 -0000 +++ wine/dlls/shell32/shlfolder.c 28 Nov 2005 10:59:39 -0000 @@ -408,14 +408,13 @@ HRESULT SHELL32_GetItemAttributes (IShel *pdwAttributes &= dwSupportedAttr; } + dwAttributes = *pdwAttributes; + if (_ILIsDrive (pidl)) { *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK; - } else if (_ILGetGUIDPointer (pidl)) { - if (!HCR_GetFolderAttributes (pidl, pdwAttributes)) { - *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| - SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK; - } + } else if (_ILGetGUIDPointer (pidl) && HCR_GetFolderAttributes(pidl, &dwAttributes)) { + *pdwAttributes = dwAttributes; } else if (_ILGetDataPointer (pidl)) { dwAttributes = _ILGetFileAttributes (pidl, NULL, 0); Index: wine/dlls/shell32/tests/shlfolder.c diff -u -p wine/dlls/shell32/tests/shlfolder.c:1.43 wine/dlls/shell32/tests/shlfolder.c:1.44 --- wine/dlls/shell32/tests/shlfolder.c:1.43 28 Nov 2005 10:59:39 -0000 +++ wine/dlls/shell32/tests/shlfolder.c 28 Nov 2005 10:59:39 -0000 @@ -602,8 +602,8 @@ static void test_GetAttributesOf(void) dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfDesktop, 1, (LPCITEMIDLIST*)&pidlMyComputer, &dwFlags); ok (SUCCEEDED(hr), "Desktop->GetAttributesOf(MyComputer) failed! hr = %08lx\n", hr); - todo_wine { ok ((dwFlags & ~(DWORD)SFGAO_CANLINK) == dwMyComputerFlags, - "Wrong MyComputer attributes: %08lx, expected: %08lx\n", dwFlags, dwMyComputerFlags); } + ok ((dwFlags & ~(DWORD)SFGAO_CANLINK) == dwMyComputerFlags, + "Wrong MyComputer attributes: %08lx, expected: %08lx\n", dwFlags, dwMyComputerFlags); hr = IShellFolder_BindToObject(psfDesktop, pidlMyComputer, NULL, &IID_IShellFolder, (LPVOID*)&psfMyComputer); ok (SUCCEEDED(hr), "Desktop failed to bind to MyComputer object! hr = %08lx\n", hr); @@ -641,6 +641,9 @@ static void test_SHGetPathFromIDList(voi STRRET strret; static WCHAR wszTestFile[] = { 'w','i','n','e','t','e','s','t','.','f','o','o',0 }; + HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); + HMODULE hShell32; + LPITEMIDLIST pidlPrograms; if(!pSHGetSpecialFolderPathW) return; @@ -725,6 +728,19 @@ static void test_SHGetPathFromIDList(voi IMalloc_Free(ppM, pidlTestFile); if (!result) return; ok(0 == lstrcmpW(wszFileName, wszPath), "SHGetPathFromIDListW returned incorrect path for file placed on desktop\n"); + + + /* Test if we can get the path from the start menu "program files" PIDL. */ + hShell32 = GetModuleHandleA("shell32"); + pSHGetSpecialFolderLocation = (HRESULT(WINAPI*)(HWND,int,LPITEMIDLIST*))GetProcAddress(hShell32, "SHGetSpecialFolderLocation"); + + hr = pSHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidlPrograms); + ok(SUCCEEDED(hr), "SHGetFolderLocation failed: 0x%08lx\n", hr); + + SetLastError(0xdeadbeef); + result = SHGetPathFromIDListW(pidlPrograms, wszPath); + IMalloc_Free(ppM, pidlPrograms); + ok(result, "SHGetPathFromIDList failed\n"); } static void test_EnumObjects_and_CompareIDs(void)

1 0

wine/documentation README.ko
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21445 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 04:59:29 Added files: documentation : README.ko Log message: YunSong Hwang <hys545(a)dreamwiz.com> Add a translation of the README. Patch: http://cvs.winehq.org/patch.py?id=21445 Old revision New revision Changes Path Added 1.1 +0 -0 wine/documentation/README.ko

1 0

wine/dlls/msi helpers.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21444 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 04:59:22 Modified files: dlls/msi : helpers.c Log message: Mike McCormack <mike(a)codeweavers.com> If a source directory doesn't exist, use the install root instead. Patch: http://cvs.winehq.org/patch.py?id=21444 Old revision New revision Changes Path 1.37 1.38 +69 -38 wine/dlls/msi/helpers.c Index: wine/dlls/msi/helpers.c diff -u -p wine/dlls/msi/helpers.c:1.37 wine/dlls/msi/helpers.c:1.38 --- wine/dlls/msi/helpers.c:1.37 28 Nov 2005 10:59:22 -0000 +++ wine/dlls/msi/helpers.c 28 Nov 2005 10:59:22 -0000 @@ -210,6 +210,24 @@ MSIFOLDER *get_loaded_folder( MSIPACKAGE return NULL; } +static LPWSTR get_source_root( MSIPACKAGE *package ) +{ + LPWSTR path, p; + + path = msi_dup_property( package, cszSourceDir ); + if (path) + return path; + + path = msi_dup_property( package, cszDatabase ); + if (path) + { + p = strrchrW(path,'\\'); + if (p) + *(p+1) = 0; + } + return path; +} + LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source, BOOL set_prop, MSIFOLDER **folder) { @@ -221,42 +239,28 @@ LPWSTR resolve_folder(MSIPACKAGE *packag if (!name) return NULL; - /* source directories appear to always be at the root */ - if (source) + /* special resolving for Target and Source root dir */ + if (strcmpW(name,cszTargetDir)==0 || strcmpW(name,cszSourceDir)==0) { - path = msi_dup_property( package, cszSourceDir ); - if (!path) + if (!source) { - path = msi_dup_property( package, cszDatabase ); - if (path) + LPWSTR check_path; + check_path = msi_dup_property( package, cszTargetDir ); + if (!check_path) { - p = strrchrW(path,'\\'); - if (p) - *(p+1) = 0; + check_path = msi_dup_property( package, cszRootDrive ); + if (set_prop) + MSI_SetPropertyW(package,cszTargetDir,check_path); } - } - if (folder) - *folder = get_loaded_folder( package, name ); - return path; - } - /* special resolving for Target and Source root dir */ - if (strcmpW(name,cszTargetDir)==0 || strcmpW(name,cszSourceDir)==0) - { - LPWSTR check_path; - check_path = msi_dup_property( package, cszTargetDir ); - if (!check_path) - { - check_path = msi_dup_property( package, cszRootDrive ); - if (set_prop) - MSI_SetPropertyW(package,cszTargetDir,check_path); + /* correct misbuilt target dir */ + path = build_directory_name(2, check_path, NULL); + if (strcmpiW(path,check_path)!=0) + MSI_SetPropertyW(package,cszTargetDir,path); + msi_free(check_path); } - - /* correct misbuilt target dir */ - path = build_directory_name(2, check_path, NULL); - if (strcmpiW(path,check_path)!=0) - MSI_SetPropertyW(package,cszTargetDir,path); - msi_free(check_path); + else + path = get_source_root( package ); if (folder) *folder = get_loaded_folder( package, name ); return path; @@ -269,13 +273,19 @@ LPWSTR resolve_folder(MSIPACKAGE *packag if (folder) *folder = f; - if (f->ResolvedTarget) + if (!source && f->ResolvedTarget) { path = strdupW( f->ResolvedTarget ); TRACE(" already resolved to %s\n",debugstr_w(path)); return path; } - else if (f->Property) + else if (source && f->ResolvedSource) + { + path = strdupW( f->ResolvedSource ); + TRACE(" (source)already resolved to %s\n",debugstr_w(path)); + return path; + } + else if (!source && f->Property) { path = build_directory_name( 2, f->Property, NULL ); @@ -292,13 +302,34 @@ LPWSTR resolve_folder(MSIPACKAGE *packag TRACE(" ! Parent is %s\n", debugstr_w(parent)); p = resolve_folder(package, parent, source, set_prop, NULL); - TRACE(" TargetDefault = %s\n", debugstr_w(f->TargetDefault)); + if (!source) + { + TRACE(" TargetDefault = %s\n", debugstr_w(f->TargetDefault)); - path = build_directory_name( 3, p, f->TargetDefault, NULL ); - f->ResolvedTarget = strdupW( path ); - TRACE(" resolved into %s\n",debugstr_w(path)); - if (set_prop) - MSI_SetPropertyW(package,name,path); + path = build_directory_name( 3, p, f->TargetDefault, NULL ); + f->ResolvedTarget = strdupW( path ); + TRACE("target -> %s\n", debugstr_w(path)); + if (set_prop) + MSI_SetPropertyW(package,name,path); + } + else + { + if (f->SourceDefault && f->SourceDefault[0]!='.') + path = build_directory_name( 3, p, f->SourceDefault, NULL ); + else + path = strdupW(p); + TRACE("source -> %s\n", debugstr_w(path)); + + /* if the directory doesn't exist, use the root */ + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + { + msi_free( path ); + path = get_source_root( package ); + TRACE("defaulting to %s\n", debugstr_w(path)); + } + else + f->ResolvedSource = strdupW( path ); + } msi_free(p); } return path;

1 0

wine/dlls/msi dialog.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21443 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 04:59:14 Modified files: dlls/msi : dialog.c Log message: Mike McCormack <mike(a)codeweavers.com> Handle the ^ character in MaskEdit controls. Patch: http://cvs.winehq.org/patch.py?id=21443 Old revision New revision Changes Path 1.60 1.61 +2 -0 wine/dlls/msi/dialog.c Index: wine/dlls/msi/dialog.c diff -u -p wine/dlls/msi/dialog.c:1.60 wine/dlls/msi/dialog.c:1.61 --- wine/dlls/msi/dialog.c:1.60 28 Nov 2005 10:59:14 -0000 +++ wine/dlls/msi/dialog.c 28 Nov 2005 10:59:14 -0000 @@ -939,6 +939,7 @@ static BOOL msi_mask_editable( WCHAR typ case '&': case '`': case '?': + case '^': return TRUE; } return FALSE; @@ -1156,6 +1157,7 @@ msi_maskedit_create_children( struct msi /* * office 2003 uses "73931<````=````=````=````=`````>@@@@@" * delphi 7 uses "<????-??????-??????-????>" and "<???-???>" + * filemaker pro 7 uses "<^^^^=^^^^=^^^^=^^^^=^^^^=^^^^=^^^^^>" */ static UINT msi_dialog_maskedit_control( msi_dialog *dialog, MSIRECORD *rec ) {

1 0

wine/dlls/dmime dmime_private.h performance.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21442 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 04:59:05 Modified files: dlls/dmime : dmime_private.h performance.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Partial implementation of IDirectMusicPerformance8Impl_AddPort. Patch: http://cvs.winehq.org/patch.py?id=21442 Old revision New revision Changes Path 1.26 1.27 +2 -1 wine/dlls/dmime/dmime_private.h 1.26 1.27 +43 -6 wine/dlls/dmime/performance.c Index: wine/dlls/dmime/dmime_private.h diff -u -p wine/dlls/dmime/dmime_private.h:1.26 wine/dlls/dmime/dmime_private.h:1.27 --- wine/dlls/dmime/dmime_private.h:1.26 28 Nov 2005 10:59: 5 -0000 +++ wine/dlls/dmime/dmime_private.h 28 Nov 2005 10:59: 5 -0000 @@ -41,6 +41,7 @@ #include "dmusici.h" #include "dmusicf.h" #include "dmusics.h" +#include "dmusicc.h" /***************************************************************************** * Interfaces @@ -147,7 +148,7 @@ struct IDirectMusicPerformance8Impl { long lMasterVolume; /* performance channels */ - DMUSIC_PRIVATE_PCHANNEL PChannel[1]; + DMUSIC_PRIVATE_PCHANNEL PChannel[32]; /* IDirectMusicPerformance8Impl fields */ IDirectMusicAudioPath* pDefaultPath; Index: wine/dlls/dmime/performance.c diff -u -p wine/dlls/dmime/performance.c:1.26 wine/dlls/dmime/performance.c:1.27 --- wine/dlls/dmime/performance.c:1.26 28 Nov 2005 10:59: 5 -0000 +++ wine/dlls/dmime/performance.c 28 Nov 2005 10:59: 5 -0000 @@ -222,7 +222,10 @@ static HRESULT WINAPI IDirectMusicPerfor This->pDirectSound = (IDirectSound*) pDirectSound; IDirectSound_AddRef((LPDIRECTSOUND) This->pDirectSound); } else { - DirectSoundCreate8(NULL, (LPDIRECTSOUND8*) &This->pDirectSound, NULL); + HRESULT hr; + hr = DirectSoundCreate8(NULL, (LPDIRECTSOUND8*) &This->pDirectSound, NULL); + if (!This->pDirectSound) return DSERR_NODRIVER; + /** * as seen in msdn * @@ -234,8 +237,6 @@ static HRESULT WINAPI IDirectMusicPerfor /* how to get the ForeGround window handle ? */ /*IDirectSound8_SetCooperativeLevel(This->pDirectSound, hWnd, DSSCL_PRIORITY);*/ } - if (!This->pDirectSound) - return DSERR_NODRIVER; } if (NULL != ppDirectMusic && NULL != *ppDirectMusic) { @@ -510,8 +511,41 @@ static HRESULT WINAPI IDirectMusicPerfor static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort (LPDIRECTMUSICPERFORMANCE8 iface, IDirectMusicPort* pPort) { IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; + HRESULT hr = E_FAIL; FIXME("(%p, %p): stub\n", This, pPort); - IDirectMusicPort_AddRef (pPort); + if (!This->pDirectMusic || !This->pDirectSound) return DMUS_E_NOT_INIT; + if (NULL == pPort) { + GUID port_guid; + IDirectMusicPort* pDefaultPort = NULL; + DMUS_PORTPARAMS params; + int i, j; + hr = IDirectMusic8_GetDefaultPort(This->pDirectMusic, &port_guid); + if (FAILED(hr)) return hr; + ZeroMemory(&params, sizeof(params)); + params.dwSize = sizeof(params); + params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_SHARE; + params.dwChannelGroups = 1; + params.fShare = TRUE; + hr = IDirectMusic8_CreatePort(This->pDirectMusic, &port_guid, &params, &pDefaultPort, NULL); + if (FAILED(hr)) return hr; + hr = IDirectMusicPort_Activate(pDefaultPort, TRUE); + if (FAILED(hr)) { IDirectMusicPort_Release(pDefaultPort); return hr; } + j = 0; + for (i = 0; i < 16; ++i) { + if (NULL == This->PChannel[i].port) { + This->PChannel[i].port = pPort; + This->PChannel[i].group = 0; + This->PChannel[i].channel = j; /* FIXME: should this be assigned? */ + j++; + } + } + } else { + IDirectMusicPort_AddRef(pPort); + } + /** + * We should remember added Ports (for example using a list) + * and control if Port is registered for each api who use ports + */ return S_OK; } @@ -527,9 +561,10 @@ static HRESULT WINAPI IDirectMusicPerfor IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; FIXME("(%p, %ld, %p, %ld): semi-stub\n", This, dwBlockNum, pPort, dwGroup-1); + if (NULL == pPort) return E_POINTER; + range = 16 * dwBlockNum; j = 0; - for (i = range; i < range+16; i++) { /*TRACE("Setting PChannel[%i] to port %p, group %ld, MIDI port %i\n", i, pPort, dwGroup-1, j); */ This->PChannel[i].port = pPort; @@ -537,6 +572,7 @@ static HRESULT WINAPI IDirectMusicPerfor This->PChannel[i].channel = j; /* FIXME: should this be assigned? */ j++; } + /*if (dwGroup > 2) return S_FALSE;*/ return S_OK; } @@ -545,6 +581,7 @@ static HRESULT WINAPI IDirectMusicPerfor IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; TRACE("(%p, %ld, %p, %ld, %ld)\n", This, dwPChannel, pPort, dwGroup, dwMChannel); + if (NULL == pPort) return E_POINTER; This->PChannel[dwPChannel].port = pPort; This->PChannel[dwPChannel].group = dwGroup; This->PChannel[dwPChannel].channel = dwMChannel; @@ -554,7 +591,7 @@ static HRESULT WINAPI IDirectMusicPerfor static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo (LPDIRECTMUSICPERFORMANCE8 iface, DWORD dwPChannel, IDirectMusicPort** ppPort, DWORD* pdwGroup, DWORD* pdwMChannel) { IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; - FIXME("(%p, %ld, %p, %p, %p): stub\n", This, dwPChannel, ppPort, pdwGroup, pdwMChannel); + FIXME("(%p, %ld, %p, %p, %p): stub\n", This, dwPChannel, ppPort, pdwGroup, pdwMChannel); return S_OK; }

1 0

wine/dlls/shell32 shfldr_unixfs.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21441 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 04:58:58 Modified files: dlls/shell32 : shfldr_unixfs.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Initial stubbed implementation of UnixFolder's IDropTarget interface. Patch: http://cvs.winehq.org/patch.py?id=21441 Old revision New revision Changes Path 1.61 1.62 +89 -12 wine/dlls/shell32/shfldr_unixfs.c Index: wine/dlls/shell32/shfldr_unixfs.c diff -u -p wine/dlls/shell32/shfldr_unixfs.c:1.61 wine/dlls/shell32/shfldr_unixfs.c:1.62 --- wine/dlls/shell32/shfldr_unixfs.c:1.61 28 Nov 2005 10:58:58 -0000 +++ wine/dlls/shell32/shfldr_unixfs.c 28 Nov 2005 10:58:58 -0000 @@ -185,10 +185,11 @@ const GUID CLSID_UnixDosFolder = {0x9d20 /* UnixFolder object layout and typedef. */ typedef struct _UnixFolder { - const IShellFolder2Vtbl *lpIShellFolder2Vtbl; - const IPersistFolder3Vtbl *lpIPersistFolder3Vtbl; + const IShellFolder2Vtbl *lpIShellFolder2Vtbl; + const IPersistFolder3Vtbl *lpIPersistFolder3Vtbl; const IPersistPropertyBagVtbl *lpIPersistPropertyBagVtbl; - const ISFHelperVtbl *lpISFHelperVtbl; + const IDropTargetVtbl *lpIDropTargetVtbl; + const ISFHelperVtbl *lpISFHelperVtbl; LONG m_cRef; CHAR *m_pszPath; /* Target path of the shell folder */ LPITEMIDLIST m_pidlLocation; /* Location in the shell namespace */ @@ -672,15 +673,17 @@ static HRESULT WINAPI UnixFolder_IShellF if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IShellFolder, riid) || IsEqualIID(&IID_IShellFolder2, riid)) { - *ppv = &This->lpIShellFolder2Vtbl; + *ppv = STATIC_CAST(IShellFolder2, This); } else if (IsEqualIID(&IID_IPersistFolder3, riid) || IsEqualIID(&IID_IPersistFolder2, riid) || IsEqualIID(&IID_IPersistFolder, riid) || IsEqualIID(&IID_IPersist, riid)) { - *ppv = &This->lpIPersistFolder3Vtbl; + *ppv = STATIC_CAST(IPersistFolder3, This); } else if (IsEqualIID(&IID_IPersistPropertyBag, riid)) { - *ppv = &This->lpIPersistPropertyBagVtbl; + *ppv = STATIC_CAST(IPersistPropertyBag, This); } else if (IsEqualIID(&IID_ISFHelper, riid)) { - *ppv = &This->lpISFHelperVtbl; + *ppv = STATIC_CAST(ISFHelper, This); + } else if (IsEqualIID(&IID_IDropTarget, riid)) { + *ppv = STATIC_CAST(IDropTarget, This); } else { *ppv = NULL; return E_NOINTERFACE; @@ -881,7 +884,9 @@ static HRESULT WINAPI UnixFolder_IShellF hr = IShellView_QueryInterface(pShellView, riid, ppv); IShellView_Release(pShellView); } - } + } else if (IsEqualIID(&IID_IDropTarget, riid)) { + hr = IShellFolder2_QueryInterface(iface, &IID_IDropTarget, ppv); + } return hr; } @@ -928,10 +933,18 @@ static HRESULT WINAPI UnixFolder_IShellF UINT cidl, LPCITEMIDLIST* apidl, REFIID riid, UINT* prgfInOut, void** ppvOut) { UnixFolder *This = ADJUST_THIS(UnixFolder, IShellFolder2, iface); + UINT i; TRACE("(iface=%p, hwndOwner=%p, cidl=%d, apidl=%p, riid=%s, prgfInOut=%p, ppv=%p)\n", iface, hwndOwner, cidl, apidl, debugstr_guid(riid), prgfInOut, ppvOut); + if (!cidl || !apidl || !riid || !ppvOut) + return E_INVALIDARG; + + for (i=0; i<cidl; i++) + if (!apidl[i]) + return E_INVALIDARG; + if (IsEqualIID(&IID_IContextMenu, riid)) { *ppvOut = ISvItemCm_Constructor((IShellFolder*)iface, This->m_pidlLocation, apidl, cidl); return S_OK; @@ -940,21 +953,21 @@ static HRESULT WINAPI UnixFolder_IShellF return S_OK; } else if (IsEqualIID(&IID_IExtractIconA, riid)) { LPITEMIDLIST pidl; - if (cidl != 1) return E_FAIL; + if (cidl != 1) return E_INVALIDARG; pidl = ILCombine(This->m_pidlLocation, apidl[0]); *ppvOut = (LPVOID)IExtractIconA_Constructor(pidl); SHFree(pidl); return S_OK; } else if (IsEqualIID(&IID_IExtractIconW, riid)) { LPITEMIDLIST pidl; - if (cidl != 1) return E_FAIL; + if (cidl != 1) return E_INVALIDARG; pidl = ILCombine(This->m_pidlLocation, apidl[0]); *ppvOut = (LPVOID)IExtractIconW_Constructor(pidl); SHFree(pidl); return S_OK; } else if (IsEqualIID(&IID_IDropTarget, riid)) { - FIXME("IDropTarget\n"); - return E_FAIL; + if (cidl != 1) return E_INVALIDARG; + return IShellFolder2_BindToObject(iface, apidl[0], NULL, &IID_IDropTarget, ppvOut); } else if (IsEqualIID(&IID_IShellLinkW, riid)) { FIXME("IShellLinkW\n"); return E_FAIL; @@ -1694,6 +1707,69 @@ static const ISFHelperVtbl UnixFolder_IS UnixFolder_ISFHelper_CopyItems }; +static HRESULT WINAPI UnixFolder_IDropTarget_QueryInterface(IDropTarget* iface, REFIID riid, + void** ppvObject) +{ + return UnixFolder_IShellFolder2_QueryInterface( + (IShellFolder2*)ADJUST_THIS(UnixFolder, IDropTarget, iface), riid, ppvObject); +} + +static ULONG WINAPI UnixFolder_IDropTarget_AddRef(IDropTarget* iface) +{ + return UnixFolder_IShellFolder2_AddRef( + (IShellFolder2*)ADJUST_THIS(UnixFolder, IDropTarget, iface)); +} + +static ULONG WINAPI UnixFolder_IDropTarget_Release(IDropTarget* iface) +{ + return UnixFolder_IShellFolder2_Release( + (IShellFolder2*)ADJUST_THIS(UnixFolder, IDropTarget, iface)); +} + +static HRESULT WINAPI UnixFolder_IDropTarget_DragEnter(IDropTarget *iface, IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + FIXME("(iface=%p, pDataObject=%p, dwKeyState=%08lx, pt={.x=%ld, .y=%ld}, pdwEffect=%p) stub\n", + iface, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI UnixFolder_IDropTarget_DragOver(IDropTarget *iface, DWORD dwKeyState, + POINTL pt, DWORD *pdwEffect) +{ + FIXME("(iface=%p, dwKeyState=%08lx, pt={.x=%ld, .y=%ld}, pdwEffect=%p) stub\n", iface, + dwKeyState, pt.x, pt.y, pdwEffect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI UnixFolder_IDropTarget_DragLeave(IDropTarget *iface) { + FIXME("(iface=%p) stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI UnixFolder_IDropTarget_Drop(IDropTarget *iface, IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + FIXME("(iface=%p, pDataObject=%p, dwKeyState=%ld, pt={.x=%ld, .y=%ld}, pdwEffect=%p) stub\n", + iface, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect); + + return E_NOTIMPL; +} + +/* VTable for UnixFolder's IDropTarget interface + */ +static const IDropTargetVtbl UnixFolder_IDropTarget_Vtbl = { + UnixFolder_IDropTarget_QueryInterface, + UnixFolder_IDropTarget_AddRef, + UnixFolder_IDropTarget_Release, + UnixFolder_IDropTarget_DragEnter, + UnixFolder_IDropTarget_DragOver, + UnixFolder_IDropTarget_DragLeave, + UnixFolder_IDropTarget_Drop +}; + /****************************************************************************** * Unix[Dos]Folder_Constructor [Internal] * @@ -1725,6 +1801,7 @@ static HRESULT CreateUnixFolder(IUnknown pUnixFolder->lpIPersistFolder3Vtbl = &UnixFolder_IPersistFolder3_Vtbl; pUnixFolder->lpIPersistPropertyBagVtbl = &UnixFolder_IPersistPropertyBag_Vtbl; pUnixFolder->lpISFHelperVtbl = &UnixFolder_ISFHelper_Vtbl; + pUnixFolder->lpIDropTargetVtbl = &UnixFolder_IDropTarget_Vtbl; pUnixFolder->m_cRef = 0; pUnixFolder->m_pszPath = NULL; pUnixFolder->m_pidlLocation = NULL;

1 0