February 2006 - Wine-commits

Eric Pouech : winedbg: Active targets
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: 829e002c3f254f4e55b3c15a2f3480aca809351a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=829e002c3f254f4e55b3c15… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Feb 24 22:12:59 2006 +0100 winedbg: Active targets Move all code related to an 'active' target (ie a running process) from winedbg.c to tgt_active.c. --- programs/winedbg/debugger.h | 13 + programs/winedbg/tgt_active.c | 746 +++++++++++++++++++++++++++++++++++++++++ programs/winedbg/winedbg.c | 742 ----------------------------------------- 3 files changed, 755 insertions(+), 746 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=829e002c3f254f4e55b…

1 0

Eric Pouech : kernel32: ClearCommError.
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: 6b95c0e4b47cc43be8378ea12937d16983d1e4a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6b95c0e4b47cc43be8378ea… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Feb 24 21:31:56 2006 +0100 kernel32: ClearCommError. ClearCommError should only deal with *communication* errors (are being seen on the serial interface) rather than API errors (which can be reported to the caller by the API itself). I then removed all the stuff related to storing the error status in the server object. --- dlls/kernel/comm.c | 55 ++-------------------------------------- dlls/kernel/tests/comm.c | 22 +++++++++++++++- include/wine/server_protocol.h | 5 +--- server/protocol.def | 3 -- server/serial.c | 11 -------- server/trace.c | 6 +--- 6 files changed, 26 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6b95c0e4b47cc43be83…

1 0

