October 2013 - Wine-commits

Nikolay Sivov : advapi32/tests: Remove string constants redefinition that are not needed anymore.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 26c2dc93cb1078f9b2ff96ba7884328b351df3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c2dc93cb1078f9b2ff96ba7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 26 23:09:51 2013 +0400 advapi32/tests: Remove string constants redefinition that are not needed anymore. --- dlls/advapi32/tests/registry.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1423d88..47de094 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -31,11 +31,6 @@ #include "winerror.h" #include "aclapi.h" -#undef SE_BACKUP_NAME -#undef SE_RESTORE_NAME -#define SE_BACKUP_NAME "SeBackupPrivilege" -#define SE_RESTORE_NAME "SeRestorePrivilege" - #define IS_HKCR(hk) ((UINT_PTR)hk > 0 && ((UINT_PTR)hk & 3) == 2) static HKEY hkey_main;

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 4dc152bd707282ad1a2a45c1636a1cb52345ce9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc152bd707282ad1a2a45c16… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 27 00:23:45 2013 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 0f84529..1525662 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3381,7 +3381,7 @@ static void test_surface_lock(void) if (tests[i].caps & DDSCAPS_ZBUFFER) { ddsd.dwFlags |= DDSD_ZBUFFERBITDEPTH; - ddsd.dwZBufferBitDepth = z_depth; + U2(ddsd).dwZBufferBitDepth = z_depth; } ddsd.ddsCaps.dwCaps = tests[i].caps; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f4702f1..7ff6075 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4041,7 +4041,7 @@ static void test_surface_lock(void) if (tests[i].caps & DDSCAPS_ZBUFFER) { ddsd.dwFlags |= DDSD_ZBUFFERBITDEPTH; - ddsd.dwZBufferBitDepth = z_depth; + U2(ddsd).dwZBufferBitDepth = z_depth; } ddsd.ddsCaps.dwCaps = tests[i].caps; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 61a54bb..ac885b4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4665,7 +4665,7 @@ static void test_surface_lock(void) if (tests[i].caps & DDSCAPS_ZBUFFER) { ddsd.dwFlags |= DDSD_PIXELFORMAT; - ddsd.ddpfPixelFormat = z_fmt; + U4(ddsd).ddpfPixelFormat = z_fmt; } ddsd.ddsCaps.dwCaps = tests[i].caps; ddsd.ddsCaps.dwCaps2 = tests[i].caps2; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 44a68c4..c4a6acb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4551,7 +4551,7 @@ static void test_surface_lock(void) if (tests[i].caps & DDSCAPS_ZBUFFER) { ddsd.dwFlags |= DDSD_PIXELFORMAT; - ddsd.ddpfPixelFormat = z_fmt; + U4(ddsd).ddpfPixelFormat = z_fmt; } ddsd.ddsCaps.dwCaps = tests[i].caps; ddsd.ddsCaps.dwCaps2 = tests[i].caps2;

1 0

Francois Gouget : mscoree: RuntimeHost_Destroy() is not used anymore so remove it.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: fbe912d73bda27f69cba0ac62fc2726d12706ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe912d73bda27f69cba0ac62… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 27 10:43:09 2013 +0100 mscoree: RuntimeHost_Destroy() is not used anymore so remove it. --- dlls/mscoree/corruntimehost.c | 17 ----------------- dlls/mscoree/mscoree_private.h | 2 -- 2 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 5cea669..554f4c5 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1269,23 +1269,6 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT RuntimeHost_Destroy(RuntimeHost *This) -{ - struct DomainEntry *cursor, *cursor2; - - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->lock); - - LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->domains, struct DomainEntry, entry) - { - list_remove(&cursor->entry); - HeapFree(GetProcessHeap(), 0, cursor); - } - - HeapFree( GetProcessHeap(), 0, This ); - return S_OK; -} - #define CHARS_IN_GUID 39 #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 820d081..f76dd78 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -175,8 +175,6 @@ extern HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *o extern HRESULT RuntimeHost_CreateManagedInstance(RuntimeHost *This, LPCWSTR name, MonoDomain *domain, MonoObject **result) DECLSPEC_HIDDEN; -extern HRESULT RuntimeHost_Destroy(RuntimeHost *This) DECLSPEC_HIDDEN; - HRESULT WINAPI CLRMetaHost_ExitProcess(ICLRMetaHost* iface, INT32 iExitCode) DECLSPEC_HIDDEN; HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, LPCWSTR pwzVersion, REFIID iid, LPVOID *ppRuntime) DECLSPEC_HIDDEN;

1 0

