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

Rein Klazes : msvcrt: Do not set the windows version to 0.5.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: ed20ac877c53ac662e295889b43b36ee9bf5417e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed20ac877c53ac662e295889b… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Apr 16 09:10:28 2009 +0200 msvcrt: Do not set the windows version to 0.5. --- dlls/msvcrt/data.c | 30 ++++++++++++++++++------------ dlls/msvcrt/tests/data.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 886257f..a031f16 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -262,7 +262,7 @@ unsigned int CDECL MSVCRT____setlc_active_func(void) */ void msvcrt_init_args(void) { - DWORD version; + OSVERSIONINFOW osvi; MSVCRT__acmdln = _strdup( GetCommandLineA() ); MSVCRT__wcmdln = msvcrt_wstrdupa(MSVCRT__acmdln); @@ -273,17 +273,23 @@ void msvcrt_init_args(void) TRACE("got %s, wide = %s argc=%d\n", debugstr_a(MSVCRT__acmdln), debugstr_w(MSVCRT__wcmdln),MSVCRT___argc); - version = GetVersion(); - MSVCRT__osver = version >> 16; - MSVCRT__winminor = version & 0xFF; - MSVCRT__winmajor = (version>>8) & 0xFF; - MSVCRT_baseversion = version >> 16; - MSVCRT__winver = ((version >> 8) & 0xFF) + ((version & 0xFF) << 8); - MSVCRT_baseminor = (version >> 16) & 0xFF; - MSVCRT_basemajor = (version >> 24) & 0xFF; - MSVCRT_osversion = version & 0xFFFF; - MSVCRT_osminor = version & 0xFF; - MSVCRT_osmajor = (version>>8) & 0xFF; + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + GetVersionExW( &osvi ); + MSVCRT__winver = (osvi.dwMajorVersion << 8) | osvi.dwMinorVersion; + MSVCRT__winmajor = osvi.dwMajorVersion; + MSVCRT__winminor = osvi.dwMinorVersion; + MSVCRT__osver = osvi.dwBuildNumber; + MSVCRT_osversion = MSVCRT__winver; + MSVCRT_osmajor = MSVCRT__winmajor; + MSVCRT_osminor = MSVCRT__winminor; + MSVCRT_baseversion = MSVCRT__osver; + MSVCRT_baseminor = MSVCRT_baseversion & 0xFF; + MSVCRT_basemajor = (MSVCRT_baseversion >> 8) & 0xFF; + TRACE( "winver %08x winmajor %08x winminor %08x osver%08x baseversion %08x basemajor %08x baseminor %08x\n", + MSVCRT__winver, MSVCRT__winmajor, MSVCRT__winminor, MSVCRT__osver, MSVCRT_baseversion, + MSVCRT_basemajor, MSVCRT_baseminor); + TRACE( "osversion %08x osmajor %08x osminor %08x\n", MSVCRT_osversion, MSVCRT_osmajor, MSVCRT_osminor); + MSVCRT__HUGE = HUGE_VAL; MSVCRT___setlc_active = 0; MSVCRT___unguarded_readlc_active = 0; diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index a981c87..40ff46b 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -67,13 +67,51 @@ static void test_initterm(void) initterm_test(&callbacks[0], &callbacks[3], 2); } +static void test_initvar( HMODULE hmsvcrt ) +{ + OSVERSIONINFO osvi = { sizeof(OSVERSIONINFO) }; + int* (*pp_winver)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winver"); + int* (*pp_winmajor)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winmajor"); + int* (*pp_winminor)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winminor"); + int* (*pp_osver)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__osver"); + int winver, winmajor, winminor, osver; + + if( !( pp_winmajor && pp_winminor && pp_winver)) { + win_skip("_winver variables are not available\n"); + return; + } + winver = *pp_winver(); + winminor = *pp_winminor(); + winmajor = *pp_winmajor(); + GetVersionEx( &osvi); + ok( winminor == osvi.dwMinorVersion, "Wrong value for _winminor %02x expected %02x\n", + winminor, osvi.dwMinorVersion); + ok( winmajor == osvi.dwMajorVersion, "Wrong value for _winmajor %02x expected %02x\n", + winmajor, osvi.dwMajorVersion); + ok( winver == ((osvi.dwMajorVersion << 8) | osvi.dwMinorVersion), + "Wrong value for _winver %02x expected %02x\n", + winver, ((osvi.dwMajorVersion << 8) | osvi.dwMinorVersion)); + if( !pp_osver) { + win_skip("_osver variables are not available\n"); + return; + } + osver = *pp_osver(); + ok( osver == (osvi.dwBuildNumber & 0xffff) || + ((osvi.dwBuildNumber >> 24) == osvi.dwMajorVersion && + ((osvi.dwBuildNumber >> 16) & 0xff) == osvi.dwMinorVersion), /* 95/98/ME */ + "Wrong value for _osver %04x expected %04x\n", + osver, osvi.dwBuildNumber); +} + START_TEST(data) { HMODULE hmsvcrt; + hmsvcrt = GetModuleHandleA("msvcrt.dll"); if (!hmsvcrt) hmsvcrt = GetModuleHandleA("msvcrtd.dll"); if (hmsvcrt) p_initterm=(void*)GetProcAddress(hmsvcrt, "_initterm"); test_initterm(); + test_initvar(hmsvcrt); }

