November 2005 - Wine-commits

wine/dlls/ntdll thread.c
by Alexandre Julliard 03 Nov '05

03 Nov '05

ChangeSet ID: 21071 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 03:54:47 Modified files: dlls/ntdll : thread.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Get rid of CPU id when copying context Patch: http://cvs.winehq.org/patch.py?id=21071 Old revision New revision Changes Path 1.43 1.44 +4 -0 wine/dlls/ntdll/thread.c Index: wine/dlls/ntdll/thread.c diff -u -p wine/dlls/ntdll/thread.c:1.43 wine/dlls/ntdll/thread.c:1.44 --- wine/dlls/ntdll/thread.c:1.43 3 Nov 2005 9:54:47 -0000 +++ wine/dlls/ntdll/thread.c 3 Nov 2005 9:54:47 -0000 @@ -528,6 +528,7 @@ NTSTATUS WINAPI NtSetContextThread( HAND static inline void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) { #ifdef __i386__ + flags &= ~CONTEXT_i386; /* get rid of CPU id */ if (flags & CONTEXT_INTEGER) { to->Eax = from->Eax; @@ -567,6 +568,7 @@ static inline void copy_context( CONTEXT to->FloatSave = from->FloatSave; } #elif defined(__x86_64__) + flags &= ~CONTEXT_AMD64; /* get rid of CPU id */ if (flags & CONTEXT_CONTROL) { to->Rbp = from->Rbp; @@ -615,6 +617,7 @@ static inline void copy_context( CONTEXT to->Dr7 = from->Dr7; } #elif defined(__sparc__) + flags &= ~CONTEXT_SPARC; /* get rid of CPU id */ if (flags & CONTEXT_CONTROL) { to->psr = from->psr; @@ -664,6 +667,7 @@ static inline void copy_context( CONTEXT /* FIXME */ } #elif defined(__powerpc__) + /* Has no CPU id */ if (flags & CONTEXT_CONTROL) { to->Msr = from->Msr;

1 0

wine/dlls/d3d8 vshaderdeclaration.c drawprim.c ...
by Alexandre Julliard 03 Nov '05

03 Nov '05

ChangeSet ID: 21070 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 03:54:31 Modified files: dlls/d3d8 : vshaderdeclaration.c drawprim.c device.c d3d8_private.h Log message: Raphael Junqueira <fenix(a)club-internet.fr> - defined D3DCOLOR_B macros to access byte values of D3DCOLOR - use D3DCOLOR macros instead of using shift + masks - fix a bug where diffuse.lpData checked instead of specular.lpData - implement color fixup on ARB VShader compilation code: -> on input parameters using swizzle -> add is_color parameter on vshader_program_add_param Patch: http://cvs.winehq.org/patch.py?id=21070 Old revision New revision Changes Path 1.12 1.13 +8 -9 wine/dlls/d3d8/vshaderdeclaration.c 1.29 1.30 +17 -17 wine/dlls/d3d8/drawprim.c 1.131 1.132 +4 -4 wine/dlls/d3d8/device.c 1.68 1.69 +4 -0 wine/dlls/d3d8/d3d8_private.h Index: wine/dlls/d3d8/vshaderdeclaration.c diff -u -p wine/dlls/d3d8/vshaderdeclaration.c:1.12 wine/dlls/d3d8/vshaderdeclaration.c:1.13 --- wine/dlls/d3d8/vshaderdeclaration.c:1.12 3 Nov 2005 9:54:31 -0000 +++ wine/dlls/d3d8/vshaderdeclaration.c 3 Nov 2005 9:54:31 -0000 @@ -511,10 +511,10 @@ HRESULT WINAPI IDirect3DDeviceImpl_FillV dw = *(const DWORD*) curPos; curPos = curPos + sizeof(DWORD); /**/ - vshader->input.V[reg].x = (float) (((dw >> 16) & 0xFF) / 255.0f); - vshader->input.V[reg].y = (float) (((dw >> 8) & 0xFF) / 255.0f); - vshader->input.V[reg].z = (float) (((dw >> 0) & 0xFF) / 255.0f); - vshader->input.V[reg].w = (float) (((dw >> 24) & 0xFF) / 255.0f); + vshader->input.V[reg].x = D3DCOLOR_R(dw); + vshader->input.V[reg].y = D3DCOLOR_G(dw); + vshader->input.V[reg].z = D3DCOLOR_B(dw); + vshader->input.V[reg].w = D3DCOLOR_A(dw); break; case D3DVSDT_SHORT2: @@ -549,11 +549,10 @@ HRESULT WINAPI IDirect3DDeviceImpl_FillV dw = *(const DWORD*) curPos; curPos = curPos + sizeof(DWORD); /**/ - vshader->input.V[reg].x = (float) ((dw & 0x000F) >> 0); - vshader->input.V[reg].y = (float) ((dw & 0x00F0) >> 8); - vshader->input.V[reg].z = (float) ((dw & 0x0F00) >> 16); - vshader->input.V[reg].w = (float) ((dw & 0xF000) >> 24); - + vshader->input.V[reg].x = (float) ((dw & 0x000000FF) >> 0); + vshader->input.V[reg].y = (float) ((dw & 0x0000FF00) >> 8); + vshader->input.V[reg].z = (float) ((dw & 0x00FF0000) >> 16); + vshader->input.V[reg].w = (float) ((dw & 0xFF000000) >> 24); break; default: /** errooooorr what to do ? */ Index: wine/dlls/d3d8/drawprim.c diff -u -p wine/dlls/d3d8/drawprim.c:1.29 wine/dlls/d3d8/drawprim.c:1.30 --- wine/dlls/d3d8/drawprim.c:1.29 3 Nov 2005 9:54:31 -0000 +++ wine/dlls/d3d8/drawprim.c 3 Nov 2005 9:54:31 -0000 @@ -1159,30 +1159,30 @@ static void drawStridedSlow(LPDIRECT3DDE /* Diffuse -------------------------------- */ if (sd->u.s.diffuse.lpData != NULL) { - glColor4ub((diffuseColor >> 16) & 0xFF, - (diffuseColor >> 8) & 0xFF, - (diffuseColor >> 0) & 0xFF, - (diffuseColor >> 24) & 0xFF); - VTRACE(("glColor4f: r,g,b,a=%f,%f,%f,%f\n", - ((diffuseColor >> 16) & 0xFF) / 255.0f, - ((diffuseColor >> 8) & 0xFF) / 255.0f, - ((diffuseColor >> 0) & 0xFF) / 255.0f, - ((diffuseColor >> 24) & 0xFF) / 255.0f)); + glColor4ub(D3DCOLOR_B_R(diffuseColor), + D3DCOLOR_B_G(diffuseColor), + D3DCOLOR_B_B(diffuseColor), + D3DCOLOR_B_A(diffuseColor)); + VTRACE(("glColor4ub: r,g,b,a=%u,%u,%u,%u\n", + D3DCOLOR_B_R(diffuseColor), + D3DCOLOR_B_G(diffuseColor), + D3DCOLOR_B_B(diffuseColor), + D3DCOLOR_B_A(diffuseColor))); } else { if (vx_index == 0) glColor4f(1.0f, 1.0f, 1.0f, 1.0f); } /* Specular ------------------------------- */ - if (sd->u.s.diffuse.lpData != NULL) { - VTRACE(("glSecondaryColor4ub: r,g,b=%f,%f,%f\n", - ((specularColor >> 16) & 0xFF) / 255.0f, - ((specularColor >> 8) & 0xFF) / 255.0f, - ((specularColor >> 0) & 0xFF) / 255.0f)); + if (sd->u.s.specular.lpData != NULL) { + VTRACE(("glSecondaryColor4ub: r,g,b=%u,%u,%u\n", + D3DCOLOR_B_R(specularColor), + D3DCOLOR_B_G(specularColor), + D3DCOLOR_B_B(specularColor))); if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { GL_EXTCALL(glSecondaryColor3ubEXT)( - (specularColor >> 16) & 0xFF, - (specularColor >> 8) & 0xFF, - (specularColor >> 0) & 0xFF); + D3DCOLOR_B_R(specularColor), + D3DCOLOR_B_G(specularColor), + D3DCOLOR_B_B(specularColor)); } else { /* Do not worry if specular colour missing and disable request */ VTRACE(("Specular color extensions not supplied\n")); Index: wine/dlls/d3d8/device.c diff -u -p wine/dlls/d3d8/device.c:1.131 wine/dlls/d3d8/device.c:1.132 --- wine/dlls/d3d8/device.c:1.131 3 Nov 2005 9:54:31 -0000 +++ wine/dlls/d3d8/device.c 3 Nov 2005 9:54:31 -0000 @@ -1411,10 +1411,10 @@ HRESULT WINAPI IDirect3DDevice8Impl_Cl if (Flags & D3DCLEAR_TARGET) { TRACE("Clearing screen with glClear to color %lx\n", Color); glGetFloatv(GL_COLOR_CLEAR_VALUE, old_color_clear_value); - glClearColor(((Color >> 16) & 0xFF) / 255.0f, - ((Color >> 8) & 0xFF) / 255.0f, - ((Color >> 0) & 0xFF) / 255.0f, - ((Color >> 24) & 0xFF) / 255.0f); + glClearColor(D3DCOLOR_R(Color), + D3DCOLOR_G(Color), + D3DCOLOR_B(Color), + D3DCOLOR_A(Color)); checkGLcall("glClearColor"); /* Clear ALL colors! */ Index: wine/dlls/d3d8/d3d8_private.h diff -u -p wine/dlls/d3d8/d3d8_private.h:1.68 wine/dlls/d3d8/d3d8_private.h:1.69 --- wine/dlls/d3d8/d3d8_private.h:1.68 3 Nov 2005 9:54:31 -0000 +++ wine/dlls/d3d8/d3d8_private.h 3 Nov 2005 9:54:31 -0000 @@ -299,6 +299,10 @@ struct PLIGHTINFOEL { #define GL_EXTCALL(FuncName) (This->direct3d8->gl_info.FuncName) #define GL_EXTCALL_DEV(FuncName, dev) ((dev)->direct3d8->gl_info.FuncName) +#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xFF) +#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xFF) +#define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xFF) +#define D3DCOLOR_B_A(dw) (((dw) >> 24) & 0xFF) #define D3DCOLOR_R(dw) (((float) (((dw) >> 16) & 0xFF)) / 255.0f) #define D3DCOLOR_G(dw) (((float) (((dw) >> 8) & 0xFF)) / 255.0f)

