January 2008 - Wine-commits

Alexandre Julliard : kernel32: Don't inherit stdin/ stdout handles in wineboot.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 9c00a78da52dc14acdb391ae02ec10a63d3b85ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c00a78da52dc14acdb391ae0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 14 15:49:56 2008 +0100 kernel32: Don't inherit stdin/stdout handles in wineboot. --- dlls/kernel32/process.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7a25f39..691e0a7 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -797,6 +797,11 @@ static HANDLE start_wineboot(void) memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdInput = 0; + si.hStdOutput = 0; + si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); + GetSystemDirectoryW( cmdline, MAX_PATH ); lstrcatW( cmdline, command_line ); if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ))

1 0

Rob Shearman : mlang: Implement Rfc1766ToLcidW.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 5a11999b8608b63b0c523cc49d819a00b83276e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a11999b8608b63b0c523cc49… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 14 11:56:36 2008 +0000 mlang: Implement Rfc1766ToLcidW. --- dlls/mlang/mlang.c | 32 +++++++++++++++++++++++++++----- dlls/mlang/mlang.spec | 2 +- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index ac455e6..42da54e 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -46,6 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mlang); #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); +static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum); static DWORD MLANG_tls_index; /* to store various per thead data */ @@ -761,6 +762,28 @@ static HRESULT lcid_from_rfc1766(IEnumRfc1766 *iface, LCID *lcid, LPCWSTR rfc176 return E_FAIL; } +HRESULT WINAPI Rfc1766ToLcidW(LCID *pLocale, LPCWSTR pszRfc1766) +{ + IEnumRfc1766 *enumrfc1766; + HRESULT hr; + + TRACE("(%p, %s)\n", pLocale, debugstr_w(pszRfc1766)); + + if (!pLocale || !pszRfc1766) + return E_INVALIDARG; + + *pLocale = 0; + + hr = EnumRfc1766_create(0, &enumrfc1766); + if (FAILED(hr)) + return hr; + + hr = lcid_from_rfc1766(enumrfc1766, pLocale, pszRfc1766); + IEnumRfc1766_Release(enumrfc1766); + + return hr; +} + /****************************************************************************** * MLANG ClassFactory */ @@ -1868,13 +1891,12 @@ static BOOL CALLBACK enum_locales_proc(LPWSTR locale) return TRUE; } -static HRESULT EnumRfc1766_create(MLang_impl* mlang, LANGID LangId, - IEnumRfc1766 **ppEnum) +static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum) { EnumRfc1766_impl *rfc; struct enum_locales_data data; - TRACE("%p, %04x, %p\n", mlang, LangId, ppEnum); + TRACE("%04x, %p\n", LangId, ppEnum); rfc = HeapAlloc( GetProcessHeap(), 0, sizeof(EnumRfc1766_impl) ); rfc->vtbl_IEnumRfc1766 = &IEnumRfc1766_vtbl; @@ -1918,7 +1940,7 @@ static HRESULT WINAPI fnIMultiLanguage_EnumRfc1766( ICOM_THIS_MULTI(MLang_impl, vtbl_IMultiLanguage, iface); TRACE("%p %p\n", This, ppEnumRfc1766); - return EnumRfc1766_create(This, 0, ppEnumRfc1766); + return EnumRfc1766_create(0, ppEnumRfc1766); } /******************************************************************************/ @@ -2243,7 +2265,7 @@ static HRESULT WINAPI fnIMultiLanguage2_EnumRfc1766( ICOM_THIS_MULTI(MLang_impl, vtbl_IMultiLanguage, iface); TRACE("%p %p\n", This, ppEnumRfc1766); - return EnumRfc1766_create(This, LangId, ppEnumRfc1766); + return EnumRfc1766_create(LangId, ppEnumRfc1766); } static HRESULT WINAPI fnIMultiLanguage2_GetRfc1766Info( diff --git a/dlls/mlang/mlang.spec b/dlls/mlang/mlang.spec index 5b067ed..d087b3c 100644 --- a/dlls/mlang/mlang.spec +++ b/dlls/mlang/mlang.spec @@ -11,4 +11,4 @@ @ stdcall LcidToRfc1766A(long ptr long) @ stdcall LcidToRfc1766W(long ptr long) @ stub Rfc1766ToLcidA -@ stub Rfc1766ToLcidW +@ stdcall Rfc1766ToLcidW(ptr wstr)

