wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Nikolay Sivov : mshtml: Implement IHTMLTable_get_tBodies.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: f91c0356e77aa0d7a1a010afe2534969110be891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91c0356e77aa0d7a1a010afe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 14 18:43:30 2013 +0400 mshtml: Implement IHTMLTable_get_tBodies. --- dlls/mshtml/htmltable.c | 17 +++++++++++++++-- dlls/mshtml/tests/dom.c | 11 ++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 85daf5b..f3c7ba8 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -379,8 +379,21 @@ static HRESULT WINAPI HTMLTable_get_tFoot(IHTMLTable *iface, IHTMLTableSection * static HRESULT WINAPI HTMLTable_get_tBodies(IHTMLTable *iface, IHTMLElementCollection **p) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLCollection *nscol = NULL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLTableElement_GetTBodies(This->nstable, &nscol); + if(NS_FAILED(nsres)) { + ERR("GetTBodies failed: %08x\n", nsres); + return E_FAIL; + } + + *p = create_collection_from_htmlcol(This->element.node.doc, nscol); + + nsIDOMHTMLCollection_Release(nscol); + return S_OK; } static HRESULT WINAPI HTMLTable_get_caption(IHTMLTable *iface, IHTMLTableCaption **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5cb0a94..44306ee 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5466,6 +5466,7 @@ static void test_table_elem(IHTMLElement *elem) static const elem_type_t row_types[] = {ET_TR,ET_TR}; static const elem_type_t all_types[] = {ET_TBODY,ET_TR,ET_TR,ET_TD,ET_TD}; + static const elem_type_t tbodies_types[] = {ET_TBODY}; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTable, (void**)&table); ok(hres == S_OK, "Could not get IHTMLTable iface: %08x\n", hres); @@ -5475,7 +5476,7 @@ static void test_table_elem(IHTMLElement *elem) col = NULL; hres = IHTMLTable_get_rows(table, &col); ok(hres == S_OK, "get_rows failed: %08x\n", hres); - ok(col != NULL, "get_ros returned NULL\n"); + ok(col != NULL, "get_rows returned NULL\n"); test_elem_collection((IUnknown*)col, row_types, sizeof(row_types)/sizeof(*row_types)); IHTMLElementCollection_Release(col); @@ -5492,6 +5493,14 @@ static void test_table_elem(IHTMLElement *elem) test_elem_all((IUnknown*)node, NULL, 0); IHTMLDOMNode_Release(node); + col = NULL; + hres = IHTMLTable_get_tBodies(table, &col); + ok(hres == S_OK, "get_tBodies failed: %08x\n", hres); + ok(col != NULL, "get_tBodies returned NULL\n"); + + test_elem_collection((IUnknown*)col, tbodies_types, sizeof(tbodies_types)/sizeof(*tbodies_types)); + IHTMLElementCollection_Release(col); + IHTMLTable_Release(table); }

1 0