1 0

wine/dlls/advapi32 service.c advapi32.spec
by Alexandre Julliard 03 Nov '05

03 Nov '05

ChangeSet ID: 21069 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 03:53:27 Modified files: dlls/advapi32 : service.c advapi32.spec Log message: Hans Leidekker <hans(a)it.vu.nl> Added stub for RegisterServiceCtrlHandlerEx{A,W}. Patch: http://cvs.winehq.org/patch.py?id=21069 Old revision New revision Changes Path 1.94 1.95 +14 -0 wine/dlls/advapi32/service.c 1.78 1.79 +2 -2 wine/dlls/advapi32/advapi32.spec Index: wine/dlls/advapi32/service.c diff -u -p wine/dlls/advapi32/service.c:1.94 wine/dlls/advapi32/service.c:1.95 --- wine/dlls/advapi32/service.c:1.94 3 Nov 2005 9:53:27 -0000 +++ wine/dlls/advapi32/service.c 3 Nov 2005 9:53:27 -0000 @@ -2229,3 +2229,17 @@ BOOL WINAPI SetServiceBits( SERVICE_STAT bSetBitsOn, bUpdateImmediately); return TRUE; } + +SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExA( LPCSTR lpServiceName, + LPHANDLER_FUNCTION_EX lpHandlerProc, LPVOID lpContext ) +{ + FIXME("%s %p %p\n", debugstr_a(lpServiceName), lpHandlerProc, lpContext); + return 0; +} + +SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceName, + LPHANDLER_FUNCTION_EX lpHandlerProc, LPVOID lpContext ) +{ + FIXME("%s %p %p\n", debugstr_w(lpServiceName), lpHandlerProc, lpContext); + return 0; +} Index: wine/dlls/advapi32/advapi32.spec diff -u -p wine/dlls/advapi32/advapi32.spec:1.78 wine/dlls/advapi32/advapi32.spec:1.79 --- wine/dlls/advapi32/advapi32.spec:1.78 3 Nov 2005 9:53:27 -0000 +++ wine/dlls/advapi32/advapi32.spec 3 Nov 2005 9:53:27 -0000 @@ -522,8 +522,8 @@ @ stdcall RegisterEventSourceW(ptr ptr) # @ stub RegisterIdleTask @ stdcall RegisterServiceCtrlHandlerA (ptr ptr) -# @ stub RegisterServiceCtrlHandlerExA -# @ stub RegisterServiceCtrlHandlerExW +@ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) +@ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) @ stdcall RegisterServiceCtrlHandlerW (ptr ptr) @ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) @ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr)

1 0

wine/dlls/riched20 wrap.c paint.c editor.h edi ...
by Alexandre Julliard 03 Nov '05

03 Nov '05

