August 2007 - Wine-commits - list.winehq.org

tools/winetest gather
by Jeremy Newman 23 Aug '07

23 Aug '07

ChangeSet ID: 31337 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/23 10:08:35 Modified files: winetest : gather Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Show the dll information on the results page Patch: http://cvs.winehq.org/patch.py?id=31337 Old revision New revision Changes Path 1.29 1.30 +21 -2 tools/winetest/gather Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.29 tools/winetest/gather:1.30 --- tools/winetest/gather:1.29 23 Aug 2007 15: 8:35 -0000 +++ tools/winetest/gather 23 Aug 2007 15: 8:35 -0000 @@ -182,12 +182,22 @@ foreach (@groups) { $header .= " <th><a href=\"#$_->{name}\">$_->{name} $testnum reports</a></th>\n"; } else { my $test = $_->{tests}->[0]; - $header .= <<"EOF"; + # If dllinfo.txt exist we use a different layout (new style report) + if (-r "$datadir/$build/$test->{dir}/dllinfo.txt") { + $header .= <<"EOF"; + <th>$_->{name} + <a href=\"$test->{dir}/version.txt\">$test->{tag}</a> + <a href=\"$test->{dir}/dllinfo.txt\">[info]</a> + <a href=\"$test->{dir}/report\">[file]</a></th> +EOF + } else { + $header .= <<"EOF"; <th>$_->{name} <a href=\"$test->{dir}/build.txt\">$test->{tag}</a> <a href=\"$test->{dir}/version.txt\">[info]</a> <a href=\"$test->{dir}/report\">[file]</a></th> EOF + } } } } @@ -339,11 +349,20 @@ foreach my $group (@groups) { $header = ""; foreach (@{$group->{tests}}) { - $header .= <<"EOF"; + # If dllinfo.txt exist we use a different layout (new style report) + if (-r "$datadir/$build/$_->{dir}/dllinfo.txt") { + $header .= <<"EOF"; + <th><a href=\"$_->{dir}/version.txt\">$_->{tag}</a> + <a href=\"$_->{dir}/dllinfo.txt\">[info]</a> + <a href=\"$_->{dir}/report\">[file]</a></th> +EOF + } else { + $header .= <<"EOF"; <th><a href=\"$_->{dir}/build.txt\">$_->{tag}</a> <a href=\"$_->{dir}/version.txt\">[info]</a> <a href=\"$_->{dir}/report\">[file]</a></th> EOF + } } chop $header;

1 0

Detlef Riekenberg : wineprefixcreate: Create spool/ drivers directory for printer drivers.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: b500333954f6b6e2b418e02f9ff2167d774375a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b500333954f6b6e2b418e02f9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Aug 22 21:48:51 2007 +0200 wineprefixcreate: Create spool/drivers directory for printer drivers. --- tools/wineprefixcreate.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index d5d76dd..fb60140 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -159,6 +159,8 @@ for i in \ "$CROOT/windows/system" \ "$CROOT/windows/system32" \ "$CROOT/windows/system32/drivers" \ + "$CROOT/windows/system32/spool" \ + "$CROOT/windows/system32/spool/drivers" \ "$CROOT/windows/temp" do [ -d "$i" ] || mkdir "$i"

1 0

