July 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Get rid of the OpenGL bitmap support.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 917fe72bb0861de4bb253921dd9711117f1f1e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=917fe72bb0861de4bb253921d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 27 16:10:53 2012 +0200 winex11: Get rid of the OpenGL bitmap support. --- dlls/winex11.drv/opengl.c | 75 ++------------------------------------------- dlls/winex11.drv/x11drv.h | 1 - 2 files changed, 3 insertions(+), 73 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 4f906e2..b2de6ce 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -153,9 +153,6 @@ struct wgl_context GLXContext ctx; Drawable drawables[2]; BOOL refresh_drawables; - Pixmap pixmap; /* pixmap for memory DCs */ - GLXPixmap glxpixmap; /* GLX pixmap for memory DCs */ - SIZE pixmap_size; /* pixmap size for memory DCs */ struct list entry; }; @@ -1385,18 +1382,7 @@ static BOOL glxdrv_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORM } /* physDev->current_pf will be set by the DCE update */ } - else if (GetObjectType( physdev->dev.hdc ) == OBJ_MEMDC) { - if(!(value&GLX_PIXMAP_BIT)) { - WARN("Pixel format %d is not compatible for bitmap rendering\n", iPixelFormat); - return FALSE; - } - - physdev->pixel_format = iPixelFormat; - physdev->type = DC_GL_BITMAP; - } - else { - FIXME("called on a non-window, non-bitmap object?\n"); - } + else FIXME("called on a non-window object?\n"); if (TRACE_ON(wgl)) { int gl_test = 0; @@ -1488,8 +1474,6 @@ static void glxdrv_wglDeleteContext(struct wgl_context *ctx) wine_tsx11_lock(); list_remove( &ctx->entry ); if (ctx->ctx) pglXDestroyContext( gdi_display, ctx->ctx ); - if (ctx->glxpixmap) pglXDestroyGLXPixmap( gdi_display, ctx->glxpixmap ); - if (ctx->pixmap) XFreePixmap( gdi_display, ctx->pixmap ); if (ctx->vis) XFree( ctx->vis ); wine_tsx11_unlock(); @@ -1505,25 +1489,6 @@ static PROC glxdrv_wglGetProcAddress(LPCSTR lpszProc) return pglXGetProcAddressARB((const GLubyte*)lpszProc); } -static GLXPixmap get_context_pixmap( HDC hdc, struct wgl_context *ctx ) -{ - if (!ctx->pixmap) - { - BITMAP bmp; - - GetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bmp), &bmp ); - - wine_tsx11_lock(); - ctx->pixmap = XCreatePixmap( gdi_display, root_window, - bmp.bmWidth, bmp.bmHeight, ctx->vis->depth ); - ctx->glxpixmap = pglXCreateGLXPixmap( gdi_display, ctx->vis, ctx->pixmap ); - wine_tsx11_unlock(); - ctx->pixmap_size.cx = bmp.bmWidth; - ctx->pixmap_size.cy = bmp.bmHeight; - } - return ctx->glxpixmap; -} - /*********************************************************************** * glxdrv_wglMakeCurrent */ @@ -1563,8 +1528,6 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) } else { - if (escape.gl_type == DC_GL_BITMAP) escape.gl_drawable = get_context_pixmap( hdc, ctx ); - wine_tsx11_lock(); if (TRACE_ON(wgl)) { @@ -1586,8 +1549,6 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) ctx->drawables[0] = escape.gl_drawable; ctx->drawables[1] = escape.gl_drawable; ctx->refresh_drawables = FALSE; - - if (escape.gl_type == DC_GL_BITMAP) opengl_funcs.gl.p_glDrawBuffer(GL_FRONT_LEFT); } else SetLastError(ERROR_INVALID_HANDLE); @@ -1636,9 +1597,6 @@ static BOOL X11DRV_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct { if (!pglXMakeContextCurrent) return FALSE; - if (escape_draw.gl_type == DC_GL_BITMAP) escape_draw.gl_drawable = get_context_pixmap( draw_hdc, ctx ); - if (escape_read.gl_type == DC_GL_BITMAP) escape_read.gl_drawable = get_context_pixmap( read_hdc, ctx ); - wine_tsx11_lock(); ret = pglXMakeContextCurrent(gdi_display, escape_draw.gl_drawable, escape_read.gl_drawable, ctx->ctx); if (ret) @@ -1690,11 +1648,6 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de } else { - if((GetObjectType(org->hdc) == OBJ_MEMDC) ^ (GetObjectType(dest->hdc) == OBJ_MEMDC)) - { - WARN("Attempting to share a context between a direct and indirect rendering context, expect issues!\n"); - } - wine_tsx11_lock(); describeContext(org); describeContext(dest); @@ -1712,20 +1665,6 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de return FALSE; } -static void flush_pixmap( struct wgl_context *ctx ) -{ - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)buffer; - struct gdi_image_bits bits; - - if (!get_pixmap_image( ctx->pixmap, ctx->pixmap_size.cx, ctx->pixmap_size.cy, ctx->vis, info, &bits )) - { - HBITMAP bitmap = GetCurrentObject( ctx->hdc, OBJ_BITMAP ); - SetDIBits( 0, bitmap, 0, ctx->pixmap_size.cy, bits.ptr, info, DIB_RGB_COLORS ); - if (bits.free) bits.free( &bits ); - } -} - static void flush_gl_drawable( struct glx_physdev *physdev ) { RECT rect; @@ -1766,11 +1705,7 @@ static void wglFinish(void) sync_context(ctx); pglFinish(); wine_tsx11_unlock(); - if (ctx) - { - if (ctx->pixmap) flush_pixmap( ctx ); - else ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); - } + ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); } static void wglFlush(void) @@ -1782,11 +1717,7 @@ static void wglFlush(void) sync_context(ctx); pglFlush(); wine_tsx11_unlock(); - if (ctx) - { - if (ctx->pixmap) flush_pixmap( ctx ); - else ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); - } + ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); } /*********************************************************************** diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0c4154b..32d7772 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -107,7 +107,6 @@ enum dc_gl_type DC_GL_WINDOW, /* normal top-level window */ DC_GL_CHILD_WIN, /* child window using XComposite */ DC_GL_PIXMAP_WIN, /* child window using intermediate pixmap */ - DC_GL_BITMAP, /* memory DC with a standard bitmap */ DC_GL_PBUFFER /* pseudo memory DC using a PBuffer */ };