Andrew de los Reyes : riched20: Implement EM_SCROLL and its tests.
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: cd024942afd316652fd989ce1679d8335b88d4ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cd024942afd316652fd989c… Author: Andrew de los Reyes <adlr(a)ucla.edu> Date: Fri Feb 24 23:26:42 2006 -0800 riched20: Implement EM_SCROLL and its tests. --- dlls/riched20/editor.c | 21 +++++- dlls/riched20/tests/editor.c | 142 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 53cddd0..feb99c3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1313,7 +1313,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_GETWORDBREAKPROCEX) UNSUPPORTED_MSG(EM_LIMITTEXT) /* also known as EM_SETLIMITTEXT */ UNSUPPORTED_MSG(EM_PASTESPECIAL) - UNSUPPORTED_MSG(EM_SCROLL) UNSUPPORTED_MSG(EM_SELECTIONTYPE) UNSUPPORTED_MSG(EM_SETBIDIOPTIONS) UNSUPPORTED_MSG(EM_SETEDITSTYLE) @@ -2132,21 +2131,29 @@ LRESULT WINAPI RichEditANSIWndProc(HWND } return 0; } + case EM_SCROLL: /* fall through */ case WM_VSCROLL: { + int nEnd; int nPos = editor->nScrollPosY; + int origNPos = nPos; + int lineHeight = 24; si.cbSize = sizeof(SCROLLINFO); si.fMask = SIF_PAGE|SIF_POS|SIF_RANGE|SIF_TRACKPOS; GetScrollInfo(hWnd, SB_VERT, &si); + if (editor && editor->pBuffer && editor->pBuffer->pDefaultStyle) + lineHeight = editor->pBuffer->pDefaultStyle->tm.tmHeight; + if (lineHeight <= 0) lineHeight = 24; switch(LOWORD(wParam)) { case SB_LINEUP: - nPos -= 24; /* FIXME follow the original */ + nPos -= lineHeight; if (nPos<0) nPos = 0; break; case SB_LINEDOWN: { - int nEnd = editor->nTotalLength - editor->sizeWindow.cy; - nPos += 24; /* FIXME follow the original */ + nEnd = editor->nTotalLength - editor->sizeWindow.cy; + if (nEnd < 0) nEnd = 0; + nPos += lineHeight; if (nPos>=nEnd) nPos = nEnd; break; } @@ -2155,8 +2162,10 @@ LRESULT WINAPI RichEditANSIWndProc(HWND if (nPos<0) nPos = 0; break; case SB_PAGEDOWN: + nEnd = editor->nTotalLength - editor->sizeWindow.cy; + if (nEnd < 0) nEnd = 0; nPos += editor->sizeWindow.cy; - if (nPos>=editor->nTotalLength) nPos = editor->nTotalLength-1; + if (nPos>=nEnd) nPos = nEnd; break; case SB_THUMBTRACK: case SB_THUMBPOSITION: @@ -2173,6 +2182,8 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UpdateWindow(hWnd); } } + if (msg == EM_SCROLL) + return 0x00010000 | (((nPos - origNPos)/lineHeight) & 0xffff); break; } case WM_MOUSEWHEEL: diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index aae3486..4f34a66 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -536,6 +536,147 @@ static void test_EM_SETOPTIONS() DestroyWindow(hwndRichEdit); } +static void test_EM_SCROLL() +{ + int i, j; + int r; /* return value */ + int expr; /* expected return value */ + HWND hwndRichEdit = new_richedit(NULL); + int y_before, y_after; /* units of lines of text */ + + /* test a richedit box containing a single line of text */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "a");/* one line of text */ + expr = 0x00010000; + for (i = 0; i < 4; i++) { + int cmd; + switch (i) { + case 0: cmd = SB_PAGEDOWN; break; + case 1: cmd = SB_PAGEUP; break; + case 2: cmd = SB_LINEDOWN; break; + case 3: cmd = SB_LINEUP; break; + } + + r = SendMessage(hwndRichEdit, EM_SCROLL, cmd, 0); + y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); + ok(expr == r, "EM_SCROLL improper return value returned (i == %d). " + "Got 0x%08x, expected 0x%08x\n", i, r, expr); + ok(y_after == 0, "EM_SCROLL improper scroll. scrolled to line %d, not 1 " + "(i == %d)\n", y_after, i); + } + + /* + * test a richedit box that will scroll. There are two general + * cases: the case without any long lines and the case with a long + * line. + */ + for (i = 0; i < 2; i++) { /* iterate through different bodies of text */ + if (i == 0) + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "a\nb\nc\nd\ne"); + else + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) + "a LONG LINE LONG LINE LONG LINE LONG LINE LONG LINE " + "LONG LINE LONG LINE LONG LINE LONG LINE LONG LINE " + "LONG LINE \nb\nc\nd\ne"); + for (j = 0; j < 12; j++) /* reset scrol position to top */ + SendMessage(hwndRichEdit, EM_SCROLL, SB_PAGEUP, 0); + + /* get first visible line */ + y_before = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); + r = SendMessage(hwndRichEdit, EM_SCROLL, SB_PAGEDOWN, 0); /* page down */ + + /* get new current first visible line */ + y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); + + ok(((r & 0xffffff00) == 0x00010000) && + ((r & 0x000000ff) != 0x00000000), + "EM_SCROLL page down didn't scroll by a small positive number of " + "lines (r == 0x%08x)\n", r); + ok(y_after > y_before, "EM_SCROLL page down not functioning " + "(line %d scrolled to line %d\n", y_before, y_after); + + y_before = y_after; + + r = SendMessage(hwndRichEdit, EM_SCROLL, SB_PAGEUP, 0); /* page up */ + y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); + ok(((r & 0xffffff00) == 0x0001ff00), + "EM_SCROLL page up didn't scroll by a small negative number of lines " + "(r == 0x%08x)\n", r); + ok(y_after < y_before, "EM_SCROLL page up not functioning (line " + "%d scrolled to line %d\n", y_before, y_after); + + y_before = y_after; + + r = SendMessage(hwndRichEdit, EM_SCROLL, SB_LINEDOWN, 0); /* line down */ + + y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); + + ok(r == 0x00010001, "EM_SCROLL line down didn't scroll by one line " + "(r == 0x%08x)\n", r); + ok(y_after -1 == y_before, "EM_SCROLL line down didn't go down by " + "1 line (%d scrolled to %d)\n", y_before, y_after); + + y_before = y_after; + + r = SendMessage(hwndRichEdit, EM_SCROLL, SB_LINEUP, 0); /* line up */ + + y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); + + ok(r == 0x0001ffff, "EM_SCROLL line up didn't scroll by one line " + "(r == 0x%08x)\n", r); + ok(y_after +1 == y_before, "EM_SCROLL line up didn't go up by 1 " + "line (%d scrolled to %d)\n", y_before, y_after); + + y_before = y_after; + + r = SendMessage(hwndRichEdit, EM_SCROLL, + SB_LINEUP, 0); /* lineup beyond top */ + + y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); + + ok(r == 0x00010000, + "EM_SCROLL line up returned indicating movement (0x%08x)\n", r); + ok(y_before == y_after, + "EM_SCROLL line up beyond top worked (%d)\n", y_after); + + y_before = y_after; + + r = SendMessage(hwndRichEdit, EM_SCROLL, + SB_PAGEUP, 0);/*page up beyond top */ + + y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); + + ok(r == 0x00010000, + "EM_SCROLL page up returned indicating movement (0x%08x)\n", r); + ok(y_before == y_after, + "EM_SCROLL page up beyond top worked (%d)\n", y_after); + + for (j = 0; j < 12; j++) /* page down all the way to the bottom */ + SendMessage(hwndRichEdit, EM_SCROLL, SB_PAGEDOWN, 0); + y_before = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); + r = SendMessage(hwndRichEdit, EM_SCROLL, + SB_PAGEDOWN, 0); /* page down beyond bot */ + y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); + + ok(r == 0x00010000, + "EM_SCROLL page down returned indicating movement (0x%08x)\n", r); + ok(y_before == y_after, + "EM_SCROLL page down beyond bottom worked (%d -> %d)\n", + y_before, y_after); + + y_before = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); + SendMessage(hwndRichEdit, EM_SCROLL, + SB_LINEDOWN, 0); /* line down beyond bot */ + y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); + + ok(r == 0x00010000, + "EM_SCROLL line down returned indicating movement (0x%08x)\n", r); + ok(y_before == y_after, + "EM_SCROLL line down beyond bottom worked (%d -> %d)\n", + y_before, y_after); + } + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { MSG msg; @@ -548,6 +689,7 @@ START_TEST( editor ) test_EM_FINDTEXT(); test_EM_SCROLLCARET(); + test_EM_SCROLL(); test_EM_SETTEXTMODE(); test_TM_PLAINTEXT(); test_EM_SETOPTIONS();

1 0

Hamza Lakhani : riched20: EM_HIDESELECTION implementation.
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: 6979719a907e7e9719ade3d296d85db22ca9f826 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6979719a907e7e9719ade3d… Author: Hamza Lakhani <hlakhani(a)gmail.com> Date: Fri Feb 24 13:31:25 2006 -0800 riched20: EM_HIDESELECTION implementation. --- dlls/riched20/editor.c | 12 +++++++++--- dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 5 ++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6f4a8a5..53cddd0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -76,7 +76,7 @@ - EM_GETWORDBREAKPROCEX - EM_GETWORDWRAPMODE 1.0asian + EM_GETZOOM 3.0 - - EM_HIDESELECTION + + EM_HIDESELECTION - EM_LIMITTEXT + EM_LINEFROMCHAR + EM_LINEINDEX @@ -1022,6 +1022,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) ed->nScrollPosY = 0; ed->nZoomNumerator = ed->nZoomDenominator = 0; ed->bRedraw = TRUE; + ed->bHideSelection = FALSE; ed->nInvalidOfs = -1; ed->pfnWordBreak = NULL; ed->lpOleCallback = NULL; @@ -1200,7 +1201,7 @@ static const char * const richedit_messa "EM_GETOLEINTERFACE", "EM_GETPARAFORMAT", "EM_GETSELTEXT", - "EM_HIDESELECTION", + "EM_HIDESELECTION", "EM_PASTESPECIAL", "EM_REQUESTRESIZE", "EM_SELECTIONTYPE", @@ -1310,7 +1311,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_GETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_GETUNDONAME) UNSUPPORTED_MSG(EM_GETWORDBREAKPROCEX) - UNSUPPORTED_MSG(EM_HIDESELECTION) UNSUPPORTED_MSG(EM_LIMITTEXT) /* also known as EM_SETLIMITTEXT */ UNSUPPORTED_MSG(EM_PASTESPECIAL) UNSUPPORTED_MSG(EM_SCROLL) @@ -1611,6 +1611,12 @@ LRESULT WINAPI RichEditANSIWndProc(HWND } return count; } + case EM_HIDESELECTION: + { + editor->bHideSelection = (wParam != 0); + ME_InvalidateSelection(editor); + return 0; + } case EM_LINESCROLL: { int nPos = editor->nScrollPosY, nEnd= editor->nTotalLength - editor->sizeWindow.cy; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index b0ea617..17cf2d8 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -316,6 +316,7 @@ typedef struct tagME_TextEditor *TM_SINGLELEVELUNDO or TM_MULTILEVELUNDO *TM_SINGLECODEPAGE or TM_MULTICODEPAGE*/ int mode; + BOOL bHideSelection; } ME_TextEditor; typedef struct tagME_Context diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 42166ed..abde9a0 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -175,7 +175,10 @@ static void ME_DrawTextWithStyle(ME_Cont GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); x += sz.cx; GetTextExtentPoint32W(hDC, szText+nSelFrom, nSelTo-nSelFrom, &sz); - PatBlt(hDC, x, ymin, sz.cx, cy, DSTINVERT); + + /* Invert selection if not hidden by EM_HIDESELECTION */ + if (c->editor->bHideSelection == FALSE) + PatBlt(hDC, x, ymin, sz.cx, cy, DSTINVERT); } SetTextColor(hDC, rgbOld); ME_UnselectStyleFont(c->editor, hDC, s, hOldFont);

