April 2008 - Wine-commits - list.winehq.org

James Hawkins : user32: Fix a test that fails on platforms without IME.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 17c907e6c3d5f270c042ff464df37c318abe1843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c907e6c3d5f270c042ff464… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 25 22:07:39 2008 -0500 user32: Fix a test that fails on platforms without IME. --- dlls/user32/tests/msg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 98fa424..7f54e61 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -318,13 +318,13 @@ static const struct message WmSwitchNotMaximizedChild[] = { { WM_NCACTIVATE, sent|wparam|defwinproc, 1 }, /* in the 2nd MDI child */ { WM_SETVISIBLE, hook }, /* in the 1st MDI child */ { WM_KILLFOCUS, sent|defwinproc }, /* in the 1st MDI child */ - { WM_IME_SETCONTEXT, sent|defwinproc }, /* in the 1st MDI child */ - { WM_IME_SETCONTEXT, sent }, /* in the MDI client */ + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, /* in the 1st MDI child */ + { WM_IME_SETCONTEXT, sent|optional }, /* in the MDI client */ { WM_SETFOCUS, sent, 0 }, /* in the MDI client */ { WM_SETVISIBLE, hook }, { WM_KILLFOCUS, sent }, /* in the MDI client */ - { WM_IME_SETCONTEXT, sent }, /* in the MDI client */ - { WM_IME_SETCONTEXT, sent|defwinproc }, /* in the 1st MDI child */ + { WM_IME_SETCONTEXT, sent|optional }, /* in the MDI client */ + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, /* in the 1st MDI child */ { WM_SETFOCUS, sent|defwinproc }, /* in the 2nd MDI child */ { WM_MDIACTIVATE, sent|defwinproc }, /* in the 2nd MDI child */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE}, /* in the 2nd MDI child */ @@ -3411,7 +3411,7 @@ static void test_mdi_messages(void) flush_sequence(); SendMessageA(mdi_client, WM_MDIACTIVATE, (WPARAM)mdi_child2, 0); - ok_sequence(WmSwitchNotMaximizedChild, "Not maximized child did not switch correctly", TRUE); + ok_sequence(WmSwitchNotMaximizedChild, "Not maximized child did not switch correctly", FALSE); trace("end of test for switch not maximized MDI children\n"); flush_sequence();

1 0

Jens Albretsen : ddraw: Fixed device name.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: cf38e4c9304286f57c1cab31c760e49c033a149c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf38e4c9304286f57c1cab31c… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun Apr 20 01:01:50 2008 +0200 ddraw: Fixed device name. --- dlls/ddraw/direct3d.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 0e026fd..3ccf8e4 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -310,7 +310,7 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 *iface, /* Some games (Motoracer 2 demo) have the bad idea to modify the device name string. Let's put the string in a sufficiently sized array in writable memory. */ char device_name[50]; - strcpy(device_name,"direct3d"); + strcpy(device_name,"Direct3D HEL"); TRACE("(%p)->(%p,%p)\n", This, Callback, Context); EnterCriticalSection(&ddraw_cs); @@ -359,6 +359,8 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 *iface, } } + strcpy(device_name,"Direct3D HAL"); + TRACE("(%p) Enumerating HAL Direct3D device\n", This); d1 = dref; d2 = dref;

1 0

