April 2014 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : oleaut32/tests: Add a test for loading an empty picture from a non-statable stream.
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: f20045c28ed593aa62dfdba52150272123a70c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20045c28ed593aa62dfdba52… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:03:09 2014 +0900 oleaut32/tests: Add a test for loading an empty picture from a non-statable stream. --- dlls/oleaut32/tests/olepicture.c | 56 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 26395b9..6861603 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1157,7 +1157,8 @@ static void test_load_save_empty_picture(void) HGLOBAL hmem; DWORD *mem; IPersistStream *src_stream; - IStream *dst_stream; + IStream *dst_stream, *stream; + LARGE_INTEGER offset; HRESULT hr; memset(&pic, 0, sizeof(pic)); @@ -1192,10 +1193,59 @@ static void test_load_save_empty_picture(void) GlobalUnlock(hmem); IPersistStream_Release(src_stream); + IPicture_Release(pic); + + /* first with statable and seekable stream */ + offset.QuadPart = 0; + hr = IStream_Seek(dst_stream, offset, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek %#x\n", hr); + + pic = NULL; + hr = pOleLoadPicture(dst_stream, 0, FALSE, &IID_IPicture, (void **)&pic); + ok(hr == S_OK, "OleLoadPicture error %#x\n", hr); + ok(pic != NULL,"picture should not be not NULL\n"); + if (pic != NULL) + { + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_NONE,"expected picture type PICTYPE_NONE, got %d\n", type); + + handle = (OLE_HANDLE)0xdeadbeef; + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(!handle, "get_Handle returned wrong handle %#x\n", handle); + + IPicture_Release(pic); + } IStream_Release(dst_stream); - GlobalFree(hmem); - IPicture_Release(pic); + /* again with non-statable and non-seekable stream */ + stream = NoStatStream_Construct(hmem); + ok(stream != NULL, "failed to create empty image stream\n"); + + pic = NULL; + hr = pOleLoadPicture(stream, 0, FALSE, &IID_IPicture, (void **)&pic); +todo_wine + ok(hr == S_OK, "OleLoadPicture error %#x\n", hr); +todo_wine + ok(pic != NULL,"picture should not be not NULL\n"); + if (pic != NULL) + { + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_NONE,"expected picture type PICTYPE_NONE, got %d\n", type); + + handle = (OLE_HANDLE)0xdeadbeef; + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(!handle, "get_Handle returned wrong handle %#x\n", handle); + + IPicture_Release(pic); + } + /* Non-statable impl always deletes on release */ + IStream_Release(stream); } START_TEST(olepicture)

1 0

Alexandre Julliard : Revert "server: Restore the masks from the previous get_message when a wait is satisfied. "
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: 202d91e5516766a859775801cca593595cc69767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=202d91e5516766a859775801c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 15:49:06 2014 +0200 Revert "server: Restore the masks from the previous get_message when a wait is satisfied." This reverts commit f846312f46bab8dc373a8fd98fdef9c3aebe8ee0. The masks will be stored on the client side instead. --- server/queue.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/server/queue.c b/server/queue.c index d919f01..1954886 100644 --- a/server/queue.c +++ b/server/queue.c @@ -117,10 +117,8 @@ struct msg_queue struct fd *fd; /* optional file descriptor to poll */ unsigned int wake_bits; /* wakeup bits */ unsigned int wake_mask; /* wakeup mask */ - unsigned int wake_get_msg; /* wakeup mask of last get_message */ unsigned int changed_bits; /* changed wakeup bits */ unsigned int changed_mask; /* changed wakeup mask */ - unsigned int changed_get_msg; /* changed wakeup mask of last get_message */ int paint_count; /* pending paint messages count */ int hotkey_count; /* pending hotkey messages count */ int quit_message; /* is there a pending quit message? */ @@ -279,10 +277,8 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ queue->fd = NULL; queue->wake_bits = 0; queue->wake_mask = 0; - queue->wake_get_msg = 0; queue->changed_bits = 0; queue->changed_mask = 0; - queue->changed_get_msg = 0; queue->paint_count = 0; queue->hotkey_count = 0; queue->quit_message = 0; @@ -931,8 +927,8 @@ static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entr static void msg_queue_satisfied( struct object *obj, struct wait_queue_entry *entry ) { struct msg_queue *queue = (struct msg_queue *)obj; - queue->wake_mask = queue->wake_get_msg; - queue->changed_mask = queue->changed_get_msg; + queue->wake_mask = 0; + queue->changed_mask = 0; } static void msg_queue_destroy( struct object *obj ) @@ -2201,11 +2197,7 @@ DECL_HANDLER(set_queue_mask) if (is_signaled( queue )) { /* if skip wait is set, do what would have been done in the subsequent wait */ - if (req->skip_wait) - { - queue->wake_mask = queue->wake_get_msg; - queue->changed_mask = queue->changed_get_msg; - } + if (req->skip_wait) queue->wake_mask = queue->changed_mask = 0; else wake_up( &queue->obj, 0 ); } } @@ -2377,7 +2369,6 @@ DECL_HANDLER(get_message) if (!queue) return; queue->last_get_msg = current_time; - queue->wake_get_msg = queue->changed_get_msg = 0; if (!filter) filter = QS_ALLINPUT; /* first check for sent messages */ @@ -2449,8 +2440,8 @@ DECL_HANDLER(get_message) } if (get_win == -1 && current->process->idle_event) set_event( current->process->idle_event ); - queue->wake_mask = queue->wake_get_msg = req->wake_mask; - queue->changed_mask = queue->changed_get_msg = req->changed_mask; + queue->wake_mask = req->wake_mask; + queue->changed_mask = req->changed_mask; set_error( STATUS_PENDING ); /* FIXME */ }