1 0

Michael Stefaniuc : winaspi.dll16: Simplify the "pointer to start of array" idiom.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: c48b372bf82eb805dc19ac7182f2349182398a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48b372bf82eb805dc19ac718… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 27 13:59:52 2012 +0200 winaspi.dll16: Simplify the "pointer to start of array" idiom. --- dlls/winaspi.dll16/winaspi.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winaspi.dll16/winaspi.c b/dlls/winaspi.dll16/winaspi.c index aceef36..0755b4d 100644 --- a/dlls/winaspi.dll16/winaspi.c +++ b/dlls/winaspi.dll16/winaspi.c @@ -205,7 +205,7 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd16 *prb, UINT16 mode) TRACE("LinkPointer %x\n", prb->SRB_Rsvd1); TRACE("CDB Length: %d\n", prb->SRB_CDBLen); TRACE("POST Proc: %x\n", (DWORD) prb->SRB_PostProc); - cdb = &prb->CDBByte[0]; + cdb = prb->CDBByte; if (TRACE_ON(aspi)) { TRACE("CDB buffer["); @@ -225,7 +225,7 @@ ASPI_PrintSenseArea16(SRB_ExecSCSICmd16 *prb) if (TRACE_ON(aspi)) { - cdb = &prb->CDBByte[0]; + cdb = prb->CDBByte; TRACE("SenseArea["); for (i = 0; i < prb->SRB_SenseLen; i++) { if (i) TRACE(","); @@ -288,7 +288,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) in_len = SCSI_OFF + lpPRB->SRB_CDBLen + lpPRB->SRB_BufLen; sg_hd = HeapAlloc(GetProcessHeap(), 0, in_len); memset(sg_hd, 0, SCSI_OFF); - memcpy(sg_hd + 1, &lpPRB->CDBByte[0], lpPRB->SRB_CDBLen); + memcpy(sg_hd + 1, lpPRB->CDBByte, lpPRB->SRB_CDBLen); if (lpPRB->SRB_BufLen) { memcpy(((BYTE *) sg_hd) + SCSI_OFF + lpPRB->SRB_CDBLen, lpBuf, lpPRB->SRB_BufLen); } @@ -298,7 +298,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) in_len = SCSI_OFF + lpPRB->SRB_CDBLen; sg_hd = HeapAlloc(GetProcessHeap(), 0, in_len); memset(sg_hd, 0, SCSI_OFF); - memcpy(sg_hd + 1, &lpPRB->CDBByte[0], lpPRB->SRB_CDBLen); + memcpy(sg_hd + 1, lpPRB->CDBByte, lpPRB->SRB_CDBLen); } if (TARGET_TO_HOST(lpPRB)) { @@ -349,7 +349,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) int sense_len = lpPRB->SRB_SenseLen; if (lpPRB->SRB_SenseLen > 16) sense_len = 16; - memcpy(SENSE_BUFFER(lpPRB), &sg_reply_hdr->sense_buffer[0], sense_len); + memcpy(SENSE_BUFFER(lpPRB), sg_reply_hdr->sense_buffer, sense_len); }

1 0

