November 2013 - Wine-commits

Alexandre Julliard : Wine release 1.6.1
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: website Branch: master Commit: dece6b0a1f7852b8acf4e057f375e90ae08e8b3b URL: http://source.winehq.org/git/website.git/?a=commit;h=dece6b0a1f7852b8acf4e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 15 20:38:35 2013 +0100 Wine release 1.6.1 --- news/en/2013111501.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/en/2013111501.xml b/news/en/2013111501.xml new file mode 100644 index 0000000..7bbfdbb --- /dev/null +++ b/news/en/2013111501.xml @@ -0,0 +1,13 @@ +<news> +<date>November 15, 2013</date> +<title>Wine 1.6.1 Released</title> +<body> + The Wine maintenance release 1.6.1 is now available. + <a href="{$root}/announce/1.6.1">What's new</a> in this release: +<ul> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.6.1 : Alexandre Julliard : Release 1.6.1
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: refs/tags/wine-1.6.1 Tag: b8b56194ea0a96033a740f72b2705d1f9ee63c11 URL: http://source.winehq.org/git/wine.git/?a=tag;h=b8b56194ea0a96033a740f72b270… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 15 20:30:24 2013 +0100 Release 1.6.1

1 0

Daniel Lehman : oleaut32: Return FALSE from SystemTimeToVariantTime if day > 31 or year is negative.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 8306518424a24a19c9c88d87f98fd3ac0024415a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8306518424a24a19c9c88d87f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jan 30 11:12:54 2012 -0800 oleaut32: Return FALSE from SystemTimeToVariantTime if day > 31 or year is negative. --- dlls/oleaut32/tests/vartest.c | 4 ++++ dlls/oleaut32/variant.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index a91eb7e..bc8c4ba 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1727,6 +1727,10 @@ static void test_SystemTimeToVariantTime(void) ST2DT(2,1,1980,0,0,0,0,TRUE,29222.0); ST2DT(0,1,1980,0,0,0,0,TRUE,29220.0); /* Rolls back to 31 Dec 1899 */ ST2DT(1,13,1980,0,0,0,0,FALSE,29587.0); /* Fails on invalid month */ + ST2DT(32,1,1980,0,0,0,0,FALSE,0.0); /* Fails on invalid day */ + ST2DT(1,1,-1,0,0,0,0,FALSE,0.0); /* Fails on invalid year */ + ST2DT(1,1,10000,0,0,0,0,FALSE,0.0); /* Fails on invalid year */ + ST2DT(1,1,9999,0,0,0,0,TRUE,2958101.0); /* 9999 is last valid year */ ST2DT(31,12,90,0,0,0,0,TRUE,33238.0); /* 30 <= year < 100 is 1900+year */ ST2DT(1,1,30,0,0,0,0,TRUE,10959.0); /* 30 <= year < 100 is 1900+year */ ST2DT(1,1,29,0,0,0,0,TRUE,47119.0); /* 0 <= year < 30 is 2000+year */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index c343578..d4c6f6c 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1312,6 +1312,10 @@ INT WINAPI SystemTimeToVariantTime(LPSYSTEMTIME lpSt, double *pDateOut) if (lpSt->wMonth > 12) return FALSE; + if (lpSt->wDay > 31) + return FALSE; + if ((short)lpSt->wYear < 0) + return FALSE; ud.st = *lpSt; return VarDateFromUdate(&ud, 0, pDateOut) == S_OK;

1 0

Francois Gouget : shlwapi/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 387289e547a07473db7305a3b5624bf3e2f4fd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387289e547a07473db7305a3b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 15 02:35:26 2013 +0100 shlwapi/tests: Fix compilation on systems that don't support nameless unions. --- dlls/shlwapi/tests/istream.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 4421a78..bacd0e6 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -675,7 +675,7 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) ok(SUCCEEDED(ret), "SHCreateStreamOnFileEx failed with ret=0x%08x\n", ret); written.QuadPart = 0; - ret = IStream_Write(src, srcContents, sizeof(srcContents), &written.LowPart); + ret = IStream_Write(src, srcContents, sizeof(srcContents), &U(written).LowPart); ok(SUCCEEDED(ret), "ISequentialStream_Write failed with ret=0x%08x\n", ret); distance.QuadPart = 0; @@ -691,8 +691,8 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) ret = IStream_CopyTo(src, dst, count, &read, &written); ok(SUCCEEDED(ret), "CopyTo failed with ret=0x%08x\n", ret); - ok(read.QuadPart == 1, "read does not match size: %d != 1\n", read.LowPart); - ok(written.QuadPart == 1, "written does not match size: %d != 1\n", written.LowPart); + ok(read.QuadPart == 1, "read does not match size: %d != 1\n", U(read).LowPart); + ok(written.QuadPart == 1, "written does not match size: %d != 1\n", U(written).LowPart); IStream_Release(dst); IStream_Release(src);