1 0

Alexander Nicolaysen Sørnes : wordpad: Fix width when text break = margins.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: e1e147da4d74bf32a6b7cab7f93be6a2cfba3299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e147da4d74bf32a6b7cab7f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jan 13 20:26:40 2008 +0100 wordpad: Fix width when text break = margins. --- programs/wordpad/print.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 4f8f2e2..e44039e 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -185,7 +185,7 @@ void target_device(HWND hMainWnd, DWORD wordWrap) if(wordWrap == ID_WORDWRAP_MARGIN) { RECT rc = get_print_rect(hdc); - width = rc.right; + width = rc.right - rc.left; } if(!hdc)

1 0

Rob Shearman : rpcrt4: Fix the calculation of element sizes for complex arrays by using a new function ComplexStructSize that doesn 't touch the buffer to calculate the size.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: aabfc52573ff2befc43a7f92be14ba880192f932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aabfc52573ff2befc43a7f92b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 14 11:54:12 2008 +0000 rpcrt4: Fix the calculation of element sizes for complex arrays by using a new function ComplexStructSize that doesn't touch the buffer to calculate the size. Otherwise, this would fail on arrays with a conformance or variance of zero. --- dlls/rpcrt4/ndr_marshall.c | 69 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 64 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 7dcfa51..dbcddd2 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2654,6 +2654,69 @@ static unsigned long ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, return size; } +static unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + PFORMAT_STRING desc; + unsigned long size = 0; + + while (*pFormat != RPC_FC_END) { + switch (*pFormat) { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + size += 1; + break; + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + size += 2; + break; + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_ENUM32: + size += 4; + break; + case RPC_FC_HYPER: + size += 8; + break; + case RPC_FC_POINTER: + size += sizeof(void *); + break; + case RPC_FC_ALIGNM4: + ALIGN_LENGTH(size, 4); + break; + case RPC_FC_ALIGNM8: + ALIGN_LENGTH(size, 8); + break; + case RPC_FC_STRUCTPAD1: + case RPC_FC_STRUCTPAD2: + case RPC_FC_STRUCTPAD3: + case RPC_FC_STRUCTPAD4: + case RPC_FC_STRUCTPAD5: + case RPC_FC_STRUCTPAD6: + case RPC_FC_STRUCTPAD7: + size += *pFormat - RPC_FC_STRUCTPAD1 + 1; + break; + case RPC_FC_EMBEDDED_COMPLEX: + size += pFormat[1]; + pFormat += 2; + desc = pFormat + *(const SHORT*)pFormat; + size += EmbeddedComplexSize(pStubMsg, desc); + pFormat += 2; + continue; + case RPC_FC_PAD: + break; + default: + FIXME("unhandled format 0x%02x\n", *pFormat); + } + pFormat++; + } + + return size; +} + /*********************************************************************** * NdrComplexStructMarshall [RPCRT4.@] */ @@ -3452,7 +3515,6 @@ ULONG WINAPI NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, { ULONG i, count, esize, SavedMemorySize, MemorySize; unsigned char alignment; - unsigned char *Buffer; TRACE("(%p,%p)\n", pStubMsg, pFormat); @@ -3474,10 +3536,7 @@ ULONG WINAPI NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, SavedMemorySize = pStubMsg->MemorySize; - Buffer = pStubMsg->Buffer; - pStubMsg->MemorySize = 0; - esize = ComplexStructMemorySize(pStubMsg, pFormat); - pStubMsg->Buffer = Buffer; + esize = ComplexStructSize(pStubMsg, pFormat); MemorySize = safe_multiply(pStubMsg->MaxCount, esize);

1 0

Rob Shearman : rpcrt4: Handle complex arrays in calc_arg_size.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 4f6142b8d9a965ebbfeedd0341b3235e82747313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6142b8d9a965ebbfeedd034… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 14 11:54:32 2008 +0000 rpcrt4: Handle complex arrays in calc_arg_size. --- dlls/rpcrt4/ndr_marshall.c | 4 ++-- dlls/rpcrt4/ndr_misc.h | 2 ++ dlls/rpcrt4/ndr_stubless.c | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index dbcddd2..6ed102f 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2654,8 +2654,8 @@ static unsigned long ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, return size; } -static unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, - PFORMAT_STRING pFormat) +unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) { PFORMAT_STRING desc; unsigned long size = 0; diff --git a/dlls/rpcrt4/ndr_misc.h b/dlls/rpcrt4/ndr_misc.h index ebd70b8..b6dfaff 100644 --- a/dlls/rpcrt4/ndr_misc.h +++ b/dlls/rpcrt4/ndr_misc.h @@ -62,4 +62,6 @@ extern const NDR_BUFFERSIZE NdrBufferSizer[]; extern const NDR_MEMORYSIZE NdrMemorySizer[]; extern const NDR_FREE NdrFreer[]; +unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat); + #endif /* __WINE_NDR_MISC_H */ diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index fb76a2f..bc40641 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -849,6 +849,12 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) case RPC_FC_LGFARRAY: size = *(const DWORD*)(pFormat + 2); break; + case RPC_FC_BOGUS_ARRAY: + pFormat = ComputeConformance(pStubMsg, NULL, pFormat + 4, *(const WORD*)&pFormat[2]); + TRACE("conformance = %ld\n", pStubMsg->MaxCount); + pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount); + size = ComplexStructSize(pStubMsg, pFormat); + size *= pStubMsg->MaxCount; default: FIXME("Unhandled type %02x\n", *pFormat); /* fallthrough */

