July 2009 - Wine-Commits - list.winehq.org

Piotr Caban : jscript: Add Error object stub.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: f33f5c92869df019be84149a3b260b6cf59c4fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33f5c92869df019be84149a3… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:17:51 2009 +0200 jscript: Add Error object stub. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/error.c | 310 +++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/global.c | 74 +++++++++++ dlls/jscript/jscript.h | 8 + dlls/jscript/tests/api.js | 27 ++++ 5 files changed, 420 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f33f5c92869df019be841…

1 0

Ismael Barros : dplayx/tests: Host migration when session host leaves.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: ebcb243c33ae15ff81fb14d9e1e2521c8d1d4d4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcb243c33ae15ff81fb14d9e… Author: Ismael Barros <razielmine(a)gmail.com> Date: Mon Jul 20 17:52:49 2009 +0200 dplayx/tests: Host migration when session host leaves. --- dlls/dplayx/tests/dplayx.c | 133 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 2d14584..3eba147 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6132,6 +6132,138 @@ static void test_remote_data_replication(void) } +/* Host migration */ + +static void test_host_migration(void) +{ + + LPDIRECTPLAY4 pDP[2]; + DPSESSIONDESC2 dpsd; + DPID dpid[2], idFrom, idTo; + HRESULT hr; + UINT i; + DWORD dwCount; + + DWORD dwDataSize = 1024; + LPDPMSG_DESTROYPLAYERORGROUP lpData = HeapAlloc( GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwDataSize ); + + + for (i=0; i<2; i++) + { + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP[i] ); + init_TCPIP_provider( pDP[i], "127.0.0.1", 0 ); + } + ZeroMemory( &dpsd, sizeof(DPSESSIONDESC2) ); + dpsd.dwSize = sizeof(DPSESSIONDESC2); + dpsd.guidApplication = appGuid; + dpsd.dwMaxPlayers = 10; + dpsd.dwFlags = DPSESSION_MIGRATEHOST; + + /* Host */ + hr = IDirectPlayX_Open( pDP[0], &dpsd, DPOPEN_CREATE ); + todo_wine checkHR( DP_OK, hr ); + + if ( hr != DP_OK ) + { + todo_wine win_skip( "dplay not implemented enough for this test yet\n" ); + return; + } + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid[0], NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + + /* Peer */ + hr = IDirectPlayX_EnumSessions( pDP[1], &dpsd, 0, EnumSessions_cb_join, + pDP[1], 0 ); + checkHR( DP_OK, hr ); + + hr = IDirectPlayX_CreatePlayer( pDP[1], &dpid[1], NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + + + /* Host: One message in queue */ + IDirectPlayX_GetMessageCount( pDP[0], dpid[0], &dwCount ); + check( 1, dwCount ); + dwDataSize = 1024; + hr = IDirectPlayX_Receive( pDP[0], &idFrom, &idTo, DPRECEIVE_PEEK, + lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + checkConv( DPSYS_CREATEPLAYERORGROUP, lpData->dwType, dpMsgType2str ); + + /* Peer: No messages */ + IDirectPlayX_GetMessageCount( pDP[1], dpid[1], &dwCount ); + check( 0, dwCount ); + hr = IDirectPlayX_Receive( pDP[1], &idFrom, &idTo, DPRECEIVE_PEEK, + lpData, &dwDataSize ); + checkHR( DPERR_NOMESSAGES, hr ); + + + /* Closing host */ + IDirectPlayX_Close( pDP[0] ); + + + /* Host: Queue is cleaned */ + IDirectPlayX_GetMessageCount( pDP[0], dpid[0], &dwCount ); + check( 0, dwCount ); + hr = IDirectPlayX_Receive( pDP[0], &idFrom, &idTo, DPRECEIVE_PEEK, + lpData, &dwDataSize ); + checkHR( DPERR_NOMESSAGES, hr ); + + /* Peer: gets message of player destruction */ + IDirectPlayX_GetMessageCount( pDP[1], dpid[1], &dwCount ); + check( 2, dwCount ); + dwDataSize = 1024; + hr = IDirectPlayX_Receive( pDP[1], &idFrom, &idTo, DPRECEIVE_PEEK, + lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + checkConv( DPSYS_DESTROYPLAYERORGROUP, lpData->dwType, dpMsgType2str ); + + + /* Message analysis */ + for (i=0; i<2; i++) + { + hr = IDirectPlayX_Receive( pDP[1], &idFrom, &idTo, 0, + lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + check( DPID_SYSMSG, idFrom ); + check( dpid[1], idTo ); /* Peer player id */ + switch(i) + { + case 0: + checkConv( DPSYS_DESTROYPLAYERORGROUP, lpData->dwType, + dpMsgType2str ); + check( DPPLAYERTYPE_PLAYER, lpData->dwPlayerType ); + check( dpid[0], lpData->dpId ); /* Host player id */ + checkLP( NULL, lpData->lpLocalData ); + check( 0, lpData->dwLocalDataSize ); + checkLP( NULL, lpData->lpRemoteData ); + check( 0, lpData->dwRemoteDataSize ); + checkLP( NULL, lpData->dpnName.lpszShortNameA ); + check( 0, lpData->dpIdParent ); + checkFlags( 0, lpData->dwFlags, + FLAGS_DPPLAYER | FLAGS_DPGROUP ); + break; + case 1: + checkConv( DPSYS_HOST, lpData->dwType, dpMsgType2str ); + break; + default: + break; + } + dwDataSize = 1024; + } + hr = IDirectPlayX_Receive( pDP[1], &idFrom, &idTo, 0, lpData, &dwDataSize ); + checkHR( DPERR_NOMESSAGES, hr ); + + + HeapFree( GetProcessHeap(), 0, lpData ); + IDirectPlayX_Release( pDP[0] ); + IDirectPlayX_Release( pDP[1] ); + +} + START_TEST(dplayx) { @@ -6183,6 +6315,7 @@ START_TEST(dplayx) test_GetMessageQueue(); test_remote_data_replication(); + test_host_migration(); CoUninitialize(); }

1 0

Dylan Smith : richedit: Added missing return to ME_EnsureVisible.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: e364a4406a7d06c1ca3056d9c059c38f70bbffa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e364a4406a7d06c1ca3056d9c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 21 00:22:12 2009 -0400 richedit: Added missing return to ME_EnsureVisible. The missing return was to prevent automatic vertically scrolling when style for it is not set, but is set for the horizontal scrollbar. I initially missed this by testing with no autoscrolling on either scrollbar. --- dlls/riched20/paint.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 2c1c9b9..4b5fed1 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1263,7 +1263,10 @@ void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) x = editor->horz_si.nPos; if (~editor->styleFlags & ES_AUTOVSCROLL) + { ME_HScrollAbs(editor, x); + return; + } } else { if (~editor->styleFlags & ES_AUTOVSCROLL) return;

1 0

Owen Rudge : shell32: Execute control panel applets in separate process.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 1eca313f47db884bc4cb6f9097aa7740e3a2786c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eca313f47db884bc4cb6f909… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jul 20 17:03:58 2009 -0300 shell32: Execute control panel applets in separate process. --- dlls/shell32/control.c | 38 ++++++++++++++++++++++++-------------- dlls/shell32/cpanel.h | 1 + 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 8337265..e2f8b89 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -59,6 +59,7 @@ CPlApplet* Control_UnloadApplet(CPlApplet* applet) if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); FreeLibrary(applet->hModule); next = applet->next; + HeapFree(GetProcessHeap(), 0, applet->cmd); HeapFree(GetProcessHeap(), 0, applet); return next; } @@ -95,6 +96,13 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) applet = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, applet, sizeof(*applet) + (applet->count - 1) * sizeof(NEWCPLINFOW)); + if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmd)+1) * sizeof(WCHAR)))) { + WARN("Cannot allocate memory for applet path"); + goto theError; + } + + lstrcpyW(applet->cmd, cmd); + for (i = 0; i < applet->count; i++) { ZeroMemory(&newinfo, sizeof(newinfo)); newinfo.dwSize = sizeof(NEWCPLINFOA); @@ -426,6 +434,20 @@ static CPlItem* Control_GetCPlItem_From_ListView(CPanel *panel) return NULL; } +static void Control_StartApplet(HWND hWnd, CPlItem *item) +{ + WCHAR verbOpen[] = {'c','p','l','o','p','e','n',0}; + WCHAR format[] = {'@','%','d',0}; + WCHAR param[MAX_PATH]; + + /* execute the applet if item is valid */ + if (item) + { + wsprintfW(param, format, item->id); + ShellExecuteW(hWnd, verbOpen, item->applet->cmd, param, NULL, SW_SHOW); + } +} + static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, WPARAM lParam1, LPARAM lParam2) { @@ -484,13 +506,7 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, if ((LOWORD(lParam1) >= IDM_CPANEL_APPLET_BASE) && (LOWORD(lParam1) <= IDM_CPANEL_APPLET_BASE + panel->total_subprogs)) { - CPlItem *item = Control_GetCPlItem_From_MenuID(hWnd, LOWORD(lParam1)); - - /* execute the applet if item is valid */ - if (item) - item->applet->proc(item->applet->hWnd, CPL_DBLCLK, item->id, - item->applet->info[item->id].lData); - + Control_StartApplet(hWnd, Control_GetCPlItem_From_MenuID(hWnd, LOWORD(lParam1))); return 0; } @@ -511,13 +527,7 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, case NM_RETURN: case NM_DBLCLK: { - CPlItem *item = Control_GetCPlItem_From_ListView(panel); - - /* execute the applet if item is valid */ - if (item) - item->applet->proc(item->applet->hWnd, CPL_DBLCLK, - item->id, item->applet->info[item->id].lData); - + Control_StartApplet(hWnd, Control_GetCPlItem_From_ListView(panel)); return 0; } case LVN_ITEMCHANGED: diff --git a/dlls/shell32/cpanel.h b/dlls/shell32/cpanel.h index 23ec5e5..6a1fa57 100644 --- a/dlls/shell32/cpanel.h +++ b/dlls/shell32/cpanel.h @@ -26,6 +26,7 @@ typedef struct CPlApplet { struct CPlApplet* next; /* linked list */ HWND hWnd; + LPWSTR cmd; /* path to applet */ unsigned count; /* number of subprograms */ HMODULE hModule; /* module of loaded applet */ APPLET_PROC proc; /* entry point address */

1 0

Owen Rudge : shell32: Check if a numerical value has been passed inside quotes in Control_DoLaunch .
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: bd926bde3830e13398e761e588ec3be0544f52a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd926bde3830e13398e761e58… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jul 20 17:03:47 2009 -0300 shell32: Check if a numerical value has been passed inside quotes in Control_DoLaunch. --- dlls/shell32/control.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 88d6ead..8337265 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -772,6 +772,11 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) extraPmts = extraPmtsBuf; } + /* Now check if there had been a numerical value in the extra params */ + if ((*extraPmts == '@') && (sp == -1)) { + sp = atoiW(extraPmts + 1); + } + TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); Control_LoadApplet(hWnd, buffer, panel);

1 0

