wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

Vincent Pelletier : msadp32.acm: Block align the adpcm extra data.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 0924ddd2ba981bb6cd2fcd55c4b2cfed7527030b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0924ddd2ba981bb6cd2fcd55c… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sun Feb 1 09:51:31 2009 +0100 msadp32.acm: Block align the adpcm extra data. Based heavily on Stefano Guidoni's patch. --- dlls/msadp32.acm/msadp32.c | 37 +++++++++++++++++++++++++++++-------- 1 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 40b8260..f345450 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -618,6 +618,9 @@ static LRESULT ADPCM_StreamClose(PACMDRVSTREAMINSTANCE adsi) */ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSIZE adss) { + DWORD nblocks; + WORD wSamplesPerBlock; + /* wSamplesPerBlock formula comes from MSDN ADPCMWAVEFORMAT page.*/ switch (adss->fdwSize) { case ACM_STREAMSIZEF_DESTINATION: @@ -625,14 +628,20 @@ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMS if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_ADPCM) { - /* don't take block overhead into account, doesn't matter too much */ - adss->cbSrcLength = adss->cbDstLength * 4; + wSamplesPerBlock = adsi->pwfxDst->nBlockAlign * 2 / adsi->pwfxDst->nChannels - 12; + nblocks = adss->cbDstLength / adsi->pwfxDst->nBlockAlign; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbSrcLength = nblocks * adsi->pwfxSrc->nBlockAlign * wSamplesPerBlock; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - FIXME("misses the block header overhead\n"); - adss->cbSrcLength = 256 + adss->cbDstLength / 4; + wSamplesPerBlock = adsi->pwfxSrc->nBlockAlign * 2 / adsi->pwfxSrc->nChannels - 12; + nblocks = adss->cbDstLength / (adsi->pwfxDst->nBlockAlign * wSamplesPerBlock); + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbSrcLength = nblocks * adsi->pwfxSrc->nBlockAlign; } else { @@ -644,14 +653,26 @@ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMS if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_ADPCM) { - FIXME("misses the block header overhead\n"); - adss->cbDstLength = 256 + adss->cbSrcLength / 4; + wSamplesPerBlock = adsi->pwfxDst->nBlockAlign * 2 / adsi->pwfxDst->nChannels - 12; + nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * wSamplesPerBlock); + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + if (adss->cbSrcLength % (adsi->pwfxSrc->nBlockAlign * wSamplesPerBlock)) + /* Round block count up. */ + nblocks++; + adss->cbDstLength = nblocks * adsi->pwfxSrc->nBlockAlign; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - /* don't take block overhead into account, doesn't matter too much */ - adss->cbDstLength = adss->cbSrcLength * 4; + wSamplesPerBlock = adsi->pwfxSrc->nBlockAlign * 2 / adsi->pwfxSrc->nChannels - 12; + nblocks = adss->cbSrcLength / adsi->pwfxSrc->nBlockAlign; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + if (adss->cbSrcLength % adsi->pwfxSrc->nBlockAlign) + /* Round block count up. */ + nblocks++; + adss->cbDstLength = nblocks * adsi->pwfxSrc->nBlockAlign * wSamplesPerBlock; } else {

1 0

Jeremiah Flerchinger : winedos: Unify Fake BIOS & VGA display mode selection information and algorithms.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 8ee698c29e221ede233fe11ccb504aa122d38c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee698c29e221ede233fe11cc… Author: Jeremiah Flerchinger <jeremiah.flerchinger(a)gmail.com> Date: Mon Feb 2 22:24:03 2009 -0700 winedos: Unify Fake BIOS & VGA display mode selection information and algorithms. --- dlls/winedos/int10.c | 118 +--------------------- dlls/winedos/vga.c | 268 +++++++++++++++++++++++++++++++++++++++++++++----- dlls/winedos/vga.h | 29 +++++- 3 files changed, 275 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ee698c29e221ede233fe…

1 0

