January 2013 - Wine-Commits

Damjan Jovanovic : shell32: Fix non-BOOL returns in BOOL functions.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: 0f64ffd91ff2fab97d9c52335478ff2fb4114947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f64ffd91ff2fab97d9c52335… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jan 10 20:54:34 2013 +0200 shell32: Fix non-BOOL returns in BOOL functions. --- dlls/shell32/brsfolder.c | 2 +- dlls/shell32/changenotify.c | 2 +- dlls/shell32/shellord.c | 14 +++++++------- dlls/shell32/shellpath.c | 4 ++-- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/shlmenu.c | 10 +++++----- dlls/shell32/shpolicy.c | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index d48666f..a14c172 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -957,7 +957,7 @@ static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL return result; } -static BOOL BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos) +static LRESULT BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos) { if ((info->lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) && !(pos->flags & SWP_NOSIZE)) { diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 94efb7a..2fba5b9 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -230,7 +230,7 @@ BOOL WINAPI SHChangeNotifyUpdateEntryList(DWORD unknown1, DWORD unknown2, FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x)\n", unknown1, unknown2, unknown3, unknown4); - return -1; + return TRUE; } struct new_delivery_notification diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index fcad032..31891e4 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1190,7 +1190,7 @@ void WINAPI SHFreeUnusedLibraries (void) BOOL WINAPI DAD_AutoScroll(HWND hwnd, AUTO_SCROLL_DATA *samples, LPPOINT pt) { FIXME("hwnd = %p %p %p\n",hwnd,samples,pt); - return 0; + return FALSE; } /************************************************************************* * DAD_DragEnter [SHELL32.130] @@ -1238,8 +1238,8 @@ BOOL WINAPI DAD_SetDragImage( HIMAGELIST himlTrack, LPPOINT lppt) { - FIXME("%p %p stub\n",himlTrack, lppt); - return 0; + FIXME("%p %p stub\n",himlTrack, lppt); + return FALSE; } /************************************************************************* * DAD_ShowDragImage [SHELL32.137] @@ -1249,8 +1249,8 @@ BOOL WINAPI DAD_SetDragImage( */ BOOL WINAPI DAD_ShowDragImage(BOOL bShow) { - FIXME("0x%08x stub\n",bShow); - return 0; + FIXME("0x%08x stub\n",bShow); + return FALSE; } static const WCHAR szwCabLocation[] = { @@ -1344,7 +1344,7 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *cs) */ BOOL WINAPI FileIconInit(BOOL bFullInit) { FIXME("(%s)\n", bFullInit ? "true" : "false"); - return 0; + return FALSE; } /************************************************************************* @@ -1551,7 +1551,7 @@ BOOL WINAPI SHWaitForFileToOpen( DWORD dwTimeout) { FIXME("%p 0x%08x 0x%08x stub\n", pidl, dwFlags, dwTimeout); - return 0; + return FALSE; } /************************************************************************ diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 6fdd762..875be38 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -647,7 +647,7 @@ int WINAPI PathCleanupSpec( LPCWSTR lpszPathW, LPWSTR lpszFileW ) static BOOL PathQualifyA(LPCSTR pszPath) { FIXME("%s\n",pszPath); - return 0; + return FALSE; } /************************************************************************* @@ -656,7 +656,7 @@ static BOOL PathQualifyA(LPCSTR pszPath) static BOOL PathQualifyW(LPCWSTR pszPath) { FIXME("%s\n",debugstr_w(pszPath)); - return 0; + return FALSE; } /************************************************************************* diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 787ba75..4ef7803 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1134,7 +1134,7 @@ static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) { if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op)) - return 0; + return FALSE; } return SHNotifyCopyFileW(szFrom, szTo, FALSE) == 0; diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 911feca..5dfdd08 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -372,7 +372,7 @@ static BOOL FileMenu_AppendItemW( if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) { ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); - return 0; + return FALSE; } menudata->bFixedItems = TRUE; @@ -549,7 +549,7 @@ BOOL WINAPI FileMenu_GetLastSelectedItemPidls( LPCITEMIDLIST *ppidlItem) { FIXME("0x%08x %p %p\n",uReserved, ppidlFolder, ppidlItem); - return 0; + return FALSE; } #define FM_ICON_SIZE 16 @@ -758,7 +758,7 @@ BOOL WINAPI FileMenu_DeleteItemByFirstID( UINT uID) { TRACE("%p 0x%08x\n", hMenu, uID); - return 0; + return FALSE; } /************************************************************************* @@ -767,7 +767,7 @@ BOOL WINAPI FileMenu_DeleteItemByFirstID( BOOL WINAPI FileMenu_DeleteSeparator(HMENU hMenu) { TRACE("%p\n", hMenu); - return 0; + return FALSE; } /************************************************************************* @@ -779,7 +779,7 @@ BOOL WINAPI FileMenu_EnableItemByCmd( BOOL bEnable) { TRACE("%p 0x%08x 0x%08x\n", hMenu, uID,bEnable); - return 0; + return FALSE; } /************************************************************************* diff --git a/dlls/shell32/shpolicy.c b/dlls/shell32/shpolicy.c index 9ca8b46..62e6ab5 100644 --- a/dlls/shell32/shpolicy.c +++ b/dlls/shell32/shpolicy.c @@ -900,14 +900,14 @@ BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey) if (lstrcmpiW(inpRegKey, strRegistryPolicyW) && lstrcmpiW(inpRegKey, strPolicyW)) /* doesn't match, fail */ - return 0; + return FALSE; } else { if (lstrcmpiA(inpRegKey, strRegistryPolicyA) && lstrcmpiA(inpRegKey, strPolicyA)) /* doesn't match, fail */ - return 0; + return FALSE; } }

1 0

Ken Thomases : winemac: Implement support for owned windows.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: b6544d19ddd1e4d5af2cef69ec14bb414b179573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6544d19ddd1e4d5af2cef69e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 06:19:36 2013 -0600 winemac: Implement support for owned windows. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 53 ++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 6 ++++ 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 41e0b90..8533e2a 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -27,6 +27,7 @@ BOOL disabled; BOOL noActivate; BOOL floating; + WineWindow* latentParentWindow; } @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 16217c2..e6ae103 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -63,6 +63,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @property (nonatomic) BOOL disabled; @property (nonatomic) BOOL noActivate; @property (nonatomic) BOOL floating; +(a)property (retain, nonatomic) NSWindow* latentParentWindow; + (void) flipRect:(NSRect*)rect; @@ -81,7 +82,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @implementation WineWindow - @synthesize disabled, noActivate, floating; + @synthesize disabled, noActivate, floating, latentParentWindow; + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame @@ -119,6 +120,12 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) return window; } + - (void) dealloc + { + [latentParentWindow release]; + [super dealloc]; + } + + (void) flipRect:(NSRect*)rect { rect->origin.y = NSMaxY([[[NSScreen screens] objectAtIndex:0] frame]) - NSMaxY(*rect); @@ -172,11 +179,23 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) [self orderWindow:NSWindowBelow relativeTo:[prev windowNumber]]; else [self orderWindow:NSWindowAbove relativeTo:[next windowNumber]]; + if (latentParentWindow) + { + [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; + self.latentParentWindow = nil; + } } return on_screen; } + - (void) doOrderOut + { + self.latentParentWindow = [self parentWindow]; + [latentParentWindow removeChildWindow:self]; + [self orderOut:nil]; + } + - (BOOL) setFrameIfOnScreen:(NSRect)contentRect { NSArray* screens = [NSScreen screens]; @@ -193,7 +212,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) { on_screen = frame_intersects_screens(contentRect, screens); if (!on_screen) - [self orderOut:nil]; + [self doOrderOut]; } oldFrame = [self frame]; @@ -209,6 +228,19 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) return on_screen; } + - (void) setMacDrvParentWindow:(WineWindow*)parent + { + if ([self parentWindow] != parent) + { + [[self parentWindow] removeChildWindow:self]; + self.latentParentWindow = nil; + if ([self isVisible] && parent) + [parent addChildWindow:self ordered:NSWindowAbove]; + else + self.latentParentWindow = parent; + } + } + - (void) setDisabled:(BOOL)newValue { if (disabled != newValue) @@ -368,7 +400,7 @@ void macdrv_hide_cocoa_window(macdrv_window w) WineWindow* window = (WineWindow*)w; OnMainThread(^{ - [window orderOut:nil]; + [window doOrderOut]; }); } @@ -392,3 +424,18 @@ int macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) return on_screen; } + +/*********************************************************************** + * macdrv_set_cocoa_parent_window + * + * Sets the parent window for a Cocoa window. If parent is NULL, clears + * the parent window. + */ +void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent) +{ + WineWindow* window = (WineWindow*)w; + + OnMainThread(^{ + [window setMacDrvParentWindow:(WineWindow*)parent]; + }); +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index fa2e083..86a49ce 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -144,5 +144,6 @@ extern int macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev, macdrv_window next) DECLSPEC_HIDDEN; extern void macdrv_hide_cocoa_window(macdrv_window w) DECLSPEC_HIDDEN; extern int macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) DECLSPEC_HIDDEN; +extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent) DECLSPEC_HIDDEN; #endif /* __WINE_MACDRV_COCOA_H */ diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 232c60a..21c9e59 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -301,12 +301,18 @@ static macdrv_window macdrv_get_cocoa_window(HWND hwnd) static void set_cocoa_window_properties(struct macdrv_win_data *data) { DWORD style, ex_style; + HWND owner; + macdrv_window owner_win; struct macdrv_window_features wf; struct macdrv_window_state state; style = GetWindowLongW(data->hwnd, GWL_STYLE); ex_style = GetWindowLongW(data->hwnd, GWL_EXSTYLE); + owner = GetWindow(data->hwnd, GW_OWNER); + owner_win = macdrv_get_cocoa_window(owner); + macdrv_set_cocoa_parent_window(data->cocoa_window, owner_win); + get_cocoa_window_features(data, style, ex_style, &wf); macdrv_set_cocoa_window_features(data->cocoa_window, &wf);

