December 2014 - Wine-commits

Aric Stewart : usp10: Correct an off-by-one error in page cache allocation.
by Alexandre Julliard 17 Dec '14

17 Dec '14

Module: wine Branch: master Commit: b2ef87750646db7798ec23cc3030baf1f07efc38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ef87750646db7798ec23cc3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 17 08:48:12 2014 -0600 usp10: Correct an off-by-one error in page cache allocation. --- dlls/usp10/usp10_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 504bd55..f10a02d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -169,7 +169,7 @@ typedef struct { OUTLINETEXTMETRICW *otm; SCRIPT_FONTPROPERTIES sfp; BOOL sfnt; - CacheGlyphPage *page[0x10]; + CacheGlyphPage *page[0x11]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table; LPVOID GDEF_Table;

1 0

Ken Thomases : winemac: Ignore Cocoa child windows which aren' t instances of WineWindow.
by Alexandre Julliard 17 Dec '14

17 Dec '14

Module: wine Branch: master Commit: b8da8fa4b1a9362f87ed671c9cb8ebfa440ba1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8da8fa4b1a9362f87ed671c9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 17 08:59:09 2014 -0600 winemac: Ignore Cocoa child windows which aren't instances of WineWindow. On Yosemite, in full-screen mode, Cocoa adds child windows of its own to our windows. These windows are, of course, not instances of WineWindow. So, when we call WineWindow-specific methods on them, it throws exceptions. --- dlls/winemac.drv/cocoa_window.m | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b2238cb..57ae2b8 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -195,6 +195,8 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif @property (retain, nonatomic) NSTimer* liveResizeDisplayTimer; +(a)property (readonly, copy, nonatomic) NSArray* childWineWindows; + - (void) updateColorSpace; - (BOOL) becameEligibleParentOrChild; @@ -834,7 +836,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif // Became non-floating. If parent of floating children, make that // relationship latent. WineWindow* child; - for (child in [[[self childWindows] copy] autorelease]) + for (child in [self childWineWindows]) { if (child.floating) [child becameIneligibleChild]; @@ -1012,7 +1014,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) becameIneligibleParentOrChild { - NSArray* childWindows = [self childWindows]; + NSArray* childWindows = [self childWineWindows]; [self becameIneligibleChild]; @@ -1020,7 +1022,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { WineWindow* child; - childWindows = [[childWindows copy] autorelease]; for (child in childWindows) { child.latentParentWindow = self; @@ -1101,7 +1102,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif // Get our child windows and sort them in the reverse of the desired // z-order (back-to-front). - origChildren = [self childWindows]; + origChildren = [self childWineWindows]; children = [[origChildren mutableCopy] autorelease]; [children sortWithOptions:NSSortStable usingComparator:^NSComparisonResult(id obj1, id obj2){ @@ -1315,7 +1316,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self setContentMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)]; } - if (equalSizes && [[self childWindows] count]) + if (equalSizes && [[self childWineWindows] count]) { // If we change the window frame such that the origin moves // but the size doesn't change, then Cocoa moves child @@ -1611,6 +1612,15 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [super toggleFullScreen:sender]; } + - (NSArray*) childWineWindows + { + NSArray* childWindows = self.childWindows; + NSIndexSet* indexes = [childWindows indexesOfObjectsPassingTest:^BOOL(id child, NSUInteger idx, BOOL *stop){ + return [child isKindOfClass:[WineWindow class]]; + }]; + return [childWindows objectsAtIndexes:indexes]; + } + // We normally use the generic/calibrated RGB color space for the window, // rather than the device color space, to avoid expensive color conversion // which slows down drawing. However, for windows displaying OpenGL, having

1 0

Andrew Eikum : mmdevapi: More accurately track device position.
by Alexandre Julliard 17 Dec '14

17 Dec '14

