April 2015 - Wine-commits - list.winehq.org

Francois Gouget : wineconsole: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 2271d82cdaffd964b41fd573da3e9f8f78227afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2271d82cdaffd964b41fd573d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:25:37 2015 +0200 wineconsole: Remove an unneeded NONAMELESSSTRUCT directive. --- programs/wineconsole/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 8ca6563..8573d07 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -22,7 +22,7 @@ #include <stdarg.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Francois Gouget : wineps.drv: Mark internal symbols with hidden visibility.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 6027c88cdf8a4ffdded935de6fb70496941871cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6027c88cdf8a4ffdded935de6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:26:07 2015 +0200 wineps.drv: Mark internal symbols with hidden visibility. --- dlls/wineps.drv/psdrv.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index faefd71..75c062a 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -393,7 +393,7 @@ static inline PSDRV_PDEVICE *get_psdrv_dev( PHYSDEV dev ) * Every glyph name in the Adobe Glyph List and the 35 core PostScript fonts */ -extern const INT PSDRV_AGLGlyphNamesSize; +extern const INT PSDRV_AGLGlyphNamesSize DECLSPEC_HIDDEN; extern GLYPHNAME PSDRV_AGLGlyphNames[] DECLSPEC_HIDDEN; @@ -401,19 +401,19 @@ extern GLYPHNAME PSDRV_AGLGlyphNames[] DECLSPEC_HIDDEN; * The AGL encoding vector */ -extern const INT PSDRV_AGLbyNameSize; /* sorted by name - */ -extern const UNICODEGLYPH PSDRV_AGLbyName[] DECLSPEC_HIDDEN; /* duplicates omitted */ +extern const INT PSDRV_AGLbyNameSize DECLSPEC_HIDDEN; /* sorted by name */ +extern const UNICODEGLYPH PSDRV_AGLbyName[] DECLSPEC_HIDDEN; /* duplicates omitted */ -extern const INT PSDRV_AGLbyUVSize; /* sorted by UV - */ -extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates included */ +extern const INT PSDRV_AGLbyUVSize DECLSPEC_HIDDEN; /* sorted by UV */ +extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates included */ extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN; extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; -extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ); -extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ); -extern DUPLEX *find_duplex( PPD *ppd, const PSDRV_DEVMODE *dm ); +extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; +extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; +extern DUPLEX *find_duplex( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; /* GDI driver functions */ extern BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,

1 0

Francois Gouget : wininet; Mark internal symbols with hidden visibility.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: ef0b22aabb9f33fd90b914c4ddac16d0447adc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0b22aabb9f33fd90b914c4d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:26:27 2015 +0200 wininet; Mark internal symbols with hidden visibility. --- dlls/wininet/internet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 3f1da71..925bfd0 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -437,7 +437,7 @@ DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; int sock_recv(int fd, void *msg, size_t len, int flags) DECLSPEC_HIDDEN; -server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); +server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL) DECLSPEC_HIDDEN; DWORD create_req_file(const WCHAR*,req_file_t**) DECLSPEC_HIDDEN; void req_file_release(req_file_t*) DECLSPEC_HIDDEN;

1 0

Francois Gouget : wmp: Mark internal symbols with hidden visibility.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: d46e6fe6b6d700e872d21a5cc49e1e33048fbf8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46e6fe6b6d700e872d21a5cc… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:26:32 2015 +0200 wmp: Mark internal symbols with hidden visibility. --- dlls/wmp/wmp_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index f022ea4..91e8465 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -44,7 +44,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) void unregister_wmp_class(void) DECLSPEC_HIDDEN; -extern HINSTANCE wmp_instance; +extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; static inline void *heap_alloc(size_t len) {

1 0

Aric Stewart : wineqtdecoder: Unload the AsyncReader on movie processing failure.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: d0d7c47b65a874553ab1c88e6a5644592df78391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d7c47b65a874553ab1c88e6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 1 09:47:47 2015 -0500 wineqtdecoder: Unload the AsyncReader on movie processing failure. --- dlls/wineqtdecoder/qtsplitter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 8bb51a4..2aafdb4 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1138,6 +1138,8 @@ static HRESULT WINAPI QTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, hr = QT_Process_Movie(impl_from_IBaseFilter(This->pin.pinInfo.pFilter)); if (FAILED(hr)) { + IAsyncReader_Release(This->pReader); + This->pReader = NULL; LeaveCriticalSection(&impl_from_IBaseFilter(This->pin.pinInfo.pFilter)->filter.csFilter); TRACE("Unable to process movie\n"); return hr;

1 0

Aric Stewart : winmm: sndPlaySound can play resource sounds.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 74471e857c44449a0236702b7cf8c607cf153a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74471e857c44449a0236702b7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 1 10:11:24 2015 -0500 winmm: sndPlaySound can play resource sounds. --- dlls/winmm/playsound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 88a4c48..5d9aed0 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -566,7 +566,7 @@ BOOL WINAPI PlaySoundW(LPCWSTR pszSoundW, HMODULE hmod, DWORD fdwSound) */ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags) { - uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; + uFlags &= SND_RESOURCE|SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; return MULTIMEDIA_PlaySound(pszSoundA, 0, uFlags, FALSE); } @@ -575,7 +575,7 @@ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags) */ BOOL WINAPI sndPlaySoundW(LPCWSTR pszSound, UINT uFlags) { - uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; + uFlags &= SND_RESOURCE|SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; return MULTIMEDIA_PlaySound(pszSound, 0, uFlags, TRUE); }

