July 2008 - Wine-commits - list.winehq.org

Nikolay Sivov : gdiplus: GdipPathIterNextMarker implementation with tests.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 0a9937c534823df161f0b911dd410a508ea4a148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9937c534823df161f0b911d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jul 5 13:02:36 2008 +0400 gdiplus: GdipPathIterNextMarker implementation with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pathiterator.c | 25 ++++++++++++++++ dlls/gdiplus/tests/pathiterator.c | 57 +++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9492065..df28863 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -456,7 +456,7 @@ @ stub GdipPathIterGetSubpathCount @ stdcall GdipPathIterHasCurve(ptr ptr) @ stub GdipPathIterIsValid -@ stub GdipPathIterNextMarker +@ stdcall GdipPathIterNextMarker(ptr ptr ptr ptr) @ stub GdipPathIterNextMarkerPath @ stub GdipPathIterNextPathType @ stdcall GdipPathIterNextSubpath(ptr ptr ptr ptr ptr) diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index abb5dbb..e9ba03e 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -105,6 +105,31 @@ GpStatus WINGDIPAPI GdipPathIterHasCurve(GpPathIterator* iterator, BOOL* hasCurv return Ok; } +GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator* iterator, INT *resultCount, + INT* startIndex, INT* endIndex) +{ + INT i; + + if(!iterator || !startIndex || !endIndex) + return InvalidParameter; + + *resultCount = 0; + + /* first call could start with second point as all subsequent, cause + path couldn't contain only one */ + for(i = iterator->marker_pos + 1; i < iterator->pathdata.Count; i++){ + if(iterator->pathdata.Types[i] & PathPointTypePathMarker){ + *startIndex = iterator->marker_pos; + if(iterator->marker_pos > 0) (*startIndex)++; + *endIndex = iterator->marker_pos = i; + *resultCount= *endIndex - *startIndex + 1; + break; + } + } + + return Ok; +} + GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator* iterator, INT *resultCount, INT* startIndex, INT* endIndex, BOOL* isClosed) { diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index baeb22b..3406ce6 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -90,6 +90,62 @@ static void test_hascurve(void) GdipDeletePath(path); } +static void test_nextmarker(void) +{ + GpPath *path; + GpPathIterator *iter; + GpStatus stat; + INT start, end, result; + + /* NULL args + BOOL out argument is local in wrapper class method, + so it always has not-NULL address */ + stat = GdipPathIterNextMarker(NULL, &result, NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterNextMarker(NULL, &result, &start, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterNextMarker(NULL, &result, NULL, &end); + expect(InvalidParameter, stat); + + GdipCreatePath(FillModeAlternate, &path); + GdipAddPathRectangle(path, 5.0, 5.0, 100.0, 50.0); + + /* no markers */ + GdipCreatePathIter(&iter, path); + stat = GdipPathIterNextMarker(iter, &result, &start, &end); + expect(Ok, stat); + expect(0, result); + GdipDeletePathIter(iter); + + /* one marker */ + GdipSetPathMarker(path); + GdipCreatePathIter(&iter, path); + stat = GdipPathIterNextMarker(iter, &result, &start, &end); + expect(Ok, stat); + expect(TRUE, (start == 0) && (end == 3) && (result == 4)); + stat = GdipPathIterNextMarker(iter, &result, &start, &end); + expect(Ok, stat); + expect(0, result); + GdipDeletePathIter(iter); + + /* two markers */ + GdipAddPathLine(path, 0.0, 0.0, 10.0, 30.0); + GdipSetPathMarker(path); + GdipCreatePathIter(&iter, path); + stat = GdipPathIterNextMarker(iter, &result, &start, &end); + expect(Ok, stat); + expect(TRUE, (start == 0) && (end == 3) && (result == 4)); + stat = GdipPathIterNextMarker(iter, &result, &start, &end); + expect(Ok, stat); + expect(TRUE, (start == 4) && (end == 5) && (result == 2)); + stat = GdipPathIterNextMarker(iter, &result, &start, &end); + expect(Ok, stat); + expect(0, result); + GdipDeletePathIter(iter); + + GdipDeletePath(path); +} + START_TEST(pathiterator) { struct GdiplusStartupInput gdiplusStartupInput; @@ -104,6 +160,7 @@ START_TEST(pathiterator) test_constructor_destructor(); test_hascurve(); + test_nextmarker(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 9ef7ad7..c33645a 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -281,6 +281,7 @@ GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*); GpStatus WINGDIPAPI GdipDeletePathIter(GpPathIterator*); GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator*,INT*,GpPointF*,BYTE*, INT,INT); +GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator*,INT*,INT*,INT*); GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator*,INT*,INT*,INT*,BOOL*); GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator*); GpStatus WINGDIPAPI GdipPathIterGetCount(GpPathIterator*,INT*);

