January 2009 - Wine-Commits

Francois Gouget : winedos: Remove unused functions from devices.c.
by Alexandre Julliard Jan. 7, 2009

Jan. 7, 2009

Module: wine Branch: master Commit: 7bf39d4b1433115c4834fda281cd639ea66efe88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf39d4b1433115c4834fda28… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 7 12:29:47 2009 +0100 winedos: Remove unused functions from devices.c. --- dlls/winedos/devices.c | 134 ------------------------------------------------ dlls/winedos/dosexe.h | 7 --- 2 files changed, 0 insertions(+), 141 deletions(-) diff --git a/dlls/winedos/devices.c b/dlls/winedos/devices.c index 0ee6f6c..44bafbe 100644 --- a/dlls/winedos/devices.c +++ b/dlls/winedos/devices.c @@ -476,140 +476,6 @@ void DOSDEV_InstallDOSDevices(void) dataseg->lol.ptr_CON_dev_hdr = MAKESEGPTR(seg, DOS_DATASEG_OFF(dev[0])); } -DWORD DOSDEV_Console(void) -{ - return DOSMEM_LOL()->ptr_CON_dev_hdr; -} - -DWORD DOSDEV_FindCharDevice(char*name) -{ - SEGPTR cur_ptr = MAKESEGPTR(HIWORD(DOS_LOLSeg), FIELD_OFFSET(DOS_LISTOFLISTS,NUL_dev)); - DOS_DEVICE_HEADER *cur = PTR_REAL_TO_LIN(SELECTOROF(cur_ptr),OFFSETOF(cur_ptr)); - char dname[8]; - int cnt; - - /* get first 8 characters */ - /* if less than 8 characters, pad with spaces */ - for (cnt=0; name[cnt] && cnt<8; cnt++) - dname[cnt]=name[cnt]; - - while(cnt<8) dname[cnt++] = ' '; - - /* search for char devices with the right name */ - while (cur && - ((!(cur->attr & ATTR_CHAR)) || - memcmp(cur->name,dname,8))) { - cur_ptr = cur->next_dev; - if (cur_ptr == NONEXT) cur=NULL; - else cur = PTR_REAL_TO_LIN(SELECTOROF(cur_ptr),OFFSETOF(cur_ptr)); - } - return cur_ptr; -} - -static void DOSDEV_DoReq(void*req, DWORD dev) -{ - REQUEST_HEADER *hdr = (REQUEST_HEADER *)req; - DOS_DEVICE_HEADER *dhdr; - CONTEXT86 ctx; - char *phdr; - - dhdr = PTR_REAL_TO_LIN(SELECTOROF(dev),OFFSETOF(dev)); - phdr = ((char*)DOSMEM_LOL()) + DOS_DATASEG_OFF(req); - - /* copy request to request scratch area */ - memcpy(phdr, req, hdr->size); - - /* prepare to call device driver */ - memset(&ctx, 0, sizeof(ctx)); - ctx.EFlags |= V86_FLAG; - - /* ES:BX points to request for strategy routine */ - ctx.SegEs = HIWORD(DOS_LOLSeg); - ctx.Ebx = DOS_DATASEG_OFF(req); - - /* call strategy routine */ - ctx.SegCs = SELECTOROF(dev); - ctx.Eip = dhdr->strategy; - DPMI_CallRMProc(&ctx, 0, 0, 0); - - /* call interrupt routine */ - ctx.SegCs = SELECTOROF(dev); - ctx.Eip = dhdr->interrupt; - DPMI_CallRMProc(&ctx, 0, 0, 0); - - /* completed, copy request back */ - memcpy(req, phdr, hdr->size); - - if (hdr->status & STAT_ERROR) { - switch (hdr->status & STAT_MASK) { - case 0x0F: /* invalid disk change */ - /* this error seems to fit the bill */ - SetLastError(ERROR_NOT_SAME_DEVICE); - break; - default: - SetLastError((hdr->status & STAT_MASK) + 0x13); - break; - } - } -} - -static int DOSDEV_IO(unsigned cmd, DWORD dev, DWORD buf, int buflen) -{ - REQ_IO req; - - req.hdr.size=sizeof(req); - req.hdr.unit=0; /* not dealing with block devices yet */ - req.hdr.command=cmd; - req.hdr.status=STAT_BUSY; - req.media=0; /* not dealing with block devices yet */ - req.buffer=buf; - req.count=buflen; - req.sector=0; /* block devices */ - req.volume=0; /* block devices */ - - DOSDEV_DoReq(&req, dev); - - return req.count; -} - -int DOSDEV_Peek(DWORD dev, BYTE*data) -{ - REQ_SAFEINPUT req; - - req.hdr.size=sizeof(req); - req.hdr.unit=0; /* not dealing with block devices yet */ - req.hdr.command=CMD_SAFEINPUT; - req.hdr.status=STAT_BUSY; - req.data=0; - - DOSDEV_DoReq(&req, dev); - - if (req.hdr.status & STAT_BUSY) return 0; - - *data = req.data; - return 1; -} - -int DOSDEV_Read(DWORD dev, DWORD buf, int buflen) -{ - return DOSDEV_IO(CMD_INPUT, dev, buf, buflen); -} - -int DOSDEV_Write(DWORD dev, DWORD buf, int buflen, int verify) -{ - return DOSDEV_IO(verify?CMD_SAFEOUTPUT:CMD_OUTPUT, dev, buf, buflen); -} - -int DOSDEV_IoctlRead(DWORD dev, DWORD buf, int buflen) -{ - return DOSDEV_IO(CMD_INIOCTL, dev, buf, buflen); -} - -int DOSDEV_IoctlWrite(DWORD dev, DWORD buf, int buflen) -{ - return DOSDEV_IO(CMD_OUTIOCTL, dev, buf, buflen); -} - void DOSDEV_SetSharingRetry(WORD delay, WORD count) { DOSMEM_LOL()->sharing_retry_delay = delay; diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index 2a20de7..2ba0735 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -368,13 +368,6 @@ extern UINT WINAPI DOSVM_GetTimer( void ); extern void DOSDEV_InstallDOSDevices(void); extern void DOSDEV_SetupDevice(const WINEDEV * devinfo, WORD seg, WORD off_dev, WORD off_thunk); -extern DWORD DOSDEV_Console(void); -extern DWORD DOSDEV_FindCharDevice(char*name); -extern int DOSDEV_Peek(DWORD dev, BYTE*data); -extern int DOSDEV_Read(DWORD dev, DWORD buf, int buflen); -extern int DOSDEV_Write(DWORD dev, DWORD buf, int buflen, int verify); -extern int DOSDEV_IoctlRead(DWORD dev, DWORD buf, int buflen); -extern int DOSDEV_IoctlWrite(DWORD dev, DWORD buf, int buflen); extern void DOSDEV_SetSharingRetry(WORD delay, WORD count); extern SEGPTR DOSDEV_GetLOL(BOOL v86);

1 0

Francois Gouget : gdi32: Remove some dead code.
by Alexandre Julliard Jan. 7, 2009

Jan. 7, 2009

Module: wine Branch: master Commit: ca82e0f5b34b861e20b87316b8af8dc4663a2ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca82e0f5b34b861e20b87316b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 7 12:25:40 2009 +0100 gdi32: Remove some dead code. --- dlls/gdi32/dispdib.c | 93 -------------------------------------------------- 1 files changed, 0 insertions(+), 93 deletions(-) diff --git a/dlls/gdi32/dispdib.c b/dlls/gdi32/dispdib.c index 0d46f65..cc28547 100644 --- a/dlls/gdi32/dispdib.c +++ b/dlls/gdi32/dispdib.c @@ -29,74 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -#if 0 - -static int dispdib_multi = 0; - -static WORD DISPDIB_Begin(WORD wFlags) -{ - unsigned Xres,Yres,Depth; - - switch(wFlags&DISPLAYDIB_MODE) { - case DISPLAYDIB_MODE_DEFAULT: - /* FIXME: is this supposed to autodetect? */ - case DISPLAYDIB_MODE_320x200x8: - Xres=320; Yres=200; Depth=8; break; - case DISPLAYDIB_MODE_320x240x8: - Xres=320; Yres=240; Depth=8; break; - default: - return DISPLAYDIB_NOTSUPPORTED; - } - /* more or less dummy calls to Death/Resurrection, for completeness */ - /* FIXME: what arguments should they get? */ - Death16(0); - if (VGA_SetMode(Xres,Yres,Depth)) { - Resurrection16(0,0,0,0,0,0,0); - return DISPLAYDIB_NOTSUPPORTED; - } - return DISPLAYDIB_NOERROR; -} - -static void DISPDIB_End(void) -{ - Resurrection16(0,0,0,0,0,0,0); /* FIXME: arguments */ - VGA_Exit(); -} - -static void DISPDIB_Palette(LPBITMAPINFO lpbi) -{ - VGA_SetQuadPalette(lpbi->bmiColors,0,256); -} - -static void DISPDIB_Show(LPBITMAPINFOHEADER lpbi,LPSTR lpBits,WORD uFlags) -{ - int Xofs,Yofs,Width=lpbi->biWidth,Height=lpbi->biHeight,Delta; - int Pitch = (Width + 3) & ~3; - unsigned int sPitch,sWidth,sHeight; - LPSTR surf = DOSMEM_MapDosToLinear(0xa0000); - - if (VGA_GetMode(&sHeight,&sWidth,NULL)) return; - sPitch=320; - - Delta=(Height<0)*2-1; - Height*=-Delta; Pitch*=Delta; - - if (uFlags&DISPLAYDIB_NOCENTER) { - Xofs=0; Yofs=0; - } else { - Xofs=(sWidth-Width)/2; - Yofs=(sHeight-Height)/2; - } - surf += (Yofs*sPitch)+Xofs; - if (Pitch<0) lpBits-=Pitch*(Height-1); - for (; Height; Height--,lpBits+=Pitch,surf+=sPitch) { - memcpy(surf,lpBits,Width); - } - - VGA_Poll(0); -} -#endif - /********************************************************************* * DisplayDib (DISPDIB.1) @@ -132,31 +64,6 @@ WORD WINAPI DisplayDib( WORD wFlags /* [in] */ ) { -#if 0 - WORD ret; - - if (wFlags&DISPLAYDIB_END) { - if (dispdib_multi) DISPDIB_End(); - dispdib_multi = 0; - return DISPLAYDIB_NOERROR; - } - if (!dispdib_multi) { - ret=DISPDIB_Begin(wFlags); - if (ret) return ret; - } - if (wFlags&DISPLAYDIB_BEGIN) dispdib_multi = 1; - if (!(wFlags&DISPLAYDIB_NOPALETTE)) { - DISPDIB_Palette(lpbi); - } - /* FIXME: not sure if it's valid to draw images in DISPLAYDIB_BEGIN, so... */ - if (lpBits) { - DISPDIB_Show(&(lpbi->bmiHeader),lpBits,wFlags); - } - if (!(wFlags&DISPLAYDIB_NOWAIT)) { - FIXME("wait not implemented\n"); - } - if (!dispdib_multi) DISPDIB_End(); -#endif FIXME( "broken, should be rewritten using ddraw\n" ); return DISPLAYDIB_NOERROR; }

1 0

Francois Gouget : oleview: Make some functions static.
by Alexandre Julliard Jan. 7, 2009

Jan. 7, 2009

Module: wine Branch: master Commit: a9532c962ab2060be6a3a09ad79643bc52c923a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9532c962ab2060be6a3a09ad… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 7 12:23:42 2009 +0100 oleview: Make some functions static. --- programs/oleview/details.c | 2 +- programs/oleview/interface.c | 2 +- programs/oleview/oleview.c | 6 +++--- programs/oleview/pane.c | 2 +- programs/oleview/tree.c | 2 +- programs/oleview/typelib.c | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index 3e266cc..da43de9 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -350,7 +350,7 @@ static void CreateTabCtrl(HWND hWnd) 0, 0, 0, 0, details.hTab, NULL, globals.hMainInst, NULL); } -LRESULT CALLBACK DetailsProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK DetailsProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { int sel; diff --git a/programs/oleview/interface.c b/programs/oleview/interface.c index 2459b74..5262187 100644 --- a/programs/oleview/interface.c +++ b/programs/oleview/interface.c @@ -63,7 +63,7 @@ static IUnknown *GetInterface(void) return unk; } -INT_PTR CALLBACK InterfaceViewerProc(HWND hDlgWnd, UINT uMsg, +static INT_PTR CALLBACK InterfaceViewerProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { DIALOG_INFO *di; diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 153b768..592fa0b 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -26,7 +26,7 @@ static WCHAR wszFormat[] = { '<','o','b','j','e','c','t','\n',' ',' ',' ', 'c','l','a','s','s','i','d','=','\"','c','l','s','i','d',':','%','s','\"','\n', '>','\n','<','/','o','b','j','e','c','t','>','\0' }; -INT_PTR CALLBACK SysConfProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK SysConfProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { HKEY hKey; WCHAR buffer[MAX_LOAD_STRING]; @@ -98,7 +98,7 @@ INT_PTR CALLBACK SysConfProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM lPar return FALSE; } -INT_PTR CALLBACK CreateInstOnProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK CreateInstOnProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { HWND hEdit; @@ -431,7 +431,7 @@ static void UpdateStatusBar(int itemID) SendMessage(globals.hStatusBar, SB_SETTEXT, 0, (LPARAM)info); } -LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, +static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) diff --git a/programs/oleview/pane.c b/programs/oleview/pane.c index f274be8..20c2fd6 100644 --- a/programs/oleview/pane.c +++ b/programs/oleview/pane.c @@ -57,7 +57,7 @@ static void DrawSplitMoving(HWND hWnd, int x) ReleaseDC(hWnd, hdc); } -LRESULT CALLBACK PaneProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK PaneProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { POINT pt; PANE *pane = (PANE*)GetMenu(hWnd); diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index a6a992a..3c9ee5a 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -646,7 +646,7 @@ void AddTree(void) AddCOMandAll(); } -LRESULT CALLBACK TreeProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK TreeProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) { diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index c794868..4861c50 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -189,12 +189,12 @@ static void GetSaveIdlAsPath(void) SaveIdl(wszPath); } -void AddToStrW(WCHAR *wszDest, const WCHAR *wszSource) +static void AddToStrW(WCHAR *wszDest, const WCHAR *wszSource) { lstrcpyW(&wszDest[lstrlenW(wszDest)], wszSource); } -void AddToTLDataStrW(TYPELIB_DATA *pTLData, const WCHAR *wszSource) +static void AddToTLDataStrW(TYPELIB_DATA *pTLData, const WCHAR *wszSource) { int SourceLen = lstrlenW(wszSource); @@ -205,7 +205,7 @@ void AddToTLDataStrW(TYPELIB_DATA *pTLData, const WCHAR *wszSource) pTLData->idlLen += SourceLen; } -void AddToTLDataStrWithTabsW(TYPELIB_DATA *pTLData, WCHAR *wszSource) +static void AddToTLDataStrWithTabsW(TYPELIB_DATA *pTLData, WCHAR *wszSource) { int lineLen = lstrlenW(wszSource); int newLinesNo = 0; @@ -1552,7 +1552,7 @@ static void EmptyTLTree(void) } } -LRESULT CALLBACK TypeLibProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK TypeLibProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) {

1 0

G. Paul Ziemba : ntdll: Clear IEXTEN when clearing ICANON.
by Alexandre Julliard Jan. 7, 2009

Jan. 7, 2009

Module: wine Branch: master Commit: df05a90a3fd617205696078c6c0e77c50d7a8d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=df05a90a3fd617205696078c6… Author: G. Paul Ziemba <p-wine-bugs(a)ziemba.us> Date: Tue Jan 6 11:40:09 2009 -0800 ntdll: Clear IEXTEN when clearing ICANON. --- dlls/ntdll/serial.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 40262a4..c8d3b29 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -651,7 +651,11 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) port.c_cflag &= ~(HUPCL); port.c_cflag |= CLOCAL | CREAD; - port.c_lflag &= ~(ICANON|ECHO|ISIG); + /* + * on FreeBSD, turning off ICANON does not disable IEXTEN, + * so we must turn it off explicitly. No harm done on Linux. + */ + port.c_lflag &= ~(ICANON|ECHO|ISIG|IEXTEN); port.c_lflag |= NOFLSH; bytesize = slc->WordLength;

