October 2006 - Wine-commits

H. Verbeet : wined3d: Explicitly enable the GL_ARB_draw_buffers extension in GLSL shaders.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 35bd8d32b19fd82f435e8b0d44dbc6961e193c1a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35bd8d32b19fd82f435e8b0… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Oct 2 20:06:38 2006 +0200 wined3d: Explicitly enable the GL_ARB_draw_buffers extension in GLSL shaders. --- dlls/wined3d/pixelshader.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 26f3299..9fc88cf 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -838,6 +838,10 @@ #endif /* Create the hw GLSL shader object and assign it as the baseShader.prgId */ GLhandleARB shader_obj = GL_EXTCALL(glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB)); + if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { + shader_addline(&buffer, "#extension GL_ARB_draw_buffers : enable\n"); + } + /* Base Declarations */ shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, &buffer, &GLINFO_LOCATION);

1 0

Robert Shearman : oleaut32: Fix ITypeInfo:: GetFuncDesc to return the correct information for dual dispinterfaces.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: dd70c0ae7cfa3de909f73414f6e55fb4c66019c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd70c0ae7cfa3de909f7341… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Oct 2 18:25:32 2006 +0100 oleaut32: Fix ITypeInfo::GetFuncDesc to return the correct information for dual dispinterfaces. --- dlls/oleaut32/typelib.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c714f62..52ce8b4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4547,6 +4547,51 @@ HRESULT ITypeInfoImpl_GetInternalFuncDes return E_INVALIDARG; } +/* internal function to make the inherited interfaces' methods appear + * part of the interface */ +static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface, + UINT index, const FUNCDESC **ppFuncDesc, UINT *funcs) +{ + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; + HRESULT hr; + UINT i; + UINT implemented_funcs = 0; + + if (funcs) + *funcs = 0; + + for (i = 0; i < This->TypeAttr.cImplTypes; i++) + { + HREFTYPE href; + ITypeInfo *pSubTypeInfo; + UINT sub_funcs; + + hr = ITypeInfo_GetRefTypeOfImplType(iface, i, &href); + if (FAILED(hr)) + return hr; + hr = ITypeInfo_GetRefTypeInfo(iface, href, &pSubTypeInfo); + if (FAILED(hr)) + return hr; + + hr = ITypeInfoImpl_GetInternalDispatchFuncDesc(pSubTypeInfo, + index, + ppFuncDesc, + &sub_funcs); + implemented_funcs += sub_funcs; + ITypeInfo_Release(pSubTypeInfo); + if (SUCCEEDED(hr)) + return hr; + } + + if (funcs) + *funcs = implemented_funcs + This->TypeAttr.cFuncs; + + if (index < implemented_funcs) + return E_INVALIDARG; + return ITypeInfoImpl_GetInternalFuncDesc(iface, index - implemented_funcs, + ppFuncDesc); +} + /* ITypeInfo::GetFuncDesc * * Retrieves the FUNCDESC structure that contains information about a @@ -4562,9 +4607,18 @@ static HRESULT WINAPI ITypeInfo_fnGetFun TRACE("(%p) index %d\n", This, index); - hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, &internal_funcdesc); + if ((This->TypeAttr.typekind == TKIND_DISPATCH) && + (This->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL)) + hr = ITypeInfoImpl_GetInternalDispatchFuncDesc((ITypeInfo *)iface, index, + &internal_funcdesc, NULL); + else + hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, + &internal_funcdesc); if (FAILED(hr)) + { + WARN("description for function %d not found\n", index); return hr; + } return TLB_AllocAndInitFuncDesc( internal_funcdesc,

1 0

Robert Shearman : oleaut32: Make ITypeInfo:: GetDocumentation work for functions/variables in inherited interfaces.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 65ca6a2f4dbe3d5cdf6a52e7642eefd781b0d7a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65ca6a2f4dbe3d5cdf6a52e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Oct 2 18:25:40 2006 +0100 oleaut32: Make ITypeInfo::GetDocumentation work for functions/variables in inherited interfaces. --- dlls/oleaut32/typelib.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ccca8c3..c714f62 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5579,6 +5579,23 @@ static HRESULT WINAPI ITypeInfo_fnGetDoc return S_OK; } } + + if(This->TypeAttr.cImplTypes && + (This->TypeAttr.typekind==TKIND_INTERFACE || This->TypeAttr.typekind==TKIND_DISPATCH)) { + /* recursive search */ + ITypeInfo *pTInfo; + HRESULT result; + result = ITypeInfo_GetRefTypeInfo(iface, This->impltypelist->hRef, + &pTInfo); + if(SUCCEEDED(result)) { + result = ITypeInfo_GetDocumentation(pTInfo, memid, pBstrName, + pBstrDocString, pdwHelpContext, pBstrHelpFile); + ITypeInfo_Release(pTInfo); + return result; + } + WARN("Could not search inherited interface!\n"); + } + WARN("member %ld not found\n", memid); return TYPE_E_ELEMENTNOTFOUND; }