Stefan Leichter : advapi32: Test a combination of CreateServiceA and GetSecurityInfo.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 08e7a1bfe7dc02d4f20e321db52eb7b35c6c6150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e7a1bfe7dc02d4f20e321db… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jul 20 21:21:16 2009 +0200 advapi32: Test a combination of CreateServiceA and GetSecurityInfo. --- dlls/advapi32/tests/service.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index b924c69..0851384 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -28,6 +28,7 @@ #include "winsvc.h" #include "winnls.h" #include "lmcons.h" +#include "aclapi.h" #include "wine/test.h" @@ -37,6 +38,8 @@ static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pEnumServicesStatusExA)(SC_HANDLE, SC_ENUM_TYPE, DWORD, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD, LPDWORD, LPCSTR); +static DWORD (WINAPI *pGetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, + PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); static BOOL (WINAPI *pQueryServiceConfig2A)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); static BOOL (WINAPI *pQueryServiceConfig2W)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); static BOOL (WINAPI *pQueryServiceStatusEx)(SC_HANDLE, SC_STATUS_TYPE, LPBYTE, @@ -48,6 +51,7 @@ static void init_function_pointers(void) pChangeServiceConfig2A = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2A"); pEnumServicesStatusExA= (void*)GetProcAddress(hadvapi32, "EnumServicesStatusExA"); + pGetSecurityInfo = (void *)GetProcAddress(hadvapi32, "GetSecurityInfo"); pQueryServiceConfig2A= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2A"); pQueryServiceConfig2W= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2W"); pQueryServiceStatusEx= (void*)GetProcAddress(hadvapi32, "QueryServiceStatusEx"); @@ -1743,7 +1747,17 @@ static void test_sequence(void) return; } else + { ok(svc_handle != NULL, "Could not create the service : %d\n", GetLastError()); + if ((svc_handle != NULL) && (pGetSecurityInfo != NULL)) + { + PSID sidOwner, sidGroup; + PACL dacl, sacl; + PSECURITY_DESCRIPTOR pSD; + HRESULT retval = pGetSecurityInfo(svc_handle,SE_SERVICE,DACL_SECURITY_INFORMATION,&sidOwner,&sidGroup,&dacl,&sacl,&pSD); + todo_wine ok(ERROR_SUCCESS == retval, "Expected GetSecurityInfo to succeed: result %d\n",retval); + } + } if (!svc_handle) return;

1 0

Austin English : shell32: Fix English folder names.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: f81784bbdb318e1e0487bdce89c874d03e6132a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f81784bbdb318e1e0487bdce8… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 20 13:19:26 2009 -0500 shell32: Fix English folder names. --- dlls/shell32/shell32_En.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index b4dddc2..6d68083 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -274,9 +274,9 @@ STRINGTABLE IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" - IDS_COMMON_MUSIC "Documents\\My Music" - IDS_COMMON_PICTURES "Documents\\My Pictures" - IDS_COMMON_VIDEO "Documents\\My Videos" + IDS_COMMON_MUSIC "Music" + IDS_COMMON_PICTURES "Pictures" + IDS_COMMON_VIDEO "Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" IDS_NEWFOLDER "New Folder"

1 0

David Adam : d3dx9: Add forgotten copyrights.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 9ec5d4388d8c65a46f154ed18ed33bfd96d90b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec5d4388d8c65a46f154ed18… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Mon Jul 20 16:20:03 2009 +0200 d3dx9: Add forgotten copyrights. --- dlls/d3dx9_36/tests/math.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 610aa23..60d7193 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1,6 +1,8 @@ /* * Copyright 2008 David Adam + * Copyright 2008 Luis Busquets * Copyright 2008 Philip Nilsson + * Copyright 2008 Henri Verbeet * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Alexandre Julliard : mountmgr: Always set the mount point id as a separate step from the mount point creation .
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 053eccf910736473c90c623d7ad98b8e513cbcf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053eccf910736473c90c623d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 21:00:33 2009 +0200 mountmgr: Always set the mount point id as a separate step from the mount point creation. --- dlls/mountmgr.sys/device.c | 7 ++++--- dlls/mountmgr.sys/mountmgr.c | 12 +++++------- dlls/mountmgr.sys/mountmgr.h | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 1b23d97..56c6446 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -360,14 +360,15 @@ static void set_drive_letter( struct dos_drive *drive, int letter ) if (drive->dosdev) delete_mount_point( drive->dosdev ); if (volume->mount) delete_mount_point( volume->mount ); drive->drive = letter; - if (letter == -1) return; + drive->dosdev = add_dosdev_mount_point( device->dev_obj, &device->name, letter ); + volume->mount = add_volume_mount_point( device->dev_obj, &device->name, &volume->guid ); if (device->unix_mount) { id = device->unix_mount; id_len = strlen( device->unix_mount ) + 1; } - drive->dosdev = add_dosdev_mount_point( device->dev_obj, &device->name, letter, id, id_len ); - volume->mount = add_volume_mount_point( device->dev_obj, &device->name, &volume->guid, id, id_len ); + if (drive->dosdev) set_mount_point_id( drive->dosdev, id, id_len ); + if (volume->mount) set_mount_point_id( volume->mount, id, id_len ); } static inline int is_valid_device( struct stat *st ) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 4554de6..bbf5d64 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -61,7 +61,7 @@ void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int } static struct mount_point *add_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - const WCHAR *link, const void *id, unsigned int id_len ) + const WCHAR *link ) { struct mount_point *mount; WCHAR *str; @@ -83,7 +83,6 @@ static struct mount_point *add_mount_point( DEVICE_OBJECT *device, UNICODE_STRIN list_add_tail( &mount_points_list, &mount->entry ); IoCreateSymbolicLink( &mount->link, device_name ); - set_mount_point_id( mount, id, id_len ); TRACE( "created %s id %s for %s\n", debugstr_w(mount->link.Buffer), debugstr_a(mount->id), debugstr_w(mount->name.Buffer) ); @@ -91,19 +90,18 @@ static struct mount_point *add_mount_point( DEVICE_OBJECT *device, UNICODE_STRIN } /* create the DosDevices mount point symlink for a new device */ -struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - int drive, const void *id, unsigned int id_len ) +struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, int drive ) { static const WCHAR driveW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','%','c',':',0}; WCHAR link[sizeof(driveW)]; sprintfW( link, driveW, 'A' + drive ); - return add_mount_point( device, device_name, link, id, id_len ); + return add_mount_point( device, device_name, link ); } /* create the Volume mount point symlink for a new device */ struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - const GUID *guid, const void *id, unsigned int id_len ) + const GUID *guid ) { static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{', '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', @@ -114,7 +112,7 @@ struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRIN sprintfW( link, volumeW, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); - return add_mount_point( device, device_name, link, id, id_len ); + return add_mount_point( device, device_name, link ); } /* delete the mount point symlinks when a device goes away */ diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 5ce5886..d61bb7d 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -63,8 +63,8 @@ extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STR struct mount_point; extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - int drive, const void *id, unsigned int id_len ); + int drive ); extern struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - const GUID *guid, const void *id, unsigned int id_len ); + const GUID *guid ); extern void delete_mount_point( struct mount_point *mount ); extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len );

1 0

Alexandre Julliard : mountmgr: Retrieve the volume uuid through HAL/ DiskArbitration when creating a device.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 81cfeaf531ad5842c5d0ad40d486571605f73a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cfeaf531ad5842c5d0ad40d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 16:11:17 2009 +0200 mountmgr: Retrieve the volume uuid through HAL/DiskArbitration when creating a device. --- dlls/mountmgr.sys/diskarb.c | 13 +++++++++++-- dlls/mountmgr.sys/hal.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 1597e34..2e5c121 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -42,6 +42,7 @@ static void appeared_callback( DADiskRef disk, void *context ) const void *ref; char device[64]; char mount_point[PATH_MAX]; + GUID guid, *guid_ptr = NULL; enum device_type type = DEVICE_UNKNOWN; if (!dict) return; @@ -50,6 +51,13 @@ static void appeared_callback( DADiskRef disk, void *context ) if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) || !CFBooleanGetValue( ref )) goto done; + if ((ref = CFDictionaryGetValue( dict, CFSTR("DAVolumeUUID") ))) + { + CFUUIDBytes bytes = CFUUIDGetUUIDBytes( ref ); + memcpy( &guid, &bytes, sizeof(guid) ); + guid_ptr = &guid; + } + /* get device name */ if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaBSDName") ))) goto done; strcpy( device, "/dev/r" ); @@ -67,9 +75,10 @@ static void appeared_callback( DADiskRef disk, void *context ) type = DEVICE_CDROM; } - TRACE( "got mount notification for '%s' on '%s'\n", device, mount_point ); + TRACE( "got mount notification for '%s' on '%s' uuid %s\n", + device, mount_point, wine_dbgstr_guid(guid_ptr) ); - add_dos_device( -1, device, device, mount_point, type, NULL ); + add_dos_device( -1, device, device, mount_point, type, guid_ptr ); done: CFRelease( dict ); } diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c index 6e09c2c..5ccb95d 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -28,6 +28,7 @@ #include <sys/time.h> #include "mountmgr.h" +#include "winnls.h" #include "excpt.h" #include "wine/library.h" @@ -105,6 +106,33 @@ static LONG WINAPI assert_fault(EXCEPTION_POINTERS *eptr) return EXCEPTION_CONTINUE_SEARCH; } +static GUID *parse_uuid( GUID *guid, const char *str ) +{ + /* standard uuid format */ + if (strlen(str) == 36) + { + UNICODE_STRING strW; + WCHAR buffer[39]; + + if (MultiByteToWideChar( CP_UNIXCP, 0, str, 36, buffer + 1, 36 )) + { + buffer[0] = '{'; + buffer[37] = '}'; + buffer[38] = 0; + RtlInitUnicodeString( &strW, buffer ); + if (!RtlGUIDFromString( &strW, guid )) return guid; + } + } + + /* check for xxxx-xxxx format (FAT serial number) */ + if (strlen(str) == 9 && str[4] == '-') + { + memset( guid, 0, sizeof(*guid) ); + if (sscanf( str, "%hx-%hx", &guid->Data2, &guid->Data3 ) == 2) return guid; + } + return NULL; +} + /* HAL callback for new device */ static void new_device( LibHalContext *ctx, const char *udi ) { @@ -113,6 +141,8 @@ static void new_device( LibHalContext *ctx, const char *udi ) char *mount_point = NULL; char *device = NULL; char *type = NULL; + char *uuid_str = NULL; + GUID guid, *guid_ptr = NULL; enum device_type drive_type; p_dbus_error_init( &error ); @@ -129,6 +159,11 @@ static void new_device( LibHalContext *ctx, const char *udi ) if (!p_libhal_device_get_property_bool( ctx, parent, "storage.removable", &error )) goto done; + if (!(uuid_str = p_libhal_device_get_property_string( ctx, udi, "volume.uuid", &error ))) + p_dbus_error_free( &error ); /* ignore error */ + else + guid_ptr = parse_uuid( &guid, uuid_str ); + if (!(type = p_libhal_device_get_property_string( ctx, parent, "storage.drive_type", &error ))) p_dbus_error_free( &error ); /* ignore error */ @@ -136,7 +171,7 @@ static void new_device( LibHalContext *ctx, const char *udi ) else if (type && !strcmp( type, "floppy" )) drive_type = DEVICE_FLOPPY; else drive_type = DEVICE_UNKNOWN; - add_dos_device( -1, udi, device, mount_point, drive_type, NULL ); + add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr ); /* add property watch for mount point */ p_libhal_device_add_property_watch( ctx, udi, &error ); @@ -145,6 +180,7 @@ done: if (type) p_libhal_free_string( type ); if (parent) p_libhal_free_string( parent ); if (device) p_libhal_free_string( device ); + if (uuid_str) p_libhal_free_string( uuid_str ); if (mount_point) p_libhal_free_string( mount_point ); p_dbus_error_free( &error ); }

1 0