Nikolay Sivov : propsys: Stub for PSRegisterPropertySchema.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 1ba1ff5f169517885516af9e5bbdf10d4bb82e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba1ff5f169517885516af9e5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 3 17:36:44 2009 +0300 propsys: Stub for PSRegisterPropertySchema. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index a2ae522..5fa0d96 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -89,7 +89,7 @@ @ stub PSLookupPropertyHandlerCLSID @ stub PSPropertyKeyFromString @ stub PSRefreshPropertySchema -@ stub PSRegisterPropertySchema +@ stdcall PSRegisterPropertySchema(wstr) @ stub PSSetPropertyValue @ stub PSStringFromPropertyKey @ stub PSUnregisterPropertySchema diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 1010d33..ccdf3ed 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -47,3 +47,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) +{ + FIXME("stub\n"); + + return E_NOTIMPL; +}

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetLogFontA.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: c17266de9e6b2807ebb7b2039950386b386bc5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c17266de9e6b2807ebb7b2039… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 4 11:57:04 2009 +0300 gdiplus: Implemented GdipGetLogFontA. --- dlls/gdiplus/font.c | 23 +++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 22fd393..94c9381 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -374,6 +374,29 @@ GpStatus WINGDIPAPI GdipGetFontUnit(GpFont *font, Unit *unit) } /******************************************************************************* + * GdipGetLogFontA [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, + LOGFONTA *lfa) +{ + GpStatus status; + LOGFONTW lfw; + + TRACE("(%p, %p, %p)\n", font, graphics, lfa); + + status = GdipGetLogFontW(font, graphics, &lfw); + if(status != Ok) + return status; + + memcpy(lfa, &lfw, FIELD_OFFSET(LOGFONTA,lfFaceName) ); + + if(!MultiByteToWideChar(CP_ACP, 0, lfa->lfFaceName, -1, lfw.lfFaceName, LF_FACESIZE)) + return GenericError; + + return Ok; +} + +/******************************************************************************* * GdipGetLogFontW [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ba2b5ab..0037a74 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -311,7 +311,7 @@ @ stdcall GdipGetLineSpacing(ptr long ptr) @ stub GdipGetLineTransform @ stdcall GdipGetLineWrapMode(ptr ptr) -@ stub GdipGetLogFontA +@ stdcall GdipGetLogFontA(ptr ptr ptr) @ stdcall GdipGetLogFontW(ptr ptr ptr) @ stdcall GdipGetMatrixElements(ptr ptr) @ stub GdipGetMetafileDownLevelRasterizationLimit

1 0

Nikolay Sivov : gdiplus: Implemented GdipFillRegion.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 9f0edc5e7c4bf7f4d85bb1d4b7bd4590cd9d68df URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f0edc5e7c4bf7f4d85bb1d4b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 3 22:17:47 2009 +0300 gdiplus: Implemented GdipFillRegion. --- dlls/gdiplus/graphics.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 04beb0b..2673042 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2375,18 +2375,39 @@ GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics *graphics, GpBrush *brush, GD return ret; } +/***************************************************************************** + * GdipFillRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, GpRegion* region) { + INT save_state; + GpStatus status; + HRGN hrgn; + + TRACE("(%p, %p, %p)\n", graphics, brush, region); + if (!(graphics && brush && region)) return InvalidParameter; if(graphics->busy) return ObjectBusy; - FIXME("(%p, %p, %p): stub\n", graphics, brush, region); + status = GdipGetRegionHRgn(region, graphics, &hrgn); + if(status != Ok) + return status; - return NotImplemented; + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + + FillRgn(graphics->hdc, hrgn, brush->gdibrush); + + RestoreDC(graphics->hdc, save_state); + + DeleteObject(hrgn); + + return Ok; } GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention)

1 0

Aric Stewart : msctf: Implement TF_GetThreadMgr.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 929aadf29b58d4ed6a1641ead4ff24892d24bbe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=929aadf29b58d4ed6a1641ead… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 3 14:28:41 2009 -0600 msctf: Implement TF_GetThreadMgr. --- dlls/msctf/msctf.c | 14 ++++++++++++++ dlls/msctf/msctf.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 868721c..78b2bc3 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -210,3 +210,17 @@ HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim) TRACE("\n"); return ThreadMgr_Constructor(NULL,(IUnknown**)pptim); } + +/*********************************************************************** + * TF_GetThreadMgr (MSCTF.@) + */ +HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim) +{ + TRACE("\n"); + *pptim = (ITfThreadMgr*)TlsGetValue(tlsIndex); + + if (*pptim) + ITfThreadMgr_AddRef(*pptim); + + return S_OK; +} diff --git a/dlls/msctf/msctf.spec b/dlls/msctf/msctf.spec index c5b9db5..faa9019 100644 --- a/dlls/msctf/msctf.spec +++ b/dlls/msctf/msctf.spec @@ -22,7 +22,7 @@ @ stub TF_GetMlngHKL @ stub TF_GetMlngIconIndex @ stub TF_GetThreadFlags -@ stub TF_GetThreadMgr +@ stdcall TF_GetThreadMgr(ptr) @ stub TF_InatExtractIcon @ stub TF_InitMlngInfo @ stub TF_InitSystem

