Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[cgutman] 48046: [PING] - Fix a bug in the lost packet counter code which could result in a negative received value

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Jul 14 19:32:03 2010 New Revision: 48046 URL: http://svn.reactos.org/svn/reactos?rev=48046&view=rev Log: [PING] - Fix a bug in the lost packet counter code which could result in a negative received value Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Wed Jul 14 19:32:03 2010 @@ -555,7 +555,6 @@ } if (Status == SOCKET_ERROR) { - LostCount++; if (WSAGetLastError() == WSAEHOSTUNREACH) printf("Destination host unreachable.\n"); else

14 years, 5 months

[dreimer] 48045: Bug 5413: [PATCH] regedit: app key on treeview/listview Bug 5473: [PATCH] regedit: selection on hexedit Both from Katayama Hirofumi

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 14 18:15:43 2010 New Revision: 48045 URL: http://svn.reactos.org/svn/reactos?rev=48045&view=rev Log: Bug 5413: [PATCH] regedit: app key on treeview/listview Bug 5473: [PATCH] regedit: selection on hexedit Both from Katayama Hirofumi Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/hexedit.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Wed Jul 14 18:15:43 2010 @@ -297,17 +297,6 @@ break; } return CallWindowProc(oldwndproc, hwnd, uMsg, wParam, lParam); -} - -/* fix coords to top-left when SHIFT-F10 is pressed */ -void FixPointIfContext(POINTS *pt, HWND hWnd) -{ - if (pt->x == -1 && pt->y == -1) { - POINT p = { 0, 0 }; - ClientToScreen(hWnd, &p); - pt->x = (WORD)(p.x); - pt->y = (WORD)(p.y); - } } /******************************************************************************* @@ -577,16 +566,29 @@ case WM_CONTEXTMENU: { - POINTS pt; + POINT pt; if((HWND)wParam == pChildWnd->hListWnd) { int i, cnt; BOOL IsDefault; - pt.x = LOWORD(lParam); - pt.y = HIWORD(lParam); + pt.x = (short) LOWORD(lParam); + pt.y = (short) HIWORD(lParam); cnt = ListView_GetSelectedCount(pChildWnd->hListWnd); i = ListView_GetNextItem(pChildWnd->hListWnd, -1, LVNI_FOCUSED | LVNI_SELECTED); - FixPointIfContext(&pt, pChildWnd->hListWnd); + if (pt.x == -1 && pt.y == -1) + { + RECT rc; + if (i != -1) + { + rc.left = LVIR_BOUNDS; + SendMessage(pChildWnd->hListWnd, LVM_GETITEMRECT, i, (LPARAM) &rc); + pt.x = rc.left + 8; + pt.y = rc.top + 8; + } + else + pt.x = pt.y = 0; + } + ClientToScreen(pChildWnd->hListWnd, &pt); if(i == -1) { TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); @@ -620,14 +622,33 @@ int iLastPos; WORD wID; - pt.x = LOWORD(lParam); - pt.y = HIWORD(lParam); - hti.pt.x = pt.x; - hti.pt.y = pt.y; - ScreenToClient(pChildWnd->hTreeWnd, &hti.pt); - (void)TreeView_HitTest(pChildWnd->hTreeWnd, &hti); - - if ((hti.flags & TVHT_ONITEM) != 0 || (pt.x == -1 && pt.y == -1)) + pt.x = (short) LOWORD(lParam); + pt.y = (short) HIWORD(lParam); + + if (pt.x == -1 && pt.y == -1) + { + RECT rc; + hti.hItem = TreeView_GetSelection(pChildWnd->hTreeWnd); + if (hti.hItem != NULL) + { + TreeView_GetItemRect(pChildWnd->hTreeWnd, hti.hItem, &rc, TRUE); + pt.x = rc.left + 8; + pt.y = rc.top + 8; + ClientToScreen(pChildWnd->hTreeWnd, &pt); + hti.flags = TVHT_ONITEM; + } + else + hti.flags = 0; + } + else + { + hti.pt.x = pt.x; + hti.pt.y = pt.y; + ScreenToClient(pChildWnd->hTreeWnd, &hti.pt); + (void)TreeView_HitTest(pChildWnd->hTreeWnd, &hti); + } + + if (hti.flags & TVHT_ONITEM) { hContextMenu = GetSubMenu(hPopupMenus, PM_TREECONTEXT); (void)TreeView_SelectItem(pChildWnd->hTreeWnd, hti.hItem); @@ -688,7 +709,6 @@ s += _tcslen(s) + 1; } } - FixPointIfContext(&pt, pChildWnd->hTreeWnd); TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, pChildWnd->hWnd, NULL); } } Modified: trunk/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] Wed Jul 14 18:15:43 2010 @@ -44,6 +44,10 @@ INT CaretCol; INT CaretLine; BOOL InMid; + + INT SelStart; + INT SelEnd; + BOOL SelOnField; } HEXEDIT_DATA, *PHEXEDIT_DATA; /* hit test codes */ @@ -181,13 +185,25 @@ HEXEDIT_PaintLines(PHEXEDIT_DATA hed, HDC hDC, DWORD ScrollPos, DWORD First, DWORD Last, RECT *rc) { DWORD dx, dy, linestart; - INT x; + INT i, isave, i0, i1, x; PBYTE buf, current, end, line; size_t bufsize; TCHAR hex[3], addr[17]; - RECT rct; + RECT rct, rct2; FillRect(hDC, rc, (HBRUSH)(COLOR_WINDOW + 1)); + SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); + + if (hed->SelStart < hed->SelEnd) + { + i0 = hed->SelStart; + i1 = hed->SelEnd; + } + else + { + i0 = hed->SelEnd; + i1 = hed->SelStart; + } if(hed->hBuffer) { @@ -212,9 +228,11 @@ end = buf + bufsize; dy = First * hed->LineHeight; linestart = (ScrollPos + First) * hed->ColumnsPerLine; + i = linestart; current = buf + linestart; Last = min(hed->nLines - ScrollPos, Last); + SetBkMode(hDC, TRANSPARENT); while(First <= Last && current < end) { DWORD dh; @@ -236,25 +254,54 @@ /* draw hex map */ dx += (hed->CharWidth / 2); line = current; + isave = i; for(x = 0; x < hed->ColumnsPerLine && current < end; x++) { rct.left += dh; rct.right += dh; _stprintf(hex, _T("%02X"), *(current++)); - ExtTextOut(hDC, dx, dy, ETO_OPAQUE, &rct, hex, 2, NULL); + if (i0 <= i && i < i1) + { + rct2.left = dx; + rct2.top = dy; + rct2.right = dx + hed->CharWidth * 2 + 1; + rct2.bottom = dy + hed->LineHeight; + InflateRect(&rct2, hed->CharWidth / 2, 0); + FillRect(hDC, &rct2, (HBRUSH)(COLOR_HIGHLIGHT + 1)); + SetTextColor(hDC, GetSysColor(COLOR_HIGHLIGHTTEXT)); + ExtTextOut(hDC, dx, dy, 0, &rct, hex, 2, NULL); + SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); + } + else + ExtTextOut(hDC, dx, dy, ETO_OPAQUE, &rct, hex, 2, NULL); dx += dh; + i++; } /* draw ascii map */ dx = ((4 + hed->AddressSpacing + hed->SplitSpacing + (hed->ColumnsPerLine * 3)) * hed->CharWidth); current = line; + i = isave; for(x = 0; x < hed->ColumnsPerLine && current < end; x++) { _stprintf(hex, _T("%C"), *(current++)); hex[0] = ((hex[0] & _T('\x007f')) >= _T(' ') ? hex[0] : _T('.')); - TextOut(hDC, dx, dy, hex, 1); + if (i0 <= i && i < i1) + { + rct2.left = dx; + rct2.top = dy; + rct2.right = dx + hed->CharWidth; + rct2.bottom = dy + hed->LineHeight; + FillRect(hDC, &rct2, (HBRUSH)(COLOR_HIGHLIGHT + 1)); + SetTextColor(hDC, GetSysColor(COLOR_HIGHLIGHTTEXT)); + TextOut(hDC, dx, dy, hex, 1); + SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); + } + else + TextOut(hDC, dx, dy, hex, 1); dx += hed->CharWidth; + i++; } dy += hed->LineHeight; @@ -291,14 +338,14 @@ } pt.x -= d; - d = (3 * hed->ColumnsPerLine * hed->CharWidth); + d = ((3 * hed->ColumnsPerLine + 1) * hed->CharWidth); if(pt.x <= d) { return HEHT_HEXDUMP; } pt.x -= d; - d = (hed->SplitSpacing * hed->CharWidth); + d = ((hed->SplitSpacing - 1) * hed->CharWidth); if(pt.x <= d) { return HEHT_HEXDUMPSPACING; @@ -501,7 +548,6 @@ hed->AddressSpacing = 2; hed->SplitSpacing = 2; hed->EditingField = TRUE; /* in hexdump field */ - hed->InMid = FALSE; SetWindowLongPtr(hWnd, 0, (DWORD_PTR)hed); HEXEDIT_Update(hed); @@ -689,7 +735,7 @@ FillRect(ps.hdc, &rc, (HBRUSH)(COLOR_WINDOW + 1)); goto epaint; } - if(!(hbmp = CreateCompatibleBitmap(hTempDC, ps.rcPaint.right, ps.rcPaint.bottom))) + if(!(hbmp = CreateCompatibleBitmap(ps.hdc, ps.rcPaint.right, ps.rcPaint.bottom))) { FillRect(ps.hdc, &rc, (HBRUSH)(COLOR_WINDOW + 1)); DeleteDC(hTempDC); @@ -705,7 +751,7 @@ DeleteObject(hbmp); DeleteDC(hTempDC); - epaint: +epaint: EndPaint(hed->hWndSelf, &ps); } @@ -755,19 +801,75 @@ { BOOL NewField; POINT EditPos; - DWORD Hit = HEXEDIT_HitRegionTest(hed, Pt); + DWORD Hit; UNREFERENCED_PARAMETER(Buttons); SetFocus(hed->hWndSelf); - hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, Hit, &EditPos, &NewField); - hed->EditingField = NewField; + if (GetAsyncKeyState(VK_SHIFT) < 0) + { + if (hed->SelOnField) + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_HEXDUMP, &EditPos, &NewField); + else + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_ASCIIDUMP, &EditPos, &NewField); + hed->SelEnd = hed->Index; + hed->EditingField = hed->SelOnField; + } + else + { + Hit = HEXEDIT_HitRegionTest(hed, Pt); + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, Hit, &EditPos, &NewField); + hed->SelStart = hed->SelEnd = hed->Index; + hed->SelOnField = hed->EditingField = NewField; + SetCapture(hed->hWndSelf); + } hed->CaretCol = EditPos.x; hed->CaretLine = EditPos.y; hed->InMid = FALSE; - + InvalidateRect(hed->hWndSelf, NULL, FALSE); HEXEDIT_MoveCaret(hed, TRUE); + return 0; +} + +static LRESULT +HEXEDIT_WM_LBUTTONUP(PHEXEDIT_DATA hed, INT Buttons, POINTS Pt) +{ + BOOL NewField; + POINT EditPos; + if (GetCapture() == hed->hWndSelf) + { + if (hed->SelOnField) + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_HEXDUMP, &EditPos, &NewField); + else + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_ASCIIDUMP, &EditPos, &NewField); + hed->CaretCol = EditPos.x; + hed->CaretLine = EditPos.y; + hed->SelEnd = hed->Index; + ReleaseCapture(); + InvalidateRect(hed->hWndSelf, NULL, FALSE); + HEXEDIT_MoveCaret(hed, TRUE); + } + return 0; +} + +static LRESULT +HEXEDIT_WM_MOUSEMOVE(PHEXEDIT_DATA hed, INT Buttons, POINTS Pt) +{ + BOOL NewField; + POINT EditPos; + if (GetCapture() == hed->hWndSelf) + { + if (hed->SelOnField) + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_HEXDUMP, &EditPos, &NewField); + else + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_ASCIIDUMP, &EditPos, &NewField); + hed->CaretCol = EditPos.x; + hed->CaretLine = EditPos.y; + hed->SelEnd = hed->Index; + InvalidateRect(hed->hWndSelf, NULL, FALSE); + HEXEDIT_MoveCaret(hed, TRUE); + } return 0; } @@ -776,6 +878,8 @@ { size_t bufsize; PBYTE buf; + INT i0, i1; + if(GetKeyState(VK_MENU) & 0x8000) { return FALSE; @@ -783,133 +887,215 @@ bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + if (hed->SelStart < hed->SelEnd) + { + i0 = hed->SelStart; + i1 = hed->SelEnd; + } + else + { + i0 = hed->SelEnd; + i1 = hed->SelStart; + } + switch(VkCode) { case VK_DELETE: - if (hed->InMid && hed->EditingField) + if (hed->SelStart != hed->SelEnd) { buf = (PBYTE) LocalLock(hed->hBuffer); if (buf) { - MoveMemory(buf + hed->Index, buf + hed->Index + 1, - bufsize - hed->Index - 1); + MoveMemory(buf + i0, buf + i1, bufsize - i1); LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - (i1 - i0)); + hed->InMid = FALSE; + hed->Index = hed->SelStart = hed->SelEnd = i0; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + } + else + { + if (hed->InMid && hed->EditingField) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index, buf + hed->Index + 1, + bufsize - hed->Index - 1); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); + hed->InMid = FALSE; + } + else if (hed->Index < bufsize) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index, buf + hed->Index + 1, + bufsize - hed->Index - 1); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); + } + } + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + break; + + case VK_BACK: + if (hed->SelStart != hed->SelEnd) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + i0, buf + i1, bufsize - i1); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - (i1 - i0)); + hed->InMid = FALSE; + hed->Index = hed->SelStart = hed->SelEnd = i0; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + } + else + { + if (hed->InMid && hed->EditingField) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index, buf + hed->Index + 1, + bufsize - hed->Index - 1); + LocalUnlock(hed->hBuffer); + } + } + else if (hed->Index > 0) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index - 1, buf + hed->Index, + bufsize - hed->Index); + LocalUnlock(hed->hBuffer); + } + hed->Index--; + hed->SelStart = hed->SelEnd = hed->Index; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; } HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); hed->InMid = FALSE; } - else if (hed->Index < bufsize) + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + break; + + case VK_LEFT: + if (hed->Index > 0) + { + hed->Index--; + if (GetAsyncKeyState(VK_SHIFT) < 0) + hed->SelEnd = hed->Index; + else + hed->SelStart = hed->SelEnd = hed->Index; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + hed->InMid = FALSE; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + } + break; + + case VK_RIGHT: + if (hed->Index < (INT)bufsize) + { + hed->Index++; + if (GetAsyncKeyState(VK_SHIFT) < 0) + hed->SelEnd = hed->Index; + else + hed->SelStart = hed->SelEnd = hed->Index; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + hed->InMid = FALSE; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + } + break; + + case VK_UP: + if (hed->Index >= hed->ColumnsPerLine) + { + hed->Index -= hed->ColumnsPerLine; + if (GetAsyncKeyState(VK_SHIFT) < 0) + hed->SelEnd = hed->Index; + else + hed->SelStart = hed->SelEnd = hed->Index; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + hed->InMid = FALSE; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + } + break; + + case VK_DOWN: + if (hed->Index + hed->ColumnsPerLine <= (INT) bufsize) + hed->Index += hed->ColumnsPerLine; + else + hed->Index = bufsize; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + if (GetAsyncKeyState(VK_SHIFT) < 0) + hed->SelEnd = hed->Index; + else + hed->SelStart = hed->SelEnd = hed->Index; + hed->InMid = FALSE; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + break; + } + + return FALSE; +} + +static BOOL +HEXEDIT_WM_CHAR(PHEXEDIT_DATA hed, WCHAR ch) +{ + size_t bufsize; + PBYTE buf; + INT i0, i1; + + bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + if (hed->SelStart < hed->SelEnd) + { + i0 = hed->SelStart; + i1 = hed->SelEnd; + } + else + { + i0 = hed->SelEnd; + i1 = hed->SelStart; + } + if (!hed->EditingField) + { + if (0x20 <= ch && ch <= 0xFF) + { + if (hed->SelStart != hed->SelEnd) { buf = (PBYTE) LocalLock(hed->hBuffer); if (buf) { - MoveMemory(buf + hed->Index, buf + hed->Index + 1, - bufsize - hed->Index - 1); + MoveMemory(buf + i0, buf + i1, bufsize - i1); LocalUnlock(hed->hBuffer); } - HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); - } - InvalidateRect(hed->hWndSelf, NULL, TRUE); - HEXEDIT_MoveCaret(hed, TRUE); - break; - - case VK_BACK: - if (hed->InMid && hed->EditingField) - { - buf = (PBYTE) LocalLock(hed->hBuffer); - if (buf) - { - MoveMemory(buf + hed->Index, buf + hed->Index + 1, - bufsize - hed->Index - 1); - LocalUnlock(hed->hBuffer); - } - HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - (i1 - i0)); hed->InMid = FALSE; - } - else if (hed->Index > 0) - { - buf = (PBYTE) LocalLock(hed->hBuffer); - if (buf) - { - MoveMemory(buf + hed->Index - 1, buf + hed->Index, - bufsize - hed->Index); - LocalUnlock(hed->hBuffer); - } - HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); - hed->Index--; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - hed->InMid = FALSE; - } - InvalidateRect(hed->hWndSelf, NULL, TRUE); - HEXEDIT_MoveCaret(hed, TRUE); - break; - - case VK_LEFT: - if (hed->Index > 0) - { - hed->Index--; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - hed->InMid = FALSE; - HEXEDIT_MoveCaret(hed, TRUE); - } - break; - - case VK_RIGHT: - if (hed->Index < (INT)bufsize) - { - hed->Index++; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - hed->InMid = FALSE; - HEXEDIT_MoveCaret(hed, TRUE); - } - break; - - case VK_UP: - if (hed->Index >= hed->ColumnsPerLine) - { - hed->Index -= hed->ColumnsPerLine; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - hed->InMid = FALSE; - HEXEDIT_MoveCaret(hed, TRUE); - } - break; - - case VK_DOWN: - if (hed->Index + hed->ColumnsPerLine <= (INT) bufsize) - { - hed->Index += hed->ColumnsPerLine; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - } - else - { - hed->Index = bufsize; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - } - hed->InMid = FALSE; - HEXEDIT_MoveCaret(hed, TRUE); - break; - } - - return FALSE; -} - -static BOOL -HEXEDIT_WM_CHAR(PHEXEDIT_DATA hed, WCHAR ch) -{ - size_t bufsize; - PBYTE buf; - - bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); - if (!hed->EditingField) - { - if (0x20 <= ch && ch < 0x7F) - { + bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + hed->Index = hed->SelStart = hed->SelEnd = i0; + } HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize + 1); buf = (PBYTE) LocalLock(hed->hBuffer); if (buf) @@ -932,6 +1118,19 @@ if (('0' <= ch && ch <= '9') || ('A' <= ch && ch <= 'F') || ('a' <= ch && ch <= 'f')) { + if (hed->SelStart != hed->SelEnd) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + i0, buf + i1, bufsize - i1); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - (i1 - i0)); + hed->InMid = FALSE; + bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + hed->Index = hed->SelStart = hed->SelEnd = i0; + } if (hed->InMid) { buf = (PBYTE) LocalLock(hed->hBuffer); @@ -947,10 +1146,6 @@ } hed->InMid = FALSE; hed->Index++; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - InvalidateRect(hed->hWndSelf, NULL, TRUE); - HEXEDIT_MoveCaret(hed, TRUE); } else { @@ -969,11 +1164,11 @@ LocalUnlock(hed->hBuffer); } hed->InMid = TRUE; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - InvalidateRect(hed->hWndSelf, NULL, TRUE); - HEXEDIT_MoveCaret(hed, TRUE); - } + } + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); return FALSE; } } @@ -1024,6 +1219,20 @@ return HEXEDIT_WM_LBUTTONDOWN(hed, (INT)wParam, p); } + case WM_LBUTTONUP: + { + p.x = LOWORD(lParam); + p.y = HIWORD(lParam); + return HEXEDIT_WM_LBUTTONUP(hed, (INT)wParam, p); + } + + case WM_MOUSEMOVE: + { + p.x = LOWORD(lParam); + p.y = HIWORD(lParam); + return HEXEDIT_WM_MOUSEMOVE(hed, (INT)wParam, p); + } + case WM_MOUSEWHEEL: { UINT nScrollLines = 3; @@ -1080,8 +1289,16 @@ return HEXEDIT_WM_NCDESTROY(hed); } break; - } - - return CallWindowProc(DefWindowProc, hWnd, uMsg, wParam, lParam); -} - + + case WM_CONTEXTMENU: + /* FIXME: Implement Cut, Copy, Paste, Delete and Select All */ + break; + + case WM_COMMAND: + /* FIXME: Implement Cut, Copy, Paste, Delete and Select All */ + break; + } + + return DefWindowProc(hWnd, uMsg, wParam, lParam); +} +

