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

Nikolay Sivov : comctl32/listview: Update some ListView structures with recently added members.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: ee015b8cd493397ba289fea5069099310ec7766e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee015b8cd493397ba289fea50… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 10 22:11:40 2009 +0400 comctl32/listview: Update some ListView structures with recently added members. --- include/commctrl.h | 73 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 58 insertions(+), 15 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 7d77faa..849fa46 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3301,10 +3301,15 @@ typedef struct tagLVITEMA INT cchTextMax; INT iImage; LPARAM lParam; - INT iIndent; /* (_WIN32_IE >= 0x0300) */ - int iGroupId; /* (_WIN32_IE >= 0x560) */ - UINT cColumns; /* (_WIN32_IE >= 0x560) */ - PUINT puColumns; /* (_WIN32_IE >= 0x560) */ + /* (_WIN32_IE >= 0x0300) */ + INT iIndent; + /* (_WIN32_IE >= 0x0560) */ + INT iGroupId; + UINT cColumns; + PUINT puColumns; + /* (_WIN32_WINNT >= 0x0600) */ + PINT piColFmt; + INT iGroup; } LVITEMA, *LPLVITEMA; typedef struct tagLVITEMW @@ -3318,10 +3323,15 @@ typedef struct tagLVITEMW INT cchTextMax; INT iImage; LPARAM lParam; - INT iIndent; /* (_WIN32_IE >= 0x0300) */ - int iGroupId; /* (_WIN32_IE >= 0x560) */ - UINT cColumns; /* (_WIN32_IE >= 0x560) */ - PUINT puColumns; /* (_WIN32_IE >= 0x560) */ + /* (_WIN32_IE >= 0x0300) */ + INT iIndent; + /* (_WIN32_IE >= 0x0560) */ + INT iGroupId; + UINT cColumns; + PUINT puColumns; + /* (_WIN32_WINNT >= 0x0600) */ + PINT piColFmt; + INT iGroup; } LVITEMW, *LPLVITEMW; #define LVITEM WINELIB_NAME_AW(LVITEM) @@ -3331,6 +3341,10 @@ typedef struct tagLVITEMW #define LVITEM_V1_SIZEW CCSIZEOF_STRUCT(LVITEMW, lParam) #define LVITEM_V1_SIZE WINELIB_NAME_AW(LVITEM_V1_SIZE) +#define LVITEMA_V5_SIZE CCSIZEOF_STRUCT(LVITEMA, puColumns) +#define LVITEMW_V5_SIZE CCSIZEOF_STRUCT(LVITEMW, puColumns) +#define LVITEM_V5_SIZE WINELIB_NAME_AW(LVITEM_V5_SIZE) + #define LV_ITEM LVITEM #define LV_ITEMA LVITEMA #define LV_ITEMW LVITEMW @@ -3394,8 +3408,13 @@ typedef struct tagLVCOLUMNA LPSTR pszText; INT cchTextMax; INT iSubItem; - INT iImage; /* (_WIN32_IE >= 0x0300) */ - INT iOrder; /* (_WIN32_IE >= 0x0300) */ + /* (_WIN32_IE >= 0x0300) */ + INT iImage; + INT iOrder; + /* (_WIN32_WINNT >= 0x0600) */ + INT cxMin; + INT cxDefault; + INT cxIdeal; } LVCOLUMNA, *LPLVCOLUMNA; typedef struct tagLVCOLUMNW @@ -3406,8 +3425,13 @@ typedef struct tagLVCOLUMNW LPWSTR pszText; INT cchTextMax; INT iSubItem; - INT iImage; /* (_WIN32_IE >= 0x0300) */ - INT iOrder; /* (_WIN32_IE >= 0x0300) */ + /* (_WIN32_IE >= 0x0300) */ + INT iImage; + INT iOrder; + /* (_WIN32_WINNT >= 0x0600) */ + INT cxMin; + INT cxDefault; + INT cxIdeal; } LVCOLUMNW, *LPLVCOLUMNW; #define LVCOLUMN WINELIB_NAME_AW(LVCOLUMN) @@ -3513,6 +3537,8 @@ typedef struct tagLVHITTESTINFO UINT flags; INT iItem; INT iSubItem; + /* (_WIN32_WINNT >= 0x0600) */ + INT iGroup; } LVHITTESTINFO, *LPLVHITTESTINFO; #define LV_HITTESTINFO LVHITTESTINFO @@ -3551,15 +3577,32 @@ typedef struct LVGROUP UINT cbSize; UINT mask; LPWSTR pszHeader; - int cchHeader; + INT cchHeader; LPWSTR pszFooter; - int cchFooter; - int iGroupId; + INT cchFooter; + INT iGroupId; UINT stateMask; UINT state; UINT uAlign; + /* (_WIN32_WINNT >= 0x0600) */ + LPWSTR pszSubtitle; + UINT cchSubtitle; + LPWSTR pszTask; + UINT cchTask; + LPWSTR pszDescriptionTop; + UINT cchDescriptionTop; + LPWSTR pszDescriptionBottom; + UINT cchDescriptionBottom; + INT iTitleImage; + INT iExtendedImage; + INT iFirstItem; + UINT cItems; + LPWSTR pszSubsetTitle; + UINT cchSubsetTitle; } LVGROUP, *PLVGROUP; +#define LVGROUP_V5_SIZE CCSIZEOF_STRUCT(LVGROUP, uAlign) + typedef struct LVGROUPMETRICS { UINT cbSize;

