August 2006 - Wine-Commits - list.winehq.org

James Liggett : winex11.drv: Add XEmbed system tray support.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 60a97505a63e5102f239d0d4c2a2ea7fd775c34e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=60a97505a63e5102f239d0d… Author: James Liggett <jrliggett(a)cox.net> Date: Tue Aug 22 17:14:11 2006 -0700 winex11.drv: Add XEmbed system tray support. Portions of this patch based on the work of Mike Hearn and Rob Shearman. --- dlls/winex11.drv/window.c | 107 +++++++++++++++++++++++++++++++++++++--- dlls/winex11.drv/x11drv.h | 3 + dlls/winex11.drv/x11drv_main.c | 3 + 3 files changed, 104 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 2bc90a7..30ef89b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -24,6 +24,7 @@ #include "config.h" #include <stdarg.h> #include <stdlib.h> +#include <stdio.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -58,6 +59,9 @@ static const char icon_window_prop[] = static const char managed_prop[] = "__wine_x11_managed"; static const char visual_id_prop[] = "__wine_x11_visual_id"; +/* for XDG systray icons */ +#define SYSTEM_TRAY_REQUEST_DOCK 0 + /*********************************************************************** * is_window_managed * @@ -291,6 +295,97 @@ static void set_icon_hints( Display *dis } } +/*********************************************************************** + * systray_dock_window + * + * Docks the given X window with the NETWM system tray. + */ +static void systray_dock_window( Display *display, struct x11drv_win_data *data ) +{ + static Atom systray_atom; + Window systray_window; + + wine_tsx11_lock(); + if (!systray_atom) + { + if (DefaultScreen( display ) == 0) + systray_atom = x11drv_atom(_NET_SYSTEM_TRAY_S0); + else + { + char systray_buffer[29]; /* strlen(_NET_SYSTEM_TRAY_S4294967295)+1 */ + sprintf( systray_buffer, "_NET_SYSTEM_TRAY_S%u", DefaultScreen( display ) ); + systray_atom = XInternAtom( display, systray_buffer, False ); + } + } + systray_window = XGetSelectionOwner( display, systray_atom ); + wine_tsx11_unlock(); + + TRACE("Docking tray icon %p\n", data->hwnd); + + if (systray_window != None) + { + XEvent ev; + unsigned long info[2]; + + /* Put the window offscreen so it isn't mapped. The window _cannot_ be + * mapped if we intend to dock with an XEMBED tray. If the window is + * mapped when we dock, it may become visible as a child of the root + * window after it docks, which isn't the proper behavior. + * + * For more information on this problem, see + * http://standards.freedesktop.org/xembed-spec/latest/ar01s04.html */ + + SetWindowPos( data->hwnd, NULL, screen_width + 1, screen_height + 1, + 0, 0, SWP_NOZORDER | SWP_NOSIZE ); + + /* set XEMBED protocol data on the window */ + info[0] = 0; /* protocol version */ + info[1] = 1; /* mapped = true */ + + wine_tsx11_lock(); + XChangeProperty( display, data->whole_window, + x11drv_atom(_XEMBED_INFO), + x11drv_atom(_XEMBED_INFO), 32, PropModeReplace, + (unsigned char*)info, 2 ); + wine_tsx11_unlock(); + + /* send the docking request message */ + ZeroMemory( &ev, sizeof(ev) ); + ev.xclient.type = ClientMessage; + ev.xclient.window = systray_window; + ev.xclient.message_type = x11drv_atom( _NET_SYSTEM_TRAY_OPCODE ); + ev.xclient.format = 32; + ev.xclient.data.l[0] = CurrentTime; + ev.xclient.data.l[1] = SYSTEM_TRAY_REQUEST_DOCK; + ev.xclient.data.l[2] = data->whole_window; + ev.xclient.data.l[3] = 0; + ev.xclient.data.l[4] = 0; + + wine_tsx11_lock(); + XSendEvent( display, systray_window, False, NoEventMask, &ev ); + wine_tsx11_unlock(); + + } + else + { + int val = 1; + + /* fall back to he KDE hints if the WM doesn't support XEMBED'ed + * systrays */ + + wine_tsx11_lock(); + XChangeProperty( display, data->whole_window, + x11drv_atom(KWM_DOCKWINDOW), + x11drv_atom(KWM_DOCKWINDOW), 32, PropModeReplace, + (unsigned char*)&val, 1 ); + XChangeProperty( display, data->whole_window, + x11drv_atom(_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR), + XA_WINDOW, 32, PropModeReplace, + (unsigned char*)&data->whole_window, 1 ); + wine_tsx11_unlock(); + } +} + /*********************************************************************** * set_size_hints @@ -420,16 +515,10 @@ void X11DRV_set_wm_hints( Display *displ /* size hints */ set_size_hints( display, data, style ); - - /* systray properties (KDE only for now) */ + + /* Dock system tray windows. */ if (ex_style & WS_EX_TRAYWINDOW) - { - int val = 1; - XChangeProperty( display, data->whole_window, x11drv_atom(KWM_DOCKWINDOW), - x11drv_atom(KWM_DOCKWINDOW), 32, PropModeReplace, (unsigned char*)&val, 1 ); - XChangeProperty( display, data->whole_window, x11drv_atom(_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR), - XA_WINDOW, 32, PropModeReplace, (unsigned char*)&data->whole_window, 1 ); - } + systray_dock_window( display, data ); /* set the WM_CLIENT_MACHINE and WM_LOCALE_NAME properties */ XSetWMProperties(display, data->whole_window, NULL, NULL, NULL, 0, NULL, NULL, NULL); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e5027c4..a4eb516 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -562,6 +562,8 @@ enum x11drv_atoms XATOM_DndSelection, XATOM__MOTIF_WM_HINTS, XATOM__KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR, + XATOM__NET_SYSTEM_TRAY_OPCODE, + XATOM__NET_SYSTEM_TRAY_S0, XATOM__NET_WM_MOVERESIZE, XATOM__NET_WM_NAME, XATOM__NET_WM_PID, @@ -570,6 +572,7 @@ enum x11drv_atoms XATOM__NET_WM_STATE_FULLSCREEN, XATOM__NET_WM_WINDOW_TYPE, XATOM__NET_WM_WINDOW_TYPE_UTILITY, + XATOM__XEMBED_INFO, XATOM_XdndAware, XATOM_XdndEnter, XATOM_XdndPosition, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 41d45a6..0403b5d 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -125,6 +125,8 @@ static const char * const atom_names[NB_ "DndSelection", "_MOTIF_WM_HINTS", "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", + "_NET_SYSTEM_TRAY_OPCODE", + "_NET_SYSTEM_TRAY_S0", "_NET_WM_MOVERESIZE", "_NET_WM_NAME", "_NET_WM_PID", @@ -133,6 +135,7 @@ static const char * const atom_names[NB_ "_NET_WM_STATE_FULLSCREEN", "_NET_WM_WINDOW_TYPE", "_NET_WM_WINDOW_TYPE_UTILITY", + "_XEMBED_INFO", "XdndAware", "XdndEnter", "XdndPosition",