1 0

Paul Vriens : advapi32: Make sure it's a real cleanup.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 1a2aa7ca3d3249ce054353ca335ea42da834625d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a2aa7ca3d3249ce054353c… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Oct 2 16:07:39 2006 +0200 advapi32: Make sure it's a real cleanup. --- dlls/advapi32/tests/registry.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 2341cad..c9a9e36 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -585,8 +585,8 @@ static void test_reg_create_key(void) ok(!ret, "RegCreateKeyExA failed with error %ld\n", ret); /* clean up */ - RegDeleteKey(hkey2, NULL); - RegDeleteKey(hkey1, NULL); + RegDeleteKey(hkey2, ""); + RegDeleteKey(hkey1, ""); /* beginning backslash character */ ret = RegCreateKeyExA(hkey_main, "\\Subkey3", 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL);

1 0

Mikołaj Zalewski : regedit: Fix some translated resources errors.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: c53d611e08e89eaee3f3174df3ac8ffff41ec32f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c53d611e08e89eaee3f3174… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Oct 2 15:19:08 2006 +0200 regedit: Fix some translated resources errors. --- programs/regedit/Bg.rc | 4 ++-- programs/regedit/Cs.rc | 6 ++---- programs/regedit/De.rc | 6 +++--- programs/regedit/Es.rc | 6 ++---- programs/regedit/Fr.rc | 8 ++++---- programs/regedit/Hu.rc | 4 ++-- programs/regedit/It.rc | 4 +--- programs/regedit/Ja.rc | 6 ++---- programs/regedit/Pt.rc | 4 ++-- programs/regedit/Ru.rc | 4 +--- programs/regedit/Si.rc | 4 +--- 11 files changed, 22 insertions(+), 34 deletions(-) diff --git a/programs/regedit/Bg.rc b/programs/regedit/Bg.rc index f471deb..f7ae2a5 100644 --- a/programs/regedit/Bg.rc +++ b/programs/regedit/Bg.rc @@ -59,8 +59,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&�� ", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&��\tCtrl+F", ID_EDIT_FIND - MENUITEM "�� &��\tF3", ID_EDIT_FINDNEXT + MENUITEM "&��\tCtrl+F", ID_EDIT_FIND, GRAYED + MENUITEM "�� &��\tF3", ID_EDIT_FINDNEXT, GRAYED END POPUP "&��" BEGIN diff --git a/programs/regedit/Cs.rc b/programs/regedit/Cs.rc index e836473..3a46c6a 100644 --- a/programs/regedit/Cs.rc +++ b/programs/regedit/Cs.rc @@ -86,9 +86,7 @@ BEGIN POPUP "&Obl�ben�" BEGIN MENUITEM "P�id&at k obl�ben�m", ID_FAVORITES_ADDTOFAVORITES - , GRAYED MENUITEM "Odeb&rat obl�ben�", ID_FAVORITES_REMOVEFAVORITE - , GRAYED END POPUP "&N�pov�da" BEGIN @@ -134,7 +132,7 @@ END */ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "O aplikaci" FONT 8, "MS Shell Dlg" BEGIN @@ -159,7 +157,7 @@ BEGIN END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "�prava DWORD" FONT 8, "MS Shell Dlg" BEGIN diff --git a/programs/regedit/De.rc b/programs/regedit/De.rc index 2571152..fe80da8 100644 --- a/programs/regedit/De.rc +++ b/programs/regedit/De.rc @@ -74,8 +74,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Schl�sselname &kopieren", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&Suchen\tStrg+F", ID_EDIT_FIND - MENUITEM "&N�chstes finden\tF3", ID_EDIT_FINDNEXT + MENUITEM "&Suchen\tStrg+F", ID_EDIT_FIND, GRAYED + MENUITEM "&N�chstes finden\tF3", ID_EDIT_FINDNEXT, GRAYED END POPUP "&Ansicht" BEGIN @@ -184,7 +184,7 @@ BEGIN END IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Zeichenkette �ndern" FONT 8, "MS Shell Dlg" BEGIN diff --git a/programs/regedit/Es.rc b/programs/regedit/Es.rc index 598859f..61e2e76 100644 --- a/programs/regedit/Es.rc +++ b/programs/regedit/Es.rc @@ -82,9 +82,7 @@ BEGIN POPUP "&Favoritos" BEGIN MENUITEM "&A�adir a Favoritos", ID_FAVORITES_ADDTOFAVORITES - , GRAYED MENUITEM "&Eliminar Favorito", ID_FAVORITES_REMOVEFAVORITE - , GRAYED END POPUP "A&yuda" BEGIN @@ -129,7 +127,7 @@ END */ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Acerca de" FONT 8, "MS Shell Dlg" BEGIN @@ -154,7 +152,7 @@ BEGIN END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Editar cadena" FONT 8, "MS Shell Dlg" BEGIN diff --git a/programs/regedit/Fr.rc b/programs/regedit/Fr.rc index 38435bf..81b12b4 100644 --- a/programs/regedit/Fr.rc +++ b/programs/regedit/Fr.rc @@ -54,8 +54,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Copier le nom de la cl�", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&Rechercher...\tCtrl+F", ID_EDIT_FIND - MENUITEM "Rechercher le s&uivant\tF3", ID_EDIT_FINDNEXT + MENUITEM "&Rechercher...\tCtrl+F", ID_EDIT_FIND, GRAYED + MENUITEM "Rechercher le s&uivant\tF3", ID_EDIT_FINDNEXT, GRAYED END POPUP "&Affichage" BEGIN @@ -130,7 +130,7 @@ END */ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "� propos" FONT 8, "MS Shell Dlg" BEGIN @@ -193,7 +193,7 @@ BEGIN END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Modification de la valeur DWORD" FONT 8, "MS Shell Dlg" BEGIN diff --git a/programs/regedit/Hu.rc b/programs/regedit/Hu.rc index 10e7b95..611a7da 100644 --- a/programs/regedit/Hu.rc +++ b/programs/regedit/Hu.rc @@ -54,8 +54,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Kul&csn�v m�sol�sa", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&Keres�s\tCtrl+F", ID_EDIT_FIND - MENUITEM "K&�vetkez� keres�se\tF3", ID_EDIT_FINDNEXT + MENUITEM "&Keres�s\tCtrl+F", ID_EDIT_FIND, GRAYED + MENUITEM "K&�vetkez� keres�se\tF3", ID_EDIT_FINDNEXT, GRAYED END POPUP "&N�zet" BEGIN diff --git a/programs/regedit/It.rc b/programs/regedit/It.rc index 627774c..d4ff631 100644 --- a/programs/regedit/It.rc +++ b/programs/regedit/It.rc @@ -84,9 +84,7 @@ BEGIN POPUP "&Preferiti" BEGIN MENUITEM "&Aggiungi ai Preferiti", ID_FAVORITES_ADDTOFAVORITES - , GRAYED MENUITEM "&Rimuovi dai Preferiti", ID_FAVORITES_REMOVEFAVORITE - , GRAYED END POPUP "&Aiuto" BEGIN @@ -131,7 +129,7 @@ END */ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Informazioni sull'editor del Registro" FONT 8, "MS Shell Dlg" BEGIN diff --git a/programs/regedit/Ja.rc b/programs/regedit/Ja.rc index 0f2ead1..22b5153 100644 --- a/programs/regedit/Ja.rc +++ b/programs/regedit/Ja.rc @@ -82,9 +82,7 @@ BEGIN POPUP "��C�ɓ��(&F)" BEGIN MENUITEM "��C�ɓ��ɒǉ�(&A)", ID_FAVORITES_ADDTOFAVORITES - , GRAYED MENUITEM "��C�ɓ��肩��폜(&R)", ID_FAVORITES_REMOVEFAVORITE - , GRAYED END POPUP "�w��v(&H)" BEGIN @@ -130,7 +128,7 @@ END */ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "��W�X�g��G�f�B�^�ɂ��" FONT 9, "MS UI Gothic" BEGIN @@ -155,7 +153,7 @@ BEGIN END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "DWORD�l�̕ҏW" FONT 9, "MS UI Gothic" BEGIN diff --git a/programs/regedit/Pt.rc b/programs/regedit/Pt.rc index 1fb557c..938f05d 100644 --- a/programs/regedit/Pt.rc +++ b/programs/regedit/Pt.rc @@ -209,7 +209,7 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Sobre" FONT 8, "MS Shell Dlg" BEGIN @@ -240,7 +240,7 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Editar DWORD" FONT 8, "MS Shell Dlg" BEGIN diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc index cea28cb..e1fb4b5 100644 --- a/programs/regedit/Ru.rc +++ b/programs/regedit/Ru.rc @@ -82,9 +82,7 @@ BEGIN POPUP "&��" BEGIN MENUITEM "&�� ", ID_FAVORITES_ADDTOFAVORITES - , GRAYED MENUITEM "&�� ", ID_FAVORITES_REMOVEFAVORITE - , GRAYED END POPUP "&��" BEGIN @@ -100,7 +98,7 @@ END */ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "� ��" FONT 8, "MS Shell Dlg" BEGIN diff --git a/programs/regedit/Si.rc b/programs/regedit/Si.rc index bd857e3..0654eb7 100644 --- a/programs/regedit/Si.rc +++ b/programs/regedit/Si.rc @@ -82,9 +82,7 @@ BEGIN POPUP "&Priljubljene" BEGIN MENUITEM "&Dodaj med Priljubljene", ID_FAVORITES_ADDTOFAVORITES - , GRAYED MENUITEM "&Odstrani iz Priljubljenih", ID_FAVORITES_REMOVEFAVORITE - , GRAYED END POPUP "&Pomo�" BEGIN @@ -100,7 +98,7 @@ END */ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "O" FONT 8, "MS Shell Dlg" BEGIN

