wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Michael Stefaniuc : dmime: Reimplement ParseDescriptor for DMAudioPathConfig.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: bdbd2e188ccacee404688b73ae094d67fcebcc02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdbd2e188ccacee404688b73… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 11 22:20:41 2018 +0100 dmime: Reimplement ParseDescriptor for DMAudioPathConfig. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/audiopath.c | 172 ++++++++--------------------------------------- dlls/dmime/tests/dmime.c | 13 ++-- 2 files changed, 35 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdbd2e188ccacee40468…

1 0

Michael Stefaniuc : dmime: Add a generic ParseDescriptor helper and use it for DMSegment.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 0fa08f47937ecb27b02dd518e31b235cc3b247cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fa08f47937ecb27b02dd518… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 11 22:20:40 2018 +0100 dmime: Add a generic ParseDescriptor helper and use it for DMSegment. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmobject.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmime/dmobject.h | 33 ++++++++ dlls/dmime/segment.c | 204 ++++++++------------------------------------- dlls/dmime/tests/dmime.c | 26 +++--- 4 files changed, 291 insertions(+), 184 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0fa08f47937ecb27b02d…

1 0

Christian Costa : ntoskrnl.exe: Fix IoReleaseCancelSpinLock argument.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 0cb9ddb7f5624f804c200216b3619c158a236757 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cb9ddb7f5624f804c200216… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 11:06:16 2018 +0000 ntoskrnl.exe: Fix IoReleaseCancelSpinLock argument. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1a47f45..c9871cc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -611,9 +611,9 @@ void WINAPI IoAcquireCancelSpinLock(PKIRQL irql) /*********************************************************************** * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) */ -void WINAPI IoReleaseCancelSpinLock(PKIRQL irql) +void WINAPI IoReleaseCancelSpinLock(KIRQL irql) { - FIXME("(%p): stub\n", irql); + FIXME("(%u): stub\n", irql); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c94737d..901f0ee 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -434,7 +434,7 @@ @ stub IoRegisterLastChanceShutdownNotification @ stdcall IoRegisterPlugPlayNotification(long long ptr ptr ptr ptr ptr) @ stdcall IoRegisterShutdownNotification(ptr) -@ stdcall IoReleaseCancelSpinLock(ptr) +@ stdcall IoReleaseCancelSpinLock(long) @ stub IoReleaseRemoveLockAndWaitEx @ stub IoReleaseRemoveLockEx @ stub IoReleaseVpbSpinLock diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b75ef9d..834f208 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1306,6 +1306,7 @@ PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +void WINAPI IoReleaseCancelSpinLock(KIRQL); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void);

1 0

Alexander Morozov : ntoskrnl.exe: Add stub for ObReferenceObjectByPointer.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 3a82fde6b5485b51db3ebc3e02c109e14243107e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a82fde6b5485b51db3ebc3e… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Mar 12 10:58:30 2018 +0000 ntoskrnl.exe: Add stub for ObReferenceObjectByPointer. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 10f69ba..1a47f45 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2258,6 +2258,19 @@ static void ObReferenceObject( void *obj ) /*********************************************************************** + * ObReferenceObjectByPointer (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObReferenceObjectByPointer(void *obj, ACCESS_MASK access, + POBJECT_TYPE type, + KPROCESSOR_MODE mode) +{ + FIXME("(%p, %x, %p, %d): stub\n", obj, access, type, mode); + + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * ObDereferenceObject (NTOSKRNL.EXE.@) */ void WINAPI ObDereferenceObject( void *obj ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 947d715..c94737d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -815,7 +815,7 @@ @ stub ObQueryObjectAuditingByHandle @ stdcall ObReferenceObjectByHandle(long long ptr long ptr ptr) @ stdcall ObReferenceObjectByName(ptr long ptr long ptr long ptr ptr) -@ stub ObReferenceObjectByPointer +@ stdcall ObReferenceObjectByPointer(ptr long ptr long) @ stub ObReferenceSecurityDescriptor @ stub ObReleaseObjectSecurity @ stub ObSetHandleAttributes diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 61374a7..b75ef9d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1336,6 +1336,7 @@ static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) void WINAPI ObDereferenceObject(void*); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); +NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE); POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE); NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID);

