January 2006 - Wine-Commits

Troy Rollo : Fix GetModuleFileNameEx definition.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: c03b21e9ca6bfe6e199a4388b243e24988d9b4c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c03b21e9ca6bfe6e199a438… Author: Troy Rollo <wine(a)troy.rollo.name> Date: Tue Jan 10 12:08:12 2006 +0100 Fix GetModuleFileNameEx definition. --- include/psapi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/psapi.h b/include/psapi.h index 0c1dbd0..831f817 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -86,7 +86,7 @@ DWORD WINAPI GetModuleBaseNameW(HANDLE, #define GetModuleBaseName WINELIB_NAME_AW(GetModuleBaseName) DWORD WINAPI GetModuleFileNameExA(HANDLE, HMODULE, LPSTR, DWORD); DWORD WINAPI GetModuleFileNameExW(HANDLE, HMODULE, LPWSTR, DWORD); -#define GetModuleFileName WINELIB_NAME_AW(GetModuleFileName) +#define GetModuleFileNameEx WINELIB_NAME_AW(GetModuleFileNameEx) BOOL WINAPI GetModuleInformation(HANDLE, HMODULE, LPMODULEINFO, DWORD); BOOL WINAPI EmptyWorkingSet(HANDLE); BOOL WINAPI QueryWorkingSet(HANDLE, PVOID, DWORD);

1 0

Michael Kaufmann : user: The LoadImage resource string may be a numeric string.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: 37c68b47f4ee8da0e98e44103455fd17f9462401 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37c68b47f4ee8da0e98e441… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Tue Jan 10 12:07:32 2006 +0100 user: The LoadImage resource string may be a numeric string. --- dlls/user/cursoricon.c | 1 - dlls/user/tests/resource.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c index 038f457..c093051 100644 --- a/dlls/user/cursoricon.c +++ b/dlls/user/cursoricon.c @@ -2114,7 +2114,6 @@ static HBITMAP BITMAP_Load( HINSTANCE in if (!instance) { /* OEM bitmap: try to load the resource from user32.dll */ - if (HIWORD(name)) return 0; instance = user32_module; } diff --git a/dlls/user/tests/resource.c b/dlls/user/tests/resource.c index 893d52e..c910253 100644 --- a/dlls/user/tests/resource.c +++ b/dlls/user/tests/resource.c @@ -283,6 +283,18 @@ static void test_PrivateExtractIcons(voi ok(cIcons == 4, "Three icons requested, four expected, got cIcons=%d\n", cIcons); } +static void test_LoadImage(void) { + HBITMAP bmp; + + bmp = LoadBitmapA(NULL, MAKEINTRESOURCE(OBM_CHECK)); + ok(bmp != NULL, "Could not load the OBM_CHECK bitmap"); + if (bmp) DeleteObject(bmp); + + bmp = LoadBitmapA(NULL, "#32760"); /* Value of OBM_CHECK */ + ok(bmp != NULL, "Could not load the OBM_CHECK bitmap"); + if (bmp) DeleteObject(bmp); +} + START_TEST(resource) { init_function_pointers(); @@ -290,4 +302,5 @@ START_TEST(resource) test_accel1(); test_accel2(); test_PrivateExtractIcons(); + test_LoadImage(); }

1 0

Michael Kaufmann : user: Improve the ownerdraw support of the static control.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: 7ff2a68459ca30de1e75bacf64833ac589d08896 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ff2a68459ca30de1e75bac… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Tue Jan 10 12:07:57 2006 +0100 user: Improve the ownerdraw support of the static control. --- dlls/user/static.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/user/static.c b/dlls/user/static.c index 3e6b520..082be9f 100644 --- a/dlls/user/static.c +++ b/dlls/user/static.c @@ -480,20 +480,24 @@ static LRESULT WINAPI StaticWndProcW( HW static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) { DRAWITEMSTRUCT dis; + HFONT font, oldFont = NULL; UINT id = (UINT)GetWindowLongPtrW( hwnd, GWLP_ID ); dis.CtlType = ODT_STATIC; dis.CtlID = id; dis.itemID = 0; dis.itemAction = ODA_DRAWENTIRE; - dis.itemState = 0; + dis.itemState = IsWindowEnabled(hwnd) ? 0 : ODS_DISABLED; dis.hwndItem = hwnd; dis.hDC = hdc; dis.itemData = 0; GetClientRect( hwnd, &dis.rcItem ); + font = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + if (font) oldFont = SelectObject( hdc, font ); SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); + if (font) SelectObject( hdc, oldFont ); } static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style )

1 0

