January 2007 - Wine-Commits

H. Verbeet : wined3d: Use SetupFullscreenWindow() to make the window fullscreen.
by Alexandre Julliard Jan. 19, 2007

Jan. 19, 2007

Module: wine Branch: master Commit: 4352934b845df88dc0dc94a24ca01f70ba700a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4352934b845df88dc0dc94a24… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jan 18 23:41:43 2007 +0100 wined3d: Use SetupFullscreenWindow() to make the window fullscreen. --- dlls/wined3d/device.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1572b10..2f95fb1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1512,7 +1512,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl HDC hdc; int bpp = 0; RECT clip_rc; - DWORD style; /* Get info on the current display setup */ hdc = GetDC(0); @@ -1528,19 +1527,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl MultiByteToWideChar(CP_ACP, 0, "Gamers CG", -1, devmode.dmDeviceName, CCHDEVICENAME); ChangeDisplaySettingsExW(devmode.dmDeviceName, &devmode, object->win_handle, CDS_FULLSCREEN, NULL); - /* Make popup window, remove caption and borders */ - style = GetWindowLongW(object->win_handle, GWL_STYLE); - style &= ~WS_CAPTION; - SetWindowLongW(object->win_handle, GWL_STYLE, style | WS_POPUP); - SetWindowPos(object->win_handle, HWND_TOP, 0, 0, - *(pPresentationParameters->BackBufferWidth), - *(pPresentationParameters->BackBufferHeight), SWP_FRAMECHANGED); - /* For GetDisplayMode */ This->ddraw_width = devmode.dmPelsWidth; This->ddraw_height = devmode.dmPelsHeight; This->ddraw_format = *(pPresentationParameters->BackBufferFormat); + IWineD3DDeviceImpl_SetupFullscreenWindow(iface, object->win_handle); + /* And finally clip mouse to our screen */ SetRect(&clip_rc, 0, 0, devmode.dmPelsWidth, devmode.dmPelsHeight); ClipCursor(&clip_rc);

1 0

H. Verbeet : wined3d: Move SetupFullscreenWindow() and RestoreWindow() from IDirectDrawImpl to IWineD3DDeviceImpl.
by Alexandre Julliard Jan. 19, 2007

Jan. 19, 2007

Module: wine Branch: master Commit: 6112522122eeb701ec21d0d55d7bcdc82dae2735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6112522122eeb701ec21d0d55… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jan 18 23:41:36 2007 +0100 wined3d: Move SetupFullscreenWindow() and RestoreWindow() from IDirectDrawImpl to IWineD3DDeviceImpl. --- dlls/ddraw/ddraw.c | 99 +------------------------------------ dlls/ddraw/ddraw_private.h | 3 - dlls/wined3d/device.c | 87 +++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++ include/wine/wined3d_interface.h | 4 ++ 5 files changed, 98 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6112522122eeb701ec21d…

1 0

Andrew Talbot : odbc32: Declare a function static.
by Alexandre Julliard Jan. 19, 2007

Jan. 19, 2007

