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

Alexandre Julliard : wineconsole: Don' t use a Win32 wait on a Unix file descriptor.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 267d38e1bc78541221d20cc72a759acc78908e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=267d38e1bc78541221d20cc72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 7 17:30:00 2008 +0200 wineconsole: Don't use a Win32 wait on a Unix file descriptor. --- programs/wineconsole/curses.c | 96 ++++++++++++++++++++++------------------- 1 files changed, 51 insertions(+), 45 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 2210cd9..549efb4 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -35,6 +35,9 @@ #include <stdio.h> #include <stdarg.h> #include <stdlib.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #ifdef HAVE_NCURSES_H # include <ncurses.h> #elif defined(HAVE_CURSES_H) @@ -53,7 +56,6 @@ #include "winecon_private.h" #include "wine/library.h" -#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(curses); @@ -71,7 +73,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(curses); struct inner_data_curse { unsigned long initial_mouse_mask; - HANDLE hInput; + int sync_pipe[2]; + HANDLE input_thread; WINDOW* pad; chtype* line; int allow_scroll; @@ -846,31 +849,43 @@ static unsigned WCCURSES_FillCode(struct inner_data* data, INPUT_RECORD* ir, int } /****************************************************************** - * WCCURSES_GetEvents - * - * + * input_thread */ -static void WCCURSES_GetEvents(struct inner_data* data) +static DWORD CALLBACK input_thread( void *arg ) { + struct inner_data* data = arg; int inchar; INPUT_RECORD ir[8]; unsigned numEvent; DWORD n; - - if ((inchar = wgetch(stdscr)) == ERR) {WINE_FIXME("Ooch. somebody beat us\n");return;} - - WINE_TRACE("Got o%o (0x%x)\n", inchar,inchar); - - if (inchar >= KEY_MIN && inchar <= KEY_MAX) - { - numEvent = WCCURSES_FillCode(data, ir, inchar); - } - else + struct pollfd pfd[2]; + + pfd[0].fd = 0; + pfd[0].events = POLLIN; + pfd[1].fd = PRIVATE(data)->sync_pipe[0]; + pfd[1].events = POLLHUP; + + for (;;) { - numEvent = WCCURSES_FillSimpleChar(ir, inchar); + pfd[0].revents = pfd[1].revents = 0; + if (poll( pfd, 2, -1 ) == -1) break; + if (pfd[0].revents & (POLLHUP|POLLERR)) break; + if (pfd[1].revents & (POLLHUP|POLLERR)) break; + if (!(pfd[0].revents & POLLIN)) continue; + + if ((inchar = wgetch(stdscr)) == ERR) continue; + + WINE_TRACE("Got o%o (0x%x)\n", inchar,inchar); + + if (inchar >= KEY_MIN && inchar <= KEY_MAX) + numEvent = WCCURSES_FillCode(data, ir, inchar); + else + numEvent = WCCURSES_FillSimpleChar(ir, inchar); + + if (numEvent) WriteConsoleInput(data->hConIn, ir, numEvent, &n); } - if (numEvent) - WriteConsoleInput(data->hConIn, ir, numEvent, &n); + close( PRIVATE(data)->sync_pipe[0] ); + return 0; } /****************************************************************** @@ -882,7 +897,12 @@ static void WCCURSES_DeleteBackend(struct inner_data* data) { if (!PRIVATE(data)) return; - CloseHandle(PRIVATE(data)->hInput); + if (PRIVATE(data)->input_thread) + { + close( PRIVATE(data)->sync_pipe[1] ); + WaitForSingleObject( PRIVATE(data)->input_thread, INFINITE ); + CloseHandle( PRIVATE(data)->input_thread ); + } delwin(PRIVATE(data)->pad); #ifdef HAVE_MOUSEMASK @@ -905,28 +925,21 @@ static void WCCURSES_DeleteBackend(struct inner_data* data) */ static int WCCURSES_MainLoop(struct inner_data* data) { - HANDLE hin[2]; + DWORD id; - hin[0] = PRIVATE(data)->hInput; - hin[1] = data->hSynchro; + if (pipe( PRIVATE(data)->sync_pipe ) == -1) return 0; + PRIVATE(data)->input_thread = CreateThread( NULL, 0, input_thread, data, 0, &id ); - for (;;) + while (WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0) { - unsigned ret = WaitForMultipleObjects(2, hin, FALSE, INFINITE); - switch (ret) - { - case WAIT_OBJECT_0: - WCCURSES_GetEvents(data); - break; - case WAIT_OBJECT_0+1: - if (!WINECON_GrabChanges(data)) return 0; - break; - default: - WINE_ERR("got pb\n"); - /* err */ - break; - } + if (!WINECON_GrabChanges(data)) break; } + + close( PRIVATE(data)->sync_pipe[1] ); + WaitForSingleObject( PRIVATE(data)->input_thread, INFINITE ); + CloseHandle( PRIVATE(data)->input_thread ); + PRIVATE(data)->input_thread = 0; + return 0; } /****************************************************************** @@ -955,13 +968,6 @@ enum init_return WCCURSES_InitBackend(struct inner_data* data) data->fnDeleteBackend = WCCURSES_DeleteBackend; data->hWnd = NULL; - if (wine_server_fd_to_handle(0, GENERIC_READ|SYNCHRONIZE, 0, - (obj_handle_t*)&PRIVATE(data)->hInput)) - { - WINE_FIXME("Cannot open 0\n"); - return init_failed; - } - /* FIXME: should find a good way to enable buffer scrolling * For the time being, setting this to 1 will allow scrolling up/down * on buffer with F11/F12.

