June 2009 - Wine-commits - list.winehq.org

Gerald Pfeifer : cmd.exe: Fix incorrect check in WCMD_HandleTildaModifiers( ).
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 008edf4572c2a339af821294cea241600973f530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=008edf4572c2a339af821294c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Jun 15 19:05:33 2009 +0200 cmd.exe: Fix incorrect check in WCMD_HandleTildaModifiers(). --- programs/cmd/batch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 4c089ca..157ad08 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -366,7 +366,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValu WINE_TRACE("Looking backwards for parameter id: %s / %s\n", wine_dbgstr_w(lastModifier), wine_dbgstr_w(forVariable)); - if (!justFors && context && (*lastModifier >= '0' || *lastModifier <= '9')) { + if (!justFors && context && (*lastModifier >= '0' && *lastModifier <= '9')) { /* Its a valid parameter identifier - OK */ break;

1 0

José Manuel Ferrer Ortiz : winecfg: Spanish resources update.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: fd3a1bb009b2b197e9cf48d213e9e561fe59e7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3a1bb009b2b197e9cf48d21… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Mon Jun 15 20:47:10 2009 +0000 winecfg: Spanish resources update. --- programs/winecfg/Es.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 86639f7..3deedc3 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -2,7 +2,7 @@ * WineCfg resources * Spanish Language Support * - * Copyright 2003-2008 Jos� Manuel Ferrer Ortiz + * Copyright 2003-2009 Jos� Manuel Ferrer Ortiz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -52,9 +52,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Configuraci�n de aplicaciones ",IDC_STATIC, 8,4,244,240 LTEXT "Wine puede imitar distintas versiones de Windows para cada aplicaci�n. Esta pesta�a est� enlazada a las de Librer�as y Gr�ficos para poder cambiar en ellas la configuraci�n global y/o la de por aplicaci�n.", - IDC_STATIC,15,20,227,32 + IDC_STATIC,15,16,227,32 CONTROL "Aplicaciones",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, - 15,56,230,144 + 15,50,230,150 PUSHBUTTON "&A�adir aplicaci�n...",IDC_APP_ADDAPP, 90,204,75,14 PUSHBUTTON "&Eliminar aplicaci�n...",IDC_APP_REMOVEAPP, 170,204,75,14 LTEXT "&Versi�n a imitar:",IDC_STATIC,17,226,58,16 @@ -67,7 +67,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Configuraci�n de ventanas ",IDC_STATIC,8,4,244,84 CONTROL "Permitir a los programas DirectX retener el rat�n en sus ventanas",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 - CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 + CONTROL "Permitir al gestor de ventanas decorar las ventanas",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Permitir al gestor de ventanas controlar las ventanas",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emular un escritorio virtual",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 @@ -81,11 +81,11 @@ BEGIN COMBOBOX IDC_D3D_VSHADER_MODE,100,108,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Permitir Pixel Shader (si hay soporte por hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 - GROUPBOX " Screen &Resolution ",IDC_STATIC,8,151,244,93 + GROUPBOX " Resoluci�n de pantalla ",IDC_STATIC,8,151,244,93 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP - LTEXT "dpi",IDC_STATIC,235,163,10,8 - LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55 + LTEXT "ppp",IDC_STATIC,235,163,10,8 + LTEXT "Esto es un texto de ejemplo usando Tahoma de 10 puntos",IDC_RES_FONT_PREVIEW,15,181,230,55 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -124,12 +124,12 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Mapeos de unidad ",IDC_STATIC,8,4,244,240 - LTEXT "Failed to connect to the mount manager, the drive configuration cannot be edited.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,220,76 + LTEXT "Conexi�n fallida al gestor de montaje, la configuraci�n de unidades no se puede editar.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,220,76 CONTROL "Listview",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 PUSHBUTTON "&A�adir...",IDC_BUTTON_ADD,15,98,37,14 PUSHBUTTON "&Eliminar",IDC_BUTTON_REMOVE,56,98,37,14 - PUSHBUTTON "Auto&detectar...",IDC_BUTTON_AUTODETECT,197,98,49,14 + PUSHBUTTON "Auto&detectar...",IDC_BUTTON_AUTODETECT,187,98,59,14 /* editing drive details */ LTEXT "&Ruta:",IDC_STATIC_PATH,15,123,20,9 @@ -316,7 +316,7 @@ BEGIN IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Sombra oscura del control" IDC_SYSPARAMS_BUTTON_LIGHT "Parte iluminada del control" IDC_SYSPARAMS_BUTTON_ALTERNATE "Fondo alternativo del control" - IDC_SYSPARAMS_HOT_TRACKING "Elemento Hot Tracked" + IDC_SYSPARAMS_HOT_TRACKING "Elemento resaltado" IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Gradiente barra t�tulo activa" IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Gradiente barra t�tulo inactiva" IDC_SYSPARAMS_MENU_HILIGHT "Resaltado del men�"

1 0

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 045c94baf1ca8bdea2f53279ff5a8cf6d92e8df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=045c94baf1ca8bdea2f53279f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jun 15 22:08:41 2009 +0100 crypt32: Constify some variables. --- dlls/crypt32/msg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index a16eef1..0b4027d 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1340,7 +1340,7 @@ static BOOL CSignedEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, } static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, - const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, + const void *pvMsgEncodeInfo, LPCSTR pszInnerContentObjID, PCMSG_STREAM_INFO pStreamInfo) { const CMSG_SIGNED_ENCODE_INFO_WITH_CMS *info = pvMsgEncodeInfo; @@ -1553,7 +1553,7 @@ static BOOL CDecodeMsg_CopyData(CRYPT_DATA_BLOB *blob, const BYTE *pbData, return ret; } -static BOOL CDecodeMsg_DecodeDataContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob) +static BOOL CDecodeMsg_DecodeDataContent(CDecodeMsg *msg, const CRYPT_DER_BLOB *blob) { BOOL ret; CRYPT_DATA_BLOB *data; @@ -1613,7 +1613,7 @@ static inline void CRYPT_FixUpAlgorithmID(CRYPT_ALGORITHM_IDENTIFIER *id) } static BOOL CDecodeMsg_DecodeHashedContent(CDecodeMsg *msg, - CRYPT_DER_BLOB *blob) + const CRYPT_DER_BLOB *blob) { BOOL ret; CRYPT_DIGESTED_DATA *digestedData;

1 0

Nikolay Sivov : comctl32/listview: Block header items drag if LVS_EX_HEADERDRAGDROP isn't set.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 736d8ff0237bede9ab7632c66689be44b94dcea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736d8ff0237bede9ab7632c66… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 15 18:15:51 2009 +0400 comctl32/listview: Block header items drag if LVS_EX_HEADERDRAGDROP isn't set. --- dlls/comctl32/listview.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index fd377ff..24c298e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9233,11 +9233,16 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE LISTVIEW_DrawTrackLine(infoPtr); infoPtr->xTrackLine = -1; break; - + + case HDN_BEGINDRAG: + notify_forward_header(infoPtr, lpnmh); + return (infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) == 0; + case HDN_ENDDRAG: FIXME("Changing column order not implemented\n"); + notify_forward_header(infoPtr, lpnmh); return TRUE; - + case HDN_ITEMCHANGINGW: case HDN_ITEMCHANGINGA: return notify_forward_header(infoPtr, lpnmh);

1 0

Nikolay Sivov : comctl32/listview: Forward HDN_DIVIDERDBLCLICK to parent.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: b4b186d7b7cb5924e75cb6cc1278e862cd67fa63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b186d7b7cb5924e75cb6cc1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 15 23:14:39 2009 +0400 comctl32/listview: Forward HDN_DIVIDERDBLCLICK to parent. --- dlls/comctl32/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 24c298e..de98e38 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9342,6 +9342,7 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE case HDN_DIVIDERDBLCLICKW: case HDN_DIVIDERDBLCLICKA: LISTVIEW_SetColumnWidth(infoPtr, lpnmh->iItem, LVSCW_AUTOSIZE); + notify_forward_header(infoPtr, lpnmh); break; }