Kai Blin : ws2_32: Handle gethostbyname call failure, add tests.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: c0a3ac5006603baa08161fb78c738c6a9520b6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a3ac5006603baa08161fb78… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Apr 28 10:37:39 2008 +0200 ws2_32: Handle gethostbyname call failure, add tests. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1fe0034..c24a049 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3244,7 +3244,7 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) #else LeaveCriticalSection( &csWSgetXXXbyYYY ); #endif - if (retval->h_addr_list[0][0] == 127 && + if (retval && retval->h_addr_list[0][0] == 127 && strcmp(name, "localhost") != 0) { /* hostname != "localhost" but has loopback address. replace by our diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8dc1f12..3c314d4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1765,6 +1765,73 @@ static void test_dns(void) ok(h != NULL, "gethostbyname(\"\") failed with %d\n", h_errno); } +/* Our winsock headers don't define gethostname because it conflicts with the + * definition in unistd.h. Define it here to get rid of the warning. */ + +int gethostname(char *name, int namelen); + +static void test_gethostbyname_hack(void) +{ + struct hostent *he; + char name[256]; + static BYTE loopback[] = {127, 0, 0, 1}; + static BYTE magic_loopback[] = {127, 12, 34, 56}; + int ret; + + ret = gethostname(name, 256); + ok(ret == 0, "gethostname() call failed: %d\n", WSAGetLastError()); + + he = gethostbyname("localhost"); + ok(he != NULL, "gethostbyname(\"localhost\") failed: %d\n", h_errno); + if(he) + { + if(he->h_length != 4) + { + skip("h_length is %d, not IPv4, skipping test.\n", he->h_length); + return; + } + + ok(memcmp(he->h_addr_list[0], loopback, he->h_length) == 0, + "gethostbyname(\"localhost\") returned %d.%d.%d.%d\n", + he->h_addr_list[0][0], he->h_addr_list[0][1], he->h_addr_list[0][2], + he->h_addr_list[0][3]); + } + + /* No reason to test further with NULL hostname */ + if(name == NULL) + return; + + if(strcmp(name, "localhost") == 0) + { + skip("hostname seems to be \"localhost\", skipping test.\n"); + return; + } + + he = NULL; + he = gethostbyname(name); + ok(he != NULL, "gethostbyname(\"%s\") failed: %d\n", name, h_errno); + if(he) + { + if(he->h_length != 4) + { + skip("h_length is %d, not IPv4, skipping test.\n", he->h_length); + return; + } + + if (he->h_addr_list[0][0] == 127) + { + ok(memcmp(he->h_addr_list[0], magic_loopback, he->h_length) == 0, + "gethostbyname(\"%s\") returned %d.%d.%d.%d not 127.12.34.56\n", + name, he->h_addr_list[0][0], he->h_addr_list[0][1], + he->h_addr_list[0][2], he->h_addr_list[0][3]); + } + } + + he = NULL; + he = gethostbyname("someweirdandbogusname"); + ok(he == NULL, "gethostbyname(\"someweirdandbogusname\") succeeded.\n"); +} + static void test_inet_addr(void) { u_long addr; @@ -1997,6 +2064,7 @@ START_TEST( sock ) test_getsockname(); test_inet_addr(); test_dns(); + test_gethostbyname_hack(); test_send(); test_write_events();

1 0

Jacek Caban : mshtml: Added put_backgroundImage implementation.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: deeaa5d20fdf5c3fc207c044b7df8b0d0c65323b URL: http://source.winehq.org/git/wine.git/?a=commit;h=deeaa5d20fdf5c3fc207c044b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 28 11:57:06 2008 +0200 mshtml: Added put_backgroundImage implementation. --- dlls/mshtml/htmlstyle.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index cb24831..a955a56 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -44,6 +44,8 @@ typedef struct { static const WCHAR attrBackgroundColor[] = {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; +static const WCHAR attrBackgroundImage[] = + {'b','a','c','k','g','r','o','u','n','d','-','i','m','a','g','e',0}; static const WCHAR attrBorderLeft[] = {'b','o','r','d','e','r','-','l','e','f','t',0}; static const WCHAR attrColor[] = @@ -451,8 +453,10 @@ static HRESULT WINAPI HTMLStyle_get_backgroundColor(IHTMLStyle *iface, VARIANT * static HRESULT WINAPI HTMLStyle_put_backgroundImage(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, attrBackgroundImage, v, 0); } static HRESULT WINAPI HTMLStyle_get_backgroundImage(IHTMLStyle *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Added IHTMLInputElement::get_disabled implementation.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 4e913b9551746f432fc2c96ef8a708dcf9ad3323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e913b9551746f432fc2c96ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 28 11:57:25 2008 +0200 mshtml: Added IHTMLInputElement::get_disabled implementation. --- dlls/mshtml/htmlinput.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e580bb6..dd0a8b5 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -223,8 +223,14 @@ static HRESULT WINAPI HTMLInputElement_put_disabled(IHTMLInputElement *iface, VA static HRESULT WINAPI HTMLInputElement_get_disabled(IHTMLInputElement *iface, VARIANT_BOOL *p) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRBool disabled = FALSE; + + TRACE("(%p)->(%p)\n", This, p); + + nsIDOMHTMLInputElement_GetDisabled(This->nsinput, &disabled); + + *p = disabled ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLFormElement **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8c6f60f..7d607d7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -40,7 +40,8 @@ static const char range_test2_str[] = "<html><body>abc<hr />123<br /><hr />def</body></html>"; static const char elem_test_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" - "<body>text test<a href=\"http://test\" name=\"x\">link</a><input />" + "<body>text test<a href=\"http://test\" name=\"x\">link</a>" + "<input id=\"in\" />" "<select id=\"s\"><option id=\"x\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" "<table><tbody></tbody></table>" @@ -783,6 +784,17 @@ static long _get_node_type(unsigned line, IUnknown *unk) return type; } +#define test_input_get_disabled(i,b) _test_input_get_disabled(__LINE__,i,b) +static void _test_input_get_disabled(unsigned line, IHTMLInputElement *input, VARIANT_BOOL exb) +{ + VARIANT_BOOL disabled = 100; + HRESULT hres; + + hres = IHTMLInputElement_get_disabled(input, &disabled); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -1429,6 +1441,7 @@ static void test_elems(IHTMLDocument2 *doc) long type; HRESULT hres; + static const WCHAR inW[] = {'i','n',0}; static const WCHAR xW[] = {'x',0}; static const WCHAR sW[] = {'s',0}; static const WCHAR scW[] = {'s','c',0}; @@ -1528,6 +1541,19 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLScriptElement_Release(script); } + elem = get_elem_by_id(doc, inW, TRUE); + if(elem) { + IHTMLInputElement *input; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLInputElement, (void**)&input); + ok(hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + + test_input_get_disabled(input, VARIANT_FALSE); + + IHTMLInputElement_Release(input); + IHTMLElement_Release(elem); + } + hres = IHTMLDocument2_get_body(doc, &elem); ok(hres == S_OK, "get_body failed: %08x\n", hres);