Detlef Riekenberg : winspool: Strings can be NULL in AddPrinterDriverExA.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 9be4cc3abfa09a3e4fc8040705c33781db3aaecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be4cc3abfa09a3e4fc804070… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Aug 22 23:41:44 2007 +0200 winspool: Strings can be NULL in AddPrinterDriverExA. --- dlls/winspool.drv/info.c | 59 +++++++++++++++++++++++++++++++-------------- 1 files changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 1ed05fd..fee2210 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6653,7 +6653,8 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW DWORD len; DWORD res = FALSE; - FIXME("(%s, %d, %p, 0x%x)\n", debugstr_a(pName), Level, pDriverInfo, dwFileCopyFlags); + TRACE("(%s, %d, %p, 0x%x)\n", debugstr_a(pName), Level, pDriverInfo, dwFileCopyFlags); + diA = (DRIVER_INFO_8A *) pDriverInfo; ZeroMemory(&diW, sizeof(diW)); @@ -6677,61 +6678,81 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW /* common fields */ diW.cVersion = diA->cVersion; - len = MultiByteToWideChar(CP_ACP, 0, diA->pName, -1, NULL, 0); - diW.pName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, diA->pName, -1, diW.pName, len); + if (diA->pName) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pName, -1, NULL, 0); + diW.pName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pName, -1, diW.pName, len); + } - len = MultiByteToWideChar(CP_ACP, 0, diA->pEnvironment, -1, NULL, 0); - diW.pEnvironment = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, diA->pEnvironment, -1, diW.pEnvironment, len); + if (diA->pEnvironment) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pEnvironment, -1, NULL, 0); + diW.pEnvironment = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pEnvironment, -1, diW.pEnvironment, len); + } - len = MultiByteToWideChar(CP_ACP, 0, diA->pDriverPath, -1, NULL, 0); - diW.pDriverPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, diA->pDriverPath, -1, diW.pDriverPath, len); + if (diA->pDriverPath) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pDriverPath, -1, NULL, 0); + diW.pDriverPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pDriverPath, -1, diW.pDriverPath, len); + } - len = MultiByteToWideChar(CP_ACP, 0, diA->pDataFile, -1, NULL, 0); - diW.pDataFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, diA->pDataFile, -1, diW.pDataFile, len); + if (diA->pDataFile) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pDataFile, -1, NULL, 0); + diW.pDataFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pDataFile, -1, diW.pDataFile, len); + } - len = MultiByteToWideChar(CP_ACP, 0, diA->pConfigFile, -1, NULL, 0); - diW.pConfigFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, diA->pConfigFile, -1, diW.pConfigFile, len); + if (diA->pConfigFile) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pConfigFile, -1, NULL, 0); + diW.pConfigFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pConfigFile, -1, diW.pConfigFile, len); + } - if (Level > 2) { + if ((Level > 2) && diA->pDependentFiles) { lenA = multi_sz_lenA(diA->pDependentFiles); len = MultiByteToWideChar(CP_ACP, 0, diA->pDependentFiles, lenA, NULL, 0); diW.pDependentFiles = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, diA->pDependentFiles, lenA, diW.pDependentFiles, len); + } + if ((Level > 2) && diA->pMonitorName) { len = MultiByteToWideChar(CP_ACP, 0, diA->pMonitorName, -1, NULL, 0); diW.pMonitorName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, diA->pMonitorName, -1, diW.pMonitorName, len); } - if (Level > 3) { + if ((Level > 3) && diA->pDefaultDataType) { len = MultiByteToWideChar(CP_ACP, 0, diA->pDefaultDataType, -1, NULL, 0); diW.pDefaultDataType = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, diA->pDefaultDataType, -1, diW.pDefaultDataType, len); + } + if ((Level > 3) && diA->pszzPreviousNames) { lenA = multi_sz_lenA(diA->pszzPreviousNames); len = MultiByteToWideChar(CP_ACP, 0, diA->pszzPreviousNames, lenA, NULL, 0); diW.pszzPreviousNames = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, diA->pszzPreviousNames, lenA, diW.pszzPreviousNames, len); } - if (Level > 5) { + if ((Level > 5) && diA->pszMfgName) { len = MultiByteToWideChar(CP_ACP, 0, diA->pszMfgName, -1, NULL, 0); diW.pszMfgName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, diA->pszMfgName, -1, diW.pszMfgName, len); + } + if ((Level > 5) && diA->pszOEMUrl) { len = MultiByteToWideChar(CP_ACP, 0, diA->pszOEMUrl, -1, NULL, 0); diW.pszOEMUrl = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, diA->pszOEMUrl, -1, diW.pszOEMUrl, len); + } + if ((Level > 5) && diA->pszHardwareID) { len = MultiByteToWideChar(CP_ACP, 0, diA->pszHardwareID, -1, NULL, 0); diW.pszHardwareID = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, diA->pszHardwareID, -1, diW.pszHardwareID, len); + } + if ((Level > 5) && diA->pszProvider) { len = MultiByteToWideChar(CP_ACP, 0, diA->pszProvider, -1, NULL, 0); diW.pszProvider = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, diA->pszProvider, -1, diW.pszProvider, len);

1 0