1 0

Nikolay Sivov : comctl32/listview: Convert forwarded header notifications to ANSI if NFR_ANSI is current format .
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 34b802caf088e526eadc23d785582e81ea5374cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b802caf088e526eadc23d78… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jun 16 01:46:11 2009 +0400 comctl32/listview: Convert forwarded header notifications to ANSI if NFR_ANSI is current format. --- dlls/comctl32/listview.c | 88 +++++++++++++++++++++++++++++++-------- dlls/comctl32/tests/listview.c | 30 +++++++++++++- 2 files changed, 99 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index de98e38..ebf49c6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -701,10 +701,78 @@ static inline LPCSTR debugscrollcode(int nScrollCode) /******** Notification functions ************************************/ +static int get_ansi_notification(UINT unicodeNotificationCode) +{ + switch (unicodeNotificationCode) + { + case LVN_BEGINLABELEDITW: return LVN_BEGINLABELEDITA; + case LVN_ENDLABELEDITW: return LVN_ENDLABELEDITA; + case LVN_GETDISPINFOW: return LVN_GETDISPINFOA; + case LVN_SETDISPINFOW: return LVN_SETDISPINFOA; + case LVN_ODFINDITEMW: return LVN_ODFINDITEMA; + case LVN_GETINFOTIPW: return LVN_GETINFOTIPA; + /* header forwards */ + case HDN_TRACKW: return HDN_TRACKA; + case HDN_ENDTRACKW: return HDN_ENDTRACKA; + case HDN_BEGINDRAG: return HDN_BEGINDRAG; + case HDN_ENDDRAG: return HDN_ENDDRAG; + case HDN_ITEMCHANGINGW: return HDN_ITEMCHANGINGA; + case HDN_ITEMCHANGEDW: return HDN_ITEMCHANGEDA; + case HDN_ITEMCLICKW: return HDN_ITEMCLICKA; + case HDN_DIVIDERDBLCLICKW: return HDN_DIVIDERDBLCLICKA; + } + ERR("unknown notification %x\n", unicodeNotificationCode); + assert(FALSE); + return 0; +} + +/* forwards header notifications to listview parent */ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADERW *lpnmh) { - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)lpnmh->hdr.idFrom, (LPARAM)lpnmh); + NMHEADERA nmhA; + HDITEMA hditema; + HD_TEXTFILTERA textfilter; + LPSTR text = NULL, filter = NULL; + LRESULT ret; + + /* on unicode format exit earlier */ + if (infoPtr->notifyFormat == NFR_UNICODE) + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, + (WPARAM)lpnmh->hdr.idFrom, (LPARAM)lpnmh); + + /* header always supplies unicode notifications, + all we have to do is to convert strings to ANSI */ + nmhA = *(NMHEADERA*)lpnmh; + if (lpnmh->pitem) + { + hditema = *(HDITEMA*)lpnmh->pitem; + nmhA.pitem = &hditema; + /* convert item text */ + if (lpnmh->pitem->mask & HDI_TEXT) + { + Str_SetPtrWtoA(&hditema.pszText, lpnmh->pitem->pszText); + text = hditema.pszText; + } + /* convert filter text */ + if ((lpnmh->pitem->mask & HDI_FILTER) && (lpnmh->pitem->type == HDFT_ISSTRING) && + lpnmh->pitem->pvFilter) + { + hditema.pvFilter = &textfilter; + textfilter = *(HD_TEXTFILTERA*)(lpnmh->pitem->pvFilter); + Str_SetPtrWtoA(&textfilter.pszText, ((HD_TEXTFILTERW*)lpnmh->pitem->pvFilter)->pszText); + filter = textfilter.pszText; + } + } + nmhA.hdr.code = get_ansi_notification(lpnmh->hdr.code); + + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, + (WPARAM)nmhA.hdr.idFrom, (LPARAM)&nmhA); + + /* cleanup */ + Free(text); + Free(filter); + + return ret; } static LRESULT notify_hdr(const LISTVIEW_INFO *infoPtr, INT code, LPNMHDR pnmh) @@ -804,22 +872,6 @@ static BOOL notify_deleteitem(const LISTVIEW_INFO *infoPtr, INT nItem) return IsWindow(hwnd); } -static int get_ansi_notification(UINT unicodeNotificationCode) -{ - switch (unicodeNotificationCode) - { - case LVN_BEGINLABELEDITW: return LVN_BEGINLABELEDITA; - case LVN_ENDLABELEDITW: return LVN_ENDLABELEDITA; - case LVN_GETDISPINFOW: return LVN_GETDISPINFOA; - case LVN_SETDISPINFOW: return LVN_SETDISPINFOA; - case LVN_ODFINDITEMW: return LVN_ODFINDITEMA; - case LVN_GETINFOTIPW: return LVN_GETINFOTIPA; - } - ERR("unknown notification %x\n", unicodeNotificationCode); - assert(FALSE); - return 0; -} - /* Send notification. depends on dispinfoW having same structure as dispinfoA. diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d28fc1b..201826b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3177,7 +3177,7 @@ static void test_editbox(void) static void test_notifyformat(void) { - HWND hwnd; + HWND hwnd, header; DWORD r; hwnd = create_listview_control(0); @@ -3212,8 +3212,12 @@ static void test_notifyformat(void) notifyFormat = 0; hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "expected header to be created\n"); r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); r = SendMessage(hwnd, WM_NOTIFYFORMAT, 0, NF_QUERY); ok(r != 0, "Expected valid format\n"); @@ -3222,12 +3226,16 @@ static void test_notifyformat(void) expect(NFR_UNICODE, r); r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(1, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); notifyFormat = NFR_ANSI; r = SendMessage(hwnd, WM_NOTIFYFORMAT, 0, NF_REQUERY); expect(NFR_ANSI, r); r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); DestroyWindow(hwnd); @@ -3245,36 +3253,56 @@ static void test_notifyformat(void) notifyFormat = -1; hwnd = create_listview_controlW(0, hwndparentW); ok(hwnd != NULL, "failed to create a listview window\n"); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "expected header to be created\n"); r = SendMessageW(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(1, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); DestroyWindow(hwnd); /* recieving error code defaulting to ansi */ notifyFormat = 0; hwnd = create_listview_controlW(0, hwndparentW); ok(hwnd != NULL, "failed to create a listview window\n"); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "expected header to be created\n"); r = SendMessageW(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); DestroyWindow(hwnd); /* recieving ansi code from unicode window, use it */ notifyFormat = NFR_ANSI; hwnd = create_listview_controlW(0, hwndparentW); ok(hwnd != NULL, "failed to create a listview window\n"); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "expected header to be created\n"); r = SendMessageW(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); DestroyWindow(hwnd); /* unicode listview with ansi parent window */ notifyFormat = -1; hwnd = create_listview_controlW(0, hwndparent); ok(hwnd != NULL, "failed to create a listview window\n"); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "expected header to be created\n"); r = SendMessageW(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); DestroyWindow(hwnd); /* unicode listview with ansi parent window, return error code */ notifyFormat = 0; hwnd = create_listview_controlW(0, hwndparent); ok(hwnd != NULL, "failed to create a listview window\n"); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "expected header to be created\n"); r = SendMessageW(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); DestroyWindow(hwnd); DestroyWindow(hwndparentW);

