wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Christian Costa : d3drm: Implement CreateMesh method and stubbed IDirect3DRMMesh interface.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: bd484dca069f0ed997ed142f638194d003a975ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd484dca069f0ed997ed142f6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 30 00:50:33 2012 +0200 d3drm: Implement CreateMesh method and stubbed IDirect3DRMMesh interface. --- dlls/d3drm/meshbuilder.c | 398 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 394 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd484dca069f0ed997ed1…

1 0

Christian Costa : d3drm: Add support for frame with fake data in IDirect3DRMX:Load methods + tests.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 4d53115cb99f7b5ab678068572770fc52d5e5e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d53115cb99f7b5ab67806857… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 23:56:54 2012 +0200 d3drm: Add support for frame with fake data in IDirect3DRMX:Load methods + tests. --- dlls/d3drm/d3drm.c | 15 ++++++++++++++- dlls/d3drm/tests/d3drm.c | 14 ++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index afd794e..c067c27 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1389,6 +1389,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc else if (IsEqualGUID(pGuid, &TID_D3DRMFrame)) { BOOL requested = FALSE; + HRESULT hr; + LPDIRECT3DRMFRAME3 frame; TRACE("Found TID_D3DRMFrame\n"); @@ -1400,7 +1402,18 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc if (requested) { - FIXME("Processing frame not supported yet\n"); + FIXME("Fake frame data and notify application\n"); + + hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame); + if (SUCCEEDED(hr)) + { + LoadProc((LPDIRECT3DRMOBJECT)frame, &IID_IDirect3DRMFrame, ArgLP); + IDirect3DRMFrame3_Release(frame); + } + + if (FAILED(hr)) + ERR("Cannot process mesh\n"); + } } else if (IsEqualGUID(pGuid, &TID_D3DRMMaterial)) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8d18d3b..0a05dcd 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -153,6 +153,11 @@ static char data_d3drm_load[] = " 0.1; 0.2; 0.3;,\n" " 1;\n" " 3; 0, 1, 2;;\n" +"}\n" +"Frame Scene\n" +"{\n" +" {Object1}\n" +" {Object2}\n" "}\n"; static void test_MeshBuilder(void) @@ -604,7 +609,8 @@ static int nb_objects = 0; static const GUID* refiids[] = { &IID_IDirect3DRMMeshBuilder, - &IID_IDirect3DRMMeshBuilder + &IID_IDirect3DRMMeshBuilder, + &IID_IDirect3DRMFrame }; void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg) @@ -620,16 +626,16 @@ static void test_d3drm_load(void) HRESULT hr; LPDIRECT3DRM pD3DRM; D3DRMLOADMEMORY info; - const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder }; + const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame }; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); info.lpMemory = data_d3drm_load; info.dSize = strlen(data_d3drm_load); - hr = IDirect3DRM_Load(pD3DRM, &info, NULL, (GUID**)req_refiids, 1, D3DRMLOAD_FROMMEMORY, object_load_callback, (LPVOID)0xdeadbeef, NULL, NULL, NULL); + hr = IDirect3DRM_Load(pD3DRM, &info, NULL, (GUID**)req_refiids, 2, D3DRMLOAD_FROMMEMORY, object_load_callback, (LPVOID)0xdeadbeef, NULL, NULL, NULL); ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr); - ok(nb_objects == 2, "Should have loaded 2 objects (got %d)\n", nb_objects); + ok(nb_objects == 3, "Should have loaded 3 objects (got %d)\n", nb_objects); IDirect3DRM_Release(pD3DRM); }

1 0

