wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Francois Gouget : msi/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: d9ffbe4e82d1f9108487a3f40c194a0819ed4c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ffbe4e82d1f9108487a3f40… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 19 11:21:38 2009 +0200 msi/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/msi/tests/install.c | 4 ++-- dlls/msi/tests/msi.c | 10 +++++----- dlls/msi/tests/source.c | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3500007..933a145 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3322,7 +3322,7 @@ static void test_publish(void) if (!pMsiQueryComponentStateA) { - skip("MsiQueryComponentStateA is not available\n"); + win_skip("MsiQueryComponentStateA is not available\n"); return; } @@ -3810,7 +3810,7 @@ static void test_publishsourcelist(void) if (!pMsiSourceListEnumSourcesA || !pMsiSourceListGetInfoA) { - skip("MsiSourceListEnumSourcesA and/or MsiSourceListGetInfoA are not available\n"); + win_skip("MsiSourceListEnumSourcesA and/or MsiSourceListGetInfoA are not available\n"); return; } diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index c3ef72b..fdbb253 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -190,7 +190,7 @@ static void test_usefeature(void) if (!pMsiUseFeatureExA) { - skip("MsiUseFeatureExA not implemented\n"); + win_skip("MsiUseFeatureExA not implemented\n"); return; } @@ -408,7 +408,7 @@ static void test_MsiGetFileHash(void) if (!pMsiGetFileHashA) { - skip("MsiGetFileHash not implemented\n"); + win_skip("MsiGetFileHash not implemented\n"); return; } @@ -1221,7 +1221,7 @@ static void test_MsiQueryComponentState(void) if (!pMsiQueryComponentStateA) { - skip("MsiQueryComponentStateA not implemented\n"); + win_skip("MsiQueryComponentStateA not implemented\n"); return; } @@ -3864,7 +3864,7 @@ static void test_MsiGetProductInfoEx(void) if (!pMsiGetProductInfoExA) { - skip("MsiGetProductInfoExA is not available\n"); + win_skip("MsiGetProductInfoExA is not available\n"); return; } @@ -10958,7 +10958,7 @@ START_TEST(msi) test_MsiGetFileHash(); if (!pConvertSidToStringSidA) - skip("ConvertSidToStringSidA not implemented\n"); + win_skip("ConvertSidToStringSidA not implemented\n"); else { /* These tests rely on get_user_sid that needs ConvertSidToStringSidA */ diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 2e9e3ff..4e94eda 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -193,7 +193,7 @@ static void test_MsiSourceListGetInfo(void) if (!pMsiSourceListGetInfoA) { - skip("Skipping MsiSourceListGetInfoA tests\n"); + win_skip("Skipping MsiSourceListGetInfoA tests\n"); return; } @@ -645,7 +645,7 @@ static void test_MsiSourceListAddSourceEx(void) if (!pMsiSourceListAddSourceExA) { - skip("Skipping MsiSourceListAddSourceExA tests\n"); + win_skip("Skipping MsiSourceListAddSourceExA tests\n"); return; } @@ -1018,7 +1018,7 @@ static void test_MsiSourceListEnumSources(void) if (!pMsiSourceListEnumSourcesA) { - skip("MsiSourceListEnumSourcesA is not available\n"); + win_skip("MsiSourceListEnumSourcesA is not available\n"); return; } @@ -1620,7 +1620,7 @@ static void test_MsiSourceListSetInfo(void) if (!pMsiSourceListSetInfoA) { - skip("MsiSourceListSetInfoA is not available\n"); + win_skip("MsiSourceListSetInfoA is not available\n"); return; } @@ -2030,7 +2030,7 @@ static void test_MsiSourceListAddMediaDisk(void) if (!pMsiSourceListAddMediaDiskA) { - skip("MsiSourceListAddMediaDiskA is not available\n"); + win_skip("MsiSourceListAddMediaDiskA is not available\n"); return; } @@ -2332,7 +2332,7 @@ static void test_MsiSourceListEnumMediaDisks(void) if (!pMsiSourceListEnumMediaDisksA) { - skip("MsiSourceListEnumMediaDisksA is not available\n"); + win_skip("MsiSourceListEnumMediaDisksA is not available\n"); return; } @@ -3131,7 +3131,7 @@ static void test_MsiSourceListAddSource(void) if (!pMsiSourceListAddSourceA) { - skip("Skipping MsiSourceListAddSourceA tests\n"); + win_skip("Skipping MsiSourceListAddSourceA tests\n"); return; }

1 0

Francois Gouget : userenv/tests: Replace realloc() with HeapReAlloc().
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 4d8cf750ff4942ea6aa12aa4a905e17a2988d6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8cf750ff4942ea6aa12aa4a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 19 11:21:12 2009 +0200 userenv/tests: Replace realloc() with HeapReAlloc(). --- dlls/userenv/tests/userenv.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index d782d2f..83bfda0 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -51,7 +51,11 @@ static char *get_tmp_space( int size ) int idx; idx = ++pos % (sizeof(list)/sizeof(list[0])); - if ((ret = realloc( list[idx], size ))) list[idx] = ret; + if (list[idx]) + ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); + else + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) list[idx] = ret; return ret; }

