December 2005 - Wine-Commits

Eric Pouech : dbghelp: Implemented StackWalk64.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 1f872df26c2781fd274d8e3d10f46610933e9a06 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f872df26c2781fd274d8e3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 5 12:50:10 2005 +0100 dbghelp: Implemented StackWalk64. --- dlls/dbghelp/stack.c | 239 ++++++++++++++++++++++++++++++++++++-------------- include/dbghelp.h | 4 - 2 files changed, 175 insertions(+), 68 deletions(-)

1 0

Francois Gouget : Update win32.api to match the current sources.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 5193c8565f5c07a37f52068ca2b06151a9091bc2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5193c8565f5c07a37f52068… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 5 12:49:30 2005 +0100 Update win32.api to match the current sources. --- tools/winapi/win32.api | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 5d14faf..9f81c13 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -604,7 +604,6 @@ ALG_ID BOOL DWORD HANDLE -HCERTSTORE HCRYPTPROV HMODULE LONG @@ -620,7 +619,9 @@ CRYPT_OID_FUNC_ENTRY[] DATA_BLOB * DWORD * GUID * +HCERTSTORE HCRYPTKEY * +HCRYPTOIDFUNCADDR HCRYPTOIDFUNCADDR * HCRYPTOIDFUNCSET HLRUCACHE @@ -3301,7 +3302,7 @@ GLvoid * GLvoid ** LPGLYPHMETRICSFLOAT LPLAYERPLANEDESCRIPTOR -void * +PROC %str

1 0

Francois Gouget : msvidc32: Add a comment for DllMain() to stop winapi_check from
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 6e7d8a7271b5f81cb1a508cabb6d2c5b8ddb8226 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e7d8a7271b5f81cb1a508c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 5 12:49:51 2005 +0100 msvidc32: Add a comment for DllMain() to stop winapi_check from complaining about it. --- dlls/msvidc32/msvideo1.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 0932978..f971d4f 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -561,6 +561,9 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PT return r; } +/*********************************************************************** + * DllMain + */ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved);

1 0

Cihan Altinay : riched20: register ListBox & ComboBox classes
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 2a1a0cf22dbef9b4acc2d76b339e16f2b141d554 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a1a0cf22dbef9b4acc2d76… Author: Cihan Altinay <cihan(a)uq.edu.au> Date: Mon Dec 5 12:48:45 2005 +0100 riched20: register ListBox & ComboBox classes Partially implement REExtendedRegisterClass() to register missing window classes so that applications relying on them don't get confused. --- dlls/riched20/editor.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a25a90d..1383bcf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2,6 +2,7 @@ * RichEdit - functions dealing with editor object * * Copyright 2004 by Krzysztof Foltman + * Copyright 2005 by Cihan Altinay * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -208,6 +209,7 @@ * - full justification * - hyphenation * - tables + * - ListBox & ComboBox not implemented * * Bugs that are probably fixed, but not so easy to verify: * - EN_UPDATE/EN_CHANGE are handled very incorrectly (should be OK now) @@ -235,6 +237,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); int me_debug = 0; HANDLE me_heap = NULL; +static BOOL ME_ListBoxRegistered = FALSE; +static BOOL ME_ComboBoxRegistered = FALSE; + static ME_TextBuffer *ME_MakeText(void) { ME_TextBuffer *buf = ALLOC_OBJ(ME_TextBuffer); @@ -934,6 +939,8 @@ void ME_DestroyEditor(ME_TextEditor *edi static WCHAR wszClassName[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0}; static WCHAR wszClassName50[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0}; +static WCHAR wszClassNameListBox[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; +static WCHAR wszClassNameComboBox[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -951,6 +958,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, UnregisterClassW(wszClassName50, 0); UnregisterClassA("RichEdit20A", 0); UnregisterClassA("RichEdit50A", 0); + if (ME_ListBoxRegistered) + UnregisterClassW(wszClassNameListBox, 0); + if (ME_ComboBoxRegistered) + UnregisterClassW(wszClassNameComboBox, 0); HeapDestroy (me_heap); me_heap = NULL; break; @@ -2167,12 +2178,62 @@ HRESULT WINAPI CreateTextServices(IUnkno return E_FAIL; /* E_NOTIMPL isn't allowed by MSDN */ } +LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + /* FIXME: Not implemented */ + TRACE("hWnd %p msg %04x (%s) %08x %08lx\n", + hWnd, msg, get_msg_name(msg), wParam, lParam); + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + +LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + /* FIXME: Not implemented */ + TRACE("hWnd %p msg %04x (%s) %08x %08lx\n", + hWnd, msg, get_msg_name(msg), wParam, lParam); + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + /****************************************************************** * REExtendedRegisterClass (RICHED20.8) * * FIXME undocumented + * Need to check for errors and implement controls and callbacks */ -void WINAPI REExtendedRegisterClass(void) +LRESULT WINAPI REExtendedRegisterClass(void) { - FIXME("stub\n"); + WNDCLASSW wcW; + UINT result; + + FIXME("semi stub\n"); + + wcW.cbClsExtra = 0; + wcW.cbWndExtra = 4; + wcW.hInstance = NULL; + wcW.hIcon = NULL; + wcW.hCursor = NULL; + wcW.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcW.lpszMenuName = NULL; + + if (!ME_ListBoxRegistered) + { + wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS; + wcW.lpfnWndProc = REListWndProc; + wcW.lpszClassName = wszClassNameListBox; + if (RegisterClassW(&wcW)) ME_ListBoxRegistered = TRUE; + } + + if (!ME_ComboBoxRegistered) + { + wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW; + wcW.lpfnWndProc = REComboWndProc; + wcW.lpszClassName = wszClassNameComboBox; + if (RegisterClassW(&wcW)) ME_ComboBoxRegistered = TRUE; + } + + result = 0; + if (ME_ListBoxRegistered) + result += 1; + if (ME_ComboBoxRegistered) + result += 2; + + return result; }

