January 2009 - Wine-commits

Florian Köberle : user32: Fix thick child minTrack and size.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: a50deff4bedd34e4bc82706e75507fceef8750ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a50deff4bedd34e4bc82706e7… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Sat Jan 24 18:06:39 2009 +0100 user32: Fix thick child minTrack and size. --- dlls/user32/tests/win.c | 36 ++++++++---------------------------- dlls/user32/winpos.c | 12 ++++++++++-- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 4e4b80d..13534ab 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5282,20 +5282,11 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM } actualMinTrackX = minmax->ptMinTrackSize.x; actualMinTrackY = minmax->ptMinTrackSize.y; - if (!(test_thick_child_style & (WS_DLGFRAME | WS_BORDER))) { - todo_wine - ok(actualMinTrackX == expectedMinTrackX && actualMinTrackY == expectedMinTrackY, - "expected minTrack %dx%d, actual minTrack %dx%d for %s\n", - expectedMinTrackX, expectedMinTrackY, actualMinTrackX, actualMinTrackY, - test_thick_child_name); - } - else - { - ok(actualMinTrackX == expectedMinTrackX && actualMinTrackY == expectedMinTrackY, - "expected minTrack %dx%d, actual minTrack %dx%d for %s\n", - expectedMinTrackX, expectedMinTrackY, actualMinTrackX, actualMinTrackY, - test_thick_child_name); - } + + ok(actualMinTrackX == expectedMinTrackX && actualMinTrackY == expectedMinTrackY, + "expected minTrack %dx%d, actual minTrack %dx%d for %s\n", + expectedMinTrackX, expectedMinTrackY, actualMinTrackX, actualMinTrackY, + test_thick_child_name); actualMaxTrackX = minmax->ptMaxTrackSize.x; actualMaxTrackY = minmax->ptMaxTrackSize.y; @@ -5453,20 +5444,9 @@ static void test_thick_child_size(HWND parentWindow) expectedHeight = -2 * adjustedParentRect.top; } - if (!(test_thick_child_style & (WS_DLGFRAME | WS_BORDER))) - { - todo_wine - ok((childWidth == expectedWidth) && (childHeight == expectedHeight), - "size of window (%s) is wrong: expected size %dx%d != actual size %dx%d\n", - test_thick_child_name, expectedWidth, expectedHeight, childWidth, childHeight); - } - else - { - ok((childWidth == expectedWidth) && (childHeight == expectedHeight), - "size of window (%s) is wrong: expected size %dx%d != actual size %dx%d\n", - test_thick_child_name, expectedWidth, expectedHeight, childWidth, childHeight); - } - + ok((childWidth == expectedWidth) && (childHeight == expectedHeight), + "size of window (%s) is wrong: expected size %dx%d != actual size %dx%d\n", + test_thick_child_name, expectedWidth, expectedHeight, childWidth, childHeight); SetLastError(0xdeadbeef); success = DestroyWindow(childWindow); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c1da249..f758514 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -678,8 +678,16 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, MinMax.ptMaxSize.x = rc.right - rc.left; MinMax.ptMaxSize.y = rc.bottom - rc.top; - MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK); - MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK); + if (style & (WS_DLGFRAME | WS_BORDER)) + { + MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK); + MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK); + } + else + { + MinMax.ptMinTrackSize.x = -2 * rc.left; + MinMax.ptMinTrackSize.y = -2 * rc.top; + } MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK); MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK); xinc = -rc.left;

1 0

