wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Dmitry Timoshkov : gdiplus: Fix the convert_unit() comment to reflect its functionality.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 1f3b53c5d826fa5de4c10642cf6f2416de54dc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3b53c5d826fa5de4c10642c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 3 17:33:41 2012 +0900 gdiplus: Fix the convert_unit() comment to reflect its functionality. --- dlls/gdiplus/gdiplus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 56d8330..11ae2d8 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -317,7 +317,7 @@ GpStatus hresult_to_status(HRESULT res) } } -/* converts a given unit to its value in pixels */ +/* converts a given unit to its value in inches */ REAL convert_unit(REAL logpixels, GpUnit unit) { switch(unit)

1 0

Dmitry Timoshkov : gdiplus: Add parameter checks to GdipSetPropertyItem, print item contents in the trace.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 56621638dfd00736ec5ae2879e6dc5ea7e220c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56621638dfd00736ec5ae2879… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 3 11:58:21 2012 +0900 gdiplus: Add parameter checks to GdipSetPropertyItem, print item contents in the trace. --- dlls/gdiplus/image.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a4dade8..db79eca 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3348,7 +3348,9 @@ GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage *image, GDIPCONST PropertyItem* { static int calls; - TRACE("(%p,%p)\n", image, item); + if (!image || !item) return InvalidParameter; + + TRACE("(%p,%p:%#x,%u,%u,%p)\n", image, item, item->id, item->type, item->length, item->value); if(!(calls++)) FIXME("not implemented\n");

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: b03e74e3586d981b4b2cd156e8be490d920a6d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03e74e3586d981b4b2cd156e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jul 2 21:51:31 2012 +0900 po: Update Korean translation. --- po/ko.po | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/po/ko.po b/po/ko.po index 44cb03f..da0088b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -9617,6 +9617,32 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"프로그램을 시작하거나, 파일 확장자에서 보통 사용하는 프로그램으로 문서를 엽니" +"다\n" +"사용법:\n" +"start [옵션] 프로그램_파일이름 [...]\n" +"start [옵션] 문서_파일이름\n" +"\n" +"옵션:\n" +"\"제목\" 자식 창의 제목 지정합니다.\n" +"/d 디렉토리 지정한 디렉토리에서 프로그램을 실행합니다.\n" +"/b 프로그램을 위해 새 콘솔을 만들지 않습니다.\n" +"/i 깨끗한 환경 변수로 프로그램을 시작합니다.\n" +"/min 프로그램을 최소화된 상태로 시작합니다.\n" +"/max 프로그램을 최대화된 상태로 시작합니다.\n" +"/low 프로그램을 낮은 우선 순위 클래스로 시작합니다.\n" +"/normal 프로그램을 보통 우선 순위 클래스로 시작합니다.\n" +"/high 프로그램을 높은 우선 순위 클래스로 시작합니다.\n" +"/realtime 프로그램을 실시간 우선 순위 클래스로 시작합니다.\n" +"/abovenormal 프로그램을 보통이상 우선 순위 클래스로 시작합니다.\n" +"/belownormal 프로그램을 보통이하 우선 순위 클래스로 시작합니다.\n" +"/node n 지정한 NUMA 노드로 프로그램을 시작합니다.\n" +"/affinity 마스크 지정한 친화도 마스크로 프로그램을 시작합니다.\n" +"/wait 시작된 프로그램이 끝나기를 기다리고,프로그램이 끝났을때 종료코드" +"로 끝납니다 /unix 유닉스 파일이름을 사용하고, 윈도우즈 탐색기같이 파일" +"을 시작합니다.\n" +"/ProgIDOpen 지정한 progID를 사용해서 문서를 엽니다.\n" +"/? 도움말을 보여주고 끝냅니다.\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n"

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 665f1eee16196f92806d4ee0610c1b10222cb594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=665f1eee16196f92806d4ee06… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jul 3 04:23:14 2012 +0200 po: Update German translation. --- po/de.po | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/po/de.po b/po/de.po index 649488f..7463643 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-20 21:55+0200\n" +"PO-Revision-Date: 2012-07-03 01:38+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -9719,6 +9719,32 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"Startet ein Programm, oder öffnet ein Dokument in dem Programm, das " +"normalerweise für Dateien mit dieser Dateiendung benutzt wird.\n" +"Aufruf:\n" +"start [Optionen] Dateiname_Programm [...]\n" +"start [Optionen] Dateiname_Dokument\n" +"\n" +"Optionen:\n" +"\"titel\" Spezifiziert den Titel für Kindfenster.\n" +"/d Ordner Startet das Programm im angegebenen Verzeichnis.\n" +"/b Für dieses Programm wird keine neue Konsole erstellt.\n" +"/i Startet das Programm mit einem neuen Satz Umgebungsvariablen.\n" +"/min Startet das Programm minimiert.\n" +"/max Startet das Programm maximiert.\n" +"/low Startet das Programm in der Leerlauf-Prioritätsklasse.\n" +"/normal Startet das Programm in der normalen Prioritätsklasse.\n" +"/high Startet das Programm in der hohen Prioritätsklasse.\n" +"/realtime Startet das Programm in der Echtzeit-Prioritätsklasse.\n" +"/abovenormal Startet das Programm in der gehobenen Prioritätsklasse.\n" +"/belownormal Startet das Programm in der abgesenkten Prioritätsklasse.\n" +"/node Startet das Programm auf dem angegebenen NUMA-Knoten.\n" +"/affinity Maske Startet das Programm mit der angegebenen Affinitätsmaske.\n" +"/wait Wartet, bis das Programm endet und beendet sich selbst mit " +"dessen Exitcode.\n" +"/unix Öffnet einen Unix-Dateinamen wie mit dem Windows-Explorer.\n" +"/ProgIDOpen Öffnet ein Dokument mit der angegebenen progID.\n" +"/? Zeigt diese Hilfe an und beendet sich.\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n"

1 0

Jacek Caban : mshtml: Force cycle collection when releasing main document object.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: ecf667ad771abbb7b6a7624627d8851c4af670f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf667ad771abbb7b6a762462… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 3 11:05:30 2012 +0200 mshtml: Force cycle collection when releasing main document object. --- dlls/mshtml/htmldoc.c | 11 +++++ dlls/mshtml/nsiface.idl | 111 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5e98cea..53e98c7 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2319,6 +2319,11 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) TRACE("(%p) ref = %u\n", This, ref); if(!ref) { + nsIDOMWindowUtils *window_utils = NULL; + + if(This->basedoc.window && This->basedoc.window->nswindow) + get_nsinterface((nsISupports*)This->basedoc.window->nswindow, &IID_nsIDOMWindowUtils, (void**)&window_utils); + if(This->basedoc.doc_node) { This->basedoc.doc_node->basedoc.doc_obj = NULL; htmldoc_release(&This->basedoc.doc_node->basedoc); @@ -2355,6 +2360,12 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) if(This->nscontainer) NSContainer_Release(This->nscontainer); heap_free(This); + + /* Force cycle collection */ + if(window_utils) { + nsIDOMWindowUtils_CycleCollect(window_utils, NULL, 0); + nsIDOMWindowUtils_Release(window_utils); + } } return ref; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index c5fe3db..006a1cc 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -149,6 +149,7 @@ typedef nsISupports nsIDOMDOMTokenList; typedef nsISupports nsITransferable; typedef nsISupports nsIDOMHTMLHeadElement; typedef nsISupports nsIDOMFileList; +typedef nsISupports nsIDOMFile; typedef nsISupports nsIControllers; typedef nsISupports nsIDOMValidityState; typedef nsISupports nsIPluginInstanceOwner; @@ -177,6 +178,10 @@ typedef nsISupports nsILocalFile; typedef nsISupports nsIDOMHTMLMenuElement; typedef nsISupports nsIDOMCaretPosition; typedef nsISupports nsIFrameRequestCallback; +typedef nsISupports nsICycleCollectorListener; +typedef nsISupports nsIDOMHTMLCanvasElement; +typedef nsISupports nsIQueryContentEventResult; +typedef nsISupports nsIDOMBlob; typedef void *JSContext; typedef void *JSObject; @@ -2620,6 +2625,110 @@ interface nsIDOMEvent : nsISupports nsresult StopImmediatePropagation(); } +[ + object, + uuid(73b48170-55d5-11e1-b86c-0800200c9a66), + local +] +interface nsIDOMWindowUtils : nsISupports +{ + nsresult GetImageAnimationMode(PRUint16 *aImageAnimationMode); + nsresult SetImageAnimationMode(PRUint16 aImageAnimationMode); + nsresult GetDocCharsetIsForced(bool *aDocCharsetIsForced); + nsresult GetCursorType(PRInt16 *_retval); + nsresult GetDocumentMetadata(const nsAString *aName, nsAString *_retval); + nsresult Redraw(PRUint32 aCount, PRUint32 *_retval); + nsresult SetCSSViewport(float aWidthPx, float aHeightPx); + nsresult SetDisplayPortForElement(float aXPx, float aYPx, float aWidthPx, float aHeightPx, nsIDOMElement *aElement); + nsresult SetResolution(float aXResolution, float aYResolution); + nsresult SendMouseEvent(const nsAString *aType, float aX, float aY, PRInt32 aButton, + PRInt32 aClickCount, PRInt32 aModifiers, bool aIgnoreRootScrollFrame); + nsresult SendTouchEvent(const nsAString *aType, PRUint32 *aIdentifiers, PRInt32 *aXs, PRInt32 *aYs, + PRUint32 *aRxs, PRUint32 *aRys, float *aRotationAngles, float *aForces, PRUint32 count, PRInt32 aModifiers, + bool aIgnoreRootScrollFrame, bool *_retval); + nsresult SendMouseEventToWindow(const nsAString *aType, float aX, float aY, PRInt32 aButton, PRInt32 aClickCount, + PRInt32 aModifiers, bool aIgnoreRootScrollFrame); + nsresult SendMouseScrollEvent(const nsAString *aType, float aX, float aY, PRInt32 aButton, PRInt32 aScrollFlags, + PRInt32 aDelta, PRInt32 aModifiers); + nsresult SendKeyEvent(const nsAString *aType, PRInt32 aKeyCode, PRInt32 aCharCode, PRInt32 aModifiers, + bool aPreventDefault, bool *_retval); + nsresult SendNativeKeyEvent(PRInt32 aNativeKeyboardLayout, PRInt32 aNativeKeyCode, PRInt32 aModifierFlags, + const nsAString *aCharacters, const nsAString *aUnmodifiedCharacters); + nsresult SendNativeMouseEvent(PRInt32 aScreenX, PRInt32 aScreenY, PRInt32 aNativeMessage, PRInt32 aModifierFlags, + nsIDOMElement *aElement); + nsresult ActivateNativeMenuItemAt(const nsAString *indexString); + nsresult ForceUpdateNativeMenuAt(const nsAString *indexString); + nsresult Focus(nsIDOMElement *aElement); + nsresult GarbageCollect(nsICycleCollectorListener *aListener, PRInt32 aExtraForgetSkippableCalls); + nsresult CycleCollect(nsICycleCollectorListener *aListener, PRInt32 aExtraForgetSkippableCalls); + nsresult SendSimpleGestureEvent(const nsAString *aType, float aX, float aY, PRUint32 aDirection, double aDelta, + PRInt32 aModifiers); + nsresult ElementFromPoint(float aX, float aY, bool aIgnoreRootScrollFrame, bool aFlushLayout, nsIDOMElement **_retval); + nsresult NodesFromRect(float aX, float aY, float aTopSize, float aRightSize, float aBottomSize, float aLeftSize, + bool aIgnoreRootScrollFrame, bool aFlushLayout, nsIDOMNodeList **_retval); + nsresult CompareCanvases(nsIDOMHTMLCanvasElement *aCanvas1, nsIDOMHTMLCanvasElement *aCanvas2, + PRUint32 *aMaxDifference, PRUint32 *_retval); + nsresult GetIsMozAfterPaintPending(bool *aIsMozAfterPaintPending); + nsresult SuppressEventHandling(bool aSuppress); + nsresult ClearMozAfterPaintEvents(); + nsresult DisableNonTestMouseEvents(bool aDisable); + nsresult GetScrollXY(bool aFlushLayout, PRInt32 *aScrollX, PRInt32 *aScrollY); + nsresult GetIMEIsOpen(bool *aIMEIsOpen); + nsresult GetIMEStatus(PRUint32 *aIMEStatus); + nsresult GetScreenPixelsPerCSSPixel(float *aScreenPixelsPerCSSPixel); + nsresult DispatchDOMEventViaPresShell(nsIDOMNode *aTarget, nsIDOMEvent *aEvent, bool aTrusted, bool *_retval); + nsresult GetClassName(const /*JS::Value*/ void *aObject, JSContext* cx, char **_retval); + nsresult SendContentCommandEvent(const nsAString *aType, nsITransferable *aTransferable); + nsresult SendCompositionEvent(const nsAString *aType, const nsAString *aData, const nsAString *aLocale); + nsresult SendTextEvent(const nsAString *aCompositionString, PRInt32 aFirstClauseLength, PRUint32 aFirstClauseAttr, + PRInt32 aSecondClauseLength, PRUint32 aSecondClauseAttr, PRInt32 aThirdClauseLength, PRUint32 aThirdClauseAttr, + PRInt32 aCaretStart, PRInt32 aCaretLength); + nsresult SendQueryContentEvent(PRUint32 aType, PRUint32 aOffset, PRUint32 aLength, PRInt32 aX, PRInt32 aY, + nsIQueryContentEventResult **_retval); + nsresult SendSelectionSetEvent(PRUint32 aOffset, PRUint32 aLength, bool aReverse, bool *_retval); + nsresult GetVisitedDependentComputedStyle(nsIDOMElement *aElement, const nsAString *aPseudoElement, + const nsAString *aPropertyName, nsAString *_retval); + nsresult GetParent(const /*JS::Value*/ void *obj, JSContext *cx, /*JS::Value*/ void *_retval); + nsresult GetOuterWindowID(PRUint64 *aOuterWindowID); + nsresult GetCurrentInnerWindowID(PRUint64 *aCurrentInnerWindowID); + nsresult EnterModalState(); + nsresult LeaveModalState(); + nsresult EnterModalStateWithWindow(nsIDOMWindow **_retval); + nsresult LeaveModalStateWithWindow(nsIDOMWindow *aWindow); + nsresult IsInModalState(bool *_retval); + nsresult SuspendTimeouts(); + nsresult ResumeTimeouts(); + nsresult GoOnline(); + nsresult GetLayerManagerType(nsAString *aLayerManagerType); + nsresult StartFrameTimeRecording(); + nsresult StopFrameTimeRecording(PRUint32 *frameCount, float **frameTime); + nsresult GetDisplayDPI(float *aDisplayDPI); + nsresult GetOuterWindowWithId(PRUint64 aOuterWindowID, nsIDOMWindow **_retval); + nsresult RenderDocument(const void /*nsRect*/ *aRect, PRUint32 aFlags, int /*nscolor*/ aBackgroundColor, + void /*gfxContext*/ *aThebesContext); + nsresult AdvanceTimeAndRefresh(PRInt64 aMilliseconds); + nsresult RestoreNormalRefresh(); + nsresult ComputeAnimationDistance(nsIDOMElement *element, const nsAString *property, const nsAString *value1, + const nsAString *value2, double *_retval); + nsresult WrapDOMFile(nsIFile *aFile, nsIDOMFile **_retval); + nsresult GetFocusedInputType(char **aFocusedInputType); + nsresult FindElementWithViewId(long /*nsViewID*/ aId, nsIDOMElement **_retval); + nsresult LeafLayersPartitionWindow(bool *_retval); + nsresult GetMayHaveTouchEventListeners(bool *aMayHaveTouchEventListeners); + nsresult CheckAndClearPaintedState(nsIDOMElement *aElement, bool *_retval); + nsresult GetFileId(nsIDOMBlob *aBlob, PRInt64 *_retval); + nsresult GetFileReferences(const nsAString *aDatabaseName, PRInt64 aId, PRInt32 *aRefCnt, PRInt32 *aDBRefCnt, + PRInt32 *aSliceRefCnt, bool *_retval); + nsresult IsIncrementalGCEnabled(JSContext *cx, bool *_retval); + nsresult StartPCCountProfiling(JSContext *cx); + nsresult StopPCCountProfiling(JSContext *cx); + nsresult PurgePCCounts(JSContext *cx); + nsresult GetPCCountScriptCount(JSContext *cx, PRInt32 *_retval); + nsresult GetPCCountScriptSummary(PRInt32 script, JSContext *cx, nsAString *_retval); + nsresult GetPCCountScriptContents(PRInt32 script, JSContext *cx, nsAString *_retval); + nsresult GetPaintingSuppressed(bool *aPaintingSuppressed); +} + cpp_quote("#define CONTEXT_NONE 0x00") cpp_quote("#define CONTEXT_LINK 0x01") cpp_quote("#define CONTEXT_IMAGE 0x02") @@ -2654,7 +2763,7 @@ interface nsIDOMUIEvent : nsIDOMEvent nsresult GetPageX(PRInt32 *aPageX); nsresult GetPageY(PRInt32 *aPageY); nsresult GetWhich(PRUint32 *aWhich); - nsresult GetRangeParent(nsIDOMNode * *aRangeParent); + nsresult GetRangeParent(nsIDOMNode **aRangeParent); nsresult GetRangeOffset(PRInt32 *aRangeOffset); nsresult GetCancelBubble(bool *aCancelBubble); nsresult SetCancelBubble(bool aCancelBubble);