1 0

Alexandre Julliard : winedos: Only read input from the stdin handle if it is a console.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 279acf6a8aa16f84ab58dd15e9077cbc38de642c URL: http://source.winehq.org/git/wine.git/?a=commit;h=279acf6a8aa16f84ab58dd15e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 7 17:32:23 2008 +0200 winedos: Only read input from the stdin handle if it is a console. --- dlls/winedos/dosvm.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c index 27dc3b7..7defba1 100644 --- a/dlls/winedos/dosvm.c +++ b/dlls/winedos/dosvm.c @@ -464,19 +464,18 @@ void WINAPI DOSVM_Wait( CONTEXT86 *waitctx ) DWORD WINAPI DOSVM_Loop( HANDLE hThread ) { HANDLE objs[2]; + int count = 0; MSG msg; DWORD waitret; - objs[0] = GetStdHandle(STD_INPUT_HANDLE); - objs[1] = hThread; + objs[count++] = hThread; + if (GetConsoleMode( GetStdHandle(STD_INPUT_HANDLE), NULL )) + objs[count++] = GetStdHandle(STD_INPUT_HANDLE); for(;;) { TRACE_(int)("waiting for action\n"); - waitret = MsgWaitForMultipleObjects(2, objs, FALSE, INFINITE, QS_ALLINPUT); + waitret = MsgWaitForMultipleObjects(count, objs, FALSE, INFINITE, QS_ALLINPUT); if (waitret == WAIT_OBJECT_0) { - DOSVM_ProcessConsole(); - } - else if (waitret == WAIT_OBJECT_0 + 1) { DWORD rv; if(!GetExitCodeThread(hThread, &rv)) { ERR("Failed to get thread exit code!\n"); @@ -484,7 +483,7 @@ DWORD WINAPI DOSVM_Loop( HANDLE hThread ) } return rv; } - else if (waitret == WAIT_OBJECT_0 + 2) { + else if (waitret == WAIT_OBJECT_0 + count) { while (PeekMessageA(&msg,0,0,0,PM_REMOVE)) { if (msg.hwnd) { /* it's a window message */ @@ -513,6 +512,10 @@ DWORD WINAPI DOSVM_Loop( HANDLE hThread ) } } } + else if (waitret == WAIT_OBJECT_0 + 1) + { + DOSVM_ProcessConsole(); + } else { ERR_(int)("MsgWaitForMultipleObjects returned unexpected value.\n");

1 0

Alexandre Julliard : winedos: Make sure that the main message queue exists before the DOS thread starts.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: f334c0fbba0e55a098f3d8d21d741eee2bd3fbb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f334c0fbba0e55a098f3d8d21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 7 17:33:19 2008 +0200 winedos: Make sure that the main message queue exists before the DOS thread starts. --- dlls/winedos/module.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c index 1dfaabd..ade7732 100644 --- a/dlls/winedos/module.c +++ b/dlls/winedos/module.c @@ -655,6 +655,7 @@ static void MZ_Launch( LPCSTR cmdtail, int length ) BYTE *psp_start = PTR_REAL_TO_LIN( DOSVM_psp, 0 ); DWORD rv; SYSLEVEL *lock; + MSG msg; MZ_FillPSP(psp_start, cmdtail, length); pTask->flags |= TDBF_WINOLDAP; @@ -665,6 +666,9 @@ static void MZ_Launch( LPCSTR cmdtail, int length ) GetpWin16Lock( &lock ); _LeaveSysLevel( lock ); + /* force the message queue to be created */ + PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + ResumeThread(dosvm_thread); rv = DOSVM_Loop(dosvm_thread);