1 0

Aric Stewart : msctf: Implement TF_CreateThreadMgr.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: f94f78ff035f96a5460898d181e92aa83b7810c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94f78ff035f96a5460898d18… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 3 14:28:35 2009 -0600 msctf: Implement TF_CreateThreadMgr. --- dlls/msctf/msctf.c | 9 +++++++++ dlls/msctf/msctf.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 956ac89..868721c 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -201,3 +201,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *ppvOut) FIXME("CLSID %s not supported\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; } + +/*********************************************************************** + * TF_CreateThreadMgr (MSCTF.@) + */ +HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim) +{ + TRACE("\n"); + return ThreadMgr_Constructor(NULL,(IUnknown**)pptim); +} diff --git a/dlls/msctf/msctf.spec b/dlls/msctf/msctf.spec index ba35806..c5b9db5 100644 --- a/dlls/msctf/msctf.spec +++ b/dlls/msctf/msctf.spec @@ -14,7 +14,7 @@ @ stub TF_CreateInputProcessorProfiles @ stub TF_CreateLangBarItemMgr @ stub TF_CreateLangBarMgr -@ stub TF_CreateThreadMgr +@ stdcall TF_CreateThreadMgr(ptr) @ stub TF_DllDetachInOther @ stub TF_GetGlobalCompartment @ stub TF_GetInputScope

1 0

Aric Stewart : msctf: Flesh out spec file with stubs.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: ea92f8cbff854acd681dc82f2bad58adeec31b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea92f8cbff854acd681dc82f2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 3 14:28:27 2009 -0600 msctf: Flesh out spec file with stubs. --- dlls/msctf/msctf.spec | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/msctf.spec b/dlls/msctf/msctf.spec index 24cb4a3..ba35806 100644 --- a/dlls/msctf/msctf.spec +++ b/dlls/msctf/msctf.spec @@ -5,3 +5,30 @@ @ stub SetInputScope @ stub SetInputScopeXML @ stub SetInputScopes +@ stub TF_CUASAppFix +@ stub TF_CheckThreadInputIdle +@ stub TF_ClearLangBarAddIns +@ stub TF_CreateCategoryMgr +@ stub TF_CreateCicLoadMutex +@ stub TF_CreateDisplayAttributeMgr +@ stub TF_CreateInputProcessorProfiles +@ stub TF_CreateLangBarItemMgr +@ stub TF_CreateLangBarMgr +@ stub TF_CreateThreadMgr +@ stub TF_DllDetachInOther +@ stub TF_GetGlobalCompartment +@ stub TF_GetInputScope +@ stub TF_GetLangIcon +@ stub TF_GetMlngHKL +@ stub TF_GetMlngIconIndex +@ stub TF_GetThreadFlags +@ stub TF_GetThreadMgr +@ stub TF_InatExtractIcon +@ stub TF_InitMlngInfo +@ stub TF_InitSystem +@ stub TF_InvalidAssemblyListCache +@ stub TF_InvalidAssemblyListCacheIfExist +@ stub TF_IsCtfmonRunning +@ stub TF_IsInMarshaling +@ stub TF_MlngInfoCount +@ stub TF_RunInputCPL

1 0

Aric Stewart : msctf: Implement ITfCategoryMgr::RegisterCategory.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: c4d5872cd1db652bb16a7824e24bb9f5e50e467f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d5872cd1db652bb16a7824e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 3 13:18:11 2009 -0600 msctf: Implement ITfCategoryMgr::RegisterCategory. --- dlls/msctf/categorymgr.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/categorymgr.c b/dlls/msctf/categorymgr.c index 297007c..2358072 100644 --- a/dlls/msctf/categorymgr.c +++ b/dlls/msctf/categorymgr.c @@ -95,9 +95,50 @@ static ULONG WINAPI CategoryMgr_Release(ITfCategoryMgr *iface) static HRESULT WINAPI CategoryMgr_RegisterCategory ( ITfCategoryMgr *iface, REFCLSID rclsid, REFGUID rcatid, REFGUID rguid) { + WCHAR fullkey[110]; + WCHAR buf[39]; + WCHAR buf2[39]; + ULONG res; + HKEY tipkey,catkey,itmkey; CategoryMgr *This = (CategoryMgr*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + static const WCHAR ctg[] = {'C','a','t','e','g','o','r','y',0}; + static const WCHAR itm[] = {'I','t','e','m',0}; + static const WCHAR fmt[] = {'%','s','\\','%','s',0}; + static const WCHAR fmt2[] = {'%','s','\\','%','s','\\','%','s','\\','%','s',0}; + + TRACE("(%p) %s %s %s\n",This,debugstr_guid(rclsid), debugstr_guid(rcatid), debugstr_guid(rguid)); + + StringFromGUID2(rclsid, buf, 39); + sprintfW(fullkey,fmt,szwSystemTIPKey,buf); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,fullkey, 0, KEY_READ | KEY_WRITE, + &tipkey ) != ERROR_SUCCESS) + return E_FAIL; + + StringFromGUID2(rcatid, buf, 39); + StringFromGUID2(rguid, buf2, 39); + sprintfW(fullkey,fmt2,ctg,ctg,buf,buf2); + + res = RegCreateKeyExW(tipkey, fullkey, 0, NULL, 0, KEY_READ | KEY_WRITE, + NULL, &catkey, NULL); + RegCloseKey(catkey); + + if (!res) + { + sprintfW(fullkey,fmt2,ctg,itm,buf2,buf); + res = RegCreateKeyExW(tipkey, fullkey, 0, NULL, 0, KEY_READ | KEY_WRITE, + NULL, &itmkey, NULL); + + RegCloseKey(itmkey); + } + + RegCloseKey(tipkey); + + if (!res) + return S_OK; + else + return E_FAIL; } static HRESULT WINAPI CategoryMgr_UnregisterCategory ( ITfCategoryMgr *iface,

1 0

Aric Stewart : msctf: Stub implementation of ITfCategoryMgr.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 2fe3b64fb459414e6ef8a0eb98e254541b74134b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe3b64fb459414e6ef8a0eb9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 3 13:18:02 2009 -0600 msctf: Stub implementation of ITfCategoryMgr. --- dlls/msctf/Makefile.in | 1 + dlls/msctf/categorymgr.c | 248 +++++++++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf.c | 1 + dlls/msctf/msctf_internal.h | 1 + dlls/msctf/regsvr.c | 7 ++ dlls/uuid/uuid.c | 1 + include/msctf.idl | 61 +++++++++++ 7 files changed, 320 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fe3b64fb459414e6ef8a…

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
97
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 February 2009