1 0

Sergey Guralnik : user32: Add test for ComboBox repositioning behavior.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: fb4545847ed6a76f615b0b16c16e277874eba571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4545847ed6a76f615b0b16c… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Tue Jul 3 12:30:49 2012 +0400 user32: Add test for ComboBox repositioning behavior. --- dlls/user32/tests/msg.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 27a5476..3102cf2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5720,6 +5720,21 @@ static const struct message WmKeyDownComboSeq[] = { 0 } }; +static const struct message WmSetPosComboSeq[] = +{ + { WM_WINDOWPOSCHANGING, sent }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { WM_CHILDACTIVATE, sent }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { WM_WINDOWPOSCHANGING, sent|defwinproc }, + { WM_NCCALCSIZE, sent|defwinproc|wparam, TRUE }, + { WM_WINDOWPOSCHANGED, sent|defwinproc }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { 0 } +}; + static WNDPROC old_combobox_proc; static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -5807,6 +5822,10 @@ static void test_combobox_messages(void) log_all_parent_messages--; ok_sequence(WmKeyDownComboSeq, "WM_KEYDOWN/VK_DOWN on a ComboBox", FALSE); + flush_sequence(); + SetWindowPos(combo, 0, 10, 10, 120, 130, SWP_NOZORDER); + ok_sequence(WmSetPosComboSeq, "repositioning messages on a ComboBox", TRUE); + DestroyWindow(combo); DestroyWindow(parent); }

