February 2006 - Wine-Commits

Robert Shearman : oleaut: Fix standard font cloning.
by Alexandre Julliard Feb. 24, 2006

Feb. 24, 2006

Module: wine Branch: refs/heads/master Commit: 7fbca4c1117549553c289e4cfac54b4e63d93c42 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7fbca4c1117549553c289e4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Feb 23 19:01:02 2006 +0000 oleaut: Fix standard font cloning. Create new empty connection points on clone of the standard Font (based on a patch by Alex Villacís Lasso). --- dlls/oleaut32/olefont.c | 11 +++++++++++ dlls/oleaut32/tests/olefont.c | 17 ++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index b213f50..a9110e7 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1109,6 +1109,17 @@ static HRESULT WINAPI OLEFontImpl_Clone( newObject->gdiFont = CreateFontIndirectW(&logFont); + /* create new connection points */ + newObject->pPropertyNotifyCP = NULL; + newObject->pFontEventsCP = NULL; + CreateConnectionPoint((IUnknown*)newObject, &IID_IPropertyNotifySink, &newObject->pPropertyNotifyCP); + CreateConnectionPoint((IUnknown*)newObject, &IID_IFontEventsDisp, &newObject->pFontEventsCP); + + if (!newObject->pPropertyNotifyCP || !newObject->pFontEventsCP) + { + OLEFontImpl_Destroy(newObject); + return E_OUTOFMEMORY; + } /* The cloned object starts with a reference count of 1 */ newObject->ref = 1; diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 5906749..1fb1596 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -206,7 +206,7 @@ static ULONG WINAPI FontEventsDisp_Relea return 1; } -static BOOL fonteventsdisp_invoke_called = FALSE; +static int fonteventsdisp_invoke_called = 0; static HRESULT WINAPI FontEventsDisp_Invoke( IFontEventsDisp __RPC_FAR * iface, @@ -226,7 +226,7 @@ static HRESULT WINAPI FontEventsDisp_Inv ok(V_VT(&pDispParams->rgvarg[0]) == VT_BSTR, "VT of first param should have been VT_BSTR instead of %d\n", V_VT(&pDispParams->rgvarg[0])); ok(!lstrcmpW(V_BSTR(&pDispParams->rgvarg[0]), wszBold), "String in first param should have been \"Bold\"\n"); - fonteventsdisp_invoke_called = TRUE; + fonteventsdisp_invoke_called++; return S_OK; } @@ -246,6 +246,7 @@ static IFontEventsDisp FontEventsDisp = static void test_font_events_disp(void) { IFont *pFont; + IFont *pFont2; IConnectionPointContainer *pCPC; IConnectionPoint *pCP; FONTDESC fontdesc; @@ -279,9 +280,19 @@ static void test_font_events_disp(void) hr = IFont_put_Bold(pFont, TRUE); ok_ole_success(hr, "IFont_put_Bold"); - ok(fonteventsdisp_invoke_called, "IFontEventDisp::Invoke wasn't called\n"); + ok(fonteventsdisp_invoke_called == 1, "IFontEventDisp::Invoke wasn't called once\n"); + hr = IFont_Clone(pFont, &pFont2); + ok_ole_success(hr, "IFont_Clone"); IFont_Release(pFont); + + hr = IFont_put_Bold(pFont2, TRUE); + ok_ole_success(hr, "IFont_put_Bold"); + + /* this test shows that the notification routine isn't called again */ + ok(fonteventsdisp_invoke_called == 1, "IFontEventDisp::Invoke wasn't called once\n"); + + IFont_Release(pFont2); } START_TEST(olefont)

1 0

Francois Gouget : user: Give meaningful names to the structures used to transfer
by Alexandre Julliard Feb. 24, 2006

Feb. 24, 2006