1 0

Peter Beutner : ddraw: Fix transparent Blits on 8bit surfaces.
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: 07fe82dd55cf03aa7c0e9ad421d756d48ca8cd71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07fe82dd55cf03aa7c0e9ad… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Sat Feb 25 13:34:52 2006 +0100 ddraw: Fix transparent Blits on 8bit surfaces. There are no red/green/blue bitmasks with color depth==8bpp. In that case always match against the whole byte. --- dlls/ddraw/surface_dib.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface_dib.c b/dlls/ddraw/surface_dib.c index f7b8073..55bdf20 100644 --- a/dlls/ddraw/surface_dib.c +++ b/dlls/ddraw/surface_dib.c @@ -849,7 +849,13 @@ DIB_DirectDrawSurface_Blt(LPDIRECTDRAWSU keylow = lpbltfx->ddckDestColorkey.dwColorSpaceLowValue; keyhigh = lpbltfx->ddckDestColorkey.dwColorSpaceHighValue; } - keymask = sdesc.u4.ddpfPixelFormat.u2.dwRBitMask | sdesc.u4.ddpfPixelFormat.u3.dwGBitMask | sdesc.u4.ddpfPixelFormat.u4.dwBBitMask; + + if(bpp == 1) + keymask = 0xff; + else + keymask = sdesc.u4.ddpfPixelFormat.u2.dwRBitMask | sdesc.u4.ddpfPixelFormat.u3.dwGBitMask | + sdesc.u4.ddpfPixelFormat.u4.dwBBitMask; + dwFlags &= ~(DDBLT_KEYSRC | DDBLT_KEYDEST | DDBLT_KEYSRCOVERRIDE | DDBLT_KEYDESTOVERRIDE); }

