wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Austin Lund : kernel32/tests: Fixed test for GetVolumeNameForVolumeMountPoint on directory.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: f5271ce1e3630954026d349fcf8a69435a1f6820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5271ce1e3630954026d349fc… Author: Austin Lund <austin.lund(a)gmail.com> Date: Sun Nov 15 11:45:45 2009 +1000 kernel32/tests: Fixed test for GetVolumeNameForVolumeMountPoint on directory. --- dlls/kernel32/tests/volume.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index f569247..efd74d5 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -155,8 +155,11 @@ static void test_GetVolumeNameForVolumeMountPointA(void) GetLastError()); /* Try on a arbitrary directory */ + /* On FAT filesystems it seems that GetLastError() is set to + ERROR_INVALID_FUNCTION. */ ret = pGetVolumeNameForVolumeMountPointA(temp_path, volume, len); - ok(ret == FALSE && GetLastError() == ERROR_NOT_A_REPARSE_POINT, + ok(ret == FALSE && (GetLastError() == ERROR_NOT_A_REPARSE_POINT || + GetLastError() == ERROR_INVALID_FUNCTION), "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", temp_path, GetLastError());

1 0

Roderick Colenbrander : opengl32/tests: fix wglShareLists error messages.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 9120e9baeb7326aa932e7651904454afa4304489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9120e9baeb7326aa932e76519… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Nov 14 17:53:33 2009 +0100 opengl32/tests: fix wglShareLists error messages. --- dlls/opengl32/tests/opengl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 13e41fd..5c3de1f 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -314,7 +314,7 @@ static void test_sharelists(HDC winhdc) res = wglMakeCurrent(winhdc, hglrc2); ok(res, "Make current failed\n"); res = wglShareLists(hglrc1, hglrc2); - todo_wine ok(res, "Sharing display lists with a destination context which has been made current passed\n"); + todo_wine ok(res, "Sharing display lists with a destination context which has been made current failed\n"); wglMakeCurrent(0, 0); wglDeleteContext(hglrc2); } @@ -325,7 +325,7 @@ static void test_sharelists(HDC winhdc) if(hglrc3) { res = wglShareLists(hglrc3, hglrc1); - ok(res == FALSE, "Sharing of display lists failed for a context which already shared lists before\n"); + ok(res == FALSE, "Sharing of display lists passed for a context which already shared lists before\n"); wglDeleteContext(hglrc3); } @@ -336,7 +336,7 @@ static void test_sharelists(HDC winhdc) res = wglMakeCurrent(winhdc, hglrc1); ok(res, "Make current failed\n"); res = wglShareLists(hglrc1, hglrc2); - ok(res, "Sharing display lists with a source context which has been made current passed\n"); + ok(res, "Sharing display lists with a source context which has been made current failed\n"); wglMakeCurrent(0, 0); wglDeleteContext(hglrc2); }

1 0

Francois Gouget : oledb32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 9b329b2ed2fe4a16aea8358ada719484eaf280bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b329b2ed2fe4a16aea8358ad… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:56:02 2009 +0100 oledb32/tests: Add a trailing '\n' to an ok() call. --- dlls/oledb32/tests/marshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c index 67fc7fd..587b8b6 100644 --- a/dlls/oledb32/tests/marshal.c +++ b/dlls/oledb32/tests/marshal.c @@ -243,7 +243,7 @@ static void test_IDBProperties(void) propset_count = 1; hr = IDBProperties_GetProperties(pProxy, 0, NULL, &propset_count, &propsets); - ok(hr == S_OK, "IDBProperties_GetProperties failed with error 0x%08x", hr); + ok(hr == S_OK, "IDBProperties_GetProperties failed with error 0x%08x\n", hr); ok(propset_count == 1, "Expected propset_count of 1 but got %d\n", propset_count); ok(propsets->rgProperties[0].dwPropertyID == TEST_PROPID, "Expected property ID of 0x%x, but got 0x%x\n", TEST_PROPID, propsets->rgProperties[0].dwPropertyID);

1 0

Francois Gouget : rsaenh/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 6e407cccb846c9d113bd2e47a7008ecfb6796fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e407cccb846c9d113bd2e47a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:55:59 2009 +0100 rsaenh/tests: Add a trailing '\n' to an ok() call. --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index e59ad95..4d57b25 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2085,7 +2085,7 @@ static void test_rsa_round_trip(void) if (result) { ok(dataLen == sizeof(test_string), "unexpected size %d\n", dataLen); - ok(!memcmp(data, test_string, sizeof(test_string)), "unexpected value"); + ok(!memcmp(data, test_string, sizeof(test_string)), "unexpected value\n"); } CryptReleaseContext(prov, 0);

1 0

Francois Gouget : widl: Add a trailing '\n' to an error_loc() call.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 61d0d121d04d66322d605d55324fd2e4c6e72dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d0d121d04d66322d605d553… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:55:48 2009 +0100 widl: Add a trailing '\n' to an error_loc() call. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index de44ab5..73b48a2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1033,7 +1033,7 @@ m_bitfield: { $$ = NULL; } struct_declarator: any_declarator m_bitfield { $$ = $1; $$->bits = $2; if (!$$->bits && !$$->var->name) - error_loc("unnamed fields are not allowed"); + error_loc("unnamed fields are not allowed\n"); } ;

1 0