14 years, 5 months

[dreimer] 48044: Fix setupapi setupcab winetest. (Samuel Serapion)

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 14 17:18:49 2010 New Revision: 48044 URL: http://svn.reactos.org/svn/reactos?rev=48044&view=rev Log: Fix setupapi setupcab winetest. (Samuel Serapion) Modified: trunk/reactos/dll/win32/setupapi/setupcab.c Modified: trunk/reactos/dll/win32/setupapi/setupcab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupca… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupcab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupcab.c [iso-8859-1] Wed Jul 14 17:18:49 2010 @@ -518,7 +518,7 @@ SC_HSC_A my_hsc; ERF erf; - CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p; + CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p = NULL; DWORD fpnsize; BOOL ret; @@ -528,6 +528,12 @@ if (! LoadCABINETDll()) return FALSE; + + if (!CabinetFile) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } memset(&my_hsc, 0, sizeof(SC_HSC_A)); pszCabinet[0] = '\0'; @@ -584,7 +590,7 @@ UINT len; SC_HSC_W my_hsc; ERF erf; - WCHAR pszCabPathW[MAX_PATH], *p; + WCHAR pszCabPathW[MAX_PATH], *p = NULL; DWORD fpnsize; BOOL ret; @@ -594,7 +600,11 @@ if (!LoadCABINETDll()) return FALSE; - if (!CabinetFile) return FALSE; + if (!CabinetFile) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } memset(&my_hsc, 0, sizeof(SC_HSC_W));

14 years, 5 months

