wine-commits September 2006

3 participants
651 discussions

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : regedit: Updated Korean Resource.

by Alexandre Julliard

Module: wine Branch: master Commit: a981d9c3616aa29114900410264618d3b7be827a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a981d9c3616aa2911490041… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Sep 28 09:55:15 2006 +0900 regedit: Updated Korean Resource. --- programs/regedit/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/Ko.rc b/programs/regedit/Ko.rc index bedbd84..2ca2f2c 100644 --- a/programs/regedit/Ko.rc +++ b/programs/regedit/Ko.rc @@ -53,7 +53,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "��(&X)", ID_REGISTRY_EXIT END - POPUP "��(&E)" + POPUP "��(&E)" BEGIN MENUITEM "��(&M)", ID_EDIT_MODIFY MENUITEM SEPARATOR

17 years, 7 months

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : winmm: Updated Korean resource.

by Alexandre Julliard

Module: wine Branch: master Commit: 2b4a76001f02cee87d6cf97187785b684096e924 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b4a76001f02cee87d6cf97… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Sep 28 09:53:57 2006 +0900 winmm: Updated Korean resource. --- dlls/winmm/winmm_Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/winmm_Ko.rc b/dlls/winmm/winmm_Ko.rc index 33bf557..97a1cea 100644 --- a/dlls/winmm/winmm_Ko.rc +++ b/dlls/winmm/winmm_Ko.rc @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -STRINGTABLE LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +STRINGTABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT BEGIN /* MMSYS errors */ @@ -77,7 +77,7 @@ MCIERR_FLAGS_NOT_COMPATIBLE, "�� MCIERR_FILE_NOT_SAVED, "�� ϴ�. �� ִ�� Ȯ��ϰų�.��Ʈ��ũ�� Ǿ��ִ�� Ȯ��ϼ��." MCIERR_DEVICE_TYPE_REQUIRED, "�� ġ�� ã�� ϴ�.�̰�� ġ�Ȱ� Ȯ��ϴٸ� ��ġ�̸�� ùٸ�� Ȯ��Ͻʽÿ�." MCIERR_DEVICE_LOCKED, "�� ġ�� ϴ�. �� ٸ� �Ŀ� �ٽ� �õ��Ͻʽÿ�." -MCIERR_DUPLICATE_ALIAS, "�� ̹� Ǯ�׸�� Դϴ�. �� Ͻʽÿ�." +MCIERR_DUPLICATE_ALIAS, "�� ̹� ��α׷�� Դϴ�. �ߺ�� ʴ� �� Ͻʽÿ�." MCIERR_BAD_CONSTANT, "�� Ű�� ɿ� �� ʽ��ϴ�." MCIERR_MUST_USE_SHAREABLE, "�� ġ ��̹�� ̹� ��Դϴ�. �̰�� Ϸ��, 'shareable' �Ű�� 'open'��ɰ� �� Ͻʽÿ�." MCIERR_MISSING_DEVICE_NAME, "�� ,��,��̹�� ġ �̸�� ʿ�� մϴ�. �̰�� Ͻʽÿ�." @@ -87,7 +87,7 @@ MCIERR_DUPLICATE_FLAGS, "�� Ű�� MCIERR_INVALID_FILE, "�� MCI��ġ�� ϴ�. �� ų� �ùٸ�� Դϴ�." MCIERR_NULL_PARAMETER_BLOCK, "�� Ű�� MCI�� õǾ��ϴ�." MCIERR_UNNAMED_RESOURCE, "�̸�� ϴ�. �� ̸�� Ͻʽÿ�." -MCIERR_NEW_REQUIRES_ALIAS, " 'new'�Ű�� ־�� մϴ�." +MCIERR_NEW_REQUIRES_ALIAS, " '�ݵ�� new'�Ű�� ־�� մϴ�." MCIERR_NOTIFY_ON_AUTO_OPEN, "'notify' �÷��״� �ڵ�� ġ�� ϴ�." MCIERR_NO_ELEMENT_ALLOWED, "�� ġ�ϰ� ��̸�� ϴ�." MCIERR_NONAPPLICABLE_FUNCTION, "�� ϴ�. �� ġ�� ٽ� �õ��Ͻʽÿ�."

17 years, 7 months