1 0

Nikolay Sivov : comctl32/listview: Make item width calculation not rely on column order for LV_VIEW_DETAILS.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: a5c970dea9cbe50a124443556c9bfe11d90ab23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c970dea9cbe50a124443556… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 10 22:56:44 2009 +0400 comctl32/listview: Make item width calculation not rely on column order for LV_VIEW_DETAILS. --- dlls/comctl32/listview.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 55519dd..c210bf5 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2505,11 +2505,15 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) nItemWidth = infoPtr->iconSpacing.cx; else if (infoPtr->uView == LV_VIEW_DETAILS) { - RECT rcHeader; - if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0) { - LISTVIEW_GetHeaderRect(infoPtr, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, &rcHeader); + RECT rcHeader; + INT index; + + index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, + DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); + + LISTVIEW_GetHeaderRect(infoPtr, index, &rcHeader); nItemWidth = rcHeader.right; } }

1 0

Nikolay Sivov : comctl32/listview: Don't use special value (1) for item width to represent both zero and one pixel width.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: f2f444a230ba69ae6fabe28e8c0c1b95484a9362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f444a230ba69ae6fabe28e8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jun 11 00:32:46 2009 +0400 comctl32/listview: Don't use special value (1) for item width to represent both zero and one pixel width. --- dlls/comctl32/listview.c | 26 ++++++++++++++++++++------ dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c210bf5..8ef516a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1239,12 +1239,25 @@ static BOOL iterator_frameditems(ITERATOR* i, const LISTVIEW_INFO* infoPtr, cons INT nPerCol = max((infoPtr->rcList.bottom - infoPtr->rcList.top) / infoPtr->nItemHeight, 1); INT nFirstRow = max(frame.top / infoPtr->nItemHeight, 0); INT nLastRow = min((frame.bottom - 1) / infoPtr->nItemHeight, nPerCol - 1); - INT nFirstCol = max(frame.left / infoPtr->nItemWidth, 0); - INT nLastCol = min((frame.right - 1) / infoPtr->nItemWidth, (infoPtr->nItemCount + nPerCol - 1) / nPerCol); - INT lower = nFirstCol * nPerCol + nFirstRow; + INT nFirstCol; + INT nLastCol; + INT lower; RANGE item_range; INT nCol; + if (infoPtr->nItemWidth) + { + nFirstCol = max(frame.left / infoPtr->nItemWidth, 0); + nLastCol = min((frame.right - 1) / infoPtr->nItemWidth, (infoPtr->nItemCount + nPerCol - 1) / nPerCol); + } + else + { + nFirstCol = max(frame.left, 0); + nLastCol = min(frame.right - 1, (infoPtr->nItemCount + nPerCol - 1) / nPerCol); + } + + lower = nFirstCol * nPerCol + nFirstRow; + TRACE("nPerCol=%d, nFirstRow=%d, nLastRow=%d, nFirstCol=%d, nLastCol=%d, lower=%d\n", nPerCol, nFirstRow, nLastRow, nFirstCol, nLastCol, lower); @@ -1493,7 +1506,7 @@ static inline INT LISTVIEW_GetCountPerRow(const LISTVIEW_INFO *infoPtr) { INT nListWidth = infoPtr->rcList.right - infoPtr->rcList.left; - return max(nListWidth/infoPtr->nItemWidth, 1); + return max(nListWidth/(infoPtr->nItemWidth ? infoPtr->nItemWidth : 1), 1); } /*** @@ -1736,7 +1749,8 @@ static void LISTVIEW_UpdateScroll(const LISTVIEW_INFO *infoPtr) if(horzInfo.nPage < infoPtr->nItemWidth) horzInfo.nPage = infoPtr->nItemWidth; - horzInfo.nPage /= infoPtr->nItemWidth; + if (infoPtr->nItemWidth) + horzInfo.nPage /= infoPtr->nItemWidth; } else if (infoPtr->uView == LV_VIEW_DETAILS) { @@ -2530,7 +2544,7 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) nItemWidth = max(DEFAULT_COLUMN_WIDTH, nItemWidth + WIDTH_PADDING); } - return max(nItemWidth, 1); + return nItemWidth; } /*** diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2dce945..3895bea 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2829,7 +2829,7 @@ static void test_getitemrect(void) /* zero width rectangle with no padding */ expect(0, rect.left); - todo_wine expect(0, rect.right); + expect(0, rect.right); insert_column(hwnd, 0); insert_column(hwnd, 1);

1 0

Nikolay Sivov : comctl32/header: Update some Header flags and structures.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 779d9ee2582793650e9ed5353eda0e78b16485ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=779d9ee2582793650e9ed5353… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jun 11 01:27:45 2009 +0400 comctl32/header: Update some Header flags and structures. --- include/commctrl.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 849fa46..6347dff 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -736,6 +736,8 @@ static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2', #define HDS_FILTERBAR 0x0100 #define HDS_FLAT 0x0200 #define HDS_CHECKBOXES 0x0400 +#define HDS_NOSIZING 0x0800 +#define HDS_OVERFLOW 0x1000 #define HDI_WIDTH 0x0001 #define HDI_HEIGHT HDI_WIDTH @@ -747,6 +749,9 @@ static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2', #define HDI_DI_SETITEM 0x0040 #define HDI_ORDER 0x0080 #define HDI_FILTER 0x0100 +#define HDI_STATE 0x0200 + +#define HDIS_FOCUSED 0x00000001 #define HDF_LEFT 0x0000 #define HDF_RIGHT 0x0001 @@ -763,6 +768,7 @@ static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2', #define HDF_BITMAP 0x2000 #define HDF_STRING 0x4000 #define HDF_OWNERDRAW 0x8000 +#define HDF_SPLITBUTTON 0x1000000 #define HHT_NOWHERE 0x0001 #define HHT_ONHEADER 0x0002 @@ -775,6 +781,8 @@ static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2', #define HHT_TORIGHT 0x0400 #define HHT_TOLEFT 0x0800 #define HHT_ONITEMSTATEICON 0x1000 +#define HHT_ONDROPDOWN 0x2000 +#define HHT_ONOVERFLOW 0x4000 #define HDM_FIRST 0x1200 #define HDM_GETITEMCOUNT (HDM_FIRST+0) @@ -862,10 +870,14 @@ typedef struct _HD_ITEMA INT cchTextMax; INT fmt; LPARAM lParam; + /* (_WIN32_IE >= 0x0300) */ INT iImage; INT iOrder; + /* (_WIN32_IE >= 0x0500) */ UINT type; LPVOID pvFilter; + /* (_WIN32_WINNT >= 0x0600) */ + UINT state; } HDITEMA, *LPHDITEMA; typedef struct _HD_ITEMW @@ -877,10 +889,14 @@ typedef struct _HD_ITEMW INT cchTextMax; INT fmt; LPARAM lParam; + /* (_WIN32_IE >= 0x0300) */ INT iImage; INT iOrder; + /* (_WIN32_IE >= 0x0500) */ UINT type; LPVOID pvFilter; + /* (_WIN32_WINNT >= 0x0600) */ + UINT state; } HDITEMW, *LPHDITEMW; #define HDITEM WINELIB_NAME_AW(HDITEM)

1 0

Hib Eris : msi: Fix a crash when freeing memory.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 8fb7fdd0295df22b19bc9ee55431ff54521a6ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb7fdd0295df22b19bc9ee55… Author: Hib Eris <hib(a)hiberis.nl> Date: Wed Jun 10 17:13:59 2009 +0200 msi: Fix a crash when freeing memory. --- dlls/msi/streams.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 2d869cc..12f707e 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -60,7 +60,7 @@ static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) if (size >= sv->max_streams) { sv->max_streams *= 2; - sv->streams = msi_realloc(sv->streams, sv->max_streams * sizeof(STREAM *)); + sv->streams = msi_realloc_zero(sv->streams, sv->max_streams * sizeof(STREAM *)); if (!sv->streams) return FALSE; } @@ -387,7 +387,7 @@ static UINT STREAMS_delete(struct tagMSIVIEW *view) for (i = 0; i < sv->num_rows; i++) { - if (sv->streams[i]->stream) + if (sv->streams[i] && sv->streams[i]->stream) IStream_Release(sv->streams[i]->stream); msi_free(sv->streams[i]); } @@ -462,7 +462,7 @@ static INT add_streams_to_table(MSISTREAMSVIEW *sv) return -1; sv->max_streams = 1; - sv->streams = msi_alloc(sizeof(STREAM *)); + sv->streams = msi_alloc_zero(sizeof(STREAM *)); if (!sv->streams) return -1;