Module: wine Branch: master Commit: 9c036817539b7437688d7dada6064f1a8f4eafe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c036817539b7437688d7dada… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 18 21:50:20 2007 +0000 odbc32: Declare a function static. --- dlls/odbc32/proxyodbc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index a3aa287..3351cfd 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -156,7 +156,7 @@ static PROXYHANDLE gProxyHandle; } \ } -SQLRETURN SQLDummyFunc(void) +static SQLRETURN SQLDummyFunc(void) { TRACE("SQLDummyFunc:\n"); return SQL_SUCCESS;

1 0

H. Verbeet : wined3d: Use %s in trace.
by Alexandre Julliard Jan. 19, 2007

Jan. 19, 2007

Module: wine Branch: master Commit: a31f2fd9fc32a4749edf8df2e031f8869c5408bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a31f2fd9fc32a4749edf8df2e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jan 18 23:41:27 2007 +0100 wined3d: Use %s in trace. --- dlls/wined3d/baseshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index bd48878..6949be1 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -61,7 +61,7 @@ int shader_addline( TRACE("GL HW (%u, %u) : %s", buffer->lineNo + 1, buffer->bsize, base); buffer->newline = FALSE; } else { - TRACE(base); + TRACE("%s", base); } buffer->bsize += rc;

1 0

Andrew Talbot : ole32: Declare some functions static.
by Alexandre Julliard Jan. 19, 2007

Jan. 19, 2007

Module: wine Branch: master Commit: 02a5f7389e3bc2ab6a6455984fe11b9ff67a5692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a5f7389e3bc2ab6a6455984… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 18 21:50:56 2007 +0000 ole32: Declare some functions static. --- dlls/ole32/classmoniker.c | 2 +- dlls/ole32/errorinfo.c | 2 +- dlls/ole32/hglobalstream.c | 2 +- dlls/ole32/itemmoniker.c | 8 ++++---- dlls/ole32/memlockbytes.c | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 8bfafe8..66677d6 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -694,7 +694,7 @@ static const IROTDataVtbl ROTDataVtbl = /****************************************************************************** * ClassMoniker_Construct (local function) *******************************************************************************/ -HRESULT WINAPI ClassMoniker_Construct(ClassMoniker* This, REFCLSID rclsid) +static HRESULT WINAPI ClassMoniker_Construct(ClassMoniker* This, REFCLSID rclsid) { TRACE("(%p,%s)\n",This,debugstr_guid(rclsid)); diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index c1789ef..01dc305 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -167,7 +167,7 @@ static inline ErrorInfoImpl *impl_from_I #define _ICreateErrorInfo_(This) (ICreateErrorInfo*)&(This->lpvtcei) #define _ISupportErrorInfo_(This) (ISupportErrorInfo*)&(This->lpvtsei) -IErrorInfo * IErrorInfoImpl_Constructor(void) +static IErrorInfo * IErrorInfoImpl_Constructor(void) { ErrorInfoImpl * ei = HeapAlloc(GetProcessHeap(), 0, sizeof(ErrorInfoImpl)); if (ei) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 40a0dbf..d98c0c5 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -651,7 +651,7 @@ static const IStreamVtbl HGLOBALStreamIm * fDeleteOnRelease - Flag set to TRUE if the HGLOBAL will be released * when the IStream object is destroyed. */ -HGLOBALStreamImpl* HGLOBALStreamImpl_Construct( +static HGLOBALStreamImpl* HGLOBALStreamImpl_Construct( HGLOBAL hGlobal, BOOL fDeleteOnRelease) { diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 110e311..2a8ed22 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -97,8 +97,8 @@ static HRESULT WINAPI ItemMonikerImpl_Pa static HRESULT WINAPI ItemMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys); /* Local function used by ItemMoniker implementation */ -HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* iface, LPCOLESTR lpszDelim,LPCOLESTR lpszPathName); -HRESULT WINAPI ItemMonikerImpl_Destroy(ItemMonikerImpl* iface); +static HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* iface, LPCOLESTR lpszDelim,LPCOLESTR lpszPathName); +static HRESULT WINAPI ItemMonikerImpl_Destroy(ItemMonikerImpl* iface); /********************************************************************************/ /* IROTData prototype functions */ @@ -388,7 +388,7 @@ HRESULT WINAPI ItemMonikerImpl_GetSizeMa /****************************************************************************** * ItemMoniker_Construct (local function) *******************************************************************************/ -HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* This, LPCOLESTR lpszDelim,LPCOLESTR lpszItem) +static HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* This, LPCOLESTR lpszDelim,LPCOLESTR lpszItem) { int sizeStr1=lstrlenW(lpszItem), sizeStr2; @@ -426,7 +426,7 @@ HRESULT WINAPI ItemMonikerImpl_Construct /****************************************************************************** * ItemMoniker_Destroy (local function) *******************************************************************************/ -HRESULT WINAPI ItemMonikerImpl_Destroy(ItemMonikerImpl* This) +static HRESULT WINAPI ItemMonikerImpl_Destroy(ItemMonikerImpl* This) { TRACE("(%p)\n",This); diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c index ef02011..18761fb 100644 --- a/dlls/ole32/memlockbytes.c +++ b/dlls/ole32/memlockbytes.c @@ -81,11 +81,11 @@ typedef struct HGLOBALLockBytesImpl HGLO /* * Method definition for the HGLOBALLockBytesImpl class. */ -HGLOBALLockBytesImpl* HGLOBALLockBytesImpl_Construct( +static HGLOBALLockBytesImpl* HGLOBALLockBytesImpl_Construct( HGLOBAL hGlobal, BOOL fDeleteOnRelease); -void HGLOBALLockBytesImpl_Destroy(HGLOBALLockBytesImpl* This); +static void HGLOBALLockBytesImpl_Destroy(HGLOBALLockBytesImpl* This); static HRESULT WINAPI HGLOBALLockBytesImpl_SetSize( ILockBytes* iface, ULARGE_INTEGER libNewSize ); @@ -196,8 +196,8 @@ HRESULT WINAPI GetHGlobalFromILockBytes( * fDeleteOnRelease [ I] Flag set to TRUE if the HGLOBAL will be released * when the IStream object is destroyed. */ -HGLOBALLockBytesImpl* HGLOBALLockBytesImpl_Construct(HGLOBAL hGlobal, - BOOL fDeleteOnRelease) +static HGLOBALLockBytesImpl* HGLOBALLockBytesImpl_Construct(HGLOBAL hGlobal, + BOOL fDeleteOnRelease) { HGLOBALLockBytesImpl* newLockBytes; newLockBytes = HeapAlloc(GetProcessHeap(), 0, sizeof(HGLOBALLockBytesImpl)); @@ -244,7 +244,7 @@ HGLOBALLockBytesImpl* HGLOBALLockBytesIm * HGLOBALLockBytesImpl class. The pointer passed-in to this function will be * freed and will not be valid anymore. */ -void HGLOBALLockBytesImpl_Destroy(HGLOBALLockBytesImpl* This) +static void HGLOBALLockBytesImpl_Destroy(HGLOBALLockBytesImpl* This) { /* * Release the HGlobal if the constructor asked for that.

1 0

Vitaliy Margolen : server: Add generic access mapping for winstation and desktop objects.
by Alexandre Julliard Jan. 19, 2007

Jan. 19, 2007

Module: wine Branch: master Commit: e612bd410c48944e95a615f370def07ba6d2310c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e612bd410c48944e95a615f37… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Jan 18 13:10:31 2007 -0700 server: Add generic access mapping for winstation and desktop objects. --- server/winstation.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/server/winstation.c b/server/winstation.c index 44c66a5..a7df50e 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -46,9 +46,11 @@ static struct namespace *winstation_name static void winstation_dump( struct object *obj, int verbose ); static int winstation_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void winstation_destroy( struct object *obj ); +static unsigned int winstation_map_access( struct object *obj, unsigned int access ); static void desktop_dump( struct object *obj, int verbose ); static int desktop_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void desktop_destroy( struct object *obj ); +static unsigned int desktop_map_access( struct object *obj, unsigned int access ); static const struct object_ops winstation_ops = { @@ -60,7 +62,7 @@ static const struct object_ops winstatio NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + winstation_map_access, /* map_access */ no_lookup_name, /* lookup_name */ winstation_close_handle, /* close_handle */ winstation_destroy /* destroy */ @@ -77,7 +79,7 @@ static const struct object_ops desktop_o NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + desktop_map_access, /* map_access */ no_lookup_name, /* lookup_name */ desktop_close_handle, /* close_handle */ desktop_destroy /* destroy */ @@ -139,6 +141,17 @@ static void winstation_destroy( struct o if (winstation->atom_table) release_object( winstation->atom_table ); } +static unsigned int winstation_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | WINSTA_ENUMDESKTOPS | WINSTA_READATTRIBUTES | + WINSTA_ENUMERATE | WINSTA_READSCREEN; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | WINSTA_ACCESSCLIPBOARD | WINSTA_CREATEDESKTOP | + WINSTA_WRITEATTRIBUTES; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | WINSTA_ACCESSGLOBALATOMS | WINSTA_EXITWINDOWS; + if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_REQUIRED | WINSTA_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + /* retrieve the process window station, checking the handle access rights */ struct winstation *get_process_winstation( struct process *process, unsigned int access ) { @@ -239,6 +252,17 @@ static void desktop_destroy( struct obje release_object( desktop->winstation ); } +static unsigned int desktop_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | DESKTOP_READOBJECTS | DESKTOP_ENUMERATE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW | + DESKTOP_HOOKCONTROL | DESKTOP_JOURNALRECORD | DESKTOP_JOURNALPLAYBACK | + DESKTOP_WRITEOBJECTS; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | DESKTOP_SWITCHDESKTOP; + if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_REQUIRED | DESKTOP_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + /* retrieve the thread desktop, checking the handle access rights */ struct desktop *get_thread_desktop( struct thread *thread, unsigned int access ) {

1 0

Francois Gouget : shell32: Add proper support for SHGetFileInfo( SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES).
by Alexandre Julliard Jan. 19, 2007

Jan. 19, 2007

Module: wine Branch: master Commit: aa3165fca69384d863a2c6f80c38f40a8430c59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa3165fca69384d863a2c6f80… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 18 16:23:30 2007 +0100 shell32: Add proper support for SHGetFileInfo(SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES). --- dlls/shell32/shell32_main.c | 67 ++++++++++++++++++++++++++++------------ dlls/shell32/tests/shlfileop.c | 6 ++-- 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 476a4ae..feeeac4 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -356,14 +356,6 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR (flags & (SHGFI_ATTRIBUTES|SHGFI_EXETYPE|SHGFI_PIDL))) return FALSE; - if ( (flags & SHGFI_USEFILEATTRIBUTES) && - (flags & (SHGFI_ICONLOCATION | SHGFI_ICON | SHGFI_SYSICONINDEX)) ) - { - FIXME("This combination of flags is not supported yet\n"); - /* And it would cause a crash, so return false instead */ - return FALSE; - } - /* windows initializes these values regardless of the flags */ if (psfi != NULL) { @@ -519,21 +511,56 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR { UINT uDummy,uFlags; - hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1, - (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconW, - &uDummy, (LPVOID*)&pei); - if (SUCCEEDED(hr)) + if (flags & SHGFI_USEFILEATTRIBUTES) { - hr = IExtractIconW_GetIconLocation(pei, uGilFlags, - szLocation, MAX_PATH, &iIndex, &uFlags); - psfi->iIcon = iIndex; - - if (!(uFlags & GIL_NOTFILENAME)) - lstrcpyW (psfi->szDisplayName, szLocation); + if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + lstrcpyW(psfi->szDisplayName, swShell32Name); + psfi->iIcon = -IDI_SHELL_FOLDER; + } else - ret = FALSE; + { + WCHAR* szExt; + static const WCHAR p1W[] = {'%','1',0}; + WCHAR sTemp [MAX_PATH]; + + szExt = (LPWSTR) PathFindExtensionW(szFullPath); + TRACE("szExt=%s\n", debugstr_w(szExt)); + if ( szExt && + HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && + HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &psfi->iIcon)) + { + if (lstrcmpW(p1W, sTemp)) + strcpyW(psfi->szDisplayName, sTemp); + else + { + /* the icon is in the file */ + strcpyW(psfi->szDisplayName, szFullPath); + } + } + else + ret = FALSE; + } + } + else + { + hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1, + (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconW, + &uDummy, (LPVOID*)&pei); + if (SUCCEEDED(hr)) + { + hr = IExtractIconW_GetIconLocation(pei, uGilFlags, + szLocation, MAX_PATH, &iIndex, &uFlags); - IExtractIconW_Release(pei); + if (uFlags & GIL_NOTFILENAME) + ret = FALSE; + else + { + lstrcpyW (psfi->szDisplayName, szLocation); + psfi->iIcon = iIndex; + } + IExtractIconW_Release(pei); + } } } diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index f6e599e..b363c5e 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -140,7 +140,7 @@ static void test_get_file_info(void) rc=SHGetFileInfoA("c:\\nonexistent", FILE_ATTRIBUTE_DIRECTORY, &shfi, sizeof(shfi), SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES); - todo_wine ok(rc, "SHGetFileInfoA(c:\\nonexistent) failed\n"); + ok(rc, "SHGetFileInfoA(c:\\nonexistent) failed\n"); if (rc) { ok(strcpy(shfi.szDisplayName, "dummy") != 0, "SHGetFileInfoA(c:\\nonexistent) displayname is not set\n"); @@ -157,7 +157,7 @@ static void test_get_file_info(void) rc=SHGetFileInfoA(notepad, GetFileAttributes(notepad), &shfi, sizeof(shfi), SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES); - todo_wine ok(rc, "SHGetFileInfoA(%s, SHGFI_USEFILEATTRIBUTES) failed\n", notepad); + ok(rc, "SHGetFileInfoA(%s, SHGFI_USEFILEATTRIBUTES) failed\n", notepad); strcpy(shfi2.szDisplayName, "dummy"); shfi2.iIcon=0xdeadbeef; rc2=SHGetFileInfoA(notepad, 0, @@ -177,7 +177,7 @@ static void test_get_file_info(void) rc=SHGetFileInfoA("test4.txt", GetFileAttributes("test4.txt"), &shfi, sizeof(shfi), SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES); - todo_wine ok(rc, "SHGetFileInfoA(test4.txt/, SHGFI_USEFILEATTRIBUTES) failed\n"); + ok(rc, "SHGetFileInfoA(test4.txt/, SHGFI_USEFILEATTRIBUTES) failed\n"); strcpy(shfi2.szDisplayName, "dummy"); shfi2.iIcon=0xdeadbeef; rc2=SHGetFileInfoA("test4.txt", 0,

1 0

Francois Gouget : shell32/tests: Add some more SHGetFileInfo() tests.
by Alexandre Julliard Jan. 19, 2007

Jan. 19, 2007

Module: wine Branch: master Commit: 5c5933f699ed16daa44d4451bedc2eddb51f78b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5933f699ed16daa44d4451b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 18 16:23:05 2007 +0100 shell32/tests: Add some more SHGetFileInfo() tests. --- dlls/shell32/tests/shlfileop.c | 69 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index c6d8004..f6e599e 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -114,20 +114,81 @@ static void clean_after_shfo_tests(void) static void test_get_file_info(void) { - DWORD rc; - SHFILEINFO shfi; + DWORD rc, rc2; + SHFILEINFO shfi, shfi2; + char notepad[MAX_PATH]; + + /* Test some flag combinations that MSDN claims are not allowed, + * but which work anyway + */ + shfi.dwAttributes=0xdeadbeef; + rc=SHGetFileInfoA("c:\\nonexistent", FILE_ATTRIBUTE_DIRECTORY, + &shfi, sizeof(shfi), + SHGFI_ATTRIBUTES | SHGFI_USEFILEATTRIBUTES); + todo_wine ok(rc, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) failed\n"); + if (rc) + ok(shfi.dwAttributes != 0xdeadbeef, "dwFileAttributes is not set\n"); + rc=SHGetFileInfoA("c:\\nonexistent", FILE_ATTRIBUTE_DIRECTORY, + &shfi, sizeof(shfi), + SHGFI_EXETYPE | SHGFI_USEFILEATTRIBUTES); + todo_wine ok(rc == 1, "SHGetFileInfoA(c:\\nonexistent | SHGFI_EXETYPE) returned %d\n", rc); + + /* Test SHGFI_USEFILEATTRIBUTES support */ strcpy(shfi.szDisplayName, "dummy"); shfi.iIcon=0xdeadbeef; rc=SHGetFileInfoA("c:\\nonexistent", FILE_ATTRIBUTE_DIRECTORY, &shfi, sizeof(shfi), SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES); - todo_wine ok(rc, "SHGetFileInfoA(c:\\nonexistent) returned %d\n", rc); + todo_wine ok(rc, "SHGetFileInfoA(c:\\nonexistent) failed\n"); if (rc) { ok(strcpy(shfi.szDisplayName, "dummy") != 0, "SHGetFileInfoA(c:\\nonexistent) displayname is not set\n"); ok(shfi.iIcon != 0xdeadbeef, "SHGetFileInfoA(c:\\nonexistent) iIcon is not set\n"); } + + /* Wine does not have a default icon for text files, and Windows 98 fails + * if we give it an empty executable. So use notepad.exe as the test + */ + if (SearchPath(NULL, "notepad.exe", NULL, sizeof(notepad), notepad, NULL)) + { + strcpy(shfi.szDisplayName, "dummy"); + shfi.iIcon=0xdeadbeef; + rc=SHGetFileInfoA(notepad, GetFileAttributes(notepad), + &shfi, sizeof(shfi), + SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES); + todo_wine ok(rc, "SHGetFileInfoA(%s, SHGFI_USEFILEATTRIBUTES) failed\n", notepad); + strcpy(shfi2.szDisplayName, "dummy"); + shfi2.iIcon=0xdeadbeef; + rc2=SHGetFileInfoA(notepad, 0, + &shfi2, sizeof(shfi2), + SHGFI_ICONLOCATION); + ok(rc2, "SHGetFileInfoA(%s) failed\n", notepad); + if (rc && rc2) + { + ok(lstrcmpi(shfi2.szDisplayName, shfi.szDisplayName) == 0, "wrong display name %s != %s\n", shfi.szDisplayName, shfi2.szDisplayName); + ok(shfi2.iIcon == shfi.iIcon, "wrong icon index %d != %d\n", shfi.iIcon, shfi2.iIcon); + } + } + + /* with a directory now */ + strcpy(shfi.szDisplayName, "dummy"); + shfi.iIcon=0xdeadbeef; + rc=SHGetFileInfoA("test4.txt", GetFileAttributes("test4.txt"), + &shfi, sizeof(shfi), + SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES); + todo_wine ok(rc, "SHGetFileInfoA(test4.txt/, SHGFI_USEFILEATTRIBUTES) failed\n"); + strcpy(shfi2.szDisplayName, "dummy"); + shfi2.iIcon=0xdeadbeef; + rc2=SHGetFileInfoA("test4.txt", 0, + &shfi2, sizeof(shfi2), + SHGFI_ICONLOCATION); + ok(rc2, "SHGetFileInfoA(test4.txt/) failed\n"); + if (rc && rc2) + { + ok(lstrcmpi(shfi2.szDisplayName, shfi.szDisplayName) == 0, "wrong display name %s != %s\n", shfi.szDisplayName, shfi2.szDisplayName); + ok(shfi2.iIcon == shfi.iIcon, "wrong icon index %d != %d\n", shfi.iIcon, shfi2.iIcon); + } } @@ -875,7 +936,9 @@ START_TEST(shlfileop) clean_after_shfo_tests(); + init_shfo_tests(); test_get_file_info(); + clean_after_shfo_tests(); init_shfo_tests(); test_delete();

1 0

Thomas Weidenmueller : shell32: Fix prototypes.
by Alexandre Julliard Jan. 19, 2007

Jan. 19, 2007

Module: wine Branch: master Commit: e06345db52c772084f46ed540fe2fd5b7708edf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06345db52c772084f46ed540… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Thu Jan 18 16:10:16 2007 +0100 shell32: Fix prototypes. Fix the SHAddFromPropSheetExtArray, SHCreatePropSheetExtArray, SHReplaceFromPropSheetExtArray and SHDestroyPropSheetExtArray function prototypes because they're now documented. Also add them to shlobj.h. --- dlls/shell32/shellord.c | 19 +++++++++---------- include/shlobj.h | 9 +++++++++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index ef6b7b8..7c22e6b 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1516,37 +1516,36 @@ DWORD WINAPI SHELL32_714(LPVOID x) /************************************************************************* * SHAddFromPropSheetExtArray [SHELL32.167] */ -DWORD WINAPI SHAddFromPropSheetExtArray(DWORD a, DWORD b, DWORD c) +UINT WINAPI SHAddFromPropSheetExtArray(HPSXA hpsxa, LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam) { - FIXME("(%08x,%08x,%08x)stub\n", a, b, c); + FIXME("(%p,%p,%08lx)stub\n", hpsxa, lpfnAddPage, lParam); return 0; } /************************************************************************* * SHCreatePropSheetExtArray [SHELL32.168] */ -DWORD WINAPI SHCreatePropSheetExtArray(DWORD a, LPCSTR b, DWORD c) +HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface) { - FIXME("(%08x,%s,%08x)stub\n", a, debugstr_a(b), c); - return 0; + FIXME("(%p,%s,%u)stub\n", hKey, debugstr_w(pszSubKey), max_iface); + return NULL; } /************************************************************************* * SHReplaceFromPropSheetExtArray [SHELL32.170] */ -DWORD WINAPI SHReplaceFromPropSheetExtArray(DWORD a, DWORD b, DWORD c, DWORD d) +UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA hpsxa, UINT uPageID, LPFNADDPROPSHEETPAGE lpfnReplaceWith, LPARAM lParam) { - FIXME("(%08x,%08x,%08x,%08x)stub\n", a, b, c, d); + FIXME("(%p,%u,%p,%08lx)stub\n", hpsxa, uPageID, lpfnReplaceWith, lParam); return 0; } /************************************************************************* * SHDestroyPropSheetExtArray [SHELL32.169] */ -DWORD WINAPI SHDestroyPropSheetExtArray(DWORD a) +void WINAPI SHDestroyPropSheetExtArray(HPSXA hpsxa) { - FIXME("(%08x)stub\n", a); - return 0; + FIXME("(%p)stub\n", hpsxa); } /************************************************************************* diff --git a/include/shlobj.h b/include/shlobj.h index ee8e58c..b5fee16 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -34,12 +34,20 @@ extern "C" { #include <shtypes.h> #include <shobjidl.h> +#ifndef HPSXA_DEFINED +#define HPSXA_DEFINED +DECLARE_HANDLE(HPSXA); +#endif + +UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM); LPVOID WINAPI SHAlloc(ULONG); HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*); +HPSXA WINAPI SHCreatePropSheetExtArray(HKEY,LPCWSTR,UINT); DWORD WINAPI SHCLSIDFromStringA(LPCSTR,CLSID*); DWORD WINAPI SHCLSIDFromStringW(LPCWSTR,CLSID*); #define SHCLSIDFromString WINELIB_NAME_AW(SHCLSIDFromString) HRESULT WINAPI SHCreateStdEnumFmtEtc(DWORD,const FORMATETC *,IEnumFORMATETC**); +void WINAPI SHDestroyPropSheetExtArray(HPSXA); BOOL WINAPI SHFindFiles(LPCITEMIDLIST,LPCITEMIDLIST); DWORD WINAPI SHFormatDrive(HWND,UINT,UINT,UINT); void WINAPI SHFree(LPVOID); @@ -50,6 +58,7 @@ BOOL WINAPI SHGetPathFromIDListW INT WINAPI SHHandleUpdateImage(LPCITEMIDLIST); HRESULT WINAPI SHILCreateFromPath(LPCWSTR,LPITEMIDLIST*,DWORD*); HRESULT WINAPI SHLoadOLE(LPARAM); +UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA,UINT,LPFNADDPROPSHEETPAGE,LPARAM); LPITEMIDLIST WINAPI SHSimpleIDListFromPath(LPCWSTR); int WINAPI SHMapPIDLToSystemImageListIndex(IShellFolder*,LPCITEMIDLIST,int*); HRESULT WINAPI SHStartNetConnectionDialog(HWND,LPCSTR,DWORD);

1 0

Dmitry Timoshkov : user32: Some apps pass a color bitmap as a mask to CreateIconIndirect, convert it to b/w.
by Alexandre Julliard Jan. 19, 2007

Jan. 19, 2007

Module: wine Branch: master Commit: 64f1d97a5435df2f8275c304145635bce290db14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f1d97a5435df2f8275c3041… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jan 18 19:21:05 2007 +0800 user32: Some apps pass a color bitmap as a mask to CreateIconIndirect, convert it to b/w. --- dlls/user32/cursoricon.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index c287009..26adfde 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1823,16 +1823,31 @@ HICON WINAPI CreateIconIndirect(PICONINF HICON16 hObj; int sizeXor,sizeAnd; - if (iconinfo->hbmColor) GetObjectA( iconinfo->hbmColor, sizeof(bmpXor), &bmpXor ); - GetObjectA( iconinfo->hbmMask, sizeof(bmpAnd), &bmpAnd ); + TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", + iconinfo->hbmColor, iconinfo->hbmMask, + iconinfo->xHotspot, iconinfo->yHotspot, iconinfo->fIcon); + + if (iconinfo->hbmColor) + { + GetObjectW( iconinfo->hbmColor, sizeof(bmpXor), &bmpXor ); + TRACE("color: width %d, height %d, width bytes %d, planes %u, bpp %u\n", + bmpXor.bmWidth, bmpXor.bmHeight, bmpXor.bmWidthBytes, + bmpXor.bmPlanes, bmpXor.bmBitsPixel); + } + GetObjectW( iconinfo->hbmMask, sizeof(bmpAnd), &bmpAnd ); + TRACE("mask: width %d, height %d, width bytes %d, planes %u, bpp %u\n", + bmpAnd.bmWidth, bmpAnd.bmHeight, bmpAnd.bmWidthBytes, + bmpAnd.bmPlanes, bmpAnd.bmBitsPixel); sizeXor = iconinfo->hbmColor ? (bmpXor.bmHeight * bmpXor.bmWidthBytes) : 0; - sizeAnd = bmpAnd.bmHeight * bmpAnd.bmWidthBytes; + sizeAnd = bmpAnd.bmHeight * get_bitmap_width_bytes(bmpAnd.bmWidth, 1); hObj = GlobalAlloc16( GMEM_MOVEABLE, sizeof(CURSORICONINFO) + sizeXor + sizeAnd ); if (hObj) { + HDC hdc; + BITMAPINFO bi; CURSORICONINFO *info; info = (CURSORICONINFO *)GlobalLock16( hObj ); @@ -1860,15 +1875,27 @@ HICON WINAPI CreateIconIndirect(PICONINF else { info->nWidth = bmpAnd.bmWidth; - info->nHeight = bmpAnd.bmHeight / 2; - info->nWidthBytes = bmpAnd.bmWidthBytes; - info->bPlanes = bmpAnd.bmPlanes; - info->bBitsPerPixel = bmpAnd.bmBitsPixel; + info->nHeight = bmpAnd.bmHeight * 2; + info->nWidthBytes = get_bitmap_width_bytes(bmpAnd.bmWidth, 1); + info->bPlanes = 1; + info->bBitsPerPixel = 1; } /* Transfer the bitmap bits to the CURSORICONINFO structure */ - GetBitmapBits( iconinfo->hbmMask, sizeAnd, (char*)(info + 1) ); + /* Some apps pass a color bitmap as a mask, convert it to b/w */ + hdc = GetDC( 0 ); + memset(&bi, 0, sizeof(bi) ); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bi.bmiHeader.biWidth = bmpAnd.bmWidth; + bi.bmiHeader.biHeight = bmpAnd.bmHeight; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 1; + bi.bmiHeader.biCompression = BI_RGB; + bi.bmiHeader.biSizeImage = sizeAnd; + GetDIBits( hdc, iconinfo->hbmMask, 0, bmpAnd.bmHeight, (char*)(info + 1), &bi, DIB_RGB_COLORS ); + ReleaseDC( 0, hdc ); + if (iconinfo->hbmColor) GetBitmapBits( iconinfo->hbmColor, sizeXor, (char*)(info + 1) + sizeAnd ); GlobalUnlock16( hObj ); }

1 0