Mikolaj Zalewski : advapi32: Return an error if we try to start an already running service.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 346fbb32e109c20ed7367e92a4a72c52c1f077c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=346fbb32e109c20ed7367e92a… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Aug 22 18:08:29 2007 -0700 advapi32: Return an error if we try to start an already running service. --- dlls/advapi32/service.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 458653c..f922e62 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -454,7 +454,8 @@ static BOOL service_handle_start(HANDLE pipe, service_data *service, DWORD count if (service->thread) { - ERR("service is not stopped\n"); + WARN("service is not stopped\n"); + result = ERROR_SERVICE_ALREADY_RUNNING; goto end; } @@ -503,7 +504,14 @@ static BOOL service_send_start_message(HANDLE pipe, LPCWSTR *argv, DWORD argc) r = WriteFile(pipe, ssi, sizeof *ssi + len*sizeof(WCHAR), &count, NULL); if (r) + { r = ReadFile(pipe, &result, sizeof result, &count, NULL); + if (r && result) + { + SetLastError(result); + r = FALSE; + } + } HeapFree(GetProcessHeap(),0,ssi); @@ -1764,11 +1772,14 @@ BOOL WINAPI StartServiceW(SC_HANDLE hService, DWORD dwNumServiceArgs, CloseHandle(handle); } - handle = service_open_pipe(hsvc->name); - if (handle != INVALID_HANDLE_VALUE) + if (r) { - service_set_processID(handle, dwProcessId, &dwResult); - CloseHandle(handle); + handle = service_open_pipe(hsvc->name); + if (handle != INVALID_HANDLE_VALUE) + { + service_set_processID(handle, dwProcessId, &dwResult); + CloseHandle(handle); + } } UnlockServiceDatabase( hLock );

1 0

Mikolaj Zalewski : advapi32: Obtain the process id locally.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: ec58b4485ade9af278504d74c26f373868d81a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec58b4485ade9af278504d74c… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Aug 22 18:10:57 2007 -0700 advapi32: Obtain the process id locally. --- dlls/advapi32/service.c | 57 ++++------------------------------------------ 1 files changed, 5 insertions(+), 52 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index f922e62..fbc888d 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -69,7 +69,6 @@ typedef struct service_start_info_t #define WINESERV_STARTINFO 1 #define WINESERV_GETSTATUS 2 #define WINESERV_SENDCONTROL 3 -#define WINESERV_SETPID 4 typedef struct service_data_t { @@ -553,41 +552,6 @@ static BOOL service_get_status(HANDLE pipe, LPSERVICE_STATUS_PROCESS status) } /****************************************************************************** - * service_handle_set_processID - */ -static BOOL service_handle_set_processID(HANDLE pipe, service_data *service, DWORD dwProcessId) -{ - DWORD count, ret = ERROR_SUCCESS; - - TRACE("received control %d\n", dwProcessId); - service->status.dwProcessId = dwProcessId; - return WriteFile(pipe, &ret, sizeof ret , &count, NULL); -} - -/****************************************************************************** - * service_set_processID - */ -static BOOL service_set_processID(HANDLE pipe, DWORD dwprocessId, LPDWORD dwResult) -{ - DWORD cmd[2], count = 0; - BOOL r; - - cmd[0] = WINESERV_SETPID; - cmd[1] = dwprocessId; - r = WriteFile( pipe, cmd, sizeof cmd, &count, NULL ); - if (!r || count != sizeof cmd) - { - ERR("service protocol error - failed to write pipe!\n"); - return r; - } - r = ReadFile( pipe, dwResult, sizeof *dwResult, &count, NULL ); - if (!r || count != sizeof *dwResult) - ERR("service protocol error - failed to read pipe " - "r = %d count = %d!\n", r, count); - return r; -} - -/****************************************************************************** * service_send_control */ static BOOL service_send_control(HANDLE pipe, DWORD dwControl, DWORD *result) @@ -772,9 +736,6 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) case WINESERV_SENDCONTROL: service_handle_control(pipe, service, req[1]); break; - case WINESERV_SETPID: - service_handle_set_processID(pipe, service, req[1]); - break; default: ERR("received invalid command %d length %d\n", req[0], req[1]); } @@ -800,15 +761,18 @@ static BOOL service_run_threads(void) count = list_count( &service_list ); - TRACE("starting %d pipe listener threads\n", count); + TRACE("Starting %d pipe listener threads. Services running as process %d\n", count, GetCurrentProcessId()); handles = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLE) * (count + 1)); handles[n++] = __wine_make_process_system(); LIST_FOR_EACH_ENTRY( service, &service_list, service_data, entry ) + { + service->status.dwProcessId = GetCurrentProcessId(); handles[n++] = CreateThread( NULL, 0, service_control_dispatcher, service, 0, NULL ); + } assert(n == count + 1); LeaveCriticalSection( &service_cs ); @@ -1741,7 +1705,6 @@ BOOL WINAPI StartServiceW(SC_HANDLE hService, DWORD dwNumServiceArgs, { struct sc_service *hsvc; BOOL r = FALSE; - DWORD dwResult, dwProcessId = 0; SC_LOCK hLock; HANDLE handle = INVALID_HANDLE_VALUE; @@ -1762,7 +1725,7 @@ BOOL WINAPI StartServiceW(SC_HANDLE hService, DWORD dwNumServiceArgs, if (handle==INVALID_HANDLE_VALUE) { /* start the service process */ - if (service_start_process(hsvc, &dwProcessId)) + if (service_start_process(hsvc, NULL)) handle = service_open_pipe(hsvc->name); } @@ -1772,16 +1735,6 @@ BOOL WINAPI StartServiceW(SC_HANDLE hService, DWORD dwNumServiceArgs, CloseHandle(handle); } - if (r) - { - handle = service_open_pipe(hsvc->name); - if (handle != INVALID_HANDLE_VALUE) - { - service_set_processID(handle, dwProcessId, &dwResult); - CloseHandle(handle); - } - } - UnlockServiceDatabase( hLock ); TRACE("returning %d\n", r);

1 0

Paul Vriens : winetest: Change the way we report missing dlls.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 3a7c16992b0583da39c75531a19248e2dcf222ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7c16992b0583da39c75531a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 23 08:55:05 2007 +0200 winetest: Change the way we report missing dlls. --- programs/winetest/main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index f433584..5d5462b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -443,9 +443,7 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, dll = LoadLibraryExA(dllname, NULL, LOAD_LIBRARY_AS_DATAFILE); if (!dll) { - xprintf ("%s:%s_dll_missing start 0 0\n", dllname, dllname); - xprintf ("%s_dll_missing: -1 tests executed (-1 marked as todo, -1 failures), -1 skipped.\n", dllname); - xprintf ("%s:%s_dll_missing done (0)\n", dllname, dllname); + xprintf (" %s=dll is missing\n", dllname); return TRUE; } FreeLibrary(dll); @@ -526,7 +524,7 @@ run_tests (char *logname) } xprintf ("Operating system version:\n"); print_version (); - xprintf ("Test output:\n" ); + xprintf ("Dll info:\n" ); report (R_STATUS, "Counting tests"); if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), @@ -544,6 +542,8 @@ run_tests (char *logname) report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); + xprintf ("Test output:\n" ); + report (R_DELTA, 0, "Extracting: Done"); report (R_STATUS, "Running tests");

