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

André Hentschel : winelib: Remove relations with autoconf.
by Alexandre Julliard 16 May '10

16 May '10

Module: docs Branch: master Commit: b9f453110b8526c6ee7de7d83116d0e0ccf0bde4 URL: http://source.winehq.org/git/docs.git/?a=commit;h=b9f453110b8526c6ee7de7d83… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 14 18:43:21 2010 +0200 winelib: Remove relations with autoconf. --- en/winelib-intro.sgml | 2 +- en/winelib-toolkit.sgml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/en/winelib-intro.sgml b/en/winelib-intro.sgml index 9d92fcf..cfe8d8f 100644 --- a/en/winelib-intro.sgml +++ b/en/winelib-intro.sgml @@ -384,7 +384,7 @@ they will compile more readily with Winelib. As it does so it may print warnings when it has to make a guess or identifies a construct that it cannot correct. Finally it will generate the - autoconf-based makefiles. Once all this is done you can review + makefiles. Once all this is done you can review the changes that winemaker did to your files by using <command>diff -uw</command>. For instance: <command>diff -uw hello.c.bak hello.c</command> diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index 461d98b..ec241b7 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -380,8 +380,7 @@ WRCFLAGS = -r -L -I/usr/lib/gcc-lib/i386-linux/2.95.2/include</literal> to cater to both C and C++ headers. But this supposes that you know where these header files reside which decreases the portability of your - makefiles to other platforms (unless you automatically detect all - the necessary directories in the autoconf script). + makefiles to other platforms. </para> <para> Or you could use the C/C++ compiler to perform the preprocessing.

1 0

André Hentschel : winelib: Fix a typo.
by Alexandre Julliard 16 May '10

16 May '10

Module: docs Branch: master Commit: d1552ae60c0698559133a0abe3a7ed4140506345 URL: http://source.winehq.org/git/docs.git/?a=commit;h=d1552ae60c0698559133a0abe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 14 18:43:37 2010 +0200 winelib: Fix a typo. --- en/winelib-toolkit.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index ec241b7..2a21e21 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -173,7 +173,7 @@ being linked with the right set of libraries. You can avoid this by using winemaker's <option>-P</>, <option>-i</>, <option>-L</option> and <option>-l</> options or adding these - DLLs and libraries to the <filename>Makefile</> file. + DLLs and libraries to the <filename>Makefile</>. </para> </listitem> <listitem>

1 0

Sven Baars : comdlg32: Fix Dutch translation.
by Alexandre Julliard 14 May '10

14 May '10