Alexandre Julliard : mountmgr: Add support for setting the drive UUID instead of having it always hardcoded .
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 84396c2e625d918be73d6948c7aed650e4e139c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84396c2e625d918be73d6948c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 16:05:04 2009 +0200 mountmgr: Add support for setting the drive UUID instead of having it always hardcoded. --- dlls/mountmgr.sys/device.c | 16 ++++++++++++++-- dlls/mountmgr.sys/diskarb.c | 2 +- dlls/mountmgr.sys/hal.c | 2 +- dlls/mountmgr.sys/mountmgr.c | 13 +++++-------- dlls/mountmgr.sys/mountmgr.h | 4 ++-- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 8057a69..1b23d97 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -71,6 +71,7 @@ struct volume struct list entry; /* entry in volumes list */ struct disk_device *device; /* disk device */ char *udi; /* unique identifier for dynamic volumes */ + GUID guid; /* volume uuid */ struct mount_point *mount; /* Volume{xxx} mount point */ }; @@ -109,6 +110,14 @@ static char *strdupA( const char *str ) return ret; } +static const GUID *get_default_uuid( int letter ) +{ + static GUID guid; + + guid.Data4[7] = 'A' + letter; + return &guid; +} + /* read a Unix symlink; returned buffer must be freed by caller */ static char *read_symlink( const char *path ) { @@ -358,7 +367,7 @@ static void set_drive_letter( struct dos_drive *drive, int letter ) id_len = strlen( device->unix_mount ) + 1; } drive->dosdev = add_dosdev_mount_point( device->dev_obj, &device->name, letter, id, id_len ); - volume->mount = add_volume_mount_point( device->dev_obj, &device->name, letter, id, id_len ); + volume->mount = add_volume_mount_point( device->dev_obj, &device->name, &volume->guid, id, id_len ); } static inline int is_valid_device( struct stat *st ) @@ -528,6 +537,7 @@ static void create_drive_devices(void) { drive->volume->device->unix_mount = link; drive->volume->device->unix_device = device; + drive->volume->guid = *get_default_uuid( i ); set_drive_letter( drive, i ); } else @@ -542,7 +552,7 @@ static void create_drive_devices(void) /* create a new dos drive */ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, - const char *mount_point, enum device_type type ) + const char *mount_point, enum device_type type, const GUID *guid ) { struct dos_drive *drive, *next; @@ -575,6 +585,8 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, if (create_dos_device( udi, type, &drive )) return STATUS_NO_MEMORY; found: + if (!guid) guid = get_default_uuid( letter ); + drive->volume->guid = *guid; RtlFreeHeap( GetProcessHeap(), 0, drive->volume->device->unix_device ); drive->volume->device->unix_device = strdupA( device ); set_drive_letter( drive, letter ); diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 3296d04..1597e34 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -69,7 +69,7 @@ static void appeared_callback( DADiskRef disk, void *context ) TRACE( "got mount notification for '%s' on '%s'\n", device, mount_point ); - add_dos_device( -1, device, device, mount_point, type ); + add_dos_device( -1, device, device, mount_point, type, NULL ); done: CFRelease( dict ); } diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c index 310b144..6e09c2c 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -136,7 +136,7 @@ static void new_device( LibHalContext *ctx, const char *udi ) else if (type && !strcmp( type, "floppy" )) drive_type = DEVICE_FLOPPY; else drive_type = DEVICE_UNKNOWN; - add_dos_device( -1, udi, device, mount_point, drive_type ); + add_dos_device( -1, udi, device, mount_point, drive_type, NULL ); /* add property watch for mount point */ p_libhal_device_add_property_watch( ctx, udi, &error ); diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index d2b1515..4554de6 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -103,20 +103,17 @@ struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRIN /* create the Volume mount point symlink for a new device */ struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - int drive, const void *id, unsigned int id_len ) + const GUID *guid, const void *id, unsigned int id_len ) { static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{', '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x', '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; WCHAR link[sizeof(volumeW)]; - GUID guid; - memset( &guid, 0, sizeof(guid) ); /* FIXME */ - guid.Data4[7] = 'A' + drive; - sprintfW( link, volumeW, guid.Data1, guid.Data2, guid.Data3, - guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], - guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); + sprintfW( link, volumeW, guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); return add_mount_point( device, device_name, link, id, id_len ); } @@ -266,7 +263,7 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) case DRIVE_RAMDISK: type = DEVICE_RAMDISK; break; case DRIVE_FIXED: type = DEVICE_HARDDISK_VOL; break; } - return add_dos_device( letter - 'a', NULL, device, mount_point, type ); + return add_dos_device( letter - 'a', NULL, device, mount_point, type, NULL ); } else { diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index e8f7d5d..5ce5886 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -52,7 +52,7 @@ enum device_type }; extern NTSTATUS add_dos_device( int letter, const char *udi, const char *device, - const char *mount_point, enum device_type type ); + const char *mount_point, enum device_type type, const GUID *guid ); extern NTSTATUS remove_dos_device( int letter, const char *udi ); extern NTSTATUS query_dos_device( int letter, enum device_type *type, const char **device, const char **mount_point ); @@ -65,6 +65,6 @@ struct mount_point; extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, int drive, const void *id, unsigned int id_len ); extern struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - int drive, const void *id, unsigned int id_len ); + const GUID *guid, const void *id, unsigned int id_len ); extern void delete_mount_point( struct mount_point *mount ); extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len );

1 0