Florian Köberle : user32: Fix maxPosition of thick child windows.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: ce119daf3e007791e121b6a2f6075f676cc2ba39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce119daf3e007791e121b6a2f… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Sat Jan 24 18:06:38 2009 +0100 user32: Fix maxPosition of thick child windows. --- dlls/user32/tests/win.c | 7 +++---- dlls/user32/winpos.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6843f70..4e4b80d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5321,10 +5321,9 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM expectedPosY = rect.top; actualPosX = minmax->ptMaxPosition.x; actualPosY = minmax->ptMaxPosition.y; - todo_wine - ok(actualPosX == expectedPosX && actualPosY == expectedPosY, - "expected maxPosition (%d/%d), actual maxPosition (%d/%d) for %s\n", - expectedPosX, expectedPosY, actualPosX, actualPosY, test_thick_child_name); + ok(actualPosX == expectedPosX && actualPosY == expectedPosY, + "expected maxPosition (%d/%d), actual maxPosition (%d/%d) for %s\n", + expectedPosX, expectedPosY, actualPosX, actualPosY, test_thick_child_name); break; } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6317005..c1da249 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -682,8 +682,8 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK); MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK); MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK); - - xinc = yinc = 0; + xinc = -rc.left; + yinc = -rc.top; } else {

1 0

Florian Köberle : user32/tests: Use AdjustWindowRectEx to calculate minTrack and maxPosition.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: dc1a7113b57277679fba6a1922861fa4c1de36d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1a7113b57277679fba6a192… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Sat Jan 24 18:06:37 2009 +0100 user32/tests: Use AdjustWindowRectEx to calculate minTrack and maxPosition. --- dlls/user32/tests/win.c | 58 +++++++++++++++++----------------------------- 1 files changed, 22 insertions(+), 36 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fb734aa..6843f70 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5228,31 +5228,6 @@ static void test_fullscreen(void) } static BOOL test_thick_child_got_minmax; - -static int getExpectedBorderSize(LONG style, LONG exStyle) -{ - int border; - if ((exStyle & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == - WS_EX_STATICEDGE) - { - border = 1; /* for the outer frame always present */ - } - else - { - border = 0; - if ((exStyle & WS_EX_DLGMODALFRAME) || - (style & (WS_THICKFRAME|WS_DLGFRAME))) border = 2; /* outer */ - } - if (style & WS_THICKFRAME) - border += ( GetSystemMetrics (SM_CXFRAME) - - GetSystemMetrics (SM_CXDLGFRAME)); /* The resize border */ - if ((style & (WS_BORDER|WS_DLGFRAME)) || - (exStyle & WS_EX_DLGMODALFRAME)) - border++; /* The other border */ - - return border; -} - static const char * test_thick_child_name; static LONG test_thick_child_style; static LONG test_thick_child_exStyle; @@ -5288,6 +5263,13 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM test_thick_child_got_minmax = TRUE; + + adjustedStyle = test_thick_child_style; + if ((adjustedStyle & WS_CAPTION) == WS_CAPTION) + adjustedStyle &= ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ + GetClientRect(GetParent(hwnd), &rect); + AdjustWindowRectEx(&rect, adjustedStyle, FALSE, test_thick_child_exStyle); + if (test_thick_child_style & (WS_DLGFRAME | WS_BORDER)) { expectedMinTrackX = GetSystemMetrics(SM_CXMINTRACK); @@ -5295,8 +5277,8 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM } else { - expectedMinTrackX = 2 * getExpectedBorderSize(test_thick_child_style, test_thick_child_exStyle); - expectedMinTrackY = 2 * getExpectedBorderSize(test_thick_child_style, test_thick_child_exStyle); + expectedMinTrackX = -2 * rect.left; + expectedMinTrackY = -2 * rect.top; } actualMinTrackX = minmax->ptMinTrackSize.x; actualMinTrackY = minmax->ptMinTrackSize.y; @@ -5324,11 +5306,6 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM expectedMaxTrackX, expectedMaxTrackY, actualMaxTrackX, actualMaxTrackY, test_thick_child_name); - adjustedStyle = test_thick_child_style; - if ((adjustedStyle & WS_CAPTION) == WS_CAPTION) - adjustedStyle &= ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ - GetClientRect(GetParent(hwnd), &rect); - AdjustWindowRectEx(&rect, adjustedStyle, FALSE, test_thick_child_exStyle); expectedMaxSizeX = rect.right - rect.left; expectedMaxSizeY = rect.bottom - rect.top; actualMaxSizeX = minmax->ptMaxSize.x; @@ -5340,8 +5317,8 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM test_thick_child_name); - expectedPosX = - getExpectedBorderSize(test_thick_child_style, test_thick_child_exStyle); - expectedPosY = expectedPosX; + expectedPosX = rect.left; + expectedPosY = rect.top; actualPosX = minmax->ptMaxPosition.x; actualPosY = minmax->ptMaxPosition.y; todo_wine @@ -5361,6 +5338,7 @@ static void test_thick_child_size(HWND parentWindow) { BOOL success; RECT childRect; + RECT adjustedParentRect; HWND childWindow; LONG childWidth; LONG childHeight; @@ -5369,6 +5347,7 @@ static void test_thick_child_size(HWND parentWindow) WNDCLASSA cls; LPCTSTR className = "THICK_CHILD_CLASS"; int i; + LONG adjustedStyle; static const LONG styles[NUMBER_OF_THICK_CHILD_TESTS] = { WS_CHILD | WS_VISIBLE | WS_THICKFRAME, WS_CHILD | WS_VISIBLE | WS_THICKFRAME | WS_DLGFRAME, @@ -5457,6 +5436,13 @@ static void test_thick_child_size(HWND parentWindow) childWidth = childRect.right - childRect.left; childHeight = childRect.bottom - childRect.top; + adjustedStyle = styles[i]; + if ((adjustedStyle & WS_CAPTION) == WS_CAPTION) + adjustedStyle &= ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ + GetClientRect(GetParent(childWindow), &adjustedParentRect); + AdjustWindowRectEx(&adjustedParentRect, adjustedStyle, FALSE, test_thick_child_exStyle); + + if (test_thick_child_style & (WS_DLGFRAME | WS_BORDER)) { expectedWidth = GetSystemMetrics(SM_CXMINTRACK); @@ -5464,8 +5450,8 @@ static void test_thick_child_size(HWND parentWindow) } else { - expectedWidth = 2 * getExpectedBorderSize(test_thick_child_style, test_thick_child_exStyle); - expectedHeight = 2 * getExpectedBorderSize(test_thick_child_style, test_thick_child_exStyle); + expectedWidth = -2 * adjustedParentRect.left; + expectedHeight = -2 * adjustedParentRect.top; } if (!(test_thick_child_style & (WS_DLGFRAME | WS_BORDER)))

1 0

Nikolay Sivov : quartz: Fix NULL pointer dereference (Coverity).
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 5ea119a3d0c1f823f2ee0be7f40b465f772e73ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea119a3d0c1f823f2ee0be7f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 27 04:05:00 2009 +0300 quartz: Fix NULL pointer dereference (Coverity). --- dlls/quartz/control.c | 4 ++-- dlls/quartz/tests/filtergraph.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 36a610e..d14e221 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -591,9 +591,9 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p This->llCurrent = llNewCurrent; This->llStop = llNewStop; - if (dwCurrentFlags & AM_SEEKING_ReturnTime) + if (pCurrent && (dwCurrentFlags & AM_SEEKING_ReturnTime)) *pCurrent = llNewCurrent; - if (dwStopFlags & AM_SEEKING_ReturnTime) + if (pStop && (dwStopFlags & AM_SEEKING_ReturnTime)) *pStop = llNewStop; ForwardCmdSeek(This->crst, This->pUserData, fwd_setposition, &args); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6f9e4c8..2e5fdc4 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -272,6 +272,11 @@ static void test_mediacontrol(void) ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_ReturnTime, NULL, AM_SEEKING_NoPositioning); + ok(hr == S_OK, "SetPositions failed: %08x\n", hr); + hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_NoPositioning, NULL, AM_SEEKING_ReturnTime); + ok(hr == S_OK, "SetPositions failed: %08x\n", hr); + IMediaFilter_SetSyncSource(filter, NULL); pos = 0xdeadbeef; hr = IMediaSeeking_GetCurrentPosition(seeking, &pos);