1 0

Francois Gouget : oleaut32/tests: Replace realloc() with HeapReAlloc().
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 1ef2f3844fd257e22a161fc5e354e5a0b0fbb5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef2f3844fd257e22a161fc5e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 19 11:21:07 2009 +0200 oleaut32/tests: Replace realloc() with HeapReAlloc(). --- dlls/oleaut32/tests/tmarshal.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index a9392c5..b8cc57d 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -56,7 +56,11 @@ static char *get_tmp_space( int size ) int idx; idx = ++pos % (sizeof(list)/sizeof(list[0])); - if ((ret = realloc( list[idx], size ))) list[idx] = ret; + if (list[idx]) + ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); + else + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) list[idx] = ret; return ret; }

1 0

Francois Gouget : mstask/tests: Replace realloc() with HeapReAlloc().
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 419ecb35e113d163d449cf128ce3d144854efef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=419ecb35e113d163d449cf128… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 19 11:20:57 2009 +0200 mstask/tests: Replace realloc() with HeapReAlloc(). --- dlls/mstask/tests/task.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 328dd76..a0a851a 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -38,7 +38,11 @@ static char *get_tmp_space(int size) int idx; idx = ++pos % (sizeof(list)/sizeof(list[0])); - if ((ret = realloc(list[idx], size))) + if (list[idx]) + ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); + else + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) list[idx] = ret; return ret; }

1 0

Michael Stefaniuc : urlmon: Move 'inline' right after the storage specifier .
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 441bc63538340d3b15d00939eb420a8cde30ad6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=441bc63538340d3b15d00939e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 18 21:07:41 2009 +0200 urlmon: Move 'inline' right after the storage specifier. --- dlls/urlmon/bindprot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 74788c1..eceb7e3 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -214,7 +214,7 @@ static void push_task(BindProtocol *This, task_header_t *task, task_proc_t proc) } } -static BOOL inline do_direct_notif(BindProtocol *This) +static inline BOOL do_direct_notif(BindProtocol *This) { return !(This->pi & PI_APARTMENTTHREADED) || (This->apartment_thread == GetCurrentThreadId() && !This->continue_call); }

1 0

Hans Leidekker : kernel32: Add tests for FormatMessageA/W.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 0eb5893ea6a34b00700de95c70f2c0d03fe3f648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb5893ea6a34b00700de95c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 19 09:20:34 2009 +0200 kernel32: Add tests for FormatMessageA/W. --- dlls/kernel32/tests/format_msg.c | 334 +++++++++++++++++++++++++++++++++++++- 1 files changed, 329 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0eb5893ea6a34b00700de…

