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

Vladimir Pankratov : taskmgr: Converted some functions and variables to Unicode.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: bc4ded7469ab06eae17d1094b24f0d1cb7822fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4ded7469ab06eae17d1094b… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Aug 20 08:34:48 2008 +0000 taskmgr: Converted some functions and variables to Unicode. --- programs/taskmgr/dbgchnl.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 1102606..83d4281 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -4,6 +4,7 @@ * dbgchnl.c * * Copyright (C) 2003 - 2004 Eric Pouech + * Copyright (C) 2008 Vladimir Pankratov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,7 +28,6 @@ #include <stdlib.h> #include <malloc.h> #include <memory.h> -#include <tchar.h> #include <stdio.h> #include <winnt.h> #include <dbghelp.h> @@ -61,9 +61,11 @@ BOOL AreDebugChannelsSupported(void) { static HANDLE hDbgHelp /* = NULL */; + static const WCHAR wszDbgHelp[] = {'D','B','G','H','E','L','P','.','D','L','L',0}; + if (hDbgHelp) return TRUE; - if (!(hDbgHelp = LoadLibrary("dbghelp.dll"))) return FALSE; + if (!(hDbgHelp = LoadLibraryW(wszDbgHelp))) return FALSE; pSymSetOptions = (void*)GetProcAddress(hDbgHelp, "SymSetOptions"); pSymInitialize = (void*)GetProcAddress(hDbgHelp, "SymInitialize"); pSymLoadModule = (void*)GetProcAddress(hDbgHelp, "SymLoadModule"); @@ -221,42 +223,43 @@ static void DebugChannels_FillList(HWND hChannelLV) static void DebugChannels_OnCreate(HWND hwndDlg) { HWND hLV = GetDlgItem(hwndDlg, IDC_DEBUG_CHANNELS_LIST); - LVCOLUMN lvc; - static TCHAR debug_channelT[] = {'D','e','b','u','g',' ','C','h','a','n','n','e','l',0}, - fixmeT[] = {'F','i','x','m','e',0}, - errT[] = {'E','r','r',0}, - warnT[] = {'W','a','r','n',0}, - traceT[] = {'T','r','a','c','e',0}; + LVCOLUMNW lvc; + + static WCHAR debug_channelW[] = {'D','e','b','u','g',' ','C','h','a','n','n','e','l',0}, + fixmeW[] = {'F','i','x','m','e',0}, + errW[] = {'E','r','r',0}, + warnW[] = {'W','a','r','n',0}, + traceW[] = {'T','r','a','c','e',0}; lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_LEFT; - lvc.pszText = debug_channelT; + lvc.pszText = debug_channelW; lvc.cx = 100; - SendMessage(hLV, LVM_INSERTCOLUMN, 0, (LPARAM) &lvc); + SendMessageW(hLV, LVM_INSERTCOLUMNW, 0, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; - lvc.pszText = fixmeT; + lvc.pszText = fixmeW; lvc.cx = 55; - SendMessage(hLV, LVM_INSERTCOLUMN, 1, (LPARAM) &lvc); + SendMessageW(hLV, LVM_INSERTCOLUMNW, 1, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; - lvc.pszText = errT; + lvc.pszText = errW; lvc.cx = 55; - SendMessage(hLV, LVM_INSERTCOLUMN, 2, (LPARAM) &lvc); + SendMessageW(hLV, LVM_INSERTCOLUMNW, 2, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; - lvc.pszText = warnT; + lvc.pszText = warnW; lvc.cx = 55; - SendMessage(hLV, LVM_INSERTCOLUMN, 3, (LPARAM) &lvc); + SendMessageW(hLV, LVM_INSERTCOLUMNW, 3, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; - lvc.pszText = traceT; + lvc.pszText = traceW; lvc.cx = 55; - SendMessage(hLV, LVM_INSERTCOLUMN, 4, (LPARAM) &lvc); + SendMessageW(hLV, LVM_INSERTCOLUMNW, 4, (LPARAM) &lvc); DebugChannels_FillList(hLV); } @@ -331,5 +334,5 @@ static INT_PTR CALLBACK DebugChannelsDlgProc(HWND hDlg, UINT message, WPARAM wPa void ProcessPage_OnDebugChannels(void) { - DialogBox(hInst, (LPCTSTR)IDD_DEBUG_CHANNELS_DIALOG, hMainWnd, DebugChannelsDlgProc); + DialogBoxW(hInst, (LPCWSTR)IDD_DEBUG_CHANNELS_DIALOG, hMainWnd, DebugChannelsDlgProc); }

