February 2009 - Wine-commits

Alexandre Julliard : widl: Change write_type_def_or_decl and write_type_decl to take an argument name instead of a printf format .
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 20e4cb98a75271bef1e0cca260782ed907d0af28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e4cb98a75271bef1e0cca26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 10 12:32:36 2009 +0100 widl: Change write_type_def_or_decl and write_type_decl to take an argument name instead of a printf format. --- tools/widl/header.c | 33 ++++++++++++--------------------- tools/widl/header.h | 4 ++-- tools/widl/typegen.c | 4 +++- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 41fcb96..f86d2b0 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -149,7 +149,7 @@ static void write_field(FILE *h, var_t *v) if (!v) return; if (v->type) { indent(h, 0); - write_type_def_or_decl(h, v->type, TRUE, "%s", v->name); + write_type_def_or_decl(h, v->type, TRUE, v->name); fprintf(h, ";\n"); } } @@ -278,8 +278,7 @@ void write_type_right(FILE *h, type_t *t, int is_field) } } -void write_type_v(FILE *h, type_t *t, int is_field, int declonly, - const char *fmt, va_list args) +static void write_type_v(FILE *h, type_t *t, int is_field, int declonly, const char *name) { type_t *pt; int ptr_level = 0; @@ -302,11 +301,9 @@ void write_type_v(FILE *h, type_t *t, int is_field, int declonly, fputc('*', h); } else write_type_left(h, t, declonly); - if (fmt) { - if (needs_space_after(t)) - fputc(' ', h); - vfprintf(h, fmt, args); - } + + if (name) fprintf(h, "%s%s", needs_space_after(t) ? " " : "", name ); + if (pt->type == RPC_FC_FUNCTION) { if (ptr_level) fputc(')', h); fputc('(', h); @@ -316,20 +313,14 @@ void write_type_v(FILE *h, type_t *t, int is_field, int declonly, write_type_right(h, t, is_field); } -void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *fmt, ...) +void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *name) { - va_list args; - va_start(args, fmt); - write_type_v(f, t, field, FALSE, fmt, args); - va_end(args); + write_type_v(f, t, field, FALSE, name); } -void write_type_decl(FILE *f, type_t *t, const char *fmt, ...) +void write_type_decl(FILE *f, type_t *t, const char *name) { - va_list args; - va_start(args, fmt); - write_type_v(f, t, FALSE, TRUE, fmt, args); - va_end(args); + write_type_v(f, t, FALSE, TRUE, name); } void write_type_decl_left(FILE *f, type_t *t) @@ -471,7 +462,7 @@ static void write_generic_handle_routines(FILE *header) static void write_typedef(FILE *header, type_t *type) { fprintf(header, "typedef "); - write_type_def_or_decl(header, type_alias_get_aliasee(type), FALSE, "%s", type->name); + write_type_def_or_decl(header, type_alias_get_aliasee(type), FALSE, type->name); fprintf(header, ";\n"); } @@ -515,7 +506,7 @@ static void write_declaration(FILE *header, const var_t *v) fprintf(header, "extern "); break; } - write_type_def_or_decl(header, v->type, FALSE, "%s", v->name); + write_type_def_or_decl(header, v->type, FALSE, v->name); fprintf(header, ";\n\n"); } } @@ -677,7 +668,7 @@ void write_args(FILE *h, const var_list_t *args, const char *name, int method, i } else fprintf(h, ","); } - write_type_decl(h, arg->type, "%s", arg->name); + write_type_decl(h, arg->type, arg->name); count++; } if (do_indent) indentation--; diff --git a/tools/widl/header.h b/tools/widl/header.h index 7829e09..0c0c0a4 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -34,8 +34,8 @@ extern int is_declptr(const type_t *t); extern const char* get_name(const var_t *v); extern void write_type_left(FILE *h, type_t *t, int declonly); extern void write_type_right(FILE *h, type_t *t, int is_field); -extern void write_type_def_or_decl(FILE *h, type_t *t, int is_field, const char *fmt, ...) __attribute__((format (printf, 4, 5))); -extern void write_type_decl(FILE *f, type_t *t, const char *fmt, ...) __attribute__((format (printf, 3, 4))); +extern void write_type_def_or_decl(FILE *h, type_t *t, int is_field, const char *name); +extern void write_type_decl(FILE *f, type_t *t, const char *name); extern void write_type_decl_left(FILE *f, type_t *t); extern int needs_space_after(type_t *t); extern int is_object(const attr_list_t *list); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9bf348f..89b7ccf 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3383,12 +3383,14 @@ void declare_stub_args( FILE *file, int indent, const var_t *func ) if (!in_attr && !is_conformant_array(var->type) && !is_string) { type_t *type_to_print; + char name[16]; print_file(file, indent, "%s", ""); if (var->type->declarray) type_to_print = var->type; else type_to_print = type_pointer_get_ref(var->type); - write_type_decl(file, type_to_print, "_W%u", i++); + sprintf(name, "_W%u", i++); + write_type_decl(file, type_to_print, name); fprintf(file, ";\n"); }

