November 2015 - Wine-Commits

Alexandre Julliard : makedep: Release extra string storage.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: 8a2545e487d439633da834f07b110b68b4eafca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a2545e487d439633da834f07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:21:21 2015 +0900 makedep: Release extra string storage. Also consistently use size_t type for string sizes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index fb32fa2..e4ba7c4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -316,7 +316,7 @@ static char *strmake( const char* fmt, ... ) va_end(ap); if (n == -1) size *= 2; else if ((size_t)n >= size) size = n + 1; - else return p; + else return xrealloc( p, n + 1 ); free(p); } } @@ -327,8 +327,8 @@ static char *strmake( const char* fmt, ... ) */ static int strendswith( const char* str, const char* end ) { - int l = strlen(str); - int m = strlen(end); + size_t l = strlen( str ); + size_t m = strlen( end ); return l >= m && strcmp(str + l - m, end) == 0; } @@ -477,8 +477,8 @@ static char *get_extension( char *filename ) static char *replace_extension( const char *name, const char *old_ext, const char *new_ext ) { char *ret; - int name_len = strlen( name ); - int ext_len = strlen( old_ext ); + size_t name_len = strlen( name ); + size_t ext_len = strlen( old_ext ); if (name_len >= ext_len && !strcmp( name + name_len - ext_len, old_ext )) name_len -= ext_len; ret = xmalloc( name_len + strlen( new_ext ) + 1 ); @@ -507,9 +507,9 @@ static struct strarray strarray_replace_extension( const struct strarray *array, /******************************************************************* * replace_substr */ -static char *replace_substr( const char *str, const char *start, unsigned int len, const char *replace ) +static char *replace_substr( const char *str, const char *start, size_t len, const char *replace ) { - unsigned int pos = start - str; + size_t pos = start - str; char *ret = xmalloc( pos + strlen(replace) + strlen(start + len) + 1 ); memcpy( ret, str, pos ); strcpy( ret + pos, replace ); @@ -657,7 +657,7 @@ static char *tools_path( const struct makefile *make, const char *name ) static char *get_line( FILE *file ) { static char *buffer; - static unsigned int size; + static size_t size; if (!size) { @@ -1385,7 +1385,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ /* try in src file directory */ if ((p = strrchr(pFile->included_by->filename, '/'))) { - int l = p - pFile->included_by->filename + 1; + size_t l = p - pFile->included_by->filename + 1; filename = xmalloc(l + strlen(pFile->name) + 1); memcpy( filename, pFile->included_by->filename, l ); strcpy( filename + l, pFile->name );

1 0

Ken Thomases : winemac: Check the window' s display link after adding it as a child of another window, which may order it on screen.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: d6574111c20d130a40c09ce0762ceb0a5461ada0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6574111c20d130a40c09ce07… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Nov 9 20:31:21 2015 -0600 winemac: Check the window's display link after adding it as a child of another window, which may order it on screen. This fixes a problem where child windows ("owned" windows in Windows parlance) would never display their contents on OS X 10.8 or earlier. Beginning with 10.9, Cocoa calls -windowDidChangeOcclusionState: when the window becomes visible, which is why they display on that version and later. Reported by Huw Davies. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 666a953..49afd18 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1041,6 +1041,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if ([self level] > [child level]) [child setLevel:[self level]]; [self addChildWindow:child ordered:NSWindowAbove]; + [child checkWineDisplayLink]; [latentChildWindows removeObjectIdenticalTo:child]; child.latentParentWindow = nil; reordered = TRUE;

1 0

Nikolay Sivov : hnetcfg: Store port number for INetFwOpenPort.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: b7a67eb30f314a37de77fa29d3a684226ba1e657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a67eb30f314a37de77fa29d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 21:21:35 2015 +0300 hnetcfg: Store port number for INetFwOpenPort. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index c79c997..4cc1ba6 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -40,6 +40,7 @@ typedef struct fw_port LONG refs; BSTR name; NET_FW_IP_PROTOCOL protocol; + LONG port; } fw_port; static inline fw_port *impl_from_INetFwOpenPort( INetFwOpenPort *iface ) @@ -253,8 +254,9 @@ static HRESULT WINAPI fw_port_put_Port( { fw_port *This = impl_from_INetFwOpenPort( iface ); - FIXME("%p %d\n", This, portNumber); - return E_NOTIMPL; + TRACE("%p %d\n", This, portNumber); + This->port = portNumber; + return S_OK; } static HRESULT WINAPI fw_port_get_Scope( @@ -368,6 +370,7 @@ HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fp->refs = 1; fp->name = NULL; fp->protocol = NET_FW_IP_PROTOCOL_TCP; + fp->port = 0; *ppObj = &fp->INetFwOpenPort_iface;

1 0

Jacek Caban : comctl32: Don't use comparisons to FALSE.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: 67819d6ee9b7a69e1bfd4264cab110e37e582c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67819d6ee9b7a69e1bfd4264c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 16:21:17 2015 +0100 comctl32: Don't use comparisons to FALSE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9121266..890c18e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3152,7 +3152,7 @@ TOOLBAR_CheckButton (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) bChecked = (btnPtr->fsState & TBSTATE_CHECKED) != 0; - if (LOWORD(lParam) == FALSE) + if (!LOWORD(lParam)) btnPtr->fsState &= ~TBSTATE_CHECKED; else { if (btnPtr->fsStyle & BTNS_GROUP) { @@ -3284,7 +3284,7 @@ TOOLBAR_EnableButton (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) bState = btnPtr->fsState & TBSTATE_ENABLED; /* update the toolbar button state */ - if(LOWORD(lParam) == FALSE) { + if(!LOWORD(lParam)) { btnPtr->fsState &= ~(TBSTATE_ENABLED | TBSTATE_PRESSED); } else { btnPtr->fsState |= TBSTATE_ENABLED;

1 0

Huw Davies : riched20: Release the font cache when changing the default style.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: f47aab61671ad0d031fcea56c2204f8d0c47fff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f47aab61671ad0d031fcea56c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 9 16:11:42 2015 +0000 riched20: Release the font cache when changing the default style. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/run.c | 19 ------------------- dlls/riched20/style.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index d76737a..d261213 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -763,25 +763,6 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C } } -/****************************************************************************** - * ME_SetDefaultCharFormat - * - * Applies a style change to the default character style. - */ -void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) -{ - ME_Style *style; - - assert(mod->cbSize == sizeof(CHARFORMAT2W)); - style = ME_ApplyStyle(editor->pBuffer->pDefaultStyle, mod); - editor->pBuffer->pDefaultStyle->fmt = style->fmt; - editor->pBuffer->pDefaultStyle->tm = style->tm; - ScriptFreeCache( &editor->pBuffer->pDefaultStyle->script_cache ); - ME_ReleaseStyle(style); - ME_MarkAllForWrapping(editor); - /* pcf = editor->pBuffer->pDefaultStyle->fmt; */ -} - static void ME_GetRunCharFormat(ME_TextEditor *editor, ME_DisplayItem *run, CHARFORMAT2W *pFmt) { ME_CopyCharFormat(pFmt, &run->member.run.style->fmt); diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 0e990e2..37f56d9 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -508,3 +508,31 @@ void ME_ClearTempStyle(ME_TextEditor *editor) ME_ReleaseStyle(editor->pBuffer->pCharStyle); editor->pBuffer->pCharStyle = NULL; } + +/****************************************************************************** + * ME_SetDefaultCharFormat + * + * Applies a style change to the default character style. + * + * The default style is special in that it is mutable - runs + * in the document that have this style should change if the + * default style changes. That means we need to fix up this + * style manually. + */ +void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) +{ + ME_Style *style, *def = editor->pBuffer->pDefaultStyle; + + assert(mod->cbSize == sizeof(CHARFORMAT2W)); + style = ME_ApplyStyle(def, mod); + def->fmt = style->fmt; + def->tm = style->tm; + if (def->font_cache) + { + release_font_cache( def->font_cache ); + def->font_cache = NULL; + } + ScriptFreeCache( &def->script_cache ); + ME_ReleaseStyle( style ); + ME_MarkAllForWrapping( editor ); +}

1 0

Austin English : dbghelp: Version to 6.1.7601.17514.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: 4f3f8a8cb73204170ec5cdc356b45a3fae4d0484 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3f8a8cb73204170ec5cdc35… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 9 01:19:12 2015 -0600 dbghelp: Version to 6.1.7601.17514. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/version.rc b/dlls/dbghelp/version.rc index 1818010..03f03a3 100644 --- a/dlls/dbghelp/version.rc +++ b/dlls/dbghelp/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine Image Helper" #define WINE_FILENAME_STR "dbghelp.dll" -#define WINE_FILEVERSION 5,1,2600,3264 -#define WINE_FILEVERSION_STR "5.1.2600.3264" -#define WINE_PRODUCTVERSION 5,1,2600,3264 -#define WINE_PRODUCTVERSION_STR "5.1.2600.3264" +#define WINE_FILEVERSION 6,1,7601,17514 +#define WINE_FILEVERSION_STR "6.1.7601.17514" +#define WINE_PRODUCTVERSION 6,1,7601,17514 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" #include "wine/wine_common_ver.rc"

1 0

Huw Davies : riched20: Store the font cache entry rather than the HFONT.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: bb165d22e0f7d134e592088880353aff42729a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb165d22e0f7d134e59208888… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 9 16:11:41 2015 +0000 riched20: Store the font cache entry rather than the HFONT. This also removes an incorrect DeleteObject() from DestroyStyle(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editstr.h | 22 +++++++++++----------- dlls/riched20/style.c | 46 ++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 37 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 90f7fa0..3e98dac 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -60,11 +60,21 @@ typedef struct tagME_String int nLen, nBuffer; } ME_String; +typedef struct tagME_FontCacheItem +{ + LOGFONTW lfSpecs; + HFONT hFont; + int nRefs; + int nAge; +} ME_FontCacheItem; + +#define HFONT_CACHE_SIZE 10 + typedef struct tagME_Style { CHARFORMAT2W fmt; - HFONT hFont; /* cached font for the style */ + ME_FontCacheItem *font_cache; /* cached font for the style */ TEXTMETRICW tm; /* cached font metrics for the style */ int nRefs; /* reference count */ SCRIPT_CACHE script_cache; @@ -372,16 +382,6 @@ typedef struct tagME_OutStream { UINT nNestingLevel; } ME_OutStream; -typedef struct tagME_FontCacheItem -{ - LOGFONTW lfSpecs; - HFONT hFont; - int nRefs; - int nAge; -} ME_FontCacheItem; - -#define HFONT_CACHE_SIZE 10 - typedef struct tagME_TextEditor { HWND hWnd, hwndParent; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 0817ea8..0e990e2 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -146,7 +146,7 @@ ME_Style *ME_MakeStyle(CHARFORMAT2W *style) assert(style->cbSize == sizeof(CHARFORMAT2W)); s->fmt = *style; s->nRefs = 1; - s->hFont = NULL; + s->font_cache = NULL; memset(&s->tm, 0, sizeof(s->tm)); s->tm.tmAscent = -1; s->script_cache = NULL; @@ -383,8 +383,6 @@ HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) { item = &c->editor->pFontCache[i]; TRACE_(richedit_style)("font reused %d\n", i); - - s->hFont = item->hFont; item->nRefs++; } else @@ -397,44 +395,40 @@ HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) DeleteObject(item->hFont); item->hFont = NULL; } - s->hFont = CreateFontIndirectW(&lf); - assert(s->hFont); + item->hFont = CreateFontIndirectW(&lf); TRACE_(richedit_style)("font created %d\n", nEmpty); - item->hFont = s->hFont; item->nRefs = 1; item->lfSpecs = lf; } - hOldFont = SelectObject(c->hDC, s->hFont); + s->font_cache = item; + hOldFont = SelectObject(c->hDC, item->hFont); /* should be cached too, maybe ? */ GetTextMetricsW(c->hDC, &s->tm); return hOldFont; } -void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) +static void release_font_cache(ME_FontCacheItem *item) { - int i; - - assert(s); - SelectObject(c->hDC, hOldFont); - for (i=0; i<HFONT_CACHE_SIZE; i++) - { - ME_FontCacheItem *pItem = &c->editor->pFontCache[i]; - if (pItem->hFont == s->hFont && pItem->nRefs > 0) + if (item->nRefs > 0) { - pItem->nRefs--; - pItem->nAge = 0; - s->hFont = NULL; - return; + item->nRefs--; + item->nAge = 0; } - } - assert(0 == "UnselectStyleFont without SelectStyleFont"); } -static void ME_DestroyStyle(ME_Style *s) { - if (s->hFont) +void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) +{ + SelectObject(c->hDC, hOldFont); + release_font_cache(s->font_cache); + s->font_cache = NULL; +} + +static void ME_DestroyStyle(ME_Style *s) +{ + if (s->font_cache) { - DeleteObject(s->hFont); - s->hFont = NULL; + release_font_cache( s->font_cache ); + s->font_cache = NULL; } ScriptFreeCache( &s->script_cache ); FREE_OBJ(s);

1 0

Józef Kucia : d3d11/tests: Port test_fragment_coords( ) from d3d10core.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: a74d3ed212b14ecae39458bfac46132aaf0cccd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a74d3ed212b14ecae39458bfa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 18:38:14 2015 +0100 d3d11/tests: Port test_fragment_coords() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a74d3ed212b14ecae3945…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_PSSetConstantBuffers().
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: 9b7737ac06a3182708a0be9f1c05411eb35c8dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7737ac06a3182708a0be9f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 18:38:13 2015 +0100 d3d11: Implement d3d11_immediate_context_PSSetConstantBuffers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index fcbb8a8..d8a219e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -275,8 +275,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_ps_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11DeviceContext *iface,

1 0

Jacek Caban : server: Reset event in set_registry_notification.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: deba2faf607f989f1277eacd08952082fc344fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deba2faf607f989f1277eacd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 12:42:28 2015 +0100 server: Reset event in set_registry_notification. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 2 +- server/registry.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 7b4ae25..3dfca57 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1520,7 +1520,7 @@ static void test_notify(void) status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); - event = CreateEventW(NULL, FALSE, FALSE, NULL); + event = CreateEventW(NULL, FALSE, TRUE, NULL); ok(event != NULL, "CreateEvent failed: %u\n", GetLastError()); status = pNtNotifyChangeKey(key, event, NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); diff --git a/server/registry.c b/server/registry.c index 5b4250b..f9b1cd5 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2290,7 +2290,10 @@ DECL_HANDLER(set_registry_notification) } } if (notify) + { + reset_event( event ); set_error( STATUS_PENDING ); + } release_object( event ); } release_object( key );

1 0