February 2008 - Wine-Commits

Francois Gouget : winex11.drv: Add some API documentation stubs to make winapi_check happy.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: f11713aa586d1d0829ac0c1c66d186f3b9495637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f11713aa586d1d0829ac0c1c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 4 23:59:55 2008 +0100 winex11.drv: Add some API documentation stubs to make winapi_check happy. --- dlls/winex11.drv/wintab.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 0987129..da18ce0 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -436,6 +436,9 @@ static BOOL is_pad(const char *name, const char *type) } +/*********************************************************************** + * X11DRV_LoadTabletInfo (X11DRV.@) + */ void X11DRV_LoadTabletInfo(HWND hwnddefault) { const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; @@ -922,6 +925,9 @@ static void proximity_event( HWND hwnd, XEvent *event ) SendMessageW(hwndTabletDefault, WT_PROXIMITY, (event->type == proximity_in_type), (LPARAM)hwnd); } +/*********************************************************************** + * X11DRV_AttachEventQueueToTablet (X11DRV.@) + */ int X11DRV_AttachEventQueueToTablet(HWND hOwner) { struct x11drv_thread_data *data = x11drv_thread_data(); @@ -999,6 +1005,9 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner) return 0; } +/*********************************************************************** + * X11DRV_GetCurrentPacket (X11DRV.@) + */ int X11DRV_GetCurrentPacket(LPWTPACKET *packet) { memcpy(packet,&gMsgPacket,sizeof(WTPACKET));

1 0

Francois Gouget : mapi32: Add an API documentation stub to make winapi_check happy.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 1f2d708766066b4a3c1bd8d20e7c998d42ecf37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2d708766066b4a3c1bd8d20… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 4 23:59:32 2008 +0100 mapi32: Add an API documentation stub to make winapi_check happy. --- dlls/mapi32/util.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 76c08ca..b68eceb 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -891,6 +891,9 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path return ret; } +/************************************************************************** + * HrQueryAllRows (MAPI32.75) + */ HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags, LPSRestriction lpRestriction, LPSSortOrderSet lpSortOrderSet, LONG crowsMax, LPSRowSet *lppRows)

1 0