1 0

Pavel Roskin : notepad: Russian translation for Font... menu item.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 83f2069b6dabb6ad50244e01facadb1dd9b55787 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83f2069b6dabb6ad50244e0… Author: Pavel Roskin <proski(a)gnu.org> Date: Mon Dec 5 12:48:58 2005 +0100 notepad: Russian translation for "Font..." menu item. --- programs/notepad/Ru.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ru.rc b/programs/notepad/Ru.rc index deea89b..bb98229 100644 --- a/programs/notepad/Ru.rc +++ b/programs/notepad/Ru.rc @@ -44,6 +44,7 @@ POPUP "&��" { MENUITEM "��&� � ��\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&�� ", CMD_WRAP + MENUITEM "&��...", CMD_FONT } POPUP "�&��" { MENUITEM "&��", CMD_SEARCH

1 0

YunSong Hwang : winefile: Fix an incorrect translation.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 38dbf09da2eee8155fca383b48bcc95e97d95482 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38dbf09da2eee8155fca383… Author: YunSong Hwang <hys545(a)dreamwiz.com> Date: Mon Dec 5 12:48:33 2005 +0100 winefile: Fix an incorrect translation. --- programs/winefile/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/Ko.rc b/programs/winefile/Ko.rc index 13150de..602f4f0 100644 --- a/programs/winefile/Ko.rc +++ b/programs/winefile/Ko.rc @@ -29,7 +29,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDM_WINEFILE MENU FIXED IMPURE { POPUP "��(&F)" { - MENUITEM "��(&O)\OCtEnter", ID_ACTIVATE + MENUITEM "��(&O)\tEnter", ID_ACTIVATE MENUITEM "�̵�(&M)...\tF7", ID_FILE_MOVE MENUITEM "��(&C)...\tF8", ID_FILE_COPY MENUITEM "Ŭ��(&I)...\tF9", 118

1 0

Alexander N. Sørnes : Update Norwegian Bokmaal resources.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: f33d726276c5f13eec0ebd7d291d0d8992400971 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f33d726276c5f13eec0ebd7… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 5 12:02:38 2005 +0100 Update Norwegian Bokmaal resources. --- dlls/commdlg/cdlg_No.rc | 6 ++--- dlls/iccvid/iccvid_No.rc | 25 +++++++++++++++++++++ dlls/iccvid/rsrc.rc | 1 + dlls/msvidc32/msvidc32_No.rc | 25 +++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + dlls/msvideo/msvfw32_No.rc | 51 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvideo/rsrc.rc | 1 + programs/notepad/No.rc | 2 +- programs/regedit/No.rc | 41 ++++++++++++++++++++++++++++++++-- programs/winecfg/No.rc | 4 +++ 10 files changed, 151 insertions(+), 6 deletions(-) create mode 100644 dlls/iccvid/iccvid_No.rc create mode 100644 dlls/msvidc32/msvidc32_No.rc create mode 100644 dlls/msvideo/msvfw32_No.rc

1 0

Patrick Ammann : wininet: compilation fix
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: d437f37f5840cec798fa80f87450f6ae09a4ada0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d437f37f5840cec798fa80f… Author: Patrick Ammann <pammann(a)aro.ch> Date: Mon Dec 5 12:01:56 2005 +0100 wininet: compilation fix - make netconnection.c compile when HAVE_OPENSSL_SSL_H or HAVE_OPENSSL_ERR_H are not defined. --- dlls/wininet/netconnection.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 3c13818..f488d69 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -36,6 +36,8 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <stdio.h> +#include <errno.h> #include "wine/library.h" #include "windef.h" @@ -317,13 +319,13 @@ BOOL NETCON_close(WININET_NETCONNECTION } return TRUE; } - +#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H static BOOL check_hostname(X509 *cert, char *hostname) { /* FIXME: implement */ return TRUE; } - +#endif /****************************************************************************** * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection.

1 0

Eric Pouech : winmm: driver unloading.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 60884fc3b33a152277a15568dcccd5abe99ac530 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=60884fc3b33a152277a1556… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 5 12:01:26 2005 +0100 winmm: driver unloading. - properly handle drivers unloading when no session instance of the driver has been created --- dlls/winmm/driver.c | 8 ++++++-- dlls/winmm/winemm.h | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index dabce42..717ba47 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -291,6 +291,7 @@ LPWINE_DRIVER DRIVER_TryOpenDriver32(LPC cause = "load1 failed"; goto exit; } + lpDrv->dwFlags |= WINE_GDF_SESSION; return ret; } @@ -416,8 +417,11 @@ LRESULT WINAPI CloseDriver(HDRVR hDrvr, { LPWINE_DRIVER lpDrv0; + if (lpDrv->dwFlags & WINE_GDF_SESSION) + FIXME("Shouldn't happen (%p)\n", lpDrv); /* if driver has an opened session instance, we have to close it too */ - if (DRIVER_GetNumberOfModuleRefs(lpDrv->d.d32.hModule, &lpDrv0) == 1) + if (DRIVER_GetNumberOfModuleRefs(lpDrv->d.d32.hModule, &lpDrv0) == 1 && + (lpDrv0->dwFlags & WINE_GDF_SESSION)) { DRIVER_SendMessage(lpDrv0, DRV_CLOSE, 0L, 0L); lpDrv0->d.d32.dwDriverID = 0; @@ -456,7 +460,7 @@ DWORD WINAPI GetDriverFlags(HDRVR hDrvr) TRACE("(%p)\n", hDrvr); if ((lpDrv = DRIVER_FindFromHDrvr(hDrvr)) != NULL) { - ret = WINE_GDF_EXIST | lpDrv->dwFlags; + ret = WINE_GDF_EXIST | (lpDrv->dwFlags & WINE_GDF_EXTERNAL_MASK); } return ret; } diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 4725359..3295199 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -306,8 +306,11 @@ extern unsigned (*pFnLoadMMDrvFu extern LRESULT (*pFnMmioCallback16)(DWORD,LPMMIOINFO,UINT,LPARAM,LPARAM); extern void (WINAPI *pFnReleaseThunkLock)(DWORD*); extern void (WINAPI *pFnRestoreThunkLock)(DWORD); + /* GetDriverFlags() returned bits is not documented (nor the call itself) * Here are Wine only definitions of the bits */ -#define WINE_GDF_EXIST 0x80000000 -#define WINE_GDF_16BIT 0x10000000 +#define WINE_GDF_EXIST 0x80000000 +#define WINE_GDF_16BIT 0x10000000 +#define WINE_GDF_EXTERNAL_MASK 0xF0000000 +#define WINE_GDF_SESSION 0x00000001

1 0

Eric Pouech : dbghelp,winedbg: SYMBOL_INFO fix.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 34db4856ae0431dd0c6e14ee6e35729271070052 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34db4856ae0431dd0c6e14e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 5 12:00:54 2005 +0100 dbghelp,winedbg: SYMBOL_INFO fix. - native dbghelp returns in SYMBOL_INFO.TypeIndex the index of the type of the symbol (we were returning the symbol index instead) - fixed winedbg accordingly --- dlls/dbghelp/symbol.c | 5 +++-- dlls/dbghelp/type.c | 1 + programs/winedbg/expr.c | 6 ++---- programs/winedbg/symbol.c | 13 +++++-------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 0dfa606..c47c04c 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -443,8 +443,9 @@ static void symt_fill_sym_info(const str const char* name; DWORD64 size; - sym_info->TypeIndex = (DWORD)sym; - sym_info->info = 0; /* TBD */ + if (!symt_get_info(sym, TI_GET_TYPE, &sym_info->TypeIndex)) + sym_info->TypeIndex = 0; + sym_info->info = (DWORD)sym; symt_get_info(sym, TI_GET_LENGTH, &size); sym_info->Size = (DWORD)size; sym_info->ModBase = module->module.BaseOfImage; diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 7617be8..fba6942 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -718,6 +718,7 @@ BOOL symt_get_info(const struct symt* ty default: FIXME("Unsupported sym-tag %s for get-type\n", symt_get_tag_str(type->tag)); + case SymTagPublicSymbol: case SymTagThunk: return FALSE; } diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index 848eb91..5eb4d49 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -461,10 +461,8 @@ struct dbg_lvalue expr_eval(struct expr* exp->un.call.result = 0; #endif rtn.cookie = DLV_HOST; - /* get function signature type */ - types_get_info(&rtn.type, TI_GET_TYPE, &rtn.type); - /* and now, return type */ - types_get_info(&rtn.type, TI_GET_TYPE, &rtn.type); + /* get return type from function signature tupe */ + types_get_info(&rtn.type, TI_GET_TYPE, &rtn.type.id); rtn.addr.Offset = (unsigned int)&exp->un.call.result; break; case EXPR_TYPE_INTVAR: diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 61ef3dc..f7dcfce 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -40,6 +40,7 @@ static BOOL symbol_get_debug_start(DWORD int i; struct dbg_type type; + if (!typeid) return FALSE; /* native dbghelp not always fills the info field */ type.module = mod_base; type.id = typeid; @@ -134,7 +135,7 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* if (sgv->lineno == -1) { if (!sgv->bp_disp || - !symbol_get_debug_start(sym->ModBase, sym->TypeIndex, &addr)) + !symbol_get_debug_start(sym->ModBase, sym->info, &addr)) addr = sym->Address; } else @@ -185,9 +186,7 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* sgv->syms[insp].lvalue.addr.Mode = AddrModeFlat; sgv->syms[insp].lvalue.addr.Offset = addr; sgv->syms[insp].lvalue.type.module = sym->ModBase; - sgv->syms[insp].lvalue.type.id = sym->TypeIndex; - types_get_info(&sgv->syms[insp].lvalue.type, TI_GET_TYPE, - &sgv->syms[insp].lvalue.type.id); + sgv->syms[insp].lvalue.type.id = sym->TypeIndex; sgv->syms[insp].flags = sym->Flags; sgv->num++; @@ -463,7 +462,7 @@ enum dbg_line_status symbol_get_function if (!SymGetLineFromAddr(dbg_curr_process->handle, lin, &disp, &il)) return dbg_no_line_info; - if (symbol_get_debug_start(sym->ModBase, sym->TypeIndex, &start) && lin < start) + if (symbol_get_debug_start(sym->ModBase, sym->info, &start) && lin < start) return dbg_not_on_a_line_number; if (!sym->Size) sym->Size = 0x100000; if (il.FileName && il.FileName[0] && disp < sym->Size) @@ -545,7 +544,6 @@ static BOOL CALLBACK info_locals_cb(SYMB dbg_printf("\t"); type.module = sym->ModBase; type.id = sym->TypeIndex; - types_get_info(&type, TI_GET_TYPE, &type.id); types_print_type(&type, FALSE); if (sym->Flags & SYMFLAG_PARAMETER) explain = "parameter"; @@ -624,8 +622,7 @@ static BOOL CALLBACK symbols_info_cb(SYM type.id = sym->TypeIndex; type.module = sym->ModBase; - if (sym->TypeIndex != dbg_itype_none && sym->TypeIndex != 0 && - types_get_info(&type, TI_GET_TYPE, &type.id)) + if (sym->TypeIndex != dbg_itype_none && sym->TypeIndex != 0) { dbg_printf(" "); types_print_type(&type, FALSE);

1 0