November 2005 - Wine-Commits

wine/include wincrypt.h
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21350 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:57:46 Modified files: include : wincrypt.h Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Add prototypes for some already defined functions in crypt32. Patch: http://cvs.winehq.org/patch.py?id=21350 Old revision New revision Changes Path 1.59 1.60 +3 -0 wine/include/wincrypt.h Index: wine/include/wincrypt.h diff -u -p wine/include/wincrypt.h:1.59 wine/include/wincrypt.h:1.60 --- wine/include/wincrypt.h:1.59 21 Nov 2005 11:57:46 -0000 +++ wine/include/wincrypt.h 21 Nov 2005 11:57:46 -0000 @@ -2277,6 +2277,7 @@ LPVOID WINAPI CryptMemAlloc(ULONG cbSize LPVOID WINAPI CryptMemRealloc(LPVOID pv, ULONG cbSize); VOID WINAPI CryptMemFree(LPVOID pv); +BOOL WINAPI CryptRegisterDefaultOIDFunction(DWORD,LPCSTR,DWORD,LPCWSTR); BOOL WINAPI CryptRegisterOIDFunction(DWORD,LPCSTR,LPCSTR,LPCWSTR,LPCSTR); BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, LPCSTR pszOID, LPCWSTR szValueName, DWORD *pdwValueType, @@ -2284,7 +2285,9 @@ BOOL WINAPI CryptGetOIDFunctionValue(DWO BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, LPCSTR pszOID, LPCWSTR pwszValueName, DWORD dwValueType, const BYTE *pbValueData, DWORD cbValueData); +BOOL WINAPI CryptUnregisterDefaultOIDFunction(DWORD,LPCSTR,LPCWSTR); BOOL WINAPI CryptUnregisterOIDFunction(DWORD,LPCSTR,LPCSTR); +HCRYPTOIDFUNCSET WINAPI CryptInitOIDFunctionSet(LPCSTR,DWORD); LPCSTR WINAPI CertAlgIdToOID(DWORD dwAlgId); DWORD WINAPI CertOIDToAlgId(LPCSTR pszObjId);

1 0

wine/dlls/wininet internet.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21349 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:57:33 Modified files: dlls/wininet : internet.c Log message: Aric Stewart <aric(a)codeweavers.com> Implement the use of NETCON_send for HTTP connections when in InternetWriteFile. Patch: http://cvs.winehq.org/patch.py?id=21349 Old revision New revision Changes Path 1.142 1.143 +11 -4 wine/dlls/wininet/internet.c Index: wine/dlls/wininet/internet.c diff -u -p wine/dlls/wininet/internet.c:1.142 wine/dlls/wininet/internet.c:1.143 --- wine/dlls/wininet/internet.c:1.142 21 Nov 2005 11:57:33 -0000 +++ wine/dlls/wininet/internet.c 21 Nov 2005 11:57:33 -0000 @@ -1676,10 +1676,17 @@ BOOL WINAPI InternetWriteFile(HINTERNET switch (lpwh->htype) { case WH_HHTTPREQ: - FIXME("This shouldn't be here! We don't support this kind" - " of connection anymore. Must use NETCON functions," - " especially if using SSL\n"); - nSocket = ((LPWININETHTTPREQW)lpwh)->netConnection.socketFD; + { + LPWININETHTTPREQW lpwhr; + lpwhr = (LPWININETHTTPREQW)lpwh; + + TRACE("HTTPREQ %li\n",dwNumOfBytesToWrite); + retval = NETCON_send(&lpwhr->netConnection, lpBuffer, + dwNumOfBytesToWrite, 0, (LPINT)lpdwNumOfBytesWritten); + + WININET_Release( lpwh ); + return retval; + } break; case WH_HFILE:

1 0