1 0

Dmitry Timoshkov : oleaut32: Fix loading of an empty picture from a non-statable stream.
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: 5fc94f0adc8c9e2ec54f4ff5935aaf9b6cd44b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc94f0adc8c9e2ec54f4ff59… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:03:17 2014 +0900 oleaut32: Fix loading of an empty picture from a non-statable stream. --- dlls/oleaut32/olepicture.c | 7 ++++++- dlls/oleaut32/tests/olepicture.c | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 6e4a737..599042c 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1390,12 +1390,17 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) } headerread += xread; xread = 0; - + if (!memcmp(&(header[0]),"lt\0\0", 4) && (statfailed || (header[1] + headerread <= statstg.cbSize.QuadPart))) { if (toread != 0 && toread != header[1]) FIXME("varying lengths of image data (prev=%u curr=%u), only last one will be used\n", toread, header[1]); toread = header[1]; + if (statfailed) + { + statstg.cbSize.QuadPart = header[1] + 8; + statfailed = FALSE; + } if (toread == 0) break; } else { if (!memcmp(&(header[0]), "GIF8", 4) || /* GIF header */ diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 6861603..46dd05f 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1226,9 +1226,7 @@ static void test_load_save_empty_picture(void) pic = NULL; hr = pOleLoadPicture(stream, 0, FALSE, &IID_IPicture, (void **)&pic); -todo_wine ok(hr == S_OK, "OleLoadPicture error %#x\n", hr); -todo_wine ok(pic != NULL,"picture should not be not NULL\n"); if (pic != NULL) {

1 0

Jacek Caban : mshtml: Ignore &IID_IWebBrowserPriv2IE7 in wb_qi.
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: e3383d1739f0a3ff9ebf1975f2cf6418bf125c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3383d1739f0a3ff9ebf1975f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 10 17:14:50 2014 +0200 mshtml: Ignore &IID_IWebBrowserPriv2IE7 in wb_qi. --- dlls/mshtml/tests/htmldoc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 313fb78..bad7291 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4977,6 +4977,7 @@ static IWebBrowser2 WebBrowser2 = { &WebBrowser2Vtbl }; static HRESULT wb_qi(REFIID riid, void **ppv) { + static const IID IID_IWebBrowserPriv2IE7 = {0x1af32b6c, 0xa3ba,0x48b9,{0xb2,0x4e,0x8a,0xa9,0xc4,0x1f,0x6e,0xcd}}; static const IID IID_IWebBrowserPriv2IE8XP = {0x486f6159,0x9f3f,0x4827,{0x82,0xd4,0x28,0x3c,0xef,0x39,0x77,0x33}}; *ppv = NULL; @@ -5006,6 +5007,11 @@ static HRESULT wb_qi(REFIID riid, void **ppv) return S_OK; } + if(IsEqualGUID(riid, &IID_IWebBrowserPriv2IE7)) { + trace("QI(IID_IWebBrowserPriv2IE7)\n"); + return E_NOINTERFACE; + } + if(IsEqualGUID(riid, &IID_IWebBrowserPriv2IE8XP)) { trace("QI(IID_IWebBrowserPriv2IE8XP)\n"); return E_NOINTERFACE;

1 0

Piotr Caban : user32: Don' t fail on windows without menu bar in DrawMenuBar.
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: 55ff0661038da271d92b5951a62f66e898b8cba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ff0661038da271d92b5951a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 10 14:50:33 2014 +0200 user32: Don't fail on windows without menu bar in DrawMenuBar. --- dlls/user32/menu.c | 17 +++++++++-------- dlls/user32/tests/menu.c | 2 -- dlls/user32/tests/msg.c | 11 +++++++++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 8bb508d..4a49ce6 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4360,17 +4360,18 @@ HMENU WINAPI GetSubMenu( HMENU hMenu, INT nPos ) BOOL WINAPI DrawMenuBar( HWND hWnd ) { LPPOPUPMENU lppop; - HMENU hMenu = GetMenu(hWnd); + HMENU hMenu; - if (!WIN_ALLOWED_MENU(GetWindowLongW( hWnd, GWL_STYLE ))) + if (!IsWindow( hWnd )) return FALSE; - if (!hMenu || !(lppop = MENU_GetMenu( hMenu ))) return FALSE; - lppop->Height = 0; /* Make sure we call MENU_MenuBarCalcSize */ - lppop->hwndOwner = hWnd; - SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | - SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); - return TRUE; + if ((hMenu = GetMenu( hWnd )) && (lppop = MENU_GetMenu( hMenu ))) { + lppop->Height = 0; /* Make sure we call MENU_MenuBarCalcSize */ + lppop->hwndOwner = hWnd; + } + + return SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | + SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); } /*********************************************************************** diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 7cab0a0..5fbe317 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -425,9 +425,7 @@ static void test_menu_locked_by_window(void) ok(ret, "DestroyMenu failed with error %d\n", GetLastError()); ret = DrawMenuBar(hwnd); - todo_wine { ok(ret, "DrawMenuBar failed with error %d\n", GetLastError()); - } ret = IsMenu(GetMenu(hwnd)); ok(!ret || broken(ret) /* nt4 */, "Menu handle should have been destroyed\n"); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7053ead..a209492 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4819,13 +4819,19 @@ static void test_messages(void) after_end_dialog = FALSE; test_def_id = FALSE; - hwnd = CreateWindowExA(0, "TestDialogClass", NULL, WS_POPUP, + hwnd = CreateWindowExA(0, "TestDialogClass", NULL, WS_POPUP|WS_CHILD, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL); ok(hwnd != 0, "Failed to create custom dialog window\n"); flush_sequence(); trace("call ShowWindow(%p, SW_SHOW)\n", hwnd); ShowWindow(hwnd, SW_SHOW); ok_sequence(WmShowCustomDialogSeq, "ShowCustomDialog", TRUE); + + flush_events(); + flush_sequence(); + ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); + flush_events(); + ok_sequence(WmDrawMenuBarSeq, "DrawMenuBar", FALSE); DestroyWindow(hwnd); flush_sequence(); @@ -4836,7 +4842,8 @@ static void test_messages(void) flush_sequence(); /* Message sequence for SetMenu */ - ok(!DrawMenuBar(hwnd), "DrawMenuBar should return FALSE for a window without a menu\n"); + ok(!DrawMenuBar(hwnd), "DrawMenuBar should return FALSE for a destroyed window\n"); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "last error is %d\n", GetLastError()); ok_sequence(WmEmptySeq, "DrawMenuBar for a window without a menu", FALSE); hmenu = CreateMenu();

1 0

Dmitry Timoshkov : taskschd: Add support for registering a task with NULL name in the root folder.
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: 39c1c9c262725fef9a8e8d0af744389eea668c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c1c9c262725fef9a8e8d0af… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:41:45 2014 +0900 taskschd: Add support for registering a task with NULL name in the root folder. Because server receives full task name it can't autogenerate a name in a non-root folder. --- dlls/taskschd/regtask.c | 20 ++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 7 +------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 5e9d5d3..10562fe 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -313,8 +313,21 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit RegisteredTask *regtask; HRESULT hr; - full_name = get_full_path(path, name); - if (!full_name) return E_OUTOFMEMORY; + if (!name) + { + if (!create) return E_INVALIDARG; + + /* NULL task name is allowed only in the root folder */ + if (path[0] != '\\' || path[1]) + return E_INVALIDARG; + + full_name = NULL; + } + else + { + full_name = get_full_path(path, name); + if (!full_name) return E_OUTOFMEMORY; + } regtask = heap_alloc(sizeof(*regtask)); if (!regtask) @@ -337,6 +350,9 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit SysFreeString(xml); return hr; } + + heap_free(full_name); + full_name = heap_strdupW(actual_path); MIDL_user_free(actual_path); } else diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index b3fe9ea..6751f62 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -851,7 +851,6 @@ todo_wine IRegisteredTask_Release(task2); hr = ITaskFolder_GetTask(root, NULL, &task1); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = ITaskFolder_GetTask(root, Wine_Task1, NULL); @@ -929,10 +928,8 @@ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_RegisterTask(root, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); -todo_wine ok(hr == S_OK, "RegisterTask error %#x\n", hr); -if (hr == S_OK) -{ + hr = IRegisteredTask_get_Name(task1, &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); hr = IIDFromString(bstr, &iid); @@ -942,10 +939,8 @@ if (hr == S_OK) hr = ITaskFolder_DeleteTask(root, bstr, 0); ok(hr == S_OK, "DeleteTask error %#x\n", hr); -} hr = ITaskFolder_RegisterTask(folder, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); ITaskFolder_Release(folder);

1 0

Dmitry Timoshkov : taskschd/tests: Add a test for registering a task with NULL name in a not root folder.
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: adc60c779f785df9f4c46537321336904ddf26a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc60c779f785df9f4c465373… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:41:39 2014 +0900 taskschd/tests: Add a test for registering a task with NULL name in a not root folder. --- dlls/taskschd/tests/scheduler.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 17501ad..b3fe9ea 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -931,8 +931,8 @@ todo_wine hr = ITaskFolder_RegisterTask(root, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); todo_wine ok(hr == S_OK, "RegisterTask error %#x\n", hr); - /* FIXME: Remove once implemented */ - if (hr != S_OK) goto failed; +if (hr == S_OK) +{ hr = IRegisteredTask_get_Name(task1, &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); hr = IIDFromString(bstr, &iid); @@ -942,8 +942,12 @@ todo_wine hr = ITaskFolder_DeleteTask(root, bstr, 0); ok(hr == S_OK, "DeleteTask error %#x\n", hr); +} + + hr = ITaskFolder_RegisterTask(folder, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); -failed: ITaskFolder_Release(folder); hr = ITaskFolder_DeleteFolder(root, Wine, 0);

1 0

Nikolay Sivov : msi: Fix a leak on error path (Coverity).
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: 5497a41e9256f8e7f99bd860c445543bc7f5c942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5497a41e9256f8e7f99bd860c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 10 09:22:13 2014 +0400 msi: Fix a leak on error path (Coverity). --- dlls/msi/source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index ab8541c..2b88ce3 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1153,7 +1153,7 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, list_init(&sourcelist); rc = fill_source_list(&sourcelist, typekey, &count); if (rc != ERROR_NO_MORE_ITEMS) - return rc; + goto done; size = (lstrlenW(source) + 1) * sizeof(WCHAR);

1 0

Alexandre Julliard : makedep: Add support for specifying an object directory different from the current directory.
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: dcf6060ab8aab4724ada508db295a85634ca51d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf6060ab8aab4724ada508db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 10:03:03 2014 +0200 makedep: Add support for specifying an object directory different from the current directory. --- tools/makedep.c | 222 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 124 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dcf6060ab8aab4724ada5…

1 0

Alexandre Julliard : makedep: Store the sources list inside the makefile structure.
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: 4cb68d2322a396ba7ef3ff9b5601a6ce59e57e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb68d2322a396ba7ef3ff9b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 13:50:37 2014 +0200 makedep: Store the sources list inside the makefile structure. --- tools/makedep.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 63b4de9..3c1f8bd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -82,7 +82,6 @@ static const struct { FLAG_IDL_HEADER, ".h" } }; -static struct list sources = LIST_INIT(sources); static struct list includes = LIST_INIT(includes); struct strarray @@ -126,6 +125,7 @@ struct makefile struct strarray imports; struct strarray delayimports; struct strarray extradllflags; + struct list sources; const char *base_dir; const char *src_dir; const char *obj_dir; @@ -654,11 +654,11 @@ static char *get_line( FILE *file ) /******************************************************************* * find_src_file */ -static struct incl_file *find_src_file( const char *name ) +static struct incl_file *find_src_file( struct makefile *make, const char *name ) { struct incl_file *file; - LIST_FOR_EACH_ENTRY( file, &sources, struct incl_file, entry ) + LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) if (!strcmp( name, file->name )) return file; return NULL; } @@ -741,13 +741,13 @@ static struct incl_file *add_generated_source( struct makefile *make, { struct incl_file *file; - if ((file = find_src_file( name ))) return file; /* we already have it */ + if ((file = find_src_file( make, name ))) return file; /* we already have it */ file = xmalloc( sizeof(*file) ); memset( file, 0, sizeof(*file) ); file->name = xstrdup( name ); file->filename = obj_dir_path( make, filename ? filename : name ); file->flags = FLAG_GENERATED; - list_add_tail( &sources, &file->entry ); + list_add_tail( &make->sources, &file->entry ); return file; } @@ -1280,11 +1280,11 @@ static struct incl_file *add_src_file( struct makefile *make, const char *name ) { struct incl_file *file; - if ((file = find_src_file( name ))) return file; /* we already have it */ + if ((file = find_src_file( make, name ))) return file; /* we already have it */ file = xmalloc( sizeof(*file) ); memset( file, 0, sizeof(*file) ); file->name = xstrdup(name); - list_add_tail( &sources, &file->entry ); + list_add_tail( &make->sources, &file->entry ); parse_file( make, file, 1 ); return file; } @@ -1434,7 +1434,7 @@ static void add_generated_sources( struct makefile *make ) { struct incl_file *source, *next, *file; - LIST_FOR_EACH_ENTRY_SAFE( source, next, &sources, struct incl_file, entry ) + LIST_FOR_EACH_ENTRY_SAFE( source, next, &make->sources, struct incl_file, entry ) { if (source->flags & FLAG_IDL_CLIENT) { @@ -1582,7 +1582,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t if (make->use_msvcrt) strarray_add( &includes, strmake( "-I%s", top_dir_path( make, "include/msvcrt" ))); strarray_addall( &includes, make->include_args ); - LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) + LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) { struct strarray extradefs; char *obj = xstrdup( source->name ); @@ -1690,7 +1690,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t { if (!(source->flags & idl_outputs[i].flag)) continue; dest = strmake( "%s%s", obj, idl_outputs[i].ext ); - if (!find_src_file( dest )) strarray_add( &clean_files, dest ); + if (!find_src_file( make, dest )) strarray_add( &clean_files, dest ); strarray_add( &targets, dest ); } if (source->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); @@ -2444,7 +2444,7 @@ static void update_makefile( const char *path ) strarray_add_uniq( &make->define_args, value.str[i] ); strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" )); - list_init( &sources ); + list_init( &make->sources ); list_init( &includes ); for (var = source_vars; *var; var++)

1 0