Stefan Dösinger : wined3d: Tell gl about the surface alignment.

by Alexandre Julliard

Module: wine Branch: master Commit: ab8264a86dea793dc7adde97b619253a7c1a1f6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab8264a86dea793dc7adde9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 28 00:12:34 2006 +0200 wined3d: Tell gl about the surface alignment. --- dlls/wined3d/device.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 943a616..9d3b5a0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1865,6 +1865,12 @@ #endif glXMakeCurrent(object->display, oldDrawable, oldContext); } + /* Set the surface alignment. This never changes, so we are safe to set it once per context*/ + glPixelStorei(GL_PACK_ALIGNMENT, 4); + checkGLcall("glPixelStorei(GL_PACK_ALIGNMENT, 4);"); + glPixelStorei(GL_UNPACK_ALIGNMENT, 4); + checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, 4);"); + LEAVE_GL(); TRACE("Set swapchain to %p\n", object);

17 years, 7 months

Andrew Talbot : shdocvw: Cast-qual warnings fix.

by Alexandre Julliard

Module: wine Branch: master Commit: 906e637748547b5157be51f1266aea29427d8764 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=906e637748547b5157be51f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Sep 27 22:46:43 2006 +0100 shdocvw: Cast-qual warnings fix. --- dlls/shdocvw/regsvr.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c index ea4fbaa..e9c8e49 100644 --- a/dlls/shdocvw/regsvr.c +++ b/dlls/shdocvw/regsvr.c @@ -314,13 +314,13 @@ static HRESULT register_coclasses(struct &shellfolder_key, NULL); if (res != ERROR_SUCCESS) goto error_close_clsid_key; if (list->flags & SHELLFOLDER_WANTSFORPARSING) - res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (LPBYTE)"", 1); + res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (const BYTE *)"", 1); if (list->flags & SHELLFOLDER_ATTRIBUTES) res = RegSetValueExA(shellfolder_key, attributes_valuename, 0, REG_DWORD, - (LPBYTE)&list->dwAttributes, sizeof(DWORD)); + (const BYTE *)&list->dwAttributes, sizeof(DWORD)); if (list->flags & SHELLFOLDER_CALLFORATTRIBUTES) res = RegSetValueExA(shellfolder_key, cfattributes_valuename, 0, REG_DWORD, - (LPBYTE)&list->dwCallForAttributes, sizeof(DWORD)); + (const BYTE *)&list->dwCallForAttributes, sizeof(DWORD)); RegCloseKey(shellfolder_key); if (res != ERROR_SUCCESS) goto error_close_clsid_key; }

17 years, 7 months

Andrew Talbot : secur32: Cast-qual warnings fix.

by Alexandre Julliard