1 0

Alexandre Julliard : advapi32/tests: Avoid accessing an uninitialized pointer.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: ac5002ed2b7a475980ac3ba60fa24320d42d2e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5002ed2b7a475980ac3ba60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 13:27:32 2009 +0200 advapi32/tests: Avoid accessing an uninitialized pointer. --- dlls/advapi32/tests/security.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b68629d..af52a3a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1237,10 +1237,11 @@ static void test_token_attr(void) Domain[0] = '\0'; ret = LookupAccountSid(NULL, Groups->Groups[i].Sid, Name, &NameLength, Domain, &DomainLength, &SidNameUse); if (ret) - trace("\t%s, %s\\%s use: %d attr: 0x%08x\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); - else - trace("\t%s, attr: 0x%08x LookupAccountSid failed with error %d\n", SidString, Groups->Groups[i].Attributes, GetLastError()); - LocalFree(SidString); + { + trace("%s, %s\\%s use: %d attr: 0x%08x\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); + LocalFree(SidString); + } + else trace("attr: 0x%08x LookupAccountSid failed with error %d\n", Groups->Groups[i].Attributes, GetLastError()); } HeapFree(GetProcessHeap(), 0, Groups);

1 0

Alexander Nicolaysen Sørnes : Fix syntax in config.php.sample
by Alexander Nicolaysen Sørnes 15 Jun '09