1 0

Vladimir Pankratov : taskmgr: Converted some functions and variables to Unicode.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: 79fadfa7f51f7e5b4046cc123f4299c7c830a920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79fadfa7f51f7e5b4046cc123… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Aug 20 08:34:12 2008 +0000 taskmgr: Converted some functions and variables to Unicode. --- programs/taskmgr/column.c | 322 ++++++++++++++++++++++++--------------------- 1 files changed, 175 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79fadfa7f51f7e5b4046c…

1 0

Vladimir Pankratov : taskmgr: Converted some functions and variables to Unicode.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: b98334b9ecbc502e2cddea51124b6fc952cf43b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98334b9ecbc502e2cddea511… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Aug 20 08:33:29 2008 +0000 taskmgr: Converted some functions and variables to Unicode. --- programs/taskmgr/applpage.c | 150 ++++++++++++++++++++++--------------------- 1 files changed, 77 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b98334b9ecbc502e2cdde…

1 0

Vladimir Pankratov : taskmgr: Converted some functions and variables to Unicode.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: b28a6c18898ae1b469ecc393b23964cb2b95ea61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28a6c18898ae1b469ecc393b… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Aug 20 08:32:24 2008 +0000 taskmgr: Converted some functions and variables to Unicode. --- programs/taskmgr/affinity.c | 168 +++++++++++++++++++++------------------ programs/taskmgr/debug.c | 74 +++++++++++------- programs/taskmgr/endproc.c | 45 ++++++----- programs/taskmgr/graph.c | 23 ++++-- programs/taskmgr/priority.c | 26 ++++--- programs/taskmgr/taskmgr.c | 183 ++++++++++++++++++++++++------------------- programs/taskmgr/taskmgr.h | 4 +- 7 files changed, 295 insertions(+), 228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b28a6c18898ae1b469ecc…

1 0

Lei Zhang : comctl32: Set listview focus on WM_LBUTTONUP instead of WM_LBUTTONDOWN.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: 098dc7b3302f39c5500d644615a6f4c37d328ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098dc7b3302f39c5500d64461… Author: Lei Zhang <thestig(a)google.com> Date: Mon Aug 18 16:05:27 2008 -0700 comctl32: Set listview focus on WM_LBUTTONUP instead of WM_LBUTTONDOWN. --- dlls/comctl32/listview.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 213b569..c620892 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8588,10 +8588,7 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; if (!infoPtr->bFocus) - { bReceivedFocus = TRUE; - SetFocus(infoPtr->hwndSelf); - } /* set left button down flag and record the click position */ infoPtr->bLButtonDown = TRUE; @@ -8721,6 +8718,9 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT LISTVIEW_DelayedEditItem); } + if (!infoPtr->bFocus) + SetFocus(infoPtr->hwndSelf); + return 0; }

1 0