1 0

Damjan Jovanovic : winex11: Support the startup notification fd.o spec.
by Alexandre Julliard Jan. 7, 2009

Jan. 7, 2009

Module: wine Branch: master Commit: 3613b15785c5168cef52efe186f154d08f712ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3613b15785c5168cef52efe18… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jan 6 20:59:07 2009 +0200 winex11: Support the startup notification fd.o spec. --- dlls/winex11.drv/window.c | 62 ++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 2 + programs/winemenubuilder/winemenubuilder.c | 2 +- tools/wine.desktop | 1 + 5 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 3725352..db34f20 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -82,6 +82,66 @@ static const char gl_drawable_prop[] = "__wine_x11_gl_drawable"; static const char pixmap_prop[] = "__wine_x11_pixmap"; static const char managed_prop[] = "__wine_x11_managed"; + +/*********************************************************************** + * http://standards.freedesktop.org/startup-notification-spec + */ +static void remove_startup_notification(Display *display, Window window) +{ + static LONG startup_notification_removed = 0; + char id[1024]; + char message[1024]; + int i; + int pos; + XEvent xevent; + const char *src; + int srclen; + + if (InterlockedCompareExchange(&startup_notification_removed, 1, 0) != 0) + return; + + if (GetEnvironmentVariableA("DESKTOP_STARTUP_ID", id, sizeof(id)) == 0) + return; + SetEnvironmentVariableA("DESKTOP_STARTUP_ID", NULL); + + pos = snprintf(message, sizeof(message), "remove: ID="); + message[pos++] = '"'; + for (i = 0; id[i] && pos < sizeof(message) - 2; i++) + { + if (id[i] == '"' || id[i] == '\\') + message[pos++] = '\\'; + message[pos++] = id[i]; + } + message[pos++] = '"'; + message[pos++] = '\0'; + + xevent.xclient.type = ClientMessage; + xevent.xclient.message_type = x11drv_atom(_NET_STARTUP_INFO_BEGIN); + xevent.xclient.display = display; + xevent.xclient.window = window; + xevent.xclient.format = 8; + + src = message; + srclen = strlen(src) + 1; + + wine_tsx11_lock(); + while (srclen > 0) + { + int msglen = srclen; + if (msglen > 20) + msglen = 20; + memset(&xevent.xclient.data.b[0], 0, 20); + memcpy(&xevent.xclient.data.b[0], src, msglen); + src += msglen; + srclen -= msglen; + + XSendEvent( display, DefaultRootWindow( display ), False, PropertyChangeMask, &xevent ); + xevent.xclient.message_type = x11drv_atom(_NET_STARTUP_INFO); + } + wine_tsx11_unlock(); +} + + /*********************************************************************** * is_window_managed * @@ -1099,6 +1159,8 @@ static void map_window( Display *display, struct x11drv_win_data *data, DWORD ne { TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); + remove_startup_notification( display, data->whole_window ); + wait_for_withdrawn_state( display, data, TRUE ); if (!data->embedded) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6b29f2a..955a08c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -595,6 +595,8 @@ enum x11drv_atoms XATOM_DndSelection, XATOM__ICC_PROFILE, XATOM__MOTIF_WM_HINTS, + XATOM__NET_STARTUP_INFO_BEGIN, + XATOM__NET_STARTUP_INFO, XATOM__NET_SUPPORTED, XATOM__NET_SYSTEM_TRAY_OPCODE, XATOM__NET_SYSTEM_TRAY_S0, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index fd8a415..020d6b5 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -132,6 +132,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "DndSelection", "_ICC_PROFILE", "_MOTIF_WM_HINTS", + "_NET_STARTUP_INFO_BEGIN", + "_NET_STARTUP_INFO", "_NET_SUPPORTED", "_NET_SYSTEM_TRAY_OPCODE", "_NET_SYSTEM_TRAY_S0", diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 56eac5a..f5f7ec0 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -804,7 +804,7 @@ static BOOL write_desktop_entry(const char *location, const char *linkname, cons fprintf(file, "Exec=env WINEPREFIX=\"%s\" wine \"%s\" %s\n", wine_get_config_dir(), path, args); fprintf(file, "Type=Application\n"); - fprintf(file, "StartupWMClass=Wine\n"); + fprintf(file, "StartupNotify=true\n"); if (descr && lstrlenA(descr)) fprintf(file, "Comment=%s\n", descr); if (workdir && lstrlenA(workdir)) diff --git a/tools/wine.desktop b/tools/wine.desktop index fe8f1e3..0d69cc8 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -18,3 +18,4 @@ Name[nn]=Wine Programlaster for Windowsapplikasjoner Exec=wine start /unix %f MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable;application/x-msi; NoDisplay=true +StartupNotify=true

1 0

Nikolay Sivov : oleaut32: Check pointer in IPicture::get_Type.
by Alexandre Julliard Jan. 7, 2009

Jan. 7, 2009

Module: wine Branch: master Commit: b91f4a3dae3bfac2f23a345a251bd5a7381add81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91f4a3dae3bfac2f23a345a2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 7 09:31:00 2009 +0300 oleaut32: Check pointer in IPicture::get_Type. --- dlls/oleaut32/olepicture.c | 4 ++++ dlls/oleaut32/tests/olepicture.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 51423a2..a0f1855 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -595,6 +595,10 @@ static HRESULT WINAPI OLEPictureImpl_get_Type(IPicture *iface, { OLEPictureImpl *This = (OLEPictureImpl *)iface; TRACE("(%p)->(%p): type is %d\n", This, ptype, This->desc.picType); + + if(!ptype) + return E_POINTER; + *ptype = This->desc.picType; return S_OK; } diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 6cf80b7..ee13227 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -687,6 +687,19 @@ static void test_get_Handle(void) IPicture_Release(pic); } +static void test_get_Type(void) +{ + IPicture *pic; + HRESULT hres; + + OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + + hres = IPicture_get_Type(pic, NULL); + ole_expect(hres, E_POINTER); + + IPicture_Release(pic); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -716,6 +729,7 @@ START_TEST(olepicture) test_Render(); test_get_Attributes(); test_get_Handle(); + test_get_Type(); }

1 0

Alexandre Julliard : msvcrt: Correctly walk up the list of trylevels in except_handler3.
by Alexandre Julliard Jan. 7, 2009

Jan. 7, 2009

Module: wine Branch: master Commit: d751c2e5c15b97b30a945841040c34f451983317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d751c2e5c15b97b30a9458410… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 7 14:17:26 2009 +0100 msvcrt: Correctly walk up the list of trylevels in except_handler3. --- dlls/msvcrt/except.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 6a6fed3..7c4ee47 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -219,10 +219,10 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec, while (trylevel != TRYLEVEL_END) { + TRACE( "level %d prev %d filter %p\n", trylevel, pScopeTable[trylevel].previousTryLevel, + pScopeTable[trylevel].lpfnFilter ); if (pScopeTable[trylevel].lpfnFilter) { - TRACE("filter = %p\n", pScopeTable[trylevel].lpfnFilter); - retval = call_filter( pScopeTable[trylevel].lpfnFilter, &exceptPtrs, &frame->_ebp ); TRACE("filter returned %s\n", retval == EXCEPTION_CONTINUE_EXECUTION ? @@ -241,13 +241,13 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec, /* Set our trylevel to the enclosing block, and call the __finally * code, which won't return */ - frame->trylevel = pScopeTable->previousTryLevel; + frame->trylevel = pScopeTable[trylevel].previousTryLevel; TRACE("__finally block %p\n",pScopeTable[trylevel].lpfnHandler); call_finally_block(pScopeTable[trylevel].lpfnHandler, &frame->_ebp); ERR("Returned from __finally block - expect crash!\n"); } } - trylevel = pScopeTable->previousTryLevel; + trylevel = pScopeTable[trylevel].previousTryLevel; } } #else

