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

Nikolay Sivov : comctl32/imagelist: Fix return value for IImageList_GetIconSize().
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: acbd632039a96a02feebc911a88de3114094512b URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbd632039a96a02feebc911a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 21 19:31:29 2010 +0400 comctl32/imagelist: Fix return value for IImageList_GetIconSize(). --- dlls/comctl32/imagelist.c | 5 +--- dlls/comctl32/tests/imagelist.c | 48 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 89333bf..9396b95 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3431,7 +3431,7 @@ static HRESULT WINAPI ImageListImpl_GetIconSize(IImageList *iface, int *cx, { HIMAGELIST This = (HIMAGELIST) iface; - return ImageList_GetIconSize(This, cx, cy) ? S_OK : E_FAIL; + return ImageList_GetIconSize(This, cx, cy) ? S_OK : E_INVALIDARG; } static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList *iface, int cx, @@ -3442,9 +3442,6 @@ static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList *iface, int cx, static HRESULT WINAPI ImageListImpl_GetImageCount(IImageList *iface, int *pi) { - if (!pi) - return E_FAIL; - *pi = ImageList_GetImageCount((HIMAGELIST) iface); return S_OK; } diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index ff3ada4..c5ea95f 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1863,6 +1863,52 @@ if (0) IImageList_Release(imgl); } +static void test_IImageList_GetImageCount(void) +{ + IImageList *imgl; + HIMAGELIST himl; + int count; + HRESULT hr; + + himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + imgl = (IImageList*)himl; + +if (0) +{ + /* crashes on native */ + hr = IImageList_GetImageCount(imgl, NULL); +} + + count = -1; + hr = IImageList_GetImageCount(imgl, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 0, "got %d\n", count); + + IImageList_Release(imgl); +} + +static void test_IImageList_GetIconSize(void) +{ + IImageList *imgl; + HIMAGELIST himl; + int cx, cy; + HRESULT hr; + + himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + imgl = (IImageList*)himl; + + hr = IImageList_GetIconSize(imgl, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IImageList_GetIconSize(imgl, &cx, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IImageList_GetIconSize(imgl, NULL, &cy); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + IImageList_Release(imgl); +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1918,6 +1964,8 @@ START_TEST(imagelist) test_IImageList_Clone(); test_IImageList_GetBkColor(); test_IImageList_SetBkColor(); + test_IImageList_GetImageCount(); + test_IImageList_GetIconSize(); CoUninitialize();

1 0

Nikolay Sivov : oleaut32/olepicture: Properly round while performing pixels->himetric units conversion.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 99863b02ba73f68c06cfa46425f06d12fc44bf9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=99863b02ba73f68c06cfa4642… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 23 10:59:06 2010 +0400 oleaut32/olepicture: Properly round while performing pixels->himetric units conversion. --- dlls/oleaut32/olepicture.c | 35 ++++++++++++---- dlls/oleaut32/tests/olepicture.c | 79 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index b8e949d..df7826b 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -181,28 +181,43 @@ static const IDispatchVtbl OLEPictureImpl_IDispatch_VTable; static const IPersistStreamVtbl OLEPictureImpl_IPersistStream_VTable; static const IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContainer_VTable; +/* pixels to HIMETRIC units conversion */ +static inline OLE_XSIZE_HIMETRIC xpixels_to_himetric(INT pixels, HDC hdc) +{ + return MulDiv(pixels, 2540, GetDeviceCaps(hdc, LOGPIXELSX)); +} + +static inline OLE_YSIZE_HIMETRIC ypixels_to_himetric(INT pixels, HDC hdc) +{ + return MulDiv(pixels, 2540, GetDeviceCaps(hdc, LOGPIXELSY)); +} + /*********************************************************************** * Implementation of the OLEPictureImpl class. */ -static void OLEPictureImpl_SetBitmap(OLEPictureImpl*This) { +static void OLEPictureImpl_SetBitmap(OLEPictureImpl *This) +{ BITMAP bm; HDC hdcRef; TRACE("bitmap handle %p\n", This->desc.u.bmp.hbitmap); - if(GetObjectA(This->desc.u.bmp.hbitmap, sizeof(bm), &bm) != sizeof(bm)) { + if(GetObjectW(This->desc.u.bmp.hbitmap, sizeof(bm), &bm) != sizeof(bm)) { ERR("GetObject fails\n"); return; } This->origWidth = bm.bmWidth; This->origHeight = bm.bmHeight; + /* The width and height are stored in HIMETRIC units (0.01 mm), so we take our pixel width divide by pixels per inch and multiply by 25.4 * 100 */ /* Should we use GetBitmapDimension if available? */ hdcRef = CreateCompatibleDC(0); - This->himetricWidth =(bm.bmWidth *2540)/GetDeviceCaps(hdcRef, LOGPIXELSX); - This->himetricHeight=(bm.bmHeight*2540)/GetDeviceCaps(hdcRef, LOGPIXELSY); + + This->himetricWidth = xpixels_to_himetric(bm.bmWidth, hdcRef); + This->himetricHeight = xpixels_to_himetric(bm.bmHeight, hdcRef); + DeleteDC(hdcRef); } @@ -216,7 +231,7 @@ static void OLEPictureImpl_SetIcon(OLEPictureImpl * This) BITMAP bm; TRACE("bitmap handle for icon is %p\n", infoIcon.hbmColor); - if(GetObjectA(infoIcon.hbmColor ? infoIcon.hbmColor : infoIcon.hbmMask, sizeof(bm), &bm) != sizeof(bm)) { + if(GetObjectW(infoIcon.hbmColor ? infoIcon.hbmColor : infoIcon.hbmMask, sizeof(bm), &bm) != sizeof(bm)) { ERR("GetObject fails on icon bitmap\n"); return; } @@ -225,8 +240,10 @@ static void OLEPictureImpl_SetIcon(OLEPictureImpl * This) This->origHeight = infoIcon.hbmColor ? bm.bmHeight : bm.bmHeight / 2; /* see comment on HIMETRIC on OLEPictureImpl_SetBitmap() */ hdcRef = GetDC(0); - This->himetricWidth = (This->origWidth *2540)/GetDeviceCaps(hdcRef, LOGPIXELSX); - This->himetricHeight= (This->origHeight *2540)/GetDeviceCaps(hdcRef, LOGPIXELSY); + + This->himetricWidth = xpixels_to_himetric(This->origWidth, hdcRef); + This->himetricHeight = ypixels_to_himetric(This->origHeight, hdcRef); + ReleaseDC(0, hdcRef); DeleteObject(infoIcon.hbmMask); @@ -1241,8 +1258,8 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x This->origWidth = cifd->idEntries[i].bWidth; This->origHeight = cifd->idEntries[i].bHeight; hdcRef = CreateCompatibleDC(0); - This->himetricWidth =(cifd->idEntries[i].bWidth *2540)/GetDeviceCaps(hdcRef, LOGPIXELSX); - This->himetricHeight=(cifd->idEntries[i].bHeight*2540)/GetDeviceCaps(hdcRef, LOGPIXELSY); + This->himetricWidth = xpixels_to_himetric(cifd->idEntries[i].bWidth, hdcRef); + This->himetricHeight= ypixels_to_himetric(cifd->idEntries[i].bHeight, hdcRef); DeleteDC(hdcRef); return S_OK; } diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index f00055e..9ab2515 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -880,6 +880,84 @@ static void test_OleLoadPicturePath(void) "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); } +static void test_himetric(void) +{ + static const BYTE bmp_bits[1024]; + OLE_XSIZE_HIMETRIC cx; + OLE_YSIZE_HIMETRIC cy; + IPicture *pic; + PICTDESC desc; + HBITMAP bmp; + HRESULT hr; + HICON icon; + HDC hdc; + INT d; + + if (!pOleCreatePictureIndirect) + { + win_skip("OleCreatePictureIndirect not available\n"); + return; + } + + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_BITMAP; + desc.u.bmp.hpal = NULL; + + hdc = CreateCompatibleDC(0); + + bmp = CreateBitmap(1.9 * GetDeviceCaps(hdc, LOGPIXELSX), + 1.9 * GetDeviceCaps(hdc, LOGPIXELSY), 1, 1, NULL); + + desc.u.bmp.hbitmap = bmp; + + /* size in himetric units reported rounded up to next integer value */ + hr = pOleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + ok(hr == S_OK, "got 0x%08x\n", hr); + + cx = 0; + d = MulDiv((INT)(1.9 * GetDeviceCaps(hdc, LOGPIXELSX)), 2540, GetDeviceCaps(hdc, LOGPIXELSX)); + hr = IPicture_get_Width(pic, &cx); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cx == d, "got %d, expected %d\n", cx, d); + + cy = 0; + d = MulDiv((INT)(1.9 * GetDeviceCaps(hdc, LOGPIXELSY)), 2540, GetDeviceCaps(hdc, LOGPIXELSY)); + hr = IPicture_get_Height(pic, &cy); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cy == d, "got %d, expected %d\n", cy, d); + + DeleteObject(bmp); + IPicture_Release(pic); + + /* same thing with icon */ + icon = CreateIcon(NULL, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), + 1, 1, bmp_bits, bmp_bits); + ok(icon != NULL, "failed to create icon\n"); + + desc.picType = PICTYPE_ICON; + desc.u.icon.hicon = icon; + + hr = pOleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + ok(hr == S_OK, "got 0x%08x\n", hr); + + cx = 0; + d = MulDiv(GetSystemMetrics(SM_CXICON), 2540, GetDeviceCaps(hdc, LOGPIXELSX)); + hr = IPicture_get_Width(pic, &cx); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cx == d, "got %d, expected %d\n", cx, d); + + cy = 0; + d = MulDiv(GetSystemMetrics(SM_CYICON), 2540, GetDeviceCaps(hdc, LOGPIXELSY)); + hr = IPicture_get_Height(pic, &cy); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cy == d, "got %d, expected %d\n", cy, d); + + IPicture_Release(pic); + DestroyIcon(icon); + + DeleteDC(hdc); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -911,6 +989,7 @@ START_TEST(olepicture) test_get_Handle(); test_get_Type(); test_OleLoadPicturePath(); + test_himetric(); }

1 0

Luca Bennati : wineconsole: Fix Italian translation.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: c48087756fe21e3c4095f163927e999083cc2123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48087756fe21e3c4095f1639… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Aug 21 19:33:03 2010 +0200 wineconsole: Fix Italian translation. --- programs/wineconsole/wineconsole_It.rc | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/wineconsole/wineconsole_It.rc b/programs/wineconsole/wineconsole_It.rc index dad2930..36e568b 100644 --- a/programs/wineconsole/wineconsole_It.rc +++ b/programs/wineconsole/wineconsole_It.rc @@ -26,9 +26,9 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_EDIT, "&Modifica" -IDS_DEFAULT, "Imposta &Default" +IDS_DEFAULT, "Imposta pre&definite" IDS_PROPERTIES, "&Proprietà" -IDS_MARK, "Mark&" +IDS_MARK, "Ma&rca" IDS_COPY, "&Copia" IDS_PASTE, "&Incolla" IDS_SELECTALL, "&Seleziona tutto" @@ -36,16 +36,16 @@ IDS_SCROLL, "Sc&orri" IDS_SEARCH, "C&erca" IDS_FNT_DISPLAY, "Il carattere è %ld pixel di larghezza e %ld pixel di altezza" IDS_FNT_PREVIEW, "Questa è una prova" -IDS_DLG_TIT_DEFAULT, "Impostazioni di Default" +IDS_DLG_TIT_DEFAULT, "Impostazioni predefinite" IDS_DLG_TIT_CURRENT, "Impostazioni correnti" IDS_DLG_TIT_ERROR, "Errore di configurazione" IDS_DLG_ERR_SBWINSIZE, "Il buffer dello schermo deve essere più grande o uguale a quello della finestra" -IDS_CMD_INVALID_EVENT_ID "wineconsole: impossibile parse event id\n" +IDS_CMD_INVALID_EVENT_ID "wineconsole: impossibile analizzare id evento\n" IDS_CMD_INVALID_BACKEND "wineconsole: backend non valido\n" IDS_CMD_INVALID_OPTION "wineconsole: opzione della linea di comando non riconosciuta\n" IDS_CMD_ABOUT "Avvia un programma in una console Wine\n" -IDS_CMD_LAUNCH_FAILED "wineconsole: Impossibile avviare %s.\n"\ +IDS_CMD_LAUNCH_FAILED "wineconsole: impossibile avviare %s.\n"\ "Il comando non è valido.\n" IDS_USAGE_HEADER "\nUso:\n wineconsole [opzioni] <comando>\n\nOpzioni:\n" @@ -66,11 +66,11 @@ FONT 8, "MS Shell Dlg" AUTORADIOBUTTON "&Grande", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP GROUPBOX "Controlli", -1, 75, 11, 125, 44, BS_GROUPBOX - LTEXT "Popup menu", -1, 79, 23, 40, 10 - AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP - AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP + LTEXT "Menu a comparsa", -1, 79, 23, 40, 10 + AUTOCHECKBOX "&Controlla", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP + AUTOCHECKBOX "Sco&rri", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP LTEXT "Modifica rapida", -1, 79, 43, 50, 10 - AUTOCHECKBOX "&abilita", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP + AUTOCHECKBOX "&Abilita", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP GROUPBOX "Cronologia", -1, 10, 57, 190, 35, BS_GROUPBOX LTEXT "&Numero di comandi richiamati :", -1, 14, 67, 78, 18 @@ -84,9 +84,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Carattere " FONT 8, "MS Shell Dlg" { - LTEXT "&Font", -1, 5, 5, 24, 8 + LTEXT "&Carattere", -1, 5, 5, 24, 8 LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL - LTEXT "&Colore", -1, 100, 5, 50, 8 + LTEXT "C&olore", -1, 100, 5, 50, 8 CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 LTEXT "&Dimensione", -1, 158, 5, 40, 8 @@ -133,5 +133,5 @@ FONT 8, "MS Shell Dlg" AUTORADIOBUTTON "Modifica solo la sessione corrente", IDC_SAV_SESSION, 14, 27, 110, 10, WS_TABSTOP PUSHBUTTON "OK", IDOK, 20, 45, 35, 12 - PUSHBUTTON "Cancella", IDCANCEL, 65, 45, 35, 12 + PUSHBUTTON "Annulla", IDCANCEL, 65, 45, 35, 12 }

1 0

Julius Schwartzenberg : setupapi: Add stubs SetupQueryDrivesInDiskSpaceList{A, W}.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 53aef28e36078f0eb28d925c01a9f81e9aeb94ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=53aef28e36078f0eb28d925c0… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sat Aug 21 22:39:49 2010 +0200 setupapi: Add stubs SetupQueryDrivesInDiskSpaceList{A,W}. --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 1b43bb9..a3dd4b0 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -469,8 +469,8 @@ @ stdcall SetupPromptForDiskA(ptr str str str str str long ptr long ptr) @ stdcall SetupPromptForDiskW(ptr wstr wstr wstr wstr wstr long ptr long ptr) @ stdcall SetupPromptReboot(ptr ptr long) -@ stub SetupQueryDrivesInDiskSpaceListA -@ stub SetupQueryDrivesInDiskSpaceListW +@ stdcall SetupQueryDrivesInDiskSpaceListA(ptr ptr long ptr) +@ stdcall SetupQueryDrivesInDiskSpaceListW(ptr ptr long ptr) @ stub SetupQueryFileLogA @ stub SetupQueryFileLogW @ stdcall SetupQueryInfFileInformationA(ptr long str long ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index a37d689..fd40343 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -194,6 +194,24 @@ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only ) } /*********************************************************************** + * SetupQueryDrivesInDiskSpaceListA (SETUPAPI.@) + */ +BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC disk_space, PSTR return_buffer, DWORD return_buffer_size, PDWORD required_size) +{ + FIXME("%p, %p, %d, %p\n", disk_space, return_buffer, return_buffer_size, required_size); + return FALSE; +} + +/*********************************************************************** + * SetupQueryDrivesInDiskSpaceListW (SETUPAPI.@) + */ +BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_buffer, DWORD return_buffer_size, PDWORD required_size) +{ + FIXME("%p, %p, %d, %p\n", disk_space, return_buffer, return_buffer_size, required_size); + return FALSE; +} + +/*********************************************************************** * SetupSetSourceListA (SETUPAPI.@) */ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count)

1 0

Alexandre Goujon : kernel32: Fix GetComputerName errors.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 49c5bd0365ebb32bb1bb9faf55cb587d4e407513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c5bd0365ebb32bb1bb9faf5… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sun Aug 22 11:40:00 2010 +0200 kernel32: Fix GetComputerName errors. --- dlls/kernel32/computername.c | 30 +++++++++++++++++++++++------- dlls/kernel32/tests/environ.c | 2 -- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index f710d7c..dabaae8 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -316,23 +316,33 @@ BOOL WINAPI GetComputerNameW(LPWSTR name,LPDWORD size) DWORD len = sizeof( buf ); LPWSTR theName = (LPWSTR) (buf + offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data )); NTSTATUS st = STATUS_INVALID_PARAMETER; + DWORD err = ERROR_SUCCESS; TRACE ("%p %p\n", name, size); _init_attr ( &attr, &nameW ); RtlInitUnicodeString( &nameW, ComputerW ); if ( ( st = NtOpenKey( &hkey, KEY_READ, &attr ) ) != STATUS_SUCCESS ) + { + err = RtlNtStatusToDosError ( st ); goto out; + } attr.RootDirectory = hkey; RtlInitUnicodeString( &nameW, ActiveComputerNameW ); if ( ( st = NtOpenKey( &hsubkey, KEY_READ, &attr ) ) != STATUS_SUCCESS ) + { + err = RtlNtStatusToDosError ( st ); goto out; + } RtlInitUnicodeString( &nameW, ComputerNameW ); if ( ( st = NtQueryValueKey( hsubkey, &nameW, KeyValuePartialInformation, buf, len, &len ) ) != STATUS_SUCCESS ) + { + err = RtlNtStatusToDosError ( st ); goto out; + } len = (len -offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data )) / sizeof (WCHAR) - 1; TRACE ("ComputerName is %s (length %u)\n", debugstr_w ( theName ), len); @@ -340,25 +350,24 @@ BOOL WINAPI GetComputerNameW(LPWSTR name,LPDWORD size) if ( *size < len + 1 ) { *size = len + 1; - st = STATUS_MORE_ENTRIES; + err = ERROR_BUFFER_OVERFLOW; } else { memcpy ( name, theName, len * sizeof (WCHAR) ); name[len] = 0; *size = len; - st = STATUS_SUCCESS; } out: NtClose ( hsubkey ); NtClose ( hkey ); - if ( st == STATUS_SUCCESS ) + if ( err == ERROR_SUCCESS ) return TRUE; else { - SetLastError ( RtlNtStatusToDosError ( st ) ); + SetLastError ( err ); WARN ( "Status %u reading computer name from registry\n", st ); return FALSE; } @@ -383,7 +392,7 @@ BOOL WINAPI GetComputerNameA(LPSTR name, LPDWORD size) if ( *size < len ) { *size = len; - SetLastError( ERROR_MORE_DATA ); + SetLastError( ERROR_BUFFER_OVERFLOW ); ret = FALSE; } else @@ -415,7 +424,11 @@ BOOL WINAPI GetComputerNameExA(COMPUTER_NAME_FORMAT type, LPSTR name, LPDWORD si { case ComputerNameNetBIOS: case ComputerNamePhysicalNetBIOS: - return GetComputerNameA (name, size); + ret = GetComputerNameA (name, size); + if (!ret && GetLastError() == ERROR_BUFFER_OVERFLOW) + SetLastError( ERROR_MORE_DATA ); + return ret; + case ComputerNameDnsHostname: case ComputerNamePhysicalDnsHostname: ret = dns_hostname (buf, &len); @@ -468,7 +481,10 @@ BOOL WINAPI GetComputerNameExW( COMPUTER_NAME_FORMAT type, LPWSTR name, LPDWORD { case ComputerNameNetBIOS: case ComputerNamePhysicalNetBIOS: - return GetComputerNameW (name, size); + ret = GetComputerNameW (name, size); + if (!ret && GetLastError() == ERROR_BUFFER_OVERFLOW) + SetLastError( ERROR_MORE_DATA ); + return ret; case ComputerNameDnsHostname: case ComputerNamePhysicalDnsHostname: ret = dns_hostname (buf, &len); diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 19d11b5..c38aef7 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -330,7 +330,6 @@ static void test_GetComputerName(void) size = 0; ret = GetComputerNameA((LPSTR)0xdeadbeef, &size); error = GetLastError(); - todo_wine ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameA should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); /* Only Vista returns the computer name length as documented in the MSDN */ @@ -362,7 +361,6 @@ static void test_GetComputerName(void) win_skip("GetComputerNameW is not implemented\n"); else { - todo_wine ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameW should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); size++; /* nul terminating character */ nameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(nameW[0]));

1 0

Damjan Jovanovic : winemenubuilder: Decouple opening a Windows icon from generating the native icon.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: bc5a2050978d63532bb052c27e60ab9968f32fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc5a2050978d63532bb052c27… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 22 19:42:18 2010 +0200 winemenubuilder: Decouple opening a Windows icon from generating the native icon. --- programs/winemenubuilder/winemenubuilder.c | 202 +++++++++++++++------------- 1 files changed, 109 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc5a2050978d63532bb05…

1 0

Damjan Jovanovic : winemenubuilder: Defer best icon selection to when we generate the native icons.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: d58f2680d1d0320b01cb88d736523cf521f6adc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58f2680d1d0320b01cb88d73… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 22 19:46:51 2010 +0200 winemenubuilder: Defer best icon selection to when we generate the native icons. --- programs/winemenubuilder/winemenubuilder.c | 162 ++++++++++++++++------------ 1 files changed, 91 insertions(+), 71 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 445fe53..8941cbf 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -301,54 +301,108 @@ end: return SUCCEEDED(hr); } -static IStream* module_icon_to_stream(GRPICONDIRENTRY *grpIconDirEntry, BITMAPINFO *pIcon) +static IStream *add_module_icons_to_stream(HMODULE hModule, GRPICONDIR *grpIconDir) { - SIZE_T size; - HGLOBAL hGlobal = NULL; + int i; + SIZE_T iconsSize = 0; + BYTE *icons = NULL; + ICONDIRENTRY *iconDirEntries = NULL; IStream *stream = NULL; - char *p; - ICONDIR *pIconDir; - ICONDIRENTRY *pIconDirEntry; HRESULT hr = E_FAIL; + ULONG bytesWritten; + ICONDIR iconDir; + SIZE_T iconOffset; + int validEntries = 0; + LARGE_INTEGER zero; - size = sizeof(ICONDIR) + sizeof(ICONDIRENTRY) + grpIconDirEntry->dwBytesInRes; - hGlobal = GlobalAlloc(GMEM_MOVEABLE, size); - if (hGlobal == NULL) + for (i = 0; i < grpIconDir->idCount; i++) + iconsSize += grpIconDir->idEntries[i].dwBytesInRes; + icons = HeapAlloc(GetProcessHeap(), 0, iconsSize); + if (icons == NULL) { WINE_ERR("out of memory allocating icon\n"); goto end; } - p = GlobalLock(hGlobal); - pIconDir = (ICONDIR*)p; - pIconDir->idReserved = 0; - pIconDir->idType = 1; - pIconDir->idCount = 1; - p += sizeof(ICONDIR); - pIconDirEntry = (ICONDIRENTRY*)p; - pIconDirEntry->bWidth = grpIconDirEntry->bWidth; - pIconDirEntry->bHeight = grpIconDirEntry->bHeight; - pIconDirEntry->bColorCount = grpIconDirEntry->bColorCount; - pIconDirEntry->bReserved = grpIconDirEntry->bReserved; - pIconDirEntry->wPlanes = grpIconDirEntry->wPlanes; - pIconDirEntry->wBitCount = grpIconDirEntry->wBitCount; - pIconDirEntry->dwBytesInRes = grpIconDirEntry->dwBytesInRes; - pIconDirEntry->dwImageOffset = sizeof(ICONDIR) + sizeof(ICONDIRENTRY); - p += sizeof(ICONDIRENTRY); - memcpy(p, pIcon, grpIconDirEntry->dwBytesInRes); - GlobalUnlock(hGlobal); - - hr = CreateStreamOnHGlobal(hGlobal, TRUE, &stream); + iconDirEntries = HeapAlloc(GetProcessHeap(), 0, grpIconDir->idCount*sizeof(ICONDIRENTRY)); + if (iconDirEntries == NULL) + { + WINE_ERR("out of memory allocating icon dir entries\n"); + goto end; + } + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); if (FAILED(hr)) { - WINE_ERR("could not create stream on icon hglobal, error 0x%08X\n", hr); + WINE_ERR("error creating icon stream\n"); + goto end; + } + + iconOffset = 0; + for (i = 0; i < grpIconDir->idCount; i++) + { + HRSRC hResInfo; + LPCWSTR lpName = MAKEINTRESOURCEW(grpIconDir->idEntries[i].nID); + if ((hResInfo = FindResourceW(hModule, lpName, (LPCWSTR)RT_ICON))) + { + HGLOBAL hResData; + if ((hResData = LoadResource(hModule, hResInfo))) + { + BITMAPINFO *pIcon; + if ((pIcon = LockResource(hResData))) + { + iconDirEntries[validEntries].bWidth = grpIconDir->idEntries[i].bWidth; + iconDirEntries[validEntries].bHeight = grpIconDir->idEntries[i].bHeight; + iconDirEntries[validEntries].bColorCount = grpIconDir->idEntries[i].bColorCount; + iconDirEntries[validEntries].bReserved = grpIconDir->idEntries[i].bReserved; + iconDirEntries[validEntries].wPlanes = grpIconDir->idEntries[i].wPlanes; + iconDirEntries[validEntries].wBitCount = grpIconDir->idEntries[i].wBitCount; + iconDirEntries[validEntries].dwBytesInRes = grpIconDir->idEntries[i].dwBytesInRes; + iconDirEntries[validEntries].dwImageOffset = iconOffset; + validEntries++; + memcpy(&icons[iconOffset], pIcon, grpIconDir->idEntries[i].dwBytesInRes); + iconOffset += grpIconDir->idEntries[i].dwBytesInRes; + } + FreeResource(hResData); + } + } + } + + if (validEntries == 0) + { + WINE_ERR("no valid icon entries\n"); goto end; } - hr = S_OK; + + iconDir.idReserved = 0; + iconDir.idType = 1; + iconDir.idCount = validEntries; + hr = IStream_Write(stream, &iconDir, sizeof(iconDir), &bytesWritten); + if (FAILED(hr) || bytesWritten != sizeof(iconDir)) + { + WINE_ERR("error 0x%08X writing icon stream\n", hr); + goto end; + } + for (i = 0; i < validEntries; i++) + iconDirEntries[i].dwImageOffset += sizeof(ICONDIR) + validEntries*sizeof(ICONDIRENTRY); + hr = IStream_Write(stream, iconDirEntries, validEntries*sizeof(ICONDIRENTRY), &bytesWritten); + if (FAILED(hr) || bytesWritten != validEntries*sizeof(ICONDIRENTRY)) + { + WINE_ERR("error 0x%08X writing icon dir entries to stream\n", hr); + goto end; + } + hr = IStream_Write(stream, icons, iconOffset, &bytesWritten); + if (FAILED(hr) || bytesWritten != iconOffset) + { + WINE_ERR("error 0x%08X writing icon images to stream\n", hr); + goto end; + } + zero.QuadPart = 0; + hr = IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); end: - if (hGlobal && stream == NULL) - GlobalFree(hGlobal); + HeapFree(GetProcessHeap(), 0, icons); + HeapFree(GetProcessHeap(), 0, iconDirEntries); if (FAILED(hr) && stream != NULL) { IStream_Release(stream); @@ -374,15 +428,9 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre { HMODULE hModule; HRSRC hResInfo; - LPCWSTR lpName = NULL; HGLOBAL hResData; GRPICONDIR *pIconDir; - BITMAPINFO *pIcon; ENUMRESSTRUCT sEnumRes; - int nMax = 0; - int nMaxBits = 0; - GRPICONDIRENTRY iconDirEntry = {0}; - int i; HRESULT hr = E_FAIL; hModule = LoadLibraryExW(szFileName, 0, LOAD_LIBRARY_AS_DATAFILE); @@ -418,20 +466,9 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre { if ((pIconDir = LockResource(hResData))) { - lpName = MAKEINTRESOURCEW(pIconDir->idEntries[0].nID); /* default to first entry */ - for (i = 0; i < pIconDir->idCount; i++) - { - if (pIconDir->idEntries[i].wBitCount >= nMaxBits) - { - if ((pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth) >= nMax) - { - lpName = MAKEINTRESOURCEW(pIconDir->idEntries[i].nID); - nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth; - nMaxBits = pIconDir->idEntries[i].wBitCount; - iconDirEntry = pIconDir->idEntries[i]; - } - } - } + *ppStream = add_module_icons_to_stream(hModule, pIconDir); + if (*ppStream) + hr = S_OK; } FreeResource(hResData); @@ -443,23 +480,6 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre FreeLibrary(hModule); return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); } - - if ((hResInfo = FindResourceW(hModule, lpName, (LPCWSTR)RT_ICON))) - { - if ((hResData = LoadResource(hModule, hResInfo))) - { - if ((pIcon = LockResource(hResData))) - { - *ppStream = module_icon_to_stream(&iconDirEntry, pIcon); - if (*ppStream) - hr = S_OK; - else - hr = E_FAIL; - } - - FreeResource(hResData); - } - } FreeLibrary(hModule); return hr;

1 0

Vincent Povirk : gdiplus: Stub GdipTranslatePathGradientTransform.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 8dd940d0b5abcd0c227d66a4da5cb43fca70dfbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd940d0b5abcd0c227d66a4d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 24 17:32:26 2010 -0500 gdiplus: Stub GdipTranslatePathGradientTransform. --- dlls/gdiplus/brush.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index c31ed4d..6bcb63c 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1679,6 +1679,19 @@ GpStatus WINGDIPAPI GdipScalePathGradientTransform(GpPathGradient *grad, return NotImplemented; } +GpStatus WINGDIPAPI GdipTranslatePathGradientTransform(GpPathGradient *grad, + REAL dx, REAL dy, GpMatrixOrder order) +{ + static int calls; + + TRACE("(%p,%0.2f,%0.2f,%i)\n", grad, dx, dy, order); + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) { TRACE("(%p, %x)\n", sf, argb); diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4a98a43..783b984 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -613,7 +613,7 @@ @ stdcall GdipTranslateClipI(ptr long long) @ stdcall GdipTranslateLineTransform(ptr long long long) @ stdcall GdipTranslateMatrix(ptr long long long) -@ stub GdipTranslatePathGradientTransform +@ stdcall GdipTranslatePathGradientTransform(ptr long long long) @ stub GdipTranslatePenTransform @ stdcall GdipTranslateRegion(ptr long long) @ stdcall GdipTranslateRegionI(ptr long long)

1 0

Vincent Povirk : gdiplus: Stub GdipGetPathGradientPresetBlend.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: b57c4314c1eddb11ac872d2ade0d07d65ba05cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57c4314c1eddb11ac872d2ad… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 24 17:32:52 2010 -0500 gdiplus: Stub GdipGetPathGradientPresetBlend. --- dlls/gdiplus/brush.c | 7 +++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 6bcb63c..02d1522 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1487,6 +1487,13 @@ GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient *brush, return NotImplemented; } +GpStatus WINGDIPAPI GdipGetPathGradientPresetBlend(GpPathGradient *brush, + ARGB *blend, REAL *pos, INT count) +{ + FIXME("(%p,%p,%p,%i): stub\n", brush, blend, pos, count); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetPathGradientPresetBlendCount(GpPathGradient *brush, INT *count) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 783b984..6f9cf88 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -334,7 +334,7 @@ @ stdcall GdipGetPathGradientGammaCorrection(ptr ptr) @ stub GdipGetPathGradientPath @ stdcall GdipGetPathGradientPointCount(ptr ptr) -@ stub GdipGetPathGradientPresetBlend +@ stdcall GdipGetPathGradientPresetBlend(ptr ptr ptr long) @ stdcall GdipGetPathGradientPresetBlendCount(ptr ptr) @ stdcall GdipGetPathGradientRect(ptr ptr) @ stdcall GdipGetPathGradientRectI(ptr ptr)

1 0

Vincent Povirk : gdiplus: Stub GdipTranslatePenTransform.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 18a4e2436894acae3722269b62272197afe65404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a4e2436894acae3722269b6… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Fri Jul 2 16:36:21 2010 -0400 gdiplus: Stub GdipTranslatePenTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6f9cf88..2d99601 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -614,7 +614,7 @@ @ stdcall GdipTranslateLineTransform(ptr long long long) @ stdcall GdipTranslateMatrix(ptr long long long) @ stdcall GdipTranslatePathGradientTransform(ptr long long long) -@ stub GdipTranslatePenTransform +@ stdcall GdipTranslatePenTransform(ptr long long long) @ stdcall GdipTranslateRegion(ptr long long) @ stdcall GdipTranslateRegionI(ptr long long) @ stdcall GdipTranslateTextureTransform(ptr long long long) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 4fed4d2..a022cfb 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -434,6 +434,21 @@ GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix) return NotImplemented; } +GpStatus WINGDIPAPI GdipTranslatePenTransform(GpPen *pen, REAL dx, REAL dy, GpMatrixOrder order) +{ + static int calls; + + TRACE("(%p,%0.2f,%0.2f,%u)\n", pen, dx, dy, order); + + if(!pen) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) { static int calls;

1 0