ChangeSet ID: 21068 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 03:52:29 Modified files: dlls/riched20 : wrap.c paint.c editor.h editor.c caret.c Log message: Phil Krylov <phil(a)newstar.rinet.ru> Added support for EM_REQUESTRESIZE message, EN_REQUESTRESIZE notification, and ENM_REQUESTRESIZE event mask. Patch: http://cvs.winehq.org/patch.py?id=21068 Old revision New revision Changes Path 1.10 1.11 +27 -0 wine/dlls/riched20/wrap.c 1.14 1.15 +2 -0 wine/dlls/riched20/paint.c 1.21 1.22 +1 -0 wine/dlls/riched20/editor.h 1.65 1.66 +6 -3 wine/dlls/riched20/editor.c 1.14 1.15 +4 -0 wine/dlls/riched20/caret.c Index: wine/dlls/riched20/wrap.c diff -u -p wine/dlls/riched20/wrap.c:1.10 wine/dlls/riched20/wrap.c:1.11 --- wine/dlls/riched20/wrap.c:1.10 3 Nov 2005 9:52:29 -0000 +++ wine/dlls/riched20/wrap.c 3 Nov 2005 9:52:29 -0000 @@ -448,9 +448,36 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEdit } editor->sizeWindow.cx = c.rcView.right-c.rcView.left; editor->sizeWindow.cy = c.rcView.bottom-c.rcView.top; + editor->nTotalLength = c.pt.y; ME_DestroyContext(&c); ReleaseDC(hWnd, hDC); return bModified; } + + +void +ME_SendRequestResize(ME_TextEditor *editor, BOOL force) +{ + if (editor->nEventMask & ENM_REQUESTRESIZE) + { + RECT rc; + + GetClientRect(editor->hWnd, &rc); + + if (force || rc.bottom != editor->nTotalLength) + { + REQRESIZE info; + + info.nmhdr.hwndFrom = editor->hWnd; + info.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); + info.nmhdr.code = EN_REQUESTRESIZE; + info.rc = rc; + info.rc.bottom = editor->nTotalLength; + + SendMessageW(GetParent(editor->hWnd), WM_NOTIFY, + info.nmhdr.idFrom, (LPARAM)&info); + } + } +} Index: wine/dlls/riched20/paint.c diff -u -p wine/dlls/riched20/paint.c:1.14 wine/dlls/riched20/paint.c:1.15 --- wine/dlls/riched20/paint.c:1.14 3 Nov 2005 9:52:29 -0000 +++ wine/dlls/riched20/paint.c 3 Nov 2005 9:52:29 -0000 @@ -90,6 +90,8 @@ void ME_PaintContent(ME_TextEditor *edit if (ys == c.pt.y) /* don't overwrite the top bar */ ys++; } + if (editor->nTotalLength != editor->nLastTotalLength) + ME_SendRequestResize(editor, FALSE); editor->nLastTotalLength = editor->nTotalLength; ME_DestroyContext(&c); } Index: wine/dlls/riched20/editor.h diff -u -p wine/dlls/riched20/editor.h:1.21 wine/dlls/riched20/editor.h:1.22 --- wine/dlls/riched20/editor.h:1.21 3 Nov 2005 9:52:29 -0000 +++ wine/dlls/riched20/editor.h 3 Nov 2005 9:52:29 -0000 @@ -173,6 +173,7 @@ ME_DisplayItem *ME_MakeRow(int height, i void ME_InsertRowStart(ME_WrapContext *wc, ME_DisplayItem *pEnd); void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp); BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor); +void ME_SendRequestResize(ME_TextEditor *editor, BOOL force); /* para.c */ ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run); Index: wine/dlls/riched20/editor.c diff -u -p wine/dlls/riched20/editor.c:1.65 wine/dlls/riched20/editor.c:1.66 --- wine/dlls/riched20/editor.c:1.65 3 Nov 2005 9:52:29 -0000 +++ wine/dlls/riched20/editor.c 3 Nov 2005 9:52:29 -0000 @@ -83,7 +83,7 @@ - EM_PASTESPECIAL + EM_POSFROMCHAR + EM_REDO 2.0 - - EM_REQUESTRESIZE + + EM_REQUESTRESIZE + EM_REPLACESEL (proper style?) ANSI&Unicode - EM_SCROLL - EM_SCROLLCARET @@ -153,7 +153,7 @@ - EN_MSGFILTER - EN_OLEOPFAILED - EN_PROTECTED - - EN_REQUESTRESIZE + + EN_REQUESTRESIZE - EN_SAVECLIPBOARD + EN_SELCHANGE + EN_SETFOCUS @@ -633,6 +633,7 @@ static LRESULT ME_StreamIn(ME_TextEditor } ME_MoveCaret(editor); ME_SendSelChange(editor); + ME_SendRequestResize(editor, FALSE); return 0; } @@ -1134,7 +1135,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_HIDESELECTION) UNSUPPORTED_MSG(EM_LIMITTEXT) /* also known as EM_SETLIMITTEXT */ UNSUPPORTED_MSG(EM_PASTESPECIAL) - UNSUPPORTED_MSG(EM_REQUESTRESIZE) UNSUPPORTED_MSG(EM_SCROLL) UNSUPPORTED_MSG(EM_SCROLLCARET) UNSUPPORTED_MSG(EM_SELECTIONTYPE) @@ -1974,6 +1974,9 @@ LRESULT WINAPI RichEditANSIWndProc(HWND ME_RewrapRepaint(editor); return 0; } + case EM_REQUESTRESIZE: + ME_SendRequestResize(editor, TRUE); + return 0; case WM_SETREDRAW: editor->bRedraw = wParam; return 0; Index: wine/dlls/riched20/caret.c diff -u -p wine/dlls/riched20/caret.c:1.14 wine/dlls/riched20/caret.c:1.15 --- wine/dlls/riched20/caret.c:1.14 3 Nov 2005 9:52:29 -0000 +++ wine/dlls/riched20/caret.c 3 Nov 2005 9:52:29 -0000 @@ -1097,6 +1097,7 @@ BOOL ME_ArrowKey(ME_TextEditor *editor, editor->bCaretAtEnd = FALSE; /* FIXME or maybe not */ ME_DeleteSelection(editor); ME_UpdateRepaint(editor); + ME_SendRequestResize(editor, FALSE); return TRUE; } if (ME_ArrowLeft(editor, p)) { @@ -1105,6 +1106,7 @@ BOOL ME_ArrowKey(ME_TextEditor *editor, ME_MoveCaret(editor); ME_DeleteTextAtCursor(editor, nCursor, 1); ME_UpdateRepaint(editor); + ME_SendRequestResize(editor, FALSE); } return TRUE; } @@ -1117,11 +1119,13 @@ BOOL ME_ArrowKey(ME_TextEditor *editor, ME_DeleteSelection(editor); ME_ClearTempStyle(editor); ME_UpdateRepaint(editor); + ME_SendRequestResize(editor, FALSE); return TRUE; } ME_DeleteTextAtCursor(editor, nCursor, 1); ME_ClearTempStyle(editor); ME_UpdateRepaint(editor); + ME_SendRequestResize(editor, FALSE); return TRUE; } case VK_HOME: {

1 0

wine/dlls/user scroll.c
by Alexandre Julliard 03 Nov '05

03 Nov '05