1 0

Andrew Eikum : wineoss.drv: Don' t skip over position updates of less than one fragment.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 932f392e08980cff3bf74dfdfd35fc10f10364fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=932f392e08980cff3bf74dfdf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 1 12:20:41 2015 -0500 wineoss.drv: Don't skip over position updates of less than one fragment. --- dlls/wineoss.drv/mmdevdrv.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index cbaf1b2..ccd5c86 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1393,7 +1393,7 @@ static void oss_write_data(ACImpl *This) { ssize_t written_bytes; UINT32 written_frames, in_oss_frames, write_limit, max_period, write_offs_frames, new_frames; - size_t to_write_frames, to_write_bytes, advanced; + SIZE_T to_write_frames, to_write_bytes, advanced; audio_buf_info bi; BYTE *buf; @@ -1409,9 +1409,7 @@ static void oss_write_data(ACImpl *This) bi.bytes, This->oss_bufsize_bytes); This->oss_bufsize_bytes = bi.bytes; in_oss_frames = 0; - }else if(This->oss_bufsize_bytes - bi.bytes <= bi.fragsize) - in_oss_frames = 0; - else + }else in_oss_frames = (This->oss_bufsize_bytes - bi.bytes) / This->fmt->nBlockAlign; write_limit = 0; @@ -1433,6 +1431,8 @@ static void oss_write_data(ACImpl *This) This->lcl_offs_frames %= This->bufsize_frames; This->held_frames -= advanced; This->in_oss_frames = in_oss_frames; + TRACE("advanced by %lu, lcl_offs: %u, held: %u, in_oss: %u\n", + advanced, This->lcl_offs_frames, This->held_frames, This->in_oss_frames); if(This->held_frames == This->in_oss_frames) @@ -1448,7 +1448,9 @@ static void oss_write_data(ACImpl *This) to_write_frames = min(to_write_frames, write_limit); to_write_bytes = to_write_frames * This->fmt->nBlockAlign; - + TRACE("going to write %lu frames from %u (%lu of %u)\n", to_write_frames, + write_offs_frames, to_write_frames + write_offs_frames, + This->bufsize_frames); buf = This->local_buffer + write_offs_frames * This->fmt->nBlockAlign; @@ -1479,6 +1481,8 @@ static void oss_write_data(ACImpl *This) if(This->session->mute) silence_buffer(This, This->local_buffer, to_write_frames); + TRACE("wrapping to write %lu frames from beginning\n", to_write_frames); + written_bytes = write(This->fd, This->local_buffer, to_write_bytes); if(written_bytes < 0){ WARN("write failed: %d (%s)\n", errno, strerror(errno));

1 0

Nikolay Sivov : wincodecs: Use valid bitmap cache option.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: de6649ede03eed385207564e8f9ac907852c4fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=de6649ede03eed385207564e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 1 22:54:25 2015 +0300 wincodecs: Use valid bitmap cache option. --- dlls/windowscodecs/imgfactory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 42b4e59..f2455fc 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -712,7 +712,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFact return E_INVALIDARG; } - hr = BitmapImpl_Create(bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, 0, NULL, &format, option, bitmap); + hr = BitmapImpl_Create(bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, 0, NULL, &format, WICBitmapCacheOnLoad, bitmap); if (hr != S_OK) return hr; hr = IWICBitmap_Lock(*bitmap, NULL, WICBitmapLockWrite, &lock);

