wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Austin English : widl: write_array_element_type shouldn't return a value.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 554a2ccb117817c869ab5643aa5de67b09c3d165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=554a2ccb117817c869ab5643a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 19 14:55:46 2012 -0600 widl: write_array_element_type shouldn't return a value. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 280bd05..cab4276 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2343,7 +2343,7 @@ static void write_array_element_type(FILE *file, const type_t *type, return; } } - return write_member_type(file, type, cont_is_complex, NULL, elem, NULL, tfsoff); + write_member_type(file, type, cont_is_complex, NULL, elem, NULL, tfsoff); } static void write_end(FILE *file, unsigned int *tfsoff)

1 0

Frédéric Delanoy : cmd: Remove dead assignments ( clang).
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 5188f08bf426497ea0f17e3f6751320cc11aeaae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5188f08bf426497ea0f17e3f6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 19 21:55:40 2012 +0100 cmd: Remove dead assignments (clang). --- programs/cmd/builtins.c | 1 - programs/cmd/wcmdmain.c | 5 ----- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8715c51..acf0882 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -440,7 +440,6 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app } /* Loop copying data from source to destination until EOF read */ - ok = TRUE; do { char buffer[MAXSTRING]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 3884727..d2884c9 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1157,8 +1157,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) static const WCHAR batExt[] = {'.','b','a','t','\0'}; static const WCHAR cmdExt[] = {'.','c','m','d','\0'}; - launched = TRUE; - /* Special case BAT and CMD */ if (ext && (!strcmpiW(ext, batExt) || !strcmpiW(ext, cmdExt))) { BOOL oldinteractive = interactive; @@ -2404,9 +2402,6 @@ int wmain (int argc, WCHAR *argvW[]) * parameters after the /C or /K by pretending there was a single space */ if (argPos == NULL) argPos = (WCHAR *)spaceW; - /* Build the command to execute - It is what is left in argPos */ - len = strlenW(argPos); - /* Take a copy */ cmd = heap_strdupW(argPos);

1 0

André Hentschel : kernel32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: e431d89ed2811496e3917523cda6c13083c3afb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e431d89ed2811496e3917523c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 19 20:34:03 2012 +0100 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/kernel32/tests/file.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3d29b28..0166fff 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3296,7 +3296,8 @@ static void test_GetFileInformationByHandleEx(void) /* ensure the existence of a file in the temp folder */ ret2 = GetTempFileNameA(tempPath, "abc", 0, tempFileName); ok(ret2, "GetFileInformationByHandleEx: GetTempFileNameA failed, got error %u.\n", GetLastError()); - ok(GetFileAttributesA(tempFileName) != INVALID_FILE_ATTRIBUTES, "GetFileInformationByHandleEx: " + ret2 = GetFileAttributesA(tempFileName); + ok(ret2 != INVALID_FILE_ATTRIBUTES, "GetFileInformationByHandleEx: " "GetFileAttributesA failed to find the temp file, got error %u.\n", GetLastError()); directory = CreateFileA(tempPath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, @@ -3359,7 +3360,8 @@ static void test_OpenFileById(void) /* ensure the existence of a file in the temp folder */ ret2 = GetTempFileNameA(tempPath, "abc", 0, tempFileName); ok(ret2, "OpenFileById: GetTempFileNameA failed, got error %u.\n", GetLastError()); - ok(GetFileAttributesA(tempFileName) != INVALID_FILE_ATTRIBUTES, + ret2 = GetFileAttributesA(tempFileName); + ok(ret2 != INVALID_FILE_ATTRIBUTES, "OpenFileById: GetFileAttributesA failed to find the temp file, got error %u\n", GetLastError()); ret2 = MultiByteToWideChar(CP_ACP, 0, tempFileName + strlen(tempPath), -1, tempFileNameW, sizeof(tempFileNameW)/sizeof(tempFileNameW[0]));

1 0

André Hentschel : msvcrt/tests: Don' t test function directly when reporting errno.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 61a12130788569e91913808d58d5e5b32ae83add URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a12130788569e91913808d5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 19 20:33:23 2012 +0100 msvcrt/tests: Don't test function directly when reporting errno. --- dlls/msvcrt/tests/data.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index 0723093..cdd65a7 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -197,12 +197,14 @@ static void test___getmainargs_parent(char *name) STARTUPINFO startup; PROCESS_INFORMATION proc; FILE *f; + int ret; ok(GetTempPathA(MAX_PATH, tmppath) != 0, "GetTempPath failed\n"); sprintf(cmdline, "%s data %s*\\* %swine_test/*", name, tmppath, tmppath); sprintf(filepath, "%swine_test", tmppath); - ok(!_mkdir(filepath), "_mkdir failed: %d\n", errno); + ret = _mkdir(filepath); + ok(!ret, "_mkdir failed: %d\n", errno); sprintf(filepath, "%swine_test\\a", tmppath); f = fopen(filepath, "w"); ok(f != NULL, "fopen(%s) failed: %d\n", filepath, errno);

1 0

Jacek Caban : atl80: Updated spec file.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: f28324a69c1ec3eaa81609d0138060150dad648d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28324a69c1ec3eaa81609d01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 19 14:17:16 2012 +0100 atl80: Updated spec file. --- dlls/atl80/atl80.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 1c940dd..c6e589e 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -29,7 +29,7 @@ 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl 42 stdcall AtlAxWinInit() atl100.AtlAxWinInit 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData -44 stub AtlWinModuleExtractCreateWndData +44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl @@ -49,5 +49,5 @@ 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA 64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc -65 stub AtlWinModuleInit +65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit 66 stub AtlWinModuleTerm

1 0

Jacek Caban : atl100: Added AtlWinModuleExtractCreateWndData tests.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: 5f4f215c2d9dd9465b8a96e00e6e9b10ec84a515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4f215c2d9dd9465b8a96e00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 19 14:17:07 2012 +0100 atl100: Added AtlWinModuleExtractCreateWndData tests. --- dlls/atl100/tests/atl.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 43d9bd5..7e6a7e0 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -27,7 +27,9 @@ static void test_winmodule(void) { + _AtlCreateWndData create_data[3]; _ATL_WIN_MODULE winmod; + void *p; HRESULT hres; winmod.cbSize = 0xdeadbeef; @@ -51,6 +53,46 @@ static void test_winmodule(void) winmod.m_rgWindowClassAtoms.m_nSize); ok(winmod.m_rgWindowClassAtoms.m_nAllocSize == 0xdeadbeef, "winmod.m_rgWindowClassAtoms.m_nAllocSize = %d\n", winmod.m_rgWindowClassAtoms.m_nAllocSize); + + InitializeCriticalSection(&winmod.m_csWindowCreate); + + AtlWinModuleAddCreateWndData(&winmod, create_data, (void*)0xdead0001); + ok(winmod.m_pCreateWndList == create_data, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[0].m_pThis == (void*)0xdead0001, "unexpected create_data[0].m_pThis %p\n", create_data[0].m_pThis); + ok(create_data[0].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[0].m_dwThreadID %x\n", + create_data[0].m_dwThreadID); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + + AtlWinModuleAddCreateWndData(&winmod, create_data+1, (void*)0xdead0002); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[1].m_pThis == (void*)0xdead0002, "unexpected create_data[1].m_pThis %p\n", create_data[1].m_pThis); + ok(create_data[1].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[1].m_dwThreadID %x\n", + create_data[1].m_dwThreadID); + ok(create_data[1].m_pNext == create_data, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + AtlWinModuleAddCreateWndData(&winmod, create_data+2, (void*)0xdead0003); + ok(winmod.m_pCreateWndList == create_data+2, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pThis == (void*)0xdead0003, "unexpected create_data[2].m_pThis %p\n", create_data[2].m_pThis); + ok(create_data[2].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[2].m_dwThreadID %x\n", + create_data[2].m_dwThreadID); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + p = AtlWinModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0003, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + create_data[1].m_dwThreadID = 0xdeadbeef; + + p = AtlWinModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0001, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + ok(!create_data[1].m_pNext+1, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + p = AtlWinModuleExtractCreateWndData(&winmod); + ok(!p, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); } START_TEST(atl)

1 0

Jacek Caban : atl100: Added AtlWinModuleExtractCreateWndData implementation .
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: c0456aea76bcd8ce77d7c91dfc95a5ff8670e344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0456aea76bcd8ce77d7c91df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 19 14:16:57 2012 +0100 atl100: Added AtlWinModuleExtractCreateWndData implementation. --- dlls/atl100/atl.c | 28 ++++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- include/atlbase.h | 1 + 3 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index bd3fbf1..570fe5c 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -319,6 +319,34 @@ void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pM, _AtlCreateWndData } /*********************************************************************** + * AtlWinModuleExtractCreateWndData [atl100.44] + */ +void* WINAPI AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE *winmod) +{ + _AtlCreateWndData *iter, *prev = NULL; + DWORD thread_id; + + TRACE("(%p)\n", winmod); + + thread_id = GetCurrentThreadId(); + + EnterCriticalSection(&winmod->m_csWindowCreate); + + for(iter = winmod->m_pCreateWndList; iter && iter->m_dwThreadID != thread_id; iter = iter->m_pNext) + prev = iter; + if(iter) { + if(prev) + prev->m_pNext = iter->m_pNext; + else + winmod->m_pCreateWndList = iter->m_pNext; + } + + LeaveCriticalSection(&winmod->m_csWindowCreate); + + return iter ? iter->m_pThis : NULL; +} + +/*********************************************************************** * AtlComModuleGetClassObject [atl100.15] */ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, REFIID riid, void **ppv) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 11cac7d..0c27070 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -27,7 +27,7 @@ 41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) -44 stub AtlWinModuleExtractCreateWndData +44 stdcall AtlWinModuleExtractCreateWndData(ptr) 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) diff --git a/include/atlbase.h b/include/atlbase.h index 95b1f2a..831150d 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -223,6 +223,7 @@ HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppS void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE*); void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE*,_AtlCreateWndData*,void*); +void* WINAPI AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE*); HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); void WINAPI AtlCallTermFunc(_ATL_MODULE*); void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM);