1 0

Zebediah Figura : regedit: Fix updating the scrollbar in the hex edit dialog.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 80ec0bc4b2291d7c3c85940ede1ef867475444f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80ec0bc4b2291d7c3c85940e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 11 12:28:34 2018 -0500 regedit: Fix updating the scrollbar in the hex edit dialog. The scrollbar should be updated every time the line width is recalculated. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/hexedit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index e9729eb..c7bdd0a 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -530,6 +530,8 @@ HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw) } } + HexEdit_UpdateScrollbars(infoPtr); + if (infoPtr->hFont) SelectObject(hdc, hOldFont); ReleaseDC (infoPtr->hwndSelf, hdc);

1 0

Zebediah Figura : regedit: Make hexedit dialog a little larger.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: c52cfd312951b54cd6d796d11d7830ea994c00ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=c52cfd312951b54cd6d796d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 11 12:28:33 2018 -0500 regedit: Make hexedit dialog a little larger. Both in the interest of having an even 8 bytes per line, and of having more than two lines visible at once. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc index 4a51bcf..a3e0a01 100644 --- a/programs/regedit/regedit.rc +++ b/programs/regedit/regedit.rc @@ -336,17 +336,17 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,160,81,45,15,WS_GROUP END -IDD_EDIT_BINARY DIALOG 22, 17, 170, 100 +IDD_EDIT_BINARY DIALOG 22, 17, 250, 200 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Edit Binary" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Value name:",IDC_STATIC,5,5,119,8 - EDITTEXT IDC_VALUE_NAME,5,15,160,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + EDITTEXT IDC_VALUE_NAME,5,15,240,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED LTEXT "Value data:",IDC_STATIC,5,30,90,8 - CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,5,40,160,40 - DEFPUSHBUTTON "OK",IDOK,70,83,45,15,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,120,83,45,15,WS_GROUP + CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,5,40,240,140 + DEFPUSHBUTTON "OK",IDOK,70,183,45,15,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,120,183,45,15,WS_GROUP END IDD_EDIT_MULTI_STRING DIALOG 22, 17, 210, 175

1 0

