wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Hans Leidekker : msi: Use binary search to find the insert index for a row.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 337fb86c3bb8d77987aebd36584338f9e77597c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=337fb86c3bb8d77987aebd365… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 24 17:09:16 2010 +0200 msi: Use binary search to find the insert index for a row. --- dlls/msi/table.c | 77 +++++++++++++++++++++++++++++++++--------------------- 1 files changed, 47 insertions(+), 30 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 464eced..9fbb0a1 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1578,39 +1578,60 @@ static UINT table_validate_new( MSITABLEVIEW *tv, MSIRECORD *rec ) return ERROR_SUCCESS; } -static UINT find_insert_index( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *pidx ) +static int compare_record( MSITABLEVIEW *tv, UINT row, MSIRECORD *rec ) { - UINT r, idx, j, ivalue, x; + UINT r, i, ivalue, x; - TRACE("%p %p %p\n", tv, rec, pidx); - - for (idx = 0; idx < tv->table->row_count; idx++) + for (i = 0; i < tv->num_cols; i++ ) { - for (j = 0; j < tv->num_cols; j++ ) + r = get_table_value_from_record( tv, rec, i + 1, &ivalue ); + if (r != ERROR_SUCCESS) + return 1; + + r = TABLE_fetch_int( &tv->view, row, i + 1, &x ); + if (r != ERROR_SUCCESS) { - r = get_table_value_from_record (tv, rec, j+1, &ivalue); - if (r != ERROR_SUCCESS) - break; + WARN("TABLE_fetch_int should not fail here %u\n", r); + return -1; + } + if (ivalue > x) + { + return 1; + } + else if (ivalue == x) + { + if (i < tv->num_cols - 1) continue; + return 0; + } + else + return -1; + } + return 1; +} - r = TABLE_fetch_int(&tv->view, idx, j + 1, &x); - if (r != ERROR_SUCCESS) - return r; +static int find_insert_index( MSITABLEVIEW *tv, MSIRECORD *rec ) +{ + int idx, c, low = 0, high = tv->table->row_count - 1; - if (ivalue > x) - break; - else if (ivalue == x) - continue; - else { - TRACE("Found %d.\n", idx); - *pidx = idx; - return ERROR_SUCCESS; - } + TRACE("%p %p\n", tv, rec); + + while (low <= high) + { + idx = (low + high) / 2; + c = compare_record( tv, idx, rec ); + + if (c < 0) + high = idx - 1; + else if (c > 0) + low = idx + 1; + else + { + TRACE("found %u\n", idx); + return idx; } } - - TRACE("Found %d.\n", idx); - *pidx = idx; - return ERROR_SUCCESS; + TRACE("found %u\n", high + 1); + return high + 1; } static UINT TABLE_insert_row( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) @@ -1626,11 +1647,7 @@ static UINT TABLE_insert_row( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, return ERROR_FUNCTION_FAILED; if (row == -1) - { - r = find_insert_index(tv, rec, &row); - if( r != ERROR_SUCCESS ) - return ERROR_FUNCTION_FAILED; - } + row = find_insert_index( tv, rec ); r = table_create_new_row( view, &row, temporary ); TRACE("insert_row returned %08x\n", r);

1 0

Hans Leidekker : msi: Avoid accessing memory before the left hand string in compare_substring.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: e58a67e9cd19bc1aef646e8f3fadaf0c490b38de URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58a67e9cd19bc1aef646e8f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 24 17:09:04 2010 +0200 msi: Avoid accessing memory before the left hand string in compare_substring. --- dlls/msi/cond.y | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 9a7a16d..03ea493 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -462,11 +462,21 @@ static INT compare_substring( LPCWSTR a, INT operator, LPCWSTR b ) case COND_LHS: return 0 == strncmpW( a, b, lstrlenW( b ) ); case COND_RHS: - return 0 == lstrcmpW( a + (lstrlenW( a ) - lstrlenW( b )), b ); + { + int l = lstrlenW( a ); + int r = lstrlenW( b ); + if (r > l) return 0; + return 0 == lstrcmpW( a + (l - r), b ); + } case COND_ILHS: return 0 == strncmpiW( a, b, lstrlenW( b ) ); case COND_IRHS: - return 0 == lstrcmpiW( a + (lstrlenW( a ) - lstrlenW( b )), b ); + { + int l = lstrlenW( a ); + int r = lstrlenW( b ); + if (r > l) return 0; + return 0 == lstrcmpiW( a + (l - r), b ); + } default: ERR("invalid substring operator\n"); return 0;

1 0

Hans Leidekker : msi: A progid without a class is not an error.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: c5ef45e5ef12a7ff373face488d063b85f95b45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ef45e5ef12a7ff373face48… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 24 17:08:56 2010 +0200 msi: A progid without a class is not an error. --- dlls/msi/classes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 30ee36b..5943805 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -1072,7 +1072,7 @@ static UINT register_progid( const MSIPROGID* progid ) if (clsid) msi_reg_set_subkey_val( hkey, szCLSID, NULL, clsid ); else - ERR("%s has no class\n", debugstr_w( progid->ProgID ) ); + TRACE("%s has no class\n", debugstr_w( progid->ProgID ) ); if (progid->Description) msi_reg_set_val_str( hkey, NULL, progid->Description );

1 0

Hans Leidekker : msi/test: Add tests for MsiGetFeatureState.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: d59c99067a3f17f3ecb75689e1355b42b5101089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59c99067a3f17f3ecb75689e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 24 17:08:48 2010 +0200 msi/test: Add tests for MsiGetFeatureState. --- dlls/msi/tests/package.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 841ef14..7efb6a2 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3283,6 +3283,19 @@ static void test_states(void) r = MsiDoAction( hpkg, "FileCost"); ok( r == ERROR_SUCCESS, "file cost failed\n"); + r = MsiGetFeatureState(hpkg, "one", NULL, NULL); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "one", NULL, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + + state = 0xdeadbee; + r = MsiGetFeatureState( hpkg, "one", &state, NULL); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "one", &state, &action);

