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

Detlef Riekenberg : browseui: Add IOleWindow to IProgressDialog.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 744acc1ddd8119560ff97e9c68ffda3e10ca2ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=744acc1ddd8119560ff97e9c6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 16 23:16:17 2012 +0200 browseui: Add IOleWindow to IProgressDialog. --- dlls/browseui/progressdlg.c | 66 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 9b970e2..5526854 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -60,6 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); typedef struct tagProgressDialog { IProgressDialog IProgressDialog_iface; + IOleWindow IOleWindow_iface; LONG refCount; CRITICAL_SECTION cs; HWND hwnd; @@ -79,6 +80,11 @@ static inline ProgressDialog *impl_from_IProgressDialog(IProgressDialog *iface) return CONTAINING_RECORD(iface, ProgressDialog, IProgressDialog_iface); } +static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, ProgressDialog, IOleWindow_iface); +} + static void set_buffer(LPWSTR *buffer, LPCWSTR string) { static const WCHAR empty_string[] = {0}; @@ -268,11 +274,19 @@ static void ProgressDialog_Destructor(ProgressDialog *This) static HRESULT WINAPI ProgressDialog_QueryInterface(IProgressDialog *iface, REFIID iid, LPVOID *ppvOut) { ProgressDialog *This = impl_from_IProgressDialog(iface); - *ppvOut = NULL; + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(iid), ppvOut); + if (!ppvOut) + return E_POINTER; + + *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IProgressDialog)) { - *ppvOut = This; + *ppvOut = iface; + } + else if (IsEqualIID(iid, &IID_IOleWindow)) + { + *ppvOut = &This->IOleWindow_iface; } if (*ppvOut) @@ -495,6 +509,53 @@ static const IProgressDialogVtbl ProgressDialogVtbl = ProgressDialog_Timer }; +static HRESULT WINAPI OleWindow_QueryInterface(IOleWindow *iface, REFIID iid, LPVOID *ppvOut) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + return ProgressDialog_QueryInterface(&This->IProgressDialog_iface, iid, ppvOut); +} + +static ULONG WINAPI OleWindow_AddRef(IOleWindow *iface) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + return ProgressDialog_AddRef(&This->IProgressDialog_iface); +} + +static ULONG WINAPI OleWindow_Release(IOleWindow *iface) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + return ProgressDialog_Release(&This->IProgressDialog_iface); +} + +static HRESULT WINAPI OleWindow_GetWindow(IOleWindow* iface, HWND* phwnd) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + + TRACE("(%p, %p)\n", This, phwnd); + EnterCriticalSection(&This->cs); + *phwnd = This->hwnd; + LeaveCriticalSection(&This->cs); + return S_OK; +} + +static HRESULT WINAPI OleWindow_ContextSensitiveHelp(IOleWindow* iface, BOOL fEnterMode) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + + FIXME("(%p, %d): stub\n", This, fEnterMode); + return E_NOTIMPL; +} + +static const IOleWindowVtbl OleWindowVtbl = +{ + OleWindow_QueryInterface, + OleWindow_AddRef, + OleWindow_Release, + OleWindow_GetWindow, + OleWindow_ContextSensitiveHelp +}; + + HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ProgressDialog *This; @@ -506,6 +567,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) return E_OUTOFMEMORY; This->IProgressDialog_iface.lpVtbl = &ProgressDialogVtbl; + This->IOleWindow_iface.lpVtbl = &OleWindowVtbl; This->refCount = 1; InitializeCriticalSection(&This->cs); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs");

1 0