Nikolay Sivov : user32: Use defined constants to identify message box buttons.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 8f985884ea1dc888c44bd29b145a0845fc8776c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f985884ea1dc888c44bd29b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 13 17:07:47 2013 +0400 user32: Use defined constants to identify message box buttons. --- dlls/user32/msgbox.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 91437bc..9328cd0 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -86,11 +86,11 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0); hFont = CreateFontIndirectW (&nclm.lfMessageFont); /* set button font */ - for (i=1; i < 12; i++) - /* No button 8 (Close) */ - if (i != 8) { + for (i = IDOK; i <= IDCONTINUE; i++) + /* no close button */ + if (i != IDCANCEL) SendDlgItemMessageW (hwnd, i, WM_SETFONT, (WPARAM)hFont, 0); - } + /* set text font */ SendDlgItemMessageW (hwnd, MSGBOX_IDTEXT, WM_SETFONT, (WPARAM)hFont, 0); @@ -234,9 +234,9 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Get the number of visible buttons and their size */ bh = bw = 1; /* Minimum button sizes */ - for (buttons = 0, i = 1; i < 12; i++) + for (buttons = 0, i = IDOK; i <= IDCONTINUE; i++) { - if (i == 8) continue; /* No CLOSE button */ + if (i == IDCLOSE) continue; /* No CLOSE button */ hItem = GetDlgItem(hwnd, i); if (GetWindowLongW(hItem, GWL_STYLE) & WS_VISIBLE) {

1 0

André Hentschel : kernel32: Silence a noisy FIXME in GetConsoleKeyboardLayoutNameW.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: e1c884256e476eac448888a48e159de65a01d806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c884256e476eac448888a48… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 13 23:57:30 2013 +0200 kernel32: Silence a noisy FIXME in GetConsoleKeyboardLayoutNameW. --- dlls/kernel32/console.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d6d1414..8405f4f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1274,7 +1274,9 @@ BOOL WINAPI GetConsoleKeyboardLayoutNameA(LPSTR layoutName) */ BOOL WINAPI GetConsoleKeyboardLayoutNameW(LPWSTR layoutName) { - FIXME( "stub %p\n", layoutName); + static int once; + if (!once++) + FIXME( "stub %p\n", layoutName); return TRUE; }

1 0

Michael Stefaniuc : dplayx: Merge the DirectPlayLobby QueryInterface helper .
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: bd0b8291421a13fb66b71c113ff1f21874654e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd0b8291421a13fb66b71c113… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Apr 13 21:43:24 2013 +0200 dplayx: Merge the DirectPlayLobby QueryInterface helper. --- dlls/dplayx/dplobby.c | 71 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index a0c11dd..bab74ea 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include <string.h> +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "windef.h" @@ -131,28 +132,6 @@ static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) return TRUE; } -static HRESULT WINAPI DPL_QueryInterface( IDirectPlayLobbyImpl *This, REFIID riid, void **ppvObj ) -{ - TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); - - if ( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlayLobby, riid ) || - IsEqualGUID( &IID_IDirectPlayLobby2, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) - *ppvObj = &This->IDirectPlayLobby3_iface; - else if ( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) || - IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) - *ppvObj = &This->IDirectPlayLobby3A_iface; - else - { - /* Unsupported interface */ - *ppvObj = NULL; - return E_NOINTERFACE; - } - - IDirectPlayLobby_AddRef( (LPDIRECTPLAYLOBBY)*ppvObj ); - - return S_OK; -} - static void dplobby_destroy(IDirectPlayLobbyImpl *obj) { DPL_DestroyLobby1( obj ); @@ -165,14 +144,58 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_QueryInterface( IDirectPlayLobby3A void **ppv ) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); - return DPL_QueryInterface( This, riid, ppv ); + return IDirectPlayLobby_QueryInterface( &This->IDirectPlayLobby3_iface, riid, ppv ); } static HRESULT WINAPI IDirectPlayLobby3Impl_QueryInterface( IDirectPlayLobby3 *iface, REFIID riid, void **ppv ) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface ); - return DPL_QueryInterface( This, riid, ppv ); + + if ( IsEqualGUID( &IID_IUnknown, riid ) ) + { + TRACE( "(%p)->(IID_IUnknown %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlayLobby, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlayLobby %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlayLobbyA %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3A_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlayLobby2, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlayLobby2 %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlayLobby2A %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3A_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlay3 %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlayLobby3A %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3A_iface; + } + else + { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI IDirectPlayLobby3AImpl_AddRef(IDirectPlayLobby3A *iface)

1 0

Michael Stefaniuc : dplayx: IDirectPlayLobby3 / IDirectPlayLobby3A have independent refcounts.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 02e9c9997613f81c4f956bf1867e96068bd4f41d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e9c9997613f81c4f956bf18… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Apr 13 21:41:32 2013 +0200 dplayx: IDirectPlayLobby3 / IDirectPlayLobby3A have independent refcounts. --- dlls/dplayx/dplobby.c | 81 +++++++++++++++++++++++--------------------- dlls/dplayx/tests/dplayx.c | 2 +- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 12444cc..a0c11dd 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -83,7 +83,8 @@ typedef struct IDirectPlayLobbyImpl { IDirectPlayLobby3 IDirectPlayLobby3_iface; IDirectPlayLobby3A IDirectPlayLobby3A_iface; - LONG ulInterfaceRef; + LONG numIfaces; /* "in use interfaces" refcount */ + LONG ref3, ref3A; CRITICAL_SECTION lock; DirectPlayLobbyData* dpl; } IDirectPlayLobbyImpl; @@ -152,40 +153,12 @@ static HRESULT WINAPI DPL_QueryInterface( IDirectPlayLobbyImpl *This, REFIID rii return S_OK; } -/* - * Simple procedure. Just increment the reference count to this - * structure and return the new reference count. - */ -static ULONG WINAPI DPL_AddRef( IDirectPlayLobbyImpl *This ) -{ - ULONG ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); - - TRACE( "ref count incremented to %u for %p\n", ulInterfaceRefCount, This ); - - return ulInterfaceRefCount; -} - -/* - * Simple COM procedure. Decrease the reference count to this object. - * If the object no longer has any reference counts, free up the associated - * memory. - */ -static ULONG WINAPI DPL_Release( IDirectPlayLobbyImpl *This ) +static void dplobby_destroy(IDirectPlayLobbyImpl *obj) { - ULONG ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); - - TRACE( "ref count decremented to %u for %p\n", ulInterfaceRefCount, This ); - - /* Deallocate if this is the last reference to the object */ - if( ulInterfaceRefCount == 0 ) - { - DPL_DestroyLobby1( This ); - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &This->lock ); - HeapFree( GetProcessHeap(), 0, This ); - } - - return ulInterfaceRefCount; + DPL_DestroyLobby1( obj ); + obj->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &obj->lock ); + HeapFree( GetProcessHeap(), 0, obj ); } static HRESULT WINAPI IDirectPlayLobby3AImpl_QueryInterface( IDirectPlayLobby3A *iface, REFIID riid, @@ -205,25 +178,53 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_QueryInterface( IDirectPlayLobby3 *i static ULONG WINAPI IDirectPlayLobby3AImpl_AddRef(IDirectPlayLobby3A *iface) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); - return DPL_AddRef( This ); + ULONG ref = InterlockedIncrement( &This->ref3A ); + + TRACE( "(%p) ref3A=%d\n", This, ref ); + + if ( ref == 1 ) + InterlockedIncrement( &This->numIfaces ); + + return ref; } static ULONG WINAPI IDirectPlayLobby3Impl_AddRef(IDirectPlayLobby3 *iface) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface ); - return DPL_AddRef( This ); + ULONG ref = InterlockedIncrement( &This->ref3 ); + + TRACE( "(%p) ref3=%d\n", This, ref ); + + if ( ref == 1 ) + InterlockedIncrement( &This->numIfaces ); + + return ref; } static ULONG WINAPI IDirectPlayLobby3AImpl_Release(IDirectPlayLobby3A *iface) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); - return DPL_Release( This ); + ULONG ref = InterlockedDecrement( &This->ref3A ); + + TRACE( "(%p) ref3A=%d\n", This, ref ); + + if ( !ref && !InterlockedDecrement( &This->numIfaces ) ) + dplobby_destroy( This ); + + return ref; } static ULONG WINAPI IDirectPlayLobby3Impl_Release(IDirectPlayLobby3 *iface) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface ); - return DPL_Release( This ); + ULONG ref = InterlockedDecrement( &This->ref3 ); + + TRACE( "(%p) ref3=%d\n", This, ref ); + + if ( !ref && !InterlockedDecrement( &This->numIfaces ) ) + dplobby_destroy( This ); + + return ref; } @@ -1520,7 +1521,9 @@ HRESULT dplobby_create( REFIID riid, void **ppv ) obj->IDirectPlayLobby3_iface.lpVtbl = &dpl3_vt; obj->IDirectPlayLobby3A_iface.lpVtbl = &dpl3A_vt; - obj->ulInterfaceRef = 1; + obj->numIfaces = 1; + obj->ref3 = 1; + obj->ref3A = 0; InitializeCriticalSection( &obj->lock ); obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayLobbyImpl.lock"); diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 6ed864c..991b3c6 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6487,7 +6487,7 @@ static void test_COM_dplobby(void) hr = IDirectPlayLobby_QueryInterface(dpl, &IID_IDirectPlayLobbyA, (void**)&dplA); ok(hr == S_OK, "QueryInterface for IID_IDirectPlayLobbyA failed: %08x\n", hr); refcount = IDirectPlayLobby_AddRef(dplA); - todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); IDirectPlayLobby_Release(dplA); hr = IDirectPlayLobby_QueryInterface(dpl, &IID_IDirectPlayLobby2, (void**)&dpl2);