Christian Costa : d3drm: Make IDirect3DRMMeshBuilderX stub return D3DRM_OK.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 5763eb16414798c912c500adc12c1455286e6df8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5763eb16414798c912c500adc… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 23:56:46 2012 +0200 d3drm: Make IDirect3DRMMeshBuilderX stub return D3DRM_OK. --- dlls/d3drm/meshbuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 398ce2c..db64917 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -460,7 +460,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Scale(IDirect3DRMMeshBuilder2* FIXME("(%p)->(%f,%f,%f): stub\n", This, sx, sy, sz); - return E_NOTIMPL; + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Translate(IDirect3DRMMeshBuilder2* iface,

1 0

Andrew Eikum : dsound: Validate and correct wValidBitsPerSample in primary buffer SetFormat.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 552433cf9e195109bbd520bf4eea47ad9afa6d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=552433cf9e195109bbd520bf4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 2 09:41:06 2012 -0500 dsound: Validate and correct wValidBitsPerSample in primary buffer SetFormat. --- dlls/dsound/primary.c | 28 +++++++++++++++++++++++++++- dlls/dsound/tests/dsound.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 5c74353..4851ac2 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -353,7 +353,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe HRESULT err = DSERR_BUFFERLOST; int i; WAVEFORMATEX *old_fmt; - WAVEFORMATEXTENSIBLE *fmtex; + WAVEFORMATEXTENSIBLE *fmtex, *passed_fmtex = (WAVEFORMATEXTENSIBLE*)passed_fmt; BOOL forced = (device->priolevel == DSSCL_WRITEPRIMARY); TRACE("(%p,%p)\n", device, passed_fmt); @@ -380,6 +380,11 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe passed_fmt->nBlockAlign != passed_fmt->nChannels * passed_fmt->wBitsPerSample / 8) return DSERR_INVALIDPARAM; + if(passed_fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(passed_fmtex->Samples.wValidBitsPerSample > passed_fmtex->Format.wBitsPerSample) + return DSERR_INVALIDPARAM; + } + /* **** */ RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); EnterCriticalSection(&(device->mixlock)); @@ -394,6 +399,13 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe goto done; } + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(fmtex->Samples.wValidBitsPerSample == 0){ + TRACE("Correcting 0 valid bits per sample\n"); + fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; + } + } + DSOUND_PrimaryClose(device); err = DSOUND_ReopenDevice(device, FALSE); @@ -427,6 +439,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 32; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -434,6 +448,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 16; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -441,6 +457,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 8; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -449,6 +467,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = passed_fmt->wBitsPerSample; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -456,6 +476,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 32; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -463,6 +485,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 16; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -470,6 +494,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 8; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 45dd00a..c68a5de 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1253,6 +1253,7 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) if (rc==DS_OK && primary!=NULL) { WAVEFORMATEX wfx; + WAVEFORMATEXTENSIBLE fmtex; wfx.wFormatTag = WAVE_FORMAT_PCM; wfx.nChannels = 0; @@ -1351,6 +1352,45 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) rc = IDirectSoundBuffer_SetFormat(primary, &wfx); ok(rc == S_OK, "SetFormat: %08x\n", rc); + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + fmtex.Format.nChannels = 2; + fmtex.Format.nSamplesPerSec = 44100; + fmtex.Format.wBitsPerSample = 16; + fmtex.Format.nBlockAlign = fmtex.Format.nChannels * fmtex.Format.wBitsPerSample / 8; + fmtex.Format.nAvgBytesPerSec = fmtex.Format.nSamplesPerSec * fmtex.Format.nBlockAlign; + fmtex.Samples.wValidBitsPerSample = 0; + fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + rc = IDirectSoundBuffer_SetFormat(primary, (WAVEFORMATEX*)&fmtex); + ok(rc == S_OK, "SetFormat: %08x\n", rc); + + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + fmtex.Format.nChannels = 2; + fmtex.Format.nSamplesPerSec = 44100; + fmtex.Format.wBitsPerSample = 24; + fmtex.Format.nBlockAlign = fmtex.Format.nChannels * fmtex.Format.wBitsPerSample / 8; + fmtex.Format.nAvgBytesPerSec = fmtex.Format.nSamplesPerSec * fmtex.Format.nBlockAlign; + fmtex.Samples.wValidBitsPerSample = 20; + fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + rc = IDirectSoundBuffer_SetFormat(primary, (WAVEFORMATEX*)&fmtex); + ok(rc == S_OK, "SetFormat: %08x\n", rc); + + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + fmtex.Format.nChannels = 2; + fmtex.Format.nSamplesPerSec = 44100; + fmtex.Format.wBitsPerSample = 24; + fmtex.Format.nBlockAlign = fmtex.Format.nChannels * fmtex.Format.wBitsPerSample / 8; + fmtex.Format.nAvgBytesPerSec = fmtex.Format.nSamplesPerSec * fmtex.Format.nBlockAlign; + fmtex.Samples.wValidBitsPerSample = 32; + fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + rc = IDirectSoundBuffer_SetFormat(primary, (WAVEFORMATEX*)&fmtex); + ok(rc == E_INVALIDARG, "SetFormat: %08x\n", rc); + IDirectSoundBuffer_Release(primary); }