Kaj Kaloinen : shlwapi: Add Finnish translation.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: ee9b656edcb0fb6a962e106050eaa961d3acc149 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee9b656edcb0fb6a962e106… Author: Kaj Kaloinen <kkaloine(a)gmail.com> Date: Tue Jan 10 12:07:07 2006 +0100 shlwapi: Add Finnish translation. --- dlls/shlwapi/shlwapi.rc | 1 + dlls/shlwapi/shlwapi_Fi.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) create mode 100644 dlls/shlwapi/shlwapi_Fi.rc diff --git a/dlls/shlwapi/shlwapi.rc b/dlls/shlwapi/shlwapi.rc index 7137127..6b22f88 100644 --- a/dlls/shlwapi/shlwapi.rc +++ b/dlls/shlwapi/shlwapi.rc @@ -28,6 +28,7 @@ #include "shlwapi_De.rc" #include "shlwapi_En.rc" #include "shlwapi_Es.rc" +#include "shlwapi_Fi.rc" #include "shlwapi_Ko.rc" #include "shlwapi_Nl.rc" #include "shlwapi_No.rc" diff --git a/dlls/shlwapi/shlwapi_Fi.rc b/dlls/shlwapi/shlwapi_Fi.rc new file mode 100644 index 0000000..6787a59 --- /dev/null +++ b/dlls/shlwapi/shlwapi_Fi.rc @@ -0,0 +1,35 @@ +/* + * Finnish resources for shlwapi + * + * Copyright 2005 Kaj Kaloinen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Virhe!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "�l� n�yt� t�t� viesti� en��", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Peruuta" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Kyll�" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ei" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +}

1 0

Phil Krylov : comctl32: Call UpdateWindow() after changing statusbar text.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: b2d289fa2382d8480c4689b098a0c5b616aac1ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b2d289fa2382d8480c4689b… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Tue Jan 10 12:06:44 2006 +0100 comctl32: Call UpdateWindow() after changing statusbar text. --- dlls/comctl32/status.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 7c86815..46d55d4 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -786,6 +786,7 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr part->text = ntext; } InvalidateRect(infoPtr->Self, &part->bound, FALSE); + UpdateWindow(infoPtr->Self); return TRUE; }

1 0