1 0

Detlef Riekenberg : api-ms-win-downlevel-shlwapi-l1-1-0: Add dll.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: 8ca7a068f4982a8c261604a8c4f7d1c3acbd8edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca7a068f4982a8c261604a8c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 17 11:37:46 2012 +0100 api-ms-win-downlevel-shlwapi-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 + .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 155 ++++++++++++++++++++ tools/make_specfiles | 4 + 5 files changed, 164 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ca7a068f4982a8c26160…

1 0

Detlef Riekenberg : api-ms-win-downlevel-advapi32-l1-1-0: Add dll.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: 52a231c5b78e7c49c00c51cf8dbd6f52f6b7af0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a231c5b78e7c49c00c51cf8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 17 11:37:45 2012 +0100 api-ms-win-downlevel-advapi32-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 + .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 145 ++++++++++++++++++++ tools/make_specfiles | 4 + 5 files changed, 154 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52a231c5b78e7c49c00c5…

1 0

Alexandre Julliard : make_specfiles: Don' t copy the ordinal flag if not appropriate.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: a0ec065666b581a961e937e7f473c6e87e3bb81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ec065666b581a961e937e7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 19 14:36:24 2012 +0100 make_specfiles: Don't copy the ordinal flag if not appropriate. --- tools/make_specfiles | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 93f5ff1..f618c56 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -219,7 +219,12 @@ sub update_spec_file($) goto done; } - my $flags = ($parent{callconv} ne "stub" || $update_flags) ? $parent{flags} : $descr{flags}; + my $flags = $descr{flags}; + if ($parent{callconv} ne "stub" || $update_flags) + { + $flags = $parent{flags}; + $flags =~ s/-ordinal\s*// if $descr{ordinal} eq "@"; + } if ($parent{callconv} ne "stub" || $parent{args}) {

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
55
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 December 2012