1 0

Hans Leidekker : kernel32: Add support for %ws and %wc format specifiers to FormatMessageA/W.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 0f1ecf2819b3de7a6f1f5667466d4100e3ea1b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f1ecf2819b3de7a6f1f56674… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 19 09:20:06 2009 +0200 kernel32: Add support for %ws and %wc format specifiers to FormatMessageA/W. --- dlls/kernel32/format_msg.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index c251514..1fca102 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -257,11 +257,20 @@ DWORD WINAPI FormatMessageA( argliststart=(*(DWORD**)args)+insertnr-1; /* FIXME: precision and width components are not handled correctly */ - if ( (strcmp(fmtstr, "%ls") == 0) || (strcmp(fmtstr,"%S") == 0) ) { - sz = WideCharToMultiByte( CP_ACP, 0, *(WCHAR**)argliststart, -1, NULL, 0, NULL, NULL); + if (strcmp(fmtstr, "%ls") == 0 || strcmp(fmtstr,"%S") == 0 || strcmp(fmtstr,"%ws") == 0) + { + sz = WideCharToMultiByte(CP_ACP, 0, *(WCHAR**)argliststart, -1, NULL, 0, NULL, NULL); b = HeapAlloc(GetProcessHeap(), 0, sz); - WideCharToMultiByte( CP_ACP, 0, *(WCHAR**)argliststart, -1, b, sz, NULL, NULL); - } else { + WideCharToMultiByte(CP_ACP, 0, *(WCHAR**)argliststart, -1, b, sz, NULL, NULL); + } + else if (strcmp(fmtstr, "%wc") == 0) + { + sz = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)argliststart, 1, NULL, 0, NULL, NULL); + b = HeapAlloc(GetProcessHeap(), 0, sz); + WideCharToMultiByte(CP_ACP, 0, (WCHAR *)argliststart, 1, b, sz, NULL, NULL); + } + else + { b = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz = 1000); /* CMF - This makes a BIG assumption about va_list */ TRACE("A BIG assumption\n"); @@ -367,6 +376,7 @@ DWORD WINAPI FormatMessageW( DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; BOOL eos = FALSE; WCHAR ch; + static const WCHAR fmt_wc[] = {'%','w','c',0}; TRACE("(0x%x,%p,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); @@ -483,6 +493,11 @@ DWORD WINAPI FormatMessageW( /* CMF - This makes a BIG assumption about va_list */ vsprintfW(sprintfbuf, fmtstr, (va_list) xarr); + } + else if (strcmpW(fmtstr, fmt_wc) == 0) { + sprintfbuf = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * 2); + sprintfbuf[0] = *(WCHAR *)argliststart; + sprintfbuf[1] = 0; } else { sprintfbuf=HeapAlloc(GetProcessHeap(),0,100);

1 0

Andrew Nguyen : kernel32/tests: Correctly skip when the Unicode communications functions are not available .
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 786158796b14bdd752734bf50cd85f00f3beab0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=786158796b14bdd752734bf50… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue May 19 02:11:34 2009 -0500 kernel32/tests: Correctly skip when the Unicode communications functions are not available. --- dlls/kernel32/tests/comm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 99fe505..8cd07ad 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -571,7 +571,10 @@ static void test_BuildCommDCBW(TEST *ptest, int initial_value, DCB *pexpected_dc result = BuildCommDCBW(wide_string, &dcb); if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("BuildCommDCBW is not available\n"); return; + } /* check results */ check_result("BuildCommDCBW", ptest, initial_value, result); @@ -595,7 +598,10 @@ static void test_BuildCommDCBAndTimeoutsW(TEST *ptest, int initial_value, DCB *p result = BuildCommDCBAndTimeoutsW(wide_string, &dcb, &timeouts); if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("BuildCommDCBAndTimeoutsW is not available\n"); return; + } /* check results */ check_result("BuildCommDCBAndTimeoutsA", ptest, initial_value, result);

1 0

Dmitry Timoshkov : user32: Invalidate a being removed listbox item before deleting it as it' s been done before d2ecb1194102b6d7e6078556f80e58c70ca39c23.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: c293a535c05d5963a9095929e55a0658d342b1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c293a535c05d5963a9095929e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 19 15:00:21 2009 +0900 user32: Invalidate a being removed listbox item before deleting it as it's been done before d2ecb1194102b6d7e6078556f80e58c70ca39c23. --- dlls/user32/listbox.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index eaa805b..15aadcb 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1725,14 +1725,14 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; + /* We need to invalidate the original rect instead of the updated one. */ + LISTBOX_InvalidateItems( descr, index ); + descr->nb_items--; LISTBOX_DeleteItem( descr, index ); if (!descr->nb_items) return LB_OKAY; - /* We need to invalidate the original rect instead of the updated one. */ - LISTBOX_InvalidateItems( descr, index ); - /* Remove the item */ item = &descr->items[index];

1 0

Roderick Colenbrander : wgl: Use local pixel format data for WGL_ACCELERATION_ARB.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: f83b299bd28f59e5157b484b4adb05e61bada69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83b299bd28f59e5157b484b4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue May 19 00:23:05 2009 +0200 wgl: Use local pixel format data for WGL_ACCELERATION_ARB. --- dlls/winex11.drv/opengl.c | 35 +++++++++++++++++++++++++---------- 1 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3696072..3d7c456 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -717,6 +717,11 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf break; case WGL_ACCELERATION_ARB: + /* This flag is set in a WineGLPixelFormat */ + pop = iWGLAttr[++cur]; + TRACE("pAttr[%d] = WGL_ACCELERATION_ARB: %d\n", cur, pop); + break; + case WGL_SUPPORT_OPENGL_ARB: pop = iWGLAttr[++cur]; /** nothing to do, if we are here, supposing support Accelerated OpenGL */ @@ -2694,6 +2699,20 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt if(piAttribIList[i+1]) dwFlags |= PFD_DRAW_TO_BITMAP; break; + case WGL_ACCELERATION_ARB: + switch(piAttribIList[i+1]) + { + case WGL_NO_ACCELERATION_ARB: + dwFlags |= PFD_GENERIC_FORMAT; + break; + case WGL_GENERIC_ACCELERATION_ARB: + dwFlags |= PFD_GENERIC_ACCELERATED; + break; + case WGL_FULL_ACCELERATION_ARB: + /* Nothing to do */ + break; + } + break; case WGL_SUPPORT_GDI_ARB: if(piAttribIList[i+1]) dwFlags |= PFD_SUPPORT_GDI; @@ -2791,16 +2810,12 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF case WGL_ACCELERATION_ARB: curGLXAttr = GLX_CONFIG_CAVEAT; if (!fmt) goto pix_error; - hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, curGLXAttr, &tmp); - if (hTest) goto get_error; - switch (tmp) { - case GLX_NONE: piValues[i] = WGL_FULL_ACCELERATION_ARB; break; - case GLX_SLOW_CONFIG: piValues[i] = WGL_GENERIC_ACCELERATION_ARB; break; - case GLX_NON_CONFORMANT_CONFIG: piValues[i] = WGL_FULL_ACCELERATION_ARB; break; - default: - ERR("unexpected Config Caveat(%x)\n", tmp); - piValues[i] = WGL_NO_ACCELERATION_ARB; - } + if(fmt->dwFlags & PFD_GENERIC_FORMAT) + piValues[i] = WGL_NO_ACCELERATION_ARB; + else if(fmt->dwFlags & PFD_GENERIC_ACCELERATED) + piValues[i] = WGL_GENERIC_ACCELERATION_ARB; + else + piValues[i] = WGL_FULL_ACCELERATION_ARB; continue; case WGL_TRANSPARENT_ARB:

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
80
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 May 2009