1 0

Andrew Talbot : ddraw: Indentation fix.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: a6746b9e7b3a5822d8110d8f9f72618c116815da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6746b9e7b3a5822d8110d8f9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed May 7 00:06:06 2008 +0100 ddraw: Indentation fix. --- dlls/ddraw/executebuffer.c | 63 ++++++++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 76f0e36..799390b 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -241,48 +241,49 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, } break; case D3DOP_STATELIGHT: { - int i; + int i; TRACE("STATELIGHT (%d)\n", count); - + for (i = 0; i < count; i++) { LPD3DSTATE ci = (LPD3DSTATE) instr; - TRACE("(%08x,%08x)\n",ci->u1.dlstLightStateType, ci->u2.dwArg[0]); + TRACE("(%08x,%08x)\n", ci->u1.dlstLightStateType, ci->u2.dwArg[0]); if (!ci->u1.dlstLightStateType && (ci->u1.dlstLightStateType > D3DLIGHTSTATE_COLORVERTEX)) ERR("Unexpected Light State Type\n"); else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_MATERIAL /* 1 */) { - DWORD matHandle = ci->u2.dwArg[0]; - - if(!matHandle) { - FIXME(" D3DLIGHTSTATE_MATERIAL called with NULL material !!!\n"); - } else if(matHandle >= lpDevice->numHandles) { - WARN("Material handle %d is invalid\n", matHandle); - } else if(lpDevice->Handles[matHandle - 1].type != DDrawHandle_Material) { - WARN("Handle %d is not a material handle\n", matHandle); - } else { - IDirect3DMaterialImpl *mat = (IDirect3DMaterialImpl *) lpDevice->Handles[matHandle - 1].ptr; - mat->activate(mat); - } - } - else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */) { + DWORD matHandle = ci->u2.dwArg[0]; + + if (!matHandle) { + FIXME(" D3DLIGHTSTATE_MATERIAL called with NULL material !!!\n"); + } else if (matHandle >= lpDevice->numHandles) { + WARN("Material handle %d is invalid\n", matHandle); + } else if (lpDevice->Handles[matHandle - 1].type != DDrawHandle_Material) { + WARN("Handle %d is not a material handle\n", matHandle); + } else { + IDirect3DMaterialImpl *mat = + (IDirect3DMaterialImpl *)lpDevice->Handles[matHandle - 1].ptr; + + mat->activate(mat); + } + } else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */) { switch (ci->u2.dwArg[0]) { case D3DCOLOR_MONO: - ERR("DDCOLOR_MONO should not happen!\n"); - break; + ERR("DDCOLOR_MONO should not happen!\n"); + break; case D3DCOLOR_RGB: - /* We are already in this mode */ - break; + /* We are already in this mode */ + break; default: - ERR("Unknown color model!\n"); + ERR("Unknown color model!\n"); } } else { - D3DRENDERSTATETYPE rs = 0; - switch (ci->u1.dlstLightStateType) { + D3DRENDERSTATETYPE rs = 0; + switch (ci->u1.dlstLightStateType) { - case D3DLIGHTSTATE_AMBIENT: /* 2 */ + case D3DLIGHTSTATE_AMBIENT: /* 2 */ rs = D3DRENDERSTATE_AMBIENT; - break; + break; case D3DLIGHTSTATE_FOGMODE: /* 4 */ rs = D3DRENDERSTATE_FOGVERTEXMODE; break; @@ -301,12 +302,12 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, default: break; } - - IDirect3DDevice7_SetRenderState(ICOM_INTERFACE(lpDevice, IDirect3DDevice7), - rs,ci->u2.dwArg[0]); - } - instr += size; + IDirect3DDevice7_SetRenderState(ICOM_INTERFACE(lpDevice, IDirect3DDevice7), rs, + ci->u2.dwArg[0]); + } + + instr += size; } } break;

1 0