Michael Stefaniuc : setupapi: Simplify the "pointer to start of array" idiom.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: f93390f719a56e955aebc7fa1116b5517c3bd6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93390f719a56e955aebc7fa1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 27 14:00:45 2012 +0200 setupapi: Simplify the "pointer to start of array" idiom. --- dlls/setupapi/query.c | 4 +- dlls/setupapi/setupcab.c | 74 +++++++++++++++++++++++----------------------- 2 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f93390f719a56e955aebc…

1 0

Michael Stefaniuc : winedbg: Simplify the "pointer to start of array" idiom .
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 442b34415aab3edfcb6cac178c9e9e324a8ae1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=442b34415aab3edfcb6cac178… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 27 14:09:40 2012 +0200 winedbg: Simplify the "pointer to start of array" idiom. --- programs/winedbg/gdbproxy.c | 2 +- programs/winedbg/tgt_minidump.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 58b2202..ff845d2 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1789,7 +1789,7 @@ static enum packet_return packet_query_remote_command(struct gdb_context* gdbctx len /= 2; hex_from(buffer, hxcmd, len); - for (qd = &query_details[0]; qd->name != NULL; qd++) + for (qd = query_details; qd->name != NULL; qd++) { if (len < qd->len || strncmp(buffer, qd->name, qd->len) != 0) continue; if (!qd->with_arg && len != qd->len) continue; diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index c346070..b374f42 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -102,7 +102,7 @@ static BOOL tgt_process_minidump_read(HANDLE hProcess, const void* addr, MemoryListStream, NULL, &stream, NULL)) { MINIDUMP_MEMORY_LIST* mml = stream; - MINIDUMP_MEMORY_DESCRIPTOR* mmd = &mml->MemoryRanges[0]; + MINIDUMP_MEMORY_DESCRIPTOR* mmd = mml->MemoryRanges; int i, found = -1; SIZE_T ilen, prev_len = 0; @@ -176,7 +176,7 @@ static BOOL is_pe_module_embedded(struct tgt_process_minidump_data* data, MINIDUMP_MODULE* mm; unsigned i; - for (i = 0, mm = &mml->Modules[0]; i < mml->NumberOfModules; i++, mm++) + for (i = 0, mm = mml->Modules; i < mml->NumberOfModules; i++, mm++) { if (get_addr64(mm->BaseOfImage) <= get_addr64(pe_mm->BaseOfImage) && get_addr64(mm->BaseOfImage) + mm->SizeOfImage >= get_addr64(pe_mm->BaseOfImage) + pe_mm->SizeOfImage) @@ -218,7 +218,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) { WCHAR* ptr; - mm = &mml->Modules[0]; + mm = mml->Modules; mds = (MINIDUMP_STRING*)((char*)data->mapping + mm->ModuleNameRva); len = mds->Length / 2; memcpy(exec_name, mds->Buffer, mds->Length); @@ -369,7 +369,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) WCHAR buffer[MAX_PATH]; mml = stream; - for (i = 0, mm = &mml->Modules[0]; i < mml->NumberOfModules; i++, mm++) + for (i = 0, mm = mml->Modules; i < mml->NumberOfModules; i++, mm++) { mds = (MINIDUMP_STRING*)((char*)data->mapping + mm->ModuleNameRva); memcpy(nameW, mds->Buffer, mds->Length); @@ -388,7 +388,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) WCHAR buffer[MAX_PATH]; mml = stream; - for (i = 0, mm = &mml->Modules[0]; i < mml->NumberOfModules; i++, mm++) + for (i = 0, mm = mml->Modules; i < mml->NumberOfModules; i++, mm++) { mds = (MINIDUMP_STRING*)((char*)data->mapping + mm->ModuleNameRva); memcpy(nameW, mds->Buffer, mds->Length);

1 0

Michael Stefaniuc : comdlg32: Use a helper to detect the need for win16 looks.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: bdaf2e988188bfb45d5dac88101ef4f3291aeb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdaf2e988188bfb45d5dac881… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 27 14:13:15 2012 +0200 comdlg32: Use a helper to detect the need for win16 looks. --- dlls/comdlg32/filedlg.c | 34 ++++++++++------------------------ 1 files changed, 10 insertions(+), 24 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index c49ed20..49f83ea 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -4207,6 +4207,12 @@ static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* address of structure with d return bRet; } +static inline BOOL is_win16_looks(DWORD flags) +{ + return (flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE) && + !(flags & OFN_EXPLORER)); +} + /* ------------------ APIs ---------------------- */ /*********************************************************************** @@ -4222,18 +4228,13 @@ static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* address of structure with d BOOL WINAPI GetOpenFileNameA( LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ { - BOOL win16look = FALSE; - TRACE("flags %08x\n", ofn->Flags); /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ if (ofn->Flags & OFN_FILEMUSTEXIST) ofn->Flags |= OFN_PATHMUSTEXIST; - if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) - win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; - - if (win16look) + if (is_win16_looks(ofn->Flags)) return GetFileName31A(ofn, OPEN_DIALOG); else return GetFileDialog95A(ofn, OPEN_DIALOG); @@ -4252,18 +4253,13 @@ BOOL WINAPI GetOpenFileNameA( BOOL WINAPI GetOpenFileNameW( LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ { - BOOL win16look = FALSE; - TRACE("flags %08x\n", ofn->Flags); /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ if (ofn->Flags & OFN_FILEMUSTEXIST) ofn->Flags |= OFN_PATHMUSTEXIST; - if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) - win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; - - if (win16look) + if (is_win16_looks(ofn->Flags)) return GetFileName31W(ofn, OPEN_DIALOG); else return GetFileDialog95W(ofn, OPEN_DIALOG); @@ -4283,12 +4279,7 @@ BOOL WINAPI GetOpenFileNameW( BOOL WINAPI GetSaveFileNameA( LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ { - BOOL win16look = FALSE; - - if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) - win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; - - if (win16look) + if (is_win16_looks(ofn->Flags)) return GetFileName31A(ofn, SAVE_DIALOG); else return GetFileDialog95A(ofn, SAVE_DIALOG); @@ -4307,12 +4298,7 @@ BOOL WINAPI GetSaveFileNameA( BOOL WINAPI GetSaveFileNameW( LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ { - BOOL win16look = FALSE; - - if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) - win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; - - if (win16look) + if (is_win16_looks(ofn->Flags)) return GetFileName31W(ofn, SAVE_DIALOG); else return GetFileDialog95W(ofn, SAVE_DIALOG);

1 0

Hans Leidekker : msi: Use the right interface to call 32-bit and 64-bit custom action scripts.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 108d5927d005c0dec95f78bee3c5d7cbe0b94708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108d5927d005c0dec95f78bee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 27 14:02:22 2012 +0200 msi: Use the right interface to call 32-bit and 64-bit custom action scripts. --- dlls/msi/script.c | 67 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 26 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index 236b60b..4866630 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -81,7 +81,8 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function { HRESULT hr; IActiveScript *pActiveScript = NULL; - IActiveScriptParse *pActiveScriptParse = NULL; + IActiveScriptParse32 *pActiveScriptParse32 = NULL; + IActiveScriptParse64 *pActiveScriptParse64 = NULL; MsiActiveScriptSite *pActiveScriptSite = NULL; IDispatch *pDispatch = NULL; DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0}; @@ -123,27 +124,41 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function goto done; } - /* Get the IActiveScriptParse engine interface */ - hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse, (void **)&pActiveScriptParse); - if (FAILED(hr)) goto done; + if (type & msidbCustomActionType64BitScript) + { + hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse64, (void **)&pActiveScriptParse64); + if (FAILED(hr)) goto done; - /* Give our host to the engine */ - hr = IActiveScript_SetScriptSite(pActiveScript, (IActiveScriptSite *)pActiveScriptSite); - if (FAILED(hr)) goto done; + hr = IActiveScript_SetScriptSite(pActiveScript, (IActiveScriptSite *)pActiveScriptSite); + if (FAILED(hr)) goto done; - /* Initialize the script engine */ - hr = IActiveScriptParse64_InitNew(pActiveScriptParse); - if (FAILED(hr)) goto done; + hr = IActiveScriptParse64_InitNew(pActiveScriptParse64); + if (FAILED(hr)) goto done; - /* Add the session object */ - hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS); - if (FAILED(hr)) goto done; + hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS); + if (FAILED(hr)) goto done; - /* Pass the script to the engine */ - hr = IActiveScriptParse64_ParseScriptText(pActiveScriptParse, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL); - if (FAILED(hr)) goto done; + hr = IActiveScriptParse64_ParseScriptText(pActiveScriptParse64, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL); + if (FAILED(hr)) goto done; + } + else + { + hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse32, (void **)&pActiveScriptParse32); + if (FAILED(hr)) goto done; + + hr = IActiveScript_SetScriptSite(pActiveScript, (IActiveScriptSite *)pActiveScriptSite); + if (FAILED(hr)) goto done; + + hr = IActiveScriptParse32_InitNew(pActiveScriptParse32); + if (FAILED(hr)) goto done; + + hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS); + if (FAILED(hr)) goto done; + + hr = IActiveScriptParse32_ParseScriptText(pActiveScriptParse32, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL); + if (FAILED(hr)) goto done; + } - /* Start processing the script */ hr = IActiveScript_SetScriptState(pActiveScript, SCRIPTSTATE_CONNECTED); if (FAILED(hr)) goto done; @@ -176,17 +191,17 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function done: - /* Free everything that needs to be freed */ if (pDispatch) IDispatch_Release(pDispatch); - if (pActiveScript) IActiveScriptSite_Release(pActiveScript); - if (pActiveScriptSite && - pActiveScriptSite->pSession) IUnknown_Release((IUnknown *)pActiveScriptSite->pSession); - if (pActiveScriptSite && - pActiveScriptSite->pInstaller) IUnknown_Release((IUnknown *)pActiveScriptSite->pInstaller); - if (pActiveScriptSite) IUnknown_Release((IUnknown *)pActiveScriptSite); - + if (pActiveScript) IActiveScript_Release(pActiveScript); + if (pActiveScriptParse32) IActiveScriptParse32_Release(pActiveScriptParse32); + if (pActiveScriptParse64) IActiveScriptParse64_Release(pActiveScriptParse64); + if (pActiveScriptSite) + { + if (pActiveScriptSite->pSession) IDispatch_Release(pActiveScriptSite->pSession); + if (pActiveScriptSite->pInstaller) IDispatch_Release(pActiveScriptSite->pInstaller); + IActiveScriptSite_Release((IActiveScriptSite *)pActiveScriptSite); + } CoUninitialize(); /* must call even if CoInitialize failed */ - return ret; }