1 0

Dmitry Timoshkov : winecfg: Fix a typo in Russian translation.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: a0276305e142c848a24e081dbfd2df5a77350ca1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a0276305e142c848a24e081… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 2 21:55:00 2006 +0900 winecfg: Fix a typo in Russian translation. --- programs/winecfg/Ru.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index fbda795..0937cab 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -248,7 +248,7 @@ BEGIN IDS_DRIVE_CDROM "CD-ROM" IDS_DRIVE_LETTERS_EXCEEDED "�� .\n\n� �� - �� A �� Z, � � �� 26 ��." IDS_SYSTEM_DRIVE_LABEL "�� " - IDS_CONFIRM_DELETE_C "�� C?\n\n�� Windows �� C. �� , �� !" + IDS_CONFIRM_DELETE_C "�� C?\n\n�� Windows �� C. �� , �� !" IDS_COL_DRIVELETTER "��" IDS_COL_DRIVEMAPPING "��" IDS_NO_DRIVE_C "�� C.\n\n�� !\n"

1 0

Peter Oberndorfer : winedbg: Don' t try to read to invalid memory if winedbg does not find the thread.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: b480668942e6687091fd4065e2f36917504b8c28 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b480668942e6687091fd406… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Thu Sep 28 19:50:03 2006 +0200 winedbg: Don't try to read to invalid memory if winedbg does not find the thread. --- programs/winedbg/tgt_active.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index af619a0..8dbca97 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -255,7 +255,11 @@ static DWORD dbg_handle_exception(const pThread = dbg_curr_thread; else pThread = dbg_get_thread(dbg_curr_process, pThreadName->dwThreadID); - + if(!pThread) + { + dbg_printf("Thread ID=0x%lx not in our list of threads -> can't rename\n", pThreadName->dwThreadID); + return DBG_CONTINUE; + } if (dbg_read_memory(pThreadName->szName, pThread->name, 9)) dbg_printf("Thread ID=0x%lx renamed using MS VC6 extension (name==\"%s\")\n", pThread->tid, pThread->name);

1 0

Peter Oberndorfer : ntdll: Add a test for NtReadVirtualMemory.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 78f603226458cd94ca96cd901e35c91038ab58ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78f603226458cd94ca96cd9… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Thu Sep 28 19:53:01 2006 +0200 ntdll: Add a test for NtReadVirtualMemory. --- dlls/ntdll/tests/info.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 72f3dd9..2588bed 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -22,6 +22,7 @@ #include "ntdll_test.h" static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static HMODULE hntdll = 0; @@ -49,6 +50,7 @@ static BOOL InitFunctionPtrs(void) { NTDLL_GET_PROC(NtQuerySystemInformation) NTDLL_GET_PROC(NtQueryInformationProcess) + NTDLL_GET_PROC(NtReadVirtualMemory) } return TRUE; } @@ -755,6 +757,61 @@ static void test_query_process_handlecou } } + +static void test_readvirtualmemory(void) +{ + HANDLE process; + DWORD status; + SIZE_T readcount; + static const char teststring[] = "test string"; + char buffer[12]; + + process = OpenProcess(PROCESS_VM_READ, FALSE, GetCurrentProcessId()); + ok(process != 0, "Expected to be able to open own process for reading memory\n"); + + /* normal operation */ + status = pNtReadVirtualMemory(process, teststring, buffer, 12, &readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( readcount == 12, "Expected to read 12 bytes, got %ld\n",readcount); + ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory"); + + /* no number of bytes */ + memset(buffer, 0, 12); + status = pNtReadVirtualMemory(process, teststring, buffer, 12, NULL); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory"); + + /* illegal remote address */ + todo_wine{ + status = pNtReadVirtualMemory(process, (void *) 0x1234, buffer, 12, &readcount); + ok( status == STATUS_PARTIAL_COPY, "Expected STATUS_PARTIAL_COPY, got %08lx\n", status); + ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); + } + + /* 0 handle */ + status = pNtReadVirtualMemory(0, teststring, buffer, 12, &readcount); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status); + ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); + + /* pseudo handle for current process*/ + memset(buffer, 0, 12); + status = pNtReadVirtualMemory((HANDLE)-1, teststring, buffer, 12, &readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + ok( readcount == 12, "Expected to read 12 bytes, got %ld\n",readcount); + ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory"); + + /* this test currently crashes wine with "wine client error:<process id>: read: Bad address" + * because the reply from wine server is directly read into the buffer and that fails with EFAULT + */ + /* illegal local address */ + /*status = pNtReadVirtualMemory(process, teststring, (void *)0x1234, 12, &readcount); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status); + ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); + */ + + CloseHandle(process); +} + START_TEST(info) { if(!InitFunctionPtrs()) @@ -832,5 +889,9 @@ START_TEST(info) trace("Starting test_query_process_handlecount()\n"); test_query_process_handlecount(); + /* belongs into it's own file */ + trace("Starting test_readvirtualmemory()\n"); + test_readvirtualmemory(); + FreeLibrary(hntdll); }

1 0

Louis. Lenders : kernel32: Add 2 simple tests for GetLongPathNameW.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: ed4b6e91cb7fa7ca316b0c9300670d3d4ffbf06e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed4b6e91cb7fa7ca316b0c9… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 29 08:21:31 2006 +0100 kernel32: Add 2 simple tests for GetLongPathNameW. --- dlls/kernel32/tests/path.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 12d3500..e348865 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -50,6 +50,7 @@ static const CHAR funny_chars[]="!@#$%^& static const CHAR is_char_ok[] ="11111110111111111011"; static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR,LPSTR,DWORD); +static DWORD (WINAPI *pGetLongPathNameW)(LPWSTR,LPWSTR,DWORD); /* a structure to deal with wine todos somewhat cleanly */ typedef struct { @@ -929,14 +930,37 @@ static void test_GetTempPath(void) SetEnvironmentVariableA("TMP", save_TMP); } +static void test_GetLongPathNameW(void) +{ + DWORD length; + WCHAR empty[MAX_PATH]; + + SetLastError(0xdeadbeef); + length = pGetLongPathNameW(NULL,NULL,0); + if(pGetLongPathNameW) + { + ok(0==length,"GetLongPathNameW returned %ld but expected 0\n",length); + ok(GetLastError()==ERROR_INVALID_PARAMETER,"GetLastError returned %lx but expected ERROR_INVALID_PARAMETER",GetLastError()); + + SetLastError(0xdeadbeef); + empty[0]=0; + length = pGetLongPathNameW(empty,NULL,0); + ok(0==length,"GetLongPathNameW returned %ld but expected 0\n",length); + ok(GetLastError()==ERROR_PATH_NOT_FOUND,"GetLastError returned %lx but expected ERROR_PATH_NOT_FOUND\n",GetLastError()); + } +} + START_TEST(path) { CHAR origdir[MAX_PATH],curdir[MAX_PATH], curDrive, otherDrive; pGetLongPathNameA = (void*)GetProcAddress( GetModuleHandleA("kernel32.dll"), "GetLongPathNameA" ); + pGetLongPathNameW = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll") , + "GetLongPathNameW" ); test_InitPathA(curdir, &curDrive, &otherDrive); test_CurrentDirectoryA(origdir,curdir); test_PathNameA(curdir, curDrive, otherDrive); test_CleanupPathA(origdir,curdir); test_GetTempPath(); + test_GetLongPathNameW(); }

1 0

Louis. Lenders : kernel32: Print an error instead of crashing in GetLongPathNameW if shortpath=0.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 44da24759c8f8c27f94a9cf8ec7bb1b23bd52204 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44da24759c8f8c27f94a9cf… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 29 08:17:07 2006 +0100 kernel32: Print an error instead of crashing in GetLongPathNameW if shortpath=0. --- dlls/kernel32/path.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index ddd169c..b53ebdb 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -294,7 +294,7 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR s LPCWSTR p; DWORD sp = 0, lp = 0; DWORD tmplen; - BOOL unixabsolute = (shortpath[0] == '/'); + BOOL unixabsolute; WIN32_FIND_DATAW wfd; HANDLE goit; @@ -318,6 +318,8 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR s return strlenW(longpath); } + unixabsolute = (shortpath[0] == '/'); + /* check for drive letter */ if (!unixabsolute && shortpath[1] == ':' ) {

1 0