wine/dlls/version/tests install.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21348 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:57:03 Modified files: dlls/version/tests: install.c Log message: Stefan Leichter <Stefan.Leichter(a)camLine.com> Fix version tests on NT, 2K and XP, make some errors more verbose. Patch: http://cvs.winehq.org/patch.py?id=21348 Old revision New revision Changes Path 1.1 1.2 +12 -6 wine/dlls/version/tests/install.c Index: wine/dlls/version/tests/install.c diff -u -p wine/dlls/version/tests/install.c:1.1 wine/dlls/version/tests/install.c:1.2 --- wine/dlls/version/tests/install.c:1.1 21 Nov 2005 11:57: 3 -0000 +++ wine/dlls/version/tests/install.c 21 Nov 2005 11:57: 3 -0000 @@ -43,9 +43,11 @@ static void test_find_file(void) memset(curdir, 0, MAX_PATH); memset(outBuf, 0, MAX_PATH); ret = VerFindFileA(0, "regedit", "", "", curdir, &dwCur, outBuf, &dwOut); - ok(!ret, "VerFindFileA should fail for a known program without extension\n"); - ok(dwCur == 1, "expected length 1 got %d\n", dwCur); - ok(dwOut == 1, "expected length 1 got %d\n", dwOut); + ok(!ret, "Wrong return value got %lx expected 0\n", ret); + ok(dwCur == 1, "Wrong length of buffer for current location: " + "got %d(%s) expected 1\n", dwCur, curdir); + ok(dwOut == 1, "Wrong length of buffer for the recommended installation location: " + "got %d(%s) expected 1\n", dwOut, outBuf); if(!GetWindowsDirectoryA(windir, MAX_PATH)) trace("GetWindowsDirectoryA failed\n"); @@ -62,7 +64,7 @@ static void test_find_file(void) todo_wine ok(VFF_CURNEDEST == ret, "Wrong return value got %lx expected VFF_CURNEDEST\n", ret); todo_wine ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: " "got %d(%s) expected %d\n", dwCur, curdir, strlen(windir)+1); - ok(dwOut == 1, "Wrong length of buffer for the recommended installation location" + ok(dwOut == 1, "Wrong length of buffer for the recommended installation location: " "got %d(%s) expected 1\n", dwOut, outBuf); dwCur=MAX_PATH; @@ -73,7 +75,7 @@ static void test_find_file(void) todo_wine ok(VFF_CURNEDEST == ret, "Wrong return value got %lx expected VFF_CURNEDEST\n", ret); todo_wine ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: " "got %d(%s) expected %d\n", dwCur, curdir, strlen(windir)+1); - ok(dwOut == 1, "Wrong length of buffer for the recommended installation location" + ok(dwOut == 1, "Wrong length of buffer for the recommended installation location: " "got %d(%s) expected 1\n", dwOut, outBuf); } } @@ -83,7 +85,11 @@ static void test_find_file(void) trace("GetModuleFileNameA, GetSystemDirectoryA or GetTempPathA failed\n"); else { char *p = strrchr(filename, '\\'); - if(p++) memmove(filename, p, 1 + strlen(p)); + if(p) { + *(p++) ='\0'; + SetCurrentDirectoryA(filename); + memmove(filename, p, 1 + strlen(p)); + } dwCur=MAX_PATH; dwOut=MAX_PATH;

1 0