1 0

Hans Leidekker : msi: Use inline wrappers for calling COM methods.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 6a588baaf7ecbe01ed0dc71c8610ff9f18e8eb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a588baaf7ecbe01ed0dc71c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 27 14:03:12 2012 +0200 msi: Use inline wrappers for calling COM methods. --- dlls/msi/Makefile.in | 1 + dlls/msi/automation.c | 3 +-- dlls/msi/custom.c | 2 +- dlls/msi/database.c | 8 ++++---- dlls/msi/package.c | 2 +- dlls/msi/script.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 140b5f1..9ea0861 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -2,6 +2,7 @@ MODULE = msi.dll IMPORTLIB = msi IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 DELAYIMPORTS = odbccp32 wintrust crypt32 imagehlp +EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ action.c \ diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 918572a..e55717a 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -609,8 +609,7 @@ static HRESULT WINAPI ListEnumerator_Clone(IEnumVARIANT* iface, IEnumVARIANT **p hr = create_list_enumerator(This->list, (LPVOID *)ppEnum); if (FAILED(hr)) { - if (*ppEnum) - IUnknown_Release(*ppEnum); + if (*ppEnum) IEnumVARIANT_Release(*ppEnum); return hr; } diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 88dcf87..8f32e59 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1439,7 +1439,7 @@ static HRESULT WINAPI mcr_QueryInterface( IWineMsiRemoteCustomAction *iface, if( IsEqualCLSID( riid, &IID_IUnknown ) || IsEqualCLSID( riid, &IID_IWineMsiRemoteCustomAction ) ) { - IUnknown_AddRef( iface ); + IWineMsiRemoteCustomAction_AddRef( iface ); *ppobj = iface; return S_OK; } diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 1f3ab81..9c0d346 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -164,7 +164,7 @@ UINT msi_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) if (!(stream = msi_alloc( sizeof(MSISTREAM) ))) return ERROR_NOT_ENOUGH_MEMORY; stream->stg = stg; - IStream_AddRef( stg ); + IStorage_AddRef( stg ); stream->stm = *stm; IStream_AddRef( *stm ); list_add_tail( &db->streams, &stream->entry ); @@ -207,7 +207,7 @@ void msi_destroy_stream( MSIDATABASE *db, const WCHAR *stname ) list_remove( &stream->entry ); IStream_Release( stream->stm ); - IStream_Release( stream->stg ); + IStorage_Release( stream->stg ); IStorage_DestroyElement( stream->stg, stname ); msi_free( stream ); CoTaskMemFree( stat.pwcsName ); @@ -224,7 +224,7 @@ static void free_streams( MSIDATABASE *db ) MSISTREAM *s = LIST_ENTRY(list_head( &db->streams ), MSISTREAM, entry); list_remove( &s->entry ); IStream_Release( s->stm ); - IStream_Release( s->stg ); + IStorage_Release( s->stg ); msi_free( s ); } } @@ -2082,7 +2082,7 @@ static HRESULT WINAPI mrd_QueryInterface( IWineMsiRemoteDatabase *iface, if( IsEqualCLSID( riid, &IID_IUnknown ) || IsEqualCLSID( riid, &IID_IWineMsiRemoteDatabase ) ) { - IUnknown_AddRef( iface ); + IWineMsiRemoteDatabase_AddRef( iface ); *ppobj = iface; return S_OK; } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1115942..a050b2e 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2361,7 +2361,7 @@ static HRESULT WINAPI mrp_QueryInterface( IWineMsiRemotePackage *iface, if( IsEqualCLSID( riid, &IID_IUnknown ) || IsEqualCLSID( riid, &IID_IWineMsiRemotePackage ) ) { - IUnknown_AddRef( iface ); + IWineMsiRemotePackage_AddRef( iface ); *ppobj = iface; return S_OK; } diff --git a/dlls/msi/script.c b/dlls/msi/script.c index 4866630..94577ba 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -219,7 +219,7 @@ static HRESULT WINAPI MsiActiveScriptSite_QueryInterface(IActiveScriptSite* ifac if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IActiveScriptSite)) { - IClassFactory_AddRef(iface); + IActiveScriptSite_AddRef(iface); *ppvObject = This; return S_OK; }

1 0

Hans Leidekker : wbemprox: Add a partial Win32_Service class implementation .
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 2d4ab8456ca4b671867d66f23d902e87a156475f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4ab8456ca4b671867d66f23… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 27 14:04:03 2012 +0200 wbemprox: Add a partial Win32_Service class implementation. --- dlls/wbemprox/builtin.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fd84ce3..b2c657f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -33,6 +33,7 @@ #include "d3d10.h" #include "winternl.h" #include "winioctl.h" +#include "winsvc.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -57,6 +58,8 @@ static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; +static const WCHAR class_serviceW[] = + {'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; static const WCHAR class_stdregprovW[] = {'S','t','d','R','e','g','P','r','o','v',0}; static const WCHAR class_videocontrollerW[] = @@ -88,6 +91,8 @@ static const WCHAR prop_deviceidW[] = {'D','e','v','i','c','e','I','d',0}; static const WCHAR prop_directionW[] = {'D','i','r','e','c','t','i','o','n',0}; +static const WCHAR prop_displaynameW[] = + {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR prop_drivetypeW[] = {'D','r','i','v','e','T','y','p','e',0}; static const WCHAR prop_filesystemW[] = @@ -132,10 +137,14 @@ static const WCHAR prop_releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR prop_serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; +static const WCHAR prop_servicetypeW[] = + {'S','e','r','v','i','c','e','T','y','p','e',0}; static const WCHAR prop_sizeW[] = {'S','i','z','e',0}; static const WCHAR prop_speedW[] = {'S','p','e','e','d',0}; +static const WCHAR prop_stateW[] = + {'S','t','a','t','e',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; static const WCHAR prop_tagW[] = @@ -238,6 +247,14 @@ static const struct column col_processor[] = { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } }; +static const struct column col_service[] = +{ + { prop_displaynameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_processidW, CIM_UINT32 }, + { prop_servicetypeW, CIM_STRING }, + { prop_stateW, CIM_STRING } +}; static const struct column col_stdregprov[] = { { method_enumkeyW, CIM_OBJECT|COL_FLAG_METHOD }, @@ -364,6 +381,14 @@ struct record_processor const WCHAR *name; const WCHAR *processor_id; }; +struct record_service +{ + const WCHAR *displayname; + const WCHAR *name; + UINT32 process_id; + const WCHAR *servicetype; + const WCHAR *state; +}; struct record_stdregprov { class_method *enumkey; @@ -760,6 +785,98 @@ static void fill_os( struct table *table ) table->num_rows = 1; } +static const WCHAR *get_service_type( DWORD type ) +{ + static const WCHAR filesystem_driverW[] = + {'F','i','l','e',' ','S','y','s','t','e','m',' ','D','r','i','v','e','r',0}; + static const WCHAR kernel_driverW[] = + {'K','e','r','n','e','l',' ','D','r','i','v','e','r',0}; + static const WCHAR own_processW[] = + {'O','w','n',' ','P','r','o','c','e','s','s',0}; + static const WCHAR share_processW[] = + {'S','h','a','r','e',' ','P','r','o','c','e','s','s',0}; + + if (type & SERVICE_KERNEL_DRIVER) return kernel_driverW; + else if (type & SERVICE_FILE_SYSTEM_DRIVER) return filesystem_driverW; + else if (type & SERVICE_WIN32_OWN_PROCESS) return own_processW; + else if (type & SERVICE_WIN32_SHARE_PROCESS) return share_processW; + else ERR("unhandled type 0x%08x\n", type); + return NULL; +} +static const WCHAR *get_service_state( DWORD state ) +{ + static const WCHAR runningW[] = + {'R','u','n','n','i','n','g',0}; + static const WCHAR start_pendingW[] = + {'S','t','a','r','t',' ','P','e','n','d','i','n','g',0}; + static const WCHAR stop_pendingW[] = + {'S','t','o','p',' ','P','e','n','d','i','n','g',0}; + static const WCHAR stoppedW[] = + {'S','t','o','p','p','e','d',0}; + static const WCHAR unknownW[] = + {'U','n','k','n','o','w','n',0}; + + switch (state) + { + case SERVICE_STOPPED: return stoppedW; + case SERVICE_START_PENDING: return start_pendingW; + case SERVICE_STOP_PENDING: return stop_pendingW; + case SERVICE_RUNNING: return runningW; + default: + ERR("unknown state %u\n", state); + return unknownW; + } +} + +static void fill_service( struct table *table ) +{ + struct record_service *rec; + SC_HANDLE manager; + ENUM_SERVICE_STATUS_PROCESSW *tmp, *services = NULL; + SERVICE_STATUS_PROCESS *status; + UINT i, num_rows = 0, offset = 0, size = 256, needed, count; + BOOL ret; + + if (!(manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE ))) return; + if (!(services = heap_alloc( size ))) goto done; + + ret = EnumServicesStatusExW( manager, SC_ENUM_PROCESS_INFO, SERVICE_TYPE_ALL, + SERVICE_STATE_ALL, (BYTE *)services, size, &needed, + &count, NULL, NULL ); + if (!ret) + { + if (GetLastError() != ERROR_MORE_DATA) goto done; + size = needed; + if (!(tmp = heap_realloc( services, size ))) goto done; + services = tmp; + ret = EnumServicesStatusExW( manager, SC_ENUM_PROCESS_INFO, SERVICE_TYPE_ALL, + SERVICE_STATE_ALL, (BYTE *)services, size, &needed, + &count, NULL, NULL ); + if (!ret) goto done; + } + if (!(table->data = heap_alloc( sizeof(*rec) * count ))) goto done; + + for (i = 0; i < count; i++) + { + status = &services[i].ServiceStatusProcess; + rec = (struct record_service *)(table->data + offset); + rec->displayname = heap_strdupW( services[i].lpDisplayName ); + rec->name = heap_strdupW( services[i].lpServiceName ); + rec->process_id = status->dwProcessId; + rec->servicetype = get_service_type( status->dwServiceType ); + rec->state = get_service_state( status->dwCurrentState ); + offset += sizeof(*rec); + num_rows++; + } + + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; + +done: + CloseServiceHandle( manager ); + heap_free( services ); +} + static UINT32 get_bits_per_pixel( UINT *hres, UINT *vres ) { HDC hdc = GetDC( NULL ); @@ -826,6 +943,7 @@ static struct table builtin_classes[] = { class_paramsW, SIZEOF(col_params), col_params, SIZEOF(data_params), (BYTE *)data_params }, { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, NULL, fill_processor }, + { class_serviceW, SIZEOF(col_service), col_service, 0, NULL, fill_service }, { class_stdregprovW, SIZEOF(col_stdregprov), col_stdregprov, SIZEOF(data_stdregprov), (BYTE *)data_stdregprov }, { class_videocontrollerW, SIZEOF(col_videocontroller), col_videocontroller, 0, NULL, fill_videocontroller } };

1 0

Hans Leidekker : wbemprox: Parse the object path passed to IWbemServices:: GetObject.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: f3b93f26159873f35e32f71f523b943b7ba37b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b93f26159873f35e32f71f5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 27 14:04:28 2012 +0200 wbemprox: Parse the object path passed to IWbemServices::GetObject. --- dlls/wbemprox/services.c | 112 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 99 insertions(+), 13 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index e8c5461..8c9c2f4 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -235,35 +235,108 @@ static HRESULT WINAPI wbem_services_QueryObjectSink( return WBEM_E_FAILED; } -static HRESULT create_instance_enum( const WCHAR *class, IEnumWbemClassObject **iter ) +struct path { - static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; - WCHAR *query; - HRESULT hr; + WCHAR *class; + UINT class_len; + WCHAR *filter; + UINT filter_len; +}; + +static HRESULT parse_path( const WCHAR *str, struct path **ret ) +{ + struct path *path; + const WCHAR *p = str, *q; + UINT len; - query = heap_alloc( strlenW( class ) * sizeof(WCHAR) + sizeof(selectW) ); - if (!query) return E_OUTOFMEMORY; + if (!(path = heap_alloc_zero( sizeof(*path) ))) return E_OUTOFMEMORY; - strcpyW( query, selectW ); - strcatW( query, class ); + while (*p && *p != '.') p++; + len = p - str; + if (!(path->class = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + heap_free( path ); + return E_OUTOFMEMORY; + } + memcpy( path->class, str, len * sizeof(WCHAR) ); + path->class[len] = 0; + path->class_len = len; + + if (p[0] == '.' && p[1]) + { + q = ++p; + while (*q) q++; + + len = q - p; + if (!(path->filter = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + heap_free( path->class ); + heap_free( path ); + return E_OUTOFMEMORY; + } + memcpy( path->filter, p, len * sizeof(WCHAR) ); + path->filter[len] = 0; + path->filter_len = len; + } + *ret = path; + return S_OK; +} + +static void free_path( struct path *path ) +{ + heap_free( path->class ); + heap_free( path->filter ); + heap_free( path ); +} + +static HRESULT create_instance_enum( const struct path *path, IEnumWbemClassObject **iter ) +{ + static const WCHAR selectW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','%','s',' ', + 'W','H','E','R','E',' ','%','s',0}; + static const WCHAR select_allW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; + WCHAR *query; + HRESULT hr; + UINT len; + + if (path->filter) + { + len = path->class_len + path->filter_len + SIZEOF(selectW); + if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + sprintfW( query, selectW, path->class, path->filter ); + } + else + { + len = path->class_len + SIZEOF(select_allW); + if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + strcpyW( query, select_allW ); + strcatW( query, path->class ); + } hr = exec_query( query, iter ); heap_free( query ); return hr; } -HRESULT get_object( const WCHAR *path, IWbemClassObject **obj ) +HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) { IEnumWbemClassObject *iter; + struct path *path; HRESULT hr; - /* FIXME: parse path */ - - hr = create_instance_enum( path, &iter ); + hr = parse_path( object_path, &path ); if (hr != S_OK) return hr; + hr = create_instance_enum( path, &iter ); + if (hr != S_OK) + { + free_path( path ); + return hr; + } hr = WbemClassObject_create( NULL, iter, 0, (void **)obj ); IEnumWbemClassObject_Release( iter ); + free_path( path ); return hr; } @@ -280,6 +353,11 @@ static HRESULT WINAPI wbem_services_GetObject( if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); + if (!strObjectPath) + { + FIXME("no support for creating new classes\n"); + return WBEM_E_FAILED; + } return get_object( strObjectPath, ppObject ); } @@ -411,11 +489,19 @@ static HRESULT WINAPI wbem_services_CreateInstanceEnum( IWbemContext *pCtx, IEnumWbemClassObject **ppEnum ) { + struct path *path; + HRESULT hr; + TRACE("%p, %s, 0%08x, %p, %p\n", iface, debugstr_w(strClass), lFlags, pCtx, ppEnum); if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); - return create_instance_enum( strClass, ppEnum ); + hr = parse_path( strClass, &path ); + if (hr != S_OK) return hr; + + hr = create_instance_enum( path, ppEnum ); + free_path( path ); + return hr; } static HRESULT WINAPI wbem_services_CreateInstanceEnumAsync(

1 0

Hans Leidekker : winhttp: Use platform-specific versions of IActiveScriptParse methods.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 8f108a0f4d5c966fe7606919294c834e2f67872e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f108a0f4d5c966fe76069192… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 27 14:46:13 2012 +0200 winhttp: Use platform-specific versions of IActiveScriptParse methods. --- dlls/winhttp/Makefile.in | 1 + dlls/winhttp/session.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 53b5b97..130971e 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = winhttp IMPORTS = uuid user32 advapi32 DELAYIMPORTS = oleaut32 ole32 crypt32 EXTRALIBS = @SOCKETLIBS@ +EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ cookie.c \ diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e3e5e2b..0349ba7 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1828,6 +1828,16 @@ static BSTR include_pac_utils( BSTR script ) return ret; } +#ifdef _WIN64 +#define IActiveScriptParse_Release IActiveScriptParse64_Release +#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText +#else +#define IActiveScriptParse_Release IActiveScriptParse32_Release +#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText +#endif + static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO *info ) { static const WCHAR jscriptW[] = {'J','S','c','r','i','p','t',0}; @@ -1862,7 +1872,7 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO hr = IActiveScript_QueryInterface( engine, &IID_IActiveScriptParse, (void **)&parser ); if (hr != S_OK) goto done; - hr = IActiveScriptParse64_InitNew( parser ); + hr = IActiveScriptParse_InitNew( parser ); if (hr != S_OK) goto done; hr = IActiveScript_SetScriptSite( engine, &script_site ); @@ -1873,7 +1883,7 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO if (!(full_script = include_pac_utils( script ))) goto done; - hr = IActiveScriptParse64_ParseScriptText( parser, full_script, NULL, NULL, NULL, 0, 0, 0, NULL, NULL ); + hr = IActiveScriptParse_ParseScriptText( parser, full_script, NULL, NULL, NULL, 0, 0, 0, NULL, NULL ); if (hr != S_OK) goto done; hr = IActiveScript_SetScriptState( engine, SCRIPTSTATE_STARTED ); @@ -1910,7 +1920,7 @@ done: SysFreeString( hostname ); SysFreeString( func ); if (dispatch) IDispatch_Release( dispatch ); - if (parser) IUnknown_Release( parser ); + if (parser) IActiveScriptParse_Release( parser ); if (engine) IActiveScript_Release( engine ); if (SUCCEEDED( init )) CoUninitialize(); if (!ret) set_last_error( ERROR_WINHTTP_BAD_AUTO_PROXY_SCRIPT );

1 0