1 0

Francois Gouget : kernel32/tests: Test deleting a timer right after creating it.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: d31b6335f2d2b6576f32d88254d83a6b4d182c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31b6335f2d2b6576f32d8825… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 3 10:03:07 2012 +0200 kernel32/tests: Test deleting a timer right after creating it. --- dlls/kernel32/tests/sync.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 5cf5269..4068b22 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -704,11 +704,11 @@ static void CALLBACK timer_queue_cb6(PVOID p, BOOLEAN timedOut) static void test_timer_queue(void) { - HANDLE q, t1, t2, t3, t4, t5; - int n1, n2, n3, n4, n5; + HANDLE q, t0, t1, t2, t3, t4, t5; + int n0, n1, n2, n3, n4, n5; struct timer_queue_data1 d1, d2, d3, d4; HANDLE e, et1, et2; - BOOL ret; + BOOL ret, ret0; if (!pChangeTimerQueueTimer || !pCreateTimerQueue || !pCreateTimerQueueTimer || !pDeleteTimerQueueEx || !pDeleteTimerQueueTimer) @@ -731,6 +731,18 @@ static void test_timer_queue(void) q = pCreateTimerQueue(); ok(q != NULL, "CreateTimerQueue\n"); + /* Not called. */ + t0 = NULL; + n0 = 0; + ret = pCreateTimerQueueTimer(&t0, q, timer_queue_cb1, &n0, 0, + 300, 0); + ok(ret, "CreateTimerQueueTimer\n"); + ok(t0 != NULL, "CreateTimerQueueTimer\n"); + ret0 = pDeleteTimerQueueTimer(q, t0, NULL); + ok((!ret0 && GetLastError() == ERROR_IO_PENDING) || + broken(ret0), /* Win 2000 & XP & 2003 */ + "DeleteTimerQueueTimer ret=%d le=%u\n", ret0, GetLastError()); + /* Called once. */ t1 = NULL; n1 = 0; @@ -784,6 +796,8 @@ static void test_timer_queue(void) ret = pDeleteTimerQueueEx(q, INVALID_HANDLE_VALUE); ok(ret, "DeleteTimerQueueEx\n"); + todo_wine + ok(n0 == 1 || broken(ret0 && n0 == 0), "Timer callback 0 expected 1 got %d\n", n0); ok(n1 == 1, "Timer callback 1 expected 1 got %d\n", n1); ok(n2 < n3, "Timer callback 2 & 3 expected %d < %d\n", n2, n3); ok(n4 == 0, "Timer callback 4 expected 0 got %d\n", n4);

1 0

Francois Gouget : kernel32/tests: Improve some traces for the CreateTimerQueueTimer() tests.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: b887e7a963a63d69dd1b99b55b6c3a4f53847ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b887e7a963a63d69dd1b99b55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 3 10:02:51 2012 +0200 kernel32/tests: Improve some traces for the CreateTimerQueueTimer() tests. --- dlls/kernel32/tests/sync.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index d4f6cf7..5cf5269 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -784,10 +784,10 @@ static void test_timer_queue(void) ret = pDeleteTimerQueueEx(q, INVALID_HANDLE_VALUE); ok(ret, "DeleteTimerQueueEx\n"); - ok(n1 == 1, "Timer callback 1\n"); - ok(n2 < n3, "Timer callback 2 should be much slower than 3\n"); - ok(n4 == 0, "Timer callback 4\n"); - ok(n5 == 1, "Timer callback 5\n"); + ok(n1 == 1, "Timer callback 1 expected 1 got %d\n", n1); + ok(n2 < n3, "Timer callback 2 & 3 expected %d < %d\n", n2, n3); + ok(n4 == 0, "Timer callback 4 expected 0 got %d\n", n4); + ok(n5 == 1, "Timer callback 5 expected 1 got %d\n", n5); /* Test synchronous deletion of the timer/queue with event trigger. */ e = CreateEvent(NULL, TRUE, FALSE, NULL);

1 0

Francois Gouget : d3dx9_36/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 691b9b644320cd5fc66e26f4f7bccefc2ee8612c URL: http://source.winehq.org/git/wine.git/?a=commit;h=691b9b644320cd5fc66e26f4f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 3 09:15:12 2012 +0200 d3dx9_36/tests: Add a trailing '\n' to ok() calls. --- dlls/d3dx9_36/tests/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 4952c24..018081c 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2458,7 +2458,7 @@ static void test_D3DXSHScale(void) for (order = 0; order < 10; order++) { received_array = D3DXSHScale(b, order, a, 5.0f); - ok(received_array == b, "Expected %p, received %p", b, received_array); + ok(received_array == b, "Expected %p, received %p\n", b, received_array); for (i = 0; i < 100; i++) { @@ -2467,7 +2467,7 @@ static void test_D3DXSHScale(void) /* D3DXSHScale does not modify the elements of the array after the order * order-th element */ else expected = a[i]; - ok(relative_error(b[i], expected) < admitted_error, "order %d, element %d, expected %f, received %f", order, i, expected, b[i]); + ok(relative_error(b[i], expected) < admitted_error, "order %d, element %d, expected %f, received %f\n", order, i, expected, b[i]); } } }

1 0

Francois Gouget : dssenh/tests: Add a trailing '\n' to a skip() call.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 91e16801546a83c85df2652a9d52b3dc8c24e51d URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e16801546a83c85df2652a9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 3 09:14:26 2012 +0200 dssenh/tests: Add a trailing '\n' to a skip() call. --- dlls/dssenh/tests/dssenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index b77dd23..332b865 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -74,7 +74,7 @@ static void test_acquire_context(void) &hProv, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); if(!result) { - skip("DSS csp is currently not available, skipping tests."); + skip("DSS csp is currently not available, skipping tests.\n"); return; } ok(result, "Expected no errors.\n");

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
72
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 July 2012