1 0

Stefan Dösinger : wined3d: Correct an off-by-one error in constant dirtification.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 9be8f36c2ec1dd3a1bb1d9b116ea11313da38e64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be8f36c2ec1dd3a1bb1d9b11… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 6 11:51:26 2008 -0500 wined3d: Correct an off-by-one error in constant dirtification. Constant numbers start at 0, and the loading loop has a for(i; i < dirtyconsts; i++). This means that the highest dirty constant isn't loaded correctly. Rather than replacing the < with <=, which would make it impossible to have no dirty constant, add 1 to the dirty constant counter. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 84ec4fc..42b107a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -134,7 +134,7 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl* This, Win ret = 0; LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { dirty_consts[lconst->idx] = 1; /* Dirtify so the non-immediate constant overwrites it next time */ - ret = max(ret, lconst->idx); + ret = max(ret, lconst->idx + 1); GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, lconst->idx, (GLfloat*)lconst->value)); } checkGLcall("glProgramEnvParameter4fvARB()"); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7a0cce2..26c1c9c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3602,7 +3602,7 @@ UINT count) { */ memset(This->activeContext->vshader_const_dirty + start, 1, sizeof(*This->activeContext->vshader_const_dirty) * count); - This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start+count); + This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start+count+1); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VERTEXSHADERCONSTANT); @@ -4030,7 +4030,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantF_DirtyConst( */ memset(This->activeContext->pshader_const_dirty + start, 1, sizeof(*This->activeContext->pshader_const_dirty) * count); - This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start+count); + This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start+count+1); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADERCONSTANT);

1 0

Dylan Smith : richedit: Made sure word selection selects only one word.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 379835b63409bbb1f2cea5717e3cb7841bd9f703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=379835b63409bbb1f2cea5717… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Jul 5 04:23:47 2008 -0400 richedit: Made sure word selection selects only one word. --- dlls/riched20/caret.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4a1a8a4..4a79e48 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -746,9 +746,9 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) void ME_SelectWord(ME_TextEditor *editor) { - if (!(editor->pCursors[0].pRun->member.run.nFlags & MERF_ENDPARA)) - ME_MoveCursorWords(editor, &editor->pCursors[0], -1); ME_MoveCursorWords(editor, &editor->pCursors[1], +1); + editor->pCursors[0] = editor->pCursors[1]; + ME_MoveCursorWords(editor, &editor->pCursors[0], -1); ME_InvalidateSelection(editor); ME_SendSelChange(editor); }

1 0

