wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Hans Leidekker : msi: Set the action taken in the ProcessComponents and InstallFiles actions.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 27e90274b52fa560994614b84075a2dab17f8cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e90274b52fa560994614b84… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 11:46:24 2010 +0100 msi: Set the action taken in the ProcessComponents and InstallFiles actions. --- dlls/msi/action.c | 1 + dlls/msi/files.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0d0e333..028b4f0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2993,6 +2993,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) else MSIREG_DeleteUserDataComponentKey(comp->ComponentId, NULL); } + comp->Action = comp->ActionRequest; /* UI stuff */ uirow = MSI_CreateRecord(3); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 4050163..bb5b197 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -98,6 +98,8 @@ static void schedule_install_files(MSIPACKAGE *package) ui_progress(package,2,file->FileSize,0,0); file->state = msifs_skipped; } + else + file->Component->Action = INSTALLSTATE_LOCAL; } }

1 0

Hans Leidekker : msi: The AppSearch and CCPSearch actions must be run only once.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 8722d0c44a10bd7a2e82182b9a05e7ba415cea37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8722d0c44a10bd7a2e82182b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 11:46:00 2010 +0100 msi: The AppSearch and CCPSearch actions must be run only once. --- dlls/msi/action.c | 2 -- dlls/msi/appsearch.c | 16 ++++++++++++++++ dlls/msi/msipriv.h | 1 + dlls/msi/upgrade.c | 6 +++--- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index db6c2cd..0d0e333 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -96,8 +96,6 @@ static const WCHAR szAllocateRegistrySpace[] = {'A','l','l','o','c','a','t','e','R','e','g','i','s','t','r','y','S','p','a','c','e',0}; static const WCHAR szBindImage[] = {'B','i','n','d','I','m','a','g','e',0}; -static const WCHAR szCCPSearch[] = - {'C','C','P','S','e','a','r','c','h',0}; static const WCHAR szDeleteServices[] = {'D','e','l','e','t','e','S','e','r','v','i','c','e','s',0}; static const WCHAR szDisableRollback[] = diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 12c7411..6f00b14 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -1064,6 +1064,14 @@ UINT ACTION_AppSearch(MSIPACKAGE *package) MSIQUERY *view = NULL; UINT r; + if (check_unique_action(package, szAppSearch)) + { + TRACE("Skipping AppSearch action: already done in UI sequence\n"); + return ERROR_SUCCESS; + } + else + register_unique_action(package, szAppSearch); + r = MSI_OpenQuery( package->db, &view, query ); if (r != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -1111,6 +1119,14 @@ UINT ACTION_CCPSearch(MSIPACKAGE *package) MSIQUERY *view = NULL; UINT r; + if (check_unique_action(package, szCCPSearch)) + { + TRACE("Skipping AppSearch action: already done in UI sequence\n"); + return ERROR_SUCCESS; + } + else + register_unique_action(package, szCCPSearch); + r = MSI_OpenQuery(package->db, &view, query); if (r != ERROR_SUCCESS) return ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 0516dd1..647eab7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1084,6 +1084,7 @@ static const WCHAR szHU[] = {'H','K','E','Y','_','U','S','E','R','S','\\',0}; static const WCHAR szWindowsFolder[] = {'W','i','n','d','o','w','s','F','o','l','d','e','r',0}; static const WCHAR szAppSearch[] = {'A','p','p','S','e','a','r','c','h',0}; static const WCHAR szMoveFiles[] = {'M','o','v','e','F','i','l','e','s',0}; +static const WCHAR szCCPSearch[] = {'C','C','P','S','e','a','r','c','h',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index a440070..3f40f55 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -209,13 +209,13 @@ UINT ACTION_FindRelatedProducts(MSIPACKAGE *package) return ERROR_SUCCESS; } - if (check_unique_action(package,szFindRelatedProducts)) + if (check_unique_action(package, szFindRelatedProducts)) { - TRACE("Skipping FindRelatedProducts action: already done on client side\n"); + TRACE("Skipping FindRelatedProducts action: already done in UI sequence\n"); return ERROR_SUCCESS; } else - register_unique_action(package,szFindRelatedProducts); + register_unique_action(package, szFindRelatedProducts); rc = MSI_DatabaseOpenViewW(package->db, Query, &view); if (rc != ERROR_SUCCESS)

1 0

Hans Leidekker : msi: Display the file identifier instead of the filename in the SelfRegModules and SelfUnregModules actions .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: a4be941df99d93e9b8f5e79b7e85e187080fca1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4be941df99d93e9b8f5e79b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 11:45:33 2010 +0100 msi: Display the file identifier instead of the filename in the SelfRegModules and SelfUnregModules actions. --- dlls/msi/action.c | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 15730f0..db6c2cd 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4152,21 +4152,16 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) CloseHandle(info.hProcess); } - msi_free(FullName); - - /* the UI chunk */ uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, filename ); uipath = strdupW( file->TargetPath ); - p = strrchrW(uipath,'\\'); - if (p) - p[0]=0; - MSI_RecordSetStringW( uirow, 1, &p[1] ); - MSI_RecordSetStringW( uirow, 2, uipath); - ui_actiondata( package, szSelfRegModules, uirow); + if ((p = strrchrW( uipath,'\\' ))) *p = 0; + MSI_RecordSetStringW( uirow, 2, uipath ); + ui_actiondata( package, szSelfRegModules, uirow ); msiobj_release( &uirow->hdr ); - msi_free( uipath ); - /* FIXME: call ui_progress? */ + msi_free( FullName ); + msi_free( uipath ); return ERROR_SUCCESS; } @@ -4235,21 +4230,16 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param ) CloseHandle( pi.hProcess ); } - msi_free( cmdline ); - uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, filename ); uipath = strdupW( file->TargetPath ); - if ((p = strrchrW( uipath, '\\' ))) - { - *p = 0; - MSI_RecordSetStringW( uirow, 1, ++p ); - } + if ((p = strrchrW( uipath,'\\' ))) *p = 0; MSI_RecordSetStringW( uirow, 2, uipath ); ui_actiondata( package, szSelfUnregModules, uirow ); msiobj_release( &uirow->hdr ); - msi_free( uipath ); - /* FIXME call ui_progress? */ + msi_free( cmdline ); + msi_free( uipath ); return ERROR_SUCCESS; }