1 0

H. Verbeet : wined3d: Don' t use GetDevice in IWineD3DSurfaceImpl_GetContainer, as
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: 7d97f29c24c3d2fb322109011d61cc2828672288 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7d97f29c24c3d2fb3221090… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Feb 24 20:40:18 2006 +0000 wined3d: Don't use GetDevice in IWineD3DSurfaceImpl_GetContainer, as it adds a reference to the device that shouldn't be there. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 766874a..a4d9770 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -191,7 +191,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetCo if (This->container) { container = This->container; } else { - IWineD3DSurface_GetDevice(iface, (IWineD3DDevice **)&container); + container = (IWineD3DBase *)This->resource.wineD3DDevice; } TRACE("Relaying to QueryInterface\n");

1 0

Roderick Colenbrander : d3d8: Moved the remaining code over to WineD3D ( based on patches by
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: d13469c1d889e2ebe2003a2db6d70a69feb2c1ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d13469c1d889e2ebe2003a2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Feb 25 13:15:08 2006 +0100 d3d8: Moved the remaining code over to WineD3D (based on patches by Oliver Stieber). --- dlls/d3d8/Makefile.in | 8 dlls/d3d8/basetexture.c | 14 dlls/d3d8/d3d8_main.c | 121 - dlls/d3d8/d3d8_private.h | 451 +--- dlls/d3d8/device.c | 4615 +++++++--------------------------------- dlls/d3d8/directx.c | 423 +--- dlls/d3d8/drawprim.c | 1663 -------------- dlls/d3d8/indexbuffer.c | 126 - dlls/d3d8/pixelshader.c | 94 + dlls/d3d8/resource.c | 84 - dlls/d3d8/shader.c | 2386 --------------------- dlls/d3d8/stateblock.c | 850 ------- dlls/d3d8/swapchain.c | 48 dlls/d3d8/texture.c | 50 dlls/d3d8/utils.c | 1845 ---------------- dlls/d3d8/vertexbuffer.c | 142 + dlls/d3d8/vertexshader.c | 98 + dlls/d3d8/vshaderdeclaration.c | 723 ------ dlls/wined3d/device.c | 2 dlls/wined3d/directx.c | 16 20 files changed, 1517 insertions(+), 12242 deletions(-) delete mode 100644 dlls/d3d8/drawprim.c create mode 100644 dlls/d3d8/pixelshader.c delete mode 100644 dlls/d3d8/shader.c delete mode 100644 dlls/d3d8/utils.c create mode 100644 dlls/d3d8/vertexshader.c delete mode 100644 dlls/d3d8/vshaderdeclaration.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d13469c1d889e2ebe20…

1 0

Hans Leidekker : winsock: Fix two Windows to Unix mapping issues.
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: 4a8961ce3dc3321fbdea0bcd3fa8423586df552d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a8961ce3dc3321fbdea0bc… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Feb 25 20:31:32 2006 +0100 winsock: Fix two Windows to Unix mapping issues. Handle wildcard address family hint in getaddrinfo. Convert flags too in getnameinfo. --- dlls/winsock/socket.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index 8ca3a3e..11672bc 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -3146,7 +3146,10 @@ int WINAPI WS_getaddrinfo(LPCSTR nodenam memset(&unixhints, 0, sizeof(unixhints)); punixhints->ai_flags = convert_aiflag_w2u(hints->ai_flags); - punixhints->ai_family = convert_af_w2u(hints->ai_family); + if (hints->ai_family == 0) /* wildcard, specific to getaddrinfo() */ + punixhints->ai_family = 0; + else + punixhints->ai_family = convert_af_w2u(hints->ai_family); if (hints->ai_socktype == 0) /* wildcard, specific to getaddrinfo() */ punixhints->ai_socktype = 0; else @@ -3252,7 +3255,7 @@ int WINAPI WS_getnameinfo(const SOCKADDR WSASetLastError(WSAEFAULT); return WSA_NOT_ENOUGH_MEMORY; } - ret = getnameinfo(sa_u, size, host, hostlen, serv, servlen, flags); + ret = getnameinfo(sa_u, size, host, hostlen, serv, servlen, convert_aiflag_w2u(flags)); ws_sockaddr_free(sa_u, sa); return convert_eai_u2w(ret);

1 0

Henning Gerhardt : crypt32: Add German resource file.
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: 39be679a45ee16167e5e3605a81048171617e2a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39be679a45ee16167e5e360… Author: Henning Gerhardt <henning.gerhardt(a)web.de> Date: Sat Feb 25 15:14:49 2006 +0100 crypt32: Add German resource file. --- dlls/crypt32/crypt32.rc | 1 dlls/crypt32/crypt32_De.rc | 166 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+), 0 deletions(-) create mode 100644 dlls/crypt32/crypt32_De.rc diff --git a/dlls/crypt32/crypt32.rc b/dlls/crypt32/crypt32.rc index db7904d..a453415 100644 --- a/dlls/crypt32/crypt32.rc +++ b/dlls/crypt32/crypt32.rc @@ -24,5 +24,6 @@ #include "version.rc" +#include "crypt32_De.rc" #include "crypt32_En.rc" #include "crypt32_No.rc" diff --git a/dlls/crypt32/crypt32_De.rc b/dlls/crypt32/crypt32_De.rc new file mode 100644 index 0000000..794c885 --- /dev/null +++ b/dlls/crypt32/crypt32_De.rc @@ -0,0 +1,166 @@ +/* + * crypt32 dll resources + * + * Copyright (C) 2006 Henning Gerhardt + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_AUTHORITY_KEY_ID "Autorit�tsschl�sselkennung" + IDS_KEY_ATTRIBUTES "Schl�sselattribute" + IDS_KEY_USAGE_RESTRICTION "Schl�sselbenutzungseinschr�nkung" + IDS_SUBJECT_ALT_NAME "Alternativer Name des Antragsstellers" + IDS_ISSUER_ALT_NAME "Alternativer Name des Ausgebers" + IDS_BASIC_CONSTRAINTS "Grunds�tzliche Einschr�nkungen" + IDS_KEY_USAGE "Schl�sselbenutzung" + IDS_CERT_POLICIES "Zertifikatsrichtlinien" + IDS_SUBJECT_KEY_IDENTIFIER "Schl�sselkennung des Antragsstellers" + IDS_CRL_REASON_CODE "CRL Grundcode" + IDS_CRL_DIST_POINTS "CRL Verteilungspunkte" + IDS_ENHANCED_KEY_USAGE "Erweiterte Schl�sselbenutzung" + IDS_AUTHORITY_INFO_ACCESS "Autorit�tsinformationszugriff" + IDS_CERT_EXTENSIONS "Zertifikatserweiterung" + IDS_NEXT_UPDATE_LOCATION "Next Update Location" + IDS_YES_OR_NO_TRUST "Vertrauen oder nicht vertrauen" + IDS_EMAIL_ADDRESS "E-Mail-Adresse" + IDS_UNSTRUCTURED_NAME "Unstrukturierter Name" + IDS_CONTENT_TYPE "Inhaltstyp" + IDS_MESSAGE_DIGEST "Nachrichten�bersicht" + IDS_SIGNING_TIME "Signierungszeit" + IDS_COUNTER_SIGN "Gegensignatur" + IDS_CHALLENGE_PASSWORD "Challenge Password" + IDS_UNSTRUCTURED_ADDRESS "Unstrukturierte Adresse" + IDS_SMIME_CAPABILITIES "SMIME M�glichkeiten" + IDS_PREFER_SIGNED_DATA "Signierte Daten bevorzugen" + IDS_CPS "CPS" + IDS_USER_NOTICE "Benutzerbenachrichtung" + IDS_OCSP "Online Zertifikationsstatusprotokoll" + IDS_CA_ISSUER "Ausgeber des Zertifikationsautorit�t" + IDS_CERT_TEMPLATE_NAME "Zertifkationsvorlagenname" + IDS_CERT_TYPE "Zertifikationstyp" + IDS_CERT_MANIFOLD "Zertifikationsvervielf�ltigung" + IDS_NETSCAPE_CERT_TYPE "Netscape Zertifikationstyp" + IDS_NETSCAPE_BASE_URL "Netscape Basis-URL" + IDS_NETSCAPE_REVOCATION_URL "Netscape Sperrungs-URL" + IDS_NETSCAPE_CA_REVOCATION_URL "Netscape CA Sperrungs-URL" + IDS_NETSCAPE_CERT_RENEWAL_URL "Netscape Zertifikationsernerung-URL" + IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Richtlinien-URL" + IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Servername" + IDS_NETSCAPE_COMMENT "Netscape Kommentar" + IDS_SPC_SP_AGENCY_INFO "SpcSp Agentur-Information" + IDS_SPC_FINANCIAL_CRITERIA "Spc Finanzielle Kriterien" + IDS_SPC_MINIMAL_CRITERIA "Spc Minimale Kriterien" + IDS_COUNTRY "Land/Region" + IDS_ORGANIZATION "Organisation" + IDS_ORGANIZATIONAL_UNIT "Organisationseinheit" + IDS_COMMON_NAME "Allgemeiner Name" + IDS_LOCALITY "Ort" + IDS_STATE_OR_PROVINCE "Bundesland oder Provinz" + IDS_TITLE "Titel" + IDS_GIVEN_NAME "Vorname" + IDS_INITIALS "Initialen" + IDS_SUR_NAME "Nachname" + IDS_DOMAIN_COMPONENT "Dom�nkomponente" + IDS_STREET_ADDRESS "Stra�e" + IDS_SERIAL_NUMBER "Seriennummer" + IDS_CA_VERSION "CA Version" + IDS_CROSS_CA_VERSION "Kreuz CA Version" + IDS_SERIALIZED_SIG_SERIAL_NUMBER "Serialisierte Signaturseriennummer" + IDS_PRINCIPAL_NAME "Prinzipalname" + IDS_WINDOWS_PRODUCT_UPDATE "Windows Produkt Aktualisierung" + IDS_ENROLLMENT_NAME_VALUE_PAIR "Wertepaar f�r Eintragungsname" + IDS_OS_VERSION "Betriebssystemversion" + IDS_ENROLLMENT_CSP "Eintragungs-CSP" + IDS_CRL_NUMBER "CRL Nummer" + IDS_DELTA_CRL_INDICATOR "Delta CRL Indikator" + IDS_ISSUING_DIST_POINT "Ausgeber des Verteilungspunktes" + IDS_FRESHEST_CRL "Aktuelle CRL" + IDS_NAME_CONSTRAINTS "Namenseinschr�nkungen" + IDS_POLICY_MAPPINGS "Richtlinienzuordnungen" + IDS_POLICY_CONSTRAINTS "Richtlinieneinschr�nkungen" + IDS_CROSS_CERT_DIST_POINTS "Verteilungspunkte f�r Kreuzzertifikate" + IDS_APPLICATION_POLICIES "Anwendungsrichtlinien" + IDS_APPLICATION_POLICY_MAPPINGS "Anwendungsrichtlinienzuordnungen" + IDS_APPLICATION_POLICY_CONSTRAINTS "Anweungsungsrichtlinieneinschr�nkungen" + IDS_CMC_DATA "CMC Daten" + IDS_CMC_RESPONSE "CMC Antwort" + IDS_UNSIGNED_CMC_REQUEST "Unsignierte CMC Antwort" + IDS_CMC_STATUS_INFO "CMC Statusinformation" + IDS_CMC_EXTENSIONS "CMC Erweiterungen" + IDS_CMC_ATTRIBUTES "CMC Attribute" + IDS_PKCS_7_DATA "PKCS 7 Daten" + IDS_PKCS_7_SIGNED "PKCS 7 signiert" + IDS_PKCS_7_ENVELOPED "PKCS 7 umh�llt" + IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 signiert und umh�llt" + IDS_PKCS_7_DIGESTED "PKCS 7 Digested" + IDS_PKCS_7_ENCRYPTED "PKCS 7 verschl�sselt" + IDS_PREVIOUS_CA_CERT_HASH "Vorheriger CA Zertifikatshash" + IDS_CRL_VIRTUAL_BASE "Virtuelle Basis-CRL-Nummer" + IDS_CRL_NEXT_PUBLISH "N�chste CRL Ver�ffentlichung" + IDS_CA_EXCHANGE "CA Verschl�sselungszertifikat" + IDS_KEY_RECOVERY_AGENT "Agent zur Schl�sselwiederherstellung" + IDS_CERTIFICATE_TEMPLATE "Zertifikatsvorlageninformation" + IDS_ENTERPRISE_ROOT_OID "Unternehmensstamm-OID" + IDS_RDN_DUMMY_SIGNER "Attrapenunterzeichner" + IDS_ARCHIVED_KEY_ATTR "Verschl�sselter, privater Schl�ssel" + IDS_CRL_SELF_CDP "Ver�ffentlichte CRL Standorte" + IDS_REQUIRE_CERT_CHAIN_POLICY "Erzwinge Zertifikatskettenrichtlinie" + IDS_TRANSACTION_ID "Transaktions-ID" + IDS_SENDER_NONCE "Sender einstweilen" + IDS_RECIPIENT_NONCE "Empf�nger einstweilen" + IDS_REG_INFO "Registrierungsinformationen" + IDS_GET_CERTIFICATE "Bekomme Zertifikat" + IDS_GET_CRL "Bekomme CRL" + IDS_REVOKE_REQUEST "Anfrageablehnen" + IDS_QUERY_PENDING "Wartende Abfrage" + IDS_SORTED_CTL "Zertifikatsvertrauensliste" + IDS_ARCHIVED_KEY_CERT_HASH "Archivierter Schl�sselzertifikatshash" + IDS_PRIVATE_KEY_USAGE_PERIOD "Private Schl�sselbenutzungsdauer" + IDS_CLIENT_INFORMATION "Client Information" + IDS_SERVER_AUTHENTICATION "Server Authentifizierung" + IDS_CLIENT_AUTHENTICATION "Client Authentifizierung" + IDS_CODE_SIGNING "Codesignatur" + IDS_SECURE_EMAIL "Sichere E-Mail" + IDS_TIME_STAMPING "Zeitstempel" + IDS_MICROSOFT_TRUST_LIST_SIGNING "Microsoft Vertrauenslistensignatur" + IDS_MICROSOFT_TIME_STAMPING "Microsoft Zeitstempel" + IDS_IPSEC_END_SYSTEM "IP Sicherheitsendsystem" + IDS_IPSEC_TUNNEL "IP Sicherheitstunnelabschluss" + IDS_IPSEC_USER "IP Sicherheitsbenutzer" + IDS_EFS "Verschl�sseltes Dateisystem" + IDS_WHQL_CRYPTO "Windows Hardware Treiber Verifizierung" + IDS_NT5_CRYPTO "Windows System Komponenten Verifizierung" + IDS_OEM_WHQL_CRYPTO "OEM Windows System Komponenten Verifizierung" + IDS_EMBEDDED_NT_CRYPTO "Embedded Windows System Komponenten Verifizierung" + IDS_KEY_PACK_LICENSES "Schl�sselpaketlizenzen" + IDS_LICENSE_SERVER "Lizenzserver Verifizierung" + IDS_SMART_CARD_LOGON "Smartcard Login" + IDS_DIGITAL_RIGHTS "Digitale Rechte" + IDS_QUALIFIED_SUBORDINATION "Qualifizierte Unterordnung" + IDS_KEY_RECOVERY "Schl�sselwiederherstellung" + IDS_DOCUMENT_SIGNING "Dokumentensignatur" + IDS_IPSEC_IKE_INTERMEDIATE "dazwischenliegende IP Sicherheits-IKE" + IDS_FILE_RECOVERY "Dateiwiederherstellung" + IDS_ROOT_LIST_SIGNER "Stammlistengeber" + IDS_ANY_APPLICATION_POLICIES "Alle Anwendungsrichtlinien" + IDS_DS_EMAIL_REPLICATION "Verzeichnisdienst f�r E-Mail Replikation" + IDS_ENROLLMENT_AGENT "Agent f�r Zertifikationsanforderung" + IDS_LIFETIME_SIGNING "Lebensdauersignatur" + IDS_ANY_CERT_POLICY "Alle ausgegebenen Richtlinien" +}

1 0

Saulius Krasuckas : mscms: One more LastError code fixed.
by Alexandre Julliard 27 Feb '06

27 Feb '06

Module: wine Branch: refs/heads/master Commit: 9f19f75a54f0e16f5cbb9a3f3762c979a11e97ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f19f75a54f0e16f5cbb9a3… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Sat Feb 25 10:22:36 2006 +0200 mscms: One more LastError code fixed. --- dlls/mscms/profile.c | 6 ++++++ dlls/mscms/tests/profile.c | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 6f6ff62..5fbf898 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -423,6 +423,12 @@ BOOL WINAPI GetStandardColorSpaceProfile return FALSE; } + if (!profile) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + GetColorDirectoryW( machine, rgbprofile, &len ); switch (id) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 2f46e37..8c7d0aa 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -605,7 +605,6 @@ static void test_GetStandardColorSpacePr if (query_colorspace(SPACE_RGB)) { - todo_wine fail_GSCSP(A, NULL, SPACE_RGB, NULL, &size, sizeP, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER)); todo_wine fail_GSCSP(A, NULL, SPACE_RGB, newprofile, &size, 0, FALSE, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER)); @@ -619,7 +618,6 @@ static void test_GetStandardColorSpacePr /* Several invalid parameter checks */ fail_GSCSP(A, machine, 0, newprofile, &size, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); fail_GSCSP(A, NULL, 0, newprofile, NULL, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER)); - todo_wine fail_GSCSP(A, NULL, 0, NULL, &size, 0, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); todo_wine fail_GSCSP(A, NULL, 0, newprofile, &size, sizeP, TRUE, (GLE == ERROR_FILE_NOT_FOUND)); @@ -666,7 +664,6 @@ static void test_GetStandardColorSpacePr fail_GSCSP(W, machineW, SPACE_RGB, newprofile, &size, sizeP, FALSE, (GLE == ERROR_NOT_SUPPORTED)); todo_wine fail_GSCSP(W, NULL, (DWORD)-1, newprofile, &size, sizeP, FALSE, (GLE == ERROR_FILE_NOT_FOUND)); - todo_wine fail_GSCSP(W, NULL, SPACE_RGB, NULL, &size, sizeP, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER)); fail_GSCSP(W, NULL, SPACE_RGB, newprofile, NULL, sizeP, FALSE, (GLE == ERROR_INVALID_PARAMETER)); todo_wine @@ -675,7 +672,6 @@ static void test_GetStandardColorSpacePr /* Several invalid parameter checks */ fail_GSCSP(W, machineW, 0, newprofile, &size, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); fail_GSCSP(W, NULL, 0, newprofile, NULL, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER)); - todo_wine fail_GSCSP(W, NULL, 0, NULL, &size, 0, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); todo_wine fail_GSCSP(W, NULL, 0, newprofile, &size, sizeP, TRUE, (GLE == ERROR_FILE_NOT_FOUND));

1 0