Detlef Riekenberg : browseui/tests: Add tests for IProgressDialog.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 518e05cb337324b032cc0b6845f42d33ebc4613f URL: http://source.winehq.org/git/wine.git/?a=commit;h=518e05cb337324b032cc0b684… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 16 23:16:18 2012 +0200 browseui/tests: Add tests for IProgressDialog. --- dlls/browseui/tests/Makefile.in | 3 +- dlls/browseui/tests/progressdlg.c | 72 +++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/tests/Makefile.in b/dlls/browseui/tests/Makefile.in index 0cb3541..c3bc768 100644 --- a/dlls/browseui/tests/Makefile.in +++ b/dlls/browseui/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = browseui.dll IMPORTS = ole32 C_SRCS = \ - autocomplete.c + autocomplete.c \ + progressdlg.c @MAKE_TEST_RULES@ diff --git a/dlls/browseui/tests/progressdlg.c b/dlls/browseui/tests/progressdlg.c new file mode 100644 index 0000000..e4d0e2f --- /dev/null +++ b/dlls/browseui/tests/progressdlg.c @@ -0,0 +1,72 @@ +/* Unit tests for progressdialog object + * + * Copyright 2012 Detlef Riekenberg + * + * 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 COBJMACROS + +#include <stdarg.h> +#include <shlobj.h> + +#include "wine/test.h" + + +static void test_IProgressDialog_QueryInterface(void) +{ + IProgressDialog *dlg; + IProgressDialog *dlg2; + IOleWindow *olewindow; + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, &IID_IProgressDialog, (void*)&dlg); + if (FAILED(hr)) { + win_skip("CoCreateInstance for IProgressDialog returned 0x%x\n", hr); + return; + } + + hr = IUnknown_QueryInterface(dlg, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + + hr = IUnknown_QueryInterface(dlg, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(unk); + } + + hr = IUnknown_QueryInterface(dlg, &IID_IOleWindow, (void**)&olewindow); + ok(hr == S_OK, "QueryInterface (IOleWindow) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + hr = IUnknown_QueryInterface(olewindow, &IID_IProgressDialog, (void**)&dlg2); + ok(hr == S_OK, "QueryInterface (IProgressDialog) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IProgressDialog_Release(dlg2); + } + IOleWindow_Release(olewindow); + } + IProgressDialog_Release(dlg); +} + + +START_TEST(progressdlg) +{ + CoInitialize(NULL); + + test_IProgressDialog_QueryInterface(); + + CoUninitialize(); +}

1 0