1 0

Michael Stefaniuc : winenas.drv: dwParam1 and dwParam2 cwhave the type DWORD_PTR.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: d360588a824915fdcc82c31d0365ccd75e62352b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d360588a824915fdcc82c31d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 9 23:35:05 2009 +0100 winenas.drv: dwParam1 and dwParam2 cwhave the type DWORD_PTR. --- dlls/winenas.drv/audio.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index f418315..d26e57c 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -127,7 +127,7 @@ enum win_wm_message { typedef struct { enum win_wm_message msg; /* message identifier */ - DWORD param; /* parameter for this message */ + DWORD_PTR param; /* parameter for this message */ HANDLE hEvent; /* if message is synchronous, handle of event for synchro */ } RING_MSG; @@ -556,8 +556,8 @@ static int NAS_AddRingMessage(MSG_RING* mr, enum win_wm_message msg, DWORD param * * Get a message from the ring. Should be called by the playback/record thread. */ -static int NAS_RetrieveRingMessage(MSG_RING* mr, - enum win_wm_message *msg, DWORD *param, HANDLE *hEvent) +static int NAS_RetrieveRingMessage(MSG_RING* mr, enum win_wm_message *msg, + DWORD_PTR *param, HANDLE *hEvent) { EnterCriticalSection(&mr->msg_crst); @@ -583,9 +583,10 @@ static int NAS_RetrieveRingMessage(MSG_RING* mr, /************************************************************************** * wodNotifyClient [internal] */ -static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2) +static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, + DWORD_PTR dwParam2) { - TRACE("wMsg = 0x%04x dwParm1 = %04X dwParam2 = %04X\n", wMsg, dwParam1, dwParam2); + TRACE("wMsg = 0x%04x dwParm1 = %08lX dwParam2 = %08lX\n", wMsg, dwParam1, dwParam2); switch (wMsg) { case WOM_OPEN: @@ -703,7 +704,7 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); + wodNotifyClient(wwo, WOM_DONE, (DWORD_PTR)lpWaveHdr, 0); } return (lpWaveHdr && lpWaveHdr != wwo->lpPlayPtr && lpWaveHdr != wwo->lpLoopPtr) ? 1 : 1; @@ -726,7 +727,7 @@ static void wodPlayer_Reset(WINE_WAVEOUT* wwo, BOOL reset) if (reset) { enum win_wm_message msg; - DWORD param; + DWORD_PTR param; HANDLE ev; /* remove any buffer */ @@ -778,11 +779,11 @@ static void wodPlayer_ProcessMessages(WINE_WAVEOUT* wwo) { LPWAVEHDR lpWaveHdr; enum win_wm_message msg; - DWORD param; + DWORD_PTR param; HANDLE ev; while (NAS_RetrieveRingMessage(&wwo->msgRing, &msg, &param, &ev)) { - TRACE("Received %s %x\n", wodPlayerCmdString[msg - WM_USER - 1], param); + TRACE("Received %s %lx\n", wodPlayerCmdString[msg - WM_USER - 1], param); switch (msg) { case WINE_WM_PAUSING: wodPlayer_Reset(wwo, FALSE); @@ -841,7 +842,7 @@ static void wodPlayer_ProcessMessages(WINE_WAVEOUT* wwo) */ static DWORD CALLBACK wodPlayer(LPVOID pmt) { - WORD uDevID = (DWORD)pmt; + WORD uDevID = (DWORD_PTR)pmt; WINE_WAVEOUT* wwo = &WOutDev[uDevID]; wwo->state = WINE_WS_STOPPED; @@ -960,7 +961,8 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) /* create player thread */ if (!(dwFlags & WAVE_DIRECTSOUND)) { wwo->hStartUpEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - wwo->hThread = CreateThread(NULL, 0, wodPlayer, (LPVOID)(DWORD)wDevID, 0, &(wwo->dwThreadID)); + wwo->hThread = CreateThread(NULL, 0, wodPlayer, (LPVOID)(DWORD_PTR)wDevID, + 0, &(wwo->dwThreadID)); if (wwo->hThread) SetThreadPriority(wwo->hThread, THREAD_PRIORITY_TIME_CRITICAL); WaitForSingleObject(wwo->hStartUpEvent, INFINITE); @@ -1048,7 +1050,7 @@ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) lpWaveHdr->lpNext = 0; TRACE("adding ring message\n"); - NAS_AddRingMessage(&WOutDev[wDevID].msgRing, WINE_WM_HEADER, (DWORD)lpWaveHdr, FALSE); + NAS_AddRingMessage(&WOutDev[wDevID].msgRing, WINE_WM_HEADER, (DWORD_PTR)lpWaveHdr, FALSE); return MMSYSERR_NOERROR; } @@ -1205,9 +1207,9 @@ static DWORD wodGetNumDevs(void) * wodMessage (WINENAS.@) */ DWORD WINAPI NAS_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%u, %04X, %08X, %08X, %08X);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + TRACE("(%u, %04X, %08X, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { case DRVM_INIT:

1 0

Michael Stefaniuc : ole32: Use GetWindowLongPtr/ SetWindowLongPtr for pointers.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: a90828aa604530be28d228d8af9c56a6d3d9d992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90828aa604530be28d228d8a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 9 23:34:20 2009 +0100 ole32: Use GetWindowLongPtr/SetWindowLongPtr for pointers. --- dlls/ole32/ole2.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index a2ff9b7..caf58b1 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1963,7 +1963,7 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc( { LPCREATESTRUCTA createStruct = (LPCREATESTRUCTA)lParam; - SetWindowLongA(hwnd, 0, (LONG)createStruct->lpCreateParams); + SetWindowLongPtrA(hwnd, 0, (LONG_PTR)createStruct->lpCreateParams); SetTimer(hwnd, DRAG_TIMER_ID, 50, NULL); break; @@ -1971,7 +1971,7 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc( case WM_TIMER: case WM_MOUSEMOVE: { - OLEDD_TrackMouseMove((TrackerWindowInfo*)GetWindowLongA(hwnd, 0)); + OLEDD_TrackMouseMove((TrackerWindowInfo*)GetWindowLongPtrA(hwnd, 0)); break; } case WM_LBUTTONUP: @@ -1981,7 +1981,7 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc( case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: { - OLEDD_TrackStateChange((TrackerWindowInfo*)GetWindowLongA(hwnd, 0)); + OLEDD_TrackStateChange((TrackerWindowInfo*)GetWindowLongPtrA(hwnd, 0)); break; } case WM_DESTROY:

1 0

Michael Stefaniuc : msvfw32: Remove some Win64 compiler warnings.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: caa604b563d3b4c2629188999ebfb08f1987bebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa604b563d3b4c2629188999… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 9 23:34:30 2009 +0100 msvfw32: Remove some Win64 compiler warnings. - Use HandleToLong to get to the user handle. - Use GetWindowLongPtr to retrieve a pointer. --- dlls/msvfw32/mciwnd.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index 61b13aa..ff8a036 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -449,7 +449,7 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa TRACE("%p %04x %08lx %08lx\n", hWnd, wMsg, wParam, lParam); - mwi = (MCIWndInfo*)GetWindowLongW(hWnd, 0); + mwi = (MCIWndInfo*)GetWindowLongPtrW(hWnd, 0); if (!mwi && wMsg != WM_CREATE) return DefWindowProcW(hWnd, wMsg, wParam, lParam); @@ -568,7 +568,7 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa hCursor = SetCursor(hCursor); mci_open.lpstrElementName = (LPWSTR)lParam; - wsprintfW(aliasW, formatW, (int)hWnd + 1); + wsprintfW(aliasW, formatW, HandleToLong(hWnd) + 1); mci_open.lpstrAlias = aliasW; mwi->lasterror = mciSendCommandW(mwi->mci, MCI_OPEN, MCI_OPEN_ELEMENT | MCI_OPEN_ALIAS | MCI_WAIT, @@ -588,7 +588,7 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa } mwi->mci = mci_open.wDeviceID; - mwi->alias = (int)hWnd + 1; + mwi->alias = HandleToLong(hWnd) + 1; mwi->lpName = HeapAlloc(GetProcessHeap(), 0, (strlenW((LPWSTR)lParam) + 1) * sizeof(WCHAR)); strcpyW(mwi->lpName, (LPWSTR)lParam);

1 0

Jacek Caban : activscp.idl: Added IActiveScriptParseProcedure*64 interfaces and use it on Win64.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 2e29c7d5162af30aa907e81fb7e9b4ffdef3973c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e29c7d5162af30aa907e81fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 9 21:11:36 2009 +0100 activscp.idl: Added IActiveScriptParseProcedure*64 interfaces and use it on Win64. --- dlls/jscript/jscript.c | 8 +++-- dlls/mshtml/script.c | 4 +- dlls/mshtml/tests/script.c | 4 ++- include/activscp.idl | 80 ++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 87 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index d53ac2f..fb99d24 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -28,11 +28,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define CTXARG_T DWORDLONG #define IActiveScriptParseVtbl IActiveScriptParse64Vtbl +#define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_64Vtbl #else #define CTXARG_T DWORD #define IActiveScriptParseVtbl IActiveScriptParse32Vtbl +#define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_32Vtbl #endif @@ -646,16 +648,16 @@ static ULONG WINAPI JScriptParseProcedure_Release(IActiveScriptParseProcedure2 * static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptParseProcedure2 *iface, LPCOLESTR pstrCode, LPCOLESTR pstrFormalParams, LPCOLESTR pstrProcedureName, LPCOLESTR pstrItemName, IUnknown *punkContext, LPCOLESTR pstrDelimiter, - DWORD dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) + CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) { JScript *This = ASPARSEPROC_THIS(iface); parser_ctx_t *parser_ctx; DispatchEx *dispex; HRESULT hres; - TRACE("(%p)->(%s %s %s %s %p %s %x %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), + TRACE("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), debugstr_w(pstrProcedureName), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), - dwSourceContextCookie, ulStartingLineNumber, dwFlags, ppdisp); + wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLineNumber, dwFlags, ppdisp); if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 43373e4..4b1a240 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -175,7 +175,7 @@ static void release_script_engine(ScriptHost *This) default: if(This->parse_proc) { - IActiveScriptParseProcedure_Release(This->parse_proc); + IUnknown_Release(This->parse_proc); This->parse_proc = NULL; } @@ -783,7 +783,7 @@ IDispatch *script_parse_event(HTMLDocument *doc, LPCWSTR text) if(!script_host || !script_host->parse_proc) return NULL; - hres = IActiveScriptParseProcedure_ParseProcedureText(script_host->parse_proc, ptr, NULL, emptyW, + hres = IActiveScriptParseProcedure64_ParseProcedureText(script_host->parse_proc, ptr, NULL, emptyW, NULL, NULL, delimiterW, 0 /* FIXME */, 0, SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); if(FAILED(hres)) { diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index d6a5e5f..4faf78a 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -40,11 +40,13 @@ DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00 #define CTXARG_T DWORDLONG #define IActiveScriptParseVtbl IActiveScriptParse64Vtbl +#define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_64Vtbl #else #define CTXARG_T DWORD #define IActiveScriptParseVtbl IActiveScriptParse32Vtbl +#define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_32Vtbl #endif @@ -550,7 +552,7 @@ static ULONG WINAPI ActiveScriptParseProcedure_Release(IActiveScriptParseProcedu static HRESULT WINAPI ActiveScriptParseProcedure_ParseProcedureText(IActiveScriptParseProcedure2 *iface, LPCOLESTR pstrCode, LPCOLESTR pstrFormalParams, LPCOLESTR pstrProcedureName, LPCOLESTR pstrItemName, IUnknown *punkContext, LPCOLESTR pstrDelimiter, - DWORD dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) + CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) { ok(0, "unexpected call\n"); return E_NOTIMPL; diff --git a/include/activscp.idl b/include/activscp.idl index 3fe6d62..e75fbec 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -350,7 +350,7 @@ object, uuid(1CFF0050-6FDD-11d0-9328-00A0C90DCAA9), pointer_default(unique) ] -interface IActiveScriptParseProcedureOld : IUnknown +interface IActiveScriptParseProcedureOld32 : IUnknown { HRESULT ParseProcedureText( [in] LPCOLESTR pstrCode, @@ -366,11 +366,39 @@ interface IActiveScriptParseProcedureOld : IUnknown } [ + object, + uuid(21f57128-08c9-4638-ba12-22d15d88dc5c), + pointer_default(unique) +] +interface IActiveScriptParseProcedureOld64 : IUnknown +{ + HRESULT ParseProcedureText( + [in] LPCOLESTR pstrCode, + [in] LPCOLESTR pstrFormalParams, + [in] LPCOLESTR pstrItemName, + [in] IUnknown *punkContext, + [in] LPCOLESTR pstrDelimiter, + [in] DWORDLONG dwSourceContextCookie, + [in] ULONG ulStartingLineNumber, + [in] DWORD dwFlags, + [out] IDispatch **ppdisp + ); +} + +cpp_quote("#ifdef _WIN64") +cpp_quote("#define IActiveScriptParseProcedureOld IActiveScriptParseProcedureOld64") +cpp_quote("#define IID_IActiveScriptParseProcedureOld IID_IActiveScriptParseProcedureOld64") +cpp_quote("#else") +cpp_quote("#define IActiveScriptParseProcedureOld IActiveScriptParseProcedureOld32") +cpp_quote("#define IID_IActiveScriptParseProcedureOld IID_IActiveScriptParseProcedureOld32") +cpp_quote("#endif") + +[ object, uuid(AA5B6A80-B834-11d0-932F-00A0C90DCAA9), pointer_default(unique) ] -interface IActiveScriptParseProcedure : IUnknown +interface IActiveScriptParseProcedure32 : IUnknown { HRESULT ParseProcedureText( [in] LPCOLESTR pstrCode, @@ -388,13 +416,59 @@ interface IActiveScriptParseProcedure : IUnknown [ object, + uuid(c64713b6-e029-4cc5-9200-438b72890b6a), + pointer_default(unique) +] +interface IActiveScriptParseProcedure64 : IUnknown +{ + HRESULT ParseProcedureText( + [in] LPCOLESTR pstrCode, + [in] LPCOLESTR pstrFormalParams, + [in] LPCOLESTR pstrProcedureName, + [in] LPCOLESTR pstrItemName, + [in] IUnknown *punkContext, + [in] LPCOLESTR pstrDelimiter, + [in] DWORDLONG dwSourceContextCookie, + [in] ULONG ulStartingLineNumber, + [in] DWORD dwFlags, + [out] IDispatch **ppdisp + ); +} + +cpp_quote("#ifdef _WIN64") +cpp_quote("#define IActiveScriptParseProcedure IActiveScriptParseProcedure64") +cpp_quote("#define IID_IActiveScriptParseProcedure IID_IActiveScriptParseProcedure64") +cpp_quote("#else") +cpp_quote("#define IActiveScriptParseProcedure IActiveScriptParseProcedure32") +cpp_quote("#define IID_IActiveScriptParseProcedure IID_IActiveScriptParseProcedure32") +cpp_quote("#endif") + +[ + object, uuid(71ee5b20-fb04-11d1-b3a8-00a0c911e8b2), pointer_default(unique) ] -interface IActiveScriptParseProcedure2 : IActiveScriptParseProcedure +interface IActiveScriptParseProcedure2_32 : IActiveScriptParseProcedure32 +{ +} + +[ + object, + uuid(fe7c4271-210c-448d-9f54-76dab7047b28), + pointer_default(unique) +] +interface IActiveScriptParseProcedure2_64 : IActiveScriptParseProcedure64 { } +cpp_quote("#ifdef _WIN64") +cpp_quote("#define IActiveScriptParseProcedure2 IActiveScriptParseProcedure2_64") +cpp_quote("#define IID_IActiveScriptParseProcedure2 IID_IActiveScriptParseProcedure2_64") +cpp_quote("#else") +cpp_quote("#define IActiveScriptParseProcedure2 IActiveScriptParseProcedure2_32") +cpp_quote("#define IID_IActiveScriptParseProcedure2 IID_IActiveScriptParseProcedure2_32") +cpp_quote("#endif") + [ object, uuid(63CDBCB0-C1B1-11d0-9336-00A0C90DCAA9),

1 0

Nikolay Sivov : gdiplus: Handle zero width/height in GdipAddPathPie.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 8cb170126ab51f1c1c2b32f7eaf261237d6bcd45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb170126ab51f1c1c2b32f7e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Feb 9 23:25:06 2009 +0300 gdiplus: Handle zero width/height in GdipAddPathPie. --- dlls/gdiplus/graphicspath.c | 11 +++++++++++ dlls/gdiplus/tests/graphicspath.c | 21 ++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 042d4a2..4703ace 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -723,6 +723,17 @@ GpStatus WINGDIPAPI GdipAddPathPie(GpPath *path, REAL x, REAL y, REAL width, REA if(!path) return InvalidParameter; + /* on zero width/height only start point added */ + if(width <= 1e-7 || height <= 1e-7){ + if(!lengthen_path(path, 1)) + return OutOfMemory; + path->pathdata.Points[0].X = x + width / 2.0; + path->pathdata.Points[0].Y = y + height / 2.0; + path->pathdata.Types[0] = PathPointTypeStart | PathPointTypeCloseSubpath; + path->pathdata.Count = 1; + return InvalidParameter; + } + count = arc2polybezier(NULL, x, y, width, height, startAngle, sweepAngle); if(count == 0) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 416d80c..d256cac 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -907,7 +907,12 @@ static path_test_t addpie_path[] = { {79.4, 46.8, PathPointTypeBezier,0, 0}, /*3*/ {63.9, 49.0, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0} /*4*/ }; - +static path_test_t addpie_path2[] = { + {0.0, 30.0, PathPointTypeStart | PathPointTypeCloseSubpath, 0, 0} /*0*/ + }; +static path_test_t addpie_path3[] = { + {30.0, 0.0, PathPointTypeStart | PathPointTypeCloseSubpath, 0, 0} /*0*/ + }; static void test_addpie(void) { GpStatus status; @@ -922,6 +927,20 @@ static void test_addpie(void) status = GdipAddPathPie(path, 0.0, 0.0, 100.0, 50.0, 10.0, 50.0); expect(Ok, status); ok_path(path, addpie_path, sizeof(addpie_path)/sizeof(path_test_t), FALSE); + status = GdipResetPath(path); + expect(Ok, status); + + /* zero width base ellipse */ + status = GdipAddPathPie(path, 0.0, 0.0, 0.0, 60.0, -90.0, 24.0); + expect(InvalidParameter, status); + ok_path(path, addpie_path2, sizeof(addpie_path2)/sizeof(path_test_t), FALSE); + status = GdipResetPath(path); + expect(Ok, status); + + /* zero height base ellipse */ + status = GdipAddPathPie(path, 0.0, 0.0, 60.0, 0.0 , -90.0, 24.0); + expect(InvalidParameter, status); + ok_path(path, addpie_path3, sizeof(addpie_path3)/sizeof(path_test_t), FALSE); GdipDeletePath(path); }

1 0

Juan Lang : crypt32: Fix a few more test failures on older versions of Windows.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 7cc615e631ebe98db30c88e52c415b210f0c0919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc615e631ebe98db30c88e52… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 9 13:49:33 2009 -0800 crypt32: Fix a few more test failures on older versions of Windows. --- dlls/crypt32/tests/chain.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 9fd32f5..0e29810 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1176,7 +1176,7 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected, todo_wine ok(got->dwErrorStatus == expected->dwErrorStatus || broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == - expected->dwErrorStatus), + (expected->dwErrorStatus & ~ignore->dwErrorStatus)), "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus); @@ -1196,14 +1196,14 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected, todo_wine ok(got->dwInfoStatus == expected->dwInfoStatus || broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == - expected->dwInfoStatus), + (expected->dwInfoStatus & ignore->dwInfoStatus)), "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", testIndex, chainIndex, elementIndex, expected->dwInfoStatus, got->dwInfoStatus); else ok(got->dwInfoStatus == expected->dwInfoStatus || broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == - expected->dwInfoStatus), + (expected->dwInfoStatus & ~ignore->dwInfoStatus)), "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", testIndex, chainIndex, elementIndex, expected->dwInfoStatus, got->dwInfoStatus); @@ -1249,7 +1249,11 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, if (todo & TODO_ERROR && chain->TrustStatus.dwErrorStatus != chainStatus->status.dwErrorStatus) todo_wine ok(chain->TrustStatus.dwErrorStatus == - chainStatus->status.dwErrorStatus, + chainStatus->status.dwErrorStatus || + broken((chain->TrustStatus.dwErrorStatus & + ~chainStatus->statusToIgnore.dwErrorStatus) == + (chainStatus->status.dwErrorStatus & + ~chainStatus->statusToIgnore.dwErrorStatus)), "Chain %d: expected error %08x, got %08x\n", testIndex, chainStatus->status.dwErrorStatus, chain->TrustStatus.dwErrorStatus); @@ -1266,7 +1270,11 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, if (todo & TODO_INFO && chain->TrustStatus.dwInfoStatus != chainStatus->status.dwInfoStatus) todo_wine ok(chain->TrustStatus.dwInfoStatus == - chainStatus->status.dwInfoStatus, + chainStatus->status.dwInfoStatus || + broken((chain->TrustStatus.dwInfoStatus & + ~chainStatus->statusToIgnore.dwInfoStatus) == + (chainStatus->status.dwInfoStatus & + ~chainStatus->statusToIgnore.dwInfoStatus)), "Chain %d: expected info %08x, got %08x\n", testIndex, chainStatus->status.dwInfoStatus, chain->TrustStatus.dwInfoStatus); @@ -1275,7 +1283,8 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, chainStatus->status.dwInfoStatus || broken((chain->TrustStatus.dwInfoStatus & ~chainStatus->statusToIgnore.dwInfoStatus) == - chainStatus->status.dwInfoStatus), + (chainStatus->status.dwInfoStatus & + ~chainStatus->statusToIgnore.dwInfoStatus)), "Chain %d: expected info %08x, got %08x\n", testIndex, chainStatus->status.dwInfoStatus, chain->TrustStatus.dwInfoStatus);

1 0

Juan Lang : crypt32: Fix some tests on Windows 98.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 95b8f49dfd7b68a258f38f2d2f4ac19bf424557c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b8f49dfd7b68a258f38f2d2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 9 14:39:11 2009 -0800 crypt32: Fix some tests on Windows 98. --- dlls/crypt32/tests/ctl.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index 5ed4381..ad87632 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -135,17 +135,19 @@ static void testCreateCTL(void) */ SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTL, sizeof(signedCTL)); - ok(!ctl && + ok((!ctl && (GetLastError() == ERROR_INVALID_DATA || - GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE), /* win9x */ + GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */)) || + broken(ctl /* some win98 */), "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, ctlWithOneEntry, sizeof(ctlWithOneEntry)); - ok(!ctl && + ok((!ctl && (GetLastError() == ERROR_INVALID_DATA || - GetLastError() == OSS_DATA_ERROR), /* win9x */ + GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */)) || + broken(ctl /* some win98 */), "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); SetLastError(0xdeadbeef); @@ -228,12 +230,15 @@ static void testCTLProperties(void) /* An implicit property */ ret = CertGetCTLContextProperty(ctl, CERT_ACCESS_STATE_PROP_ID, NULL, &size); - ok(ret, "CertGetCTLContextProperty failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == CRYPT_E_NOT_FOUND /* some win98 */), + "CertGetCTLContextProperty failed: %08x\n", GetLastError()); ret = CertGetCTLContextProperty(ctl, CERT_ACCESS_STATE_PROP_ID, &access, &size); - ok(ret, "CertGetCTLContextProperty failed: %08x\n", GetLastError()); - ok(!(access & CERT_ACCESS_STATE_WRITE_PERSIST_FLAG), - "Didn't expect a persisted cert\n"); + ok(ret || broken(GetLastError() == CRYPT_E_NOT_FOUND /* some win98 */), + "CertGetCTLContextProperty failed: %08x\n", GetLastError()); + if (ret) + ok(!(access & CERT_ACCESS_STATE_WRITE_PERSIST_FLAG), + "Didn't expect a persisted cert\n"); checkHash(signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent), CALG_SHA1, ctl, CERT_HASH_PROP_ID);

1 0

Vincent Pelletier : ddraw: Use ddraw_from_d3d7 to make a (IDirectDrawImpl * ) from a (IDirect3D7 *).
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: f879176b99920bb136eda2487814c781b363e546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f879176b99920bb136eda2487… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Mon Feb 9 22:58:27 2009 +0100 ddraw: Use ddraw_from_d3d7 to make a (IDirectDrawImpl *) from a (IDirect3D7 *). --- dlls/ddraw/device.c | 6 +++--- dlls/ddraw/tests/d3d.c | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index db43b55..4db931f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1790,7 +1790,7 @@ Thunk_IDirect3DDeviceImpl_3_GetDirect3D(IDirect3DDevice3 *iface, ret = IDirect3DDevice7_GetDirect3D((IDirect3DDevice7 *)This, &ret_ptr); if(ret != D3D_OK) return ret; - *Direct3D3 = ret_ptr ? (IDirect3D3 *)&((IDirectDrawImpl *)ret_ptr)->IDirect3D3_vtbl : NULL; + *Direct3D3 = ret_ptr ? (IDirect3D3 *)&ddraw_from_d3d7(ret_ptr)->IDirect3D3_vtbl : NULL; TRACE(" returning interface %p\n", *Direct3D3); return D3D_OK; } @@ -1807,7 +1807,7 @@ Thunk_IDirect3DDeviceImpl_2_GetDirect3D(IDirect3DDevice2 *iface, ret = IDirect3DDevice7_GetDirect3D((IDirect3DDevice7 *)This, &ret_ptr); if(ret != D3D_OK) return ret; - *Direct3D2 = ret_ptr ? (IDirect3D2 *)&((IDirectDrawImpl *)ret_ptr)->IDirect3D2_vtbl : NULL; + *Direct3D2 = ret_ptr ? (IDirect3D2 *)&ddraw_from_d3d7(ret_ptr)->IDirect3D2_vtbl : NULL; TRACE(" returning interface %p\n", *Direct3D2); return D3D_OK; } @@ -1824,7 +1824,7 @@ Thunk_IDirect3DDeviceImpl_1_GetDirect3D(IDirect3DDevice *iface, ret = IDirect3DDevice7_GetDirect3D((IDirect3DDevice7 *)This, &ret_ptr); if(ret != D3D_OK) return ret; - *Direct3D = ret_ptr ? (IDirect3D *)&((IDirectDrawImpl *)ret_ptr)->IDirect3D_vtbl : NULL; + *Direct3D = ret_ptr ? (IDirect3D *)&ddraw_from_d3d7(ret_ptr)->IDirect3D_vtbl : NULL; TRACE(" returning interface %p\n", *Direct3D); return D3D_OK; } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index aeae559..a35f520 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1033,6 +1033,7 @@ static void Direct3D1Test(void) D3DVIEWPORT vp_data; D3DINSTRUCTION *instr; D3DBRANCH *branch; + IDirect3D *Direct3D_alt; unsigned int idx = 0; static struct v_in testverts[] = { {0.0, 0.0, 0.0}, { 1.0, 1.0, 1.0}, {-1.0, -1.0, -1.0}, @@ -1050,6 +1051,12 @@ static void Direct3D1Test(void) D3DTRANSFORMDATA transformdata; DWORD i = FALSE; + /* Interface consistency check. */ + hr = IDirect3DDevice_GetDirect3D(Direct3DDevice1, &Direct3D_alt); + ok(hr == D3D_OK, "IDirect3DDevice_GetDirect3D failed: %08x\n", hr); + if (hr == D3D_OK) + ok(Direct3D_alt == Direct3D1, "Direct3D1 struct pointer missmatch: %p != %p\n", Direct3D_alt, Direct3D1); + memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); hr = IDirect3DExecuteBuffer_Lock(ExecuteBuffer, &desc);

1 0

Paul Vriens : fusion/tests: Mark some tests as broken() on .NET 1.0.
by Alexandre Julliard 10 Feb '09

10 Feb '09

Module: wine Branch: master Commit: 2524523ea42a106462835021e7445b10f520202f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2524523ea42a106462835021e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Feb 10 09:57:42 2009 +0100 fusion/tests: Mark some tests as broken() on .NET 1.0. --- dlls/fusion/tests/asmname.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 29b0ec8..37579a3 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -363,7 +363,8 @@ static void test_assembly_name_props_line(IAssemblyName *name, to_multibyte(val, str); ok(hr == vals[i].hr || - broken(i >= ASM_NAME_CONFIG_MASK && hr == E_INVALIDARG), /* .NET 1.1 */ + broken(i >= ASM_NAME_CONFIG_MASK && hr == E_INVALIDARG) || /* .NET 1.1 */ + broken(i >= ASM_NAME_FILE_MAJOR_VERSION && hr == E_INVALIDARG), /* .NET 1.0 */ "%d: prop %d: Expected %08x, got %08x\n", line, i, vals[i].hr, hr); if (hr != E_INVALIDARG) {

1 0