ChangeSet ID: 21067 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 03:51:42 Modified files: dlls/user : scroll.c Log message: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Scroll bar: Keep the caret blinking during scroll operations (only handle WM_SYSTIMER messages that belong to the scroll bar). Patch: http://cvs.winehq.org/patch.py?id=21067 Old revision New revision Changes Path 1.15 1.16 +6 -7 wine/dlls/user/scroll.c Index: wine/dlls/user/scroll.c diff -u -p wine/dlls/user/scroll.c:1.15 wine/dlls/user/scroll.c:1.16 --- wine/dlls/user/scroll.c:1.15 3 Nov 2005 9:51:42 -0000 +++ wine/dlls/user/scroll.c 3 Nov 2005 9:51:42 -0000 @@ -1085,19 +1085,18 @@ void SCROLL_TrackScrollBar( HWND hwnd, I { if (!GetMessageW( &msg, 0, 0, 0 )) break; if (CallMsgFilterW( &msg, MSGF_SCROLLBAR )) continue; - switch(msg.message) + if (msg.message == WM_LBUTTONUP || + msg.message == WM_MOUSEMOVE || + (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) { - case WM_LBUTTONUP: - case WM_MOUSEMOVE: - case WM_SYSTIMER: pt.x = (short)LOWORD(msg.lParam) + xoffset; pt.y = (short)HIWORD(msg.lParam) + yoffset; SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt ); - break; - default: + } + else + { TranslateMessage( &msg ); DispatchMessageW( &msg ); - break; } if (!IsWindow( hwnd )) {

1 0

wine/ include/dbghelp.h dlls/dbghelp/symbol.c ...
by Alexandre Julliard 03 Nov '05

03 Nov '05

ChangeSet ID: 21066 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 03:51:26 Modified files: include : dbghelp.h dlls/dbghelp : symbol.c source.c dbghelp_private.h dbghelp.spec Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Implemented SymEnumLines. Patch: http://cvs.winehq.org/patch.py?id=21066 Old revision New revision Changes Path 1.14 1.15 +13 -0 wine/include/dbghelp.h 1.17 1.18 +0 -13 wine/dlls/dbghelp/symbol.c 1.3 1.4 +66 -0 wine/dlls/dbghelp/source.c 1.16 1.17 +13 -0 wine/dlls/dbghelp/dbghelp_private.h 1.10 1.11 +1 -0 wine/dlls/dbghelp/dbghelp.spec Index: wine/include/dbghelp.h diff -u -p wine/include/dbghelp.h:1.14 wine/include/dbghelp.h:1.15 --- wine/include/dbghelp.h:1.14 3 Nov 2005 9:51:26 -0000 +++ wine/include/dbghelp.h 3 Nov 2005 9:51:26 -0000 @@ -749,6 +749,19 @@ BOOL WINAPI SymEnumSourceFiles(HANDLE, U BOOL WINAPI SymGetLineFromAddr(HANDLE, DWORD, PDWORD, PIMAGEHLP_LINE); BOOL WINAPI SymGetLinePrev(HANDLE, PIMAGEHLP_LINE); BOOL WINAPI SymGetLineNext(HANDLE, PIMAGEHLP_LINE); +typedef struct _SRCCODEINFO +{ + DWORD SizeOfStruct; + PVOID Key; + DWORD64 ModBase; + char Obj[MAX_PATH+1]; + char FileName[MAX_PATH+1]; + DWORD LineNumber; + DWORD64 Address; +} SRCCODEINFO, *PSRCCODEINFO; + +typedef BOOL (CALLBACK* PSYM_ENUMLINES_CALLBACK)(PSRCCODEINFO, PVOID); +BOOL WINAPI SymEnumLines(HANDLE, ULONG64, PCSTR, PCSTR, PSYM_ENUMLINES_CALLBACK, PVOID); /************************* * File & image handling * Index: wine/dlls/dbghelp/symbol.c diff -u -p wine/dlls/dbghelp/symbol.c:1.17 wine/dlls/dbghelp/symbol.c:1.18 --- wine/dlls/dbghelp/symbol.c:1.17 3 Nov 2005 9:51:26 -0000 +++ wine/dlls/dbghelp/symbol.c 3 Nov 2005 9:51:26 -0000 @@ -40,19 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); WINE_DECLARE_DEBUG_CHANNEL(dbghelp_symt); -struct line_info -{ - unsigned long is_first : 1, - is_last : 1, - is_source_file : 1, - line_number; - union - { - unsigned long pc_offset; /* if is_source_file isn't set */ - unsigned source_file; /* if is_source_file is set */ - } u; -}; - inline static int cmp_addr(ULONG64 a1, ULONG64 a2) { if (a1 > a2) return 1; Index: wine/dlls/dbghelp/source.c diff -u -p wine/dlls/dbghelp/source.c:1.3 wine/dlls/dbghelp/source.c:1.4 --- wine/dlls/dbghelp/source.c:1.3 3 Nov 2005 9:51:26 -0000 +++ wine/dlls/dbghelp/source.c 3 Nov 2005 9:51:26 -0000 @@ -26,6 +26,9 @@ #include "dbghelp_private.h" #include "wine/debug.h" +#ifdef HAVE_REGEX_H +# include <regex.h> +#endif WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); @@ -136,3 +139,66 @@ BOOL WINAPI SymEnumSourceFiles(HANDLE hP return TRUE; } + +/****************************************************************** + * SymEnumLines (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, + PCSTR srcfile, PSYM_ENUMLINES_CALLBACK cb, PVOID user) +{ + struct process* pcs; + struct module* module; + struct hash_table_iter hti; + struct symt_ht* sym; + regex_t re; + struct line_info* dli; + void* ptr; + SRCCODEINFO sci; + char* file; + + if (!cb) return FALSE; + pcs = process_find_by_handle(hProcess); + if (!pcs) return FALSE; + if (!(dbghelp_options & SYMOPT_LOAD_LINES)) return TRUE; + if (regcomp(&re, srcfile, REG_NOSUB)) + { + FIXME("Couldn't compile %s\n", srcfile); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (compiland) FIXME("Unsupported yet (filtering on compiland %s)\n", compiland); + module = module_find_by_addr(pcs, base, DMT_UNKNOWN); + if (!(module = module_get_debug(pcs, module))) return FALSE; + + sci.SizeOfStruct = sizeof(sci); + sci.ModBase = base; + + hash_table_iter_init(&module->ht_symbols, &hti, NULL); + while ((ptr = hash_table_iter_up(&hti))) + { + sym = GET_ENTRY(ptr, struct symt_ht, hash_elt); + if (sym->symt.tag != SymTagFunction) continue; + + dli = NULL; + sci.FileName[0] = '\0'; + while ((dli = vector_iter_up(&((struct symt_function*)sym)->vlines, dli))) + { + if (dli->is_source_file) + { + file = (char*)source_get(module, dli->u.source_file); + if (regexec(&re, file, 0, NULL, 0) != 0) file = ""; + strcpy(sci.FileName, file); + } + else if (sci.FileName[0]) + { + sci.Key = dli; + sci.Obj[0] = '\0'; /* FIXME */ + sci.LineNumber = dli->line_number; + sci.Address = dli->u.pc_offset; + if (!cb(&sci, user)) break; + } + } + } + return TRUE; +} Index: wine/dlls/dbghelp/dbghelp_private.h diff -u -p wine/dlls/dbghelp/dbghelp_private.h:1.16 wine/dlls/dbghelp/dbghelp_private.h:1.17 --- wine/dlls/dbghelp/dbghelp_private.h:1.16 3 Nov 2005 9:51:26 -0000 +++ wine/dlls/dbghelp/dbghelp_private.h 3 Nov 2005 9:51:26 -0000 @@ -289,6 +289,19 @@ struct process IMAGEHLP_STACK_FRAME ctx_frame; }; +struct line_info +{ + unsigned long is_first : 1, + is_last : 1, + is_source_file : 1, + line_number; + union + { + unsigned long pc_offset; /* if is_source_file isn't set */ + unsigned source_file; /* if is_source_file is set */ + } u; +}; + /* dbghelp.c */ extern struct process* process_find_by_handle(HANDLE hProcess); extern HANDLE hMsvcrt; Index: wine/dlls/dbghelp/dbghelp.spec diff -u -p wine/dlls/dbghelp/dbghelp.spec:1.10 wine/dlls/dbghelp/dbghelp.spec:1.11 --- wine/dlls/dbghelp/dbghelp.spec:1.10 3 Nov 2005 9:51:26 -0000 +++ wine/dlls/dbghelp/dbghelp.spec 3 Nov 2005 9:51:26 -0000 @@ -26,6 +26,7 @@ @ stub StackWalk64 @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) @ stdcall SymCleanup(long) +@ stdcall SymEnumLines(ptr double str str ptr ptr) @ stdcall SymEnumSourceFiles(ptr double str ptr ptr) @ stub SymEnumSym @ stdcall SymEnumSymbols(ptr double str ptr ptr)