Francois Gouget : ntdsapi: Add an API documentation stub to make winapi_check happy.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: afaa4d63b624772d1e9e19fc6ea1b3cfe984526f URL: http://source.winehq.org/git/wine.git/?a=commit;h=afaa4d63b624772d1e9e19fc6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 4 23:59:44 2008 +0100 ntdsapi: Add an API documentation stub to make winapi_check happy. --- dlls/ntdsapi/ntdsapi.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index bad284c..01acda0 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -135,6 +135,11 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, return ERROR_SUCCESS; } +/*********************************************************************** + * DsMakeSpnA (NTDSAPI.@) + * + * See DsMakeSpnW. + */ DWORD WINAPI DsMakeSpnA(LPCSTR svc_class, LPCSTR svc_name, LPCSTR inst_name, USHORT inst_port, LPCSTR ref, DWORD *spn_length, LPSTR spn)

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 20b41af9f153a5e52dde957f7209edf1fbe09464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b41af9f153a5e52dde957f7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 4 23:59:25 2008 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/visual.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index eed9bdf..1f965e1 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -989,8 +989,8 @@ out: ptr = ((D3DINSTRUCTION*)(ptr))+1; } while (0) #define EXEBUF_PUT_RENDER_STATE(state, value, ptr) do {\ - ((D3DSTATE*)(ptr))->drstRenderStateType = state;\ - ((D3DSTATE*)(ptr))->dwArg[0] = value;\ + U1(*((D3DSTATE*)(ptr))).drstRenderStateType = state; \ + U2(*((D3DSTATE*)(ptr))).dwArg[0] = value; \ ptr = ((D3DSTATE*)(ptr))+1; } while (0) #define EXEBUF_PUT_PROCESSVERTICES(nvertices, ptr) do {\ @@ -1016,14 +1016,14 @@ out: ((D3DINSTRUCTION*)(ptr))->bSize = sizeof(D3DTRIANGLE);\ ((D3DINSTRUCTION*)(ptr))->wCount = 2;\ ptr = ((D3DINSTRUCTION*)(ptr))+1;\ - ((D3DTRIANGLE*)(ptr))->v1 = base_idx;\ - ((D3DTRIANGLE*)(ptr))->v2 = (base_idx) + 1;\ - ((D3DTRIANGLE*)(ptr))->v3 = (base_idx) + 3;\ + U1(*((D3DTRIANGLE*)(ptr))).v1 = base_idx;\ + U2(*((D3DTRIANGLE*)(ptr))).v2 = (base_idx) + 1; \ + U3(*((D3DTRIANGLE*)(ptr))).v3 = (base_idx) + 3; \ ((D3DTRIANGLE*)(ptr))->wFlags = 0;\ ptr = ((D3DTRIANGLE*)ptr)+1;\ - ((D3DTRIANGLE*)(ptr))->v1 = (base_idx) + 1;\ - ((D3DTRIANGLE*)(ptr))->v2 = (base_idx) + 2;\ - ((D3DTRIANGLE*)(ptr))->v3 = (base_idx) + 3;\ + U1(*((D3DTRIANGLE*)(ptr))).v1 = (base_idx) + 1; \ + U2(*((D3DTRIANGLE*)(ptr))).v2 = (base_idx) + 2; \ + U3(*((D3DTRIANGLE*)(ptr))).v3 = (base_idx) + 3; \ ((D3DTRIANGLE*)(ptr))->wFlags = 0;\ ptr = ((D3DTRIANGLE*)(ptr))+1;\ } while (0) @@ -1103,14 +1103,14 @@ static void D3D1_TextureMapBlendTest(void) memset(&ddbltfx, 0, sizeof(ddbltfx)); ddbltfx.dwSize = sizeof(ddbltfx); - ddbltfx.dwFillColor = 0; + U5(ddbltfx).dwFillColor = 0; hr = IDirectDrawSurface_Blt(Surface1, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); ok(hr == D3D_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); - ddbltfx.dwFillColor = 0xff0000ff; + U5(ddbltfx).dwFillColor = 0xff0000ff; hr = IDirectDrawSurface_Blt(TexSurface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); ok(hr == D3D_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); - ddbltfx.dwFillColor = 0x800000ff; + U5(ddbltfx).dwFillColor = 0x800000ff; hr = IDirectDrawSurface_Blt(TexSurface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); ok(hr == D3D_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); @@ -1235,14 +1235,14 @@ static void D3D1_TextureMapBlendTest(void) memset(&ddbltfx, 0, sizeof(ddbltfx)); ddbltfx.dwSize = sizeof(ddbltfx); - ddbltfx.dwFillColor = 0; + U5(ddbltfx).dwFillColor = 0; hr = IDirectDrawSurface_Blt(Surface1, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); ok(hr == D3D_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); - ddbltfx.dwFillColor = 0xff0000ff; + U5(ddbltfx).dwFillColor = 0xff0000ff; hr = IDirectDrawSurface_Blt(TexSurface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); ok(hr == D3D_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); - ddbltfx.dwFillColor = 0x800000ff; + U5(ddbltfx).dwFillColor = 0x800000ff; hr = IDirectDrawSurface_Blt(TexSurface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); ok(hr == D3D_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); @@ -1356,14 +1356,14 @@ static void D3D1_TextureMapBlendTest(void) memset(&ddbltfx, 0, sizeof(ddbltfx)); ddbltfx.dwSize = sizeof(ddbltfx); - ddbltfx.dwFillColor = 0; + U5(ddbltfx).dwFillColor = 0; hr = IDirectDrawSurface_Blt(Surface1, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); ok(hr == D3D_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); - ddbltfx.dwFillColor = 0x00ffffff; + U5(ddbltfx).dwFillColor = 0x00ffffff; hr = IDirectDrawSurface_Blt(TexSurface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); ok(hr == D3D_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); - ddbltfx.dwFillColor = 0x00ffff80; + U5(ddbltfx).dwFillColor = 0x00ffff80; hr = IDirectDrawSurface_Blt(TexSurface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); ok(hr == D3D_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); @@ -1478,13 +1478,13 @@ static void D3D1_TextureMapBlendTest(void) memset(&ddbltfx, 0, sizeof(ddbltfx)); ddbltfx.dwSize = sizeof(ddbltfx); - ddbltfx.dwFillColor = 0; + U5(ddbltfx).dwFillColor = 0; hr = IDirectDrawSurface_Blt(Surface1, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); ok(hr == D3D_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); - ddbltfx.dwFillColor = 0xf800; + U5(ddbltfx).dwFillColor = 0xf800; hr = IDirectDrawSurface_Blt(TexSurface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); ok(hr == D3D_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); - ddbltfx.dwFillColor = 0x001f; + U5(ddbltfx).dwFillColor = 0x001f; hr = IDirectDrawSurface_Blt(TexSurface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); ok(hr == D3D_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr);