1 0

Huw Davies : oleaut32: Calling SetLcid with LOCALE_NEUTRAL is a special case which sets the first header lcid to US English and the second one to 0 .
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: d84693cc291db686cdcd2e2e3d9b83991f2de4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84693cc291db686cdcd2e2e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 10 16:45:29 2009 +0100 oleaut32: Calling SetLcid with LOCALE_NEUTRAL is a special case which sets the first header lcid to US English and the second one to 0. --- dlls/oleaut32/tests/typelib.c | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 7 ++++- 2 files changed, 61 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 6a07a49..2748ed0 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1378,6 +1378,58 @@ static const char *create_test_typelib(void) return filename; } +static void test_create_typelib_lcid(LCID lcid) +{ + char filename[MAX_PATH]; + WCHAR name[MAX_PATH]; + HRESULT hr; + ICreateTypeLib2 *tl; + HANDLE file; + DWORD msft_header[5]; /* five is enough for now */ + DWORD read; + + GetTempFileNameA( ".", "tlb", 0, filename ); + MultiByteToWideChar(CP_ACP, 0, filename, -1, name, MAX_PATH); + + hr = CreateTypeLib2(SYS_WIN32, name, &tl); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetLcid(tl, lcid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SaveAllChanges(tl); + ICreateTypeLib2_Release(tl); + + file = CreateFileA( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); + + ReadFile( file, msft_header, sizeof(msft_header), &read, NULL ); + ok(read == sizeof(msft_header), "read %d\n", read); + CloseHandle( file ); + + ok(msft_header[0] == 0x5446534d, "got %08x\n", msft_header[0]); + ok(msft_header[1] == 0x00010002, "got %08x\n", msft_header[1]); + ok(msft_header[2] == 0xffffffff, "got %08x\n", msft_header[2]); + ok(msft_header[3] == (lcid ? lcid : 0x409), "got %08x (lcid %08x)\n", msft_header[3], lcid); + ok(msft_header[4] == lcid, "got %08x (lcid %08x)\n", msft_header[4], lcid); + + DeleteFileA(filename); +} + +static void test_create_typelibs(void) +{ + test_create_typelib_lcid(LOCALE_SYSTEM_DEFAULT); + test_create_typelib_lcid(LOCALE_USER_DEFAULT); + test_create_typelib_lcid(LOCALE_NEUTRAL); + + test_create_typelib_lcid(0x009); + test_create_typelib_lcid(0x409); + test_create_typelib_lcid(0x809); + + test_create_typelib_lcid(0x007); + test_create_typelib_lcid(0x407); +} + START_TEST(typelib) { const char *filename; @@ -1394,4 +1446,7 @@ START_TEST(typelib) test_dump_typelib( filename ); DeleteFile( filename ); } + + test_create_typelibs(); + } diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 3d092e5..b011342 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3204,7 +3204,10 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 * iface, /****************************************************************************** * ICreateTypeLib2_SetLcid {OLEAUT32} * - * See ICreateTypeLib_SetLcid. + * Sets both the lcid and lcid2 members in the header to lcid. + * + * As a special case if lcid == LOCALE_NEUTRAL (0), then the first header lcid + * is set to US English while the second one is set to 0. */ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 * iface, LCID lcid) { @@ -3214,6 +3217,8 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 * iface, LCID lc This->typelib_header.lcid = This->typelib_header.lcid2 = lcid; + if(lcid == LOCALE_NEUTRAL) This->typelib_header.lcid = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US); + return S_OK; }