1 0

Hans Leidekker : msi: Remove unused field from MSICOMPONENT structure.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: d56d0d98a3a9603e6d149678580203c69aff2af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56d0d98a3a9603e6d1496785… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 24 17:08:36 2010 +0200 msi: Remove unused field from MSICOMPONENT structure. --- dlls/msi/msipriv.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 99486ec..2e87918 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -399,7 +399,6 @@ typedef struct tagMSIFEATURE typedef struct tagMSICOMPONENT { struct list entry; - DWORD magic; LPWSTR Component; LPWSTR ComponentId; LPWSTR Directory;

1 0

Juan Lang : crypt32: Add parameter checking to CryptSIPCreateIndirectData.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 604e39dde5c189b6e35cc3205c34d3d8cb18a5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604e39dde5c189b6e35cc3205… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 2 18:31:23 2010 -0700 crypt32: Add parameter checking to CryptSIPCreateIndirectData. --- dlls/crypt32/sip.c | 5 +++++ dlls/wintrust/tests/softpub.c | 13 ------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index e207457..d2f55f2 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -715,6 +715,11 @@ BOOL WINAPI CryptSIPCreateIndirectData(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pcb TRACE("(%p %p %p)\n", pSubjectInfo, pcbIndirectData, pIndirectData); + if (!pSubjectInfo || !pSubjectInfo->pgSubjectType || !pcbIndirectData) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) ret = sip->info.pfCreate(pSubjectInfo, pcbIndirectData, pIndirectData); TRACE("returning %d\n", ret); diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index dd12000..b431ff8 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -619,28 +619,17 @@ static void test_sip_create_indirect_data(void) skip("Missing CryptSIPCreateIndirectData\n"); return; } -if (0) -{ - /* FIXME: crashes Wine */ SetLastError(0xdeadbeef); ret = CryptSIPCreateIndirectData_p(NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); -} - /* FIXME: this assignment is only to avoid a crash in Wine, it isn't - * needed by native. - */ - subjinfo.pgSubjectType = &unknown; SetLastError(0xdeadbeef); ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); subjinfo.cbSize = sizeof(subjinfo); SetLastError(0xdeadbeef); ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); file = create_temp_file(temp_file); @@ -655,13 +644,11 @@ if (0) subjinfo.hFile = file; SetLastError(0xdeadbeef); ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); subjinfo.pgSubjectType = &unknown; SetLastError(0xdeadbeef); ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); count = 0xdeadbeef;

1 0

Juan Lang : wintrust/tests: Test CryptSIPCreateIndirectData.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: ea715da1c6882ab89f20385cfb507c0388ff835c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea715da1c6882ab89f20385cf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 2 18:26:28 2010 -0700 wintrust/tests: Test CryptSIPCreateIndirectData. --- dlls/wintrust/tests/softpub.c | 268 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 250 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea715da1c6882ab89f203…

1 0