1 0

wine/programs/wineconsole winecon_user.h user. ...
by Alexandre Julliard 03 Nov '05

03 Nov '05

ChangeSet ID: 21065 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 03:51:00 Modified files: programs/wineconsole: winecon_user.h user.c dialog.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Now filling external leading in font cells. Patch: http://cvs.winehq.org/patch.py?id=21065 Old revision New revision Changes Path 1.8 1.9 +3 -1 wine/programs/wineconsole/winecon_user.h 1.25 1.26 +17 -2 wine/programs/wineconsole/user.c 1.21 1.22 +2 -2 wine/programs/wineconsole/dialog.c Index: wine/programs/wineconsole/winecon_user.h diff -u -p wine/programs/wineconsole/winecon_user.h:1.8 wine/programs/wineconsole/winecon_user.h:1.9 --- wine/programs/wineconsole/winecon_user.h:1.8 3 Nov 2005 9:51: 0 -0000 +++ wine/programs/wineconsole/winecon_user.h 3 Nov 2005 9:51: 0 -0000 @@ -30,6 +30,7 @@ struct inner_data_user { /* the following fields are only user by the USER backend (should be hidden in user) */ HWND hWnd; /* handle to windows for rendering */ HFONT hFont; /* font used for rendering, usually fixed */ + LONG ext_leading; /* external leading for hFont */ HDC hMemDC; /* memory DC holding the bitmap below */ HBITMAP hBitmap; /* bitmap of display window content */ HMENU hPopMenu; /* popup menu triggered by right mouse click */ @@ -50,7 +51,8 @@ extern BOOL WCUSER_ValidateFontMetric(co const TEXTMETRIC* tm, DWORD fontType); extern BOOL WCUSER_AreFontsEqual(const struct config_data* config, const LOGFONT* lf); -extern HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONT* lf); +extern HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONT* lf, + LONG* el); extern void WCUSER_FillLogFont(LOGFONT* lf, const WCHAR* name, UINT height, UINT weight); Index: wine/programs/wineconsole/user.c diff -u -p wine/programs/wineconsole/user.c:1.25 wine/programs/wineconsole/user.c:1.26 --- wine/programs/wineconsole/user.c:1.25 3 Nov 2005 9:51: 0 -0000 +++ wine/programs/wineconsole/user.c 3 Nov 2005 9:51: 0 -0000 @@ -50,6 +50,8 @@ static void WCUSER_FillMemDC(const struc HFONT hOldFont; WORD attr; WCHAR* line; + RECT r; + HBRUSH hbr; /* no font has been set up yet, don't worry about filling the bitmap, * we'll do it once a font is chosen @@ -77,6 +79,16 @@ static void WCUSER_FillMemDC(const struc } TextOut(PRIVATE(data)->hMemDC, i * data->curcfg.cell_width, j * data->curcfg.cell_height, line, k - i); + if (PRIVATE(data)->ext_leading && + (hbr = CreateSolidBrush(WCUSER_ColorMap[(attr>>4)&0x0F]))) + { + r.left = i * data->curcfg.cell_width; + r.top = (j + 1) * data->curcfg.cell_height - PRIVATE(data)->ext_leading; + r.right = k * data->curcfg.cell_width; + r.bottom = (j + 1) * data->curcfg.cell_height; + FillRect(PRIVATE(data)->hMemDC, &r, hbr); + DeleteObject(hbr); + } i = k - 1; } } @@ -410,7 +422,7 @@ static int CALLBACK get_first_font_enum( * get the relevant information from the font described in lf and store them * in config */ -HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONT* lf) +HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONT* lf, LONG* el) { TEXTMETRIC tm; HDC hDC; @@ -461,6 +473,7 @@ HFONT WCUSER_CopyFont(struct config_data config->cell_height = tm.tmHeight + tm.tmExternalLeading; config->font_weight = tm.tmWeight; lstrcpy(config->face_name, lf->lfFaceName); + if (el) *el = tm.tmExternalLeading; return hFont; err: @@ -503,15 +516,17 @@ void WCUSER_FillLogFont(LOGFONT* lf, BOOL WCUSER_SetFont(struct inner_data* data, const LOGFONT* logfont) { HFONT hFont; + LONG el; if (PRIVATE(data)->hFont != 0 && WCUSER_AreFontsEqual(&data->curcfg, logfont)) return TRUE; - hFont = WCUSER_CopyFont(&data->curcfg, PRIVATE(data)->hWnd, logfont); + hFont = WCUSER_CopyFont(&data->curcfg, PRIVATE(data)->hWnd, logfont, &el); if (!hFont) {WINE_ERR("wrong font\n"); return FALSE;} if (PRIVATE(data)->hFont) DeleteObject(PRIVATE(data)->hFont); PRIVATE(data)->hFont = hFont; + PRIVATE(data)->ext_leading = el; WCUSER_ComputePositions(data); WCUSER_NewBitmap(data); Index: wine/programs/wineconsole/dialog.c diff -u -p wine/programs/wineconsole/dialog.c:1.21 wine/programs/wineconsole/dialog.c:1.22 --- wine/programs/wineconsole/dialog.c:1.21 3 Nov 2005 9:51: 0 -0000 +++ wine/programs/wineconsole/dialog.c 3 Nov 2005 9:51: 0 -0000 @@ -432,7 +432,7 @@ static BOOL select_font(struct dialog_i WCUSER_FillLogFont(&lf, di->font[size_idx].faceName, di->font[size_idx].height, di->font[size_idx].weight); - hFont = WCUSER_CopyFont(&config, PRIVATE(di->data)->hWnd, &lf); + hFont = WCUSER_CopyFont(&config, PRIVATE(di->data)->hWnd, &lf, NULL); if (!hFont) return FALSE; if (config.cell_height != di->font[size_idx].height) @@ -571,7 +571,7 @@ static BOOL WINAPI WCUSER_FontDlgProc(HW WCUSER_FillLogFont(&lf, di->font[val].faceName, di->font[val].height, di->font[val].weight); DeleteObject(WCUSER_CopyFont(&di->config, - PRIVATE(di->data)->hWnd, &lf)); + PRIVATE(di->data)->hWnd, &lf, NULL)); } val = (GetWindowLong(GetDlgItem(hDlg, IDC_FNT_COLOR_BK), 0) << 4) |