15 Jun '09

Module: appdb Branch: master Commit: b62ed3aab6304d45048cda257aa4ea0502266bb6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b62ed3aab6304d45048cda25… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jun 15 15:17:04 2009 +0200 Fix syntax in config.php.sample --- include/config.php.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/config.php.sample b/include/config.php.sample index 6caf756..86f924a 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -35,7 +35,7 @@ define("TESTDATA_AGED_THRESHOLD", 175); // Show versions from these branches even if they are not among the most recent ones // Separate by commas if there are more than one -define("STABLE_BRANCHES", "1.0.");); +define("STABLE_BRANCHES", "1.0."); /* * apps database info

1 0

Alexander Nicolaysen Sørnes : Merge some code to get list of Wine versions
by Alexander Nicolaysen Sørnes 15 Jun '09

15 Jun '09

Module: appdb Branch: master Commit: 70729a700c63a41da2ae3520a68dbe136b2fdb2b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=70729a700c63a41da2ae3520… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jun 15 15:18:39 2009 +0200 Merge some code to get list of Wine versions --- include/util.php | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff --git a/include/util.php b/include/util.php index acdac5a..5d9cb8b 100644 --- a/include/util.php +++ b/include/util.php @@ -165,8 +165,10 @@ function get_xml_tag ($file, $mode = null) /* bugzilla functions */ // Returns an array containg the Wine versions stored in our Bugzilla DB -function get_bugzilla_versions() +// If bReturnIds is true, version ids are returned instead of names +function get_bugzilla_versions($bReturnIds = false) { + $sFetchColumn = $bReturnIds ? 'id' : 'value'; $aVersions = array(); $sTable = BUGZILLA_DB.".versions"; @@ -180,7 +182,7 @@ function get_bugzilla_versions() foreach($aBranches as $sBranch) { $sWhere = "WHERE product_id =".BUGZILLA_PRODUCT_ID." AND value LIKE '$sBranch%'"; - $sQuery = "SELECT value FROM $sTable $sWhere ORDER BY id desc limit 6"; + $sQuery = "SELECT $sFetchColumn FROM $sTable $sWhere ORDER BY id desc limit 6"; $hResult = query_bugzilladb($sQuery); if($hResult) { @@ -198,18 +200,7 @@ function get_bugzilla_versions() // Returns an array containing the IDs of the Wine versions stored in Bugzilla function get_bugzilla_version_ids() { - $aIds = array(); - $hResult = query_bugzilladb("SELECT id FROM ".BUGZILLA_DB.".versions WHERE - product_id = '".BUGZILLA_PRODUCT_ID."' - ORDER BY id DESC LIMIT 6"); - - if(!$hResult) - return $aIds; - - while(list($sId) = mysql_fetch_row($hResult)) - $aIds[] = $sId; - - return $aIds; + return get_bugzilla_versions(true); } // $sVarname - name of the selection array that this function will output