1 0

Alistair Leslie-Hughes : oleaut32: Add ISupportErrorInfo registry entry.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 25756b787300468504eeacc19e76055c42f4925c URL: http://source.winehq.org/git/wine.git/?a=commit;h=25756b787300468504eeacc19… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 20 21:39:27 2010 +1100 oleaut32: Add ISupportErrorInfo registry entry. --- dlls/oleaut32/regsvr.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/regsvr.c b/dlls/oleaut32/regsvr.c index 12f64fa..f97544f 100644 --- a/dlls/oleaut32/regsvr.c +++ b/dlls/oleaut32/regsvr.c @@ -480,6 +480,12 @@ static struct regsvr_coclass const coclass_list[] = { "Obsolete Font", "OldFont" }, + { &IID_ISupportErrorInfo, + "PSSupportErrorInfo", + "ole2disp.dll", + "oleaut32.dll", + NULL + }, { NULL } /* list terminator */ };

1 0

Mike Kaplinskiy : ws2_32/tests: Test a WSARecv error condition.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 5d72f63bd71383343770e7a71c1730849dc627fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d72f63bd71383343770e7a71… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Mar 22 14:56:25 2010 -0400 ws2_32/tests: Test a WSARecv error condition. --- dlls/ws2_32/tests/sock.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5b519b8..a8baeeb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2778,6 +2778,62 @@ static void test_WSASendTo(void) "a successful call to WSASendTo()\n"); } +static void test_WSARecv(void) +{ + SOCKET src, dest; + char buf[20]; + WSABUF bufs; + WSAOVERLAPPED ov; + DWORD bytesReturned; + DWORD flags; + struct linger ling; + int iret; + DWORD dwret; + BOOL bret; + + tcp_socketpair(&src, &dest); + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) + { + skip("failed to create sockets\n"); + goto end; + } + + bufs.len = sizeof(buf); + bufs.buf = buf; + flags = 0; + + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); + if (!ov.hEvent) + goto end; + + ling.l_onoff = 1; + ling.l_linger = 0; + ok(!setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)), "Failed to set linger %d\n", GetLastError()); + + iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, &ov, NULL); + ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError()); + + closesocket(src); + src = INVALID_SOCKET; + + dwret = WaitForSingleObject(ov.hEvent, 1000); + ok(dwret == WAIT_OBJECT_0, "Waiting for disconnect event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)dest, &ov, &bytesReturned, FALSE); + todo_wine ok(!bret && GetLastError() == ERROR_NETNAME_DELETED, "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); + ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned); + +end: + if (dest != INVALID_SOCKET) + closesocket(dest); + if (src != INVALID_SOCKET) + closesocket(src); + if (ov.hEvent) + WSACloseEvent(ov.hEvent); +} + static void test_GetAddrInfoW(void) { static const WCHAR port[] = {'8','0',0}; @@ -3392,6 +3448,7 @@ START_TEST( sock ) test_write_events(); test_WSASendTo(); + test_WSARecv(); test_ipv6only(); test_GetAddrInfoW();

1 0

Mike Kaplinskiy : ws2_32: Use ntstatus in overlapped functions.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 798c9e5161955c75231343eff0e92536cacb8360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=798c9e5161955c75231343eff… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Mar 22 14:56:21 2010 -0400 ws2_32: Use ntstatus in overlapped functions. --- dlls/ws2_32/socket.c | 148 +++++++++++++++++++++++++++++++++++++------------- server/sock.c | 69 ++++++++++++++++++++--- 2 files changed, 170 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=798c9e5161955c7523134…

1 0

Stefan Dösinger : wined3d: Implement manual buffer fencing.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 1181762f99be1d32cd0bc9e2e6a9f2779aebe531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1181762f99be1d32cd0bc9e2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 21 13:26:36 2010 +0100 wined3d: Implement manual buffer fencing. --- dlls/wined3d/buffer.c | 69 +++++++++++++++++++++++++++++++++--- dlls/wined3d/device.c | 8 ++++ dlls/wined3d/drawprim.c | 5 +++ dlls/wined3d/query.c | 76 +++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 9 +++++ 5 files changed, 157 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1181762f99be1d32cd0bc…

1 0

Stefan Dösinger : wined3d: Partially implement unserialized buffers with the apple extension.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: fd13a6ae232c5504ae925468e173e2ac89c593cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd13a6ae232c5504ae925468e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 18 12:11:35 2010 +0100 wined3d: Partially implement unserialized buffers with the apple extension. --- dlls/wined3d/buffer.c | 34 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index aedade9..1b1c4c2 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -107,6 +107,8 @@ static void delete_gl_buffer(struct wined3d_buffer *This) checkGLcall("glDeleteBuffersARB"); LEAVE_GL(); This->buffer_object = 0; + + This->flags &= ~WINED3D_BUFFER_APPLESYNC; } /* Context activation is done by the caller. */ @@ -169,6 +171,10 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)"); This->flags |= WINED3D_BUFFER_FLUSH; + + GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); + checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)"); + This->flags |= WINED3D_BUFFER_APPLESYNC; } /* No setup is needed here for GL_ARB_map_buffer_range */ } @@ -768,6 +774,26 @@ static DWORD STDMETHODCALLTYPE buffer_GetPriority(IWineD3DBuffer *iface) return resource_get_priority((IWineD3DResource *)iface); } +/* The caller provides a context and GL locking and binds the buffer */ +static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags) +{ + /* No fencing needs to be done if the app promises not to overwrite + * existing data */ + if(flags & WINED3DLOCK_NOOVERWRITE) return; + if(flags & WINED3DLOCK_DISCARD) + { + GL_EXTCALL(glBufferDataARB(This->buffer_type_hint, This->resource.size, NULL, This->buffer_object_usage)); + checkGLcall("glBufferDataARB\n"); + return; + } + + /* Drop the unserialized updates for now */ + FIXME("Implement fences for unserialized buffers\n"); + GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); + checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); + This->flags &= ~WINED3D_BUFFER_APPLESYNC; +} + /* The caller provides a GL context */ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info, DWORD flags) { @@ -795,6 +821,13 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined } else { + if (This->flags & WINED3D_BUFFER_APPLESYNC) + { + DWORD syncflags = 0; + if (flags & WINED3D_BUFFER_DISCARD) syncflags |= WINED3DLOCK_DISCARD; + if (flags & WINED3D_BUFFER_NOSYNC) syncflags |= WINED3DLOCK_NOOVERWRITE; + buffer_sync_apple(This, syncflags); + } map = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_WRITE_ONLY_ARB)); checkGLcall("glMapBufferARB"); } @@ -1183,6 +1216,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, } else { + if(This->flags & WINED3D_BUFFER_APPLESYNC) buffer_sync_apple(This, flags); This->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_READ_WRITE_ARB)); checkGLcall("glMapBufferARB"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index db063dc..317fb80 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2476,6 +2476,7 @@ struct wined3d_map_range #define WINED3D_BUFFER_FLUSH 0x10 /* Manual unmap flushing */ #define WINED3D_BUFFER_DISCARD 0x20 /* A DISCARD lock has occurred since the last PreLoad */ #define WINED3D_BUFFER_NOSYNC 0x40 /* All locks since the last PreLoad had NOOVERWRITE set */ +#define WINED3D_BUFFER_APPLESYNC 0x80 /* Using sync as in GL_APPLE_flush_buffer_range */ struct wined3d_buffer {

1 0

Stefan Dösinger : wined3d: Add a function for deleting the GL buffer.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 5d94fe2095e8f07cad3021e567d67a3d72c3ec8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d94fe2095e8f07cad3021e56… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 18 12:05:02 2010 +0100 wined3d: Add a function for deleting the GL buffer. --- dlls/wined3d/buffer.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 46798dd..aedade9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -97,6 +97,18 @@ static inline BOOL buffer_is_fully_dirty(struct wined3d_buffer *This) return FALSE; } +/* Context activation is done by the caller */ +static void delete_gl_buffer(struct wined3d_buffer *This) +{ + if(!This->buffer_object) return; + + ENTER_GL(); + GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object)); + checkGLcall("glDeleteBuffersARB"); + LEAVE_GL(); + This->buffer_object = 0; +} + /* Context activation is done by the caller. */ static void buffer_create_buffer_object(struct wined3d_buffer *This) { @@ -203,13 +215,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) fail: /* Clean up all vbo init, but continue because we can work without a vbo :-) */ ERR("Failed to create a vertex buffer object. Continuing, but performance issues may occur\n"); - if (This->buffer_object) - { - ENTER_GL(); - GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object)); - LEAVE_GL(); - } - This->buffer_object = 0; + delete_gl_buffer(This); buffer_clear_dirty_areas(This); } @@ -691,11 +697,7 @@ static void STDMETHODCALLTYPE buffer_UnLoad(IWineD3DBuffer *iface) This->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; } - ENTER_GL(); - GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object)); - checkGLcall("glDeleteBuffersARB"); - LEAVE_GL(); - This->buffer_object = 0; + delete_gl_buffer(This); This->flags |= WINED3D_BUFFER_CREATEBO; /* Recreate the buffer object next load */ buffer_clear_dirty_areas(This);