Module: wine Branch: master Commit: d301254e72f018c3e04272115e20ffc70ffcbc12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d301254e72f018c3e04272115… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 17 09:28:13 2014 -0600 mmdevapi: More accurately track device position. --- dlls/mmdevapi/tests/render.c | 10 +- dlls/winealsa.drv/mmdevdrv.c | 384 ++++++++++++++++++++++++++----------------- dlls/wineoss.drv/mmdevdrv.c | 76 +++++---- 3 files changed, 283 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d301254e72f018c3e0427…

1 0

Andrew Eikum : wineoss.drv: Don't use SNDCTL_DSP_GETISPACE.
by Alexandre Julliard 17 Dec '14

17 Dec '14

Module: wine Branch: master Commit: 50cdc6d7f3d04fafcd7b859814653be403df98e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cdc6d7f3d04fafcd7b85981… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 17 09:28:21 2014 -0600 wineoss.drv: Don't use SNDCTL_DSP_GETISPACE. This shouldn't be needed as the device is opened in non-blocking mode, and it appears this function is unimplemented on PCBSD. --- dlls/wineoss.drv/mmdevdrv.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index b111338..0688f9a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1493,20 +1493,11 @@ static void oss_write_data(ACImpl *This) static void oss_read_data(ACImpl *This) { UINT64 pos, readable; - audio_buf_info bi; ssize_t nread; - if(ioctl(This->fd, SNDCTL_DSP_GETISPACE, &bi) < 0){ - WARN("GETISPACE failed: %d (%s)\n", errno, strerror(errno)); - return; - } - pos = (This->held_frames + This->lcl_offs_frames) % This->bufsize_frames; readable = (This->bufsize_frames - pos) * This->fmt->nBlockAlign; - if(bi.bytes < readable) - readable = bi.bytes; - nread = read(This->fd, This->local_buffer + pos * This->fmt->nBlockAlign, readable); if(nread < 0){

1 0

Alexandre Julliard : winspool.drv: Don' t crash if the ppd directory cannot be created.
by Alexandre Julliard 17 Dec '14

17 Dec '14

Module: wine Branch: master Commit: f1aea67d9578a1fcbc5f7ca13fb5424b7b36be43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1aea67d9578a1fcbc5f7ca13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 17:10:50 2014 +0100 winspool.drv: Don't crash if the ppd directory cannot be created. --- dlls/winspool.drv/info.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 073a8fb..7653d2f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -946,7 +946,11 @@ static BOOL CUPS_LoadPrinters(void) } else { BOOL added_driver = FALSE; - if (!ppd_dir) ppd_dir = get_ppd_dir(); + if (!ppd_dir && !(ppd_dir = get_ppd_dir())) + { + HeapFree( GetProcessHeap(), 0, port ); + break; + } ppd = get_ppd_filename( ppd_dir, nameW ); if (get_cups_ppd( dests[i].name, ppd )) { @@ -1098,7 +1102,11 @@ static BOOL update_driver( HANDLE printer ) queue_name = get_queue_name( printer, &is_cups ); if (!queue_name) return FALSE; - ppd_dir = get_ppd_dir(); + if (!(ppd_dir = get_ppd_dir())) + { + HeapFree( GetProcessHeap(), 0, queue_name ); + return FALSE; + } ppd = get_ppd_filename( ppd_dir, name ); #ifdef SONAME_LIBCUPS @@ -1224,7 +1232,7 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) sep_file[] = "<sep file?>"; BOOL added_driver = FALSE; - if (!ppd_dir) ppd_dir = get_ppd_dir(); + if (!ppd_dir && !(ppd_dir = get_ppd_dir())) goto end; ppd = get_ppd_filename( ppd_dir, devnameW ); if (get_fallback_ppd( devname, ppd )) {

1 0

Drew Ronneberg : winemenubuilder: Prevent recursion by calling open_module_icon() instead of open_icon()
by Alexandre Julliard 17 Dec '14

17 Dec '14

Module: wine Branch: master Commit: e6a558ad820cc12d59bf0e71ad1ff5cfd021542e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a558ad820cc12d59bf0e71a… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sat Nov 22 13:39:43 2014 -0500 winemenubuilder: Prevent recursion by calling open_module_icon() instead of open_icon() --- programs/winemenubuilder/winemenubuilder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 5d3bb27..fae89f9 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1028,13 +1028,13 @@ static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) *comma = 0; index = atoiW(comma + 1); } - hr = open_icon(icon, index, FALSE, ppStream); + hr = open_module_icon(icon, index, ppStream); } else { executable = assoc_query(ASSOCSTR_EXECUTABLE, extension, openW); if (executable) - hr = open_icon(executable, 0, FALSE, ppStream); + hr = open_module_icon(executable, 0, ppStream); } end:

1 0

Aidan Thornton : quartz: Implement IFilterGraph2:: AddSourceFilterForMoniker.
by Alexandre Julliard 17 Dec '14

17 Dec '14

Module: wine Branch: master Commit: 1f7683777babab98197c39e5965ba6f70c01c8d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f7683777babab98197c39e59… Author: Aidan Thornton <makosoft(a)gmail.com> Date: Tue Dec 16 18:49:34 2014 +0000 quartz: Implement IFilterGraph2::AddSourceFilterForMoniker. --- dlls/quartz/filtergraph.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 3d495db..fcdd05b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1737,8 +1737,27 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilterForMoniker(IFilterGraph2 *ifac IMoniker *pMoniker, IBindCtx *pCtx, LPCWSTR lpcwstrFilterName, IBaseFilter **ppFilter) { IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); + HRESULT hr; + IBaseFilter* pfilter; + + TRACE("(%p/%p)->(%p %p %s %p)\n", This, iface, pMoniker, pCtx, debugstr_w(lpcwstrFilterName), ppFilter); + + hr = IMoniker_BindToObject(pMoniker, pCtx, NULL, &IID_IBaseFilter, (void**)&pfilter); + if(FAILED(hr)) { + WARN("Unable to bind moniker to filter object (%x)\n", hr); + return hr; + } + + hr = IFilterGraph2_AddFilter(iface, pfilter, lpcwstrFilterName); + if (FAILED(hr)) { + WARN("Unable to add filter (%x)\n", hr); + IBaseFilter_Release(pfilter); + return hr; + } - TRACE("(%p/%p)->(%p %p %s %p): stub !!!\n", This, iface, pMoniker, pCtx, debugstr_w(lpcwstrFilterName), ppFilter); + if(ppFilter) + *ppFilter = pfilter; + else IBaseFilter_Release(pfilter); return S_OK; }

1 0

Erich E. Hoover : ntdll: Unify retrieving the attributes of a file.
by Alexandre Julliard 17 Dec '14

17 Dec '14

Module: wine Branch: master Commit: ca51e113e4820f8b11016c13732b1a971d2b0054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca51e113e4820f8b11016c137… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Aug 19 20:31:00 2014 -0600 ntdll: Unify retrieving the attributes of a file. --- dlls/ntdll/directory.c | 12 ++---- dlls/ntdll/file.c | 103 ++++++++++++++++++++++++++++++++++-------------- dlls/ntdll/ntdll_misc.h | 4 +- 3 files changed, 79 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca51e113e4820f8b11016…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.33
by Jeremy Newman 16 Dec '14

16 Dec '14