1 0

James Hawkins : msi: Reimplement MsiFormatRecord.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 5a0d459cc4fe6315d63ab5f270772d2793c8e0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a0d459cc4fe6315d63ab5f27… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 15:59:21 2008 -0600 msi: Reimplement MsiFormatRecord. --- dlls/msi/format.c | 1088 +++++++++++++++++++++++++++++------------------ dlls/msi/tests/format.c | 307 +++++++------- 2 files changed, 811 insertions(+), 584 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a0d459cc4fe6315d63ab…

1 0

James Hawkins : msi: Add more tests for MsiFormatRecord.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: e618c6d11534ed0fc1e63643b01cbd37314f5d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e618c6d11534ed0fc1e63643b… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 15:43:54 2008 -0600 msi: Add more tests for MsiFormatRecord. --- dlls/msi/tests/format.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 2c9861e..be3a025 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1794,6 +1794,101 @@ static void test_formatrecord_package(void) ok( sz == 0, "size wrong: %d\n", sz); ok( 0 == strcmp(buffer,""), "wrong output: %s\n", buffer); + MsiRecordSetString(hrec, 0, "\\x"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 2, "Expected 2, got %d\n", sz); + ok(!lstrcmpA(buffer, "\\x"), "Expected \"\\x\", got \"%s\"\n", buffer); + + MsiRecordSetString(hrec, 0, "[\\["); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 3, "Expected 3, got %d\n", sz); + ok(!lstrcmpA(buffer, "[\\["), "Expected \"[\\[\", got \"%s\"\n", buffer); + + MsiRecordSetString(hrec, 0, "[\\[]"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 1, "Expected 1, got %d\n", sz); + ok(!lstrcmpA(buffer, "["), "Expected \"[\", got \"%s\"\n", buffer); + + MsiRecordSetString(hrec, 0, "[[]"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 3, "Expected 3, got %d\n", sz); + ok(!lstrcmpA(buffer, "[[]"), "Expected \"[]\", got \"%s\"\n", buffer); + + MsiRecordSetString(hrec, 0, "[\\[]]"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 2, "Expected 2, got %d\n", sz); + ok(!lstrcmpA(buffer, "[]"), "Expected \"[]\", got \"%s\"\n", buffer); + + MsiRecordSetString(hrec, 0, "[\\[a]"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 1, "Expected 1, got %d\n", sz); + ok(!lstrcmpA(buffer, "["), "Expected \"[\", got \"%s\"\n", buffer); + + MsiRecordSetString(hrec, 0, "[\\a[]"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(sz == 1, "Expected 1, got %d\n", sz); + ok(!lstrcmpA(buffer, "a"), "Expected \"a\", got \"%s\"\n", buffer); + } + + MsiRecordSetString(hrec, 0, "[prop]"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 3, "Expected 3, got %d\n", sz); + ok(!lstrcmpA(buffer, "val"), "Expected \"val\", got \"%s\"\n", buffer); + + MsiRecordSetString(hrec, 0, "[prop] [pro\\pblah] [prop]"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 8, "Expected 8, got %d\n", sz); + ok(!lstrcmpA(buffer, "val val"), "Expected \"val val\", got \"%s\"\n", buffer); + + MsiSetPropertyA(package, "b", "ball"); + MsiRecordSetString(hrec, 0, "[\\b]"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 1, "Expected 1, got %d\n", sz); + ok(!lstrcmpA(buffer, "b"), "Expected \"b\", got \"%s\"\n", buffer); + + MsiRecordSetString(hrec, 0, "[\\c]"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 1, "Expected 1, got %d\n", sz); + ok(!lstrcmpA(buffer, "c"), "Expected \"c\", got \"%s\"\n", buffer); + + MsiRecordSetString(hrec, 0, "[\\[]prop]"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 6, "Expected 6, got %d\n", sz); + ok(!lstrcmpA(buffer, "[prop]"), "Expected \"[prop]\", got \"%s\"\n", buffer); + + MsiRecordSetString(hrec, 0, "[\\a]prop]"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 6, "Expected 6, got %d\n", sz); + ok(!lstrcmpA(buffer, "aprop]"), "Expected \"aprop]\", got \"%s\"\n", buffer); + MsiRecordSetString(hrec, 0, "[\\[]Bracket Text[\\]]"); sz = sizeof buffer; r = MsiFormatRecord(package, hrec, buffer, &sz); @@ -1812,6 +1907,19 @@ static void test_formatrecord_package(void) ok( sz == 9, "size wrong\n"); ok( 0 == strcmp(buffer,"boo "), "wrong output\n"); + MsiRecordSetString(hrec, 0, "[1] [~abc] [2]"); + MsiRecordSetString(hrec, 1, "boo"); + MsiRecordSetString(hrec, 2, "hoo"); + sz = sizeof(buffer); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(sz == 8, "Expected 8, got %d\n", sz); + ok(!lstrcmpA(buffer, "boo hoo"), + "Expected \"boo hoo\", got \"%s\"\n", buffer); + } + /* properties */ r = MsiSetProperty(package,"dummy","Bork"); ok( r == ERROR_SUCCESS, "set property failed\n");