Module: wine Branch: master Commit: 9c78a93e964fc9b5df4aa05a2f887373d437a08e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c78a93e964fc9b5df4aa05… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Sep 27 20:03:31 2006 +0100 secur32: Cast-qual warnings fix. --- dlls/secur32/secur32.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 1e0b704..dbe3c4c 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -238,8 +238,8 @@ static void _makeFnTableA(PSecurityFunct * implemented (yikes) */ size_t tableSize = inFnTableA->dwVersion == 1 ? - (LPBYTE)&inFnTableA->SetContextAttributesA - - (LPBYTE)inFnTableA : sizeof(SecurityFunctionTableA); + (const BYTE *)&inFnTableA->SetContextAttributesA - + (const BYTE *)inFnTableA : sizeof(SecurityFunctionTableA); memcpy(fnTableA, inFnTableA, tableSize); /* override this, since we can do it internally anyway */ @@ -309,8 +309,8 @@ static void _makeFnTableW(PSecurityFunct * implemented (yikes) */ size_t tableSize = inFnTableW->dwVersion == 1 ? - (LPBYTE)&inFnTableW->SetContextAttributesW - - (LPBYTE)inFnTableW : sizeof(SecurityFunctionTableW); + (const BYTE *)&inFnTableW->SetContextAttributesW - + (const BYTE *)inFnTableW : sizeof(SecurityFunctionTableW); memcpy(fnTableW, inFnTableW, tableSize); /* override this, since we can do it internally anyway */ @@ -374,7 +374,7 @@ static void _copyPackageInfo(PSecPkgInfo /* odd, I know, but up until Name and Comment the structures are * identical */ - memcpy(info, inInfoW ? inInfoW : (PSecPkgInfoW)inInfoA, sizeof(*info)); + memcpy(info, inInfoW ? inInfoW : (const SecPkgInfoW *)inInfoA, sizeof(*info)); if (inInfoW) { info->Name = SECUR32_strdupW(inInfoW->Name);

17 years, 7 months

Huw Davies : ole32: Don' t return from CoRegisterClassObject until we have created the named pipe.

by Alexandre Julliard

Module: wine Branch: master Commit: fead72e8a7a1928c8195815d7ec9b33794f28115 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fead72e8a7a1928c8195815… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 27 16:23:42 2006 +0100 ole32: Don't return from CoRegisterClassObject until we have created the named pipe. Also don't fail if the client connects to the pipe between CreateNamedPipe and ConnectNamedPipe. --- dlls/ole32/rpc.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index e7266dc..7646e1d 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -924,6 +924,7 @@ struct local_server_params { CLSID clsid; IStream *stream; + HANDLE ready_event; }; /* FIXME: should call to rpcss instead */ @@ -945,12 +946,14 @@ static DWORD WINAPI local_server_thread( get_localserver_pipe_name(pipefn, &lsp->clsid); - HeapFree(GetProcessHeap(), 0, lsp); - hPipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, 4096, 4096, 500 /* 0.5 second timeout */, NULL ); - + + SetEvent(lsp->ready_event); + + HeapFree(GetProcessHeap(), 0, lsp); + if (hPipe == INVALID_HANDLE_VALUE) { FIXME("pipe creation failed for %s, le is %ld\n", debugstr_w(pipefn), GetLastError()); @@ -958,7 +961,7 @@ static DWORD WINAPI local_server_thread( } while (1) { - if (!ConnectNamedPipe(hPipe,NULL)) { + if (!ConnectNamedPipe(hPipe,NULL) && GetLastError() != ERROR_PIPE_CONNECTED) { ERR("Failure during ConnectNamedPipe %ld, ABORT!\n",GetLastError()); break; } @@ -1002,14 +1005,18 @@ static DWORD WINAPI local_server_thread( void RPC_StartLocalServer(REFCLSID clsid, IStream *stream) { DWORD tid; - HANDLE thread; + HANDLE thread, ready_event; struct local_server_params *lsp = HeapAlloc(GetProcessHeap(), 0, sizeof(*lsp)); lsp->clsid = *clsid; lsp->stream = stream; IStream_AddRef(stream); + lsp->ready_event = ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); thread = CreateThread(NULL, 0, local_server_thread, lsp, 0, &tid); CloseHandle(thread); /* FIXME: failure handling */ + + WaitForSingleObject(ready_event, INFINITE); + CloseHandle(ready_event); }

17 years, 7 months

Robert Shearman : include: Add types to objidl.idl used by COM contexts.

by Alexandre Julliard

Module: wine Branch: master Commit: 1f854b20243ec16c7355075715042ce5dbdf455d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f854b20243ec16c7355075… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Sep 27 15:51:18 2006 +0100 include: Add types to objidl.idl used by COM contexts. --- include/objidl.idl | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/include/objidl.idl b/include/objidl.idl index 928c57a..0b1b9fe 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -2370,3 +2370,67 @@ interface IThumbnailExtractor : IUnknown HRESULT OnFileUpdated( [in] IStorage *pStg); } + + +cpp_quote("#ifdef USE_COM_CONTEXT_DEF") + +typedef DWORD CPFLAGS; + +typedef struct tagContextProperty +{ + GUID policyId; + CPFLAGS flags; + [unique] IUnknown *pUnk; +} ContextProperty; + +[ + local, + object, + uuid(000001c1-0000-0000-C000-000000000046) +] +interface IEnumContextProps : IUnknown +{ + typedef [unique] IEnumContextProps *LPENUMCONTEXTPROPS; + + HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] ContextProperty *pContextProperties, + [out] ULONG *pceltFetched); + + HRESULT Skip( + [in] ULONG celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumContextProps **ppEnumContextProps); + + HRESULT Count( + [out] ULONG *pcelt); +} + +[ + local, + object, + uuid(000001c0-0000-0000-C000-000000000046) +] +interface IContext : IUnknown +{ + HRESULT SetProperty( + [in] REFGUID policyId, + [in] CPFLAGS flags, + [in] IUnknown *pUnk); + + HRESULT RemovePropert( + [in] REFGUID policyId); + + HRESULT GetProperty( + [in] REFGUID guid, + [out] CPFLAGS *pFlags, + [out] IUnknown **ppUnk); + + HRESULT EnumContextProps( + [out] IEnumContextProps **ppEnumContextProps); +} + +cpp_quote("#endif /* defined USE_COM_CONTEXT_DEF */")

17 years, 7 months

Robert Shearman : oleaut32: Make sure to free the allocated vtable when the tmarshal proxy is released .

by Alexandre Julliard

Module: wine Branch: master Commit: cc21d235390fafed6333e4965709a8fd65bd9392 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc21d235390fafed6333e49… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Sep 27 15:51:26 2006 +0100 oleaut32: Make sure to free the allocated vtable when the tmarshal proxy is released. --- dlls/oleaut32/tmarshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index a9d0b32..9c4987f 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -416,6 +416,7 @@ TMProxyImpl_Release(LPRPCPROXYBUFFER ifa DeleteCriticalSection(&This->crit); if (This->chanbuf) IRpcChannelBuffer_Release(This->chanbuf); VirtualFree(This->asmstubs, 0, MEM_RELEASE); + HeapFree(GetProcessHeap(), 0, This->lpvtbl); CoTaskMemFree(This); } return refCount;

17 years, 7 months

Robert Shearman : ole32: Check the return value of IStream_SetSize so as to not blindly continue on and possibly corrupt the structured storage file .

by Alexandre Julliard

Module: wine Branch: master Commit: 3721bf60bb4c49c7a57205b5621faab87df3d68f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3721bf60bb4c49c7a57205b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Sep 27 15:51:13 2006 +0100 ole32: Check the return value of IStream_SetSize so as to not blindly continue on and possibly corrupt the structured storage file. --- dlls/ole32/stg_stream.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 32061a1..c66fa65 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -415,7 +415,9 @@ static HRESULT WINAPI StgStreamImpl_Writ if (newSize.u.LowPart > This->streamSize.u.LowPart) { /* grow stream */ - IStream_SetSize(iface, newSize); + res = IStream_SetSize(iface, newSize); + if (FAILED(res)) + return res; } /*

17 years, 7 months

Robert Shearman : ntdll: Avoid crashing in check_atl_thunk if an execution exception was raised with a bad address .

by Alexandre Julliard

Module: wine Branch: master Commit: 5881d91cfc20f830893e00b1220299de303ee225 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5881d91cfc20f830893e00b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Sep 27 15:51:07 2006 +0100 ntdll: Avoid crashing in check_atl_thunk if an execution exception was raised with a bad address. --- dlls/ntdll/signal_i386.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 44f47ec..9a8f197 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -828,14 +828,26 @@ #include "poppack.h" */ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) { - struct atl_thunk *thunk = (struct atl_thunk *)rec->ExceptionInformation[1]; + const struct atl_thunk *thunk = (const struct atl_thunk *)rec->ExceptionInformation[1]; + BOOL ret = FALSE; - if (thunk->movl != 0x042444c7 || thunk->jmp != 0xe9) return FALSE; - *((DWORD *)context->Esp + 1) = thunk->this; - context->Eip = (DWORD_PTR)(&thunk->func + 1) + thunk->func; - TRACE( "emulating ATL thunk at %p, func=%08lx arg=%08lx\n", - thunk, context->Eip, *((DWORD *)context->Esp + 1) ); - return TRUE; + __TRY + { + if (thunk->movl == 0x042444c7 && thunk->jmp == 0xe9) + { + *((DWORD *)context->Esp + 1) = thunk->this; + context->Eip = (DWORD_PTR)(&thunk->func + 1) + thunk->func; + TRACE( "emulating ATL thunk at %p, func=%08lx arg=%08lx\n", + thunk, context->Eip, *((DWORD *)context->Esp + 1) ); + ret = TRUE; + } + } + __EXCEPT_PAGE_FAULT + { + return FALSE; + } + __ENDTRY + return ret; }

17 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2006