Dmitry Timoshkov : kernel32: Add more memory access checks.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: d4d39736ceab567ecc7e9bdb077efad46ce3e5c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d39736ceab567ecc7e9bdb0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 17 17:14:46 2012 +0900 kernel32: Add more memory access checks. --- dlls/kernel32/tests/virtual.c | 96 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 89 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index b537ce0..73a5206 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -792,8 +792,25 @@ static void test_MapViewOfFile(void) SetLastError(0xdeadbeef); map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); ok( map2 != 0, "OpenFileMappingA failed with error %d\n", GetLastError() ); - CloseHandle(map2); - CloseHandle(mapping); + SetLastError(0xdeadbeef); + ret = CloseHandle(map2); + ok(ret, "CloseHandle error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CloseHandle(mapping); + ok(ret, "CloseHandle error %d\n", GetLastError()); + + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( !ret, "memory is not accessible\n" ); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); + ok(info.RegionSize == MAPPING_SIZE, "got %#lx != expected %#x\n", info.RegionSize, MAPPING_SIZE); + ok(info.Protect == PAGE_READWRITE, "got %#x != expected PAGE_READWRITE\n", info.Protect); + ok(info.AllocationBase == ptr, "%p != %p\n", info.AllocationBase, ptr); + ok(info.AllocationProtect == PAGE_READWRITE, "%#x != PAGE_READWRITE\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == MEM_MAPPED, "%#x != MEM_MAPPED\n", info.Type); SetLastError(0xdeadbeef); map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); @@ -801,22 +818,46 @@ static void test_MapViewOfFile(void) ok( map2 == 0, "OpenFileMappingA succeeded\n" ); todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "OpenFileMappingA set error %d\n", GetLastError() ); - CloseHandle(map2); + if (map2) CloseHandle(map2); /* FIXME: remove once Wine is fixed */ SetLastError(0xdeadbeef); mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, MAPPING_SIZE, name); ok( mapping != 0, "CreateFileMappingA failed\n" ); todo_wine ok( GetLastError() == ERROR_SUCCESS, "CreateFileMappingA set error %d\n", GetLastError() ); - CloseHandle(mapping); + SetLastError(0xdeadbeef); + ret = CloseHandle(mapping); + ok(ret, "CloseHandle error %d\n", GetLastError()); ret = IsBadReadPtr(ptr, MAPPING_SIZE); ok( !ret, "memory is not accessible\n" ); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); + ok(info.RegionSize == MAPPING_SIZE, "got %#lx != expected %#x\n", info.RegionSize, MAPPING_SIZE); + ok(info.Protect == PAGE_READWRITE, "got %#x != expected PAGE_READWRITE\n", info.Protect); + ok(info.AllocationBase == ptr, "%p != %p\n", info.AllocationBase, ptr); + ok(info.AllocationProtect == PAGE_READWRITE, "%#x != PAGE_READWRITE\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == MEM_MAPPED, "%#x != MEM_MAPPED\n", info.Type); + SetLastError(0xdeadbeef); ret = UnmapViewOfFile(ptr); ok( ret, "UnmapViewOfFile failed with error %d\n", GetLastError() ); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); ok( ret, "memory is accessible\n" ); + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); + ok(info.RegionSize != MAPPING_SIZE, "got size %#lx\n", info.RegionSize); + ok(info.Protect == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", info.Protect); + ok(info.AllocationBase == NULL, "%p != NULL\n", info.AllocationBase); + ok(info.AllocationProtect == 0, "%#x != 0\n", info.AllocationProtect); + ok(info.State == MEM_FREE, "%#x != MEM_FREE\n", info.State); + ok(info.Type == 0, "%#x != 0\n", info.Type); + SetLastError(0xdeadbeef); file = CreateFileA(testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); @@ -832,8 +873,25 @@ static void test_MapViewOfFile(void) SetLastError(0xdeadbeef); map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); ok( map2 != 0, "OpenFileMappingA failed with error %d\n", GetLastError() ); - CloseHandle(map2); - CloseHandle(mapping); + SetLastError(0xdeadbeef); + ret = CloseHandle(map2); + ok(ret, "CloseHandle error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CloseHandle(mapping); + ok(ret, "CloseHandle error %d\n", GetLastError()); + + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( !ret, "memory is not accessible\n" ); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); + ok(info.RegionSize == MAPPING_SIZE, "got %#lx != expected %#x\n", info.RegionSize, MAPPING_SIZE); + ok(info.Protect == PAGE_READWRITE, "got %#x != expected PAGE_READWRITE\n", info.Protect); + ok(info.AllocationBase == ptr, "%p != %p\n", info.AllocationBase, ptr); + ok(info.AllocationProtect == PAGE_READWRITE, "%#x != PAGE_READWRITE\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == MEM_MAPPED, "%#x != MEM_MAPPED\n", info.Type); SetLastError(0xdeadbeef); map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); @@ -847,16 +905,40 @@ static void test_MapViewOfFile(void) ok( mapping != 0, "CreateFileMappingA failed\n" ); todo_wine ok( GetLastError() == ERROR_SUCCESS, "CreateFileMappingA set error %d\n", GetLastError() ); - CloseHandle(mapping); + SetLastError(0xdeadbeef); + ret = CloseHandle(mapping); + ok(ret, "CloseHandle error %d\n", GetLastError()); ret = IsBadReadPtr(ptr, MAPPING_SIZE); ok( !ret, "memory is not accessible\n" ); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); + ok(info.RegionSize == MAPPING_SIZE, "got %#lx != expected %#x\n", info.RegionSize, MAPPING_SIZE); + ok(info.Protect == PAGE_READWRITE, "got %#x != expected PAGE_READWRITE\n", info.Protect); + ok(info.AllocationBase == ptr, "%p != %p\n", info.AllocationBase, ptr); + ok(info.AllocationProtect == PAGE_READWRITE, "%#x != PAGE_READWRITE\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == MEM_MAPPED, "%#x != MEM_MAPPED\n", info.Type); + SetLastError(0xdeadbeef); ret = UnmapViewOfFile(ptr); ok( ret, "UnmapViewOfFile failed with error %d\n", GetLastError() ); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); ok( ret, "memory is accessible\n" ); + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); + ok(info.RegionSize != MAPPING_SIZE, "got size %#lx\n", info.RegionSize); + ok(info.Protect == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", info.Protect); + ok(info.AllocationBase == NULL, "%p != NULL\n", info.AllocationBase); + ok(info.AllocationProtect == 0, "%#x != 0\n", info.AllocationProtect); + ok(info.State == MEM_FREE, "%#x != MEM_FREE\n", info.State); + ok(info.Type == 0, "%#x != 0\n", info.Type); + CloseHandle(file); DeleteFileA(testfile); }

1 0

Carlo Bramini : shlwapi: Add NULL checks to StrCpyW and StrCatW.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: f6524a9f77cfad6b2d6c7745cdc8598e50e4bdf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6524a9f77cfad6b2d6c7745c… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Wed Apr 18 21:51:05 2012 +0200 shlwapi: Add NULL checks to StrCpyW and StrCatW. --- dlls/shlwapi/string.c | 6 ++++-- dlls/shlwapi/tests/string.c | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index c65d576..e2f1cba 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -477,7 +477,8 @@ LPWSTR WINAPI StrCatW(LPWSTR lpszStr, LPCWSTR lpszSrc) { TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSrc)); - strcatW(lpszStr, lpszSrc); + if (lpszStr && lpszSrc) + strcatW(lpszStr, lpszSrc); return lpszStr; } @@ -497,7 +498,8 @@ LPWSTR WINAPI StrCpyW(LPWSTR lpszStr, LPCWSTR lpszSrc) { TRACE("(%p,%s)\n", lpszStr, debugstr_w(lpszSrc)); - strcpyW(lpszStr, lpszSrc); + if (lpszStr && lpszSrc) + strcpyW(lpszStr, lpszSrc); return lpszStr; } diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index c918bcc..aac79f8 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -407,16 +407,28 @@ static void test_StrCpyW(void) WCHAR szSrc[256]; WCHAR szBuff[256]; const StrFormatSizeResult* result = StrFormatSize_results; - + LPWSTR lpRes; while(result->value) { MultiByteToWideChar(0,0,result->byte_size_64,-1,szSrc,sizeof(szSrc)/sizeof(WCHAR)); - StrCpyW(szBuff, szSrc); - ok(!StrCmpW(szSrc, szBuff), "Copied string %s wrong\n", result->byte_size_64); + lpRes = StrCpyW(szBuff, szSrc); + ok(!StrCmpW(szSrc, szBuff) && lpRes == szBuff, "Copied string %s wrong\n", result->byte_size_64); result++; } + + /* this test crashes on win2k SP4 */ + /*lpRes = StrCpyW(szBuff, NULL);*/ + /*ok(lpRes == szBuff, "Wrong return value: got %p expected %p\n", lpRes, szBuff);*/ + + /* this test crashes on win2k SP4 */ + /*lpRes = StrCpyW(NULL, szSrc);*/ + /*ok(lpRes == NULL, "Wrong return value: got %p expected NULL\n", lpRes);*/ + + /* this test crashes on win2k SP4 */ + /*lpRes = StrCpyW(NULL, NULL);*/ + /*ok(lpRes == NULL, "Wrong return value: got %p expected NULL\n", lpRes);*/ } static void test_StrChrNW(void)