1 0

Jacek Caban : mshtml: Fixed status text cache implementation.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: f9c875dd3e00da2e2e6e7d3da0d22b62eff96dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c875dd3e00da2e2e6e7d3da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 16:33:50 2012 +0200 mshtml: Fixed status text cache implementation. --- dlls/mshtml/main.c | 29 ++++++++++++++--------------- dlls/mshtml/resource.h | 7 ++++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 165bf03..8468f5c 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -49,7 +49,7 @@ DWORD mshtml_tls = TLS_OUT_OF_INDEXES; static HINSTANCE shdoclc = NULL; static HDC display_dc; -static LPWSTR status_strings[NUM_STATUS_STRINGS]; +static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1]; static void thread_detach(void) { @@ -68,7 +68,7 @@ static void thread_detach(void) static void free_strings(void) { int i; - for(i = 0; i < NUM_STATUS_STRINGS; i++) + for(i = 0; i < sizeof(status_strings)/sizeof(*status_strings); i++) heap_free(status_strings[i]); } @@ -89,30 +89,29 @@ static void process_detach(void) void set_statustext(HTMLDocumentObj* doc, INT id, LPCWSTR arg) { - int index = id - IDS_STATUS_DONE; - LPWSTR p = status_strings[index]; + int index = id - IDS_STATUS_FIRST; + WCHAR *p = status_strings[index]; + DWORD len; if(!doc->frame) return; - if(!p) - { - DWORD len = 255; + if(!p) { + len = 255; p = heap_alloc(len * sizeof(WCHAR)); - len = LoadStringW(hInst, id, p, len); - len++; + len = LoadStringW(hInst, id, p, len) + 1; p = heap_realloc(p, len * sizeof(WCHAR)); - if(InterlockedCompareExchangePointer((void**)&status_strings[index], p, NULL)) - { + if(InterlockedCompareExchangePointer((void**)&status_strings[index], p, NULL)) { heap_free(p); p = status_strings[index]; } } - if(arg) - { - DWORD len = lstrlenW(p) + lstrlenW(arg) - 1; - LPWSTR buf = heap_alloc(len * sizeof(WCHAR)); + if(arg) { + WCHAR *buf; + + len = lstrlenW(p) + lstrlenW(arg) - 1; + buf = heap_alloc(len * sizeof(WCHAR)); snprintfW(buf, len, p, arg); diff --git a/dlls/mshtml/resource.h b/dlls/mshtml/resource.h index a798760..836d667 100644 --- a/dlls/mshtml/resource.h +++ b/dlls/mshtml/resource.h @@ -23,9 +23,10 @@ #define IDS_HTMLDISABLED 7500 #define IDS_HTMLDOCUMENT 7501 -#define NUM_STATUS_STRINGS 2 -#define IDS_STATUS_DOWNLOADINGFROM 7550 -#define IDS_STATUS_DONE 7551 +#define IDS_STATUS_FIRST 7550 +#define IDS_STATUS_DOWNLOADINGFROM IDS_STATUS_FIRST +#define IDS_STATUS_DONE (IDS_STATUS_FIRST+1) +#define IDS_STATUS_LAST IDS_STATUS_DONE #define ID_PROMPT_DIALOG 7700 #define ID_PROMPT_PROMPT 7701

1 0

Jacek Caban : mshtml: Added IHTMLMetaElement stub implementation.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 2d206abeac725a15bfb2bb74387d66403d263138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d206abeac725a15bfb2bb743… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 15:53:07 2012 +0200 mshtml: Added IHTMLMetaElement stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmlmeta.c | 255 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 15 ++- 5 files changed, 274 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d206abeac725a15bfb2b…

1 0

Jacek Caban : mshtml.idl: Added IHTMLMetaElement* declarations.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 5d8d4b8f3f8fc2e83e8892136fb8ad7317e958de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d8d4b8f3f8fc2e83e8892136… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 15:52:54 2012 +0200 mshtml.idl: Added IHTMLMetaElement* declarations. --- include/mshtml.idl | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 2b532be..a6a9954 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9611,6 +9611,84 @@ interface IHTMLTitleElement : IDispatch } /***************************************************************************** + * IHTMLMetaElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f203-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLMetaElement : IDispatch +{ + [propput, id(DISPID_IHTMLMETAELEMENT_HTTPEQUIV), displaybind, bindable] + HRESULT httpEquiv([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_HTTPEQUIV), displaybind, bindable] + HRESULT httpEquiv([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLMETAELEMENT_CONTENT), displaybind, bindable] + HRESULT content([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_CONTENT), displaybind, bindable] + HRESULT content([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLMETAELEMENT_NAME), displaybind, bindable] + HRESULT name([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_NAME), displaybind, bindable] + HRESULT name([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLMETAELEMENT_URL), displaybind, bindable] + HRESULT url([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_URL), displaybind, bindable] + HRESULT url([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLMETAELEMENT_CHARSET), displaybind, bindable] + HRESULT charset([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_CHARSET), displaybind, bindable] + HRESULT charset([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLMetaElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f81f-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLMetaElement2 : IDispatch +{ + [propput, id(DISPID_IHTMLMETAELEMENT2_SCHEME), displaybind, bindable] + HRESULT scheme([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT2_SCHEME), displaybind, bindable] + HRESULT scheme([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLMetaElement3 interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510495-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLMetaElement3 : IDispatch +{ + [propput, id(DISPID_IHTMLMETAELEMENT3_IE8_URL)] + HRESULT url([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT3_IE8_URL)] + HRESULT url([out, retval] BSTR *p); +} + +/***************************************************************************** * DispHTMLHeadElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added DispHTMLMetaElement declaration.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 30a477d36bfec1d2675f3dffeed1403846cb6d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a477d36bfec1d2675f3dffe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 15:52:39 2012 +0200 mshtml.idl: Added DispHTMLMetaElement declaration. --- include/mshtmdid.h | 13 +++++++++++ include/mshtml.idl | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 1 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 6190537..a062131 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2402,6 +2402,19 @@ /* IHTMLTitleElement */ #define DISPID_IHTMLTITLEELEMENT_TEXT DISPID_A_VALUE +/* IHTMLMetaElement */ +#define DISPID_IHTMLMETAELEMENT_HTTPEQUIV DISPID_HEDELEMS+1 +#define DISPID_IHTMLMETAELEMENT_CONTENT DISPID_HEDELEMS+2 +#define DISPID_IHTMLMETAELEMENT_NAME STDPROPID_XOBJ_NAME +#define DISPID_IHTMLMETAELEMENT_URL DISPID_HEDELEMS+3 +#define DISPID_IHTMLMETAELEMENT_CHARSET DISPID_HEDELEMS+13 + +/* IHTMLMetaElement2 */ +#define DISPID_IHTMLMETAELEMENT2_SCHEME DISPID_HEDELEMS+20 + +/* IHTMLMetaElement3 */ +#define DISPID_IHTMLMETAELEMENT3_IE8_URL DISPID_IE8_META + /* IHTMLRect */ #define DISPID_IHTMLRECT_LEFT DISPID_OMRECT+1 #define DISPID_IHTMLRECT_TOP DISPID_OMRECT+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index fd4a509..2b532be 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9657,7 +9657,63 @@ methods: } /***************************************************************************** - * DispHTMLUnknownElement interface + * DispHTMLMetaElement dispinterface + */ +[ + hidden, + uuid(3050f517-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLMetaElement +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLMETAELEMENT_HTTPEQUIV), displaybind, bindable] + void httpEquiv(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_HTTPEQUIV), displaybind, bindable] + BSTR httpEquiv(); + + [propput, id(DISPID_IHTMLMETAELEMENT_CONTENT), displaybind, bindable] + void content(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_CONTENT), displaybind, bindable] + BSTR content(); + + [propput, id(DISPID_IHTMLMETAELEMENT_NAME), displaybind, bindable] + void name(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_NAME), displaybind, bindable] + BSTR name(); + + [propput, id(DISPID_IHTMLMETAELEMENT_URL), displaybind, bindable] + void url(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_URL), displaybind, bindable] + BSTR url(); + + [propput, id(DISPID_IHTMLMETAELEMENT_CHARSET), displaybind, bindable] + void charset(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_CHARSET), displaybind, bindable] + BSTR charset(); + + [propput, id(DISPID_IHTMLMETAELEMENT2_SCHEME), displaybind, bindable] + void scheme(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT2_SCHEME), displaybind, bindable] + BSTR scheme(); + + [propput, id(DISPID_IHTMLMETAELEMENT3_IE8_URL)] + void ie8_url(BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT3_IE8_URL)] + BSTR ie8_url(); +} + +/***************************************************************************** + * DispHTMLUnknownElement dispinterface */ [ hidden,

1 0

Huw Davies : wineps: Use the unicode version of StartDocPrinter.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: d963a8f864a495f7230dc6fe717d71e61ae51d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d963a8f864a495f7230dc6fe7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 2 14:14:08 2012 +0100 wineps: Use the unicode version of StartDocPrinter. --- dlls/wineps.drv/escape.c | 68 ++++++++------------------------------------- dlls/wineps.drv/init.c | 18 +++++++++--- dlls/wineps.drv/psdrv.h | 2 +- 3 files changed, 26 insertions(+), 62 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index eff7500..66a1a89 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -409,15 +409,15 @@ INT PSDRV_EndPage( PHYSDEV dev ) /************************************************************************ - * PSDRV_StartDocA + * PSDRV_StartDoc */ -static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) +INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - DOC_INFO_1A di; + DOC_INFO_1W di; - TRACE("(%p, %p) => %s, %s, %s\n", physDev, doc, debugstr_a(doc->lpszDocName), - debugstr_a(doc->lpszOutput), debugstr_a(doc->lpszDatatype)); + TRACE("(%p, %p) => %s, %s, %s\n", physDev, doc, debugstr_w(doc->lpszDocName), + debugstr_w(doc->lpszOutput), debugstr_w(doc->lpszDatatype)); if(physDev->job.id) { FIXME("hJob != 0. Now what?\n"); @@ -431,21 +431,21 @@ static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) return 0; } - di.pDocName = (LPSTR) doc->lpszDocName; + di.pDocName = (LPWSTR) doc->lpszDocName; di.pDatatype = NULL; if(doc->lpszOutput) - di.pOutputFile = (LPSTR) doc->lpszOutput; + di.pOutputFile = (LPWSTR) doc->lpszOutput; else if(physDev->job.output) di.pOutputFile = physDev->job.output; else di.pOutputFile = NULL; - TRACE("using output: %s\n", debugstr_a(di.pOutputFile)); + TRACE("using output: %s\n", debugstr_w(di.pOutputFile)); /* redirection located in HKCU\Software\Wine\Printing\Spooler is done during winspool.drv,ScheduleJob */ - physDev->job.id = StartDocPrinterA(physDev->job.hprinter, 1, (LPBYTE) &di); + physDev->job.id = StartDocPrinterW(physDev->job.hprinter, 1, (LPBYTE) &di); if(!physDev->job.id) { WARN("StartDocPrinter() failed: %d\n", GetLastError()); ClosePrinter(physDev->job.hprinter); @@ -458,8 +458,9 @@ static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) physDev->job.in_passthrough = FALSE; physDev->job.had_passthrough_rect = FALSE; if(doc->lpszDocName) { - physDev->job.DocName = HeapAlloc(GetProcessHeap(), 0, strlen(doc->lpszDocName)+1); - strcpy(physDev->job.DocName, doc->lpszDocName); + INT len = WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, NULL, 0, NULL, NULL ); + physDev->job.DocName = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, physDev->job.DocName, len, NULL, NULL ); } else physDev->job.DocName = NULL; @@ -467,51 +468,6 @@ static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) } /************************************************************************ - * PSDRV_StartDoc - */ -INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) -{ - DOCINFOA docA; - INT ret, len; - LPSTR docname = NULL, output = NULL, datatype = NULL; - - TRACE("(%p, %p) => %d,%s,%s,%s\n", dev, doc, doc->cbSize, debugstr_w(doc->lpszDocName), - debugstr_w(doc->lpszOutput), debugstr_w(doc->lpszDatatype)); - - docA.cbSize = doc->cbSize; - if (doc->lpszDocName) - { - len = WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, NULL, 0, NULL, NULL ); - if ((docname = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, docname, len, NULL, NULL ); - } - if (doc->lpszOutput) - { - len = WideCharToMultiByte( CP_ACP, 0, doc->lpszOutput, -1, NULL, 0, NULL, NULL ); - if ((output = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_ACP, 0, doc->lpszOutput, -1, output, len, NULL, NULL ); - } - if (doc->lpszDatatype) - { - len = WideCharToMultiByte( CP_ACP, 0, doc->lpszDatatype, -1, NULL, 0, NULL, NULL ); - if ((datatype = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_ACP, 0, doc->lpszDatatype, -1, datatype, len, NULL, NULL ); - } - docA.lpszDocName = docname; - docA.lpszOutput = output; - docA.lpszDatatype = datatype; - docA.fwType = doc->fwType; - - ret = PSDRV_StartDocA(dev, &docA); - - HeapFree( GetProcessHeap(), 0, docname ); - HeapFree( GetProcessHeap(), 0, output ); - HeapFree( GetProcessHeap(), 0, datatype ); - - return ret; -} - -/************************************************************************ * PSDRV_EndDoc */ INT PSDRV_EndDoc( PHYSDEV dev ) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index fa47573..c6a4488 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -41,6 +41,7 @@ #include "winnls.h" #include "psdrv.h" #include "winspool.h" +#include "wine/unicode.h" #include "wine/library.h" #include "wine/debug.h" @@ -171,6 +172,17 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } +static inline WCHAR *strdupW( const WCHAR *str ) +{ + int size; + WCHAR *ret; + + if (!str) return NULL; + size = (strlenW( str ) + 1) * sizeof(WCHAR); + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) memcpy( ret, str, size ); + return ret; +} static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) { @@ -355,11 +367,7 @@ static BOOL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, if (!(physDev = create_psdrv_physdev( pi ))) return FALSE; - if (output && *output) { - INT len = WideCharToMultiByte( CP_ACP, 0, output, -1, NULL, 0, NULL, NULL ); - if ((physDev->job.output = HeapAlloc( PSDRV_Heap, 0, len ))) - WideCharToMultiByte( CP_ACP, 0, output, -1, physDev->job.output, len, NULL, NULL ); - } + if (output && *output) physDev->job.output = strdupW( output ); if(initData) { DEVMODEA *devmodeA = DEVMODEdupWtoA(PSDRV_Heap, initData); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 3bcad2c..fd82bd5 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -346,7 +346,7 @@ typedef struct { typedef struct { DWORD id; /* Job id */ HANDLE hprinter; /* Printer handle */ - LPSTR output; /* Output file/port */ + LPWSTR output; /* Output file/port */ LPSTR DocName; /* Document Name */ BOOL banding; /* Have we received a NEXTBAND */ BOOL OutOfPage; /* Page header not sent yet */

1 0

Huw Davies : winspool: Propagate the printer's devmode to a new job.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 0b9a3f9de44075c16541ee98ca9c787f25d74aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9a3f9de44075c16541ee98c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 2 11:42:36 2012 +0100 winspool: Propagate the printer's devmode to a new job. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d832b4b..c50a894 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2311,7 +2311,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD memcpy(job->filename, filename, (len + 1) * sizeof(WCHAR)); job->document_title = strdupW(default_doc_title); job->printer_name = strdupW(printer->name); - job->devmode = NULL; + job->devmode = dup_devmode( printer->devmode ); list_add_tail(&printer->queue->jobs, &job->entry); *pcbNeeded = (len + 1) * sizeof(WCHAR) + sizeof(*addjob);

1 0

← Newer
1
...
64
65
66
67
68
69
70
71
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 April 2012