Francois Gouget : commdlg.dll16: The commdlg debug channel is unused. Remove it.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 54ada514501c392997f18926edb6d88af6fa09fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ada514501c392997f18926e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:54:47 2009 +0100 commdlg.dll16: The commdlg debug channel is unused. Remove it. --- dlls/commdlg.dll16/finddlg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/commdlg.dll16/finddlg.c b/dlls/commdlg.dll16/finddlg.c index e243868..abd30d5 100644 --- a/dlls/commdlg.dll16/finddlg.c +++ b/dlls/commdlg.dll16/finddlg.c @@ -30,11 +30,9 @@ #include "wingdi.h" #include "winuser.h" #include "commdlg.h" -#include "wine/debug.h" #include "cderr.h" #include "cdlg16.h" -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); /***********************************************************************

1 0

Francois Gouget : jscript: We don't need throw_eval_error() so remove it.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 5d06095dfb3b57d9c72bbf7f09326522585890ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d06095dfb3b57d9c72bbf7f0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:54:32 2009 +0100 jscript: We don't need throw_eval_error() so remove it. --- dlls/jscript/error.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 6c89d70..d8503f1 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -489,11 +489,6 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH return id; } -HRESULT throw_eval_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) -{ - return throw_error(ctx, ei, id, str, ctx->eval_error_constr); -} - HRESULT throw_generic_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) { return throw_error(ctx, ei, id, str, ctx->error_constr);

1 0

Francois Gouget : mshtml: parse_complete() is unused so remove it.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 67c8e896a9e524bbf89d2eda8115470134531775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c8e896a9e524bbf89d2eda8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:53:02 2009 +0100 mshtml: parse_complete() is unused so remove it. --- dlls/mshtml/task.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index e6b94a2..eae51ca 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -199,12 +199,6 @@ HRESULT clear_task_timer(HTMLDocument *doc, BOOL interval, DWORD id) return S_OK; } -void parse_complete(HTMLDocumentObj *doc) -{ - TRACE("(%p)\n", doc); - -} - static void call_timer_disp(IDispatch *disp) { DISPPARAMS dp = {NULL, NULL, 0, 0};

1 0

Francois Gouget : shell32: Make GetFileNameFromBrowse{A,W}() static.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 8a00aaaa50e1571556fa3e9bc30073ff16abad5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a00aaaa50e1571556fa3e9bc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:52:55 2009 +0100 shell32: Make GetFileNameFromBrowse{A,W}() static. --- dlls/shell32/shellord.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index fd942f7..29b77df 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -169,7 +169,7 @@ DWORD WINAPI ParseFieldAW(LPCVOID src, DWORD nField, LPVOID dst, DWORD len) /************************************************************************* * GetFileNameFromBrowseA [internal] */ -BOOL WINAPI GetFileNameFromBrowseA( +static BOOL GetFileNameFromBrowseA( HWND hwndOwner, LPSTR lpstrFile, DWORD nMaxFile, @@ -216,7 +216,7 @@ BOOL WINAPI GetFileNameFromBrowseA( /************************************************************************* * GetFileNameFromBrowseW [internal] */ -BOOL WINAPI GetFileNameFromBrowseW( +static BOOL GetFileNameFromBrowseW( HWND hwndOwner, LPWSTR lpstrFile, DWORD nMaxFile,

1 0

Stefan Leichter : kernel32: Added stub for CreateMemoryResourceNotification .
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 7f1fe90e7f45433fc2f2f6fc130687262040e9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1fe90e7f45433fc2f2f6fc1… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Nov 14 09:58:47 2009 +0100 kernel32: Added stub for CreateMemoryResourceNotification. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 12 ++++++++++++ include/winbase.h | 5 +++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7e278b5..aad5e79 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -236,7 +236,7 @@ @ stub CreateKernelThread @ stdcall CreateMailslotA(ptr long long ptr) @ stdcall CreateMailslotW(ptr long long ptr) -# @ stub CreateMemoryResourceNotification +@ stdcall CreateMemoryResourceNotification(long) @ stdcall CreateMutexA(ptr long str) @ stdcall CreateMutexExA(ptr str long long) @ stdcall CreateMutexExW(ptr wstr long long) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 8330d4a..8918f3d 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2171,6 +2171,18 @@ BOOL WINAPI BindIoCompletionCallback( HANDLE FileHandle, LPOVERLAPPED_COMPLETION return FALSE; } + +/*********************************************************************** + * CreateMemoryResourceNotification (KERNEL32.@) + */ +HANDLE WINAPI CreateMemoryResourceNotification(MEMORY_RESOURCE_NOTIFICATION_TYPE nt) +{ + FIXME("(%d) stub\n", nt); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + + #ifdef __i386__ /*********************************************************************** diff --git a/include/winbase.h b/include/winbase.h index 0b4ee17..8298cbd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -501,6 +501,10 @@ typedef struct tagMEMORYSTATUSEX { } MEMORYSTATUSEX, *LPMEMORYSTATUSEX; #include <poppack.h> +typedef enum _MEMORY_RESOURCE_NOTIFICATION_TYPE { + LowMemoryResourceNotification, + HighMemoryResourceNotification +} MEMORY_RESOURCE_NOTIFICATION_TYPE; #ifndef _SYSTEMTIME_ #define _SYSTEMTIME_ @@ -1391,6 +1395,7 @@ WINBASEAPI HANDLE WINAPI CreateJobObjectW(LPSECURITY_ATTRIBUTES,LPCWSTR); WINBASEAPI HANDLE WINAPI CreateMailslotA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES); WINBASEAPI HANDLE WINAPI CreateMailslotW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES); #define CreateMailslot WINELIB_NAME_AW(CreateMailslot) +WINBASEAPI HANDLE WINAPI CreateMemoryResourceNotification(MEMORY_RESOURCE_NOTIFICATION_TYPE); WINBASEAPI HANDLE WINAPI CreateMutexA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI CreateMutexW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); #define CreateMutex WINELIB_NAME_AW(CreateMutex)

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009