1 0

Huw Davies : winspool: Add a helper to open a printer's registry key.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: b9bc9a0cf2badb7ec4cd41dd0eb7fdd8c49f32d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9bc9a0cf2badb7ec4cd41dd0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 19 13:43:24 2012 +0100 winspool: Add a helper to open a printer's registry key. --- dlls/winspool.drv/info.c | 79 +++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 49 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9b3c335..1e5aabc 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -995,6 +995,21 @@ static LPCWSTR get_opened_printer_name(HANDLE hprn) return printer->name; } +static DWORD open_printer_reg_key( const WCHAR *name, HKEY *key ) +{ + HKEY printers; + DWORD err; + + *key = NULL; + err = RegCreateKeyW( HKEY_LOCAL_MACHINE, PrintersW, &printers ); + if (err) return err; + + err = RegOpenKeyW( printers, name, key ); + if (err) err = ERROR_INVALID_PRINTER_NAME; + RegCloseKey( printers ); + return err; +} + /****************************************************************** * WINSPOOL_GetOpenedPrinterRegKey * @@ -1002,24 +1017,9 @@ static LPCWSTR get_opened_printer_name(HANDLE hprn) static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) { LPCWSTR name = get_opened_printer_name(hPrinter); - DWORD ret; - HKEY hkeyPrinters; if(!name) return ERROR_INVALID_HANDLE; - - if((ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters)) != - ERROR_SUCCESS) - return ret; - - if(RegOpenKeyW(hkeyPrinters, name, phkey) != ERROR_SUCCESS) - { - ERR("Can't find opened printer %s in registry\n", - debugstr_w(name)); - RegCloseKey(hkeyPrinters); - return ERROR_INVALID_PRINTER_NAME; /* ? */ - } - RegCloseKey(hkeyPrinters); - return ERROR_SUCCESS; + return open_printer_reg_key( name, phkey ); } void WINSPOOL_LoadSystemPrinters(void) @@ -3872,30 +3872,18 @@ static BOOL WINSPOOL_GetPrinter_9(HKEY hkeyPrinter, PRINTER_INFO_9W *pi9, LPBYTE BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) { - LPCWSTR name; - DWORD size, needed = 0; + DWORD size, needed = 0, err; LPBYTE ptr = NULL; - HKEY hkeyPrinter, hkeyPrinters; + HKEY hkeyPrinter; BOOL ret; TRACE("(%p,%d,%p,%d,%p)\n",hPrinter,Level,pPrinter,cbBuf, pcbNeeded); - if (!(name = get_opened_printer_name(hPrinter))) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != - ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - return FALSE; - } - if(RegOpenKeyW(hkeyPrinters, name, &hkeyPrinter) != ERROR_SUCCESS) + err = WINSPOOL_GetOpenedPrinterRegKey( hPrinter, &hkeyPrinter ); + if (err) { - ERR("Can't find opened printer %s in registry\n", debugstr_w(name)); - RegCloseKey(hkeyPrinters); - SetLastError(ERROR_INVALID_PRINTER_NAME); /* ? */ - return FALSE; + SetLastError( err ); + return FALSE; } switch(Level) { @@ -4016,13 +4004,11 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, default: FIXME("Unimplemented level %d\n", Level); SetLastError(ERROR_INVALID_LEVEL); - RegCloseKey(hkeyPrinters); RegCloseKey(hkeyPrinter); return FALSE; } RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); TRACE("returning %d needed = %d\n", ret, needed); if(pcbNeeded) *pcbNeeded = needed; @@ -4559,7 +4545,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, WCHAR DriverName[100]; DWORD ret, type, size, needed = 0; LPBYTE ptr = NULL; - HKEY hkeyPrinter, hkeyPrinters, hkeyDrivers; + HKEY hkeyPrinter, hkeyDrivers; const printenv_t * env; TRACE("(%p,%s,%d,%p,%d,%p)\n",hPrinter,debugstr_w(pEnvironment), @@ -4581,24 +4567,19 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, env = validate_envW(pEnvironment); if (!env) return FALSE; /* SetLastError() is in validate_envW */ - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != - ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - return FALSE; - } - if(RegOpenKeyW(hkeyPrinters, name, &hkeyPrinter) - != ERROR_SUCCESS) { - ERR("Can't find opened printer %s in registry\n", debugstr_w(name)); - RegCloseKey(hkeyPrinters); - SetLastError(ERROR_INVALID_PRINTER_NAME); /* ? */ - return FALSE; + ret = open_printer_reg_key( name, &hkeyPrinter ); + if (ret) + { + ERR( "Can't find opened printer %s in registry\n", debugstr_w(name) ); + SetLastError( ret ); + return FALSE; } + size = sizeof(DriverName); DriverName[0] = 0; ret = RegQueryValueExW(hkeyPrinter, Printer_DriverW, 0, &type, (LPBYTE)DriverName, &size); RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); if(ret != ERROR_SUCCESS) { ERR("Can't get DriverName for printer %s\n", debugstr_w(name)); return FALSE;

1 0

Huw Davies : winspool: Simplify the code that checks for deleted printers and have it not call OpenPrinter unless it finds a printer that needs deletion .
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: bd3a941b2059364b0e495f427c37dba1ced4e626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3a941b2059364b0e495f427… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 19 13:43:25 2012 +0100 winspool: Simplify the code that checks for deleted printers and have it not call OpenPrinter unless it finds a printer that needs deletion. --- dlls/winspool.drv/info.c | 105 ++++++++++++++++++++++------------------------ 1 files changed, 50 insertions(+), 55 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 1e5aabc..a2e3f8b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1022,10 +1022,56 @@ static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) return open_printer_reg_key( name, phkey ); } +static void old_printer_check( BOOL delete_phase ) +{ + PRINTER_INFO_5W* pi; + DWORD needed, type, num, delete, i, size; + const DWORD one = 1; + HKEY key; + HANDLE hprn; + + EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return; + + pi = HeapAlloc( GetProcessHeap(), 0, needed ); + EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num ); + for (i = 0; i < num; i++) + { + if (strncmpW( pi[i].pPortName, CUPS_Port, strlenW(CUPS_Port) ) && + strncmpW( pi[i].pPortName, LPR_Port, strlenW(LPR_Port) )) + continue; + + if (open_printer_reg_key( pi[i].pPrinterName, &key )) continue; + + if (!delete_phase) + { + RegSetValueExW( key, May_Delete_Value, 0, REG_DWORD, (LPBYTE)&one, sizeof(one) ); + RegCloseKey( key ); + } + else + { + delete = 0; + size = sizeof( delete ); + RegQueryValueExW( key, May_Delete_Value, NULL, &type, (LPBYTE)&delete, &size ); + RegCloseKey( key ); + if (delete) + { + TRACE( "Deleting old printer %s\n", debugstr_w(pi[i].pPrinterName) ); + if (OpenPrinterW( pi[i].pPrinterName, &hprn, NULL )) + { + DeletePrinter( hprn ); + ClosePrinter( hprn ); + } + DeletePrinterDriverExW( NULL, NULL, pi[i].pPrinterName, 0, 0 ); + } + } + } + HeapFree(GetProcessHeap(), 0, pi); +} + void WINSPOOL_LoadSystemPrinters(void) { HKEY hkey, hkeyPrinters; - HANDLE hprn; DWORD needed, num, i; WCHAR PrinterName[256]; BOOL done = FALSE; @@ -1034,7 +1080,7 @@ void WINSPOOL_LoadSystemPrinters(void) problems later if they don't. If one is found to be missed we create one and set it equal to the name of the key */ if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) == ERROR_SUCCESS) { - if(RegQueryInfoKeyA(hkeyPrinters, NULL, NULL, NULL, &num, NULL, NULL, + if(RegQueryInfoKeyW(hkeyPrinters, NULL, NULL, NULL, &num, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { for(i = 0; i < num; i++) { if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)/sizeof(PrinterName[0])) == ERROR_SUCCESS) { @@ -1050,31 +1096,7 @@ void WINSPOOL_LoadSystemPrinters(void) RegCloseKey(hkeyPrinters); } - /* We want to avoid calling AddPrinter on printers as much as - possible, because on cups printers this will (eventually) lead - to a call to cupsGetPPD which takes forever, even with non-cups - printers AddPrinter takes a while. So we'll tag all printers that - were automatically added last time around, if they still exist - we'll leave them be otherwise we'll delete them. */ - if (EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num) && needed) { - PRINTER_INFO_5A* pi = HeapAlloc(GetProcessHeap(), 0, needed); - if(EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num)) { - for(i = 0; i < num; i++) { - if(pi[i].pPortName == NULL || !strncmp(pi[i].pPortName,"CUPS:", 5) || !strncmp(pi[i].pPortName, "LPR:", 4)) { - if(OpenPrinterA(pi[i].pPrinterName, &hprn, NULL)) { - if(WINSPOOL_GetOpenedPrinterRegKey(hprn, &hkey) == ERROR_SUCCESS) { - DWORD dw = 1; - RegSetValueExW(hkey, May_Delete_Value, 0, REG_DWORD, (LPBYTE)&dw, sizeof(dw)); - RegCloseKey(hkey); - } - ClosePrinter(hprn); - } - } - } - } - HeapFree(GetProcessHeap(), 0, pi); - } - + old_printer_check( FALSE ); #ifdef SONAME_LIBCUPS done = CUPS_LoadPrinters(); @@ -1083,36 +1105,9 @@ void WINSPOOL_LoadSystemPrinters(void) if(!done) /* If we have any CUPS based printers, skip looking for printcap printers */ PRINTCAP_LoadPrinters(); - /* Now enumerate the list again and delete any printers that are still tagged */ - EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num); - if(needed) { - PRINTER_INFO_5A* pi = HeapAlloc(GetProcessHeap(), 0, needed); - if(EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num)) { - for(i = 0; i < num; i++) { - if(pi[i].pPortName == NULL || !strncmp(pi[i].pPortName,"CUPS:", 5) || !strncmp(pi[i].pPortName, "LPR:", 4)) { - if(OpenPrinterA(pi[i].pPrinterName, &hprn, NULL)) { - BOOL delete_driver = FALSE; - if(WINSPOOL_GetOpenedPrinterRegKey(hprn, &hkey) == ERROR_SUCCESS) { - DWORD dw, type, size = sizeof(dw); - if(RegQueryValueExW(hkey, May_Delete_Value, NULL, &type, (LPBYTE)&dw, &size) == ERROR_SUCCESS) { - TRACE("Deleting old printer %s\n", pi[i].pPrinterName); - DeletePrinter(hprn); - delete_driver = TRUE; - } - RegCloseKey(hkey); - } - ClosePrinter(hprn); - if(delete_driver) - DeletePrinterDriverExA(NULL, NULL, pi[i].pPrinterName, 0, 0); - } - } - } - } - HeapFree(GetProcessHeap(), 0, pi); - } + old_printer_check( TRUE ); return; - } /******************************************************************