1 0

Nikolay Sivov : msxml3: Explicitly list acceptable libxml2-> msxml node types for unknode.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: e1b160b00511ff37bdd625b91e73e9335158190f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b160b00511ff37bdd625b91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 1 23:39:59 2015 +0300 msxml3: Explicitly list acceptable libxml2->msxml node types for unknode. --- dlls/msxml3/node.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1178e60..0f591b4 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1617,7 +1617,29 @@ static HRESULT WINAPI unknode_get_nodeType( FIXME("(%p)->(%p)\n", This, domNodeType); - *domNodeType = This->node.node->type; + switch (This->node.node->type) + { + case XML_ELEMENT_NODE: + case XML_ATTRIBUTE_NODE: + case XML_TEXT_NODE: + case XML_CDATA_SECTION_NODE: + case XML_ENTITY_REF_NODE: + case XML_ENTITY_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: + case XML_DOCUMENT_NODE: + case XML_DOCUMENT_TYPE_NODE: + case XML_DOCUMENT_FRAG_NODE: + case XML_NOTATION_NODE: + /* we only care about this set of types, libxml2 type values are + exactly what we need */ + *domNodeType = (DOMNodeType)This->node.node->type; + break; + default: + *domNodeType = NODE_INVALID; + break; + } + return S_OK; }

1 0

Nikolay Sivov : comctl32/tests: Fix couple of metrics tests that fail on some systems.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: af30ffaa4351f115dc4b4fad0191901637a6f3fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=af30ffaa4351f115dc4b4fad0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 2 01:20:52 2015 +0300 comctl32/tests: Fix couple of metrics tests that fail on some systems. --- dlls/comctl32/tests/listview.c | 44 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 94c19f4..a165100 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3915,7 +3915,6 @@ static void test_getitemrect(void) LVCOLUMNA col; INT order[2]; POINT pt; - HDC hdc; /* rectangle isn't empty for empty text items */ hwnd = create_listview_control(LVS_LIST); @@ -3929,9 +3928,9 @@ static void test_getitemrect(void) expect(TRUE, r); expect(0, rect.left); expect(0, rect.top); - hdc = GetDC(hwnd); - todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, rect.right); - ReleaseDC(hwnd, hdc); + /* estimate it as width / height ratio */ +todo_wine + ok((rect.right / rect.bottom) >= 5, "got right %d, bottom %d\n", rect.right, rect.bottom); DestroyWindow(hwnd); hwnd = create_listview_control(LVS_REPORT); @@ -4833,6 +4832,36 @@ static void test_getitemspacing(void) DestroyWindow(hwnd); } +static INT get_current_font_height(HWND listview) +{ + TEXTMETRICA tm; + HFONT hfont; + HWND hwnd; + HDC hdc; + + hwnd = (HWND)SendMessageA(listview, LVM_GETHEADER, 0, 0); + if (!hwnd) + hwnd = listview; + + hfont = (HFONT)SendMessageA(hwnd, WM_GETFONT, 0, 0); + if (!hfont) { + hdc = GetDC(hwnd); + GetTextMetricsA(hdc, &tm); + ReleaseDC(hwnd, hdc); + } + else { + HFONT oldfont; + + hdc = GetDC(0); + oldfont = SelectObject(hdc, hfont); + GetTextMetricsA(hdc, &tm); + SelectObject(hdc, oldfont); + ReleaseDC(0, hdc); + } + + return tm.tmHeight; +} + static void test_getcolumnwidth(void) { HWND hwnd; @@ -4840,7 +4869,7 @@ static void test_getcolumnwidth(void) DWORD_PTR style; LVCOLUMNA col; LVITEMA itema; - HDC hdc; + INT height; /* default column width */ hwnd = create_listview_control(LVS_ICON); @@ -4864,9 +4893,8 @@ static void test_getcolumnwidth(void) memset(&itema, 0, sizeof(itema)); SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); ret = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); - hdc = GetDC(hwnd); - todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, ret); - ReleaseDC(hwnd, hdc); + height = get_current_font_height(hwnd); + ok((ret / height) >= 6, "got width %d, height %d\n", ret, height); DestroyWindow(hwnd); }

1 0