1 0

Frédéric Delanoy : imm32: Use BOOL type where appropriate.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: bf34d0c3af8232042748c399cbd1adfcdc7d0ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf34d0c3af8232042748c399c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 15 02:44:42 2013 +0100 imm32: Use BOOL type where appropriate. --- dlls/imm32/imm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 35c16f0..5991b8b 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2086,11 +2086,11 @@ BOOL WINAPI ImmRegisterWordW( */ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) { - static int shown = 0; + static BOOL shown = FALSE; if (!shown) { FIXME("(%p, %p): stub\n", hWnd, hIMC); - shown = 1; + shown = TRUE; } return TRUE; }

1 0

Frédéric Delanoy : msgsm32.acm: Use BOOL type where appropriate.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 157eae214f6203704f4f9dbe41288d20fc72a314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157eae214f6203704f4f9dbe4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 15 02:44:44 2013 +0100 msgsm32.acm: Use BOOL type where appropriate. --- dlls/msgsm32.acm/msgsm32.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 5e7bce0..c32c656 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -61,13 +61,13 @@ FUNCPTR(gsm_decode); if((p##f = wine_dlsym(libgsm_handle, #f, NULL, 0)) == NULL) { \ wine_dlclose(libgsm_handle, NULL, 0); \ libgsm_handle = NULL; \ - return 0; \ + return FALSE; \ } /*********************************************************************** * GSM_drvLoad */ -static LRESULT GSM_drvLoad(void) +static BOOL GSM_drvLoad(void) { char error[128]; @@ -79,12 +79,12 @@ static LRESULT GSM_drvLoad(void) LOAD_FUNCPTR(gsm_option); LOAD_FUNCPTR(gsm_encode); LOAD_FUNCPTR(gsm_decode); - return 1; + return TRUE; } else { ERR("Couldn't load " SONAME_LIBGSM ": %s\n", error); - return 0; + return FALSE; } } @@ -137,10 +137,10 @@ static LRESULT GSM_DriverDetails(PACMDRIVERDETAILSW add) } /* Validate a WAVEFORMATEX structure */ -static DWORD GSM_FormatValidate(const WAVEFORMATEX *wfx) +static BOOL GSM_FormatValidate(const WAVEFORMATEX *wfx) { if (wfx->nChannels != 1) - return 0; + return FALSE; switch (wfx->wFormatTag) { @@ -148,54 +148,54 @@ static DWORD GSM_FormatValidate(const WAVEFORMATEX *wfx) if (wfx->wBitsPerSample != 16) { WARN("PCM wBitsPerSample %u\n", wfx->wBitsPerSample); - return 0; + return FALSE; } if (wfx->nBlockAlign != 2) { WARN("PCM nBlockAlign %u\n", wfx->nBlockAlign); - return 0; + return FALSE; } if (wfx->nAvgBytesPerSec != wfx->nBlockAlign * wfx->nSamplesPerSec) { WARN("PCM nAvgBytesPerSec %u/%u\n", wfx->nAvgBytesPerSec, wfx->nBlockAlign * wfx->nSamplesPerSec); - return 0; + return FALSE; } - return 1; + return TRUE; case WAVE_FORMAT_GSM610: if (wfx->cbSize < sizeof(WORD)) { WARN("GSM cbSize %u\n", wfx->cbSize); - return 0; + return FALSE; } if (wfx->wBitsPerSample != 0) { WARN("GSM wBitsPerSample %u\n", wfx->wBitsPerSample); - return 0; + return FALSE; } if (wfx->nBlockAlign != 65) { WARN("GSM nBlockAlign %u\n", wfx->nBlockAlign); - return 0; + return FALSE; } if (((const GSM610WAVEFORMAT*)wfx)->wSamplesPerBlock != 320) { WARN("GSM wSamplesPerBlock %u\n", ((const GSM610WAVEFORMAT*)wfx)->wSamplesPerBlock); - return 0; + return FALSE; } if (wfx->nAvgBytesPerSec != wfx->nSamplesPerSec * 65 / 320) { WARN("GSM nAvgBytesPerSec %d / %d\n", wfx->nAvgBytesPerSec, wfx->nSamplesPerSec * 65 / 320); - return 0; + return FALSE; } - return 1; + return TRUE; default: - return 0; + return FALSE; } - return 0; + return FALSE; } static const DWORD gsm_rates[] = { 8000, 11025, 22050, 44100, 48000, 96000 };

1 0

Frédéric Delanoy : itss: Use BOOL type where appropriate.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 99e3ce7d430a730e152fdaba8d84515a733a70d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e3ce7d430a730e152fdaba8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 15 02:44:43 2013 +0100 itss: Use BOOL type where appropriate. --- dlls/itss/chm_lib.c | 216 +++++++++++++++++++++++++------------------------- dlls/itss/chm_lib.h | 10 +- 2 files changed, 113 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99e3ce7d430a730e152fd…

1 0

Ken Thomases : winemac: Allow ordering a window into Cocoa' s window list even if it's positioned outside of the desktop.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 784a91390eb64bf0e6cf3a27be9becff7ad5787f URL: http://source.winehq.org/git/wine.git/?a=commit;h=784a91390eb64bf0e6cf3a27b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Nov 14 20:52:04 2013 -0600 winemac: Allow ordering a window into Cocoa's window list even if it's positioned outside of the desktop. Some programs minimize windows which are outside of the desktop. The Mac driver had been leaving such windows ordered out, which prevented them from minimizing and appearing on the Dock. That, in turn, made it difficult for the user to restore them. --- dlls/winemac.drv/cocoa_window.m | 64 +++++++++++--------------------------- dlls/winemac.drv/macdrv_cocoa.h | 4 +- dlls/winemac.drv/window.c | 20 ++++++------ 3 files changed, 31 insertions(+), 57 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index dbac40a..f7c2cd0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1045,11 +1045,10 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif /* Returns whether or not the window was ordered in, which depends on if its frame intersects any screen. */ - - (BOOL) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)activate + - (void) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)activate { WineApplicationController* controller = [WineApplicationController sharedController]; - BOOL on_screen = frame_intersects_screens([self frame], [NSScreen screens]); - if (on_screen && ![self isMiniaturized]) + if (![self isMiniaturized]) { BOOL needAdjustWindowLevels = FALSE; BOOL wasVisible = [self isVisible]; @@ -1128,8 +1127,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if (![self isExcludedFromWindowsMenu]) [NSApp addWindowsItem:self title:[self title] filename:NO]; } - - return on_screen; } - (void) doOrderOut @@ -1173,24 +1170,12 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } } - - (BOOL) setFrameIfOnScreen:(NSRect)contentRect + - (void) setFrameFromWine:(NSRect)contentRect { - NSArray* screens = [NSScreen screens]; - BOOL on_screen = [self isOrderedIn]; - - if (![screens count]) return on_screen; - /* Origin is (left, top) in a top-down space. Need to convert it to (left, bottom) in a bottom-up space. */ [[WineApplicationController sharedController] flipRect:&contentRect]; - if (on_screen) - { - on_screen = frame_intersects_screens(contentRect, screens); - if (!on_screen) - [self doOrderOut]; - } - /* The back end is establishing a new window size and position. It's not interested in any stale events regarding those that may be sitting in the queue. */ @@ -1219,7 +1204,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self updateFullscreen]; - if (on_screen) + if ([self isOrderedIn]) { /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed event. The back end will ignore it if nothing actually changed. */ @@ -1227,8 +1212,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } } } - - return on_screen; } - (void) setMacDrvParentWindow:(WineWindow*)parent @@ -1415,8 +1398,10 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif // If a window is sized to completely cover a screen, then it's in // full-screen mode. In that case, we don't allow NSWindow to constrain // it. + NSArray* screens = [NSScreen screens]; NSRect contentRect = [self contentRectForFrameRect:frameRect]; - if (!screen_covered_by_rect(contentRect, [NSScreen screens])) + if (!screen_covered_by_rect(contentRect, screens) && + frame_intersects_screens(frameRect, screens)) frameRect = [super constrainFrameRect:frameRect toScreen:screen]; return frameRect; } @@ -2042,23 +2027,19 @@ void macdrv_set_cocoa_window_title(macdrv_window w, const unsigned short* title, * non-NULL, it is ordered below that window. Else, if next is non-NULL, * it is ordered above that window. Otherwise, it is ordered to the * front. - * - * Returns true if the window has actually been ordered onto the screen - * (i.e. if its frame intersects with a screen). Otherwise, false. */ -int macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev, - macdrv_window next, int activate) +void macdrv_order_cocoa_window(macdrv_window w, macdrv_window p, + macdrv_window n, int activate) { WineWindow* window = (WineWindow*)w; - __block BOOL on_screen; + WineWindow* prev = (WineWindow*)p; + WineWindow* next = (WineWindow*)n; - OnMainThread(^{ - on_screen = [window orderBelow:(WineWindow*)prev - orAbove:(WineWindow*)next - activate:activate]; + OnMainThreadAsync(^{ + [window orderBelow:prev + orAbove:next + activate:activate]; }); - - return on_screen; } /*********************************************************************** @@ -2078,22 +2059,15 @@ void macdrv_hide_cocoa_window(macdrv_window w) /*********************************************************************** * macdrv_set_cocoa_window_frame * - * Move a Cocoa window. If the window has been moved out of the bounds - * of the desktop, it is ordered out. (This routine won't ever order a - * window in, though.) - * - * Returns true if the window is on screen; false otherwise. + * Move a Cocoa window. */ -int macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) +void macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) { WineWindow* window = (WineWindow*)w; - __block BOOL on_screen; - OnMainThread(^{ - on_screen = [window setFrameIfOnScreen:NSRectFromCGRect(*new_frame)]; + OnMainThreadAsync(^{ + [window setFrameFromWine:NSRectFromCGRect(*new_frame)]; }); - - return on_screen; } /*********************************************************************** diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index e0c4f29..b452461 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -381,10 +381,10 @@ extern void macdrv_set_cocoa_window_state(macdrv_window w, const struct macdrv_window_state* state) DECLSPEC_HIDDEN; extern void macdrv_set_cocoa_window_title(macdrv_window w, const UniChar* title, size_t length) DECLSPEC_HIDDEN; -extern int macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev, +extern void macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev, macdrv_window next, int activate) 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_window_frame(macdrv_window w, const CGRect* new_frame) DECLSPEC_HIDDEN; extern void macdrv_get_cocoa_window_frame(macdrv_window w, CGRect* out_frame) DECLSPEC_HIDDEN; extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent) DECLSPEC_HIDDEN; extern void macdrv_set_window_surface(macdrv_window w, void *surface, pthread_mutex_t *mutex) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 3d92481..eac333a 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -729,6 +729,7 @@ static void show_window(struct macdrv_win_data *data) macdrv_window prev_window = NULL; macdrv_window next_window = NULL; BOOL activate = FALSE; + HWND hwndFocus; /* find window that this one must be after */ prev = GetWindow(data->hwnd, GW_HWNDPREV); @@ -749,15 +750,14 @@ static void show_window(struct macdrv_win_data *data) if (!prev_window) activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); - data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window, activate); - if (data->on_screen) - { - HWND hwndFocus = GetFocus(); - if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) - macdrv_SetFocus(hwndFocus); - if (activate) - activate_on_focus_time = 0; - } + macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window, activate); + data->on_screen = TRUE; + + hwndFocus = GetFocus(); + if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) + macdrv_SetFocus(hwndFocus); + if (activate) + activate_on_focus_time = 0; } @@ -857,7 +857,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c if (frame.size.width < 1 || frame.size.height < 1) frame.size.width = frame.size.height = 1; - data->on_screen = macdrv_set_cocoa_window_frame(data->cocoa_window, &frame); + macdrv_set_cocoa_window_frame(data->cocoa_window, &frame); if (old_window_rect && old_whole_rect && (IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect) || old_window_rect->left - old_whole_rect->left != data->window_rect.left - data->whole_rect.left ||

1 0

Ken Thomases : winemac: Avoid moving owned windows when programmatically moving the owner.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 3a03dcf09733cddd2c5b70cfa956df9a5c12437b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a03dcf09733cddd2c5b70cfa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Nov 14 20:52:07 2013 -0600 winemac: Avoid moving owned windows when programmatically moving the owner. Cocoa normally maintains the relative position of owned windows with respect to the owner, which differs from Windows. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 32 ++++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index d9130ac..ba5e34f 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -64,6 +64,7 @@ NSTimeInterval enteredFullScreenTime; BOOL ignore_windowDeminiaturize; + BOOL ignore_windowResize; BOOL fakingClose; } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index f7c2cd0..8b44fec 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1190,14 +1190,34 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif frame = [self frameRectForContentRect:contentRect]; if (!NSEqualRects(frame, oldFrame)) { - if (NSEqualSizes(frame.size, oldFrame.size)) - [self setFrameOrigin:frame.origin]; - else + BOOL equalSizes = NSEqualSizes(frame.size, oldFrame.size); + BOOL needEnableScreenUpdates = FALSE; + + if (equalSizes && [[self childWindows] count]) { - [self setFrame:frame display:YES]; - [self updateColorSpace]; + // If we change the window frame such that the origin moves + // but the size doesn't change, then Cocoa moves child + // windows with the parent. We don't want that so we fake + // a change of the size and then change it back. + NSRect bogusFrame = frame; + bogusFrame.size.width++; + + NSDisableScreenUpdates(); + needEnableScreenUpdates = TRUE; + + ignore_windowResize = TRUE; + [self setFrame:bogusFrame display:NO]; + ignore_windowResize = FALSE; } + [self setFrame:frame display:YES]; + + if (needEnableScreenUpdates) + NSEnableScreenUpdates(); + + if (!equalSizes) + [self updateColorSpace]; + if (!enteringFullScreen && [[NSProcessInfo processInfo] systemUptime] - enteredFullScreenTime > 1.0) nonFullscreenFrame = frame; @@ -1683,7 +1703,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif macdrv_event* event; NSRect frame = [self contentRectForFrameRect:[self frame]]; - if (exitingFullScreen) return; + if (ignore_windowResize || exitingFullScreen) return; if (self.disabled) {

1 0

Henri Verbeet : ddraw: Move the mipmap count fixup from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 063a6c8d2d3e76e8a3b9c66519ad70a6608fc2b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063a6c8d2d3e76e8a3b9c6651… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 15 08:24:29 2013 +0100 ddraw: Move the mipmap count fixup from CreateSurface() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 37 ------------------------------------- dlls/ddraw/surface.c | 50 ++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 47 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8891ed6..052023b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3017,43 +3017,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, if (!desc2.dwWidth || !desc2.dwHeight) return DDERR_INVALIDPARAMS; - /* Mipmap count fixes */ - if(desc2.ddsCaps.dwCaps & DDSCAPS_MIPMAP) - { - if(desc2.ddsCaps.dwCaps & DDSCAPS_COMPLEX) - { - if(desc2.dwFlags & DDSD_MIPMAPCOUNT) - { - /* Mipmap count is given, should not be 0 */ - if( desc2.u2.dwMipMapCount == 0 ) - return DDERR_INVALIDPARAMS; - } - else - { - /* Undocumented feature: Create sublevels until - * either the width or the height is 1 - */ - DWORD min = desc2.dwWidth < desc2.dwHeight ? - desc2.dwWidth : desc2.dwHeight; - desc2.u2.dwMipMapCount = 0; - while( min ) - { - desc2.u2.dwMipMapCount += 1; - min >>= 1; - } - } - } - else - { - /* Not-complex mipmap -> Mipmapcount = 1 */ - desc2.u2.dwMipMapCount = 1; - } - - /* There's a mipmap count in the created surface in any case */ - desc2.dwFlags |= DDSD_MIPMAPCOUNT; - } - /* If no mipmap is given, the texture has only one level */ - /* The first surface is a front buffer, the back buffer is created afterwards */ if( (desc2.dwFlags & DDSD_CAPS) && (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) ) { diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cad449c..c9903c0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5633,6 +5633,44 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, /* Do not fail surface creation, only fail 3D device creation. */ } + /* Mipmap count fixes */ + if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) + { + if (desc->ddsCaps.dwCaps & DDSCAPS_COMPLEX) + { + if (desc->dwFlags & DDSD_MIPMAPCOUNT) + { + /* Mipmap count is given, should not be 0. */ + if (!desc->u2.dwMipMapCount) + return DDERR_INVALIDPARAMS; + } + else + { + /* Undocumented feature: Create sublevels until either the + * width or the height is 1. */ + DWORD min = desc->dwWidth < desc->dwHeight ? desc->dwWidth : desc->dwHeight; + + desc->u2.dwMipMapCount = 0; + while (min) + { + ++desc->u2.dwMipMapCount; + min >>= 1; + } + } + } + else + { + desc->u2.dwMipMapCount = 1; + } + + desc->dwFlags |= DDSD_MIPMAPCOUNT; + levels = desc->u2.dwMipMapCount; + } + else + { + levels = 1; + } + if (!(desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) && !((desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) && (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)))) @@ -5685,16 +5723,6 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, texture->version = version; copy_to_surfacedesc2(&texture->surface_desc, desc); - if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) - levels = desc->u2.dwMipMapCount; - else - levels = 1; - - if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - layers = 6; - else - layers = 1; - /* Some applications assume surfaces will always be mapped at the same * address. Some of those also assume that this address is valid even when * the surface isn't mapped, and that updates done this way will be @@ -5706,12 +5734,14 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, wined3d_desc.resource_type = WINED3D_RTYPE_CUBE_TEXTURE; hr = wined3d_texture_create_cube(ddraw->wined3d_device, &wined3d_desc, levels, WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture); + layers = 6; } else { wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE; hr = wined3d_texture_create_2d(ddraw->wined3d_device, &wined3d_desc, levels, WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture); + layers = 1; } if (FAILED(hr))

1 0