Francois Gouget : winspool.drv/tests: Fix the OpenPrinter() tests error reporting.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 3ad70f9e11f71ed61e446485305e201c8f9c552f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad70f9e11f71ed61e4464853… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 27 11:47:33 2013 +0100 winspool.drv/tests: Fix the OpenPrinter() tests error reporting. --- dlls/winspool.drv/tests/info.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 601cb60..4ab9c89 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2912,7 +2912,7 @@ static void test_OpenPrinter_defaults(void) ok( !ret, "got %d\n", ret ); pi = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetPrinterA( printer, 2, (BYTE *)pi, needed, &needed ); - ok( ret, "got %d\n", ret ); + ok( ret, "GetPrinterA() failed le=%d\n", GetLastError() ); default_size = pi->pDevMode->u1.s1.dmPaperSize; HeapFree( GetProcessHeap(), 0, pi ); @@ -2920,13 +2920,13 @@ static void test_OpenPrinter_defaults(void) ok( !ret, "got %d\n", ret ); add_job = HeapAlloc( GetProcessHeap(), 0, needed ); ret = AddJobA( printer, 1, (BYTE *)add_job, needed, &needed ); - ok( ret, "got %d\n", ret ); + ok( ret, "AddJobA() failed le=%d\n", GetLastError() ); ret = GetJobA( printer, add_job->JobId, 2, NULL, 0, &needed ); ok( !ret, "got %d\n", ret ); job_info = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetJobA( printer, add_job->JobId, 2, (BYTE *)job_info, needed, &needed ); - ok( ret, "got %d\n", ret ); + ok( ret, "GetJobA() failed le=%d\n", GetLastError() ); todo_wine ok( job_info->pDevMode != NULL, "got NULL DEVMODEA\n"); @@ -2951,14 +2951,14 @@ todo_wine prn_def.DesiredAccess = PRINTER_ACCESS_USE; ret = OpenPrinterA( default_printer, &printer, &prn_def ); - ok( ret, "got %d\n", ret ); + ok( ret, "OpenPrinterA() failed le=%d\n", GetLastError() ); /* GetPrinter stills returns default size */ ret = GetPrinterA( printer, 2, NULL, 0, &needed ); ok( !ret, "got %d\n", ret ); pi = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetPrinterA( printer, 2, (BYTE *)pi, needed, &needed ); - ok( ret, "got %d\n", ret ); + ok( ret, "GetPrinterA() failed le=%d\n", GetLastError() ); ok( pi->pDevMode->u1.s1.dmPaperSize == default_size, "got %d default %d\n", pi->pDevMode->u1.s1.dmPaperSize, default_size ); @@ -2969,13 +2969,13 @@ todo_wine ok( !ret, "got %d\n", ret ); add_job = HeapAlloc( GetProcessHeap(), 0, needed ); ret = AddJobA( printer, 1, (BYTE *)add_job, needed, &needed ); - ok( ret, "got %d\n", ret ); + ok( ret, "AddJobA() failed le=%d\n", GetLastError() ); ret = GetJobA( printer, add_job->JobId, 2, NULL, 0, &needed ); ok( !ret, "got %d\n", ret ); job_info = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetJobA( printer, add_job->JobId, 2, (BYTE *)job_info, needed, &needed ); - ok( ret, "got %d\n", ret ); + ok( ret, "GetJobA() failed le=%d\n", GetLastError() ); ok( job_info->pDevMode->dmFields == DM_PAPERSIZE, "got %08x\n", job_info->pDevMode->dmFields );

1 0

Nikolay Sivov : msxml3/tests: Fix test failures on newer systems.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 32f56af204aaf5122635ae1b5395ac1d0b296337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f56af204aaf5122635ae1b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 27 22:01:55 2013 +0400 msxml3/tests: Fix test failures on newer systems. --- dlls/msxml3/tests/httpreq.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 58abec9..ad074de 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1150,16 +1150,11 @@ static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, { /* FIXME: unidentified service id */ } - else if (IsEqualGUID(service, &IID_IInternetProtocol) && - IsEqualGUID(riid, &IID_IInternetProtocol)) - { - } - else if (IsEqualGUID(service, &IID_IHttpNegotiate2) && - IsEqualGUID(riid, &IID_IHttpNegotiate2)) - { - } - else if (IsEqualGUID(service, &IID_IGetBindHandle) && - IsEqualGUID(riid, &IID_IGetBindHandle)) + else if ((IsEqualGUID(service, &IID_IInternetProtocol) && IsEqualGUID(riid, &IID_IInternetProtocol)) || + (IsEqualGUID(service, &IID_IHttpNegotiate2) && IsEqualGUID(riid, &IID_IHttpNegotiate2)) || + (IsEqualGUID(service, &IID_IGetBindHandle) && IsEqualGUID(riid, &IID_IGetBindHandle)) || + (IsEqualGUID(service, &IID_IBindStatusCallback) && IsEqualGUID(riid, &IID_IBindStatusCallback)) || + (IsEqualGUID(service, &IID_IWindowForBindingUI) && IsEqualGUID(riid, &IID_IWindowForBindingUI))) { } else

1 0