Dylan Smith : richedit: Fixed double click issues by sharing code with single click.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 5b2bdc06d00ef2a3e3bfd30dc142da5f902ede5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b2bdc06d00ef2a3e3bfd30dc… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Jul 5 04:23:53 2008 -0400 richedit: Fixed double click issues by sharing code with single click. --- dlls/riched20/caret.c | 26 ++++++++++---------------- dlls/riched20/editor.c | 14 ++++++-------- dlls/riched20/editor.h | 2 +- 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4a79e48..c23d92c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -749,8 +749,6 @@ ME_SelectWord(ME_TextEditor *editor) ME_MoveCursorWords(editor, &editor->pCursors[1], +1); editor->pCursors[0] = editor->pCursors[1]; ME_MoveCursorWords(editor, &editor->pCursors[0], -1); - ME_InvalidateSelection(editor); - ME_SendSelChange(editor); } @@ -871,7 +869,7 @@ ME_CharFromPos(ME_TextEditor *editor, int x, int y) } -void ME_LButtonDown(ME_TextEditor *editor, int x, int y) +void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) { ME_Cursor tmp_cursor; int is_selection = 0; @@ -888,19 +886,15 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y) ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd); if (GetKeyState(VK_SHIFT)>=0) { + /* Shift key is not down */ editor->pCursors[1] = editor->pCursors[0]; + if (clickNum > 1) + ME_SelectWord(editor); } else if (!is_selection) { editor->pCursors[1] = tmp_cursor; is_selection = 1; } - - ME_InvalidateSelection(editor); - HideCaret(editor->hWnd); - ME_MoveCaret(editor); - ShowCaret(editor->hWnd); - ME_ClearTempStyle(editor); - ME_SendSelChange(editor); } else { @@ -934,13 +928,13 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y) } editor->pCursors[2] = editor->pCursors[0]; editor->pCursors[3] = editor->pCursors[1]; - ME_InvalidateSelection(editor); - HideCaret(editor->hWnd); - ME_MoveCaret(editor); - ShowCaret(editor->hWnd); - ME_ClearTempStyle(editor); - ME_SendSelChange(editor); } + ME_InvalidateSelection(editor); + HideCaret(editor->hWnd); + ME_MoveCaret(editor); + ShowCaret(editor->hWnd); + ME_ClearTempStyle(editor); + ME_SendSelChange(editor); } void ME_MouseMove(ME_TextEditor *editor, int x, int y) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6ff1385..2d00061 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2966,17 +2966,22 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_DestroyEditor(editor); SetWindowLongPtrW(hWnd, 0, 0); return 0; + case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: + { + int clickNum = (msg == WM_LBUTTONDBLCLK) ? 2 : 1; ME_CommitUndo(editor); /* End coalesced undos for typed characters */ if ((editor->nEventMask & ENM_MOUSEEVENTS) && !ME_FilterEvent(editor, msg, &wParam, &lParam)) return 0; SetFocus(hWnd); - ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); + ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), + clickNum); SetCapture(hWnd); ME_LinkNotify(editor,msg,wParam,lParam); if (!ME_SetCursor(editor, LOWORD(lParam))) goto do_default; break; + } case WM_MOUSEMOVE: if ((editor->nEventMask & ENM_MOUSEEVENTS) && !ME_FilterEvent(editor, msg, &wParam, &lParam)) @@ -3001,13 +3006,6 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if (!ret) goto do_default; } break; - case WM_LBUTTONDBLCLK: - if ((editor->nEventMask & ENM_MOUSEEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; - ME_LinkNotify(editor,msg,wParam,lParam); - ME_SelectWord(editor); - break; case WM_RBUTTONUP: case WM_RBUTTONDOWN: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 0fc615a..a23fb8b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -181,7 +181,7 @@ void ME_HideCaret(ME_TextEditor *ed); void ME_ShowCaret(ME_TextEditor *ed); void ME_MoveCaret(ME_TextEditor *ed); int ME_CharFromPos(ME_TextEditor *editor, int x, int y); -void ME_LButtonDown(ME_TextEditor *editor, int x, int y); +void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum); void ME_MouseMove(ME_TextEditor *editor, int x, int y); void ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars); void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor,

1 0