1 0

lostwages/wwn wn20050916_290.xml wn20050923_29 ...
by Jeremy Newman 02 Nov '05

02 Nov '05

ChangeSet ID: 21064 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/11/02 16:16:02 Modified files: wwn : wn20050916_290.xml wn20050923_291.xml wn20050930_292.xml Log message: Jonathan Ernst <Jonathan(a)ErnstFamily.ch> - Fix deadlinks that come from the hypermail to pipermail transition in wwn's Patch: http://cvs.winehq.org/patch.py?id=21064 Old revision New revision Changes Path 1.5 1.6 +7 -7 lostwages/wwn/wn20050916_290.xml 1.4 1.5 +6 -6 lostwages/wwn/wn20050923_291.xml 1.4 1.5 +7 -7 lostwages/wwn/wn20050930_292.xml Index: lostwages/wwn/wn20050916_290.xml diff -u -p lostwages/wwn/wn20050916_290.xml:1.5 lostwages/wwn/wn20050916_290.xml:1.6 --- lostwages/wwn/wn20050916_290.xml:1.5 2 Nov 2005 22:16: 2 -0000 +++ lostwages/wwn/wn20050916_290.xml 2 Nov 2005 22:16: 2 -0000 @@ -378,7 +378,7 @@ seemed to be the consensus. </p> <section title="Wine's Development Model" subject="Suggestions for improvement of the emulator" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/039745.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/039745.html" posts="52" > <topic>Project Management</topic> @@ -587,7 +587,7 @@ any volunteers. </p> <section title="HTML Help" subject="HTML Help is functional" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040071.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040071.html" posts="1" > <topic>Web/HTML</topic> @@ -664,7 +664,7 @@ improvements that have been made. <section title="Safedisc Begins to Work" subject="Safedisc 1 works on wine" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/039950.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/039950.html" posts="4" > <topic>Status Updates</topic> @@ -765,7 +765,7 @@ for things like screenshots.</p> <section title="SMP Safe?" subject="Is Wine SMP-safe yet?" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040079.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040079.html" posts="2" > <p>Is Wine SMP safe? Well... it certainly seems like a topic someone would @@ -775,8 +775,8 @@ I've seen conflicting reports about whet to run on SMP systems. </p><p> Have the issues described in -<a href="http://www.winehq.org/hypermail/wine-devel/2005/01/0060.html"> -http://www.winehq.org/hypermail/wine-devel/2005/01/0060.html</a> +<a href="http://www.winehq.org/pipermail/wine-devel/2005/01/0060.html"> +http://www.winehq.org/pipermail/wine-devel/2005/01/0060.html</a> been taken care of? </p><p> I just pinged the reporter of the only bug with SMP in the summary, @@ -796,7 +796,7 @@ in the problems i tried to debug there w <section title="Wine's MSI - Help Us Break It" subject="Looking for bugs in Wine's Microsoft Installer (MSI) implementation" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040041.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040041.html" posts="2" > <topic>MSI</topic> Index: lostwages/wwn/wn20050923_291.xml diff -u -p lostwages/wwn/wn20050923_291.xml:1.4 lostwages/wwn/wn20050923_291.xml:1.5 --- lostwages/wwn/wn20050923_291.xml:1.4 2 Nov 2005 22:16: 2 -0000 +++ lostwages/wwn/wn20050923_291.xml 2 Nov 2005 22:16: 2 -0000 @@ -85,7 +85,7 @@ that the company was still around.</p> <section title="Docs Needed" subject="Documentation volunteer(s) needed" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040163.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040163.html" posts="16" > <topic>Documentation</topic> @@ -281,7 +281,7 @@ real-world applications need anything li <section title="WineD3D and DirectX7" subject="D3D7 -> WineD3D" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040212.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040212.html" posts="5" > <topic>DirectX</topic> @@ -338,7 +338,7 @@ problems. </p> <section title="Wine & WindowsCE" subject="Windows CE on Wine" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040161.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040161.html" posts="3" > <topic>Ports</topic> @@ -428,7 +428,7 @@ The same goes for the actual CE source c <section title="Finding Memory Leaks" subject="memory leak detection patch" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040218.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040218.html" posts="3" > <topic>Memory Management</topic> @@ -499,7 +499,7 @@ of finding problems in Wine code.</p></q <section title="Printing & Acrobat Reader" subject="question about the status of the wine printing system" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040144.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040144.html" posts="3" > <p>Dan Kegel stumbled across an odd problem, one that fortunately has @@ -525,7 +525,7 @@ Acrobat Reader.</p> <section title="Running Wine From Source Tree" subject="Running Wine from source tree" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040238.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040238.html" posts="5" > <topic>Build Process</topic> Index: lostwages/wwn/wn20050930_292.xml diff -u -p lostwages/wwn/wn20050930_292.xml:1.4 lostwages/wwn/wn20050930_292.xml:1.5 --- lostwages/wwn/wn20050930_292.xml:1.4 2 Nov 2005 22:16: 2 -0000 +++ lostwages/wwn/wn20050930_292.xml 2 Nov 2005 22:16: 2 -0000 @@ -82,7 +82,7 @@ Its main goal is to search for the DBA h <section title="Summer of Code Update: Single Sign-On" subject="Single sign-on SoC project summary" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040340.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040340.html" posts="1" > <topic>Status Updates</topic> @@ -157,7 +157,7 @@ keep doing so for a while. <section title="Summer of Code Update: Theming" subject="Theming SoC outcome" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040289.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040289.html" posts="1" > <topic>Status Updates</topic> @@ -198,7 +198,7 @@ so I guess I'll stick around a bit longe <section title="Red Hat/Fedora RPMs" subject="RH8 spec for 20050830" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040377.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040377.html" posts="2" > <topic>Build Process</topic> @@ -241,7 +241,7 @@ with the fonts. <section title="Build Changes" subject="build errors" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040381.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040381.html" posts="8" > <topic>Build Process</topic> @@ -292,7 +292,7 @@ tests). </quote></p> <section title="Compile Problems from Wine-20050830" subject="Problem Resolve" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040420.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040420.html" posts="5" > <topic>Fixes</topic> @@ -347,7 +347,7 @@ that point.</li></ol></p></quote> <section title="Lotus Notes Breakage and Fix" subject="Wine CVS as of 9/25/2005 Kills Notes" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/.html" posts="11" > <topic></topic> @@ -400,7 +400,7 @@ will need to fill out the ScriptFreeCach <section title="Finding Stack Corruption" subject="Help debugging a problem!" - archive="http://www.winehq.com/hypermail/wine-devel/2005-September/040426.html" + archive="http://www.winehq.com/pipermail/wine-devel/2005-September/040426.html" posts="8" > <topic>Debugging</topic>