1 0

Rob Shearman : rpcrt4: The initialisation of [out] variables in the stubless code must be after the unmarshaling of [in] and [in, out] variables has been completed.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: ed5b296289a991c00820f9b0a32e47a6aa3eb145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed5b296289a991c00820f9b0a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 14 11:56:13 2008 +0000 rpcrt4: The initialisation of [out] variables in the stubless code must be after the unmarshaling of [in] and [in, out] variables has been completed. This is because the size of an [out] variable could depend on a conformance value stored in an unmarshalled [in] or [in,out] variable. --- dlls/rpcrt4/ndr_stubless.c | 63 +++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 27 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index bc40641..8a99286 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -114,11 +114,12 @@ static inline unsigned long call_memory_sizer(PMIDL_STUB_MESSAGE pStubMsg, PFORM } #define STUBLESS_UNMARSHAL 1 -#define STUBLESS_CALLSERVER 2 -#define STUBLESS_CALCSIZE 3 -#define STUBLESS_GETBUFFER 4 -#define STUBLESS_MARSHAL 5 -#define STUBLESS_FREE 6 +#define STUBLESS_INITOUT 2 +#define STUBLESS_CALLSERVER 3 +#define STUBLESS_CALCSIZE 4 +#define STUBLESS_GETBUFFER 5 +#define STUBLESS_MARSHAL 6 +#define STUBLESS_FREE 7 void WINAPI NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage) { @@ -855,6 +856,7 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount); size = ComplexStructSize(pStubMsg, pFormat); size *= pStubMsg->MaxCount; + break; default: FIXME("Unhandled type %02x\n", *pFormat); /* fallthrough */ @@ -915,6 +917,8 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, if (pParam->param_attributes.ServerAllocSize) HeapFree(GetProcessHeap(), 0, *(void **)pArg); break; + case STUBLESS_INITOUT: + break; case STUBLESS_UNMARSHAL: if (pParam->param_attributes.ServerAllocSize) *(void **)pArg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -988,7 +992,21 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, if (pParam->param_attributes.ServerAllocSize) HeapFree(GetProcessHeap(), 0, *(void **)pArg); - /* FIXME: call call_freer here for IN types with MustFree set */ + break; + case STUBLESS_INITOUT: + if (!pParam->param_attributes.IsIn && + pParam->param_attributes.IsOut && + !pParam->param_attributes.ServerAllocSize && + !pParam->param_attributes.IsByValue) + { + DWORD size = calc_arg_size(pStubMsg, pTypeFormat); + + if(size) + { + *(void **)pArg = NdrAllocate(pStubMsg, size); + memset(*(void **)pArg, 0, size); + } + } break; case STUBLESS_UNMARSHAL: if (pParam->param_attributes.ServerAllocSize) @@ -1002,18 +1020,6 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, else call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); } - else if (pParam->param_attributes.IsOut && - !pParam->param_attributes.ServerAllocSize && - !pParam->param_attributes.IsByValue) - { - DWORD size = calc_arg_size(pStubMsg, pTypeFormat); - - if(size) - { - *(void **)pArg = NdrAllocate(pStubMsg, size); - memset(*(void **)pArg, 0, size); - } - } break; case STUBLESS_CALCSIZE: if (pParam->param_attributes.IsOut || pParam->param_attributes.IsReturn) @@ -1127,14 +1133,9 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, call_freer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); else if (pParam->param_direction == RPC_FC_OUT_PARAM) pStubMsg->pfnFree(*(void **)pArg); - break; - case STUBLESS_UNMARSHAL: - if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || - pParam->param_direction == RPC_FC_IN_PARAM) - call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); - else if (pParam->param_direction == RPC_FC_RETURN_PARAM) - retval_ptr = (LONG_PTR *)pArg; - else if (pParam->param_direction == RPC_FC_OUT_PARAM) + break; + case STUBLESS_INITOUT: + if (pParam->param_direction == RPC_FC_OUT_PARAM) { DWORD size = calc_arg_size(pStubMsg, pTypeFormat); @@ -1145,6 +1146,13 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, } } break; + case STUBLESS_UNMARSHAL: + if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || + pParam->param_direction == RPC_FC_IN_PARAM) + call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + else if (pParam->param_direction == RPC_FC_RETURN_PARAM) + retval_ptr = (LONG_PTR *)pArg; + break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_OUT_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM || @@ -1406,9 +1414,10 @@ LONG WINAPI NdrStubCall2( stubMsg.Buffer = stubMsg.BufferStart; } break; - case STUBLESS_MARSHAL: case STUBLESS_UNMARSHAL: + case STUBLESS_INITOUT: case STUBLESS_CALCSIZE: + case STUBLESS_MARSHAL: case STUBLESS_FREE: if (bV2Format) retval_ptr = stub_do_args(&stubMsg, &pFormat[parameter_start_offset],