1 0

Ken Thomases : winemac: Implement the Mac "Window" menu.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: b3f71fdeb101945ce6d971016278e1d8248035c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f71fdeb101945ce6d971016… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 06:21:06 2013 -0600 winemac: Implement the Mac "Window" menu. --- dlls/winemac.drv/cocoa_app.m | 11 +++++++++++ dlls/winemac.drv/cocoa_window.m | 26 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 28d2ad2..d869a05 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -51,7 +51,18 @@ [item setSubmenu:submenu]; [mainMenu addItem:item]; + submenu = [[[NSMenu alloc] initWithTitle:@"Window"] autorelease]; + [submenu addItemWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@""]; + [submenu addItemWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; + [submenu addItem:[NSMenuItem separatorItem]]; + [submenu addItemWithTitle:@"Bring All to Front" action:@selector(arrangeInFront:) keyEquivalent:@""]; + item = [[[NSMenuItem alloc] init] autorelease]; + [item setTitle:@"Window"]; + [item setSubmenu:submenu]; + [mainMenu addItem:item]; + [self setMainMenu:mainMenu]; + [self setWindowsMenu:submenu]; } } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 9d359ff..49dd31b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -172,9 +172,17 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) else behavior |= NSWindowCollectionBehaviorManaged; if (state->excluded_by_cycle) + { behavior |= NSWindowCollectionBehaviorIgnoresCycle; + if ([self isVisible]) + [NSApp removeWindowsItem:self]; + } else + { behavior |= NSWindowCollectionBehaviorParticipatesInCycle; + if ([self isVisible]) + [NSApp addWindowsItem:self title:[self title] filename:NO]; + } [self setCollectionBehavior:behavior]; } @@ -196,6 +204,9 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; self.latentParentWindow = nil; } + + if (![self isExcludedFromWindowsMenu]) + [NSApp addWindowsItem:self title:[self title] filename:NO]; } return on_screen; @@ -206,6 +217,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) self.latentParentWindow = [self parentWindow]; [latentParentWindow removeChildWindow:self]; [self orderOut:nil]; + [NSApp removeWindowsItem:self]; } - (BOOL) setFrameIfOnScreen:(NSRect)contentRect @@ -277,6 +289,18 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) return [self canBecomeKeyWindow]; } + - (BOOL) isExcludedFromWindowsMenu + { + return !([self collectionBehavior] & NSWindowCollectionBehaviorParticipatesInCycle); + } + + - (BOOL) validateMenuItem:(NSMenuItem *)menuItem + { + if ([menuItem action] == @selector(makeKeyAndOrderFront:)) + return [self isKeyWindow] || (!self.disabled && !self.noActivate); + return [super validateMenuItem:menuItem]; + } + /* * ---------- NSWindowDelegate methods ---------- @@ -372,6 +396,8 @@ void macdrv_set_cocoa_window_title(macdrv_window w, const unsigned short* title, titleString = @""; OnMainThreadAsync(^{ [window setTitle:titleString]; + if ([window isVisible] && ![window isExcludedFromWindowsMenu]) + [NSApp changeWindowsItem:window title:titleString filename:NO]; }); [pool release];

1 0

Piotr Caban : msvcrt: Use fputwc to output characters to file in fprintf functions.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: a8c2ae17510ba75bea35a39538183fa195bdce84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c2ae17510ba75bea35a3953… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 11 11:19:08 2013 +0100 msvcrt: Use fputwc to output characters to file in fprintf functions. --- dlls/msvcrt/file.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 19ad11c..daea39a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4208,7 +4208,25 @@ static int puts_clbk_file_a(void *file, int len, const char *str) static int puts_clbk_file_w(void *file, int len, const MSVCRT_wchar_t *str) { - return MSVCRT_fwrite(str, sizeof(MSVCRT_wchar_t), len, file); + int i, ret; + + MSVCRT__lock_file(file); + + if(!(msvcrt_get_ioinfo(((MSVCRT_FILE*)file)->_file)->wxflag & WX_TEXT)) { + ret = MSVCRT_fwrite(str, sizeof(MSVCRT_wchar_t), len, file); + MSVCRT__unlock_file(file); + return ret; + } + + for(i=0; i<len; i++) { + if(MSVCRT_fputwc(str[i], file) == MSVCRT_WEOF) { + MSVCRT__unlock_file(file); + return -1; + } + } + + MSVCRT__unlock_file(file); + return len; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Fixed ftell behaviour when file is opened for writing in text mode.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: c1792e1a8acbd00d5cfc4f9c94718a84d4732761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1792e1a8acbd00d5cfc4f9c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 11 11:19:44 2013 +0100 msvcrt: Fixed ftell behaviour when file is opened for writing in text mode. --- dlls/msvcrt/file.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index a1e4320..60af1a7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3798,6 +3798,14 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) if(file->_bufsiz) { if(file->_flag & MSVCRT__IOWRT) { pos += file->_ptr - file->_base; + + if(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT) { + char *p; + + for(p=file->_base; p<file->_ptr; p++) + if(*p == '\n') + pos++; + } } else if(!file->_cnt) { /* nothing to do */ } else if(MSVCRT__lseeki64(file->_file, 0, SEEK_END)==pos) { int i;

1 0

Dmitry Timoshkov : windowscodecs: Add a test for CreateBitmapFromHICON.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: 89838342b7a5de5ca8fcb4fa1715043f718e3203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89838342b7a5de5ca8fcb4fa1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 11 19:56:33 2013 +0800 windowscodecs: Add a test for CreateBitmapFromHICON. --- dlls/windowscodecs/tests/Makefile.in | 2 +- dlls/windowscodecs/tests/bitmap.c | 92 ++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index 8bc8066..76db38a 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windowscodecs.dll -IMPORTS = ole32 windowscodecs +IMPORTS = gdi32 user32 ole32 windowscodecs C_SRCS = \ bitmap.c \ diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 68d681a..40b8ce6 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -18,6 +18,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <math.h> #define COBJMACROS @@ -29,6 +30,18 @@ static IWICImagingFactory *factory; +static const char *debugstr_guid(const GUID *guid) +{ + static char buf[50]; + + if (!guid) return "(null)"; + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], + guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return buf; +} + static void test_createbitmap(void) { HRESULT hr; @@ -494,6 +507,84 @@ static void test_CreateBitmapFromMemory(void) IWICBitmap_Release(bitmap); } +static void test_CreateBitmapFromHICON(void) +{ + static const char bits[4096]; + HICON icon; + ICONINFO info; + HRESULT hr; + IWICBitmap *bitmap; + UINT width, height; + WICPixelFormatGUID format; + + /* 1 bpp mask */ + info.fIcon = 1; + info.xHotspot = 0; + info.yHotspot = 0; + info.hbmColor = 0; + info.hbmMask = CreateBitmap(16, 32, 1, 1, bits); + ok(info.hbmMask != 0, "CreateBitmap failed\n"); + icon = CreateIconIndirect(&info); + ok(icon != 0, "CreateIconIndirect failed\n"); + DeleteObject(info.hbmMask); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, 0, NULL); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, 0, &bitmap); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_CURSOR_HANDLE), "expected ERROR_INVALID_CURSOR_HANDLE, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, NULL); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, &bitmap); +todo_wine + ok(hr == S_OK, "CreateBitmapFromHICON error %#x\n", hr); + DestroyIcon(icon); + if (hr != S_OK) return; + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 16, "expected 16, got %u\n", width); + ok(height == 16, "expected 16, got %u\n", height); + + IWICBitmap_Release(bitmap); + + /* 24 bpp color, 1 bpp mask */ + info.fIcon = 1; + info.xHotspot = 0; + info.yHotspot = 0; + info.hbmColor = CreateBitmap(16, 16, 1, 24, bits); + ok(info.hbmColor != 0, "CreateBitmap failed\n"); + info.hbmMask = CreateBitmap(16, 16, 1, 1, bits); + ok(info.hbmMask != 0, "CreateBitmap failed\n"); + icon = CreateIconIndirect(&info); + ok(icon != 0, "CreateIconIndirect failed\n"); + DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHICON error %#x\n", hr); + DestroyIcon(icon); + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 16, "expected 16, got %u\n", width); + ok(height == 16, "expected 16, got %u\n", height); + + IWICBitmap_Release(bitmap); +} START_TEST(bitmap) { @@ -508,6 +599,7 @@ START_TEST(bitmap) test_createbitmap(); test_createbitmapfromsource(); test_CreateBitmapFromMemory(); + test_CreateBitmapFromHICON(); IWICImagingFactory_Release(factory);

1 0

Henri Verbeet : d3d9/tests: Merge texture.c into device.c.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: 0c9713bb65ca679c701123fc07b79883fc6d4e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9713bb65ca679c701123fc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 11 12:07:50 2013 +0100 d3d9/tests: Merge texture.c into device.c. --- dlls/d3d9/tests/Makefile.in | 1 - dlls/d3d9/tests/device.c | 540 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/texture.c | 452 ------------------------------------ 3 files changed, 540 insertions(+), 453 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c9713bb65ca679c70112…

1 0

Henri Verbeet : d3d9/tests: Merge surface.c into device.c.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: 3197e364132ea978e7b105a7bd5f0df29fd5094c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3197e364132ea978e7b105a7b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 11 12:07:51 2013 +0100 d3d9/tests: Merge surface.c into device.c. --- dlls/d3d9/tests/Makefile.in | 1 - dlls/d3d9/tests/device.c | 956 ++++++++++++++++++++++++++++++++++++++++++- dlls/d3d9/tests/surface.c | 841 ------------------------------------- 3 files changed, 955 insertions(+), 843 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3197e364132ea978e7b10…

1 0

Ken Thomases : winemac: Implement support for no-activate windows.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: 9d29ea42e135001a92179cd5cda2fcff3a306304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d29ea42e135001a92179cd5c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 06:18:36 2013 -0600 winemac: Implement support for no-activate windows. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 7 +++++-- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 21 +++++++++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 1edcd9c..86211dd 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -25,6 +25,7 @@ { NSUInteger normalStyleMask; BOOL disabled; + BOOL noActivate; } @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 848e49e..dde77b3 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -61,6 +61,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @interface WineWindow () @property (nonatomic) BOOL disabled; +(a)property (nonatomic) BOOL noActivate; + (void) flipRect:(NSRect*)rect; @@ -79,7 +80,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @implementation WineWindow - @synthesize disabled; + @synthesize disabled, noActivate; + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame @@ -147,6 +148,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) - (void) setMacDrvState:(const struct macdrv_window_state*)state { self.disabled = state->disabled; + self.noActivate = state->no_activate; } /* Returns whether or not the window was ordered in, which depends on if @@ -214,7 +216,8 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) */ - (BOOL) canBecomeKeyWindow { - return !self.disabled; + if (self.disabled || self.noActivate) return NO; + return YES; } - (BOOL) canBecomeMainWindow diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index e2a735b..d91cd1a 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -127,6 +127,7 @@ struct macdrv_window_features { struct macdrv_window_state { unsigned int disabled:1; + unsigned int no_activate:1; }; extern macdrv_window macdrv_create_cocoa_window(const struct macdrv_window_features* wf, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 8520afa..b813cdc 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -73,6 +73,26 @@ static void get_cocoa_window_features(struct macdrv_win_data *data, } +/******************************************************************* + * can_activate_window + * + * Check if we can activate the specified window. + */ +static inline BOOL can_activate_window(HWND hwnd) +{ + LONG style = GetWindowLongW(hwnd, GWL_STYLE); + RECT rect; + + if (!(style & WS_VISIBLE)) return FALSE; + if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; + if (style & WS_MINIMIZE) return FALSE; + if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_NOACTIVATE) return FALSE; + if (hwnd == GetDesktopWindow()) return FALSE; + if (GetWindowRect(hwnd, &rect) && IsRectEmpty(&rect)) return FALSE; + return !(style & WS_DISABLED); +} + + /*********************************************************************** * get_cocoa_window_state */ @@ -82,6 +102,7 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, { memset(state, 0, sizeof(*state)); state->disabled = (style & WS_DISABLED) != 0; + state->no_activate = !can_activate_window(data->hwnd); }

1 0

Ken Thomases : winemac: Implement support for WS_EX_TOPMOST windows.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: 429732ce1a4db12cfd9149bbc1c630bd9509508b URL: http://source.winehq.org/git/wine.git/?a=commit;h=429732ce1a4db12cfd9149bbc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 06:18:55 2013 -0600 winemac: Implement support for WS_EX_TOPMOST windows. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 10 +++++++++- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 1 + 4 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 86211dd..41e0b90 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -26,6 +26,7 @@ NSUInteger normalStyleMask; BOOL disabled; BOOL noActivate; + BOOL floating; } @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index dde77b3..16217c2 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -62,6 +62,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @property (nonatomic) BOOL disabled; @property (nonatomic) BOOL noActivate; +(a)property (nonatomic) BOOL floating; + (void) flipRect:(NSRect*)rect; @@ -80,7 +81,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @implementation WineWindow - @synthesize disabled, noActivate; + @synthesize disabled, noActivate, floating; + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame @@ -147,8 +148,15 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) - (void) setMacDrvState:(const struct macdrv_window_state*)state { + NSInteger level; + self.disabled = state->disabled; self.noActivate = state->no_activate; + + self.floating = state->floating; + level = state->floating ? NSFloatingWindowLevel : NSNormalWindowLevel; + if (level != [self level]) + [self setLevel:level]; } /* Returns whether or not the window was ordered in, which depends on if diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index d91cd1a..fa2e083 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -128,6 +128,7 @@ struct macdrv_window_features { struct macdrv_window_state { unsigned int disabled:1; unsigned int no_activate:1; + unsigned int floating:1; }; extern macdrv_window macdrv_create_cocoa_window(const struct macdrv_window_features* wf, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index b813cdc..232c60a 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -103,6 +103,7 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, memset(state, 0, sizeof(*state)); state->disabled = (style & WS_DISABLED) != 0; state->no_activate = !can_activate_window(data->hwnd); + state->floating = (ex_style & WS_EX_TOPMOST) != 0; }

1 0