Detlef Riekenberg : winspool: Set PrinterPorts for win3.x/win9. x compatibility.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 473717fefd06650e1e8d80c8dc0e16ab583cc673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=473717fefd06650e1e8d80c8d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 6 20:26:05 2008 +0200 winspool: Set PrinterPorts for win3.x/win9.x compatibility. --- dlls/comdlg32/tests/printdlg.c | 2 - dlls/winspool.drv/info.c | 51 ++++++++++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 744b6eb..31e57cf 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -216,11 +216,9 @@ static void test_PrintDlgA(void) SetLastError(0xdeadbeef); res = GetProfileStringA(PrinterPortsA, device, emptyA, buffer, sizeof(buffer)); ptr = strchr(buffer, ','); - todo_wine { ok( (res > 1) && (ptr != NULL), "got %u with %u and %p for '%s' (expected '>1' and '!= NULL')\n", res, GetLastError(), ptr, buffer); - } if (ptr) ptr[0] = '\0'; todo_wine { diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index dadc61f..5057c0d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -187,6 +187,12 @@ static const WCHAR WinNT_CV_PortsW[] = {'S','o','f','t','w','a','r','e','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'P','o','r','t','s',0}; +static const WCHAR WinNT_CV_PrinterPortsW[] = { 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'P','r','i','n','t','e','r','P','o','r','t','s',0}; + static const WCHAR DefaultEnvironmentW[] = {'W','i','n','e',0}; static const WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; @@ -225,6 +231,7 @@ static const WCHAR Previous_NamesW[] = {'P','r','e','v','i','o','u','s',' ','N', static const WCHAR Print_ProcessorW[] = {'P','r','i','n','t',' ','P','r','o','c','e','s','s','o','r',0}; static const WCHAR Printer_DriverW[] = {'P','r','i','n','t','e','r',' ','D','r','i','v','e','r',0}; static const WCHAR PrinterDriverDataW[] = {'P','r','i','n','t','e','r','D','r','i','v','e','r','D','a','t','a',0}; +static const WCHAR PrinterPortsW[] = {'P','r','i','n','t','e','r','P','o','r','t','s',0}; static const WCHAR ProviderW[] = {'P','r','o','v','i','d','e','r',0}; static const WCHAR Separator_FileW[] = {'S','e','p','a','r','a','t','o','r',' ','F','i','l','e',0}; static const WCHAR Share_NameW[] = {'S','h','a','r','e',' ','N','a','m','e',0}; @@ -489,16 +496,26 @@ static BOOL CUPS_LoadPrinters(void) nrofdests = pcupsGetDests(&dests); TRACE("Found %d CUPS %s:\n", nrofdests, (nrofdests == 1) ? "printer" : "printers"); for (i=0;i<nrofdests;i++) { - port = HeapAlloc(GetProcessHeap(),0,strlen("LPR:")+strlen(dests[i].name)+1); - sprintf(port,"LPR:%s",dests[i].name); - devline=HeapAlloc(GetProcessHeap(),0,sizeof("WINEPS.DRV,")+strlen(port)); - sprintf(devline,"WINEPS.DRV,%s",port); - WriteProfileStringA("devices",dests[i].name,devline); + /* FIXME: replace "LPR:" with "CUPS:". Fix printing output first */ + port = HeapAlloc(GetProcessHeap(), 0, strlen("LPR:") + strlen(dests[i].name)+1); + sprintf(port,"LPR:%s", dests[i].name); + /* FIXME: remove extension. Fix gdi32/drivers and comdlg32/printdlg first */ + devline = HeapAlloc(GetProcessHeap(), 0, sizeof("WINEPS.DRV,,15,45") + strlen(port)); + sprintf(devline, "WINEPS.DRV,%s", port); + WriteProfileStringA("devices", dests[i].name, devline); if(RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey) == ERROR_SUCCESS) { RegSetValueExA(hkey, dests[i].name, 0, REG_SZ, (LPBYTE)devline, strlen(devline) + 1); RegCloseKey(hkey); } - HeapFree(GetProcessHeap(),0,devline); + + lstrcatA(devline, ",15,45"); + WriteProfileStringA("PrinterPorts", dests[i].name, devline); + if(RegCreateKeyW(HKEY_CURRENT_USER, WinNT_CV_PrinterPortsW, &hkey) == ERROR_SUCCESS) { + RegSetValueExA(hkey, dests[i].name, 0, REG_SZ, (LPBYTE)devline, strlen(devline) + 1); + RegCloseKey(hkey); + } + + HeapFree(GetProcessHeap(), 0, devline); TRACE("Printer %d: %s\n", i, dests[i].name); if(RegOpenKeyA(hkeyPrinters, dests[i].name, &hkeyPrinter) == ERROR_SUCCESS) { @@ -614,13 +631,22 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { port = HeapAlloc(GetProcessHeap(),0,strlen("LPR:")+strlen(name)+1); sprintf(port,"LPR:%s",name); - devline=HeapAlloc(GetProcessHeap(),0,sizeof("WINEPS.DRV,")+strlen(port)); - sprintf(devline,"WINEPS.DRV,%s",port); - WriteProfileStringA("devices",devname,devline); + /* FIXME: remove extension. Fix gdi32/drivers and comdlg32/printdlg first */ + devline = HeapAlloc(GetProcessHeap(), 0, sizeof("WINEPS.DRV,,15,45") + strlen(port)); + sprintf(devline, "WINEPS.DRV,%s", port); + WriteProfileStringA("devices", devname, devline); if(RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey) == ERROR_SUCCESS) { RegSetValueExA(hkey, devname, 0, REG_SZ, (LPBYTE)devline, strlen(devline) + 1); RegCloseKey(hkey); } + + lstrcatA(devline, ",15,45"); + WriteProfileStringA("PrinterPorts", devname, devline); + if(RegCreateKeyW(HKEY_CURRENT_USER, WinNT_CV_PrinterPortsW, &hkey) == ERROR_SUCCESS) { + RegSetValueExA(hkey, devname, 0, REG_SZ, (LPBYTE)devline, strlen(devline) + 1); + RegCloseKey(hkey); + } + HeapFree(GetProcessHeap(),0,devline); if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != @@ -3259,10 +3285,17 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) RegCloseKey(hkeyPrinters); } WriteProfileStringW(devicesW, lpNameW, NULL); + WriteProfileStringW(PrinterPortsW, lpNameW, NULL); + if(RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey) == ERROR_SUCCESS) { RegDeleteValueW(hkey, lpNameW); RegCloseKey(hkey); } + + if(RegCreateKeyW(HKEY_CURRENT_USER, WinNT_CV_PrinterPortsW, &hkey) == ERROR_SUCCESS) { + RegDeleteValueW(hkey, lpNameW); + RegCloseKey(hkey); + } return TRUE; }

1 0

Alexandre Julliard : ntdll: Serial with ReadIntervalTimeout set to MAXDWORD should return immediately even if nothing was read .
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 2e3287bc6a7984df5d204ea666a53405cd2242f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3287bc6a7984df5d204ea66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 7 13:29:18 2008 +0200 ntdll: Serial with ReadIntervalTimeout set to MAXDWORD should return immediately even if nothing was read. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ce94917..fd72a61 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -433,7 +433,7 @@ static NTSTATUS get_io_timeouts( HANDLE handle, enum server_fd_type type, ULONG timeouts->total += count * st.ReadTotalTimeoutMultiplier; } else if (st.ReadIntervalTimeout == MAXDWORD) - timeouts->interval = 0; + timeouts->interval = timeouts->total = 0; } else /* write */ {

1 0

Jens Albretsen : serialui: Danish translation.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 367f978e37140194e455c6535c383308f1011066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=367f978e37140194e455c6535… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Mon May 5 22:44:42 2008 +0200 serialui: Danish translation. --- dlls/serialui/Da.rc | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/serialui/serialui_rc.rc | 1 + 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/serialui/Da.rc b/dlls/serialui/Da.rc new file mode 100644 index 0000000..b5b76af --- /dev/null +++ b/dlls/serialui/Da.rc @@ -0,0 +1,43 @@ +/* + * Danish language support + * + * Copyright (C) 2008 Jens Albretsen <jens(a)albretsen.dk> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Egenskaber for " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Baud hastighed", 0,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Paritet", 0,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Flowcontrol", 0,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Databits", 0,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Stopbits", 0,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK,30,138,50,14 + PUSHBUTTON "Annuller", IDCANCEL,85,138,50,14 + /* these two buttons are for testing Get/SetDefaultCommConfig */ + /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ + /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */ +END diff --git a/dlls/serialui/serialui_rc.rc b/dlls/serialui/serialui_rc.rc index 9e3a1df..72c8466 100644 --- a/dlls/serialui/serialui_rc.rc +++ b/dlls/serialui/serialui_rc.rc @@ -23,6 +23,7 @@ #include "Bg.rc" #include "Cs.rc" +#include "Da.rc" #include "De.rc" #include "En.rc" #include "Eo.rc"

1 0

Maarten Lankhorst : winetest: Fix CreateProcess so that debugger tests run without timing out.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 7c051f13941b15bd0a399431e36cae16b8fe092e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c051f13941b15bd0a399431e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 6 14:14:56 2008 -0700 winetest: Fix CreateProcess so that debugger tests run without timing out. --- programs/winetest/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index c862427..79f7e79 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -325,7 +325,7 @@ run_ex (char *cmd, const char *out, const char *tempdir, DWORD ms) close (fd); } - if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, CREATE_NEW_PROCESS_GROUP, + if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, tempdir, &si, &pi)) { status = -2; } else {

1 0

Maarten Lankhorst : wininet: Ignore INTERNET_STATUS_DETECTING_PROXY messages in the http test.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 11a0e45304e9d9d69b1a2d9a6f6aa8a276f35f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a0e45304e9d9d69b1a2d9a6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 6 14:58:31 2008 -0700 wininet: Ignore INTERNET_STATUS_DETECTING_PROXY messages in the http test. --- dlls/wininet/tests/http.c | 5 +++++ include/wininet.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8e29dac..f1a67ca 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -192,6 +192,8 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CREATED %p %d\n", GetCurrentThreadId(), hInternet, dwContext, *(HINTERNET *)lpvStatusInformation,dwStatusInformationLength); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + SET_EXPECT(INTERNET_STATUS_DETECTING_PROXY); break; case INTERNET_STATUS_HANDLE_CLOSING: ok(dwStatusInformationLength == sizeof(HINTERNET), @@ -218,6 +220,8 @@ static VOID WINAPI callback( GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation, dwStatusInformationLength); *(LPSTR)lpvStatusInformation = '\0'; + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + SET_EXPECT(INTERNET_STATUS_DETECTING_PROXY); break; case INTERNET_STATUS_INTERMEDIATE_RESPONSE: trace("%04x:Callback %p 0x%lx INTERNET_STATUS_INTERMEDIATE_RESPONSE %p %d\n", @@ -1767,6 +1771,7 @@ static void init_status_tests(void) STATUS_STRING(INTERNET_STATUS_CONNECTION_CLOSED); STATUS_STRING(INTERNET_STATUS_HANDLE_CREATED); STATUS_STRING(INTERNET_STATUS_HANDLE_CLOSING); + STATUS_STRING(INTERNET_STATUS_DETECTING_PROXY); STATUS_STRING(INTERNET_STATUS_REQUEST_COMPLETE); STATUS_STRING(INTERNET_STATUS_REDIRECT); STATUS_STRING(INTERNET_STATUS_INTERMEDIATE_RESPONSE); diff --git a/include/wininet.h b/include/wininet.h index 8293ce7..de1aae3 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -644,6 +644,7 @@ INTERNETAPI INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW(HINTERNET #define INTERNET_STATUS_CONNECTION_CLOSED 51 #define INTERNET_STATUS_HANDLE_CREATED 60 #define INTERNET_STATUS_HANDLE_CLOSING 70 +#define INTERNET_STATUS_DETECTING_PROXY 80 #define INTERNET_STATUS_REQUEST_COMPLETE 100 #define INTERNET_STATUS_REDIRECT 110 #define INTERNET_STATUS_INTERMEDIATE_RESPONSE 120

1 0

John Klehm : winex11.drv: Wintab packet serial numbers are passed via WPARAM.
by Alexandre Julliard 07 May '08

07 May '08

Module: wine Branch: master Commit: 8d09d5c8adc5f5c4b95278529cea80ab25f2820d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d09d5c8adc5f5c4b95278529… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Tue May 6 22:12:56 2008 -0500 winex11.drv: Wintab packet serial numbers are passed via WPARAM. --- dlls/winex11.drv/wintab.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 4e3e9de..d4d7109 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -834,7 +834,7 @@ static void motion_event( HWND hwnd, XEvent *event ) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = motion->axis_data[2]; gMsgPacket.pkButtons = get_button_state(curnum); - SendMessageW(hwndTabletDefault,WT_PACKET,0,(LPARAM)hwnd); + SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); } static void button_event( HWND hwnd, XEvent *event ) @@ -863,7 +863,7 @@ static void button_event( HWND hwnd, XEvent *event ) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = button->axis_data[2]; gMsgPacket.pkButtons = get_button_state(curnum); - SendMessageW(hwndTabletDefault,WT_PACKET,0,(LPARAM)hwnd); + SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); } static void key_event( HWND hwnd, XEvent *event )

1 0