Module: wine Branch: master Commit: e6603811025b50b47e42405520c8e4552f05eb97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6603811025b50b47e4240552… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 14 15:58:24 2010 +0200 comdlg32: Fix Dutch translation. --- dlls/comdlg32/cdlg_Nl.rc | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index dfd5d4e..b883a05 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -99,7 +99,7 @@ CAPTION "Afdrukeigenschappen" FONT 8, "MS Shell Dlg" { GROUPBOX "Printer", 1072, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "Stan&daard Printer", 1056, 16, 20, 80, 12 + RADIOBUTTON "Stan&daardprinter", 1056, 16, 20, 80, 12 LTEXT "[geen]", 1088, 35, 35, 120, 9 RADIOBUTTON "Specifieke &Printer", 1057, 16, 50, 80, 12 COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -250,7 +250,7 @@ FONT 8, "MS Shell Dlg" PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -CAPTION "Print32" +CAPTION "Afdrukken" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON @@ -290,7 +290,7 @@ FONT 8, "MS Shell Dlg" PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -CAPTION "Print Setup" +CAPTION "Afdrukeigenschappen" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP @@ -315,15 +315,15 @@ BEGIN LTEXT "&Bron:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - GROUPBOX "Orientatie", grp1, 180, 92, 100,56, WS_GROUP + GROUPBOX "Oriëntatie", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "P&ortret", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 + CONTROL "S&taand", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 CONTROL "L&iggend", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Setup Page" +CAPTION "Pagina-instellingen" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 @@ -335,7 +335,7 @@ BEGIN LTEXT "La&de:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientatie", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portret", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Staand", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Liggend", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Randen", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "L&inks:", stc15, 88, 172, 21, 8 @@ -366,10 +366,10 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { - IDS_SYSTEMFOLDERS "Systeem mappen" + IDS_SYSTEMFOLDERS "Systeemmappen" IDS_LOCALHARDRIVES "Lokale vaste schijven" IDS_FILENOTFOUND "Bestand niet gevonden" - IDS_VERIFYFILE "Controleer of de juiste bestandnaam is opgegeven" + IDS_VERIFYFILE "Controleer of de juiste bestandsnaam is opgegeven" IDS_CREATEFILE "Dit bestand bestaat nog niet\nWilt u het bestand aanmaken?" IDS_OVERWRITEFILE "Bestand bestaat al.\nWilt u het vervangen?" IDS_INVALID_FILENAME_TITLE "De naam van het pad bevat ongeldige tekens" @@ -389,7 +389,7 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { - PD32_PRINT_TITLE "Print" + PD32_PRINT_TITLE "Afdrukken" PD32_VALUE_UREADABLE "Onleesbare ingave" PD32_INVALID_PAGE_RANGE "Deze waarde ligt niet binnen het bereik\n\ @@ -402,13 +402,13 @@ buiten het papier.\nVoer s.v.p. nieuwe marges in." zijn." PD32_TOO_LARGE_COPIES "Zoveel exemplaren kan de printer \ niet in een keer aan, het maximum is %d" - PD32_PRINT_ERROR "Er ontstond een printer fout." - PD32_NO_DEFAULT_PRINTER "Er is geen default printer" + PD32_PRINT_ERROR "Er heeft zich een fout voorgedaan met de printer." + PD32_NO_DEFAULT_PRINTER "Er is geen standaardprinter" PD32_CANT_FIND_PRINTER "De printer werd niet gevonden" PD32_OUT_OF_MEMORY "Er was onvoldoende geheugen \ beschikbaar" - PD32_GENERIC_ERROR "Er onstond een niet nader \ -gespecifieerde fout" + PD32_GENERIC_ERROR "Er ontstond een niet nader \ +gespecificeerde fout" PD32_DRIVER_UNKNOWN "De printer driver is onbekend" PD32_NO_DEVICES "Voordat u printer-gerelateerde taken \ zoals pagina instellingen of het printen van een document kun uitvoeren, moet u een \ @@ -422,13 +422,13 @@ wachtrij" PD32_MILLIMETERS "mm" PD32_PRINTER_STATUS_READY "Klaar" - PD32_PRINTER_STATUS_PAUSED "Gepauseerd, " + PD32_PRINTER_STATUS_PAUSED "Gepauzeerd, " PD32_PRINTER_STATUS_ERROR "Fout, " PD32_PRINTER_STATUS_PENDING_DELETION "Bezig met verwijderen, " - PD32_PRINTER_STATUS_PAPER_JAM "Papier opstopping, " + PD32_PRINTER_STATUS_PAPER_JAM "Papier-opstopping, " PD32_PRINTER_STATUS_PAPER_OUT "Papier is op, " PD32_PRINTER_STATUS_MANUAL_FEED "Voer s.v.p. met de hand papier in, " - PD32_PRINTER_STATUS_PAPER_PROBLEM "Papier probleem, " + PD32_PRINTER_STATUS_PAPER_PROBLEM "Papier-probleem, " PD32_PRINTER_STATUS_OFFLINE "Printer offline, " PD32_PRINTER_STATUS_IO_ACTIVE "I/O Actief, " PD32_PRINTER_STATUS_BUSY "Druk bezig, " @@ -446,7 +446,7 @@ wachtrij" PD32_PRINTER_STATUS_OUT_OF_MEMORY "Onvoldoende geheugen beschikbaar, " PD32_PRINTER_STATUS_DOOR_OPEN "De printer staat is open, " PD32_PRINTER_STATUS_SERVER_UNKNOWN "Print server onbekend; " - PD32_PRINTER_STATUS_POWER_SAVE "Power safe modus; " + PD32_PRINTER_STATUS_POWER_SAVE "Power save modus; " } STRINGTABLE DISCARDABLE /* Font styles */

1 0

Jacek Caban : mshtml: Fixed platform test on 64-bit IE6.
by Alexandre Julliard 14 May '10

14 May '10

Module: wine Branch: master Commit: 03e04403699f6829bfc8c4c57c510109f5e880f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e04403699f6829bfc8c4c57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 14 16:50:22 2010 +0200 mshtml: Fixed platform test on 64-bit IE6. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fd4238e..4f954a8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3442,7 +3442,7 @@ static void test_navigator(IHTMLDocument2 *doc) hres = IOmNavigator_get_platform(navigator, &bstr); ok(hres == S_OK, "get_platform failed: %08x\n", hres); #ifdef _WIN64 - ok(!strcmp_wa(bstr, "Win64"), "unexpected platform %s\n", wine_dbgstr_w(bstr)); + ok(!strcmp_wa(bstr, "Win64") || broken(!strcmp_wa(bstr, "Win32") /* IE6 */), "unexpected platform %s\n", wine_dbgstr_w(bstr)); #else ok(!strcmp_wa(bstr, "Win32"), "unexpected platform %s\n", wine_dbgstr_w(bstr)); #endif

1 0

Detlef Riekenberg : kernel32: Move a 16 bit related comment to krnl386.
by Alexandre Julliard 14 May '10

14 May '10

Module: wine Branch: master Commit: 69326aa246d388df7c28944c0370b1e2bf5fd1df URL: http://source.winehq.org/git/wine.git/?a=commit;h=69326aa246d388df7c28944c0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 14 17:08:37 2010 +0200 kernel32: Move a 16 bit related comment to krnl386. --- dlls/kernel32/module.c | 4 +--- dlls/krnl386.exe16/ne_module.c | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 2b8f11e..21db5cb 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -588,9 +588,7 @@ HMODULE WINAPI GetModuleHandleW(LPCWSTR module) * Failure: 0. Use GetLastError() to determine the cause. * * NOTES - * This function always returns the long path of hModule (as opposed to - * GetModuleFileName16() which returns short paths when the modules version - * field is < 4.0). + * This function always returns the long path of hModule * The function doesn't write a terminating '\0' if the buffer is too * small. */ diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index aa1c9c2..fe80126 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -1518,7 +1518,9 @@ BOOL16 WINAPI GetModuleName16( HINSTANCE16 hinst, LPSTR buf, INT16 count ) /********************************************************************** * GetModuleFileName (KERNEL.49) * - * Comment: see GetModuleFileNameA + * See also: GetModuleFileNameA + * + * This function returns short paths when the modules version field is < 4.0). * * Even if invoked by second instance of a program, * it still returns path of first one.

1 0

Roderick Colenbrander : wined3d: Make sure wglFlush is not between ENTER_GL /LEAVE_GL.
by Alexandre Julliard 14 May '10

14 May '10

Module: wine Branch: master Commit: e91f4ae7761034a67cf909ce5cf569b9294d0031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e91f4ae7761034a67cf909ce5… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri May 14 12:56:43 2010 +0200 wined3d: Make sure wglFlush is not between ENTER_GL/LEAVE_GL. --- dlls/wined3d/directx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4df04fa..eb5a16d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -529,9 +529,12 @@ static void test_pbo_functionality(struct wined3d_gl_info *gl_info) checkGLcall("Loading the PBO test texture"); GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + LEAVE_GL(); + wglFinish(); /* just to be sure */ memset(check, 0, sizeof(check)); + ENTER_GL(); glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, check); checkGLcall("Reading back the PBO test texture");

1 0

Roderick Colenbrander : opengl32: Add 32-bit bitmap rendering test.
by Alexandre Julliard 14 May '10

14 May '10

Module: wine Branch: master Commit: 3a5ddab91db427626a7b98c0d5743fd3f7cd75be URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5ddab91db427626a7b98c0d… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri May 14 12:56:44 2010 +0200 opengl32: Add 32-bit bitmap rendering test. --- dlls/opengl32/tests/opengl.c | 87 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index ab55e0b..7568f47 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -22,6 +22,10 @@ #include <wingdi.h> #include "wine/test.h" +void WINAPI glClearColor(float red, float green, float blue, float alpha); +void WINAPI glClear(unsigned int mask); +void WINAPI glFinish(void); +#define GL_COLOR_BUFFER_BIT 0x00004000 const unsigned char * WINAPI glGetString(unsigned int); #define GL_VENDOR 0x1F00 #define GL_RENDERER 0x1F01 @@ -499,6 +503,88 @@ static void test_acceleration(HDC hdc) } } +static void test_bitmap_rendering(void) +{ + PIXELFORMATDESCRIPTOR pfd; + int i, iPixelFormat=0; + unsigned int nFormats; + HGLRC hglrc; + BITMAPINFO biDst; + HBITMAP bmpDst, oldDst; + HDC hdcDst, hdcScreen; + UINT32 *dstBuffer; + + memset(&biDst, 0, sizeof(BITMAPINFO)); + biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst.bmiHeader.biWidth = 2; + biDst.bmiHeader.biHeight = -2; + biDst.bmiHeader.biPlanes = 1; + biDst.bmiHeader.biBitCount = 32; + biDst.bmiHeader.biCompression = BI_RGB; + + hdcScreen = CreateCompatibleDC(0); + if(GetDeviceCaps(hdcScreen, BITSPIXEL) != 32) + { + DeleteDC(hdcScreen); + trace("Skipping bitmap rendering test\n"); + return; + } + + hdcDst = CreateCompatibleDC(hdcScreen); + bmpDst = CreateDIBSection(hdcDst, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + oldDst = SelectObject(hdcDst, bmpDst); + + /* Pick a pixel format by hand because ChoosePixelFormat is unreliable */ + nFormats = DescribePixelFormat(hdcDst, 0, 0, NULL); + for(i=1; i<=nFormats; i++) + { + memset(&pfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); + DescribePixelFormat(hdcDst, i, sizeof(PIXELFORMATDESCRIPTOR), &pfd); + + if((pfd.dwFlags & PFD_DRAW_TO_BITMAP) && + (pfd.dwFlags & PFD_SUPPORT_OPENGL) && + (pfd.cColorBits == 32) && + (pfd.cAlphaBits == 8) ) + { + iPixelFormat = i; + break; + } + } + + if(!iPixelFormat) + { + skip("Unable to find a suitable pixel format"); + } + else + { + SetPixelFormat(hdcDst, iPixelFormat, &pfd); + hglrc = wglCreateContext(hdcDst); + todo_wine ok(hglrc != NULL, "Unable to create a context\n"); + + if(hglrc) + { + wglMakeCurrent(hdcDst, hglrc); + + /* Note this is RGBA but we read ARGB back */ + glClearColor((float)0x22/0xff, (float)0x33/0xff, (float)0x44/0xff, (float)0x11/0xff); + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + + /* Note apparently the alpha channel is not supported by the software renderer (bitmap only works using software) */ + ok(dstBuffer[0] == 0x223344, "Expected color=0x223344, received color=%x\n", dstBuffer[0]); + + wglMakeCurrent(NULL, NULL); + wglDeleteContext(hglrc); + } + } + + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); + DeleteDC(hdcDst); + + DeleteDC(hdcScreen); +} + struct wgl_thread_param { HANDLE test_finished; @@ -833,6 +919,7 @@ START_TEST(opengl) res = SetPixelFormat(hdc, iPixelFormat, &pfd); ok(res, "SetPixelformat failed: %x\n", GetLastError()); + test_bitmap_rendering(); test_minimized(); test_dc(hwnd, hdc);

1 0

Hans Leidekker : winedump: Print the network share name in .lnk files.
by Alexandre Julliard 14 May '10

14 May '10

Module: wine Branch: master Commit: f6612adcd29b99ae9488cb370c265d6384a7c3b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6612adcd29b99ae9488cb370… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 14 16:46:06 2010 +0200 winedump: Print the network share name in .lnk files. --- tools/winedump/lnk.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index 98892c9..680e2de 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -118,6 +118,15 @@ typedef struct _LOCAL_VOLUME_INFO DWORD dwVolLabelOfs; } LOCAL_VOLUME_INFO; +typedef struct _NETWORK_VOLUME_INFO +{ + DWORD dwSize; + DWORD dwUnkown1; + DWORD dwShareNameOfs; + DWORD dwReserved; + DWORD dwUnknown2; +} NETWORK_VOLUME_INFO; + typedef struct { DWORD cbSize; @@ -232,9 +241,10 @@ static int dump_location(void) printf("Header size = %d\n", loc->dwHeaderSize); printf("Flags = %08x\n", loc->dwFlags); - /* dump out information about the volume the link points to */ - printf("Volume ofs = %08x ", loc->dwVolTableOfs); - if (loc->dwVolTableOfs && (loc->dwVolTableOfs<loc->dwTotalSize)) + /* dump information about the local volume the link points to */ + printf("Local volume ofs = %08x ", loc->dwVolTableOfs); + if (loc->dwVolTableOfs && + loc->dwVolTableOfs + sizeof(LOCAL_VOLUME_INFO) < loc->dwTotalSize) { const LOCAL_VOLUME_INFO *vol = (const LOCAL_VOLUME_INFO *)&p[loc->dwVolTableOfs]; @@ -245,6 +255,19 @@ static int dump_location(void) } printf("\n"); + /* dump information about the network volume the link points to */ + printf("Network volume ofs = %08x ", loc->dwNetworkVolTableOfs); + if (loc->dwNetworkVolTableOfs && + loc->dwNetworkVolTableOfs + sizeof(NETWORK_VOLUME_INFO) < loc->dwTotalSize) + { + const NETWORK_VOLUME_INFO *vol = (const NETWORK_VOLUME_INFO *)&p[loc->dwNetworkVolTableOfs]; + + printf("size %d name %d ", vol->dwSize, vol->dwShareNameOfs); + if(vol->dwShareNameOfs) + printf("(\"%s\")", &p[loc->dwNetworkVolTableOfs + vol->dwShareNameOfs]); + } + printf("\n"); + /* dump out the path the link points to */ printf("LocalPath ofs = %08x ", loc->dwLocalPathOfs); if( loc->dwLocalPathOfs && (loc->dwLocalPathOfs < loc->dwTotalSize) )

1 0

Hans Leidekker : winemenubuilder: Lower case the content type.
by Alexandre Julliard 14 May '10

14 May '10

Module: wine Branch: master Commit: df260d14a6af2f9057883d11a0b4404860f28c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df260d14a6af2f9057883d11a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 14 15:35:04 2010 +0200 winemenubuilder: Lower case the content type. --- programs/winemenubuilder/winemenubuilder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8f6e042..afa541a 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2092,6 +2092,8 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package iconW = assoc_query(ASSOCSTR_DEFAULTICON, extensionW, NULL); contentTypeW = assoc_query(ASSOCSTR_CONTENTTYPE, extensionW, NULL); + if (contentTypeW) + strlwrW(contentTypeW); if (!freedesktop_mime_type_for_extension(nativeMimeTypes, extensionA, extensionW, &mimeTypeA)) goto end;

1 0

Hans Leidekker : winemenubuilder: Expand environment strings in the shortcut path.
by Alexandre Julliard 14 May '10

14 May '10

Module: wine Branch: master Commit: 3c31a373d3461665affdce1115ae7f7e9d32537e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c31a373d3461665affdce111… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 14 15:35:55 2010 +0200 winemenubuilder: Expand environment strings in the shortcut path. --- programs/winemenubuilder/winemenubuilder.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index afa541a..4dc08d5 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2254,7 +2254,8 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) ExpandEnvironmentStringsW(szTmp, szDescription, INFOTIPSIZE); WINE_TRACE("description: %s\n", wine_dbgstr_w(szDescription)); - get_cmdline( sl, szPath, MAX_PATH, szArgs, INFOTIPSIZE); + get_cmdline( sl, szTmp, MAX_PATH, szArgs, INFOTIPSIZE); + ExpandEnvironmentStringsW(szTmp, szPath, MAX_PATH); WINE_TRACE("path : %s\n", wine_dbgstr_w(szPath)); WINE_TRACE("args : %s\n", wine_dbgstr_w(szArgs));

1 0