wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Matej Spindler : mshtml: Update Slovenian translation.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 56b56a686ab7e59e99224af1fd92a0acc71bb210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b56a686ab7e59e99224af1f… Author: Matej Spindler <matej.spindler(a)gmail.com> Date: Wed Jun 24 17:29:05 2009 +0200 mshtml: Update Slovenian translation. --- dlls/mshtml/Si.rc | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Si.rc b/dlls/mshtml/Si.rc index 2a67290..9500c18 100644 --- a/dlls/mshtml/Si.rc +++ b/dlls/mshtml/Si.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "Prikazovanje HTML dokumento je trenutno onemogočeno." + IDS_HTMLDISABLED "Prikazovanje HTML dokumentov je trenutno onemogočeno." IDS_HTMLDOCUMENT "HTML dokument" IDS_DOWNLOADING "Nalagam ..." IDS_INSTALLING "Nameščam ..." @@ -56,4 +56,15 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Prekliči", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "V redu", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Prekliči", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +} + #pragma code_page(default)

1 0

Henri Verbeet : wined3d: Make sure we have an active GL context in IWineD3DDeviceImpl_SetCursorProperties ().
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 4a137815dbc1fbc82cad42ffe3b025b3c14d77da URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a137815dbc1fbc82cad42ffe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 25 10:24:58 2009 +0200 wined3d: Make sure we have an active GL context in IWineD3DDeviceImpl_SetCursorProperties(). --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3ad0625..9959aea 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6708,6 +6708,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i for(i = 0; i < height; i++) memcpy(&mem[width * bpp * i], &bits[rect.Pitch * i], width * bpp); IWineD3DSurface_UnlockRect(pCursorBitmap); + + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) {

1 0

Henri Verbeet : wined3d: Make sure we have an active GL context in context_resource_released().
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 5dcbc40581f0fc355deb935287e7e8c3f89c25ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dcbc40581f0fc355deb93528… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 25 10:24:57 2009 +0200 wined3d: Make sure we have an active GL context in context_resource_released(). --- dlls/wined3d/context.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5b3cecb..fa67872 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -472,6 +472,10 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource This->lastActiveRenderTarget = (IWineD3DSurface *)0xdeadcafe; } } + else if (This->d3d_initialized) + { + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + } for (i = 0; i < This->numContexts; ++i) {

1 0

Henri Verbeet : wined3d: Make context_resource_released() responsible for activating a different GL context.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 94cd8656ea123420b31826231a6d8b8ae3347ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94cd8656ea123420b31826231… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 25 10:24:56 2009 +0200 wined3d: Make context_resource_released() responsible for activating a different GL context. In case lastActiveRenderTarget is destroyed. --- dlls/wined3d/context.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 35 ++--------------------------------- 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 81bddb1..5b3cecb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -426,6 +426,53 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { case WINED3DRTYPE_SURFACE: { + if ((IWineD3DSurface *)resource == This->lastActiveRenderTarget) + { + IWineD3DSwapChainImpl *swapchain; + + TRACE("Last active render target destroyed.\n"); + + /* Find a replacement surface for the currently active back + * buffer. The context manager does not do NULL checks, so + * switch to a valid target as long as the currently set + * surface is still valid. Use the surface of the implicit + * swpchain. If that is the same as the destroyed surface the + * device is destroyed and the lastActiveRenderTarget member + * shouldn't matter. */ + swapchain = This->swapchains ? (IWineD3DSwapChainImpl *)This->swapchains[0] : NULL; + if (swapchain) + { + if (swapchain->backBuffer && swapchain->backBuffer[0] != (IWineD3DSurface *)resource) + { + TRACE("Activating primary back buffer.\n"); + ActivateContext(This, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); + } + else if (!swapchain->backBuffer && swapchain->frontBuffer != (IWineD3DSurface *)resource) + { + /* Single buffering environment */ + TRACE("Activating primary front buffer.\n"); + + ActivateContext(This, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); + } + else + { + /* Implicit render target destroyed, that means the + * device is being destroyed whatever we set here, it + * shouldn't matter. */ + TRACE("Device is being destroyed, setting lastActiveRenderTarget to 0xdeadbabe.\n"); + + This->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadbabe; + } + } + else + { + WARN("Render target set, but swapchain does not exist!\n"); + + /* May happen during ddraw uninitialization. */ + This->lastActiveRenderTarget = (IWineD3DSurface *)0xdeadcafe; + } + } + for (i = 0; i < This->numContexts; ++i) { WineD3DContext *context = This->contexts[i]; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 48d49a8..3ad0625 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7327,39 +7327,8 @@ void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resour case WINED3DRTYPE_SURFACE: { unsigned int i; - /* Cleanup any FBO attachments if d3d is enabled */ - if(This->d3d_initialized) { - if((IWineD3DSurface *)resource == This->lastActiveRenderTarget) { - IWineD3DSwapChainImpl *swapchain = This->swapchains ? (IWineD3DSwapChainImpl *) This->swapchains[0] : NULL; - - TRACE("Last active render target destroyed\n"); - /* Find a replacement surface for the currently active back buffer. The context manager does not do NULL - * checks, so switch to a valid target as long as the currently set surface is still valid. Use the - * surface of the implicit swpchain. If that is the same as the destroyed surface the device is destroyed - * and the lastActiveRenderTarget member shouldn't matter - */ - if(swapchain) { - if(swapchain->backBuffer && swapchain->backBuffer[0] != (IWineD3DSurface *)resource) { - TRACE("Activating primary back buffer\n"); - ActivateContext(This, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); - } else if(!swapchain->backBuffer && swapchain->frontBuffer != (IWineD3DSurface *)resource) { - /* Single buffering environment */ - TRACE("Activating primary front buffer\n"); - ActivateContext(This, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); - } else { - TRACE("Device is being destroyed, setting lastActiveRenderTarget = 0xdeadbabe\n"); - /* Implicit render target destroyed, that means the device is being destroyed - * whatever we set here, it shouldn't matter - */ - This->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadbabe; - } - } else { - /* May happen during ddraw uninitialization */ - TRACE("Render target set, but swapchain does not exist!\n"); - This->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadcafe; - } - } - + if (This->d3d_initialized) + { for (i = 0; i < GL_LIMITS(buffers); ++i) { if (This->render_targets[i] == (IWineD3DSurface *)resource) { This->render_targets[i] = NULL;

1 0

Henri Verbeet : wined3d: Make sure we have an active GL context in buffer_PreLoad().
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 964f4b0157d0d0a5530c214b859c56728d9f588c URL: http://source.winehq.org/git/wine.git/?a=commit;h=964f4b0157d0d0a5530c214b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 25 10:24:55 2009 +0200 wined3d: Make sure we have an active GL context in buffer_PreLoad(). --- dlls/wined3d/buffer.c | 7 +++---- dlls/wined3d/drawprim.c | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8896db9..4b71311 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -37,13 +37,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); static void buffer_create_buffer_object(struct wined3d_buffer *This) { GLenum error, gl_usage; - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; TRACE("Creating an OpenGL vertex buffer object for IWineD3DVertexBuffer %p Usage(%s)\n", This, debug_d3dusage(This->resource.usage)); - /* Make sure that a context is there. Needed in a multithreaded environment. Otherwise this call is a nop */ - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); ENTER_GL(); /* Make sure that the gl error is cleared. Do not use checkGLcall @@ -689,6 +686,8 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) TRACE("iface %p\n", iface); + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if (!This->buffer_object) { /* TODO: Make converting independent from VBOs */ @@ -724,7 +723,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) if (This->conversion_count > VB_MAXDECLCHANGES) { FIXME("Too many declaration changes, stopping converting\n"); - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object)); checkGLcall("glDeleteBuffersARB"); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index dcdf21a..c0fb678 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -756,6 +756,11 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, GLenum feedback_type; GLfloat *feedbuffer; + /* Simply activate the context for blitting. This disables all the things we don't want and + * takes care of dirtifying. Dirtifying is preferred over pushing / popping, since drawing the + * patch (as opposed to normal draws) will most likely need different changes anyway. */ + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_BLIT); + /* First, locate the position data. This is provided in a vertex buffer in the stateblock. * Beware of vbos */ @@ -806,11 +811,6 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, patch->has_normals = TRUE; patch->has_texcoords = FALSE; - /* Simply activate the context for blitting. This disables all the things we don't want and - * takes care of dirtifying. Dirtifying is preferred over pushing / popping, since drawing the - * patch (as opposed to normal draws) will most likely need different changes anyway - */ - ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_BLIT); ENTER_GL(); glMatrixMode(GL_PROJECTION);

1 0

Henri Verbeet : wined3d: Make sure we have an active GL context in delete_opengl_contexts().
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 11fd358cc6865dd5f9d305e284260894dfd2f76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=11fd358cc6865dd5f9d305e28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 25 10:24:54 2009 +0200 wined3d: Make sure we have an active GL context in delete_opengl_contexts(). --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 04a453e..48d49a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6971,6 +6971,8 @@ void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_ UINT i; IWineD3DBaseShaderImpl *shader; + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + IWineD3DDevice_EnumResources(iface, reset_unload_resources, NULL); LIST_FOR_EACH_ENTRY(shader, &This->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) { This->shader_backend->shader_destroy((IWineD3DBaseShader *) shader);

1 0

Aric Stewart : msctf: Semi-stub implementation of ITfInputProcessorProfiles ::GetLanguageList.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: a19efb7ad91a92934f40df8c6aa9554155e7eaaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19efb7ad91a92934f40df8c6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 17:00:45 2009 +0900 msctf: Semi-stub implementation of ITfInputProcessorProfiles::GetLanguageList. --- dlls/msctf/inputprocessor.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 80d8c7d..765c3d5 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -422,8 +422,11 @@ static HRESULT WINAPI InputProcessorProfiles_GetLanguageList( ITfInputProcessorProfiles *iface, LANGID **ppLangId, ULONG *pulCount) { InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + FIXME("Semi-STUB:(%p)\n",This); + *ppLangId = CoTaskMemAlloc(sizeof(LANGID)); + **ppLangId = This->currentLanguage; + *pulCount = 1; + return S_OK; } static HRESULT WINAPI InputProcessorProfiles_EnumLanguageProfiles(

1 0

Aric Stewart : msctf/tests: Release the ITfDocumentMgr received on GetFocus .
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 3fff6ec879e30a134d3a409dd78b2c6722a41c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fff6ec879e30a134d3a409dd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 17:00:22 2009 +0900 msctf/tests: Release the ITfDocumentMgr received on GetFocus. --- dlls/msctf/tests/inputprocessor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 4d94d3c..ba43570 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1170,6 +1170,7 @@ static void test_startSession(void) hr = ITfThreadMgr_GetFocus(g_tm,&dmtest); ok(SUCCEEDED(hr),"GetFocus Failed\n"); ok(g_dm == dmtest,"Expected DocumentMgr not focused\n"); + ITfDocumentMgr_Release(dmtest); TextStoreACP_Constructor((IUnknown**)&ts);

1 0

Aric Stewart : msctf: Correct registry key from "Enabled" to "Enable".
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: eb0ef77478cc15780c3f28074f2d06cfc4b4e3ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0ef77478cc15780c3f28074… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 17:00:06 2009 +0900 msctf: Correct registry key from "Enabled" to "Enable". --- dlls/msctf/inputprocessor.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index a904a68..80d8c7d 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); static const WCHAR szwLngp[] = {'L','a','n','g','u','a','g','e','P','r','o','f','i','l','e',0}; -static const WCHAR szwEnabled[] = {'E','n','a','b','l','e','d',0}; +static const WCHAR szwEnable[] = {'E','n','a','b','l','e',0}; static const WCHAR szwTipfmt[] = {'%','s','\\','%','s',0}; static const WCHAR szwFullLangfmt[] = {'%','s','\\','%','s','\\','%','s','\\','0','x','%','0','8','x','\\','%','s',0}; @@ -144,7 +144,7 @@ static void add_userkey( REFCLSID rclsid, LANGID langid, if (!res && disposition == REG_CREATED_NEW_KEY) { DWORD zero = 0x0; - RegSetValueExW(key, szwEnabled, 0, REG_DWORD, (LPBYTE)&zero, sizeof(DWORD)); + RegSetValueExW(key, szwEnable, 0, REG_DWORD, (LPBYTE)&zero, sizeof(DWORD)); } if (!res) @@ -278,7 +278,7 @@ static HRESULT WINAPI InputProcessorProfiles_AddLanguageProfile( RegSetValueExW(fmtkey, icnf, 0, REG_SZ, (LPBYTE)pchIconFile, cchFile * sizeof(WCHAR)); RegSetValueExW(fmtkey, icni, 0, REG_DWORD, (LPBYTE)&uIconIndex, sizeof(DWORD)); if (disposition == REG_CREATED_NEW_KEY) - RegSetValueExW(fmtkey, szwEnabled, 0, REG_DWORD, (LPBYTE)&zero, sizeof(DWORD)); + RegSetValueExW(fmtkey, szwEnable, 0, REG_DWORD, (LPBYTE)&zero, sizeof(DWORD)); RegCloseKey(fmtkey); add_userkey(rclsid, langid, guidProfile); @@ -456,7 +456,7 @@ static HRESULT WINAPI InputProcessorProfiles_EnableLanguageProfile( if (!res) { - RegSetValueExW(key, szwEnabled, 0, REG_DWORD, (LPBYTE)&fEnable, sizeof(DWORD)); + RegSetValueExW(key, szwEnable, 0, REG_DWORD, (LPBYTE)&fEnable, sizeof(DWORD)); RegCloseKey(key); } else @@ -490,7 +490,7 @@ static HRESULT WINAPI InputProcessorProfiles_IsEnabledLanguageProfile( if (!res) { DWORD count = sizeof(DWORD); - res = RegQueryValueExW(key, szwEnabled, 0, NULL, (LPBYTE)pfEnable, &count); + res = RegQueryValueExW(key, szwEnable, 0, NULL, (LPBYTE)pfEnable, &count); RegCloseKey(key); } @@ -501,7 +501,7 @@ static HRESULT WINAPI InputProcessorProfiles_IsEnabledLanguageProfile( if (!res) { DWORD count = sizeof(DWORD); - res = RegQueryValueExW(key, szwEnabled, 0, NULL, (LPBYTE)pfEnable, &count); + res = RegQueryValueExW(key, szwEnable, 0, NULL, (LPBYTE)pfEnable, &count); RegCloseKey(key); } } @@ -533,7 +533,7 @@ static HRESULT WINAPI InputProcessorProfiles_EnableLanguageProfileByDefault( if (!res) { - RegSetValueExW(key, szwEnabled, 0, REG_DWORD, (LPBYTE)&fEnable, sizeof(DWORD)); + RegSetValueExW(key, szwEnable, 0, REG_DWORD, (LPBYTE)&fEnable, sizeof(DWORD)); RegCloseKey(key); } else

1 0

Aric Stewart : wintrust: GetSignedMsgFromCabFile looks for signinfo at the beginning of the cab.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: d962939290f407d925c12b2fb3f4d3cdd0d015da URL: http://source.winehq.org/git/wine.git/?a=commit;h=d962939290f407d925c12b2fb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 16:59:46 2009 +0900 wintrust: GetSignedMsgFromCabFile looks for signinfo at the beginning of the cab. Discussed with Juan Lang, We could look for the signinfo at the beginning of the cab and restore the file pointer afterward. This allows IE7 to read the signing information from downloaded ActiveX controls. --- dlls/wintrust/crypt.c | 35 ++++------------------------------- 1 files changed, 4 insertions(+), 31 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index e01a230..d9fa563 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -1121,36 +1121,6 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); - /* - * FIXME: I just noticed that I am memorizing the initial file pointer - * offset and restoring it before reading in the rest of the header - * information in the cabinet. Perhaps that's correct -- that is, perhaps - * this API is supposed to support "streaming" cabinets which are embedded - * in other files, or cabinets which begin at file offsets other than zero. - * Otherwise, I should instead go to the absolute beginning of the file. - * (Either way, the semantics of wine's FDICopy require me to leave the - * file pointer where it is afterwards -- If Windows does not do so, we - * ought to duplicate the native behavior in the FDIIsCabinet API, not here. - * - * So, the answer lies in Windows; will native cabinet.dll recognize a - * cabinet "file" embedded in another file? Note that cabextract.c does - * support this, which implies that Microsoft's might. I haven't tried it - * yet so I don't know. ATM, most of wine's FDI cabinet routines (except - * this one) would not work in this way. To fix it, we could just make the - * various references to absolute file positions in the code relative to an - * initial "beginning" offset. Because the FDICopy API doesn't take a - * file-handle like this one, we would therein need to search through the - * file for the beginning of the cabinet (as we also do in cabextract.c). - * Note that this limits us to a maximum of one cabinet per. file: the first. - * - * So, in summary: either the code below is wrong, or the rest of fdi.c is - * wrong... I cannot imagine that both are correct ;) One of these flaws - * should be fixed after determining the behavior on Windows. We ought - * to check both FDIIsCabinet and FDICopy for the right behavior. - * - * -gmt - */ - /* get basic offset & size info */ base_offset = SetFilePointer(pSubjectInfo->hFile, 0L, NULL, SEEK_CUR); @@ -1162,7 +1132,7 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, cabsize = SetFilePointer(pSubjectInfo->hFile, 0L, NULL, SEEK_CUR); if ((cabsize == -1) || (base_offset == -1) || - (SetFilePointer(pSubjectInfo->hFile, base_offset, NULL, SEEK_SET) == INVALID_SET_FILE_POINTER)) + (SetFilePointer(pSubjectInfo->hFile, 0, NULL, SEEK_SET) == INVALID_SET_FILE_POINTER)) { TRACE("seek error\n"); return FALSE; @@ -1267,6 +1237,7 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, NULL) || dwRead != cert_size) { ERR("couldn't read cert\n"); + SetFilePointer(pSubjectInfo->hFile, base_offset, NULL, SEEK_SET); return FALSE; } /* The encoding of the files I've seen appears to be in ASN.1 @@ -1274,6 +1245,8 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, * always is. */ *pdwEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + /* Restore base offset */ + SetFilePointer(pSubjectInfo->hFile, base_offset, NULL, SEEK_SET); return TRUE; }

1 0

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 June 2009