1 0

Vincent Povirk : shell32: Implement SHGetNewLinkInfo[AW].
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: fcde02f9ffc166a0c39a5ff2ae65bdef813b331f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcde02f9ffc166a0c39a5ff2a… Author: Vincent Povirk <madewokherd+8cd9(a)gmail.com> Date: Thu Apr 16 22:51:40 2009 -0500 shell32: Implement SHGetNewLinkInfo[AW]. --- dlls/shell32/shellord.c | 61 ++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shlfileop.c | 52 ++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index eaf2859..5eb4507 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1914,19 +1914,70 @@ BOOL WINAPI SHObjectProperties(HWND hwnd, DWORD dwType, LPCWSTR szObject, LPCWST BOOL WINAPI SHGetNewLinkInfoA(LPCSTR pszLinkTo, LPCSTR pszDir, LPSTR pszName, BOOL *pfMustCopy, UINT uFlags) { - FIXME("%s, %s, %p, %p, 0x%08x - stub\n", debugstr_a(pszLinkTo), debugstr_a(pszDir), - pszName, pfMustCopy, uFlags); + WCHAR wszLinkTo[MAX_PATH]; + WCHAR wszDir[MAX_PATH]; + WCHAR wszName[MAX_PATH]; + BOOL res; - return FALSE; + MultiByteToWideChar(CP_ACP, 0, pszLinkTo, -1, wszLinkTo, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, pszDir, -1, wszDir, MAX_PATH); + + res = SHGetNewLinkInfoW(wszLinkTo, wszDir, wszName, pfMustCopy, uFlags); + + if (res) + WideCharToMultiByte(CP_ACP, 0, wszName, -1, pszName, MAX_PATH, NULL, NULL); + + return res; } BOOL WINAPI SHGetNewLinkInfoW(LPCWSTR pszLinkTo, LPCWSTR pszDir, LPWSTR pszName, BOOL *pfMustCopy, UINT uFlags) { - FIXME("%s, %s, %p, %p, 0x%08x - stub\n", debugstr_w(pszLinkTo), debugstr_w(pszDir), + const WCHAR *basename; + WCHAR *dst_basename; + int i=2; + static const WCHAR lnkformat[] = {'%','s','.','l','n','k',0}; + static const WCHAR lnkformatnum[] = {'%','s',' ','(','%','d',')','.','l','n','k',0}; + + TRACE("(%s, %s, %p, %p, 0x%08x)\n", debugstr_w(pszLinkTo), debugstr_w(pszDir), pszName, pfMustCopy, uFlags); - return FALSE; + *pfMustCopy = FALSE; + + if (uFlags & SHGNLI_PIDL) + { + FIXME("SHGNLI_PIDL flag unsupported\n"); + return FALSE; + } + + if (uFlags) + FIXME("ignoring flags: 0x%08x\n", uFlags); + + /* FIXME: should test if the file is a shortcut or DOS program */ + if (GetFileAttributesW(pszLinkTo) == INVALID_FILE_ATTRIBUTES) + return FALSE; + + basename = strrchrW(pszLinkTo, '\\'); + if (basename) + basename = basename+1; + else + basename = pszLinkTo; + + lstrcpynW(pszName, pszDir, MAX_PATH); + if (!PathAddBackslashW(pszName)) + return FALSE; + + dst_basename = pszName + strlenW(pszName); + + snprintfW(dst_basename, pszName + MAX_PATH - dst_basename, lnkformat, basename); + + while (GetFileAttributesW(pszName) != INVALID_FILE_ATTRIBUTES) + { + snprintfW(dst_basename, pszName + MAX_PATH - dst_basename, lnkformatnum, basename, i); + i++; + } + + return TRUE; } HRESULT WINAPI SHStartNetConnectionDialog(HWND hwnd, LPCSTR pszRemoteName, DWORD dwType) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 433a131..ff060ba 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2051,6 +2051,54 @@ static void test_sh_path_prepare(void) RemoveDirectoryW(UNICODE_PATH); } +static void test_sh_new_link_info(void) +{ + BOOL ret, mustcopy=TRUE; + CHAR linkto[MAX_PATH]; + CHAR destdir[MAX_PATH]; + CHAR result[MAX_PATH]; + CHAR result2[MAX_PATH]; + + /* source file does not exist */ + set_curr_dir_path(linkto, "nosuchfile.txt\0"); + set_curr_dir_path(destdir, "testdir2\0"); + ret = SHGetNewLinkInfoA(linkto, destdir, result, &mustcopy, 0); + ok(ret == FALSE, "SHGetNewLinkInfoA succeeded\n"); + ok(mustcopy == FALSE, "mustcopy should be FALSE\n"); + + /* dest dir does not exist */ + set_curr_dir_path(linkto, "test1.txt\0"); + set_curr_dir_path(destdir, "nosuchdir\0"); + ret = SHGetNewLinkInfoA(linkto, destdir, result, &mustcopy, 0); + ok(ret == TRUE, "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); + ok(mustcopy == FALSE, "mustcopy should be FALSE\n"); + + /* source file exists */ + set_curr_dir_path(linkto, "test1.txt\0"); + set_curr_dir_path(destdir, "testdir2\0"); + ret = SHGetNewLinkInfoA(linkto, destdir, result, &mustcopy, 0); + ok(ret == TRUE, "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); + ok(mustcopy == FALSE, "mustcopy should be FALSE\n"); + ok(CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, destdir, + lstrlenA(destdir), result, lstrlenA(destdir)) == CSTR_EQUAL, + "%s does not start with %s\n", result, destdir); + ok(lstrlenA(result) > 4 && lstrcmpiA(result+lstrlenA(result)-4, ".lnk") == 0, + "%s does not end with .lnk\n", result); + + /* preferred target name already exists */ + createTestFile(result); + ret = SHGetNewLinkInfoA(linkto, destdir, result2, &mustcopy, 0); + ok(ret == TRUE, "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); + ok(mustcopy == FALSE, "mustcopy should be FALSE\n"); + ok(CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, destdir, + lstrlenA(destdir), result2, lstrlenA(destdir)) == CSTR_EQUAL, + "%s does not start with %s\n", result2, destdir); + ok(lstrlenA(result2) > 4 && lstrcmpiA(result2+lstrlenA(result2)-4, ".lnk") == 0, + "%s does not end with .lnk\n", result2); + ok(lstrcmpiA(result, result2) != 0, "%s and %s are the same\n", result, result2); + DeleteFileA(result); +} + static void test_unicode(void) { SHFILEOPSTRUCTW shfoW; @@ -2158,5 +2206,9 @@ START_TEST(shlfileop) test_sh_path_prepare(); clean_after_shfo_tests(); + init_shfo_tests(); + test_sh_new_link_info(); + clean_after_shfo_tests(); + test_unicode(); }

1 0

Jeff Latimer : ws2_32: WSAAddressToStringA should return length of ANSI address string and should include the trailing null .
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: bf40710516d76fcdadaf14233605af63e00960e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf40710516d76fcdadaf14233… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Apr 17 14:29:52 2009 +1000 ws2_32: WSAAddressToStringA should return length of ANSI address string and should include the trailing null. --- dlls/ws2_32/socket.c | 3 ++- dlls/ws2_32/tests/sock.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0031ad2..1bcff89 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4805,7 +4805,7 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, p = strchr( buffer, ':' ); if (!((SOCKADDR_IN *)sockaddr)->sin_port) *p = 0; - size = strlen( buffer ); + size = strlen( buffer ) + 1; if (*lenstr < size) { @@ -4814,6 +4814,7 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, return SOCKET_ERROR; } + *lenstr = size; strcpy( string, buffer ); return 0; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c46a3f1..eb76a86 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1296,6 +1296,7 @@ static void test_WSAAddressToStringA(void) ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !strcmp( address, expect1 ), "Expected: %s, got: %s\n", expect1, address ); + ok( len == sizeof( expect1 ), "Expected size to be %d, got %d\n", sizeof( expect1 ), len); len = sizeof(address); @@ -1329,6 +1330,7 @@ static void test_WSAAddressToStringA(void) ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !strcmp( address, expect4 ), "Expected: %s, got: %s\n", expect4, address ); + ok( len == sizeof( expect4 ), "Expected size to be %d, got %d\n", sizeof( expect4 ), len); } static void test_WSAAddressToStringW(void)