1 0

Rob Shearman : winhttp: Add a stub for WinHttpOpen.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 1ff2bdbd65469388949e7706a8a8dbdd279ef5a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff2bdbd65469388949e7706a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 14 11:53:57 2008 +0000 winhttp: Add a stub for WinHttpOpen. --- dlls/winhttp/main.c | 15 +++++++++++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 8f26859..c3616b6 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -114,3 +114,18 @@ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_ SetLastError(ERROR_SUCCESS); return TRUE; } + +/*********************************************************************** + * WinHttpOpen (winhttp.@) + */ +HINTERNET WINAPI WinHttpOpen(LPCWSTR pwszUserAgent, DWORD dwAccessType, + LPCWSTR pwszProxyName, LPCWSTR pwszProxyByPass, + DWORD dwFlags) +{ + FIXME("(%s, %d, %s, %s, 0x%x): stub\n", debugstr_w(pwszUserAgent), + dwAccessType, debugstr_w(pwszProxyName), debugstr_w(pwszProxyByPass), + dwFlags); + + SetLastError(ERROR_NOT_SUPPORTED); + return NULL; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index d148cfc..e1562b6 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -12,7 +12,7 @@ @ stub WinHttpGetDefaultProxyConfiguration @ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr) @ stub WinHttpGetProxyForUrl -@ stub WinHttpOpen +@ stdcall WinHttpOpen(wstr long wstr wstr long) @ stub WinHttpOpenRequest @ stub WinHttpQueryAuthSchemes @ stub WinHttpQueryDataAvailable

