November 2009 - Wine-Commits

Nikolay Sivov : comctl32/listview: Default column width in LVS_LIST to better value.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: fc43895f49a423bdc6d826be7ad16b00c960612c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc43895f49a423bdc6d826be7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Nov 26 22:42:33 2009 +0300 comctl32/listview: Default column width in LVS_LIST to better value. --- dlls/comctl32/listview.c | 13 +++++++++---- dlls/comctl32/tests/listview.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5b45ffb..b846176 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -403,7 +403,7 @@ typedef struct tagLISTVIEW_INFO #define MAX_EMPTYTEXT_SELECT_WIDTH 80 /* default column width for items in list display mode */ -#define DEFAULT_COLUMN_WIDTH 128 +#define DEFAULT_COLUMN_WIDTH 96 /* Size of "line" scroll for V & H scrolls */ #define LISTVIEW_SCROLL_ICON_LINE_SIZE 37 @@ -2786,15 +2786,20 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) } else /* LV_VIEW_SMALLICON, or LV_VIEW_LIST */ { + BOOL empty; INT i; - + for (i = 0; i < infoPtr->nItemCount; i++) nItemWidth = max(LISTVIEW_GetLabelWidth(infoPtr, i), nItemWidth); + empty = nItemWidth == 0; if (infoPtr->himlSmall) nItemWidth += infoPtr->iconSize.cx; if (infoPtr->himlState) nItemWidth += infoPtr->iconStateSize.cx; - nItemWidth = max(DEFAULT_COLUMN_WIDTH, nItemWidth + WIDTH_PADDING); + if (empty) + nItemWidth = max(nItemWidth, DEFAULT_COLUMN_WIDTH); + else + nItemWidth += WIDTH_PADDING; } return nItemWidth; @@ -7454,7 +7459,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems ); if (nItem == -1) goto fail; - infoPtr->nItemCount++; + if (infoPtr->nItemCount++ == 0) LISTVIEW_UpdateItemSize(infoPtr); /* shift indices first so they don't get tangled */ LISTVIEW_ShiftIndices(infoPtr, nItem, 1); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 95d9ddc..1b6fcab 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3124,6 +3124,20 @@ static void test_getitemrect(void) INT order[2]; POINT pt; + /* rectangle isn't empty for empty text items */ + hwnd = create_custom_listview_control(LVS_LIST); + memset(&item, 0, sizeof(item)); + item.mask = 0; + item.iItem = 0; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + expect(0, r); + rect.left = LVIR_LABEL; + SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(0, rect.left); + expect(0, rect.top); + todo_wine expect(96, rect.right); + DestroyWindow(hwnd); + hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -3921,6 +3935,7 @@ static void test_getcolumnwidth(void) DWORD ret; DWORD_PTR style; LVCOLUMNA col; + LVITEMA itema; /* default column width */ hwnd = create_custom_listview_control(0); @@ -3938,6 +3953,14 @@ static void test_getcolumnwidth(void) ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); expect(10, ret); DestroyWindow(hwnd); + + /* default column width with item added */ + hwnd = create_custom_listview_control(LVS_LIST); + memset(&itema, 0, sizeof(itema)); + SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); + ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + expect(96, ret); + DestroyWindow(hwnd); } static void test_scrollnotify(void)

1 0