Zebediah Figura : regedit: Also display the byte offset in the hex edit dialog.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: ce94f686d5134ff122d7559864326b9a1708349b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce94f686d5134ff122d75598… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 11 12:28:32 2018 -0500 regedit: Also display the byte offset in the hex edit dialog. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/hexedit.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 46d9b82..e9729eb 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -73,32 +73,35 @@ static inline BYTE hexchar_to_byte(WCHAR ch) return -1; } -static LPWSTR HexEdit_GetLineText(BYTE *pData, LONG cbData, LONG pad) +static LPWSTR HexEdit_GetLineText(int offset, BYTE *pData, LONG cbData, LONG pad) { + static const WCHAR percent_04xW[] = {'%','0','4','X',' ',' ',0}; static const WCHAR percent_02xW[] = {'%','0','2','X',' ',0}; - WCHAR *lpszLine = heap_xalloc((cbData * 3 + pad * 3 + DIV_SPACES + cbData + 1) * sizeof(WCHAR)); + WCHAR *lpszLine = heap_xalloc((6 + cbData * 3 + pad * 3 + DIV_SPACES + cbData + 1) * sizeof(WCHAR)); LONG i; + wsprintfW(lpszLine, percent_04xW, offset); + for (i = 0; i < cbData; i++) - wsprintfW(lpszLine + i*3, percent_02xW, pData[i]); + wsprintfW(lpszLine + 6 + i*3, percent_02xW, pData[offset + i]); for (i = 0; i < pad * 3; i++) - lpszLine[cbData * 3 + i] = ' '; + lpszLine[6 + cbData * 3 + i] = ' '; for (i = 0; i < DIV_SPACES; i++) - lpszLine[cbData * 3 + pad * 3 + i] = ' '; + lpszLine[6 + cbData * 3 + pad * 3 + i] = ' '; /* attempt an ASCII representation if the characters are printable, * otherwise display a '.' */ for (i = 0; i < cbData; i++) { /* (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER) */ - if (isprint(pData[i])) - lpszLine[cbData * 3 + pad * 3 + DIV_SPACES + i] = pData[i]; + if (isprint(pData[offset + i])) + lpszLine[6 + cbData * 3 + pad * 3 + DIV_SPACES + i] = pData[offset + i]; else - lpszLine[cbData * 3 + pad * 3 + DIV_SPACES + i] = '.'; + lpszLine[6 + cbData * 3 + pad * 3 + DIV_SPACES + i] = '.'; } - lpszLine[cbData * 3 + pad * 3 + DIV_SPACES + cbData] = 0; + lpszLine[6 + cbData * 3 + pad * 3 + DIV_SPACES + cbData] = 0; return lpszLine; } @@ -110,9 +113,9 @@ HexEdit_Paint(HEXEDIT_INFO *infoPtr) INT nXStart, nYStart; COLORREF clrOldText; HFONT hOldFont; - BYTE *pData; INT iMode; LONG lByteOffset = infoPtr->nScrollPos * infoPtr->nBytesPerLine; + int i; /* Make a gap from the frame */ nXStart = GetSystemMetrics(SM_CXBORDER); @@ -125,17 +128,16 @@ HexEdit_Paint(HEXEDIT_INFO *infoPtr) iMode = SetBkMode(hdc, TRANSPARENT); hOldFont = SelectObject(hdc, infoPtr->hFont); - - for (pData = infoPtr->pData + lByteOffset; pData < infoPtr->pData + infoPtr->cbData; pData += infoPtr->nBytesPerLine) + + for (i = lByteOffset; i < infoPtr->cbData; i += infoPtr->nBytesPerLine) { LPWSTR lpszLine; - LONG nLineLen = min((LONG)((infoPtr->pData + infoPtr->cbData) - pData), - infoPtr->nBytesPerLine); + LONG nLineLen = min(infoPtr->cbData - i, infoPtr->nBytesPerLine); - lpszLine = HexEdit_GetLineText(pData, nLineLen, infoPtr->nBytesPerLine - nLineLen); + lpszLine = HexEdit_GetLineText(i, infoPtr->pData, nLineLen, infoPtr->nBytesPerLine - nLineLen); /* FIXME: draw hex <-> ASCII mapping highlighted? */ - TextOutW(hdc, nXStart, nYStart, lpszLine, infoPtr->nBytesPerLine * 3 + DIV_SPACES + nLineLen); + TextOutW(hdc, nXStart, nYStart, lpszLine, lstrlenW(lpszLine)); nYStart += infoPtr->nHeight; heap_free(lpszLine); @@ -158,14 +160,14 @@ HexEdit_UpdateCaret(HEXEDIT_INFO *infoPtr) INT nByteLinePos = nCaretBytePos % infoPtr->nBytesPerLine; INT nLine = nCaretBytePos / infoPtr->nBytesPerLine; LONG nLineLen = min(infoPtr->cbData - nLine * infoPtr->nBytesPerLine, infoPtr->nBytesPerLine); - LPWSTR lpszLine = HexEdit_GetLineText(infoPtr->pData + nLine * infoPtr->nBytesPerLine, nLineLen, infoPtr->nBytesPerLine - nLineLen); + LPWSTR lpszLine = HexEdit_GetLineText(nLine * infoPtr->nBytesPerLine, infoPtr->pData, nLineLen, infoPtr->nBytesPerLine - nLineLen); INT nCharOffset; /* calculate offset of character caret is on in the line */ if (infoPtr->bFocusHex) - nCharOffset = nByteLinePos*3 + infoPtr->nCaretPos % 2; + nCharOffset = 6 + nByteLinePos*3 + infoPtr->nCaretPos % 2; else - nCharOffset = infoPtr->nBytesPerLine*3 + DIV_SPACES + nByteLinePos; + nCharOffset = 6 + infoPtr->nBytesPerLine*3 + DIV_SPACES + nByteLinePos; hdc = GetDC(infoPtr->hwndSelf); hOldFont = SelectObject(hdc, infoPtr->hFont); @@ -517,7 +519,7 @@ HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw) SIZE size; memset(pData, 0, i); - lpszLine = HexEdit_GetLineText(pData, i, 0); + lpszLine = HexEdit_GetLineText(0, pData, i, 0); GetTextExtentPoint32W(hdc, lpszLine, lstrlenW(lpszLine), &size); heap_free(lpszLine); heap_free(pData);