Dmitry Timoshkov : kernel32/tests: Update trace message to report actually used timeout value.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: d97a36c51fece853884fe873af06af3f5a43973f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97a36c51fece853884fe873a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 28 17:27:57 2013 +0900 kernel32/tests: Update trace message to report actually used timeout value. --- dlls/kernel32/tests/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index dc9f587..455ee89 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -882,7 +882,7 @@ static void test_waittxempty(void) CloseHandle(ovl_wait.hEvent); timediff = after - before; - trace("WaitCommEvent for EV_TXEMPTY took %d ms (timeout %d)\n", timediff, TIMEOUT); + trace("WaitCommEvent for EV_TXEMPTY took %d ms (timeout 1500)\n", timediff); ok(timediff < 1200, "WaitCommEvent used %d ms for waiting\n", timediff); res = WaitForSingleObject(ovl_write.hEvent, 0);

1 0

Piotr Caban : comctl32: Fix a typo in UPDOWN_OffsetVal that breaks UDS_WRAP flag support.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 22a132938229e9fcb33a905787318a96bee4c33c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a132938229e9fcb33a90578… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 28 09:56:18 2013 +0100 comctl32: Fix a typo in UPDOWN_OffsetVal that breaks UDS_WRAP flag support. --- dlls/comctl32/updown.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 0761774..23a633e 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -150,7 +150,7 @@ static BOOL UPDOWN_OffsetVal(UPDOWN_INFO *infoPtr, int delta) (infoPtr->MaxVal < infoPtr->MinVal ? -1 : 1) * (infoPtr->MinVal - infoPtr->MaxVal) + (delta < 0 ? 1 : -1); - } if ((infoPtr->MaxVal > infoPtr->MinVal && infoPtr->CurVal+delta > infoPtr->MaxVal) + } else if ((infoPtr->MaxVal > infoPtr->MinVal && infoPtr->CurVal+delta > infoPtr->MaxVal) || (infoPtr->MaxVal < infoPtr->MinVal && infoPtr->CurVal+delta < infoPtr->MaxVal)) { delta = infoPtr->MaxVal - infoPtr->CurVal; } else {

1 0

Dmitry Timoshkov : atl100: Drop file attribute when opening an existing file and specify appropriate sharing mode .
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 22cb898c9edcd9a0029eee8b6f03e410d956ed7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=22cb898c9edcd9a0029eee8b6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 28 17:28:02 2013 +0900 atl100: Drop file attribute when opening an existing file and specify appropriate sharing mode. --- dlls/atl100/registrar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/registrar.c b/dlls/atl100/registrar.c index 9cad32a..414ad2b 100644 --- a/dlls/atl100/registrar.c +++ b/dlls/atl100/registrar.c @@ -498,7 +498,7 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist LRESULT lres; HRESULT hres; - file = CreateFileW(fileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); + file = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if(file != INVALID_HANDLE_VALUE) { filelen = GetFileSize(file, NULL); regstra = HeapAlloc(GetProcessHeap(), 0, filelen);

1 0

Dmitry Timoshkov : atl100: ReadFile doesn't directly return an error code.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 87d8250117d933c6866967ed43145ad09054c8cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=87d8250117d933c6866967ed4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 28 17:28:05 2013 +0900 atl100: ReadFile doesn't directly return an error code. --- dlls/atl100/registrar.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/registrar.c b/dlls/atl100/registrar.c index 414ad2b..b255e12 100644 --- a/dlls/atl100/registrar.c +++ b/dlls/atl100/registrar.c @@ -495,15 +495,13 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist DWORD filelen, len; LPWSTR regstrw; LPSTR regstra; - LRESULT lres; HRESULT hres; file = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if(file != INVALID_HANDLE_VALUE) { filelen = GetFileSize(file, NULL); regstra = HeapAlloc(GetProcessHeap(), 0, filelen); - lres = ReadFile(file, regstra, filelen, NULL, NULL); - if(lres == ERROR_SUCCESS) { + if(ReadFile(file, regstra, filelen, NULL, NULL)) { len = MultiByteToWideChar(CP_ACP, 0, regstra, filelen, NULL, 0)+1; regstrw = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, regstra, filelen, regstrw, len); @@ -514,7 +512,7 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist HeapFree(GetProcessHeap(), 0, regstrw); }else { WARN("Failed to read faile\n"); - hres = HRESULT_FROM_WIN32(lres); + hres = HRESULT_FROM_WIN32(GetLastError()); } HeapFree(GetProcessHeap(), 0, regstra); CloseHandle(file);

1 0

Dmitry Timoshkov : cryptnet: Avoid preliminary blob size initialization.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 876cc598c366c2acbc776421ce1e6109147d5d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=876cc598c366c2acbc776421c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 28 17:28:16 2013 +0900 cryptnet: Avoid preliminary blob size initialization. --- dlls/cryptnet/cryptnet_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 35d6609..13ca6e2 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -464,7 +464,6 @@ static BOOL CRYPT_GetObjectFromFile(HANDLE hFile, PCRYPT_BLOB_ARRAY pObject) blob.pbData = CryptMemAlloc(size.u.LowPart); if (blob.pbData) { - blob.cbData = size.u.LowPart; ret = ReadFile(hFile, blob.pbData, size.u.LowPart, &blob.cbData, NULL); if (ret)

1 0