1 0

Rob Shearman : rpcrt4: Fix potential memory leaks on error paths in RPCRT4_io_thread.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 1ceef1e149a92e4125451984f1920113bd7a383c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ceef1e149a92e4125451984f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 4 22:22:50 2008 +0000 rpcrt4: Fix potential memory leaks on error paths in RPCRT4_io_thread. --- dlls/rpcrt4/rpc_server.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 35acbb7..9ffec50 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -391,6 +391,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) packet = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcPacket)); if (!packet) { + I_RpcFree(msg->Buffer); HeapFree(GetProcessHeap(), 0, msg); break; } @@ -399,6 +400,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) packet->msg = msg; if (!QueueUserWorkItem(RPCRT4_worker_thread, packet, WT_EXECUTELONGFUNCTION)) { ERR("couldn't queue work item for worker thread, error was %d\n", GetLastError()); + I_RpcFree(msg->Buffer); HeapFree(GetProcessHeap(), 0, msg); HeapFree(GetProcessHeap(), 0, packet); break;

1 0

Rob Shearman : rpcrt4: Fix potential memory leaks in RPCRT4_Receive.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 8e667fd89c48ff577da079ae16dd24598f080303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e667fd89c48ff577da079ae1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 4 22:22:47 2008 +0000 rpcrt4: Fix potential memory leaks in RPCRT4_Receive. --- dlls/rpcrt4/rpc_message.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 74e0052..068adf1 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -813,6 +813,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, void *payload = NULL; *Header = NULL; + pMsg->Buffer = NULL; TRACE("(%p, %p, %p)\n", Connection, Header, pMsg); @@ -964,6 +965,8 @@ fail: if (CurrentHeader != *Header) RPCRT4_FreeHeader(CurrentHeader); if (status != RPC_S_OK) { + I_RpcFree(pMsg->Buffer); + pMsg->Buffer = NULL; RPCRT4_FreeHeader(*Header); *Header = NULL; }

1 0

Andrew Talbot : wininet: Remove unneeded casts.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 45481db078d50a331db2702a75e448de311ebeee URL: http://source.winehq.org/git/wine.git/?a=commit;h=45481db078d50a331db2702a7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 4 22:07:57 2008 +0000 wininet: Remove unneeded casts. --- dlls/wininet/ftp.c | 6 +++--- dlls/wininet/http.c | 2 +- dlls/wininet/internet.c | 18 +++++++++--------- dlls/wininet/urlcache.c | 8 ++++---- dlls/wininet/utility.c | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 44a5d33..f9ae2db 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -474,7 +474,7 @@ lend: { INTERNET_ASYNC_RESULT iar; - iar.dwResult = (DWORD)bSuccess; + iar.dwResult = bSuccess; iar.dwError = bSuccess ? ERROR_SUCCESS : ERROR_INTERNET_EXTENDED_ERROR; SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, sizeof(INTERNET_ASYNC_RESULT)); @@ -1008,13 +1008,13 @@ lend: { INTERNET_ASYNC_RESULT iar; - iar.dwResult = (DWORD)bSuccess; + iar.dwResult = bSuccess; iar.dwError = bSuccess ? ERROR_SUCCESS : ERROR_INTERNET_EXTENDED_ERROR; SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, sizeof(INTERNET_ASYNC_RESULT)); } - return (DWORD) bSuccess; + return bSuccess; } /*********************************************************************** diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 71dcc51..964140e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -796,7 +796,7 @@ BOOL WINAPI HttpEndRequestA(HINTERNET hRequest, FIXME("Do we need to translate info out of these buffer?\n"); - HeapFree(GetProcessHeap(),0,(LPVOID)ptrW->lpvBuffer); + HeapFree(GetProcessHeap(),0,ptrW->lpvBuffer); ptrW2 = ptrW->Next; HeapFree(GetProcessHeap(),0,ptrW); ptrW = ptrW2; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 2c3e9a9..595a718 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -265,7 +265,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) URLCacheContainers_CreateDefaults(); - WININET_hModule = (HMODULE)hinstDLL; + WININET_hModule = hinstDLL; case DLL_THREAD_ATTACH: break; @@ -568,7 +568,7 @@ lend: HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent, DWORD dwAccessType, LPCSTR lpszProxy, LPCSTR lpszProxyBypass, DWORD dwFlags) { - HINTERNET rc = (HINTERNET)NULL; + HINTERNET rc = NULL; INT len; WCHAR *szAgent = NULL, *szProxy = NULL, *szBypass = NULL; @@ -851,7 +851,7 @@ HINTERNET WINAPI InternetConnectA(HINTERNET hInternet, LPCSTR lpszUserName, LPCSTR lpszPassword, DWORD dwService, DWORD dwFlags, DWORD_PTR dwContext) { - HINTERNET rc = (HINTERNET)NULL; + HINTERNET rc = NULL; INT len = 0; LPWSTR szServerName = NULL; LPWSTR szUserName = NULL; @@ -1700,7 +1700,7 @@ BOOL WINAPI InternetWriteFile(HINTERNET hFile, LPCVOID lpBuffer , LPWININETHANDLEHEADER lpwh; TRACE("\n"); - lpwh = (LPWININETHANDLEHEADER) WININET_GetObject( hFile ); + lpwh = WININET_GetObject( hFile ); if (NULL == lpwh) return FALSE; @@ -2544,7 +2544,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, LPWININETHANDLEHEADER lpwh; INTERNET_STATUS_CALLBACK callback = *(INTERNET_STATUS_CALLBACK *)lpBuffer; - if (!(lpwh = (LPWININETHANDLEHEADER)WININET_GetObject(hInternet))) return FALSE; + if (!(lpwh = WININET_GetObject(hInternet))) return FALSE; r = (set_status_callback(lpwh, callback, FALSE) != INTERNET_INVALID_STATUS_CALLBACK); WININET_Release(lpwh); return r; @@ -3104,7 +3104,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, HINTERNET WINAPI InternetOpenUrlA(HINTERNET hInternet, LPCSTR lpszUrl, LPCSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) { - HINTERNET rc = (HINTERNET)NULL; + HINTERNET rc = NULL; INT lenUrl; INT lenHeaders = 0; @@ -3117,16 +3117,16 @@ HINTERNET WINAPI InternetOpenUrlA(HINTERNET hInternet, LPCSTR lpszUrl, lenUrl = MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, NULL, 0 ); szUrl = HeapAlloc(GetProcessHeap(), 0, lenUrl*sizeof(WCHAR)); if(!szUrl) - return (HINTERNET)NULL; + return NULL; MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, szUrl, lenUrl); } - + if(lpszHeaders) { lenHeaders = MultiByteToWideChar(CP_ACP, 0, lpszHeaders, dwHeadersLength, NULL, 0 ); szHeaders = HeapAlloc(GetProcessHeap(), 0, lenHeaders*sizeof(WCHAR)); if(!szHeaders) { HeapFree(GetProcessHeap(), 0, szUrl); - return (HINTERNET)NULL; + return NULL; } MultiByteToWideChar(CP_ACP, 0, lpszHeaders, dwHeadersLength, szHeaders, lenHeaders); } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 7dfb20a..dc92aff 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1125,7 +1125,7 @@ static BOOL URLCache_FindHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, struct HASH_CACHEFILE_ENTRY * pHashEntry; DWORD dwHashTableNumber = 0; - key = (DWORD)(key / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; + key = (key / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; for (pHashEntry = URLCache_HashEntryFromOffset(pHeader, pHeader->dwOffsetFirstHashTable); ((DWORD)((LPBYTE)pHashEntry - (LPBYTE)pHeader) >= ENTRY_START_OFFSET) && ((DWORD)((LPBYTE)pHashEntry - (LPBYTE)pHeader) < pHeader->dwFileSize); @@ -1147,7 +1147,7 @@ static BOOL URLCache_FindHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, struct for (i = 0; i < HASHTABLE_BLOCKSIZE; i++) { struct _HASH_ENTRY * pHashElement = &pHashEntry->HashTable[offset + i]; - if (key == (DWORD)(pHashElement->dwHashKey / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES) + if (key == (pHashElement->dwHashKey / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES) { /* FIXME: we should make sure that this is the right element * before returning and claiming that it is. We can do this @@ -1195,7 +1195,7 @@ static BOOL URLCache_FindHashW(LPCURLCACHE_HEADER pHeader, LPCWSTR lpszUrl, stru */ static BOOL URLCache_HashEntrySetUse(struct _HASH_ENTRY * pHashEntry, DWORD dwUseCount) { - pHashEntry->dwHashKey = dwUseCount | (DWORD)(pHashEntry->dwHashKey / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; + pHashEntry->dwHashKey = dwUseCount | (pHashEntry->dwHashKey / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; return TRUE; } @@ -1238,7 +1238,7 @@ static BOOL URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, D HASH_CACHEFILE_ENTRY * pHashEntry; DWORD dwHashTableNumber = 0; - key = (DWORD)(key / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; + key = (key / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; for (pHashEntry = URLCache_HashEntryFromOffset(pHeader, pHeader->dwOffsetFirstHashTable); ((DWORD)((LPBYTE)pHashEntry - (LPBYTE)pHeader) >= ENTRY_START_OFFSET) && ((DWORD)((LPBYTE)pHashEntry - (LPBYTE)pHeader) < pHeader->dwFileSize); diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 97b4be5..352b260 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -162,7 +162,7 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, memset(psa,0,sizeof(struct sockaddr_in)); memcpy((char *)&psa->sin_addr, phe->h_addr, phe->h_length); psa->sin_family = phe->h_addrtype; - psa->sin_port = htons((u_short)nServerPort); + psa->sin_port = htons(nServerPort); return TRUE; }

1 0

Andrew Talbot : winex11.drv: Remove unneeded casts.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 6436dd616944dc855f13ed8256b6def4a9419298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6436dd616944dc855f13ed825… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 4 22:07:44 2008 +0000 winex11.drv: Remove unneeded casts. --- dlls/winex11.drv/xfont.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index a55e77d..7dc3a40 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -3100,7 +3100,7 @@ static X_PHYSFONT XFONT_RealizeFont( LPLOGFONT16 plf, pfo->lpPixmap = NULL; for ( i = 0; i < X11FONT_REFOBJS_MAX; i++ ) - pfo->prefobjs[i] = (X_PHYSFONT)0xffffffff; /* invalid value */ + pfo->prefobjs[i] = 0xffffffff; /* invalid value */ /* special treatment for DBCS that needs multiple fonts */ /* All member of pfo must be set correctly. */ @@ -3165,7 +3165,7 @@ END: *faceMatched = pfo->fi->df.dfFace; *pcharsetMatched = pfo->fi->internal_charset; - return (X_PHYSFONT)(X_PFONT_MAGIC | index); + return X_PFONT_MAGIC | index; } /***********************************************************************

1 0