Roy Shea : mstask: Implemented (Set|Get)ApplicationName.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: ca736551240f510cba58770c0ec9e156904160e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca736551240f510cba58770c0… Author: Roy Shea <royshea(a)gmail.com> Date: Thu Aug 21 01:09:18 2008 -0700 mstask: Implemented (Set|Get)ApplicationName. --- dlls/mstask/Makefile.in | 2 +- dlls/mstask/mstask_private.h | 1 + dlls/mstask/task.c | 62 +++++++++++++++++++++++++++++++++++++++--- dlls/mstask/tests/task.c | 34 +++++++++++----------- 4 files changed, 77 insertions(+), 22 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index 9fb78ee..31d2eca 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mstask.dll -IMPORTS = uuid kernel32 +IMPORTS = uuid ole32 kernel32 C_SRCS = \ factory.c \ diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index e5de0dc..b0892fe 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -58,6 +58,7 @@ typedef struct const IPersistFileVtbl *persistVtbl; LONG ref; LPWSTR taskName; + LPWSTR applicationName; } TaskImpl; extern HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj); diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 8a24b87..f1f5426 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -323,16 +323,69 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName( ITask* iface, LPCWSTR pwszApplicationName) { - FIXME("(%p, %s): stub\n", iface, debugstr_w(pwszApplicationName)); - return E_NOTIMPL; + DWORD n; + TaskImpl *This = (TaskImpl *)iface; + LPWSTR tmp_name; + + TRACE("(%p, %s)\n", iface, debugstr_w(pwszApplicationName)); + + /* Empty application name */ + if (pwszApplicationName[0] == 0) + { + HeapFree(GetProcessHeap(), 0, This->applicationName); + This->applicationName = NULL; + return S_OK; + } + + /* Attempt to set pwszApplicationName to a path resolved application name */ + n = SearchPathW(NULL, pwszApplicationName, NULL, 0, NULL, NULL); + if (n) + { + tmp_name = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); + if (!tmp_name) + return E_OUTOFMEMORY; + n = SearchPathW(NULL, pwszApplicationName, NULL, n, tmp_name, NULL); + if (n) + { + HeapFree(GetProcessHeap(), 0, This->applicationName); + This->applicationName = tmp_name; + return S_OK; + } + else + HeapFree(GetProcessHeap(), 0, tmp_name); + } + + /* If unable to path resolve name, simply set to pwszApplicationName */ + n = (lstrlenW(pwszApplicationName) + 1); + tmp_name = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); + if (!tmp_name) + return E_OUTOFMEMORY; + lstrcpyW(tmp_name, pwszApplicationName); + HeapFree(GetProcessHeap(), 0, This->applicationName); + This->applicationName = tmp_name; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetApplicationName( ITask* iface, LPWSTR *ppwszApplicationName) { - FIXME("(%p, %p): stub\n", iface, ppwszApplicationName); - return E_NOTIMPL; + DWORD n; + TaskImpl *This = (TaskImpl *)iface; + + TRACE("(%p, %p)\n", iface, ppwszApplicationName); + + n = This->applicationName ? lstrlenW(This->applicationName) + 1 : 1; + *ppwszApplicationName = CoTaskMemAlloc(n * sizeof(WCHAR)); + if (!*ppwszApplicationName) + return E_OUTOFMEMORY; + + if (!This->applicationName) + *ppwszApplicationName[0] = 0; + else + lstrcpyW(*ppwszApplicationName, This->applicationName); + + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetParameters( @@ -571,6 +624,7 @@ HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) return E_OUTOFMEMORY; } lstrcpyW(This->taskName, pwszTaskName); + This->applicationName = NULL; *ppObj = &This->lpVtbl; InterlockedIncrement(&dll_ref); diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 7e9e831..ff35f52 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -118,10 +118,10 @@ static void test_SetApplicationName_GetApplicationName(void) /* Attempt getting before setting application name */ hres = ITask_GetApplicationName(test_task, &stored_name); - todo_wine ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(stored_name, empty), + ok(!lstrcmpW(stored_name, empty), "Got %s, expected empty string\n", dbgstr_w(stored_name)); CoTaskMemFree(stored_name); } @@ -129,14 +129,14 @@ static void test_SetApplicationName_GetApplicationName(void) /* Set application name to a non-existent application and then get * the application name that is actually stored */ hres = ITask_SetApplicationName(test_task, non_application_name); - todo_wine ok(hres == S_OK, "Failed setting name %s: %08x\n", + ok(hres == S_OK, "Failed setting name %s: %08x\n", dbgstr_w(non_application_name), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - todo_wine ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { full_name = path_resolve_name(non_application_name); - todo_wine ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", dbgstr_w(stored_name), dbgstr_w(full_name)); CoTaskMemFree(stored_name); } @@ -144,14 +144,14 @@ static void test_SetApplicationName_GetApplicationName(void) /* Set a valid application name with program type extension and then * get the stored name */ hres = ITask_SetApplicationName(test_task, notepad_exe); - todo_wine ok(hres == S_OK, "Failed setting name %s: %08x\n", + ok(hres == S_OK, "Failed setting name %s: %08x\n", dbgstr_w(notepad_exe), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - todo_wine ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { full_name = path_resolve_name(notepad_exe); - todo_wine ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", dbgstr_w(stored_name), dbgstr_w(full_name)); CoTaskMemFree(stored_name); } @@ -159,13 +159,13 @@ static void test_SetApplicationName_GetApplicationName(void) /* Set a valid application name without program type extension and * then get the stored name */ hres = ITask_SetApplicationName(test_task, notepad); - todo_wine ok(hres == S_OK, "Failed setting name %s: %08x\n", dbgstr_w(notepad), hres); + ok(hres == S_OK, "Failed setting name %s: %08x\n", dbgstr_w(notepad), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - todo_wine ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { full_name = path_resolve_name(notepad); - todo_wine ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", dbgstr_w(stored_name), dbgstr_w(full_name)); CoTaskMemFree(stored_name); } @@ -174,26 +174,26 @@ static void test_SetApplicationName_GetApplicationName(void) * to a non-existant application and then get the name that is * actually stored */ hres = ITask_SetApplicationName(test_task, non_application_name); - todo_wine ok(hres == S_OK, "Failed setting name %s: %08x\n", + ok(hres == S_OK, "Failed setting name %s: %08x\n", dbgstr_w(non_application_name), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - todo_wine ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { full_name = path_resolve_name(non_application_name); - todo_wine ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", dbgstr_w(stored_name), dbgstr_w(full_name)); CoTaskMemFree(stored_name); } /* Clear application name */ hres = ITask_SetApplicationName(test_task, empty); - todo_wine ok(hres == S_OK, "Failed setting name %s: %08x\n", dbgstr_w(empty), hres); + ok(hres == S_OK, "Failed setting name %s: %08x\n", dbgstr_w(empty), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - todo_wine ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { - todo_wine ok(!lstrcmpW(stored_name, empty), + ok(!lstrcmpW(stored_name, empty), "Got %s, expected empty string\n", dbgstr_w(stored_name)); CoTaskMemFree(stored_name); }

1 0

Roy Shea : expand: Extended expand program to accept /r argument.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: 44941a55fa97b40b4c9ffa8e414e3a8a26efc65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=44941a55fa97b40b4c9ffa8e4… Author: Roy Shea <royshea(a)gmail.com> Date: Thu Aug 21 01:18:00 2008 -0700 expand: Extended expand program to accept /r argument. --- programs/expand/expand.c | 83 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 76 insertions(+), 7 deletions(-) diff --git a/programs/expand/expand.c b/programs/expand/expand.c index 6022fe2..a8736b1 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -26,6 +26,30 @@ #include <lzexpand.h> #include <setupapi.h> +static UINT CALLBACK set_outfile( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) +{ + FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)param1; + char buffer[MAX_PATH]; + char* basename; + + switch (notification) + { + case SPFILENOTIFY_FILEINCABINET: + { + LPSTR outfile = context; + if (outfile[0] != 0) + { + SetLastError( ERROR_NOT_SUPPORTED ); + return FILEOP_ABORT; + } + GetFullPathNameA( info->NameInCabinet, sizeof(buffer), buffer, &basename ); + strcpy( outfile, basename ); + return FILEOP_SKIP; + } + default: return NO_ERROR; + } +} + static UINT CALLBACK extract_callback( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) { FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)param1; @@ -43,29 +67,74 @@ static UINT CALLBACK extract_callback( PVOID context, UINT notification, UINT_PT } } +static BOOL option_equal(LPCSTR str1, LPCSTR str2) +{ + if (str1[0] != '/' && str1[0] != '-') + return FALSE; + return !lstrcmpA( str1 + 1, str2 ); +} + int main(int argc, char *argv[]) { int ret = 0; char infile[MAX_PATH], outfile[MAX_PATH], actual_name[MAX_PATH]; + char outfile_basename[MAX_PATH], *basename_index; UINT comp; if (argc < 3) { - fprintf( stderr, "Usage: %s infile outfile\n", argv[0] ); + fprintf( stderr, "Usage:\n" ); + fprintf( stderr, "\t%s infile outfile\n", argv[0] ); + fprintf( stderr, "\t%s /r infile \n", argv[0] ); return 1; } - GetFullPathNameA( argv[1], sizeof(infile), infile, NULL ); - GetFullPathNameA( argv[2], sizeof(outfile), outfile, NULL ); + if (argc == 3 && (option_equal(argv[1], "R") || option_equal(argv[1], "r"))) + GetFullPathNameA( argv[2], sizeof(infile), infile, NULL ); + else + GetFullPathNameA( argv[1], sizeof(infile), infile, NULL ); - if (!lstrcmpiA( infile, outfile )) + if (!SetupGetFileCompressionInfoExA( infile, actual_name, sizeof(actual_name), NULL, NULL, NULL, &comp )) { - fprintf( stderr, "%s: can't expand file to itself\n", argv[0] ); + fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); return 1; } - if (!SetupGetFileCompressionInfoExA( infile, actual_name, sizeof(actual_name), NULL, NULL, NULL, &comp )) + + if (argc == 3 && (option_equal(argv[1], "R") || option_equal(argv[1], "r"))) { - fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); + switch (comp) + { + case FILE_COMPRESSION_MSZIP: + { + outfile_basename[0] = 0; + if (!SetupIterateCabinetA( infile, 0, set_outfile, (PVOID)outfile_basename )) + { + fprintf( stderr, "%s: can't determine original name\n", argv[0] ); + return 1; + } + GetFullPathNameA( infile, sizeof(outfile), outfile, &basename_index ); + *basename_index = 0; + strcat( outfile, outfile_basename ); + break; + } + case FILE_COMPRESSION_WINLZA: + { + GetExpandedNameA( infile, outfile_basename ); + break; + } + default: + { + fprintf( stderr, "%s: can't determine original\n", argv[0] ); + return 1; + } + } + } + else + GetFullPathNameA( argv[2], sizeof(outfile), outfile, NULL ); + + if (!lstrcmpiA( infile, outfile )) + { + fprintf( stderr, "%s: can't expand file to itself\n", argv[0] ); return 1; }

1 0

Alexander Dorofeyev : wined3d: Fix copy paste error in IWineGDISurfaceImpl_RealizePalette.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: 67631163ffe6960aa1673fc72c45005eaa001ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67631163ffe6960aa1673fc72… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Aug 20 21:51:53 2008 +0300 wined3d: Fix copy paste error in IWineGDISurfaceImpl_RealizePalette. It has to update the whole surface, so NULL must be passed to x11_copy_to_screen. Fixes a regression in Red Alert. --- dlls/wined3d/surface_gdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 7874f92..05a4a54 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -483,7 +483,7 @@ HRESULT WINAPI IWineGDISurfaceImpl_RealizePalette(IWineD3DSurface *iface) { /* Tell the swapchain to update the screen */ IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **) &swapchain); if(swapchain) { - x11_copy_to_screen(swapchain, &This->lockedRect); + x11_copy_to_screen(swapchain, NULL); IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); }

1 0

Alexander Dorofeyev : wined3d: Set D3DPTEXTURECAPS_TRANSPARENCY.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: 03ae71dad9dd8fad886c7b818b46de2c4287ec40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ae71dad9dd8fad886c7b818… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Aug 20 21:51:41 2008 +0300 wined3d: Set D3DPTEXTURECAPS_TRANSPARENCY. It indicates support of colorkey transparency on textures, so set it because wined3d supports it. Fixes transparency problems in Forsaken. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bd7f68b..c55d66c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3135,6 +3135,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, pCaps->TextureCaps = WINED3DPTEXTURECAPS_ALPHA | WINED3DPTEXTURECAPS_ALPHAPALETTE | + WINED3DPTEXTURECAPS_TRANSPARENCY | WINED3DPTEXTURECAPS_BORDER | WINED3DPTEXTURECAPS_MIPMAP | WINED3DPTEXTURECAPS_PROJECTED |

1 0

Alexander Dorofeyev : wined3d: Disable TEXTURE_RECTANGLE in SetupForBlit.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: 1da8a032af0c4de4898fb197615ba943a5a741b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da8a032af0c4de4898fb1976… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Aug 20 21:50:51 2008 +0300 wined3d: Disable TEXTURE_RECTANGLE in SetupForBlit. --- dlls/wined3d/context.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 739ddb2..17d0714 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -730,6 +730,10 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex } glDisable(GL_TEXTURE_3D); checkGLcall("glDisable GL_TEXTURE_3D"); + if(GL_SUPPORT(ARB_TEXTURE_RECTANGLE)) { + glDisable(GL_TEXTURE_RECTANGLE_ARB); + checkGLcall("glDisable GL_TEXTURE_RECTANGLE_ARB"); + } glDisable(GL_TEXTURE_2D); checkGLcall("glDisable GL_TEXTURE_2D"); @@ -755,6 +759,10 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex } glDisable(GL_TEXTURE_3D); checkGLcall("glDisable GL_TEXTURE_3D"); + if(GL_SUPPORT(ARB_TEXTURE_RECTANGLE)) { + glDisable(GL_TEXTURE_RECTANGLE_ARB); + checkGLcall("glDisable GL_TEXTURE_RECTANGLE_ARB"); + } glDisable(GL_TEXTURE_2D); checkGLcall("glDisable GL_TEXTURE_2D");

1 0