wine/dlls/winmm/wineoss audio.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21347 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:56:55 Modified files: dlls/winmm/wineoss: audio.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Break from the SNDCTL_DSP_CHANNELS loops on first error instead of continuing with even higher channels numbers. Patch: http://cvs.winehq.org/patch.py?id=21347 Old revision New revision Changes Path 1.166 1.167 +3 -0 wine/dlls/winmm/wineoss/audio.c Index: wine/dlls/winmm/wineoss/audio.c diff -u -p wine/dlls/winmm/wineoss/audio.c:1.166 wine/dlls/winmm/wineoss/audio.c:1.167 --- wine/dlls/winmm/wineoss/audio.c:1.166 21 Nov 2005 11:56:55 -0000 +++ wine/dlls/winmm/wineoss/audio.c 21 Nov 2005 11:56:55 -0000 @@ -788,6 +788,7 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* for (c = 1; c <= MAX_CHANNELS; c++) { arg=c; rc=ioctl(ossdev->fd, SNDCTL_DSP_CHANNELS, &arg); + if( rc == -1) break; if (rc!=0 || arg!=c) { TRACE("DSP_CHANNELS: rc=%d returned %d for %d\n",rc,arg,c); continue; @@ -927,6 +928,7 @@ static BOOL OSS_WaveInInit(OSS_DEVICE* o for (c = 1; c <= MAX_CHANNELS; c++) { arg=c; rc=ioctl(ossdev->fd, SNDCTL_DSP_CHANNELS, &arg); + if( rc == -1) break; if (rc!=0 || arg!=c) { TRACE("DSP_CHANNELS: rc=%d returned %d for %d\n",rc,arg,c); continue; @@ -1019,6 +1021,7 @@ static void OSS_WaveFullDuplexInit(OSS_D for (c = 1; c <= MAX_CHANNELS; c++) { arg=c; rc=ioctl(ossdev->fd, SNDCTL_DSP_CHANNELS, &arg); + if( rc == -1) break; if (rc!=0 || arg!=c) { TRACE("DSP_CHANNELS: rc=%d returned %d for %d\n",rc,arg,c); continue;

1 0

wine/dlls/winsock socket.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21346 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 05:56:42 Modified files: dlls/winsock : socket.c Log message: Marcus Meissner <marcus(a)jet.franken.de> Fixed typo in ws_sockaddr_u2ws(). Patch: http://cvs.winehq.org/patch.py?id=21346 Old revision New revision Changes Path 1.195 1.196 +1 -1 wine/dlls/winsock/socket.c Index: wine/dlls/winsock/socket.c diff -u -p wine/dlls/winsock/socket.c:1.195 wine/dlls/winsock/socket.c:1.196 --- wine/dlls/winsock/socket.c:1.195 21 Nov 2005 11:56:42 -0000 +++ wine/dlls/winsock/socket.c 21 Nov 2005 11:56:42 -0000 @@ -1076,7 +1076,7 @@ static int ws_sockaddr_u2ws(const struct win->sin_family = WS_AF_INET; win->sin_port = uin->sin_port; memcpy(&win->sin_addr,&uin->sin_addr,4); /* 4 bytes = 32 address bits */ - *wsaddrlen = sizeof(struct WS_sockaddr_in6); + *wsaddrlen = sizeof(struct WS_sockaddr_in); return 0; } default:

1 0

wine/ dlls/wldap32/wldap32.spec dlls/wldap32/w ...
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21345 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 10:56:45 Modified files: dlls/wldap32 : wldap32.spec wldap32.h winldap_private.h init.c . : configure.ac configure Log message: Hans Leidekker <hans(a)it.vu.nl> Avoid using deprecated openldap functions. Implement ldap_sslinit{A,W}, improve cldap_open{A,W}. Add stub implementation for ldap_startup and ldap_stop_tls_s. Patch: http://cvs.winehq.org/patch.py?id=21345 Old revision New revision Changes Path 1.28 1.29 +5 -5 wine/dlls/wldap32/wldap32.spec 1.6 1.7 +11 -0 wine/dlls/wldap32/wldap32.h 1.29 1.30 +4 -0 wine/dlls/wldap32/winldap_private.h 1.6 1.7 +289 -9 wine/dlls/wldap32/init.c 1.414 1.415 +1 -1 wine/configure.ac 1.717 1.718 +10 -10 wine/configure

1 0