1 0

Detlef Riekenberg : setupapi: Move IsUserAdmin to shell32.IsUserAnAdmin.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: ed1b527dd94d3fd26f2ad81e451c59df42d89a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1b527dd94d3fd26f2ad81e4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 12 22:25:06 2009 +0200 setupapi: Move IsUserAdmin to shell32.IsUserAnAdmin. --- dlls/setupapi/misc.c | 62 +------------------------------------ dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellord.c | 74 ++++++++++++++++++++++++++++++++++++++++++-- include/shlobj.h | 1 + 4 files changed, 74 insertions(+), 65 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index a9efa2a..08c0c79 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -30,6 +30,7 @@ #include "lzexpand.h" #include "softpub.h" #include "mscat.h" +#include "shlobj.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -197,67 +198,8 @@ LONG WINAPI QueryRegistryValue(HKEY hKey, */ BOOL WINAPI IsUserAdmin(VOID) { - SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; - HANDLE hToken; - DWORD dwSize; - PTOKEN_GROUPS lpGroups; - PSID lpSid; - DWORD i; - BOOL bResult = FALSE; - TRACE("\n"); - - if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) - { - return FALSE; - } - - if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) - { - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - CloseHandle(hToken); - return FALSE; - } - } - - lpGroups = MyMalloc(dwSize); - if (lpGroups == NULL) - { - CloseHandle(hToken); - return FALSE; - } - - if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) - { - MyFree(lpGroups); - CloseHandle(hToken); - return FALSE; - } - - CloseHandle(hToken); - - if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, - &lpSid)) - { - MyFree(lpGroups); - return FALSE; - } - - for (i = 0; i < lpGroups->GroupCount; i++) - { - if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) - { - bResult = TRUE; - break; - } - } - - FreeSid(lpSid); - MyFree(lpGroups); - - return bResult; + return IsUserAnAdmin(); } diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 9d4808f..b50890b 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -251,7 +251,7 @@ 654 stdcall @(long long) shell32_654 # ReadCabinetState(a)8 660 stdcall -noname FileIconInit(long) - 680 stdcall -noname IsUserAdmin() + 680 stdcall -noname IsUserAnAdmin() 704 stdcall -noname GUIDFromStringW(wstr ptr) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 5eb4507..2fef940 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1279,13 +1279,79 @@ BOOL WINAPI FileIconInit(BOOL bFullInit) { FIXME("(%s)\n", bFullInit ? "true" : "false"); return 0; } + /************************************************************************* - * IsUserAdmin [SHELL32.680] NT 4.0 + * IsUserAnAdmin [SHELL32.680] NT 4.0 + * + * Checks whether the current user is a member of the Administrators group. * + * PARAMS + * None + * + * RETURNS + * Success: TRUE + * Failure: FALSE */ -HRESULT WINAPI IsUserAdmin(void) -{ FIXME("stub\n"); - return TRUE; +BOOL WINAPI IsUserAnAdmin(VOID) +{ + SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; + HANDLE hToken; + DWORD dwSize; + PTOKEN_GROUPS lpGroups; + PSID lpSid; + DWORD i; + BOOL bResult = FALSE; + + TRACE("\n"); + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + { + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + CloseHandle(hToken); + return FALSE; + } + } + + lpGroups = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (lpGroups == NULL) + { + CloseHandle(hToken); + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) + { + HeapFree(GetProcessHeap(), 0, lpGroups); + CloseHandle(hToken); + return FALSE; + } + + CloseHandle(hToken); + if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, + &lpSid)) + { + HeapFree(GetProcessHeap(), 0, lpGroups); + return FALSE; + } + + for (i = 0; i < lpGroups->GroupCount; i++) + { + if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) + { + bResult = TRUE; + break; + } + } + + FreeSid(lpSid); + HeapFree(GetProcessHeap(), 0, lpGroups); + return bResult; } /************************************************************************* diff --git a/include/shlobj.h b/include/shlobj.h index a608a7e..01f8368 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -77,6 +77,7 @@ VOID WINAPI SHUpdateImageW(LPCWSTR,INT,UINT,INT); #define SHUpdateImage WINELIB_NAME_AW(SHUpdateImage) int WINAPI RestartDialog(HWND,LPCWSTR,DWORD); int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD); +BOOL WINAPI IsUserAnAdmin(void); #define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */

1 0