1 0

James Hawkins : msiexec: Add handling for msiexec's regserver option.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: a6b8ff9ddbf4ee03e570d9e3b7ec925b34cc0361 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6b8ff9ddbf4ee03e570d9e… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 22 18:56:00 2006 -0700 msiexec: Add handling for msiexec's regserver option. --- programs/msiexec/msiexec.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index d00fde9..d8025bf 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -329,6 +329,37 @@ static DWORD DoDllUnregisterServer(LPCWS return 0; } +static DWORD DoRegServer(void) +{ + SC_HANDLE scm, service; + CHAR path[MAX_PATH+12]; + + scm = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE); + if (!scm) + { + fprintf(stderr, "Failed to open the service control manager.\n"); + return 1; + } + + GetSystemDirectory(path, MAX_PATH); + lstrcatA(path, "\\msiexec.exe"); + + service = CreateServiceA(scm, "MSIServer", "MSIServer", GENERIC_ALL, + SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, path, NULL, NULL, + NULL, NULL, NULL); + if (!service) + { + fprintf(stderr, "Failed to create MSI service\n"); + CloseServiceHandle(scm); + return 1; + } + + CloseServiceHandle(scm); + CloseServiceHandle(service); + return 0; +} + static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) { LONG r; @@ -808,7 +839,7 @@ int main(int argc, char **argv) } else if (FunctionRegServer) { - WINE_FIXME( "/regserver not implemented yet, ignoring\n" ); + ReturnCode = DoRegServer(); } else if (FunctionUnregServer) {

1 0

Mike McCormack : server: Use ntdll values where possible.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 261691fa2f923fb34604c5b8f09f19f20794d610 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=261691fa2f923fb34604c5b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 23 16:13:02 2006 +0900 server: Use ntdll values where possible. --- server/thread.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/thread.c b/server/thread.c index 36d1d79..56cdbd2 100644 --- a/server/thread.c +++ b/server/thread.c @@ -140,7 +140,7 @@ inline static void init_thread_structure thread->wait_fd = NULL; thread->state = RUNNING; thread->exit_code = 0; - thread->priority = THREAD_PRIORITY_NORMAL; + thread->priority = 0; thread->affinity = 1; thread->suspend = 0; thread->desktop_users = 0; @@ -764,7 +764,7 @@ void break_thread( struct thread *thread assert( thread->context ); - data.record.ExceptionCode = EXCEPTION_BREAKPOINT; + data.record.ExceptionCode = STATUS_BREAKPOINT; data.record.ExceptionFlags = EXCEPTION_CONTINUABLE; data.record.ExceptionRecord = NULL; data.record.ExceptionAddress = get_context_ip( thread->context ); @@ -945,7 +945,7 @@ DECL_HANDLER(get_thread_info) reply->pid = get_process_id( thread->process ); reply->tid = get_thread_id( thread ); reply->teb = thread->teb; - reply->exit_code = (thread->state == TERMINATED) ? thread->exit_code : STILL_ACTIVE; + reply->exit_code = (thread->state == TERMINATED) ? thread->exit_code : STATUS_PENDING; reply->priority = thread->priority; reply->affinity = thread->affinity; reply->creation_time.sec = thread->creation_time.tv_sec;

1 0

Mike McCormack : windef.h: Add a definition for FILETIME.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: b346d0f248381c54da93521fbd68688e43954bd6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b346d0f248381c54da93521… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 23 16:12:47 2006 +0900 windef.h: Add a definition for FILETIME. --- include/windef.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/windef.h b/include/windef.h index d9c0331..850c026 100644 --- a/include/windef.h +++ b/include/windef.h @@ -355,6 +355,17 @@ #else #endif } POINTS, *PPOINTS, *LPPOINTS; +typedef struct _FILETIME { +#ifdef WORDS_BIGENDIAN + DWORD dwHighDateTime; + DWORD dwLowDateTime; +#else + DWORD dwLowDateTime; + DWORD dwHighDateTime; +#endif +} FILETIME, *PFILETIME, *LPFILETIME; +#define _FILETIME_ + /* The RECT structure */ typedef struct tagRECT {

1 0

Mike McCormack : ntdll: Use RTL_CRITICAL_SECTION not CRITICAL_SECTION.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 2dca7aa2e22a2a1cc60cd7893c87ebd36970375b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2dca7aa2e22a2a1cc60cd78… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 23 16:12:32 2006 +0900 ntdll: Use RTL_CRITICAL_SECTION not CRITICAL_SECTION. --- dlls/ntdll/threadpool.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 454cb69..60ba1ba 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -45,14 +45,14 @@ static LONG num_busy_workers; static struct list work_item_list = LIST_INIT(work_item_list); static HANDLE work_item_event; -static CRITICAL_SECTION threadpool_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = +static RTL_CRITICAL_SECTION threadpool_cs; +static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { 0, 0, &threadpool_cs, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": threadpool_cs") } }; -static CRITICAL_SECTION threadpool_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static RTL_CRITICAL_SECTION threadpool_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; struct work_item {

1 0

Paul Vriens : winecfg: Wrong text in messagebox.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: a53ee521d0e388468fc3eca5789e9ab7acdbd510 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a53ee521d0e388468fc3eca… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Aug 23 08:53:56 2006 +0200 winecfg: Wrong text in messagebox. --- programs/winecfg/driveui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index f7557f9..0be623a 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -55,7 +55,7 @@ static void update_controls(HWND dialog) static DWORD driveui_msgbox (HWND parent, UINT messageId, DWORD flags) { WCHAR* caption = load_string (IDS_WINECFG_TITLE); - WCHAR* text = load_string (flags); + WCHAR* text = load_string (messageId); DWORD result = MessageBoxW (parent, text, caption, flags); HeapFree (GetProcessHeap(), 0, caption); HeapFree (GetProcessHeap(), 0, text);

1 0

Paul Vriens : winecfg: Update Dutch resource.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 15e1e4d8246b41b7857f18799879317ef7deb5c6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15e1e4d8246b41b7857f187… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Aug 23 09:48:13 2006 +0200 winecfg: Update Dutch resource. --- programs/winecfg/Nl.rc | 94 ++++++++++++++++++++++++------------------------ 1 files changed, 47 insertions(+), 47 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 2cf9d3f..5d0d62d 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -66,7 +66,7 @@ BEGIN CONTROL "Een DirectX programma kan de muis in een venster vasthouden.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,230,8 CONTROL "Schakel \"double buffering\" in.",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,24,230,8 - LTEXT "Wanneer de vensters door de window manager worden beheerd hebben deze de standaard kaders, er wordt rekening gehouden met de virtuele desktop en ze staan in de lijst met vensters.\n\nAls de vensters niet worden beheerd, worden ze losgekoppeld van de window manager. Dit betekent dat vensters niet perfect met u desktop integreren. De 'emulatie' is echter exacter en kan ervoor zorgen dat programma's beter werken.", + LTEXT "Wanneer de vensters door de window manager worden beheerd hebben deze de standaard kaders, er wordt rekening gehouden met de virtuele desktop en ze staan in de lijst met vensters.\n\nAls de vensters niet worden beheerd, worden ze losgekoppeld van de window manager. Dit betekent dat vensters niet perfect met uw desktop integreren. De 'emulatie' is echter exacter en kan ervoor zorgen dat programma's beter werken.", IDC_STATIC,15,37,228,80 CONTROL "Laat de window manager de vensters beheren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8 @@ -136,7 +136,7 @@ BEGIN PUSHBUTTON "&Bladeren...",IDC_BUTTON_BROWSE_PATH,208,120,40,13 LTEXT "&Soort:",IDC_STATIC_TYPE,15,138,21,10 - COMBOBOX IDC_COMBO_TYPE,41,135,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_TYPE,41,135,97,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Naam en serienummer",IDC_LABELSERIAL_STATIC,15,155,131,10 @@ -161,9 +161,9 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Stuurprograma selectie ",IDC_STATIC,8,4,244,195 - LTEXT "Geluidsbesturing: ",IDC_STATIC,15,20,227,30 - CONTROL "Apparaten",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 - PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,50,79,14 + LTEXT "Selecteer een geluids-stuurprogramma door het aanvinken van het gewenste stuurprogramma. Zet het geluid uit door geen stuurprogramma te selecteren. Het selecteren van meerdere stuurprogramma's wordt niet aanbevolen. Configureer een stuurprogramma d.m.v. een rechter muisklik hierop.",IDC_STATIC,15,20,227,45 + CONTROL "Apparaten",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,65,140,125 + PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,65,79,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Hardwareversnelling: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -219,63 +219,63 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_DLL_WARNING "Veranderen van de laadvolgorde van deze bibliotheek wordt niet aanbevolen\n. Weet u zeker dat u dit wilt doen?" + IDS_DLL_WARNING "Veranderen van de laadvolgorde van deze bibliotheek wordt niet aanbevolen\n. Weet u zeker dat u dit wilt doen?" IDS_DLL_WARNING_CAPTION "Waarschuwing: systeembibliotheek" - IDS_DLL_NATIVE "Native (Windows)" - IDS_DLL_BUILTIN "Builtin (Wine)" - IDS_DLL_NATIVE_BUILTIN "Native dan builtin" - IDS_DLL_BUILTIN_NATIVE "Builtin dan native" - IDS_DLL_DISABLED "Uitgeschakeld" - IDS_DEFAULT_SETTINGS "Default Settings" - IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" - IDS_USE_GLOBAL_SETTINGS "Use global settings" - IDS_SELECT_EXECUTABLE "Select an executable file" + IDS_DLL_NATIVE "Native (Windows)" + IDS_DLL_BUILTIN "Builtin (Wine)" + IDS_DLL_NATIVE_BUILTIN "Native dan builtin" + IDS_DLL_BUILTIN_NATIVE "Builtin dan native" + IDS_DLL_DISABLED "Uitgeschakeld" + IDS_DEFAULT_SETTINGS "Standaard instellingen" + IDS_EXECUTABLE_FILTER "Wine toepassingen (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Gebruike globale instellingen" + IDS_SELECT_EXECUTABLE "Selecteer een uitvoerbaar bestand" END STRINGTABLE DISCARDABLE BEGIN IDS_SHADER_MODE_HARDWARE "Hardware" - IDS_SHADER_MODE_NONE "None" - IDS_SHADER_MODE_EMULATION "Emulated" + IDS_SHADER_MODE_NONE "Geen" + IDS_SHADER_MODE_EMULATION "Emulatie" END STRINGTABLE DISCARDABLE BEGIN - IDS_DRIVE_UNKNOWN "Autodetect" - IDS_DRIVE_FIXED "Local hard disk" - IDS_DRIVE_REMOTE "Network share" + IDS_DRIVE_UNKNOWN "Automatisch detecteren" + IDS_DRIVE_FIXED "Lokaal station" + IDS_DRIVE_REMOTE "Netwerkverbinding" IDS_DRIVE_REMOVABLE "Floppy disk" IDS_DRIVE_CDROM "CD-ROM" - IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26" - IDS_SYSTEM_DRIVE_LABEL "System drive" - IDS_CONFIRM_DELETE_C "Are you sure you want to delete drive C?\n\nMost Windows applications expect drive C to exist, and will die messily if it doesn't. If you proceed remember to recreate it!" + IDS_DRIVE_LETTERS_EXCEEDED "U kunt geen stations meer toevoegen.\n\nElk station moet een letter, van A tot Z, hebben zodat er niet meer dan 26 kunnen zijn" + IDS_SYSTEM_DRIVE_LABEL "Systeem station" + IDS_CONFIRM_DELETE_C "Weet u zeker dat u station C wilt verwijderen?\nDe meeste Windows toepassingen verwachten dat station C bestaat en zullen, met onverwachte resultaten, afbreken. Als u doorgaat vergeet dan niet om station C opnieuw aan te maken!" IDS_COL_DRIVELETTER "Letter" - IDS_COL_DRIVEMAPPING "Drive Mapping" - IDS_NO_DRIVE_C "You don't have a drive C. This is not so great.\n\nRemember to click 'Add' in the Drives tab to create one!\n" + IDS_COL_DRIVEMAPPING "Toewijzing" + IDS_NO_DRIVE_C "U heeft geen C station. Dit kan tot problemen leiden.\n\nVergeet niet om m.b.v. de knop 'Toevoegen' in de Stations tab een C station aan te maken!\n" END STRINGTABLE DISCARDABLE BEGIN - IDS_ACCEL_FULL "Full" - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Basic" - IDS_ACCEL_EMULATION "Emulation" - IDS_DRIVER_ALSA "ALSA Driver" - IDS_DRIVER_ARTS "aRts Driver" - IDS_DRIVER_ESOUND "EsounD Driver" - IDS_DRIVER_OSS "OSS Driver" - IDS_DRIVER_JACK "JACK Driver" - IDS_DRIVER_NAS "NAS Driver" - IDS_DRIVER_AUDIOIO "Audio IO (Solaris) Driver" - IDS_DRIVER_COREAUDIO "CoreAudio Driver" - IDS_OPEN_DRIVER_ERROR "Couldn't open %s!" - IDS_SOUNDDRIVERS "Sound Drivers" - IDS_DEVICES_WAVEOUT "Wave Out Devices" - IDS_DEVICES_WAVEIN "Wave In Devices" - IDS_DEVICES_MIDIOUT "MIDI Out Devices" - IDS_DEVICES_MIDIIN "MIDI In Devices" - IDS_DEVICES_AUX "Aux Devices" - IDS_DEVICES_MIXER "Mixer Devices" - IDS_UNAVAILABLE_DRIVER "Found driver in registry that is not available!\n\nRemove \"%s\" from registry?" - IDS_WARNING "Warning" + IDS_ACCEL_FULL "Volledig" + IDS_ACCEL_STANDARD "Standaard" + IDS_ACCEL_BASIC "Eenvoudig" + IDS_ACCEL_EMULATION "Emulatie" + IDS_DRIVER_ALSA "ALSA Stuurprogramma" + IDS_DRIVER_ARTS "aRts Stuurprogramma" + IDS_DRIVER_ESOUND "EsounD Stuurprogramma" + IDS_DRIVER_OSS "OSS Stuurprogramma" + IDS_DRIVER_JACK "JACK Stuurprogramma" + IDS_DRIVER_NAS "NAS Stuurprogramma" + IDS_DRIVER_AUDIOIO "Audio IO (Solaris) Stuurprogramma" + IDS_DRIVER_COREAUDIO "CoreAudio Stuurprogramma" + IDS_OPEN_DRIVER_ERROR "%s kon niet worden geopend!" + IDS_SOUNDDRIVERS "Stuurprogramma's voor geluid" + IDS_DEVICES_WAVEOUT "Wave Out apparaten" + IDS_DEVICES_WAVEIN "Wave In apparaten" + IDS_DEVICES_MIDIOUT "MIDI Out apparaten" + IDS_DEVICES_MIDIIN "MIDI In apparaten" + IDS_DEVICES_AUX "Aux apparaten" + IDS_DEVICES_MIXER "Mixer apparaten" + IDS_UNAVAILABLE_DRIVER "Stuurprogramma in de registry is niet beschikbaar!\n\nVerwijder \"%s\" uit de registry?" + IDS_WARNING "Waarschuwing" END

1 0

Hwang YunSong(황윤성) : shlwapi: Update Korean resource.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 3a04565b1878ccd715de0327434fb240b06cf7ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a04565b1878ccd715de032… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Aug 23 08:40:07 2006 +0900 shlwapi: Update Korean resource. --- dlls/shlwapi/shlwapi_Ko.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/shlwapi_Ko.rc b/dlls/shlwapi/shlwapi_Ko.rc index 92dab21..bb8641c 100644 --- a/dlls/shlwapi/shlwapi_Ko.rc +++ b/dlls/shlwapi/shlwapi_Ko.rc @@ -34,7 +34,8 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON L"�ƴϿ�(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } + STRINGTABLE DISCARDABLE { - IDS_BYTES_FORMAT "%ld bytes" + IDS_BYTES_FORMAT "%ld ��Ʈ" }

1 0

Andrew Talbot : winebuild: Cast-qual warnings fix.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 0235b1bf26df362b8bd70fe6a3f521de11bf4bd0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0235b1bf26df362b8bd70fe… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Aug 22 23:30:52 2006 +0100 winebuild: Cast-qual warnings fix. --- tools/winebuild/res16.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/res16.c b/tools/winebuild/res16.c index c8dcf1e..99e5cd3 100644 --- a/tools/winebuild/res16.c +++ b/tools/winebuild/res16.c @@ -142,7 +142,7 @@ static void get_string( struct string_id } else { - char *p = xmalloc( (strlen((char*)file_pos) + 1) ); + char *p = xmalloc(strlen((const char *)file_pos) + 1); str->str = p; str->id = 0; while ((*p++ = get_byte()));

1 0

Andrew Talbot : libwine: Cast-qual warning fix.
by Alexandre Julliard Aug. 23, 2006

Aug. 23, 2006

Module: wine Branch: master Commit: 5e8f9c7aff05641211f60c1e4976f2e230924c1e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5e8f9c7aff05641211f60c1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Aug 22 20:21:56 2006 +0100 libwine: Cast-qual warning fix. --- libs/wine/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 4406a32..abf428d 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -362,7 +362,7 @@ #ifdef HAVE_MMAP *nt = *nt_descr; - delta = (BYTE *)nt_descr - addr; + delta = (const BYTE *)nt_descr - addr; code_start = page_size; data_start = delta & ~page_mask; data_end = (nt->OptionalHeader.SizeOfImage + delta + page_mask) & ~page_mask;

1 0