Dylan Smith : richedit: Fixed Valgrind error related to undoing.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: ebded1636b850c3e1f1ef253ebaba6b9f11652da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebded1636b850c3e1f1ef253e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jul 6 15:27:40 2008 -0400 richedit: Fixed Valgrind error related to undoing. The error was a memory access of a freed object. In ME_AddUndoItem I checked the top of the undo stack to end a coalescing undo transaction, assuming that this should be either a valid undo item, or NULL, instead it was already freed. --- dlls/riched20/undo.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index a0fd646..bf992ab 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -55,13 +55,7 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_Disp return NULL; else { - ME_DisplayItem *pItem; - if (editor->pUndoStack - && editor->pUndoStack->type == diUndoPotentialEndTransaction) - { - editor->pUndoStack->type = diUndoEndTransaction; - } - pItem = (ME_DisplayItem *)ALLOC_OBJ(ME_UndoItem); + ME_DisplayItem *pItem = (ME_DisplayItem *)ALLOC_OBJ(ME_UndoItem); ((ME_UndoItem *)pItem)->nCR = ((ME_UndoItem *)pItem)->nLF = -1; switch(type) { @@ -109,6 +103,11 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_Disp pItem->prev = NULL; if (editor->nUndoMode == umAddToUndo || editor->nUndoMode == umAddBackToUndo) { + if (editor->pUndoStack + && editor->pUndoStack->type == diUndoPotentialEndTransaction) + { + editor->pUndoStack->type = diUndoEndTransaction; + } if (editor->nUndoMode == umAddToUndo) TRACE("Pushing id=%s to undo stack, deleting redo stack\n", ME_GetDITypeName(type)); else @@ -355,17 +354,18 @@ BOOL ME_Undo(ME_TextEditor *editor) { editor->nUndoMode = umAddToRedo; p = editor->pUndoStack->next; ME_DestroyDisplayItem(editor->pUndoStack); + editor->pUndoStack = p; do { - ME_DisplayItem *pp = p; + p->prev = NULL; ME_PlayUndoItem(editor, p); - p = p->next; - ME_DestroyDisplayItem(pp); + editor->pUndoStack = p->next; + ME_DestroyDisplayItem(p); + p = editor->pUndoStack; } while(p && p->type != diUndoEndTransaction); - ME_AddUndoItem(editor, diUndoEndTransaction, NULL); - editor->pUndoStack = p; - editor->nUndoStackSize--; if (p) p->prev = NULL; + ME_AddUndoItem(editor, diUndoEndTransaction, NULL); + editor->nUndoStackSize--; editor->nUndoMode = nMode; ME_UpdateRepaint(editor); return TRUE; @@ -389,16 +389,17 @@ BOOL ME_Redo(ME_TextEditor *editor) { editor->nUndoMode = umAddBackToUndo; p = editor->pRedoStack->next; ME_DestroyDisplayItem(editor->pRedoStack); + editor->pRedoStack = p; do { - ME_DisplayItem *pp = p; + p->prev = NULL; ME_PlayUndoItem(editor, p); - p = p->next; - ME_DestroyDisplayItem(pp); + editor->pRedoStack = p->next; + ME_DestroyDisplayItem(p); + p = editor->pRedoStack; } while(p && p->type != diUndoEndTransaction); - ME_AddUndoItem(editor, diUndoEndTransaction, NULL); - editor->pRedoStack = p; if (p) p->prev = NULL; + ME_AddUndoItem(editor, diUndoEndTransaction, NULL); editor->nUndoMode = nMode; ME_UpdateRepaint(editor); return TRUE;

1 0

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian Bokmål translation.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 5bd57c5992f719a457a6121f497f52c5277162a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd57c5992f719a457a6121f4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 6 17:54:31 2008 +0200 winecfg: Update Norwegian Bokmål translation. --- programs/winecfg/No.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index f31d05d..b48a4ed 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -39,7 +39,7 @@ BEGIN LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 LTEXT "Dette biblioteket er fri programvarer; det kan redistribueres i henhold til vilk�rene i GNU Lesser General Public License utgitt av �the Free Software Foundation�, enten versjon 2.1 av denne Lisensen, eller (hvis du �nsker det) en nyere versjon.", IDC_STATIC,119,44,124,72 - GROUPBOX " Windows P�melding Informasjon ", IDC_STATIC, 15, 110, 230, 55 + GROUPBOX " Brukerinformasjon ", IDC_STATIC, 15, 110, 230, 55 LTEXT "Eier:", IDC_STATIC, 22, 126, 40, 20 LTEXT "Organisasjon:", IDC_STATIC, 22, 140, 50, 20 EDITTEXT IDC_ABT_OWNER, 75, 126, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP @@ -85,7 +85,7 @@ BEGIN 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 "Forh�ndsvisning av tekst med 10 punkters Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Alexander Nicolaysen Sørnes : shell32: Update Norwegian Bokmål translation.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: ade9a3d6ea69cfd8e85ae9735d41e144c0406155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade9a3d6ea69cfd8e85ae9735… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 6 17:38:32 2008 +0200 shell32: Update Norwegian Bokmål translation. --- dlls/shell32/shell32_No.rc | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc index b6ad967..adaefc1 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -220,6 +220,12 @@ STRINGTABLE IDS_SHUTDOWN_TITLE "Avslutt" IDS_SHUTDOWN_PROMPT "Vil du avslutte Wine-�kten?" + /* Run File dialog */ + IDS_RUNDLG_ERROR "Klarte ikke vise Kj�r-vinduet (intern feil)" + IDS_RUNDLG_BROWSE_ERROR "Klarte ikke vise Bla-vinduet (intern feil)" + IDS_RUNDLG_BROWSE_CAPTION "Bla" + IDS_RUNDLG_BROWSE_FILTER "Programfiler\0*.exe\0Alle filer\0*.*\0\0" + /* shell folder path default values */ IDS_PROGRAMS "Start-meny\\Programmer" IDS_PERSONAL "Mine dokumenter"

1 0

Andrew Talbot : winedos: Remove unneeded address-of operator from function name.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 7e917a0f9dbc69dc19b000a10e85dd1c0936fb49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e917a0f9dbc69dc19b000a10… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Jul 6 13:00:58 2008 +0100 winedos: Remove unneeded address-of operator from function name. --- dlls/winedos/dosaspi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/dosaspi.c b/dlls/winedos/dosaspi.c index 28089a3..988e776 100644 --- a/dlls/winedos/dosaspi.c +++ b/dlls/winedos/dosaspi.c @@ -153,7 +153,7 @@ DWORD ASPI_SendASPIDOSCommand(DWORD ptrSRB) memcpy(&lpPRB->CDBByte[0],&lpSRB16->cmd.CDBByte[0],lpSRB16->cmd.SRB_CDBLen); /* Set post proc to our post proc */ - lpPRB->SRB_PostProc = &DOSASPI_PostProc; + lpPRB->SRB_PostProc = DOSASPI_PostProc; /* Stick the DWORD after all the sense info */ memcpy(lpPRB->SenseArea + lpPRB->SRB_SenseLen,&ptrSRB,sizeof(DWORD));

1 0

Andrew Talbot : wined3d: Remove unneeded address-of operators from function names.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 6ced8a3f55aec5b85668b158f5106a9dcca9e160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ced8a3f55aec5b85668b158f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Jul 6 13:00:52 2008 +0100 wined3d: Remove unneeded address-of operators from function names. --- dlls/wined3d/arb_program_shader.c | 30 +++++++++++++++--------------- dlls/wined3d/baseshader.c | 30 +++++++++++++++--------------- dlls/wined3d/glsl_shader.c | 32 ++++++++++++++++---------------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bd633f6..84ec4fc 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2098,20 +2098,20 @@ static void shader_arb_fragment_enable(IWineD3DDevice *iface, BOOL enable) { } const shader_backend_t arb_program_shader_backend = { - &shader_arb_select, - &shader_arb_select_depth_blt, - &shader_arb_destroy_depth_blt, - &shader_arb_load_constants, - &shader_arb_cleanup, - &shader_arb_color_correction, - &shader_arb_destroy, - &shader_arb_alloc, - &shader_arb_free, - &shader_arb_dirty_const, - &shader_arb_generate_pshader, - &shader_arb_generate_vshader, - &shader_arb_get_caps, - &shader_arb_load_init, - &shader_arb_fragment_enable, + shader_arb_select, + shader_arb_select_depth_blt, + shader_arb_destroy_depth_blt, + shader_arb_load_constants, + shader_arb_cleanup, + shader_arb_color_correction, + shader_arb_destroy, + shader_arb_alloc, + shader_arb_free, + shader_arb_dirty_const, + shader_arb_generate_pshader, + shader_arb_generate_vshader, + shader_arb_get_caps, + shader_arb_load_init, + shader_arb_fragment_enable, FFPStateTable }; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 174f2ea..06dd69d 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1201,21 +1201,21 @@ static void shader_none_fragment_enable(IWineD3DDevice *iface, BOOL enable) { #undef GLINFO_LOCATION const shader_backend_t none_shader_backend = { - &shader_none_select, - &shader_none_select_depth_blt, - &shader_none_destroy_depth_blt, - &shader_none_load_constants, - &shader_none_cleanup, - &shader_none_color_correction, - &shader_none_destroy, - &shader_none_alloc, - &shader_none_free, - &shader_none_dirty_const, - &shader_none_generate_pshader, - &shader_none_generate_vshader, - &shader_none_get_caps, - &shader_none_load_init, - &shader_none_fragment_enable, + shader_none_select, + shader_none_select_depth_blt, + shader_none_destroy_depth_blt, + shader_none_load_constants, + shader_none_cleanup, + shader_none_color_correction, + shader_none_destroy, + shader_none_alloc, + shader_none_free, + shader_none_dirty_const, + shader_none_generate_pshader, + shader_none_generate_vshader, + shader_none_get_caps, + shader_none_load_init, + shader_none_fragment_enable, FFPStateTable }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a9ab92c..4823126 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3473,7 +3473,7 @@ static BOOL glsl_program_key_compare(void *keya, void *keyb) { static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; This->shader_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_glsl_priv)); - This->glsl_program_lookup = hash_table_create(&glsl_program_key_hash, &glsl_program_key_compare); + This->glsl_program_lookup = hash_table_create(glsl_program_key_hash, glsl_program_key_compare); return WINED3D_OK; } @@ -3693,20 +3693,20 @@ static void shader_glsl_fragment_enable(IWineD3DDevice *iface, BOOL enable) { } const shader_backend_t glsl_shader_backend = { - &shader_glsl_select, - &shader_glsl_select_depth_blt, - &shader_glsl_destroy_depth_blt, - &shader_glsl_load_constants, - &shader_glsl_cleanup, - &shader_glsl_color_correction, - &shader_glsl_destroy, - &shader_glsl_alloc, - &shader_glsl_free, - &shader_glsl_dirty_const, - &shader_glsl_generate_pshader, - &shader_glsl_generate_vshader, - &shader_glsl_get_caps, - &shader_glsl_load_init, - &shader_glsl_fragment_enable, + shader_glsl_select, + shader_glsl_select_depth_blt, + shader_glsl_destroy_depth_blt, + shader_glsl_load_constants, + shader_glsl_cleanup, + shader_glsl_color_correction, + shader_glsl_destroy, + shader_glsl_alloc, + shader_glsl_free, + shader_glsl_dirty_const, + shader_glsl_generate_pshader, + shader_glsl_generate_vshader, + shader_glsl_get_caps, + shader_glsl_load_init, + shader_glsl_fragment_enable, FFPStateTable };

1 0

Andrew Talbot : shell32: Remove unneeded address-of operators from function names.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 93f656bf855f46ea490d4ac5173ea1b94e5e90e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f656bf855f46ea490d4ac51… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Jul 6 13:00:42 2008 +0100 shell32: Remove unneeded address-of operators from function names. --- dlls/shell32/shellole.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 19dba05..bec9996 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -60,19 +60,19 @@ static const struct { REFIID riid; LPFNCREATEINSTANCE lpfnCI; } InterfaceTable[] = { - {&CLSID_ShellFSFolder, &IFSFolder_Constructor}, - {&CLSID_MyComputer, &ISF_MyComputer_Constructor}, - {&CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor}, - {&CLSID_ShellDesktop, &ISF_Desktop_Constructor}, - {&CLSID_ShellLink, &IShellLink_Constructor}, - {&CLSID_DragDropHelper, &IDropTargetHelper_Constructor}, - {&CLSID_ControlPanel, &IControlPanel_Constructor}, - {&CLSID_AutoComplete, &IAutoComplete_Constructor}, - {&CLSID_UnixFolder, &UnixFolder_Constructor}, - {&CLSID_UnixDosFolder, &UnixDosFolder_Constructor}, - {&CLSID_FolderShortcut, &FolderShortcut_Constructor}, - {&CLSID_MyDocuments, &MyDocuments_Constructor}, - {&CLSID_RecycleBin, &RecycleBin_Constructor}, + {&CLSID_ShellFSFolder, IFSFolder_Constructor}, + {&CLSID_MyComputer, ISF_MyComputer_Constructor}, + {&CLSID_NetworkPlaces, ISF_NetworkPlaces_Constructor}, + {&CLSID_ShellDesktop, ISF_Desktop_Constructor}, + {&CLSID_ShellLink, IShellLink_Constructor}, + {&CLSID_DragDropHelper, IDropTargetHelper_Constructor}, + {&CLSID_ControlPanel, IControlPanel_Constructor}, + {&CLSID_AutoComplete, IAutoComplete_Constructor}, + {&CLSID_UnixFolder, UnixFolder_Constructor}, + {&CLSID_UnixDosFolder, UnixDosFolder_Constructor}, + {&CLSID_FolderShortcut, FolderShortcut_Constructor}, + {&CLSID_MyDocuments, MyDocuments_Constructor}, + {&CLSID_RecycleBin, RecycleBin_Constructor}, {NULL,NULL} };

1 0