[dreimer] 48043: Fix libtiff's external functions.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 14 17:12:22 2010 New Revision: 48043 URL: http://svn.reactos.org/svn/reactos?rev=48043&view=rev Log: Fix libtiff's external functions. Added: trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch (with props) trunk/reactos/include/reactos/libs/libtiff/rosdiff.patch (with props) Modified: trunk/reactos/dll/3rdparty/libtiff/libtiff.rbuild trunk/reactos/dll/3rdparty/libtiff/tif_open.c trunk/reactos/include/reactos/libs/libtiff/tiffio.h Modified: trunk/reactos/dll/3rdparty/libtiff/libtiff.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/libti… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/libtiff.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/libtiff.rbuild [iso-8859-1] Wed Jul 14 17:12:22 2010 @@ -3,8 +3,9 @@ <module name="libtiff" type="win32dll" entrypoint="0" installbase="system32" installname="libtiff.dll" allowwarnings="true" crt="msvcrt"> <define name="WIN32" /> <define name="NDEBUG" /> - <define name="_WINDOWS" /> - <define name="_USRDLL" /> + <define name="BUILD_LIBTIFF_DLL" /> + <define name="DLL_EXPORT" /> + <define name="USE_WIN32_FILEIO" /> <include base="libtiff">.</include> <include base="ReactOS">include/reactos/libs/zlib</include> <include base="ReactOS">include/reactos/libs/libtiff</include> Added: trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/rosdi… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch (added) +++ trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch [iso-8859-1] Wed Jul 14 17:12:22 2010 @@ -1,0 +1,15 @@ +Index: tif_open.c +=================================================================== +--- tif_open.c (revision 48037) ++++ tif_open.c (working copy) +@@ -516,6 +516,9 @@ + TIFFSetClientdata(TIFF* tif, thandle_t newvalue) + { + thandle_t m = tif->tif_clientdata; ++#ifdef USE_WIN32_FILEIO ++ newvalue = (thandle_t) _get_osfhandle(newvalue); ++#endif /* USE_WIN32_FILEIO */ + tif->tif_clientdata = newvalue; + return m; + } + Propchange: trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/3rdparty/libtiff/tif_open.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_o… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_open.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_open.c [iso-8859-1] Wed Jul 14 17:12:22 2010 @@ -516,6 +516,9 @@ TIFFSetClientdata(TIFF* tif, thandle_t newvalue) { thandle_t m = tif->tif_clientdata; +#ifdef USE_WIN32_FILEIO + newvalue = (thandle_t) _get_osfhandle(newvalue); +#endif /* USE_WIN32_FILEIO */ tif->tif_clientdata = newvalue; return m; } Added: trunk/reactos/include/reactos/libs/libtiff/rosdiff.patch URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… ============================================================================== --- trunk/reactos/include/reactos/libs/libtiff/rosdiff.patch (added) +++ trunk/reactos/include/reactos/libs/libtiff/rosdiff.patch [iso-8859-1] Wed Jul 14 17:12:22 2010 @@ -1,0 +1,445 @@ +Index: tiffio.h +=================================================================== +--- tiffio.h (revision 48037) ++++ tiffio.h (working copy) +@@ -27,6 +27,30 @@ + #ifndef _TIFFIO_ + #define _TIFFIO_ + ++#ifndef __GNUC__ ++# define __DLL_IMPORT__ __declspec(dllimport) ++# define __DLL_EXPORT__ __declspec(dllexport) ++#else ++# define __DLL_IMPORT__ __attribute__((dllimport)) extern ++# define __DLL_EXPORT__ __attribute__((dllexport)) extern ++#endif ++ ++#if (defined __WIN32__) || (defined _WIN32) ++# ifdef BUILD_LIBTIFF_DLL ++# define LIBTIFF_DLL_IMPEXP __DLL_EXPORT__ ++# elif defined(LIBTIFF_STATIC) ++# define LIBTIFF_DLL_IMPEXP ++# elif defined (USE_LIBTIFF_DLL) ++# define LIBTIFF_DLL_IMPEXP __DLL_IMPORT__ ++# elif defined (USE_LIBTIFF_STATIC) ++# define LIBTIFF_DLL_IMPEXP ++# else /* assume USE_LIBTIFF_DLL */ ++# define LIBTIFF_DLL_IMPEXP __DLL_IMPORT__ ++# endif ++#else /* __WIN32__ */ ++# define LIBTIFF_DLL_IMPEXP ++#endif ++ + /* + * TIFF I/O Library Definitions. + */ +@@ -80,10 +104,20 @@ + */ + + #if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows) ++# define BINMODE "b" + # if !defined(__CYGWIN) && !defined(AVOID_WIN32_FILEIO) && !defined(USE_WIN32_FILEIO) + # define AVOID_WIN32_FILEIO + # endif +-#endif ++# include <fcntl.h> ++# include <io.h> ++# ifdef SET_BINARY ++# undef SET_BINARY ++# endif /* SET_BINARY */ ++# define SET_BINARY(f) do {if (!_isatty(f)) _setmode(f,_O_BINARY);} while (0) ++#else /* Windows */ ++# define BINMODE ++# define SET_BINARY(f) (void)0 ++#endif /* Windows */ + + #if defined(USE_WIN32_FILEIO) + # define VC_EXTRALEAN +@@ -268,30 +302,30 @@ + typedef void (*TIFFUnmapFileProc)(thandle_t, tdata_t, toff_t); + typedef void (*TIFFExtendProc)(TIFF*); + +-extern const char* TIFFGetVersion(void); ++LIBTIFF_DLL_IMPEXP const char* TIFFGetVersion(void); + +-extern const TIFFCodec* TIFFFindCODEC(uint16); +-extern TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod); +-extern void TIFFUnRegisterCODEC(TIFFCodec*); +-extern int TIFFIsCODECConfigured(uint16); +-extern TIFFCodec* TIFFGetConfiguredCODECs(void); ++LIBTIFF_DLL_IMPEXP const TIFFCodec* TIFFFindCODEC(uint16); ++LIBTIFF_DLL_IMPEXP TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod); ++LIBTIFF_DLL_IMPEXP void TIFFUnRegisterCODEC(TIFFCodec*); ++LIBTIFF_DLL_IMPEXP int TIFFIsCODECConfigured(uint16); ++LIBTIFF_DLL_IMPEXP TIFFCodec* TIFFGetConfiguredCODECs(void); + + /* + * Auxiliary functions. + */ + +-extern tdata_t _TIFFmalloc(tsize_t); +-extern tdata_t _TIFFrealloc(tdata_t, tsize_t); +-extern void _TIFFmemset(tdata_t, int, tsize_t); +-extern void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t); +-extern int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t); +-extern void _TIFFfree(tdata_t); ++LIBTIFF_DLL_IMPEXP tdata_t _TIFFmalloc(tsize_t); ++LIBTIFF_DLL_IMPEXP tdata_t _TIFFrealloc(tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP void _TIFFmemset(tdata_t, int, tsize_t); ++LIBTIFF_DLL_IMPEXP void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP void _TIFFfree(tdata_t); + + /* + ** Stuff, related to tag handling and creating custom tags. + */ +-extern int TIFFGetTagListCount( TIFF * ); +-extern ttag_t TIFFGetTagListEntry( TIFF *, int tag_index ); ++LIBTIFF_DLL_IMPEXP int TIFFGetTagListCount( TIFF * ); ++LIBTIFF_DLL_IMPEXP ttag_t TIFFGetTagListEntry( TIFF *, int tag_index ); + + #define TIFF_ANY TIFF_NOTYPE /* for field descriptor searching */ + #define TIFF_VARIABLE -1 /* marker for variable length tags */ +@@ -317,12 +351,12 @@ + void *value; + } TIFFTagValue; + +-extern void TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], int); +-extern const TIFFFieldInfo* TIFFFindFieldInfo(TIFF*, ttag_t, TIFFDataType); +-extern const TIFFFieldInfo* TIFFFindFieldInfoByName(TIFF* , const char *, ++LIBTIFF_DLL_IMPEXP void TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], int); ++LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFindFieldInfo(TIFF*, ttag_t, TIFFDataType); ++LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFindFieldInfoByName(TIFF* , const char *, + TIFFDataType); +-extern const TIFFFieldInfo* TIFFFieldWithTag(TIFF*, ttag_t); +-extern const TIFFFieldInfo* TIFFFieldWithName(TIFF*, const char *); ++LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFieldWithTag(TIFF*, ttag_t); ++LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFieldWithName(TIFF*, const char *); + + typedef int (*TIFFVSetMethod)(TIFF*, ttag_t, va_list); + typedef int (*TIFFVGetMethod)(TIFF*, ttag_t, va_list); +@@ -334,180 +368,180 @@ + TIFFPrintMethod printdir; /* directory print routine */ + } TIFFTagMethods; + +-extern TIFFTagMethods *TIFFAccessTagMethods( TIFF * ); +-extern void *TIFFGetClientInfo( TIFF *, const char * ); +-extern void TIFFSetClientInfo( TIFF *, void *, const char * ); ++LIBTIFF_DLL_IMPEXP TIFFTagMethods *TIFFAccessTagMethods( TIFF * ); ++LIBTIFF_DLL_IMPEXP void *TIFFGetClientInfo( TIFF *, const char * ); ++LIBTIFF_DLL_IMPEXP void TIFFSetClientInfo( TIFF *, void *, const char * ); + +-extern void TIFFCleanup(TIFF*); +-extern void TIFFClose(TIFF*); +-extern int TIFFFlush(TIFF*); +-extern int TIFFFlushData(TIFF*); +-extern int TIFFGetField(TIFF*, ttag_t, ...); +-extern int TIFFVGetField(TIFF*, ttag_t, va_list); +-extern int TIFFGetFieldDefaulted(TIFF*, ttag_t, ...); +-extern int TIFFVGetFieldDefaulted(TIFF*, ttag_t, va_list); +-extern int TIFFReadDirectory(TIFF*); +-extern int TIFFReadCustomDirectory(TIFF*, toff_t, const TIFFFieldInfo[], ++LIBTIFF_DLL_IMPEXP void TIFFCleanup(TIFF*); ++LIBTIFF_DLL_IMPEXP void TIFFClose(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFFlush(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFFlushData(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFGetField(TIFF*, ttag_t, ...); ++LIBTIFF_DLL_IMPEXP int TIFFVGetField(TIFF*, ttag_t, va_list); ++LIBTIFF_DLL_IMPEXP int TIFFGetFieldDefaulted(TIFF*, ttag_t, ...); ++LIBTIFF_DLL_IMPEXP int TIFFVGetFieldDefaulted(TIFF*, ttag_t, va_list); ++LIBTIFF_DLL_IMPEXP int TIFFReadDirectory(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFReadCustomDirectory(TIFF*, toff_t, const TIFFFieldInfo[], + size_t); +-extern int TIFFReadEXIFDirectory(TIFF*, toff_t); +-extern tsize_t TIFFScanlineSize(TIFF*); +-extern tsize_t TIFFOldScanlineSize(TIFF*); +-extern tsize_t TIFFNewScanlineSize(TIFF*); +-extern tsize_t TIFFRasterScanlineSize(TIFF*); +-extern tsize_t TIFFStripSize(TIFF*); +-extern tsize_t TIFFRawStripSize(TIFF*, tstrip_t); +-extern tsize_t TIFFVStripSize(TIFF*, uint32); +-extern tsize_t TIFFTileRowSize(TIFF*); +-extern tsize_t TIFFTileSize(TIFF*); +-extern tsize_t TIFFVTileSize(TIFF*, uint32); +-extern uint32 TIFFDefaultStripSize(TIFF*, uint32); +-extern void TIFFDefaultTileSize(TIFF*, uint32*, uint32*); +-extern int TIFFFileno(TIFF*); +-extern int TIFFSetFileno(TIFF*, int); +-extern thandle_t TIFFClientdata(TIFF*); +-extern thandle_t TIFFSetClientdata(TIFF*, thandle_t); +-extern int TIFFGetMode(TIFF*); +-extern int TIFFSetMode(TIFF*, int); +-extern int TIFFIsTiled(TIFF*); +-extern int TIFFIsByteSwapped(TIFF*); +-extern int TIFFIsUpSampled(TIFF*); +-extern int TIFFIsMSB2LSB(TIFF*); +-extern int TIFFIsBigEndian(TIFF*); +-extern TIFFReadWriteProc TIFFGetReadProc(TIFF*); +-extern TIFFReadWriteProc TIFFGetWriteProc(TIFF*); +-extern TIFFSeekProc TIFFGetSeekProc(TIFF*); +-extern TIFFCloseProc TIFFGetCloseProc(TIFF*); +-extern TIFFSizeProc TIFFGetSizeProc(TIFF*); +-extern TIFFMapFileProc TIFFGetMapFileProc(TIFF*); +-extern TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*); +-extern uint32 TIFFCurrentRow(TIFF*); +-extern tdir_t TIFFCurrentDirectory(TIFF*); +-extern tdir_t TIFFNumberOfDirectories(TIFF*); +-extern uint32 TIFFCurrentDirOffset(TIFF*); +-extern tstrip_t TIFFCurrentStrip(TIFF*); +-extern ttile_t TIFFCurrentTile(TIFF*); +-extern int TIFFReadBufferSetup(TIFF*, tdata_t, tsize_t); +-extern int TIFFWriteBufferSetup(TIFF*, tdata_t, tsize_t); +-extern int TIFFSetupStrips(TIFF *); +-extern int TIFFWriteCheck(TIFF*, int, const char *); +-extern void TIFFFreeDirectory(TIFF*); +-extern int TIFFCreateDirectory(TIFF*); +-extern int TIFFLastDirectory(TIFF*); +-extern int TIFFSetDirectory(TIFF*, tdir_t); +-extern int TIFFSetSubDirectory(TIFF*, uint32); +-extern int TIFFUnlinkDirectory(TIFF*, tdir_t); +-extern int TIFFSetField(TIFF*, ttag_t, ...); +-extern int TIFFVSetField(TIFF*, ttag_t, va_list); +-extern int TIFFWriteDirectory(TIFF *); +-extern int TIFFCheckpointDirectory(TIFF *); +-extern int TIFFRewriteDirectory(TIFF *); +-extern int TIFFReassignTagToIgnore(enum TIFFIgnoreSense, int); ++LIBTIFF_DLL_IMPEXP int TIFFReadEXIFDirectory(TIFF*, toff_t); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFScanlineSize(TIFF*); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFOldScanlineSize(TIFF*); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFNewScanlineSize(TIFF*); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFRasterScanlineSize(TIFF*); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFStripSize(TIFF*); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFRawStripSize(TIFF*, tstrip_t); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFVStripSize(TIFF*, uint32); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFTileRowSize(TIFF*); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFTileSize(TIFF*); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFVTileSize(TIFF*, uint32); ++LIBTIFF_DLL_IMPEXP uint32 TIFFDefaultStripSize(TIFF*, uint32); ++LIBTIFF_DLL_IMPEXP void TIFFDefaultTileSize(TIFF*, uint32*, uint32*); ++LIBTIFF_DLL_IMPEXP int TIFFFileno(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFSetFileno(TIFF*, int); ++LIBTIFF_DLL_IMPEXP thandle_t TIFFClientdata(TIFF*); ++LIBTIFF_DLL_IMPEXP thandle_t TIFFSetClientdata(TIFF*, thandle_t); ++LIBTIFF_DLL_IMPEXP int TIFFGetMode(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFSetMode(TIFF*, int); ++LIBTIFF_DLL_IMPEXP int TIFFIsTiled(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFIsByteSwapped(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFIsUpSampled(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFIsMSB2LSB(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFIsBigEndian(TIFF*); ++LIBTIFF_DLL_IMPEXP TIFFReadWriteProc TIFFGetReadProc(TIFF*); ++LIBTIFF_DLL_IMPEXP TIFFReadWriteProc TIFFGetWriteProc(TIFF*); ++LIBTIFF_DLL_IMPEXP TIFFSeekProc TIFFGetSeekProc(TIFF*); ++LIBTIFF_DLL_IMPEXP TIFFCloseProc TIFFGetCloseProc(TIFF*); ++LIBTIFF_DLL_IMPEXP TIFFSizeProc TIFFGetSizeProc(TIFF*); ++LIBTIFF_DLL_IMPEXP TIFFMapFileProc TIFFGetMapFileProc(TIFF*); ++LIBTIFF_DLL_IMPEXP TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*); ++LIBTIFF_DLL_IMPEXP uint32 TIFFCurrentRow(TIFF*); ++LIBTIFF_DLL_IMPEXP tdir_t TIFFCurrentDirectory(TIFF*); ++LIBTIFF_DLL_IMPEXP tdir_t TIFFNumberOfDirectories(TIFF*); ++LIBTIFF_DLL_IMPEXP uint32 TIFFCurrentDirOffset(TIFF*); ++LIBTIFF_DLL_IMPEXP tstrip_t TIFFCurrentStrip(TIFF*); ++LIBTIFF_DLL_IMPEXP ttile_t TIFFCurrentTile(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFReadBufferSetup(TIFF*, tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP int TIFFWriteBufferSetup(TIFF*, tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP int TIFFSetupStrips(TIFF *); ++LIBTIFF_DLL_IMPEXP int TIFFWriteCheck(TIFF*, int, const char *); ++LIBTIFF_DLL_IMPEXP void TIFFFreeDirectory(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFCreateDirectory(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFLastDirectory(TIFF*); ++LIBTIFF_DLL_IMPEXP int TIFFSetDirectory(TIFF*, tdir_t); ++LIBTIFF_DLL_IMPEXP int TIFFSetSubDirectory(TIFF*, uint32); ++LIBTIFF_DLL_IMPEXP int TIFFUnlinkDirectory(TIFF*, tdir_t); ++LIBTIFF_DLL_IMPEXP int TIFFSetField(TIFF*, ttag_t, ...); ++LIBTIFF_DLL_IMPEXP int TIFFVSetField(TIFF*, ttag_t, va_list); ++LIBTIFF_DLL_IMPEXP int TIFFWriteDirectory(TIFF *); ++LIBTIFF_DLL_IMPEXP int TIFFCheckpointDirectory(TIFF *); ++LIBTIFF_DLL_IMPEXP int TIFFRewriteDirectory(TIFF *); ++LIBTIFF_DLL_IMPEXP int TIFFReassignTagToIgnore(enum TIFFIgnoreSense, int); + + #if defined(c_plusplus) || defined(__cplusplus) +-extern void TIFFPrintDirectory(TIFF*, FILE*, long = 0); +-extern int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t = 0); +-extern int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t = 0); +-extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0); +-extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, ++LIBTIFF_DLL_IMPEXP void TIFFPrintDirectory(TIFF*, FILE*, long = 0); ++LIBTIFF_DLL_IMPEXP int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t = 0); ++LIBTIFF_DLL_IMPEXP int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t = 0); ++LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0); ++LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, + int = ORIENTATION_BOTLEFT, int = 0); + #else +-extern void TIFFPrintDirectory(TIFF*, FILE*, long); +-extern int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t); +-extern int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t); +-extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int); +-extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int); ++LIBTIFF_DLL_IMPEXP void TIFFPrintDirectory(TIFF*, FILE*, long); ++LIBTIFF_DLL_IMPEXP int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t); ++LIBTIFF_DLL_IMPEXP int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t); ++LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int); ++LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int); + #endif + +-extern int TIFFReadRGBAStrip(TIFF*, tstrip_t, uint32 * ); +-extern int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * ); +-extern int TIFFRGBAImageOK(TIFF*, char [1024]); +-extern int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]); +-extern int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32); +-extern void TIFFRGBAImageEnd(TIFFRGBAImage*); +-extern TIFF* TIFFOpen(const char*, const char*); ++LIBTIFF_DLL_IMPEXP int TIFFReadRGBAStrip(TIFF*, tstrip_t, uint32 * ); ++LIBTIFF_DLL_IMPEXP int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * ); ++LIBTIFF_DLL_IMPEXP int TIFFRGBAImageOK(TIFF*, char [1024]); ++LIBTIFF_DLL_IMPEXP int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]); ++LIBTIFF_DLL_IMPEXP int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32); ++LIBTIFF_DLL_IMPEXP void TIFFRGBAImageEnd(TIFFRGBAImage*); ++LIBTIFF_DLL_IMPEXP TIFF* TIFFOpen(const char*, const char*); + # ifdef __WIN32__ +-extern TIFF* TIFFOpenW(const wchar_t*, const char*); ++LIBTIFF_DLL_IMPEXP TIFF* TIFFOpenW(const wchar_t*, const char*); + # endif /* __WIN32__ */ +-extern TIFF* TIFFFdOpen(int, const char*, const char*); +-extern TIFF* TIFFClientOpen(const char*, const char*, ++LIBTIFF_DLL_IMPEXP TIFF* TIFFFdOpen(int, const char*, const char*); ++LIBTIFF_DLL_IMPEXP TIFF* TIFFClientOpen(const char*, const char*, + thandle_t, + TIFFReadWriteProc, TIFFReadWriteProc, + TIFFSeekProc, TIFFCloseProc, + TIFFSizeProc, + TIFFMapFileProc, TIFFUnmapFileProc); +-extern const char* TIFFFileName(TIFF*); +-extern const char* TIFFSetFileName(TIFF*, const char *); +-extern void TIFFError(const char*, const char*, ...) __attribute__((format (printf,2,3))); +-extern void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); +-extern void TIFFWarning(const char*, const char*, ...) __attribute__((format (printf,2,3))); +-extern void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); +-extern TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler); +-extern TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt); +-extern TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler); +-extern TIFFErrorHandlerExt TIFFSetWarningHandlerExt(TIFFErrorHandlerExt); +-extern TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc); +-extern ttile_t TIFFComputeTile(TIFF*, uint32, uint32, uint32, tsample_t); +-extern int TIFFCheckTile(TIFF*, uint32, uint32, uint32, tsample_t); +-extern ttile_t TIFFNumberOfTiles(TIFF*); +-extern tsize_t TIFFReadTile(TIFF*, ++LIBTIFF_DLL_IMPEXP const char* TIFFFileName(TIFF*); ++LIBTIFF_DLL_IMPEXP const char* TIFFSetFileName(TIFF*, const char *); ++LIBTIFF_DLL_IMPEXP void TIFFError(const char*, const char*, ...) __attribute__((format (printf,2,3))); ++LIBTIFF_DLL_IMPEXP void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); ++LIBTIFF_DLL_IMPEXP void TIFFWarning(const char*, const char*, ...) __attribute__((format (printf,2,3))); ++LIBTIFF_DLL_IMPEXP void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); ++LIBTIFF_DLL_IMPEXP TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler); ++LIBTIFF_DLL_IMPEXP TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt); ++LIBTIFF_DLL_IMPEXP TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler); ++LIBTIFF_DLL_IMPEXP TIFFErrorHandlerExt TIFFSetWarningHandlerExt(TIFFErrorHandlerExt); ++LIBTIFF_DLL_IMPEXP TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc); ++LIBTIFF_DLL_IMPEXP ttile_t TIFFComputeTile(TIFF*, uint32, uint32, uint32, tsample_t); ++LIBTIFF_DLL_IMPEXP int TIFFCheckTile(TIFF*, uint32, uint32, uint32, tsample_t); ++LIBTIFF_DLL_IMPEXP ttile_t TIFFNumberOfTiles(TIFF*); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFReadTile(TIFF*, + tdata_t, uint32, uint32, uint32, tsample_t); +-extern tsize_t TIFFWriteTile(TIFF*, ++LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteTile(TIFF*, + tdata_t, uint32, uint32, uint32, tsample_t); +-extern tstrip_t TIFFComputeStrip(TIFF*, uint32, tsample_t); +-extern tstrip_t TIFFNumberOfStrips(TIFF*); +-extern tsize_t TIFFReadEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); +-extern tsize_t TIFFReadRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); +-extern tsize_t TIFFReadEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); +-extern tsize_t TIFFReadRawTile(TIFF*, ttile_t, tdata_t, tsize_t); +-extern tsize_t TIFFWriteEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); +-extern tsize_t TIFFWriteRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); +-extern tsize_t TIFFWriteEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); +-extern tsize_t TIFFWriteRawTile(TIFF*, ttile_t, tdata_t, tsize_t); +-extern int TIFFDataWidth(TIFFDataType); /* table of tag datatype widths */ +-extern void TIFFSetWriteOffset(TIFF*, toff_t); +-extern void TIFFSwabShort(uint16*); +-extern void TIFFSwabLong(uint32*); +-extern void TIFFSwabDouble(double*); +-extern void TIFFSwabArrayOfShort(uint16*, unsigned long); +-extern void TIFFSwabArrayOfTriples(uint8*, unsigned long); +-extern void TIFFSwabArrayOfLong(uint32*, unsigned long); +-extern void TIFFSwabArrayOfDouble(double*, unsigned long); +-extern void TIFFReverseBits(unsigned char *, unsigned long); +-extern const unsigned char* TIFFGetBitRevTable(int); ++LIBTIFF_DLL_IMPEXP tstrip_t TIFFComputeStrip(TIFF*, uint32, tsample_t); ++LIBTIFF_DLL_IMPEXP tstrip_t TIFFNumberOfStrips(TIFF*); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFReadEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFReadRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFReadEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFReadRawTile(TIFF*, ttile_t, tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteRawTile(TIFF*, ttile_t, tdata_t, tsize_t); ++LIBTIFF_DLL_IMPEXP int TIFFDataWidth(TIFFDataType); /* table of tag datatype widths */ ++LIBTIFF_DLL_IMPEXP void TIFFSetWriteOffset(TIFF*, toff_t); ++LIBTIFF_DLL_IMPEXP void TIFFSwabShort(uint16*); ++LIBTIFF_DLL_IMPEXP void TIFFSwabLong(uint32*); ++LIBTIFF_DLL_IMPEXP void TIFFSwabDouble(double*); ++LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfShort(uint16*, unsigned long); ++LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfTriples(uint8*, unsigned long); ++LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfLong(uint32*, unsigned long); ++LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfDouble(double*, unsigned long); ++LIBTIFF_DLL_IMPEXP void TIFFReverseBits(unsigned char *, unsigned long); ++LIBTIFF_DLL_IMPEXP const unsigned char* TIFFGetBitRevTable(int); + + #ifdef LOGLUV_PUBLIC + #define U_NEU 0.210526316 + #define V_NEU 0.473684211 + #define UVSCALE 410. +-extern double LogL16toY(int); +-extern double LogL10toY(int); +-extern void XYZtoRGB24(float*, uint8*); +-extern int uv_decode(double*, double*, int); +-extern void LogLuv24toXYZ(uint32, float*); +-extern void LogLuv32toXYZ(uint32, float*); ++LIBTIFF_DLL_IMPEXP double LogL16toY(int); ++LIBTIFF_DLL_IMPEXP double LogL10toY(int); ++LIBTIFF_DLL_IMPEXP void XYZtoRGB24(float*, uint8*); ++LIBTIFF_DLL_IMPEXP int uv_decode(double*, double*, int); ++LIBTIFF_DLL_IMPEXP void LogLuv24toXYZ(uint32, float*); ++LIBTIFF_DLL_IMPEXP void LogLuv32toXYZ(uint32, float*); + #if defined(c_plusplus) || defined(__cplusplus) +-extern int LogL16fromY(double, int = SGILOGENCODE_NODITHER); +-extern int LogL10fromY(double, int = SGILOGENCODE_NODITHER); +-extern int uv_encode(double, double, int = SGILOGENCODE_NODITHER); +-extern uint32 LogLuv24fromXYZ(float*, int = SGILOGENCODE_NODITHER); +-extern uint32 LogLuv32fromXYZ(float*, int = SGILOGENCODE_NODITHER); ++LIBTIFF_DLL_IMPEXP int LogL16fromY(double, int = SGILOGENCODE_NODITHER); ++LIBTIFF_DLL_IMPEXP int LogL10fromY(double, int = SGILOGENCODE_NODITHER); ++LIBTIFF_DLL_IMPEXP int uv_encode(double, double, int = SGILOGENCODE_NODITHER); ++LIBTIFF_DLL_IMPEXP uint32 LogLuv24fromXYZ(float*, int = SGILOGENCODE_NODITHER); ++LIBTIFF_DLL_IMPEXP uint32 LogLuv32fromXYZ(float*, int = SGILOGENCODE_NODITHER); + #else +-extern int LogL16fromY(double, int); +-extern int LogL10fromY(double, int); +-extern int uv_encode(double, double, int); +-extern uint32 LogLuv24fromXYZ(float*, int); +-extern uint32 LogLuv32fromXYZ(float*, int); ++LIBTIFF_DLL_IMPEXP int LogL16fromY(double, int); ++LIBTIFF_DLL_IMPEXP int LogL10fromY(double, int); ++LIBTIFF_DLL_IMPEXP int uv_encode(double, double, int); ++LIBTIFF_DLL_IMPEXP uint32 LogLuv24fromXYZ(float*, int); ++LIBTIFF_DLL_IMPEXP uint32 LogLuv32fromXYZ(float*, int); + #endif + #endif /* LOGLUV_PUBLIC */ + +-extern int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, TIFFDisplay *, float*); +-extern void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32, ++LIBTIFF_DLL_IMPEXP int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, TIFFDisplay *, float*); ++LIBTIFF_DLL_IMPEXP void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32, + float *, float *, float *); +-extern void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float, ++LIBTIFF_DLL_IMPEXP void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float, + uint32 *, uint32 *, uint32 *); + +-extern int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*); +-extern void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32, ++LIBTIFF_DLL_IMPEXP int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*); ++LIBTIFF_DLL_IMPEXP void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32, + uint32 *, uint32 *, uint32 *); + + #if defined(c_plusplus) || defined(__cplusplus) Propchange: trunk/reactos/include/reactos/libs/libtiff/rosdiff.patch ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/reactos/libs/libtiff/tiffio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… ============================================================================== --- trunk/reactos/include/reactos/libs/libtiff/tiffio.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libtiff/tiffio.h [iso-8859-1] Wed Jul 14 17:12:22 2010 @@ -27,6 +27,30 @@ #ifndef _TIFFIO_ #define _TIFFIO_ +#ifndef __GNUC__ +# define __DLL_IMPORT__ __declspec(dllimport) +# define __DLL_EXPORT__ __declspec(dllexport) +#else +# define __DLL_IMPORT__ __attribute__((dllimport)) extern +# define __DLL_EXPORT__ __attribute__((dllexport)) extern +#endif + +#if (defined __WIN32__) || (defined _WIN32) +# ifdef BUILD_LIBTIFF_DLL +# define LIBTIFF_DLL_IMPEXP __DLL_EXPORT__ +# elif defined(LIBTIFF_STATIC) +# define LIBTIFF_DLL_IMPEXP +# elif defined (USE_LIBTIFF_DLL) +# define LIBTIFF_DLL_IMPEXP __DLL_IMPORT__ +# elif defined (USE_LIBTIFF_STATIC) +# define LIBTIFF_DLL_IMPEXP +# else /* assume USE_LIBTIFF_DLL */ +# define LIBTIFF_DLL_IMPEXP __DLL_IMPORT__ +# endif +#else /* __WIN32__ */ +# define LIBTIFF_DLL_IMPEXP +#endif + /* * TIFF I/O Library Definitions. */ @@ -80,10 +104,20 @@ */ #if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows) +# define BINMODE "b" # if !defined(__CYGWIN) && !defined(AVOID_WIN32_FILEIO) && !defined(USE_WIN32_FILEIO) # define AVOID_WIN32_FILEIO # endif -#endif +# include <fcntl.h> +# include <io.h> +# ifdef SET_BINARY +# undef SET_BINARY +# endif /* SET_BINARY */ +# define SET_BINARY(f) do {if (!_isatty(f)) _setmode(f,_O_BINARY);} while (0) +#else /* Windows */ +# define BINMODE +# define SET_BINARY(f) (void)0 +#endif /* Windows */ #if defined(USE_WIN32_FILEIO) # define VC_EXTRALEAN @@ -268,30 +302,30 @@ typedef void (*TIFFUnmapFileProc)(thandle_t, tdata_t, toff_t); typedef void (*TIFFExtendProc)(TIFF*); -extern const char* TIFFGetVersion(void); - -extern const TIFFCodec* TIFFFindCODEC(uint16); -extern TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod); -extern void TIFFUnRegisterCODEC(TIFFCodec*); -extern int TIFFIsCODECConfigured(uint16); -extern TIFFCodec* TIFFGetConfiguredCODECs(void); +LIBTIFF_DLL_IMPEXP const char* TIFFGetVersion(void); + +LIBTIFF_DLL_IMPEXP const TIFFCodec* TIFFFindCODEC(uint16); +LIBTIFF_DLL_IMPEXP TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod); +LIBTIFF_DLL_IMPEXP void TIFFUnRegisterCODEC(TIFFCodec*); +LIBTIFF_DLL_IMPEXP int TIFFIsCODECConfigured(uint16); +LIBTIFF_DLL_IMPEXP TIFFCodec* TIFFGetConfiguredCODECs(void); /* * Auxiliary functions. */ -extern tdata_t _TIFFmalloc(tsize_t); -extern tdata_t _TIFFrealloc(tdata_t, tsize_t); -extern void _TIFFmemset(tdata_t, int, tsize_t); -extern void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t); -extern int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t); -extern void _TIFFfree(tdata_t); +LIBTIFF_DLL_IMPEXP tdata_t _TIFFmalloc(tsize_t); +LIBTIFF_DLL_IMPEXP tdata_t _TIFFrealloc(tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP void _TIFFmemset(tdata_t, int, tsize_t); +LIBTIFF_DLL_IMPEXP void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP void _TIFFfree(tdata_t); /* ** Stuff, related to tag handling and creating custom tags. */ -extern int TIFFGetTagListCount( TIFF * ); -extern ttag_t TIFFGetTagListEntry( TIFF *, int tag_index ); +LIBTIFF_DLL_IMPEXP int TIFFGetTagListCount( TIFF * ); +LIBTIFF_DLL_IMPEXP ttag_t TIFFGetTagListEntry( TIFF *, int tag_index ); #define TIFF_ANY TIFF_NOTYPE /* for field descriptor searching */ #define TIFF_VARIABLE -1 /* marker for variable length tags */ @@ -317,12 +351,12 @@ void *value; } TIFFTagValue; -extern void TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], int); -extern const TIFFFieldInfo* TIFFFindFieldInfo(TIFF*, ttag_t, TIFFDataType); -extern const TIFFFieldInfo* TIFFFindFieldInfoByName(TIFF* , const char *, +LIBTIFF_DLL_IMPEXP void TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], int); +LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFindFieldInfo(TIFF*, ttag_t, TIFFDataType); +LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFindFieldInfoByName(TIFF* , const char *, TIFFDataType); -extern const TIFFFieldInfo* TIFFFieldWithTag(TIFF*, ttag_t); -extern const TIFFFieldInfo* TIFFFieldWithName(TIFF*, const char *); +LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFieldWithTag(TIFF*, ttag_t); +LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFieldWithName(TIFF*, const char *); typedef int (*TIFFVSetMethod)(TIFF*, ttag_t, va_list); typedef int (*TIFFVGetMethod)(TIFF*, ttag_t, va_list); @@ -334,180 +368,180 @@ TIFFPrintMethod printdir; /* directory print routine */ } TIFFTagMethods; -extern TIFFTagMethods *TIFFAccessTagMethods( TIFF * ); -extern void *TIFFGetClientInfo( TIFF *, const char * ); -extern void TIFFSetClientInfo( TIFF *, void *, const char * ); - -extern void TIFFCleanup(TIFF*); -extern void TIFFClose(TIFF*); -extern int TIFFFlush(TIFF*); -extern int TIFFFlushData(TIFF*); -extern int TIFFGetField(TIFF*, ttag_t, ...); -extern int TIFFVGetField(TIFF*, ttag_t, va_list); -extern int TIFFGetFieldDefaulted(TIFF*, ttag_t, ...); -extern int TIFFVGetFieldDefaulted(TIFF*, ttag_t, va_list); -extern int TIFFReadDirectory(TIFF*); -extern int TIFFReadCustomDirectory(TIFF*, toff_t, const TIFFFieldInfo[], +LIBTIFF_DLL_IMPEXP TIFFTagMethods *TIFFAccessTagMethods( TIFF * ); +LIBTIFF_DLL_IMPEXP void *TIFFGetClientInfo( TIFF *, const char * ); +LIBTIFF_DLL_IMPEXP void TIFFSetClientInfo( TIFF *, void *, const char * ); + +LIBTIFF_DLL_IMPEXP void TIFFCleanup(TIFF*); +LIBTIFF_DLL_IMPEXP void TIFFClose(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFFlush(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFFlushData(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFGetField(TIFF*, ttag_t, ...); +LIBTIFF_DLL_IMPEXP int TIFFVGetField(TIFF*, ttag_t, va_list); +LIBTIFF_DLL_IMPEXP int TIFFGetFieldDefaulted(TIFF*, ttag_t, ...); +LIBTIFF_DLL_IMPEXP int TIFFVGetFieldDefaulted(TIFF*, ttag_t, va_list); +LIBTIFF_DLL_IMPEXP int TIFFReadDirectory(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFReadCustomDirectory(TIFF*, toff_t, const TIFFFieldInfo[], size_t); -extern int TIFFReadEXIFDirectory(TIFF*, toff_t); -extern tsize_t TIFFScanlineSize(TIFF*); -extern tsize_t TIFFOldScanlineSize(TIFF*); -extern tsize_t TIFFNewScanlineSize(TIFF*); -extern tsize_t TIFFRasterScanlineSize(TIFF*); -extern tsize_t TIFFStripSize(TIFF*); -extern tsize_t TIFFRawStripSize(TIFF*, tstrip_t); -extern tsize_t TIFFVStripSize(TIFF*, uint32); -extern tsize_t TIFFTileRowSize(TIFF*); -extern tsize_t TIFFTileSize(TIFF*); -extern tsize_t TIFFVTileSize(TIFF*, uint32); -extern uint32 TIFFDefaultStripSize(TIFF*, uint32); -extern void TIFFDefaultTileSize(TIFF*, uint32*, uint32*); -extern int TIFFFileno(TIFF*); -extern int TIFFSetFileno(TIFF*, int); -extern thandle_t TIFFClientdata(TIFF*); -extern thandle_t TIFFSetClientdata(TIFF*, thandle_t); -extern int TIFFGetMode(TIFF*); -extern int TIFFSetMode(TIFF*, int); -extern int TIFFIsTiled(TIFF*); -extern int TIFFIsByteSwapped(TIFF*); -extern int TIFFIsUpSampled(TIFF*); -extern int TIFFIsMSB2LSB(TIFF*); -extern int TIFFIsBigEndian(TIFF*); -extern TIFFReadWriteProc TIFFGetReadProc(TIFF*); -extern TIFFReadWriteProc TIFFGetWriteProc(TIFF*); -extern TIFFSeekProc TIFFGetSeekProc(TIFF*); -extern TIFFCloseProc TIFFGetCloseProc(TIFF*); -extern TIFFSizeProc TIFFGetSizeProc(TIFF*); -extern TIFFMapFileProc TIFFGetMapFileProc(TIFF*); -extern TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*); -extern uint32 TIFFCurrentRow(TIFF*); -extern tdir_t TIFFCurrentDirectory(TIFF*); -extern tdir_t TIFFNumberOfDirectories(TIFF*); -extern uint32 TIFFCurrentDirOffset(TIFF*); -extern tstrip_t TIFFCurrentStrip(TIFF*); -extern ttile_t TIFFCurrentTile(TIFF*); -extern int TIFFReadBufferSetup(TIFF*, tdata_t, tsize_t); -extern int TIFFWriteBufferSetup(TIFF*, tdata_t, tsize_t); -extern int TIFFSetupStrips(TIFF *); -extern int TIFFWriteCheck(TIFF*, int, const char *); -extern void TIFFFreeDirectory(TIFF*); -extern int TIFFCreateDirectory(TIFF*); -extern int TIFFLastDirectory(TIFF*); -extern int TIFFSetDirectory(TIFF*, tdir_t); -extern int TIFFSetSubDirectory(TIFF*, uint32); -extern int TIFFUnlinkDirectory(TIFF*, tdir_t); -extern int TIFFSetField(TIFF*, ttag_t, ...); -extern int TIFFVSetField(TIFF*, ttag_t, va_list); -extern int TIFFWriteDirectory(TIFF *); -extern int TIFFCheckpointDirectory(TIFF *); -extern int TIFFRewriteDirectory(TIFF *); -extern int TIFFReassignTagToIgnore(enum TIFFIgnoreSense, int); +LIBTIFF_DLL_IMPEXP int TIFFReadEXIFDirectory(TIFF*, toff_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFScanlineSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFOldScanlineSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFNewScanlineSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFRasterScanlineSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFStripSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFRawStripSize(TIFF*, tstrip_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFVStripSize(TIFF*, uint32); +LIBTIFF_DLL_IMPEXP tsize_t TIFFTileRowSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFTileSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFVTileSize(TIFF*, uint32); +LIBTIFF_DLL_IMPEXP uint32 TIFFDefaultStripSize(TIFF*, uint32); +LIBTIFF_DLL_IMPEXP void TIFFDefaultTileSize(TIFF*, uint32*, uint32*); +LIBTIFF_DLL_IMPEXP int TIFFFileno(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFSetFileno(TIFF*, int); +LIBTIFF_DLL_IMPEXP thandle_t TIFFClientdata(TIFF*); +LIBTIFF_DLL_IMPEXP thandle_t TIFFSetClientdata(TIFF*, thandle_t); +LIBTIFF_DLL_IMPEXP int TIFFGetMode(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFSetMode(TIFF*, int); +LIBTIFF_DLL_IMPEXP int TIFFIsTiled(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFIsByteSwapped(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFIsUpSampled(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFIsMSB2LSB(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFIsBigEndian(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFReadWriteProc TIFFGetReadProc(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFReadWriteProc TIFFGetWriteProc(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFSeekProc TIFFGetSeekProc(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFCloseProc TIFFGetCloseProc(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFSizeProc TIFFGetSizeProc(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFMapFileProc TIFFGetMapFileProc(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*); +LIBTIFF_DLL_IMPEXP uint32 TIFFCurrentRow(TIFF*); +LIBTIFF_DLL_IMPEXP tdir_t TIFFCurrentDirectory(TIFF*); +LIBTIFF_DLL_IMPEXP tdir_t TIFFNumberOfDirectories(TIFF*); +LIBTIFF_DLL_IMPEXP uint32 TIFFCurrentDirOffset(TIFF*); +LIBTIFF_DLL_IMPEXP tstrip_t TIFFCurrentStrip(TIFF*); +LIBTIFF_DLL_IMPEXP ttile_t TIFFCurrentTile(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFReadBufferSetup(TIFF*, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP int TIFFWriteBufferSetup(TIFF*, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP int TIFFSetupStrips(TIFF *); +LIBTIFF_DLL_IMPEXP int TIFFWriteCheck(TIFF*, int, const char *); +LIBTIFF_DLL_IMPEXP void TIFFFreeDirectory(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFCreateDirectory(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFLastDirectory(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFSetDirectory(TIFF*, tdir_t); +LIBTIFF_DLL_IMPEXP int TIFFSetSubDirectory(TIFF*, uint32); +LIBTIFF_DLL_IMPEXP int TIFFUnlinkDirectory(TIFF*, tdir_t); +LIBTIFF_DLL_IMPEXP int TIFFSetField(TIFF*, ttag_t, ...); +LIBTIFF_DLL_IMPEXP int TIFFVSetField(TIFF*, ttag_t, va_list); +LIBTIFF_DLL_IMPEXP int TIFFWriteDirectory(TIFF *); +LIBTIFF_DLL_IMPEXP int TIFFCheckpointDirectory(TIFF *); +LIBTIFF_DLL_IMPEXP int TIFFRewriteDirectory(TIFF *); +LIBTIFF_DLL_IMPEXP int TIFFReassignTagToIgnore(enum TIFFIgnoreSense, int); #if defined(c_plusplus) || defined(__cplusplus) -extern void TIFFPrintDirectory(TIFF*, FILE*, long = 0); -extern int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t = 0); -extern int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t = 0); -extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0); -extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, +LIBTIFF_DLL_IMPEXP void TIFFPrintDirectory(TIFF*, FILE*, long = 0); +LIBTIFF_DLL_IMPEXP int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t = 0); +LIBTIFF_DLL_IMPEXP int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t = 0); +LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0); +LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int = ORIENTATION_BOTLEFT, int = 0); #else -extern void TIFFPrintDirectory(TIFF*, FILE*, long); -extern int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t); -extern int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t); -extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int); -extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int); -#endif - -extern int TIFFReadRGBAStrip(TIFF*, tstrip_t, uint32 * ); -extern int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * ); -extern int TIFFRGBAImageOK(TIFF*, char [1024]); -extern int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]); -extern int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32); -extern void TIFFRGBAImageEnd(TIFFRGBAImage*); -extern TIFF* TIFFOpen(const char*, const char*); +LIBTIFF_DLL_IMPEXP void TIFFPrintDirectory(TIFF*, FILE*, long); +LIBTIFF_DLL_IMPEXP int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t); +LIBTIFF_DLL_IMPEXP int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t); +LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int); +LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int); +#endif + +LIBTIFF_DLL_IMPEXP int TIFFReadRGBAStrip(TIFF*, tstrip_t, uint32 * ); +LIBTIFF_DLL_IMPEXP int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * ); +LIBTIFF_DLL_IMPEXP int TIFFRGBAImageOK(TIFF*, char [1024]); +LIBTIFF_DLL_IMPEXP int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]); +LIBTIFF_DLL_IMPEXP int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32); +LIBTIFF_DLL_IMPEXP void TIFFRGBAImageEnd(TIFFRGBAImage*); +LIBTIFF_DLL_IMPEXP TIFF* TIFFOpen(const char*, const char*); # ifdef __WIN32__ -extern TIFF* TIFFOpenW(const wchar_t*, const char*); +LIBTIFF_DLL_IMPEXP TIFF* TIFFOpenW(const wchar_t*, const char*); # endif /* __WIN32__ */ -extern TIFF* TIFFFdOpen(int, const char*, const char*); -extern TIFF* TIFFClientOpen(const char*, const char*, +LIBTIFF_DLL_IMPEXP TIFF* TIFFFdOpen(int, const char*, const char*); +LIBTIFF_DLL_IMPEXP TIFF* TIFFClientOpen(const char*, const char*, thandle_t, TIFFReadWriteProc, TIFFReadWriteProc, TIFFSeekProc, TIFFCloseProc, TIFFSizeProc, TIFFMapFileProc, TIFFUnmapFileProc); -extern const char* TIFFFileName(TIFF*); -extern const char* TIFFSetFileName(TIFF*, const char *); -extern void TIFFError(const char*, const char*, ...) __attribute__((format (printf,2,3))); -extern void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); -extern void TIFFWarning(const char*, const char*, ...) __attribute__((format (printf,2,3))); -extern void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); -extern TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler); -extern TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt); -extern TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler); -extern TIFFErrorHandlerExt TIFFSetWarningHandlerExt(TIFFErrorHandlerExt); -extern TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc); -extern ttile_t TIFFComputeTile(TIFF*, uint32, uint32, uint32, tsample_t); -extern int TIFFCheckTile(TIFF*, uint32, uint32, uint32, tsample_t); -extern ttile_t TIFFNumberOfTiles(TIFF*); -extern tsize_t TIFFReadTile(TIFF*, +LIBTIFF_DLL_IMPEXP const char* TIFFFileName(TIFF*); +LIBTIFF_DLL_IMPEXP const char* TIFFSetFileName(TIFF*, const char *); +LIBTIFF_DLL_IMPEXP void TIFFError(const char*, const char*, ...) __attribute__((format (printf,2,3))); +LIBTIFF_DLL_IMPEXP void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); +LIBTIFF_DLL_IMPEXP void TIFFWarning(const char*, const char*, ...) __attribute__((format (printf,2,3))); +LIBTIFF_DLL_IMPEXP void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); +LIBTIFF_DLL_IMPEXP TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler); +LIBTIFF_DLL_IMPEXP TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt); +LIBTIFF_DLL_IMPEXP TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler); +LIBTIFF_DLL_IMPEXP TIFFErrorHandlerExt TIFFSetWarningHandlerExt(TIFFErrorHandlerExt); +LIBTIFF_DLL_IMPEXP TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc); +LIBTIFF_DLL_IMPEXP ttile_t TIFFComputeTile(TIFF*, uint32, uint32, uint32, tsample_t); +LIBTIFF_DLL_IMPEXP int TIFFCheckTile(TIFF*, uint32, uint32, uint32, tsample_t); +LIBTIFF_DLL_IMPEXP ttile_t TIFFNumberOfTiles(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFReadTile(TIFF*, tdata_t, uint32, uint32, uint32, tsample_t); -extern tsize_t TIFFWriteTile(TIFF*, +LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteTile(TIFF*, tdata_t, uint32, uint32, uint32, tsample_t); -extern tstrip_t TIFFComputeStrip(TIFF*, uint32, tsample_t); -extern tstrip_t TIFFNumberOfStrips(TIFF*); -extern tsize_t TIFFReadEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); -extern tsize_t TIFFReadRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); -extern tsize_t TIFFReadEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); -extern tsize_t TIFFReadRawTile(TIFF*, ttile_t, tdata_t, tsize_t); -extern tsize_t TIFFWriteEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); -extern tsize_t TIFFWriteRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); -extern tsize_t TIFFWriteEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); -extern tsize_t TIFFWriteRawTile(TIFF*, ttile_t, tdata_t, tsize_t); -extern int TIFFDataWidth(TIFFDataType); /* table of tag datatype widths */ -extern void TIFFSetWriteOffset(TIFF*, toff_t); -extern void TIFFSwabShort(uint16*); -extern void TIFFSwabLong(uint32*); -extern void TIFFSwabDouble(double*); -extern void TIFFSwabArrayOfShort(uint16*, unsigned long); -extern void TIFFSwabArrayOfTriples(uint8*, unsigned long); -extern void TIFFSwabArrayOfLong(uint32*, unsigned long); -extern void TIFFSwabArrayOfDouble(double*, unsigned long); -extern void TIFFReverseBits(unsigned char *, unsigned long); -extern const unsigned char* TIFFGetBitRevTable(int); +LIBTIFF_DLL_IMPEXP tstrip_t TIFFComputeStrip(TIFF*, uint32, tsample_t); +LIBTIFF_DLL_IMPEXP tstrip_t TIFFNumberOfStrips(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFReadEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFReadRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFReadEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFReadRawTile(TIFF*, ttile_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteRawTile(TIFF*, ttile_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP int TIFFDataWidth(TIFFDataType); /* table of tag datatype widths */ +LIBTIFF_DLL_IMPEXP void TIFFSetWriteOffset(TIFF*, toff_t); +LIBTIFF_DLL_IMPEXP void TIFFSwabShort(uint16*); +LIBTIFF_DLL_IMPEXP void TIFFSwabLong(uint32*); +LIBTIFF_DLL_IMPEXP void TIFFSwabDouble(double*); +LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfShort(uint16*, unsigned long); +LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfTriples(uint8*, unsigned long); +LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfLong(uint32*, unsigned long); +LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfDouble(double*, unsigned long); +LIBTIFF_DLL_IMPEXP void TIFFReverseBits(unsigned char *, unsigned long); +LIBTIFF_DLL_IMPEXP const unsigned char* TIFFGetBitRevTable(int); #ifdef LOGLUV_PUBLIC #define U_NEU 0.210526316 #define V_NEU 0.473684211 #define UVSCALE 410. -extern double LogL16toY(int); -extern double LogL10toY(int); -extern void XYZtoRGB24(float*, uint8*); -extern int uv_decode(double*, double*, int); -extern void LogLuv24toXYZ(uint32, float*); -extern void LogLuv32toXYZ(uint32, float*); +LIBTIFF_DLL_IMPEXP double LogL16toY(int); +LIBTIFF_DLL_IMPEXP double LogL10toY(int); +LIBTIFF_DLL_IMPEXP void XYZtoRGB24(float*, uint8*); +LIBTIFF_DLL_IMPEXP int uv_decode(double*, double*, int); +LIBTIFF_DLL_IMPEXP void LogLuv24toXYZ(uint32, float*); +LIBTIFF_DLL_IMPEXP void LogLuv32toXYZ(uint32, float*); #if defined(c_plusplus) || defined(__cplusplus) -extern int LogL16fromY(double, int = SGILOGENCODE_NODITHER); -extern int LogL10fromY(double, int = SGILOGENCODE_NODITHER); -extern int uv_encode(double, double, int = SGILOGENCODE_NODITHER); -extern uint32 LogLuv24fromXYZ(float*, int = SGILOGENCODE_NODITHER); -extern uint32 LogLuv32fromXYZ(float*, int = SGILOGENCODE_NODITHER); +LIBTIFF_DLL_IMPEXP int LogL16fromY(double, int = SGILOGENCODE_NODITHER); +LIBTIFF_DLL_IMPEXP int LogL10fromY(double, int = SGILOGENCODE_NODITHER); +LIBTIFF_DLL_IMPEXP int uv_encode(double, double, int = SGILOGENCODE_NODITHER); +LIBTIFF_DLL_IMPEXP uint32 LogLuv24fromXYZ(float*, int = SGILOGENCODE_NODITHER); +LIBTIFF_DLL_IMPEXP uint32 LogLuv32fromXYZ(float*, int = SGILOGENCODE_NODITHER); #else -extern int LogL16fromY(double, int); -extern int LogL10fromY(double, int); -extern int uv_encode(double, double, int); -extern uint32 LogLuv24fromXYZ(float*, int); -extern uint32 LogLuv32fromXYZ(float*, int); +LIBTIFF_DLL_IMPEXP int LogL16fromY(double, int); +LIBTIFF_DLL_IMPEXP int LogL10fromY(double, int); +LIBTIFF_DLL_IMPEXP int uv_encode(double, double, int); +LIBTIFF_DLL_IMPEXP uint32 LogLuv24fromXYZ(float*, int); +LIBTIFF_DLL_IMPEXP uint32 LogLuv32fromXYZ(float*, int); #endif #endif /* LOGLUV_PUBLIC */ -extern int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, TIFFDisplay *, float*); -extern void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32, +LIBTIFF_DLL_IMPEXP int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, TIFFDisplay *, float*); +LIBTIFF_DLL_IMPEXP void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32, float *, float *, float *); -extern void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float, +LIBTIFF_DLL_IMPEXP void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float, uint32 *, uint32 *, uint32 *); -extern int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*); -extern void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32, +LIBTIFF_DLL_IMPEXP int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*); +LIBTIFF_DLL_IMPEXP void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32, uint32 *, uint32 *, uint32 *); #if defined(c_plusplus) || defined(__cplusplus)

14 years, 5 months

[jgardou] 48042: [WIN32K] - Properly initialize hVisRgn in CLIPPING_UpdateGCRegion This fixes a whole bunch of "IntGdiCombineRgn requires hSrc2 != NULL for combine mode 1!", and probably some bugs. Dedicated to encod3d.

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jul 14 16:12:32 2010 New Revision: 48042 URL: http://svn.reactos.org/svn/reactos?rev=48042&view=rev Log: [WIN32K] - Properly initialize hVisRgn in CLIPPING_UpdateGCRegion This fixes a whole bunch of "IntGdiCombineRgn requires hSrc2 != NULL for combine mode 1!", and probably some bugs. Dedicated to encod3d. Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Wed Jul 14 16:12:32 2010 @@ -26,7 +26,7 @@ CLIPPING_UpdateGCRegion(DC* Dc) { PROSRGNDATA CombinedRegion; - HRGN hRgnVis = NULL; + HRGN hRgnVis = Dc->prgnVis->BaseObject.hHmgr; /* Experiment with API region based on wine.. */ if (Dc->rosdc.hClipRgn && Dc->dclevel.prgnMeta) @@ -56,7 +56,7 @@ Dc->rosdc.hGCClipRgn = IntSysCreateRectRgn(0, 0, 0, 0); if (Dc->rosdc.hClipRgn == NULL) - NtGdiCombineRgn(Dc->rosdc.hGCClipRgn, ((PROSRGNDATA)Dc->prgnVis)->BaseObject.hHmgr, 0, RGN_COPY); + NtGdiCombineRgn(Dc->rosdc.hGCClipRgn, hRgnVis, 0, RGN_COPY); else NtGdiCombineRgn(Dc->rosdc.hGCClipRgn, Dc->rosdc.hClipRgn, hRgnVis, RGN_AND);

14 years, 5 months

[jgardou] 48041: [USER32] - WINE creates an alpha bitmap on icon creation, we do it when drawing it, so we need to create a bitmap which holds alpha information. - Add error handling to CreateIconIndirect.

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jul 14 15:42:44 2010 New Revision: 48041 URL: http://svn.reactos.org/svn/reactos?rev=48041&view=rev Log: [USER32] - WINE creates an alpha bitmap on icon creation, we do it when drawing it, so we need to create a bitmap which holds alpha information. - Add error handling to CreateIconIndirect. Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Wed Jul 14 15:42:44 2010 @@ -485,8 +485,8 @@ else { if (!(*mask = CreateBitmap( width, height, 1, 1, NULL ))) goto done; - if (!(*color = CreateBitmap( width, height, GetDeviceCaps( screen_dc, PLANES ), - GetDeviceCaps( screen_dc, BITSPIXEL ), NULL ))) + if (!(*color = CreateBitmap( width, height, bmi->bmiHeader.biPlanes, + bmi->bmiHeader.biBitCount, NULL ))) { DeleteObject( *mask ); goto done; @@ -1475,10 +1475,29 @@ height = bmpXor.bmHeight; if (bmpXor.bmPlanes * bmpXor.bmBitsPixel != 1) { - color = CreateCompatibleBitmap( screen_dc, width, height ); + color = CreateBitmap( width, height, bmpXor.bmPlanes, bmpXor.bmBitsPixel, NULL ); + if(!color) + { + ERR("Unable to create color bitmap!\n"); + return NULL; + } mask = CreateBitmap( width, height, 1, 1, NULL ); - } - else mask = CreateBitmap( width, height * 2, 1, 1, NULL ); + if(!mask) + { + ERR("Unable to create mask bitmap!\n"); + DeleteObject(color); + return NULL; + } + } + else + { + mask = CreateBitmap( width, height * 2, 1, 1, NULL ); + if(!mask) + { + ERR("Unable to create mask bitmap!\n"); + return NULL; + } + } } else {

14 years, 5 months

[jgardou] 48040: [WIN32K, USER32] - Get rid of ONEPARAM_ROUTINE_CREATECURICONHANDLE

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jul 14 15:01:02 2010 New Revision: 48040 URL: http://svn.reactos.org/svn/reactos?rev=48040&view=rev Log: [WIN32K, USER32] - Get rid of ONEPARAM_ROUTINE_CREATECURICONHANDLE Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Wed Jul 14 15:01:02 2010 @@ -76,8 +76,8 @@ HICON CreateCursorIconHandle( PICONINFO IconInfo ) { - HICON hIcon = (HICON)NtUserCallOneParam(0, //FIXME ? - ONEPARAM_ROUTINE_CREATECURICONHANDLE); + HICON hIcon = (HICON)NtUserCallOneParam(0, + ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT); if(!hIcon) return NULL; Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Jul 14 15:01:02 2010 @@ -3140,7 +3140,6 @@ #define ONEPARAM_ROUTINE_ISWINDOWINDESTROY 0xfffe000c #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d #define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e -#define ONEPARAM_ROUTINE_CREATECURICONHANDLE 0xfffe0025 // CREATE_EMPTY_CURSOR_OBJECT ? #define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0xfffe0027 #define ONEPARAM_ROUTINE_GETCURSORPOSITION 0xfffe0048 // use ONEPARAM_ or TWOPARAM routine ? #define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 // user mode Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Wed Jul 14 15:01:02 2010 @@ -192,7 +192,7 @@ case ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO: RETURN( (DWORD_PTR)MsqSetMessageExtraInfo((LPARAM)Param)); - case ONEPARAM_ROUTINE_CREATECURICONHANDLE: + case ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT: { PCURICON_OBJECT CurIcon; DWORD_PTR Result ;

14 years, 5 months

[jgardou] 48039: [W32KNAPI] - Test ONE_PARAM_ROUTINE_CREATEEMPTYCUROBJECT - Test NtUserGetIconInfo

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jul 14 14:56:53 2010 New Revision: 48039 URL: http://svn.reactos.org/svn/reactos?rev=48039&view=rev Log: [W32KNAPI] - Test ONE_PARAM_ROUTINE_CREATEEMPTYCUROBJECT - Test NtUserGetIconInfo Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserGetIconInfo.c (with props) Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c trunk/rostests/apitests/w32knapi/osver.c trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.h Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c [iso-8859-1] Wed Jul 14 14:56:53 2010 @@ -21,6 +21,26 @@ TEST(hWnd != 0); TEST(IsWindow(hWnd)); TEST(hWnd == GetDesktopWindow()); + + return APISTATUS_NORMAL; +} + +INT +Test_OneParamRoutine_CreateEmptyCurObject(PTESTINFO pti) /* XP/2k3 : 0x21, vista 0x25 */ +{ + HICON hIcon ; + + /* Test 0 */ + hIcon = (HICON) NtUserCallOneParam(0, _ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT); + TEST(hIcon != NULL); + + TEST(NtUserDestroyCursor(hIcon, 0) == TRUE); + + /* Test Garbage */ + hIcon = (HICON) NtUserCallOneParam(0xdeadbeef, _ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT); + TEST(hIcon != NULL); + + TEST(NtUserDestroyCursor(hIcon, 0xbaadf00d) == TRUE); return APISTATUS_NORMAL; } @@ -66,6 +86,7 @@ { Test_OneParamRoutine_BeginDeferWindowPos(pti); /* 0x1e */ Test_OneParamRoutine_WindowFromDC(pti); /* 0x1f */ + Test_OneParamRoutine_CreateEmptyCurObject(pti); /* XP/2k3 : 0x21, vista 0x25 */ Test_OneParamRoutine_MapDesktopObject(pti); /* 0x30 */ Test_OneParamRoutine_SwapMouseButtons(pti); /* 0x42 */ Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserGetIconInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserGetIconInfo.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserGetIconInfo.c [iso-8859-1] Wed Jul 14 14:56:53 2010 @@ -1,0 +1,62 @@ +INT +Test_NtUserGetIconInfo(PTESTINFO pti) +{ + HICON hIcon; + ICONINFO iinfo; + HBITMAP mask, color; + + ZeroMemory(&iinfo, sizeof(ICONINFO)); + + /* BASIC TESTS */ + hIcon = (HICON) NtUserCallOneParam(0, _ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT); + TEST(hIcon != NULL); + + /* Last param is unknown */ + TEST(NtUserGetIconInfo(hIcon, &iinfo, NULL, NULL, NULL, FALSE) == FALSE); + TEST(NtUserGetIconInfo(hIcon, &iinfo, NULL, NULL, NULL, TRUE) == FALSE); + + TEST(NtUserDestroyCursor(hIcon, 0) == TRUE); + + mask = CreateBitmap(16,16,1,1,NULL); + color = CreateBitmap(16,16,1,16,NULL); + + iinfo.hbmMask = mask; + iinfo.hbmColor = color ; + iinfo.fIcon = TRUE; + iinfo.xHotspot = 8; + iinfo.yHotspot = 8; + + hIcon = CreateIconIndirect(&iinfo); + TEST(hIcon!=NULL); + + // TODO : test last parameter... + TEST(NtUserGetIconInfo(hIcon, &iinfo, NULL, NULL, NULL, FALSE) == TRUE); + + TEST(iinfo.hbmMask != NULL); + TEST(iinfo.hbmColor != NULL); + TEST(iinfo.fIcon == TRUE); + TEST(iinfo.yHotspot == 8); + TEST(iinfo.xHotspot == 8); + + TEST(iinfo.hbmMask != mask); + TEST(iinfo.hbmColor != color); + + /* Does it make a difference? */ + TEST(NtUserGetIconInfo(hIcon, &iinfo, NULL, NULL, NULL, TRUE) == TRUE); + + TEST(iinfo.hbmMask != NULL); + TEST(iinfo.hbmColor != NULL); + TEST(iinfo.fIcon == TRUE); + TEST(iinfo.yHotspot == 8); + TEST(iinfo.xHotspot == 8); + + TEST(iinfo.hbmMask != mask); + TEST(iinfo.hbmColor != color); + + DeleteObject(mask); + DeleteObject(color); + + DestroyIcon(hIcon); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserGetIconInfo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/osver.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/osver.c… ============================================================================== --- trunk/rostests/apitests/w32knapi/osver.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/osver.c [iso-8859-1] Wed Jul 14 14:56:53 2010 @@ -6,6 +6,7 @@ ASPI gNOPARAM_ROUTINE_CREATEMENU = {-1,-1,0x00,-1,0x00}; ASPI gNOPARAM_ROUTINE_CREATEMENUPOPUP = {-1,-1,0x01,-1,0x01}; ASPI gNOPARAM_ROUTINE_LOADUSERAPIHOOK = {-1,-1,0x1d,-1,0x0e}; +ASPI gONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT = {-1, -1, 0x21, 0x21, 0x25}; ASPI gONEPARAM_ROUTINE_MAPDEKTOPOBJECT = {-1,-1,0x30,-1,0x31}; ASPI gONEPARAM_ROUTINE_SWAPMOUSEBUTTON = {-1,-1,0x42,-1,0x44}; Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] Wed Jul 14 14:56:53 2010 @@ -50,6 +50,7 @@ #include "ntuser/NtUserEnumDisplaySettings.c" #include "ntuser/NtUserFindExistingCursorIcon.c" #include "ntuser/NtUserGetClassInfo.c" +#include "ntuser/NtUserGetIconInfo.c" #include "ntuser/NtUserGetTitleBarInfo.c" #include "ntuser/NtUserProcessConnect.c" #include "ntuser/NtUserRedrawWindow.c" @@ -114,6 +115,7 @@ { L"NtUserEnumDisplaySettings", TEST_NtUserEnumDisplaySettings }, { L"NtUserFindExistingCursorIcon", Test_NtUserFindExistingCursoricon }, { L"NtUserGetClassInfo", Test_NtUserGetClassInfo }, + { L"NtUserGetIconInfo", Test_NtUserGetIconInfo }, { L"NtUserGetTitleBarInfo", Test_NtUserGetTitleBarInfo }, { L"NtUserProcessConnect", Test_NtUserProcessConnect }, { L"NtUserRedrawWindow", Test_NtUserRedrawWindow }, Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] Wed Jul 14 14:56:53 2010 @@ -47,6 +47,7 @@ extern ASPI gNOPARAM_ROUTINE_CREATEMENU; extern ASPI gNOPARAM_ROUTINE_CREATEMENUPOPUP; extern ASPI gNOPARAM_ROUTINE_LOADUSERAPIHOOK; +extern ASPI gONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT; extern ASPI gONEPARAM_ROUTINE_MAPDEKTOPOBJECT; extern ASPI gONEPARAM_ROUTINE_SWAPMOUSEBUTTON; extern ASPI gHWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW; @@ -56,6 +57,7 @@ #define _NOPARAM_ROUTINE_CREATEMENU gNOPARAM_ROUTINE_CREATEMENU[g_OsIdx] #define _NOPARAM_ROUTINE_CREATEMENUPOPUP gNOPARAM_ROUTINE_CREATEMENUPOPUP[g_OsIdx] #define _NOPARAM_ROUTINE_LOADUSERAPIHOOK gNOPARAM_ROUTINE_LOADUSERAPIHOOK[g_OsIdx] +#define _ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT gONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT[g_OsIdx] #define _ONEPARAM_ROUTINE_MAPDEKTOPOBJECT gONEPARAM_ROUTINE_MAPDEKTOPOBJECT[g_OsIdx] #define _ONEPARAM_ROUTINE_SWAPMOUSEBUTTON gONEPARAM_ROUTINE_SWAPMOUSEBUTTON[g_OsIdx] #define _HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW gHWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW[g_OsIdx]

14 years, 5 months

[dreimer] 48038: Reapply some Win32 specific magic to properly build a Windows DLL of libjpeg. (Samuel Serapion)

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 14 14:53:35 2010 New Revision: 48038 URL: http://svn.reactos.org/svn/reactos?rev=48038&view=rev Log: Reapply some Win32 specific magic to properly build a Windows DLL of libjpeg. (Samuel Serapion) Added: trunk/reactos/include/reactos/libs/libjpeg/rosdiff.patch (with props) Modified: trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h Modified: trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjp… ============================================================================== --- trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h [iso-8859-1] Wed Jul 14 14:53:35 2010 @@ -191,14 +191,63 @@ * or code profilers that require it. */ +#ifdef _WIN32 +# if defined(ALL_STATIC) +# if defined(JPEG_DLL) +# undef JPEG_DLL +# endif +# if !defined(JPEG_STATIC) +# define JPEG_STATIC +# endif +# endif +# if defined(JPEG_DLL) +# if defined(JPEG_STATIC) +# undef JPEG_STATIC +# endif +# endif +# if defined(JPEG_DLL) +/* building a DLL */ +# define JPEG_IMPEXP __declspec(dllexport) +# elif defined(JPEG_STATIC) +/* building or linking to a static library */ +# define JPEG_IMPEXP +# else +/* linking to the DLL */ +# define JPEG_IMPEXP __declspec(dllimport) +# endif +# if !defined(JPEG_API) +# define JPEG_API __cdecl +# endif +/* The only remaining magic that is necessary for cygwin */ +#elif defined(__CYGWIN__) +# if !defined(JPEG_IMPEXP) +# define JPEG_IMPEXP +# endif +# if !defined(JPEG_API) +# define JPEG_API __cdecl +# endif +#endif + +/* Ensure our magic doesn't hurt other platforms */ +#if !defined(JPEG_IMPEXP) +# define JPEG_IMPEXP +#endif +#if !defined(JPEG_API) +# define JPEG_API +#endif + /* a function called through method pointers: */ #define METHODDEF(type) static type /* a function used only in its module: */ #define LOCAL(type) static type /* a function referenced thru EXTERNs: */ -#define GLOBAL(type) type +#define GLOBAL(type) type JPEG_API /* a reference to a GLOBAL function: */ -#define EXTERN(type) extern type +#ifndef EXTERN +# define EXTERN(type) extern JPEG_IMPEXP type JPEG_API +/* a reference to a "GLOBAL" function exported by sourcefiles of utility progs */ +#endif /* EXTERN */ +#define EXTERN_1(type) extern type JPEG_API /* This macro is used to declare a "method", that is, a function pointer. Added: trunk/reactos/include/reactos/libs/libjpeg/rosdiff.patch URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjp… ============================================================================== --- trunk/reactos/include/reactos/libs/libjpeg/rosdiff.patch (added) +++ trunk/reactos/include/reactos/libs/libjpeg/rosdiff.patch [iso-8859-1] Wed Jul 14 14:53:35 2010 @@ -1,0 +1,70 @@ +Index: libs/libjpeg/jmorecfg.h +=================================================================== +--- libs/libjpeg/jmorecfg.h (revision 48026) ++++ libs/libjpeg/jmorecfg.h (working copy) +@@ -191,14 +191,63 @@ + * or code profilers that require it. + */ + ++#ifdef _WIN32 ++# if defined(ALL_STATIC) ++# if defined(JPEG_DLL) ++# undef JPEG_DLL ++# endif ++# if !defined(JPEG_STATIC) ++# define JPEG_STATIC ++# endif ++# endif ++# if defined(JPEG_DLL) ++# if defined(JPEG_STATIC) ++# undef JPEG_STATIC ++# endif ++# endif ++# if defined(JPEG_DLL) ++/* building a DLL */ ++# define JPEG_IMPEXP __declspec(dllexport) ++# elif defined(JPEG_STATIC) ++/* building or linking to a static library */ ++# define JPEG_IMPEXP ++# else ++/* linking to the DLL */ ++# define JPEG_IMPEXP __declspec(dllimport) ++# endif ++# if !defined(JPEG_API) ++# define JPEG_API __cdecl ++# endif ++/* The only remaining magic that is necessary for cygwin */ ++#elif defined(__CYGWIN__) ++# if !defined(JPEG_IMPEXP) ++# define JPEG_IMPEXP ++# endif ++# if !defined(JPEG_API) ++# define JPEG_API __cdecl ++# endif ++#endif ++ ++/* Ensure our magic doesn't hurt other platforms */ ++#if !defined(JPEG_IMPEXP) ++# define JPEG_IMPEXP ++#endif ++#if !defined(JPEG_API) ++# define JPEG_API ++#endif ++ + /* a function called through method pointers: */ + #define METHODDEF(type) static type + /* a function used only in its module: */ + #define LOCAL(type) static type + /* a function referenced thru EXTERNs: */ +-#define GLOBAL(type) type ++#define GLOBAL(type) type JPEG_API + /* a reference to a GLOBAL function: */ +-#define EXTERN(type) extern type ++#ifndef EXTERN ++# define EXTERN(type) extern JPEG_IMPEXP type JPEG_API ++/* a reference to a "GLOBAL" function exported by sourcefiles of utility progs */ ++#endif /* EXTERN */ ++#define EXTERN_1(type) extern type JPEG_API + + + /* This macro is used to declare a "method", that is, a function pointer. Propchange: trunk/reactos/include/reactos/libs/libjpeg/rosdiff.patch ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 5 months

[dreimer] 48037: Bye, old Downloader.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 14 11:00:31 2010 New Revision: 48037 URL: http://svn.reactos.org/svn/reactos?rev=48037&view=rev Log: Bye, old Downloader. Removed: trunk/reactos/base/applications/downloader/ Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Wed Jul 14 11:00:31 2010 @@ -16,9 +16,6 @@ <directory name="control"> <xi:include href="control/control.rbuild" /> </directory> - <directory name="downloader"> - <xi:include href="downloader/downloader.rbuild" /> - </directory> <directory name="dxdiag"> <xi:include href="dxdiag/dxdiag.rbuild" /> </directory>

14 years, 5 months

← Newer
1
...
32
33
34
35
36
37
38
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010