1 0

Vitaliy Margolen : dinput: Fix default axes mapping generation.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 736d03c8da58268564f851d9be2c2c077b88c80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=736d03c8da58268564f851d9b… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 27 23:01:55 2008 -0600 dinput: Fix default axes mapping generation. --- dlls/dinput/joystick_linux.c | 44 +++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 46ce4ce..3343bb2 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -271,6 +271,9 @@ static HRESULT setup_dinput_options(JoystickImpl * device) { char buffer[MAX_PATH+16]; HKEY hkey, appkey; + int tokens = 0; + int axis = 0; + int pov = 0; buffer[MAX_PATH]='\0'; @@ -283,18 +286,14 @@ static HRESULT setup_dinput_options(JoystickImpl * device) TRACE("setting default deadzone to: \"%s\" %d\n", buffer, device->deadzone); } + device->axis_map = HeapAlloc(GetProcessHeap(), 0, device->axes * sizeof(int)); + if (!device->axis_map) return DIERR_OUTOFMEMORY; + if (!get_config_key( hkey, appkey, device->name, buffer, MAX_PATH )) { - int tokens = 0; - int axis = 0; - int pov = 0; const char *delim = ","; char * ptr; TRACE("\"%s\" = \"%s\"\n", device->name, buffer); - device->axis_map = HeapAlloc(GetProcessHeap(), 0, device->axes * sizeof(int)); - if (device->axis_map == 0) - return DIERR_OUTOFMEMORY; - if ((ptr = strtok(buffer, delim)) != NULL) { do { if (strcmp(ptr, "X") == 0) { @@ -355,9 +354,22 @@ static HRESULT setup_dinput_options(JoystickImpl * device) } } - device->devcaps.dwAxes = axis; - device->devcaps.dwPOVs = pov; } + else + { + for (tokens = 0; tokens < device->axes; tokens++) + { + if (tokens < 8) + device->axis_map[tokens] = axis++; + else + { + device->axis_map[tokens ] = 8 + pov; + device->axis_map[tokens++] = 8 + pov++; + } + } + } + device->devcaps.dwAxes = axis; + device->devcaps.dwPOVs = pov; if (appkey) RegCloseKey( appkey ); @@ -445,29 +457,17 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di /* setup_dinput_options may change these */ newDevice->deadzone = 0; newDevice->devcaps.dwButtons = newDevice->buttons; - newDevice->devcaps.dwAxes = newDevice->axes; - newDevice->devcaps.dwPOVs = 0; /* do any user specified configuration */ hr = setup_dinput_options(newDevice); if (hr != DI_OK) goto FAILED1; - if (newDevice->axis_map == 0) { - newDevice->axis_map = HeapAlloc(GetProcessHeap(), 0, newDevice->axes * sizeof(int)); - if (newDevice->axis_map == 0) - goto FAILED; - - for (i = 0; i < newDevice->axes; i++) - newDevice->axis_map[i] = i; - } - /* Create copy of default data format */ if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto FAILED; memcpy(df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); - /* Axes include POVs */ - df->dwNumObjs = newDevice->axes + newDevice->buttons; + df->dwNumObjs = newDevice->devcaps.dwAxes + newDevice->devcaps.dwPOVs + newDevice->buttons; if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto FAILED; for (i = 0; i < newDevice->axes; i++)

1 0

Jacek Caban : mshtml.idl: Added DispHTMLInputElement declaration.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 32846424be02af2600fee5aaadb2b9652b40902d URL: http://source.winehq.org/git/wine.git/?a=commit;h=32846424be02af2600fee5aaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 28 11:56:53 2008 +0200 mshtml.idl: Added DispHTMLInputElement declaration. --- include/mshtmdid.h | 9 + include/mshtml.idl | 1047 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1056 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32846424be02af2600fee…

1 0

Andrew Talbot : comctl32: Dangling pointers fix.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 2db311a843e2830105c174190d1cd6b5a39a7746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db311a843e2830105c174190… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Apr 27 14:17:30 2008 +0100 comctl32: Dangling pointers fix. --- dlls/comctl32/comboex.c | 4 +++- dlls/comctl32/trackbar.c | 3 ++- dlls/comctl32/treeview.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index e79831d..cfcfed8 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1600,9 +1600,11 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) if (infoPtr->defaultFont) DeleteObject (infoPtr->defaultFont); + SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); + /* free comboex info data */ Free (infoPtr); - SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); + return 0; } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index e81d55f..a25f81e 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1452,9 +1452,10 @@ TRACKBAR_Destroy (TRACKBAR_INFO *infoPtr) if (infoPtr->hwndToolTip) DestroyWindow (infoPtr->hwndToolTip); - Free (infoPtr); SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); + Free (infoPtr); + return 0; } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 2b71a3b..fb67c24 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1019,7 +1019,6 @@ static void TREEVIEW_FreeItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) { DPA_DeletePtr(infoPtr->items, DPA_GetPtrIndex(infoPtr->items, item)); - Free(item); if (infoPtr->selectedItem == item) infoPtr->selectedItem = NULL; if (infoPtr->hotItem == item) @@ -1032,6 +1031,7 @@ TREEVIEW_FreeItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) infoPtr->dropItem = NULL; if (infoPtr->insertMarkItem == item) infoPtr->insertMarkItem = NULL; + Free(item); }