1 0

Paul Vriens : setupapi/tests: Skip some tests if we don' t have enough rights.
by Alexandre Julliard Jan. 7, 2009

Jan. 7, 2009

Module: wine Branch: master Commit: c89617e06700108c4f807c98055d5d5e2e938486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89617e06700108c4f807c980… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 7 11:05:24 2009 +0100 setupapi/tests: Skip some tests if we don't have enough rights. --- dlls/setupapi/tests/install.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 981dce3..4936923 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -288,6 +288,13 @@ static void test_install_svc_from(void) infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); SetLastError(0xdeadbeef); ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to install the service\n"); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); + return; + } ok(ret, "Expected success\n"); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); @@ -344,6 +351,11 @@ static void test_driver_install(void) skip("OpenSCManagerA is not implemented, we are most likely on win9x\n"); return; } + else if (!scm_handle && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights to install the service\n"); + return; + } CloseServiceHandle(scm_handle); /* Place where we expect the driver to be installed */

1 0

Nikolay Sivov : oleaut32: Check pointer in IPicture::get_Handle.
by Alexandre Julliard Jan. 7, 2009

Jan. 7, 2009

Module: wine Branch: master Commit: a22ca1c2d9b0b5be570bae18f56d933d10624b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22ca1c2d9b0b5be570bae18f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 7 09:07:06 2009 +0300 oleaut32: Check pointer in IPicture::get_Handle. --- dlls/oleaut32/olepicture.c | 4 ++++ dlls/oleaut32/tests/olepicture.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 3d0af78..51423a2 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -519,6 +519,10 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface, { OLEPictureImpl *This = (OLEPictureImpl *)iface; TRACE("(%p)->(%p)\n", This, phandle); + + if(!phandle) + return E_POINTER; + switch(This->desc.picType) { case PICTYPE_NONE: case PICTYPE_UNINITIALIZED: diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 7bff9b0..6cf80b7 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -674,6 +674,19 @@ static void test_get_Attributes(void) IPicture_Release(pic); } +static void test_get_Handle(void) +{ + IPicture *pic; + HRESULT hres; + + OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + + hres = IPicture_get_Handle(pic, NULL); + ole_expect(hres, E_POINTER); + + IPicture_Release(pic); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -702,6 +715,7 @@ START_TEST(olepicture) test_OleCreatePictureIndirect(); test_Render(); test_get_Attributes(); + test_get_Handle(); }

1 0

Peter Urbanec : wintab32: Check for NULL before using context.
by Alexandre Julliard Jan. 7, 2009

Jan. 7, 2009

Module: wine Branch: master Commit: 65b3393dce9fb5ea6192c787809f543a84b49f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b3393dce9fb5ea6192c7878… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Wed Jan 7 10:46:04 2009 +1100 wintab32: Check for NULL before using context. --- dlls/wintab32/context.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index f52d8d2..6b52c08 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -685,6 +685,12 @@ BOOL WINAPI WTOverlap(HCTX hCtx, BOOL fToTop) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (!context) + { + LeaveCriticalSection(&csTablet); + return FALSE; + } + /* if we want to send to top and it's not already there */ if (fToTop && context->context.lcStatus != CXS_ONTOP) { @@ -777,6 +783,12 @@ BOOL WINAPI WTSetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (!context) + { + LeaveCriticalSection(&csTablet); + return FALSE; + } + LOGCONTEXTAtoW(lpLogCtx, &context->context); LeaveCriticalSection(&csTablet); @@ -799,6 +811,12 @@ BOOL WINAPI WTSetW(HCTX hCtx, LPLOGCONTEXTW lpLogCtx) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (!context) + { + LeaveCriticalSection(&csTablet); + return FALSE; + } + memmove(&context->context, lpLogCtx, sizeof(LOGCONTEXTW)); LeaveCriticalSection(&csTablet);

1 0