1 0

Damjan Jovanovic : start.exe: Add infrastructure to launch windows file open associations from freedesktop .
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 3b52d42ab4151f4620313dae351f4ae35366f00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b52d42ab4151f4620313dae3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Jun 10 21:11:48 2009 +0200 start.exe: Add infrastructure to launch windows file open associations from freedesktop. --- programs/start/Cs.rc | 1 + programs/start/De.rc | 1 + programs/start/En.rc | 1 + programs/start/Es.rc | 1 + programs/start/Fr.rc | 1 + programs/start/It.rc | 1 + programs/start/Ko.rc | 1 + programs/start/Nl.rc | 1 + programs/start/Pl.rc | 1 + programs/start/Pt.rc | 1 + programs/start/Ru.rc | 1 + programs/start/Si.rc | 1 + programs/start/Tr.rc | 1 + programs/start/start.c | 21 +++++++++++++++++++-- 14 files changed, 32 insertions(+), 2 deletions(-) diff --git a/programs/start/Cs.rc b/programs/start/Cs.rc index b319f8d..1693f8b 100644 --- a/programs/start/Cs.rc +++ b/programs/start/Cs.rc @@ -37,6 +37,7 @@ Volby:\n\ /MAX[imalizovan�] Spust� program maximalizovan�.\n\ /R Spust� program norm�ln� (ani minimalizovan� ani maximalizovan�).\n\ /W �ek� na dokon�en� spu�t�n�ho programu, vrac� n�vratov� k�d.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Zobraz� licenci.\n\ \n\ start.exe verze 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/De.rc b/programs/start/De.rc index 3ab7aa0..4f54a53 100644 --- a/programs/start/De.rc +++ b/programs/start/De.rc @@ -34,6 +34,7 @@ Optionen:\n\ /MAX[imized] Starte das Programm maximiert.\n\ /R[estored] Starte das Programm normal (weder minimiert noch maximiert).\n\ /W[ait] Wartet bis das gestartete Programm sich beendet,\n\t dann beendet sich start mit dessen Exitcode des Programmes.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Zeige die Endbenutzerlizenz an.\n\ \n\ start.exe Version 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/En.rc b/programs/start/En.rc index f44ba11..0429fe9 100644 --- a/programs/start/En.rc +++ b/programs/start/En.rc @@ -34,6 +34,7 @@ Options:\n\ /R[estored] Start the program normally (neither minimized nor maximized).\n\ /W[ait] Wait for started program to finish, then exit with its exit code.\n\ /Unix Use a Unix filename and start the file like windows explorer.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Show end-user license.\n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Es.rc b/programs/start/Es.rc index fd74d8f..ac1c6d7 100644 --- a/programs/start/Es.rc +++ b/programs/start/Es.rc @@ -34,6 +34,7 @@ Opciones:\n\ /R[estored] Inicia el programa normalmente (ni minimizado ni maximizado).\n\ /W[ait] Espera que termine el programa iniciado y despu�s sale con su c�digo de salida.\n\ /Unix Usa un nombre de archivo de Unix e inicia el archivo como en el explorador de windows.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Muestra la licencia para el usuario final.\n\ \n\ start.exe versi�n 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Fr.rc b/programs/start/Fr.rc index 7373637..a2c8fd7 100644 --- a/programs/start/Fr.rc +++ b/programs/start/Fr.rc @@ -37,6 +37,7 @@ Options :\n\ /MAX[imized] Lance le programme maximisé.\n\ /R[estored] Lance le programme normalement (ni minimisé ni maximisé).\n\ /W[ait] Attend que le programme lancé se termine, et termine ensuite avec son code de sortie.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Montre la licence d'utilisation.\n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/It.rc b/programs/start/It.rc index aa83497..42f59ac 100644 --- a/programs/start/It.rc +++ b/programs/start/It.rc @@ -35,6 +35,7 @@ Options:\n\ /MAX[imized] Avvia il programma massimizato.\n\ /R[estored] Avvia il programma normalmente (n� minimizzato n� massimizato).\n\ /W[ait] Attendi l'uscita del programma, poi esci con il suo codice di uscita.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Mostra l'accordo di licenza con l'utente finale.\n\ \n\ start.exe versione 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Ko.rc b/programs/start/Ko.rc index 6c177fe..bc58ebc 100644 --- a/programs/start/Ko.rc +++ b/programs/start/Ko.rc @@ -35,6 +35,7 @@ Options:\n\ /R[estored] Ǯ�׸�� ·� ��۽�Ű�� (�ּ�ȭ�� ƴϰ� �ִ�ȭ�� ƴ�).\n\ /W[ait] ��۵� Ǯ�׸�� ٸ�, �� ڵ带 ��.\n\ /Unix �� ͽ��÷ξ�� н� ��̸�� ؼ� ��.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L �� ̼�� \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Nl.rc b/programs/start/Nl.rc index 725789a..69012a1 100644 --- a/programs/start/Nl.rc +++ b/programs/start/Nl.rc @@ -34,6 +34,7 @@ Options:\n\ /R[estored] Start het programma normaal (noch geminimaliseerd noch gemaximaliseerd).\n\ /W[ait] Wacht totdat het gestarte programma is be�indigd, eindig dan met de exit code van dat programma.\n\ /Unix Gebruik een Unix bestandsnaam en start het bestand als de windows verkenner.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Laat de gebruikerslicentie zien.\n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Pl.rc b/programs/start/Pl.rc index 514c192..09b9f51 100644 --- a/programs/start/Pl.rc +++ b/programs/start/Pl.rc @@ -35,6 +35,7 @@ Opcje:\n\ /R[estored] Uruchamia program normalnie (bez minimalizacji ani maksymalizacji).\n\ /W[ait] Zaczekaj a� program zako�czy dzia�anie (i zako�cz\n\ \t kodem wyj�cia programu).\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Poka� licencj� u�ytkownika.\n\ \n\ start.exe wersja 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Pt.rc b/programs/start/Pt.rc index 9030238..51ff53b 100644 --- a/programs/start/Pt.rc +++ b/programs/start/Pt.rc @@ -34,6 +34,7 @@ Options:\n\ /MAX[imized] Inicia o programa maximizado.\n\ /R[estored] Inicia o programa normalmente (sem minimizar nem maximizar).\n\ /W[ait] Aguarda que o programa iniciado termine e ent�o retorno um c�digo (exit code).\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Mostra a licen�a ao usu�rio.\n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Ru.rc b/programs/start/Ru.rc index 3e9cf62..97e9854 100644 --- a/programs/start/Ru.rc +++ b/programs/start/Ru.rc @@ -34,6 +34,7 @@ start [options] /R[estored] �� (�� ).\n\ /W[ait] �� .\n\ /Unix �� Unix �� .\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L �� .\n\ \n\ start.exe �� 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Si.rc b/programs/start/Si.rc index b7ff270..e10ddf7 100644 --- a/programs/start/Si.rc +++ b/programs/start/Si.rc @@ -35,6 +35,7 @@ Možnosti:\n\ /MAX[imized] Zažene program z razširjenim oknom.\n\ /R[estored] Zažene program z običajno velikostjo okna.\n\ /W[ait] Počaka, da se zagnani program zaključi, nato se zaključi in vrne izhodno kodo programa.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Prikaže licenčno pogodbo.\n\ \n\ start.exe različica 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Tr.rc b/programs/start/Tr.rc index 28f15a2..de7a69d 100644 --- a/programs/start/Tr.rc +++ b/programs/start/Tr.rc @@ -33,6 +33,7 @@ Se /MAX[imized] Ekran� kaplayacak �ekilde ba�lat.\n\ /R[estored] Program� normal bir �ekilde ba�lat (simge halinde veya b�y�t�lm�� halde olabilir).\n\ /W[ait] Ba�lat�lm�� program�n bitmesini bekle, sonra ��k�� koduyla ��k.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Son-kullan�c� lisans�n� g�ster.\n\ \n\ start.exe s�r�m 0.2 Telif Hakk� (C) 2003, Dan Kegel\n\ diff --git a/programs/start/start.c b/programs/start/start.c index ed7df03..e58d4c0 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -176,12 +176,15 @@ int wmain (int argc, WCHAR *argv[]) WCHAR *args = NULL; int i; int unix_mode = 0; + int progid_open = 0; WCHAR *dos_filename = NULL; WCHAR *parent_directory = NULL; DWORD binary_type; static const WCHAR openW[] = { 'o', 'p', 'e', 'n', 0 }; static const WCHAR unixW[] = { 'u', 'n', 'i', 'x', 0 }; + static const WCHAR progIDOpenW[] = + { 'p', 'r', 'o', 'g', 'I', 'D', 'O', 'p', 'e', 'n', 0}; memset(&sei, 0, sizeof(sei)); sei.cbSize = sizeof(sei); @@ -203,7 +206,7 @@ int wmain (int argc, WCHAR *argv[]) break; /* Unix paths can start with / so we have to assume anything following /U is not a flag */ - if (unix_mode) + if (unix_mode || progid_open) break; /* Handle all options in this word */ @@ -235,6 +238,15 @@ int wmain (int argc, WCHAR *argv[]) usage(); } break; + case 'p': + case 'P': + if (strncmpiW(&argv[i][ci], progIDOpenW, 17) == 0) + progid_open = 1; + else { + WINE_ERR("Option '%s' not recognized\n", wine_dbgstr_w( argv[i]+ci-1)); + usage(); + } + break; case 'w': case 'W': sei.fMask |= SEE_MASK_NOCLOSEPROCESS; @@ -252,12 +264,17 @@ int wmain (int argc, WCHAR *argv[]) if (i == argc) usage(); + if (progid_open) { + sei.lpClass = argv[i++]; + sei.fMask |= SEE_MASK_CLASSNAME; + } + sei.lpFile = argv[i++]; args = build_args( argc - i, &argv[i] ); sei.lpParameters = args; - if (unix_mode) { + if (unix_mode || progid_open) { LPWSTR (*CDECL wine_get_dos_file_name_ptr)(LPCSTR); char* multibyte_unixpath; int multibyte_unixpath_len;

1 0

Stefan Dösinger : wined3d: Don' t set unloaded arrays to zero.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 3f5936f6f7dc5560e0ad56e25bd0c9c421f0fba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5936f6f7dc5560e0ad56e25… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 31 16:38:05 2009 +0200 wined3d: Don't set unloaded arrays to zero. This causes memory corruption on MacOS, even if the app does not reference undeclared arrays. Trying to avoid potential breakage in broken apps which provoke undefined behavior is pointless if it causes actual breakage in well-behaved apps (on ill-behaved drivers). --- dlls/wined3d/state.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1e09385..c468d2b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3828,14 +3828,6 @@ static inline void unload_numbered_array(IWineD3DStateBlockImpl *stateblock, Win { GL_EXTCALL(glDisableVertexAttribArrayARB(i)); checkGLcall("glDisableVertexAttribArrayARB(reg)"); - /* Some Windows drivers(NV GF 7) use the latest value that was used when drawing with the now - * deactivated stream disabled, some other drivers(ATI, NV GF 8) set the undefined values to 0x00. - * Let's set them to 0x00 to avoid hitting some undefined aspects of OpenGL. All that is really - * important here is the glDisableVertexAttribArrayARB call above. The test shows that the refrast - * keeps dereferencing the pointers, which would cause crashes in some games like Half Life 2: Episode Two. - */ - GL_EXTCALL(glVertexAttrib4NubARB(i, 0, 0, 0, 0)); - checkGLcall("glVertexAttrib4NubARB(i, 0, 0, 0, 0)"); context->numbered_array_mask &= ~(1 << i); }

1 0

Paul Vriens : riched32/tests: Fix a few test failures on Win9x, WinME and NT4.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 984300b59e70047c0964b9c269ffedb236ea3206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=984300b59e70047c0964b9c26… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 10 10:16:13 2009 +0200 riched32/tests: Fix a few test failures on Win9x, WinME and NT4. --- dlls/riched32/tests/editor.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index cb5db77..8e0388c 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -868,11 +868,19 @@ static void test_word_wrap(void) res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); ok(res, "WM_SETTEXT failed.\n"); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); - ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + ok(!pos || + broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + "pos=%d indicating word wrap when none is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); - ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + ok(!pos || + broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + "pos=%d indicating word wrap when none is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); DestroyWindow(hwnd); hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, @@ -882,17 +890,29 @@ static void test_word_wrap(void) res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); ok(res, "WM_SETTEXT failed.\n"); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); - ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + ok(!pos || + broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + "pos=%d indicating word wrap when none is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); - ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + ok(!pos || + broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + "pos=%d indicating word wrap when none is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); /* Test the effect of EM_SETTARGETDEVICE on word wrap. */ res = SendMessage(hwnd, EM_SETTARGETDEVICE, 0, 1); ok(res, "EM_SETTARGETDEVICE failed (returned %d).\n", res); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); - ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + ok(!pos || + broken(pos == lstrlen(text)), /* Win9x, WinME and NT4 */ + "pos=%d indicating word wrap when none is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "Line was not expected to wrap (lines=%d).\n", lines); res = SendMessage(hwnd, EM_SETTARGETDEVICE, 0, 0); ok(res, "EM_SETTARGETDEVICE failed (returned %d).\n", res);

1 0

Ken Sharp : gdiplus: Add stubs for GdipGetVisibleClipBoundsI, GdipDrawDriverString & GdipMeasureDriverString.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: e3f4859961fcc8e386a15ea92f9c892d4b3b1245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f4859961fcc8e386a15ea92… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Tue Jun 9 21:48:05 2009 +0100 gdiplus: Add stubs for GdipGetVisibleClipBoundsI, GdipDrawDriverString & GdipMeasureDriverString. --- dlls/gdiplus/gdiplus.spec | 6 +++--- dlls/gdiplus/graphics.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 72fdcb6..03c9629 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -169,7 +169,7 @@ @ stub GdipDrawCurve3I @ stdcall GdipDrawCurve(ptr ptr ptr long) @ stdcall GdipDrawCurveI(ptr ptr ptr long) -@ stub GdipDrawDriverString +@ stdcall GdipDrawDriverString(ptr ptr long ptr ptr ptr long ptr) @ stdcall GdipDrawEllipse(ptr ptr long long long long) @ stdcall GdipDrawEllipseI(ptr ptr long long long long) @ stdcall GdipDrawImage(ptr ptr long long) @@ -401,7 +401,7 @@ @ stdcall GdipGetTextureTransform(ptr ptr) @ stdcall GdipGetTextureWrapMode(ptr ptr) @ stub GdipGetVisibleClipBounds -@ stub GdipGetVisibleClipBoundsI +@ stdcall GdipGetVisibleClipBoundsI(ptr ptr) @ stdcall GdipGetWorldTransform(ptr ptr) @ stdcall GdipGraphicsClear(ptr long) @ stub GdipGraphicsSetAbort @@ -440,7 +440,7 @@ @ stdcall GdipLoadImageFromStream(ptr ptr) @ stdcall GdipLoadImageFromStreamICM(ptr ptr) @ stdcall GdipMeasureCharacterRanges(ptr wstr long ptr ptr ptr long ptr) -@ stub GdipMeasureDriverString +@ stdcall GdipMeasureDriverString(ptr ptr long ptr ptr long ptr ptr) @ stdcall GdipMeasureString(ptr wstr long ptr ptr ptr ptr ptr ptr) @ stub GdipMultiplyLineTransform @ stdcall GdipMultiplyMatrix(ptr ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c7fa0be..85ecf43 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -955,7 +955,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra TRACE("(%p, %p, %p)\n", hdc, hDevice, graphics); if(hDevice != NULL) { - FIXME("Don't know how to hadle parameter hDevice\n"); + FIXME("Don't know how to handle parameter hDevice\n"); return NotImplemented; } @@ -3845,3 +3845,36 @@ GpStatus WINGDIPAPI GdipTranslateClipI(GpGraphics *graphics, INT dx, INT dy) return GdipTranslateRegion(graphics->clip, (REAL)dx, (REAL)dy); } + + +/***************************************************************************** + * GdipMeasureDriverString [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, + GDIPCONST GpFont *font, GDIPCONST PointF *positions, + INT flags, GDIPCONST GpMatrix *matrix, RectF *boundingBox) +{ + FIXME("(%p %p %d %p %p %d %p %p): stub\n", graphics, text, length, font, positions, flags, matrix, boundingBox); + return NotImplemented; +} + +/***************************************************************************** + * GdipGetVisibleClipBoundsI [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics *graphics, GpRect *rect) +{ + FIXME("(%p %p): stub\n", graphics, rect); + return NotImplemented; +} + +/***************************************************************************** + * GdipDrawDriverString [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, + GDIPCONST GpFont *font, GDIPCONST GpBrush *brush, + GDIPCONST PointF *positions, INT flags, + GDIPCONST GpMatrix *matrix ) +{ + FIXME("(%p %p %d %p %p %p %d %p): stub \n", graphics, text, length, font, brush, positions, flags, matrix); + return NotImplemented; +}

1 0