Alexandre Julliard : mountmgr: Create a separate structure for volume information.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: bc8dce2004438243ae0a7e1feb4f88f15a29a724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc8dce2004438243ae0a7e1fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 15:56:26 2009 +0200 mountmgr: Create a separate structure for volume information. --- dlls/mountmgr.sys/device.c | 100 ++++++++++++++++++++++++++++--------------- 1 files changed, 65 insertions(+), 35 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 8821b41..8057a69 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -66,14 +66,20 @@ struct disk_device char *unix_mount; /* unix mount point path */ }; +struct volume +{ + struct list entry; /* entry in volumes list */ + struct disk_device *device; /* disk device */ + char *udi; /* unique identifier for dynamic volumes */ + struct mount_point *mount; /* Volume{xxx} mount point */ +}; + struct dos_drive { struct list entry; /* entry in drives list */ - struct disk_device *device; /* disk device */ - char *udi; /* unique identifier for dynamic drives */ + struct volume *volume; /* volume for this drive */ int drive; /* drive letter (0 = A: etc.) */ struct mount_point *dosdev; /* DosDevices mount point */ - struct mount_point *volume; /* Volume{xxx} mount point */ }; static struct list drives_list = LIST_INIT(drives_list); @@ -269,6 +275,41 @@ static void delete_disk_device( struct disk_device *device ) IoDeleteDevice( device->dev_obj ); } +/* create a disk volume */ +static NTSTATUS create_volume( const char *udi, enum device_type type, struct volume **volume_ret ) +{ + struct volume *volume; + NTSTATUS status; + + if (!(volume = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*volume) ))) + return STATUS_NO_MEMORY; + + if (udi && !(volume->udi = strdupA( udi ))) + { + RtlFreeHeap( GetProcessHeap(), 0, volume ); + return STATUS_NO_MEMORY; + } + if (!(status = create_disk_device( type, &volume->device ))) + { + *volume_ret = volume; + } + else + { + RtlFreeHeap( GetProcessHeap(), 0, volume->udi ); + RtlFreeHeap( GetProcessHeap(), 0, volume ); + } + return status; +} + +/* delete a volume and the corresponding disk device */ +static void delete_volume( struct volume *volume ) +{ + if (volume->mount) delete_mount_point( volume->mount ); + delete_disk_device( volume->device ); + RtlFreeHeap( GetProcessHeap(), 0, volume->udi ); + RtlFreeHeap( GetProcessHeap(), 0, volume ); +} + /* create the disk device for a given volume */ static NTSTATUS create_dos_device( const char *udi, enum device_type type, struct dos_drive **drive_ret ) { @@ -278,25 +319,14 @@ static NTSTATUS create_dos_device( const char *udi, enum device_type type, struc if (!(drive = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*drive) ))) return STATUS_NO_MEMORY; drive->drive = -1; drive->dosdev = NULL; - drive->volume = NULL; - drive->udi = strdupA( udi ); - if (udi && !drive->udi) - { - RtlFreeHeap( GetProcessHeap(), 0, drive ); - return STATUS_NO_MEMORY; - } - - if (!(status = create_disk_device( type, &drive->device ))) + if (!(status = create_volume( udi, type, &drive->volume ))) { list_add_tail( &drives_list, &drive->entry ); *drive_ret = drive; } - else - { - RtlFreeHeap( GetProcessHeap(), 0, drive->udi ); - RtlFreeHeap( GetProcessHeap(), 0, drive ); - } + else RtlFreeHeap( GetProcessHeap(), 0, drive ); + return status; } @@ -305,9 +335,7 @@ static void delete_dos_device( struct dos_drive *drive ) { list_remove( &drive->entry ); if (drive->dosdev) delete_mount_point( drive->dosdev ); - if (drive->volume) delete_mount_point( drive->volume ); - delete_disk_device( drive->device ); - RtlFreeHeap( GetProcessHeap(), 0, drive->udi ); + delete_volume( drive->volume ); RtlFreeHeap( GetProcessHeap(), 0, drive ); } @@ -316,11 +344,12 @@ static void set_drive_letter( struct dos_drive *drive, int letter ) { void *id = NULL; unsigned int id_len = 0; - struct disk_device *device = drive->device; + struct volume *volume = drive->volume; + struct disk_device *device = volume->device; if (drive->drive == letter) return; if (drive->dosdev) delete_mount_point( drive->dosdev ); - if (drive->volume) delete_mount_point( drive->volume ); + if (volume->mount) delete_mount_point( volume->mount ); drive->drive = letter; if (letter == -1) return; if (device->unix_mount) @@ -329,7 +358,7 @@ static void set_drive_letter( struct dos_drive *drive, int letter ) id_len = strlen( device->unix_mount ) + 1; } drive->dosdev = add_dosdev_mount_point( device->dev_obj, &device->name, letter, id, id_len ); - drive->volume = add_volume_mount_point( device->dev_obj, &device->name, letter, id, id_len ); + volume->mount = add_volume_mount_point( device->dev_obj, &device->name, letter, id, id_len ); } static inline int is_valid_device( struct stat *st ) @@ -420,7 +449,8 @@ static BOOL set_unix_mount_point( struct dos_drive *drive, const char *mount_poi { char *path, *p; BOOL modified = FALSE; - struct disk_device *device = drive->device; + struct volume *volume = drive->volume; + struct disk_device *device = volume->device; if (!(path = get_dosdevices_path( &p ))) return FALSE; p[0] = 'a' + drive->drive; @@ -438,7 +468,7 @@ static BOOL set_unix_mount_point( struct dos_drive *drive, const char *mount_poi RtlFreeHeap( GetProcessHeap(), 0, device->unix_mount ); device->unix_mount = strdupA( mount_point ); if (drive->dosdev) set_mount_point_id( drive->dosdev, mount_point, strlen(mount_point) + 1 ); - if (drive->volume) set_mount_point_id( drive->volume, mount_point, strlen(mount_point) + 1 ); + if (volume->mount) set_mount_point_id( volume->mount, mount_point, strlen(mount_point) + 1 ); } else { @@ -446,7 +476,7 @@ static BOOL set_unix_mount_point( struct dos_drive *drive, const char *mount_poi RtlFreeHeap( GetProcessHeap(), 0, device->unix_mount ); device->unix_mount = NULL; if (drive->dosdev) set_mount_point_id( drive->dosdev, NULL, 0 ); - if (drive->volume) set_mount_point_id( drive->volume, NULL, 0 ); + if (volume->mount) set_mount_point_id( volume->mount, NULL, 0 ); } HeapFree( GetProcessHeap(), 0, path ); @@ -496,8 +526,8 @@ static void create_drive_devices(void) if (!create_dos_device( NULL, drive_type, &drive )) { - drive->device->unix_mount = link; - drive->device->unix_device = device; + drive->volume->device->unix_mount = link; + drive->volume->device->unix_device = device; set_drive_letter( drive, i ); } else @@ -533,9 +563,9 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, LIST_FOR_EACH_ENTRY_SAFE( drive, next, &drives_list, struct dos_drive, entry ) { - if (udi && drive->udi && !strcmp( udi, drive->udi )) + if (udi && drive->volume->udi && !strcmp( udi, drive->volume->udi )) { - if (type == drive->device->type) goto found; + if (type == drive->volume->device->type) goto found; delete_dos_device( drive ); continue; } @@ -545,8 +575,8 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, if (create_dos_device( udi, type, &drive )) return STATUS_NO_MEMORY; found: - RtlFreeHeap( GetProcessHeap(), 0, drive->device->unix_device ); - drive->device->unix_device = strdupA( device ); + RtlFreeHeap( GetProcessHeap(), 0, drive->volume->device->unix_device ); + drive->volume->device->unix_device = strdupA( device ); set_drive_letter( drive, letter ); set_unix_mount_point( drive, mount_point ); @@ -590,8 +620,8 @@ NTSTATUS remove_dos_device( int letter, const char *udi ) if (letter != -1 && drive->drive != letter) continue; if (udi) { - if (!drive->udi) continue; - if (strcmp( udi, drive->udi )) continue; + if (!drive->volume->udi) continue; + if (strcmp( udi, drive->volume->udi )) continue; } if (drive->drive != -1) @@ -625,7 +655,7 @@ NTSTATUS query_dos_device( int letter, enum device_type *type, LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) { if (drive->drive != letter) continue; - disk_device = drive->device; + disk_device = drive->volume->device; if (type) *type = disk_device->type; if (device) *device = disk_device->unix_device; if (mount_point) *mount_point = disk_device->unix_mount;

1 0

Alexandre Julliard : mountmgr: Create a separate structure for disk device information, independent from the DOS drive.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 8fb8b2e6a335fbc6037d0896beedc7179fdfbfd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb8b2e6a335fbc6037d0896b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 15:46:34 2009 +0200 mountmgr: Create a separate structure for disk device information, independent from the DOS drive. --- dlls/mountmgr.sys/device.c | 206 +++++++++++++++++++++++++------------------ 1 files changed, 120 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fb8b2e6a335fbc6037d0…

1 0

Alexandre Julliard : Convert English resources to UTF-8 where necessary.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: a32e4e5ee326c9daf19fa263c2be1c7e9df0ee79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32e4e5ee326c9daf19fa263c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 14:46:48 2009 +0200 Convert English resources to UTF-8 where necessary. --- dlls/avifil32/avifile_En.rc | 2 +- dlls/msrle32/msrle_En.rc | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/avifile_En.rc b/dlls/avifil32/avifile_En.rc index 71c5d3e..e136569 100644 --- a/dlls/avifil32/avifile_En.rc +++ b/dlls/avifil32/avifile_En.rc @@ -1,5 +1,5 @@ /* - * Copyright 2002 Michael G�nnewig + * Copyright 2002 Michael Günnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/msrle32/msrle_En.rc b/dlls/msrle32/msrle_En.rc index becd9d9..e95f395 100644 --- a/dlls/msrle32/msrle_En.rc +++ b/dlls/msrle32/msrle_En.rc @@ -1,7 +1,7 @@ /* * English resource file for MS-RLE * - * Copyright 2002 Michael G�nnewig + * Copyright 2002 Michael Günnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +20,13 @@ #include "msrle_private.h" +#pragma code_page(65001) + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { IDS_NAME "WINE-MS-RLE" IDS_DESCRIPTION "Wine MS-RLE video codec" - IDS_ABOUT "Wine MS-RLE video codec\nCopyright 2002 by Michael G�nnewig" + IDS_ABOUT "Wine MS-RLE video codec\nCopyright 2002 by Michael Günnewig" }

1 0

Alexandre Julliard : winecfg: Fix quote characters in English resource.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: b8484cc082dbc60d12b750b9e56b7dbcfbad68fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8484cc082dbc60d12b750b9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 14:46:34 2009 +0200 winecfg: Fix quote characters in English resource. --- programs/winecfg/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index a69b4d9..cf0ce07 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -264,7 +264,7 @@ BEGIN 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_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_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" END STRINGTABLE DISCARDABLE @@ -288,7 +288,7 @@ BEGIN 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_UNAVAILABLE_DRIVER "Found driver in registry that is not available!\n\nRemove '%s' from registry?" IDS_WARNING "Warning" END

1 0

Alexander Nicolaysen Sørnes : cron: Temporarily disable error reporting
by Alexander Nicolaysen Sørnes July 21, 2009

July 21, 2009

Module: appdb Branch: master Commit: 79df5bcdfcad75ac5f95ab648e375f55884a655f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=79df5bcdfcad75ac5f95ab64… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 16:27:35 2009 +0200 cron: Temporarily disable error reporting --- cron/cleanup.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cron/cleanup.php b/cron/cleanup.php index 299c0b0..7c1fb25 100644 --- a/cron/cleanup.php +++ b/cron/cleanup.php @@ -17,7 +17,8 @@ inactiveUserCheck(); orphanVersionCheck(); /* report error log entries to admins and flush the error log after doing so */ -reportErrorLogEntries(); +// temporarily disabled - it apperas we have too many errors +// reportErrorLogEntries(); /* remove screenshots that are missing their screenshot and thumbnail files */ removeScreenshotsWithMissingFiles();

1 0

Alexandre Julliard : transl: Add a margin to the contents of the text boxes .
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: tools Branch: master Commit: 6462cc1e32dab36aae472dd1d7b61af490591858 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6462cc1e32dab36aae472dd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 15:59:05 2009 +0200 transl: Add a margin to the contents of the text boxes. --- transl/php/index.php | 2 ++ transl/php/lang.php | 6 ++++++ transl/php/style.css | 4 ++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index eb08251..6cd0c7e 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -29,6 +29,7 @@ while ($line = fgets($summary, 1024)) </head> <div class="main"> <h1>Wine translation statistics <?php echo $TITLE_APPENDIX ?></h1> +<div class="contents"> <?php echo $TITLE_DESCR ?> @@ -114,6 +115,7 @@ for ($i = 0; $i < count($transl); $i++) <?php draw_bar($transl_sum, $errors_sum, ($nr-1)*$sum) ?> </table> </div> +</div> <?php if ($time = filemtime("$DATAROOT/langs/summary")) { diff --git a/transl/php/lang.php b/transl/php/lang.php index 2fe240a..2dfb7c7 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -92,16 +92,22 @@ if (preg_match("/:00/", $lang) && $translations == 0) <div class="group"> <h2>Partially translated modules</h2> +<div class="contents"> <?php dump_table($partial) ?> </div> +</div> <div class="group"> <h2>Modules not translated</h2> +<div class="contents"> <?php dump_table($notransl) ?> </div> +</div> <div class="group"> <h2>Fully translated modules</h2> +<div class="contents"> <?php dump_table($transl) ?> </div> +</div> </div> </html> diff --git a/transl/php/style.css b/transl/php/style.css index 0464bc2..affea71 100644 --- a/transl/php/style.css +++ b/transl/php/style.css @@ -38,6 +38,10 @@ div.main { border: 1px solid #601919; } +div.contents { + margin: 5px; +} + div.group { margin: 10px 20% 10px 20%; background-color: white;

1 0

Alexandre Julliard : transl: Specify utf-8 charset everywhere and fix some quoting issues.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: tools Branch: master Commit: d3b35f51f3bf25e4078b1067a5cb5df4688267e2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d3b35f51f3bf25e4078b1067… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 15:46:19 2009 +0200 transl: Specify utf-8 charset everywhere and fix some quoting issues. --- transl/php/index.php | 1 + transl/php/lang.php | 1 + transl/php/lib.php | 2 +- transl/php/resfile.php | 1 + transl/php/resource.php | 1 + 5 files changed, 5 insertions(+), 1 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index f49fade..eb08251 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -24,6 +24,7 @@ while ($line = fgets($summary, 1024)) <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Wine translation statistics <?php echo $TITLE_APPENDIX ?></title> </head> <div class="main"> diff --git a/transl/php/lang.php b/transl/php/lang.php index 45ff62c..2fe240a 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -48,6 +48,7 @@ ksort($notransl); <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title><?php echo get_lang_name($lang) ?> language - Wine translations</title> </head> diff --git a/transl/php/lib.php b/transl/php/lib.php index 84bd179..7fc4ae5 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -177,7 +177,7 @@ function get_locale_name($localeid) { global $LOCALE_NAMES; enum_locale_names(); - return $LOCALE_NAMES[$localeid]; + return htmlspecialchars($LOCALE_NAMES[$localeid],ENT_QUOTES,'UTF-8'); } function get_res_path($resfile) diff --git a/transl/php/resfile.php b/transl/php/resfile.php index a6fa628..71e3c19 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -11,6 +11,7 @@ $msgs = array(); <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Module <?php echo $resfile?> - Wine translations</title> </head> diff --git a/transl/php/resource.php b/transl/php/resource.php index e86fe8c..493e9f1 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -13,6 +13,7 @@ $compare = isset($_REQUEST['compare']); <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title><?php echo get_resource_name($type, $id) ?> from <?php echo $resfile?> - Wine translation</title> </head> <body>

1 0

Paul Vriens : transl: Simplify the resource parsing a bit by using a hash for the languages per module .
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: tools Branch: master Commit: 1ab3af542def7a18d7d753887ce316bbec73752d URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ab3af542def7a18d7d75388… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 09:20:44 2009 +0200 transl: Simplify the resource parsing a bit by using a hash for the languages per module. --- transl/scripts/checkmakefile.pl | 40 ++++++++++++++------------------------ 1 files changed, 15 insertions(+), 25 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 0c91132..e21685c 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -121,13 +121,11 @@ sub mycheck my $type = -1; my $resource; - my %deflangs = (); - my @file_langs = (); - my %reslangs = (); - @file_langs = ("009:01"); - $deflangs{"009:01"} = 1; + my %file_langs = (); + $file_langs{"009:01"} = 1; + my %reslangs = (); my @resources = (); my %transl_count = (); @@ -167,7 +165,7 @@ sub mycheck { my $lang = collapse($1); - # Don't add neutral langs (nn:00) to the file_langs array + # Don't add neutral langs (nn:00) to the file_langs hash # if we have sublangs (nn:xx) in the conf directory, add # it's sublangs instead (if present). # @@ -179,28 +177,20 @@ sub mycheck my $primary_lang = $lang; $primary_lang =~ s/:00//; my $found = 0; - foreach my $language (@languages) + my @sublanguages = grep(/$primary_lang/, @languages); + foreach my $language (@sublanguages) { - if ($language =~ /$primary_lang:./) - { - if (not defined $deflangs{$language}) - { - $deflangs{$language} = 1; - push @file_langs, $language; - } - $found = 1; - } + $file_langs{$language} = 1; + $found = 1; } - if ((!$found) && (not defined $deflangs{$lang})) + if (!$found) { - $deflangs{$lang} = 1; - push @file_langs, $lang; + $file_langs{$lang} = 1; } } - elsif (not defined $deflangs{$lang}) + else { - $deflangs{$lang} = 1; - push @file_langs, $lang; + $file_langs{$lang} = 1; } $reslangs{$type." ".$resource}{$lang} = 1; $transl_count{$lang}++; @@ -244,7 +234,7 @@ sub mycheck { next if ($notransl{$resource}); - foreach my $lang (@file_langs) + foreach my $lang (keys %file_langs) { my $basic_lang = $lang; $basic_lang=~s/:[0-9a-f][0-9a-f]/:00/; @@ -285,7 +275,7 @@ sub mycheck } } } - foreach my $lang (@file_langs) + foreach my $lang (keys %file_langs) { my $suffix; @@ -360,7 +350,7 @@ sub mycheck { next if (!($lang eq collapse($lang))); next if ($transl_count{"009:01"} == 0); - my @transl = grep {$_ eq $lang} @file_langs; + my @transl = grep {$_ eq $lang} keys %file_langs; if ($#transl == -1) { open(LANGOUT, ">>$workdir/langs/$lang");

1 0

Paul Vriens : transl: Show all translations instead of using the conf directory.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: tools Branch: master Commit: 94973ae3864c575cccdfbbfb3fd2f4ca2d6a0a70 URL: http://source.winehq.org/git/tools.git/?a=commit;h=94973ae3864c575cccdfbbfb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 09:37:05 2009 +0200 transl: Show all translations instead of using the conf directory. --- transl/php/lang.php | 8 -- transl/scripts/checkmakefile.pl | 190 +++++++++++++------------------------- 2 files changed, 65 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=94973ae3864c575cccdf…

1 0

Paul Vriens : transl: Move the resource parsing out of the makefile parse loop.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: tools Branch: master Commit: e0d59a8c831d4ad4e94440e6c6cbc7c76fb94965 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e0d59a8c831d4ad4e94440e6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 09:13:51 2009 +0200 transl: Move the resource parsing out of the makefile parse loop. --- transl/scripts/checkmakefile.pl | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index ef83bdd..0c91132 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -433,6 +433,7 @@ if (!@makefiles) @makefiles = split(/\s/,`find $srcdir/ -name Makefile.in -print`); } +my %checks = (); # parse the makefiles foreach my $makefile (@makefiles) { @@ -471,6 +472,15 @@ foreach my $makefile (@makefiles) close MAKEFILE; next unless @files; + $checks{$path}{defines} = $defs; + $checks{$path}{files} = [ @files ]; +} + +foreach my $path (keys %checks) +{ + my $defs = $checks{$path}{defines}; + my @files = @{$checks{$path}{files}}; + if ("$path" eq "dlls/kernel32") { mycheck("nonlocale", $path,$defs,@files);

1 0

Paul Vriens : transl: Rely on kernel32 resources to see if a language is valid.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: tools Branch: master Commit: fc6ad2b296fb1615b245ab69caf8c6f1d6e9706b URL: http://source.winehq.org/git/tools.git/?a=commit;h=fc6ad2b296fb1615b245ab69… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jul 20 18:10:35 2009 +0200 transl: Rely on kernel32 resources to see if a language is valid. --- transl/php/lib.php | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index ab71631..84bd179 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -62,11 +62,13 @@ function enum_locale_names() function validate_lang($id) { - global $DATAROOT; - - $lang = preg_replace("/[^0-9a-f:]/", "-", $id); - if (!file_exists("$DATAROOT/conf/$lang") || !file_exists("$DATAROOT/langs/$lang")) + global $LOCALE_NAMES; + enum_locale_names(); + + if (!isset($LOCALE_NAMES[$id])) die("Invalid lang parameter"); + + $lang = preg_replace("/[^0-9a-f:]/", "-", $id); return $lang; }

1 0

André Hentschel : transl: More valid HTML.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: tools Branch: master Commit: 0cefbbbbea3c096563cc01853a8dd12c4cf3bbff URL: http://source.winehq.org/git/tools.git/?a=commit;h=0cefbbbbea3c096563cc0185… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 17 21:00:12 2009 +0200 transl: More valid HTML. --- transl/php/index.php | 5 +++-- transl/php/lib.php | 6 ++++-- transl/php/resfile.php | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index a000d70..f49fade 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -20,6 +20,7 @@ while ($line = fgets($summary, 1024)) 'missing' => $m[4], 'errors' => $m[5]); } ?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> @@ -53,9 +54,9 @@ function draw_bar($tr, $err, $sum) $miss_len = 300 - $tr_len - $err_len; echo '<td class="bar">'; if ($tr_len > 0) - echo "<img src=\"img/bar0.gif\" height=\"15\" width=\"$tr_len\">"; + echo "<img src=\"img/bar0.gif\" height=\"15\" width=\"$tr_len\" alt=\"translations\">"; if ($err_len > 0) - echo "<img src=\"img/bar1.gif\" height=\"15\" width=\"$err_len\">"; + echo "<img src=\"img/bar1.gif\" height=\"15\" width=\"$err_len\" alt=\"errors\">"; // echo "<img src=\"img/bar6.gif\" height=\"15\" width=\"$miss_len\">"; echo "</td></tr>"; } diff --git a/transl/php/lib.php b/transl/php/lib.php index 400cbf7..ab71631 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -272,7 +272,8 @@ function dump_menu_lang($lang, $link = TRUE) if ($link) echo gen_lang_a($lang); echo get_lang_name($lang); - echo "</a>"; + if ($link) + echo "</a>"; } function dump_menu_resfile($lang, $resfile, $link = TRUE) @@ -280,7 +281,8 @@ function dump_menu_resfile($lang, $resfile, $link = TRUE) if ($link) echo gen_resfile_a($lang, $resfile); echo get_resfile_name($resfile); - echo "</a>"; + if ($link) + echo "</a>"; } function dump_menu_resource($lang, $resfile, $type, $id) diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 337dc89..a6fa628 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -64,7 +64,7 @@ foreach ($msgs as $value) unset($icon); } if (isset($icon)) - echo "<img src=\"img/icon-".$icon."\" width=\"32\">"; + echo "<img src=\"img/icon-".$icon."\" width=\"32\" alt=\"".$value."\">"; $line_lang = $lang; if (preg_match("/@LANG$([0-9a-f]{3}:[0-9a-f]{2})$/", $value, $m))

1 0

Alexander Nicolaysen Sørnes : Revert " Add support for application-wide notes & how-tos"
by Alexander Nicolaysen Sørnes July 21, 2009

July 21, 2009

Module: appdb Branch: master Commit: 0339fa60c2a467e49649e5bbc563eec81e6f9a39 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0339fa60c2a467e49649e5bb… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 16:02:05 2009 +0200 Revert "Add support for application-wide notes & how-tos" This reverts commit e546738913abf539bc6bb0f0249e60db194b5b12. --- include/application.php | 5 -- include/html.php | 17 ------- include/note.php | 107 +++++++++------------------------------------- include/version.php | 10 ++++- runonce | 1 - runonce.php | 28 ------------ tables/appdb_tables.sql | 1 - 7 files changed, 30 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=0339fa60c2a467e49649…

1 0

Alexander Nicolaysen Sørnes : Revert " Run necessary SQL command for app how-to support"
by Alexander Nicolaysen Sørnes July 21, 2009

July 21, 2009

Module: appdb Branch: master Commit: e7b71b52fe802307aa84ea88308db059a2d80fbb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e7b71b52fe802307aa84ea88… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 16:01:13 2009 +0200 Revert "Run necessary SQL command for app how-to support" This reverts commit 9f97de53021a0054ede40129f4de66d959474085. --- runonce | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/runonce b/runonce index 8b13789..56a6051 100755 --- a/runonce +++ b/runonce @@ -1 +1 @@ - +1 \ No newline at end of file

1 0

Alexander Nicolaysen Sørnes : Run necessary SQL command for app how-to support
by Alexander Nicolaysen Sørnes July 21, 2009

July 21, 2009

Module: appdb Branch: master Commit: 9f97de53021a0054ede40129f4de66d959474085 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9f97de53021a0054ede40129… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 15:54:29 2009 +0200 Run necessary SQL command for app how-to support --- runonce | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/runonce b/runonce index 56a6051..8b13789 100755 --- a/runonce +++ b/runonce @@ -1 +1 @@ -1 \ No newline at end of file +

1 0

Alexander Nicolaysen Sørnes : Add support for application-wide notes & how-tos
by Alexander Nicolaysen Sørnes July 21, 2009

July 21, 2009

Module: appdb Branch: master Commit: e546738913abf539bc6bb0f0249e60db194b5b12 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e546738913abf539bc6bb0f0… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Tue Jul 21 03:09:48 2009 +0200 Add support for application-wide notes & how-tos --- include/application.php | 5 ++ include/html.php | 17 +++++++ include/note.php | 107 +++++++++++++++++++++++++++++++++++++--------- include/version.php | 10 +---- runonce | 1 + runonce.php | 28 ++++++++++++ tables/appdb_tables.sql | 1 + 7 files changed, 139 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=e546738913abf539bc6b…

1 0

Alexander Nicolaysen Sørnes : AppDB FAQ: Improve text for submitting new applications
by Alexander Nicolaysen Sørnes July 20, 2009

July 20, 2009

Module: appdb Branch: master Commit: 9ed113f6dc22bb6cbb03c7b97f91e8de7e69b104 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9ed113f6dc22bb6cbb03c7b9… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 20 19:19:36 2009 +0200 AppDB FAQ: Improve text for submitting new applications --- help/appdb_faq.help | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/help/appdb_faq.help b/help/appdb_faq.help index 7cdd832..bc66693 100644 --- a/help/appdb_faq.help +++ b/help/appdb_faq.help @@ -51,12 +51,7 @@ work in Wine, and also what are the tricks to get it working best.<p> <p><b>Q: How does a new application get added to the database?</b></p> <blockquote> -<p><b>A:</b> In order to ensure consistency, only authorized application database -maintainers are permitted to add new applications to the database. -Any application database can comment on a particular application.</p> -<p>Anyone can request that an application be added to the database, -but the application is not actually added until after it has been -reviewed by a maintainer or administrator.</p> +<p><b>A:</b> Any registered user can submit an application. Use the <a href="../objectManager.php?sClass=application_queue&sTitle=Submit+Application&sAction=add">Submit App</a> link in the AppDB sidebar to add an entry; it will be processed by an admin before becoming visible to all users. You can make changes to your queued entries by visiting the <a href="../queueditems.php">Your Queued Items</a> page.</p> </blockquote> <p><b>Q: How can I submit screenshots?</b></p>

1 0

Rein Klazes : user32: Ignore the MFT_BITMAP flag when testing menu items for 'magic' bitmap handles.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: c2ada6409716f06f1953f4be3ba1f862d55df78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ada6409716f06f1953f4be3… Author: Rein Klazes <wijn(a)online.nl> Date: Sun Jul 19 09:12:38 2009 +0200 user32: Ignore the MFT_BITMAP flag when testing menu items for 'magic' bitmap handles. --- dlls/user32/menu.c | 3 +- dlls/user32/tests/menu.c | 92 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 86 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ab473ea..e35372b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2164,8 +2164,7 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) * Note: XP treats only bitmap handles 1 - 6 as "magic" ones * regardless of their id. */ - while (pos > 0 && (menu->items[pos - 1].fType & MFT_BITMAP) && - (INT_PTR)menu->items[pos - 1].hbmpItem >= (INT_PTR)HBMMENU_SYSTEM && + while (pos > 0 && (INT_PTR)menu->items[pos - 1].hbmpItem >= (INT_PTR)HBMMENU_SYSTEM && (INT_PTR)menu->items[pos - 1].hbmpItem <= (INT_PTR)HBMMENU_MBAR_CLOSE_D) pos--; diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 868fd9a..878decf 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2451,6 +2451,48 @@ static HMENU create_menu_from_data(const struct menu_data *item, INT item_count) return hmenu; } +/* use InsertMenuItem: does not set the MFT_BITMAP flag, + * and does not accept non-magic bitmaps with invalid + * bitmap handles */ +static HMENU create_menuitem_from_data(const struct menu_data *item, INT item_count) +{ + HMENU hmenu; + INT i; + BOOL ret; + MENUITEMINFO mii = { sizeof( MENUITEMINFO)}; + + hmenu = CreateMenu(); + assert(hmenu != 0); + + for (i = 0; i < item_count; i++) + { + SetLastError(0xdeadbeef); + + mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STATE; + mii.fType = 0; + if( item[i].type & MFT_BITMAP) + { + mii.fMask |= MIIM_BITMAP; + mii.hbmpItem = (HBITMAP)item[i].str; + } + else if( item[i].type & MFT_SEPARATOR) + mii.fType = MFT_SEPARATOR; + else + { + mii.fMask |= MIIM_STRING; + mii.dwTypeData = (LPSTR)item[i].str; + mii.cch = strlen( item[i].str); + } + mii.fState = 0; + if( item[i].type & MF_HELP) mii.fType |= MF_HELP; + mii.wID = item[i].id; + ret = InsertMenuItem( hmenu, -1, TRUE, &mii); + ok(ret, "%d: InsertMenuItem(%04x, %04x, %p) error %u\n", + i, item[i].type, item[i].id, item[i].str, GetLastError()); + } + return hmenu; +} + static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT item_count) { INT count, i; @@ -2479,14 +2521,12 @@ static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT ite "%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType); ok(mii.wID == item[i].id, "%u: expected wID %04x, got %04x\n", i, item[i].id, mii.wID); - if (item[i].type & (MF_BITMAP | MF_SEPARATOR)) - { + if (mii.hbmpItem || !item[i].str) /* For some reason Windows sets high word to not 0 for * not "magic" ids. */ ok(LOWORD(mii.hbmpItem) == LOWORD(item[i].str), "%u: expected hbmpItem %p, got %p\n", i, item[i].str, mii.hbmpItem); - } else { ok(mii.cch == strlen(item[i].str), @@ -2499,6 +2539,7 @@ static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT ite static void test_InsertMenu(void) { + HBITMAP hbm = CreateBitmap(1,1,1,1,NULL); /* Note: XP treats only bitmap handles 1 - 6 as "magic" ones * regardless of their id. */ @@ -2514,16 +2555,28 @@ static void test_InsertMenu(void) { MF_STRING|MF_HELP, 2, "Help" }, { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(1) } }; - static const struct menu_data in2[] = + static const struct menu_data out1a[] = + { + { MF_STRING, 1, "File" }, + { MF_STRING|MF_HELP, 2, "Help" }, + { MF_HELP, SC_CLOSE, MAKEINTRESOURCE(1) } + }; + const struct menu_data in2[] = { { MF_STRING, 1, "File" }, - { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(100) }, + { MF_BITMAP|MF_HELP, SC_CLOSE, (char*)hbm }, { MF_STRING|MF_HELP, 2, "Help" } }; - static const struct menu_data out2[] = + const struct menu_data out2[] = { { MF_STRING, 1, "File" }, - { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(100) }, + { MF_BITMAP|MF_HELP, SC_CLOSE, (char*)hbm }, + { MF_STRING|MF_HELP, 2, "Help" } + }; + const struct menu_data out2a[] = + { + { MF_STRING, 1, "File" }, + { MF_HELP, SC_CLOSE, (char*)hbm }, { MF_STRING|MF_HELP, 2, "Help" } }; static const struct menu_data in3[] = @@ -2550,9 +2603,16 @@ static void test_InsertMenu(void) { MF_STRING|MF_HELP, 2, "Help" }, { MF_BITMAP|MF_HELP, 1, MAKEINTRESOURCE(1) } }; + static const struct menu_data out4a[] = + { + { MF_STRING, 1, "File" }, + { MF_STRING|MF_HELP, 2, "Help" }, + { MF_HELP, 1, MAKEINTRESOURCE(1) } + }; HMENU hmenu; #define create_menu(a) create_menu_from_data((a), sizeof(a)/sizeof((a)[0])) +#define create_menuitem(a) create_menuitem_from_data((a), sizeof(a)/sizeof((a)[0])) #define compare_menu(h, a) compare_menu_data((h), (a), sizeof(a)/sizeof((a)[0])) hmenu = create_menu(in1); @@ -2571,7 +2631,25 @@ static void test_InsertMenu(void) compare_menu(hmenu, out4); DestroyMenu(hmenu); + /* now using InsertMenuItemInfo */ + hmenu = create_menuitem(in1); + compare_menu(hmenu, out1a); + DestroyMenu(hmenu); + + hmenu = create_menuitem(in2); + compare_menu(hmenu, out2a); + DestroyMenu(hmenu); + + hmenu = create_menuitem(in3); + compare_menu(hmenu, out3); + DestroyMenu(hmenu); + + hmenu = create_menuitem(in4); + compare_menu(hmenu, out4a); + DestroyMenu(hmenu); + #undef create_menu +#undef create_menuitem #undef compare_menu }

1 0

Stefan Leichter : advapi32: Fix parameter types of CreateServiceA/ W in spec file.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 6ee1b0607305faf384f4499ab6670ea34031f42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee1b0607305faf384f4499ab… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Jul 18 09:49:05 2009 +0200 advapi32: Fix parameter types of CreateServiceA/W in spec file. --- dlls/advapi32/advapi32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index d641efd..e9168aa 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -98,8 +98,8 @@ @ stdcall CreateProcessAsUserW(long str str ptr ptr long long ptr str ptr ptr) @ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr) @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) -@ stdcall CreateServiceA(long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) -@ stdcall CreateServiceW (long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) +@ stdcall CreateServiceA(long str str long long long long str str ptr str str str) +@ stdcall CreateServiceW(long wstr wstr long long long long wstr wstr ptr wstr wstr wstr) # @ stub CreateTraceInstanceId @ stdcall CreateWellKnownSid(long ptr ptr ptr) @ stdcall CredDeleteA(str long long)

1 0

Mike Kaplinskiy : ws2_32/tests: Fix test failures on NT4/x86_64.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 83d2108126d4af8b01d9b92e3160420c3b2a374c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d2108126d4af8b01d9b92e3… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Jul 19 21:02:10 2009 -0400 ws2_32/tests: Fix test failures on NT4/x86_64. --- dlls/ws2_32/tests/sock.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bd672c5..21502c2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2862,8 +2862,7 @@ static void test_AcceptEx(void) /* Connect socket #1 */ iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - ok(iret == 0 || - (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK), "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); FD_ZERO ( &fds_accept ); FD_ZERO ( &fds_send ); @@ -2877,15 +2876,17 @@ static void test_AcceptEx(void) for (i = 0; i < 4000; ++i) { - wsa_ok ( ( select ( 0, &fds_accept, &fds_send, NULL, &timeout ) ), SOCKET_ERROR !=, - "select_server (%x): select() failed: %d\n" ); + fd_set fds_openaccept = fds_accept, fds_opensend = fds_send; + + wsa_ok ( ( select ( 0, &fds_openaccept, &fds_opensend, NULL, &timeout ) ), SOCKET_ERROR !=, + "acceptex test(%d): could not select on socket, errno %d\n" ); /* check for incoming requests */ - if ( FD_ISSET ( listener, &fds_accept ) ) { + if ( FD_ISSET ( listener, &fds_openaccept ) ) { got++; if (got == 1) { SOCKET tmp = WSAAccept(listener, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); - ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection\n"); + ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); @@ -2901,14 +2902,14 @@ static void test_AcceptEx(void) ok(FALSE, "Got more than 2 connections?\n"); } } - if ( conn1 && FD_ISSET ( connector2, &fds_send ) ) { + if ( conn1 && FD_ISSET ( connector2, &fds_opensend ) ) { /* Send data on second socket, and stop */ send(connector2, "2", 1, 0); FD_CLR ( connector2, &fds_send ); break; } - if ( FD_ISSET ( connector, &fds_send ) ) { + if ( FD_ISSET ( connector, &fds_opensend ) ) { /* Once #1 is connected, allow #2 to connect */ conn1 = 1; @@ -2916,13 +2917,13 @@ static void test_AcceptEx(void) FD_CLR ( connector, &fds_send ); iret = connect(connector2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - ok(iret == 0 || - (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK), "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); FD_SET ( connector2, &fds_send ); } } - ok (got == 2, "Did not get both connections\n"); + ok (got == 2 || broken(got == 1) /* NT4 */, + "Did not get both connections, got %d\n", got); dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); @@ -2933,7 +2934,7 @@ static void test_AcceptEx(void) set_blocking(acceptor, TRUE); iret = recv( acceptor, buffer, 2, 0); - ok(iret == 1, "Failed to get data, %d\n", iret); + ok(iret == 1, "Failed to get data, %d, errno: %d\n", iret, WSAGetLastError()); ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); @@ -2942,6 +2943,10 @@ static void test_AcceptEx(void) closesocket(acceptor); acceptor = INVALID_SOCKET; + /* clean up in case of failures */ + while ((acceptor = accept(listener, NULL, NULL)) != INVALID_SOCKET) + closesocket(acceptor); + /* Disconnect during receive? */ acceptor = socket(AF_INET, SOCK_STREAM, 0);

1 0

Mike Kaplinskiy : ws2_32/tests: Test closing listener during pending AcceptEx.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 4acc8729c456e238c90afa6d677d539082111aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4acc8729c456e238c90afa6d6… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Jul 19 20:52:50 2009 -0400 ws2_32/tests: Test closing listener during pending AcceptEx. --- dlls/ws2_32/tests/sock.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cecda0d..bd672c5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2972,6 +2972,25 @@ static void test_AcceptEx(void) ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); + acceptor = socket(AF_INET, SOCK_STREAM, 0); + if (acceptor == INVALID_SOCKET) { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + + closesocket(listener); + listener = INVALID_SOCKET; + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(!bret && GetLastError() == ERROR_OPERATION_ABORTED, "GetOverlappedResult failed, error %d\n", GetLastError()); + end: if (overlapped.hEvent) WSACloseEvent(overlapped.hEvent);

1 0

Mike Kaplinskiy : ws2_32/tests: Test AcceptEx during pending AcceptEx call.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 98bc97f770dc1dcf5bf29e4f5519f29a9c169989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98bc97f770dc1dcf5bf29e4f5… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Jul 19 20:54:03 2009 -0400 ws2_32/tests: Test AcceptEx during pending AcceptEx call. --- dlls/ws2_32/tests/sock.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b1db361..cecda0d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2774,6 +2774,11 @@ static void test_AcceptEx(void) &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on already pending socket returned %d + errno %d\n", bret, WSAGetLastError()); + iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError());

1 0

Henri Verbeet : wined3d: Remove an unused struct member.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: e6f55c2650c87598b573f015f75e4a18f24ffc12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f55c2650c87598b573f015f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 20 12:21:49 2009 +0200 wined3d: Remove an unused struct member. --- dlls/wined3d/wined3d_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5d61c6a..59b91b3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1536,7 +1536,6 @@ struct IWineD3DDeviceImpl /* Caches to avoid unneeded context changes */ IWineD3DSurface *lastActiveRenderTarget; - IWineD3DSwapChain *lastActiveSwapChain; /* palettes texture management */ UINT NumberOfPalettes;

1 0

Henri Verbeet : wined3d: Skip some unnecessary FBO binds.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 3a63552fd1880c973f28baf8f9f7a29fd24d1412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a63552fd1880c973f28baf8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 20 12:21:48 2009 +0200 wined3d: Skip some unnecessary FBO binds. --- dlls/wined3d/device.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a1ed4dc..cf23419 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6080,12 +6080,6 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, glClear(GL_COLOR_BUFFER_BIT); checkGLcall("glClear"); - if (This->activeContext->current_fbo) { - context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, &This->activeContext->current_fbo->id); - } else { - context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, NULL); - } - if (swapchain && surface == ((IWineD3DSwapChainImpl *)swapchain)->frontBuffer && ((IWineD3DSwapChainImpl *)swapchain)->backBuffer) { glDrawBuffer(GL_BACK); @@ -6534,12 +6528,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED IWineD3DSurface_ModifyLocation(dst_surface, SFLAG_INDRAWABLE, TRUE); - if (This->activeContext->current_fbo) { - context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, &This->activeContext->current_fbo->id); - } else { - context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, NULL); - } - /* If we switched from GL_BACK to GL_FRONT above, we need to switch back here */ if (dst_swapchain && dst_surface == ((IWineD3DSwapChainImpl *)dst_swapchain)->frontBuffer && ((IWineD3DSwapChainImpl *)dst_swapchain)->backBuffer) {

1 0

Henri Verbeet : wined3d: Recognize the SM4 log opcode.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: dedd62c0e2aa43181ec83444803a95e68e7bf16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dedd62c0e2aa43181ec834448… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 20 12:21:47 2009 +0200 wined3d: Recognize the SM4 log opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 8686232..4e7a69e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -52,6 +52,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EXP = 0x19, + WINED3D_SM4_OP_LOG = 0x2f, WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_RET = 0x3e, @@ -102,6 +103,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, + {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0},

1 0

Vladimir Pankratov : net: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 6e3ed38f6f471954e68eceb20356da6bd17586ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e3ed38f6f471954e68eceb20… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:27:07 2009 +0500 net: Convert the Russian resources to UTF-8. --- programs/net/Ru.rc | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/programs/net/Ru.rc b/programs/net/Ru.rc index a59394b..bf4cd65 100644 --- a/programs/net/Ru.rc +++ b/programs/net/Ru.rc @@ -21,26 +21,29 @@ #include "resources.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "��:\n\nNET [ HELP | START | STOP | USE ]\n" - STRING_START_USAGE, "�� .\n" - STRING_STOP_USAGE, "�� .\n" - STRING_STOP_DEP, "�� : %s\n" - STRING_CANT_STOP, "�� %s\n" - STRING_NO_SCM, "�� .\n" - STRING_NO_SVCHANDLE, "�� .\n" - STRING_START_SVC, "�� %s.\n" - STRING_START_SVC_SUCCESS, "�� %s �� .\n" - STRING_START_SVC_FAIL, "�� %s.\n" - STRING_STOP_SVC, "�� %s.\n" - STRING_STOP_SVC_SUCCESS, "�� %s �� .\n" - STRING_STOP_SVC_FAIL, "�� %s.\n" - STRING_HELP_USAGE, "��:\n\nNET HELP ��\n -��-\nNET �� /HELP\n\n"\ - " �� :\n NET HELP NET START NET STOP NET USE\n" - STRING_NO_ENTRIES, "�� .\n" - STRING_USE_HEADER, "\n�� \n---------------------------------------------------------------\n" - STRING_USE_ENTRY, "%s %S %S �� : %lu\n" + STRING_USAGE, "Использование:\n\nNET [ HELP | START | STOP | USE ]\n" + STRING_START_USAGE, "Укажите запускаемую службу.\n" + STRING_STOP_USAGE, "Укажите останавливаемую службу.\n" + STRING_STOP_DEP, "Остановка зависимой службы: %s\n" + STRING_CANT_STOP, "Невозможно остановить службу %s\n" + STRING_NO_SCM, "Невозможно получить доступ к диспетчеру служб.\n" + STRING_NO_SVCHANDLE, "Невозможно получить доступ к службе.\n" + STRING_START_SVC, "Запуск службы %s.\n" + STRING_START_SVC_SUCCESS, "Служба %s успешно запущена.\n" + STRING_START_SVC_FAIL, "Ошибка при запуске службы %s.\n" + STRING_STOP_SVC, "Остановка службы %s.\n" + STRING_STOP_SVC_SUCCESS, "Служба %s успешно остановлена.\n" + STRING_STOP_SVC_FAIL, "Ошибка при остановке службы %s.\n" + STRING_HELP_USAGE, "Использование:\n\nNET HELP команда\n -или-\nNET команда /HELP\n\n"\ + " Доступные команды:\n NET HELP NET START NET STOP NET USE\n" + STRING_NO_ENTRIES, "Список пуст.\n" + STRING_USE_HEADER, "\nСтатус Локальный Удалённый\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S Открытых ресурсов: %lu\n" }

1 0

Vladimir Pankratov : reg: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 08c9f775d4cf283081e05e5f95fce8b1c3fe21d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c9f775d4cf283081e05e5f9… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:27:46 2009 +0500 reg: Convert the Russian resources to UTF-8. --- programs/reg/Ru.rc | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/reg/Ru.rc b/programs/reg/Ru.rc index 8e07c4c..cac53a3 100644 --- a/programs/reg/Ru.rc +++ b/programs/reg/Ru.rc @@ -20,12 +20,15 @@ #include "reg.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "�� :\n\nREG [ ADD | DELETE | QUERY ]\nREG <��> /?\n" - STRING_ADD_USAGE, "REG ADD <��> [/v <��> | /ve] [/t <��>] [/s <��>] [/d ��] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE <��> [/v <��> | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY <��> [/v <��> | /ve] [/s]\n" + STRING_USAGE, "Использование программы:\n\nREG [ ADD | DELETE | QUERY ]\nREG <команда> /?\n" + STRING_ADD_USAGE, "REG ADD <ключ> [/v <параметр> | /ve] [/t <тип>] [/s <разделитель>] [/d данные] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE <ключ> [/v <параметр> | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY <ключ> [/v <параметр> | /ve] [/s]\n" }

1 0

Vladimir Pankratov : progman: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 4efecf2af5c7b71fa2d777dbdcdf7dc72755fcd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4efecf2af5c7b71fa2d777dbd… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:27:31 2009 +0500 progman: Convert the Russian resources to UTF-8. --- programs/progman/Ru.rc | 202 ++++++++++++++++++++++++------------------------ 1 files changed, 100 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4efecf2af5c7b71fa2d77…

1 0

Vladimir Pankratov : oleview: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 3e388b834011f667db69d610e770afa79c070019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e388b834011f667db69d610e… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:27:17 2009 +0500 oleview: Convert the Russian resources to UTF-8. --- programs/oleview/Ru.rc | 135 ++++++++++++++++++++++++----------------------- 1 files changed, 69 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e388b834011f667db69d…

1 0

Vladimir Pankratov : notepad: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 8682830355480ed63545746220d9a14e130ec9cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8682830355480ed6354574622… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:26:55 2009 +0500 notepad: Convert the Russian resources to UTF-8. --- programs/notepad/Ru.rc | 139 +++++++++++++++++++++++++++--------------------- 1 files changed, 79 insertions(+), 60 deletions(-) diff --git a/programs/notepad/Ru.rc b/programs/notepad/Ru.rc index 6e9f64e..814b7fc 100644 --- a/programs/notepad/Ru.rc +++ b/programs/notepad/Ru.rc @@ -20,46 +20,49 @@ #include "notepad_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT MAIN_MENU MENU { - POPUP "&��" { - MENUITEM "��&��\tCtrl+N", CMD_NEW - MENUITEM "&��...\tCtrl+O", CMD_OPEN - MENUITEM "&��\tCtrl+S", CMD_SAVE - MENUITEM "�� &��...", CMD_SAVE_AS + POPUP "&Файл" { + MENUITEM "Созд&ать\tCtrl+N", CMD_NEW + MENUITEM "&Открыть...\tCtrl+O", CMD_OPEN + MENUITEM "&Сохранить\tCtrl+S", CMD_SAVE + MENUITEM "Сохранить &как...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "&��...\tCtrl+P", CMD_PRINT - MENUITEM "��&�� ...", CMD_PAGE_SETUP - MENUITEM "&�� ...", CMD_PRINTER_SETUP + MENUITEM "&Печатать...\tCtrl+P", CMD_PRINT + MENUITEM "Пара&метры страницы...", CMD_PAGE_SETUP + MENUITEM "&Настройка принтера...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "�&��", CMD_EXIT + MENUITEM "В&ыход", CMD_EXIT } -POPUP "&��" { - MENUITEM "&��\tCtrl+Z", CMD_UNDO +POPUP "&Правка" { + MENUITEM "&Отменить\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "&��\tCtrl+X", CMD_CUT - MENUITEM "&��\tCtrl+C", CMD_COPY - MENUITEM "��&��\tCtrl+V", CMD_PASTE - MENUITEM "&��\tDel", CMD_DELETE + MENUITEM "&Вырезать\tCtrl+X", CMD_CUT + MENUITEM "&Копировать\tCtrl+C", CMD_COPY + MENUITEM "Вст&авить\tCtrl+V", CMD_PASTE + MENUITEM "&Удалить\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "�� &��", CMD_SELECT_ALL - MENUITEM "��&� � ��\tF5", CMD_TIME_DATE + MENUITEM "Выделить в&се", CMD_SELECT_ALL + MENUITEM "Врем&я и дата\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&�� ", CMD_WRAP - MENUITEM "&��...", CMD_FONT + MENUITEM "&Перенос по словам", CMD_WRAP + MENUITEM "&Шрифт...", CMD_FONT } -POPUP "�&��" { - MENUITEM "&��...", CMD_SEARCH - MENUITEM "�� &��\tF3", CMD_SEARCH_NEXT +POPUP "П&оиск" { + MENUITEM "&Найти...", CMD_SEARCH + MENUITEM "Найти &далее\tF3", CMD_SEARCH_NEXT } -POPUP "&��" { - MENUITEM "&��", CMD_HELP_CONTENTS - MENUITEM "&��...", CMD_HELP_SEARCH - MENUITEM "&�� ", CMD_HELP_ON_HELP +POPUP "&Справка" { + MENUITEM "&Содержание", CMD_HELP_CONTENTS + MENUITEM "&Поиск...", CMD_HELP_SEARCH + MENUITEM "&Использование справки", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&� Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&О Notepad", CMD_HELP_ABOUT_NOTEPAD } } @@ -68,53 +71,69 @@ POPUP "& DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "�� " +CAPTION "Параметры страницы" { -LTEXT "�&�� :", 0x140, 10, 07, 40, 15 +LTEXT "В&ерхний колонтитул:", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "�&�� :", 0x142, 10, 24, 40, 15 +LTEXT "Н&ижний колонтитул:", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP -GROUPBOX "�� (��):", 0x144, 10, 43,160, 45 -LTEXT "&��:", 0x145, 20, 55, 30, 10, WS_CHILD +GROUPBOX "Поля (мм):", 0x144, 10, 43,160, 45 +LTEXT "&Левое:", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&��:", 0x148, 20, 73, 30, 10, WS_CHILD +LTEXT "&Верхнее:", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&��:", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "&Правое:", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&��:", 0x14E,100, 73, 30, 10, WS_CHILD +LTEXT "&Нижнее:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "��", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&��", IDHELP, 180, 39, 40, 15, WS_TABSTOP +PUSHBUTTON "Отмена", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Справка", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Кодировка:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "�� &p" - -STRING_NOTEPAD, "��" -STRING_ERROR, "��" -STRING_WARNING, "��" -STRING_INFO, "��" - -STRING_UNTITLED, "(�� )" - -STRING_ALL_FILES, "�� (*.*)" -STRING_TEXT_FILES_TXT, "�� (*.txt)" - -STRING_TOOLARGE, "�� '%s' �� .\n \ -�� ." -STRING_NOTEXT, "�� . \ -\n�� -�� ." -STRING_DOESNOTEXIST, "�� '%s'\n�� \n\n \ -�� ?" -STRING_NOTSAVED, "�� '%s'\n�� \n\n \ -�� ?" -STRING_NOTFOUND, "'%s' �� ." -STRING_OUT_OF_MEMORY, "�� \ -\n�� ." +STRING_PAGESETUP_FOOTERVALUE, "Страница &p" + +STRING_NOTEPAD, "Блокнот" +STRING_ERROR, "ОШИБКА" +STRING_WARNING, "ВНИМАНИЕ" +STRING_INFO, "Информация" + +STRING_UNTITLED, "(без заголовка)" + +STRING_ALL_FILES, "Все файлы (*.*)" +STRING_TEXT_FILES_TXT, "Текстовые файлы (*.txt)" + +STRING_TOOLARGE, "Файл '%s' слишком большой для блокнота.\n \ +Используйте другой редактор." +STRING_NOTEXT, "Вы не ввели никакого текста. \ +\nВведите что-нибудь и попробуйте еще." +STRING_DOESNOTEXIST, "Файл '%s'\nне существует\n\n \ +Хотите создать новый файл?" +STRING_NOTSAVED, "Файл '%s'\nбыл изменен\n\n \ +Хотите сохранить изменения?" +STRING_NOTFOUND, "'%s' не найден." +STRING_OUT_OF_MEMORY, "Недостаточно памяти для завершения этой операции \ +\nЗакройте одно или несколько приложений и повторите попытку." + +STRING_UNICODE_LE, "Юникод (UTF-16)" +STRING_UNICODE_BE, "Юникод (UTF-16 big-endian)" +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Этот файл содержит текст в формате Юникод, который будет потерян, если вы сохраните этот файл как файл в кодировке %s.\n\ +Чтобы сохранить данные в формате Юникод, нажмите кнопку \"Отмена\" и выберите\n\ +один из вариантов сохранения в формате Юникод.\n\ +Продолжить?" }

1 0

Vladimir Pankratov : cmdlgtst: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 6f4b182b7e08152ca05f7e9a8572de8e7535d4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4b182b7e08152ca05f7e9a8… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:26:38 2009 +0500 cmdlgtst: Convert the Russian resources to UTF-8. --- programs/cmdlgtst/Ru.rc | 125 ++++++++++++++++++++++++----------------------- 1 files changed, 64 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f4b182b7e08152ca05f7…

1 0

Vladimir Pankratov : clock: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: e02f113f315357551bd798e02cf6c507bc1041c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02f113f315357551bd798e02… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:26:18 2009 +0500 clock: Convert the Russian resources to UTF-8. --- programs/clock/Ru.rc | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/programs/clock/Ru.rc b/programs/clock/Ru.rc index df5b489..71bd67f 100644 --- a/programs/clock/Ru.rc +++ b/programs/clock/Ru.rc @@ -20,29 +20,34 @@ #include "clock_res.h" -MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +MAIN_MENU MENU { - POPUP "&��" { - MENUITEM "&��", IDM_ANALOG - MENUITEM "&��", IDM_DIGITAL + POPUP "&Свойства" { + MENUITEM "&Аналовые", IDM_ANALOG + MENUITEM "&Цифровые", IDM_DIGITAL MENUITEM SEPARATOR - MENUITEM "&��...", IDM_FONT + MENUITEM "&Шрифт...", IDM_FONT MENUITEM SEPARATOR - MENUITEM "&�� ", IDM_NOTITLE + MENUITEM "&Без заголовка", IDM_NOTITLE MENUITEM SEPARATOR - MENUITEM "&��", IDM_SECONDS - MENUITEM "&��", IDM_DATE + MENUITEM "&Секунды", IDM_SECONDS + MENUITEM "&Дата", IDM_DATE MENUITEM SEPARATOR - MENUITEM "&�� ", IDM_ONTOP + MENUITEM "&Поверх всех", IDM_ONTOP } - POPUP "&��" { - MENUITEM "&��...", IDM_LICENSE - MENUITEM "&�� ...", IDM_NOWARRANTY - MENUITEM "&� ��...", IDM_ABOUT + POPUP "&Сведения" { + MENUITEM "&Лицензия...", IDM_LICENSE + MENUITEM "&БЕЗ ГАРАНТИЙ...", IDM_NOWARRANTY + MENUITEM "&О программе...", IDM_ABOUT } } -STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { -IDS_CLOCK, "��" +IDS_CLOCK, "Часы" }

1 0

Stefan Dösinger : wined3d: Set the highest dirty marker after marking shader constants dirty.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: e06997359f7a38ef9920627cd88e7fccb349cffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06997359f7a38ef9920627cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 17 15:26:44 2009 +0200 wined3d: Set the highest dirty marker after marking shader constants dirty. --- dlls/wined3d/context.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 172cd6b..078005f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1794,10 +1794,12 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if(This->activeContext->vshader_const_dirty) { memset(This->activeContext->vshader_const_dirty, 1, sizeof(*This->activeContext->vshader_const_dirty) * GL_LIMITS(vshader_constantsF)); + This->highest_dirty_vs_const = GL_LIMITS(vshader_constantsF); } if(This->activeContext->pshader_const_dirty) { memset(This->activeContext->pshader_const_dirty, 1, sizeof(*This->activeContext->pshader_const_dirty) * GL_LIMITS(pshader_constantsF)); + This->highest_dirty_ps_const = GL_LIMITS(pshader_constantsF); } This->activeContext = context; context_set_last_device(This);

1 0

Stefan Dösinger : wined3d: Don' t activate a context unless we need one.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: cd7f43b00dbe12f3b999773b0dfca27f7137c501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7f43b00dbe12f3b999773b0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 17 11:48:32 2009 +0200 wined3d: Don't activate a context unless we need one. --- dlls/wined3d/arb_program_shader.c | 8 ++++++-- dlls/wined3d/glsl_shader.c | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6b82049..e7ca690 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4359,8 +4359,6 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)baseShader->baseShader.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - if (shader_is_pshader_version(baseShader->baseShader.reg_maps.shader_version.type)) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *) iface; @@ -4369,6 +4367,9 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { if(!shader_data) return; /* This can happen if a shader was never compiled */ ENTER_GL(); + + if(shader_data->num_gl_shaders) ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + for(i = 0; i < shader_data->num_gl_shaders; i++) { GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId))"); @@ -4384,6 +4385,9 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { if(!shader_data) return; /* This can happen if a shader was never compiled */ ENTER_GL(); + + if(shader_data->num_gl_shaders) ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + for(i = 0; i < shader_data->num_gl_shaders; i++) { GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId)); checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &shader_data->gl_shaders[i].prgId))"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0189616..65c5b04 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4331,8 +4331,6 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { */ char pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - if(pshader) { struct glsl_pshader_private *shader_data; ps = (IWineD3DPixelShaderImpl *) This; @@ -4344,6 +4342,8 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { return; } + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if (priv->glsl_program && (IWineD3DBaseShader *)priv->glsl_program->pshader == iface) { ENTER_GL(); @@ -4361,6 +4361,8 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { return; } + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if (priv->glsl_program && (IWineD3DBaseShader *)priv->glsl_program->vshader == iface) { ENTER_GL();

1 0

Austin English : shell32: Adjust shell folders to more closely match Windows.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: c68a20fb800b4ac6755f25b577bfdd318710402f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68a20fb800b4ac6755f25b57… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jul 19 18:44:59 2009 -0500 shell32: Adjust shell folders to more closely match Windows. --- dlls/shell32/shellpath.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 44f0750..0f07a85 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -764,6 +764,7 @@ static const WCHAR Common_Administrative_ToolsW[] = {'C','o','m','m','o','n',' ' static const WCHAR Common_AppDataW[] = {'C','o','m','m','o','n',' ','A','p','p','D','a','t','a','\0'}; static const WCHAR Common_DesktopW[] = {'C','o','m','m','o','n',' ','D','e','s','k','t','o','p','\0'}; static const WCHAR Common_DocumentsW[] = {'C','o','m','m','o','n',' ','D','o','c','u','m','e','n','t','s','\0'}; +static const WCHAR Common_FavoritesW[] = {'C','o','m','m','o','n',' ','F','a','v','o','r','i','t','e','s','\0'}; static const WCHAR CommonFilesDirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r','\0'}; static const WCHAR CommonMusicW[] = {'C','o','m','m','o','n','M','u','s','i','c','\0'}; static const WCHAR CommonPicturesW[] = {'C','o','m','m','o','n','P','i','c','t','u','r','e','s','\0'}; @@ -981,7 +982,7 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x1f - CSIDL_COMMON_FAVORITES */ CSIDL_Type_AllUsers, - FavoritesW, + Common_FavoritesW, MAKEINTRESOURCEW(IDS_FAVORITES) }, { /* 0x20 - CSIDL_INTERNET_CACHE */ @@ -2041,6 +2042,10 @@ static HRESULT _SHRegisterCommonShellFolders(void) CSIDL_COMMON_APPDATA, CSIDL_COMMON_TEMPLATES, CSIDL_COMMON_DOCUMENTS, + CSIDL_COMMON_ADMINTOOLS, + CSIDL_COMMON_MUSIC, + CSIDL_COMMON_PICTURES, + CSIDL_COMMON_VIDEO, }; HRESULT hr;

1 0

Austin English : notepad: English resource fixes.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 95a7e5f8bd4308f5389705998792114c98a8d65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a7e5f8bd4308f5389705998… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jul 19 19:23:24 2009 -0500 notepad: English resource fixes. --- programs/notepad/En.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index 15439b1..d9ea7cd 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -116,14 +116,14 @@ STRING_UNTITLED, "Untitled" STRING_ALL_FILES, "All files (*.*)" STRING_TEXT_FILES_TXT, "Text files (*.txt)" -STRING_TOOLARGE, "File '%s' is too large for notepad.\n \ +STRING_TOOLARGE, "File '%s' is too large for notepad.\n\ Please use a different editor." -STRING_NOTEXT, "You didn't enter any text. \ +STRING_NOTEXT, "You didn't enter any text.\ \nPlease type something and try again" -STRING_DOESNOTEXIST, "File '%s' does not exist\n\n \ -Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s' has been modified\n\n \ -Would you like to save the changes ?" +STRING_DOESNOTEXIST, "File '%s' does not exist.\n\n\ +Do you want to create a new file?" +STRING_NOTSAVED, "File '%s' has been modified.\n\n\ +Would you like to save the changes?" STRING_NOTFOUND, "'%s' could not be found." STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ task.\nClose one or more applications to increase the amount of free memory."

1 0

Frédéric Delanoy : notepad: French resources fixes.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: addeb0e34abc522c659e73905f7e02cf1c99cb74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addeb0e34abc522c659e73905… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 20 10:50:03 2009 +0200 notepad: French resources fixes. --- programs/notepad/Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc index 3ec4262..77b3c3c 100644 --- a/programs/notepad/Fr.rc +++ b/programs/notepad/Fr.rc @@ -124,9 +124,9 @@ STRING_TOOLARGE, "Le fichier « %s » est trop gr Veuillez utiliser un autre éditeur." STRING_NOTEXT, "Vous n'avez pas entré de texte. \ Veuillez taper quelque chose et recommencer" -STRING_DOESNOTEXIST, "Le fichier « %s »\nn'existe pas.\n\n\ +STRING_DOESNOTEXIST, "Le fichier « %s » n'existe pas.\n\n\ Voulez-vous créer un nouveau fichier ?" -STRING_NOTSAVED, "Le fichier « %s »\na été modifié\n\n \ +STRING_NOTSAVED, "Le fichier « %s » a été modifié\n\n\ Voulez-vous enregistrer vos modifications ?" STRING_NOTFOUND, "« %s » non trouvé." STRING_OUT_OF_MEMORY, "Pas assez de mémoire pour terminer cette \

1 0

Nikolay Sivov : wingdi.h: Fix RGBQUAD and RGBTRIPLE to match PSDK.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 1218c2b5f6104223ac0c965149317631e7566341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1218c2b5f6104223ac0c96514… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 19 23:59:19 2009 +0400 wingdi.h: Fix RGBQUAD and RGBTRIPLE to match PSDK. --- include/wingdi.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index a6cdd64..0e5d5e6 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1775,14 +1775,14 @@ typedef struct tagEXTLOGPEN /* Device-independent bitmaps */ -typedef struct { +typedef struct tagRGBQUAD { BYTE rgbBlue; BYTE rgbGreen; BYTE rgbRed; BYTE rgbReserved; } RGBQUAD, *LPRGBQUAD; -typedef struct { +typedef struct tagRGBTRIPLE { BYTE rgbtBlue; BYTE rgbtGreen; BYTE rgbtRed;

1 0

Aurimas Fišeras : Various small Lithuanian translation fixes.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: d05f1d3e0a51359805f7f70f637edd834baa7c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05f1d3e0a51359805f7f70f6… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jul 19 18:42:46 2009 +0300 Various small Lithuanian translation fixes. --- dlls/crypt32/crypt32_Lt.rc | 4 ++-- dlls/cryptui/cryptui_Lt.rc | 4 ++-- dlls/localui/ui_Lt.rc | 2 +- dlls/oledlg/oledlg_Lt.rc | 2 +- dlls/setupapi/Lt.rc | 2 +- dlls/shell32/shell32_Lt.rc | 12 ++++++------ programs/regedit/Lt.rc | 10 +++++----- programs/start/Lt.rc | 2 +- programs/taskmgr/Lt.rc | 2 +- programs/uninstaller/Lt.rc | 2 +- programs/winemine/Lt.rc | 2 +- programs/xcopy/Lt.rc | 10 +++++----- 12 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d05f1d3e0a51359805f7f…

1 0