Aric Stewart : quartz: Allow for proper setting of the video window to WS_CHILD.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 97343b0f002902c0495969f25e48ace8983bf692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97343b0f002902c0495969f25… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Sep 24 08:53:14 2010 -0500 quartz: Allow for proper setting of the video window to WS_CHILD. If the set_WindowStyle comes before the set_Owner then the style was not being set properly (WS_CHILD cannot be set on a window with a NULL parent). So reset the window style when the set_Owner command comes in to make the new style allowable. --- dlls/quartz/videorenderer.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 0af8cc6..d3ccede 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -89,6 +89,7 @@ typedef struct VideoRendererImpl BOOL bAggregatable; REFERENCE_TIME rtLastStop; MediaSeekingImpl mediaSeeking; + LONG WindowStyle; /* During pause we can hold a single sample, for use in GetCurrentImage */ IMediaSample *sample_held; @@ -611,6 +612,7 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT)); pVideoRenderer->hWndMsgDrain = NULL; + pVideoRenderer->WindowStyle = WS_OVERLAPPED; /* construct input pin */ piInput.dir = PINDIR_INPUT; @@ -1782,8 +1784,10 @@ static HRESULT WINAPI Videowindow_put_WindowStyle(IVideoWindow *iface, if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_ICONIC|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) return E_INVALIDARG; - + SetWindowLongA(This->hWnd, GWL_STYLE, WindowStyle); + SetWindowPos(This->hWnd,0,0,0,0,0,SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOZORDER); + This->WindowStyle = WindowStyle; return S_OK; } @@ -1794,7 +1798,7 @@ static HRESULT WINAPI Videowindow_get_WindowStyle(IVideoWindow *iface, TRACE("(%p/%p)->(%p)\n", This, iface, WindowStyle); - *WindowStyle = GetWindowLongA(This->hWnd, GWL_STYLE); + *WindowStyle = This->WindowStyle; return S_OK; } @@ -2013,6 +2017,15 @@ static HRESULT WINAPI Videowindow_put_Owner(IVideoWindow *iface, TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Owner); SetParent(This->hWnd, (HWND)Owner); + if (This->WindowStyle & WS_CHILD) + { + LONG old = GetWindowLongA(This->hWnd, GWL_STYLE); + if (old != This->WindowStyle) + { + SetWindowLongA(This->hWnd, GWL_STYLE, This->WindowStyle); + SetWindowPos(This->hWnd,0,0,0,0,0,SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOZORDER); + } + } return S_OK; }

1 0

James McKenzie : wineps.drv: Correct a typo.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 95c3c3fdc67c3dc7cb8f5fb72050b33c64c2f106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c3c3fdc67c3dc7cb8f5fb72… Author: James McKenzie <jjmckenzie51(a)earthlink.net> Date: Thu Sep 23 21:07:03 2010 -0700 wineps.drv: Correct a typo. --- dlls/wineps.drv/escape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index b5a3720..988381e 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -310,7 +310,7 @@ INT CDECL PSDRV_ExtEscape( PSDRV_PDEVICE *physDev, INT nEscape, INT cbInput, LPC TRACE("END_PATH\n"); if(!physDev->pathdepth) { - ERR("END_PATH called without a BEIGN_PATH\n"); + ERR("END_PATH called without a BEGIN_PATH\n"); return -1; } TRACE("RenderMode = %d, FillMode = %d, BkMode = %d\n",

1 0

Matej Špindler : taskkill: Add Slovenian translation.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: fe7cfdcb1527f53d18bc65ae48a6db41ef5540b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7cfdcb1527f53d18bc65ae4… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri Sep 24 10:48:28 2010 +0200 taskkill: Add Slovenian translation. --- programs/taskkill/Makefile.in | 1 + programs/taskkill/Si.rc | 43 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index e24df64..7af915e 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ Ko.rc \ Lt.rc \ Nl.rc \ + Si.rc \ Sv.rc @MAKE_PROG_RULES@ diff --git a/programs/taskkill/Si.rc b/programs/taskkill/Si.rc new file mode 100644 index 0000000..b278544 --- /dev/null +++ b/programs/taskkill/Si.rc @@ -0,0 +1,43 @@ +/* + * Task termination utility + * Slovenian language support + * + * Copyright 2010 Matej Špindler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "taskkill.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Uporaba: taskkill [/?] [/f] [/im ImeProcesa | /pid IDProcesa]\n" + STRING_INVALID_OPTION, "Napaka: Nepoznana ali nepopolna ukazna vrstica.\n" + STRING_INVALID_PARAM, "Napaka: Nepravilen parameter ukazne vrstice.\n" + STRING_MISSING_OPTION, "Napaka: Ena izmed opcija /im ali /pid mora biti izbrana.\n" + STRING_MISSING_PARAM, "Napaka: Opcija %s pričakuje parameter v ukazni vstici.\n" + STRING_MUTUAL_EXCLUSIVE, "Napaka: Opciji /im in /pid se izključujeta.\n" + STRING_CLOSE_PID_SEARCH, "Sporočilo zapri poslano vrhnjemu oknu procesa s PID %u.\n" + STRING_CLOSE_PROC_SRCH, "Sporočilo zapri poslano vrhnjemu oknu procesa \"%s\" s PID %u.\n" + STRING_TERM_PID_SEARCH, "Proces s PID %u je bil prisilno končan.\n" + STRING_TERM_PROC_SEARCH, "Proces \"%s\" s PID %u je bil prisilno končan.\n" + STRING_SEARCH_FAILED, "Napaka: Procesa \"%s\" ni mogoče najti.\n" + STRING_ENUM_FAILED, "Napaka: Ne morem dobiti seznama procesov.\n" + STRING_TERMINATE_FAILED, "Napaka: Procesa \"%s\" ni mogoče končati.\n" +}

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
86
Older →

Jump to page:

2025

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 2010