1 0

lostwages/ news/2004033101.xml news/2005021701 ...
by Jeremy Newman 02 Nov '05

02 Nov '05

ChangeSet ID: 21063 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/11/02 16:15:16 Modified files: news : 2004033101.xml 2005021701.xml 2005051101.xml wwn : wn20040402_217.xml wn20041001_242.xml wn20050218_262.xml wn20050513_274.xml wn20050923_291.xml wn20051007_293.xml Log message: Jonathan Ernst <Jonathan(a)ErnstFamily.ch> - Some more deadlinks Patch: http://cvs.winehq.org/patch.py?id=21063 Old revision New revision Changes Path 1.1 1.2 +2 -3 lostwages/news/2004033101.xml 1.1 1.2 +2 -3 lostwages/news/2005021701.xml 1.2 1.3 +1 -1 lostwages/news/2005051101.xml 1.5 1.6 +4 -8 lostwages/wwn/wn20040402_217.xml 1.3 1.4 +4 -9 lostwages/wwn/wn20041001_242.xml 1.2 1.3 +1 -4 lostwages/wwn/wn20050218_262.xml 1.2 1.3 +1 -1 lostwages/wwn/wn20050513_274.xml 1.3 1.4 +2 -10 lostwages/wwn/wn20050923_291.xml 1.3 1.4 +2 -4 lostwages/wwn/wn20051007_293.xml Index: lostwages/news/2004033101.xml diff -u -p lostwages/news/2004033101.xml:1.1 lostwages/news/2004033101.xml:1.2 --- lostwages/news/2004033101.xml:1.1 2 Nov 2005 22:15:16 -0000 +++ lostwages/news/2004033101.xml 2 Nov 2005 22:15:16 -0000 @@ -3,10 +3,9 @@ <title>Onebase Linux Supports Wine</title> <body> Onebase Linux - <a href="http://www.ibiblio.org/onebase/onebase-linux.org/Community/phpBB2/viewtopic…">announced support</a> + <a href="http://www.ibiblio.org/onebase/onebaselinux.com/Community/phpBB2/viewtopic.…">announced support</a> for Wine using a custom configuration system. Their - <a href="http://www.ibiblio.org/onebase/onebase-linux.org/wineapps/">Wine - Gallery</a> lists applications you can run and includes MS Word View, + Wine Gallery lists applications you can run and includes MS Word View, Sim City 3000, and Dreamweaver MX. For more information about this Linux distro, check out <a href="http://www.ibiblio.org/onebase/">their website</a>. Thanks to Index: lostwages/news/2005021701.xml diff -u -p lostwages/news/2005021701.xml:1.1 lostwages/news/2005021701.xml:1.2 --- lostwages/news/2005021701.xml:1.1 2 Nov 2005 22:15:16 -0000 +++ lostwages/news/2005021701.xml 2 Nov 2005 22:15:16 -0000 @@ -11,9 +11,8 @@ piracy by allowing downloads only to lic systems. To do this, an executable named <a href="http://download.microsoft.com/download/1/1/a/11a73739-0b11-4bf2-950f-cbd995…">GenuineCheck.exe</a> (MD5 hash = 05499eaa4d4f55af32f5b14561ee7e55) gets downloaded if you go to -their website with Firefox. If you happen to look at -<a href="http://spazioinwind.libero.it/nonsolomicrosoft/GenuinceCheck.html">the -strings in that file</a>, you'll notice a reference to a registry key that +their website with Firefox. If you happen to look at the +strings in that file, you'll notice a reference to a registry key that looks curiously familiar: SOFTWARE\Wine\Wine\Config. That little string, albeit subtle, happens to be the first Wine-specific test Microsoft has made in a program. Index: lostwages/news/2005051101.xml diff -u -p lostwages/news/2005051101.xml:1.2 lostwages/news/2005051101.xml:1.3 --- lostwages/news/2005051101.xml:1.2 2 Nov 2005 22:15:16 -0000 +++ lostwages/news/2005051101.xml 2 Nov 2005 22:15:16 -0000 @@ -10,7 +10,7 @@ will be providing legal counsel to the W at the forefront of legal representation for free and open source software. Its distinguished board includes Eben Moglen, Lawrence Lessig, Diane M. Peters, and Daniel J. Weitzner. From the -<a href="http://biz.yahoo.com/prnews/050511/sfw055.html?.v=9">press +<a href="http://lwn.net/Articles/135413/">press release</a>: <ul> "As open source projects are increasingly threatened by excessive litigation, Index: lostwages/wwn/wn20040402_217.xml diff -u -p lostwages/wwn/wn20040402_217.xml:1.5 lostwages/wwn/wn20040402_217.xml:1.6 --- lostwages/wwn/wn20040402_217.xml:1.5 2 Nov 2005 22:15:16 -0000 +++ lostwages/wwn/wn20040402_217.xml 2 Nov 2005 22:15:16 -0000 @@ -76,7 +76,7 @@ Its main goal is to take apart electroni <section title="News: Onebase Linux & Wine, WineTools Update" subject="News" - archive="http://www.onebase-linux.org" + archive="http://www.ibiblio.org/onebase/" posts="1" startdate="03/27/2004" enddate="04/02/2004" @@ -84,23 +84,19 @@ Its main goal is to take apart electroni <topic>News</topic> <p>Earlier this week we posted a news item about -<a href="http://www.onebase-linux.org">Onebase Linux</a> and +<a href="http://www.ibiblio.org/onebase/">Onebase Linux</a> and its new support for Wine. Onebase is a new community-driven distribution. It features an entirely new package management system, part of which includes the ability to interact with Wine and Win32 programs. They've put together -<a href="http://www.ibiblio.org/onebase/onebase-linux.org/wineapps/">a -gallery</a> of applications that can be downloaded and installed +a gallery of applications that can be downloaded and installed using custom ".owm" installation scripts. These scripts vary in complexity and at the most basic level just download and run an application installer. At the other end of the spectrum it's possible to tell the script to manually extract cab files and use native DLLs (using Wine AppDefaults in the config -file.) From their -<a href="http://www.ibiblio.org/onebase/onebase-linux.org/About/aboutol.html">about</a> -page:</p> +file.) From their about page:</p> <quote who="Onebase"><p> - Onebase provides fine integration of WINE software for easier and trouble-free installation and execution of Win32 applications through the "Onebase WINe support". Index: lostwages/wwn/wn20041001_242.xml diff -u -p lostwages/wwn/wn20041001_242.xml:1.3 lostwages/wwn/wn20041001_242.xml:1.4 --- lostwages/wwn/wn20041001_242.xml:1.3 2 Nov 2005 22:15:16 -0000 +++ lostwages/wwn/wn20041001_242.xml 2 Nov 2005 22:15:16 -0000 @@ -258,15 +258,10 @@ config file and discuss Winecfg instead. use Winecfg these changes are useless, but it's probably worth looking this over to see whether these docs are headed in the right direction. For now, the biggest changes can be found in configuring.sgml (which -translates into the "Configuring Wine" part of the guide.) A diff is -available here: -<ul><a href="http://www.theshell.com/~vinn/wine-user-guide.diff"> - http://www.theshell.com/~vinn/wine-user-guide.diff</a></ul></p><p> - -However, this stuff is best looked at as a side-by-side comparison with -the existing docs. You can find that here: -<ul><a href="http://www.theshell.com/~vinn/wine-user-guide.html"> - http://www.theshell.com/~vinn/wine-user-guide.html</a></ul></p><p> +translates into the "Configuring Wine" part of the guide.) + +</p><p> + (Not having looked at Mike's recent patches, I'm sure this will soon be out of date. Things like drive detection are missing. There's also parts that I left undone: such as the printing config, an appendix listing reg keys would Index: lostwages/wwn/wn20050218_262.xml diff -u -p lostwages/wwn/wn20050218_262.xml:1.2 lostwages/wwn/wn20050218_262.xml:1.3 --- lostwages/wwn/wn20050218_262.xml:1.2 2 Nov 2005 22:15:16 -0000 +++ lostwages/wwn/wn20050218_262.xml 2 Nov 2005 22:15:16 -0000 @@ -188,10 +188,7 @@ It's also the first time Microsoft ackno </p></quote> <p>Ivan provided a link showing the Wine registry key in the -executable, -<a href="http://spazioinwind.libero.it/nonsolomicrosoft/GenuinceCheck.html"> -http://spazioinwind.libero.it/nonsolomicrosoft/GenuinceCheck.html</a> -and provided an MD5 hash of the program: +executable and provided an MD5 hash of the program: 05499eaa4d4f55af32f5b14561ee7e55. Other developers verified they found the same thing. You should try it too; it's fun for the whole family.</p> Index: lostwages/wwn/wn20050513_274.xml diff -u -p lostwages/wwn/wn20050513_274.xml:1.2 lostwages/wwn/wn20050513_274.xml:1.3 --- lostwages/wwn/wn20050513_274.xml:1.2 2 Nov 2005 22:15:16 -0000 +++ lostwages/wwn/wn20050513_274.xml 2 Nov 2005 22:15:16 -0000 @@ -111,7 +111,7 @@ Its main goal is to fly to LA. It also s <p>We had some pretty big news this week. The <a href="http://www.softwarefreedom.org">Software Freedom Law Center</a> will be providing legal counsel to Wine. The -<a href="http://biz.yahoo.com/prnews/050511/sfw055.html?.v=9">press +<a href="http://lwn.net/Articles/135413/">press release</a> came out on Wednesday and was quickly picked up in the news media. Slashdot's headline put it well, Index: lostwages/wwn/wn20050923_291.xml diff -u -p lostwages/wwn/wn20050923_291.xml:1.3 lostwages/wwn/wn20050923_291.xml:1.4 --- lostwages/wwn/wn20050923_291.xml:1.3 2 Nov 2005 22:15:16 -0000 +++ lostwages/wwn/wn20050923_291.xml 2 Nov 2005 22:15:16 -0000 @@ -151,17 +151,9 @@ Last year I sent this to wine-devel talk </p><p> For now, the biggest changes can be found in configuring.sgml (which -translates into the "Configuring Wine" part of the guide.) A diff is -available here: +translates into the "Configuring Wine" part of the guide.) - <ul><a href="http://www.theshell.com/~vinn/wine-user-guide.diff"> - http://www.theshell.com/~vinn/wine-user-guide.diff</a></ul></p><p> - -However, this stuff is best looked at as a side-by-side comparison with -the existing docs. You can find that here: - - <ul><a href="http://www.theshell.com/~vinn/wine-user-guide.html"> - http://www.theshell.com/~vinn/wine-user-guide.html</a></ul></p><p> +</p><p> (Not having looked at Mike's recent patches, I'm sure this will soon be out of date. Things like drive detection are missing. There's also parts that Index: lostwages/wwn/wn20051007_293.xml diff -u -p lostwages/wwn/wn20051007_293.xml:1.3 lostwages/wwn/wn20051007_293.xml:1.4 --- lostwages/wwn/wn20051007_293.xml:1.3 2 Nov 2005 22:15:16 -0000 +++ lostwages/wwn/wn20051007_293.xml 2 Nov 2005 22:15:16 -0000 @@ -452,10 +452,8 @@ If you have a patented bytecode hinter e <ul><a href="http://plan99.net/~mike/files/hinted-fonts.jpg"> http://plan99.net/~mike/files/hinted-fonts.jpg</a></ul></p><p> -but if you don't (like 99% of Linux users): - - <ul><a href="http://www.republika.pl/belegdol/temp/wine.png"> - http://www.republika.pl/belegdol/temp/wine.png</a></ul></p><p> +but if you don't (like 99% of Linux users), fonts look ugly. +</p><p> Needless to say we can't ship 0.9 when it'll look like that for most users. </p><p>