1 0

Jeff Latimer : ws2_32: WSAAddressToStringW should return length of unicode address string should and include the trailing null .
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: eab59e84ace3e279af5fe9aab3ad48e2810bd16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab59e84ace3e279af5fe9aab… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Apr 17 14:30:53 2009 +1000 ws2_32: WSAAddressToStringW should return length of unicode address string should and include the trailing null. --- dlls/ws2_32/socket.c | 3 ++- dlls/ws2_32/tests/sock.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1bcff89..9324833 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4868,7 +4868,7 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, p = strchrW( buffer, ':' ); if (!((SOCKADDR_IN *)sockaddr)->sin_port) *p = 0; - size = strlenW( buffer ); + size = strlenW( buffer ) + 1; if (*lenstr < size) { @@ -4876,6 +4876,7 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, return SOCKET_ERROR; } + *lenstr = size; lstrcpyW( string, buffer ); return 0; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index eb76a86..cd88b8d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1369,6 +1369,7 @@ static void test_WSAAddressToStringW(void) ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address, expect1 ), "Expected different address string\n" ); + ok( len == sizeof( expect1 )/sizeof( WCHAR ), "Expected size to be %d, got %d\n", sizeof( expect1 )/sizeof( WCHAR ), len); len = sizeof(address); @@ -1402,6 +1403,7 @@ static void test_WSAAddressToStringW(void) ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address, expect4 ), "Expected different address string\n" ); + ok( len == sizeof( expect4 )/sizeof( WCHAR ), "Expected size to be %d, got %d\n", sizeof( expect4 )/sizeof( WCHAR ), len); } static void test_WSAStringToAddressA(void)