wine/programs/winedbg types.c
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21344 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 10:53:32 Modified files: programs/winedbg: types.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Native dbghelp doesn't provide names for basic type, so added relevant basic type names in winedbg. Patch: http://cvs.winehq.org/patch.py?id=21344 Old revision New revision Changes Path 1.16 1.17 +46 -3 wine/programs/winedbg/types.c Index: wine/programs/winedbg/types.c diff -u -p wine/programs/winedbg/types.c:1.16 wine/programs/winedbg/types.c:1.17 --- wine/programs/winedbg/types.c:1.16 18 Nov 2005 16:53:32 -0000 +++ wine/programs/winedbg/types.c 18 Nov 2005 16:53:32 -0000 @@ -646,15 +646,58 @@ int types_print_type(const struct dbg_ty return TRUE; } +/* helper to typecast pInfo to its expected type (_t) */ +#define X(_t) (*((_t*)pInfo)) + BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, void* pInfo) { if (type->id == dbg_itype_none) return FALSE; if (type->module != 0) - return SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, ti, pInfo); + { + DWORD ret, tag, bt; + ret = SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, ti, pInfo); + if (!ret && + SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, TI_GET_SYMTAG, &tag) && + tag == SymTagBaseType && + SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, TI_GET_BASETYPE, &bt)) + { + static const WCHAR voidW[] = {'v','o','i','d','\0'}; + static const WCHAR charW[] = {'c','h','a','r','\0'}; + static const WCHAR wcharW[] = {'W','C','H','A','R','\0'}; + static const WCHAR intW[] = {'i','n','t','\0'}; + static const WCHAR uintW[] = {'u','n','s','i','g','n','e','d',' ','i','n','t','\0'}; + static const WCHAR floatW[] = {'f','l','o','a','t','\0'}; + static const WCHAR boolW[] = {'b','o','o','l','\0'}; + static const WCHAR longW[] = {'l','o','n','g',' ','i','n','t','\0'}; + static const WCHAR ulongW[] = {'u','n','s','i','g','n','e','d',' ','l','o','n','g',' ','i','n','t','\0'}; + static const WCHAR complexW[] = {'c','o','m','p','l','e','x','\0'}; + const WCHAR* name = NULL; + + switch (bt) + { + case btVoid: name = voidW; break; + case btChar: name = charW; break; + case btWChar: name = wcharW; break; + case btInt: name = intW; break; + case btUInt: name = uintW; break; + case btFloat: name = floatW; break; + case btBool: name = boolW; break; + case btLong: name = longW; break; + case btULong: name = ulongW; break; + case btComplex: name = complexW; break; + default: WINE_FIXME("Unsupported basic type %ld\n", bt); return FALSE; + } + X(WCHAR*) = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(name) + 1) * sizeof(WCHAR)); + if (X(WCHAR*)) + { + lstrcpyW(X(WCHAR*), name); + ret = TRUE; + } + } + return ret; + } assert(type->id >= dbg_itype_first); -/* helper to typecast pInfo to its expected type (_t) */ -#define X(_t) (*((_t*)pInfo)) switch (type->id) {

1 0