James Hawkins : advpack: Add documentation for ExtractFiles.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: 325c19cfc5a91918b41b86e310d5aae6905a983e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=325c19cfc5a91918b41b86e… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jan 9 20:26:10 2006 +0100 advpack: Add documentation for ExtractFiles. --- dlls/advpack/advpack.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 31fa51c..9e09a9b 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -578,10 +578,31 @@ HRESULT WINAPI ExecuteCab( HWND hwnd, PC /*********************************************************************** * ExtractFiles (ADVPACK.@) * + * Extracts the specified files from a cab archive into + * a destination directory. + * + * PARAMS + * CabName [I] Filename of the cab archive. + * ExpandDir [I] Destination directory for the extracted files. + * Flags [I] Reserved. + * FileList [I] Optional list of files to extract. See NOTES. + * LReserved [I] Reserved. Must be NULL. + * Reserved [I] Reserved. Must be 0. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * NOTES + * FileList is a colon-separated list of filenames. If FileList is + * non-NULL, only the files in the list will be extracted from the + * cab file, otherwise all files will be extracted. Any number of + * spaces, tabs, or colons can be before or after the list, but + * the list itself must only be separated by colons. + * * BUGS - * Unimplemented + * Unimplemented. */ - HRESULT WINAPI ExtractFiles ( LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, LPCSTR FileList, LPVOID LReserved, DWORD Reserved) {

1 0

James Hawkins : cabinet: Clean up the documentation for Extract.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: 18d6f6944b19b284963dc9c12074aca121616787 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18d6f6944b19b284963dc9c… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jan 9 20:24:21 2006 +0100 cabinet: Clean up the documentation for Extract. --- dlls/cabinet/cabinet_main.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index d066a38..0be8ed4 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -69,22 +69,37 @@ HRESULT WINAPI DllGetVersion (DLLVERSION /*********************************************************************** * Extract (CABINET.3) * - * Apparently an undocumented function, presumably to extract a CAB file - * to somewhere... + * Extracts the contents of the cabinet file to the specified + * destination. * * PARAMS - * dest pointer to a buffer of 0x32c bytes containing - * [I] - number with value 1 at index 0x18 - * - the dest path starting at index 0x1c - * [O] - a linked list with the filename existing inside the - * CAB file at idx 0x10 - * - the number of files inside the CAB file at index 0x14 - * - the name of the last file with dest path at idx 0x120 + * dest [I/O] Controls the operation of Extract. See NOTES. * szCabName [I] Filename of the cabinet to extract. * * RETURNS - * Success: S_OK - * Failure: E_OUTOFMEMORY (?) + * Success: S_OK. + * Failure: E_FAIL. + * + * NOTES + * The following members of the dest struct control the operation + * of Extract: + * filelist [I] A linked list of filenames. Extract only extracts + * files from the cabinet that are in this list. + * filecount [O] Contains the number of files in filelist on + * completion. + * flags [I] See Operation. + * directory [I] The destination directory. + * lastfile [O] The last file extracted. + * + * Operation + * If flags contains EXTRACT_FILLFILELIST, then filelist will be + * filled with all the files in the cabinet. If flags contains + * EXTRACT_EXTRACTFILES, then only the files in the filelist will + * be extracted from the cabinet. EXTRACT_FILLFILELIST can be called + * by itself, but EXTRACT_EXTRACTFILES must have a valid filelist + * in order to succeed. If flags contains both EXTRACT_FILLFILELIST + * and EXTRACT_EXTRACTFILES, then all the files in the cabinet + * will be extracted. */ HRESULT WINAPI Extract(EXTRACTdest *dest, LPCSTR szCabName) {

1 0

James Hawkins : cabinet: Add the two flags used by Extract to cabinet.h.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: 6213c452bb54bc14482c1e7a7ddf4a53394f0ea1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6213c452bb54bc14482c1e7… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jan 9 20:24:10 2006 +0100 cabinet: Add the two flags used by Extract to cabinet.h. --- dlls/cabinet/cabinet.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index 9743b0a..1349105 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -613,6 +613,10 @@ static const cab_UWORD Zipmask[17] = { 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff \ } +/* EXTRACTdest flags */ +#define EXTRACT_FILLFILELIST 0x00000001 +#define EXTRACT_EXTRACTFILES 0x00000002 + struct ExtractFileList { LPSTR filename; struct ExtractFileList *next;

1 0

James Hawkins : cabinet: Define the flags member of the EXTRACTdest structure.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: e073fbdce91aefe3cf4a80c3a1a7c7a6020ee0cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e073fbdce91aefe3cf4a80c… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jan 9 20:23:34 2006 +0100 cabinet: Define the flags member of the EXTRACTdest structure. --- dlls/cabinet/cabinet.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index c70d639..9743b0a 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -625,7 +625,7 @@ typedef struct { long unknown1[3]; /* 0x004 */ struct ExtractFileList *filelist; /* 0x010 */ long filecount; /* 0x014 */ - long unknown2; /* 0x018 */ + DWORD flags; /* 0x018 */ char directory[0x104]; /* 0x01c */ char lastfile[0x20c]; /* 0x120 */ } EXTRACTdest;

1 0

James Hawkins : cabinet: Fix the second parameter name of Extract.
by Alexandre Julliard Jan. 9, 2006

Jan. 9, 2006

Module: wine Branch: refs/heads/master Commit: f9859a88d3833af6eabc3ed6b04efb3d73708976 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9859a88d3833af6eabc3ed… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jan 9 20:23:26 2006 +0100 cabinet: Fix the second parameter name of Extract. --- dlls/cabinet/cabinet_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 5d61324..d066a38 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -80,13 +80,13 @@ HRESULT WINAPI DllGetVersion (DLLVERSION * CAB file at idx 0x10 * - the number of files inside the CAB file at index 0x14 * - the name of the last file with dest path at idx 0x120 - * what [I] char* describing what to uncompress, I guess. + * szCabName [I] Filename of the cabinet to extract. * * RETURNS * Success: S_OK * Failure: E_OUTOFMEMORY (?) */ -HRESULT WINAPI Extract(EXTRACTdest *dest, LPCSTR what) +HRESULT WINAPI Extract(EXTRACTdest *dest, LPCSTR szCabName) { #define DUMPC(idx) idx >= sizeof(EXTRACTdest) ? ' ' : \ ((unsigned char*) dest)[idx] >= 0x20 ? \ @@ -97,7 +97,7 @@ HRESULT WINAPI Extract(EXTRACTdest *dest LPSTR dir; unsigned int i; - TRACE("(dest == %0lx, what == %s)\n", (long) dest, debugstr_a(what)); + TRACE("(dest == %0lx, szCabName == %s)\n", (long) dest, debugstr_a(szCabName)); if (!dest) { /* win2k will crash here */ @@ -121,7 +121,7 @@ HRESULT WINAPI Extract(EXTRACTdest *dest TRACE("extracting to dir: %s\n", debugstr_a(dir)); /* FIXME: what to do on failure? */ - if (!process_cabinet(what, dir, FALSE, FALSE, dest)) { + if (!process_cabinet(szCabName, dir, FALSE, FALSE, dest)) { LocalFree(dir); return E_OUTOFMEMORY; }

1 0