1 0

Stefan Dösinger : wined3d: Clear the constant list before finding constants.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 5426cd6317f1f388102606cce111adaaee8046f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5426cd6317f1f388102606cce… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 8 22:31:24 2008 +0100 wined3d: Clear the constant list before finding constants. shader_get_registers_used is delayed until compile time for some 1.x shaders, mostly to wait for the right vertex declaration to be set. This means that on a recompile it will be run again, adding another instance of each local constant, which in turn causes compile errors because of constant redeclaration. Just purging the lists before finding the constants is a simple and reliable solution. --- dlls/wined3d/baseshader.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 858bf7f..870d92e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -181,6 +181,20 @@ unsigned int shader_get_float_offset(const DWORD reg) { } } +static void shader_delete_constant_list(struct list* clist) { + + struct list *ptr; + struct local_constant* constant; + + ptr = list_head(clist); + while (ptr) { + constant = LIST_ENTRY(ptr, struct local_constant, entry); + ptr = list_next(clist, ptr); + HeapFree(GetProcessHeap(), 0, constant); + } + list_init(clist); +} + /* Note that this does not count the loop register * as an address register. */ @@ -204,6 +218,13 @@ HRESULT shader_get_registers_used( if (pToken == NULL) return WINED3D_OK; + /* get_registers_used is called on every compile on some 1.x shaders, which can result + * in stacking up a collection of local constants. Delete the old constants if existing + */ + shader_delete_constant_list(&This->baseShader.constantsF); + shader_delete_constant_list(&This->baseShader.constantsB); + shader_delete_constant_list(&This->baseShader.constantsI); + while (WINED3DVS_END() != *pToken) { CONST SHADER_OPCODE* curOpcode; DWORD opcode_token; @@ -1075,20 +1096,6 @@ void shader_trace_init( } } -static void shader_delete_constant_list( - struct list* clist) { - - struct list *ptr; - struct local_constant* constant; - - ptr = list_head(clist); - while (ptr) { - constant = LIST_ENTRY(ptr, struct local_constant, entry); - ptr = list_next(clist, ptr); - HeapFree(GetProcessHeap(), 0, constant); - } -} - static void shader_none_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {} static void shader_none_select_depth_blt(IWineD3DDevice *iface) {} static void shader_none_load_constants(IWineD3DDevice *iface, char usePS, char useVS) {}

1 0

Gerald Pfeifer : wininet: Fix type of a loop variable in HTTP_BuildHeaderRequestStr().
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 3f1a20b8b1848475aed6435a075c8f3d4aaa7ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1a20b8b1848475aed6435a0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 12 20:14:04 2008 +0100 wininet: Fix type of a loop variable in HTTP_BuildHeaderRequestStr(). --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b9f56d2..50d61da 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -262,7 +262,7 @@ static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR ve LPWSTR requestString; DWORD len, n; LPCWSTR *req; - INT i; + UINT i; LPWSTR p; static const WCHAR szSpace[] = { ' ',0 };

1 0

Gerald Pfeifer : kernel32: Fix type of a loop variable in SNOOP16_Entry().
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 221a8048b9aff88f401388a8d2c07a0c80d4f284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221a8048b9aff88f401388a8d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 12 19:53:23 2008 +0100 kernel32: Fix type of a loop variable in SNOOP16_Entry(). --- dlls/kernel32/snoop16.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/snoop16.c b/dlls/kernel32/snoop16.c index f092433..fb82ba9 100644 --- a/dlls/kernel32/snoop16.c +++ b/dlls/kernel32/snoop16.c @@ -249,7 +249,8 @@ void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context) { SNOOP16_FUN *fun = NULL; SNOOP16_RETURNENTRIES **rets = &firstrets; SNOOP16_RETURNENTRY *ret; - int i=0, max; + unsigned i=0; + int max; while (dll) { if (xcs == dll->funhandle) {

1 0