Module: wine Branch: refs/heads/master Commit: 1f297893e57e0f24974065dbcb029968e3ef71af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f297893e57e0f24974065d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 23 17:57:59 2006 +0100 user: Give meaningful names to the structures used to transfer information to the test threads. --- dlls/user/tests/msg.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index dd671d7..5b3cac5 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -5535,12 +5535,12 @@ static void test_message_conversion(void ok( ret, "DestroyWindow() error %ld\n", GetLastError()); } -typedef struct _thread_info +struct timer_info { HWND hWnd; HANDLE handles[2]; DWORD id; -} thread_info; +}; static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT id, DWORD dwTime) { @@ -5550,7 +5550,7 @@ static VOID CALLBACK tfunc(HWND hwnd, UI static DWORD WINAPI timer_thread_proc(LPVOID x) { - thread_info *info = x; + struct timer_info *info = x; DWORD r; r = KillTimer(info->hWnd, 0x19); @@ -5565,7 +5565,7 @@ static DWORD WINAPI timer_thread_proc(LP static void test_timers(void) { - thread_info info; + struct timer_info info; DWORD id; info.hWnd = CreateWindow ("TestWindowClass", NULL, @@ -6432,7 +6432,7 @@ static const struct message WmUser[] = { { 0 } }; -struct thread_info +struct sendmsg_info { HWND hwnd; DWORD timeout; @@ -6441,7 +6441,7 @@ struct thread_info static DWORD CALLBACK send_msg_thread( LPVOID arg ) { - struct thread_info *info = arg; + struct sendmsg_info *info = arg; info->ret = SendMessageTimeoutA( info->hwnd, WM_USER, 0, 0, 0, info->timeout, NULL ); if (!info->ret) ok( GetLastError() == ERROR_TIMEOUT, "unexpected error %ld\n", GetLastError()); return 0; @@ -6466,7 +6466,7 @@ static void test_SendMessageTimeout(void { MSG msg; HANDLE thread; - struct thread_info info; + struct sendmsg_info info; DWORD tid; info.hwnd = CreateWindowA( "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, @@ -6783,7 +6783,7 @@ static const struct message WmUserChar[] #define EV_SENDMSG 1 #define EV_ACK 2 -struct thread_info_2 +struct peekmsg_info { HWND hwnd; HANDLE hevent[3]; /* 0 - start/stop, 1 - SendMessage, 2 - ack */ @@ -6792,7 +6792,7 @@ struct thread_info_2 static DWORD CALLBACK send_msg_thread_2(void *param) { DWORD ret; - struct thread_info_2 *info = param; + struct peekmsg_info *info = param; trace("thread: waiting for start\n"); WaitForSingleObject(info->hevent[EV_START_STOP], INFINITE); @@ -6830,7 +6830,7 @@ static void test_PeekMessage(void) DWORD tid, qstatus; UINT qs_all_input = QS_ALLINPUT; UINT qs_input = QS_INPUT; - struct thread_info_2 info; + struct peekmsg_info info; info.hwnd = CreateWindowA("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL);

1 0

Ulrich Czekalla : msi: When evaluating conditions, if the condition is empty or none is
by Alexandre Julliard Feb. 24, 2006

Feb. 24, 2006

Module: wine Branch: refs/heads/master Commit: 2ee5a5bf7c4cc67f40a3dc7d5e8325224713dc85 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2ee5a5bf7c4cc67f40a3dc7… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Thu Feb 23 11:33:10 2006 -0500 msi: When evaluating conditions, if the condition is empty or none is provided then treat it as being satisfied. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 0a8fa50..69909a7 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1991,7 +1991,7 @@ static UINT msi_dialog_control_event( MS condition = MSI_RecordGetString( rec, 5 ); r = MSI_EvaluateConditionW( dialog->package, condition ); - if( r == MSICONDITION_TRUE ) + if( r == MSICONDITION_TRUE || r == MSICONDITION_NONE ) { event = MSI_RecordGetString( rec, 3 ); arg = MSI_RecordGetString( rec, 4 );

1 0

Huw Davies : msxml3: Fix for empty node lists.
by Alexandre Julliard Feb. 24, 2006

Feb. 24, 2006

Module: wine Branch: refs/heads/master Commit: 4eb389bbdf479ed762ab76015f5b0a5bdcd6f7f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4eb389bbdf479ed762ab760… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 23 14:10:06 2006 +0000 msxml3: Fix for empty node lists. --- dlls/msxml3/nodelist.c | 9 +++---- dlls/msxml3/tests/domdoc.c | 58 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 407c5f7..7543b75 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -61,6 +61,8 @@ static void xslt_info_init( struct xslt_ static int create_xslt_parser( struct xslt_info *info, xmlNodePtr node, const xmlChar *str ) { + if(!node) return 1; + info->sheet = xsltNewStylesheet(); if (!info->sheet) return 0; @@ -220,7 +222,7 @@ static ULONG WINAPI xmlnodelist_Release( if ( ref == 0 ) { free_xslt_info( &This->xinfo ); - xmldoc_release( This->node->doc ); + if(This->node) xmldoc_release( This->node->doc ); HeapFree( GetProcessHeap(), 0, This ); } @@ -424,7 +426,7 @@ static xmlnodelist *new_nodelist( xmlNod nodelist->enum_children = FALSE; xslt_info_init( &nodelist->xinfo ); - xmldoc_add_ref( node->doc ); + if(node) xmldoc_add_ref( node->doc ); return nodelist; } @@ -432,15 +434,12 @@ static xmlnodelist *new_nodelist( xmlNod IXMLDOMNodeList* create_nodelist( xmlNodePtr node ) { xmlnodelist *nodelist = new_nodelist( node ); - if (!node) - return NULL; return (IXMLDOMNodeList*) &nodelist->lpVtbl; } IXMLDOMNodeList* create_filtered_nodelist( xmlNodePtr node, const xmlChar *str, BOOL enum_children ) { xmlnodelist *This = new_nodelist( node ); - if (create_xslt_parser( &This->xinfo, node, str )) { This->enum_children = enum_children; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1b5eb23..6de17e2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -58,6 +58,7 @@ static const WCHAR szComplete4[] = { 'p','n','=','\'','w','i','n','e',' ','2','0','0','5','0','8','0','4','\'','>','\n', 'f','n','2','.','t','x','t','\n', '<','/','p','r','>','\n', + '<','e','m','p','t','y','>','<','/','e','m','p','t','y','>','\n', '<','/','l','c','>','\n',0 }; static const WCHAR szNonExistentFile[] = { @@ -494,7 +495,7 @@ todo_wine { r = IXMLDOMNodeList_get_length( list, &count ); ok( r == S_OK, "get_length returns %08lx\n", r ); - ok( count == 2, "get_length got %ld\n", count ); + ok( count == 3, "get_length got %ld\n", count ); r = IXMLDOMNodeList_nextNode( list, &node ); ok( r == S_OK, "nextNode returned wrong code\n"); @@ -803,7 +804,7 @@ static void test_getElementsByTagName(vo ok( r == S_OK, "ret %08lx\n", r ); r = IXMLDOMNodeList_get_length( node_list, &len ); ok( r == S_OK, "ret %08lx\n", r ); - ok( len == 3, "len %ld\n", len ); + ok( len == 4, "len %ld\n", len ); IXMLDOMNodeList_Release( node_list ); SysFreeString( str ); @@ -904,6 +905,58 @@ todo_wine { IXMLDOMDocument_Release( doc ); } +static void test_get_childNodes(void) +{ + HRESULT r; + BSTR str; + VARIANT_BOOL b; + IXMLDOMDocument *doc; + IXMLDOMElement *element; + IXMLDOMNode *node, *node2; + IXMLDOMNodeList *node_list, *node_list2; + long len; + + r = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); + if( r != S_OK ) + return; + + str = SysAllocString( szComplete4 ); + r = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( r == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + r = IXMLDOMDocument_get_documentElement( doc, &element ); + ok( r == S_OK, "ret %08lx\n", r); + + r = IXMLDOMElement_get_childNodes( element, &node_list ); + ok( r == S_OK, "ret %08lx\n", r); + + r = IXMLDOMNodeList_get_length( node_list, &len ); + ok( r == S_OK, "ret %08lx\n", r); + ok( len == 3, "len %ld\n", len); + + r = IXMLDOMNodeList_get_item( node_list, 2, &node ); + ok( r == S_OK, "ret %08lx\n", r); + + r = IXMLDOMNode_get_childNodes( node, &node_list2 ); + ok( r == S_OK, "ret %08lx\n", r); + + r = IXMLDOMNodeList_get_length( node_list2, &len ); + ok( r == S_OK, "ret %08lx\n", r); + ok( len == 0, "len %ld\n", len); + + r = IXMLDOMNodeList_get_item( node_list2, 0, &node2); + ok( r == S_FALSE, "ret %08lx\n", r); + + IXMLDOMNodeList_Release( node_list2 ); + IXMLDOMNode_Release( node ); + IXMLDOMNodeList_Release( node_list ); + IXMLDOMElement_Release( element ); + IXMLDOMDocument_Release( doc ); +} + START_TEST(domdoc) { HRESULT r; @@ -917,6 +970,7 @@ START_TEST(domdoc) test_create(); test_getElementsByTagName(); test_get_text(); + test_get_childNodes(); CoUninitialize(); }

1 0

Dmitry Timoshkov : gdi: Use "MS Sans Serif" as default sans serif font, not Arial.
by Alexandre Julliard Feb. 24, 2006

Feb. 24, 2006

Module: wine Branch: refs/heads/master Commit: 69a23a608eea59624b2f37ab424e0f42b3da5baf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69a23a608eea59624b2f37a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 23 20:33:06 2006 +0800 gdi: Use "MS Sans Serif" as default sans serif font, not Arial. --- dlls/gdi/freetype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index ad0d6eb..51e92b8 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -284,10 +284,10 @@ static struct list font_list = LIST_INIT static const WCHAR defSerif[] = {'T','i','m','e','s',' ','N','e','w',' ', 'R','o','m','a','n','\0'}; -static const WCHAR defSans[] = {'A','r','i','a','l','\0'}; +static const WCHAR defSans[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR defFixed[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; -static const WCHAR defSystem[] = {'A','r','i','a','l','\0'}; +static const WCHAR defSystem[] = {'S','y','s','t','e','m','\0'}; static const WCHAR SystemW[] = {'S','y','s','t','e','m','\0'}; static const WCHAR MSSansSerifW[] = {'M','S',' ','S','a','n','s',' ', 'S','e','r','i','f','\0'};

1 0

Huw Davies : gdi32: Fallback to StretchDIBits if the driver doesn' t support BitBlt.
by Alexandre Julliard Feb. 24, 2006

Feb. 24, 2006

Module: wine Branch: refs/heads/master Commit: 66a05b2aec118946d75f159237a3c73df38f2486 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=66a05b2aec118946d75f159… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 23 12:02:03 2006 +0000 gdi32: Fallback to StretchDIBits if the driver doesn't support BitBlt. --- dlls/gdi/bitblt.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 56 insertions(+), 7 deletions(-) diff --git a/dlls/gdi/bitblt.c b/dlls/gdi/bitblt.c index d15b39a..221fc6d 100644 --- a/dlls/gdi/bitblt.c +++ b/dlls/gdi/bitblt.c @@ -55,19 +55,68 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst BOOL ret = FALSE; DC *dcDst, *dcSrc; - if ((dcSrc = DC_GetDCUpdate( hdcSrc ))) GDI_ReleaseObj( hdcSrc ); - /* FIXME: there is a race condition here */ - if ((dcDst = DC_GetDCUpdate( hdcDst ))) + if ((dcDst = DC_GetDCUpdate( hdcDst )) && dcDst->funcs->pBitBlt) { - dcSrc = DC_GetDCPtr( hdcSrc ); + GDI_ReleaseObj( hdcDst ); + /* FIXME: there is a race condition here */ + dcSrc = DC_GetDCUpdate( hdcSrc ); + dcDst = DC_GetDCPtr( hdcDst ); TRACE("hdcSrc=%p %d,%d -> hdcDest=%p %d,%d %dx%d rop=%06lx\n", hdcSrc, xSrc, ySrc, hdcDst, xDst, yDst, width, height, rop); - if (dcDst->funcs->pBitBlt) - ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, - dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, rop ); + + ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, + dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, rop ); + + GDI_ReleaseObj( hdcDst ); if (dcSrc) GDI_ReleaseObj( hdcSrc ); + } + else if(dcDst && dcDst->funcs->pStretchDIBits) + { + BITMAP bm; + BITMAPINFOHEADER info_hdr; + HBITMAP hbm; + LPVOID bits; + INT lines; + GDI_ReleaseObj( hdcDst ); + + if(GetObjectType( hdcSrc ) != OBJ_MEMDC) + { + FIXME("hdcSrc isn't a memory dc. Don't yet cope with this\n"); + return FALSE; + } + + GetObjectW(GetCurrentObject(hdcSrc, OBJ_BITMAP), sizeof(bm), &bm); + + info_hdr.biSize = sizeof(info_hdr); + info_hdr.biWidth = bm.bmWidth; + info_hdr.biHeight = bm.bmHeight; + info_hdr.biPlanes = 1; + info_hdr.biBitCount = 32; + info_hdr.biCompression = BI_RGB; + info_hdr.biSizeImage = 0; + info_hdr.biXPelsPerMeter = 0; + info_hdr.biYPelsPerMeter = 0; + info_hdr.biClrUsed = 0; + info_hdr.biClrImportant = 0; + + if(!(bits = HeapAlloc(GetProcessHeap(), 0, bm.bmHeight * bm.bmWidth * 4))) + return FALSE; + + /* Select out the src bitmap before calling GetDIBits */ + hbm = SelectObject(hdcSrc, GetStockObject(DEFAULT_BITMAP)); + GetDIBits(hdcSrc, hbm, 0, bm.bmHeight, bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS); + SelectObject(hdcSrc, hbm); + + lines = StretchDIBits(hdcDst, xDst, yDst, width, height, xSrc, ySrc, width, height, + bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS, rop); + + HeapFree(GetProcessHeap(), 0, bits); + return (lines == bm.bmHeight); } + else if(dcDst) + GDI_ReleaseObj( hdcDst ); + return ret; }

1 0

Detlef Riekenberg : cfgmgr32: Forward some functions to setupapi.dll.
by Alexandre Julliard Feb. 24, 2006

Feb. 24, 2006

Module: wine Branch: refs/heads/master Commit: 56247a2084174a7ba02d9a695cd582efa8ccac8f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=56247a2084174a7ba02d9a6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Feb 23 12:26:22 2006 +0100 cfgmgr32: Forward some functions to setupapi.dll. --- dlls/cfgmgr32/Makefile.in | 2 +- dlls/cfgmgr32/cfgmgr32.spec | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/cfgmgr32/Makefile.in b/dlls/cfgmgr32/Makefile.in index 597f662..d128841 100644 --- a/dlls/cfgmgr32/Makefile.in +++ b/dlls/cfgmgr32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cfgmgr32.dll IMPORTLIB = libcfgmgr32.$(IMPLIBEXT) -IMPORTS = kernel32 +IMPORTS = setupapi kernel32 C_SRCS = \ main.c diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 6f7a877..2d53dd1 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -8,7 +8,7 @@ @ stub CM_Add_Res_Des @ stub CM_Add_Res_Des_Ex @ stub CM_Connect_MachineA -@ stub CM_Connect_MachineW +@ stdcall CM_Connect_MachineW(wstr ptr) setupapi.CM_Connect_MachineW @ stub CM_Create_DevNodeA @ stub CM_Create_DevNodeW @ stub CM_Create_DevNode_ExA @@ -23,7 +23,7 @@ @ stub CM_Detect_Resource_Conflict_Ex @ stub CM_Disable_DevNode @ stub CM_Disable_DevNode_Ex -@ stub CM_Disconnect_Machine +@ stdcall CM_Disconnect_Machine(long) setupapi.CM_Disconnect_Machine @ stub CM_Dup_Range_List @ stub CM_Enable_DevNode @ stub CM_Enable_DevNode_Ex @@ -177,3 +177,4 @@ @ stub CM_Unregister_Device_InterfaceW @ stub CM_Unregister_Device_Interface_ExA @ stub CM_Unregister_Device_Interface_ExW +@ stdcall CMP_WaitNoPendingInstallEvents(long) setupapi.CMP_WaitNoPendingInstallEvents

1 0

Mike McCormack : server: Add directories to recursive watches as they' re opened.
by Alexandre Julliard Feb. 23, 2006

Feb. 23, 2006

Module: wine Branch: refs/heads/master Commit: 42121085985b3995692c4b40ee1b127963785223 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42121085985b3995692c4b4… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Feb 23 00:45:34 2006 +0900 server: Add directories to recursive watches as they're opened. --- server/change.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/server/change.c b/server/change.c index 923bbce..4a8d222 100644 --- a/server/change.c +++ b/server/change.c @@ -934,6 +934,105 @@ static int inotify_adjust_changes( struc return 1; } +static char *get_basename( const char *link ) +{ + char *buffer, *name = NULL; + int r, n = 0x100; + + while (1) + { + buffer = malloc( n ); + if (!buffer) break; + + r = readlink( link, buffer, n ); + if (r < 0) + break; + + if (r < n) + { + name = buffer; + break; + } + free( buffer ); + n *= 2; + } + + if (name) + { + while (r > 0 && name[ r - 1 ] == '/' ) + r--; + name[ r ] = 0; + + name = strrchr( name, '/' ); + if (name) + name = strdup( &name[1] ); + } + + free( buffer ); + return name; +} + +static int dir_add_to_existing_notify( struct dir *dir ) +{ + struct inode *inode, *parent; + unsigned int filter = 0; + struct stat st, st_new; + char link[35], *name; + int wd, unix_fd; + + if (!inotify_fd) + return 0; + + unix_fd = get_unix_fd( dir->fd ); + + /* check if it's in the list of inodes we want to watch */ + if (-1 == fstat( unix_fd, &st_new )) + return 0; + inode = find_inode( st_new.st_dev, st_new.st_ino ); + if (inode) + return 0; + + /* lookup the parent */ + sprintf( link, "/proc/self/fd/%u/..", unix_fd ); + if (-1 == stat( link, &st )) + return 0; + + /* + * If there's no parent, stop. We could keep going adding + * ../ to the path until we hit the root of the tree or + * find a recursively watched ancestor. + * Assume it's too expensive to search up the tree for now. + */ + parent = find_inode( st.st_dev, st.st_ino ); + if (!parent) + return 0; + + if (parent->wd == -1) + return 0; + + filter = filter_from_inode( parent, 1 ); + if (!filter) + return 0; + + sprintf( link, "/proc/self/fd/%u", unix_fd ); + name = get_basename( link ); + if (!name) + return 0; + inode = inode_add( parent, st_new.st_dev, st_new.st_ino, name ); + free( name ); + if (!inode) + return 0; + + /* Couldn't find this inode at the start of the function, must be new */ + assert( inode->wd == -1 ); + + wd = inotify_add_dir( link, filter ); + if (wd != -1) + inode_set_wd( inode, wd ); + + return 1; +} + #else static int init_inotify( void ) @@ -951,6 +1050,11 @@ static void free_inode( struct inode *in assert( 0 ); } +static int dir_add_to_existing_notify( struct dir *dir ) +{ + return 0; +} + #endif /* USE_INOTIFY */ struct object *create_dir_obj( struct fd *fd ) @@ -973,6 +1077,8 @@ struct object *create_dir_obj( struct fd dir->fd = fd; set_fd_user( fd, &dir_fd_ops, &dir->obj ); + dir_add_to_existing_notify( dir ); + return &dir->obj; }

1 0

Juan Lang : wincrypt: Add OIDs.
by Alexandre Julliard Feb. 23, 2006

Feb. 23, 2006

Module: wine Branch: refs/heads/master Commit: 3faa942c8fd4eb32925c2a1eb62ca12d666518a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3faa942c8fd4eb32925c2a1… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Feb 22 22:25:19 2006 -0800 wincrypt: Add OIDs. --- include/wincrypt.h | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index e19f6b1..8d82ebe 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2127,6 +2127,36 @@ static const WCHAR CERT_PHYSICAL_STORE_A #define szOID_PKCS_12_LOCAL_KEY_ID "1.2.840.113549.1.9.21" #define szOID_CERT_EXTENSIONS "1.3.6.1.4.1.311.2.1.14" #define szOID_NEXT_UPDATE_LOCATION "1.3.6.1.4.1.311.10.2" +#define szOID_KP_CTL_USAGE_SIGNING "1.3.6.1.4.1.311.10.3.1" +#define szOID_KP_TIME_STAMP_SIGNING "1.3.6.1.4.1.311.10.3.2" +#ifndef szOID_SERVER_GATED_CRYPTO +#define szOID_SERVER_GATED_CRYPTO "1.3.6.1.4.1.311.10.3.3" +#endif +#define szOID_KP_EFS "1.3.6.1.4.1.311.10.3.4" +#define szOID_EFS_RECOVERY "1.3.6.1.4.1.311.10.3.4.1" +#define szOID_WHQL_CRYPTO "1.3.6.1.4.1.311.10.3.5" +#define szOID_NT5_CRYPTO "1.3.6.1.4.1.311.10.3.6" +#define szOID_OEM_WHQL_CRYPTO "1.3.6.1.4.1.311.10.3.7" +#define szOID_EMBEDDED_NT_CRYPTO "1.3.6.1.4.1.311.10.3.8" +#define szOID_ROOT_LIST_SIGNER "1.3.6.1.4.1.311.10.3.9" +#define szOID_KP_QUALIFIED_SUBORDINATION "1.3.6.1.4.1.311.10.3.10" +#define szOID_KP_KEY_RECOVERY "1.3.6.1.4.1.311.10.3.11" +#define szOID_KP_DOCUMENT_SIGNING "1.3.6.1.4.1.311.10.3.12" +#define szOID_KP_LIFETIME_SIGNING "1.3.6.1.4.1.311.10.3.13" +#define szOID_KP_MOBILE_DEVICE_SOFTWARE "1.3.6.1.4.1.311.10.3.14" +#define szOID_YESNO_TRUST_ATTR "1.3.6.1.4.1.311.10.4.1" +#ifndef szOID_DRM +#define szOID_DRM "1.3.6.1.4.1.311.10.5.1" +#endif +#ifndef szOID_DRM_INDIVIDUALIZATION +#define szOID_DRM_INDIVIDUALIZATION "1.3.6.1.4.1.311.10.5.2" +#endif +#ifndef szOID_LICENSES +#define szOID_LICENSES "1.3.6.1.4.1.311.10.6.1" +#endif +#ifndef szOID_LICENSE_SERVER +#define szOID_LICENSE_SERVER "1.3.6.1.4.1.311.10.6.2" +#endif #define szOID_REMOVE_CERTIFICATE "1.3.6.1.4.1.311.10.8.1" #define szOID_CROSS_CERT_DIST_POINTS "1.3.6.1.4.1.311.10.9.1" #define szOID_CTL "1.3.6.1.4.1.311.10.10.1" @@ -2141,7 +2171,11 @@ static const WCHAR CERT_PHYSICAL_STORE_A #define szOID_AUTO_ENROLL_CTL_USAGE "1.3.6.1.4.1.311.20.1" #define szOID_ENROLL_CERTTYPE_EXTENSION "1.3.6.1.4.1.311.20.2" #define szOID_ENROLLMENT_AGENT "1.3.6.1.4.1.311.20.2.1" +#define szOID_KP_SMARTCARD_LOGON "1.3.6.1.4.1.311.20.2.2" #define szOID_CERT_MANIFOLD "1.3.6.1.4.1.311.20.3" +#ifndef szOID_CERTSRV_CA_VERSION +#define szOID_CERTSRV_CA_VERSION "1.3.6.1.4.1.311.21.1" +#endif #define szOID_CERTSRV_PREVIOUS_CERT_HASH "1.3.6.1.4.1.311.21.2" #define szOID_CRL_VIRTUAL_BASE "1.3.6.1.4.1.311.21.3" #define szOID_CRL_NEXT_PUBLISH "1.3.6.1.4.1.311.21.4" @@ -2177,15 +2211,48 @@ static const WCHAR CERT_PHYSICAL_STORE_A #define szOID_PKIX_KP_IPSEC_TUNNEL "1.3.6.1.5.5.7.3.6" #define szOID_PKIX_KP_IPSEC_USER "1.3.6.1.5.5.7.3.7" #define szOID_PKIX_KP_TIMESTAMP_SIGNING "1.3.6.1.5.5.7.3.8" +#define szOID_PKIX_NO_SIGNATURE "1.3.6.1.5.5.7.6.2" +#define szOID_CMC "1.3.6.1.5.5.7.7" +#define szOID_CMC_STATUS_INFO "1.3.6.1.5.5.7.7.1" +#define szOID_CMC_IDENTIFICATION "1.3.6.1.5.5.7.7.2" +#define szOID_CMC_IDENTITY_PROOF "1.3.6.1.5.5.7.7.3" +#define szOID_CMC_DATA_RETURN "1.3.6.1.5.5.7.7.4" +#define szOID_CMC_TRANSACTION_ID "1.3.6.1.5.5.7.7.5" +#define szOID_CMC_SENDER_NONCE "1.3.6.1.5.5.7.7.6" +#define szOID_CMC_RECIPIENT_NONCE "1.3.6.1.5.5.7.7.7" +#define szOID_CMC_ADD_EXTENSIONS "1.3.6.1.5.5.7.7.8" +#define szOID_CMC_ENCRYPTED_POP "1.3.6.1.5.5.7.7.9" +#define szOID_CMC_DECRYPTED_POP "1.3.6.1.5.5.7.7.10" +#define szOID_CMC_LRA_POP_WITNESS "1.3.6.1.5.5.7.7.11" +#define szOID_CMC_GET_CERT "1.3.6.1.5.5.7.7.15" +#define szOID_CMC_GET_CRL "1.3.6.1.5.5.7.7.16" +#define szOID_CMC_REVOKE_REQUEST "1.3.6.1.5.5.7.7.17" +#define szOID_CMC_REG_INFO "1.3.6.1.5.5.7.7.18" +#define szOID_CMC_RESPONSE_INFO "1.3.6.1.5.5.7.7.19" +#define szOID_CMC_QUERY_PENDING "1.3.6.1.5.5.7.7.21" +#define szOID_CMC_ID_POP_LINK_RANDOM "1.3.6.1.5.5.7.7.22" +#define szOID_CMC_ID_POP_LINK_WITNESS "1.3.6.1.5.5.7.7.23" +#define szOID_CT_PKI_DATA "1.3.6.1.5.5.7.12.2" +#define szOID_CT_PKI_RESPONSE "1.3.6.1.5.5.7.12.3" +#define szOID_PKIX_ACC_DESCR "1.3.6.1.5.5.7.48" +#define szOID_PKIX_OCSP "1.3.6.1.5.5.7.48.1" +#define szOID_PKIX_CA_ISSUERS "1.3.6.1.5.5.7.48.2" #define szOID_IPSEC_KP_IKE_INTERMEDIATE "1.3.6.1.5.5.8.2.2" #ifndef szOID_SERIALIZED #define szOID_SERIALIZED "1.3.6.1.4.1.311.10.3.3.1" #endif +#define szOID_AUTO_ENROLL_CTL_USAGE "1.3.6.1.4.1.311.20.1" +#define szOID_ENROLL_CERTTYPE_EXTENSION "1.3.6.1.4.1.311.20.2" +#define szOID_ENROLLMENT_AGENT "1.3.6.1.4.1.311.20.2.1" +#ifndef szOID_KP_SMARTCARD_LOGON +#define szOID_KP_SMARTCARD_LOGON "1.3.6.1.4.1.311.20.2.2" +#endif #ifndef szOID_NT_PRINCIPAL_NAME #define szOID_NT_PRINCIPAL_NAME "1.3.6.1.4.1.311.20.2.3" #endif +#define szOID_CERT_MANIFOLD "1.3.6.1.4.1.311.20.3" #ifndef szOID_CERTSRV_CA_VERSION #define szOID_CERTSRV_CA_VERSION "1.3.6.1.4.1.311.21.1" @@ -2195,6 +2262,17 @@ static const WCHAR CERT_PHYSICAL_STORE_A #define szOID_PRODUCT_UPDATE "1.3.6.1.4.1.311.31.1" #endif +#define szOID_NETSCAPE "2.16.840.1.113730" +#define szOID_NETSCAPE_CERT_EXTENSION "2.16.840.1.113730.1" +#define szOID_NETSCAPE_CERT_TYPE "2.16.840.1.113730.1.1" +#define szOID_NETSCAPE_BASE_URL "2.16.840.1.113730.1.2" +#define szOID_NETSCAPE_REVOCATION_URL "2.16.840.1.113730.1.3" +#define szOID_NETSCAPE_CA_REVOCATION_URL "2.16.840.1.113730.1.4" +#define szOID_NETSCAPE_CERT_RENEWAL_URL "2.16.840.1.113730.1.7" +#define szOID_NETSCAPE_CA_POLICY_URL "2.16.840.1.113730.1.8" +#define szOID_NETSCAPE_SSL_SERVER_NAME "2.16.840.1.113730.1.12" +#define szOID_NETSCAPE_COMMENT "2.16.840.1.113730.1.13" + #define CRYPT_ENCODE_DECODE_NONE 0 #define X509_CERT ((LPCSTR)1) #define X509_CERT_TO_BE_SIGNED ((LPCSTR)2)

1 0

James Hawkins : setupapi: Downgrade an ERR to a WARN.
by Alexandre Julliard Feb. 23, 2006

Feb. 23, 2006

Module: wine Branch: refs/heads/master Commit: ee324e694a9db27cc1800be74f094ef81339ebfe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee324e694a9db27cc1800be… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 22 23:39:51 2006 -0600 setupapi: Downgrade an ERR to a WARN. --- dlls/setupapi/dirid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/dirid.c b/dlls/setupapi/dirid.c index 60db095..038c35c 100644 --- a/dlls/setupapi/dirid.c +++ b/dlls/setupapi/dirid.c @@ -175,7 +175,7 @@ const WCHAR *DIRID_get_string( int dirid { for (i = 0; i < nb_user_dirids; i++) if (user_dirids[i].id == dirid) return user_dirids[i].str; - ERR("user id %d not found\n", dirid ); + WARN("user id %d not found\n", dirid ); return NULL; } else if (dirid >= MIN_CSIDL_DIRID)

1 0