1 0

André Hentschel : setupapi: Add stub keyword to some FIXMEs.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: f8c77fbd628a62221f985755baf7de675d4f31f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c77fbd628a62221f985755b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 13 15:36:17 2013 +0200 setupapi: Add stub keyword to some FIXMEs. --- dlls/setupapi/stubs.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 3855b46..76dc410 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -46,7 +46,7 @@ CONFIGRET WINAPI CM_Connect_MachineA(PCSTR name, PHMACHINE machine) */ CONFIGRET WINAPI CM_Connect_MachineW(PCWSTR name, PHMACHINE machine) { - FIXME("\n"); + FIXME("stub\n"); return CR_ACCESS_DENIED; } @@ -73,7 +73,7 @@ CONFIGRET WINAPI CM_Create_DevNodeW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, */ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) { - FIXME("\n"); + FIXME("stub\n"); return CR_SUCCESS; } @@ -84,7 +84,7 @@ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) DWORD WINAPI CM_Get_Device_ID_ExA( DEVINST dnDevInst, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) { - FIXME("0x%08x %p 0x%08x 0x%08x %p\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); + FIXME("0x%08x %p 0x%08x 0x%08x %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); return CR_SUCCESS; } @@ -94,7 +94,7 @@ DWORD WINAPI CM_Get_Device_ID_ExA( DWORD WINAPI CM_Get_Device_ID_ExW( DEVINST dnDevInst, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) { - FIXME("0x%08x %p 0x%08x 0x%08x %p\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); + FIXME("0x%08x %p 0x%08x 0x%08x %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); return CR_SUCCESS; } @@ -104,7 +104,7 @@ DWORD WINAPI CM_Get_Device_ID_ExW( CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { - FIXME("%s %p %d 0x%08x\n", debugstr_a(pszFilter), Buffer, BufferLen, ulFlags); + FIXME("%s %p %d 0x%08x: stub\n", debugstr_a(pszFilter), Buffer, BufferLen, ulFlags); if (BufferLen >= 2) Buffer[0] = Buffer[1] = 0; return CR_SUCCESS; @@ -116,7 +116,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListA( CONFIGRET WINAPI CM_Get_Device_ID_ListW( PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { - FIXME("%s %p %d 0x%08x\n", debugstr_w(pszFilter), Buffer, BufferLen, ulFlags); + FIXME("%s %p %d 0x%08x: stub\n", debugstr_w(pszFilter), Buffer, BufferLen, ulFlags); if (BufferLen >= 2) Buffer[0] = Buffer[1] = 0; return CR_SUCCESS; @@ -127,7 +127,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListW( */ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( PULONG pulLen, PCSTR pszFilter, ULONG ulFlags ) { - FIXME("%p %s 0x%08x\n", pulLen, debugstr_a(pszFilter), ulFlags); + FIXME("%p %s 0x%08x: stub\n", pulLen, debugstr_a(pszFilter), ulFlags); return CR_SUCCESS; } @@ -137,7 +137,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( PULONG pulLen, PCSTR pszFilter, */ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG pulLen, PCWSTR pszFilter, ULONG ulFlags ) { - FIXME("%p %s 0x%08x\n", pulLen, debugstr_w(pszFilter), ulFlags); + FIXME("%p %s 0x%08x: stub\n", pulLen, debugstr_w(pszFilter), ulFlags); return CR_SUCCESS; } @@ -219,7 +219,7 @@ BOOL WINAPI SetupOpenLog(BOOL Reserved) */ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only ) { - FIXME("%p, %p, %d\n", file_queue, owner, scan_only); + FIXME("%p, %p, %d: stub\n", file_queue, owner, scan_only); return 0; } @@ -228,7 +228,7 @@ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only ) */ BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC disk_space, PSTR return_buffer, DWORD return_buffer_size, PDWORD required_size) { - FIXME("%p, %p, %d, %p\n", disk_space, return_buffer, return_buffer_size, required_size); + FIXME("%p, %p, %d, %p: stub\n", disk_space, return_buffer, return_buffer_size, required_size); return FALSE; } @@ -237,7 +237,7 @@ BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC disk_space, PSTR return_buf */ BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_buffer, DWORD return_buffer_size, PDWORD required_size) { - FIXME("%p, %p, %d, %p\n", disk_space, return_buffer, return_buffer_size, required_size); + FIXME("%p, %p, %d, %p: stub\n", disk_space, return_buffer, return_buffer_size, required_size); return FALSE; } @@ -246,7 +246,7 @@ BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_bu */ BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source) { - FIXME("0x%08x %s\n", flags, debugstr_a(source)); + FIXME("0x%08x %s: stub\n", flags, debugstr_a(source)); return TRUE; } @@ -255,7 +255,7 @@ BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source) */ BOOL WINAPI SetupAddToSourceListW(DWORD flags, PCWSTR source) { - FIXME("0x%08x %s\n", flags, debugstr_w(source)); + FIXME("0x%08x %s: stub\n", flags, debugstr_w(source)); return TRUE; } @@ -264,7 +264,7 @@ BOOL WINAPI SetupAddToSourceListW(DWORD flags, PCWSTR source) */ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count) { - FIXME("0x%08x %p %d\n", flags, list, count); + FIXME("0x%08x %p %d: stub\n", flags, list, count); return FALSE; } @@ -273,7 +273,7 @@ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count) */ BOOL WINAPI SetupSetSourceListW(DWORD flags, PCWSTR *list, UINT count) { - FIXME("0x%08x %p %d\n", flags, list, count); + FIXME("0x%08x %p %d: stub\n", flags, list, count); return FALSE; } @@ -310,7 +310,7 @@ BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA ClassImageListData BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceId, HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) { - FIXME("%p %s %p 0x%08x %p\n", DeviceInfoSet, debugstr_a(DeviceInstanceId), + FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_a(DeviceInstanceId), hwndParent, OpenFlags, DeviceInfoData); return FALSE; } @@ -321,7 +321,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceI BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceInstanceId, HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) { - FIXME("%p %s %p 0x%08x %p\n", DeviceInfoSet, debugstr_w(DeviceInstanceId), + FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_w(DeviceInstanceId), hwndParent, OpenFlags, DeviceInfoData); return FALSE; }