Module: website Branch: master Commit: 01c51cfe7340f5e20147070219ef572cde827258 URL: http://source.winehq.org/git/website.git/?a=commit;h=01c51cfe7340f5e2014707… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 13 03:39:42 2014 +0100 Polish translation for release 1.7.33 --- news/pl/2014121201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014121201.xml b/news/pl/2014121201.xml new file mode 100644 index 0000000..6032329 --- /dev/null +++ b/news/pl/2014121201.xml @@ -0,0 +1,16 @@ +<news> +<date>Grudzień 12, 2014</date> +<title>Wydano Wine 1.7.33</title> +<body> + Wydanie rozwojowe Wine 1.7.33 jest już dostępne. + <a href="{$root}/announce/1.7.33">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla poleceń kopiuj/wklej w MSHTML.</li> + <li>Rozszerzono wsparcie dla czcionek w DirectWrite.</li> + <li>Lepsza obsługa utraty uaktywninienia okien w Direct3D.</li> + <li>Kilka zestawów AP bibliotek DLL.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.33.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Michael Stefaniuc : d3d9: Don't assert for shaders with the wrong vtbl.
by Alexandre Julliard 16 Dec '14

16 Dec '14

Module: wine Branch: master Commit: 51406b471aa81a56dc38e4b266b51e09646987c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51406b471aa81a56dc38e4b26… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 16 09:57:09 2014 +0100 d3d9: Don't assert for shaders with the wrong vtbl. --- dlls/d3d9/shader.c | 6 ++++-- dlls/d3d9/tests/device.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 0c2c881..9430afd 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -167,7 +167,8 @@ struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVerte { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d9_vertexshader_vtbl); + if (iface->lpVtbl != &d3d9_vertexshader_vtbl) + WARN("Vertex shader %p with the wrong vtbl %p\n", iface, iface->lpVtbl); return impl_from_IDirect3DVertexShader9(iface); } @@ -317,7 +318,8 @@ struct d3d9_pixelshader *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelSh { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d9_pixelshader_vtbl); + if (iface->lpVtbl != &d3d9_pixelshader_vtbl) + WARN("Pixel shader %p with the wrong vtbl %p\n", iface, iface->lpVtbl); return impl_from_IDirect3DPixelShader9(iface); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3206e57..ffd3c11 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5518,6 +5518,7 @@ static void test_get_set_vertex_shader(void) { IDirect3DVertexShader9 *current_shader = NULL; IDirect3DVertexShader9 *shader = NULL; + const IDirect3DVertexShader9Vtbl *shader_vtbl; IDirect3DDevice9 *device; ULONG refcount, i; IDirect3D9 *d3d; @@ -5568,6 +5569,16 @@ static void test_get_set_vertex_shader(void) ok(current_shader == shader, "Got unexpected shader %p, expected %p.\n", current_shader, shader); IDirect3DVertexShader9_Release(current_shader); + /* SetVertexShader() with a bogus shader vtbl */ + shader_vtbl = shader->lpVtbl; + shader->lpVtbl = (IDirect3DVertexShader9Vtbl *)0xdeadbeef; + hr = IDirect3DDevice9_SetVertexShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + shader->lpVtbl = NULL; + hr = IDirect3DDevice9_SetVertexShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + shader->lpVtbl = shader_vtbl; + IDirect3DVertexShader9_Release(shader); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); @@ -5640,6 +5651,7 @@ static void test_get_set_pixel_shader(void) { IDirect3DPixelShader9 *current_shader = NULL; IDirect3DPixelShader9 *shader = NULL; + const IDirect3DPixelShader9Vtbl *shader_vtbl; IDirect3DDevice9 *device; ULONG refcount, i; IDirect3D9 *d3d; @@ -5690,6 +5702,16 @@ static void test_get_set_pixel_shader(void) ok(current_shader == shader, "Got unexpected shader %p, expected %p.\n", current_shader, shader); IDirect3DPixelShader9_Release(current_shader); + /* SetPixelShader() with a bogus shader vtbl */ + shader_vtbl = shader->lpVtbl; + shader->lpVtbl = (IDirect3DPixelShader9Vtbl *)0xdeadbeef; + hr = IDirect3DDevice9_SetPixelShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + shader->lpVtbl = NULL; + hr = IDirect3DDevice9_SetPixelShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + shader->lpVtbl = shader_vtbl; + IDirect3DPixelShader9_Release(shader); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0