wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

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

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

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 : 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

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

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

Jacek Caban : mshtml: Added IHTMLSelectElement:: multiple property implementation.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: eebc40f2b3935819584a20187af2e6f782270838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebc40f2b3935819584a20187… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 14 16:17:02 2013 +0100 mshtml: Added IHTMLSelectElement::multiple property implementation. --- dlls/mshtml/htmlselect.c | 21 +++++++++++++++++---- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 0f1ad8c..aef0bf0 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -156,15 +156,28 @@ static HRESULT WINAPI HTMLSelectElement_get_size(IHTMLSelectElement *iface, LONG static HRESULT WINAPI HTMLSelectElement_put_multiple(IHTMLSelectElement *iface, VARIANT_BOOL v) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLSelectElement_SetMultiple(This->nsselect, !!v); + assert(nsres == NS_OK); + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_multiple(IHTMLSelectElement *iface, VARIANT_BOOL *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLSelectElement_GetMultiple(This->nsselect, &val); + assert(nsres == NS_OK); + + *p = val ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLSelectElement_put_name(IHTMLSelectElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e43c754..cf72873 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1943,6 +1943,28 @@ static void _test_select_type(unsigned line, IHTMLSelectElement *select, const c SysFreeString(type); } +#define test_select_multiple(s,t) _test_select_multiple(__LINE__,s,t) +static void _test_select_multiple(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL exmultiple) +{ + VARIANT_BOOL b = 100; + HRESULT hres; + + hres = IHTMLSelectElement_get_multiple(select, &b); + ok_(__FILE__,line) (hres == S_OK, "get_multiple failed: %08x\n", hres); + ok_(__FILE__,line) (b == exmultiple, "multiple=%x, expected %x\n", b, exmultiple); +} + +#define test_select_set_multiple(s,v) _test_select_set_multiple(__LINE__,s,v) +static void _test_select_set_multiple(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL val) +{ + HRESULT hres; + + hres = IHTMLSelectElement_put_multiple(select, val); + ok_(__FILE__,line) (hres == S_OK, "put_multiple failed: %08x\n", hres); + + _test_select_multiple(line, select, val); +} + #define test_range_text(r,t) _test_range_text(__LINE__,r,t) static void _test_range_text(unsigned line, IHTMLTxtRange *range, const char *extext) { @@ -4212,6 +4234,9 @@ static void test_select_elem(IHTMLSelectElement *select) ok(iface_cmp((IUnknown*)disp, (IUnknown*)disp2), "disp != disp2\n"); IDispatch_Release(disp2); IDispatch_Release(disp); + + test_select_multiple(select, VARIANT_FALSE); + test_select_set_multiple(select, VARIANT_TRUE); } static void test_form_item(IHTMLElement *elem)

1 0

Rico Schüller : d3d10: Fix a comment.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: dee50ab8b4807db1344d9e3c19fae54a7d3e23c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee50ab8b4807db1344d9e3c1… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Nov 14 12:15:30 2013 +0100 d3d10: Fix a comment. --- dlls/d3d10/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index 19ca5b4..a6a9a30 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -130,7 +130,7 @@ const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl = d3d10_shader_reflection_QueryInterface, d3d10_shader_reflection_AddRef, d3d10_shader_reflection_Release, - /* ID3D10Effect methods */ + /* ID3D10ShaderReflection methods */ d3d10_shader_reflection_GetDesc, d3d10_shader_reflection_GetConstantBufferByIndex, d3d10_shader_reflection_GetConstantBufferByName,

1 0

Rico Schüller : d3d10/tests: Enable DepthEnable for reproducible results.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: 8e5ecee1ceaeb52afbb6ad0e1c466d6fda4284f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5ecee1ceaeb52afbb6ad0e1… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Nov 14 11:26:55 2013 +0100 d3d10/tests: Enable DepthEnable for reproducible results. --- dlls/d3d10/tests/effect.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 7f5ce0a..fa24596 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3618,7 +3618,7 @@ RasterizerState rast_state DepthStencilState ds_state { - DepthEnable = false; /* 0x16 */ + DepthEnable = true; /* 0x16 */ DepthWriteMask = zero; /* 0x17 */ DepthFunc = equal; /* 0x18 */ StencilEnable = true; /* 0x19 */ @@ -3675,8 +3675,8 @@ technique10 tech0 #endif static DWORD fx_test_state_groups[] = { - 0x43425844, 0x519ef0cc, 0x85962b86, 0x3c2272fb, - 0x17942172, 0x00000001, 0x00000794, 0x00000001, + 0x43425844, 0xbf7e3418, 0xd2838ea5, 0x8012c315, + 0x7dd76ca7, 0x00000001, 0x00000794, 0x00000001, 0x00000024, 0x30315846, 0x00000768, 0xfeff1001, 0x00000001, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x0000035c, @@ -3698,7 +3698,7 @@ static DWORD fx_test_state_groups[] = 0x74617453, 0x00bc0065, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x73640000, 0x6174735f, 0x01006574, 0x04000000, - 0x00000000, 0x01000000, 0x02000000, 0x00000000, + 0x01000000, 0x01000000, 0x02000000, 0x00000000, 0x01000000, 0x02000000, 0x03000000, 0x01000000, 0x04000000, 0x01000000, 0x01000000, 0x02000000, 0x04000000, 0x01000000, 0x02000000, 0x05000000, @@ -3865,7 +3865,7 @@ static void test_effect_state_groups(ID3D10Device *device) v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v); d->lpVtbl->GetBackingStore(d, 0, &ds_desc); - ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ZERO, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); ok(ds_desc.DepthFunc == D3D10_COMPARISON_EQUAL, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); @@ -3950,10 +3950,10 @@ static void test_effect_state_groups(ID3D10Device *device) ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); - ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ZERO, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); - todo_wine ok(ds_desc.DepthFunc == D3D10_COMPARISON_NEVER, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); + ok(ds_desc.DepthFunc == D3D10_COMPARISON_EQUAL, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); ok(ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); ok(ds_desc.StencilReadMask == 0x4, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); ok(ds_desc.StencilWriteMask == 0x5, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask);

1 0

Henri Verbeet : wined3d: Create a texture for the logo surface.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: 94509fbd59b59244379e3efb54e78f676dc09e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=94509fbd59b59244379e3efb5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 14 10:47:19 2013 +0100 wined3d: Create a texture for the logo surface. --- dlls/wined3d/device.c | 33 ++++++++++++++++++++++----------- dlls/wined3d/swapchain.c | 5 +++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8a1af6b..2d65684 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -551,6 +551,8 @@ struct wined3d_swapchain * CDECL wined3d_device_get_swapchain(const struct wined static void device_load_logo(struct wined3d_device *device, const char *filename) { struct wined3d_color_key color_key; + struct wined3d_resource_desc desc; + struct wined3d_surface *surface; HBITMAP hbm; BITMAP bm; HRESULT hr; @@ -574,31 +576,40 @@ static void device_load_logo(struct wined3d_device *device, const char *filename bm.bmHeight = 32; } - hr = wined3d_surface_create(device, bm.bmWidth, bm.bmHeight, WINED3DFMT_B5G6R5_UNORM, 0, - WINED3D_POOL_SYSTEM_MEM, WINED3D_MULTISAMPLE_NONE, 0, WINED3D_SURFACE_MAPPABLE, - NULL, &wined3d_null_parent_ops, &device->logo_surface); - if (FAILED(hr)) - { - ERR("Wine logo requested, but failed to create surface, hr %#x.\n", hr); + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = WINED3DFMT_B5G6R5_UNORM; + desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + desc.multisample_quality = 0; + desc.usage = 0; + desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.width = bm.bmWidth; + desc.height = bm.bmHeight; + desc.depth = 1; + desc.size = 0; + if (FAILED(hr = wined3d_texture_create_2d(device, &desc, 1, WINED3D_SURFACE_MAPPABLE, + NULL, &wined3d_null_parent_ops, &device->logo_texture))) + { + ERR("Wine logo requested, but failed to create texture, hr %#x.\n", hr); goto out; } + surface = surface_from_resource(wined3d_texture_get_sub_resource(device->logo_texture, 0)); if (dcb) { - if (FAILED(hr = wined3d_surface_getdc(device->logo_surface, &dcs))) + if (FAILED(hr = wined3d_surface_getdc(surface, &dcs))) goto out; BitBlt(dcs, 0, 0, bm.bmWidth, bm.bmHeight, dcb, 0, 0, SRCCOPY); - wined3d_surface_releasedc(device->logo_surface, dcs); + wined3d_surface_releasedc(surface, dcs); color_key.color_space_low_value = 0; color_key.color_space_high_value = 0; - wined3d_surface_set_color_key(device->logo_surface, WINEDDCKEY_SRCBLT, &color_key); + wined3d_surface_set_color_key(surface, WINEDDCKEY_SRCBLT, &color_key); } else { const struct wined3d_color c = {1.0f, 1.0f, 1.0f, 1.0f}; /* Fill the surface with a white color to show that wined3d is there */ - wined3d_device_color_fill(device, device->logo_surface, NULL, &c); + wined3d_device_color_fill(device, surface, NULL, &c); } out: @@ -1014,8 +1025,8 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) context = context_acquire(device, NULL); gl_info = context->gl_info; - if (device->logo_surface) - wined3d_surface_decref(device->logo_surface); + if (device->logo_texture) + wined3d_texture_decref(device->logo_texture); state_unbind_resources(&device->state); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7a383fd..1b45cd0 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -468,9 +468,10 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT NULL, WINED3D_TEXF_POINT); } - if (swapchain->device->logo_surface) + if (swapchain->device->logo_texture) { - struct wined3d_surface *src_surface = swapchain->device->logo_surface; + struct wined3d_surface *src_surface = surface_from_resource( + wined3d_texture_get_sub_resource(swapchain->device->logo_texture, 0)); RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; /* Blit the logo into the upper left corner of the drawable. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e4ce84d..3c8cc51 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1924,8 +1924,8 @@ struct wined3d_device GLuint cursorTexture; HCURSOR hardwareCursor; - /* The Wine logo surface */ - struct wined3d_surface *logo_surface; + /* The Wine logo texture */ + struct wined3d_texture *logo_texture; /* Textures for when no other textures are mapped */ UINT dummy_texture_2d[MAX_COMBINED_SAMPLERS];

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2013