October 2009 - Wine-commits

Jacek Caban : mshtml: Moved event_vector to HTMLDocumentNode.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 361f9a30ba9a36716c29fced6dc1da10d235a2f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=361f9a30ba9a36716c29fced6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 27 21:10:02 2009 +0100 mshtml: Moved event_vector to HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/htmlevent.c | 23 ++++++++++++----------- dlls/mshtml/htmlevent.h | 6 +++--- dlls/mshtml/htmlwindow.c | 1 - dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/nsevents.c | 6 +++--- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a5422f2..bc20a2d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1777,6 +1777,7 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) nsIDOMHTMLDocument_Release(This->nsdoc); } + heap_free(This->event_vector); destroy_htmldoc(&This->basedoc); } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d1cc6b7..345fd83 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -921,7 +921,8 @@ static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid, in return TRUE; } -static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLWindow *window, eventid_t eid, IDispatch *disp) +static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLDocumentNode *doc, + eventid_t eid, IDispatch *disp) { event_target_t *event_target; @@ -940,23 +941,23 @@ static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLWin return S_OK; IDispatch_AddRef(disp); - if(window->nswindow && (event_info[eid].flags & EVENT_DEFAULTLISTENER)) { - if(!window->event_vector) { - window->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); - if(!window->event_vector) + if(doc->nsdoc && (event_info[eid].flags & EVENT_DEFAULTLISTENER)) { + if(!doc->event_vector) { + doc->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); + if(!doc->event_vector) return E_OUTOFMEMORY; } - if(!window->event_vector[eid]) { - window->event_vector[eid] = TRUE; - add_nsevent_listener(window, event_info[eid].name); + if(!doc->event_vector[eid]) { + doc->event_vector[eid] = TRUE; + add_nsevent_listener(doc, event_info[eid].name); } } return S_OK; } -HRESULT set_event_handler(event_target_t **event_target, HTMLDocument *doc, eventid_t eid, VARIANT *var) +HRESULT set_event_handler(event_target_t **event_target, HTMLDocumentNode *doc, eventid_t eid, VARIANT *var) { switch(V_VT(var)) { case VT_NULL: @@ -967,7 +968,7 @@ HRESULT set_event_handler(event_target_t **event_target, HTMLDocument *doc, even break; case VT_DISPATCH: - return set_event_handler_disp(event_target, doc->window, eid, V_DISPATCH(var)); + return set_event_handler_disp(event_target, doc, eid, V_DISPATCH(var)); default: FIXME("not supported vt=%d\n", V_VT(var)); @@ -1048,7 +1049,7 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) disp = script_parse_event(doc->basedoc.window, attr_value); if(disp) { node = get_node(doc, (nsIDOMNode*)nselem, TRUE); - set_event_handler_disp(get_node_event_target(node), node->doc->basedoc.window, i, disp); + set_event_handler_disp(get_node_event_target(node), node->doc, i, disp); IDispatch_Release(disp); } } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 21e7ff0..d0332ee 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -42,7 +42,7 @@ eventid_t str_to_eid(LPCWSTR); void check_event_attr(HTMLDocumentNode*,nsIDOMElement*); void release_event_target(event_target_t*); void fire_event(HTMLDocumentNode*,eventid_t,nsIDOMNode*,nsIDOMEvent*); -HRESULT set_event_handler(event_target_t**,HTMLDocument*,eventid_t,VARIANT*); +HRESULT set_event_handler(event_target_t**,HTMLDocumentNode*,eventid_t,VARIANT*); HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*); HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*); HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*); @@ -55,7 +55,7 @@ static inline event_target_t **get_node_event_target(HTMLDOMNode *node) static inline HRESULT set_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) { - return set_event_handler(get_node_event_target(node), &node->doc->basedoc, eid, var); + return set_event_handler(get_node_event_target(node), node->doc, eid, var); } static inline HRESULT get_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) @@ -75,7 +75,7 @@ static inline HRESULT get_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *v static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) { - return set_event_handler(&window->event_target, &window->doc_obj->basedoc, eid, var); + return set_event_handler(&window->event_target, window->doc, eid, var); } static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index c66f245..9b8dda3 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -189,7 +189,6 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) windowref_release(This->window_ref); heap_free(This->global_props); - heap_free(This->event_vector); release_script_hosts(This); list_remove(&This->entry); release_dispex(&This->dispex); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e3a12b2..d0fdb29 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -226,7 +226,6 @@ struct HTMLWindow { event_target_t *event_target; IHTMLEventObj *event; - BOOL *event_vector; SCRIPTMODE scriptmode; struct list script_hosts; @@ -487,6 +486,7 @@ struct HTMLDocumentNode { IInternetSecurityManager *secmgr; nsDocumentEventListener *nsevent_listener; + BOOL *event_vector; mutation_queue_t *mutation_queue; mutation_queue_t *mutation_queue_tail; @@ -652,7 +652,7 @@ nsresult get_nsinterface(nsISupports*,REFIID,void**); void init_nsevents(HTMLDocumentNode*); void release_nsevents(HTMLDocumentNode*); -void add_nsevent_listener(HTMLWindow*,LPCWSTR); +void add_nsevent_listener(HTMLDocumentNode*,LPCWSTR); void set_window_bscallback(HTMLWindow*,nsChannelBSC*); void set_current_mon(HTMLWindow*,IMoniker*); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 3aef738..aa87442 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -282,18 +282,18 @@ static void init_listener(nsEventListener *This, nsDocumentEventListener *listen This->This = listener; } -void add_nsevent_listener(HTMLWindow *window, LPCWSTR type) +void add_nsevent_listener(HTMLDocumentNode *doc, LPCWSTR type) { nsIDOMEventTarget *target; nsresult nsres; - nsres = nsIDOMWindow_QueryInterface(window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); + nsres = nsIDOMWindow_QueryInterface(doc->basedoc.window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); if(NS_FAILED(nsres)) { ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); return; } - init_event(target, type, NSEVENTLIST(&window->doc->nsevent_listener->htmlevent_listener), TRUE); + init_event(target, type, NSEVENTLIST(&doc->nsevent_listener->htmlevent_listener), TRUE); nsIDOMEventTarget_Release(target); }

1 0

Alexander Nicolaysen Sørnes : vendor: Ignore deleted entries when checking for duplicates
by Alexander Nicolaysen Sørnes 28 Oct '09

28 Oct '09

Module: appdb Branch: master Commit: f852373d168fd7674971c43fdcfff07740b358a0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f852373d168fd7674971c43f… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Oct 27 21:06:59 2009 +0100 vendor: Ignore deleted entries when checking for duplicates --- include/vendor.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index 6242978..e808215 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -68,7 +68,7 @@ class Vendor { function create() { /* Check for duplicates */ - $hResult = query_parameters("SELECT * FROM vendor WHERE vendorName = '?'", + $hResult = query_parameters("SELECT * FROM vendor WHERE vendorName = '?' AND state != 'deleted'", $this->sName); if($hResult && $oRow = query_fetch_object($hResult)) {

1 0

Alexander Nicolaysen Sørnes : appBundle: Don't show deleted apps as part of bundle when editing
by Alexander Nicolaysen Sørnes 28 Oct '09

28 Oct '09

Module: appdb Branch: master Commit: 03bdcfd585ac9ad8e4c14942a05e3b1225391838 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=03bdcfd585ac9ad8e4c14942… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Oct 27 21:37:42 2009 +0100 appBundle: Don't show deleted apps as part of bundle when editing --- admin/editBundle.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/admin/editBundle.php b/admin/editBundle.php index 03ac946..8243d5c 100644 --- a/admin/editBundle.php +++ b/admin/editBundle.php @@ -44,7 +44,8 @@ if($aClean['sCmd']) apidb_header("Edit Application Bundle"); $hResult = query_parameters("SELECT bundleId, appBundle.appId, appName FROM appBundle, appFamily ". - "WHERE bundleId = '?' AND appFamily.appId = appBundle.appId", + "WHERE bundleId = '?' AND appFamily.appId = appBundle.appId + AND appFamily.state != 'deleted'", $aClean['iBundleId']); echo html_frame_start("Apps in this Bundle","300",'',0);

1 0

Alexander Nicolaysen Sørnes : appBundle: Don't allow apps to be added more than once to a given bundle
by Alexander Nicolaysen Sørnes 28 Oct '09

28 Oct '09

Module: appdb Branch: master Commit: 7aa0f3e59cd8c0678e40700db8ba64107cb72517 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7aa0f3e59cd8c0678e40700d… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Oct 27 21:45:33 2009 +0100 appBundle: Don't allow apps to be added more than once to a given bundle --- admin/editBundle.php | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/admin/editBundle.php b/admin/editBundle.php index 8243d5c..adb0ec1 100644 --- a/admin/editBundle.php +++ b/admin/editBundle.php @@ -31,12 +31,21 @@ if($aClean['sCmd']) } if($aClean['sCmd'] == "add") { - $hResult = query_parameters("INSERT INTO appBundle (bundleId, appId) VALUES". - "('?', '?')", - $aClean['iBundleId'], - $aClean['iAppId']); - if($hResult) - addmsg("App $appId added to Bundle".$aClean['iBundleId'], "green"); + $oApp = new application($aClean['iAppId']); + /* Check that the app hasn't already been added */ + $hResult = query_parameters("SELECT * FROM appBundle WHERE bundleId = '?' AND appId = '?'", $aClean['iBundleId'], $aClean['iAppId']); + if($hResult && mysql_num_rows($hResult) == 0) + { + $hResult = query_parameters("INSERT INTO appBundle (bundleId, appId) VALUES". + "('?', '?')", + $aClean['iBundleId'], + $aClean['iAppId']); + if($hResult) + addmsg("App $appId added to Bundle".$aClean['iBundleId'], "green"); + } else + { + addmsg("{$oApp->sName} is already in the bundle", 'red'); + } } }

1 0

Alexander Nicolaysen Sørnes : appBundle: Improve on-screen message when adding an app to a bundle
by Alexander Nicolaysen Sørnes 28 Oct '09

28 Oct '09

Module: appdb Branch: master Commit: 15e3155c6cd8d3b69d0261d239faa9f8551f165f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=15e3155c6cd8d3b69d0261d2… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Oct 27 21:53:38 2009 +0100 appBundle: Improve on-screen message when adding an app to a bundle --- admin/editBundle.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/admin/editBundle.php b/admin/editBundle.php index adb0ec1..68e5318 100644 --- a/admin/editBundle.php +++ b/admin/editBundle.php @@ -41,7 +41,7 @@ if($aClean['sCmd']) $aClean['iBundleId'], $aClean['iAppId']); if($hResult) - addmsg("App $appId added to Bundle".$aClean['iBundleId'], "green"); + addmsg("{$oApp->sName} added to bundle {$aClean['iBundleId']}", 'green'); } else { addmsg("{$oApp->sName} is already in the bundle", 'red');

1 0

Alexander Nicolaysen Sørnes : appBundle: Add apps using 'Add' button instead of single-click
by Alexander Nicolaysen Sørnes 28 Oct '09

28 Oct '09

Module: appdb Branch: master Commit: f9e50695d185db22cb0532d61212275ef9ea6aba URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f9e50695d185db22cb0532d6… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Oct 27 22:01:45 2009 +0100 appBundle: Add apps using 'Add' button instead of single-click --- admin/editBundle.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/editBundle.php b/admin/editBundle.php index 68e5318..bbe38b7 100644 --- a/admin/editBundle.php +++ b/admin/editBundle.php @@ -10,7 +10,7 @@ function build_app_list() { $hResult = application::objectGetEntries('accepted'); - echo "<select name=iAppId size=5 onChange='this.form.submit()'>\n"; + echo "<select name=iAppId size=5'>\n"; while($oRow = query_fetch_object($hResult)) { echo "<option value=$oRow->appId>$oRow->appName</option>\n"; @@ -95,12 +95,13 @@ echo html_frame_end(); echo "<form method=post action=editBundle.php>\n"; -echo html_frame_start("Application List (double click to add)","",'',2); +echo html_frame_start("Application list","",'',2); build_app_list(); echo html_frame_end(); echo "<input type=\"hidden\" name=\"iBundleId\" value=\"".$aClean['iBundleId']."\">\n"; echo "<input type=\"hidden\" name=\"sCmd\" value=\"add\">\n"; +echo "<input type=\"submit\" value=\"Add\" />\n"; echo "</form>\n"; apidb_footer();

1 0

Alexander Nicolaysen Sørnes : Use objectManager to show 'Comments Management' page
by Alexander Nicolaysen Sørnes 28 Oct '09

28 Oct '09

Module: appdb Branch: master Commit: 0b8e7c97fe4b0a4f97734c98fab6aa464d972809 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0b8e7c97fe4b0a4f97734c98… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Oct 27 23:25:26 2009 +0100 Use objectManager to show 'Comments Management' page --- admin/adminCommentView.php | 73 ------------------------------------------- include/comment.php | 74 ++++++++++++++++++++++++++++++++++++++++++++ include/sidebar_admin.php | 2 +- 3 files changed, 75 insertions(+), 74 deletions(-) diff --git a/admin/adminCommentView.php b/admin/adminCommentView.php deleted file mode 100644 index 13f5929..0000000 --- a/admin/adminCommentView.php +++ /dev/null @@ -1,73 +0,0 @@ -<?php -/************************************************************/ -/* Page for managing all of the comments in the apidb */ -/* Without having go into each application version to do so */ -/************************************************************/ - -require("path.php"); -require(BASE."include/incl.php"); - -apidb_header("Comments"); - -/* display a range of 10 pages */ -$pageRange = 10; - -$ItemsPerPage = isset($aClean['iItemsPerPage']) ? $aClean['iItemsPerPage'] : 10; -$currentPage = isset($aClean['iPage']) ? $aClean['iPage'] : 1; - -$totalPages = ceil(getNumberOfComments()/$ItemsPerPage); - -if($ItemsPerPage > 100) $ItemsPerPage = 100; - - -/* display page selection links */ -echo "<center>"; -echo "<b>Page $currentPage of $totalPages</b><br>"; -display_page_range($currentPage, $pageRange, $totalPages, $_SERVER['PHP_SELF']."?iItemsPerPage=".$ItemsPerPage); -echo "<br>"; -echo "<br>"; - -/* display the option to choose how many comments per-page to display */ -echo "<form method=\"get\" name=\"sMessage\" action=\"".$_SERVER['PHP_SELF']."\">"; -echo "<b>Number of comments per page:</b>"; -echo " <select name='iItemsPerPage'>"; - -$ItemsPerPageArray = array(10, 20, 50, 100, 500); -foreach($ItemsPerPageArray as $i => $value) -{ - if($ItemsPerPageArray[$i] == $ItemsPerPage) - echo "<option value='$ItemsPerPageArray[$i]' SELECTED>$ItemsPerPageArray[$i]"; - else - echo "<option value='$ItemsPerPageArray[$i]'>$ItemsPerPageArray[$i]"; -} -echo "</select>"; - -echo "<input type=hidden name=iPage value=$currentPage>"; -echo " <input type=submit value='Refresh'>"; -echo "</form>"; - -echo "</center>"; - -/* query for all of the commentId's, ordering by their time in reverse order */ -$offset = (($currentPage-1) * $ItemsPerPage); -$commentIds = query_parameters("SELECT commentId from appComments ORDER BY ". - "appComments.time ASC LIMIT ?, ?", $offset, $ItemsPerPage); -while ($oRow = query_fetch_object($commentIds)) -{ - $sQuery = "SELECT from_unixtime(unix_timestamp(time), \"%W %M %D %Y, %k:%i\") as time, ". - "commentId, parentId, versionId, userid, subject, body ". - "FROM appComments WHERE commentId = '?'"; - $hResult = query_parameters($sQuery, $oRow->commentId); - /* call view_app_comment to display the comment */ - $oComment_row = query_fetch_object($hResult); - Comment::view_app_comment($oComment_row, true); -} - -/* display page selection links */ - -echo "<center>"; -display_page_range($currentPage, $pageRange, $totalPages, $_SERVER['PHP_SELF']."?iItemsPerPage=".$ItemsPerPage); -echo "</center>"; - -apidb_footer(); -?> diff --git a/include/comment.php b/include/comment.php index a999e41..a890ec3 100644 --- a/include/comment.php +++ b/include/comment.php @@ -296,6 +296,80 @@ class Comment { echo html_frame_end(); } + public function objectWantCustomDraw($sWhat, $sQueued) + { + switch($sWhat) + { + case 'table': + return true; + } + + return false; + } + + public static function objectGetEntries($sState, $iNumRows = 0, $iStart = 0, $sOrderBy = 'commentId') + { + $sLimit = ''; + + if($iNumRows) + { + $iStart = mysql_real_escape_string($iStart); + $iNumRows = mysql_real_escape_string($iNumRows); + $sLimit = " LIMIT $iStart,$iNumRows"; + } + + if($sOrderBy) + $sOrderBy = " ORDER BY ".mysql_real_escape_string($sOrderBy); + + $hResult = query_parameters("SELECT * FROM appComments$sOrderBy$sLimit"); + + return $hResult; + } + + public function objectGetDefaultSort() + { + return 'commentId'; + } + + public static function objectGetEntriesCount($sState) + { + $hResult = query_parameters("SELECT COUNT(commentId) as count FROM appComments"); + + if(!$hResult) + return null; + + $oRow = mysql_fetch_object($hResult); + + return $oRow->count; + } + + public function objectGetItemsPerPage() + { + $aItemsPerPage = array(10, 20, 50, 100, 500); + $iDefaultPerPage = 10; + + return array($aItemsPerPage, $iDefaultPerPage); + } + + public function objectDrawCustomTable($hResult, $sQueued) + { + while($oRow = mysql_fetch_object($hResult)) + comment::view_app_comment($oRow, true); + } + + public function objectGetHeader() + { + return new TableRow(); + } + + public function objectGetTableRow() + { + $oTableRow = new TableRow(); + $oOMRow = new OMTableRow($oTableRow); + + return $oOMRow; + } + function display() { $this->output_comment(); diff --git a/include/sidebar_admin.php b/include/sidebar_admin.php index c06864e..746470d 100644 --- a/include/sidebar_admin.php +++ b/include/sidebar_admin.php @@ -39,7 +39,7 @@ function global_admin_menu() { BASE."objectManager.php?sClass=testData&sTitle=". "View%20Test%20Results"); $g->add("Users Management", BASE."admin/adminUsers.php"); - $g->add("Comments Management", BASE."admin/adminCommentView.php"); + $g->add('Comments Management', BASE.'objectManager.php?sClass=comment'); $g->add("Screenshots Management", BASE."admin/adminScreenshots.php"); $g->addmisc(" ");

1 0

Huw Davies : oledb32: Add a couple of conversions to DBTYPE_FILETIME.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 76e009056557db810afaa8af042b7248b879f7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e009056557db810afaa8af0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 12:25:19 2009 +0000 oledb32: Add a couple of conversions to DBTYPE_FILETIME. --- dlls/oledb32/convert.c | 14 ++++++++++++++ dlls/oledb32/tests/convert.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index e5443cb..44d86bb 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -128,6 +128,8 @@ static int get_length(DBTYPE type) return 8; case DBTYPE_BSTR: return sizeof(BSTR); + case DBTYPE_FILETIME: + return sizeof(FILETIME); case DBTYPE_WSTR: case DBTYPE_BYREF | DBTYPE_WSTR: return 0; @@ -281,6 +283,18 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, break; } + case DBTYPE_FILETIME: + { + FILETIME *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: d->dwLowDateTime = d->dwHighDateTime = 0; hr = S_OK; break; + case DBTYPE_FILETIME: *d = *(FILETIME*)src; hr = S_OK; break; + default: FIXME("Unimplemented conversion %04x -> FILETIME\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_WSTR: { BSTR b; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 6cd44f5..2095b9b 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1111,6 +1111,34 @@ static void test_converttobyrefwstr(void) IDataConvert_Release(convert); } +static void test_converttofiletime(void) +{ + IDataConvert *convert; + HRESULT hr; + FILETIME dst; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + memset(&dst, 0xcc, sizeof(dst)); + ((FILETIME *)src)->dwLowDateTime = 0x12345678; + ((FILETIME *)src)->dwHighDateTime = 0x9abcdef0; + hr = IDataConvert_DataConvert(convert, DBTYPE_FILETIME, DBTYPE_FILETIME, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %d\n", dst_len); + ok(dst.dwLowDateTime == 0x12345678, "got %08x\n", dst.dwLowDateTime); + ok(dst.dwHighDateTime == 0x9abcdef0, "got %08x\n", dst.dwHighDateTime); + + IDataConvert_Release(convert); +} START_TEST(convert) { @@ -1122,5 +1150,6 @@ START_TEST(convert) test_converttobstr(); test_converttowstr(); test_converttobyrefwstr(); + test_converttofiletime(); OleUninitialize(); }

1 0

Matteo Bruni : d3dx9: Add D3DXAssembleShader tests.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: c6af1f5cd4abffd37a1fb8a3fd17abdf6b879d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6af1f5cd4abffd37a1fb8a3f… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Sep 16 00:41:33 2009 +0200 d3dx9: Add D3DXAssembleShader tests. --- dlls/d3dx9_36/tests/Makefile.in | 1 + dlls/d3dx9_36/tests/asm.c | 1409 +++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/res.vsh | 2 + dlls/d3dx9_36/tests/resources.h | 2 + dlls/d3dx9_36/tests/rsrc.rc | 3 + 5 files changed, 1417 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6af1f5cd4abffd37a1fb…

1 0

Nate Gallaher : msi: Add tablename tracking to VIEW_find_column.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: cc366e12829a20570b3d2e3cc508a8c861c722cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc366e12829a20570b3d2e3cc… Author: Nate Gallaher <ngallaher(a)deepthought.org> Date: Sun Oct 18 12:41:41 2009 -0400 msi: Add tablename tracking to VIEW_find_column. This fixes the bug where multiple columns of the same name, but different tables are members of a join. Any attempt to refer to these columns will resolve to the first available column with that name, irregardless of any tablename modifier. --- dlls/msi/alter.c | 5 +++-- dlls/msi/create.c | 5 +++-- dlls/msi/delete.c | 7 ++++--- dlls/msi/distinct.c | 7 ++++--- dlls/msi/insert.c | 19 +++++++++++-------- dlls/msi/join.c | 8 +++++--- dlls/msi/msipriv.h | 8 ++++---- dlls/msi/msiquery.c | 14 ++++++++++---- dlls/msi/query.h | 8 +++++++- dlls/msi/select.c | 11 ++++++----- dlls/msi/sql.y | 3 ++- dlls/msi/storages.c | 6 ++++-- dlls/msi/streams.c | 6 ++++-- dlls/msi/table.c | 13 +++++++++++-- dlls/msi/update.c | 7 ++++--- dlls/msi/where.c | 15 +++++++++------ 16 files changed, 91 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc366e12829a20570b3d2…

1 0