1 0

Christian Costa : d3dxof: Increase MAX_SUBOBJECTS and do the corresponding checks at the right place .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: f2fe2f7e840d0867672e797b56d29669276716c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fe2f7e840d0867672e797b5… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Mar 23 08:32:20 2010 +0100 d3dxof: Increase MAX_SUBOBJECTS and do the corresponding checks at the right place. --- dlls/d3dxof/d3dxof.c | 7 ------- dlls/d3dxof/d3dxof_private.h | 2 +- dlls/d3dxof/parsing.c | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index b8c85e0..507664f 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1104,13 +1104,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE goto error; } - if (This->buf.pxo->nb_subobjects > MAX_SUBOBJECTS) - { - FIXME("Too many subobjects %d\n", This->buf.pxo->nb_subobjects); - hr = DXFILEERR_BADALLOC; - goto error; - } - object->pstrings = pstrings; object->pobj = This->buf.pxo; object->cur_enum_object = 0; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 8f3b53e..a8534ac 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -39,7 +39,7 @@ #define MAX_CHILDS 100 #define MAX_TEMPLATES 200 #define MAX_OBJECTS 500 -#define MAX_SUBOBJECTS 500 +#define MAX_SUBOBJECTS 2000 #define MAX_STRINGS_BUFFER 10000 typedef struct { diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index c2ffdff..c45fcd0 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1212,6 +1212,13 @@ _exit: ERR("Reference to unknown object %s\n", (char*)buf->value); return FALSE; } + + if (buf->pxo->root->nb_subobjects >= MAX_SUBOBJECTS) + { + FIXME("Too many sub-objects\n"); + return FALSE; + } + buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &(buf->pxo_globals[i])[j]; buf->pxo->nb_childs++; @@ -1219,6 +1226,13 @@ _exit: else if (check_TOKEN(buf) == TOKEN_NAME) { xobject* pxo = buf->pxo; + + if (buf->pxo->root->nb_subobjects >= MAX_SUBOBJECTS) + { + FIXME("Too many sub-objects\n"); + return FALSE; + } + buf->pxo = buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; TRACE("Enter optional %s\n", (char*)buf->value);

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
92
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 March 2010