1 0

Dmitry Timoshkov : advapi32: Add distinct tests for Read, Write and Execute access rights for kernel objects.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 27a3c43bb00fe69c4652b89cf723b5cb9e9fbec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a3c43bb00fe69c4652b89cf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 18 16:29:46 2012 +0900 advapi32: Add distinct tests for Read, Write and Execute access rights for kernel objects. --- dlls/advapi32/tests/security.c | 49 +++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9db84a4..40691ad 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -38,6 +38,10 @@ /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) +#ifndef EVENT_QUERY_STATE +#define EVENT_QUERY_STATE 0x0001 +#endif + /* copied from Wine winternl.h - not included in the Windows SDK */ typedef enum _OBJECT_INFORMATION_CLASS { ObjectBasicInformation, @@ -3992,6 +3996,9 @@ static void validate_default_security_descriptor(SECURITY_DESCRIPTOR *sd) ACL *acl; void *sid; + ret = IsValidSecurityDescriptor(sd); + ok(ret, "security descriptor is not valid\n"); + present = -1; defaulted = -1; acl = (void *)0xdeadbeef; @@ -4041,12 +4048,12 @@ static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MA length = needed; sd = HeapAlloc(GetProcessHeap(), 0, length); - needed = 0; + needed = 0xdeadbeef; SetLastError(0xdeadbeef); ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, sd, length, &needed); ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); - ok(needed == length, "GetKernelObjectSecurity should return required buffer length\n"); + ok(needed == length, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); validate_default_security_descriptor(sd); @@ -4058,7 +4065,7 @@ static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MA todo_wine { ok(ret, "AccessCheck error %d\n", GetLastError()); ok(status == 1, "expected 1, got %d\n", status); - ok(granted == mapping->GenericAll, "expected %#x, got %#x\n", mapping->GenericAll, granted); + ok(granted == mapping->GenericAll, "expected all access %#x, got %#x\n", mapping->GenericAll, granted); } priv_set_len = sizeof(priv_set); granted = 0xdeadbeef; @@ -4080,13 +4087,44 @@ todo_wine { ok(status == 0, "expected 0, got %d\n", status); ok(granted == 0, "expected 0, got %#x\n", granted); } + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericRead, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericRead, "expected read access %#x, got %#x\n", mapping->GenericRead, granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericWrite, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericWrite, "expected write access %#x, got %#x\n", mapping->GenericWrite, granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericExecute, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericExecute, "expected execute access %#x, got %#x\n", mapping->GenericExecute, granted); +} HeapFree(GetProcessHeap(), 0, sd); } static void test_mutex_security(HANDLE token) { HANDLE mutex; - GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ, STANDARD_RIGHTS_WRITE, + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | MUTEX_MODIFY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS }; @@ -4107,7 +4145,8 @@ static void test_mutex_security(HANDLE token) static void test_event_security(HANDLE token) { HANDLE event; - GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ, STANDARD_RIGHTS_WRITE, + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | EVENT_QUERY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS };

1 0

Dmitry Timoshkov : advapi32: Add named pipe access tests.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 3bb0462165a89b72e4cdc65e8ba03bbce1611f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb0462165a89b72e4cdc65e8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 18 16:30:04 2012 +0900 advapi32: Add named pipe access tests. --- dlls/advapi32/tests/security.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 40691ad..3fc9930 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4053,7 +4053,7 @@ static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MA ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, sd, length, &needed); ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); - ok(needed == length, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); + ok(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); validate_default_security_descriptor(sd); @@ -4164,6 +4164,36 @@ static void test_event_security(HANDLE token) CloseHandle(event); } +#define WINE_TEST_PIPE "\\\\.\\pipe\\WineTestPipe" +static void test_named_pipe_security(HANDLE token) +{ + HANDLE pipe, file; + GENERIC_MAPPING mapping = { FILE_GENERIC_READ, + FILE_GENERIC_WRITE, + FILE_GENERIC_EXECUTE, + STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS }; + + SetLastError(0xdeadbeef); + pipe = CreateNamedPipe(WINE_TEST_PIPE, PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE, + PIPE_TYPE_BYTE | PIPE_NOWAIT, PIPE_UNLIMITED_INSTANCES, + 0, 0, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe error %d\n", GetLastError()); + + test_default_handle_security(token, pipe, &mapping); + + SetLastError(0xdeadbeef); + file = CreateFile(WINE_TEST_PIPE, FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(file); + + CloseHandle(pipe); + + SetLastError(0xdeadbeef); + file = CreateFile("\\\\.\\pipe\\", FILE_ALL_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE || broken(file == INVALID_HANDLE_VALUE) /* before Vista */, "CreateFile error %d\n", GetLastError()); + CloseHandle(file); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -4236,6 +4266,7 @@ static void test_kernel_objects_security(void) test_mutex_security(token); test_event_security(token); + test_named_pipe_security(token); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Daniel Lehman : msvcrt: Add declarations to stdlib. h for _strtoui64 and _strtoi64.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 5afde5f37832aaff99276c6e9926cf510797886b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afde5f37832aaff99276c6e9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 13 15:58:48 2012 -0800 msvcrt: Add declarations to stdlib.h for _strtoui64 and _strtoi64. --- include/msvcrt/stdlib.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index c972156..5010949 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -201,6 +201,10 @@ void __cdecl srand(unsigned int); double __cdecl strtod(const char*,char**); __msvcrt_long __cdecl strtol(const char*,char**,int); __msvcrt_ulong __cdecl strtoul(const char*,char**,int); +__int64 __cdecl _strtoi64(const char*,char**,int); +__int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); +unsigned __int64 __cdecl _strtoui64(const char*,char**,int); +unsigned __int64 __cdecl _strtoui64_l(const char*,char**,int,_locale_t); int __cdecl system(const char*); void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (*)(const void*,const void*)); void __cdecl qsort(void*,size_t,size_t,int (*)(const void*,const void*));