1 0

Rob Shearman : ole32: Fix two comments about the running object table.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 67a7a8a8ef63c91390a9838a01980c938937376b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a7a8a8ef63c91390a9838a0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 27 23:01:16 2008 +0100 ole32: Fix two comments about the running object table. --- dlls/ole32/moniker.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 413d110..68ea4d1 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -19,11 +19,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * TODO: - * - IRunningObjectTable should work interprocess, but currently doesn't. - * Native (on Win2k at least) uses an undocumented RPC interface, IROT, to - * communicate with RPCSS which contains the table of marshalled data. */ #include <stdarg.h> @@ -974,9 +969,9 @@ HRESULT WINAPI RunningObjectTableImpl_Initialize(void) /* initialize the virtual table function */ runningObjectTableInstance->lpVtbl = &VT_RunningObjectTableImpl; - /* the initial reference is set to "1" ! because if set to "0" it will be not practis when */ - /* the ROT referred many times not in the same time (all the objects in the ROT will */ - /* be removed every time the ROT is removed ) */ + /* the initial reference is set to "1" so that it isn't destroyed after its + * first use until the process is destroyed, as the running object table is + * a process-wide cache of a global table */ runningObjectTableInstance->ref = 1; list_init(&runningObjectTableInstance->rot);

1 0

David Adam : amstream: Fix the condition of existence of the IMediaStream interface.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 653c7e7dcaf7ebee2cfc8a6e356779dc8974aac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=653c7e7dcaf7ebee2cfc8a6e3… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun Apr 27 12:10:32 2008 +0200 amstream: Fix the condition of existence of the IMediaStream interface. --- dlls/amstream/mediastream.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 2cb7ce6..3d15731 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -71,7 +71,8 @@ static HRESULT WINAPI IMediaStreamImpl_QueryInterface(IMediaStream* iface, REFII TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IAMMultiMediaStream)) + IsEqualGUID(riid, &IID_IAMMultiMediaStream) || + IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) { IClassFactory_AddRef(iface); *ppvObject = This;

1 0