1 0

André Hentschel : setupapi: Add stubs for CM_Reenumerate_DevNode and CM_Reenumerate_DevNode_Ex.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: f79fa294c9f7c15286e575c6a38aa2827ff06d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f79fa294c9f7c15286e575c6a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 13 15:36:06 2013 +0200 setupapi: Add stubs for CM_Reenumerate_DevNode and CM_Reenumerate_DevNode_Ex. --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index a2ade67..cac0a13 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -141,8 +141,8 @@ @ stub CM_Query_Arbitrator_Free_Size_Ex @ stub CM_Query_Remove_SubTree @ stub CM_Query_Remove_SubTree_Ex -@ stub CM_Reenumerate_DevNode -@ stub CM_Reenumerate_DevNode_Ex +@ stdcall CM_Reenumerate_DevNode(ptr long) setupapi.CM_Reenumerate_DevNode +@ stdcall CM_Reenumerate_DevNode_Ex(ptr long ptr) setupapi.CM_Reenumerate_DevNode_Ex @ stub CM_Register_Device_Driver @ stub CM_Register_Device_Driver_Ex @ stub CM_Register_Device_InterfaceA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 9a13bb2..b412e75 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -156,8 +156,8 @@ @ stub CM_Query_Arbitrator_Free_Size_Ex @ stub CM_Query_Remove_SubTree @ stub CM_Query_Remove_SubTree_Ex -@ stub CM_Reenumerate_DevNode -@ stub CM_Reenumerate_DevNode_Ex +@ stdcall CM_Reenumerate_DevNode(ptr long) +@ stdcall CM_Reenumerate_DevNode_Ex(ptr long ptr) @ stub CM_Register_Device_Driver @ stub CM_Register_Device_Driver_Ex @ stub CM_Register_Device_InterfaceA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 030b295..3855b46 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -435,6 +435,18 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULON return CR_FAILURE; } +CONFIGRET WINAPI CM_Reenumerate_DevNode(DEVINST dnDevInst, ULONG ulFlags) +{ + FIXME("0x%08x 0x%08x: stub\n", dnDevInst, ulFlags); + return CR_FAILURE; +} + +CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex(DEVINST dnDevInst, ULONG ulFlags, HMACHINE machine) +{ + FIXME("0x%08x 0x%08x %p: stub\n", dnDevInst, ulFlags, machine); + return CR_FAILURE; +} + /*********************************************************************** * CM_Set_Class_Registry_PropertyA (SETUPAPI.@) */