1 0

Daniel Lehman : oleaut32: Treat years 0 to 29 as 2000 to 2029 in VARIANT_RollUdate.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: cc37abb6589a1aa9862624c77a45b32c9a36dca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc37abb6589a1aa9862624c77… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Apr 18 13:01:56 2012 -0700 oleaut32: Treat years 0 to 29 as 2000 to 2029 in VARIANT_RollUdate. --- dlls/oleaut32/tests/vartest.c | 5 ++++- dlls/oleaut32/variant.c | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index a79481a..770ea5f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1742,7 +1742,10 @@ static void test_SystemTimeToVariantTime(void) ST2DT(2,1,1980,0,0,0,0,TRUE,29222.0); ST2DT(0,1,1980,0,0,0,0,TRUE,29220.0); /* Rolls back to 31 Dec 1899 */ ST2DT(1,13,1980,0,0,0,0,FALSE,29587.0); /* Fails on invalid month */ - ST2DT(31,12,90,0,0,0,0,TRUE,33238.0); /* year < 100 is 1900+year! */ + ST2DT(31,12,90,0,0,0,0,TRUE,33238.0); /* 30 <= year < 100 is 1900+year */ + ST2DT(1,1,30,0,0,0,0,TRUE,10959.0); /* 30 <= year < 100 is 1900+year */ + ST2DT(1,1,29,0,0,0,0,TRUE,47119.0); /* 0 <= year < 30 is 2000+year */ + ST2DT(1,1,0,0,0,0,0,TRUE,36526.0); /* 0 <= year < 30 is 2000+year */ } static void test_dt2st(int line, double dt, INT r, WORD d, WORD m, WORD y, diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 0d1f2cc..2d6e2ce 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1143,8 +1143,11 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) if (iYear > 9999 || iYear < -9999) return E_INVALIDARG; /* Invalid value */ - /* Years < 100 are treated as 1900 + year */ - if (iYear > 0 && iYear < 100) + /* Year 0 to 29 are treated as 2000 + year */ + if (iYear >= 0 && iYear < 30) + iYear += 2000; + /* Remaining years < 100 are treated as 1900 + year */ + else if (iYear >= 30 && iYear < 100) iYear += 1900; iMinute += iSecond / 60;

1 0