1 0

Alexandre Julliard : kernel32/tests: Don' t hardcode C drive for SetCurrentDirectory tests.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: a79868e09d0f45d36f714a9adce2a517925ae017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79868e09d0f45d36f714a9ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 27 14:49:47 2009 +0100 kernel32/tests: Don't hardcode C drive for SetCurrentDirectory tests. Also handle the case where TMP and TEMP are not defined. --- dlls/kernel32/tests/path.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e8e6c1e..3985bcf 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -468,10 +468,10 @@ static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) /* change to root without a trailing backslash. The function call succeeds but the directory is not changed. */ - strcpy(tmpstr,"C:"); + sprintf(tmpstr, "%c:", newdir[0]); test_setdir(newdir,tmpstr,newdir,1,"check 10"); /* works however with a trailing backslash */ - strcpy(tmpstr,"C:\\"); + sprintf(tmpstr, "%c:\\", newdir[0]); test_setdir(newdir,tmpstr,NULL,1,"check 11"); } @@ -901,15 +901,18 @@ static void test_GetTempPath(void) char windir[MAX_PATH]; char buf[MAX_PATH]; - GetEnvironmentVariableA("TMP", save_TMP, sizeof(save_TMP)); + if (!GetEnvironmentVariableA("TMP", save_TMP, sizeof(save_TMP))) save_TMP[0] = 0; /* test default configuration */ trace("TMP=%s\n", save_TMP); - strcpy(buf,save_TMP); - if (buf[strlen(buf)-1]!='\\') - strcat(buf,"\\"); - test_GetTempPathA(buf); - test_GetTempPathW(buf); + if (save_TMP[0]) + { + strcpy(buf,save_TMP); + if (buf[strlen(buf)-1]!='\\') + strcat(buf,"\\"); + test_GetTempPathA(buf); + test_GetTempPathW(buf); + } /* TMP=C:\WINDOWS */ GetWindowsDirectoryA(windir, sizeof(windir)); @@ -1216,8 +1219,11 @@ static void test_drive_letter_case(void) ret = GetTempPath(sizeof(buf), buf); ok(ret, "GetTempPath error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); - ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); - ok(buf[strlen(buf)-1] == '\\', "Temporary path (%s) doesn't end in a slash\n", buf); + if (buf[0]) + { + ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); + ok(buf[strlen(buf)-1] == '\\', "Temporary path (%s) doesn't end in a slash\n", buf); + } memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : user32/tests: Accept DISP_CHANGE_RESTART also for tests expected to fail.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: e55a691dedf3cdd32f0faa46ce097e50de08f68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55a691dedf3cdd32f0faa46c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 27 14:38:23 2009 +0100 user32/tests: Accept DISP_CHANGE_RESTART also for tests expected to fail. --- dlls/user32/tests/monitor.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 25c8867..944e49b 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -241,7 +241,8 @@ static void test_ChangeDisplaySettingsEx(void) res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); ok(vid_modes_test[i].must_succeed ? (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : - (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_BADMODE || res == DISP_CHANGE_BADPARAM), + (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART || + res == DISP_CHANGE_BADMODE || res == DISP_CHANGE_BADPARAM), "Unexpected ChangeDisplaySettingsEx() return code for resolution[%d]: %d\n", i, res); if (res == DISP_CHANGE_SUCCESSFUL)

1 0

Hans Leidekker : msi: Add stub implementations of MsiSourceListClearSourceA /W.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 8fec17b5ad62c533f149c1eeeda4dde1d52434ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fec17b5ad62c533f149c1eee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 27 11:58:19 2009 +0100 msi: Add stub implementations of MsiSourceListClearSourceA/W. --- dlls/msi/msi.spec | 4 ++-- dlls/msi/source.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 017fdbe..902e5f8 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -250,8 +250,8 @@ 254 stub MsiDeterminePatchSequenceW 255 stdcall MsiSourceListAddSourceExA(str str long long str long) 256 stdcall MsiSourceListAddSourceExW(wstr wstr long long wstr long) -257 stub MsiSourceListClearSourceA -258 stub MsiSourceListClearSourceW +257 stdcall MsiSourceListClearSourceA(str str long long str) +258 stdcall MsiSourceListClearSourceW(wstr wstr long long wstr) 259 stub MsiSourceListClearAllExA 260 stub MsiSourceListClearAllExW 261 stub MsiSourceListForceResolutionExA diff --git a/dlls/msi/source.c b/dlls/msi/source.c index e8e4a11..8cdaf40 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1314,3 +1314,27 @@ UINT WINAPI MsiSourceListClearAllW( LPCWSTR szProduct, LPCWSTR szUserName, DWORD FIXME("(%s %s %d)\n", debugstr_w(szProduct), debugstr_w(szUserName), dwReserved); return ERROR_SUCCESS; } + +/****************************************************************** + * MsiSourceListClearSourceA (MSI.@) + */ +UINT WINAPI MsiSourceListClearSourceA(LPCSTR szProductCodeOrPatchCode, LPCSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions, + LPCSTR szSource) +{ + FIXME("(%s %s %x %x %s)\n", debugstr_a(szProductCodeOrPatchCode), debugstr_a(szUserSid), + dwContext, dwOptions, debugstr_a(szSource)); + return ERROR_SUCCESS; +} + +/****************************************************************** + * MsiSourceListClearSourceW (MSI.@) + */ +UINT WINAPI MsiSourceListClearSourceW(LPCWSTR szProductCodeOrPatchCode, LPCWSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions, + LPCWSTR szSource) +{ + FIXME("(%s %s %x %x %s)\n", debugstr_w(szProductCodeOrPatchCode), debugstr_w(szUserSid), + dwContext, dwOptions, debugstr_w(szSource)); + return ERROR_SUCCESS; +}

1 0

Hans Leidekker : msvcrt: Add a test for _vsnwprintf.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 120120e37ea470fcac13e83ff7a3399be2ef5e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120120e37ea470fcac13e83ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 27 11:58:49 2009 +0100 msvcrt: Add a test for _vsnwprintf. --- dlls/msvcrt/tests/printf.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 9d31f86..d25734e 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -27,6 +27,10 @@ #include <stdio.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" + #include "wine/test.h" static void test_sprintf( void ) @@ -694,10 +698,39 @@ static void test_fcvt(void) ok( 0 == sign, "sign wrong\n"); } +static int _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = _vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return ret; +} + +static void test_vsnwprintf(void) +{ + const wchar_t format[] = {'%','w','s','%','w','s','%','w','s',0}; + const wchar_t one[] = {'o','n','e',0}; + const wchar_t two[] = {'t','w','o',0}; + const wchar_t three[] = {'t','h','r','e','e',0}; + + int ret; + wchar_t str[32]; + char buf[32]; + + ret = _vsnwprintf_wrapper( str, sizeof(str)/sizeof(str[0]), format, one, two, three ); + + ok( ret == 11, "got %d expected 11\n", ret ); + WideCharToMultiByte( CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL ); + ok( !strcmp(buf, "onetwothree"), "got %s expected 'onetwothree'\n", buf ); +} + START_TEST(printf) { test_sprintf(); test_swprintf(); test_snprintf(); test_fcvt(); + test_vsnwprintf(); }

1 0

Hans Leidekker : schannel: Add stub implementations of SslEmptyCacheA/W.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 7bfa0d2c7f0f5946c9ad25a9a6551fc46c738f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bfa0d2c7f0f5946c9ad25a9a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 27 11:57:31 2009 +0100 schannel: Add stub implementations of SslEmptyCacheA/W. --- dlls/schannel/schannel.spec | 4 ++-- dlls/schannel/schannel_main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/schannel/schannel.spec b/dlls/schannel/schannel.spec index c330c83..6944d1d 100644 --- a/dlls/schannel/schannel.spec +++ b/dlls/schannel/schannel.spec @@ -26,8 +26,8 @@ @ stdcall SpLsaModeInitialize(long ptr ptr ptr) @ stdcall SpUserModeInitialize(long ptr ptr ptr) @ stub SslCrackCertificate -@ stub SslEmptyCacheA -@ stub SslEmptyCacheW +@ stdcall SslEmptyCacheA(str long) +@ stdcall SslEmptyCacheW(wstr long) @ stub SslFreeCertificate @ stub SslGenerateKeyPair @ stub SslGenerateRandomBits diff --git a/dlls/schannel/schannel_main.c b/dlls/schannel/schannel_main.c index 9889c5d..5f8b569 100644 --- a/dlls/schannel/schannel_main.c +++ b/dlls/schannel/schannel_main.c @@ -38,3 +38,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +BOOL WINAPI SslEmptyCacheA(LPSTR target, DWORD flags) +{ + FIXME("%s %x\n", debugstr_a(target), flags); + return TRUE; +} + +BOOL WINAPI SslEmptyCacheW(LPWSTR target, DWORD flags) +{ + FIXME("%s %x\n", debugstr_w(target), flags); + return TRUE; +}

1 0

Michael Stefaniuc : localspl: Remove superfluous pointer casts.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 56f57693647974fbe9e7c69f185b0cd302c0fcd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f57693647974fbe9e7c69f1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 27 11:37:19 2009 +0100 localspl: Remove superfluous pointer casts. --- dlls/localspl/localmon.c | 8 ++++---- dlls/localspl/tests/localmon.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index ef35576..f4e1739 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -427,7 +427,7 @@ static BOOL WINAPI localmon_AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer */ static BOOL WINAPI localmon_ClosePort(HANDLE hPort) { - port_t * port = (port_t *) hPort; + port_t * port = hPort; TRACE("(%p)\n", port); EnterCriticalSection(&port_handles_cs); @@ -531,7 +531,7 @@ static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) port->type = type; memcpy(port->nameW, pName, len); - *phPort = (HANDLE) port; + *phPort = port; EnterCriticalSection(&port_handles_cs); list_add_tail(&port_handles, &port->entry); @@ -556,7 +556,7 @@ static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) */ static BOOL WINAPI localmon_XcvClosePort(HANDLE hXcv) { - xcv_t * xcv = (xcv_t *) hXcv; + xcv_t * xcv = hXcv; TRACE("(%p)\n", xcv); /* No checks are done in Windows */ @@ -744,7 +744,7 @@ static BOOL WINAPI localmon_XcvOpenPort(LPCWSTR pName, ACCESS_MASK GrantedAccess if (xcv) { xcv->GrantedAccess = GrantedAccess; memcpy(xcv->nameW, pName, len); - *phXcv = (HANDLE) xcv; + *phXcv = xcv; EnterCriticalSection(&xcv_handles_cs); list_add_tail(&xcv_handles, &xcv->entry); LeaveCriticalSection(&xcv_handles_cs); diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 26eea89..23a3608 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -1347,7 +1347,7 @@ static void test_XcvOpenPort(void) #define GET_MONITOR_FUNC(name) \ if(numentries > 0) { \ numentries--; \ - p##name = (void *) pm->Monitor.pfn##name ; \ + p##name = pm->Monitor.pfn##name ; \ }

1 0