1 0

Nigel Liang : winecfg: Suport color schemes from .theme format themes.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 998baf9f0fe4723b0171f03626687ef1e541a344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=998baf9f0fe4723b0171f0362… Author: Nigel Liang <ncliang(a)gmail.com> Date: Wed Aug 22 19:48:11 2007 -0700 winecfg: Suport color schemes from .theme format themes. --- programs/winecfg/theme.c | 147 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 110 insertions(+), 37 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 5797c96..ca67914 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -496,9 +496,111 @@ static void apply_theme(HWND dialog) theme_dirty = FALSE; } +static struct +{ + int sm_idx, color_idx; + const char *color_reg; + int size; + COLORREF color; + LOGFONTW lf; +} metrics[] = +{ + {-1, COLOR_BTNFACE, "ButtonFace" }, /* IDC_SYSPARAMS_BUTTON */ + {-1, COLOR_BTNTEXT, "ButtonText" }, /* IDC_SYSPARAMS_BUTTON_TEXT */ + {-1, COLOR_BACKGROUND, "Background" }, /* IDC_SYSPARAMS_DESKTOP */ + {SM_CXMENUSIZE, COLOR_MENU, "Menu" }, /* IDC_SYSPARAMS_MENU */ + {-1, COLOR_MENUTEXT, "MenuText" }, /* IDC_SYSPARAMS_MENU_TEXT */ + {SM_CXVSCROLL, COLOR_SCROLLBAR, "Scrollbar" }, /* IDC_SYSPARAMS_SCROLLBAR */ + {-1, COLOR_HIGHLIGHT, "Hilight" }, /* IDC_SYSPARAMS_SELECTION */ + {-1, COLOR_HIGHLIGHTTEXT, "HilightText" }, /* IDC_SYSPARAMS_SELECTION_TEXT */ + {-1, COLOR_INFOBK, "InfoWindow" }, /* IDC_SYSPARAMS_TOOLTIP */ + {-1, COLOR_INFOTEXT, "InfoText" }, /* IDC_SYSPARAMS_TOOLTIP_TEXT */ + {-1, COLOR_WINDOW, "Window" }, /* IDC_SYSPARAMS_WINDOW */ + {-1, COLOR_WINDOWTEXT, "WindowText" }, /* IDC_SYSPARAMS_WINDOW_TEXT */ + {SM_CXSIZE, COLOR_ACTIVECAPTION, "ActiveTitle" }, /* IDC_SYSPARAMS_ACTIVE_TITLE */ + {-1, COLOR_CAPTIONTEXT, "TitleText" }, /* IDC_SYSPARAMS_ACTIVE_TITLE_TEXT */ + {-1, COLOR_INACTIVECAPTION, "InactiveTitle" }, /* IDC_SYSPARAMS_INACTIVE_TITLE */ + {-1, COLOR_INACTIVECAPTIONTEXT,"InactiveTitleText" }, /* IDC_SYSPARAMS_INACTIVE_TITLE_TEXT */ + {-1, -1, "MsgBoxText" }, /* IDC_SYSPARAMS_MSGBOX_TEXT */ +}; + +static void save_sys_color(int idx, COLORREF clr) +{ + char buffer[13]; + + sprintf(buffer, "%d %d %d", GetRValue (clr), GetGValue (clr), GetBValue (clr)); + set_reg_key(HKEY_CURRENT_USER, "Control Panel\\Colors", metrics[idx].color_reg, buffer); +} + +static void set_color_from_theme(WCHAR *keyName, COLORREF color) +{ + char *keyNameA = NULL; + int keyNameSize=0, i=0; + + keyNameSize = WideCharToMultiByte(CP_ACP, 0, keyName, -1, keyNameA, 0, NULL, NULL); + keyNameA = HeapAlloc(GetProcessHeap(), 0, keyNameSize); + WideCharToMultiByte(CP_ACP, 0, keyName, -1, keyNameA, -1, NULL, NULL); + + for (i=0; i<sizeof(metrics)/sizeof(metrics[0]); i++) + { + if (strcmp(metrics[i].color_reg, keyNameA)==0) + { + metrics[i].color = color; + save_sys_color(i, color); + break; + } + } + HeapFree(GetProcessHeap(), 0, keyNameA); +} + +static void do_parse_theme(WCHAR *file) +{ + static const WCHAR colorSect[] = { + 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'C','o','l','o','r','s',0}; + WCHAR keyName[MAX_PATH], keyNameValue[MAX_PATH]; + WCHAR *keyNamePtr = NULL; + char *keyNameValueA = NULL; + int keyNameValueSize = 0; + int red = 0, green = 0, blue = 0; + COLORREF color; + + WINE_TRACE("%s\n", wine_dbgstr_w(file)); + + GetPrivateProfileStringW(colorSect, NULL, NULL, keyName, + MAX_PATH*sizeof(WCHAR), file); + + keyNamePtr = keyName; + while (*keyNamePtr!=0) { + GetPrivateProfileStringW(colorSect, keyNamePtr, NULL, keyNameValue, + MAX_PATH*sizeof(WCHAR), file); + + keyNameValueSize = WideCharToMultiByte(CP_ACP, 0, keyNameValue, -1, + keyNameValueA, 0, NULL, NULL); + keyNameValueA = HeapAlloc(GetProcessHeap(), 0, keyNameValueSize); + WideCharToMultiByte(CP_ACP, 0, keyNameValue, -1, keyNameValueA, -1, NULL, NULL); + + WINE_TRACE("parsing key: %s with value: %s\n", + wine_dbgstr_w(keyNamePtr), wine_dbgstr_w(keyNameValue)); + + sscanf(keyNameValueA, "%d %d %d", &red, &green, &blue); + + color = RGB((BYTE)red, (BYTE)blue, (BYTE)green); + + HeapFree(GetProcessHeap(), 0, keyNameValueA); + + set_color_from_theme(keyNamePtr, color); + + keyNamePtr+=lstrlenW(keyNamePtr); + keyNamePtr++; + } +} + static void on_theme_install(HWND dialog) { - static const WCHAR filterMask[] = {0,'*','.','m','s','s','t','y','l','e','s',0,0}; + static const WCHAR filterMask[] = {0,'*','.','m','s','s','t','y','l','e','s',';', + '*','.','t','h','e','m','e',0,0}; + static const WCHAR themeExt[] = {'.','T','h','e','m','e',0}; const int filterMaskLen = sizeof(filterMask)/sizeof(filterMask[0]); OPENFILENAMEW ofn; WCHAR filetitle[MAX_PATH]; @@ -546,6 +648,13 @@ static void on_theme_install(HWND dialog) if (FAILED (SHGetFolderPathW (NULL, CSIDL_RESOURCES|CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, themeFilePath))) return; + if (lstrcmpiW(PathFindExtensionW(filetitle), themeExt)==0) + { + do_parse_theme(file); + SendMessage(GetParent(dialog), PSM_CHANGED, 0, 0); + return; + } + PathRemoveExtensionW (filetitle); /* Construct path into which the theme file goes */ @@ -829,42 +938,6 @@ static void apply_shell_folder_changes(void) { } } -static struct -{ - int sm_idx, color_idx; - const char *color_reg; - int size; - COLORREF color; - LOGFONTW lf; -} metrics[] = -{ - {-1, COLOR_BTNFACE, "ButtonFace" }, /* IDC_SYSPARAMS_BUTTON */ - {-1, COLOR_BTNTEXT, "ButtonText" }, /* IDC_SYSPARAMS_BUTTON_TEXT */ - {-1, COLOR_BACKGROUND, "Background" }, /* IDC_SYSPARAMS_DESKTOP */ - {SM_CXMENUSIZE, COLOR_MENU, "Menu" }, /* IDC_SYSPARAMS_MENU */ - {-1, COLOR_MENUTEXT, "MenuText" }, /* IDC_SYSPARAMS_MENU_TEXT */ - {SM_CXVSCROLL, COLOR_SCROLLBAR, "Scrollbar" }, /* IDC_SYSPARAMS_SCROLLBAR */ - {-1, COLOR_HIGHLIGHT, "Hilight" }, /* IDC_SYSPARAMS_SELECTION */ - {-1, COLOR_HIGHLIGHTTEXT, "HilightText" }, /* IDC_SYSPARAMS_SELECTION_TEXT */ - {-1, COLOR_INFOBK, "InfoWindow" }, /* IDC_SYSPARAMS_TOOLTIP */ - {-1, COLOR_INFOTEXT, "InfoText" }, /* IDC_SYSPARAMS_TOOLTIP_TEXT */ - {-1, COLOR_WINDOW, "Window" }, /* IDC_SYSPARAMS_WINDOW */ - {-1, COLOR_WINDOWTEXT, "WindowText" }, /* IDC_SYSPARAMS_WINDOW_TEXT */ - {SM_CXSIZE, COLOR_ACTIVECAPTION, "ActiveTitle" }, /* IDC_SYSPARAMS_ACTIVE_TITLE */ - {-1, COLOR_CAPTIONTEXT, "TitleText" }, /* IDC_SYSPARAMS_ACTIVE_TITLE_TEXT */ - {-1, COLOR_INACTIVECAPTION, "InactiveTitle" }, /* IDC_SYSPARAMS_INACTIVE_TITLE */ - {-1, COLOR_INACTIVECAPTIONTEXT,"InactiveTitleText" }, /* IDC_SYSPARAMS_INACTIVE_TITLE_TEXT */ - {-1, -1, "MsgBoxText" } /* IDC_SYSPARAMS_MSGBOX_TEXT */ -}; - -static void save_sys_color(int idx, COLORREF clr) -{ - char buffer[13]; - - sprintf(buffer, "%d %d %d", GetRValue (clr), GetGValue (clr), GetBValue (clr)); - set_reg_key(HKEY_CURRENT_USER, "Control Panel\\Colors", metrics[idx].color_reg, buffer); -} - static void read_sysparams(HWND hDlg) { WCHAR buffer[256];

1 0

Mikolaj Zalewski : include: Add some definitions to winioctl.h.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 108e5d4b0203e647789b509b4bd16e5b5dff6052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108e5d4b0203e647789b509b4… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Tue Aug 21 13:49:29 2007 -0700 include: Add some definitions to winioctl.h. --- include/winioctl.h | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/include/winioctl.h b/include/winioctl.h index a54c5a5..10c6f5e 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -176,20 +176,29 @@ #define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE #define IOCTL_STORAGE_CHECK_VERIFY CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_CHECK_VERIFY2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_MEDIA_REMOVAL CTL_CODE(IOCTL_STORAGE_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_EJECT_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_LOAD_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_LOAD_MEDIA2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_RESERVE CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_RELEASE CTL_CODE(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_FIND_NEW_DEVICES CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_EJECTION_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0250, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_MCN_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_GET_MEDIA_TYPES CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_GET_MEDIA_TYPES_EX CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_MEDIA_TYPES CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_MEDIA_TYPES_EX CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0304, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0305, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_SET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_RESET_BUS CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_RESET_DEVICE CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_BREAK_RESERCATION CTL_CODE(IOCTL_STORAGE_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS); +#define IOCTL_STORAGE_PERSISTENT_RESERVE_IN CTL_CODE(IOCTL_STORAGE_BASE, 0x0406, METHOD_BUFFERED, FILE_READ_ACCESS); +#define IOCTL_STORAGE_PERSISTENT_RESERVE_OUT CTL_CODE(IOCTL_STORAGE_BASE, 0x0407, METHOD_BUFFERED, FILE_READ_ACCESS|FILE_WRITE_ACCESS); + #define IOCTL_STORAGE_GET_DEVICE_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_DISK_BASE FILE_DEVICE_DISK @@ -225,6 +234,9 @@ #define SMART_GET_VERSION CTL_CODE(IOCTL_DISK_BASE, 0x0020, METHOD_BUFFERED, FILE_READ_ACCESS) #define SMART_SEND_DRIVE_COMMAND CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define SMART_RCV_DRIVE_DATA CTL_CODE(IOCTL_DISK_BASE, 0x0022, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +#define IOCTL_VOLUME_BASE ((DWORD)'V') +#define IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS CTL_CODE(IOCTL_VOLUME_BASE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) /* End: For _WIN32_WINNT >= 0x0400 */ #define IOCTL_SERIAL_LSRMST_INSERT CTL_CODE(FILE_DEVICE_SERIAL_PORT,31,METHOD_BUFFERED,FILE_ANY_ACCESS) @@ -316,12 +328,26 @@ typedef struct _REASSIGN_BLOCKS { DWORD BlockNumber[1]; } REASSIGN_BLOCKS, *PREASSIGN_BLOCKS; -#if(_WIN32_WINNT >= 0x0400) +/* Start: _WIN32_WINNT >= 0x0400 */ + typedef struct _DISK_CONTROLLER_NUMBER { DWORD ControllerNumber; DWORD DiskNumber; } DISK_CONTROLLER_NUMBER, *PDISK_CONTROLLER_NUMBER; -#endif /* _WIN32_WINNT >= 0x0400 */ + +/* VOLUME_GET_VOLUME_DISK_EXTENTS */ +typedef struct _DISK_EXTENT { + DWORD DiskNumber; + LARGE_INTEGER StartingOffset; + LARGE_INTEGER ExtentLength; +} DISK_EXTENT; + +typedef struct _VOLUME_DISK_EXTENTS { + DWORD NumberOfDiskExtents; + DISK_EXTENT Extents[1]; +} VOLUME_DISK_EXTENTS; + +/* End: _WIN32_WINNT >= 0x0400 */ /* Device Io Stuff - Most VxD support. * NOTE: All VxD messages seem to start with a hiword or 0

1 0

Stefan Dösinger : wined3d: Refuse to ReleaseDC the wrong DC.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 50c101135c6af901cef2082f542971ce5d9efe26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c101135c6af901cef2082f5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 14 14:40:33 2007 +0200 wined3d: Refuse to ReleaseDC the wrong DC. --- dlls/wined3d/surface.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7e525c5..2abb277 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1456,6 +1456,11 @@ HRESULT WINAPI IWineD3DSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC hDC) { if (!(This->Flags & SFLAG_DCINUSE)) return WINED3DERR_INVALIDCALL; + if (This->hDC !=hDC) { + WARN("Application tries to release an invalid DC(%p), surface dc is %p\n", hDC, This->hDC); + return WINED3DERR_INVALIDCALL; + } + /* we locked first, so unlock now */ IWineD3DSurface_UnlockRect(iface);

1 0

Stefan Dösinger : wined3d: Deal with multithreading in event queries.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: a99907d1d22f28b4ae6a532bea963379c78ba21f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a99907d1d22f28b4ae6a532be… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 14 15:26:02 2007 +0200 wined3d: Deal with multithreading in event queries. --- dlls/wined3d/device.c | 3 ++- dlls/wined3d/query.c | 19 +++++++++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92b0943..8509192 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1143,15 +1143,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE break; } case WINED3DQUERYTYPE_EVENT: - /* TODO: GL_APPLE_fence */ if(GL_SUPPORT(APPLE_FENCE)) { object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryEventData)); GL_EXTCALL(glGenFencesAPPLE(1, &((WineQueryEventData *)(object->extendedData))->fenceId)); checkGLcall("glGenFencesAPPLE"); + ((WineQueryEventData *)(object->extendedData))->ctx = This->activeContext; } else if(GL_SUPPORT(NV_FENCE)) { object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryEventData)); GL_EXTCALL(glGenFencesNV(1, &((WineQueryEventData *)(object->extendedData))->fenceId)); checkGLcall("glGenFencesNV"); + ((WineQueryEventData *)(object->extendedData))->ctx = This->activeContext; } break; diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 99390f8..f787c78 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -167,7 +167,12 @@ static HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pDa case WINED3DQUERYTYPE_EVENT: { BOOL* data = pData; - if(GL_SUPPORT(APPLE_FENCE)) { + WineD3DContext *ctx = ((WineQueryEventData *)This->extendedData)->ctx; + if(ctx != This->wineD3DDevice->activeContext || ctx->tid != GetCurrentThreadId()) { + /* See comment in IWineD3DQuery::Issue, event query codeblock */ + WARN("Query context not active, reporting GPU idle\n"); + *data = TRUE; + } else if(GL_SUPPORT(APPLE_FENCE)) { *data = GL_EXTCALL(glTestFenceAPPLE(((WineQueryEventData *)This->extendedData)->fenceId)); checkGLcall("glTestFenceAPPLE"); } else if(GL_SUPPORT(NV_FENCE)) { @@ -390,7 +395,17 @@ static HRESULT WINAPI IWineD3DQueryImpl_Issue(IWineD3DQuery* iface, DWORD dwIs case WINED3DQUERYTYPE_EVENT: { if (dwIssueFlags & WINED3DISSUE_END) { - if(GL_SUPPORT(APPLE_FENCE)) { + WineD3DContext *ctx = ((WineQueryEventData *)This->extendedData)->ctx; + if(ctx != This->wineD3DDevice->activeContext || ctx->tid != GetCurrentThreadId()) { + /* GL fences can be used only from the context that created them, + * so if a different context is active, don't bother setting the query. The penalty + * of a context switch is most likely higher than the gain of a correct query result + * + * If the query is used from a different thread, don't bother creating a multithread + * context - there's no point in doing that as the query would be unusable anyway + */ + WARN("Query context not active\n"); + } else if(GL_SUPPORT(APPLE_FENCE)) { GL_EXTCALL(glSetFenceAPPLE(((WineQueryEventData *)This->extendedData)->fenceId)); checkGLcall("glSetFenceAPPLE"); } else if (GL_SUPPORT(NV_FENCE)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 73d13cc..84e0480 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1464,6 +1464,7 @@ typedef struct WineQueryOcclusionData { typedef struct WineQueryEventData { GLuint fenceId; + WineD3DContext *ctx; } WineQueryEventData; /*****************************************************************************

1 0