wine/dlls/commdlg filedlg.c
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21343 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 10:52:35 Modified files: dlls/commdlg : filedlg.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> There is no need to resize our own fake dialog to match the parent, it doesn't have controls anyway. Patch: http://cvs.winehq.org/patch.py?id=21343 Old revision New revision Changes Path 1.116 1.117 +28 -8 wine/dlls/commdlg/filedlg.c Index: wine/dlls/commdlg/filedlg.c diff -u -p wine/dlls/commdlg/filedlg.c:1.116 wine/dlls/commdlg/filedlg.c:1.117 --- wine/dlls/commdlg/filedlg.c:1.116 18 Nov 2005 16:52:35 -0000 +++ wine/dlls/commdlg/filedlg.c 18 Nov 2005 16:52:35 -0000 @@ -701,10 +701,6 @@ static void ArrangeCtrlPositions(HWND hw /* finally use fixed parent size */ rectParent.bottom -= help_fixup; - /* save the size of the parent's client area */ - rectChild.right = rectParent.right; - rectChild.bottom = rectParent.bottom; - /* set the size of the parent dialog */ AdjustWindowRectEx(&rectParent, GetWindowLongW(hwndParentDlg, GWL_STYLE), FALSE, GetWindowLongW(hwndParentDlg, GWL_EXSTYLE)); @@ -713,10 +709,6 @@ static void ArrangeCtrlPositions(HWND hw rectParent.right - rectParent.left, rectParent.bottom - rectParent.top, SWP_NOMOVE | SWP_NOZORDER); - - /* set the size of the child dialog */ - SetWindowPos(hwndChildDlg, HWND_BOTTOM, - 0, 0, rectChild.right, rectChild.bottom, SWP_NOACTIVATE); } static INT_PTR CALLBACK FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -1032,9 +1024,29 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND FILEDLG95_InitControls(hwnd); if (fodInfos->DlgInfos.hwndCustomDlg) + { + RECT rc; + UINT flags = SWP_NOACTIVATE; + ArrangeCtrlPositions(fodInfos->DlgInfos.hwndCustomDlg, hwnd, (fodInfos->ofnInfos->Flags & (OFN_HIDEREADONLY | OFN_SHOWHELP)) == OFN_HIDEREADONLY); + /* resize the custom dialog to the parent size */ + if (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE)) + GetClientRect(hwnd, &rc); + else + { + /* our own fake template is zero sized and doesn't have + * children, so there is no need to resize it. + * Picasa depends on it. + */ + flags |= SWP_NOSIZE; + SetRectEmpty(&rc); + } + SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM, + 0, 0, rc.right, rc.bottom, flags); + } + FILEDLG95_FillControls(hwnd, wParam, lParam); SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); @@ -3782,6 +3794,8 @@ BOOL WINAPI GetOpenFileNameA( { BOOL win16look = FALSE; + TRACE("flags %08lx\n", ofn->Flags); + /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ if (ofn->Flags & OFN_FILEMUSTEXIST) ofn->Flags |= OFN_PATHMUSTEXIST; @@ -3810,6 +3824,12 @@ BOOL WINAPI GetOpenFileNameW( { BOOL win16look = FALSE; + TRACE("flags %08lx\n", ofn->Flags); + + /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ + if (ofn->Flags & OFN_FILEMUSTEXIST) + ofn->Flags |= OFN_PATHMUSTEXIST; + if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE;

1 0

wine/dlls/mscms/tests profile.c
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21342 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 10:51:30 Modified files: dlls/mscms/tests: profile.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Don't call unicode functions of file API as they fail on Win9x. Patch: http://cvs.winehq.org/patch.py?id=21342 Old revision New revision Changes Path 1.17 1.18 +16 -5 wine/dlls/mscms/tests/profile.c Index: wine/dlls/mscms/tests/profile.c diff -u -p wine/dlls/mscms/tests/profile.c:1.17 wine/dlls/mscms/tests/profile.c:1.18 --- wine/dlls/mscms/tests/profile.c:1.17 18 Nov 2005 16:51:30 -0000 +++ wine/dlls/mscms/tests/profile.c 18 Nov 2005 16:51:30 -0000 @@ -971,9 +971,11 @@ static void test_UninstallColorProfileW( if (testprofileW) { WCHAR dest[MAX_PATH], base[MAX_PATH]; + char destA[MAX_PATH]; DWORD size = sizeof(dest); WCHAR slash[] = { '\\', 0 }; HANDLE handle; + int bytes_copied; ret = pInstallColorProfileW( NULL, testprofileW ); ok( ret, "InstallColorProfileW() failed (%ld)\n", GetLastError() ); @@ -989,8 +991,10 @@ static void test_UninstallColorProfileW( ret = pUninstallColorProfileW( NULL, dest, TRUE ); ok( ret, "UninstallColorProfileW() failed (%ld)\n", GetLastError() ); + bytes_copied = WideCharToMultiByte(CP_ACP, 0, dest, -1, destA, MAX_PATH, NULL, NULL); + ok( bytes_copied > 0 , "WideCharToMultiByte() returns %d\n", bytes_copied); /* Check if the profile is really gone */ - handle = CreateFileW( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + handle = CreateFileA( destA, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%ld)\n", GetLastError() ); CloseHandle( handle ); } @@ -1004,6 +1008,7 @@ START_TEST(profile) char profilefile1[MAX_PATH], profilefile2[MAX_PATH]; WCHAR profilefile1W[MAX_PATH], profilefile2W[MAX_PATH]; WCHAR fileW[MAX_PATH]; + UINT ret; hmscms = LoadLibraryA( "mscms.dll" ); if (!hmscms) return; @@ -1015,8 +1020,16 @@ START_TEST(profile) } /* See if we can find the standard color profile */ - GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); - GetSystemDirectoryW( profilefile1W, sizeof(profilefile1W) / sizeof(WCHAR) ); + ret = GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); + ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %ld\n", ret, GetLastError()); + ok( lstrlenA(profilefile1) > 0 && lstrlenA(profilefile1) < MAX_PATH, + "GetSystemDirectoryA() returns %d, LastError = %ld\n", ret, GetLastError()); + MultiByteToWideChar(CP_ACP, 0, profilefile1, -1, profilefile1W, MAX_PATH); + ok( lstrlenW(profilefile1W) > 0 && lstrlenW(profilefile1W) < MAX_PATH, + "GetSystemDirectoryA() returns %d, LastError = %ld\n", ret, GetLastError()); + lstrcpyA(profilefile2, profilefile1); + lstrcpyW(profilefile2W, profilefile1W); + lstrcatA( profilefile1, profile1 ); lstrcatW( profilefile1W, profile1W ); handle = CreateFileA( profilefile1, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); @@ -1028,8 +1041,6 @@ START_TEST(profile) CloseHandle( handle ); } - GetSystemDirectoryA( profilefile2, sizeof(profilefile2) ); - GetSystemDirectoryW( profilefile2W, sizeof(profilefile2W) / sizeof(WCHAR) ); lstrcatA( profilefile2, profile2 ); lstrcatW( profilefile2W, profile2W ); handle = CreateFileA( profilefile2, 0 , 0, NULL, OPEN_EXISTING, 0, NULL );

1 0

wine/server winstation.c user.h timer.c semaph ...
by Alexandre Julliard Nov. 18, 2005

Nov. 18, 2005

ChangeSet ID: 21341 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/18 10:31:18 Modified files: server : winstation.c user.h timer.c semaphore.c request.h process.c object.h object.c named_pipe.c mutex.c mapping.c mailslot.c handle.h handle.c event.c console.c Log message: Added a struct unicode_str to encapsulate object names. Patch: http://cvs.winehq.org/patch.py?id=21341 Old revision New revision Changes Path 1.13 1.14 +37 -33 wine/server/winstation.c 1.37 1.38 +2 -2 wine/server/user.h 1.30 1.31 +9 -5 wine/server/timer.c 1.31 1.32 +9 -6 wine/server/semaphore.c 1.123 1.124 +7 -0 wine/server/request.h 1.143 1.144 +3 -3 wine/server/process.c 1.68 1.69 +9 -3 wine/server/object.h 1.36 1.37 +16 -14 wine/server/object.c 1.52 1.53 +14 -11 wine/server/named_pipe.c 1.31 1.32 +9 -7 wine/server/mutex.c 1.59 1.60 +9 -6 wine/server/mapping.c 1.11 1.12 +12 -9 wine/server/mailslot.c 1.18 1.19 +2 -1 wine/server/handle.h 1.41 1.42 +2 -2 wine/server/handle.c 1.33 1.34 +9 -6 wine/server/event.c 1.60 1.61 +1 -1 wine/server/console.c

1 0