Paul Chitescu : authz: Stub for AuthzInitializeResourceManager.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 353339154ae33854fc3b11baeafeaf8da53b8c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=353339154ae33854fc3b11bae… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Nov 24 18:50:55 2009 +0200 authz: Stub for AuthzInitializeResourceManager. --- dlls/authz/authz.c | 14 ++++++++++++++ dlls/authz/authz.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/authz/authz.c b/dlls/authz/authz.c index 6e98aac..2c1f3d1 100644 --- a/dlls/authz/authz.c +++ b/dlls/authz/authz.c @@ -42,3 +42,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +/*********************************************************************** + * AuthzInitializeResourceManager (AUTHZ.@) + */ +BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, LPVOID pfnAccessChecker, + LPVOID pfnComputeDynGroups, LPVOID pfnFreeDynGroups, + LPCWSTR managerName, LPVOID lpManagerHandle ) +{ + FIXME("(0x%X,%p,%p,%p,%s,%p): stub\n", flags, pfnAccessChecker, + pfnComputeDynGroups, pfnFreeDynGroups, + debugstr_w(managerName), lpManagerHandle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/authz/authz.spec b/dlls/authz/authz.spec index bc3010e..8ffd52b 100644 --- a/dlls/authz/authz.spec +++ b/dlls/authz/authz.spec @@ -13,7 +13,7 @@ @ stub AuthzInitializeContextFromToken @ stub AuthzInitializeObjectAccessAuditEvent @ stub AuthzInitializeObjectAccessAuditEvent2 -@ stub AuthzInitializeResourceManager +@ stdcall AuthzInitializeResourceManager(long ptr ptr ptr wstr ptr) @ stub AuthzInstallSecurityEventSource @ stub AuthzOpenObjectAudit @ stub AuthzRegisterSecurityEventSource

1 0

Henri Verbeet : wineoss.drv: Use wine_dbg_sprintf() in a few debug utility functions.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 3be325040cdfcd68a47f33fe0fd55708c7df1409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be325040cdfcd68a47f33fe0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 30 10:22:10 2009 +0100 wineoss.drv: Use wine_dbg_sprintf() in a few debug utility functions. --- dlls/wineoss.drv/audio.c | 8 ++------ dlls/wineoss.drv/mixer.c | 20 +++++--------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 98575f1..cd89cb7 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -107,7 +107,6 @@ unsigned numInDev; /* These strings used only for tracing */ static const char * getCmdString(enum win_wm_message msg) { - static char unknown[32]; #define MSG_TO_STR(x) case x: return #x switch(msg) { MSG_TO_STR(WINE_WM_PAUSING); @@ -121,8 +120,7 @@ static const char * getCmdString(enum win_wm_message msg) MSG_TO_STR(WINE_WM_STOPPING); } #undef MSG_TO_STR - sprintf(unknown, "UNKNOWN(0x%08x)", msg); - return unknown; + return wine_dbg_sprintf("UNKNOWN(0x%08x)", msg); } int getEnables(OSS_DEVICE *ossdev) @@ -133,7 +131,6 @@ int getEnables(OSS_DEVICE *ossdev) static const char * getMessage(UINT msg) { - static char unknown[32]; #define MSG_TO_STR(x) case x: return #x switch(msg) { MSG_TO_STR(DRVM_INIT); @@ -175,8 +172,7 @@ static const char * getMessage(UINT msg) MSG_TO_STR(DRV_QUERYDSOUNDDESC); } #undef MSG_TO_STR - sprintf(unknown, "UNKNOWN(0x%04x)", msg); - return unknown; + return wine_dbg_sprintf("UNKNOWN(0x%04x)", msg); } static DWORD wodDevInterfaceSize(UINT wDevID, LPDWORD dwParam1) diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c index 0ed9ab0..ac72c7a 100644 --- a/dlls/wineoss.drv/mixer.c +++ b/dlls/wineoss.drv/mixer.c @@ -113,7 +113,6 @@ static struct mixer MIX_Mixers[MAX_MIXERDRV]; static const char * getMessage(UINT uMsg) { - static char str[64]; #define MSG_TO_STR(x) case x: return #x; switch (uMsg) { MSG_TO_STR(DRVM_INIT); @@ -130,13 +129,11 @@ static const char * getMessage(UINT uMsg) MSG_TO_STR(MXDM_SETCONTROLDETAILS); } #undef MSG_TO_STR - sprintf(str, "UNKNOWN(%08x)", uMsg); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", uMsg); } static const char * getIoctlCommand(int command) { - static char str[64]; #define IOCTL_TO_STR(x) case x: return #x; switch (command) { IOCTL_TO_STR(SOUND_MIXER_VOLUME); @@ -172,13 +169,11 @@ static const char * getIoctlCommand(int command) #endif } #undef IOCTL_TO_STR - sprintf(str, "UNKNOWN(%08x)", command); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", command); } static const char * getControlType(DWORD dwControlType) { - static char str[64]; #define TYPE_TO_STR(x) case x: return #x switch (dwControlType) { TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_CUSTOM); @@ -214,13 +209,11 @@ static const char * getControlType(DWORD dwControlType) TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MILLITIME); } #undef TYPE_TO_STR - sprintf(str, "UNKNOWN(%08x)", dwControlType); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", dwControlType); } static const char * getComponentType(DWORD dwComponentType) { - static char str[64]; #define TYPE_TO_STR(x) case x: return #x; switch (dwComponentType) { TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_DST_UNDEFINED); @@ -245,13 +238,11 @@ static const char * getComponentType(DWORD dwComponentType) TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_SRC_ANALOG); } #undef TYPE_TO_STR - sprintf(str, "UNKNOWN(%08x)", dwComponentType); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", dwComponentType); } static const char * getTargetType(DWORD dwType) { - static char str[64]; #define TYPE_TO_STR(x) case x: return #x; switch (dwType) { TYPE_TO_STR(MIXERLINE_TARGETTYPE_UNDEFINED); @@ -262,8 +253,7 @@ static const char * getTargetType(DWORD dwType) TYPE_TO_STR(MIXERLINE_TARGETTYPE_AUX); } #undef TYPE_TO_STR - sprintf(str, "UNKNOWN(%08x)", dwType); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", dwType); } static const WCHAR sz_short_volume [] = {'V','o','l',0};

1 0

Dan Kegel : advpack: fix off-by-one error in AdvInstallFileW that caused buffer overrun.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: ced19b425a7db2ca88dbfa5de429f20075b4c6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced19b425a7db2ca88dbfa5de… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Nov 26 21:46:51 2009 -0800 advpack: fix off-by-one error in AdvInstallFileW that caused buffer overrun. --- dlls/advpack/files.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 216b863..679d236 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -279,13 +279,13 @@ HRESULT WINAPI AdvInstallFileW(HWND hwnd, LPCWSTR lpszSourceDir, LPCWSTR lpszSou if (lpszDestFile) { dwLen = lstrlenW(lpszDestFile); - szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + szDestFilename = HeapAlloc(GetProcessHeap(), 0, (dwLen+1) * sizeof(WCHAR)); lstrcpyW(szDestFilename, lpszDestFile); } else { dwLen = lstrlenW(lpszSourceFile); - szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + szDestFilename = HeapAlloc(GetProcessHeap(), 0, (dwLen+1) * sizeof(WCHAR)); lstrcpyW(szDestFilename, lpszSourceFile); }

1 0

Henri Verbeet : winecoreaudio.drv: Use wine_dbg_sprintf() in a few debug utility functions.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: c369f338933e208a3b93f87fdc1d2072626f9e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c369f338933e208a3b93f87fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 30 10:22:11 2009 +0100 winecoreaudio.drv: Use wine_dbg_sprintf() in a few debug utility functions. --- dlls/winecoreaudio.drv/audio.c | 4 +--- dlls/winecoreaudio.drv/mixer.c | 16 ++++------------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index f48a5aa..8223dff 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -264,7 +264,6 @@ OSStatus CoreAudio_wiAudioUnitIOProc(void *inRefCon, static const char * getMessage(UINT msg) { - static char unknown[32]; #define MSG_TO_STR(x) case x: return #x switch(msg) { MSG_TO_STR(DRVM_INIT); @@ -306,8 +305,7 @@ static const char * getMessage(UINT msg) MSG_TO_STR(DRV_QUERYDSOUNDDESC); } #undef MSG_TO_STR - sprintf(unknown, "UNKNOWN(0x%04x)", msg); - return unknown; + return wine_dbg_sprintf("UNKNOWN(0x%04x)", msg); } #define kStopLoopMessage 0 diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 7c01c57..389caad 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -92,7 +92,6 @@ static int numMixers = 1; static const char * getMessage(UINT uMsg) { - static char str[64]; #define MSG_TO_STR(x) case x: return #x; switch (uMsg) { MSG_TO_STR(DRVM_INIT); @@ -109,13 +108,11 @@ static const char * getMessage(UINT uMsg) MSG_TO_STR(MXDM_SETCONTROLDETAILS); } #undef MSG_TO_STR - sprintf(str, "UNKNOWN(%08x)", uMsg); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", uMsg); } static const char * getControlType(DWORD dwControlType) { - static char str[64]; #define TYPE_TO_STR(x) case x: return #x; switch (dwControlType) { TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_CUSTOM); @@ -151,13 +148,11 @@ static const char * getControlType(DWORD dwControlType) TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MILLITIME); } #undef TYPE_TO_STR - sprintf(str, "UNKNOWN(%08x)", dwControlType); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", dwControlType); } static const char * getComponentType(DWORD dwComponentType) { - static char str[64]; #define TYPE_TO_STR(x) case x: return #x; switch (dwComponentType) { TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_DST_UNDEFINED); @@ -182,13 +177,11 @@ static const char * getComponentType(DWORD dwComponentType) TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_SRC_ANALOG); } #undef TYPE_TO_STR - sprintf(str, "UNKNOWN(%08x)", dwComponentType); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", dwComponentType); } static const char * getTargetType(DWORD dwType) { - static char str[64]; #define TYPE_TO_STR(x) case x: return #x; switch (dwType) { TYPE_TO_STR(MIXERLINE_TARGETTYPE_UNDEFINED); @@ -199,8 +192,7 @@ static const char * getTargetType(DWORD dwType) TYPE_TO_STR(MIXERLINE_TARGETTYPE_AUX); } #undef TYPE_TO_STR - sprintf(str, "UNKNOWN(%08x)", dwType); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", dwType); } /* FIXME is there a better way ? */

1 0

Henri Verbeet : winealsa.drv: Use wine_dbg_sprintf() in a few debug utility functions.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 7151cdc8a2947bfb4a7ad17895c448c2d55fe2c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7151cdc8a2947bfb4a7ad1789… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 30 10:22:09 2009 +0100 winealsa.drv: Use wine_dbg_sprintf() in a few debug utility functions. --- dlls/winealsa.drv/alsa.c | 12 +++--------- dlls/winealsa.drv/mixer.c | 4 +--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index f16d013..4ea1f1d 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -220,7 +220,6 @@ int ALSA_RetrieveRingMessage(ALSA_MSG_RING* omr, enum win_wm_message *msg, /* These strings used only for tracing */ const char * ALSA_getCmdString(enum win_wm_message msg) { - static char unknown[32]; #define MSG_TO_STR(x) case x: return #x switch(msg) { MSG_TO_STR(WINE_WM_PAUSING); @@ -234,13 +233,11 @@ const char * ALSA_getCmdString(enum win_wm_message msg) MSG_TO_STR(WINE_WM_STOPPING); } #undef MSG_TO_STR - sprintf(unknown, "UNKNOWN(0x%08x)", msg); - return unknown; + return wine_dbg_sprintf("UNKNOWN(0x%08x)", msg); } const char * ALSA_getMessage(UINT msg) { - static char unknown[32]; #define MSG_TO_STR(x) case x: return #x switch(msg) { MSG_TO_STR(DRVM_INIT); @@ -282,13 +279,11 @@ const char * ALSA_getMessage(UINT msg) MSG_TO_STR(DRV_QUERYDSOUNDDESC); } #undef MSG_TO_STR - sprintf(unknown, "UNKNOWN(0x%04x)", msg); - return unknown; + return wine_dbg_sprintf("UNKNOWN(0x%04x)", msg); } const char * ALSA_getFormat(WORD wFormatTag) { - static char unknown[32]; #define FMT_TO_STR(x) case x: return #x switch(wFormatTag) { FMT_TO_STR(WAVE_FORMAT_PCM); @@ -298,8 +293,7 @@ const char * ALSA_getFormat(WORD wFormatTag) FMT_TO_STR(WAVE_FORMAT_ADPCM); } #undef FMT_TO_STR - sprintf(unknown, "UNKNOWN(0x%04x)", wFormatTag); - return unknown; + return wine_dbg_sprintf("UNKNOWN(0x%04x)", wFormatTag); } /* Allow 1% deviation for sample rates (some ES137x cards) */ diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index e5cd347..cfdf95f 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -77,7 +77,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mixer); static const char * getMessage(UINT uMsg) { - static char str[64]; #define MSG_TO_STR(x) case x: return #x; switch (uMsg){ MSG_TO_STR(DRVM_INIT); @@ -95,8 +94,7 @@ static const char * getMessage(UINT uMsg) default: break; } #undef MSG_TO_STR - sprintf(str, "UNKNOWN(%08x)", uMsg); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", uMsg); } static const char * getControlType(DWORD dwControlType)

1 0

Jacek Caban : wininet: Don't use INTERNET_SetLastError in HttpSendRequestW.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 4e3eabd6fa261976296e74d3cb0c3c09e87842e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3eabd6fa261976296e74d3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 00:14:41 2009 +0100 wininet: Don't use INTERNET_SetLastError in HttpSendRequestW. --- dlls/wininet/http.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a250cbf..e4b6f1c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3405,7 +3405,7 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, http_request_t *lpwhr; http_session_t *lpwhs = NULL; appinfo_t *hIC = NULL; - BOOL r; + DWORD res = ERROR_SUCCESS; TRACE("%p, %s, %i, %p, %i)\n", hHttpRequest, debugstr_wn(lpszHeaders, dwHeaderLength), dwHeaderLength, lpOptional, dwOptionalLength); @@ -3413,24 +3413,21 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, lpwhr = (http_request_t*) WININET_GetObject( hHttpRequest ); if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ) { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - r = FALSE; + res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; goto lend; } lpwhs = lpwhr->lpHttpSession; if (NULL == lpwhs || lpwhs->hdr.htype != WH_HHTTPSESSION) { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - r = FALSE; + res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; goto lend; } hIC = lpwhs->lpAppInfo; if (NULL == hIC || hIC->hdr.htype != WH_HINIT) { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - r = FALSE; + res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; goto lend; } @@ -3464,19 +3461,23 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, /* * This is from windows. */ - INTERNET_SetLastError(ERROR_IO_PENDING); - r = FALSE; + res = ERROR_IO_PENDING; } else { - r = HTTP_HttpSendRequestW(lpwhr, lpszHeaders, + BOOL r = HTTP_HttpSendRequestW(lpwhr, lpszHeaders, dwHeaderLength, lpOptional, dwOptionalLength, dwOptionalLength, TRUE); + if(!r) + res = INTERNET_GetLastError(); } lend: if( lpwhr ) WININET_Release( &lpwhr->hdr ); - return r; + + if(res != ERROR_SUCCESS) + SetLastError(res); + return res == ERROR_SUCCESS; } /***********************************************************************

1 0

Jacek Caban : shdocvw: Use CoTaskMemFree to free url.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 75c71b4b9c9db31f649d1534658773e2053518af URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c71b4b9c9db31f649d15346… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 00:15:36 2009 +0100 shdocvw: Use CoTaskMemFree to free url. Pointed out by Dan Kegel. --- dlls/shdocvw/dochost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index f3035e1..5d661fd 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -753,5 +753,5 @@ void DocHost_Release(DocHost *This) ConnectionPointContainer_Destroy(&This->cps); - SysFreeString(This->url); + CoTaskMemFree(This->url); }

1 0

Vitaliy Margolen : dinput: Improve dumping of DIACTIONFORMAT.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 29561f492e935447c31698984aea51592bd9e58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=29561f492e935447c31698984… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 29 21:07:21 2009 -0700 dinput: Improve dumping of DIACTIONFORMAT. --- dlls/dinput/dinput_main.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 5b16100..27a0e05 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -221,25 +221,26 @@ void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { FIXME("diaf.dwDataSize = %d\n", lpdiActionFormat->dwDataSize); FIXME("diaf.dwNumActions = %d\n", lpdiActionFormat->dwNumActions); FIXME("diaf.rgoAction = %p\n", lpdiActionFormat->rgoAction); - for (i=0;i<lpdiActionFormat->dwNumActions;i++) { - FIXME("diaf.rgoAction[%u]:\n", i); - FIXME("\tuAppData=%lx\n", lpdiActionFormat->rgoAction[i].uAppData); - FIXME("\tdwSemantic=%x\n", lpdiActionFormat->rgoAction[i].dwSemantic); - FIXME("\tdwFlags=%x\n", lpdiActionFormat->rgoAction[i].dwFlags); - FIXME("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].u.lptszActionName)); - FIXME("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance)); - FIXME("\tdwObjID=%x\n", lpdiActionFormat->rgoAction[i].dwObjID); - FIXME("\tdwHow=%x\n", lpdiActionFormat->rgoAction[i].dwHow); - } FIXME("diaf.guidActionMap = %s\n", debugstr_guid(&lpdiActionFormat->guidActionMap)); - FIXME("diaf.dwGenre = %d\n", lpdiActionFormat->dwGenre); + FIXME("diaf.dwGenre = 0x%08x\n", lpdiActionFormat->dwGenre); FIXME("diaf.dwBufferSize = %d\n", lpdiActionFormat->dwBufferSize); FIXME("diaf.lAxisMin = %d\n", lpdiActionFormat->lAxisMin); FIXME("diaf.lAxisMax = %d\n", lpdiActionFormat->lAxisMax); FIXME("diaf.hInstString = %p\n", lpdiActionFormat->hInstString); FIXME("diaf.ftTimeStamp ...\n"); - FIXME("diaf.dwCRC = %x\n", lpdiActionFormat->dwCRC); + FIXME("diaf.dwCRC = 0x%x\n", lpdiActionFormat->dwCRC); FIXME("diaf.tszActionMap = %s\n", debugstr_a(lpdiActionFormat->tszActionMap)); + for (i = 0; i < lpdiActionFormat->dwNumActions; i++) + { + FIXME("diaf.rgoAction[%u]:\n", i); + FIXME("\tuAppData=0x%lx\n", lpdiActionFormat->rgoAction[i].uAppData); + FIXME("\tdwSemantic=0x%08x\n", lpdiActionFormat->rgoAction[i].dwSemantic); + FIXME("\tdwFlags=0x%x\n", lpdiActionFormat->rgoAction[i].dwFlags); + FIXME("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].u.lptszActionName)); + FIXME("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance)); + FIXME("\tdwObjID=0x%x\n", lpdiActionFormat->rgoAction[i].dwObjID); + FIXME("\tdwHow=0x%x\n", lpdiActionFormat->rgoAction[i].dwHow); + } } /******************************************************************************

1 0

Henri Verbeet : dsound: Use wine_dbg_sprintf() in dumpCooperativeLevel().
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 7209cb89bb40dedced5be0a97930dd4fdd91743b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7209cb89bb40dedced5be0a97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 30 10:22:07 2009 +0100 dsound: Use wine_dbg_sprintf() in dumpCooperativeLevel(). --- dlls/dsound/dsound.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 77a5928..c91ec83 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -113,7 +113,6 @@ static HRESULT DirectSoundDevice_VerifyCertification(DirectSoundDevice * device, const char * dumpCooperativeLevel(DWORD level) { - static char unknown[32]; #define LE(x) case x: return #x switch (level) { LE(DSSCL_NORMAL); @@ -122,8 +121,7 @@ const char * dumpCooperativeLevel(DWORD level) LE(DSSCL_WRITEPRIMARY); } #undef LE - sprintf(unknown, "Unknown(%08x)", level); - return unknown; + return wine_dbg_sprintf("Unknown(%08x)", level); } static void _dump_DSCAPS(DWORD xmask) {

1 0