1 0

lostwages/include html.php
by Jeremy Newman 02 Nov '05

02 Nov '05

ChangeSet ID: 21062 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/11/02 15:39:00 Modified files: include : html.php Log message: send a 404 header for 404 not found pages Patch: http://cvs.winehq.org/patch.py?id=21062 Old revision New revision Changes Path 1.14 1.15 +12 -1 lostwages/include/html.php Index: lostwages/include/html.php diff -u -p lostwages/include/html.php:1.14 lostwages/include/html.php:1.15 --- lostwages/include/html.php:1.14 2 Nov 2005 21:39: 0 -0000 +++ lostwages/include/html.php 2 Nov 2005 21:39: 0 -0000 @@ -15,6 +15,7 @@ class html var $_file_root; var $page; var $template_title; + var $in404; // HTML init object function html ($root) @@ -66,7 +67,16 @@ class html } $search = $this->template("base", "search"); // display the html - $this->http_header(); + if ($this->in404) + { + // 404 not found + header("HTTP/1.1 404 Not Found"); + } + else + { + // normal HTTP Headers + $this->http_header(); + } echo $this->template( $theme, @@ -749,6 +759,7 @@ class html // oops not found, load 404 template if (!$in) { + $this->in404 = 1; $in = ''; if ($config->web_debug) $in = $this->p($theme."|".$template);

1 0