1 0

Christian Costa : amstream/tests: Improve render file test. Move OpenFile specific test into a separate test function.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: c0f6808db6611350a4e079965b33a44acc18763b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f6808db6611350a4e079965… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Apr 19 22:35:41 2009 +0200 amstream/tests: Improve render file test. Move OpenFile specific test into a separate test function. --- dlls/amstream/tests/Makefile.in | 2 +- dlls/amstream/tests/amstream.c | 112 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 109 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in index cc44995..10258ff 100644 --- a/dlls/amstream/tests/Makefile.in +++ b/dlls/amstream/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = amstream.dll -IMPORTS = quartz oleaut32 ole32 kernel32 +IMPORTS = quartz ddraw oleaut32 ole32 user32 kernel32 CTESTS = \ amstream.c diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c376e8e..4d5d8f2 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -30,6 +30,8 @@ static const char fileA[FILE_LEN] = "test.avi"; IAMMultiMediaStream* pams; +IDirectDraw7* pdd7 = NULL; +IDirectDrawSurface7* pdds7 = NULL; static int create_ammultimediastream(void) { @@ -42,30 +44,131 @@ static void release_ammultimediastream(void) IAMMultiMediaStream_Release(pams); } -static void renderfile(const char * fileA) +static int create_directdraw(void) { HRESULT hr; + IDirectDraw* pdd = NULL; + DDSURFACEDESC2 ddsd; + + hr = DirectDrawCreate(NULL, &pdd, NULL); + ok(hr==DD_OK, "DirectDrawCreate returned: %x\n", hr); + + hr = IDirectDraw_QueryInterface(pdd, &IID_IDirectDraw7, (LPVOID*)&pdd7); + ok(hr==DD_OK, "QueryInterface returned: %x\n", hr); + if (hr != DD_OK) goto error; + + hr = IDirectDraw7_SetCooperativeLevel(pdd7, GetDesktopWindow(), DDSCL_NORMAL); + ok(hr==DD_OK, "SetCooperativeLevel returned: %x\n", hr); + + ZeroMemory(&ddsd, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw7_CreateSurface(pdd7, &ddsd, &pdds7, NULL); + ok(hr==DD_OK, "CreateSurface returned: %x\n", hr); + + return TRUE; + +error: + if (pdds7) + IDirectDrawSurface7_Release(pdds7); + if (pdd7) + IDirectDraw7_Release(pdd7); + if (pdd) + IDirectDraw_Release(pdd); + + return FALSE; +} + +static void release_directdraw(void) +{ + IDirectDrawSurface7_Release(pdds7); + IDirectDraw7_Release(pdd7); +} + +static void test_openfile(void) +{ + HANDLE h; + HRESULT hr; WCHAR fileW[FILE_LEN]; IGraphBuilder* pgraph; + if (!create_ammultimediastream()) + return; + + h = CreateFileA(fileA, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + if (h == INVALID_HANDLE_VALUE) { + release_ammultimediastream(); + return; + } + MultiByteToWideChar(CP_ACP, 0, fileA, -1, fileW, FILE_LEN); hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); - ok(hr==S_OK, "GetFilterGraph returned: %x\n", hr); + ok(hr==S_OK, "IAMMultiMediaStream_GetFilterGraph returned: %x\n", hr); ok(pgraph==NULL, "Filtergraph should not be created yet\n"); if (pgraph) IGraphBuilder_Release(pgraph); hr = IAMMultiMediaStream_OpenFile(pams, fileW, 0); - ok(hr==S_OK, "OpenFile returned: %x\n", hr); + ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); - ok(hr==S_OK, "GetFilterGraph returned: %x\n", hr); + ok(hr==S_OK, "IAMMultiMediaStream_GetFilterGraph returned: %x\n", hr); ok(pgraph!=NULL, "Filtergraph should be created\n"); if (pgraph) IGraphBuilder_Release(pgraph); + + release_ammultimediastream(); +} + +static void renderfile(const char * fileA) +{ + HRESULT hr; + WCHAR fileW[FILE_LEN]; + IMediaStream *pvidstream = NULL; + IDirectDrawMediaStream *pddstream = NULL; + IDirectDrawStreamSample *pddsample = NULL; + + if (!create_directdraw()) + return; + + MultiByteToWideChar(CP_ACP, 0, fileA, -1, fileW, FILE_LEN); + + hr = IAMMultiMediaStream_Initialize(pams, STREAMTYPE_READ, 0, NULL); + ok(hr==S_OK, "IAMMultiMediaStream_Initialize returned: %x\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(pams, (IUnknown*)pdd7, &MSPID_PrimaryVideo, 0, NULL); + ok(hr==S_OK, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); + ok(hr==S_OK, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + + hr = IAMMultiMediaStream_OpenFile(pams, fileW, 0); + ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); + + hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &pvidstream); + ok(hr==S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + if (FAILED(hr)) goto error; + + hr = IMediaStream_QueryInterface(pvidstream, &IID_IDirectDrawMediaStream, (LPVOID*)&pddstream); + ok(hr==S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + if (FAILED(hr)) goto error; + + hr = IDirectDrawMediaStream_CreateSample(pddstream, NULL, NULL, 0, &pddsample); + todo_wine ok(hr==S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + +error: + if (pddsample) + IDirectDrawMediaSample_Release(pddsample); + if (pddstream) + IDirectDrawMediaStream_Release(pddstream); + if (pvidstream) + IMediaStream_Release(pvidstream); + + release_directdraw(); } static void test_render(void) @@ -87,6 +190,7 @@ static void test_render(void) START_TEST(amstream) { CoInitializeEx(NULL, COINIT_MULTITHREADED); + test_openfile(); test_render(); CoUninitialize(); }

1 0

Dmitry Kislyuk : kernel32: Added GetPrivateProfileSection and GetPrivateProfileString tests for empty section scenario .
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 182e75140eedcc333a289f61ac356dac6914108d URL: http://source.winehq.org/git/wine.git/?a=commit;h=182e75140eedcc333a289f61a… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Mon Apr 20 04:01:55 2009 -0300 kernel32: Added GetPrivateProfileSection and GetPrivateProfileString tests for empty section scenario. --- dlls/kernel32/tests/profile.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 87c0a73..15a3902 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -186,7 +186,15 @@ static void test_profile_sections(void) broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - /* And a real one */ + /* Existing empty section with no keys */ + SetLastError(0xdeadbeef); + ret=GetPrivateProfileSectionA("section2", buf, sizeof(buf), testfile4); + ok( ret == 0, "expected return size 0, got %d\n", ret ); + ok( GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "expected ERROR_SUCCESS, got %d\n", GetLastError()); + + /* Existing section with keys and values*/ SetLastError(0xdeadbeef); ret=GetPrivateProfileSectionA("section1", buf, sizeof(buf), testfile4); for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1) @@ -798,6 +806,18 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ok(ret == 4, "Expected 4, got %d\n", ret); ok(!lstrcmpA(buf, "val1"), "Expected \"val1\", got \"%s\"\n", buf); + /* Existing section with no keys in an existing file */ + memset(buf, 0xc,sizeof(buf)); + SetLastError(0xdeadbeef); + ret=GetPrivateProfileStringA("section2", "DoesntExist", "", + buf, MAX_PATH, filename); + ok( ret == 0, "expected return size 0, got %d\n", ret ); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + todo_wine + ok( GetLastError() == 0xdeadbeef , "expected 0xdeadbeef, got %d\n", + GetLastError()); + + DeleteFileA(path); DeleteFileA(filename); }

1 0

Hans Leidekker : msi: Fix a double free.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 91ac47b84bc59617274783a431a5c46a36578ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ac47b84bc59617274783a43… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 20 16:08:26 2009 +0200 msi: Fix a double free. TABLE_drop() calls TABLE_remove_column() which calls msi_update_table_columns() which frees column info and possibly returns without reallocating. When that happens it will be freed again when TABLE_drop() finally calls free_table(). --- dlls/msi/table.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index ab86bcd..e7e2e68 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1038,8 +1038,9 @@ static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) table = find_cached_table( db, name ); old_count = table->col_count; msi_free( table->colinfo ); - table_get_column_info( db, name, &table->colinfo, &table->col_count ); + table->colinfo = NULL; + table_get_column_info( db, name, &table->colinfo, &table->col_count ); if (!table->col_count) return;

1 0

Hans Leidekker : programs: Add stub termsv.exe.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 6137b1ba2d19a1ac5430c9c8d6c1a651ca0c0a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6137b1ba2d19a1ac5430c9c8d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 15 14:58:00 2009 +0200 programs: Add stub termsv.exe. --- configure | 10 ++++ configure.ac | 1 + programs/termsv/Makefile.in | 15 +++++++ programs/termsv/main.c | 99 +++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 10 ++++ 5 files changed, 135 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a98e04e..4d41840 100755 --- a/configure +++ b/configure @@ -28007,6 +28007,15 @@ programs/taskmgr/Makefile: programs/taskmgr/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/taskmgr/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + programs/termsv/Makefile" +test "x$enable_termsv" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + termsv" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + termsv" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +programs/termsv/Makefile: programs/termsv/Makefile.in programs/Makeprog.rules" +ac_config_files="$ac_config_files programs/termsv/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/uninstaller/Makefile" test "x$enable_uninstaller" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ uninstaller" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ @@ -29359,6 +29368,7 @@ do "programs/start/Makefile") CONFIG_FILES="$CONFIG_FILES programs/start/Makefile" ;; "programs/svchost/Makefile") CONFIG_FILES="$CONFIG_FILES programs/svchost/Makefile" ;; "programs/taskmgr/Makefile") CONFIG_FILES="$CONFIG_FILES programs/taskmgr/Makefile" ;; + "programs/termsv/Makefile") CONFIG_FILES="$CONFIG_FILES programs/termsv/Makefile" ;; "programs/uninstaller/Makefile") CONFIG_FILES="$CONFIG_FILES programs/uninstaller/Makefile" ;; "programs/unlodctr/Makefile") CONFIG_FILES="$CONFIG_FILES programs/unlodctr/Makefile" ;; "programs/view/Makefile") CONFIG_FILES="$CONFIG_FILES programs/view/Makefile" ;; diff --git a/configure.ac b/configure.ac index f156bbe..bf5afe9 100644 --- a/configure.ac +++ b/configure.ac @@ -2326,6 +2326,7 @@ WINE_CONFIG_MAKEFILE([programs/spoolsv/Makefile],[programs/Makeprog.rules],[prog WINE_CONFIG_MAKEFILE([programs/start/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/svchost/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/taskmgr/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/termsv/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/uninstaller/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/unlodctr/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/view/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS]) diff --git a/programs/termsv/Makefile.in b/programs/termsv/Makefile.in new file mode 100644 index 0000000..559a72e --- /dev/null +++ b/programs/termsv/Makefile.in @@ -0,0 +1,15 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = termsv.exe +APPMODE = -mconsole -municode +IMPORTS = advapi32 kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/termsv/main.c b/programs/termsv/main.c new file mode 100644 index 0000000..6391525 --- /dev/null +++ b/programs/termsv/main.c @@ -0,0 +1,99 @@ +/* + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(termsv); + +static WCHAR termserviceW[] = {'T','e','r','m','S','e','r','v','i','c','e',0}; + +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + WINE_TRACE( "shutting down\n" ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( stop_event ); + return NO_ERROR; + default: + WINE_FIXME( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} + +static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) +{ + SERVICE_STATUS status; + + WINE_TRACE( "starting service\n" ); + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( termserviceW, service_handler, NULL ); + if (!service_handle) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( stop_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + WINE_TRACE( "service stopped\n" ); +} + +int wmain( int argc, WCHAR *argv[] ) +{ + static const SERVICE_TABLE_ENTRYW service_table[] = + { + { termserviceW, ServiceMain }, + { NULL, NULL } + }; + + StartServiceCtrlDispatcherW( service_table ); + return 0; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 0c3a5cc..fb7c68c 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -78,10 +78,12 @@ AddReg=\ [DefaultInstall.Services] AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService +AddService=TermService,0,TerminalServices [DefaultInstall.NT.Services] AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService +AddService=TermService,0,TerminalServices [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -2904,6 +2906,14 @@ StartType=4 ErrorControl=1 LoadOrderGroup="SpoolerGroup" +[TerminalServices] +Description="Remote desktop access" +DisplayName="Terminal Services" +ServiceBinary="%11%\termsv.exe" +ServiceType=32 +StartType=3 +ErrorControl=1 + [Services] HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,,""

1 0

Brad Martin : wined3d: Fix prototype for EnumAdapterModes.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 2ea6b36ef1b1ed8c375d067875ba93751f180b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea6b36ef1b1ed8c375d06787… Author: Brad Martin <wine(a)fatlxception.no-ip.org> Date: Thu Apr 16 20:10:26 2009 -0500 wined3d: Fix prototype for EnumAdapterModes. --- include/wine/wined3d.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b8691a7..6f86688 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2222,8 +2222,8 @@ interface IWineD3D : IWineD3DBase ); HRESULT EnumAdapterModes( [in] UINT adapter_idx, - [in] UINT mode_idx, [in] WINED3DFORMAT format, + [in] UINT mode_idx, [out] WINED3DDISPLAYMODE *mode ); HRESULT GetAdapterDisplayMode(

1 0

Detlef Riekenberg : oleaut32/tests: Replace lstrcpyW and lstrcatW with memcpy to fix failures on win95.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 00703d0c2f2b583bc2cbd20f7142f308ff2a992b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00703d0c2f2b583bc2cbd20f7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 17 14:45:09 2009 +0200 oleaut32/tests: Replace lstrcpyW and lstrcatW with memcpy to fix failures on win95. --- dlls/oleaut32/tests/vartest.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 24ef171..f0a6deb 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -106,15 +106,16 @@ static void init(void) res = VarBstrFromBool(VARIANT_TRUE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); ok(SUCCEEDED(res) && (lstrlenW(bstr) > 0), "Expected localized string for 'True'\n"); - lstrcpyW(sz12_true, sz12); - if (bstr) lstrcatW(sz12_true, bstr); + /* lstrcpyW / lstrcatW do not work on win95 */ + memcpy(sz12_true, sz12, sizeof(sz12)); + if (bstr) memcpy(&sz12_true[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR)); SysFreeString(bstr); res = VarBstrFromBool(VARIANT_FALSE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); ok(SUCCEEDED(res) && (lstrlenW(bstr) > 0), "Expected localized string for 'False'\n"); - lstrcpyW(sz12_false, sz12); - if (bstr) lstrcatW(sz12_false, bstr); + memcpy(sz12_false, sz12, sizeof(sz12)); + if (bstr) memcpy(&sz12_false[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR)); SysFreeString(bstr); hOleaut32 = GetModuleHandle("oleaut32.dll");

1 0