January 2007 - Wine-Commits

Andrew Talbot : shlwapi: Uninitialized variable fix (Coverity).
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: fb0fbe3e8da7e655e4e8a70e2f1debd83d3cd0d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0fbe3e8da7e655e4e8a70e2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 20 17:29:29 2007 +0000 shlwapi: Uninitialized variable fix (Coverity). --- dlls/shlwapi/assoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 2669358..caac827 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -376,7 +376,7 @@ HRESULT WINAPI AssocQueryStringByKeyA(AS LPCSTR pszExtra, LPSTR pszOut, DWORD *pcchOut) { - WCHAR szExtraW[MAX_PATH], *lpszExtraW; + WCHAR szExtraW[MAX_PATH], *lpszExtraW = szExtraW; WCHAR szReturnW[MAX_PATH], *lpszReturnW = szReturnW; HRESULT hRet = E_OUTOFMEMORY;

1 0

Andrew Talbot : oleaut32: Declare some items static.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: d6fc116475efe301685f05866b4504abbd5eeea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6fc116475efe301685f05866… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 20 16:51:29 2007 +0000 oleaut32: Declare some items static. --- dlls/oleaut32/typelib.c | 2 +- dlls/oleaut32/typelib.h | 1 - dlls/oleaut32/variant.c | 2 +- dlls/oleaut32/variant.h | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6c3b16a..0992683 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1229,7 +1229,7 @@ static void dump_TLBImplType(const TLBIm } } -void dump_Variant(const VARIANT * pvar) +static void dump_Variant(const VARIANT * pvar) { SYSTEMTIME st; diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index c2ce2eb..fc1cba0 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -599,7 +599,6 @@ WORD typeofarray HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ); extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args); -extern void dump_Variant(const VARIANT * pvar); HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 03c1537..37fdea2 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1465,7 +1465,7 @@ HRESULT WINAPI VarUdateFromDate(DATE dat TRACE("lcid 0x%x, " #name "=%d '%c'\n", lcid, lpChars->name, lpChars->name) /* Get the valid number characters for an lcid */ -void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) +static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',',','$',0,'.',',' }; LCTYPE lctype = dwFlags & LOCALE_NOUSEROVERRIDE; diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index c5f2e5d..41f8a9a 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -123,5 +123,3 @@ typedef struct tagVARIANT_NUMBER_CHARS WCHAR cCurrencyDecimalPoint; WCHAR cCurrencyDigitSeparator; } VARIANT_NUMBER_CHARS; - -void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS*,LCID,DWORD);

1 0

Detlef Riekenberg : kernel32/tests: GetVolumeNameForMountPoint not present before w2k.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: dc577ed68553b26eb2182ee2cfa00c3560c13e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc577ed68553b26eb2182ee2c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jan 20 12:46:34 2007 +0100 kernel32/tests: GetVolumeNameForMountPoint not present before w2k. --- dlls/kernel32/tests/volume.c | 38 ++++++++++++++++++++++++++++++-------- 1 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index e940a4b..b673947 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -27,6 +27,12 @@ #define LANMAN "LANMANREDIRECTOR" #define RAMDISK "RAMDISK" +static HINSTANCE hdll; +static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); +static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointW)(LPCWSTR, LPWSTR, DWORD); + +/* ############################### */ + static void test_query_dos_deviceA(void) { char drivestr[] = "a:"; @@ -51,18 +57,24 @@ static void test_GetVolumeNameForVolumeM char volume[MAX_PATH], path[] = "c:\\"; DWORD len = sizeof(volume); - ret = GetVolumeNameForVolumeMountPointA(path, volume, 0); + /* not present before w2k */ + if (!pGetVolumeNameForVolumeMountPointA) { + skip("GetVolumeNameForVolumeMountPointA not found\n"); + return; + } + + ret = pGetVolumeNameForVolumeMountPointA(path, volume, 0); ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); if (0) { /* these crash on XP */ - ret = GetVolumeNameForVolumeMountPointA(path, NULL, len); + ret = pGetVolumeNameForVolumeMountPointA(path, NULL, len); ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); - ret = GetVolumeNameForVolumeMountPointA(NULL, volume, len); + ret = pGetVolumeNameForVolumeMountPointA(NULL, volume, len); ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); } - ret = GetVolumeNameForVolumeMountPointA(path, volume, len); + ret = pGetVolumeNameForVolumeMountPointA(path, volume, len); ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n"); } @@ -72,23 +84,33 @@ static void test_GetVolumeNameForVolumeM WCHAR volume[MAX_PATH], path[] = {'c',':','\\',0}; DWORD len = sizeof(volume) / sizeof(WCHAR); - ret = GetVolumeNameForVolumeMountPointW(path, volume, 0); + /* not present before w2k */ + if (!pGetVolumeNameForVolumeMountPointW) { + skip("GetVolumeNameForVolumeMountPointW not found\n"); + return; + } + + ret = pGetVolumeNameForVolumeMountPointW(path, volume, 0); ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); if (0) { /* these crash on XP */ - ret = GetVolumeNameForVolumeMountPointW(path, NULL, len); + ret = pGetVolumeNameForVolumeMountPointW(path, NULL, len); ok(ret == FALSE, "GetVolumeNameForVolumeMountPointW succeeded\n"); - ret = GetVolumeNameForVolumeMountPointW(NULL, volume, len); + ret = pGetVolumeNameForVolumeMountPointW(NULL, volume, len); ok(ret == FALSE, "GetVolumeNameForVolumeMountPointW succeeded\n"); } - ret = GetVolumeNameForVolumeMountPointW(path, volume, len); + ret = pGetVolumeNameForVolumeMountPointW(path, volume, len); ok(ret == TRUE, "GetVolumeNameForVolumeMountPointW failed\n"); } START_TEST(volume) { + hdll = GetModuleHandleA("kernel32.dll"); + pGetVolumeNameForVolumeMountPointA = (void *) GetProcAddress(hdll, "GetVolumeNameForVolumeMountPointA"); + pGetVolumeNameForVolumeMountPointW = (void *) GetProcAddress(hdll, "GetVolumeNameForVolumeMountPointW"); + test_query_dos_deviceA(); test_GetVolumeNameForVolumeMountPointA(); test_GetVolumeNameForVolumeMountPointW();

1 0

Detlef Riekenberg : kernel32/tests: VirtualAllocEx not present in Win95.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: 9b8f699a080ef0b921f629624ef3f7cf9037cc89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b8f699a080ef0b921f629624… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jan 20 12:44:35 2007 +0100 kernel32/tests: VirtualAllocEx not present in Win95. --- dlls/kernel32/tests/virtual.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 5993a0c..bcff9c4 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -28,6 +28,12 @@ #define NUM_THREADS 4 +static HINSTANCE hkernel32; +static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); +static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); + +/* ############################### */ + static HANDLE create_target_process(const char *arg) { char **argv; @@ -55,15 +61,21 @@ static void test_VirtualAllocEx(void) MEMORY_BASIC_INFORMATION info; HANDLE hProcess; + /* not exported in all windows-versions */ + if ((!pVirtualAllocEx) || (!pVirtualFreeEx)) { + skip("VirtualAllocEx not found\n"); + return; + } + hProcess = create_target_process("sleep"); ok(hProcess != NULL, "Can't start process\n"); SetLastError(0xdeadbeef); - addr1 = VirtualAllocEx(hProcess, NULL, alloc_size, MEM_COMMIT, + addr1 = pVirtualAllocEx(hProcess, NULL, alloc_size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); if (!addr1 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { /* Win9x */ - trace("VirtualAllocEx is not implemented, skipping the test\n"); + skip("VirtualAllocEx not implemented\n"); TerminateProcess(hProcess, 0); CloseHandle(hProcess); return; @@ -81,7 +93,7 @@ static void test_VirtualAllocEx(void) b = ReadProcessMemory(hProcess, addr1, dst, alloc_size, &bytes_read); ok(b && (bytes_read == alloc_size), "%lu bytes read\n", bytes_read); ok(!memcmp(src, dst, alloc_size), "Data from remote process differs\n"); - b = VirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE); + b = pVirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE); ok(b != 0, "VirtualFreeEx, error %u\n", GetLastError()); HeapFree( GetProcessHeap(), 0, src ); @@ -92,13 +104,13 @@ static void test_VirtualAllocEx(void) */ SetLastError(0xdeadbeef); - addr1 = VirtualAllocEx(hProcess, 0, 0, MEM_RESERVE, PAGE_NOACCESS); + addr1 = pVirtualAllocEx(hProcess, 0, 0, MEM_RESERVE, PAGE_NOACCESS); ok(addr1 == NULL, "VirtualAllocEx should fail on zero-sized allocation\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER /* NT */ || GetLastError() == ERROR_NOT_ENOUGH_MEMORY, /* Win9x */ "got %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); - addr1 = VirtualAllocEx(hProcess, 0, 0xFFFC, MEM_RESERVE, PAGE_NOACCESS); + addr1 = pVirtualAllocEx(hProcess, 0, 0xFFFC, MEM_RESERVE, PAGE_NOACCESS); ok(addr1 != NULL, "VirtualAllocEx failed\n"); /* test a not committed memory */ @@ -122,7 +134,7 @@ static void test_VirtualAllocEx(void) GetLastError() == ERROR_INVALID_PARAMETER, /* Win9x */ "got %u, expected ERROR_INVALID_ADDRESS\n", GetLastError()); - addr2 = VirtualAllocEx(hProcess, addr1, 0x1000, MEM_COMMIT, PAGE_NOACCESS); + addr2 = pVirtualAllocEx(hProcess, addr1, 0x1000, MEM_COMMIT, PAGE_NOACCESS); ok(addr1 == addr2, "VirtualAllocEx failed\n"); /* test a committed memory */ @@ -153,20 +165,20 @@ static void test_VirtualAllocEx(void) ok(VirtualProtectEx(hProcess, addr1, 0x1000, PAGE_READWRITE, &old_prot), "VirtualProtectEx failed\n"); ok(old_prot == PAGE_READONLY, "wrong old protection: got %04x instead of PAGE_READONLY\n", old_prot); - ok(!VirtualFreeEx(hProcess, addr1, 0x10000, 0), + ok(!pVirtualFreeEx(hProcess, addr1, 0x10000, 0), "VirtualFreeEx should fail with type 0\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); - ok(VirtualFreeEx(hProcess, addr1, 0x10000, MEM_DECOMMIT), "VirtualFreeEx failed\n"); + ok(pVirtualFreeEx(hProcess, addr1, 0x10000, MEM_DECOMMIT), "VirtualFreeEx failed\n"); /* if the type is MEM_RELEASE, size must be 0 */ - ok(!VirtualFreeEx(hProcess, addr1, 1, MEM_RELEASE), + ok(!pVirtualFreeEx(hProcess, addr1, 1, MEM_RELEASE), "VirtualFreeEx should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); - ok(VirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE), "VirtualFreeEx failed\n"); + ok(pVirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE), "VirtualFreeEx failed\n"); TerminateProcess(hProcess, 0); CloseHandle(hProcess); @@ -495,6 +507,10 @@ START_TEST(virtual) return; } + hkernel32 = GetModuleHandleA("kernel32.dll"); + pVirtualAllocEx = (void *) GetProcAddress(hkernel32, "VirtualAllocEx"); + pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); + test_VirtualAllocEx(); test_VirtualAlloc(); test_MapViewOfFile();

1 0

Dmitry Timoshkov : comctl32: Fix the updown control test to pass under XP.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: 105cf6b28234ba16f877cbe147f8442eed505dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=105cf6b28234ba16f877cbe14… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Jan 20 17:09:43 2007 +0800 comctl32: Fix the updown control test to pass under XP. --- dlls/comctl32/tests/updown.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index e0b8131..9a9c493 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -109,6 +109,7 @@ static const struct message create_paren { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, /* Win9x adds SWP_NOZORDER below */ { WM_WINDOWPOSCHANGED, sent, /*|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE*/ }, + { WM_NCCALCSIZE, sent|wparam|optional, 1 }, { WM_SIZE, sent }, { WM_MOVE, sent }, { 0 } @@ -123,7 +124,7 @@ static const struct message add_updown_w { WM_WINDOWPOSCHANGING, sent }, { WM_NCCALCSIZE, sent|wparam, TRUE }, { WM_WINDOWPOSCHANGED, sent }, - { WM_SIZE, sent|wparam|lparam|defwinproc, SIZE_RESTORED, MAKELONG(91, 75) }, + { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED /*, MAKELONG(91, 75) exact size depends on font */ }, { 0 } }; @@ -202,6 +203,8 @@ static void ok_sequence_(int sequence_in while (expected->message && actual->message) { + trace_( file, line)("expected %04x - actual %04x\n", expected->message, actual->message); + if (expected->message == actual->message) { if (expected->flags & wparam) @@ -356,6 +359,8 @@ static LRESULT WINAPI parent_wnd_proc(HW message != WM_GETICON && message != WM_DEVICECHANGE) { + trace("parent: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam); + msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -413,6 +418,8 @@ static LRESULT WINAPI edit_subclass_proc LRESULT ret; struct message msg; + trace("edit: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam); + msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -459,6 +466,8 @@ static LRESULT WINAPI updown_subclass_pr LRESULT ret; struct message msg; + trace("updown: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam); + msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -519,7 +528,7 @@ static void test_create_updown_control(v updown = create_updown_control(); ok(updown != NULL, "Failed to create updown control\n"); ok_sequence(PARENT_SEQ_INDEX, add_updown_to_parent_seq, "add updown control to parent", TRUE); - ok_sequence(EDIT_SEQ_INDEX, add_updown_with_edit_seq, "add updown control with edit", TRUE); + ok_sequence(EDIT_SEQ_INDEX, add_updown_with_edit_seq, "add updown control with edit", FALSE); flush_sequences();

1 0

Hans Leidekker : mlang: Implement IMultiLanguage::GetCodePageInfo.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: 4275a093c175678a880316fdb4f492a51c273e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4275a093c175678a880316fdb… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Jan 20 10:52:57 2007 +0100 mlang: Implement IMultiLanguage::GetCodePageInfo. --- dlls/mlang/mlang.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f290426..8c20bc4 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1497,8 +1497,24 @@ static HRESULT WINAPI fnIMultiLanguage_G UINT uiCodePage, PMIMECPINFO pCodePageInfo) { - FIXME("\n"); - return E_NOTIMPL; + UINT i, n; + + ICOM_THIS_MULTI(MLang_impl, vtbl_IMultiLanguage, iface); + TRACE("%p, %u, %p\n", This, uiCodePage, pCodePageInfo); + + for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + { + for (n = 0; n < mlang_data[i].number_of_cp; n++) + { + if (mlang_data[i].mime_cp_info[n].cp == uiCodePage) + { + fill_cp_info(&mlang_data[i], n, pCodePageInfo); + return S_OK; + } + } + } + + return S_FALSE; } static HRESULT WINAPI fnIMultiLanguage_GetFamilyCodePage(

1 0

Vitaliy Margolen : server: User correct user sid for the default_dacl.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: 97b122c03f2eb46a2bb18e47461541f7d97ecbef URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b122c03f2eb46a2bb18e474… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Jan 19 12:28:59 2007 -0700 server: User correct user sid for the default_dacl. --- server/token.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/token.c b/server/token.c index b84c91b..c27e73b 100644 --- a/server/token.c +++ b/server/token.c @@ -542,7 +542,8 @@ struct token *token_create_admin( void ) static const unsigned int alias_users_subauth[] = { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS }; PSID alias_admins_sid; PSID alias_users_sid; - ACL *default_dacl = create_default_dacl( &local_system_sid ); + /* note: should be the owner specified in the token */ + ACL *default_dacl = create_default_dacl( &interactive_sid ); alias_admins_sid = security_sid_alloc( &nt_authority, sizeof(alias_admins_subauth)/sizeof(alias_admins_subauth[0]), alias_admins_subauth );

1 0

Detlef Riekenberg : kernel32/tests: Fix a declaration and use skip for the message.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: fb9df99dc0a6fc920fe625311316a3802b9edaef URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9df99dc0a6fc920fe625311… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jan 20 12:38:14 2007 +0100 kernel32/tests: Fix a declaration and use skip for the message. --- dlls/kernel32/tests/process.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8e782f1..162a622 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -33,8 +33,9 @@ static HINSTANCE hkernel32; static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); -static LPVOID (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); +static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); +/* ############################### */ static char base[MAX_PATH]; static char selfname[MAX_PATH]; static char* exename; @@ -1302,8 +1303,11 @@ static void test_OpenProcess(void) MEMORY_BASIC_INFORMATION info; SIZE_T dummy, read_bytes; - /* Not implemented in all windows versions */ - if ((!pVirtualAllocEx) || (!pVirtualFreeEx)) return; + /* not exported in all windows versions */ + if ((!pVirtualAllocEx) || (!pVirtualFreeEx)) { + skip("VirtualAllocEx not found\n"); + return; + } /* without PROCESS_VM_OPERATION */ hproc = OpenProcess(PROCESS_ALL_ACCESS & ~PROCESS_VM_OPERATION, FALSE, GetCurrentProcessId()); @@ -1315,7 +1319,7 @@ static void test_OpenProcess(void) if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { /* Win9x */ CloseHandle(hproc); - trace("VirtualAllocEx is not implemented, skipping the test\n"); + skip("VirtualAllocEx not implemented\n"); return; } ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %d\n", GetLastError());

1 0

Rob Shearman : kernel32: Handle the SECURITY_* flags passed into CreateFileW by filling out the SECURITY_QUALITY_OF_SERVICE structure and passing it to NtCreateFile .
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: 8132707bce02a70dab50062d7f038380ed885179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8132707bce02a70dab50062d7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 19 07:00:29 2007 -0600 kernel32: Handle the SECURITY_* flags passed into CreateFileW by filling out the SECURITY_QUALITY_OF_SERVICE structure and passing it to NtCreateFile. Print a fixme in NtCreateFile if the SECURITY_QUALITY_OF_SERVICE structure is specified, since it isn't handled yet. --- dlls/kernel32/file.c | 12 +++++++++++- dlls/ntdll/file.c | 4 ++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 5a0c5cb..f92d37a 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1281,6 +1281,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filen static const WCHAR bkslashes_with_dotW[] = {'\\','\\','.','\\',0}; static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; static const WCHAR conoutW[] = {'C','O','N','O','U','T','$',0}; + SECURITY_QUALITY_OF_SERVICE qos; static const UINT nt_disposition[5] = { @@ -1406,7 +1407,16 @@ HANDLE WINAPI CreateFileW( LPCWSTR filen attr.Attributes = OBJ_CASE_INSENSITIVE; attr.ObjectName = &nameW; attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; + if (attributes & SECURITY_SQOS_PRESENT) + { + qos.Length = sizeof(qos); + qos.ImpersonationLevel = (attributes >> 16) & 0x3; + qos.ContextTrackingMode = attributes & SECURITY_CONTEXT_TRACKING ? SECURITY_DYNAMIC_TRACKING : SECURITY_STATIC_TRACKING; + qos.EffectiveOnly = attributes & SECURITY_EFFECTIVE_ONLY ? TRUE : FALSE; + attr.SecurityQualityOfService = &qos; + } + else + attr.SecurityQualityOfService = NULL; if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a79d227..a9b9142 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -162,6 +162,8 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE ha if (attr->ObjectName->Length > sizeof(pipeW) && !memicmpW( attr->ObjectName->Buffer, pipeW, sizeof(pipeW)/sizeof(WCHAR) )) { + if (attr->SecurityQualityOfService) + FIXME("SecurityQualityOfService ignored\n"); SERVER_START_REQ( open_named_pipe ) { req->access = access; @@ -182,6 +184,8 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE ha if (attr->ObjectName->Length > sizeof(mailslotW) && !memicmpW( attr->ObjectName->Buffer, mailslotW, sizeof(mailslotW)/sizeof(WCHAR) )) { + if (attr->SecurityQualityOfService) + FIXME("SecurityQualityOfService ignored\n"); SERVER_START_REQ( open_mailslot ) { req->access = access & GENERIC_WRITE;

1 0

Thomas Weidenmueller : comctl32: Fix InitCommonControlsEx prototype.
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Module: wine Branch: master Commit: fda7775c7d59b04254cc9fd83c5a1b97d8f50411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda7775c7d59b04254cc9fd83… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Fri Jan 19 13:40:04 2007 +0100 comctl32: Fix InitCommonControlsEx prototype. --- dlls/comctl32/commctrl.c | 2 +- include/commctrl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 2f08f75..9cfdc9b 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -627,7 +627,7 @@ InitCommonControls (void) */ BOOL WINAPI -InitCommonControlsEx (LPINITCOMMONCONTROLSEX lpInitCtrls) +InitCommonControlsEx (const INITCOMMONCONTROLSEX *lpInitCtrls) { INT cCount; DWORD dwMask; diff --git a/include/commctrl.h b/include/commctrl.h index e77dee2..7a931f8 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -36,7 +36,7 @@ typedef struct tagINITCOMMONCONTROLSEX { DWORD dwICC; } INITCOMMONCONTROLSEX, *LPINITCOMMONCONTROLSEX; -BOOL WINAPI InitCommonControlsEx (LPINITCOMMONCONTROLSEX); +BOOL WINAPI InitCommonControlsEx (const INITCOMMONCONTROLSEX*); LANGID WINAPI GetMUILanguage (VOID); VOID WINAPI InitMUILanguage (LANGID uiLang);

1 0