1 0

Zebediah Figura : regedit: Use monospace font for hex edit dialog.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 31e41a942e37db0d37183e8b35254177dcdcbbd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31e41a942e37db0d37183e8b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 11 12:28:31 2018 -0500 regedit: Use monospace font for hex edit dialog. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 1 + programs/regedit/hexedit.c | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index c8b77bd..c982791 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -151,6 +151,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara else SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData); + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, WM_SETFONT, (WPARAM) GetStockObject(ANSI_FIXED_FONT), TRUE); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index fc6c3a3..46d9b82 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -330,16 +330,6 @@ HexEdit_Char (HEXEDIT_INFO *infoPtr, WCHAR ch) } static inline LRESULT -HexEdit_Create (HEXEDIT_INFO *infoPtr, LPCREATESTRUCTW lpcs) -{ - HexEdit_SetFont(infoPtr, GetStockObject(SYSTEM_FONT), FALSE); - HexEdit_UpdateScrollbars(infoPtr); - - return 0; -} - - -static inline LRESULT HexEdit_Destroy (HEXEDIT_INFO *infoPtr) { HWND hwnd = infoPtr->hwndSelf; @@ -630,9 +620,6 @@ HexEdit_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_CHAR: return HexEdit_Char (infoPtr, (WCHAR)wParam); - case WM_CREATE: - return HexEdit_Create (infoPtr, (LPCREATESTRUCTW)lParam); - case WM_DESTROY: return HexEdit_Destroy (infoPtr);

1 0

Anton Romanov : wmp: Implement IWMPPlayer_get_URL and IWMPMedia_get_sourceURL.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 84068b6d97fcd0443fe111bae9b0f457e18eff8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=84068b6d97fcd0443fe111ba… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Fri Mar 9 23:26:36 2018 -0800 wmp: Implement IWMPPlayer_get_URL and IWMPMedia_get_sourceURL. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 5 +++-- dlls/wmp/tests/oleobj.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index cb8e074..6c68240 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1577,8 +1577,9 @@ static HRESULT WINAPI WMPMedia_get_isIdentical(IWMPMedia *iface, IWMPMedia *othe static HRESULT WINAPI WMPMedia_get_sourceURL(IWMPMedia *iface, BSTR *pbstrSourceUrl) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%p)\n", This, pbstrSourceUrl); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pbstrSourceUrl); + *pbstrSourceUrl = SysAllocString(This->url); + return S_OK; } static HRESULT WINAPI WMPMedia_get_name(IWMPMedia *iface, BSTR *pbstrName) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index ae93d79..937960c 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -955,8 +955,8 @@ static void test_wmp_ifaces(IOleObject *oleobj) url = NULL; SET_EXPECT(Invoke_USERMODE); hres = IWMPPlayer4_get_URL(player4, &url); - todo_wine ok(hres == S_OK, "IWMPPlayer4_get_URL failed: %08x\n", hres); - todo_wine ok(0 == lstrcmpW(url, filename), "%s != %s", wine_dbgstr_w(url), wine_dbgstr_w(filename)); + ok(hres == S_OK, "IWMPPlayer4_get_URL failed: %08x\n", hres); + ok(0 == lstrcmpW(url, filename), "%s != %s", wine_dbgstr_w(url), wine_dbgstr_w(filename)); todo_wine CHECK_CALLED(Invoke_USERMODE); SysFreeString(url); @@ -964,6 +964,12 @@ static void test_wmp_ifaces(IOleObject *oleobj) ok(hres == S_OK, "get_currentMedia failed: %08x\n", hres); ok(media != NULL, "media = (%p)\n", media); + url = NULL; + hres = IWMPMedia_get_sourceURL(media, &url); + ok(hres == S_OK, "IWMPMedia_get_sourceURL failed: %08x\n", hres); + ok(0 == lstrcmpW(url, filename), "%s != %s", wine_dbgstr_w(url), wine_dbgstr_w(filename)); + SysFreeString(url); + SET_EXPECT(GetContainer); hres = IWMPPlayer4_put_currentMedia(player4, media); ok(hres == S_OK, "put_currentMedia failed: %08x\n", hres);

1 0

Louis Lenders : ntdll: Match NtAllocateUuids signature to Windows 2000 instead of NT4.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: e24af9660aa202d5885171f55e1dd371f57fc15d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e24af9660aa202d5885171f5… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Mar 11 21:09:48 2018 -0600 ntdll: Match NtAllocateUuids signature to Windows 2000 instead of NT4. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/om.c | 9 +++------ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/winternl.h | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b63e335..e545eaf 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -111,7 +111,7 @@ @ stdcall NtAlertThread(long) @ stdcall NtAllocateLocallyUniqueId(ptr) # @ stub NtAllocateUserPhysicalPages -@ stdcall NtAllocateUuids(ptr ptr ptr) +@ stdcall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) @ stdcall NtAreMappedFilesTheSame(ptr ptr) @ stdcall NtAssignProcessToJobObject(long long) @@ -1040,7 +1040,7 @@ @ stdcall -private ZwAlertThread(long) NtAlertThread @ stdcall -private ZwAllocateLocallyUniqueId(ptr) NtAllocateLocallyUniqueId # @ stub ZwAllocateUserPhysicalPages -@ stdcall -private ZwAllocateUuids(ptr ptr ptr) NtAllocateUuids +@ stdcall -private ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids @ stdcall -private ZwAllocateVirtualMemory(long ptr long ptr long long) NtAllocateVirtualMemory @ stdcall -private ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame @ stdcall -private ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 1279f2b..febe5bd 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -688,13 +688,10 @@ NTSTATUS WINAPI NtQuerySymbolicLinkObject( HANDLE handle, PUNICODE_STRING target /****************************************************************************** * NtAllocateUuids [NTDLL.@] */ -NTSTATUS WINAPI NtAllocateUuids( - PULARGE_INTEGER Time, - PULONG Range, - PULONG Sequence) +NTSTATUS WINAPI NtAllocateUuids( ULARGE_INTEGER *time, ULONG *delta, ULONG *sequence, UCHAR *seed ) { - FIXME("(%p,%p,%p), stub.\n", Time, Range, Sequence); - return 0; + FIXME("(%p,%p,%p,%p), stub.\n", time, delta, sequence, seed); + return STATUS_SUCCESS; } /************************************************************************** diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ebf1705..947d715 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -740,7 +740,7 @@ @ stdcall NtAddAtom(ptr long ptr) @ stdcall NtAdjustPrivilegesToken(long long ptr long ptr ptr) @ stdcall NtAllocateLocallyUniqueId(ptr) -@ stdcall NtAllocateUuids(ptr ptr ptr) +@ stdcall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) @ stub NtBuildNumber @ stdcall NtClose(long) diff --git a/include/winternl.h b/include/winternl.h index 98bf201..5e4d8b7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2247,7 +2247,7 @@ NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEG NTSYSAPI NTSTATUS WINAPI NtAlertResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); -NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG,SIZE_T*,ULONG,ULONG); NTSYSAPI NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID,PVOID); NTSYSAPI NTSTATUS WINAPI NtAssignProcessToJobObject(HANDLE,HANDLE);

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
79
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 2018