1 0

Jactry Zeng : Updated Simplified Chinese translation
by Jeremy Newman 15 Apr '13

15 Apr '13

Module: website Branch: master Commit: dd0bb5fe062926db80f379318cb4b39569c0670b URL: http://source.winehq.org/git/website.git/?a=commit;h=dd0bb5fe062926db80f379… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Apr 13 12:33:52 2013 +0800 Updated Simplified Chinese translation --- templates/zh-cn/download.template | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index b3d8adf..8313e69 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -91,8 +91,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">下载 SUSE 安装包</a> - - openSUSE 11.1、11.2、11.3、11.4 和 SUSE Linux Enterprise 10 和 11 的发行二进制和源码 .rpms 及每日快照 RPMs。 - 旧版本安装包可以从 <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> 获取 + - 所有版本的 openSUSE （11.1 至 12.3）和 SUSE Linux Enterprise 11 的发行二进制和源码 .rpms 及每日快照 RPMs。 </td> <td><a href="mailto:meissner@suse.de">Marcus Meissner</a></td> </tr>

1 0

Jactry Zeng : Simplified Chinese translation for release 1.5.28
by Jeremy Newman 15 Apr '13

15 Apr '13

Module: website Branch: master Commit: 78e2f091688f124c521254bcb3a499843b5ac2bb URL: http://source.winehq.org/git/website.git/?a=commit;h=78e2f091688f124c521254… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Apr 13 11:32:40 2013 +0800 Simplified Chinese translation for release 1.5.28 --- news/zh-cn/2013041201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013041201.xml b/news/zh-cn/2013041201.xml new file mode 100644 index 0000000..2264413 --- /dev/null +++ b/news/zh-cn/2013041201.xml @@ -0,0 +1,17 @@ +<news> +<date>四月 12, 2013</date> +<title>Wine 1.5.28 发布</title> +<body> + Wine 开发版 1.5.28 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.28">更新</a>： +<ul> + <li>使用 GnuTLS 进行所有安全连接，不再依赖 OpenSSL。</li> + <li>默认启用 Mac 后端驱动。</li> + <li>内置 FixedSys 字体。</li> + <li>新的操纵杆控制面板图标。</li> + <li>Postscript 驱动的改进。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.28.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.28
by Jeremy Newman 15 Apr '13

15 Apr '13

Module: website Branch: master Commit: af3c21bcb79ba057e00c400a4dac4bbe609fff3d URL: http://source.winehq.org/git/website.git/?a=commit;h=af3c21bcb79ba057e00c40… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Apr 13 13:59:49 2013 +0200 Polish translation for release 1.5.28 --- news/pl/2013041201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2013041201.xml b/news/pl/2013041201.xml new file mode 100644 index 0000000..47f6d55 --- /dev/null +++ b/news/pl/2013041201.xml @@ -0,0 +1,17 @@ +<news> +<date>Kwiecień 12, 2013</date> +<title>Wydano Wine 1.5.28</title> +<body> + Wydanie rozwojowe Wine 1.5.28 jest już dostępne. + <a href="{$root}/announce/1.5.28">Co nowego</a> w tym wydaniu: +<ul> + <li>GnuTLS jest używany dla wszystkich bezpiecznych połączeń, OpenSSL już nie jest potrzebny.</li> + <li>Sterownik Mac jest domyślnie włączony.</li> + <li>Wbudowane czcionki FixedSys.</li> + <li>Nowa ikona dla joysticku w panelu sterowania.</li> + <li>Ulepszenia w sterowniku Postscript.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.28.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
58
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 April 2013